@zat-design/sisyphus-react 3.3.2 → 3.3.3-beta.3

package/es/ProForm/utils/useForm.js

@@ -3,86 +3,59 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useMemo } from 'react';
-import { merge } from 'lodash';
-import { HOOK_MARK } from 'rc-field-form/es/FieldContext';
-import { deleteForPath } from '.';
+import { filterInternalFields } from './index';
 export var useForm = function useForm(originForm) {
   var _Form$useForm = _Form.useForm(originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var getFieldsValue = form.getFieldsValue,
-    validateFields = form.validateFields,
-    getFieldValue = form.getFieldValue;
-  useMemo(function () {
-    var _getFieldsValue = function _getFieldsValue() {
-      var firstProps = !(arguments.length <= 0 ? undefined : arguments[0]) ? true : arguments.length <= 0 ? undefined : arguments[0];
-      var values = getFieldsValue(firstProps, arguments.length <= 1 ? undefined : arguments[1]);
-      if ((arguments.length <= 0 ? undefined : arguments[0]) === undefined) {
-        var result = merge({}, values);
-        // @ts-ignore
-        var internalHooks = form.getInternalHooks(HOOK_MARK);
-        var fields = internalHooks.getFields();
-        var deletePath = [];
-        // 找到带'-'的name
-        fields.forEach(function (field) {
-          var name = field.name;
-          if (Array.isArray(name)) {
-            var index = name.findIndex(function (item) {
-              return typeof item === 'string' && item.includes('-');
-            });
-            if (index !== -1) deletePath.push(name);
-          }
-          if (typeof name === 'string' && name.includes('-')) {
-            deletePath.push(name);
-          }
-        });
-        // 执行删除操作
-        deletePath.forEach(function (item) {
-          deleteForPath(result, item);
-        });
-        return result;
-      }
-      return values;
+    validateFields = form.validateFields;
+  // @ts-ignore
+  var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
+    // 全部查询
+    if (nameList !== true) {
+      var values = getFieldsValue(true, filterFunc);
+      return filterInternalFields(values);
+    }
+    return getFieldsValue(nameList, filterFunc);
+  };
+  var _validateFields = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+      var _len,
+        rest,
+        _key,
+        values,
+        _values,
+        _args = arguments;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+              rest[_key - 1] = _args[_key];
+            }
+            _context.next = 3;
+            return validateFields.apply(void 0, [nameList].concat(rest));
+          case 3:
+            values = _context.sent;
+            if (!nameList) {
+              _context.next = 6;
+              break;
+            }
+            return _context.abrupt("return", values);
+          case 6:
+            _values = _getFieldsValue();
+            return _context.abrupt("return", _values);
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function _validateFields(_x) {
+      return _ref.apply(this, arguments);
     };
-    var _validateFields = /*#__PURE__*/function () {
-      var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
-        var _len,
-          rest,
-          _key,
-          values,
-          _values,
-          _args = arguments;
-        return _regeneratorRuntime().wrap(function _callee$(_context) {
-          while (1) switch (_context.prev = _context.next) {
-            case 0:
-              for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-                rest[_key - 1] = _args[_key];
-              }
-              _context.next = 3;
-              return validateFields.apply(void 0, [nameList].concat(rest));
-            case 3:
-              values = _context.sent;
-              if (!nameList) {
-                _context.next = 6;
-                break;
-              }
-              return _context.abrupt("return", values);
-            case 6:
-              _values = _getFieldsValue();
-              return _context.abrupt("return", _values);
-            case 8:
-            case "end":
-              return _context.stop();
-          }
-        }, _callee);
-      }));
-      return function _validateFields(_x) {
-        return _ref.apply(this, arguments);
-      };
-    }();
-    form.getFieldsValue = _getFieldsValue;
-    form.validateFields = _validateFields;
-  }, [form]);
+  }();
+  form.getFieldsValue = _getFieldsValue;
+  form.validateFields = _validateFields;
   return [form];
 };

package/es/ProForm/utils/useListChanged.js

