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

@@ -109,7 +109,7 @@ export const useNodeFieldDisplay = ({
     return null;
     return null;
   };
   };
 
 
-  const genDisplayDom = (value: string) => {
+  const genDisplayDom = (value: string, nodes: INode[]) => {
     const itemId = getId(value);
     const itemId = getId(value);
     if (!itemId) return;
     if (!itemId) return;
     let displayConfig: any[] = [];
     let displayConfig: any[] = [];
@@ -118,7 +118,7 @@ export const useNodeFieldDisplay = ({
     while (n && index <= 20) {
     while (n && index <= 20) {
       displayConfig = [];
       displayConfig = [];
       // eslint-disable-next-line @typescript-eslint/no-use-before-define
       // eslint-disable-next-line @typescript-eslint/no-use-before-define
-      const curNode = cloneDeep(optionalNodes[index]) || {};
+      const curNode = cloneDeep(nodes[index]) || {};
       displayConfig.push({
       displayConfig.push({
         title: curNode.name,
         title: curNode.name,
         icon: curNode.icon,
         icon: curNode.icon,
@@ -151,7 +151,6 @@ export const useNodeFieldDisplay = ({
         n = false;
         n = false;
       }
       }
     }
     }
-
     return (
     return (
       <>
       <>
         {displayConfig?.map((item, idx) => (
         {displayConfig?.map((item, idx) => (
@@ -186,10 +185,10 @@ export const useNodeFieldDisplay = ({
     );
     );
   };
   };
 
 
-  const renderInputDisplay = (val: string = value || '') => {
+  const renderInputDisplay = (nodes: INode[] = optionalNodes, val: string = value || '', ) => {
     setInputDisplay(
     setInputDisplay(
       <Tag bordered={false} className="qx-node-select-input__content">
       <Tag bordered={false} className="qx-node-select-input__content">
-        {genDisplayDom(val)}
+        {genDisplayDom(val, nodes)}
       </Tag>,
       </Tag>,
     );
     );
   };
   };
@@ -197,7 +196,7 @@ export const useNodeFieldDisplay = ({
   /***
   /***
    * 查找有 formId 的 result
    * 查找有 formId 的 result
    */
    */
-  const findResultByFormId = () => {
+  const findResultByFormId = (sourceParentNodes: INode[]) => {
     const forms: FiledType[] = [];
     const forms: FiledType[] = [];
     sourceParentNodes.forEach((node) => {
     sourceParentNodes.forEach((node) => {
       if (Array.isArray(node.data?.result)) {
       if (Array.isArray(node.data?.result)) {
@@ -230,7 +229,7 @@ export const useNodeFieldDisplay = ({
    * 查询所有 formId 的字段，并给 result 添加 child
    * 查询所有 formId 的字段，并给 result 添加 child
    */
    */
   const handleGetAppsFields = async () => {
   const handleGetAppsFields = async () => {
-    const forms = findResultByFormId();
+    const forms = findResultByFormId(sourceParentNodes);
     const ids = forms.map((item) => item.qxProps?.formId);
     const ids = forms.map((item) => item.qxProps?.formId);
     if (Array.isArray(ids) && ids.length && subset) {
     if (Array.isArray(ids) && ids.length && subset) {
       try {
       try {
@@ -250,7 +249,7 @@ export const useNodeFieldDisplay = ({
             id: item.code,
             id: item.code,
             type: item.extract?.fieldType,
             type: item.extract?.fieldType,
           }));
           }));
-         
+
           if (Array.isArray(form.child)) {
           if (Array.isArray(form.child)) {
             form.child.push(childItem);
             form.child.push(childItem);
           } else {
           } else {
@@ -261,7 +260,6 @@ export const useNodeFieldDisplay = ({
       } catch (error) {
       } catch (error) {
         // appsFields = {};
         // appsFields = {};
       } finally {
       } finally {
-        renderInputDisplay();
       }
       }
     }
     }
     return sourceParentNodes;
     return sourceParentNodes;
@@ -291,18 +289,22 @@ export const useNodeFieldDisplay = ({
   const getOptionalNodes = async () => {
   const getOptionalNodes = async () => {
     const targetParentNodes = await handleGetAppsFields();
     const targetParentNodes = await handleGetAppsFields();
 
 
-    for (let i = 0; i< targetParentNodes.length;i++) {
-      correctionNodeField(targetParentNodes[i].data?.result || [])
+    for (let i = 0; i < targetParentNodes.length; i++) {
+      correctionNodeField(targetParentNodes[i].data?.result || []);
+    }
+
+    if (!limitTypes) {
+      setOptionalNodes(targetParentNodes);
+      renderInputDisplay(targetParentNodes);
+      return;
     }
     }
-   
-    if (!limitTypes) return setOptionalNodes(targetParentNodes);
 
 
     function getEffectiveResult(result: FiledType[]) {
     function getEffectiveResult(result: FiledType[]) {
       const newResult = [];
       const newResult = [];
       for (let i = 0; i < result.length; i++) {
       for (let i = 0; i < result.length; i++) {
-        const resultItem = result[i] || {};       
-        correctionNodeField(resultItem)
-       
+        const resultItem = result[i] || {};
+        correctionNodeField(resultItem);
+
         if (resultItem.child) {
         if (resultItem.child) {
           resultItem.child = getEffectiveResult(resultItem.child);
           resultItem.child = getEffectiveResult(resultItem.child);
           if (
           if (
@@ -333,6 +335,7 @@ export const useNodeFieldDisplay = ({
 
 
     const newNodes = getEffectiveNodes(targetParentNodes);
     const newNodes = getEffectiveNodes(targetParentNodes);
     setOptionalNodes([...newNodes]);
     setOptionalNodes([...newNodes]);
+    renderInputDisplay([...newNodes]);
   };
   };
 
 
   useEffect(() => {
   useEffect(() => {
@@ -388,7 +391,9 @@ const SelectItem = (props: any) => {
         onClick={() => props.onClick(props)}
         onClick={() => props.onClick(props)}
       >
       >
         {/* @ts-ignore */}
         {/* @ts-ignore */}
-        {props.icon ? props.icon : `[${FieldMapType[props.extract?.fieldType]}]`}
+        {props.icon
+          ? props.icon
+          : `[${FieldMapType[props.extract?.fieldType]}]`}
         {props.name}
         {props.name}
       </div>
       </div>
     );
     );
@@ -466,7 +471,7 @@ export const QxFlowNodeFieldSelector: React.FC<NodeFieldSelectProps> = (
     const newValue = '${' + `${nodeKey}|${item.id}` + '}';
     const newValue = '${' + `${nodeKey}|${item.id}` + '}';
     props.onChange?.(newValue, item);
     props.onChange?.(newValue, item);
     if (!props.children) {
     if (!props.children) {
-      renderInputDisplay(newValue);
+      renderInputDisplay(optionalNodes ,newValue);
     }
     }
     setVisible(false);
     setVisible(false);
   };
   };