mirror/sunmao-ui
2
0
Fork 0
mirror of https://github.com/smartxworks/sunmao-ui.git synced 2025-04-06 21:40:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #545 from smartxworks/fix/trait-property-crash

Browse Source 
fix(traitForm): trait form will crash if the trait has a property that is not in its spec
This commit is contained in:
tanbowensg 2022-07-26 11:25:34 +08:00 committed by GitHub
commit 941ffa9089
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
packages/editor/src/components/ComponentForm/GeneralTraitFormList/GeneralTraitForm.tsx
View File

@ -3,7 +3,6 @@ import { ComponentSchema, TraitSchema } from '@sunmao-ui/core';
import { HStack, IconButton, VStack } from '@chakra-ui/react';
import { generateDefaultValueFromSpec } from '@sunmao-ui/shared';
import { CloseIcon } from '@chakra-ui/icons';
import { TSchema } from '@sinclair/typebox';
import { formWrapperCSS } from '../style';
import { EditorServices } from '../../../types';
import { SpecWidget } from '@sunmao-ui/editor-sdk';
@ -28,7 +27,10 @@ export const GeneralTraitForm: React.FC<Props> = props => {
);
const fields = Object.keys(properties || []).map((key: string) => {
const value = trait.properties[key];
const propertySpec = (tImpl.spec.properties as TSchema).properties?.[key];
const propertySpec = tImpl.spec.properties.properties?.[key];
if (!propertySpec) return undefined;
const onChange = (newValue: any) => {
const operation = genOperation(registry, 'modifyTraitProperty', {
componentId: component.id,
@ -41,15 +43,14 @@ export const GeneralTraitForm: React.FC<Props> = props => {
eventBus.send('operation', operation);
};
const specObj = propertySpec === true ? {} : propertySpec;
return (
<SpecWidget
key={key}
level={1}
path={[key]}
spec={{
...propertySpec,
title: propertySpec.title || key,
}}
spec={{ ...specObj, title: specObj.title || key }}
value={value}
services={services}
component={component}