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

package/dist/cjs/utils/excelHelper.tpl

@@ -18,6 +18,10 @@ export interface ColumnProcessOptions<T> {
 
 export type DataRowGenerator = () => Promise<any[]>;
 
+export type CfProColumns<T = any, ValueType = 'text'> = ProColumns<T, ValueType> & {
+  hideInExport?: boolean;
+};
+
 // 延时函数
 // eslint-disable-next-line no-promise-executor-return
 export const delay = (ms: number) => new Promise((resolve) => setTimeout(resolve, ms));
@@ -38,9 +42,9 @@ export const extractTextFromJSX = (
   React.Children.forEach(jsx, (child) => {
     if (React.isValidElement(child)) {
       if (typeof child.props.children === 'string' || typeof jsx === 'number' || Array.isArray(child.props.children)) {
-        if(Array.isArray(child.props.children)) {
+        if (Array.isArray(child.props.children)) {
           textArray.push(child.props.children.join(' '));
-        }else {
+        } else {
           textArray.push(child.props.children);
         }
       } else {
@@ -167,6 +171,7 @@ export const genExcel = (
        */
       return workBook.xlsx.writeBuffer();
     })
+    // @ts-ignore
     .then((blob: Blob) => {
       /**
        * 下载文件
@@ -515,19 +520,22 @@ export const convertNumberToCellName = (cellIndex: number): string => {
  * @param param 列，变更属性，过滤值
  * @returns
  */
-export const getExportColumns = <T>({
+export const getExportColumns = <T = any>({
   columns = [],
   columnsStateMap = {},
   filters = [],
 }: {
-  columns: ProColumns<T>[];
+  columns: CfProColumns<T>[];
   columnsStateMap?: Record<string, ColumnsState>;
   filters?: any[];
 }): ProColumns<T>[] => {
+  // 只处理显示的子列
   const filterList = columns.filter((item) => {
+    const hideInExport = item.hideInExport ?? item.hideInTable;
+
     return (
       // 排除隐藏在表格的列
-      !item.hideInTable &&
+      !hideInExport &&
       // 排除主动过滤的列
       !filters.includes(item.dataIndex) &&
       // 排除在于columnsStateMap中且columnsStateMapp[item.dataIndex].show为false的列(排除表格右上角工具隐藏的列)
@@ -596,10 +604,14 @@ export const getExportColumnsWithGroupSupport = <T>(options: ColumnProcessOption
 
   /**
    * 检查列是否应该显示
+   * 检查列是否应该出现在导出中
+   * hideInExport 未配置时回退到 hideInTable，保持向后兼容
    */
-  const shouldShowColumn = (column: ProColumns<T>): boolean => {
+  const shouldShowColumn = (column: CfProColumns<T>): boolean => {
+    const hideInExport = column.hideInExport ?? column.hideInTable;
+
     return (
-      !column.hideInTable &&
+      !hideInExport &&
       !filters.includes(column.dataIndex) &&
       (!columnsStateMap[column.dataIndex as string] || (columnsStateMap[column.dataIndex as string]?.show ?? true))
     );
@@ -711,6 +723,25 @@ const getFormatValue = (value: any, type: ProColumns<any>['valueType'], getLocal
   return newValue;
 };
 
+export interface GetExportValueForColumnsOptions<T> {
+  columns: ProColumns<T>[];
+  data: readonly T[];
+  /** 获取本地日期时间 */
+  getLocalDate?: (date: any) => string | undefined;
+  /** 处理百分比 */
+  handlePercentChange?: (percent: number) => void;
+  /** 获取render中的节点文本Arr，使用textArrJoin字符拼接 */
+  textArrJoin?: string;
+  /** 每次切割条数 */
+  batchSize?: number;
+  /** 进度更新间隔，默认每1000条数据更新一次 */
+  progressUpdateInterval?: number;
+  /** 批处理间的延迟时间，避免UI阻塞 */
+  delayMs?: number;
+  /** 是否需要处理中划线的字段（空值字段） */
+  needHandleCenterlineValue?: boolean;
+}
+
 /**
  * 根据取值的columns，获取需要导出的数据
  * @param columns 取值的列（过滤排序后）特殊类型如百分比，日期需要定义valueType
@@ -735,16 +766,8 @@ export const getExportValueForColumns = async <T = any>({
   batchSize = 500,
   progressUpdateInterval = batchSize * 2, // 进度更新间隔，默认每次切割条数的2倍
   delayMs = 30, // 批处理间的延迟时间
-}: {
-  columns: ProColumns<T>[];
-  data: readonly T[];
-  getLocalDate?: (date: any) => string | undefined;
-  handlePercentChange?: (percent: number) => void;
-  textArrJoin?: string;
-  batchSize?: number;
-  progressUpdateInterval?: number;
-  delayMs?: number;
-}): Promise<any[]> => {
+  needHandleCenterlineValue,
+}: GetExportValueForColumnsOptions<T>): Promise<any[]> => {
   // 1. 参数校验
   if (!columns.length || !data.length) return Promise.resolve([]);
 
@@ -802,6 +825,7 @@ export const getExportValueForColumns = async <T = any>({
         const { text, textArray } = extractTextFromJSX(value);
         value = textArrJoin ? textArray.join(textArrJoin) : text;
       }
+      value = needHandleCenterlineValue ? (value === '-' ? null : value) : value;
 
       rowValues.push(value);
     }

package/dist/cjs/utils/importHelper.tpl

@@ -145,12 +145,26 @@ function convertIndexedPropertiesToArrays(obj: Record<string, any>): any {
  * @returns
  */
 export const handleImportExeclCellValue = (value: unknown, type?: string) => {
-  if (!value) return;
+  if (!value && value !== 0 && value !== '0') return;
 
   if (type === 'parenthesisCode') {
-    return getParenthesisValue(value as string);
+    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;
+    }
     return dayjs.utc(value).format(UTC_FORMAT);
   }
   if (typeof value === 'string') {
@@ -164,21 +178,34 @@ export const handleImportExeclCellValue = (value: unknown, type?: string) => {
  * @param keys [] | string，为对象属性名，数组类型并且
  * @param value 属性值
  * @param obj 嵌套对象
+ * @param options
+ * @param options.needHandleUnderlineKey 是否需要处理下划线code
+ * @param options.needHandleCenterlineValue 是否需要处理中划线的字段（空值字段）
  * @returns (['a', 'b', 'c'], 1, {}) => {a: { b: {c : 1} } }
  */
-export const createNestedObjectAndSetValue = (keys: string | string[], value: any, obj: Record<string, any>, needHandleUnderline = true) => {
+export const createNestedObjectAndSetValue = (
+  keys: string | string[],
+  value: any,
+  obj: Record<string, any>,
+  options: Omit<HandleImportListOptions, 'hasRowNum'>
+) => {
   if (!keys.length) return obj;
   // 过滤没有定义code的字段
   if (typeof keys === 'string' && keys.startsWith('__EMPTY')) return obj;
 
+  const { needHandleUnderlineKey = true, needHandleCenterlineValue = true } = options;
+
   //为了不改变原对象
   const cloneObj = { ...obj };
   // 当前操作的嵌套对象层级，从外到内
   let current: any = cloneObj;
   // 如果keys是字符串，转为数组
-  const newKeys = typeof keys === 'string' ? needHandleUnderline ? keys.split('_') : [keys] : keys;
+  const newKeys = typeof keys === 'string' ? (needHandleUnderlineKey ? keys.split('_') : [keys]) : keys;
   // 最后一个键下标
   const lastIndex = newKeys.length - 1;
+  // 处理中划线的字段（空值字段）
+  const handleValue = needHandleCenterlineValue ? (value === '-' ? null : value) : value;
+
   // 转为嵌套对象
   newKeys.forEach((key) => {
     if (current[key] === undefined) {
@@ -188,13 +215,13 @@ export const createNestedObjectAndSetValue = (keys: string | string[], value: an
     if (key === newKeys[lastIndex]) {
       // 判断是不是要取单元格括号中的code
       const handleKey = key.split('?');
-      if (handleKey.length === 2 && value) {
+      if (handleKey.length === 2 && handleValue) {
         // 取出单元格中的code并删除原有带?的字段,使用?前的字符串作为字段名,?后的作为识别类型
-        current[handleKey[0]] = handleImportExeclCellValue(value, parse(handleKey[1])?.type as string);
+        current[handleKey[0]] = handleImportExeclCellValue(handleValue, parse(handleKey[1])?.type as string);
         delete current[key];
       } else {
         // 处理导入单元格的值
-        current[key] = handleImportExeclCellValue(value);
+        current[key] = handleImportExeclCellValue(handleValue);
       }
     } else {
       // 移动到下一层级
@@ -217,14 +244,26 @@ export const createNestedObjectAndSetValue = (keys: string | string[], value: an
   return convertIndexedPropertiesToArrays(cloneObj);
 };
 
+export interface HandleImportListOptions {
+  /** 是否添加表格行号 */
+  hasRowNum?: boolean;
+  /** 是否需要处理下划线code */
+  needHandleUnderlineKey?: boolean;
+  /** 是否需要处理中划线的字段（空值字段） */
+  needHandleCenterlineValue?: boolean;
+}
+
 /**
  * 处理execl导入的数据
  * @param {T[]} list 列表
  * @param {number} hasRowNum 是否添加表格行号
  * @returns {T[]} list
  */
-export const handleImportList = <T extends Record<string, any> = any[]>(list: T[], options: { hasRowNum?: boolean, needHandleUnderline?: boolean } = {}): T[] => {
-  const { hasRowNum = true, needHandleUnderline = true } = options;
+export const handleImportList = <T extends Record<string, any> = any[]>(
+  list: T[],
+  options: HandleImportListOptions = {},
+): T[] => {
+  const { hasRowNum = true, ...restOptions } = options;
 
   list.shift();
   const newList: T[] = list.map((item: any, idx) => {
@@ -235,7 +274,7 @@ export const handleImportList = <T extends Record<string, any> = any[]>(list: T[
     }
     // 处理获取到的数据转换成需要的格式
     Object.entries(item).forEach((entry) => {
-      newObj = createNestedObjectAndSetValue(entry[0], entry[1], newObj, needHandleUnderline);
+      newObj = createNestedObjectAndSetValue(entry[0], entry[1], newObj, restOptions);
     });
     return newObj;
   });

package/dist/cjs/utils/utils.tpl

@@ -115,4 +115,14 @@ export function arrayToTree<T, R = T>(
   }
 
   return result as unknown as R[];
-}
+}
+
+/**
+ * 提取括号中的值
+ * @param str
+ * @returns
+ */
+export const getParenthesisValue = (str: string) => {
+  const matches = str.match(/\((.*?)\)/);
+  return matches ? matches[1] : null;
+};

package/dist/cjs/writeTmpFile/writeTypes.js

@@ -8,5 +8,5 @@ var _types = require("../types");
 // 修改方法，不再尝试读取外部文件
 var _default = exports.default = {
   path: 'types.d.ts',
-  content: "\n    import React from 'react';\n    import { ModalProps, DrawerProps, SelectProps, DatePickerProps, UploadProps, UploadFile, TooltipProps, ButtonProps, TabsProps, SwitchProps, FloatButtonProps, StepsProps, FlexProps, TagProps } from 'antd';\n    import { PresetColorType, PresetStatusColorType } from \"antd/lib/_util/colors\";\n    import { AutoCompleteProps } from 'antd/es/auto-complete';\n    import { RangePickerProps } from 'antd/lib/date-picker';\n    import { LiteralUnion } from \"antd/lib/_util/type\";\n    import { IconComponentProps } from '@ant-design/icons/lib/components/Icon';\n    import { ActionType, ProFormItemProps, ProColumns, ProTableProps, DrawerFormProps, ModalFormProps, PageContainerProps, ProFormInstance } from '@ant-design/pro-components';\n    import dayjs, { OpUnitType } from 'dayjs';\n    import { IEditorConfig, IToolbarConfig } from '@wangeditor/editor';\n    import type { DragEndEvent } from '@dnd-kit/core';\n    import { fileTypeMap } from './components'; \n\n\n    ".concat(_types.servicesTypes, "\n\n    ").concat(_types.HighlightStrTypes, "\n\n    ").concat(_types.DropdownButtonTypes, "\n\n    ").concat(_types.DynamicIconTypes, "\n\n    ").concat(_types.MyFooterToolbarTypes, "\n\n    ").concat(_types.QrCodeModalTypes, "\n\n    ").concat(_types.MenuFooterTypes, "\n\n    ").concat(_types.EditMultiLangFormTypes, "\n\n    ").concat(_types.MySelectTypes, "\n\n    ").concat(_types.MySelectLangTypes, "\n\n    ").concat(_types.PermissionSelectTypes, "\n\n    ").concat(_types.DataPermissionSelectTypes, "\n\n    ").concat(_types.DatePickerTypes, "\n\n    ").concat(_types.RandomAvatarTypes, "\n\n    ").concat(_types.RefDrawerFormTypes, "\n\n    ").concat(_types.ViewTableItemDrawerTypes, "\n\n    ").concat(_types.WangEditorTypes, "\n\n    ").concat(_types.MyPageContainerTypes, "\n\n    ").concat(_types.MyTagListTypes, "\n\n    ").concat(_types.VolumeFormItemTypes, "\n\n    ").concat(_types.ImportExeclTypes, "\n\n    ").concat(_types.MyUploadTypes, "\n\n    ").concat(_types.ReportTableTypes, "\n\n    ").concat(_types.DicDropDownListTypes, "\n\n    ").concat(_types.ActionLogDrawerTypes, "\n\n    ").concat(_types.DndTabsTypes, "\n\n    ").concat(_types.ImportDataUploadTypes, "\n\n    ").concat(_types.AvatarDropdownTypes, "\n\n    ").concat(_types.HeaderSearchTypes, "\n\n    ").concat(_types.ThemeSwitchTypes, "\n\n    ").concat(_types.GlobalHeaderTypes, "\n\n    ").concat(_types.KeepAliveTabsTypes, "\n\n    ").concat(_types.ExportPageWrapperTypes, "\n\n    ").concat(_types.MySetpsTypes, "\n\n    ").concat(_types.CrudTableTypes, "\n\n    ").concat(_types.DndTagTypes, "\n  ")
+  content: "\n    import React from 'react';\n    import { ModalProps, DrawerProps, SelectProps, DatePickerProps, UploadProps, UploadFile, TooltipProps, ButtonProps, TabsProps, SwitchProps, FloatButtonProps, StepsProps, FlexProps, TagProps } from 'antd';\n    import { PresetColorType, PresetStatusColorType } from \"antd/lib/_util/colors\";\n    import { AutoCompleteProps } from 'antd/es/auto-complete';\n    import { RangePickerProps } from 'antd/lib/date-picker';\n    import { LiteralUnion } from \"antd/lib/_util/type\";\n    import { IconComponentProps } from '@ant-design/icons/lib/components/Icon';\n    import { ActionType, ProFormItemProps, ProColumns, ProTableProps, DrawerFormProps, ModalFormProps, PageContainerProps, ProFormInstance } from '@ant-design/pro-components';\n    import dayjs, { OpUnitType } from 'dayjs';\n    import { IEditorConfig, IToolbarConfig } from '@wangeditor/editor';\n    import type { DragEndEvent } from '@dnd-kit/core';\n    import { fileTypeMap } from './components'; \n    import { ExcelExportOptions } from './utils/excelHelper';\n    import { HandleImportListOptions } from './utils/importHelper';\n\n\n    ".concat(_types.servicesTypes, "\n\n    ").concat(_types.HighlightStrTypes, "\n\n    ").concat(_types.DropdownButtonTypes, "\n\n    ").concat(_types.DynamicIconTypes, "\n\n    ").concat(_types.MyFooterToolbarTypes, "\n\n    ").concat(_types.QrCodeModalTypes, "\n\n    ").concat(_types.MenuFooterTypes, "\n\n    ").concat(_types.EditMultiLangFormTypes, "\n\n    ").concat(_types.MySelectTypes, "\n\n    ").concat(_types.MySelectLangTypes, "\n\n    ").concat(_types.PermissionSelectTypes, "\n\n    ").concat(_types.DataPermissionSelectTypes, "\n\n    ").concat(_types.DatePickerTypes, "\n\n    ").concat(_types.RandomAvatarTypes, "\n\n    ").concat(_types.RefDrawerFormTypes, "\n\n    ").concat(_types.ViewTableItemDrawerTypes, "\n\n    ").concat(_types.WangEditorTypes, "\n\n    ").concat(_types.MyPageContainerTypes, "\n\n    ").concat(_types.MyTagListTypes, "\n\n    ").concat(_types.VolumeFormItemTypes, "\n\n    ").concat(_types.ImportExeclTypes, "\n\n    ").concat(_types.MyUploadTypes, "\n\n    ").concat(_types.ReportTableTypes, "\n\n    ").concat(_types.DicDropDownListTypes, "\n\n    ").concat(_types.ActionLogDrawerTypes, "\n\n    ").concat(_types.DndTabsTypes, "\n\n    ").concat(_types.ImportDataUploadTypes, "\n\n    ").concat(_types.AvatarDropdownTypes, "\n\n    ").concat(_types.HeaderSearchTypes, "\n\n    ").concat(_types.ThemeSwitchTypes, "\n\n    ").concat(_types.GlobalHeaderTypes, "\n\n    ").concat(_types.KeepAliveTabsTypes, "\n\n    ").concat(_types.ExportPageWrapperTypes, "\n\n    ").concat(_types.MySetpsTypes, "\n\n    ").concat(_types.CrudTableTypes, "\n\n    ").concat(_types.DndTagTypes, "\n  ")
 };

package/dist/esm/components/CrudTable.tpl

@@ -16,7 +16,7 @@ import {
   LangInfoItem,
   RefDrawerFormRefType,
 } from '../types';
-import { genExcel, genExcelAdvanced, getExportColumns, getExportValueForColumns } from '../utils/excelHelper';
+import { genExcelAdvanced, getExportColumns, getExportValueForColumns } from '../utils/excelHelper';
 import { handleImportList, showCheckErrorTips } from '../utils/importHelper';
 import ActionLogDrawer from './ActionLogDrawer';
 import CreateForm from './AddDrawerForm';
@@ -69,6 +69,8 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
     updateConfig = {},
     actionColumnConfig = {} as CrudTableConfig['actionColumnConfig'],
     downloadTemplate = {},
+    exportExcel = {},
+    importData = {},
 
     onAdd,
     onView,
@@ -177,6 +179,7 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
     },
   );
 
+  // 选择多语言字段
   const handleSelectMultiLangField = useMemoizedFn(async (multiLang: CrudTableConfig['multiLang']) => {
     if (!multiLang?.fields) return;
 
@@ -190,7 +193,10 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
 
       await new Promise((resolve) => {
         Modal.confirm({
-          title: '导出多语言数据',
+          title: formatMessage({
+            id: 'cfmmUI.common.button.exportMultiLang.title',
+            defaultMessage: '请选择需要导出的字段',
+          }),
           content: (
             <div>
               <Radio.Group
@@ -285,29 +291,41 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
     }
 
     // 处理导入数据，正确赋值字段以及转格式
-    const newList = handleImportList<ExportMultiLangListItem>(list, { needHandleUnderline: false });
+    const newList = multiLang.handleImportList
+      ? multiLang.handleImportList(list, { needHandleUnderlineKey: false })
+      : handleImportList<ExportMultiLangListItem>(list, { needHandleUnderlineKey: false });
 
     // 导入校验提示
-    // const errorMessageList = checkImportExecl(newList);
-    // if (errorMessageList.length) {
-    //   showCheckErrorTips(errorMessageList);
-    //   return Promise.resolve({ success: false });
-    // }
-
-    const result = await doAction(
-      'IMPORT',
-      {
+    const errorMessageList = multiLang.checkImportExecl?.(newList);
+    if (errorMessageList?.length) {
+      multiLang.showCheckErrorTips?.(errorMessageList) ?? showCheckErrorTips(errorMessageList);
+      return Promise.resolve({ success: false });
+    }
+
+    let result;
+
+    if (multiLang.submit) {
+      result = await multiLang.submit({
         tableName: tableName,
         columnName: columnName,
-        i18nDataList: newList.filter((item) => item.en_US || item.zh_CN || item.zh_TW || item.th_TH),
-      },
-      {
-        actionFn: importMultiLangList,
-        showMsg: false,
-      },
-    );
+        list: newList,
+      });
+    } else {
+      result = await doAction(
+        'IMPORT',
+        {
+          tableName: tableName,
+          columnName: columnName,
+          i18nDataList: newList.filter((item) => item.en_US || item.zh_CN || item.zh_TW || item.th_TH),
+        },
+        {
+          actionFn: importMultiLangList,
+          showMsg: false,
+        },
+      );
+    }
 
-    if (result.success) {
+    if (result?.success) {
       actionRef.current?.reload();
     }
     return result;
@@ -332,7 +350,7 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
 
     setLoading(true);
     const result = await queryList<T[]>(processedParams, {
-      queryFn: apis.query,
+      queryFn: apis.queryExportData ? apis.queryExportData : apis.query,
     });
     setLoading(false);
 
@@ -510,7 +528,9 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
     if (!apis.importData && !interceptors.importData?.submitImportListData) return;
 
     // 处理导入数据，正确赋值字段以及转格式
-    const newList = interceptors.importData?.request?.(list) ?? handleImportList<T>(list);
+    const newList =
+      interceptors.importData?.request?.(list, importData?.handleImportListOptions) ??
+      handleImportList<T>(list, importData?.handleImportListOptions);
 
     // 导入校验提示
     const errorMessageList = interceptors.importData?.checkImportExecl?.(newList) || [];
@@ -539,6 +559,9 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
    * 下载数据为Excel
    */
   const handleDownloadExcel = async () => {
+    if (exportExcel?.handleDownloadExcel) {
+      return exportExcel.handleDownloadExcel(columns, columnsStateMap);
+    }
     const result = await handleSearchAll();
     if (!result.success || result.error || !result.data) {
       return;
@@ -548,7 +571,8 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
 
     setDownloadButtonLoading(true);
 
-    const exportColums = getExportColumns<T>({ columns, columnsStateMap });
+    const getExportColumnsFn = exportExcel.getExportColumns ?? getExportColumns;
+    const exportColums = getExportColumnsFn<T>({ columns, columnsStateMap });
 
     //固定列名
     let columnsName: any[] = exportColums.map((item) => item.title).filter(Boolean);
@@ -558,45 +582,61 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
       defaultMessage: '数据列表',
     });
 
+    const codeList = exportColums.map((item) => item.dataIndex as string).filter(Boolean);
+
     //创建导出Excel
-    genExcel(fileName + '.xlsx', 'sheet1', columnsName, function () {
-      //生成数据
-      return new Promise((resolve) => {
-        //所有数据行
-        getExportValueForColumns({
-          columns: exportColums,
-          data: result.data,
-          getLocalDate,
-          handlePercentChange,
-        })
-          .then((allRows) => {
-            if (allRows.length > MAX_DOWNLOAD) {
-              Modal.warning({
-                title: formatMessage({ id: 'common.download.exceed.max.title', defaultMessage: `下载数据过大提醒` }),
-                content: formatMessage(
-                  {
-                    id: 'common.download.exceed.max.tips',
-                    defaultMessage: `超出最大下载数据 ${MAX_DOWNLOAD} 条，超出部分请重新下载`,
-                  },
-                  {
-                    count: MAX_DOWNLOAD,
-                  },
-                ),
-                onOk: () => resolve(allRows.slice(0, MAX_DOWNLOAD)),
-              });
-            } else {
-              resolve(allRows);
-            }
+    genExcelAdvanced(
+      fileName + '.xlsx',
+      'sheet1',
+      columnsName,
+      function () {
+        //生成数据
+        return new Promise((resolve) => {
+          //所有数据行
+          getExportValueForColumns({
+            columns: exportColums,
+            data: result.data,
+            getLocalDate,
+            handlePercentChange,
+            ...(exportExcel.getExportValueForColumnsOptions ?? {}),
           })
-          .catch((err) => console.log('err', err))
-          .finally(() => {
-            timer.current = setTimeout(() => {
-              setDownloadButtonLoading(false);
-              setPercent(0);
-            }, 2000);
-          });
-      });
-    });
+            .then((allRows) => {
+              if (allRows.length > MAX_DOWNLOAD) {
+                Modal.warning({
+                  title: formatMessage({ id: 'common.download.exceed.max.title', defaultMessage: `下载数据过大提醒` }),
+                  content: formatMessage(
+                    {
+                      id: 'common.download.exceed.max.tips',
+                      defaultMessage: `超出最大下载数据 ${MAX_DOWNLOAD} 条，超出部分请重新下载`,
+                    },
+                    {
+                      count: MAX_DOWNLOAD,
+                    },
+                  ),
+                  onOk: () => resolve(allRows.slice(0, MAX_DOWNLOAD)),
+                });
+              } else {
+                resolve(allRows);
+              }
+            })
+            .catch((err) => console.log('err', err))
+            .finally(() => {
+              timer.current = setTimeout(() => {
+                setDownloadButtonLoading(false);
+                setPercent(0);
+              }, 2000);
+            });
+        });
+      },
+      {
+        codeColumns: codeList,
+        title: fileName,
+        notice: [
+          formatMessage({ id: 'cfmmUI.common.button.exportMultiLang.notice', defaultMessage: '请勿修改表格结构' }),
+        ],
+        ...(exportExcel.genExcelAdvancedOptions ?? {}),
+      },
+    );
   };
 
   /**
@@ -863,12 +903,28 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
           </a>
         ),
       },
+      {
+        auth: getAuthorityFn(defaultAuthCodes.export),
+        key: 'export',
+        disabled: !tableList.length || loading,
+        label: (
+          <a onClick={handleDownloadExcel} key="export">
+            <CloudDownloadOutlined style={{ marginRight: 6 }} />
+            {formatMessage({ id: 'cfmmUI.common.button.exportData', defaultMessage: '导出数据' })}
+          </a>
+        ),
+      },
       {
         auth:
           getAuthorityFn(defaultAuthCodes.import) && (apis.importData || interceptors.importData?.submitImportListData),
         key: 'import',
         label: (
-          <ImportExecl key="importMaterial" rangeStart={{ c: 0, r: 2 }} onChange={importListData}>
+          <ImportExecl
+            key="importListData"
+            rangeStart={{ c: 0, r: 2 }}
+            onChange={importListData}
+            {...(importData?.attributes || {})}
+          >
             <div style={{ color: !actionLoading ? 'rgba(0, 0, 0, 0.88)' : 'rgba(0, 0, 0, 0.25)' }}>
               <UploadOutlined style={{ marginRight: 8 }} />
               {formatMessage({ id: 'cfmmUI.common.button.importData', defaultMessage: '导入数据' })}
@@ -876,17 +932,6 @@ function CrudTable<T extends Record<string, any>, U = {}, C = {}>(
           </ImportExecl>
         ),
       },
-      {
-        auth: getAuthorityFn(defaultAuthCodes.export),
-        key: 'export',
-        disabled: !tableList.length || loading,
-        label: (
-          <a onClick={handleDownloadExcel} key="export">
-            <CloudDownloadOutlined style={{ marginRight: 6 }} />
-            {formatMessage({ id: 'cfmmUI.common.button.exportData', defaultMessage: '导出数据' })}
-          </a>
-        ),
-      },
     ];
 
     allButtons = handleTableButtonList(allButtons);

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

@@ -126,6 +126,7 @@ declare const _default: {
     "cfmmUI.common.button.importData": string;
     "cfmmUI.common.button.exportData": string;
     'cfmmUI.common.button.exportMultiLang.notice': string;
+    "cfmmUI.common.button.exportMultiLang.title": string;
     'cfmmUI.action.create.waitingMessage': string;
     'cfmmUI.action.update.waitingMessage': string;
     'cfmmUI.action.delete.waitingMessage': string;

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

@@ -26,6 +26,7 @@ declare const _default: {
     "cfmmUI.common.button.importData": string;
     "cfmmUI.common.button.exportData": string;
     'cfmmUI.common.button.exportMultiLang.notice': string;
+    "cfmmUI.common.button.exportMultiLang.title": string;
     'cfmmUI.action.create.waitingMessage': string;
     'cfmmUI.action.update.waitingMessage': string;
     'cfmmUI.action.delete.waitingMessage': string;

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

@@ -28,6 +28,7 @@ export default {
   "cfmmUI.common.button.importData": "Import Data",
   "cfmmUI.common.button.exportData": "Export Data",
   'cfmmUI.common.button.exportMultiLang.notice': 'Please do not modify the table structure',
+  "cfmmUI.common.button.exportMultiLang.title": "Please select the fields to export",
   //操作提示
   'cfmmUI.action.create.waitingMessage': 'Being Added',
   'cfmmUI.action.update.waitingMessage': 'Be Modifying',

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

@@ -126,6 +126,7 @@ declare const _default: {
     "cfmmUI.common.button.importData": string;
     "cfmmUI.common.button.exportData": string;
     'cfmmUI.common.button.exportMultiLang.notice': string;
+    "cfmmUI.common.button.exportMultiLang.title": string;
     'cfmmUI.action.create.waitingMessage': string;
     'cfmmUI.action.update.waitingMessage': string;
     'cfmmUI.action.delete.waitingMessage': string;

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

@@ -126,6 +126,7 @@ declare const _default: {
     "cfmmUI.common.button.importData": string;
     "cfmmUI.common.button.exportData": string;
     'cfmmUI.common.button.exportMultiLang.notice': string;
+    "cfmmUI.common.button.exportMultiLang.title": string;
     'cfmmUI.action.create.waitingMessage': string;
     'cfmmUI.action.update.waitingMessage': string;
     'cfmmUI.action.delete.waitingMessage': string;

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

@@ -126,6 +126,7 @@ declare const _default: {
     "cfmmUI.common.button.importData": string;
     "cfmmUI.common.button.exportData": string;
     "cfmmUI.common.button.exportMultiLang.notice": string;
+    "cfmmUI.common.button.exportMultiLang.title": string;
     "cfmmUI.action.create.waitingMessage": string;
     "cfmmUI.action.update.waitingMessage": string;
     "cfmmUI.action.delete.waitingMessage": string;

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

@@ -125,6 +125,7 @@ declare const _default: {
     "cfmmUI.common.button.importData": string;
     "cfmmUI.common.button.exportData": string;
     "cfmmUI.common.button.exportMultiLang.notice": string;
+    "cfmmUI.common.button.exportMultiLang.title": string;
     "cfmmUI.action.create.waitingMessage": string;
     "cfmmUI.action.update.waitingMessage": string;
     "cfmmUI.action.delete.waitingMessage": string;

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

@@ -26,6 +26,7 @@ declare const _default: {
     "cfmmUI.common.button.importData": string;
     "cfmmUI.common.button.exportData": string;
     "cfmmUI.common.button.exportMultiLang.notice": string;
+    "cfmmUI.common.button.exportMultiLang.title": string;
     "cfmmUI.action.create.waitingMessage": string;
     "cfmmUI.action.update.waitingMessage": string;
     "cfmmUI.action.delete.waitingMessage": string;

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

@@ -28,6 +28,7 @@ export default {
   "cfmmUI.common.button.importData": "导入数据",
   "cfmmUI.common.button.exportData": "导出数据",
   "cfmmUI.common.button.exportMultiLang.notice": "请勿修改表格结构",
+  "cfmmUI.common.button.exportMultiLang.title": "请选择需要导出的字段",
   //操作提示
   "cfmmUI.action.create.waitingMessage": "正在新增",
   "cfmmUI.action.update.waitingMessage": "正在修改",

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

@@ -126,6 +126,7 @@ declare const _default: {
     "cfmmUI.common.button.importData": string;
     "cfmmUI.common.button.exportData": string;
     "cfmmUI.common.button.exportMultiLang.notice": string;
+    "cfmmUI.common.button.exportMultiLang.title": string;
     "cfmmUI.action.create.waitingMessage": string;
     "cfmmUI.action.update.waitingMessage": string;
     "cfmmUI.action.delete.waitingMessage": string;