plain-design 1.0.0-beta.16 → 1.0.0-beta.161

package/src/packages/components/AutoTable/use/useTableOption.methods.tsx

@@ -1,15 +1,15 @@
 import {createUrlUtils, iUrlResponseData} from "../utils/TableOption.url";
-import {nextTick, toRaw, useAsyncMethods} from 'plain-design-composition';
+import {nextTick, toRaw, useAsyncMethods} from '@peryl/react-compose';
 import {iHttpRequestConfig} from "../../createHttp/http.utils";
 import {iTableNode} from "../../Table/table/utils/table.utils";
 import {eTableOptionStatus} from "./useTableOption.confirm";
 import {$notice} from "../../$notice";
 import {$dialog} from "../../$dialog";
-import {deepcopy} from "plain-utils/object/deepcopy";
+import {deepcopy} from "@peryl/utils/deepcopy";
 import {$message} from "../../$message";
-import {PlainObject} from "plain-utils/utils/event";
+import {PlainObject} from "@peryl/utils/event";
 import {mergeQueryParam} from "../../FilterService/utils/mergeQueryParam";
-import {defer} from "plain-utils/utils/defer";
+import {defer} from "@peryl/utils/defer";
 import {tPlc} from "../../Table/plc/utils/plc.utils";
 import {iFilterQueryParam} from "../../FilterService/utils/filter.service.utils";
 import {tPlcData} from "../../Table/plc/formatPlcList";
@@ -18,6 +18,7 @@ import '../utils/TableOption.space';
 import {eTableOptionEditType} from "../utils/TableOption.utils";
 import i18n from "../../i18n";
 import {AutoModule} from "../utils/AutoModule";
