Fix: customized uiSchema can't show properly (#854)

Co-authored-by: liyanfang <liyanfang@cmss.chinamobile.com>
kubevela · Jul 14, 2023 · 8a81aa1 · 8a81aa1
1 parent 28dea8a
commit 8a81aa1
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/packages/velaux-ui/src/components/UISchema/index.tsx b/packages/velaux-ui/src/components/UISchema/index.tsx
@@ -192,9 +192,6 @@ class UISchema extends Component<Props, State> {
       if (condition.action == 'enable' || !condition.action) {
         enableConditionCount += 1;
       }
-      if (value == undefined) {
-        return;
-      }
       switch (condition.op) {
         case 'in':
           if (Array.isArray(condition.value) && condition.value.includes(value)) {
@@ -976,7 +973,7 @@ class UISchema extends Component<Props, State> {
     };
 
     const showAdvancedButton = couldBeDisabledParamCount != couldShowParamCount || requiredParamCount === 0;
-    return (
+    return ( 
       <Form field={this.form} className="ui-schema-container">
         <If condition={disableRenderRow}>{items}</If>
         <If condition={!disableRenderRow}>

diff --git a/packages/velaux-ui/src/extends/Group/index.tsx b/packages/velaux-ui/src/extends/Group/index.tsx
@@ -57,7 +57,7 @@ class Group extends React.Component<Props, State> {
 
   initSwitchState = () => {
     const { jsonKey = '', propertyValue = {}, alwaysShow = false, required, closed, initClose } = this.props;
-    const findKey = Object.keys(propertyValue).find((item) => item === jsonKey);
+    const findKey = propertyValue && Object.keys(propertyValue).find((item) => item === jsonKey);
     if (findKey || alwaysShow) {
       this.setState({ enable: true, closed: false || initClose, checked: true });
     } else if (required) {