pref: 根据antd5 做迭代处理；以及 lodash 全局处理为按需引用

@@ -4,7 +4,7 @@ export default defineConfig({
   apiParser: {},
   apiParser: {},
   outputPath: 'docs-dist',
   outputPath: 'docs-dist',
   themeConfig: {
   themeConfig: {
-    name: '@qx/common ',
+    name: '@qx/common',
   },
   },
   resolve: {
   resolve: {
     // 配置入口文件路径，API 解析将从这里开始
     // 配置入口文件路径，API 解析将从这里开始

@@ -11,6 +11,7 @@
       "dependencies": {
       "dependencies": {
         "@ant-design/icons": "^5.2.5",
         "@ant-design/icons": "^5.2.5",
         "@qx/ui": "0.0.3-beta.1",
         "@qx/ui": "0.0.3-beta.1",
+        "classnames": "^2.3.2",
         "codemirror": "5.65.8",
         "codemirror": "5.65.8",
         "dayjs": "^1.11.9",
         "dayjs": "^1.11.9",
         "lodash-es": "^4.17.21",
         "lodash-es": "^4.17.21",

@@ -49,7 +49,8 @@
     "dayjs": "^1.11.9",
     "dayjs": "^1.11.9",
     "lodash-es": "^4.17.21",
     "lodash-es": "^4.17.21",
     "rc-virtual-list": "^3.4.13",
     "rc-virtual-list": "^3.4.13",
-    "react-codemirror2": "^7.2.1"
+    "react-codemirror2": "^7.2.1",
+    "classnames": "^2.3.2"
   },
   },
   "devDependencies": {
   "devDependencies": {
     "@commitlint/cli": "^17.1.2",
     "@commitlint/cli": "^17.1.2",

 export * from './qx-filter-condition';
 export * from './qx-filter-condition';
 export * from './qx-parameter-setting';
 export * from './qx-parameter-setting';
 export * from './qx-sort-condition';
 export * from './qx-sort-condition';
+export * from './qx-base-icon';
 // export * from './qx-btn';
 // export * from './qx-btn';
 // export { default as FieldSetter } from './qx-field-setter';
 // export { default as FieldSetter } from './qx-field-setter';

-import { DownOutlined, SearchOutlined } from '@ant-design/icons';
+import { DownOutlined } from '@ant-design/icons';
 import {
 import {
   Input,
   Input,
   Menu,
   Menu,
@@ -10,7 +10,7 @@ import {
   // TreeSelect,
   // TreeSelect,
   Typography,
   Typography,
 } from 'antd';
 } from 'antd';
-import _ from 'lodash';
+import { cloneDeep } from 'lodash-es';
 import React, { useEffect, useMemo, useState } from 'react';
 import React, { useEffect, useMemo, useState } from 'react';
 import {
 import {
   getAggreList,
   getAggreList,
@@ -20,6 +20,7 @@ import {
 } from './service';
 } from './service';
 // import { FRWidgetProps } from '@/packages/qx-form-generator/src';
 // import { FRWidgetProps } from '@/packages/qx-form-generator/src';
 import type { ModalProps } from 'antd';
 import type { ModalProps } from 'antd';
+import {QxBaseIcon} from '@qx/common';
 
 
 import './styles.less';
 import './styles.less';
 
 
@@ -80,6 +81,9 @@ export const QxAppSelector: React.FC<QxAppSelectProps> = ({
     const _item = props.item || {};
     const _item = props.item || {};
     let targetItem: any = {};
     let targetItem: any = {};
     getAppList(request, { from: props.from }).then((res: any) => {
     getAppList(request, { from: props.from }).then((res: any) => {
+      if (!res?.length) {
+        return;
+      }
       // eslint-disable-next-line array-callback-return
       // eslint-disable-next-line array-callback-return
       res.map((item: any) => {
       res.map((item: any) => {
         if (item.code === _item['currentId']) {
         if (item.code === _item['currentId']) {
@@ -192,6 +196,9 @@ export const QxAppSelector: React.FC<QxAppSelectProps> = ({
     } else {
     } else {
       if (e.target.value === 'join' && !aggreList.length) {
       if (e.target.value === 'join' && !aggreList.length) {
         getAggreList(request).then((res: any) => {
         getAggreList(request).then((res: any) => {
+          if (!res?.length) {
+            return;
+          }
           // eslint-disable-next-line array-callback-return
           // eslint-disable-next-line array-callback-return
           res.map((item: any) => {
           res.map((item: any) => {
             item.label = item.name;
             item.label = item.name;
@@ -240,7 +247,7 @@ export const QxAppSelector: React.FC<QxAppSelectProps> = ({
 
 
     const filter = (word: string) => {
     const filter = (word: string) => {
       if (list) {
       if (list) {
-        const _data = _.cloneDeep(list);
+        const _data = cloneDeep(list);
         _data.forEach((it: Item) => {
         _data.forEach((it: Item) => {
           it.deleted = !(it.name.indexOf(word) > -1);
           it.deleted = !(it.name.indexOf(word) > -1);
         });
         });
@@ -264,7 +271,7 @@ export const QxAppSelector: React.FC<QxAppSelectProps> = ({
             className={'qx-selector-sub-search'}
             className={'qx-selector-sub-search'}
             placeholder={'输入名称，回车搜索'}
             placeholder={'输入名称，回车搜索'}
             allowClear
             allowClear
-            prefix={<SearchOutlined />}
+            prefix={<QxBaseIcon type={'icon-app-search-line'} />}
             onChange={(e) => {
             onChange={(e) => {
               handleChange(e.target.value);
               handleChange(e.target.value);
             }}
             }}

+@import '~@qx/ui/src/style/variable.less';
+
 .ant-input.select-source {
 .ant-input.select-source {
   display: flex;
   display: flex;
   flex-direction: row;
   flex-direction: row;
@@ -13,7 +15,7 @@
 
 
   > .anticon {
   > .anticon {
     padding: 0 6px;
     padding: 0 6px;
-    color: rgba(0, 0, 0, 25%);
+    color: @N5;
     font-size: 12px;
     font-size: 12px;
   }
   }
 }
 }

+@import '~@qx/ui/src/style/variable.less';
+
 .qx-formula-cm {
 .qx-formula-cm {
   .CodeMirror {
   .CodeMirror {
     height: auto;
     height: auto;
@@ -6,8 +8,8 @@
 }
 }
 
 
 .cm-bg .CodeMirror {
 .cm-bg .CodeMirror {
-  background-color: #f9f9f9 !important;
-  border: 1px solid #e7e6e6;
+  background-color: @N2 !important;
+  border: 1px solid @N4;
 }
 }
 
 
 .qx-copy-send-cm {
 .qx-copy-send-cm {
@@ -22,6 +24,6 @@
   position: absolute;
   position: absolute;
   right: 8px;
   right: 8px;
   bottom: 8px;
   bottom: 8px;
-  color: #bcb9b9;
+  color: @N4;
   font-size: 14px;
   font-size: 14px;
 }
 }

 import React, { useEffect, useState } from 'react';
 import React, { useEffect, useState } from 'react';
 import { UnControlled as CodeMirror } from 'react-codemirror2';
 import { UnControlled as CodeMirror } from 'react-codemirror2';
-import _ from 'lodash';
+import { cloneDeep, flatten, sortBy, size, isEqual, forEach, debounce } from 'lodash-es';
 import type { VariableMappingProps } from '../qx-field-setter';
 import type { VariableMappingProps } from '../qx-field-setter';
 import funObjects from './functions';
 import funObjects from './functions';
 import 'codemirror/lib/codemirror.css';
 import 'codemirror/lib/codemirror.css';
@@ -36,7 +36,7 @@ export type VariableProps = {
  * @param code
  * @param code
  */
  */
 export const getAllVariable = (code: string) => {
 export const getAllVariable = (code: string) => {
-  let codeLocal: string = _.clone(code);
+  let codeLocal: string = cloneDeep(code);
   if (!codeLocal) {
   if (!codeLocal) {
     return [];
     return [];
   }
   }
@@ -126,11 +126,11 @@ const CodeEditor: React.FC<CodeHighLightProps> = ({
   const [isInitDone, setIsInitDone] = useState<boolean>(false);
   const [isInitDone, setIsInitDone] = useState<boolean>(false);
   const [focusFun, setFocusFun] = useState<string>();
   const [focusFun, setFocusFun] = useState<string>();
 
 
-  const funObjs = _.flatten(funObjects.map((item: any) => item.children));
+  const funObjs = flatten(funObjects.map((item: any) => item.children));
   const funObjSimple = {};
   const funObjSimple = {};
   funObjs.map((item) => Object.assign(funObjSimple, { [item.title]: item.title }));
   funObjs.map((item) => Object.assign(funObjSimple, { [item.title]: item.title }));
   // 以变量字符长度排序，确保`DATAIF`比`IF`优先匹配
   // 以变量字符长度排序，确保`DATAIF`比`IF`优先匹配
-  const funObjsSort = _.sortBy(funObjs, function (o) {
+  const funObjsSort = sortBy(funObjs, function (o) {
     return 0 - o.title.length;
     return 0 - o.title.length;
   });
   });
 
 
@@ -141,7 +141,7 @@ const CodeEditor: React.FC<CodeHighLightProps> = ({
         setValueLocal(value);
         setValueLocal(value);
       }
       }
 
 
-      if (_.size(variableObj) > 0) {
+      if (size(variableObj) > 0) {
         setVariableObjLocal(variableObj);
         setVariableObjLocal(variableObj);
       }
       }
     }
     }
@@ -180,7 +180,7 @@ const CodeEditor: React.FC<CodeHighLightProps> = ({
         return;
         return;
       }
       }
 
 
-      const code = _.cloneDeep(editor.getValue());
+      const code = cloneDeep(editor.getValue());
       // 换行分隔
       // 换行分隔
       const codeArr = code.split('\n');
       const codeArr = code.split('\n');
       const variReplace = (cm: any, line: number) => {
       const variReplace = (cm: any, line: number) => {
@@ -276,7 +276,7 @@ const CodeEditor: React.FC<CodeHighLightProps> = ({
     cmUtils.variableRender(editor);
     cmUtils.variableRender(editor);
 
 
     // TODO 默认值bug修复 暂时注释
     // TODO 默认值bug修复 暂时注释
-    // const isSame = _.isEqual(valueLocal, val);
+    // const isSame = isEqual(valueLocal, val);
     // if (isSame) {
     // if (isSame) {
     //   return;
     //   return;
     // }
     // }
@@ -310,7 +310,7 @@ const CodeEditor: React.FC<CodeHighLightProps> = ({
     let flag: boolean = false;
     let flag: boolean = false;
     let funName: string = '';
     let funName: string = '';
 
 
-    _.forEach(funObjsSort, (v) => {
+    forEach(funObjsSort, (v) => {
       if (flag) {
       if (flag) {
         return;
         return;
       }
       }
@@ -351,7 +351,7 @@ const CodeEditor: React.FC<CodeHighLightProps> = ({
           // 滚动（false，默认）或自动换行
           // 滚动（false，默认）或自动换行
           lineWrapping: true,
           lineWrapping: true,
         }}
         }}
-        onChange={_.debounce(onValueChange, 300)}
+        onChange={debounce(onValueChange, 300)}
         onCursor={(editor) => {
         onCursor={(editor) => {
           const funName = findFocusFun(editor);
           const funName = findFocusFun(editor);
           setFocusFun(funName);
           setFocusFun(funName);

@@ -31,7 +31,7 @@
     cursor: pointer;
     cursor: pointer;
 
 
     &:hover {
     &:hover {
-      background-color: @item-hover-bg;
+      background-color: @N3;
     }
     }
   }
   }
 }
 }
@@ -44,7 +44,7 @@
   &.ant-menu-inline > .ant-menu-submenu > .ant-menu-submenu-title {
   &.ant-menu-inline > .ant-menu-submenu > .ant-menu-submenu-title {
     margin-top: 0;
     margin-top: 0;
     margin-bottom: 1px;
     margin-bottom: 1px;
-    background-color: #fafafa;
+    background-color: @N2;
   }
   }
 
 
   .ant-menu-sub.ant-menu-inline {
   .ant-menu-sub.ant-menu-inline {
@@ -59,7 +59,7 @@
 
 
     &:hover {
     &:hover {
       color: inherit;
       color: inherit;
-      background-color: @item-hover-bg;
+      background-color: @N3;
     }
     }
   }
   }
 
 
@@ -74,5 +74,5 @@
   padding-top: 5px;
   padding-top: 5px;
   padding-bottom: 5px;
   padding-bottom: 5px;
   padding-left: 24px;
   padding-left: 24px;
-  border-top: 1px solid #f0f0f0;
+  border-top: 1px solid @N4;
 }
 }

@@ -5,7 +5,7 @@ import type { ReactElement } from 'react';
 import { useEffect, useState } from 'react';
 import { useEffect, useState } from 'react';
 import QxFieldItem from '../qx-field/src/item';
 import QxFieldItem from '../qx-field/src/item';
 import { useDebounceFn } from 'ahooks';
 import { useDebounceFn } from 'ahooks';
-import _ from 'lodash';
+import { isEmpty } from 'lodash-es';
 import { QxBaseIcon } from '../qx-base-icon';
 import { QxBaseIcon } from '../qx-base-icon';
 import './index.less';
 import './index.less';
 
 
@@ -100,7 +100,7 @@ export const QxFieldPopover: React.FC<QxFieldPopoverProp> = (props) => {
     });
     });
   };
   };
   useEffect(() => {
   useEffect(() => {
-    if (!_.isEmpty(props.data)) {
+    if (!isEmpty(props.data)) {
       const _fields = excludeFields(props.data);
       const _fields = excludeFields(props.data);
       setFields(_fields);
       setFields(_fields);
       setFilterFields(_fields);
       setFilterFields(_fields);
@@ -316,10 +316,9 @@ export const QxFieldPopover: React.FC<QxFieldPopoverProp> = (props) => {
       // getPopupContainer={(triggerNode) => triggerNode}
       // getPopupContainer={(triggerNode) => triggerNode}
       content={fieldsPopContent()}
       content={fieldsPopContent()}
       placement={'bottomRight'}
       placement={'bottomRight'}
-      // TODO 默认hover改成click 因为个别电脑输入法 输入会触发气泡的失焦事件 弹框消失
-      trigger={props.disabled ? '' : props.trigger || 'click'}
-      visible={visible}
-      onVisibleChange={(v) => {
+      trigger={props.disabled ? undefined : props.trigger || 'click'}
+      open={visible}
+      onOpenChange={(v) => {
         if (!v) {
         if (!v) {
           setTimeout(() => {
           setTimeout(() => {
             setKeyword('');
             setKeyword('');

@@ -194,10 +194,10 @@ export const OrgSetter: React.FC<OrgSetterProps> = ({
         overlayClassName={'qx-pop-select'}
         overlayClassName={'qx-pop-select'}
         getPopupContainer={(triggerNode) => triggerNode}
         getPopupContainer={(triggerNode) => triggerNode}
         arrowContent={false}
         arrowContent={false}
-        visible={popVisible}
-        onVisibleChange={handlePopVisibleChange}
+        open={popVisible}
+        onOpenChange={handlePopVisibleChange}
         placement="bottom"
         placement="bottom"
-        trigger={disabled ? '' : 'click'}
+        trigger={disabled ? undefined : 'click'}
       >
       >
         <div
         <div
           style={style || {}}
           style={style || {}}

 import React, { useEffect, useState, useMemo, useRef } from 'react';
 import React, { useEffect, useState, useMemo, useRef } from 'react';
 import { Input, Cascader } from 'antd';
 import { Input, Cascader } from 'antd';
 import { getDictDetail } from '../service';
 import { getDictDetail } from '../service';
-import _ from 'lodash';
+import { cloneDeep, isEqual, isEmpty } from 'lodash-es';
 
 
 export interface FRWidgetProps {
 export interface FRWidgetProps {
   title?: string;
   title?: string;
@@ -96,7 +96,7 @@ const QxAddress: React.FC<FRWidgetProps> = (props) => {
     // eslint-disable-next-line @typescript-eslint/no-shadow
     // eslint-disable-next-line @typescript-eslint/no-shadow
     const options: any = [];
     const options: any = [];
     Object.keys(opArr).forEach((key) => {
     Object.keys(opArr).forEach((key) => {
-      let num = _.cloneDeep(level);
+      let num = cloneDeep(level);
       const option: any = {
       const option: any = {
         value: opArr[key].value,
         value: opArr[key].value,
         label: opArr[key].label,
         label: opArr[key].label,
@@ -142,10 +142,10 @@ const QxAddress: React.FC<FRWidgetProps> = (props) => {
       _localCasValue = [];
       _localCasValue = [];
       _localTextValue = '';
       _localTextValue = '';
     }
     }
-    if (!_.isEqual(_localCasValue, localCasValue)) {
+    if (!isEqual(_localCasValue, localCasValue)) {
       setLocalCasValue(_localCasValue);
       setLocalCasValue(_localCasValue);
     }
     }
-    if (!_.isEqual(_localTextValue, localTextValue)) {
+    if (!isEqual(_localTextValue, localTextValue)) {
       setLocalTextValue(_localTextValue);
       setLocalTextValue(_localTextValue);
     }
     }
   }, [props.value]);
   }, [props.value]);
@@ -191,10 +191,10 @@ const QxAddress: React.FC<FRWidgetProps> = (props) => {
 
 
   const handleChange = (changeObj: any) => {
   const handleChange = (changeObj: any) => {
     const newObj = { localCasValue, localTextValue, ...changeObj };
     const newObj = { localCasValue, localTextValue, ...changeObj };
-    if (!_.isEqual(localCasValue, newObj.localCasValue)) {
+    if (!isEqual(localCasValue, newObj.localCasValue)) {
       setLocalCasValue(newObj.localCasValue);
       setLocalCasValue(newObj.localCasValue);
     }
     }
-    if (!_.isEqual(localTextValue, newObj.localTextValue)) {
+    if (!isEqual(localTextValue, newObj.localTextValue)) {
       setLocalTextValue(newObj.localTextValue);
       setLocalTextValue(newObj.localTextValue);
     }
     }
 
 
@@ -248,7 +248,7 @@ const QxAddress: React.FC<FRWidgetProps> = (props) => {
         />
         />
         {detail ? (
         {detail ? (
           <Input
           <Input
-            disabled={props.disabled || _.isEmpty(localCasValue) || isDisabled}
+            disabled={props.disabled || isEmpty(localCasValue) || isDisabled}
             //  defaultValue={finalProps.textDefaultValue}
             //  defaultValue={finalProps.textDefaultValue}
             value={localTextValue}
             value={localTextValue}
             style={{ marginTop: '10px' }}
             style={{ marginTop: '10px' }}

 import React, { useEffect, useState } from 'react';
 import React, { useEffect, useState } from 'react';
 import { Empty, Input, List, Modal, Tag } from 'antd';
 import { Empty, Input, List, Modal, Tag } from 'antd';
-import { CheckOutlined, CloseOutlined, SearchOutlined } from '@ant-design/icons';
+import { CheckOutlined, CloseOutlined } from '@ant-design/icons';
 import { getPreviewSelect, getSelect } from '../service';
 import { getPreviewSelect, getSelect } from '../service';
 import VirtualList from 'rc-virtual-list';
 import VirtualList from 'rc-virtual-list';
 import { ParamValueType } from '../../qx-filter-condition/filter';
 import { ParamValueType } from '../../qx-filter-condition/filter';
@@ -14,6 +14,7 @@ interface UserSelectProps {
   getName: (str: string[]) => string;
   getName: (str: string[]) => string;
   modalClassName?: string | undefined; // 弹框类名自定义 用于自定义以及覆盖样式
   modalClassName?: string | undefined; // 弹框类名自定义 用于自定义以及覆盖样式
 }
 }
+import {QxBaseIcon} from '@qx/common';
 
 
 const CONTAINER_HEIGHT = 300;
 const CONTAINER_HEIGHT = 300;
 
 
@@ -273,8 +274,8 @@ export const RelSetter: React.FC<UserSelectProps> = ({
         title="选择"
         title="选择"
         width={'640px'}
         width={'640px'}
         className={'qx-table-selector'}
         className={'qx-table-selector'}
-        visible={visible}
-        destroyOnClose={true}
+        open={visible}
+        destroyOnClose
         onOk={handleOk}
         onOk={handleOk}
         onCancel={handleCancel}
         onCancel={handleCancel}
         wrapClassName={props?.modalClassName || ''}
         wrapClassName={props?.modalClassName || ''}
@@ -285,7 +286,7 @@ export const RelSetter: React.FC<UserSelectProps> = ({
               className={'qx-selector-sub-search'}
               className={'qx-selector-sub-search'}
               placeholder={'输入关键字，回车搜索'}
               placeholder={'输入关键字，回车搜索'}
               allowClear
               allowClear
-              prefix={<SearchOutlined />}
+              prefix={<QxBaseIcon type={'icon-app-search-line'} />}
               onChange={handleChange}
               onChange={handleChange}
               onPressEnter={(e) => {
               onPressEnter={(e) => {
                 handleSearch(e);
                 handleSearch(e);

 import React, { useCallback, useEffect, useState } from 'react';
 import React, { useCallback, useEffect, useState } from 'react';
 import { Empty, Input, Modal, Spin, Tag, Tree } from 'antd';
 import { Empty, Input, Modal, Spin, Tag, Tree } from 'antd';
-import { CloseOutlined, SearchOutlined } from '@ant-design/icons';
+import { CloseOutlined } from '@ant-design/icons';
 import { getPreviewSelect, getSelect } from '../service';
 import { getPreviewSelect, getSelect } from '../service';
 import { ParamValueType } from '../../qx-filter-condition/filter';
 import { ParamValueType } from '../../qx-filter-condition/filter';
+import {QxBaseIcon} from '@qx/common';
 
 
 interface UserSelectProps {
 interface UserSelectProps {
   value?: string[];
   value?: string[];
@@ -295,8 +296,8 @@ export const RelTreeSetter: React.FC<UserSelectProps> = ({
         title="选择"
         title="选择"
         width={'640px'}
         width={'640px'}
         className={'qx-table-selector'}
         className={'qx-table-selector'}
-        visible={visible}
-        destroyOnClose={true}
+        open={visible}
+        destroyOnClose
         onOk={handleOk}
         onOk={handleOk}
         onCancel={handleCancel}
         onCancel={handleCancel}
         wrapClassName={props?.modalClassName || ''}
         wrapClassName={props?.modalClassName || ''}
@@ -307,7 +308,7 @@ export const RelTreeSetter: React.FC<UserSelectProps> = ({
             style={{ borderBottom: '1px solid #f0f0f0' }}
             style={{ borderBottom: '1px solid #f0f0f0' }}
             placeholder={'请输入关键字，按回车键搜索'}
             placeholder={'请输入关键字，按回车键搜索'}
             allowClear
             allowClear
-            prefix={<SearchOutlined />}
+            prefix={<QxBaseIcon type={'icon-app-search-line'} />}
             onChange={(e) => {
             onChange={(e) => {
               handleChange(e);
               handleChange(e);
             }}
             }}

@@ -196,10 +196,10 @@ export const UserSetter: React.FC<UserSelectProps> = ({
         overlayClassName={'qx-pop-select'}
         overlayClassName={'qx-pop-select'}
         getPopupContainer={(triggerNode) => triggerNode}
         getPopupContainer={(triggerNode) => triggerNode}
         arrowContent={false}
         arrowContent={false}
-        visible={popVisible}
-        onVisibleChange={handlePopVisibleChange}
+        open={popVisible}
+        onOpenChange={handlePopVisibleChange}
         placement="bottom"
         placement="bottom"
-        trigger={disabled ? '' : 'click'}
+        trigger={disabled ? undefined : 'click'}
       >
       >
         <div
         <div
           style={style || {}}
           style={style || {}}

@@ -14,7 +14,7 @@ import moment from 'dayjs';
 import type { MappingValueProps } from '../qx-filter-condition/filter';
 import type { MappingValueProps } from '../qx-filter-condition/filter';
 import CodeEditor, { getAllVariable, VariableProps } from '../qx-code-editor';
 import CodeEditor, { getAllVariable, VariableProps } from '../qx-code-editor';
 import { CloseOutlined, ControlOutlined, RightOutlined } from '@ant-design/icons';
 import { CloseOutlined, ControlOutlined, RightOutlined } from '@ant-design/icons';
-import _ from 'lodash';
+import { cloneDeep, isEqual, isEmpty, findIndex, size } from 'lodash-es';
 import { RelTreeSetter } from './components/rel-tree-setter';
 import { RelTreeSetter } from './components/rel-tree-setter';
 import { AddressSetter } from './components/address-setter';
 import { AddressSetter } from './components/address-setter';
 import {QxFieldPopover} from '../qx-field-popover';
 import {QxFieldPopover} from '../qx-field-popover';
@@ -185,11 +185,11 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
   const currentElem = useRef<any>();
   const currentElem = useRef<any>();
   const [valueLocal, setValueLocal] = useState<MappingValueProps[]>();
   const [valueLocal, setValueLocal] = useState<MappingValueProps[]>();
   useEffect(() => {
   useEffect(() => {
-    setValueLocal(_.cloneDeep(value));
+    setValueLocal(cloneDeep(value));
   }, [JSON.stringify(value)]);
   }, [JSON.stringify(value)]);
 
 
   useEffect(() => {
   useEffect(() => {
-    const isSame = _.isEqual(value, valueLocal);
+    const isSame = isEqual(value, valueLocal);
     if (!valueLocal || isSame) {
     if (!valueLocal || isSame) {
       if (props.formula === 'MOD' && (valueLocal || []).length > 2) {
       if (props.formula === 'MOD' && (valueLocal || []).length > 2) {
         onChange((valueLocal || []).slice(0, 2));
         onChange((valueLocal || []).slice(0, 2));
@@ -290,7 +290,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
     index?: number,
     index?: number,
     isReplace?: boolean,
     isReplace?: boolean,
   ) => {
   ) => {
-    const valCp: string[] = _.cloneDeep(val);
+    const valCp: string[] = cloneDeep(val);
     let valueFin: string[] = valCp;
     let valueFin: string[] = valCp;
     if (isMultiTag) {
     if (isMultiTag) {
       if (Boolean(isReplace)) {
       if (Boolean(isReplace)) {
@@ -313,14 +313,14 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
     }
     }
 
 
     if (isRange) {
     if (isRange) {
-      const oldVal = _.cloneDeep(valueLocal || []).map((v) => v.value) || [];
-      oldVal[index || 0] = _.cloneDeep(valueFin)[0];
+      const oldVal = cloneDeep(valueLocal || []).map((v) => v.value) || [];
+      oldVal[index || 0] = cloneDeep(valueFin)[0];
       valueFin = oldVal;
       valueFin = oldVal;
     }
     }
     const mappingValuesNew: MappingValueProps[] = [];
     const mappingValuesNew: MappingValueProps[] = [];
     (valueFin || []).map((v: string) => {
     (valueFin || []).map((v: string) => {
       if (isMultiTag) {
       if (isMultiTag) {
-        const i = _.findIndex(mappingValuesNew, (o: any) => {
+        const i = findIndex(mappingValuesNew, (o: any) => {
           return o.type === valueType && o.value === v;
           return o.type === valueType && o.value === v;
         });
         });
         if (i > -1) {
         if (i > -1) {
@@ -342,7 +342,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
 
 
   const onFilterExtValueChange = (val: any) => {
   const onFilterExtValueChange = (val: any) => {
     setValueLocal((prevState) => {
     setValueLocal((prevState) => {
-      const valCp = _.cloneDeep(prevState);
+      const valCp = cloneDeep(prevState);
       if (valCp && valCp?.length > 0) {
       if (valCp && valCp?.length > 0) {
         valCp[0].extVal = val || '';
         valCp[0].extVal = val || '';
       }
       }
@@ -580,7 +580,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
    * @param type
    * @param type
    */
    */
   function getMappingValues(mValues: MappingValueProps[], type?: ParamValueType) {
   function getMappingValues(mValues: MappingValueProps[], type?: ParamValueType) {
-    if (!mValues || _.size(mValues) === 0) {
+    if (!mValues || size(mValues) === 0) {
       return [];
       return [];
     }
     }
     if (type) {
     if (type) {
@@ -592,7 +592,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
   }
   }
 
 
   function getMappingExtValue(mValues: MappingValueProps[], type?: ParamValueType) {
   function getMappingExtValue(mValues: MappingValueProps[], type?: ParamValueType) {
-    if (!mValues || _.size(mValues) === 0) {
+    if (!mValues || size(mValues) === 0) {
       return [];
       return [];
     }
     }
     if (type) {
     if (type) {
@@ -767,7 +767,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
   );
   );
 
 
   // "值选项集"按查询参数对应类型过滤
   // "值选项集"按查询参数对应类型过滤
-  const colsTreeCurr = _.cloneDeep(colsTree);
+  const colsTreeCurr = cloneDeep(colsTree);
   // 是人员、组织、日期类型时，按类型过滤数据
   // 是人员、组织、日期类型时，按类型过滤数据
   let colsTreeProps = colsTreeCurr || [];
   let colsTreeProps = colsTreeCurr || [];
   // 类型匹配处理，当前为只列出类型相同的属性 todo
   // 类型匹配处理，当前为只列出类型相同的属性 todo
@@ -776,7 +776,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
   }
   }
 
 
   // 禁用选项
   // 禁用选项
-  if (excludeKeys && _.size(excludeKeys) > 0) {
+  if (excludeKeys && size(excludeKeys) > 0) {
     colsTreeProps = colsTreeProps?.filter((co: ColsTreeProps) => excludeKeys.includes(co.key));
     colsTreeProps = colsTreeProps?.filter((co: ColsTreeProps) => excludeKeys.includes(co.key));
     colsTreeProps.map((col) => {
     colsTreeProps.map((col) => {
       col.children = col?.children?.filter((co: ColsTreeProps) => excludeKeys.includes(co.key));
       col.children = col?.children?.filter((co: ColsTreeProps) => excludeKeys.includes(co.key));
@@ -1326,7 +1326,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
                   // 原值类型
                   // 原值类型
                   let valueType: any;
                   let valueType: any;
                   // 查询原值（如果存在于`valueLocal`下）类型
                   // 查询原值（如果存在于`valueLocal`下）类型
-                  const i = _.findIndex(valueLocal, (it) => {
+                  const i = findIndex(valueLocal, (it) => {
                     return it?.value === val[0];
                     return it?.value === val[0];
                   });
                   });
 
 
@@ -1519,7 +1519,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
           }
           }
           placeholder="请输入日期（时间）"
           placeholder="请输入日期（时间）"
           defaultValue={
           defaultValue={
-            !_.isEmpty(getMappingExtValue(valueLocal || [], ParamValueType.MANUAL))
+            !isEmpty(getMappingExtValue(valueLocal || [], ParamValueType.MANUAL))
               ? moment(
               ? moment(
                   getMappingExtValue(valueLocal || [], ParamValueType.MANUAL),
                   getMappingExtValue(valueLocal || [], ParamValueType.MANUAL),
                   formatEnum[
                   formatEnum[
@@ -1533,7 +1533,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
               : undefined
               : undefined
           }
           }
           value={
           value={
-            !_.isEmpty(getMappingExtValue(valueLocal || [], ParamValueType.MANUAL))
+            !isEmpty(getMappingExtValue(valueLocal || [], ParamValueType.MANUAL))
               ? moment(
               ? moment(
                   getMappingExtValue(valueLocal || [], ParamValueType.MANUAL),
                   getMappingExtValue(valueLocal || [], ParamValueType.MANUAL),
                   formatEnum[
                   formatEnum[
@@ -1555,7 +1555,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
           style={{ width: '100%', marginTop: '6px' }}
           style={{ width: '100%', marginTop: '6px' }}
           placeholder="请输入时间"
           placeholder="请输入时间"
           defaultValue={
           defaultValue={
-            !_.isEmpty(getMappingExtValue(valueLocal || [], ParamValueType.MANUAL))
+            !isEmpty(getMappingExtValue(valueLocal || [], ParamValueType.MANUAL))
               ? moment(
               ? moment(
                   getMappingExtValue(valueLocal || [], ParamValueType.MANUAL),
                   getMappingExtValue(valueLocal || [], ParamValueType.MANUAL),
                   formatEnum[
                   formatEnum[
@@ -1569,7 +1569,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
               : undefined
               : undefined
           }
           }
           value={
           value={
-            !_.isEmpty(getMappingExtValue(valueLocal || [], ParamValueType.MANUAL))
+            !isEmpty(getMappingExtValue(valueLocal || [], ParamValueType.MANUAL))
               ? moment(
               ? moment(
                   getMappingExtValue(valueLocal || [], ParamValueType.MANUAL),
                   getMappingExtValue(valueLocal || [], ParamValueType.MANUAL),
                   formatEnum[
                   formatEnum[
@@ -1594,7 +1594,7 @@ export const FieldSetter: React.FC<paramColSelectProps> = ({
           }
           }
           onChange={(date, dateString) => {
           onChange={(date, dateString) => {
             setValueLocal((prevState) => {
             setValueLocal((prevState) => {
-              let valCp: any = _.cloneDeep(prevState);
+              let valCp: any = cloneDeep(prevState);
               if (valCp && valCp?.length > 0) {
               if (valCp && valCp?.length > 0) {
                 valCp[0].value = '__action_time';
                 valCp[0].value = '__action_time';
                 valCp[0].extVal = dateString || '';
                 valCp[0].extVal = dateString || '';

@@ -5,9 +5,9 @@ import { FC, ReactElement, useEffect, useState } from 'react';
 import type { OptionField } from '../type';
 import type { OptionField } from '../type';
 import { getUsefulFieldProp } from '../util';
 import { getUsefulFieldProp } from '../util';
 import QxFieldItem from '../item';
 import QxFieldItem from '../item';
-import { SearchOutlined } from '@ant-design/icons';
 import './style.less';
 import './style.less';
 import Checkbox from 'antd/es/checkbox/Checkbox';
 import Checkbox from 'antd/es/checkbox/Checkbox';
+import {QxBaseIcon} from '@qx/common';
 
 
 interface QxFieldPopoverProp {
 interface QxFieldPopoverProp {
   data: OptionField[];
   data: OptionField[];
@@ -42,7 +42,7 @@ const FieldsCheckboxGroup: FC<FieldsCheckboxGroupProps> = (props) => {
         className={'qx-selector-sub-search'}
         className={'qx-selector-sub-search'}
         placeholder={'请输入字段名'}
         placeholder={'请输入字段名'}
         allowClear
         allowClear
-        prefix={<SearchOutlined />}
+        prefix={<QxBaseIcon type={'icon-app-search-line'} />}
         onChange={(e) => {
         onChange={(e) => {
           setKey(e.target.value.trim());
           setKey(e.target.value.trim());
         }}
         }}
@@ -90,6 +90,7 @@ interface QxCheckboxFieldPopoverProp extends QxFieldPopoverProp {
     isChecked: boolean,
     isChecked: boolean,
   ) => void;
   ) => void;
   values?: string[];
   values?: string[];
+  children?: any;
 }
 }
 
 
 const QxCheckboxFieldPopover: React.FC<QxCheckboxFieldPopoverProp> = (props) => {
 const QxCheckboxFieldPopover: React.FC<QxCheckboxFieldPopoverProp> = (props) => {
@@ -131,13 +132,13 @@ const QxCheckboxFieldPopover: React.FC<QxCheckboxFieldPopoverProp> = (props) =>
         <FieldsCheckboxGroup fields={fields} onChange={props.onChange} values={props.values} />
         <FieldsCheckboxGroup fields={fields} onChange={props.onChange} values={props.values} />
       }
       }
       placement={'bottomRight'}
       placement={'bottomRight'}
-      trigger={props.disabled ? '' : props.trigger || 'hover'}
-      visible={visible}
-      onVisibleChange={(v) => {
+      trigger={props.disabled ? undefined : props.trigger || 'hover'}
+      open={visible}
+      onOpenChange={(v) => {
         setVisible(v);
         setVisible(v);
       }}
       }}
     >
     >
-      {props.children}
+      {props?.children}
     </Popover>
     </Popover>
   );
   );
 };
 };

@@ -7,11 +7,10 @@ import type { OptionField } from '../type';
 import { getUsefulFieldProp } from '../util';
 import { getUsefulFieldProp } from '../util';
 // import {flatFields, getUsefulFieldProp} from '../util';
 // import {flatFields, getUsefulFieldProp} from '../util';
 import QxFieldItem from '../item';
 import QxFieldItem from '../item';
-// import classNames from "classnames";
-import { SearchOutlined } from '@ant-design/icons';
+import {QxBaseIcon} from '@qx/common';
 import './style.less';
 import './style.less';
 import { useDebounceFn } from 'ahooks';
 import { useDebounceFn } from 'ahooks';
-import _ from 'lodash';
+import { isEmpty } from 'lodash-es';
 
 
 interface QxFieldPopoverProp {
 interface QxFieldPopoverProp {
   data: OptionField[];
   data: OptionField[];
@@ -55,7 +54,7 @@ const QxFieldPopover: React.FC<QxFieldPopoverProp> = (props) => {
     });
     });
   };
   };
   useEffect(() => {
   useEffect(() => {
-    if (!_.isEmpty(props.data)) {
+    if (!isEmpty(props.data)) {
       const _fields = excludeFields(props.data);
       const _fields = excludeFields(props.data);
       setFields(_fields);
       setFields(_fields);
       setFilterFields(_fields);
       setFilterFields(_fields);
@@ -132,7 +131,7 @@ const QxFieldPopover: React.FC<QxFieldPopoverProp> = (props) => {
               className={'qx-selector-sub-search'}
               className={'qx-selector-sub-search'}
               placeholder={'搜索'}
               placeholder={'搜索'}
               allowClear
               allowClear
-              prefix={<SearchOutlined />}
+              prefix={<QxBaseIcon type={'icon-app-search-line'} />}
               style={{ paddingTop: '6px' }}
               style={{ paddingTop: '6px' }}
               onChange={(e) => {
               onChange={(e) => {
                 handleChange(e.target.value);
                 handleChange(e.target.value);
@@ -242,13 +241,13 @@ const QxFieldPopover: React.FC<QxFieldPopoverProp> = (props) => {
       // getPopupContainer={(triggerNode) => triggerNode}
       // getPopupContainer={(triggerNode) => triggerNode}
       content={fieldsPopContent()}
       content={fieldsPopContent()}
       placement={'bottomRight'}
       placement={'bottomRight'}
-      trigger={props.disabled ? '' : props.trigger || 'hover'}
-      visible={visible}
-      onVisibleChange={(v) => {
+      trigger={props.disabled ? undefined : props.trigger || 'hover'}
+      open={visible}
+      onOpenChange={(v) => {
         setVisible(v);
         setVisible(v);
       }}
       }}
     >
     >
-      {props.children}
+      {props?.children}
     </Popover>
     </Popover>
   );
   );
 };
 };

+@import '~@qx/ui/src/style/variable.less';
+
 .qx-fields-popover {
 .qx-fields-popover {
   padding-top: 0;
   padding-top: 0;
 
 
@@ -22,7 +24,7 @@
     cursor: pointer;
     cursor: pointer;
 
 
     &:hover {
     &:hover {
-      background-color: @item-hover-bg;
+      background-color: @N3;
     }
     }
   }
   }
 }
 }
@@ -35,7 +37,7 @@
   &.ant-menu-inline > .ant-menu-submenu > .ant-menu-submenu-title {
   &.ant-menu-inline > .ant-menu-submenu > .ant-menu-submenu-title {
     margin-top: 0;
     margin-top: 0;
     margin-bottom: 1px;
     margin-bottom: 1px;
-    background-color: #fafafa;
+    background-color: @N2;
   }
   }
 
 
   .ant-menu-sub.ant-menu-inline {
   .ant-menu-sub.ant-menu-inline {
@@ -50,7 +52,7 @@
 
 
     &:hover {
     &:hover {
       color: inherit;
       color: inherit;
-      background-color: @item-hover-bg;
+      background-color: @N3;
     }
     }
   }
   }
 }
 }
@@ -58,5 +60,5 @@
   padding-top: 5px;
   padding-top: 5px;
   padding-bottom: 5px;
   padding-bottom: 5px;
   padding-left: 24px;
   padding-left: 24px;
-  border-top: 1px solid #f0f0f0;
+  border-top: 1px solid @N4;
 }
 }

@@ -2,7 +2,7 @@ import { Input, Popover, Tree } from 'antd';
 import React from 'react';
 import React from 'react';
 import { FC, ReactElement, useEffect, useState } from 'react';
 import { FC, ReactElement, useEffect, useState } from 'react';
 import type { OptionField } from '../type';
 import type { OptionField } from '../type';
-import { SearchOutlined } from '@ant-design/icons';
+import {QxBaseIcon} from '@qx/common';
 import './style.less';
 import './style.less';
 
 
 interface QxFieldPopoverProp {
 interface QxFieldPopoverProp {
@@ -29,8 +29,8 @@ const ParametersTreeGroup: FC<FieldsCheckboxGroupProps> = (props) => {
   const [keyword, setKey] = useState('');
   const [keyword, setKey] = useState('');
 
 
   const [autoExpandParent, setAutoExpandParent] = useState<boolean>(true);
   const [autoExpandParent, setAutoExpandParent] = useState<boolean>(true);
-  const [expandedKeys, setExpandedKeys] = useState<React.Key[]>([]);
-  const [checkedKeys, setCheckedKeys] = useState<React.Key[]>([]);
+  const [expandedKeys, setExpandedKeys] = useState<any>([]);
+  const [checkedKeys, setCheckedKeys] = useState<any>([]);
 
 
   const [treeData, setTreeData] = useState<any[]>([]);
   const [treeData, setTreeData] = useState<any[]>([]);
 
 
@@ -67,7 +67,7 @@ const ParametersTreeGroup: FC<FieldsCheckboxGroupProps> = (props) => {
     setAutoExpandParent(false);
     setAutoExpandParent(false);
   };
   };
 
 
-  const onCheck = (checkedKeysValue: React.Key[], Item: any) => {
+  const onCheck = (checkedKeysValue: any, Item: any) => {
     console.log('onCheck', checkedKeysValue, Item, checkedKeysValue?.checked);
     console.log('onCheck', checkedKeysValue, Item, checkedKeysValue?.checked);
     setCheckedKeys(checkedKeysValue);
     setCheckedKeys(checkedKeysValue);
     const chooseId = Item?.node?.id;
     const chooseId = Item?.node?.id;
@@ -83,7 +83,7 @@ const ParametersTreeGroup: FC<FieldsCheckboxGroupProps> = (props) => {
 
 
   const KeysArr: any[] = [];
   const KeysArr: any[] = [];
   const loop = (data: any): any =>
   const loop = (data: any): any =>
-    data.map((item) => {
+    data.map((item: any) => {
       const strTitle = item.title as string;
       const strTitle = item.title as string;
       const index = strTitle.indexOf(keyword);
       const index = strTitle.indexOf(keyword);
       const beforeStr = strTitle.substring(0, index);
       const beforeStr = strTitle.substring(0, index);
@@ -123,7 +123,7 @@ const ParametersTreeGroup: FC<FieldsCheckboxGroupProps> = (props) => {
         className={'qx-selector-sub-search'}
         className={'qx-selector-sub-search'}
         placeholder={'请输入参数名称搜索'}
         placeholder={'请输入参数名称搜索'}
         allowClear
         allowClear
-        prefix={<SearchOutlined />}
+        prefix={<QxBaseIcon type={'icon-app-search-line'} />}
         onChange={(e) => {
         onChange={(e) => {
           setKey(e.target.value.trim());
           setKey(e.target.value.trim());
         }}
         }}
@@ -152,6 +152,7 @@ const ParametersTreeGroup: FC<FieldsCheckboxGroupProps> = (props) => {
 interface QxTreeParameterPopoverProp extends QxFieldPopoverProp {
 interface QxTreeParameterPopoverProp extends QxFieldPopoverProp {
   onChange: (selectedKey: string, selectedItem: OptionField, isChecked: boolean) => void;
   onChange: (selectedKey: string, selectedItem: OptionField, isChecked: boolean) => void;
   values?: string[];
   values?: string[];
+  children?: any;
 }
 }
 
 
 const QxTreeParameterPopover: React.FC<QxTreeParameterPopoverProp> = (props) => {
 const QxTreeParameterPopover: React.FC<QxTreeParameterPopoverProp> = (props) => {
@@ -172,7 +173,7 @@ const QxTreeParameterPopover: React.FC<QxTreeParameterPopoverProp> = (props) =>
     // console.log(props.data);
     // console.log(props.data);
     if (props.data) {
     if (props.data) {
       const _fields = excludeFields(props?.data);
       const _fields = excludeFields(props?.data);
-      setFields(_fields);
+      setFields(_fields || []);
     }
     }
   }, [props.data]);
   }, [props.data]);
 
 
@@ -183,13 +184,13 @@ const QxTreeParameterPopover: React.FC<QxTreeParameterPopoverProp> = (props) =>
         <ParametersTreeGroup fields={fields} onChange={props.onChange} values={props.values} />
         <ParametersTreeGroup fields={fields} onChange={props.onChange} values={props.values} />
       }
       }
       placement={'bottomRight'}
       placement={'bottomRight'}
-      trigger={props.disabled ? '' : props.trigger || 'hover'}
-      visible={visible}
-      onVisibleChange={(v) => {
+      trigger={props.disabled ? undefined : props.trigger || 'hover'}
+      open={visible}
+      onOpenChange={(v) => {
         setVisible(v);
         setVisible(v);
       }}
       }}
     >
     >
-      {props.children}
+      {props?.children}
     </Popover>
     </Popover>
   );
   );
 };
 };

@@ -87,7 +87,7 @@ const QxFieldSelect: React.FC = (props: any) => {
   useEffect(() => {
   useEffect(() => {
     if (schemaProps && !schemaProps.data && schemaProps.params && fields.length === 0) {
     if (schemaProps && !schemaProps.data && schemaProps.params && fields.length === 0) {
       const { ...otherParams } = schemaProps.params;
       const { ...otherParams } = schemaProps.params;
-      getFieldOptions(appCode, funCode, otherParams).then((res) => {
+      getFieldOptions(appCode, funCode, otherParams).then((res: any) => {
         setFields(includeFields(res));
         setFields(includeFields(res));
       });
       });
     } else if (schemaProps && schemaProps.data) {
     } else if (schemaProps && schemaProps.data) {
@@ -126,7 +126,7 @@ const QxFieldSelect: React.FC = (props: any) => {
               // @ts-ignore
               // @ts-ignore
               return (
               return (
                 ((fields || []) as any)
                 ((fields || []) as any)
-                  .filter((field) => field.code === option.key)[0]
+                  .filter((field: { code: string }) => field.code === option.key)[0]
                   .name?.indexOf(input) > -1
                   .name?.indexOf(input) > -1
               );
               );
             }
             }

+@import '~@qx/ui/src/style/variable.less';
+
 .select_mask {
 .select_mask {
   position: absolute;
   position: absolute;
   z-index: 9;
   z-index: 9;
   width: 100%;
   width: 100%;
   height: 100%;
   height: 100%;
   text-align: center;
   text-align: center;
-  background-color: @red-1;
-  border: 1px solid @btn-danger-border;
-  border-radius: @btn-border-radius-base;
+  background-color: @E1;
+  border: 1px solid @E2;
+  border-radius: 4px;
   pointer-events: none;
   pointer-events: none;
 }
 }
 
 
 .select_mask_text {
 .select_mask_text {
   z-index: 13;
   z-index: 13;
-  color: @error-color;
+  color: @E3;
   font-size: 14px;
   font-size: 14px;
   line-height: 30px;
   line-height: 30px;
   text-align: center;
   text-align: center;

@@ -29,7 +29,7 @@ export const getUsefulFieldProp = (field: any) => {
  * @param excludeWidgets
  * @param excludeWidgets
  */
  */
 export const flatFields = (fields: WidgetField[] | OptionField[], excludeWidgets?: string[]) => {
 export const flatFields = (fields: WidgetField[] | OptionField[], excludeWidgets?: string[]) => {
-  const fieldFlatten = {};
+  const fieldFlatten: any = {};
   fields.forEach((field: any) => {
   fields.forEach((field: any) => {
     const { code, widget } = getUsefulFieldProp(field);
     const { code, widget } = getUsefulFieldProp(field);
     if (excludeWidgets && excludeWidgets.indexOf(widget) > -1) {
     if (excludeWidgets && excludeWidgets.indexOf(widget) > -1) {

+import React, { useCallback, useRef } from 'react';
 import { BlockOutlined } from '@ant-design/icons';
 import { BlockOutlined } from '@ant-design/icons';
 import { useSetState } from 'ahooks';
 import { useSetState } from 'ahooks';
 import { Button } from 'antd';
 import { Button } from 'antd';
 import cls from 'classnames';
 import cls from 'classnames';
-import React, { useCallback, useRef } from 'react';
 import { QxAppSelector } from '../qx-app-selector';
 import { QxAppSelector } from '../qx-app-selector';
 import type { InputSelectProps } from '../qx-input-select';
 import type { InputSelectProps } from '../qx-input-select';
 import { QxInputSelect } from '../qx-input-select';
 import { QxInputSelect } from '../qx-input-select';

+@import '~@qx/ui/src/style/variable.less';
+
 @prefix: ~'qx-datasource-select';
 @prefix: ~'qx-datasource-select';
 
 
 .@{prefix} {
 .@{prefix} {
@@ -8,6 +10,6 @@
     height: 50px !important;
     height: 50px !important;
     text-align: left !important;
     text-align: left !important;
     background-color: #fff !important;
     background-color: #fff !important;
-    border-top: 1px solid #e6eaf2 !important;
+    border-top: 1px solid @N4 !important;
   }
   }
 }
 }

@@ -2,9 +2,9 @@ import * as React from 'react';
 import { useCallback, useEffect, useImperativeHandle, useState } from 'react';
 import { useCallback, useEffect, useImperativeHandle, useState } from 'react';
 import { Checkbox, Empty, Input, Spin } from 'antd';
 import { Checkbox, Empty, Input, Spin } from 'antd';
 import Menu from 'antd/es/menu';
 import Menu from 'antd/es/menu';
-import {  SearchOutlined } from '@ant-design/icons';
+import {QxBaseIcon} from '@qx/common';
 import { getGroups } from './service';
 import { getGroups } from './service';
-import _ from 'lodash';
+import { cloneDeep } from 'lodash-es';
 
 
 type GroupCoreProps = {
 type GroupCoreProps = {
   appId?: string;
   appId?: string;
@@ -144,7 +144,7 @@ const GroupSelCore: React.FC<GroupCoreProps> = ({
     };
     };
 
 
     if (data) {
     if (data) {
-      const _data = _.cloneDeep(data);
+      const _data = cloneDeep(data);
       _data.forEach((item) => {
       _data.forEach((item) => {
         traverse(item);
         traverse(item);
       });
       });
@@ -189,7 +189,7 @@ const GroupSelCore: React.FC<GroupCoreProps> = ({
         className={'qx-selector-sub-search'}
         className={'qx-selector-sub-search'}
         placeholder={placeholder || '请输入群组名称，按回车键搜索'}
         placeholder={placeholder || '请输入群组名称，按回车键搜索'}
         allowClear
         allowClear
-        prefix={<SearchOutlined />}
+        prefix={<QxBaseIcon type={'icon-app-search-line'} />}
         onChange={(e) => {
         onChange={(e) => {
           handleChange(e);
           handleChange(e);
         }}
         }}

-import { SearchOutlined } from '@ant-design/icons';
-import { useScroll } from 'ahooks';
-import { Empty, Input, Menu, Spin } from 'antd';
-import cls from 'classnames';
-import { debounce } from 'lodash';
 import React, {
 import React, {
   memo,
   memo,
   useCallback,
   useCallback,
@@ -11,6 +6,11 @@ import React, {
   useRef,
   useRef,
   useState,
   useState,
 } from 'react';
 } from 'react';
+import {QxBaseIcon} from '@qx/common';
+import { useScroll } from 'ahooks';
+import { Empty, Input, Menu, Spin } from 'antd';
+import cls from 'classnames';
+import { debounce } from 'lodash-es';
 import './styles.less';
 import './styles.less';
 const prefix = 'qx-input-select-dropdown';
 const prefix = 'qx-input-select-dropdown';
 
 
@@ -115,7 +115,7 @@ const DropdownContent = React.forwardRef<any, DropdownContentProps>(
         {showSearch ? (
         {showSearch ? (
           <Input
           <Input
             placeholder={placeholder || '输入名称搜索'}
             placeholder={placeholder || '输入名称搜索'}
-            prefix={<SearchOutlined />}
+            prefix={<QxBaseIcon type={'icon-app-search-line'} />}
             className={`${prefix}__input`}
             className={`${prefix}__input`}
             onChange={onSearch}
             onChange={onSearch}
           />
           />

@@ -62,11 +62,11 @@ export const QxInputSelect = React.forwardRef<any, InputSelectProps>(
     return (
     return (
       <div className={cls(prefix, className)}>
       <div className={cls(prefix, className)}>
         <Dropdown
         <Dropdown
-          visible={state.visible}
+          open={state.visible}
           destroyPopupOnHide
           destroyPopupOnHide
           trigger={['click']}
           trigger={['click']}
           className={`${prefix}__dropdown`}
           className={`${prefix}__dropdown`}
-          overlay={() => (
+          dropdownRender={() => (
             <DropdownContent
             <DropdownContent
               options={options}
               options={options}
               onChange={handleChange}
               onChange={handleChange}
@@ -74,7 +74,7 @@ export const QxInputSelect = React.forwardRef<any, InputSelectProps>(
             />
             />
           )}
           )}
           getPopupContainer={(triggerNode) => triggerNode}
           getPopupContainer={(triggerNode) => triggerNode}
-          onVisibleChange={onVisibleChange}
+          onOpenChange={onVisibleChange}
           disabled={disabled}
           disabled={disabled}
         >
         >
           <Input
           <Input

@@ -31,7 +31,7 @@
           margin-bottom: 0;
           margin-bottom: 0;
 
 
           &:hover {
           &:hover {
-            background-color: #f5f5f5;
+            background-color: @N3;
           }
           }
         }
         }
       }
       }
@@ -54,7 +54,7 @@
       padding-bottom: 5px !important;
       padding-bottom: 5px !important;
       padding-left: 0 !important;
       padding-left: 0 !important;
       border: none !important;
       border: none !important;
-      border-bottom: 1px solid #e6eaf2 !important;
+      border-bottom: 1px solid @N4 !important;
       outline: none !important;
       outline: none !important;
       box-shadow: none !important;
       box-shadow: none !important;
 
 

+@import '~@qx/ui/src/style/variable.less';
+
 .qx-search-tree__wrap {
 .qx-search-tree__wrap {
   height: 100%;
   height: 100%;
   overflow: auto;
   overflow: auto;
@@ -8,8 +10,8 @@
 
 
   .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
   .ant-tree .ant-tree-node-content-wrapper.ant-tree-node-selected {
     // TODO 主题色更改 颜色暂时写死
     // TODO 主题色更改 颜色暂时写死
-    color: #1764ff;
-    background-color: #e6f7ff;
+    color: @B8;
+    background-color: @B3;
   }
   }
 }
 }
 
 

@@ -3,8 +3,9 @@ import { useCallback, useEffect, useImperativeHandle, useState } from 'react';
 import { Empty, Input, Spin, Tooltip, Tree } from 'antd';
 import { Empty, Input, Spin, Tooltip, Tree } from 'antd';
 import './core.less';
 import './core.less';
 import { getOrgTree } from './service';
 import { getOrgTree } from './service';
-import _ from 'lodash';
-import { PartitionOutlined, SearchOutlined } from '@ant-design/icons';
+import { cloneDeep } from 'lodash-es';
+import { PartitionOutlined } from '@ant-design/icons';
+import {QxBaseIcon} from '@qx/common';
 
 
 type OrgCoreProps = {
 type OrgCoreProps = {
   cRef?: any;
   cRef?: any;
@@ -243,7 +244,7 @@ const OrgCore: React.FC<OrgCoreProps> = (props) => {
     };
     };
 
 
     if (data) {
     if (data) {
-      const _data = _.cloneDeep(data);
+      const _data = cloneDeep(data);
       if (word != '') {
       if (word != '') {
         traverse(_data);
         traverse(_data);
       }
       }
@@ -301,7 +302,7 @@ const OrgCore: React.FC<OrgCoreProps> = (props) => {
         className={'qx-selector-sub-search'}
         className={'qx-selector-sub-search'}
         placeholder={props.placeholder || '请输入部门名称，按回车键搜索'}
         placeholder={props.placeholder || '请输入部门名称，按回车键搜索'}
         allowClear
         allowClear
-        prefix={<SearchOutlined />}
+        prefix={<QxBaseIcon type={'icon-app-search-line'} />}
         onChange={(e) => {
         onChange={(e) => {
           handleChange(e);
           handleChange(e);
         }}
         }}

-import * as React from 'react';
-import { useEffect, useRef, useState } from 'react';
+import React, { useEffect, useRef, useState } from 'react';
 import { Modal, Tag } from 'antd';
 import { Modal, Tag } from 'antd';
 import OrgCore from './core';
 import OrgCore from './core';
 
 
@@ -56,7 +55,7 @@ const OrgSelectorDialog: React.FC<OrgSelectorDialogProps> = (props) => {
     <Modal
     <Modal
       title={props.title || '选择部门'}
       title={props.title || '选择部门'}
       width={560}
       width={560}
-      visible={props.visible}
+      open={props.visible}
       className={'qx-org-selector__dialog'}
       className={'qx-org-selector__dialog'}
       onOk={handleOk}
       onOk={handleOk}
       onCancel={handleCancel}
       onCancel={handleCancel}

@@ -103,7 +103,7 @@ const QxOrgSelector: React.FC<QxOrgSelectorProps> = (props) => {
   }, [JSON.stringify(props.defaultData)]);
   }, [JSON.stringify(props.defaultData)]);
 
 
   // getUserList()
   // getUserList()
-  const handleOk = (keys: [], data: []) => {
+  const handleOk = (keys: any[], data: any[]) => {
     let _value: [] | string = keys;
     let _value: [] | string = keys;
     if (!props.multiple && keys && keys.length > 0) {
     if (!props.multiple && keys && keys.length > 0) {
       // @ts-ignore
       // @ts-ignore

+@import '~@qx/ui/src/style/variable.less';
+
 .qx-org-selector {
 .qx-org-selector {
   padding-left: 8px;
   padding-left: 8px;
   line-height: 0;
   line-height: 0;
@@ -55,7 +57,7 @@
 
 
   .qx-selector-sub-search.ant-input-affix-wrapper {
   .qx-selector-sub-search.ant-input-affix-wrapper {
     margin-bottom: 8px;
     margin-bottom: 8px;
-    border-bottom: 1px solid #f0f0f0;
+    border-bottom: 1px solid @N4;
   }
   }
 }
 }
 
 
@@ -68,7 +70,7 @@
   height: 60px;
   height: 60px;
   padding: 5px;
   padding: 5px;
   overflow: auto;
   overflow: auto;
-  border-bottom: 1px solid #f0f0f0;
+  border-bottom: 1px solid @N4;
 
 
   .ant-tag {
   .ant-tag {
     margin: 1px 2px;
     margin: 1px 2px;
@@ -82,14 +84,14 @@
 
 
 .qx-org-tree__include {
 .qx-org-tree__include {
   margin-left: 10px;
   margin-left: 10px;
-  color: #999;
+  color: @N7;
   font-size: 16px;
   font-size: 16px;
 
 
   &:hover {
   &:hover {
-    color: #333;
+    color: @N9;
   }
   }
 
 
   .active {
   .active {
-    color: #1890ff;
+    color: @B8;
   }
   }
 }
 }

@@ -3,7 +3,6 @@
 import {
 import {
   DeleteOutlined,
   DeleteOutlined,
   PlusOutlined,
   PlusOutlined,
-  SearchOutlined,
   SisternodeOutlined,
   SisternodeOutlined,
   SnippetsOutlined,
   SnippetsOutlined,
 } from '@ant-design/icons';
 } from '@ant-design/icons';
@@ -40,8 +39,10 @@ import { formatEnum } from './constant';
 //   typeTranslateItemtype,
 //   typeTranslateItemtype,
 // } from './constant';
 // } from './constant';
 // import { Controlled as CodeMirror } from 'react-codemirror2'
 // import { Controlled as CodeMirror } from 'react-codemirror2'
-import _ from 'lodash';
+import { cloneDeep } from 'lodash-es';
 import moment from 'dayjs';
 import moment from 'dayjs';
+import {QxBaseIcon} from '@qx/common';
+
 const valueOptions = [
 const valueOptions = [
   { key: 'STRING', title: '文本' },
   { key: 'STRING', title: '文本' },
   { key: 'NUMBER', title: '数字' },
   { key: 'NUMBER', title: '数字' },
@@ -125,7 +126,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
 
 
   //判断数组是否只有一个子节点
   //判断数组是否只有一个子节点
   const checkShowAdd = (_data: any) => {
   const checkShowAdd = (_data: any) => {
-    const _newTreeData = _.cloneDeep(treeData);
+    const _newTreeData = cloneDeep(treeData);
     if (!!_data.pid) {
     if (!!_data.pid) {
       const pidIndex = _newTreeData.findIndex(
       const pidIndex = _newTreeData.findIndex(
         (item: any) => item.id === _data.pid,
         (item: any) => item.id === _data.pid,
@@ -870,7 +871,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
       const dropId =
       const dropId =
         dropCol.getAttribute('data-row-key') ||
         dropCol.getAttribute('data-row-key') ||
         dropCol.getAttribute('id')?.slice(4);
         dropCol.getAttribute('id')?.slice(4);
-      const _newTreeData = _.cloneDeep(treeData);
+      const _newTreeData = cloneDeep(treeData);
       const dragIndex = _newTreeData.findIndex(
       const dragIndex = _newTreeData.findIndex(
         (item: any) => item.id === dragId,
         (item: any) => item.id === dragId,
       ); //要drop的index
       ); //要drop的index
@@ -947,7 +948,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
     <>
     <>
       <Modal
       <Modal
         title="高级参数设计器"
         title="高级参数设计器"
-        visible={visible}
+        open={visible}
         destroyOnClose
         destroyOnClose
         footer={null}
         footer={null}
         // onOk={handleCancel}
         // onOk={handleCancel}
@@ -986,7 +987,7 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
               <Input
               <Input
                 className={'qx-parameter-setting--search'}
                 className={'qx-parameter-setting--search'}
                 placeholder="按名称搜索"
                 placeholder="按名称搜索"
-                prefix={<SearchOutlined />}
+                prefix={<QxBaseIcon type={'icon-app-search-line'} />}
                 onChange={onChange}
                 onChange={onChange}
                 style={{ width: 219 }}
                 style={{ width: 219 }}
               />
               />
@@ -1019,11 +1020,12 @@ const ParameterModal: React.FC<ParameterSettingProps> = (props) => {
             // <Form form={form}>
             // <Form form={form}>
             <Table
             <Table
               components={components}
               components={components}
-              defaultExpandAllRows
+              expandable={{
+                defaultExpandAllRows: true,
+                childrenColumnName: 'child'
+              }}
               onRow={() => onRow()}
               onRow={() => onRow()}
               scroll={{ x: 1600 }}
               scroll={{ x: 1600 }}
-              childrenColumnName={'child'}
-              // className={'param-setting-table'}
               rowClassName={() => 'editable-row'}
               rowClassName={() => 'editable-row'}
               bordered
               bordered
               pagination={false}
               pagination={false}

@@ -585,4 +585,5 @@ export interface ParamDesignModel extends DataNode {
   title?: string;
   title?: string;
   qxProps?: any;
   qxProps?: any;
   child?: ParamDesignModel[];
   child?: ParamDesignModel[];
+  mappingValues?: any;
 }
 }

@@ -5,7 +5,6 @@ import React, { useCallback, useEffect, useState } from 'react';
 import {
 import {
   DeleteOutlined,
   DeleteOutlined,
   PlusOutlined,
   PlusOutlined,
-  SearchOutlined,
   SettingOutlined,
   SettingOutlined,
 } from '@ant-design/icons';
 } from '@ant-design/icons';
 import {
 import {
@@ -30,10 +29,12 @@ import { formatEnum } from './constant';
 //   typeTranslateItemtype,
 //   typeTranslateItemtype,
 // } from './constant';
 // } from './constant';
 
 
-import _ from 'lodash';
+import { cloneDeep } from 'lodash-es';
 import moment from 'dayjs';
 import moment from 'dayjs';
 import type { ParamDesignModel } from './constant';
 import type { ParamDesignModel } from './constant';
 import { uidGen } from './stringUtil';
 import { uidGen } from './stringUtil';
+import {QxBaseIcon} from '@qx/common';
+
 import './style.less';
 import './style.less';
 
 
 const valueOptions = [
 const valueOptions = [
@@ -106,7 +107,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
 
 
   useEffect(() => {
   useEffect(() => {
     if (props?.value?.length > 0) {
     if (props?.value?.length > 0) {
-      const value = _.cloneDeep(props?.value);
+      const value = cloneDeep(props?.value);
       const expandedArray: any = [];
       const expandedArray: any = [];
       (value || []).map((_item: ParamDesignModel) => {
       (value || []).map((_item: ParamDesignModel) => {
         expandedArray.push(_item.id);
         expandedArray.push(_item.id);
@@ -115,7 +116,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
       setTreeData(value);
       setTreeData(value);
       // const newData = generateTreeData(value, '')
       // const newData = generateTreeData(value, '')
       const Treelist = generateList(value);
       const Treelist = generateList(value);
-      const newList = _.cloneDeep(Treelist);
+      const newList = cloneDeep(Treelist);
       newList.map((_item) => {
       newList.map((_item) => {
         delete _item.child;
         delete _item.child;
       });
       });
@@ -153,7 +154,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
     data: ParamDesignModel,
     data: ParamDesignModel,
     // newType: string,
     // newType: string,
   ) => {
   ) => {
-    let treeList = _.cloneDeep(list);
+    let treeList = cloneDeep(list);
     // todo 编辑重名bug 貌似有点问题 待修改
     // todo 编辑重名bug 貌似有点问题 待修改
     treeList = (treeList || []).filter((item) => item.id != data.id);
     treeList = (treeList || []).filter((item) => item.id != data.id);
     if (!treeList || treeList.length == 0) {
     if (!treeList || treeList.length == 0) {
@@ -217,7 +218,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
 
 
     const isProps = code.indexOf('qxProps');
     const isProps = code.indexOf('qxProps');
     const _newCode = isProps > -1 ? code.slice(8) : '';
     const _newCode = isProps > -1 ? code.slice(8) : '';
-    const _newData = _.cloneDeep(treeData);
+    const _newData = cloneDeep(treeData);
     if (code == 'code') {
     if (code == 'code') {
       data.code = value;
       data.code = value;
       const codeValid = validateCode(data);
       const codeValid = validateCode(data);
@@ -290,7 +291,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
       okText: '确认',
       okText: '确认',
       okType: 'danger',
       okType: 'danger',
       onOk: () => {
       onOk: () => {
-        const listData = _.cloneDeep(treeData);
+        const listData = cloneDeep(treeData);
         // const newData = generateTreeData(listData, '');
         // const newData = generateTreeData(listData, '');
         const loopDeleteTree = (treeList: ParamDesignModel[]) => {
         const loopDeleteTree = (treeList: ParamDesignModel[]) => {
           for (let i = 0; i < treeList.length; i++) {
           for (let i = 0; i < treeList.length; i++) {
@@ -334,7 +335,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
       }
       }
     };
     };
 
 
-    let data = _.cloneDeep(treeData);
+    let data = cloneDeep(treeData);
     // Find dragObject
     // Find dragObject
     let dragObj: ParamDesignModel;
     let dragObj: ParamDesignModel;
     loop(data, dragKey, (item, index, arr) => {
     loop(data, dragKey, (item, index, arr) => {
@@ -525,8 +526,8 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
   //     return undefined;
   //     return undefined;
   // };
   // };
 
 
-  const changeField = (val: string, data: amy) => {
-    const _newData = _.cloneDeep(treeData);
+  const changeField = (val: any, data: any) => {
+    const _newData = cloneDeep(treeData);
     const _qxProps = {};
     const _qxProps = {};
 
 
     const loopChangeTree = (treeList: ParamDesignModel[]) => {
     const loopChangeTree = (treeList: ParamDesignModel[]) => {
@@ -543,8 +544,8 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
             treeList[i].mappingValues = [val[0].value];
             treeList[i].mappingValues = [val[0].value];
           }
           }
           return;
           return;
-        } else if (treeList[i].child) {
-          loopChangeTree(treeList[i].child);
+        } else if (!!treeList[i]?.child?.length) {
+          loopChangeTree(treeList[i].child || []);
         }
         }
       }
       }
     };
     };
@@ -663,13 +664,11 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
           <Dropdown
           <Dropdown
             trigger={['click']}
             trigger={['click']}
             className={'hidden-select'}
             className={'hidden-select'}
-            overlay={
-              <Menu
-                items={valueOptions}
-                className={'dropdown'}
-                onClick={onSelect}
-              />
-            }
+            menu={{
+              items: valueOptions,
+              className: 'dropdown',
+              onClick: onSelect
+            }}
           >
           >
             <Button type={'link'}>
             <Button type={'link'}>
               <PlusOutlined />
               <PlusOutlined />
@@ -690,7 +689,7 @@ export const QxParameterSetting: React.FC<ParameterSettingProps> = (props) => {
           <Input
           <Input
             className={'qx-parameter-setting--search'}
             className={'qx-parameter-setting--search'}
             placeholder="按名称搜索"
             placeholder="按名称搜索"
-            prefix={<SearchOutlined />}
+            prefix={<QxBaseIcon type={'icon-app-search-line'} />}
             onChange={onChange}
             onChange={onChange}
           />
           />
         )}
         )}

+@import '~@qx/ui/src/style/variable.less';
+
 /* stylelint-disable declaration-block-no-redundant-longhand-properties */
 /* stylelint-disable declaration-block-no-redundant-longhand-properties */
 .border-none .ant-select:not(.ant-select-customize-input) .ant-select-selector {
 .border-none .ant-select:not(.ant-select-customize-input) .ant-select-selector {
   border: none;
   border: none;
@@ -10,22 +12,6 @@
   flex-direction: row-reverse;
   flex-direction: row-reverse;
   flex-wrap: nowrap;
   flex-wrap: nowrap;
   justify-content: space-between;
   justify-content: space-between;
-  // flex-shrink:0;
-  // min-height: 32px;
-  // padding: 1px;
-  // position: 'relative', display: 'flex', flexWrap: 'wrap'
-
-  // > .ant-tag {
-  //   margin: 3px;
-
-  //   &:first-child {
-  //     margin-left: 10px;
-  //   }
-
-  //   ~ .qx-tags-input__box {
-  //     padding-left: 5px;
-  //   }
-  // }
 }
 }
 
 
 .tree-wrapper {
 .tree-wrapper {
@@ -36,7 +22,7 @@
     border-radius: 4px;
     border-radius: 4px;
 
 
     &:hover {
     &:hover {
-      background-color: #f4f4f5;
+      background-color: @N3;
     }
     }
   }
   }
 
 
@@ -49,24 +35,6 @@
   }
   }
 }
 }
 
 
-// .ant-tree-node-selected:hover ~ .ant-tree-treenode:hover{
-// 	background-color: #bae7ff !important;
-// }
-
-// .ant-tree-node-content-wrapper :hover ~ .ant-tree-treenode{
-// 	// background-color: #F4F4F5;
-//   // padding-top: 4px;
-// }
-
-// .tree-list :hover{
-//   background-color: #ff72;
-// }
-
-// .ant-tree .ant-tree-treenode :hover{
-//   background-color: #00f;
-//   border-radius:4px;
-// }
-
 .border-none
 .border-none
   .ant-select-focused:not(.ant-select-disabled).ant-select:not(
   .ant-select-focused:not(.ant-select-disabled).ant-select:not(
     .ant-select-customize-input
     .ant-select-customize-input
@@ -98,7 +66,7 @@
     color: #666;
     color: #666;
 
 
     &:hover {
     &:hover {
-      color: red;
+      color: @E3;
       opacity: 1;
       opacity: 1;
     }
     }
   }
   }
@@ -131,7 +99,7 @@
   // min-width: 100px;
   // min-width: 100px;
   margin-bottom: 2px;
   margin-bottom: 2px;
   overflow: hidden;
   overflow: hidden;
-  text-overflow: ellipsi;
+  text-overflow: ellipsis;
 }
 }
 
 
 .opt-left-down {
 .opt-left-down {
@@ -145,7 +113,7 @@
   margin-top: 2px;
   margin-top: 2px;
   margin-bottom: 2px;
   margin-bottom: 2px;
   overflow: hidden;
   overflow: hidden;
-  text-overflow: ellipsi;
+  text-overflow: ellipsis;
 }
 }
 
 
 // .ant-tree-node-content-wrapper :hover .select-tree {
 // .ant-tree-node-content-wrapper :hover .select-tree {
@@ -237,13 +205,13 @@
 
 
 .btn-high-del {
 .btn-high-del {
   &:hover {
   &:hover {
-    color: red !important;
+    color: @E3 !important;
   }
   }
 }
 }
 
 
 .editable-row:hover .editable-cell-value-wrap {
 .editable-row:hover .editable-cell-value-wrap {
   padding: 4px 11px;
   padding: 4px 11px;
-  border: 1px solid #d9d9d9;
+  border: 1px solid @N4;
   border-radius: 2px;
   border-radius: 2px;
 }
 }
 
 
@@ -306,41 +274,6 @@
   text-align: center !important;
   text-align: center !important;
 }
 }
 
 
-//TODO 写法不行
-// #root .hidden-select {
-//   .ant-select-tree
-//     .ant-select-tree-node-content-wrapper.ant-select-tree-node-selected {
-//     // background-color: #bae7ff;
-//     background-color: @primary-2;
-//   }
-// }
-// .ant-form-item
-// .qx-parameter-setting__tree-list {
-//   .ant-tree-draggable-icon {
-//     line-height: 32px;
-//   }
-
-//   &.ant-tree
-//     .ant-tree-treenode:not(.ant-tree-treenode-disabled)
-//     .ant-tree-node-content-wrapper {
-//     border-radius: 4px;
-
-//     &.ant-tree-node-selected {
-//       background-color: transparent;
-//     }
-
-//     &:hover,
-//     &.ant-tree-node-selected:hover {
-//       background-color: @N3;
-//       // opacity: 1 !important;
-//       // background-color: #91d5ff;
-//     }
-//   }
-// }
-
-// .ant-form-item{
-//   margin-bottom: 0;
-// }
 
 
 .json-editor {
 .json-editor {
   width: 90%;
   width: 90%;

@@ -2,8 +2,8 @@ import * as React from 'react';
 import { useCallback, useEffect, useImperativeHandle, useState } from 'react';
 import { useCallback, useEffect, useImperativeHandle, useState } from 'react';
 import { Checkbox, Empty, Input, Spin } from 'antd';
 import { Checkbox, Empty, Input, Spin } from 'antd';
 import { getPositions } from './service';
 import { getPositions } from './service';
-import _ from 'lodash';
-import { SearchOutlined } from '@ant-design/icons';
+import { cloneDeep } from 'lodash-es';
+import {QxBaseIcon} from '@qx/common';
 import Menu from 'antd/es/menu';
 import Menu from 'antd/es/menu';
 
 
 type PosCoreProps = {
 type PosCoreProps = {
@@ -143,7 +143,7 @@ const PosCore: React.FC<PosCoreProps> = (props) => {
     };
     };
 
 
     if (data) {
     if (data) {
-      const _data = _.cloneDeep(data);
+      const _data = cloneDeep(data);
       _data.forEach((item) => {
       _data.forEach((item) => {
         traverse(item);
         traverse(item);
       });
       });
@@ -186,7 +186,7 @@ const PosCore: React.FC<PosCoreProps> = (props) => {
         className={'qx-selector-sub-search'}
         className={'qx-selector-sub-search'}
         placeholder={props.placeholder || '请输入岗位名称，按回车键搜索'}
         placeholder={props.placeholder || '请输入岗位名称，按回车键搜索'}
         allowClear
         allowClear
-        prefix={<SearchOutlined />}
+        prefix={<QxBaseIcon type={'icon-app-search-line'} />}
         onChange={(e) => {
         onChange={(e) => {
           handleChange(e);
           handleChange(e);
         }}
         }}

@@ -52,7 +52,7 @@ const PosSelectorDialog: React.FC<PosSelectorDialogProps> = (props) => {
     <Modal
     <Modal
       title={props.title || '选择岗位'}
       title={props.title || '选择岗位'}
       width={560}
       width={560}
-      visible={props.visible}
+      open={props.visible}
       className={'qx-pos-selector__dialog'}
       className={'qx-pos-selector__dialog'}
       onOk={handleOk}
       onOk={handleOk}
       onCancel={handleCancel}
       onCancel={handleCancel}

@@ -32,7 +32,7 @@ const QxPosSelector: React.FC<QxPosSelectorProps> = (props) => {
   }, []);
   }, []);
 
 
   // getUserList()
   // getUserList()
-  const handleOk = (keys: [], data: []) => {
+  const handleOk = (keys: [], data: any[]) => {
     let _value: [] | string = keys;
     let _value: [] | string = keys;
     if (!props.multiple && keys && keys.length > 0) {
     if (!props.multiple && keys && keys.length > 0) {
       // @ts-ignore
       // @ts-ignore

+@import '~@qx/ui/src/style/variable.less';
+
 .qx-pos-selector__dialog {
 .qx-pos-selector__dialog {
   //.ant-popover-arrow {
   //.ant-popover-arrow {
   //  display: none;
   //  display: none;
@@ -27,7 +29,7 @@
   height: 60px;
   height: 60px;
   padding: 5px;
   padding: 5px;
   overflow: auto;
   overflow: auto;
-  border-bottom: 1px solid #f0f0f0;
+  border-bottom: 1px solid @N4;
 
 
   .ant-tag {
   .ant-tag {
     margin: 1px 2px;
     margin: 1px 2px;

@@ -85,7 +85,7 @@ const QxPagination: React.FC<QxPaginationProps> = (props) => {
       <Popover
       <Popover
         overlayClassName={'qx-pagination__overlay'}
         overlayClassName={'qx-pagination__overlay'}
         content={pageContent}
         content={pageContent}
-        trigger={total === 0 ? '' : 'click'}
+        trigger={total === 0 ? undefined : 'click'}
         placement={'bottom'}
         placement={'bottom'}
       >
       >
         <li className={'ant-pagination-simple-pager'}>
         <li className={'ant-pagination-simple-pager'}>

+@import '~@qx/ui/src/style/variable.less';
+
 .qx-pagination {
 .qx-pagination {
   > .anticon {
   > .anticon {
-    color: rgba(0, 0, 0, 0.25);
+    color: @N7;
   }
   }
 
 
   .ant-pagination-simple-pager {
   .ant-pagination-simple-pager {
     cursor: pointer;
     cursor: pointer;
 
 
     &:hover {
     &:hover {
-      color: #007ef3;
+      color: @B8;
     }
     }
   }
   }
 }
 }

@@ -2,9 +2,7 @@ import * as React from 'react';
 import { useCallback, useEffect, useState } from 'react';
 import { useCallback, useEffect, useState } from 'react';
 import { Empty, Input, Spin} from 'antd';
 import { Empty, Input, Spin} from 'antd';
 import { getAllRole } from '../service';
 import { getAllRole } from '../service';
-import {
-  SearchOutlined,
-} from '@ant-design/icons';
+import {QxBaseIcon} from '@qx/common';
 import Menu from 'antd/es/menu';
 import Menu from 'antd/es/menu';
 
 
 type RoleProps = {
 type RoleProps = {
@@ -188,7 +186,7 @@ const Role: React.FC<RoleProps> = (props) => {
         className={'qx-selector-sub-search'}
         className={'qx-selector-sub-search'}
         placeholder={props.placeholder || '请输入角色名称，按回车键搜索'}
         placeholder={props.placeholder || '请输入角色名称，按回车键搜索'}
         allowClear
         allowClear
-        prefix={<SearchOutlined />}
+        prefix={<QxBaseIcon type={'icon-app-search-line'} />}
         onChange={(e) => {
         onChange={(e) => {
           handleChange(e);
           handleChange(e);
         }}
         }}

@@ -6,7 +6,7 @@ import { Checkbox, Empty, Input, Spin } from 'antd';
 // import { InputRef } from 'antd/es/input';
 // import { InputRef } from 'antd/es/input';
 import QxPagination from './qx-pagination';
 import QxPagination from './qx-pagination';
 import type { CheckboxChangeEvent } from 'antd/es/checkbox';
 import type { CheckboxChangeEvent } from 'antd/es/checkbox';
-import { SearchOutlined } from '@ant-design/icons';
+import {QxBaseIcon} from '@qx/common';
 // import type { InputRef } from 'antd/lib/input';
 // import type { InputRef } from 'antd/lib/input';
 
 
 type UserItem = { id: string; name: string; code: string; relName?: string };
 type UserItem = { id: string; name: string; code: string; relName?: string };
@@ -202,7 +202,7 @@ const UserList: React.FC<UserListProps> = (props) => {
               }}
               }}
               onChange={(e) => handleChange(e)}
               onChange={(e) => handleChange(e)}
               allowClear
               allowClear
-              prefix={<SearchOutlined style={{ color: 'rgba(0,0,0,.45)' }} />}
+              prefix={<QxBaseIcon style={{ color: 'rgba(0,0,0,.45)' }} type={'icon-app-search-line'} />}
             />
             />
           </div>
           </div>
           <QxPagination
           <QxPagination

@@ -222,7 +222,7 @@ const UserSelectorDialog: React.FC<UserSelectorDialogProps> = (props) => {
     <Modal
     <Modal
       title={dialogTitle}
       title={dialogTitle}
       width={700}
       width={700}
-      visible={props.visible}
+      open={props.visible}
       className={'qx-user-selector__dialog'}
       className={'qx-user-selector__dialog'}
       onOk={handleOk}
       onOk={handleOk}
       onCancel={handleCancel}
       onCancel={handleCancel}

@@ -6,7 +6,7 @@ import './style.less';
 import type { UserItem } from './dialog';
 import type { UserItem } from './dialog';
 import UserSelectorDialog from './dialog';
 import UserSelectorDialog from './dialog';
 import { searchUserByAllType, SearchUserAllData } from './service';
 import { searchUserByAllType, SearchUserAllData } from './service';
-import _ from 'lodash';
+import { debounce } from 'lodash-es';
 
 
 export type QxUserSelectorProps = {
 export type QxUserSelectorProps = {
   cRef?: any;
   cRef?: any;
@@ -266,7 +266,7 @@ const QxUserSelector: React.FC<QxUserSelectorProps> = (props) => {
     }
     }
   }, [popVisible]);
   }, [popVisible]);
 
 
-  const handleSearch = _.debounce((_keywords: string | undefined) => {
+  const handleSearch = debounce((_keywords: string | undefined) => {
     if (!_keywords) {
     if (!_keywords) {
       setUserList(null);
       setUserList(null);
       return;
       return;
@@ -384,12 +384,12 @@ const QxUserSelector: React.FC<QxUserSelectorProps> = (props) => {
       <Popover
       <Popover
         content={userDropContent}
         content={userDropContent}
         placement={'bottom'}
         placement={'bottom'}
-        visible={
+        open={
           ((props?.params?.range || !userId) && !userList) || props.readOnly ? false : popVisible
           ((props?.params?.range || !userId) && !userList) || props.readOnly ? false : popVisible
         }
         }
         trigger={'click'}
         trigger={'click'}
         overlayClassName={'qx-user-selector--input__pop'}
         overlayClassName={'qx-user-selector--input__pop'}
-        onVisibleChange={(v: boolean) => setPopVisible(v)}
+        onOpenChange={(v: boolean) => setPopVisible(v)}
       >
       >
         <div
         <div
           className={
           className={

+@import '~@qx/ui/src/style/variable.less';
+
 .qx-user-input__box {
 .qx-user-input__box {
   padding-left: 0;
   padding-left: 0;
   background-color: transparent;
   background-color: transparent;
@@ -100,7 +102,7 @@
     color: #999;
     color: #999;
     font-weight: normal;
     font-weight: normal;
     font-size: 14px;
     font-size: 14px;
-    border-bottom: 1px solid #efefef;
+    border-bottom: 1px solid @N4;
     &:first-child {
     &:first-child {
       margin-top: 0;
       margin-top: 0;
     }
     }
@@ -114,41 +116,41 @@
     cursor: pointer;
     cursor: pointer;
     &.qx-user-selector-more {
     &.qx-user-selector-more {
       margin-top: 5px;
       margin-top: 5px;
-      color: #4ba9ff;
+      color: @B8;
       &:hover {
       &:hover {
-        color: #4ba9ff;
+        color: @B7;
       }
       }
     }
     }
     &.disabled {
     &.disabled {
-      color: #ccc;
+      color: @N5;
       cursor: default;
       cursor: default;
       &:hover {
       &:hover {
-        color: #ccc;
+        color: @N5;
       }
       }
       .qx-user-selector-code {
       .qx-user-selector-code {
-        color: #ccc;
+        color: @N5;
       }
       }
     }
     }
 
 
     &:hover {
     &:hover {
-      color: #000;
-      background-color: #fafafa;
+      color: @N9;
+      background-color: @N2;
     }
     }
     &.qx-user-selector-pop-empty {
     &.qx-user-selector-pop-empty {
       padding: 10px;
       padding: 10px;
-      color: #aaa;
+      color: @N5;
       text-align: center;
       text-align: center;
-      background-color: #fbfbfb;
+      background-color: @N2;
       cursor: default;
       cursor: default;
       &:hover {
       &:hover {
-        color: #aaa;
+        color: @N5;
       }
       }
     }
     }
   }
   }
 }
 }
 
 
 .qx-user-selector-code {
 .qx-user-selector-code {
-  color: rgb(102, 102, 102);
+  color: @N7;
 }
 }
 .qx-user-selector__dialog {
 .qx-user-selector__dialog {
   .ant-modal-body {
   .ant-modal-body {
@@ -183,7 +185,7 @@
   height: 60px;
   height: 60px;
   padding: 5px;
   padding: 5px;
   overflow: auto;
   overflow: auto;
-  border-bottom: 1px solid #f0f0f0;
+  border-bottom: 1px solid @N4;
 
 
   .ant-tag {
   .ant-tag {
     margin: 1px 2px;
     margin: 1px 2px;
@@ -198,7 +200,7 @@
 .qx-user-selector__left {
 .qx-user-selector__left {
   height: @contentHeight;
   height: @contentHeight;
   overflow: hidden;
   overflow: hidden;
-  border-right: 1px solid #f0f0f0;
+  border-right: 1px solid @N4;
 
 
   .qx-user-selector__collapse {
   .qx-user-selector__collapse {
     border: none;
     border: none;
@@ -211,11 +213,11 @@
   }
   }
 
 
   .ant-collapse-content {
   .ant-collapse-content {
-    border-color: #f0f0f0;
+    border-color: @N4;
   }
   }
 
 
   .ant-collapse > .ant-collapse-item {
   .ant-collapse > .ant-collapse-item {
-    border-color: #f0f0f0;
+    border-color: @N4;
   }
   }
 }
 }
 
 
@@ -223,7 +225,7 @@
   display: flex;
   display: flex;
   flex-direction: column;
   flex-direction: column;
   height: @contentHeight;
   height: @contentHeight;
-  border-left: 1px solid #f0f0f0;
+  border-left: 1px solid @N4;
   border-left: none;
   border-left: none;
 
 
   &__header {
   &__header {
@@ -232,7 +234,7 @@
     justify-content: space-between;
     justify-content: space-between;
     height: 40px;
     height: 40px;
     padding: 0 10px;
     padding: 0 10px;
-    border-bottom: 1px solid #f0f0f0;
+    border-bottom: 1px solid @N4;
 
 
     .ant-checkbox-wrapper {
     .ant-checkbox-wrapper {
       white-space: nowrap;
       white-space: nowrap;
@@ -260,13 +262,13 @@
   .ant-table-pagination.ant-pagination {
   .ant-table-pagination.ant-pagination {
     margin: 0;
     margin: 0;
     padding: 11px;
     padding: 11px;
-    border-top: 1px solid #f0f0f0;
+    border-top: 1px solid @N4;
   }
   }
 }
 }
 
 
 .qx-user-selector__user-search {
 .qx-user-selector__user-search {
   padding: 7px 10px;
   padding: 7px 10px;
-  border-bottom: 1px solid #f0f0f0;
+  border-bottom: 1px solid @N4;
 }
 }
 
 
 .qx-selector-tab {
 .qx-selector-tab {
@@ -339,7 +341,7 @@
     cursor: pointer;
     cursor: pointer;
 
 
     &:hover {
     &:hover {
-      background-color: #fafafa;
+      background-color: @N2;
     }
     }
 
 
     .ant-checkbox-wrapper,
     .ant-checkbox-wrapper,