+import {delay} from "@peryl/utils/delay";
 
 declare module '../utils/TableOption.space' {
   namespace TableOptionSpace {
@@ -63,7 +64,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
         await utils.selectCurrent(state.list[0][config.keyField]);
         return state.currentNode!;
       }
-      $notice.error(i18n('table.pleaseSelectOneRecord').d('请选中一条数据'));
+      $notice.error(i18n.$it('table.pleaseSelectOneRecord').d('请选中一条数据'));
       throw new Error('no current node');
     },
     ...(() => {
@@ -120,7 +121,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
         onAfterLoad?: (responseData: iUrlResponseData["query"]) => any,
         onLoaded?: (responseData: iUrlResponseData["query"]) => any,
       }) => {
-      const closeLoading = loading.loading({ message: i18n('base.loading').d('加载中') });
+      const closeLoading = loading.loading({ message: i18n.$it('base.loading').d('加载中') });
       try {
         await editMethods.save();
         if (!loadParam || loadParam.awaitInit !== false) {
@@ -161,6 +162,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
       }
     };
     const reload = async (reloadParam?: { size?: number }) => {
+      if (!state.isInit) {state.isInit = true;}
       await load({
         page: 1,
         size: reloadParam?.size,
@@ -170,7 +172,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
       });
     };
     const queryCount = async (): Promise<number> => {
-      const closeLoading = loading.loading({ message: i18n('table.queryTotal').d('查询总数') });
+      const closeLoading = loading.loading({ message: i18n.$it('table.queryTotal').d('查询总数') });
       try {
         const queryParam = await getLoadQueryParam();
         const responseData = await urlUtils.request({
@@ -210,7 +212,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
         await loadingMethods.save();
         node = node || await utils.getCurrentNode();
         if (!node) {
-          return $notice.warn(i18n('table.selectRowToDelete').d('请选中一行要删除的数据'));
+          return $notice.warn(i18n.$it('table.selectRowToDelete').d('请选中一行要删除的数据'));
         }
         const { page, size } = utils.getPageState();
         const { data, state: { index } } = node;
@@ -218,7 +220,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
           size: config.size,
           render: () => (
             <div style={{ minWidth: '300px', minHeight: '40px', display: 'flex', alignItems: 'center', justifyContent: 'center' }}>
-              {i18n('table.areYouSureYouWantToDeleteTheData', { index: (page - 1) * size + index + 1 }).d(`确定要删除第${(page - 1) * size + index + 1}条数据吗？`)}
+              {i18n.$it('table.areYouSureYouWantToDeleteTheData', { index: (page - 1) * size + index + 1 }).d(`确定要删除第${(page - 1) * size + index + 1}条数据吗？`)}
             </div>
           )
         });
@@ -233,7 +235,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
             }
           });
           if (!!deleteResult.message) {
-            return $notice.error(`${i18n('table.deleteFailed').d('删除失败')}：${deleteResult.message}`);
+            return $notice.error(`${i18n.$it('table.deleteFailed').d('删除失败')}：${deleteResult.message}`);
           }
           await pageMethods.load();
         } finally {
@@ -244,7 +246,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
     })());
 
     const saveInsert = async (editRow: any) => {
-      const closeLoading = loading.loading({ message: i18n('table.savingData').d('正在保存') });
+      const closeLoading = loading.loading({ message: i18n.$it('table.savingData').d('正在保存') });
       try {
         const saveRowPrev = await hooks.onBeforeSaveRow.exec(editRow);
         const newRowResult = await urlUtils.request({
@@ -281,7 +283,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
             const validateResult = await newNode.validate();
             if (!!validateResult) {
               const { validateResultData, node: { state: { index } } } = validateResult;
-              $message.error(`${i18n('table.articleDataVerificationFailed', { index: index + 1 }).d(`第${index + 1}条记录校验不通过`)}，${validateResultData[0].label}:${validateResultData[0].message}`);
+              $message.error(`${i18n.$it('table.articleDataVerificationFailed', { index: index + 1 }).d(`第${index + 1}条记录校验不通过`)}，${validateResultData[0].label}:${validateResultData[0].message}`);
               return Promise.reject(validateResult);
             }
             const saveRow = await saveInsert(newNode.state.editRow);
@@ -298,7 +300,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
       const editForm = async () => {
         await table.formEditor.methods.edit({
           node: table.methods.createTableNode(newRowData, 0),
-          title: i18n('base.edit.edit').d('编辑'),
+          title: i18n.$it('base.edit.edit').d('编辑'),
           onConfirm: async (newNode) => {
             const saveRow = await saveInsert(newNode.state.editRow);
             state.list.unshift(saveRow);
@@ -325,7 +327,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
       let newRows = batchInsertConfig?.rows || await (async () => {
         const num = await new Promise<number>((resolve, reject) => {
           $dialog({
-            title: i18n('table.pleaseEnterTheNumberOfRowsToCreate').d('请输入要新建的行数'),
+            title: i18n.$it('table.pleaseEnterTheNumberOfRowsToCreate').d('请输入要新建的行数'),
             size: config.size,
             editRequired: true,
             editType: 'number',
@@ -339,11 +341,13 @@ export const useTableOptionMethods = AutoModule.createRegistration((
         return new Array(num).fill(null).map(() => deepcopy((!config.defaultNewRow ? {} : (typeof config.defaultNewRow === "function" ? config.defaultNewRow() : config.defaultNewRow))));
       })();
       if (!confirm.checkEditable(eTableOptionStatus.insert)) {await confirm.close.confirm();}
+      state.editingWhenAddRow = true;
+      await delay(23);
       newRows.forEach(newRow => insert(newRow));
     };
 
     const saveUpdate = async (editRow: any) => {
-      const closeLoading = loading.loading({ message: i18n('table.savingData').d('正在保存') });
+      const closeLoading = loading.loading({ message: i18n.$it('table.savingData').d('正在保存') });
       try {
         const saveRowPrev = await hooks.onBeforeSaveRow.exec(editRow);
         const newRowResult = await urlUtils.request({
@@ -372,7 +376,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
             const validateResult = await node.validate();
             if (!!validateResult) {
               const { validateResultData, node: { state: { index } } } = validateResult;
-              $message.error(`${i18n('table.articleDataVerificationFailed', { index: index + 1 }).d(`第${index + 1}条记录校验不通过`)}，${validateResultData[0].label}:${validateResultData[0].message}`);
+              $message.error(`${i18n.$it('table.articleDataVerificationFailed', { index: index + 1 }).d(`第${index + 1}条记录校验不通过`)}，${validateResultData[0].label}:${validateResultData[0].message}`);
               return Promise.reject(validateResult);
             }
             const changeNode = utils.getChangeNode(node);
@@ -396,7 +400,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
       const editForm = async () => {
         await state.getTable()!.formEditor.methods.edit({
           node,
-          title: i18n('base.edit.edit').d('编辑'),
+          title: i18n.$it('base.edit.edit').d('编辑'),
           onConfirm: async (updateNode) => {
             const saveRow = await saveUpdate(updateNode.state.editRow);
             await node.saveEdit(saveRow);
@@ -420,7 +424,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
         });
       });
       if (!Object.keys(editRow).length) {return;}
-      const closeLoading = loading.loading({ message: i18n('table.savingData').d('正在保存') });
+      const closeLoading = loading.loading({ message: i18n.$it('table.savingData').d('正在保存') });
       try {
         await urlUtils.request({
           type: 'batchUpdate',
@@ -442,7 +446,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
 
     const batchDelete = async () => {
       const rows = await check.openToCheck();
-      const closeLoading = loading.loading({ message: i18n('table.deleting').d('正在删除') });
+      const closeLoading = loading.loading({ message: i18n.$it('table.deleting').d('正在删除') });
       try {
         const deleteResult = await urlUtils.request({
           type: 'batchDelete',
@@ -452,9 +456,9 @@ export const useTableOptionMethods = AutoModule.createRegistration((
           beforeRequest: async requestConfig => {await hooks.onBeforeDelete.exec(requestConfig);}
         });
         if (!!deleteResult.message) {
-          return $notice.error(`${i18n('table.deleteFailed').d('删除失败')}：${deleteResult.message}`);
+          return $notice.error(`${i18n.$it('table.deleteFailed').d('删除失败')}：${deleteResult.message}`);
         }
-        $notice.success(i18n('table.deleteSucceed').d('删除成功'));
+        $notice.success(i18n.$it('table.deleteSucceed').d('删除成功'));
         confirm.close.clear();
         await pageMethods.load();
       } finally {
@@ -488,6 +492,7 @@ export const useTableOptionMethods = AutoModule.createRegistration((
   })();
 
   hooks.onTableSetup.use(() => {
+    if (state.isInit) {return;}
     if (config.loadOnStart !== false) {pageMethods.reload();}
   });
 

package/src/packages/components/AutoTable/use/useTableOption.pagination.tsx

@@ -1,8 +1,8 @@
 import {Pagination} from "../../Pagination";
-import {computed, reactive} from "plain-design-composition";
+import {computed, reactive} from "@peryl/react-compose";
 import {iAutoTablePageData} from "../utils/AutoTable.utils";
 import $notice from "../../$notice";
-import {deepcopy} from "plain-utils/object/deepcopy";
+import {deepcopy} from "@peryl/utils/deepcopy";
 
 import '../utils/TableOption.space';
 import i18n from "../../i18n";
@@ -30,7 +30,7 @@ export const useTableOptionPagination = AutoModule.createRegistration((
     createInitialData: (): iAutoTablePageData => {
       return {
         page: 1,
-        size: config.showRows,
+        size: config.pageSize || config.showRows,
         hasNext: true,
         total: null as null | number,
       };
@@ -55,7 +55,7 @@ export const useTableOptionPagination = AutoModule.createRegistration((
         } else {
           const total = await tableMethods.pageMethods.queryCount();
           if (!total) {
-            const msg = i18n('table.queryTotalFailed').d('查询总数失败');
+            const msg = i18n.$it('table.queryTotalFailed').d('查询总数失败');
             $notice.error(msg);
             throw new Error(msg);
           }
@@ -71,6 +71,11 @@ export const useTableOptionPagination = AutoModule.createRegistration((
     pageSizeOptions: deepcopy(config.pageSizeOptions),
   });
 
+  if (!!config.showRows && state.pageSizeOptions.indexOf(config.showRows) === -1) {
+    const index = state.pageSizeOptions.findIndex(i => i > config.showRows);
+    state.pageSizeOptions.splice(index, 0, config.showRows);
+  }
+
   const handler = {
     onSizeChange: async (size: number) => {await methods.changeSize(size);},
     onJump: async (page: number) => {await methods.jump(page);},
@@ -109,13 +114,13 @@ export const useTableOptionPagination = AutoModule.createRegistration((
             ...config.paginationAttrs,
           }}
         >
-          <span>{i18n('base.total').d('总共')}</span>
+          <span>{i18n.$it('base.total').d('总共')}</span>
           {state.total == null ?
             <span className="auto-table-pagination-total-number" onClick={tableMethods.pageMethods.queryCount}>
               {total.value}+
               </span> :
             total.value}
-          <span>{i18n('base.data').d('条数据')}</span>
+          <span>{i18n.$it('base.data').d('条数据')}</span>
         </Pagination>
       </div>
     ),

package/src/packages/components/AutoTable/use/useTableOption.parent.tsx

@@ -1,10 +1,11 @@
 import {iUrlResponseData} from "../utils/TableOption.url";
 import {eTableOptionStatus} from "./useTableOption.confirm";
-import {createEffects} from "plain-utils/utils/createEffects";
-import {onBeforeUnmount} from "plain-design-composition";
+import {createEffects} from "@peryl/utils/createEffects";
+import {onBeforeUnmount} from "@peryl/react-compose";
 import {TableOptionSpace} from "../utils/TableOption.space";
 import '../utils/TableOption.space';
 import {AutoModule} from "../utils/AutoModule";
+import {delay} from "@peryl/utils/delay";
 
 declare module '../utils/TableOption.space' {
   namespace TableOptionSpace {
@@ -74,6 +75,8 @@ export const useTableOptionParent = AutoModule.createRegistration((
   effects.push(
     hooks.onQueryParam.use(async () => {
       if (isDestroy()) {return;}
+      /*这里等待下一个宏任务执行，等 option.state.currentNode 刷新*/
+      await delay(0);
       const currentNode = await parentOption.methods.utils.getCurrentNode();
       return {
         queries: Object.entries(parentMap).map(([childKey, parentKey], index) => ({

package/src/packages/components/AutoTable/use/useTableOption.permission.tsx

@@ -1,5 +1,5 @@
 import {useOperationPermission} from "../../Table/standard/PlcOperation/useOperationPermission";
-import {deepcopy} from "plain-utils/object/deepcopy";
+import {deepcopy} from "@peryl/utils/deepcopy";
 import '../utils/TableOption.space';
 import {AutoModule} from "../utils/AutoModule";
 

package/src/packages/components/AutoTable/use/useTableOption.sort.ts

@@ -1,11 +1,11 @@
-import {iMouseEvent, reactive} from "plain-design-composition";
-import {deepcopy} from "plain-utils/object/deepcopy";
-import {createEnum} from "plain-utils/utils/createEnum";
+import {iMouseEvent, reactive} from "@peryl/react-compose";
+import {deepcopy} from "@peryl/utils/deepcopy";
+import {createEnum} from "@peryl/utils/createEnum";
 import {PartialFields} from "../../../utils/type";
 import {eTableOptionSettingView} from "../setting/useTableOption.setting.utils";
 import {TableOptionSpace} from "../utils/TableOption.space";
 import '../utils/TableOption.space';
-import {toArray} from "plain-utils/utils/toArray";
+import {toArray} from "@peryl/utils/toArray";
 import i18n from "../../i18n";
 import {AutoModule} from "../utils/AutoModule";
 
@@ -70,16 +70,16 @@ export const useTableOptionSortState = AutoModule.createRegistration((
     methods.pageMethods.reload();
   };
 
-  const useSenior = (sortMetas: iTableOptionSortMeta[]) => {
+  const useSenior = (sortMetas: iTableOptionSortMeta[], autoReload: boolean) => {
     state.data.sortMode = eTableOptionSortMode.senior;
     state.data.seniorParam = sortMetas.map(({ field, desc }) => ({ field, desc }));
-    methods.pageMethods.reload();
+    !!autoReload && methods.pageMethods.reload();
   };
 
   filterState.useState({
     seq: 1,
     key: 'option-sort',
-    title: i18n('base.sort').d('排序'),
+    title: i18n.$it('base.sort').d('排序'),
     getActiveFilterCount: () => 0,
     applyCache() {/*do nothing*/},
     getCache: () => {/*do nothing*/},
@@ -88,7 +88,8 @@ export const useTableOptionSortState = AutoModule.createRegistration((
       state.data.sortMode = eTableOptionSortMode.single;
       state.data.singleParam = null;
       state.data.seniorParam = [];
-      methods.pageMethods.reload();
+      /*这里不能自动刷新，会导致调用全部清空的时候重复查询*/
+      // methods.pageMethods.reload();
     },
   });
 
@@ -127,9 +128,9 @@ export const useTableOptionSortState = AutoModule.createRegistration((
       if (!!state.data.singleParam) {
         const { field, desc } = state.data.singleParam;
         const title = tableState.getSourceFlatPlcList().find(i => i.props.field === field)?.props.title;
-        const sortType = desc ? i18n('base.desc').d('降序') : i18n('base.asc').d('升序');
+        const sortType = desc ? i18n.$it('base.desc').d('降序') : i18n.$it('base.asc').d('升序');
         list.push({
-          display: () => i18n('table.sortInTypeOrderOfField', { description: title + sortType }).d(`按照${title}${sortType}排序`),
+          display: () => i18n.$it('table.sortInTypeOrderOfField', { description: title + sortType }).d(`按照${title}${sortType}排序`),
           onClear: (e?: iMouseEvent) => {
             e?.stopPropagation();
             state.data.singleParam = null;
@@ -142,11 +143,11 @@ export const useTableOptionSortState = AutoModule.createRegistration((
       if (!!state.data.seniorParam?.length) {
         const description = state.data.seniorParam!.map(({ field, desc }) => {
           const title = tableState.getSourceFlatPlcList().find(i => i.props.field === field)?.props.title;
-          const sortType = desc ? i18n('base.desc').d('降序') : i18n('base.asc').d('升序');
+          const sortType = desc ? i18n.$it('base.desc').d('降序') : i18n.$it('base.asc').d('升序');
           return `${title}${sortType}`;
         }).join(',');
         list.push({
-          display: () => i18n('table.sortInTypeOrderOfField', { description }).d(`按照${description}排序`),
+          display: () => i18n.$it('table.sortInTypeOrderOfField', { description }).d(`按照${description}排序`),
           onClear: (e?: iMouseEvent) => {
             e?.stopPropagation();
             state.data.seniorParam = [];

package/src/packages/components/AutoTable/use/useTableOption.state.tsx

@@ -1,5 +1,5 @@
 import {TableOptionSpace} from "../utils/TableOption.space";
-import {computed, reactive} from "plain-design-composition";
+import {computed, reactive} from "@peryl/react-compose";
 import {iTableNode} from "../../Table/table/utils/table.utils";
 import '../utils/TableOption.space';
 import {AutoModule} from "../utils/AutoModule";
@@ -14,6 +14,7 @@ declare module '../utils/TableOption.space' {
 
 export const useTableOptionState = AutoModule.createRegistration(({ config, hooks }) => {
   const state: TableOptionSpace.iTableOptionState = reactive({
+    isInit: false,
     getTable: () => null,
     getAutoTable: () => null,
     list: [],

package/src/packages/components/AutoTable/use/useTableOption.table.tsx

@@ -1,11 +1,11 @@
 import {Table} from "../../Table";
 import {iTableNode} from "../../Table/table/utils/table.utils";
-import {tPlcType} from "../../Table/plc/utils/plc.utils";
-import {PlainObject} from "plain-utils/utils/event";
+import {tPlc, tPlcType} from "../../Table/plc/utils/plc.utils";
+import {PlainObject} from "@peryl/utils/event";
 import '../utils/TableOption.space';
 import {PlcIndex} from "../../Table/standard/PlcIndex";
 import {AutoModule} from "../utils/AutoModule";
-import {iMouseEvent} from "plain-design-composition";
+import {Fragment, iMouseEvent} from "@peryl/react-compose";
 
 declare module '../utils/TableOption.space' {
   namespace TableOptionSpace {
@@ -35,8 +35,9 @@ export const useTableOptionTable = AutoModule.createRegistration((
   const handler = {
     onClickRow: (node: iTableNode, e: iMouseEvent) => {hooks.onClickRow.exec({ node, e });},
     onDblclickRow: (node: iTableNode, e: iMouseEvent) => {hooks.onDblclickRow.exec({ node, e });},
-    onClickCell: (node: iTableNode, e: iMouseEvent) => {hooks.onClickCell.exec({ node, e });},
-    onDblclickCell: (node: iTableNode, e: iMouseEvent) => {hooks.onDblclickCell.exec({ node, e });},
+    onClickCell: (node: iTableNode, e: iMouseEvent, plc: tPlc) => {hooks.onClickCell.exec({ node, e, plc });},
+    onDblclickCell: (node: iTableNode, e: iMouseEvent, plc: tPlc) => {hooks.onDblclickCell.exec({ node, e, plc });},
+    onContextmenuCell: (node: iTableNode, e: iMouseEvent, plc: tPlc) => {hooks.onContextmenuCell.exec({ node, e, plc });},
     onClickHead: (plc: tPlcType, e: iMouseEvent) => {hooks.onClickHead.exec({ plc, e });},
     onCurrentChange: (data: PlainObject | null) => {hooks.onCurrentChange.exec(data);},
     onCollectPlcData: hooks.onCollectPlcData.exec,
@@ -46,11 +47,18 @@ export const useTableOptionTable = AutoModule.createRegistration((
   hooks.onRenderColumns.use({
     processor: ({ list, render }) => {list.push({ key: 'index', seq: 0, render });},
     render: () => <>
-      {config.indexing != false && <PlcIndex start={(pagination.state.page - 1) * pagination.state.size}/>}
-      {render.default()}
+      {config.indexing != false && <PlcIndex start={(pagination.state.page - 1) * pagination.state.size} key="key_standard_index"/>}
+      <Fragment key="key_option_render">{render.default()}</Fragment>
     </>
   });
 
+  hooks.onTableRender.use({
+    processor: ({ list, render }) => {config.title && list.push({ key: 'table_title', seq: 3, render });},
+    render: () => (
+      <div className="auto-table-title">{config.title}</div>
+    )
+  });
+
   hooks.onTableRender.use({
     processor: ({ list, render }) => {list.push({ key: 'table', seq: 5, render });},
     render: () => {
@@ -66,6 +74,7 @@ export const useTableOptionTable = AutoModule.createRegistration((
             config: cache.tablePropsConfig,
             headRowHeight: config.headRowHeight,
             bodyRowHeight: config.bodyRowHeight,
+            ...config.tableProps,
             ...handler,
           })}
           v-slots={{ default: () => hooks.onRenderColumns.exec(), }}

package/src/packages/components/AutoTable/use/useTableOption.tips.tsx

@@ -1,5 +1,5 @@
 import {Icon} from "../../Icon";
-import {designComponent, getComponentCls, PropType, useRefs} from "plain-design-composition";
+import {designComponent, getComponentCls, PropType, useRefs} from "@peryl/react-compose";
 import Button from "../../Button";
 import {useTooltip} from "../../useTooltip";
 import {useStyle} from "../../../uses/useStyle";
@@ -54,7 +54,7 @@ export const RenderTableOptionTips = designComponent({
           {tips.map((tip, index) => (
             <RenderTableOptionTipItem tip={tip} key={index}/>
           ))}
-          {!props.hideClearButton && <Button mode="text" icon="pi-delete" label={i18n('table.clearAll').d('全部清空')} onClick={emit.onClearAll}/>}
+          {!props.hideClearButton && <Button size="small" mode="text" icon="pi-delete" label={i18n.$it('table.clearAll').d('全部清空')} onClick={emit.onClearAll}/>}
         </div>
       );
     };
@@ -77,10 +77,10 @@ export const RenderTableOptionTipItem = designComponent({
       }),
     });
     return () => (
-      <div onClick={props.tip.onClick} className="auto-table-tips-item">
+      <div onClick={props.tip.onClick} className="auto-table-tips-item" data-no-clear={!props.tip.onClear || props.tip.noClear}>
         <span className="auto-table-tips-label" ref={onRef.el}>{props.tip.display()}</span>
         <div className="auto-table-tips-separator"/>
-        {!!props.tip.onClear && <Icon className="auto-table-tips-close" icon="pi-close" onClick={props.tip.onClear}/>}
+        {!!props.tip.onClear && !props.tip.noClear && <Icon className="auto-table-tips-close" icon="pi-close" onClick={props.tip.onClear}/>}
       </div>
     );
   },

package/src/packages/components/AutoTable/use/useTableOptionKeyboard.tsx

@@ -1,5 +1,5 @@
-import {onBeforeUnmount, SimpleFunction} from "plain-design-composition";
-import {KeyBoardMap} from "../../KeyboardService";
+import {onBeforeUnmount, SimpleFunction} from "@peryl/react-compose";
+import {getKeyNameByKeyboardEvent} from "@peryl/utils/keyboard";
 import '../utils/TableOption.space';
 import {AutoModule} from "../utils/AutoModule";
 
@@ -26,7 +26,11 @@ export const useTableOptionKeyboard = AutoModule.createRegistration(({ hooks })
       (e.metaKey || e.ctrlKey) && names.push('ctrl');
       e.shiftKey && names.push('shift');
       e.altKey && names.push('alt');
-      names.push((KeyBoardMap as any)[e.keyCode]);
+
+      const keyName = getKeyNameByKeyboardEvent(e);
+      if (!keyName) {return; }
+
+      names.push(keyName);
       const compositionKeyName = names.join('+');
 
       const listener = [...staticState.listeners];
@@ -51,6 +55,7 @@ export const useTableOptionKeyboard = AutoModule.createRegistration(({ hooks })
       staticState.clearTableEnterEvent = () => {
         el.removeEventListener('mouseenter', onEnter);
         el.removeEventListener('mouseleave', onLeave);
+        staticState.clearTableEnterEvent = null;
       };
 
       return staticState.clearTableEnterEvent;
@@ -66,7 +71,10 @@ export const useTableOptionKeyboard = AutoModule.createRegistration(({ hooks })
         }
       };
       document.body.addEventListener('keydown', onKeydown);
-      staticState.clearTableKeydownEvent = () => {document.body.removeEventListener('keydown', onKeydown);};
+      staticState.clearTableKeydownEvent = () => {
+        document.body.removeEventListener('keydown', onKeydown);
+        staticState.clearTableKeydownEvent = null;
+      };
       return staticState.clearTableKeydownEvent;
     },
   };
@@ -79,6 +87,7 @@ export const useTableOptionKeyboard = AutoModule.createRegistration(({ hooks })
   onBeforeUnmount(() => {
     staticState.clearTableEnterEvent?.();
     staticState.clearTableKeydownEvent?.();
+    staticState.listeners.splice(0, staticState.listeners.length);
   });
 
   const on = (name: string, handler: (e: KeyboardEvent) => void) => {

package/src/packages/components/AutoTable/utils/AutoModule.ts

@@ -1,4 +1,4 @@
-import {createModule} from 'plain-design-composition';
+import {createModule} from '@peryl/react-compose';
 import {TableOptionSpace} from "./TableOption.space";
 
 export const AutoModule = createModule</*@formatter:off*/

package/src/packages/components/AutoTable/utils/AutoTable.utils.ts

@@ -1,6 +1,8 @@
-import {tScopeSlotsType, tSlotsType} from "plain-design-composition";
+import {tScopeSlotsType, tSlotsType} from "@peryl/react-compose";
 import {iTableCellRenderScope} from "../../Table/table/utils/table.utils";
 import {TableOptionSpace} from "./TableOption.space";
+import {iAiConfiguration} from "../../$ai";
+import {tPlc} from "../../Table/plc/utils/plc.utils";
 
 /**
  * AutoTable插槽类型
@@ -43,3 +45,76 @@ export interface iAutoTablePageData {
   hasNext: boolean,
   total?: null | number,
 }
+
+/**
+ * AutoOption中配置AI的相关设置
+ * @author  韦胜健
+ * @date    2025/4/6 10:58
+ */
+export interface iAutoTableAiConfig {
+  search: boolean,
+  sort: boolean,
+  config: boolean,
+  aiConfig?: iAiConfiguration,
+}
+
+/**
+ * settingConfig中编辑的数据类型
+ * @author  韦胜健
+ * @date    2025/4/7 22:43
+ */
+export interface iPlcConfigData {
+  field: string,
+  title?: string,
+  order: number,
+  align: string,
+  width: number,
+  fixed: string,
+  hide?: boolean,
+
+  plcRef: () => tPlc,
+  key: string,
+}
+
+/**
+ * 通过外部数据源的方式配置字段信息的数据类型
+ * @author  韦胜健
+ * @date    2025/4/7 22:43
+ */
+export type iPlcCustomData = Partial<Omit<iPlcConfigData, 'plcRef' | 'key' | 'field'>> & { field: string }
+
+/*---------------------------------------table ai types-------------------------------------------*/
+
+/*ai返回列表搜索的数据类型*/
+export interface iTableAiOperateSearch {
+  type: 'search',
+  data: { filters: { id: string, field: string, filterHandler: string, value: any }[], filterExpression: string }
+}
+
+/*ai返回列表排序的数据类型*/
+export interface iTableAiOperateSort {
+  type: 'sort',
+  data: { field: string, desc: boolean, title: string }[]
+}
+
+/*ai返回列表字段配置的数据类型*/
+export interface iTableAiOperateConfig {
+  type: 'config',
+  data: iTableAiOperatePlcMeta[]
+}
+
+/*ai返回的解析错误的数据类型*/
+export interface iTableAiOperateError {
+  type: 'error',
+  data: string
+}
+
+/**
+ * ai返回的配置字段的耽搁字段配置数据类型
+ * @author  韦胜健
+ * @date    2025/4/7 22:47
+ */
+export type iTableAiOperatePlcMeta = iPlcCustomData & { filterType: string }
+
+/*ai返回的数据类型*/
+export type iTableAiOperate = iTableAiOperateSearch | iTableAiOperateSort | iTableAiOperateConfig | iTableAiOperateError