refactor: condition 可选类型

@@ -2,7 +2,7 @@ import { ControlOutlined } from '@ant-design/icons';
 import { Select, Tooltip } from 'antd';
 import { Select, Tooltip } from 'antd';
 import { size } from 'lodash-es';
 import { size } from 'lodash-es';
 import React, { useState } from 'react';
 import React, { useState } from 'react';
-import type { QxBaseConditionField } from '../qx-base-condition';
+import { FieldBaseType, type QxBaseConditionField } from '../qx-base-condition';
 import { QxBaseIcon } from '../qx-base-icon';
 import { QxBaseIcon } from '../qx-base-icon';
 import { QxFieldSetter } from '../qx-field-setter';
 import { QxFieldSetter } from '../qx-field-setter';
 import type { INode } from '../qx-flow-node-selector';
 import type { INode } from '../qx-flow-node-selector';
@@ -15,6 +15,11 @@ import { QxWidgetIcon } from '../qx-widget-icon';
 
 
 import './index.less';
 import './index.less';
 
 
+export const fieldLimitTypes: Record<string, string[]> = {
+  TEXT: [],
+  ENUM: ['TEXT', 'ENUM'],
+};
+
 export const multipleType = [
 export const multipleType = [
   'STRING',
   'STRING',
   'REL_MULTI',
   'REL_MULTI',
@@ -733,10 +738,13 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
     setOpen(false);
     setOpen(false);
   };
   };
 
 
+  const baseType = FieldBaseType[field.extract?.fieldType] || field.extract?.fieldType 
+  const limitTypes = fieldLimitTypes[baseType] ? fieldLimitTypes[baseType] : [baseType]
+
   const { genDisplayDom } = useNodeFieldDisplay({
   const { genDisplayDom } = useNodeFieldDisplay({
     node: node,
     node: node,
     nodes: nodes,
     nodes: nodes,
-    limitTypes: [field.extract?.fieldType],
+    limitTypes,
     value: valuesObj?.value,
     value: valuesObj?.value,
     subset,
     subset,
   });
   });
@@ -829,7 +837,7 @@ export const QxBaseConditionItem: React.FC<QxBaseConditionItemProps> = ({
             open={open}
             open={open}
             value={valuesObj?.value}
             value={valuesObj?.value}
             onChange={handleAssignment}
             onChange={handleAssignment}
-            limitTypes={[field.extract?.fieldType]}
+            limitTypes={limitTypes}
             subset={subset}
             subset={subset}
           >
           >
             {RenderContent}
             {RenderContent}

@@ -8,6 +8,31 @@ export const FieldBaseType = {
   DOUBLE: 'NUM',
   DOUBLE: 'NUM',
   NUMBER: 'NUM',
   NUMBER: 'NUM',
   YEAR_SEC: 'DATE',
   YEAR_SEC: 'DATE',
+  TIME: 'DATE',
+  YEAR: 'DATE',
+  YEAR_MONTH: 'DATE',
+  YEAR_DATE: 'DATE',
+  YEAR_MIN: 'DATE',
+  YEAR_HOUR: 'DATE',
+  HOUR: 'DATE',
+  HOUR_MIN: 'DATE',
+  HOUR_SEC: 'DATE',
+  PERCENT: 'NUM',
+  DECIMAL: 'NUM',
+  /**
+   * 用户
+   */
+  USER: 'USER',
+  /**
+   * 多选用户
+   */
+  USER_MULTI: 'USER',
+  ORG: 'ORG',
+  ORG_MULTI: 'ORG',
+  REL: 'FORM',
+  REL_MULTI: 'FORM',
+  TABLE: 'FORM',
+  TREE: 'FORM',
 };
 };
 
 
 export const QxBaseCondition: React.FC<QxBaseConditionProps> = (props) => {
 export const QxBaseCondition: React.FC<QxBaseConditionProps> = (props) => {

@@ -3,6 +3,7 @@ import { Collapse, Dropdown, Empty, Tag } from 'antd';
 import cls from 'classnames';
 import cls from 'classnames';
 import { cloneDeep } from 'lodash-es';
 import { cloneDeep } from 'lodash-es';
 import React, { useEffect, useState } from 'react';
 import React, { useEffect, useState } from 'react';
+import { FieldBaseType } from '../qx-base-condition';
 import { QxBaseIcon } from '../qx-base-icon';
 import { QxBaseIcon } from '../qx-base-icon';
 import { request } from '../utils';
 import { request } from '../utils';
 import './index.less';
 import './index.less';
@@ -151,11 +152,11 @@ export const useNodeFieldDisplay = ({
       }
       }
     }
     }
 
 
-    return displayConfig
-  }
+    return displayConfig;
+  };
 
 
   const genDisplayDom = (value: string, nodes: INode[] = optionalNodes) => {
   const genDisplayDom = (value: string, nodes: INode[] = optionalNodes) => {
-    const displayConfig = getDisplayConfig(value, nodes)
+    const displayConfig = getDisplayConfig(value, nodes);
     return (
     return (
       <>
       <>
         {displayConfig?.map((item, idx) => (
         {displayConfig?.map((item, idx) => (
@@ -301,7 +302,7 @@ export const useNodeFieldDisplay = ({
       correctionNodeField(targetParentNodes[i].data?.result || []);
       correctionNodeField(targetParentNodes[i].data?.result || []);
     }
     }
 
 
-    if (!limitTypes) {
+    if (!limitTypes || !limitTypes.length) {
       setOptionalNodes(targetParentNodes);
       setOptionalNodes(targetParentNodes);
       renderInputDisplay(targetParentNodes);
       renderInputDisplay(targetParentNodes);
       return;
       return;
@@ -317,11 +318,19 @@ export const useNodeFieldDisplay = ({
           resultItem.child = getEffectiveResult(resultItem.child);
           resultItem.child = getEffectiveResult(resultItem.child);
           if (
           if (
             (Array.isArray(resultItem.child) && resultItem.child.length) ||
             (Array.isArray(resultItem.child) && resultItem.child.length) ||
-            limitTypes?.includes(resultItem.type)
+            limitTypes?.includes(
+              FieldBaseType[resultItem.type as keyof typeof FieldBaseType] ||
+                resultItem.type,
+            )
           ) {
           ) {
             newResult.push(resultItem);
             newResult.push(resultItem);
           }
           }
-        } else if (limitTypes?.includes(resultItem.type)) {
+        } else if (
+          limitTypes?.includes(
+            FieldBaseType[resultItem.type as keyof typeof FieldBaseType] ||
+              resultItem.type,
+          )
+        ) {
           newResult.push(resultItem);
           newResult.push(resultItem);
         }
         }
       }
       }
@@ -479,7 +488,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(optionalNodes ,newValue);
+      renderInputDisplay(optionalNodes, newValue);
     }
     }
     setVisible(false);
     setVisible(false);
   };
   };