@cfmm/umi-plugins-ui-v2 0.0.16 → 0.0.18

package/dist/cjs/types/ImportExeclTypes.d.ts

@@ -1 +1 @@
-export declare const ImportExeclTypes = "\nexport interface ImportExeclProps<T = any[]> {\n  accept?: string;\n  /**\n   * \u4E0A\u4F20\u4E8B\u4EF6\uFF0C\u83B7\u53D6execl\u6570\u636E\u5217\u8868\uFF0C\u51FD\u6570\u8FD4\u56DEpromise\u5E76\u4E14showDefautlMessage\u4E0D\u662Ffalse\u65F6\u6709\u9ED8\u8BA4message\u63D0\u793A\n   */\n  onChange: (list: T, fileInfo: Pick<UploadFile, 'name' | 'size' | 'type' | 'uid'>) => Promise<{ success: boolean; failMsg?: string; data?: any } | void> | void;\n  /**\n   * \u663E\u793A\u9ED8\u8BA4\u7684\u63D0\u793A\n   */\n  showDefautlMessage?: boolean;\n  /**\n   * \u6309\u94AE\u6587\u672C\n   */\n  title?: string;\n  /**\n   * \u8BFB\u53D6\u5DE5\u4F5C\u7C3F\u6570\u91CF\uFF0C\u9ED8\u8BA41\n   */\n  max?: number;\n  /**\n   * \u4EE5\u7B2C\u51E0\u884C\u4E3A\u8868\u5934\uFF0C\u9ED8\u8BA4\u7B2C\u4E00\u884C\n   */\n  header?: number;\n  /**\n   * \u4EE5\u7B2C\u51E0\u5217\u7B2C\u51E0\u884C\u5F00\u59CB\u8BFB\u53D6\uFF0C\u9ED8\u8BA4\u7B2C\u4E00\u884C\u7B2C\u4E00\u5217\n   */\n  rangeStart?: { c: number; r: number };\n  /**\n   * \u4FDD\u7559\u7A7A\u884C\uFF0C\u9ED8\u8BA4false\n   */\n  blankrows?: boolean;\n  /**\n   * \u81EA\u5B9A\u4E49\u6309\u94AE\u5185\u5BB9\n   */\n  children?: React.ReactNode;\n  /**\n   * Upload\u7EC4\u4EF6\u5C5E\u6027\n   */\n  uploadProps?: UploadProps;\n  /**\n   * Button\u7EC4\u4EF6\u5C5E\u6027\n   */\n  buttonProps?: ButtonProps;\n}\n";
+export declare const ImportExeclTypes = "\nexport interface ImportExeclProps<T = any[]> {\n  accept?: string;\n  /**\n   * \u4E0A\u4F20\u4E8B\u4EF6\uFF0C\u83B7\u53D6execl\u6570\u636E\u5217\u8868\uFF0C\u51FD\u6570\u8FD4\u56DEpromise\u5E76\u4E14showDefautlMessage\u4E0D\u662Ffalse\u65F6\u6709\u9ED8\u8BA4message\u63D0\u793A\n   */\n  onChange: (list: T, fileInfo: Pick<UploadFile, 'name' | 'size' | 'type' | 'uid'>) => Promise<{\n    success: boolean; failMsg?: string; data?: {\n      success: boolean;\n      insertCount: number;\n      updateCount: number;\n      deleteCount: number;\n    } | number\n  } | void> | void;\n  /**\n   * \u663E\u793A\u9ED8\u8BA4\u7684\u63D0\u793A\n   */\n  showDefautlMessage?: boolean;\n  /**\n   * \u6309\u94AE\u6587\u672C\n   */\n  title?: string;\n  /**\n   * \u8BFB\u53D6\u5DE5\u4F5C\u7C3F\u6570\u91CF\uFF0C\u9ED8\u8BA41\n   */\n  max?: number;\n  /**\n   * \u4EE5\u7B2C\u51E0\u884C\u4E3A\u8868\u5934\uFF0C\u9ED8\u8BA4\u7B2C\u4E00\u884C\n   */\n  header?: number;\n  /**\n   * \u4EE5\u7B2C\u51E0\u5217\u7B2C\u51E0\u884C\u5F00\u59CB\u8BFB\u53D6\uFF0C\u9ED8\u8BA4\u7B2C\u4E00\u884C\u7B2C\u4E00\u5217\n   */\n  rangeStart?: { c: number; r: number };\n  /**\n   * \u7A7A\u5355\u5143\u683C\u5360\u4F4D\u503C\uFF1B\u4F20\u5165\u540E\u6BCF\u884C\u5BF9\u8C61\u4F1A\u5305\u542B\u4E0E\u8868\u5934\u5BF9\u9F50\u7684\u5168\u90E8 key\uFF08\u7A7A\u5355\u5143\u683C\u4E3A\u8BE5\u503C\uFF09\uFF0C\u5426\u5219 SheetJS \u4F1A\u7701\u7565\u7A7A\u5355\u5143\u683C\u5BF9\u5E94\u5B57\u6BB5\n   */\n  defval?: unknown;\n  /**\n   * \u4FDD\u7559\u7A7A\u884C\uFF0C\u9ED8\u8BA4false\n   */\n  blankrows?: boolean;\n  /**\n   * \u81EA\u5B9A\u4E49\u6309\u94AE\u5185\u5BB9\n   */\n  children?: React.ReactNode;\n  /**\n   * Upload\u7EC4\u4EF6\u5C5E\u6027\n   */\n  uploadProps?: UploadProps;\n  /**\n   * Button\u7EC4\u4EF6\u5C5E\u6027\n   */\n  buttonProps?: ButtonProps;\n}\n";

