Explorar o código

Merge xyh

fix: 修复场景联动触发方式删除产品后导致显示异常
XieYongHong %!s(int64=3) %!d(string=hai) anos
pai
achega
71fa0e70d9
Modificáronse 1 ficheiros con 2 adicións e 2 borrados
  1. 2 2
      src/pages/rule-engine/Scene/Save/trigger/index.tsx

+ 2 - 2
src/pages/rule-engine/Scene/Save/trigger/index.tsx

@@ -67,7 +67,7 @@ export default observer((props: TriggerProps) => {
         newOperator = [...newOperator, { label: '功能调用', value: OperatorEnum.invokeFunction }];
         newOperator = [...newOperator, { label: '功能调用', value: OperatorEnum.invokeFunction }];
         setFunctions(metadataObj.functions);
         setFunctions(metadataObj.functions);
       }
       }
-      setOperatorOptions(newOperator);
+      setOperatorOptions(Object.keys(metadataObj).length ? newOperator : undefined);
     } catch (err) {
     } catch (err) {
       console.warn('handleMetadata === ', err);
       console.warn('handleMetadata === ', err);
     }
     }
@@ -154,7 +154,7 @@ export default observer((props: TriggerProps) => {
                 props.form?.resetFields([['trigger', 'device', 'selector']]);
                 props.form?.resetFields([['trigger', 'device', 'selector']]);
                 props.form?.resetFields([['trigger', 'device', 'selectorValues']]);
                 props.form?.resetFields([['trigger', 'device', 'selectorValues']]);
                 props.form?.resetFields([['trigger', 'device', 'operation']]);
                 props.form?.resetFields([['trigger', 'device', 'operation']]);
-                productIdChange(key, node.metadata);
+                productIdChange(key, node?.metadata);
                 setSelector('fixed');
                 setSelector('fixed');
                 props.form?.setFieldsValue({
                 props.form?.setFieldsValue({
                   trigger: {
                   trigger: {