@@ -33,11 +33,22 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var originalValueRow = originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
-    var originalValue = (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
-      return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
-    }) : get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    var originalValue;
+    if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
+      var originalNamesValue = originalNames.map(function (originalName) {
+        return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      });
+      // 有可能出现数组中全是undefined的情况  视为没有值
+      var fillUndefined = originalNamesValue.every(function (valItem) {
+        return valItem === undefined;
+      });
+      originalValue = fillUndefined ? undefined : originalNamesValue;
+    } else {
+      originalValue = get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+    }
     return originalValue;
   }
+  // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
   return (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
     return get(originalValues, originalName);
   }) : get(originalValues, originalName);
@@ -54,23 +65,24 @@ export var useListChanged = function useListChanged(params) {
     form = params.form,
     equalWith = params.equalWith,
     rowKeyPath = params.rowKeyPath;
-  // let _form = form;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var originalValue = getOriginalValue({
+  var notWatch = !originalValues;
+  var originalValue = !notWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
     originalValues: originalValues,
     rowKeyPath: rowKeyPath,
     form: form
-  });
-  var notWatch = !originalValues || originalValue === undefined;
+  }) : undefined;
+  var noChange = !equalWith && (!originalValues || originalValue === undefined);
+  var _form = form;
   // @ts-ignore
