@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

package/es/ProEnum/hooks/useEnumRequest.js

@@ -6,10 +6,10 @@ import _typeof from "@babel/runtime/helpers/esm/typeof";
 var _ref;
 import { useEffect } from 'react';
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
-import { diffCode, getEnumData, setEnumData, cacheFieldNames } from '../utils';
-import locale from '../../locale';
-import '../utils/eventCenter';
-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;
+import { diffCode, getEnumData, setEnumData, cacheFieldNames, baseCacheKey } from "../utils";
+import locale from "../../locale";
+import "../utils/eventCenter";
+var baseEnumStorage = (_ref = window.localStorage.getItem(baseCacheKey) && JSON.parse(window.localStorage.getItem(baseCacheKey))) !== null && _ref !== void 0 ? _ref : null;
 var useEnumRequest = function useEnumRequest(props, dispatch) {
   var _ref2 = props || {},
     _ref2$main = _ref2.main,
@@ -25,7 +25,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
       children: 'children'
     } : _ref2$fieldNames,
     _ref2$cacheKey = _ref2.cacheKey,
-    cacheKey = _ref2$cacheKey === void 0 ? 'zat-design-pro-component-cacheKey' : _ref2$cacheKey,
+    cacheKey = _ref2$cacheKey === void 0 ? baseCacheKey : _ref2$cacheKey,
     _ref2$requestRefresh = _ref2.requestRefresh,
     requestRefresh = _ref2$requestRefresh === void 0 ? false : _ref2$requestRefresh,
     _ref2$storage = _ref2.storage,
