@zat-design/sisyphus-react 3.11.14 → 3.12.0-beta.2

package/lib/ProEditTable/utils/tools.js

@@ -16,32 +16,47 @@ var _lodash = require("lodash");
 /* eslint-disable no-await-in-loop */
 /* eslint-disable no-restricted-syntax */
 
+/**
+ * 生成随机字符串
+ * @returns 随机字符串
+ */
 var getRandom = exports.getRandom = function getRandom() {
   return Math.random().toString(36).slice(-6);
 };
-// 深层次对比两个对象且取出来差异值
+/**
+ * 深层次对比两个对象且取出来差异值
+ * @param object 比较对象
+ * @param base 基准对象
+ * @returns 差异对象
+ */
 var difference = exports.difference = function difference(object, base) {
   var _changes = function changes(object, base) {
     return (0, _lodash.transform)(object, function (result, value, key) {
-      if (!(0, _lodash.isEqual)(value, base[key])) {
-        result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? _changes(value, base[key]) : value;
+      if (!(0, _lodash.isEqual)(value, base === null || base === void 0 ? void 0 : base[key])) {
+        result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base === null || base === void 0 ? void 0 : base[key]) ? _changes(value, base === null || base === void 0 ? void 0 : base[key]) : value;
       }
     });
   };
   return _changes(object, base);
 };
-// 数组字段循环校验，解决validateFields无法批量校验的问题
+/**
+ * 数组字段循环校验，解决validateFields无法批量校验的问题
+ * @param validateKeys 校验键数组
+ * @param form 表单实例
+ * @param rowName 行名称路径
+ * @returns 校验结果Promise
+ */
 var customValidate = exports.customValidate = function customValidate(validateKeys, form, rowName) {
   var array = [];
   validateKeys.forEach(function (key) {
-    array.push(rowName.concat(key));
+    array.push([].concat((0, _toConsumableArray2.default)(Array.isArray(rowName) ? rowName : [rowName]), [key]));
   });
   return form.validateFields(array);
 };
 /**
  * 拆解数组names
- * @param names [][]
- * @returns string
+ * @param names 名称数组
+ * @returns 拆解后的字符串
  */
 var splitNames = exports.splitNames = function splitNames(names) {
   var result;
@@ -58,14 +73,23 @@ var splitNames = exports.splitNames = function splitNames(names) {
   result = resultArray.join('-');
   return result;
 };
-// 获取中间formItem的name
+/**
+ * 获取中间formItem的name
+ * @param name 名称路径
+ * @param virtualKey 虚拟键
+ * @returns 完整名称路径数组
+ */
 var getNamePath = exports.getNamePath = function getNamePath(name, virtualKey) {
   var nextName = (0, _lodash.cloneDeep)(Array.isArray(name) ? name : [name]);
-  var lastValue = nextName[nextName.length - 1];
-  nextName[nextName.length - 1] = "".concat(lastValue).concat(virtualKey ? "-".concat(virtualKey) : '');
+  var lastIndex = nextName.length - 1;
+  // 确保最后一个元素是字符串类型
+  nextName[lastIndex] = "".concat(nextName[lastIndex]).concat(virtualKey ? "-".concat(virtualKey) : '');
   return nextName;
 };
-// 删除操作
+/**
+ * 删除操作
+ * @param params 删除参数
+ */
 var onDelete = exports.onDelete = function onDelete(_ref) {
   var name = _ref.name,
     form = _ref.form,
@@ -90,16 +114,12 @@ var onDelete = exports.onDelete = function onDelete(_ref) {
     }
   }
 };
-/** 获取最终的disabled, 两张模式【子级优先，全局优先】
+/**
+ * 获取最终的disabled, 两张模式【子级优先，全局优先
  * 全局优先：globalControl为true时，全局控制
  * 子级优先：globalControl为false时，子级控制
- * @param globalControl 全局控制
- * @param formDisabled 表单的disabled
- * @param column 当前列
- * @param tabledDisabled 表格的disabled
- * @param columnFieldProps 当前列的fieldProps
- * @param params 当前列的参数
- * @param rowDisabled 行禁用参数
+ * @param params 禁用参数
+ * @returns 是否禁用
  */
 var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
   var _ref3, _column$disabled;