-  // if (notWatch) _form = [];
-  var value = _Form.useWatch(namePath, form);
-  if (notWatch) return [false];
+  if (notWatch) _form = [];
+  var value = _Form.useWatch(namePath, _form);
+  if (notWatch || noChange) return [false];
   var changed = contrastOriginal({
     value: value,
     originalValue: originalValue,

package/es/ProLayout/components/ProCollapse/index.js

@@ -43,6 +43,7 @@ var ProCollapse = function ProCollapse(props) {
     if (level === '2') {
       var level2Panel = classNames({
         'pro-collapse-level2-collapse': towCollapse,
+        'pro-collapse-level2-no-collapse': !towCollapse,
         'pro-collapse-panel': true
       });
       var hasCollapse = {};

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -18,59 +18,62 @@
 
   .@{ant-prefix}-collapse-header {
     align-items: center !important;
-    padding    : 12px var(--zaui-space-size-md, 16px) !important;
-    background : var(--zaui-area, #fafafa);
+    padding: 12px var(--zaui-space-size-md, 16px) !important;
+    background: var(--zaui-area, #fafafa);
   }
 
   .@{ant-prefix}-collapse-header-text {
-    color      : var(--zaui-text, #343434);
+    color: var(--zaui-text, #343434);
     font-weight: 500;
-    font-size  : var(--zaui-font-size-lg, 16px);
+    font-size: var(--zaui-font-size-lg, 16px);
   }
 
   .@{ant-prefix}-collapse-expand-icon {
     color: #c5c7cd;
   }
 
-  &.@{ant-prefix}-collapse-borderless .@{ant-prefix}-collapse-item>.@{ant-prefix}-collapse-content>.@{ant-prefix}-collapse-content-box {
+  &.@{ant-prefix}-collapse-borderless
+    .@{ant-prefix}-collapse-item
+    > .@{ant-prefix}-collapse-content
+    > .@{ant-prefix}-collapse-content-box {
     padding: 0;
   }
 
   .@{ant-prefix}-collapse-content-box {
-    padding   : 0;
+    padding: 0;
     background: var(--zaui-base-bg, #ffffff);
 
     .pro-collapse-content {
-      padding       : var(--zaui-space-size-md, 16px);
+      padding: var(--zaui-space-size-md, 16px);
       padding-bottom: 0;
-      background    : var(--zaui-base-bg, #ffffff);
+      background: var(--zaui-base-bg, #ffffff);
     }
   }
 
   &.pro-collapse-level2 {
     margin-bottom: 0;
-    background   : var(--zaui-base-bg, #ffffff);
+    background: var(--zaui-base-bg, #ffffff);
 
     .@{ant-prefix}-collapse-header {
       margin-bottom: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1));
-      padding      : 0 !important;
-      background   : var(--zaui-base-bg, #ffffff);
+      padding: 0 !important;
+      background: var(--zaui-base-bg, #ffffff);
 
       .@{ant-prefix}-collapse-header-text {
-        position    : relative;
+        position: relative;
         padding-left: var(--zaui-space-size-sm, 8px);
-        font-size   : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
 
         &::before {
-          position     : absolute;
-          top          : 50%;
-          left         : 0;
-          width        : 4px;
-          height       : 14px;
-          background   : var(--zaui-brand);
+          position: absolute;
+          top: 50%;
+          left: 0;
+          width: 4px;
+          height: 14px;
+          background: var(--zaui-brand);
           border-radius: var(--zaui-border-radius-card, 2px);
-          transform    : translateY(-50%);
-          content      : '';
+          transform: translateY(-50%);
+          content: '';
         }
       }
 
@@ -93,9 +96,12 @@
       padding: 0;
     }
 
-    &.@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled>.@{ant-prefix}-collapse-header,
-    .@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled>.@{ant-prefix}-collapse-header>.arrow {
-      color : var(--zaui-text, #343434);
+    &.@{ant-prefix}-collapse .@{ant-prefix}-collapse-item-disabled > .@{ant-prefix}-collapse-header,
+    .@{ant-prefix}-collapse
+      .@{ant-prefix}-collapse-item-disabled
+      > .@{ant-prefix}-collapse-header
+      > .arrow {
+      color: var(--zaui-text, #343434);
       cursor: default;
     }
 
@@ -108,6 +114,12 @@
         display: block;
       }
     }
+
+    .pro-collapse-level2-no-collapse {
+      .@{ant-prefix}-collapse-expand-icon {
+        display: none;
+      }
+    }
   }
 
   .@{ant-prefix}-collapse-extra {
@@ -117,10 +129,9 @@
   }
 
   &.pro-collapse-list {
-
-    .@{ant-prefix}-descriptions-row>th,
-    .@{ant-prefix}-descriptions-row>td {
-      padding   : var(--zaui-space-size-md, 16px) 0;
+    .@{ant-prefix}-descriptions-row > th,
+    .@{ant-prefix}-descriptions-row > td {
+      padding: var(--zaui-space-size-md, 16px) 0;
       background: #fafafa;
 
       &.@{ant-prefix}-descriptions-item {
@@ -133,26 +144,25 @@
         position: relative;
 
         &::before {
-          position     : absolute;
-          top          : 50%;
-          left         : 8px;
-          width        : 4px;
-          height       : 14px;
-          background   : var(--zaui-brand);
+          position: absolute;
+          top: 50%;
+          left: 8px;
+          width: 4px;
+          height: 14px;
+          background: var(--zaui-brand);
           border-radius: var(--zaui-border-radius-card, 2px);
-          transform    : translateY(-50%);
-          content      : '';
+          transform: translateY(-50%);
+          content: '';
         }
       }
     }
 
     .@{ant-prefix}-descriptions-item-container {
-
       .@{ant-prefix}-descriptions-item-label,
       .@{ant-prefix}-descriptions-item-content {
-        color      : #0a0a0a !important;
+        color: #0a0a0a !important;
         font-weight: 500 !important;
-        font-size  : var(--zaui-font-size, 14px);
+        font-size: var(--zaui-font-size, 14px);
       }
     }
 

package/es/ProStep/index.js

@@ -160,7 +160,6 @@ var ProStep = function ProStep(_ref) {
       subtree: true,
       childList: true // 是否观察子元素的添加或删除
     };
-
     observer.observe(targetElement, config);
   };
   useDeepCompareEffect(function () {

package/es/ProThemeTools/index.js

@@ -115,7 +115,6 @@ var ProThemeTools = function ProThemeTools(_ref) {
         return ["".concat(getKebabCase(item === null || item === void 0 ? void 0 : item[0])), ['zauiSize'].includes(item === null || item === void 0 ? void 0 : item[0]) || typeof (item === null || item === void 0 ? void 0 : item[1]) !== 'number' ? item === null || item === void 0 ? void 0 : item[1] : "".concat(item === null || item === void 0 ? void 0 : item[1], "px") // zauiSize取数字
         ];
       }));
-
       setState(_objectSpread(_objectSpread({}, state), localThemeConfig));
       setThemes(cssVariables);
       _ConfigProvider.config({

package/es/ProThemeTools/utils/index.js

@@ -49,7 +49,6 @@ export var getKebabCase = function getKebabCase(str) {
   if (temp.slice(0, 1) === '-') {
     temp = temp.slice(1); // 如果首字母是大写，执行replace时会多一个-，需要去掉
   }
-
   return temp;
 };
 /** JS实现对象驼峰命名与横线命名的转换  */

package/es/ProTree/components/Tree.js

@@ -303,7 +303,6 @@ function List(props) {
       });
       return treeRow; // .filter((item) => item);
     };
-
     if ((other === null || other === void 0 ? void 0 : other.mode) === 'view') {
       return;
     }

package/es/ProTreeModal/index.js

@@ -491,8 +491,12 @@ var ProTreeModal = function ProTreeModal(props) {
     } else {
       onChange === null || onChange === void 0 ? void 0 : onChange([]);
       setState({
-        checkAll: false
+        checkAll: false,
+        open: true
       });
+      if (appoint) {
+        openChange === null || openChange === void 0 ? void 0 : openChange(true);
+      }
     }
   };
   /**

package/es/ProTreeSelect/index.js

@@ -19,7 +19,6 @@ import { useProConfig } from '../ProConfigProvider';
 import Container from '../ProForm/components/Container';
 var SHOW_PARENT = _TreeSelect.SHOW_PARENT;
 export var ProTreeSelect = function ProTreeSelect(props, ref) {
-  var _classnames2;
   // 全局属性配置在ConfigProvider
   var _ref = useProConfig('ProTreeSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
@@ -363,7 +362,6 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
         //   currentAllNodeChild.push(item);
         // }
       }
-
       return currentAllNodeChild;
     };
     sourceList = filterData(sourceList);
@@ -469,9 +467,9 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     'pro-tree-select': true
   }, "".concat(className), className));
   var innerClass = treeCheckable ? 'checkable-tree pro' : "".concat(tenCountClass, " signal-tree");
-  var dropDownClassName = classnames((_classnames2 = {
+  var dropDownClassName = classnames(_defineProperty(_defineProperty({
     'pro-tree-select-drop-down-container': true
-  }, _defineProperty(_classnames2, "".concat(innerClass), true), _defineProperty(_classnames2, "".concat(popupClassName), popupClassName), _classnames2));
+  }, "".concat(innerClass), true), "".concat(popupClassName), popupClassName));
   var treeProps = _objectSpread({
     disabled: disabled,
     showSearch: showSearch,

package/es/ProUpload/index.js

@@ -91,7 +91,6 @@ var ProUpload = /*#__PURE__*/React.forwardRef(function (props, ref) {
           response: file === null || file === void 0 ? void 0 : file.response
           // url: file?.response?.data?.url,
         };
-
         if (transformResponse) {
           var data = transformResponse(file.response) || {};
           return _objectSpread(_objectSpread({}, nfile), data);

package/es/index.d.ts

@@ -8,6 +8,7 @@ export { default as ProViewer } from './ProViewer';
 export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
+export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components';

package/es/index.js

@@ -12,6 +12,7 @@ export { default as ProEditTable } from './ProEditTable';
 export { default as ProDrawerForm } from './ProDrawerForm';
 export { default as ProEditLabel } from './ProEditLabel';
 // 表单
+export { ProFormGroup, useProFormGroup } from './ProForm/components/ProFormGroup';
 export { default as ProForm } from './ProForm';
 export * from './ProForm';
 export * from './ProForm/components'; // ProForm 中组件导出

package/es/old/ProEditableTable/index.js

@@ -404,7 +404,7 @@ var ProEditableTable = /*#__PURE__*/forwardRef(function (props, ref) {
           }, antButtonProps), {}, {
             children: buttonText
           }))]
-        }) : /*#__PURE__*/cloneElement(buttonText, antButtonProps)
+        }) : ( /*#__PURE__*/cloneElement(buttonText, antButtonProps))
       }) : null
     });
   };

package/es/style/theme/antd.less

@@ -663,7 +663,7 @@
       width: calc(100% - 18px);
       margin-bottom: 0;
       text-align: right;
-      background: #fff;
+      // background: #fff;
     }
   }
 }

package/lib/ProConfigProvider/index.js

@@ -34,7 +34,6 @@ var antdLangMap = {
   'zh-CN': _zh_CN.default,
   'en-US': _en_US.default // en-US
 };
-
 var reducer = function reducer(state, action) {
   var _state$ProEnum;
   switch (action.type) {

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

@@ -178,7 +178,6 @@ var ProModal = function ProModal(_ref) {
     footer: renderFooter(),
     okText: okText,
     cancelText: cancelText,
-    centered: true,
     closeIcon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
       className: "close-icon",
       src: _close.default

package/lib/ProEditLabel/index.js

@@ -23,7 +23,6 @@ var _RenderProForm = _interopRequireDefault(require("./components/RenderProForm"
 var _utils = require("./utils");
 var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
 var ProEditLabel = function ProEditLabel(_ref) {
-  var _classnames;
   var _ref$open = _ref.open,
     open = _ref$open === void 0 ? false : _ref$open,
     _ref$disabled = _ref.disabled,
@@ -129,9 +128,9 @@ var ProEditLabel = function ProEditLabel(_ref) {
       }
     }
   }, [confirmValue, mode]);
-  var cls = (0, _classnames2.default)((_classnames = {
+  var cls = (0, _classnames2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({
     'pro-edit-label': true
-  }, (0, _defineProperty2.default)(_classnames, "trigger-".concat(trigger), trigger), (0, _defineProperty2.default)(_classnames, 'pro-edit-label-small', size === 'small'), (0, _defineProperty2.default)(_classnames, 'pro-edit-label-middle', size === 'middle'), (0, _defineProperty2.default)(_classnames, 'pro-edit-label-large', size === 'large'), (0, _defineProperty2.default)(_classnames, "".concat(className), className), _classnames));
+  }, "trigger-".concat(trigger), trigger), 'pro-edit-label-small', size === 'small'), 'pro-edit-label-middle', size === 'middle'), 'pro-edit-label-large', size === 'large'), "".concat(className), className));
   /**
    * pop确认回调
    */

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

@@ -86,24 +86,24 @@ var ActionButton = function ActionButton(_ref) {
         disabled: isDisabled,
         okText: _locale.default.ProEditTable.confirm,
         cancelText: _locale.default.ProEditTable.cancel,
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled
-        })) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
       }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
             btnConfig.onEvent(record, index);
           }
