Merge remote-tracking branch 'origin/feature/dataflow' into feature/dataflow

@@ -53,6 +53,10 @@
       justify-content: center;
       justify-content: center;
       color: @N7;
       color: @N7;
       border-radius: 0 4px 4px 0;
       border-radius: 0 4px 4px 0;
+
+      &.disabled {
+        background-color: @N2;
+      }
     }
     }
 
 
     .qx-field-setter {
     .qx-field-setter {

@@ -790,9 +790,11 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
       {showAssignment ? (
       {showAssignment ? (
         <ControlOutlined
         <ControlOutlined
           onClick={() => {
           onClick={() => {
+            if (optValTypeCheck.isEmptyType(value?.opt) || disabled) return;
             setOpen(!open);
             setOpen(!open);
           }}
           }}
-          className="qx-base-condition-item__content-suffix"
+          className={`qx-base-condition-item__content-suffix ${
+            optValTypeCheck.isEmptyType(value?.opt) || disabled ? ' disabled' : ' '}`}
         />
         />
       ) : null}
       ) : null}
     </>
     </>

 @import '~@qx/ui/src/style/variable.less';
 @import '~@qx/ui/src/style/variable.less';
 
 
-.qx-base-condition-list {
-  
-  &-item {
-    display: flex;
-    align-items: center;
+.qx-base-condition {
+  width: 100%;
 
 
+  &-list {
+    width: 100%;
 
 
-    &__idx {
-      color: @N9;
-      margin-right: 4px;
-      width: 24px;
-      display: inline-block;
+    &-item {
+      width: 100%;
+      display: flex;
+      align-items: center;
+
+
+      &__idx {
+        color: @N9;
+        margin-right: 4px;
+        width: 24px;
+        display: inline-block;
+      }
     }
     }
   }
   }
 }
 }
+

@@ -51,7 +51,7 @@ export const QxBaseCondition: React.FC<QxBaseConditionProps> = (props) => {
 
 
   const handleItemChange = (val: any, key: number) => {
   const handleItemChange = (val: any, key: number) => {
     props.onChange?.(
     props.onChange?.(
-      props.value?.map((item, idx) => {
+      (props.value || [])?.map((item, idx) => {
         if (idx === key) return val;
         if (idx === key) return val;
         return props.value?.[idx]
         return props.value?.[idx]
           ? props.value?.[idx]
           ? props.value?.[idx]

@@ -181,6 +181,10 @@
   .qx-field-setter__fields-btn:hover {
   .qx-field-setter__fields-btn:hover {
     background-color: @N3;
     background-color: @N3;
   }
   }
+
+  .qx-tags-input.ant-input {
+    border-radius: 4px;
+  }
 }
 }
 
 
 .qx-field-setter--range {
 .qx-field-setter--range {

@@ -271,8 +271,9 @@ export const useNodeFieldDisplay = ({
     if (!forms.length) return sourceParentNodes;
     if (!forms.length) return sourceParentNodes;
 
 
     const ids = forms.map((item) => item.qxProps?.formId);
     const ids = forms.map((item) => item.qxProps?.formId);
-    if (JSON.stringify(ids) === JSON.stringify(formIds) && ids.length)
-      return targetParentNodes;
+    // TODO 这个判断 会拿前面已渲染的数据 导致回显不对
+    // if (JSON.stringify(ids) === JSON.stringify(formIds) && ids.length)
+    //   return targetParentNodes;
 
 
     if (Array.isArray(ids) && ids.length && subset) {
     if (Array.isArray(ids) && ids.length && subset) {
       try {
       try {