Merge branch 'feature/dataflow' of http://gitlab.qgutech.com/tianqiang/qx-common…

… into feature/dataflow

@@ -43,6 +43,7 @@ export const getParentNodes = (
   allNodes = getNodesMap(treeNodes!),
   allNodes = getNodesMap(treeNodes!),
 ) => {
 ) => {
   if (!node || !treeNodes) return [];
   if (!node || !treeNodes) return [];
+
   if (node.previousId) {
   if (node.previousId) {
     parentNode.unshift(allNodes[node.previousId]);
     parentNode.unshift(allNodes[node.previousId]);
     getParentNodes(allNodes[node.previousId], treeNodes, parentNode, allNodes);
     getParentNodes(allNodes[node.previousId], treeNodes, parentNode, allNodes);
@@ -96,9 +97,10 @@ export const useNodeFieldDisplay = ({
       (node) => !['default_DF_BRANCH'].includes(node.type),
       (node) => !['default_DF_BRANCH'].includes(node.type),
     ) || [],
     ) || [],
   );
   );
+
   const [inputDisplay, setInputDisplay] = useState<React.ReactNode>();
   const [inputDisplay, setInputDisplay] = useState<React.ReactNode>();
   const [optionalNodes, setOptionalNodes] = useState<FiledType[]>([]); // 根据 fieldType 过滤后的 nodes
   const [optionalNodes, setOptionalNodes] = useState<FiledType[]>([]); // 根据 fieldType 过滤后的 nodes
-  const displayResolved = useRef<boolean>(false)
+  const displayResolved = useRef<boolean>(false);
 
 
   const getResultFieldMap = (optionalNodes: FiledType[]) => {
   const getResultFieldMap = (optionalNodes: FiledType[]) => {
     const resultMap: Record<string, FiledType | INode> = {};
     const resultMap: Record<string, FiledType | INode> = {};
@@ -160,12 +162,11 @@ export const useNodeFieldDisplay = ({
 
 
   const getDisplayConfig = async (val = value): Promise<FiledType[]> => {
   const getDisplayConfig = async (val = value): Promise<FiledType[]> => {
     return new Promise((resolve, reject) => {
     return new Promise((resolve, reject) => {
-      if (displayResolved.current) resolve(handleGetDisplayConfig(val!))
+      if (displayResolved.current) resolve(handleGetDisplayConfig(val!));
       resolveDisplayConfig.current = () => {
       resolveDisplayConfig.current = () => {
         try {
         try {
-          console.log('handleGetDisplayConfig');
           resolve(handleGetDisplayConfig(val!));
           resolve(handleGetDisplayConfig(val!));
-          displayResolved.current = true
+          displayResolved.current = true;
         } catch (error) {
         } catch (error) {
           reject(error);
           reject(error);
         }
         }
@@ -175,7 +176,6 @@ export const useNodeFieldDisplay = ({
 
 
   const genDisplayDom = async (val = value) => {
   const genDisplayDom = async (val = value) => {
     const displayConfig = await getDisplayConfig(val);
     const displayConfig = await getDisplayConfig(val);
-    console.log('displayConfig', displayConfig);
     return (
     return (
       <>
       <>
         {displayConfig?.map?.((item, idx) => (
         {displayConfig?.map?.((item, idx) => (
@@ -279,26 +279,31 @@ export const useNodeFieldDisplay = ({
         const data = await getAppsFields(ids as any[]);
         const data = await getAppsFields(ids as any[]);
         Object.keys(data).forEach((id) => {
         Object.keys(data).forEach((id) => {
           // 此处是引用类型，会间接修改 sourceParentNodes
           // 此处是引用类型，会间接修改 sourceParentNodes
-          const form = forms.find((item) => item.qxProps?.formId === id);
-          if (!form) return;
-
-          const childItem = data[id].map((item: FiledType) => ({
-            ...item,
-            icon: (
-              <span className="qx-node-select-item__icon">
-                <QxWidgetIcon widgetName={item.extract?.widget || 'qxInput'} />
-              </span>
-            ),
-            title: item.name,
-            id: item.code,
-            type: item.extract?.fieldType,
-          }));
-
-          if (Array.isArray(form.child)) {
-            form.child.push(childItem);
-          } else {
-            form.child = childItem;
-          }
+          const targetForms = forms.filter(
+            (item) => item.qxProps?.formId === id,
+          );
+          if (!targetForms.length) return;
+          targetForms.forEach((form) => {
+            const childItem = data[id].map((item: FiledType) => ({
+              ...item,
+              icon: (
+                <span className="qx-node-select-item__icon">
+                  <QxWidgetIcon
+                    widgetName={item.extract?.widget || 'qxInput'}
+                  />
+                </span>
+              ),
+              title: item.name,
+              id: item.code,
+              type: item.extract?.fieldType,
+            }));
+
+            if (Array.isArray(form.child)) {
+              form.child.push(childItem);
+            } else {
+              form.child = childItem;
+            }
+          });
         });
         });
       } catch (error) {
       } catch (error) {
         console.error(error);
         console.error(error);
@@ -373,7 +378,8 @@ export const useNodeFieldDisplay = ({
    */
    */
   const getOptionalNodes = async () => {
   const getOptionalNodes = async () => {
     const _targetParentNodes = await handleFormTypeAddChild(); // 给 form 类型的字段添加 child
     const _targetParentNodes = await handleFormTypeAddChild(); // 给 form 类型的字段添加 child
-    let newNodes = correctionNode(_targetParentNodes);
+    const correctedNodes = correctionNode(_targetParentNodes) || [];
+    let newNodes: FiledType[] = correctedNodes.filter(i => !!i.child);
 
 
     /**
     /**
      * 根据 limitType 获取可选择的字段
      * 根据 limitType 获取可选择的字段
@@ -396,9 +402,7 @@ export const useNodeFieldDisplay = ({
           )
           )
         ) {
         ) {
           newResult.push(resultItem);
           newResult.push(resultItem);
-        }
-
-        if (Array.isArray(resultItem.child) && resultItem.child.length) {
+        } else if (Array.isArray(resultItem.child) && resultItem.child.length) {
           const child = getEffectiveResult(resultItem.child);
           const child = getEffectiveResult(resultItem.child);
           if (child && child.length) {
           if (child && child.length) {
             resultItem.child = child;
             resultItem.child = child;
@@ -427,7 +431,6 @@ export const useNodeFieldDisplay = ({
       newNodes = getEffectiveNodes(cloneDeep(newNodes));
       newNodes = getEffectiveNodes(cloneDeep(newNodes));
     }
     }
 
 
-    // console.log('newNodes', newNodes);
     setOptionalNodes(newNodes);
     setOptionalNodes(newNodes);
     resultFieldMap.current = getResultFieldMap(newNodes);
     resultFieldMap.current = getResultFieldMap(newNodes);
     resolveFieldResultMap.current?.(resultFieldMap.current);
     resolveFieldResultMap.current?.(resultFieldMap.current);
@@ -613,8 +616,6 @@ export const QxFlowNodeFieldSelector = React.forwardRef<
     getInputDisplay: () => inputDisplay,
     getInputDisplay: () => inputDisplay,
   }));
   }));
 
 
-  console.log('resultFieldMap', resultFieldMap, inputDisplay);
-
   return (
   return (
     <div
     <div
       className={cls('qx-node-select')}
       className={cls('qx-node-select')}