@zat-design/sisyphus-react 3.11.14-beta.13 → 3.11.14-beta.14

package/es/ProEnum/hooks/useEnum.d.ts

@@ -4,7 +4,7 @@ import { DataOption } from '../propsType';
  * @param code
  * const [options,fn] = useEnum("code")
  */
-declare function useEnum(code: string): [DataOption[], (val: string, showCodeName?: boolean) => string];
+declare function useEnum(code?: string): [DataOption[], (val: string, showCodeName?: boolean) => string];
 /**
  * input codes output { code1:DataOption[],code2:DataOption[] }
  * @param codes
@@ -17,5 +17,5 @@ declare function useEnum(codes: string[]): Record<string, DataOption[]>;
  * @param value
  * @param compose 展示 value-label
  */
-declare function useEnum(code: string, value?: string, compose?: boolean): [string, DataOption];
+declare function useEnum(code?: string, value?: string, compose?: boolean): [string, DataOption];
 export default useEnum;

package/es/ProEnum/hooks/useEnum.js

@@ -1,8 +1,17 @@
-var _ref;
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 /* eslint-disable no-redeclare */
 import { useProConfig } from '../../ProConfigProvider';
 import { getEnumData } from '../utils';
-var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
+var baseEnumStorage = null;
+try {
+  var storedData = window.localStorage.getItem('zat-design-pro-component-cacheKey');
+  if (storedData) {
+    baseEnumStorage = JSON.parse(storedData);
+  }
+} catch (error) {
+  console.error('解析枚举缓存数据失败', error);
+  baseEnumStorage = null;
+}
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -11,24 +20,44 @@ var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-compon
  * @returns
  */
 function useEnum(codes, value, compose) {
-  var _ref2 = useProConfig('globalConfig') || {},
-    _ref2$storage = _ref2.storage,
-    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage;
-  var _ref3 = useProConfig('ProEnum') || {},
-    _ref3$cacheKey = _ref3.cacheKey,
-    cacheKey = _ref3$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref3$cacheKey,
-    _ref3$fieldNames = _ref3.fieldNames,
-    fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
-    _ref3$clear = _ref3.clear,
-    clear = _ref3$clear === void 0 ? true : _ref3$clear;
-  var catchData = getEnumData(storage, cacheKey, baseEnumStorage);
+  var _ref = useProConfig('globalConfig') || {},
+    _ref$storage = _ref.storage,
+    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage;
+  var _ref2 = useProConfig('ProEnum') || {},
+    _ref2$cacheKey = _ref2.cacheKey,
+    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    _ref2$fieldNames = _ref2.fieldNames,
+    fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
+    _ref2$clear = _ref2.clear,
+    clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$dataSource = _ref2.dataSource,
+    dataSource = _ref2$dataSource === void 0 ? {} : _ref2$dataSource;
+  var catchData = getEnumData(storage, cacheKey, baseEnumStorage, dataSource);
   // 默认枚举缓存数据
   baseEnumStorage = catchData;
   if (!codes) {
+    if (!Object.keys(catchData).length) {
+      return [];
+    }
     return catchData;
   }
   var fieldLabel = '';
   var fieldValue = '';
+  // 获取枚举数据源
+  var enumDataSource = (catchData === null || catchData === void 0 ? void 0 : catchData.data) || {};
+  // 当dataSource有值时，检查是否需要合并
+  if (dataSource && Object.keys(dataSource).length > 0) {
+    // 创建合并后的数据源
+    var mergedDataSource = _objectSpread({}, enumDataSource);
+    // 遍历dataSource中的每个键
+    Object.keys(dataSource).forEach(function (key) {
+      // 如果enumDataSource中不存在该键或者该键对应的值为空数组，则合并
+      if (!enumDataSource[key] || enumDataSource[key].length === 0) {
+        mergedDataSource[key] = dataSource[key];
+      }
+    });
+    enumDataSource = mergedDataSource;
+  }
   if (fieldNames && Object.keys(fieldNames).length) {
     fieldLabel = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label;
     fieldValue = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value;
@@ -38,8 +67,8 @@ function useEnum(codes, value, compose) {
     fieldValue = 'value';
   }
   if (typeof codes === 'string') {
-    var _catchData$data;
-    var options = (catchData === null || catchData === void 0 ? void 0 : (_catchData$data = catchData.data) === null || _catchData$data === void 0 ? void 0 : _catchData$data[codes]) || [];
+    var _enumDataSource;
+    var options = ((_enumDataSource = enumDataSource) === null || _enumDataSource === void 0 ? void 0 : _enumDataSource[codes]) || [];
     var getEnumLabel = function getEnumLabel(v, composezTow) {
       var option = options.find(function (item) {
         return item[fieldValue] === v;
@@ -62,8 +91,8 @@ function useEnum(codes, value, compose) {
   if (Array.isArray(codes)) {
     var _options = {};
     codes.forEach(function (code) {
-      var _catchData$data2;
-      var values = catchData === null || catchData === void 0 ? void 0 : (_catchData$data2 = catchData.data) === null || _catchData$data2 === void 0 ? void 0 : _catchData$data2[code];
+      var _enumDataSource2;
+      var values = (_enumDataSource2 = enumDataSource) === null || _enumDataSource2 === void 0 ? void 0 : _enumDataSource2[code];
       if (Array.isArray(values) && values.length) {
         _options[code] = values;
       }

package/es/ProEnum/utils/index.d.ts

@@ -4,7 +4,14 @@ interface EnumRes {
     data: Record<string, DataOption[]>;
     [key: string]: any;
 }
-export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
+/**
+ * 获取枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param baseEnumStorage
+ * @returns
+ */
+export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any, dataSource?: any[]): EnumRes;
 export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): import("../propsType").DataOptionType[];
 export declare function isObject(obj: any): boolean;

package/es/ProEnum/utils/index.js

@@ -1,8 +1,15 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["children"];
 import { isNull, isUndefined } from 'lodash';
-export function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage) {
+/**
+ * 获取枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param baseEnumStorage
+ * @returns
+ */
+export function getEnumData(storage, cacheKey, baseEnumStorage, dataSource) {
+  if (baseEnumStorage && cacheKey === 'zat-design-pro-component-cacheKey') {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

package/es/ProTable/components/RenderTabs/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { ProTableTabsType } from '../../propsType';
+declare const _default: import("react").MemoExoticComponent<(props: ProTableTabsType) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

package/es/ProTable/components/RenderTabs/index.js

@@ -0,0 +1,78 @@
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import "antd/es/tabs/style";
+import _Tabs from "antd/es/tabs";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
+import "antd/es/form/style";
+import _Form from "antd/es/form";
+import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { useMemo, useState, useEffect, memo } from 'react';
+import useEnum from '../../../ProEnum/hooks/useEnum';
+var RenderTabs = function RenderTabs(props) {
+  var code = props.code,
+    _props$dataSource = props.dataSource,
+    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
+    transformResponse = props.transformResponse,
+    tabsProps = props.tabsProps,
+    name = props.name,
+    formTableProps = props.formTableProps;
+  var _ref = formTableProps || {},
+    form = _ref.form,
+    onSearch = _ref.onSearch;
+  var _useState = useState(props.activeKey),
+    _useState2 = _slicedToArray(_useState, 2),
+    activeKey = _useState2[0],
+    setActiveKey = _useState2[1];
+  var _useEnum = useEnum(code),
+    _useEnum2 = _slicedToArray(_useEnum, 1),
+    options = _useEnum2[0];
+  var fieldValue = _Form.useWatch(name, form);
+  // 使用useMemo计算派生状态
+  var tabItems = useMemo(function () {
+    var defaultItems = [].concat(_toConsumableArray(dataSource), _toConsumableArray(options || []));
+    // 合并数据源并转换格式
+    var mergedData = defaultItems.map(function (item) {
+      return {
+        key: item.value,
+        label: item.label
+      };
+    });
+    if (transformResponse && typeof transformResponse === 'function') {
+      mergedData = transformResponse(defaultItems, formTableProps);
+      return mergedData.map(function (item) {
+        return {
+          key: String(item.value),
+          label: item.label
+        };
+      });
+    }
+    return mergedData.map(function (item) {
+      return {
+        key: String(item.key),
+        label: item.label
+      };
+    });
+  }, [dataSource, options, transformResponse]);
+  useEffect(function () {
+    var _tabItems$;
+    setActiveKey(fieldValue || (tabItems === null || tabItems === void 0 ? void 0 : (_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.key));
+  }, [fieldValue]);
+  if (!(tabItems === null || tabItems === void 0 ? void 0 : tabItems.length)) {
+    return null;
+  }
+  return _jsx(_Tabs, _objectSpread(_objectSpread({
+    className: "pro-table-tabs",
+    onChange: function onChange(key) {
+      var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
+      setActiveKey(key);
+      form.setFieldValue(name, key);
+      onSearch === null || onSearch === void 0 ? void 0 : onSearch(_objectSpread(_objectSpread({}, fieldsValues), {}, _defineProperty({}, name, key)));
+    },
+    type: "card"
+  }, tabsProps), {}, {
+    items: tabItems,
+    activeKey: activeKey
+  }));
+};
+export default /*#__PURE__*/memo(RenderTabs);

package/es/ProTable/components/index.d.ts

@@ -1,5 +1,30 @@
+/**
+ * 表格可伸缩列组件
+ * @description 实现表格列宽可调整功能
+ */
 export { default as TableResizable } from './TableResizable';
+/**
+ * 表格空数据渲染组件
+ * @description 当表格数据为空时的显示内容
+ */
 export { default as RenderEmptyText } from './RenderEmptyText';
+/**
+ * 表格汇总行组件
+ * @description 用于渲染表格底部的汇总信息
+ */
 export { default as RenderSummary } from './RenderSummary';
+/**
+ * 表格头部渲染组件
+ * @description 自定义表格头部区域，支持自定义内容和操作按钮
+ */
 export { default as RenderTableHeader } from './RenderTableHeader';
+/**
+ * 表格底部渲染组件
+ * @description 自定义表格底部区域，支持添加额外操作按钮
+ */
 export { default as RenderFooter } from './RenderFooter';
+/**
+ * 表格标签页组件
+ * @description 实现表格顶部的标签页切换功能，用于数据分类展示
+ */
+export { default as RenderTabs } from './RenderTabs';

package/es/ProTable/components/index.js

@@ -1,5 +1,30 @@
+/**
+ * 表格可伸缩列组件
+ * @description 实现表格列宽可调整功能
+ */
 export { default as TableResizable } from './TableResizable';
+/**
+ * 表格空数据渲染组件
+ * @description 当表格数据为空时的显示内容
+ */
 export { default as RenderEmptyText } from './RenderEmptyText';
+/**
+ * 表格汇总行组件
+ * @description 用于渲染表格底部的汇总信息
+ */
 export { default as RenderSummary } from './RenderSummary';
+/**
+ * 表格头部渲染组件
+ * @description 自定义表格头部区域，支持自定义内容和操作按钮
+ */
 export { default as RenderTableHeader } from './RenderTableHeader';
-export { default as RenderFooter } from './RenderFooter';
+/**
+ * 表格底部渲染组件
+ * @description 自定义表格底部区域，支持添加额外操作按钮
+ */
+export { default as RenderFooter } from './RenderFooter';
+/**
+ * 表格标签页组件
+ * @description 实现表格顶部的标签页切换功能，用于数据分类展示
+ */
+export { default as RenderTabs } from './RenderTabs';

package/es/ProTable/hooks/useAntdTable.d.ts

@@ -1,95 +1,4 @@
-import { Key } from 'react';
 import { useRequest } from 'ahooks';
 import type { ProTableRequestOptionsType, ProTableServiceType } from '../propsType';
-declare function useAntdTable<I, R extends Record<string, any>, S extends ProTableServiceType<I, R>>(service: S, options?: ProTableRequestOptionsType<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): {
-    data: R[];
-    params: any;
-    rowSelection: {
-        fixed: boolean;
-        type: import("antd/es/table/interface").RowSelectionType;
-        columnWidth: number;
-        selectedRowKeys: Key[];
-        onChange(rowKeys: Key[], rows: any[]): void;
-        onSelectAll: (selected: boolean) => void;
-        getCheckboxProps: (record?: any) => {
-            className: string;
-        };
-        selections: boolean | ({
-            key: string;
-            text: string;
-            onSelect: (changeableRowKeys: Key[]) => void;
-        } | {
-            key: string;
-            text: any;
-            onSelect: () => Promise<void>;
-        })[];
-    };
-    searchValues: I;
-    allSelected: boolean;
-    selectedTip: string;
-    selectedRowKeys: Key[];
-    selectedRecords: R[];
-    clearSelected: () => void;
-    setSelectedRowKeys: (selectedRowKeys: Key[]) => void;
-    setSelectedRecords: (selectedRecords: R[]) => void;
-    pagination: {
-        current: number;
-        pageSize: number;
-        showSizeChanger: boolean;
-        showQuickJumper: boolean;
-        onPaginationChange: boolean;
-        total: number;
-        showTotal: (total: any) => string;
-        onShowSizeChange: (current: number, pageSize: number) => void;
-        onChange: (current: number, pageSize: number) => void;
-    };
-    onReset: () => void;
-    onSearch: (values: any) => void;
-    refresh: () => Promise<void>;
-    tableProps: {
-        rowKey: string | import("rc-table/lib/interface").GetRowKey<R>;
-        loading: boolean;
-        dataSource: R[];
-        rowSelection: {
-            fixed: boolean;
-            type: import("antd/es/table/interface").RowSelectionType;
-            columnWidth: number;
-            selectedRowKeys: Key[];
-            onChange(rowKeys: Key[], rows: any[]): void;
-            onSelectAll: (selected: boolean) => void;
-            getCheckboxProps: (record?: any) => {
-                className: string;
-            };
-            selections: boolean | ({
-                key: string;
-                text: string;
-                onSelect: (changeableRowKeys: Key[]) => void;
-            } | {
-                key: string;
-                text: any;
-                onSelect: () => Promise<void>;
-            })[];
-        };
-        pagination: {
-            current: number;
-            pageSize: number;
-            showSizeChanger: boolean;
-            showQuickJumper: boolean;
-            onPaginationChange: boolean;
-            total: number;
-            showTotal: (total: any) => string;
-            onShowSizeChange: (current: number, pageSize: number) => void;
-            onChange: (current: number, pageSize: number) => void;
-        };
-        onChange: (pagination: any, filters: any, sorter: any, extra: any) => void;
-    };
-    handleSetStateCallback: (values: any) => void;
-    loading: boolean;
-    error?: Error;
-    cancel: () => void;
-    refreshAsync: () => Promise<unknown>;
-    run: (...params: any[]) => void;
-    runAsync: (...params: any[]) => Promise<unknown>;
-    mutate: (data?: unknown) => void;
-};
+declare function useAntdTable<I, R extends Record<string, any>, S extends ProTableServiceType<I, R>>(service: S, options?: ProTableRequestOptionsType<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): any;
 export default useAntdTable;

package/es/ProTable/hooks/useAntdTable.js

@@ -9,7 +9,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["page", "filters", "sorter"];
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { useRequest, useSetState, useDeepCompareEffect, usePrevious } from 'ahooks';
-import { pickBy, isObject, merge, set, isEqual } from 'lodash';
+import { pickBy, isObject, merge, set, isEqual, omit } from 'lodash';
 import { defaultPage } from '../index';
 import { isListResult, removeEmptyKeys, isNonEmptyObject } from '../utils';
 import locale, { formatMessage } from '../../locale';
@@ -475,7 +475,7 @@ function useAntdTable(service, options, useRequestOptions) {
     onShowSizeChange: handlePageChange,
     onChange: handlePageChange
   };
-  return _objectSpread(_objectSpread({}, result), {}, {
+  var useAntdTableProps = _objectSpread(_objectSpread({}, result), {}, {
     data: data,
     params: params,
     rowSelection: rowSelection,
@@ -509,5 +509,9 @@ function useAntdTable(service, options, useRequestOptions) {
     },
     handleSetStateCallback: handleSetStateCallback
   });
+  useAntdTableProps.tableProps.formTableProps = _objectSpread(_objectSpread({}, omit(useAntdTableProps, 'tableProps')), {}, {
+    form: form
+  });
+  return useAntdTableProps;
 }
 export default useAntdTable;

package/es/ProTable/index.js

@@ -5,7 +5,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd", "tabs"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState, createContext } from 'react';
@@ -13,7 +13,7 @@ import { get, keyBy, assign, isObject, isFunction, isBoolean } from 'lodash';
 import { useDebounceEffect, useDeepCompareEffect, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useProConfig } from '../index';
-import { RenderTableHeader, RenderFooter } from './components';
+import { RenderTableHeader, RenderFooter, RenderTabs } from './components';
 import useAntdTable from './hooks/useAntdTable';
 import { BaseTable, DraggableTable } from './components/RcTable';
 import { formatColumn } from './components/FormatColumn';
@@ -55,6 +55,7 @@ var ProTable = function ProTable(props) {
     diffConfig = props.diffConfig,
     onDragStartGuard = props.onDragStart,
     onDragEndGuard = props.onDragEnd,
+    tabs = props.tabs,
     restProps = _objectWithoutProperties(props, _excluded);
   var _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
@@ -393,7 +394,9 @@ var ProTable = function ProTable(props) {
     },
     children: _jsxs("div", {
       className: cls,
-      children: [_jsx(RenderTableHeader, {
+      children: [tabs && _jsx(RenderTabs, _objectSpread(_objectSpread({}, tabs), {}, {
+        formTableProps: restProps === null || restProps === void 0 ? void 0 : restProps.formTableProps
+      })), _jsx(RenderTableHeader, {
         dataSource: {
           headerRender: headerRender,
           columnConfig: columnConfig,

package/es/ProTable/propsType.d.ts

@@ -1,5 +1,6 @@
 import { Key, ReactNode } from 'react';
 import { TableProps } from 'antd/es/table/Table';
+import { NamePath } from 'antd/es/form/interface';
 import { ColumnType, GetRowKey, RowSelectionType } from 'antd/es/table/interface';
 import { FormInstance } from 'antd';
 import type { TooltipProps } from 'antd';
@@ -314,6 +315,54 @@ export interface ProTableDiffConfigType {
      */
     addTipColor?: string;
 }
+export interface ProTableTabsType {
+    /**
+     * 激活的 key
+     * @description 激活的 key
+     * @default undefined
+     */
+    activeKey?: string;
+    /**
+     * 枚举 code
+     * @description 枚举 code
+     * @default undefined
+     */
+    code?: string;
+    /**
+     * 枚举数据源
+     * @description 枚举数据源
+     * @default undefined
+     */
+    dataSource?: {
+        label: string;
+        value: string;
+    }[];
+    /**
+     * 枚举数据源转换
+     * @description 枚举数据源转换
+     * @default undefined
+     */
+    transformResponse?: (dataSource: {
+        label: string;
+        value: string;
+    }[], useAntdTableProps: ProTableUseAntdTableType<any, any>) => {
+        key: string;
+        label: string | ReactNode;
+    }[];
+    /**
+     * 标签属性
+     * @description 标签属性
+     * @default undefined
+     */
+    tabsProps?: TabsProps;
+    /**
+     * 表单字段名
+     * @description 表单字段名
+     * @default undefined
+     */
+    name: NamePath;
+    [key: string]: any;
+}
 /**
  * ProTable 主要属性
  */
@@ -321,30 +370,25 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
     /**
      * table 唯一标识
      * @description 用于缓存和获取 columns 配置，在开启 resizeColumn/columnConfig 功能时需要传递以保证缓存和获取到正确的 columns 配置
-     * @default undefined
+     * @default -
      */
     tableId?: string;
     /**
      * 表格 tabs查询 配置
      * @description 用于配置表格的 tabs 选项
-     * @default undefined
+     * @default -
      */
-    tabs?: {
-        code: string;
-        dataSource: any[];
-        transformResponse?: (res: any) => any[];
-        tabsProps?: TabsProps;
-    };
+    tabs?: ProTableTabsType;
     /**
      * 表格行 key 的取值
      * @description 表格行数据的唯一标识字段
-     * @default undefined
+     * @default -
      */
     rowKey?: string | GetRowKey<any>;
     /**
      * 自定义 table header 左侧渲染
      * @description 可以是 ReactNode 或返回 ReactNode 的函数
-     * @default undefined
+     * @default -
      */
     headerRender?: ReactNode | (() => ReactNode);
     /**
@@ -394,7 +438,7 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
     /**
      * 自定义 table footer 左侧渲染
      * @description 可以是 ReactNode 或返回 ReactNode 的函数
-     * @default undefined
+     * @default -
      */
     footerRender?: ReactNode | (() => ReactNode);
     /**
@@ -430,7 +474,7 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
     /**
      * 行禁用判断
      * @description 判断指定行是否禁用
-     * @default undefined
+     * @default -
      */
     rowDisabled?: (record?: T) => string | boolean;
     /**
@@ -448,19 +492,19 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
     /**
      * 表单比对配置
      * @description 用于标记数据变化的配置
-     * @default undefined
+     * @default -
      */
     diffConfig?: ProTableDiffConfigType;
     /**
      * 开始拖拽回调
      * @description 拖拽开始时触发
-     * @default undefined
+     * @default -
      */
     onDragStart?: ProTableDragStartGuardType;
     /**
      * 结束拖拽回调
      * @description 拖拽结束时触发，务必返回变更后的数据源
-     * @default undefined
+     * @default -
      */
     onDragEnd?: ProTableDragEndGuardType;
     /**
@@ -469,6 +513,7 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
      * @default true
      */
     scrollFollowParent?: boolean;
+    [key: string]: any;
 }
 /**
  * ProTable 值类型
@@ -702,6 +747,7 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default false
      */
     allSelected: boolean;
+    [key: string]: any;
 }
 export type ProTableProps<T = any> = ProTableType<T>;
 export type ProTableColumn = ProTableColumnType;

package/lib/ProEnum/hooks/useEnum.d.ts

@@ -4,7 +4,7 @@ import { DataOption } from '../propsType';
  * @param code
  * const [options,fn] = useEnum("code")
  */
-declare function useEnum(code: string): [DataOption[], (val: string, showCodeName?: boolean) => string];
+declare function useEnum(code?: string): [DataOption[], (val: string, showCodeName?: boolean) => string];
 /**
  * input codes output { code1:DataOption[],code2:DataOption[] }
  * @param codes
@@ -17,5 +17,5 @@ declare function useEnum(codes: string[]): Record<string, DataOption[]>;
  * @param value
  * @param compose 展示 value-label
  */
-declare function useEnum(code: string, value?: string, compose?: boolean): [string, DataOption];
+declare function useEnum(code?: string, value?: string, compose?: boolean): [string, DataOption];
 export default useEnum;

package/lib/ProEnum/hooks/useEnum.js

@@ -1,14 +1,25 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _ProConfigProvider = require("../../ProConfigProvider");
 var _utils = require("../utils");
-var _ref;
 /* eslint-disable no-redeclare */
-var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-component-cacheKey') && JSON.parse(window.localStorage.getItem('zat-design-pro-component-cacheKey'))) !== null && _ref !== void 0 ? _ref : null;
+
+var baseEnumStorage = null;
+try {
+  var storedData = window.localStorage.getItem('zat-design-pro-component-cacheKey');
+  if (storedData) {
+    baseEnumStorage = JSON.parse(storedData);
+  }
+} catch (error) {
+  console.error('解析枚举缓存数据失败', error);
+  baseEnumStorage = null;
+}
 /**
  * 根据 code 从枚举缓存取出对应的 options 、以及回显
  * @param codes
@@ -17,24 +28,44 @@ var baseEnumStorage = (_ref = window.localStorage.getItem('zat-design-pro-compon
  * @returns
  */
 function useEnum(codes, value, compose) {
-  var _ref2 = (0, _ProConfigProvider.useProConfig)('globalConfig') || {},
-    _ref2$storage = _ref2.storage,
-    storage = _ref2$storage === void 0 ? 'localStorage' : _ref2$storage;
-  var _ref3 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
-    _ref3$cacheKey = _ref3.cacheKey,
-    cacheKey = _ref3$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref3$cacheKey,
-    _ref3$fieldNames = _ref3.fieldNames,
-    fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
-    _ref3$clear = _ref3.clear,
-    clear = _ref3$clear === void 0 ? true : _ref3$clear;
-  var catchData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage);
+  var _ref = (0, _ProConfigProvider.useProConfig)('globalConfig') || {},
+    _ref$storage = _ref.storage,
+    storage = _ref$storage === void 0 ? 'localStorage' : _ref$storage;
+  var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
+    _ref2$cacheKey = _ref2.cacheKey,
+    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    _ref2$fieldNames = _ref2.fieldNames,
+    fieldNames = _ref2$fieldNames === void 0 ? {} : _ref2$fieldNames,
+    _ref2$clear = _ref2.clear,
+    clear = _ref2$clear === void 0 ? true : _ref2$clear,
+    _ref2$dataSource = _ref2.dataSource,
+    dataSource = _ref2$dataSource === void 0 ? {} : _ref2$dataSource;
+  var catchData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage, dataSource);
   // 默认枚举缓存数据
   baseEnumStorage = catchData;
   if (!codes) {
+    if (!Object.keys(catchData).length) {
+      return [];
+    }
     return catchData;
   }
   var fieldLabel = '';
   var fieldValue = '';
+  // 获取枚举数据源
+  var enumDataSource = (catchData === null || catchData === void 0 ? void 0 : catchData.data) || {};
+  // 当dataSource有值时，检查是否需要合并
+  if (dataSource && Object.keys(dataSource).length > 0) {
+    // 创建合并后的数据源
+    var mergedDataSource = (0, _objectSpread2.default)({}, enumDataSource);
+    // 遍历dataSource中的每个键
+    Object.keys(dataSource).forEach(function (key) {
+      // 如果enumDataSource中不存在该键或者该键对应的值为空数组，则合并
+      if (!enumDataSource[key] || enumDataSource[key].length === 0) {
+        mergedDataSource[key] = dataSource[key];
+      }
+    });
+    enumDataSource = mergedDataSource;
+  }
   if (fieldNames && Object.keys(fieldNames).length) {
     fieldLabel = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label;
     fieldValue = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value;
@@ -44,8 +75,8 @@ function useEnum(codes, value, compose) {
     fieldValue = 'value';
   }
   if (typeof codes === 'string') {
-    var _catchData$data;
-    var options = (catchData === null || catchData === void 0 ? void 0 : (_catchData$data = catchData.data) === null || _catchData$data === void 0 ? void 0 : _catchData$data[codes]) || [];
+    var _enumDataSource;
+    var options = ((_enumDataSource = enumDataSource) === null || _enumDataSource === void 0 ? void 0 : _enumDataSource[codes]) || [];
     var getEnumLabel = function getEnumLabel(v, composezTow) {
       var option = options.find(function (item) {
         return item[fieldValue] === v;
@@ -68,8 +99,8 @@ function useEnum(codes, value, compose) {
   if (Array.isArray(codes)) {
     var _options = {};
     codes.forEach(function (code) {
-      var _catchData$data2;
-      var values = catchData === null || catchData === void 0 ? void 0 : (_catchData$data2 = catchData.data) === null || _catchData$data2 === void 0 ? void 0 : _catchData$data2[code];
+      var _enumDataSource2;
+      var values = (_enumDataSource2 = enumDataSource) === null || _enumDataSource2 === void 0 ? void 0 : _enumDataSource2[code];
       if (Array.isArray(values) && values.length) {
         _options[code] = values;
       }

package/lib/ProEnum/utils/index.d.ts

@@ -4,7 +4,14 @@ interface EnumRes {
     data: Record<string, DataOption[]>;
     [key: string]: any;
 }
-export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
+/**
+ * 获取枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param baseEnumStorage
+ * @returns
+ */
+export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any, dataSource?: any[]): EnumRes;
 export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): import("../propsType").DataOptionType[];
 export declare function isObject(obj: any): boolean;

package/lib/ProEnum/utils/index.js

@@ -14,8 +14,15 @@ exports.setEnumData = setEnumData;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _lodash = require("lodash");
 var _excluded = ["children"];
-function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage) {
+/**
+ * 获取枚举数据
+ * @param storage
+ * @param cacheKey
+ * @param baseEnumStorage
+ * @returns
+ */
+function getEnumData(storage, cacheKey, baseEnumStorage, dataSource) {
+  if (baseEnumStorage && cacheKey === 'zat-design-pro-component-cacheKey') {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {

package/lib/ProTable/components/RenderTabs/index.d.ts

@@ -0,0 +1,4 @@
+/// <reference types="react" />
+import type { ProTableTabsType } from '../../propsType';
+declare const _default: import("react").MemoExoticComponent<(props: ProTableTabsType) => import("react/jsx-runtime").JSX.Element>;
+export default _default;

package/lib/ProTable/components/RenderTabs/index.js

@@ -0,0 +1,82 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+var _react = require("react");
+var _useEnum3 = _interopRequireDefault(require("../../../ProEnum/hooks/useEnum"));
+var RenderTabs = function RenderTabs(props) {
+  var code = props.code,
+    _props$dataSource = props.dataSource,
+    dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
+    transformResponse = props.transformResponse,
+    tabsProps = props.tabsProps,
+    name = props.name,
+    formTableProps = props.formTableProps;
+  var _ref = formTableProps || {},
+    form = _ref.form,
+    onSearch = _ref.onSearch;
+  var _useState = (0, _react.useState)(props.activeKey),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    activeKey = _useState2[0],
+    setActiveKey = _useState2[1];
+  var _useEnum = (0, _useEnum3.default)(code),
+    _useEnum2 = (0, _slicedToArray2.default)(_useEnum, 1),
+    options = _useEnum2[0];
+  var fieldValue = _antd.Form.useWatch(name, form);
+  // 使用useMemo计算派生状态
+  var tabItems = (0, _react.useMemo)(function () {
+    var defaultItems = [].concat((0, _toConsumableArray2.default)(dataSource), (0, _toConsumableArray2.default)(options || []));
+    // 合并数据源并转换格式
+    var mergedData = defaultItems.map(function (item) {
+      return {
+        key: item.value,
+        label: item.label
+      };
+    });
+    if (transformResponse && typeof transformResponse === 'function') {
+      mergedData = transformResponse(defaultItems, formTableProps);
+      return mergedData.map(function (item) {
+        return {
+          key: String(item.value),
+          label: item.label
+        };
+      });
+    }
+    return mergedData.map(function (item) {
+      return {
+        key: String(item.key),
+        label: item.label
+      };
+    });
+  }, [dataSource, options, transformResponse]);
+  (0, _react.useEffect)(function () {
+    var _tabItems$;
+    setActiveKey(fieldValue || (tabItems === null || tabItems === void 0 ? void 0 : (_tabItems$ = tabItems[0]) === null || _tabItems$ === void 0 ? void 0 : _tabItems$.key));
+  }, [fieldValue]);
+  if (!(tabItems === null || tabItems === void 0 ? void 0 : tabItems.length)) {
+    return null;
+  }
+  return (0, _jsxRuntime.jsx)(_antd.Tabs, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+    className: "pro-table-tabs",
+    onChange: function onChange(key) {
+      var fieldsValues = (form === null || form === void 0 ? void 0 : form.getFieldsValue()) || {};
+      setActiveKey(key);
+      form.setFieldValue(name, key);
+      onSearch === null || onSearch === void 0 ? void 0 : onSearch((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldsValues), {}, (0, _defineProperty2.default)({}, name, key)));
+    },
+    type: "card"
+  }, tabsProps), {}, {
+    items: tabItems,
+    activeKey: activeKey
+  }));
+};
+var _default = exports.default = /*#__PURE__*/(0, _react.memo)(RenderTabs);

package/lib/ProTable/components/index.d.ts

@@ -1,5 +1,30 @@
+/**
+ * 表格可伸缩列组件
+ * @description 实现表格列宽可调整功能
+ */
 export { default as TableResizable } from './TableResizable';
+/**
+ * 表格空数据渲染组件
+ * @description 当表格数据为空时的显示内容
+ */
 export { default as RenderEmptyText } from './RenderEmptyText';
+/**
+ * 表格汇总行组件
+ * @description 用于渲染表格底部的汇总信息
+ */
 export { default as RenderSummary } from './RenderSummary';
+/**
+ * 表格头部渲染组件
+ * @description 自定义表格头部区域，支持自定义内容和操作按钮
+ */
 export { default as RenderTableHeader } from './RenderTableHeader';
+/**
+ * 表格底部渲染组件
+ * @description 自定义表格底部区域，支持添加额外操作按钮
+ */
 export { default as RenderFooter } from './RenderFooter';
+/**
+ * 表格标签页组件
+ * @description 实现表格顶部的标签页切换功能，用于数据分类展示
+ */
+export { default as RenderTabs } from './RenderTabs';

package/lib/ProTable/components/index.js

@@ -28,6 +28,12 @@ Object.defineProperty(exports, "RenderTableHeader", {
     return _RenderTableHeader.default;
   }
 });
+Object.defineProperty(exports, "RenderTabs", {
+  enumerable: true,
+  get: function get() {
+    return _RenderTabs.default;
+  }
+});
 Object.defineProperty(exports, "TableResizable", {
   enumerable: true,
   get: function get() {
@@ -38,4 +44,5 @@ var _TableResizable = _interopRequireDefault(require("./TableResizable"));
 var _RenderEmptyText = _interopRequireDefault(require("./RenderEmptyText"));
 var _RenderSummary = _interopRequireDefault(require("./RenderSummary"));
 var _RenderTableHeader = _interopRequireDefault(require("./RenderTableHeader"));
-var _RenderFooter = _interopRequireDefault(require("./RenderFooter"));
+var _RenderFooter = _interopRequireDefault(require("./RenderFooter"));
+var _RenderTabs = _interopRequireDefault(require("./RenderTabs"));

package/lib/ProTable/hooks/useAntdTable.d.ts

@@ -1,95 +1,4 @@
-import { Key } from 'react';
 import { useRequest } from 'ahooks';
 import type { ProTableRequestOptionsType, ProTableServiceType } from '../propsType';
-declare function useAntdTable<I, R extends Record<string, any>, S extends ProTableServiceType<I, R>>(service: S, options?: ProTableRequestOptionsType<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): {
-    data: R[];
-    params: any;
-    rowSelection: {
-        fixed: boolean;
-        type: import("antd/es/table/interface").RowSelectionType;
-        columnWidth: number;
-        selectedRowKeys: Key[];
-        onChange(rowKeys: Key[], rows: any[]): void;
-        onSelectAll: (selected: boolean) => void;
-        getCheckboxProps: (record?: any) => {
-            className: string;
-        };
-        selections: boolean | ({
-            key: string;
-            text: string;
-            onSelect: (changeableRowKeys: Key[]) => void;
-        } | {
-            key: string;
-            text: any;
-            onSelect: () => Promise<void>;
-        })[];
-    };
-    searchValues: I;
-    allSelected: boolean;
-    selectedTip: string;
-    selectedRowKeys: Key[];
-    selectedRecords: R[];
-    clearSelected: () => void;
-    setSelectedRowKeys: (selectedRowKeys: Key[]) => void;
-    setSelectedRecords: (selectedRecords: R[]) => void;
-    pagination: {
-        current: number;
-        pageSize: number;
-        showSizeChanger: boolean;
-        showQuickJumper: boolean;
-        onPaginationChange: boolean;
-        total: number;
-        showTotal: (total: any) => string;
-        onShowSizeChange: (current: number, pageSize: number) => void;
-        onChange: (current: number, pageSize: number) => void;
-    };
-    onReset: () => void;
-    onSearch: (values: any) => void;
-    refresh: () => Promise<void>;
-    tableProps: {
-        rowKey: string | import("rc-table/lib/interface").GetRowKey<R>;
-        loading: boolean;
-        dataSource: R[];
-        rowSelection: {
-            fixed: boolean;
-            type: import("antd/es/table/interface").RowSelectionType;
-            columnWidth: number;
-            selectedRowKeys: Key[];
-            onChange(rowKeys: Key[], rows: any[]): void;
-            onSelectAll: (selected: boolean) => void;
-            getCheckboxProps: (record?: any) => {
-                className: string;
-            };
-            selections: boolean | ({
-                key: string;
-                text: string;
-                onSelect: (changeableRowKeys: Key[]) => void;
-            } | {
-                key: string;
-                text: any;
-                onSelect: () => Promise<void>;
-            })[];
-        };
-        pagination: {
-            current: number;
-            pageSize: number;
-            showSizeChanger: boolean;
-            showQuickJumper: boolean;
-            onPaginationChange: boolean;
-            total: number;
-            showTotal: (total: any) => string;
-            onShowSizeChange: (current: number, pageSize: number) => void;
-            onChange: (current: number, pageSize: number) => void;
-        };
-        onChange: (pagination: any, filters: any, sorter: any, extra: any) => void;
-    };
-    handleSetStateCallback: (values: any) => void;
-    loading: boolean;
-    error?: Error;
-    cancel: () => void;
-    refreshAsync: () => Promise<unknown>;
-    run: (...params: any[]) => void;
-    runAsync: (...params: any[]) => Promise<unknown>;
-    mutate: (data?: unknown) => void;
-};
+declare function useAntdTable<I, R extends Record<string, any>, S extends ProTableServiceType<I, R>>(service: S, options?: ProTableRequestOptionsType<I, R>, useRequestOptions?: Parameters<typeof useRequest>[1]): any;
 export default useAntdTable;

package/lib/ProTable/hooks/useAntdTable.js

@@ -482,7 +482,7 @@ function useAntdTable(service, options, useRequestOptions) {
     onShowSizeChange: handlePageChange,
     onChange: handlePageChange
   };
-  return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
+  var useAntdTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, result), {}, {
     data: data,
     params: params,
     rowSelection: rowSelection,
@@ -516,5 +516,9 @@ function useAntdTable(service, options, useRequestOptions) {
     },
     handleSetStateCallback: handleSetStateCallback
   });
+  useAntdTableProps.tableProps.formTableProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(useAntdTableProps, 'tableProps')), {}, {
+    form: form
+  });
+  return useAntdTableProps;
 }
 var _default = exports.default = useAntdTable;

package/lib/ProTable/index.js

@@ -27,7 +27,7 @@ var _reset = _interopRequireDefault(require("../assets/reset.svg"));
 var _customColumn = _interopRequireDefault(require("../assets/customColumn.svg"));
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd"],
+var _excluded = ["tableId", "headerRender", "footerRender", "quickConfig", "stripe", "columns", "className", "draggable", "disabled", "isView", "rowDisabled", "summary", "emptyText", "diffConfig", "onDragStart", "onDragEnd", "tabs"],
   _excluded2 = ["resizeColumn", "columnConfig", "cacheTime", "storage"];
 var defaultCacheTime = 1; // columns 配置保存时间为一天
 // 全局上下文
@@ -62,6 +62,7 @@ var ProTable = function ProTable(props) {
     diffConfig = props.diffConfig,
     onDragStartGuard = props.onDragStart,
     onDragEndGuard = props.onDragEnd,
+    tabs = props.tabs,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _props$scrollFollowPa = props.scrollFollowParent,
     scrollFollowParent = _props$scrollFollowPa === void 0 ? true : _props$scrollFollowPa;
@@ -400,7 +401,9 @@ var ProTable = function ProTable(props) {
     },
     children: (0, _jsxRuntime.jsxs)("div", {
       className: cls,
-      children: [(0, _jsxRuntime.jsx)(_components.RenderTableHeader, {
+      children: [tabs && (0, _jsxRuntime.jsx)(_components.RenderTabs, (0, _objectSpread4.default)((0, _objectSpread4.default)({}, tabs), {}, {
+        formTableProps: restProps === null || restProps === void 0 ? void 0 : restProps.formTableProps
+      })), (0, _jsxRuntime.jsx)(_components.RenderTableHeader, {
         dataSource: {
           headerRender: headerRender,
           columnConfig: columnConfig,

package/lib/ProTable/propsType.d.ts

@@ -1,5 +1,6 @@
 import { Key, ReactNode } from 'react';
 import { TableProps } from 'antd/es/table/Table';
+import { NamePath } from 'antd/es/form/interface';
 import { ColumnType, GetRowKey, RowSelectionType } from 'antd/es/table/interface';
 import { FormInstance } from 'antd';
 import type { TooltipProps } from 'antd';
@@ -314,6 +315,54 @@ export interface ProTableDiffConfigType {
      */
     addTipColor?: string;
 }
+export interface ProTableTabsType {
+    /**
+     * 激活的 key
+     * @description 激活的 key
+     * @default undefined
+     */
+    activeKey?: string;
+    /**
+     * 枚举 code
+     * @description 枚举 code
+     * @default undefined
+     */
+    code?: string;
+    /**
+     * 枚举数据源
+     * @description 枚举数据源
+     * @default undefined
+     */
+    dataSource?: {
+        label: string;
+        value: string;
+    }[];
+    /**
+     * 枚举数据源转换
+     * @description 枚举数据源转换
+     * @default undefined
+     */
+    transformResponse?: (dataSource: {
+        label: string;
+        value: string;
+    }[], useAntdTableProps: ProTableUseAntdTableType<any, any>) => {
+        key: string;
+        label: string | ReactNode;
+    }[];
+    /**
+     * 标签属性
+     * @description 标签属性
+     * @default undefined
+     */
+    tabsProps?: TabsProps;
+    /**
+     * 表单字段名
+     * @description 表单字段名
+     * @default undefined
+     */
+    name: NamePath;
+    [key: string]: any;
+}
 /**
  * ProTable 主要属性
  */
@@ -321,30 +370,25 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
     /**
      * table 唯一标识
      * @description 用于缓存和获取 columns 配置，在开启 resizeColumn/columnConfig 功能时需要传递以保证缓存和获取到正确的 columns 配置
-     * @default undefined
+     * @default -
      */
     tableId?: string;
     /**
      * 表格 tabs查询 配置
      * @description 用于配置表格的 tabs 选项
-     * @default undefined
+     * @default -
      */
-    tabs?: {
-        code: string;
-        dataSource: any[];
-        transformResponse?: (res: any) => any[];
-        tabsProps?: TabsProps;
-    };
+    tabs?: ProTableTabsType;
     /**
      * 表格行 key 的取值
      * @description 表格行数据的唯一标识字段
-     * @default undefined
+     * @default -
      */
     rowKey?: string | GetRowKey<any>;
     /**
      * 自定义 table header 左侧渲染
      * @description 可以是 ReactNode 或返回 ReactNode 的函数
-     * @default undefined
+     * @default -
      */
     headerRender?: ReactNode | (() => ReactNode);
     /**
@@ -394,7 +438,7 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
     /**
      * 自定义 table footer 左侧渲染
      * @description 可以是 ReactNode 或返回 ReactNode 的函数
-     * @default undefined
+     * @default -
      */
     footerRender?: ReactNode | (() => ReactNode);
     /**
@@ -430,7 +474,7 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
     /**
      * 行禁用判断
      * @description 判断指定行是否禁用
-     * @default undefined
+     * @default -
      */
     rowDisabled?: (record?: T) => string | boolean;
     /**
@@ -448,19 +492,19 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
     /**
      * 表单比对配置
      * @description 用于标记数据变化的配置
-     * @default undefined
+     * @default -
      */
     diffConfig?: ProTableDiffConfigType;
     /**
      * 开始拖拽回调
      * @description 拖拽开始时触发
-     * @default undefined
+     * @default -
      */
     onDragStart?: ProTableDragStartGuardType;
     /**
      * 结束拖拽回调
      * @description 拖拽结束时触发，务必返回变更后的数据源
-     * @default undefined
+     * @default -
      */
     onDragEnd?: ProTableDragEndGuardType;
     /**
@@ -469,6 +513,7 @@ export interface ProTableType<T = any> extends Omit<TableProps<any>, 'summary' |
      * @default true
      */
     scrollFollowParent?: boolean;
+    [key: string]: any;
 }
 /**
  * ProTable 值类型
@@ -702,6 +747,7 @@ export interface ProTableUseAntdTableType<I, R> {
      * @default false
      */
     allSelected: boolean;
+    [key: string]: any;
 }
 export type ProTableProps<T = any> = ProTableType<T>;
 export type ProTableColumn = ProTableColumnType;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.11.14-beta.13",
+  "version": "3.11.14-beta.14",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}