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

package/es/ProEditLabel/components/RenderProForm.js

@@ -1,11 +1,13 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _omit from "lodash/omit";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { useEffect } from 'react';
+import { omit } from 'lodash';
 import { InfoCircleOutlined } from '@ant-design/icons';
 import { Space } from 'antd';
-import { ProForm } from '../../index';
-import { matchFormValue } from '../utils';
+import { ProForm } from "../../index";
+import { matchFormValue } from "../utils";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var RenderProForm = function RenderProForm(props) {
   var _props3, _props6, _props7;
   var columns = [];
@@ -13,19 +15,21 @@ var RenderProForm = function RenderProForm(props) {
   var _props = {};
   useEffect(function () {
     // isNode以ReactNode节点方式打开popUp，默认每次打开弹窗清空弹窗内容
-    if ((primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.value) && !(primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.isNode)) {
+    if (primitiveProps !== null && primitiveProps !== void 0 && primitiveProps.value && !(primitiveProps !== null && primitiveProps !== void 0 && primitiveProps.isNode)) {
       var _props2;
       _props.form.setFieldsValue(matchFormValue(primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.value, (_props2 = _props) === null || _props2 === void 0 ? void 0 : _props2.columns));
     }
+
     // 销毁重置表单数据
     return function () {
       var _props$form;
-      (_props$form = _props.form) === null || _props$form === void 0 ? void 0 : _props$form.resetFields();
+      (_props$form = _props.form) === null || _props$form === void 0 || _props$form.resetFields();
     };
   }, []);
+
   // 兼容老写法
   if (!props.columns) {
-    columns[0] = _objectSpread(_objectSpread({}, _omit(props, ['title', 'tip', 'form', 'onChange', 'isView', 'isNode'])), {}, {
+    columns[0] = _objectSpread(_objectSpread({}, omit(props, ['title', 'tip', 'form', 'onChange', 'isView', 'isNode'])), {}, {
       name: props.type || 'Input'
     });
     _props = {
@@ -34,37 +38,37 @@ var RenderProForm = function RenderProForm(props) {
       isView: props.isView
     };
   } else {
-    _props = _objectSpread({}, _omit(props, ['onChange', 'isNode']));
+    _props = _objectSpread({}, omit(props, ['onChange', 'isNode']));
   }
-  if ((_props3 = _props) === null || _props3 === void 0 ? void 0 : _props3.isView) {
-    var _props4, _props4$columns;
-    (_props4 = _props) === null || _props4 === void 0 ? void 0 : (_props4$columns = _props4.columns) === null || _props4$columns === void 0 ? void 0 : _props4$columns.forEach(function (item) {
+  if ((_props3 = _props) !== null && _props3 !== void 0 && _props3.isView) {
+    var _props4;
+    (_props4 = _props) === null || _props4 === void 0 || (_props4 = _props4.columns) === null || _props4 === void 0 || _props4.forEach(function (item) {
       item.noStyle = true;
     });
   } else {
-    var _props5, _props5$columns;
-    (_props5 = _props) === null || _props5 === void 0 ? void 0 : (_props5$columns = _props5.columns) === null || _props5$columns === void 0 ? void 0 : _props5$columns.forEach(function (item) {
+    var _props5;
+    (_props5 = _props) === null || _props5 === void 0 || (_props5 = _props5.columns) === null || _props5 === void 0 || _props5.forEach(function (item) {
       item.noStyle = false;
     });
   }
-  return _jsxs(_Fragment, {
-    children: [(primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title) && !((_props6 = _props) === null || _props6 === void 0 ? void 0 : _props6.isView) && _jsx("div", {
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [(primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title) && !((_props6 = _props) !== null && _props6 !== void 0 && _props6.isView) && /*#__PURE__*/_jsx("div", {
       className: "pro-edit-label-title",
       children: primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.title
-    }), (primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip) && !((_props7 = _props) === null || _props7 === void 0 ? void 0 : _props7.isView) && _jsx("div", {
+    }), (primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip) && !((_props7 = _props) !== null && _props7 !== void 0 && _props7.isView) && /*#__PURE__*/_jsx("div", {
       className: "pro-edit-label-tip",
-      children: _jsxs(Space, {
+      children: /*#__PURE__*/_jsxs(Space, {
         align: "start",
-        children: [_jsx(InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
+        children: [/*#__PURE__*/_jsx(InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
       })
-    }), _jsx(ProForm, _objectSpread({
+    }), /*#__PURE__*/_jsx(ProForm, _objectSpread({
       span: 24,
       footer: false,
       onValuesChange: function onValuesChange(changeValue, values) {
         var _props8;
         if (((_props8 = _props) === null || _props8 === void 0 ? void 0 : _props8.columns.length) === 1) {
-          var _props9, _props9$columns$;
-          primitiveProps.onChange && primitiveProps.onChange(values[(_props9 = _props) === null || _props9 === void 0 ? void 0 : (_props9$columns$ = _props9.columns[0]) === null || _props9$columns$ === void 0 ? void 0 : _props9$columns$.name]);
+          var _props9;
+          primitiveProps.onChange && primitiveProps.onChange(values[(_props9 = _props) === null || _props9 === void 0 || (_props9 = _props9.columns[0]) === null || _props9 === void 0 ? void 0 : _props9.name]);
           return;
         }
         primitiveProps.onChange && primitiveProps.onChange(values);

package/es/ProEditLabel/index.js

@@ -1,20 +1,21 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _omit from "lodash/omit";
 var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
-function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
-function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { EditOutlined } from '@ant-design/icons';
 import { Input, Popconfirm, Form, Space } from 'antd';
 import { useToggle, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import React, { useEffect, useRef } from 'react';
-import RenderProForm from './components/RenderProForm';
-import { matchFormValue } from './utils';
+import { omit } from 'lodash';
+import RenderProForm from "./components/RenderProForm";
+import { matchFormValue } from "./utils";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var ProEditLabel = function ProEditLabel(_ref) {
   var _ref$open = _ref.open,
     open = _ref$open === void 0 ? false : _ref$open,
@@ -39,6 +40,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
     props = _objectWithoutProperties(_ref, _excluded);
   var _useSetState = useSetState({
       popValue: props.value || '',
+      // 临时value
       confirmValue: props.value || '' // 确认后value
     }),
     _useSetState2 = _slicedToArray(_useSetState, 2),
@@ -66,7 +68,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
   var editHandle = function editHandle() {
     var _inputRef$current;
     toggleStatus();
-    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 ? void 0 : _inputRef$current.focus();
+    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
     if (mode === 'popup') {
       // 兼容老写法
       if (!popupProps.columns) {
@@ -93,6 +95,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
       popValue: props.value
     });
   }, [props.value]);
+
   // 初始化同步数据或者同步外部数据源
   useEffect(function () {
     // 弹窗模式使用form赋值
@@ -109,6 +112,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
       }
     }
   }, [props.value, mode]);
+
   // 文本模式同步
   useEffect(function () {
     // 弹窗模式使用form赋值
@@ -124,62 +128,65 @@ var ProEditLabel = function ProEditLabel(_ref) {
   var cls = classnames(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     'pro-edit-label': true
   }, "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确认回调
    */
   var onConfirmHandle = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee() {
-      var res, value, _t, _t2, _t3;
-      return _regenerator().w(function (_context) {
-        while (1) switch (_context.p = _context.n) {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var res, value;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
           case 0:
-            _context.n = 1;
+            _context.next = 2;
             return form.validateFields();
-          case 1:
-            res = _context.v;
+          case 2:
+            res = _context.sent;
             // 兼容老写法
             if (!popupProps.columns) {
               value = res[(popupProps === null || popupProps === void 0 ? void 0 : popupProps.type) || 'Input'];
             }
             value = res;
-            _context.p = 2;
-            _t = onFinish;
-            if (!_t) {
-              _context.n = 3;
+            _context.prev = 5;
+            _context.t0 = onFinish;
+            if (!_context.t0) {
+              _context.next = 10;
               break;
             }
-            _context.n = 3;
+            _context.next = 10;
             return onFinish(value);
-          case 3:
-            _t2 = onConfirm;
-            if (!_t2) {
-              _context.n = 4;
+          case 10:
+            _context.t1 = onConfirm;
+            if (!_context.t1) {
+              _context.next = 14;
               break;
             }
-            _context.n = 4;
+            _context.next = 14;
             return onConfirm(value);
-          case 4:
-            _context.n = 5;
+          case 14:
+            _context.next = 16;
             return setState({
               confirmValue: value,
               popValue: value
             });
-          case 5:
-            _context.n = 7;
+          case 16:
+            _context.next = 21;
             break;
-          case 6:
-            _context.p = 6;
-            _t3 = _context.v;
-            return _context.a(2, Promise.reject());
-          case 7:
-            return _context.a(2);
+          case 18:
+            _context.prev = 18;
+            _context.t2 = _context["catch"](5);
+            return _context.abrupt("return", Promise.reject());
+          case 21:
+          case "end":
+            return _context.stop();
         }
-      }, _callee, null, [[2, 6]]);
+      }, _callee, null, [[5, 18]]);
     }));
     return function onConfirmHandle() {
       return _ref2.apply(this, arguments);
     };
   }();
+
   /**
    * pop取消回调
    */
@@ -194,27 +201,28 @@ var ProEditLabel = function ProEditLabel(_ref) {
       popValue: props.value
     });
   };
+
   /**
    * 渲染可编辑label
    * @returns
    */
   var renderProEditLabel = function renderProEditLabel() {
-    var TextNode = _jsx("div", {
+    var TextNode = /*#__PURE__*/_jsx("div", {
       className: cls,
       style: style,
-      children: _jsxs(Space, {
+      children: /*#__PURE__*/_jsxs(Space, {
         align: "start",
-        children: [mode === 'current' ? props.value : _jsx(RenderProForm, _objectSpread({
+        children: [mode === 'current' ? props.value : /*#__PURE__*/_jsx(RenderProForm, _objectSpread({
           value: confirmValue,
           isView: true,
           form: viewForm
-        }, popupProps)), !disabled && _jsx(EditOutlined, {
+        }, popupProps)), !disabled && /*#__PURE__*/_jsx(EditOutlined, {
           onClick: editHandle
         })]
       })
     });
     if (disabled) {
-      if (/*#__PURE__*/React.isValidElement(children)) {
+      if ( /*#__PURE__*/React.isValidElement(children)) {
         return children;
       }
       if (props.value && !popupProps) {
@@ -225,7 +233,7 @@ var ProEditLabel = function ProEditLabel(_ref) {
     // 当前页编辑模式
     if (mode === 'current') {
       if (status) {
-        return _jsx(Input, _objectSpread(_objectSpread({
+        return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({
           ref: inputRef,
           size: size,
           onBlur: function onBlur(e) {
@@ -246,18 +254,18 @@ 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;
       };
-      return _jsx(Popconfirm, _objectSpread(_objectSpread({
+      return /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
         classNames: {
           root: 'pro-edit-label-popconfirm'
         },
         icon: null,
         destroyOnHidden: true,
-        title: _jsx(RenderProForm, _objectSpread({
+        title: /*#__PURE__*/_jsx(RenderProForm, _objectSpread({
           form: form,
           value: confirmValue,
           onChange: props.onChange,
@@ -268,12 +276,12 @@ var ProEditLabel = function ProEditLabel(_ref) {
         onOpenChange: function onOpenChange(open) {
           _onOpenChange && _onOpenChange(open);
         }
-      }, _omit(popupProps, ['type', 'label', 'title', 'tip', 'trim', 'labelWidth', 'fieldProps', 'columns'])), {}, {
+      }, omit(popupProps, ['type', 'label', 'title', 'tip', 'trim', 'labelWidth', 'fieldProps', 'columns'])), {}, {
         children: labelRender()
       }));
     }
   };
-  return _jsx(_Fragment, {
+  return /*#__PURE__*/_jsx(_Fragment, {
     children: renderProEditLabel()
   });
 };

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

@@ -1,13 +1,14 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _omit from "lodash/omit";
-import _isFunction from "lodash/isFunction";
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { Button, Popconfirm } from 'antd';
-import { iconMap } from '../../utils/config';
-import locale from '../../../locale';
+import { isFunction, omit } from 'lodash';
+import { iconMap } from "../../utils/config";
+import locale from "../../../locale";
+
 // 渲染操作按钮
+import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var ActionButton = function ActionButton(_ref) {
   var _editingKeys$includes, _btnConfig$buttonProp, _btnConfig$buttonProp2, _btnConfig$buttonProp3, _btnConfig$icon;
   var record = _ref.record,
@@ -25,6 +26,7 @@ var ActionButton = function ActionButton(_ref) {
     tableLength = config.tableLength,
     selectedRows = config.selectedRows;
   var rowNamePath = [].concat(_toConsumableArray(name), [index]);
+
   // 操作按钮权限控制
   var getShow = function getShow(show) {
     if (typeof show === 'function') {
@@ -39,6 +41,7 @@ var ActionButton = function ActionButton(_ref) {
     }
     return show;
   };
+
   // 操作按钮权限控制
   var getDisabled = function getDisabled(disabled) {
     if (typeof disabled === 'function') {
@@ -51,6 +54,7 @@ var ActionButton = function ActionButton(_ref) {
         selectedRows: selectedRows
       });
     }
+
     // 新增超过最大行，禁止操作按钮
     if (btnConfig.type === 'add' && max && tableLength >= max) {
       return true;
@@ -61,16 +65,19 @@ var ActionButton = function ActionButton(_ref) {
     delete: deletePoConfirmMsg,
     mulDelete: mulDeletePoConfirmMsg
   };
+
   // 判断当前行是否正在编辑
-  var _isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 ? void 0 : (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
+  var _isEditing = !virtualKey || btnConfig.isEditable === (editingKeys === null || editingKeys === void 0 || (_editingKeys$includes = editingKeys.includes) === null || _editingKeys$includes === void 0 ? void 0 : _editingKeys$includes.call(editingKeys, record === null || record === void 0 ? void 0 : record.rowKey));
+
   // 单行删除、多行删除按钮Props
   var delBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
     disabled: getDisabled((_btnConfig$buttonProp = (_btnConfig$buttonProp2 = btnConfig.buttonProps) === null || _btnConfig$buttonProp2 === void 0 ? void 0 : _btnConfig$buttonProp2.disabled) !== null && _btnConfig$buttonProp !== void 0 ? _btnConfig$buttonProp : !selectedRowKeys.length && btnConfig.type === 'mulDelete')
   });
+
   // 其他操作按钮Props
   var actionBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
     onClick: function onClick() {
-      btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, {
+      btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
         index: index,
         form: form,
         name: name,
@@ -81,8 +88,9 @@ var ActionButton = function ActionButton(_ref) {
     },
     disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
   });
+
   // 当传入函数时，先转成reactNode
-  if (_isFunction(btnConfig.label)) {
+  if (isFunction(btnConfig.label)) {
     var addIndex = tableLength ? tableLength - 1 : 0;
     var namePath = [].concat(_toConsumableArray(name), [addIndex]);
     var addRecord = form.getFieldValue(namePath) || {};
@@ -96,13 +104,13 @@ var ActionButton = function ActionButton(_ref) {
     });
   }
   var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
-  return _isEditing && getShow(btnConfig.show) ? _jsx(_Fragment, {
-    children: ['delete', 'mulDelete'].includes(btnConfig.type) ? _jsx(_Fragment, {
-      children: (btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.needConfirm) ? _jsx(Popconfirm, {
+  return _isEditing && getShow(btnConfig.show) ? /*#__PURE__*/_jsx(_Fragment, {
+    children: ['delete', 'mulDelete'].includes(btnConfig.type) ? /*#__PURE__*/_jsx(_Fragment, {
+      children: btnConfig !== null && btnConfig !== void 0 && btnConfig.needConfirm ? /*#__PURE__*/_jsx(Popconfirm, {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: function onConfirm() {
-          btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, {
+          btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
             index: index,
             form: form,
             name: name,
@@ -114,22 +122,22 @@ 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
-        }))) : _jsx(Button, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
         }))
-      }) : _jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+      }) : /*#__PURE__*/_jsx(_Fragment, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           record: record,
           index: index,
           disabled: isDisabled,
           onClick: function onClick() {
-            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, {
+            btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
               index: index,
               form: form,
               name: name,
@@ -138,11 +146,11 @@ var ActionButton = function ActionButton(_ref) {
               selectedRows: selectedRows
             });
           }
-        }))) : _jsx(Button, _objectSpread(_objectSpread({}, _omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+        }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
           disabled: isDisabled,
           type: "link",
           onClick: function onClick() {
-            btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.onEvent(record, {
+            btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
               index: index,
               form: form,
               name: name,
@@ -154,13 +162,13 @@ var ActionButton = function ActionButton(_ref) {
           children: btnConfig.label
         }))
       })
-    }) : _jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? (/*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, _omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+    }) : /*#__PURE__*/_jsx(_Fragment, {
+      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({
+      }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
         className: "action-button"
-      }, _omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
+      }, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent'])), {}, {
         type: "link",
         icon: (_btnConfig$icon = btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.icon) !== null && _btnConfig$icon !== void 0 ? _btnConfig$icon : iconMap[btnConfig.type],
         children: btnConfig.label

package/es/ProEditTable/components/RcTable/BaseTable.js

@@ -1,13 +1,14 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isNumber from "lodash/isNumber";
-import _isFunction from "lodash/isFunction";
 var _excluded = ["tableProps"];
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { memo, useCallback } from 'react';
 import { Badge, Table } from 'antd';
-import useEditTableError from '../../utils/useEditTableError';
+import { isFunction, isNumber } from 'lodash';
+import useEditTableError from "../../utils/useEditTableError";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var BaseTable = function BaseTable(_ref) {
   var _value$;
   var tableProps = _ref.tableProps,
@@ -40,18 +41,18 @@ var BaseTable = function BaseTable(_ref) {
     _useEditTableError2 = _slicedToArray(_useEditTableError, 1),
     errorLength = _useEditTableError2[0];
   var getScroll = useCallback(function () {
-    if ((scroll === null || scroll === void 0 ? void 0 : scroll.x) && (scroll === null || scroll === void 0 ? void 0 : scroll.y)) {
+    if (scroll !== null && scroll !== void 0 && scroll.x && scroll !== null && scroll !== void 0 && scroll.y) {
       return {
         x: scroll === null || scroll === void 0 ? void 0 : scroll.x,
         y: Number(scroll === null || scroll === void 0 ? void 0 : scroll.y)
       };
     }
-    if ((scroll === null || scroll === void 0 ? void 0 : scroll.x) && !_isNumber(scroll === null || scroll === void 0 ? void 0 : scroll.y)) {
+    if (scroll !== null && scroll !== void 0 && scroll.x && !isNumber(scroll === null || scroll === void 0 ? void 0 : scroll.y)) {
       return {
         x: scroll === null || scroll === void 0 ? void 0 : scroll.x
       };
     }
-    if ((scroll === null || scroll === void 0 ? void 0 : scroll.y) && !(scroll === null || scroll === void 0 ? void 0 : scroll.x)) {
+    if (scroll !== null && scroll !== void 0 && scroll.y && !(scroll !== null && scroll !== void 0 && scroll.x)) {
       return {
         y: Number(scroll === null || scroll === void 0 ? void 0 : scroll.y)
       };
@@ -62,7 +63,7 @@ var BaseTable = function BaseTable(_ref) {
     className: className,
     columns: columns,
     rowClassName: rowClassName,
-    dataSource: (value === null || value === void 0 ? void 0 : (_value$ = value[0]) === null || _value$ === void 0 ? void 0 : _value$.rowKey) ? value : [],
+    dataSource: value !== null && value !== void 0 && (_value$ = value[0]) !== null && _value$ !== void 0 && _value$.rowKey ? value : [],
     rowSelection: renderRowSelection(),
     onRow: function onRow() {
       return {
@@ -83,14 +84,14 @@ var BaseTable = function BaseTable(_ref) {
       showTotal: function showTotal(total) {
         var _locale$ProEditTable;
         if (!total) return;
-        return formatMessage(locale === null || locale === void 0 ? void 0 : (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
+        return formatMessage(locale === null || locale === void 0 || (_locale$ProEditTable = locale.ProEditTable) === null || _locale$ProEditTable === void 0 ? void 0 : _locale$ProEditTable.total, {
           total: total
         });
       },
       itemRender: function itemRender(index, type, originalElement) {
-        return type === 'page' && page.pageNum === index && errorLength ? _jsxs("div", {
+        return type === 'page' && page.pageNum === index && errorLength ? /*#__PURE__*/_jsxs("div", {
           className: "pro-edit-table-pagination-item-badge",
-          children: [_jsx(Badge, {
+          children: [/*#__PURE__*/_jsx(Badge, {
             count: errorLength
           }), originalElement]
         }) : originalElement;
@@ -102,11 +103,11 @@ var BaseTable = function BaseTable(_ref) {
     }) : false,
     scroll: getScroll()
   });
-  return _jsxs(_Fragment, {
-    children: [headerRender ? _jsx("div", {
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [headerRender ? /*#__PURE__*/_jsx("div", {
       className: "pro-edit-table-header",
-      children: _isFunction(headerRender) ? headerRender() : headerRender
-    }) : null, _jsx(Table, _objectSpread({
+      children: isFunction(headerRender) ? headerRender() : headerRender
+    }) : null, /*#__PURE__*/_jsx(Table, _objectSpread({
       ref: tableRef
     }, nextTableProps))]
   });