package/dist/cjs/types/ImportExeclTypes.js

@@ -4,4 +4,4 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ImportExeclTypes = void 0;
-var ImportExeclTypes = exports.ImportExeclTypes = "\nexport interface ImportExeclProps<T = any[]> {\n  accept?: string;\n  /**\n   * \u4E0A\u4F20\u4E8B\u4EF6\uFF0C\u83B7\u53D6execl\u6570\u636E\u5217\u8868\uFF0C\u51FD\u6570\u8FD4\u56DEpromise\u5E76\u4E14showDefautlMessage\u4E0D\u662Ffalse\u65F6\u6709\u9ED8\u8BA4message\u63D0\u793A\n   */\n  onChange: (list: T, fileInfo: Pick<UploadFile, 'name' | 'size' | 'type' | 'uid'>) => Promise<{ success: boolean; failMsg?: string; data?: any } | void> | void;\n  /**\n   * \u663E\u793A\u9ED8\u8BA4\u7684\u63D0\u793A\n   */\n  showDefautlMessage?: boolean;\n  /**\n   * \u6309\u94AE\u6587\u672C\n   */\n  title?: string;\n  /**\n   * \u8BFB\u53D6\u5DE5\u4F5C\u7C3F\u6570\u91CF\uFF0C\u9ED8\u8BA41\n   */\n  max?: number;\n  /**\n   * \u4EE5\u7B2C\u51E0\u884C\u4E3A\u8868\u5934\uFF0C\u9ED8\u8BA4\u7B2C\u4E00\u884C\n   */\n  header?: number;\n  /**\n   * \u4EE5\u7B2C\u51E0\u5217\u7B2C\u51E0\u884C\u5F00\u59CB\u8BFB\u53D6\uFF0C\u9ED8\u8BA4\u7B2C\u4E00\u884C\u7B2C\u4E00\u5217\n   */\n  rangeStart?: { c: number; r: number };\n  /**\n   * \u4FDD\u7559\u7A7A\u884C\uFF0C\u9ED8\u8BA4false\n   */\n  blankrows?: boolean;\n  /**\n   * \u81EA\u5B9A\u4E49\u6309\u94AE\u5185\u5BB9\n   */\n  children?: React.ReactNode;\n  /**\n   * Upload\u7EC4\u4EF6\u5C5E\u6027\n   */\n  uploadProps?: UploadProps;\n  /**\n   * Button\u7EC4\u4EF6\u5C5E\u6027\n   */\n  buttonProps?: ButtonProps;\n}\n";
+var ImportExeclTypes = exports.ImportExeclTypes = "\nexport interface ImportExeclProps<T = any[]> {\n  accept?: string;\n  /**\n   * \u4E0A\u4F20\u4E8B\u4EF6\uFF0C\u83B7\u53D6execl\u6570\u636E\u5217\u8868\uFF0C\u51FD\u6570\u8FD4\u56DEpromise\u5E76\u4E14showDefautlMessage\u4E0D\u662Ffalse\u65F6\u6709\u9ED8\u8BA4message\u63D0\u793A\n   */\n  onChange: (list: T, fileInfo: Pick<UploadFile, 'name' | 'size' | 'type' | 'uid'>) => Promise<{\n    success: boolean; failMsg?: string; data?: {\n      success: boolean;\n      insertCount: number;\n      updateCount: number;\n      deleteCount: number;\n    } | number\n  } | void> | void;\n  /**\n   * \u663E\u793A\u9ED8\u8BA4\u7684\u63D0\u793A\n   */\n  showDefautlMessage?: boolean;\n  /**\n   * \u6309\u94AE\u6587\u672C\n   */\n  title?: string;\n  /**\n   * \u8BFB\u53D6\u5DE5\u4F5C\u7C3F\u6570\u91CF\uFF0C\u9ED8\u8BA41\n   */\n  max?: number;\n  /**\n   * \u4EE5\u7B2C\u51E0\u884C\u4E3A\u8868\u5934\uFF0C\u9ED8\u8BA4\u7B2C\u4E00\u884C\n   */\n  header?: number;\n  /**\n   * \u4EE5\u7B2C\u51E0\u5217\u7B2C\u51E0\u884C\u5F00\u59CB\u8BFB\u53D6\uFF0C\u9ED8\u8BA4\u7B2C\u4E00\u884C\u7B2C\u4E00\u5217\n   */\n  rangeStart?: { c: number; r: number };\n  /**\n   * \u7A7A\u5355\u5143\u683C\u5360\u4F4D\u503C\uFF1B\u4F20\u5165\u540E\u6BCF\u884C\u5BF9\u8C61\u4F1A\u5305\u542B\u4E0E\u8868\u5934\u5BF9\u9F50\u7684\u5168\u90E8 key\uFF08\u7A7A\u5355\u5143\u683C\u4E3A\u8BE5\u503C\uFF09\uFF0C\u5426\u5219 SheetJS \u4F1A\u7701\u7565\u7A7A\u5355\u5143\u683C\u5BF9\u5E94\u5B57\u6BB5\n   */\n  defval?: unknown;\n  /**\n   * \u4FDD\u7559\u7A7A\u884C\uFF0C\u9ED8\u8BA4false\n   */\n  blankrows?: boolean;\n  /**\n   * \u81EA\u5B9A\u4E49\u6309\u94AE\u5185\u5BB9\n   */\n  children?: React.ReactNode;\n  /**\n   * Upload\u7EC4\u4EF6\u5C5E\u6027\n   */\n  uploadProps?: UploadProps;\n  /**\n   * Button\u7EC4\u4EF6\u5C5E\u6027\n   */\n  buttonProps?: ButtonProps;\n}\n";