@@ -38,7 +38,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     dics = _ref2$dics === void 0 ? {} : _ref2$dics;
   if (_typeof(dataSource) === 'object' && dataSource === null) {
     var _locale$ProEnum;
-    throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
+    throw new Error(locale === null || locale === void 0 || (_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorDataSource);
   }
   var logDebug = function logDebug(msg) {
     if (props.debugger) {
@@ -52,7 +52,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     staleTime: 6e4 * 60
   }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
     setCache: function () {
-      var _setCache = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
+      var _setCache = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(res) {
         var response, _locale$ProEnum2, _useRequest$options, ignoreCodes, cacheData;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -70,7 +70,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 _context.next = 9;
                 break;
               }
-              throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+              throw new Error(locale === null || locale === void 0 || (_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
             case 9:
               res.data = response;
             case 10:
@@ -89,12 +89,12 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               // 只返回fieldNames对象的key
               if (clear) {
                 // 忽略清洗的 codes
-                ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
+                ignoreCodes = (useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.ignoreCodes) || [];
                 Object.keys(response).forEach(function (key) {
                   if (!response[key] || !Array.isArray(response[key])) {
                     return;
                   }
-                  var options = _toConsumableArray(response[key]) || [];
+                  var options = _toConsumableArray(response[key]);
                   if (ignoreCodes.includes(key)) {
                     response[key] = options;
                   } else {
@@ -110,6 +110,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               }; // 合并缓存数据
               res.data = _objectSpread(_objectSpread({}, cacheData === null || cacheData === void 0 ? void 0 : cacheData.data), res.data);
               setEnumData(storage, cacheKey, res);
+
               // 同步数据到全局
               dispatch({
                 type: 'setProEnumDic',
@@ -119,7 +120,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
                 setTimeout(function () {
                   var _locale$ProEnum3;
                   window.eventCenter.publish('zat-design-pro-component-event', res.data);
-                  logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
+                  logDebug(locale === null || locale === void 0 || (_locale$ProEnum3 = locale.ProEnum) === null || _locale$ProEnum3 === void 0 ? void 0 : _locale$ProEnum3.mainInitByRequest);
                 }, 10000);
               }
               return _context.abrupt("return", res);
@@ -146,7 +147,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         setTimeout(function () {
           var _locale$ProEnum4;
           window.eventCenter.publish('zat-design-pro-component-event', res.data);
-          logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
+          logDebug(locale === null || locale === void 0 || (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.mainInitByCache);
         }, 10000);
       }
       return res;
@@ -157,12 +158,12 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         msg = res.message;
       if (status !== 200) {
         var _locale$ProEnum5;
-        throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
+        throw new Error(locale === null || locale === void 0 || (_locale$ProEnum5 = locale.ProEnum) === null || _locale$ProEnum5 === void 0 ? void 0 : _locale$ProEnum5.requestError);
       }
     }
   }));
   var mergeData = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var cacheData, _useRequest$options2, _useRequest$options3, enumData, cacheCodes, codes, ignoreCodes, diff, response, res, _locale$ProEnum6;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -180,8 +181,8 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
             }
             enumData = cacheData.data;
             cacheCodes = Object.keys(enumData);
-            codes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.codes) || []; // 缓存的所有 codes
-            ignoreCodes = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.ignoreCodes) || []; // 忽略清洗的 codes
+            codes = (useRequest === null || useRequest === void 0 || (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.codes) || []; // 缓存的所有 codes
+            ignoreCodes = (useRequest === null || useRequest === void 0 || (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.ignoreCodes) || []; // 忽略清洗的 codes
             diff = diffCode(cacheCodes, codes);
             if (!diff) {
               _context2.next = 27;
@@ -203,7 +204,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
               _context2.next = 18;
               break;
             }
-            throw new Error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum6 = locale.ProEnum) === null || _locale$ProEnum6 === void 0 ? void 0 : _locale$ProEnum6.errorMessage);
+            throw new Error(locale === null || locale === void 0 || (_locale$ProEnum6 = locale.ProEnum) === null || _locale$ProEnum6 === void 0 ? void 0 : _locale$ProEnum6.errorMessage);
           case 18:
             _context2.next = 21;
             break;
@@ -215,7 +216,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
             // 只返回fieldNames对象的key
             if (clear) {
               Object.keys(response).forEach(function (key) {
-                var options = _toConsumableArray(response[key]) || [];
+                var options = _toConsumableArray(response[key]);
                 if (ignoreCodes.includes(key)) {
                   response[key] = options;
                 } else {
@@ -253,7 +254,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     };
   }();
   useDeepCompareEffect(function () {
-    if (useRequest && (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service)) {
+    if (useRequest && useRequest !== null && useRequest !== void 0 && useRequest.service) {
       var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
         defaultParams = _ref4.defaultParams;
       var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
@@ -262,6 +263,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
         window.sessionStorage.removeItem(cacheKey);
       }
       enumRes.run(params);
+
       // TODO 这段代码目前看起来是没啥用的、没起到作用
       mergeData();
     } else if (Object.keys(dataSource)) {
@@ -296,12 +298,12 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     if (main) {
       var _locale$ProEnum7;
       window.eventCenter.publish('zat-design-pro-component-event', {});
-      logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum7 = locale.ProEnum) === null || _locale$ProEnum7 === void 0 ? void 0 : _locale$ProEnum7.mainInitOnce);
+      logDebug(locale === null || locale === void 0 || (_locale$ProEnum7 = locale.ProEnum) === null || _locale$ProEnum7 === void 0 ? void 0 : _locale$ProEnum7.mainInitOnce);
     }
     if (!main && share) {
       var _locale$ProEnum8;
       window.eventCenter.subscribe('zat-design-pro-component-event', shareProEnumDic);
-      logDebug(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum8 = locale.ProEnum) === null || _locale$ProEnum8 === void 0 ? void 0 : _locale$ProEnum8.sonInitEvent);
+      logDebug(locale === null || locale === void 0 || (_locale$ProEnum8 = locale.ProEnum) === null || _locale$ProEnum8 === void 0 ? void 0 : _locale$ProEnum8.sonInitEvent);
     }
     return function () {
       window.eventCenter.unsubscribe('zat-design-pro-component-event', shareProEnumDic);

package/es/ProEnum/index.js

@@ -1,38 +1,27 @@
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/checkbox/style";
-import _Checkbox from "antd/es/checkbox";
-import "antd/es/radio/style";
-import _Radio from "antd/es/radio";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isNumber from "lodash/isNumber";
-import _omit from "lodash/omit";
-import _isArray from "lodash/isArray";
-import _isString from "lodash/isString";
-import _isFunction from "lodash/isFunction";
-import _cloneDeep from "lodash/cloneDeep";
 var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps", "isView"],
   _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
+import { message, Radio, Checkbox, Space } from 'antd';
 import React, { useState, useEffect, useMemo } from 'react';
-import ProSelect from '../ProSelect';
-import { useProConfig } from '../ProConfigProvider';
-import ProEnumTag from './components/Tag';
-import ProEnumGroup from './components/Group';
-import Container from '../ProForm/components/Container';
-import { isObject } from './utils';
-import getEnumLabel from './utils/getEnumLabel';
-import useEnum from './hooks/useEnum';
-import locale from '../locale';
-import './style/index.less';
-import { useFieldProps } from '../ProForm/utils/useFieldProps';
+import { cloneDeep, isFunction, isString, isArray, omit, isNumber } from 'lodash';
+import ProSelect from "../ProSelect";
+import { useProConfig } from "../ProConfigProvider";
+import ProEnumTag from "./components/Tag";
+import ProEnumGroup from "./components/Group";
+import Container from "../ProForm/components/Container";
+import { isObject } from "./utils";
+import getEnumLabel from "./utils/getEnumLabel";
+import useEnum from "./hooks/useEnum";
+import locale from "../locale";
+import "./style/index.less";
+import { useFieldProps } from "../ProForm/utils/useFieldProps";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var ProEnum = function ProEnum(props) {
   var _otherProps$isView, _enumProps$showCodeNa;
   var code = props.code,
@@ -72,23 +61,24 @@ var ProEnum = function ProEnum(props) {
     (dataSource === null || dataSource === void 0 ? void 0 : dataSource.length) && setData(_toConsumableArray(dataSource));
   }, [dataSource]);
   if (fieldNames && Object.keys(fieldNames).length) {
-    if (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.label) label = fieldNames.label;
-    if (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value) fieldValue = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value;
+    if (fieldNames !== null && fieldNames !== void 0 && fieldNames.label) label = fieldNames.label;
+    if (fieldNames !== null && fieldNames !== void 0 && fieldNames.value) fieldValue = fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.value;
   }
   if (props.fieldNames && Object.keys(props.fieldNames).length) {
     var _props$fieldNames, _props$fieldNames2, _props$fieldNames3, _props$fieldNames4;
-    if (props === null || props === void 0 ? void 0 : (_props$fieldNames = props.fieldNames) === null || _props$fieldNames === void 0 ? void 0 : _props$fieldNames.label) label = (_props$fieldNames2 = props.fieldNames) === null || _props$fieldNames2 === void 0 ? void 0 : _props$fieldNames2.label;
-    if (props === null || props === void 0 ? void 0 : (_props$fieldNames3 = props.fieldNames) === null || _props$fieldNames3 === void 0 ? void 0 : _props$fieldNames3.value) fieldValue = (_props$fieldNames4 = props.fieldNames) === null || _props$fieldNames4 === void 0 ? void 0 : _props$fieldNames4.value;
+    if (props !== null && props !== void 0 && (_props$fieldNames = props.fieldNames) !== null && _props$fieldNames !== void 0 && _props$fieldNames.label) label = (_props$fieldNames2 = props.fieldNames) === null || _props$fieldNames2 === void 0 ? void 0 : _props$fieldNames2.label;
+    if (props !== null && props !== void 0 && (_props$fieldNames3 = props.fieldNames) !== null && _props$fieldNames3 !== void 0 && _props$fieldNames3.value) fieldValue = (_props$fieldNames4 = props.fieldNames) === null || _props$fieldNames4 === void 0 ? void 0 : _props$fieldNames4.value;
   }
   if (clear) {
     label = 'label';
     fieldValue = 'value';
   }
+
   // 这种时候优先级最高、完全走自定义
-  if ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) && props.fieldNames) {
+  if (useRequest !== null && useRequest !== void 0 && useRequest.service && props.fieldNames) {
     var _props$fieldNames5, _props$fieldNames6;
-    if ((_props$fieldNames5 = props.fieldNames) === null || _props$fieldNames5 === void 0 ? void 0 : _props$fieldNames5.label) label = props.fieldNames.label;
-    if ((_props$fieldNames6 = props.fieldNames) === null || _props$fieldNames6 === void 0 ? void 0 : _props$fieldNames6.value) fieldValue = props.fieldNames.value;
+    if ((_props$fieldNames5 = props.fieldNames) !== null && _props$fieldNames5 !== void 0 && _props$fieldNames5.label) label = props.fieldNames.label;
+    if ((_props$fieldNames6 = props.fieldNames) !== null && _props$fieldNames6 !== void 0 && _props$fieldNames6.value) fieldValue = props.fieldNames.value;
   }
   var _useProConfig = useProConfig('ProEnum'),
     _useProConfig$dics = _useProConfig.dics,
@@ -102,7 +92,7 @@ var ProEnum = function ProEnum(props) {
           var responseData = transformResponse(res);
           if (_typeof(responseData) !== 'object') {
             var _locale$ProEnum;
-            return _message.error((_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
+            return message.error((_locale$ProEnum = locale.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
           }
           setData(responseData);
         } else {
@@ -113,49 +103,51 @@ var ProEnum = function ProEnum(props) {
           if (status === 200) {
             if (_typeof(data) !== 'object') {
               var _locale$ProEnum2;
-              return _message.error((_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+              return message.error((_locale$ProEnum2 = locale.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
             }
             if (Array.isArray(data)) {
               setData(_toConsumableArray(data));
             }
-            if (isObject(data) && _isString(code)) {
+            if (isObject(data) && isString(code)) {
               setData(data[code]);
             }
           } else {
-            _message.error(msg);
+            message.error(msg);
           }
         }
       }
     })),
     run = _useRequestFunc.run;
+
   // 自定义请求
   useDeepCompareEffect(function () {
     var _ref3 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
       defaultParams = _ref3.defaultParams;
     var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
-    if (useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) {
+    if (useRequest !== null && useRequest !== void 0 && useRequest.service) {
       run(params);
     }
   }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   var enumLists = useMemo(function () {
     var lists = [];
-    if (_isString(code)) {
+    if (isString(code)) {
       lists = (dics === null || dics === void 0 ? void 0 : dics[code]) || [];
     }
-    if (_isArray(code)) {
+    if (isArray(code)) {
       code.forEach(function (enumCode) {
         var _lists;
-        _isArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, _toConsumableArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
+        isArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, _toConsumableArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
       });
     }
     return lists;
   }, [dics, code]);
   var renderComponent = function renderComponent() {
     var list = [];
+
     // 优先使用组件内部自己传入的数据源或者请求得到的数据
-    list = _cloneDeep(dataList && dataList.length ? dataList : enumLists);
+    list = cloneDeep(dataList && dataList.length ? dataList : enumLists);
     // 对数据进行一系列的过滤等操作
-    if (!(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service) && transformResponse) {
+    if (!(useRequest !== null && useRequest !== void 0 && useRequest.service) && transformResponse) {
       list = transformResponse(list);
       if (!Array.isArray(list)) {
         var _locale$ProEnum3;
@@ -163,9 +155,9 @@ var ProEnum = function ProEnum(props) {
         list = [];
       }
     }
-    if (/*#__PURE__*/React.isValidElement(component)) {
+    if ( /*#__PURE__*/React.isValidElement(component)) {
       var Component = component;
-      return _jsx(Component, _objectSpread(_objectSpread({}, enumProps), {}, {
+      return /*#__PURE__*/_jsx(Component, _objectSpread(_objectSpread({}, enumProps), {}, {
         dataSource: list,
         fieldNames: {
           label: label,
@@ -177,7 +169,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
+        return /*#__PURE__*/_jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {
@@ -188,12 +180,12 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange
         }));
       case 'Radio':
-        return _jsx(_Radio.Group, _objectSpread(_objectSpread({}, _omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return /*#__PURE__*/_jsx(Radio.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
           children: list.map(function (item) {
-            return _jsx(_Radio, {
+            return /*#__PURE__*/_jsx(Radio, {
               value: item[fieldValue],
               disabled: !!item.disabled,
               children: item[label]
@@ -201,12 +193,12 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Checkbox':
-        return _jsx(_Checkbox.Group, _objectSpread(_objectSpread({}, _omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return /*#__PURE__*/_jsx(Checkbox.Group, _objectSpread(_objectSpread({}, omit(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
           children: list.map(function (item) {
-            return _jsx(_Checkbox, {
+            return /*#__PURE__*/_jsx(Checkbox, {
               value: item[fieldValue],
               disabled: !!item.disabled,
               children: item[label]
@@ -214,7 +206,7 @@ var ProEnum = function ProEnum(props) {
           })
         }));
       case 'Tag':
-        return _jsx(ProEnumTag, {
+        return /*#__PURE__*/_jsx(ProEnumTag, {
           id: enumProps.id,
           value: value,
           onChange: onChange,
@@ -223,7 +215,7 @@ var ProEnum = function ProEnum(props) {
           dataSource: list
         });
       case 'Group':
-        return _jsx(ProEnumGroup, _objectSpread(_objectSpread({}, _omit(enumProps, ['showCodeName'])), {}, {
+        return /*#__PURE__*/_jsx(ProEnumGroup, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
           value: value,
           onChange: onChange,
           fieldLabel: label,
@@ -236,7 +228,7 @@ var ProEnum = function ProEnum(props) {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    _message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
+    message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 || (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -269,33 +261,33 @@ var ProEnum = function ProEnum(props) {
       record.forEach(function (item) {
         arr.push(props.optionRender(item));
       });
-      return _jsx(_Space, {
+      return /*#__PURE__*/_jsx(Space, {
         direction: "vertical",
         size: 4,
         children: arr.map(function (item) {
-          return _jsx(React.Fragment, {
+          return /*#__PURE__*/_jsx(React.Fragment, {
             children: item
           }, item);
         })
       });
     };
-    return _isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
+    return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
   if (_isView) {
     var __value = value || _defalutValue;
     if (Array.isArray(__value)) {
-      return _jsx(Container, {
+      return /*#__PURE__*/_jsx(Container, {
         tooltip: true,
         viewEmpty: viewEmpty,
         children: transToLabel(__value)
       });
     }
-    return _jsx(Container, {
+    return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
-      children: __value || _isNumber(__value) ? transToLabel([__value]) : null
+      children: __value || isNumber(__value) ? transToLabel([__value]) : null
     });
   }
-  return _jsx(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: renderComponent()
   });
 };

package/es/ProEnum/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 @zaui-disabled-bg: var(--zaui-disabled-bg);
 

package/es/ProEnum/utils/eventCenter.js

@@ -1,13 +1,14 @@
 import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
 import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _isFunction from "lodash/isFunction";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import { isFunction } from 'lodash';
 var SimpleEventCenter = /*#__PURE__*/function () {
   function SimpleEventCenter() {
     _classCallCheck(this, SimpleEventCenter);
-    this.events = void 0;
+    _defineProperty(this, "events", void 0);
     this.events = new Map();
   }
-  return _createClass(SimpleEventCenter, [{
+  _createClass(SimpleEventCenter, [{
     key: "subscribe",
     value: function subscribe(eventName, callback) {
       if (!this.events.has(eventName)) {
@@ -20,7 +21,7 @@ var SimpleEventCenter = /*#__PURE__*/function () {
     value: function publish(eventName, data) {
       if (this.events.has(eventName)) {
         this.events.get(eventName).forEach(function (callback) {
-          _isFunction(callback) && (callback === null || callback === void 0 ? void 0 : callback(data));
+          isFunction(callback) && (callback === null || callback === void 0 ? void 0 : callback(data));
         });
       }
     }
@@ -34,5 +35,6 @@ var SimpleEventCenter = /*#__PURE__*/function () {
       }
     }
   }]);
+  return SimpleEventCenter;
 }(); // 将 eventCenter 实例添加到 window 对象上
 window.eventCenter = new SimpleEventCenter();

package/es/ProEnum/utils/getEnumLabel.js

@@ -1,9 +1,8 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _isString from "lodash/isString";
-import _isArray from "lodash/isArray";
-import { jsx as _jsx } from "react/jsx-runtime";
 import { useMemo } from 'react';
-import { useProConfig } from '../../ProConfigProvider';
+import { isArray, isString } from 'lodash';
+import { useProConfig } from "../../ProConfigProvider";
+import { jsx as _jsx } from "react/jsx-runtime";
 var EnumLabel = function EnumLabel(props) {
   var fieldNameLabel = '';
   var fieldNameValue = '';
@@ -29,13 +28,13 @@ var EnumLabel = function EnumLabel(props) {
     dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
   var enumLists = useMemo(function () {
     var lists = [];
-    if (_isString(code)) {
+    if (isString(code)) {
       lists = (dics === null || dics === void 0 ? void 0 : dics[code]) || [];
     }
-    if (_isArray(code)) {
+    if (isArray(code)) {
       code.forEach(function (enumCode) {
         var _lists;
-        _isArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, _toConsumableArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
+        isArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]) && (_lists = lists).push.apply(_lists, _toConsumableArray(dics === null || dics === void 0 ? void 0 : dics[enumCode]));
       });
     }
     return lists;
@@ -50,7 +49,7 @@ var EnumLabel = function EnumLabel(props) {
       }
       return '';
     });
-    return _jsx("span", {
+    return /*#__PURE__*/_jsx("span", {
       children: labelList.join('，') || '-'
     });
   };
@@ -60,7 +59,7 @@ var EnumLabel = function EnumLabel(props) {
     }
     return transToLabel([value]);
   }
-  return _jsx("span", {
+  return /*#__PURE__*/_jsx("span", {
     children: "-"
   });
 };
@@ -71,7 +70,7 @@ var getEnumLabel = function getEnumLabel(code, value) {
   if (!code) {
     return null;
   }
-  return _jsx(EnumLabel, {
+  return /*#__PURE__*/_jsx(EnumLabel, {
     code: code,
     value: value,
     compose: compose,

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

@@ -1,5 +1,6 @@
 import { DataOption } from '../propsType';
 type StorageType = 'localStorage' | 'sessionStorage';
+export declare const baseCacheKey = "zat-design-pro-component-cacheKey";
 interface EnumRes {
     data: Record<string, DataOption[]>;
     [key: string]: any;

package/es/ProEnum/utils/index.js

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isUndefined from "lodash/isUndefined";
-import _isNull from "lodash/isNull";
 var _excluded = ["children"];
+import { isNull, isUndefined } from 'lodash';
+export var baseCacheKey = 'zat-design-pro-component-cacheKey';
 /**
  * 获取枚举数据
  * @param storage
@@ -10,7 +10,7 @@ var _excluded = ["children"];
  * @returns
  */
 export function getEnumData(storage, cacheKey, baseEnumStorage) {
-  if (baseEnumStorage && window.localStorage.getItem(cacheKey)) {
+  if (baseEnumStorage && window.localStorage.getItem(cacheKey) && cacheKey === baseCacheKey) {
     return baseEnumStorage;
   }
   if (storage === 'localStorage') {
@@ -20,6 +20,7 @@ export function getEnumData(storage, cacheKey, baseEnumStorage) {
     return JSON.parse(window.sessionStorage.getItem(cacheKey) || '{}');
   }
 }
+
 /**
  * 设置枚举数据
  * @param storage
@@ -28,7 +29,7 @@ export function getEnumData(storage, cacheKey, baseEnumStorage) {
  */
 export function setEnumData(storage, cacheKey, data) {
   var _Object$keys;
-  if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
+  if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) !== null && _Object$keys !== void 0 && _Object$keys.length)) {
     return false;
   }
   if (storage === 'localStorage') {
@@ -37,6 +38,7 @@ export function setEnumData(storage, cacheKey, data) {
     window.sessionStorage.setItem(cacheKey, JSON.stringify(data));
   }
 }
+
 /**
  * 判断枚举列表是否存在
  * @param storage
@@ -49,6 +51,7 @@ export function hasEnumList(storage, cacheKey, code) {
   var enumList = (res === null || res === void 0 ? void 0 : res.data) || {};
   return enumList === null || enumList === void 0 ? void 0 : enumList[code];
 }
+
 /**
  * 判断是否是对象
  * @param obj
@@ -57,6 +60,7 @@ export function hasEnumList(storage, cacheKey, code) {
 export function isObject(obj) {
   return Object.prototype.toString.call(obj) === '[object Object]';
 }
+
 /**
  * 合并枚举数据
  * @param storage
@@ -72,8 +76,9 @@ export function mergeCacheData(storage, code, cacheKey, responseData) {
   if (cacheData && cacheData.data) {
     cacheData.data[code] = responseData;
   }
-  (_window2 = window) === null || _window2 === void 0 ? void 0 : _window2[cacheStorage].setItem(cacheKey, JSON.stringify(cacheData));
+  (_window2 = window) === null || _window2 === void 0 || _window2[cacheStorage].setItem(cacheKey, JSON.stringify(cacheData));
 }
+
 /**
  * diff code 差异
  * @param cacheCodes
@@ -93,6 +98,7 @@ export function diffCode(cacheCodes, codes) {
   }
   return diff;
 }
+
 /**
  * 缓存fieldNames制定的值
  * @param fieldNames 保留映射值
@@ -105,7 +111,7 @@ export function cacheFieldNames(fieldNames, dataSource) {
   var result = {};
   Object.keys(restFieldNames).forEach(function (key) {
     var value = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
-    if (!(_isUndefined(value) || _isNull(value))) {
+    if (!(isUndefined(value) || isNull(value))) {
       result[key] = dataSource[restFieldNames[key]] ? dataSource[restFieldNames[key]] : dataSource[key];
     }
   });

package/es/ProForm/components/Container.d.ts

@@ -3,6 +3,7 @@ interface Props {
     tooltip?: boolean;
     nowrap?: boolean;
     viewEmpty?: React.ReactNode;
+    children?: React.ReactNode;
 }
 declare const Container: React.FC<Props>;
 export default Container;