@@ -112,7 +132,7 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
     rowDisabled = _ref2.rowDisabled;
   var convertToBoolean = function convertToBoolean(value) {
     if (Array.isArray(value)) {
-      return value;
+      return Boolean(value.length);
     }
     if (value === null || value === undefined || value === '') {
       return false;
@@ -166,15 +186,16 @@ var getDisabled = exports.getDisabled = function getDisabled(_ref2) {
   }
   return convertToBoolean((_ref3 = (_column$disabled = column === null || column === void 0 ? void 0 : column.disabled) !== null && _column$disabled !== void 0 ? _column$disabled : columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) !== null && _ref3 !== void 0 ? _ref3 : tabledDisabled);
 };
-/** 表格自动滚动到报错位置
+/**
+ * 表格自动滚动到报错位置
  */
 var handleScrollToError = exports.handleScrollToError = function handleScrollToError() {
   setTimeout(function () {
-    var errorDom = document.querySelector('.ant-form-item-has-error');
+    var errorDom = document.querySelector('[class*="form-item-has-error"]');
     if (errorDom) {
-      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-      var tableCell = errorDom.closest('.ant-table-cell');
-      var tableRow = errorDom.closest('.ant-table-row');
+      var tableBody = errorDom.closest('[class*="table-content"]') || errorDom.closest('[class*="table-body"]');
+      var tableCell = errorDom.closest('[class*="table-cell"]');
+      var tableRow = errorDom.closest('[class*="table-row"]');
       if (tableBody && tableCell) {
         var previousSibling = tableCell.previousElementSibling;
         var childOffsetLeft = 0;
@@ -226,6 +247,11 @@ function cloneDeepFilterNode(value) {
     }
   });
 }
+/**
+ * 判断值是否为空
+ * @param value 需要判断的值
+ * @returns 是否为空
+ */
 var _isNull = function isNull(value) {
   if (Array.isArray(value) && value.length) {
     return value.some(function (item) {

package/lib/ProEnum/components/Group.d.ts

@@ -1,5 +1,5 @@
-import { ProEnum } from '../propsType';
-interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'> {
+import type { ProEnumType } from '../propsType';
+interface Props extends Pick<ProEnumType, 'id' | 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
     disabled?: boolean;

package/lib/ProEnum/components/Tag.d.ts

@@ -1,5 +1,5 @@
-import { ProEnum } from '../propsType';
-interface Props extends Pick<ProEnum, 'id' | 'value' | 'onChange' | 'dataSource'> {
+import type { ProEnumType } from '../propsType';
+interface Props extends Pick<ProEnumType, 'id' | 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
 }

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/hooks/useEnumRequest.d.ts

@@ -1,4 +1,4 @@
-import { ProEnumConfig } from '../propsType';
+import type { ProEnumConfigType } from '../propsType';
 import '../utils/eventCenter';
-declare const useEnumRequest: (props: ProEnumConfig, dispatch: any) => import("ahooks/lib/useRequest/src/types").Result<any, any>;
+declare const useEnumRequest: (props: ProEnumConfigType, dispatch: any) => import("ahooks/lib/useRequest/src/types").Result<any, any>;
 export default useEnumRequest;

package/lib/ProEnum/index.d.ts

@@ -1,8 +1,8 @@
 import useEnum from './hooks/useEnum';
-import { ProEnumProps } from './propsType';
+import type { ProEnumType } from './propsType';
 import './style/index.less';
 declare const ProEnum: {
-    (props: ProEnumProps): import("react/jsx-runtime").JSX.Element;
+    (props: ProEnumType): import("react/jsx-runtime").JSX.Element;
     getEnumLabel: (code: string | string[], value: any, compose?: boolean, fieldNameLabel?: string, fieldNameValue?: string) => import("react/jsx-runtime").JSX.Element;
     useEnum: typeof useEnum;
 };

package/lib/ProEnum/propsType.d.ts

@@ -1,95 +1,284 @@
 import React, { ReactNode } from 'react';
 import { RadioProps, CheckboxProps } from 'antd';
 import { Service, Options } from 'ahooks/lib/useRequest/src/types';
-import { ProFormOtherProps } from '../index';
-import { PropSelectProps } from '../ProSelect/propsType';
-export interface DataOption {
+import type { ProFormOtherType } from '../ProForm/propsType';
+import type { PropSelectProps } from '../ProSelect/propsType';
+/**
+ * @description 数据选项类型
+ */
+export interface DataOptionType {
+    /**
+     * @description 展示标签
+     * @default -
+     */
     label?: string;
+    /**
+     * @description 选项值
+     * @default -
+     */
     value?: string;
+    /**
+     * @description 是否禁用
+     * @default false
+     */
     disabled?: boolean;
+    /**
+     * @description 允许扩展字段
+     */
     [key: string]: any;
 }
-export interface ProEnumConfig {
-    /** 是否枚举主入口 */
+/**
+ * @description ProEnum配置类型
+ */
+export interface ProEnumConfigType {
+    /**
+     * @description 是否枚举主入口
+     * @default false
+     */
     main?: boolean;
-    /** 是否使用主入口枚举 */
+    /**
+     * @description 是否使用主入口枚举
+     * @default false
+     */
     share?: boolean;
-    /** 是否开启调试 log */
+    /**
+     * @description 是否开启调试 log
+     * @default false
+     */
     debugger?: boolean;
-    /** 是否对数据进行清洗 */
+    /**
+     * @description 是否对数据进行清洗
+     * @default false
+     */
     clear?: boolean;
-    /** 字段别名 */
+    /**
+     * @description 字段别名
+     * @default { label: 'label', value: 'value', children: 'children' }
+     */
     fieldNames?: Record<'label' | 'value' | 'children', string>;
-    /** 缓存的key、默认 zat-design-pro-component-cacheKey */
+    /**
+     * @description 缓存的key、默认 zat-design-pro-component-cacheKey
+     * @default "zat-design-pro-component-cacheKey"
+     */
     cacheKey: string;
-    /** 刷新请求、设置后每次进入都会重新请求 */
+    /**
+     * @description 刷新请求、设置后每次进入都会重新请求
+     * @default false
+     */
     requestRefresh: boolean;
-    /** 存储位置、不设置、默认读取 globalConfig 里面的 */
+    /**
+     * @description 存储位置、不设置、默认读取 globalConfig 里面的
+     * @default "localStorage"
+     */
     storage: 'localStorage' | 'sessionStorage';
-    /** 默认静态枚举数据 */
-    dataSource: Record<string, DataOption[]>;
-    /** 对后台返回数据进行格式化 */
+    /**
+     * @description 默认静态枚举数据
+     * @default {}
+     */
+    dataSource: Record<string, DataOptionType[]>;
+    /**
+     * @description 对后台返回数据进行格式化
+     * @param data 后台返回的数据
+     * @returns 格式化后的枚举数据
+     * @default -
+     */
     transformResponse?: (data: {
-        data: Record<string, DataOption[]>;
-    }) => Record<string, DataOption[]> | Promise<Record<string, DataOption[]>>;
-    /** 批量请求枚举接口 */
+        data: Record<string, DataOptionType[]>;
+    }) => Record<string, DataOptionType[]> | Promise<Record<string, DataOptionType[]>>;
+    /**
+     * @description 批量请求枚举接口
+     * @default -
+     */
     useRequest?: {
+        /**
+         * @description 请求服务函数
+         */
         service: Service<any, any>;
+        /**
+         * @description 请求选项配置
+         */
         options?: Options<any, any> & {
+            /**
+             * @description 指定请求的枚举码
+             */
             codes?: string[];
+            /**
+             * @description 忽略的枚举码
+             */
             ignoreCodes?: string[];
         };
     };
-    dics: Record<string, DataOption[]>;
+    /**
+     * @description 字典数据
+     * @default {}
+     */
+    dics: Record<string, DataOptionType[]>;
 }
-type ProEnumType = 'ProSelect' | 'Radio' | 'Checkbox' | 'Tag' | 'Group';
-export interface ProEnum {
-    /** 组件展示类型、默认 ProSelect */
-    type?: ProEnumType;
-    /** 用于自定义组件 */
+/**
+ * @description 枚举组件类型枚举
+ */
+type EnumComponentType = 'ProSelect' | 'Radio' | 'Checkbox' | 'Tag' | 'Group';
+/**
+ * @description ProEnum基础属性类型
+ */
+export interface ProEnumBaseType {
+    /**
+     * @description 组件展示类型、默认 ProSelect
+     * @default "ProSelect"
+     */
+    type?: EnumComponentType;
+    /**
+     * @description 用于自定义组件
+     * @default -
+     */
     component?: ReactNode;
-    /** 用于提交 code */
+    /**
+     * @description 用于提交 code
+     * @default -
+     */
     code?: string | string[];
-    /** 字段别名 */
+    /**
+     * @description 字段别名
+     * @default -
+     */
     fieldNames?: Record<string, string>;
-    /** 是否查看模式 */
+    /**
+     * @description 是否查看模式
+     * @default false
+     */
     isView?: boolean;
-    /** 数据源 */
-    dataSource?: DataOption[];
+    /**
+     * @description 数据源
+     * @default -
+     */
+    dataSource?: DataOptionType[];
+    /**
+     * @description 当前值
+     * @default -
+     */
     value: any;
+    /**
+     * @description 值变化回调
+     * @default -
+     */
     onChange?: (value: any) => void;
-    /** 远程请求接口 */
+    /**
+     * @description 远程请求接口
+     * @default -
+     */
     useRequest?: {
+        /**
+         * @description 请求服务函数
+         */
         service: Service<any, any>;
+        /**
+         * @description 请求选项
+         */
         options?: Options<any, any>;
     };
-    /** 对后台返回数据进行格式化 */
-    transformResponse?: (data: any) => DataOption[];
-    /** 时候合并 */
+    /**
+     * @description 对后台返回数据进行格式化
+     * @param data 后台返回的数据
+     * @returns 格式化后的选项数据
+     * @default -
+     */
+    transformResponse?: (data: any) => DataOptionType[];
+    /**
+     * @description 是否合并数据
+     * @default false
+     */
     merge?: boolean;
-    /** 查看模式下为空展示 */
+    /**
+     * @description 查看模式下为空展示
+     * @default "-"
+     */
     viewEmpty?: React.ReactNode;
+    /**
+     * @description 自定义选项渲染
+     * @default -
+     */
     optionRender?: any;
-    /** 显示 code-value 形式 */
+    /**
+     * @description 显示 code-value 形式
+     * @default false
+     */
     showCodeName?: boolean;
-    /** 支持 {label:xx, value: xx} */
+    /**
+     * @description 支持 {label:xx, value: xx} 形式
+     * @default false
+     */
     labelInValue?: boolean;
-    otherProps?: ProFormOtherProps;
+    /**
+     * @description 其他表单属性
+     * @default -
+     */
+    otherProps?: ProFormOtherType;
+    /**
+     * @description 是否允许清除
+     * @default false
+     */
     allowClear?: boolean;
+    /**
+     * @description 组件ID
+     * @default -
+     */
     id?: string;
+    /**
+     * @description 默认值
+     * @default -
+     */
     defaultValue?: any;
 }
-export type PropProSelectsMap = {
+/**
+ * @description ProSelect类型映射
+ */
+export type PropProSelectsMapType = {
+    /**
+     * @description 类型为ProSelect
+     * @default "ProSelect"
+     */
     type?: 'ProSelect';
 } & PropSelectProps;
-export type PropRadioPropsMap = {
+/**
+ * @description Radio类型映射
+ */
+export type PropRadioPropsMapType = {
+    /**
+     * @description 类型为Radio
+     * @default "Radio"
+     */
     type?: 'Radio';
 } & RadioProps;
-export type CheckboxPropsMap = {
+/**
+ * @description Checkbox类型映射
+ */
+export type CheckboxPropsMapType = {
+    /**
+     * @description 类型为Checkbox
+     * @default "Checkbox"
+     */
     type?: 'Checkbox';
 } & CheckboxProps;
-export interface TagPropsMap {
+/**
+ * @description Tag类型映射
+ */
+export interface TagPropsMapType {
+    /**
+     * @description 类型为Tag或Group
+     * @default -
+     */
     type?: 'Tag' | 'Group';
 }
-export type ProEnumProps = Omit<ProEnum, 'type'> & (PropProSelectsMap | PropRadioPropsMap | CheckboxPropsMap | TagPropsMap);
+/**
+ * @description ProEnum组件属性类型
+ */
+export type ProEnumType = Omit<ProEnumBaseType, 'type'> & (PropProSelectsMapType | PropRadioPropsMapType | CheckboxPropsMapType | TagPropsMapType);
+export type DataOption = DataOptionType;
+export type ProEnumConfig = ProEnumConfigType;
+export type ProEnum = ProEnumBaseType;
+export type PropProSelectsMap = PropProSelectsMapType;
+export type PropRadioPropsMap = PropRadioPropsMapType;
+export type CheckboxPropsMap = CheckboxPropsMapType;
+export type TagPropsMap = TagPropsMapType;
+export type ProEnumProps = ProEnumBaseType;
 export {};

package/lib/ProEnum/propsType.js

@@ -2,10 +2,4 @@
 
 Object.defineProperty(exports, "__esModule", {
   value: true
-});
-var proEnum = {
-  code: '22',
-  showCodeName: true,
-  value: 1,
-  type: 'Group'
-};
+});

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

@@ -4,9 +4,16 @@ 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): DataOption[];
+export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): import("../propsType").DataOptionType[];
 export declare function isObject(obj: any): boolean;
 export declare function mergeCacheData(storage: string, code: string, cacheKey: string, responseData: any): void;
 /**