@zat-design/sisyphus-react 3.7.3 → 3.8.0-beat.2

package/es/ProDownload/utils.js

@@ -70,7 +70,7 @@ export function getFilenameFromContentDisposition(contentDisposition) {
 }
 // 发起请求获取下载文件
 export var DownloadRequest = /*#__PURE__*/function () {
-  var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
+  var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref2) {
     var url, _ref2$method, method, params, headers, transformResponse, fileName, onFinish, onError, config, res, fileBlob, data, contentFileName;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -97,8 +97,8 @@ export var DownloadRequest = /*#__PURE__*/function () {
             config.headers = _objectSpread(_objectSpread({}, config.headers), headers);
           }
           _context2.next = 7;
-          return fetch(url, config).then( /*#__PURE__*/function () {
-            var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
+          return fetch(url, config).then(/*#__PURE__*/function () {
+            var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(response) {
               var _data, errorMsg;
               return _regeneratorRuntime().wrap(function _callee$(_context) {
                 while (1) switch (_context.prev = _context.next) {

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -46,7 +46,7 @@ var ProDrawer = function ProDrawer(_ref) {
     loading = _useState2[0],
     toggleLoading = _useState2[1];
   var noRenderFooter = isView || footer === false || footer === null;
-  var onConfirm = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onConfirm = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3, _locale$ProDrawerForm4;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -74,7 +74,7 @@ var ProDrawer = function ProDrawer(_ref) {
       }
     }, _callee);
   })), [onCancel, modalRef.current]);
-  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+  var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
@@ -166,7 +166,7 @@ var ProDrawer = function ProDrawer(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/React.isValidElement(footer)) {
+    if (/*#__PURE__*/React.isValidElement(footer)) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -176,7 +176,7 @@ var ProDrawer = function ProDrawer(_ref) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/React.isValidElement(item)) {
+          if (/*#__PURE__*/React.isValidElement(item)) {
             return item;
           }
           return false;

package/es/ProDrawerForm/components/ProModal/index.js

@@ -52,7 +52,7 @@ var ProModal = function ProModal(_ref) {
     'pro-modal-no-footer': noRenderFooter,
     'pro-modal-footer-shadow': height >= 450
   }]);
-  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var handleFinish = useCallback(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var values, _error$errorFields, _error$errorFields$;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
@@ -146,7 +146,7 @@ var ProModal = function ProModal(_ref) {
     if (noRenderFooter) {
       return null;
     }
-    if ( /*#__PURE__*/React.isValidElement(footer)) {
+    if (/*#__PURE__*/React.isValidElement(footer)) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer
@@ -156,7 +156,7 @@ var ProModal = function ProModal(_ref) {
       return _jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(function (item) {
-          if ( /*#__PURE__*/React.isValidElement(item)) {
+          if (/*#__PURE__*/React.isValidElement(item)) {
             return item;
           }
           return false;

package/es/ProEditLabel/index.js

@@ -134,7 +134,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
    * pop确认回调
    */
   var onConfirmHandle = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var res, value;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -221,7 +221,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
       })
     });
     if (disabled) {
-      if ( /*#__PURE__*/React.isValidElement(children)) {
+      if (/*#__PURE__*/React.isValidElement(children)) {
         return children;
       }
       if (props.value && !popupProps) {
@@ -253,7 +253,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
     if (mode === 'popup') {
       // 查看时内容渲染
       var labelRender = function labelRender() {
-        if ( /*#__PURE__*/React.isValidElement(children)) {
+        if (/*#__PURE__*/React.isValidElement(children)) {
           return children;
         }
         return TextNode;

package/es/ProEditTable/components/ActionButton/index.js

@@ -82,7 +82,7 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: locale.ProEditTable.confirm,
         cancelText: locale.ProEditTable.cancel,
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
@@ -92,7 +92,7 @@ var ActionButton = function ActionButton(_ref) {
           children: btnConfig.label
         }))
       }) : _jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
@@ -109,7 +109,7 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : _jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         record: record,
         index: index
       }))) : _jsx(_Button, _objectSpread(_objectSpread({

package/es/ProEditTable/components/RenderField/{ListChanged.d.ts → ListChangedWrapper.d.ts}

@@ -1,6 +1,7 @@
 import React from 'react';
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
+import { DiffOriginalParams } from '../../../ProForm/utils/diffOriginal';
 interface Props {
     name?: NamePath;
     names?: NamePath[];
@@ -9,8 +10,8 @@ interface Props {
     namesStr?: NamePath;
     originalValues?: any;
     form: FormInstance;
-    equalWith?: (preValue: any, curValue: any) => boolean | undefined;
+    equalWith?: DiffOriginalParams['equalWith'];
     [name: string]: any;
 }
-declare const ListChanged: React.FC<Props>;
-export default ListChanged;
+declare const ListChangedWrapper: React.FC<Props>;
+export default ListChangedWrapper;

package/es/ProEditTable/components/RenderField/{ListChanged.js → ListChangedWrapper.js}

@@ -7,8 +7,11 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
+import classNames from 'classnames';
 import { get } from 'lodash';
 import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
+import { useProConfig } from '../../../ProConfigProvider';
+import { isEmpty } from '../../../utils';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -61,7 +64,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     return get(originalValues, originalName);
   }) : get(originalValues, originalName);
 };
-var ListChanged = function ListChanged(props) {
+var ListChangedWrapper = function ListChangedWrapper(props) {
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -76,11 +79,13 @@ var ListChanged = function ListChanged(props) {
     children = props.children,
     type = props.type,
     rest = _objectWithoutProperties(props, _excluded);
+  var _ref2 = useProConfig('ProEditTable') || {},
+    isDiffAll = _ref2.isDiffAll;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var notWatch = !originalValues || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = !notWatch ? getOriginalValue({
+  var isWatch = originalValues && !['FormList', 'ProEditTable'].includes(type);
+  var originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
@@ -88,9 +93,9 @@ var ListChanged = function ListChanged(props) {
     rowKeyPath: rowKeyPath,
     form: form
   }) : undefined;
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = useMemo(function () {
-    if (notWatch || noChange) return false;
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
+  var diffType = useMemo(function () {
+    if (!isWatch || noChange) return 'same';
     return diffOriginal({
       value: props.value,
       originalValue: originalValue,
@@ -99,11 +104,18 @@ var ListChanged = function ListChanged(props) {
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
   }, [props.value, originalValue]);
-  if (notWatch || noChange) {
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
+  if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
   }
+  var diffClassName = classNames({
+    'pro-form-item-changed': isChanged,
+    'pro-form-item-add': isAdd
+  });
   return _jsx(_Tooltip, {
-    open: changed ? undefined : false,
+    // 传入undefined 鼠标移入显示移出隐藏
+    open: isChanged ? undefined : false,
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
@@ -116,9 +128,9 @@ var ListChanged = function ListChanged(props) {
       })) : undefined]
     }),
     children: _jsx("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: diffClassName,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
     })
   });
 };
-export default ListChanged;
+export default ListChangedWrapper;

package/es/ProEditTable/components/RenderField/index.js

@@ -25,7 +25,7 @@ import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
 import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
 import { getDefaultProps } from '../../utils/getDefaultProps';
-import ListChanged from './ListChanged';
+import ListChangedWrapper from './ListChangedWrapper';
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
   var value = _ref.text,
@@ -246,7 +246,7 @@ var RenderField = function RenderField(_ref) {
     if (typeof _editRender === 'function') {
       TargetComponent = _editRender.apply(void 0, rowParams);
     }
-    if ( /*#__PURE__*/React.isValidElement(_editRender)) {
+    if (/*#__PURE__*/React.isValidElement(_editRender)) {
       TargetComponent = _editRender;
     }
   }
@@ -262,7 +262,7 @@ var RenderField = function RenderField(_ref) {
         children: View
       });
     }
-    if ( /*#__PURE__*/React.isValidElement(viewRender)) {
+    if (/*#__PURE__*/React.isValidElement(viewRender)) {
       TargetComponent = viewRender;
     }
   }
@@ -305,7 +305,7 @@ var RenderField = function RenderField(_ref) {
     }, 100);
   };
   // 单元格更新数据时，加个防抖，防止更新频率过快，卡顿
-  var _onChange = debounce( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var _onChange = debounce(/*#__PURE__*/_asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
     var _len2,
       args,
       _key2,
@@ -409,7 +409,7 @@ var RenderField = function RenderField(_ref) {
     }, _callee);
   })), 300);
   var _onblur = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _TargetComponent3, _TargetComponent3$pro, _TargetComponent$prop4;
       var _len3,
         args,
@@ -510,7 +510,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       names: names,
       namePath: [].concat(_toConsumableArray(namePath), [index]),
-      name: cellName,
+      name: originalName,
       listName: cellName,
       viewEmpty: viewEmpty,
       valueType: _valueType,
@@ -545,9 +545,9 @@ var RenderField = function RenderField(_ref) {
   var getFieldItem = function getFieldItem() {
     var _componentProps;
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
+    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? (/*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
     if (originalValues) {
-      FieldComponent = _jsx(ListChanged, {
+      FieldComponent = _jsx(ListChangedWrapper, {
         name: cellName,
         names: names,
         namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),

package/es/ProEditTable/components/RenderToolbar/index.js

@@ -76,7 +76,7 @@ var RenderToolbar = function RenderToolbar(config) {
     toolbar.show = show !== null && show !== void 0 ? show : true;
     toolbar.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     toolbar.onEvent = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
         var onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {

package/es/ProEditTable/utils/config.js

@@ -63,7 +63,7 @@ export var actions = {
     });
   },
   save: function () {
-    var _save = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
+    var _save = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(_ref2) {
       var record, editingKeys, setState, form, rowName, virtualRowName, result, updateData, nextEditingKeys, values;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -166,7 +166,7 @@ export var actions = {
     }
   },
   add: function () {
-    var _add = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
+    var _add = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
       var _tableRef$current$que, _tableRef$current$que2;
       var result, insertType, editingKeys, setState, form, name, virtualName, virtualKey, onlyOneLineMsg, tableRef, _ref5$prefixCls, prefixCls, nextData, rowKey, addData, nextEditingKeys;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {

package/es/ProEditTable/utils/index.js

@@ -26,7 +26,7 @@ import locale from '../../locale';
 // 渲染操作栏
 var getActionColumn = function getActionColumn(config) {
   var _cloneDeepWith = cloneDeepWith(config, function (value) {
-      if ( /*#__PURE__*/React.isValidElement(value)) {
+      if (/*#__PURE__*/React.isValidElement(value)) {
         return value;
       }
     }),
@@ -83,7 +83,7 @@ var getActionColumn = function getActionColumn(config) {
     action.show = show !== null && show !== void 0 ? show : true;
     action.needConfirm = needConfirm !== null && needConfirm !== void 0 ? needConfirm : true;
     action.onEvent = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
+      var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, index) {
         var _form$getFieldValue;
         var rowName, _record, onEvent, result;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -234,7 +234,7 @@ export var transformColumns = function transformColumns() {
           children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
             title: tooltipTitle !== null && tooltipTitle !== void 0 ? tooltipTitle : tooltip
           }, resetProps), {}, {
-            children: icon ? ( /*#__PURE__*/React.cloneElement(icon, {
+            children: icon ? (/*#__PURE__*/React.cloneElement(icon, {
               className: 'icon-tip'
             })) : _jsx(ReactSVG, {
               className: "icon-tip",
@@ -380,8 +380,8 @@ export var transformColumns = function transformColumns() {
   }
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
-    Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+    Promise.all(Object.entries(_cacheMap).map(/*#__PURE__*/function () {
+      var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
         var _item, key, value, _ref4, service, option;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {

package/es/ProEditTable/utils/tools.js

@@ -191,7 +191,7 @@ export var handleScrollToError = function handleScrollToError() {
  */
 export function cloneDeepFilterNode(value) {
   return cloneDeepWith(value, function (val) {
-    if ( /*#__PURE__*/React.isValidElement(val)) {
+    if (/*#__PURE__*/React.isValidElement(val)) {
       return val;
     }
   });

package/es/ProEnum/components/Group.js

@@ -43,7 +43,10 @@ var Group = function Group(props) {
   }
   return _jsx("div", {
     id: id,
-    className: classNames('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
+    className: classNames({
+      'pro-enum-group-root': true,
+      'pro-enum-group-root-disabled': disabled
+    }),
     children: dataSource.map(function (item, index) {
       return _jsx("div", {
         onClick: function onClick() {
@@ -51,7 +54,12 @@ var Group = function Group(props) {
             handleClick(item[fieldValue], index);
           }
         },
-        className: classNames('pro-enum-group-item', value === item[fieldValue] ? 'pro-enum-group-item-selected' : '', index === idx.current || index + 1 === idx.current ? 'pro-enum-group-item-disabled-after' : '', item.disabled ? 'pro-enum-group-item-disabled' : ''),
+        className: classNames({
+          'pro-enum-group-item': true,
+          'pro-enum-group-item-selected': value === item[fieldValue],
+          'pro-enum-group-item-disabled-after': index === idx.current || index + 1 === idx.current,
+          'pro-enum-group-item-disabled': item.disabled
+        }),
         children: item[fieldLabel]
       }, item[fieldValue]);
     })

package/es/ProEnum/hooks/useEnumRequest.js

@@ -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) {
@@ -162,7 +162,7 @@ var useEnumRequest = function useEnumRequest(props, dispatch) {
     }
   }));
   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) {

package/es/ProEnum/index.js

@@ -11,7 +11,7 @@ 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";
-var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
+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';
@@ -39,10 +39,11 @@ var ProEnum = function ProEnum(props) {
     onChange = props.onChange,
     transformResponse = props.transformResponse,
     otherProps = props.otherProps,
+    isView = props.isView,
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
-    isView = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -152,7 +153,7 @@ 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), {}, {
         dataSource: list,
@@ -226,7 +227,7 @@ var ProEnum = function ProEnum(props) {
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
     _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
-    return;
+    // return;
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -271,7 +272,7 @@ var ProEnum = function ProEnum(props) {
     };
     return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
-  if (isView) {
+  if (_isView) {
     if (Array.isArray(value)) {
       return _jsx(Container, {
         tooltip: true,

package/es/ProEnum/style/index.less

@@ -1,6 +1,8 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
+@zaui-disabled-bg: var(--zaui-disabled-bg);
+
 .pro-enum {
   &-tag-root {
     display: flex;
@@ -19,7 +21,7 @@
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
     padding: var(--zaui-space-size-xs) 10px;
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     border-radius: var(--zaui-space-size-xs);
     cursor: pointer;
   }
@@ -29,7 +31,7 @@
     background-color: var(--zaui-brand);
   }
   &-tag-item-disabled {
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     pointer-events: none;
   }
 
@@ -90,12 +92,20 @@
 
     .pro-enum-group-item-disabled {
       color: rgba(0, 0, 0, 0.25);
-      background: #f5f5f5;
+      background: var(--zaui-disabled-bg);
       cursor: not-allowed;
     }
   }
 
   &-group-root-disabled {
-    opacity: 0.7;
+    color: var(--zaui-aide-text);
+
+    .pro-enum-group-item {
+      background: var(--zaui-disabled-bg);
+      &.pro-enum-group-item-selected {
+        background: var(--zaui-brand-disabled);
+        border-color: var(--zaui-brand-disabled);
+      }
+    }
   }
 }

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

@@ -5,7 +5,7 @@ interface EnumRes {
     [key: string]: any;
 }
 export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
-export declare function setEnumData(storage: StorageType, cacheKey: string, data: Object): void;
+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 isObject(obj: any): boolean;
 export declare function mergeCacheData(storage: string, code: string, cacheKey: string, responseData: any): void;

package/es/ProEnum/utils/index.js

@@ -13,6 +13,10 @@ 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)) {
+    return false;
+  }
   if (storage === 'localStorage') {
     window.localStorage.setItem(cacheKey, JSON.stringify(data));
   } else if (storage === 'sessionStorage') {

package/es/ProForm/components/combination/Container/index.js

@@ -9,11 +9,12 @@ import ProCollapse from '../../../../ProLayout/components/ProCollapse';
 import ProForm from '../../../../ProForm';
 var Container = function Container(props) {
   var children = props.children,
-    otherProps = props.otherProps,
     className = props.className,
     container = props.container,
     show = props.show,
-    clearNotShow = props.clearNotShow;
+    clearNotShow = props.clearNotShow,
+    diffConfig = props.diffConfig,
+    otherProps = props.otherProps;
   var _ref = ProForm.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
@@ -38,7 +39,8 @@ var Container = function Container(props) {
   var childRender = function childRender() {
     var child = _jsx(RenderFields, _objectSpread({
       columns: _children,
-      form: form
+      form: form,
+      diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
       return _jsx(ProCollapse, _objectSpread(_objectSpread({}, omit(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RowProps } from 'antd';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+import { ProColumnProps, ProFormOtherProps, DiffConfigProps } from '../../../propsType';
 export interface ContainerProps {
     children?: ProColumnProps[];
     otherProps?: ProFormOtherProps;
@@ -8,5 +8,6 @@ export interface ContainerProps {
     className?: string;
     container?: string | React.ReactNode;
     show?: boolean | (() => boolean);
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
 }

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -133,7 +133,7 @@ var ActionButton = function ActionButton(props) {
     return _actionProps;
   }, [props.actionProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
+    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, index, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -272,7 +272,7 @@ var ActionButton = function ActionButton(props) {
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : ( /*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

package/es/ProForm/components/combination/FormList/components/BlockTitle.js

@@ -13,7 +13,7 @@ var BlockTitle = function BlockTitle(props) {
   if (!title) {
     return _jsx("div", {});
   }
-  if ( /*#__PURE__*/React.isValidElement(title)) {
+  if (/*#__PURE__*/React.isValidElement(title)) {
     return title;
   }
   var titleContent = title;

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -55,7 +55,7 @@ var ToolbarButton = function ToolbarButton(props) {
     return _toolbarProps;
   }, [props.toolbarProps]);
   var handleClick = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(defaultCallback, callback, item) {
       var value, data;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {