@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

package/lib/ProEditTable/utils/index.js

@@ -5,16 +5,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.transformColumns = void 0;
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireDefault(require("react"));
 var _lodash = require("lodash");
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _reactSvg = require("react-svg");
 var _utils = require("@zat-design/utils");
@@ -89,7 +86,7 @@ var getActionColumn = config => {
     action.onEvent = /*#__PURE__*/function () {
       var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result, actionHandler;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -136,7 +133,8 @@ var getActionColumn = config => {
               result = _context.sent;
             case 22:
               if (result !== false && type !== 'custom') {
-                _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
+                actionHandler = _config.actions[type];
+                actionHandler((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [...name, index],
                   virtualRowName: rowName,
                   record,
@@ -161,14 +159,14 @@ var getActionColumn = config => {
     title: _locale.default.ProEditTable.operation,
     key: 'action',
     fixed: 'right',
-    width: actionWidth || (actionDirection === 'vertical' ? '60px' : virtualKey ? '120px' : '60px'),
+    width: actionWidth || (actionDirection === 'vertical' ? 60 : virtualKey ? 120 : 60),
     render: (text, record, index) => {
       var _rowDisabled;
       var _disabled = (_rowDisabled = rowDisabled === null || rowDisabled === void 0 ? void 0 : rowDisabled(record)) !== null && _rowDisabled !== void 0 ? _rowDisabled : false;
       if (_disabled) {
         return '';
       }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
         size: "small",
         direction: actionDirection,
         children: actionBtns.map(btnConfig => {
@@ -194,6 +192,7 @@ var getActionColumn = config => {
  * @param columns 表格配置数据
  * @param config
  */
+
 var transformColumns = exports.transformColumns = function transformColumns() {
   var columns = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var config = arguments.length > 1 ? arguments[1] : undefined;
@@ -209,10 +208,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     setState = config.setState,
     page = config.page;
   var isCell = mode === 'cell';
-  var _columns = (0, _tools.cloneDeepFilterNode)(columns);
+  var nextColumns = (0, _tools.cloneDeepFilterNode)(columns);
   var pageNum = _utils.tools.calc(page.pageNum, '-', 1);
   var firstIndex = _utils.tools.calc(pageNum, '*', page.pageSize);
-  _columns.forEach((item, index) => {
+  nextColumns.forEach((item, index) => {
     var label = item.label,
       names = item.names,
       labelRequired = item.labelRequired,
@@ -239,7 +238,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
           resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
         item.title = /*#__PURE__*/(0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
-          children: [before, columnTitle, /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+          children: [before, columnTitle, /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
             children: icon ? ( /*#__PURE__*/_react.default.cloneElement(icon, {
@@ -258,6 +257,11 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       }
     }
 
+    // width转为数字，兼容虚拟滚动场景
+    if (typeof item.width === 'string' && item.width.includes('px')) {
+      item.width = parseInt(item.width, 10);
+    }
+
     // column设置name时，权重最高
     var columnName = (item === null || item === void 0 ? void 0 : item.name) || dataIndex || key;
     item.dataIndex = columnName;
@@ -265,7 +269,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     // item.shouldCellUpdate = item.shouldCellUpdate || ((record, perRecord) => !isEqual(record, perRecord));
 
     var required = (0, _lodash.isBoolean)(item.required) ? item.required : false;
-    if (typeof item.required === 'function') {
+    if ((0, _lodash.isFunction)(item.required)) {
       var namePath = (0, _tools.getNamePath)(name, virtualKey);
       var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
       var rowData = form.getFieldValue([...namePathArray, index]) || {};
@@ -361,9 +365,9 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   });
   if (disabled || isView) {
     // 查看模式下过滤操作栏
-    _columns = _columns.filter(item => item.title !== _locale.default.ProEditTable.operation);
+    nextColumns = nextColumns.filter(item => item.title !== _locale.default.ProEditTable.operation);
   } else {
-    var validateKeys = _columns.filter(i => i.rules || i.required).map(item => {
+    var validateKeys = nextColumns.filter(i => i.rules || i.required).map(item => {
       var _item$names;
       if ((_item$names = item.names) !== null && _item$names !== void 0 && _item$names.length) {
         var nextDataIndex = (0, _tools.splitNames)(item.names);
@@ -375,9 +379,9 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     var actionColumn = getActionColumn((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
       validateKeys // 需要校验的单元格的formItem的name
     }));
-    actionColumn && _columns.push(actionColumn);
+    actionColumn && nextColumns.push(actionColumn);
   }
 
   // 渲染操作列
-  return _columns;
+  return nextColumns;
 };

package/lib/ProEditTable/utils/useEditTableError.js

@@ -17,8 +17,9 @@ var useEditTableError = _ref => {
     errorLength = _useState2[0],
     setErrorLength = _useState2[1];
   (0, _react.useEffect)(() => {
+    var _containerNode$childr3;
     // 如果 isEnabled 为 false 或容器节点不存在，直接跳过监听
-    if (!isEnabled || !containerNode) {
+    if (!isEnabled || !containerNode || !(containerNode !== null && containerNode !== void 0 && containerNode.querySelector)) {
       return; // 如果未启用监听或容器节点不存在，直接返回
     }
 
@@ -35,8 +36,9 @@ var useEditTableError = _ref => {
 
           // 检查目标节点是否包含指定的类
           if (target.classList.contains(className)) {
+            var _containerNode$childr;
             // 查找所有包含 className 的节点
-            var errorNodes = containerNode.querySelectorAll(`.${className}`);
+            var errorNodes = containerNode === null || containerNode === void 0 || (_containerNode$childr = containerNode.children[0]) === null || _containerNode$childr === void 0 ? void 0 : _containerNode$childr.querySelectorAll(`.${className}`);
 
             // 过滤这些节点，只保留那些类名完全为 `ant-form-item-explain-error` 的节点
             var validErrorNodes = Array.from(errorNodes).filter(node => node.classList.length === 1 && node.classList.contains('ant-form-item-explain-error'));
@@ -56,8 +58,9 @@ var useEditTableError = _ref => {
           // 检查删除的节点是否包含指定的类名
           mutation.removedNodes.forEach(removedNode => {
             if (removedNode instanceof HTMLElement && removedNode.classList.contains('ant-table-row')) {
+              var _containerNode$childr2;
               // 更新错误数量
-              var _errorNodes = containerNode.querySelectorAll(`.${className}`);
+              var _errorNodes = containerNode === null || containerNode === void 0 || (_containerNode$childr2 = containerNode.children[0]) === null || _containerNode$childr2 === void 0 ? void 0 : _containerNode$childr2.querySelectorAll(`.${className}`);
               if (errorLength === 0) {
                 debouncedSetErrorLength(0);
               }
@@ -82,7 +85,12 @@ var useEditTableError = _ref => {
     };
 
     // 启动 MutationObserver
-    observer.observe(containerNode.querySelector('tbody'), config);
+    var targetNode = containerNode === null || containerNode === void 0 || (_containerNode$childr3 = containerNode.children[0]) === null || _containerNode$childr3 === void 0 ? void 0 : _containerNode$childr3.querySelector('tbody');
+    if (targetNode instanceof HTMLElement) {
+      observer.observe(targetNode, config);
+    } else {
+      console.error('warning: tbody element not found or invalid');
+    }
 
     // 清理 MutationObserver 和防抖定时器
     return () => {

package/lib/ProEditTable/utils/useShouldUpdateForTable.d.ts

@@ -0,0 +1,15 @@
+interface UseShouldUpdateForTableProps {
+    rowParams: any[];
+    column: any;
+    shouldUpdateDebounce: number;
+}
+interface Result {
+    isEditable: any;
+    required: any;
+    rules: any;
+    fieldProps: any;
+    desensitization: any;
+    valueType: any;
+}
+declare const useShouldUpdateForTable: (props: UseShouldUpdateForTableProps) => Result;
+export default useShouldUpdateForTable;

package/lib/ProEditTable/utils/useShouldUpdateForTable.js

@@ -0,0 +1,139 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+var _react = require("react");
+var _lodash = require("lodash");
+var _utils = require("../../utils");
+var useShouldUpdateForTable = props => {
+  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current;
+  var rowParams = props.rowParams,
+    column = props.column,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
+
+  // refs 存储当前值
+  var isEditableRef = (0, _react.useRef)();
+  var requiredRef = (0, _react.useRef)();
+  var rulesRef = (0, _react.useRef)();
+  var fieldPropsRef = (0, _react.useRef)();
+  var desensitizationRef = (0, _react.useRef)();
+  var valueTypeRef = (0, _react.useRef)();
+  var _useState = (0, _react.useState)({}),
+    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
+    reRender = _useState2[1];
+  var debouncedUpdateRef = (0, _react.useRef)(null);
+  var pendingParamsRef = (0, _react.useRef)(null);
+
+  // 统一处理所有动态属性的更新
+  var processUpdate = params => {
+    var hasChange = false;
+
+    // isEditable 处理
+    if ((0, _lodash.isFunction)(column.isEditable)) {
+      var newIsEditable = column.isEditable(...params);
+      if (isEditableRef.current !== newIsEditable) {
+        isEditableRef.current = newIsEditable;
+        hasChange = true;
+      }
+    } else {
+      isEditableRef.current = column.isEditable;
+    }
+
+    // required 处理
+    if ((0, _lodash.isFunction)(column.required)) {
+      var newRequired = column.required(...params);
+      if (requiredRef.current !== newRequired) {
+        requiredRef.current = newRequired;
+        hasChange = true;
+      }
+    } else {
+      requiredRef.current = column.required;
+    }
+
+    // rules 处理
+    if ((0, _lodash.isFunction)(column.rules)) {
+      var newRules = column.rules(...params);
+      if (!(0, _lodash.isEqualWith)(rulesRef.current, newRules, _utils.customEqualForFunction)) {
+        rulesRef.current = newRules;
+        hasChange = true;
+      }
+    } else {
+      rulesRef.current = column.rules;
+    }
+
+    // fieldProps 处理
+    if ((0, _lodash.isFunction)(column.fieldProps)) {
+      var newFieldProps = column.fieldProps(...params);
+      if (!(0, _lodash.isEqualWith)(fieldPropsRef.current, newFieldProps, _utils.customEqualForFunction)) {
+        fieldPropsRef.current = newFieldProps;
+        hasChange = true;
+      }
+    } else {
+      fieldPropsRef.current = column.fieldProps;
+    }
+
+    // desensitization 处理
+    if ((0, _lodash.isFunction)(column.desensitization)) {
+      var newDesensitization = column.desensitization(...params);
+      if (!(0, _lodash.isEqualWith)(desensitizationRef.current, newDesensitization)) {
+        desensitizationRef.current = newDesensitization;
+        hasChange = true;
+      }
+    } else {
+      desensitizationRef.current = column.desensitization;
+    }
+
+    // valueType 处理
+    if ((0, _lodash.isFunction)(column.valueType)) {
+      var newValueType = column.valueType(...params);
+      if (valueTypeRef.current !== newValueType) {
+        valueTypeRef.current = newValueType;
+        hasChange = true;
+      }
+    } else {
+      valueTypeRef.current = column.valueType;
+    }
+    if (hasChange) {
+      reRender({});
+    }
+  };
+
+  // 创建防抖函数（统一处理所有动态属性）
+  (0, _react.useEffect)(() => {
+    if (shouldUpdateDebounce > 0 && ((0, _lodash.isFunction)(column.isEditable) || (0, _lodash.isFunction)(column.required) || (0, _lodash.isFunction)(column.rules) || (0, _lodash.isFunction)(column.fieldProps) || (0, _lodash.isFunction)(column.desensitization) || (0, _lodash.isFunction)(column.valueType))) {
+      debouncedUpdateRef.current = (0, _lodash.debounce)(() => {
+        if (pendingParamsRef.current) {
+          processUpdate(pendingParamsRef.current);
+          pendingParamsRef.current = null;
+        }
+      }, shouldUpdateDebounce);
+    }
+    return () => {
+      var _debouncedUpdateRef$c;
+      (_debouncedUpdateRef$c = debouncedUpdateRef.current) === null || _debouncedUpdateRef$c === void 0 || _debouncedUpdateRef$c.cancel();
+    };
+  }, [shouldUpdateDebounce, column]);
+
+  // 统一的属性处理逻辑
+  if (shouldUpdateDebounce > 0 && debouncedUpdateRef.current) {
+    // 使用防抖延迟更新
+    pendingParamsRef.current = rowParams;
+    debouncedUpdateRef.current();
+  } else {
+    // 立即更新（shouldUpdateDebounce = 0 或无防抖函数）
+    processUpdate(rowParams);
+  }
+  return {
+    isEditable: (_isEditableRef$curren = isEditableRef.current) !== null && _isEditableRef$curren !== void 0 ? _isEditableRef$curren : column.isEditable,
+    required: (_requiredRef$current = requiredRef.current) !== null && _requiredRef$current !== void 0 ? _requiredRef$current : column.required,
+    rules: (_rulesRef$current = rulesRef.current) !== null && _rulesRef$current !== void 0 ? _rulesRef$current : column.rules,
+    fieldProps: (_fieldPropsRef$curren = fieldPropsRef.current) !== null && _fieldPropsRef$curren !== void 0 ? _fieldPropsRef$curren : column.fieldProps,
+    desensitization: (_desensitizationRef$c = desensitizationRef.current) !== null && _desensitizationRef$c !== void 0 ? _desensitizationRef$c : column.desensitization,
+    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType
+  };
+};
+var _default = exports.default = useShouldUpdateForTable;

package/lib/ProEnum/hooks/useEnum.js

@@ -48,6 +48,11 @@ function useEnum(codes, value, compose) {
     fieldNames = _ref3$fieldNames === void 0 ? {} : _ref3$fieldNames,
     _ref3$clear = _ref3.clear,
     clear = _ref3$clear === void 0 ? true : _ref3$clear;
+
+  // 存在子应用自管理枚举时，需要根据其指定的cacheKey进行缓存
+  if (cacheKey !== 'zat-design-pro-component-cacheKey') {
+    baseEnumStorage = null;
+  }
   var catchData = (0, _utils.getEnumData)(storage, cacheKey, baseEnumStorage);
 
   // 默认枚举缓存数据

package/lib/ProEnum/hooks/useEnumRequest.js

@@ -14,7 +14,7 @@ var _utils = require("../utils");
 var _locale = _interopRequireDefault(require("../../locale"));
 require("../utils/eventCenter");
 var _ref;
-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 = (_ref = window.localStorage.getItem(_utils.baseCacheKey) && JSON.parse(window.localStorage.getItem(_utils.baseCacheKey))) !== null && _ref !== void 0 ? _ref : null;
 var useEnumRequest = (props, dispatch) => {
   var _ref2 = props || {},
     _ref2$main = _ref2.main,
@@ -30,7 +30,7 @@ var 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 ? _utils.baseCacheKey : _ref2$cacheKey,
     _ref2$requestRefresh = _ref2.requestRefresh,
     requestRefresh = _ref2$requestRefresh === void 0 ? false : _ref2$requestRefresh,
     _ref2$storage = _ref2.storage,

package/lib/ProEnum/index.js

@@ -6,18 +6,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
-require("antd/es/radio/style");
-var _radio = _interopRequireDefault(require("antd/es/radio"));
-require("antd/es/message/style");
-var _message2 = _interopRequireDefault(require("antd/es/message"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _ahooks = require("ahooks");
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _lodash = require("lodash");
 var _ProSelect = _interopRequireDefault(require("../ProSelect"));
@@ -104,7 +97,7 @@ var ProEnum = props => {
           var responseData = transformResponse(res);
           if (typeof responseData !== 'object') {
             var _locale$ProEnum;
-            return _message2.default.error((_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
+            return _antd.message.error((_locale$ProEnum = _locale.default.ProEnum) === null || _locale$ProEnum === void 0 ? void 0 : _locale$ProEnum.errorMessage);
           }
           setData(responseData);
         } else {
@@ -115,7 +108,7 @@ var ProEnum = props => {
           if (status === 200) {
             if (typeof data !== 'object') {
               var _locale$ProEnum2;
-              return _message2.default.error((_locale$ProEnum2 = _locale.default.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
+              return _antd.message.error((_locale$ProEnum2 = _locale.default.ProEnum) === null || _locale$ProEnum2 === void 0 ? void 0 : _locale$ProEnum2.errorMessage);
             }
             if (Array.isArray(data)) {
               setData([...data]);
@@ -124,7 +117,7 @@ var ProEnum = props => {
               setData(data[code]);
             }
           } else {
-            _message2.default.error(msg);
+            _antd.message.error(msg);
           }
         }
       }
@@ -191,22 +184,22 @@ var ProEnum = props => {
           onChange: onChange
         }));
       case 'Radio':
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_radio.default.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Radio.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
-          children: list.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_radio.default, {
+          children: list.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Radio, {
             value: item[fieldValue],
             disabled: !!item.disabled,
             children: item[label]
           }, item[fieldValue]))
         }));
       case 'Checkbox':
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(enumProps, ['fieldNames', 'showCodeName'])), {}, {
           options: list,
           value: value,
           onChange: onChange,
-          children: list.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default, {
+          children: list.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox, {
             value: item[fieldValue],
             disabled: !!item.disabled,
             children: item[label]
@@ -235,7 +228,7 @@ var ProEnum = props => {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    _message2.default.error(`${otherProps === null || otherProps === void 0 ? void 0 : otherProps.label}-${otherProps === null || otherProps === void 0 ? void 0 : otherProps.name}-${_locale.default === null || _locale.default === void 0 || (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType}`);
+    _antd.message.error(`${otherProps === null || otherProps === void 0 ? void 0 : otherProps.label}-${otherProps === null || otherProps === void 0 ? void 0 : otherProps.name}-${_locale.default === null || _locale.default === void 0 || (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType}`);
   }
   var transToLabel = value => {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -268,7 +261,7 @@ var ProEnum = props => {
       record.forEach(item => {
         arr.push(props.optionRender(item));
       });
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_space.default, {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Space, {
         direction: "vertical",
         size: 4,
         children: arr.map(item => /*#__PURE__*/(0, _jsxRuntime.jsx)(_react.default.Fragment, {

package/lib/ProEnum/style/index.less

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

package/lib/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/lib/ProEnum/utils/index.js

@@ -4,6 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
+exports.baseCacheKey = void 0;
 exports.cacheFieldNames = cacheFieldNames;
 exports.diffCode = diffCode;
 exports.getEnumData = getEnumData;
@@ -13,6 +14,7 @@ exports.mergeCacheData = mergeCacheData;
 exports.setEnumData = setEnumData;
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _excluded = ["children"];
+var baseCacheKey = exports.baseCacheKey = 'zat-design-pro-component-cacheKey';
 /**
  * 获取枚举数据
  * @param storage
@@ -21,13 +23,8 @@ var _excluded = ["children"];
  * @returns
  */
 function getEnumData(storage, cacheKey, baseEnumStorage) {
-  var _baseEnumStorage = baseEnumStorage;
-  // 存在子应用自管理枚举时，需要根据其指定的cacheKey进行缓存
-  if (cacheKey !== 'zat-design-pro-component-cacheKey') {
-    _baseEnumStorage = null;
-  }
-  if (_baseEnumStorage && window.localStorage.getItem(cacheKey)) {
-    return _baseEnumStorage;
+  if (baseEnumStorage && window.localStorage.getItem(cacheKey) && cacheKey === baseCacheKey) {
+    return baseEnumStorage;
   }
   if (storage === 'localStorage') {
     return JSON.parse(window.localStorage.getItem(cacheKey) || '{}');

package/lib/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;

package/lib/ProForm/components/Container.js

@@ -5,9 +5,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 var _react = _interopRequireDefault(require("react"));
+var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _utils = require("../utils");
 var _jsxRuntime = require("react/jsx-runtime");
@@ -24,7 +23,7 @@ var Container = props => {
     'pro-form-view-container_nowrap': nowrap !== null && nowrap !== void 0 ? nowrap : tooltip
   });
   if (tooltip && !nullValue) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_tooltip.default, {
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Tooltip, {
       placement: "topLeft",
       title: children,
       children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/ProForm/components/FormFooter/index.js

@@ -6,11 +6,8 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.PRO_FORM_CACHE = void 0;
-require("antd/es/space/style");
-var _space = _interopRequireDefault(require("antd/es/space"));
-require("antd/es/button/style");
-var _button = _interopRequireDefault(require("antd/es/button"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../locale"));
@@ -29,12 +26,15 @@ var FormFooter = props => {
     confirmLoading = _initialConfig$props.confirmLoading,
     formId = _initialConfig$props.formId,
     form = _initialConfig$props.form;
-  var _footer$okButtonProps = footer.okButtonProps,
-    okButtonProps = _footer$okButtonProps === void 0 ? {} : _footer$okButtonProps,
-    _footer$cancelButtonP = footer.cancelButtonProps,
-    cancelButtonProps = _footer$cancelButtonP === void 0 ? {} : _footer$cancelButtonP;
-  var okChildren = okButtonProps.children;
-  var cancelChildren = cancelButtonProps.children;
+  var _ref = footer || {},
+    _ref$okButtonProps = _ref.okButtonProps,
+    okButtonProps = _ref$okButtonProps === void 0 ? {} : _ref$okButtonProps,
+    _ref$cancelButtonProp = _ref.cancelButtonProps,
+    cancelButtonProps = _ref$cancelButtonProp === void 0 ? {} : _ref$cancelButtonProp;
+  var _ref2 = okButtonProps || {},
+    okChildren = _ref2.children;
+  var _ref3 = cancelButtonProps || {},
+    cancelChildren = _ref3.children;
   var searchCache = (0, _react.useMemo)(() => {
     var cacheStr = window.sessionStorage.getItem(PRO_FORM_CACHE);
     var cache = JSON.parse(cacheStr || '{}');
@@ -45,7 +45,7 @@ var FormFooter = props => {
       form.setFieldsValue(searchCache[formId]);
     }
   }, [formId]);
-  var _onOk = () => {
+  var nextOnOk = () => {
     var _modifiedForm$__INTER;
     if (formId) {
       var values = form.getFieldsValue();
@@ -61,31 +61,30 @@ var FormFooter = props => {
       form.validateFields().then(() => {
         onOk();
       }).catch(error => {
-        // 验证失败，不执行 onOk
-        console.log('校验失败', error);
+        console.warn('ProForm validateFields error', error);
       });
     } else {
       onOk();
     }
   };
-  var _onCancel = () => {
+  var nextOnCancel = () => {
     if (formId && searchCache[formId]) {
       delete searchCache[formId];
       window.sessionStorage.setItem(PRO_FORM_CACHE, JSON.stringify(searchCache));
     }
     onCancel();
   };
-  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_space.default, {
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_antd.Space, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
       type: "primary",
       htmlType: onOk ? 'button' : 'submit',
-      onClick: _onOk,
+      onClick: nextOnOk,
       disabled: confirmLoading,
       loading: confirmLoading
     }, okButtonProps), {}, {
       children: okChildren || okText || `${_locale.default.ProForm.search}`
-    })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_button.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      onClick: _onCancel
+    })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      onClick: nextOnCancel
     }, cancelButtonProps), {}, {
       children: cancelChildren || cancelText || `${_locale.default.ProForm.reset}`
     })), children]

package/lib/ProForm/components/FormFooter/propsType.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ButtonProps, ColProps, FormInstance } from 'antd';
 import { ModifiedFormInstanceType } from '../../utils/useForm';
 export interface ButtonItem extends ButtonProps {
@@ -17,6 +18,7 @@ export interface FooterRenderType {
     confirmLoading?: boolean;
     formId?: string;
     form: FormInstance | ModifiedFormInstanceType<any>;
+    children?: React.ReactNode;
 }
 /**
  * 兼容旧命名导出

package/lib/ProForm/components/base/Checkbox/index.js

@@ -7,10 +7,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-require("antd/es/checkbox/style");
-var _checkbox = _interopRequireDefault(require("antd/es/checkbox"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _react = _interopRequireWildcard(require("react"));
+var _antd = require("antd");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _index = _interopRequireDefault(require("../../../index"));
@@ -66,13 +65,13 @@ var Checkbox = props => {
       };
     }
   }
-  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_checkbox.default.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+  return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Checkbox.Group, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     style: {
       width: '100%'
     }
   }, rest), {}, {
     children: !!dataSource.length && dataSource.map(item => {
-      return /*#__PURE__*/(0, _react.createElement)(_checkbox.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+      return /*#__PURE__*/(0, _react.createElement)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
         key: item[_fieldNames.value],
         value: item[_fieldNames.value]
       }), item[_fieldNames.label]);