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

 {
   "name": "@qx/common",
-  "version": "3.0.0-alpha.22",
+  "version": "3.0.0-alpha.23",
   "description": "A react library developed with dumi",
   "license": "MIT",
   "module": "dist/index.js",

@@ -680,6 +680,8 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
   mode = 'condition',
   node,
   nodes,
+  subset,
+  params
 }) => {
   const valuesObj = value?.valuesObj?.[0] || {};
   const [open, setOpen] = useState(false);
@@ -731,6 +733,8 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
     node: node,
     nodes: nodes,
     limitTypes: [field.fieldType],
+    value: valuesObj?.value,
+    subset
   });
 
   const getName = (values: any[]) => {
@@ -740,6 +744,7 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
   const RenderContent = (
     <>
       <QxFieldSetter
+        params={params || field?.params}
         value={value?.valuesObj}
         fieldGroupType={value?.fieldGroupType}
         onChange={handleChange}
@@ -747,6 +752,7 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
         isRange={optValTypeCheck.isRangeType(value?.opt)}
         disabled={optValTypeCheck.isEmptyType(value?.opt)}
         getName={getName}
+        widget={field.extract?.widget}
       />
       {mode === 'variable' && (
         <ControlOutlined
@@ -812,6 +818,7 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
             value={valuesObj?.value}
             onChange={handleAssignment}
             limitTypes={[field.fieldType]}
+            subset={subset}
           >
             {RenderContent}
           </QxFlowNodeFieldSelector>
@@ -841,5 +848,6 @@ export interface QxBaseConditionItemProps {
   mode?: string;
   node?: INode;
   nodes?: INode[];
+  [key: string]: any
   // customDisplay?: (val: string) => React.ReactNode;
 }

 import React, { useEffect, useState } from 'react';
 import { QxBaseConditionItem } from '../qx-base-condition-item';
-import './index.less';
 import { INode } from '../qx-flow-node-selector';
+import './index.less';
 
-export enum FieldBaseType {
-  STRING = 'TEXT',
-  DOUBLE = 'NUM',
-  YEAR_SEC = 'DATE',
-}
+const FieldBaseType = {
+  STRING: 'TEXT',
+  DOUBLE: 'NUM',
+  NUMBER: 'NUM',
+  YEAR_SEC: 'DATE',
+};
 
 export const QxBaseCondition: React.FC<QxBaseConditionProps> = (props) => {
   const [localOptions, setLocalOptions] = useState(props.options || []);
 
   const getDefaultConditionOptions = (item: QxBaseConditionField) => ({
     ...item,
-    // @ts-ignore
-    fieldGroupType: FieldBaseType[item.fieldType] || 'TEXT',
+    fieldGroupType:
+      FieldBaseType[item.fieldType] ||
+      item.fieldGroupType ||
+      item.fieldType ||
+      'TEXT',
     mappingValues: [],
     opt: 'IS',
     valuesObj: [],
@@ -49,7 +53,7 @@ export const QxBaseCondition: React.FC<QxBaseConditionProps> = (props) => {
       )}
       <QxBaseConditionItem
         key={item.code || key}
-        mode={props.mode}
+        mode={props.mode || 'condition'}
         {...item}
         value={Object.assign(
           {},
@@ -59,6 +63,7 @@ export const QxBaseCondition: React.FC<QxBaseConditionProps> = (props) => {
         nodes={props.nodes}
         node={props.node}
         field={item}
+        subset={props.subset}
         onChange={(val) => handleItemChange(val, key)}
         remove={() => handleDelete(key)}
       />
@@ -74,11 +79,12 @@ export const QxBaseCondition: React.FC<QxBaseConditionProps> = (props) => {
 
 export interface QxBaseConditionField {
   field: string;
-  fieldType: string;
+  fieldType: keyof typeof FieldBaseType;
   fieldName: string;
   fieldGroupType: string;
   qxProps?: string;
-  extract?: any;
+  extract: any;
+  params?: any
 }
 
 export interface QxBaseConditionOptionsProps extends QxBaseConditionField {
@@ -96,6 +102,7 @@ export interface QxBaseConditionProps {
   options: QxBaseConditionOptionsProps[];
   value: any[];
   onChange?: (val: any[]) => void;
-  nodes?: INode[]
-  node?: INode
+  nodes?: INode[];
+  node?: INode;
+  subset?: boolean;
 }

@@ -80,6 +80,7 @@ export const AddressSetter: React.FC<InputSetterProps> = ({ value, onChange, ...
               closable
               onClose={(e) => removeItem(e, item)}
               onClick={(e) => e.stopPropagation()}
+              bordered={false}
             >
               {/*// @ts-ignore*/}
               {props.getName && props.getName([item])}
@@ -95,6 +96,7 @@ export const AddressSetter: React.FC<InputSetterProps> = ({ value, onChange, ...
           placeholder="请选择"
           disabled={props.disabled}
           onChange={handleManualChange}
+          schema={{}}
         />
       )}
     </>

@@ -76,6 +76,7 @@ export const InputSetter: React.FC<InputSetterProps> = ({ value, onChange, ...pr
               title={props.getCompleteName && props.getCompleteName([item])}
               onClose={(e) => removeItem(e, item)}
               onClick={(e) => e.stopPropagation()}
+              bordered={false}
             >
               {props.getName && props.getName([item])}
             </Tag>

@@ -217,6 +217,7 @@ export const OrgSetter: React.FC<OrgSetterProps> = ({
                 closable
                 onClose={(e) => removeItem(e, id)}
                 onClick={(e) => e.stopPropagation()}
+                bordered={false}
               >
                 {valueMap[id]}
               </Tag>

@@ -265,6 +265,7 @@ export const RelSetter: React.FC<UserSelectProps> = ({
             closable
             onClose={(e) => removeItem(e, item.value)}
             onClick={(e) => e.stopPropagation()}
+            bordered={false}
           >
             {valueMap[item.value]}
           </Tag>

@@ -287,6 +287,7 @@ export const RelTreeSetter: React.FC<UserSelectProps> = ({
             closable
             onClose={(e) => removeItem(e, item.value)}
             onClick={(e) => e.stopPropagation()}
+            bordered={false}
           >
             {valueMap[item.value]}
           </Tag>

@@ -219,6 +219,7 @@ export const UserSetter: React.FC<UserSelectProps> = ({
                 closable
                 onClose={(e) => removeItem(e, id)}
                 onClick={(e) => e.stopPropagation()}
+                bordered={false}
               >
                 {valueMap[id]}
               </Tag>

@@ -3,7 +3,7 @@ import { QxWidgetIcon } from '@qx/common';
 import { Collapse, Dropdown, Empty, Tag } from 'antd';
 import cls from 'classnames';
 import { cloneDeep } from 'lodash-es';
-import React, { useEffect, useMemo, useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import { QxBaseIcon } from '../qx-base-icon';
 import { request } from '../utils';
 import './index.less';
@@ -68,6 +68,8 @@ interface NodeFieldDisPlay {
   node?: INode;
   nodes?: INode[];
   limitTypes?: string[];
+  value?: string;
+  subset?: boolean;
 }
 
 const icon = (icon: any) => {
@@ -85,52 +87,18 @@ export const useNodeFieldDisplay = ({
   node,
   nodes,
   limitTypes,
+  value,
+  subset = true,
 }: NodeFieldDisPlay) => {
-  const sourceParentNodes =
+  const sourceParentNodes = cloneDeep(
     getParentNodes(node, nodes).filter(
       (node) => !['default_DF_BRANCH'].includes(node.type),
-    ) || [];
-
-  const optionalNodes = useMemo(() => {
-    const targetParentNodes = cloneDeep(sourceParentNodes);
-    if (!limitTypes) return targetParentNodes;
-
-    function getEffectiveNodes(nodes: INode[]) {
-      return nodes.reduce<INode[]>((pre, cur) => {
-        const curNode = cur;
-
-        if (Array.isArray(curNode.data?.result)) {
-          const resultNodes = (curNode.data.result as FiledType[]).filter(
-            (i) => {
-              if (i.child && Array.isArray(i.child)) {
-                // eslint-disable-next-line @typescript-eslint/no-use-before-define
-                i.child = getEffectiveResult(i.child);
-              }
-              return limitTypes!.includes(i.type);
-            },
-          );
-
-          if (resultNodes?.length) {
-            curNode.data.result = resultNodes;
-            pre.push(curNode);
-          }
-        }
-
-        return pre;
-      }, []);
-    }
-
-    function getEffectiveResult(result: FiledType[]) {
-      return result.filter((item) => {
-        if (item.child && Array.isArray(item.child)) {
-          item.child = getEffectiveResult(item.child);
-        }
-        return limitTypes?.includes(item.fieldType);
-      });
-    }
+    ) || [],
+  );
 
-    return getEffectiveNodes(targetParentNodes);
-  }, [limitTypes, sourceParentNodes]);
+  // const [targetParentNodes, setTargetParentNodes] = useState(sourceParentNodes)
+  const [inputDisplay, setInputDisplay] = useState<React.ReactNode>();
+  const [optionalNodes, setOptionalNodes] = useState<INode[]>([]); // 根据 fieldType 过滤后的 nodes
 
   const getId = (val?: string) => {
     if (!val) return;
@@ -150,11 +118,12 @@ export const useNodeFieldDisplay = ({
     let index = 0;
     while (n && index <= 20) {
       displayConfig = [];
-      const curNode = optionalNodes[index] || {};
+      // eslint-disable-next-line @typescript-eslint/no-use-before-define
+      const curNode = cloneDeep(optionalNodes[index]) || {};
       displayConfig.push({
         title: curNode.name,
         icon: curNode.icon,
-        ...(optionalNodes[index] || {}),
+        ...curNode,
       });
       // eslint-disable-next-line @typescript-eslint/no-use-before-define
       recursionNodeResult(curNode.data?.result);
@@ -187,20 +156,13 @@ export const useNodeFieldDisplay = ({
     return (
       <>
         {displayConfig?.map((item, idx) => (
-          <div
-            key={idx}
-            className='qx-node-select-input__content-item'
-          >
+          <div key={idx} className="qx-node-select-input__content-item">
             {item.icon && (
-              <span
-                className='qx-node-select-input__content-item__icon'
-              >
+              <span className="qx-node-select-input__content-item__icon">
                 {icon(item.icon)}
               </span>
             )}
-            <span
-              className='qx-node-select-input__content-item__text'
-            >
+            <span className="qx-node-select-input__content-item__text">
               {item.type &&
                 FileTypeMap[item.type] &&
                 !item.icon &&
@@ -208,9 +170,7 @@ export const useNodeFieldDisplay = ({
               {item.title}
             </span>
             {idx !== displayConfig.length - 1 && (
-              <span
-                className='qx-node-select-input__content-item__arrow'
-              >
+              <span className="qx-node-select-input__content-item__arrow">
                 <svg
                   xmlns="http://www.w3.org/2000/svg"
                   width="1em"
@@ -227,9 +187,137 @@ export const useNodeFieldDisplay = ({
     );
   };
 
+  const renderInputDisplay = (val: string = value || '') => {
+    setInputDisplay(
+      <Tag bordered={false} className="qx-node-select-input__content">
+        {genDisplayDom(val)}
+      </Tag>,
+    );
+  };
+
+  /***
+   * 查找有 formId 的 result
+   */
+  const findResultByFormId = () => {
+    const forms: FiledType[] = [];
+    sourceParentNodes.forEach((node) => {
+      if (Array.isArray(node.data?.result)) {
+        // eslint-disable-next-line @typescript-eslint/no-use-before-define
+        recursionNodeResult(node.data?.result);
+      }
+    });
+
+    function recursionNodeResult(result: FiledType[] | FiledType) {
+      if (!Array.isArray(result) && result) {
+        if (result.qxProps && result.qxProps?.formId) {
+          forms.push(result);
+        }
+      }
+      if (Array.isArray(result)) {
+        result.forEach((i) => {
+          if (i.qxProps && i.qxProps?.formId) {
+            forms.push(i);
+          } else if (i.child) {
+            recursionNodeResult(i.child);
+          }
+        });
+      }
+    }
+
+    return forms;
+  };
+
+  /**
+   * 查询所有 formId 的字段，并给 result 添加 child
+   */
+  const handleGetAppsFields = async () => {
+    const forms = findResultByFormId();
+    const ids = forms.map((item) => item.qxProps?.formId);
+    if (Array.isArray(ids) && ids.length && subset) {
+      try {
+        const data = await getAppsFields(ids as any[]);
+        Object.keys(data).forEach((id) => {
+          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;
+          }
+        });
+        // console.log(2222222, targetParentNodes, forms);
+      } catch (error) {
+        // appsFields = {};
+      } finally {
+        renderInputDisplay();
+      }
+    }
+    return sourceParentNodes;
+  };
+
+  const getOptionalNodes = async () => {
+    const targetParentNodes = await handleGetAppsFields();
+    if (!limitTypes) return setOptionalNodes(targetParentNodes);
+
+    function getEffectiveResult(result: FiledType[]) {
+      const newResult = [];
+      for (let i = 0; i < result.length; i++) {
+        const resultItem = result[i] || {};
+        if (resultItem.child) {
+          resultItem.child = getEffectiveResult(resultItem.child);
+          if (
+            (Array.isArray(resultItem.child) && resultItem.child.length) ||
+            limitTypes?.includes(resultItem.type)
+          ) {
+            newResult.push(resultItem);
+          }
+        } else if (limitTypes?.includes(resultItem.type)) {
+          newResult.push(resultItem);
+        }
+      }
+
+      return newResult;
+    }
+
+    function getEffectiveNodes(nodes: INode[]) {
+      for (let i = 0; i <= nodes.length; i++) {
+        const node = nodes[i] || {};
+        const nodeResult = node.data?.result;
+        if (Array.isArray(nodeResult) && nodeResult.length) {
+          node.data.result = getEffectiveResult(nodeResult);
+        }
+      }
+
+      return nodes;
+    }
+
+    const newNodes = getEffectiveNodes(targetParentNodes);
+    setOptionalNodes([...newNodes]);
+  };
+
+  useEffect(() => {
+    getOptionalNodes();
+  }, []);
+
   return {
     genDisplayDom,
     optionalNodes,
+    // targetParentNodes,
+    renderInputDisplay,
+    inputDisplay,
   };
 };
 
@@ -266,7 +354,7 @@ const SelectItem = (props: any) => {
     );
   }
 
-  if (!props.child) {
+  if (!props.child || !props.child.length) {
     return (
       <div
         className={cls('qx-node-select-item')}
@@ -317,14 +405,10 @@ export const QxFlowNodeFieldSelector: React.FC<NodeFieldSelectProps> = (
 
   const [visible, setVisible] = useState(false);
 
-  const [inputDisplay, setInputDisplay] = useState<React.ReactNode>();
-
-  const { optionalNodes, genDisplayDom } = useNodeFieldDisplay(props);
+  const { optionalNodes, renderInputDisplay, inputDisplay } =
+    useNodeFieldDisplay(props);
 
   const getOptions = () => {
-    if (!optionalNodes.length) {
-      return <Empty />;
-    }
     return optionalNodes.map((node) => ({
       label: (
         <div className={cls('qx-node-select-dropdown-header')}>
@@ -352,96 +436,6 @@ export const QxFlowNodeFieldSelector: React.FC<NodeFieldSelectProps> = (
     }));
   };
 
-  const getForms = () => {
-    const forms: FiledType[] = [];
-    optionalNodes.forEach((node) => {
-      if (Array.isArray(node.data?.result)) {
-        // eslint-disable-next-line @typescript-eslint/no-use-before-define
-        recursionNodeResult(node.data?.result);
-      }
-    });
-
-    function recursionNodeResult(result: FiledType[] | FiledType) {
-      if (!Array.isArray(result) && result) {
-        if (result.qxProps && result.qxProps?.formId) {
-          forms.push(result);
-        }
-      }
-      if (Array.isArray(result)) {
-        result.forEach((i) => {
-          if (i.qxProps && i.qxProps?.formId) {
-            forms.push(i);
-          } else if (i.child) {
-            recursionNodeResult(i.child);
-          }
-        });
-      }
-    }
-
-    return forms;
-  };
-
-  const renderInputDisplay = (val: string = props.value || '') => {
-    setInputDisplay(
-      <Tag bordered={false} className="qx-node-select-input__content">
-        {genDisplayDom(val)}
-      </Tag>,
-    );
-  };
-
-  const handleGetAppsFields = async () => {
-    const forms = getForms();
-    const ids = forms.map(
-      (item) => item.qxProps?.formId && !props.limitTypes?.includes(item.type),
-    );
-    console.log(ids, 'ids')
-    if (Array.isArray(ids) && ids.length) {
-      try {
-        const data = await getAppsFields(ids as any[]);
-        Object.keys(data).forEach((id) => {
-          forms.forEach((i) => {
-            if (i.qxProps?.formId === id) {
-              if (Array.isArray(i.child)) {
-                i.child.push(
-                  data[id].map((item: FiledType) => ({
-                    icon: (
-                      <span className="qx-node-select-item__icon">
-                        <QxWidgetIcon
-                          widgetName={item.extract?.widget || 'qxInput'}
-                        />
-                      </span>
-                    ),
-                    title: item.name,
-                    code: item.code,
-                    id: item.code,
-                    type: item.extract?.fieldType,
-                  })),
-                );
-              } else {
-                i.child = data[id].map((item: FiledType) => ({
-                  icon: (
-                    <span className="qx-node-select-item__icon">
-                      <QxWidgetIcon
-                        widgetName={item.extract?.widget || 'qxInput'}
-                      />
-                    </span>
-                  ),
-                  title: item.name,
-                  code: item.code,
-                  id: item.code,
-                  type: item.extract?.fieldType,
-                }));
-              }
-            }
-          });
-        });
-        renderInputDisplay();
-      } catch (error) {
-        // appsFields = {};
-      }
-    }
-  };
-
   const handleItemClick = (nodeKey: string, item: any) => {
     const newValue = '${' + `${nodeKey}|${item.id}` + '}';
     props.onChange?.(newValue, item);
@@ -452,23 +446,27 @@ export const QxFlowNodeFieldSelector: React.FC<NodeFieldSelectProps> = (
   };
 
   useEffect(() => {
-    handleGetAppsFields();
-  }, []);
-
-  useEffect(() => {
     setVisible(props.open ?? false);
   }, [props.open]);
 
+  const dropdownRender = () => {
+    const items = getOptions();
+    if (Array.isArray(items) && items.length) {
+      return <Collapse ghost expandIconPosition="end" items={items} />;
+    } else {
+      return <Empty />;
+    }
+  };
+
   return (
     <div className={cls('qx-node-select')}>
       <Dropdown
+        destroyPopupOnHide
         trigger={['click']}
         overlayStyle={{ width: `${props?.width}px` }}
         overlayClassName={cls('qx-node-select-dropdown')}
         open={visible}
-        dropdownRender={() => (
-          <Collapse ghost expandIconPosition="end" items={getOptions()} />
-        )}
+        dropdownRender={dropdownRender}
         onOpenChange={(open) => {
           if (mode === 'select') {
             setVisible(open);
@@ -505,6 +503,7 @@ export interface NodeFieldSelectProps {
   width?: number;
   mode?: 'select' | 'variable';
   open?: boolean;
+  subset?: boolean;
 }
 
 export interface FiledType {