package/dist/cjs/utils/importHelper.tpl

@@ -1,10 +1,10 @@
 // replaceTo:tsx
-import { UTC_FORMAT } from '../constants';
 import { getIntl } from '@umijs/max';
 import { Modal, Tag } from 'antd';
 import dayjs from 'dayjs';
 import { parse } from 'querystring';
 import * as XLSX from 'xlsx';
+import { UTC_FORMAT } from '../constants';
 
 /**
  * 提取括号中的值
@@ -22,6 +22,8 @@ export const getParenthesisValue = (str: string) => {
  * @param max 最大读取行数
  * @param header 哪行是表头，默认第一行
  * @param rangeStart 开始读取行数{ c: 1, r: 2 } 从第2列第3行开始读取
+ * @param defval 缺省单元格占位值；传入后空单元格也会出现在每行对象中（如 `''` / `null`），不传则 SheetJS 默认会省略空字段的 key
+ * @param blankrows 是否输出完全空白的行，与 SheetJS `sheet_to_json` 的 `blankrows` 一致；不传则使用库默认
  * @return Promise<T = any[]>
  */
 export function importExexl<T = any>({
@@ -29,11 +31,17 @@ export function importExexl<T = any>({
   max = 1,
   rangeStart,
   header,
+  defval = null,
+  blankrows,
 }: {
   file: any;
   max?: number;
   header?: number;
   rangeStart?: { c: number; r: number };
+  /** 空单元格占位，传入后不过滤空字段（与表头对齐的 key 都会存在） */
+  defval?: unknown;
+  /** 是否输出空白行 */
+  blankrows?: boolean;
 }): Promise<T[]> {
   return new Promise((resolve, reject) => {
     // 通过FileReader对象读取文件
@@ -61,6 +69,9 @@ export function importExexl<T = any>({
               XLSX.utils.sheet_to_json(workbook.Sheets[sheet], {
                 header,
                 dateNF: 'YYYY-MM-DDTHH:mm:ss[Z]',
+                ...(blankrows !== undefined ? { blankrows } : {}),
+                // 有 defval 时空单元格也会生成对应字段，否则缺省单元格不会出现在对象里
+                ...(defval !== undefined ? { defval } : {}),
                 // 属性s从第1列第3行开始读取，属性c到最后一行最后一列结束（Excel 行号从1开始）
                 range: rangeStart
                   ? {
@@ -145,23 +156,23 @@ function convertIndexedPropertiesToArrays(obj: Record<string, any>): any {
  * @returns
  */
 export const handleImportExeclCellValue = (value: unknown, type?: string) => {
-  if (!value && value !== 0 && value !== '0') return;
+  if (!value && value !== 0 && value !== '0') return value;
 
   if (type === 'parenthesisCode') {
     const newValue = getParenthesisValue(value as string);
     return typeof newValue === 'string' ? newValue.trim() : newValue;
   }
-if (value instanceof Date || (type === 'date' && typeof value === 'string')) {
+  if (value instanceof Date || (type === 'date' && typeof value === 'string')) {
     if (value instanceof Date) {
       const corrected = new Date(value);
       const seconds = corrected.getSeconds();
-      
+
       // 修正读取execl日期精度问题，如果秒数大于10，加1分钟并清零分钟和秒
       if (seconds > 10) {
         corrected.setMinutes(corrected.getMinutes() + 1);
         corrected.setSeconds(0, 0); // 清零秒和毫秒
       }
-      
+
       const dateStr = dayjs.utc(corrected).format(UTC_FORMAT);
       return dateStr;
     }
@@ -187,7 +198,7 @@ export const createNestedObjectAndSetValue = (
   keys: string | string[],
   value: any,
   obj: Record<string, any>,
-  options: Omit<HandleImportListOptions, 'hasRowNum'>
+  options: Omit<HandleImportListOptions, 'hasRowNum'>,
 ) => {
   if (!keys.length) return obj;
   // 过滤没有定义code的字段
@@ -207,7 +218,7 @@ export const createNestedObjectAndSetValue = (
   const handleValue = needHandleCenterlineValue ? (value === '-' ? null : value) : value;
 
   // 转为嵌套对象
-  newKeys.forEach((key) => {
+  newKeys.forEach((key, idx) => {
     if (current[key] === undefined) {
       current[key] = {};
     }

package/dist/esm/components/CrudTable.tpl

@@ -2,7 +2,7 @@ import { CloudDownloadOutlined, DownloadOutlined, PlusOutlined, UploadOutlined }
 import { ActionType, ColumnsState, ProColumns, ProFormInstance, ProTable } from '@ant-design/pro-components';
 import { cfmmUtils, ImportExecl, useFormatLocale, useIntl, useModel } from '@umijs/max';
 import { Button, Drawer, Dropdown, MenuProps, message, Modal, Progress, Radio } from 'antd';
-import React, { ForwardedRef, forwardRef, useImperativeHandle, useMemo, useRef, useState } from 'react';
+import React, { ForwardedRef, forwardRef, useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import useAction from '../hooks/useAction';
 import useAuthority from '../hooks/useAuthority';
 import useMemoizedFn from '../hooks/useMemoizedFn';
@@ -716,6 +716,11 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
     ];
   }, [rowKey, columns, multiLang, defaultAuthCodes, actionColumnConfig, updateFormRef]);
 
+  const viewColumns = useMemo<ProColumns<T>[]>(() => {
+    // 如果没有配置hideInExport，说明是正常的表格字段，配置了hideInExport，说明是导出隐藏的列
+    return columns.filter((column) => (column as any).hideInExport ?? true);
+  }, [columns]);
+
   const editColumns = useMemo<ProColumns<T>[]>(() => {
     return columns.map((column) => {
       if (updateConfig.disabledColumnKeys?.includes(column.dataIndex as keyof T)) {
@@ -764,6 +769,11 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
       onDelete: handleDelete,
       updateModalOpen: () => updateDrawerRef.current?.show(),
       updateModalClose: () => updateDrawerRef.current?.close(),
+      handlePercentChange,
+      downloadButtonLoading,
+      setDownloadButtonLoading,
+      percent,
+      setPercent,
     }),
     [
       actionRef,
@@ -788,6 +798,11 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
       setEditLangModalOpen,
       setCurrentLangInfo,
       handleDelete,
+      handlePercentChange,
+      downloadButtonLoading,
+      setDownloadButtonLoading,
+      percent,
+      setPercent,
     ],
   );
 
@@ -866,7 +881,7 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
             }
             key="add"
           >
-            <PlusOutlined style={{ marginRight: 6 }} />
+            <PlusOutlined style={{ marginRight: 8 }} />
             {formatMessage({ id: 'cfmmUI.common.button.add', defaultMessage: '新增' })}
           </a>
         ),
@@ -876,7 +891,7 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
         key: 'exportMultiLang',
         label: (
           <a onClick={handleExportMultiLang} key="exportMultiLang">
-            <CloudDownloadOutlined style={{ marginRight: 6 }} />
+            <CloudDownloadOutlined style={{ marginRight: 8 }} />
             {formatMessage({ id: 'cfmmUI.common.button.exportMultiLang', defaultMessage: '导出多语言' })}
           </a>
         ),
@@ -898,7 +913,7 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
         key: 'templateDownload',
         label: (
           <a onClick={handleDownloadTemplate} key="templateDownload">
-            <DownloadOutlined style={{ marginRight: 6 }} />
+            <DownloadOutlined style={{ marginRight: 8 }} />
             {formatMessage({ id: 'cfmmUI.common.button.templateDownload', defaultMessage: '下载模板' })}
           </a>
         ),
@@ -909,7 +924,7 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
         disabled: !tableList.length || loading,
         label: (
           <a onClick={handleDownloadExcel} key="export">
-            <CloudDownloadOutlined style={{ marginRight: 6 }} />
+            <CloudDownloadOutlined style={{ marginRight: 8 }} />
             {formatMessage({ id: 'cfmmUI.common.button.exportData', defaultMessage: '导出数据' })}
           </a>
         ),
@@ -940,6 +955,12 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
     return allButtons!.filter((button) => button.auth).map(({ auth, ...rest }) => rest);
   }, [tableList, loading, columnsStateMap]);
 
+  useEffect(() => {
+    return () => {
+      timer.current && clearTimeout(timer.current);
+    };
+  }, []);
+
   return (
     <>
       {downloadButtonLoading ? <Progress percent={percent} size="small" /> : null}
@@ -1149,7 +1170,7 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
       />
 
       {/* 查看详情 */}
-      <ViewTableItemDrawer<T> row={viewRow} onClose={useMemoizedFn(() => setViewRow(undefined))} columns={columns} />
+      <ViewTableItemDrawer<T> row={viewRow} onClose={useMemoizedFn(() => setViewRow(undefined))} columns={viewColumns} />
 
       {/* 操作日志 */}
       <ActionLogDrawer row={actionLogRow} onClose={useMemoizedFn(() => setActionLogRow(undefined))} />

package/dist/esm/components/ImportExecl.tpl

@@ -1,19 +1,21 @@
-import { importExexl } from '../utils/importHelper';
 import { UploadOutlined } from '@ant-design/icons';
 import { useIntl } from '@umijs/max';
 import type { UploadFile, UploadProps } from 'antd';
-import { Button, message, Upload } from 'antd';
+import { Button, message, Modal, Upload } from 'antd';
 import React from 'react';
 import { ImportExeclProps } from '../types';
+import { importExexl } from '../utils/importHelper';
 import styles from './ImportExecl.less';
 
 const ImportExecl = <T,>(props: ImportExeclProps<T>) => {
   const {
-    accept = ".xlsx, .xls",
+    accept = '.xlsx, .xls',
     title,
     max,
     header,
     rangeStart,
+    defval,
+    blankrows,
     uploadProps,
     buttonProps,
     children,
@@ -36,7 +38,7 @@ const ImportExecl = <T,>(props: ImportExeclProps<T>) => {
           0,
         );
 
-      const data = await importExexl({ file: info.file, rangeStart, max, header });
+      const data = await importExexl({ file: info.file, rangeStart, max, header, defval, blankrows });
       const result = await onChange?.(data as T, info.file as UploadFile);
 
       hide?.();
@@ -52,6 +54,52 @@ const ImportExecl = <T,>(props: ImportExeclProps<T>) => {
                 { count: result.data },
               ),
             );
+          } else if (
+            result.data &&
+            typeof result.data === 'object' &&
+            (result.data.insertCount || result.data.updateCount || result.data.deleteCount)
+          ) {
+            const { insertCount = 0, updateCount = 0, deleteCount = 0 } = result.data;
+            Modal.info({
+              title: formatMessage(
+                {
+                  id: 'cfmmUI.File.import.exceed.success',
+                  defaultMessage: '成功导入 {count} 条数据',
+                },
+                { count: insertCount + updateCount + deleteCount },
+              ),
+              content: (
+                <div>
+                  <p>
+                    {formatMessage(
+                      {
+                        id: 'cfmmUI.File.import.add.success',
+                        defaultMessage: '新增 {insertCount} 条数据',
+                      },
+                      { count: insertCount },
+                    )}
+                  </p>
+                  <p>
+                    {formatMessage(
+                      {
+                        id: 'cfmmUI.File.import.update.success',
+                        defaultMessage: '更新 {updateCount} 条数据',
+                      },
+                      { count: updateCount },
+                    )}
+                  </p>
+                  <p>
+                    {formatMessage(
+                      {
+                        id: 'cfmmUI.File.import.delete.success',
+                        defaultMessage: '删除 {deleteCount} 条数据',
+                      },
+                      { count: deleteCount },
+                    )}
+                  </p>
+                </div>
+              ),
+            });
           } else {
             message.success(
               formatMessage({
@@ -105,4 +153,4 @@ const ImportExecl = <T,>(props: ImportExeclProps<T>) => {
   );
 };
 
-export default React.memo(ImportExecl) as <T,>(props: ImportExeclProps<T>) => React.ReactElement;
+export default React.memo(ImportExecl) as <T>(props: ImportExeclProps<T>) => React.ReactElement;

package/dist/esm/hooks/useAction.tpl

@@ -4,10 +4,16 @@ import { useState } from 'react';
 import { API } from '../types';
 import useActionLocales from './useActionLocales';
 
-// 支持两种函数签名的ActionFn类型
+/** 与 queryList 中 queryFn 一致：用泛型 K 绑定接口返回的 data/rows 载荷类型 */
+type ListOrBasePromise<K> = Promise<API.Result_Base<K>> | Promise<API.Result_Base_List<K>>;
+
+/**
+ * 支持多种 service 签名；K 由返回的 Result_Base<K> / Result_Base_List<K> 推断（与 useQueryTableList 思路一致）
+ */
 export type ActionFn<T, K> =
-  | ((params: T, url?: string) => Promise<API.Result_Base<K>>)
-  | ((method: API.MethodTypes, params: T, url?: string) => Promise<API.Result_Base<K>>);
+  | (() => ListOrBasePromise<K>)
+  | ((params: T, url?: string) => ListOrBasePromise<K>)
+  | ((method: API.MethodTypes, params: T, url?: string) => ListOrBasePromise<K>);
 
 type Options<T, K> = {
   // loading时的提示内容，false时不显示
@@ -24,6 +30,13 @@ type Options<T, K> = {
   showMsg?: boolean;
 };
 
+/** doAction 返回值：`data` 恒为 `K | null`（无 undefined），便于多项目复用 */
+export type DoActionResult<K> = {
+  success: boolean;
+  data: K | null;
+  error: AxiosError | null;
+};
+
 interface IProps {
   baseLocalCode?: string;
   baseLocalName?: string;
@@ -38,24 +51,20 @@ const useAction = (props: IProps = {}) => {
   const [error, setError] = useState<AxiosError>();
 
   /**
-   * 列表的操作方法
-   * @param method 请求方式
-   * @param params 传给后端的参数
-   * @param {Options} options
-   * @returns {{success: boolean; data?: K | null}}
+   * 列表的操作方法；`data` 的泛型 K 由 `options.actionFn` 的返回类型推断（未标注返回类型时 K 回退为 any，与旧行为一致）
    */
-  async function doAction<T = API.TableListParams, K = any>(
+  async function doAction<TParams = API.TableListParams, KData = any>(
     method: API.AllMethodTypes,
-    params: T,
-    options: Omit<Options<T, K>, 'actionFn'> & { actionFn: any },
+    params: TParams,
+    options: Options<TParams, KData>,
     url?: string,
-  ): Promise<{ success: boolean; data?: K | null; error?: AxiosError | null }> {
+  ): Promise<DoActionResult<KData>> {
     setLoading(true);
 
     const { actionFn, waitingMsg, successMsg, failMsg, showMsg = true, errCallback } = options;
 
     let success: boolean = false;
-    let data: K | null = null;
+    let data: KData | null = null;
     let fnError: AxiosError | null = null;
     let hide;
 
@@ -76,14 +85,13 @@ const useAction = (props: IProps = {}) => {
     }
 
     try {
-      // 根据actionFn的参数数量决定如何调用
-      let result: API.Result_Base<K>;
+      type AnyResult = API.Result_Base<KData> | API.Result_Base_List<KData>;
+      let result: AnyResult;
+      const callFn = actionFn as (...args: unknown[]) => Promise<AnyResult>;
       if (actionFn.length === 1 || (actionFn.length === 2 && url)) {
-        // actionFn只接受一个参数(params)或两个参数(params, url)
-        result = await (actionFn as (params: T, url?: string) => Promise<API.Result_Base<K>>)(params, url);
+        result = await (callFn as (p: TParams, u?: string) => Promise<AnyResult>)(params, url);
       } else {
-        // actionFn接受method参数
-        result = await (actionFn as (method: API.MethodTypes, params: T, url?: string) => Promise<API.Result_Base<K>>)(
+        result = await (callFn as (m: API.MethodTypes, p: TParams, u?: string) => Promise<AnyResult>)(
           requestMethod,
           params,
           url,
@@ -92,16 +100,23 @@ const useAction = (props: IProps = {}) => {
 
       // 返回数据处理
       if (result && result.code === 200) {
-        if(requestMethod === 'GET' && successMsg && showMsg) {
+        if (requestMethod === 'GET' && successMsg && showMsg) {
           message.success(successMsg);
         }
-        if(requestMethod !== 'GET' && showMsg && successMsg !== false) {
+        if (requestMethod !== 'GET' && showMsg && successMsg !== false) {
           const { successMsg: successMessage } = getActionLocales(method);
           message.success(successMsg || successMessage);
         }
         success = true;
-        if (result.data) {
-          data = result.data;
+        if ('rows' in result) {
+          const r = result as API.Result_Base_List<KData>;
+          const raw = r.data != null ? r.data : r.rows;
+          // 与历史逻辑一致：仅 truthy 时写入（0 / false / 空串 等仍不写入，避免行为变化）
+          if (raw) {
+            data = raw as KData;
+          }
+        } else if ((result as API.Result_Base<KData>).data) {
+          data = (result as API.Result_Base<KData>).data;
         }
       }
 

package/dist/esm/locales/en-US.d.ts

@@ -52,6 +52,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/enUS/File.d.ts

@@ -35,6 +35,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/enUS/File.js

@@ -35,6 +35,9 @@ export default {
   'cfmmUI.File.import': 'Import',
   'cfmmUI.File.import.exceed.error.title': 'Import Failed, Reason',
   'cfmmUI.File.import.exceed.success': 'Successfully Imported {count} Pieces Of Data',
+  'cfmmUI.File.import.add.success': 'Added {count} Pieces Of Data',
+  'cfmmUI.File.import.update.success': 'Updated {count} Pieces Of Data',
+  'cfmmUI.File.import.delete.success': 'Deleted {count} Pieces Of Data',
   'cfmmUI.File.button.excel.download': 'Download As Excel',
   'cfmmUI.File.check.type.failMessage': 'This File Type Is Not Supported, It Can Only Be {type} Type',
   'cfmmUI.File.check.size.failMessage': 'The File Cannot Be Larger Than {size}',

package/dist/esm/locales/enUS/index.d.ts

@@ -52,6 +52,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/th-TH.d.ts

@@ -52,6 +52,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/zh-CN.d.ts

@@ -52,6 +52,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/zh-TW.d.ts

@@ -51,6 +51,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/zhCN/File.d.ts

@@ -35,6 +35,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/zhCN/File.js

@@ -35,6 +35,9 @@ export default {
   'cfmmUI.File.import': '导入',
   'cfmmUI.File.import.exceed.error.title': '导入失败，原因如下',
   'cfmmUI.File.import.exceed.success': '成功导入 {count} 条数据',
+  'cfmmUI.File.import.add.success': '新增 {count} 条数据',
+  'cfmmUI.File.import.update.success': '更新 {count} 条数据',
+  'cfmmUI.File.import.delete.success': '删除 {count} 条数据',
   'cfmmUI.File.button.excel.download': '下载为Excel',
   'cfmmUI.File.check.type.failMessage': '不支持该文件类型，只能是 {type} 类型',
   'cfmmUI.File.check.size.failMessage': '文件不能大于 {size}',

package/dist/esm/locales/zhCN/index.d.ts

@@ -52,6 +52,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/zhTW/File.d.ts

@@ -34,6 +34,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;

package/dist/esm/locales/zhTW/File.js

@@ -34,6 +34,9 @@ export default {
   'cfmmUI.File.import': '導入',
   'cfmmUI.File.import.exceed.error.title': '導入失敗，原因如下',
   'cfmmUI.File.import.exceed.success': '成功導入 {count} 條數據',
+  'cfmmUI.File.import.add.success': '新增 {count} 條數據',
+  'cfmmUI.File.import.update.success': '更新 {count} 條數據',
+  'cfmmUI.File.import.delete.success': '刪除 {count} 條數據',
   'cfmmUI.File.button.excel.download': '下載為Excel',
   'cfmmUI.File.check.type.failMessage': '不支持該檔案類型，只能是 {type} 類型',
   'cfmmUI.File.check.size.failMessage': '文件不能大於 {size}',

package/dist/esm/locales/zhTW/index.d.ts

@@ -51,6 +51,9 @@ declare const _default: {
     'cfmmUI.File.import': string;
     'cfmmUI.File.import.exceed.error.title': string;
     'cfmmUI.File.import.exceed.success': string;
+    'cfmmUI.File.import.add.success': string;
+    'cfmmUI.File.import.update.success': string;
+    'cfmmUI.File.import.delete.success': string;
     'cfmmUI.File.button.excel.download': string;
     'cfmmUI.File.check.type.failMessage': string;
     'cfmmUI.File.check.size.failMessage': string;