-        })) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
+        }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(delBtnProps, ['buttonProps', 'isEditable'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
@@ -113,10 +113,10 @@ var ActionButton = function ActionButton(_ref) {
         }))
       })
     }) : (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
-      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(btnConfig.label) ? ( /*#__PURE__*/_react.default.cloneElement(btnConfig.label, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
         record: record,
         index: index
-      })) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      }))) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         className: "action-button"
       }, (0, _lodash.omit)(actionBtnProps, ['buttonProps', 'isEditable'])), {}, {
         type: "link",

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

@@ -33,7 +33,7 @@ var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "e
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4, _classNames;
+  var _type, _type$replace, _fieldProps2, _fieldProps3, _fieldProps4, _names, _formItemChildProps$p, _TargetComponent4;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -509,13 +509,13 @@ var RenderField = function RenderField(_ref) {
   if (!isEditing) {
     delete _formItemProps.rules;
   }
-  var _className = (0, _classnames.default)((_classNames = {}, (0, _defineProperty2.default)(_classNames, className, className), (0, _defineProperty2.default)(_classNames, 'pro-form-item-changed', changed), _classNames));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
   var originalTitle = originalTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
-    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
-    })) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
+    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
@@ -526,7 +526,7 @@ var RenderField = function RenderField(_ref) {
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: cellName,
-    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange']))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
+    children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });

package/lib/ProEditTable/style/index.less

@@ -313,7 +313,6 @@
 }
 
 .pro-edit-table-toolbar {
-  margin-top: var(--zaui-space-size-md, 16px);
   .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);