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

package/es/ProEditLabel/index.js

@@ -1,91 +1,62 @@
-var _excluded = ["open", "disabled", "onOpenChange", "onFinish", "onConfirm", "trigger", "mode", "className", "size", "popupProps", "style", "viewEmpty", "children", "form"];
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import _omit from "lodash/omit";
 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 { omit } from 'lodash';
 import RenderProForm from "./components/RenderProForm";
 import { matchFormValue } from "./utils";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-var ProEditLabel = _ref => {
-  var _ref$open = _ref.open,
-    open = _ref$open === void 0 ? false : _ref$open,
-    _ref$disabled = _ref.disabled,
-    disabled = _ref$disabled === void 0 ? false : _ref$disabled,
-    _onOpenChange = _ref.onOpenChange,
-    onFinish = _ref.onFinish,
-    onConfirm = _ref.onConfirm,
-    _ref$trigger = _ref.trigger,
-    trigger = _ref$trigger === void 0 ? 'click' : _ref$trigger,
-    _ref$mode = _ref.mode,
-    mode = _ref$mode === void 0 ? 'current' : _ref$mode,
-    className = _ref.className,
-    _ref$size = _ref.size,
-    size = _ref$size === void 0 ? 'middle' : _ref$size,
-    popupProps = _ref.popupProps,
-    style = _ref.style,
-    _ref$viewEmpty = _ref.viewEmpty,
-    viewEmpty = _ref$viewEmpty === void 0 ? '-' : _ref$viewEmpty,
-    children = _ref.children,
-    OriginForm = _ref.form,
-    props = _objectWithoutProperties(_ref, _excluded);
-  var _useSetState = useSetState({
-      popValue: props.value || '',
-      // 临时value
-      confirmValue: props.value || '' // 确认后value
-    }),
-    _useSetState2 = _slicedToArray(_useSetState, 2),
-    confirmValue = _useSetState2[0].confirmValue,
-    setState = _useSetState2[1];
-  var _useToggle = useToggle(open),
-    _useToggle2 = _slicedToArray(_useToggle, 2),
-    status = _useToggle2[0],
-    toggleStatus = _useToggle2[1].toggle;
-  var _Form$useForm = Form.useForm(OriginForm),
-    _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    form = _Form$useForm2[0];
-  var _Form$useForm3 = Form.useForm(),
-    _Form$useForm4 = _slicedToArray(_Form$useForm3, 1),
-    viewForm = _Form$useForm4[0];
-  var inputRef = useRef(null);
+const ProEditLabel = ({
+  open = false,
+  disabled = false,
+  onOpenChange,
+  onFinish,
+  onConfirm,
+  trigger = 'click',
+  mode = 'current',
+  className,
+  size = 'middle',
+  popupProps,
+  style,
+  viewEmpty = '-',
+  children,
+  form: OriginForm,
+  ...props
+}) => {
+  const [{
+    confirmValue
+  }, setState] = useSetState({
+    popValue: props.value || '',
+    // 临时value
+    confirmValue: props.value || '' // 确认后value
+  });
+  const [status, {
+    toggle: toggleStatus
+  }] = useToggle(open);
+  const [form] = Form.useForm(OriginForm);
+  const [viewForm] = Form.useForm();
+  const inputRef = useRef(null);
 
   // 类型断言：antd FormInstance 确实有这些方法（setFieldsValue, validateFields等）
   // 使用类型断言解决 TypeScript 类型检查问题
-  var formInstance = form;
-  var viewFormInstance = viewForm;
-  var onPress = e => {
-    var element = e.target;
+  const formInstance = form;
+  const viewFormInstance = viewForm;
+  const onPress = e => {
+    const element = e.target;
     if (e.key === 'Enter') {
       onFinish && onFinish(element.value);
       onConfirm && onConfirm(element.value);
       toggleStatus();
     }
   };
-  var editHandle = () => {
-    var _inputRef$current;
+  const editHandle = () => {
     toggleStatus();
-    (_inputRef$current = inputRef.current) === null || _inputRef$current === void 0 || _inputRef$current.focus();
+    inputRef.current?.focus();
     if (mode === 'popup') {
       // 兼容老写法
       if (!popupProps.columns) {
-        if (!(popupProps !== null && popupProps !== void 0 && popupProps.type)) {
+        if (!popupProps?.type) {
           console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
           return;
         }
@@ -93,7 +64,7 @@ var ProEditLabel = _ref => {
           [popupProps.type]: confirmValue
         });
       } else {
-        var matchedValue = matchFormValue(confirmValue, popupProps.columns);
+        const matchedValue = matchFormValue(confirmValue, popupProps.columns);
         formInstance.setFieldsValue(matchedValue || {});
       }
       // 弹窗同步最新value数据，解决Popconfirm空白处关闭数据不同步问题
@@ -103,12 +74,11 @@ var ProEditLabel = _ref => {
     }
   };
   useEffect(() => {
-    var _inputRef$current2;
-    status && ((_inputRef$current2 = inputRef.current) === null || _inputRef$current2 === void 0 ? void 0 : _inputRef$current2.focus());
+    status && inputRef.current?.focus();
   }, [status]);
   useEffect(() => {
-    _onOpenChange && _onOpenChange(status);
-  }, [_onOpenChange, status]);
+    onOpenChange && onOpenChange(status);
+  }, [onOpenChange, status]);
   useEffect(() => {
     setState({
       confirmValue: props.value,
@@ -122,7 +92,7 @@ var ProEditLabel = _ref => {
     if (mode === 'popup' && props.value) {
       // 兼容老写法
       if (!popupProps.columns) {
-        if (!(popupProps !== null && popupProps !== void 0 && popupProps.type)) {
+        if (!popupProps?.type) {
           console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
           return;
         }
@@ -147,7 +117,7 @@ var ProEditLabel = _ref => {
     if (mode === 'popup' && confirmValue !== props.value) {
       // 兼容老写法
       if (!popupProps.columns) {
-        if (!(popupProps !== null && popupProps !== void 0 && popupProps.type)) {
+        if (!popupProps?.type) {
           console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
           return;
         }
@@ -159,7 +129,7 @@ var ProEditLabel = _ref => {
       }
     }
   }, [confirmValue, mode]);
-  var cls = classnames({
+  const cls = classnames({
     'pro-edit-label': true,
     [`trigger-${trigger}`]: trigger,
     'pro-edit-label-small': size === 'small',
@@ -172,86 +142,44 @@ var ProEditLabel = _ref => {
   /**
    * pop确认回调
    */
-  var onConfirmHandle = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var res, value, fieldName;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return formInstance.validateFields();
-          case 2:
-            res = _context.sent;
-            if (popupProps.columns) {
-              _context.next = 10;
-              break;
-            }
-            if (popupProps !== null && popupProps !== void 0 && popupProps.type) {
-              _context.next = 7;
-              break;
-            }
-            console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
-            return _context.abrupt("return", Promise.reject(new Error('popupProps.type is required')));
-          case 7:
-            value = res[popupProps.type];
-            _context.next = 11;
-            break;
-          case 10:
-            // 新写法：如果只有一个字段，提取单个值；否则使用整个对象
-            if (popupProps.columns.length === 1) {
-              fieldName = popupProps.columns[0].name || popupProps.columns[0].type;
-              value = res[fieldName];
-            } else {
-              value = res;
-            }
-          case 11:
-            _context.prev = 11;
-            _context.t0 = onFinish;
-            if (!_context.t0) {
-              _context.next = 16;
-              break;
-            }
-            _context.next = 16;
-            return onFinish(value);
-          case 16:
-            _context.t1 = onConfirm;
-            if (!_context.t1) {
-              _context.next = 20;
-              break;
-            }
-            _context.next = 20;
-            return onConfirm(value);
-          case 20:
-            _context.next = 22;
-            return setState({
-              confirmValue: value,
-              popValue: value
-            });
-          case 22:
-            _context.next = 27;
-            break;
-          case 24:
-            _context.prev = 24;
-            _context.t2 = _context["catch"](11);
-            return _context.abrupt("return", Promise.reject());
-          case 27:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee, null, [[11, 24]]);
-    }));
-    return function onConfirmHandle() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
+  const onConfirmHandle = async () => {
+    const res = await formInstance.validateFields();
+    let value;
+    // 兼容老写法
+    if (!popupProps.columns) {
+      if (!popupProps?.type) {
+        console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
+        return Promise.reject(new Error('popupProps.type is required'));
+      }
+      value = res[popupProps.type];
+    } else {
+      // 新写法：如果只有一个字段，提取单个值；否则使用整个对象
+      if (popupProps.columns.length === 1) {
+        const fieldName = popupProps.columns[0].name || popupProps.columns[0].type;
+        value = res[fieldName];
+      } else {
+        value = res;
+      }
+    }
+    try {
+      onFinish && (await onFinish(value));
+      onConfirm && (await onConfirm(value));
+      await setState({
+        confirmValue: value,
+        popValue: value
+      });
+    } catch (error) {
+      return Promise.reject();
+    }
+  };
 
   /**
    * pop取消回调
    */
-  var onCancelHandle = () => {
+  const onCancelHandle = () => {
     // 兼容老写法
     if (!popupProps.columns) {
-      if (!(popupProps !== null && popupProps !== void 0 && popupProps.type)) {
+      if (!popupProps?.type) {
         console.warn('ProEditLabel: popupProps.type is required when using old API (without columns)');
         return;
       }
@@ -270,17 +198,18 @@ var ProEditLabel = _ref => {
    * 渲染可编辑label
    * @returns
    */
-  var renderProEditLabel = () => {
-    var TextNode = /*#__PURE__*/_jsx("div", {
+  const renderProEditLabel = () => {
+    const TextNode = /*#__PURE__*/_jsx("div", {
       className: cls,
       style: style,
       children: /*#__PURE__*/_jsxs(Space, {
         align: "start",
-        children: [mode === 'current' ? props.value : /*#__PURE__*/_jsx(RenderProForm, _objectSpread({
+        children: [mode === 'current' ? props.value : /*#__PURE__*/_jsx(RenderProForm, {
           value: confirmValue,
           isView: true,
-          form: viewForm
-        }, popupProps)), !disabled && /*#__PURE__*/_jsx(EditOutlined, {
+          form: viewForm,
+          ...popupProps
+        }), !disabled && /*#__PURE__*/_jsx(EditOutlined, {
           onClick: editHandle
         })]
       })
@@ -297,7 +226,7 @@ var ProEditLabel = _ref => {
     // 当前页编辑模式
     if (mode === 'current') {
       if (status) {
-        return /*#__PURE__*/_jsx(Input, _objectSpread(_objectSpread({
+        return /*#__PURE__*/_jsx(Input, {
           ref: inputRef,
           size: size,
           onBlur: e => {
@@ -305,44 +234,45 @@ var ProEditLabel = _ref => {
             onFinish && onFinish(e.target.value);
             onConfirm && onConfirm(e.target.value);
           },
-          onKeyDown: onPress
-        }, props), {}, {
+          onKeyDown: onPress,
+          ...props,
           onChange: e => {
             props.onChange && props.onChange(e.target.value);
           }
-        }));
+        });
       }
       return TextNode;
     }
     // 弹窗编辑模式
     if (mode === 'popup') {
       // 查看时内容渲染
-      var labelRender = () => {
+      const labelRender = () => {
         if ( /*#__PURE__*/React.isValidElement(children)) {
           return children;
         }
         return TextNode;
       };
-      return /*#__PURE__*/_jsx(Popconfirm, _objectSpread(_objectSpread({
+      return /*#__PURE__*/_jsx(Popconfirm, {
         classNames: {
           root: 'pro-edit-label-popconfirm'
         },
         icon: null,
         destroyOnHidden: true,
-        title: /*#__PURE__*/_jsx(RenderProForm, _objectSpread({
+        title: /*#__PURE__*/_jsx(RenderProForm, {
           form: form,
           value: confirmValue,
           onChange: props.onChange,
-          isNode: /*#__PURE__*/React.isValidElement(children)
-        }, popupProps)),
+          isNode: /*#__PURE__*/React.isValidElement(children),
+          ...popupProps
+        }),
         onConfirm: onConfirmHandle,
         onCancel: onCancelHandle,
         onOpenChange: open => {
-          _onOpenChange && _onOpenChange(open);
-        }
-      }, omit(popupProps, ['type', 'label', 'title', 'tip', 'trim', 'labelWidth', 'fieldProps', 'columns'])), {}, {
+          onOpenChange && onOpenChange(open);
+        },
+        ..._omit(popupProps, ['type', 'label', 'title', 'tip', 'trim', 'labelWidth', 'fieldProps', 'columns']),
         children: labelRender()
-      }));
+      });
     }
   };
   return /*#__PURE__*/_jsx(_Fragment, {

package/es/ProEditLabel/utils/index.js

@@ -4,7 +4,7 @@
  * @param columns 表单配置项
  * @returns value
  */
-export var matchFormValue = (value, columns) => {
+export const matchFormValue = (value, columns) => {
   if (!Array.isArray(columns)) {
     return value;
   }

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

@@ -1,37 +1,35 @@
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
-function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+import _omit from "lodash/omit";
+import _isFunction from "lodash/isFunction";
 import React from 'react';
 import { Button, Popconfirm } from 'antd';
-import { isFunction, omit } from 'lodash';
 import { iconMap } from "../../utils/config";
 import locale from "../../../locale";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-var OMIT_DOM_INVALID_KEYS = ['buttonProps', 'isEditable', 'onEvent', 'isSelectModal'];
+const OMIT_DOM_INVALID_KEYS = ['buttonProps', 'isEditable', 'onEvent', 'isSelectModal'];
 
 // 渲染操作按钮
-var ActionButton = _ref => {
-  var _editingKeys$includes, _btnConfig$buttonProp, _btnConfig$buttonProp2, _btnConfig$buttonProp3, _btnConfig$icon;
-  var record = _ref.record,
-    index = _ref.index,
-    config = _ref.config,
-    btnConfig = _ref.btnConfig;
-  var form = config.form,
-    virtualKey = config.virtualKey,
-    editingKeys = config.editingKeys,
-    selectedRowKeys = config.selectedRowKeys,
-    deletePoConfirmMsg = config.deletePoConfirmMsg,
-    mulDeletePoConfirmMsg = config.mulDeletePoConfirmMsg,
-    max = config.max,
-    name = config.name,
-    tableLength = config.tableLength,
-    selectedRows = config.selectedRows;
-  var rowNamePath = [...name, index];
+const ActionButton = ({
+  record,
+  index,
+  config,
+  btnConfig
+}) => {
+  const {
+    form,
+    virtualKey,
+    editingKeys,
+    selectedRowKeys,
+    deletePoConfirmMsg,
+    mulDeletePoConfirmMsg,
+    max,
+    name,
+    tableLength,
+    selectedRows
+  } = config;
+  const rowNamePath = [...name, index];
 
   // 操作按钮权限控制
-  var getShow = show => {
+  const getShow = show => {
     if (typeof show === 'function') {
       return show(record, {
         index,
@@ -46,7 +44,7 @@ var ActionButton = _ref => {
   };
 
   // 操作按钮权限控制
-  var getDisabled = disabled => {
+  const getDisabled = disabled => {
     if (typeof disabled === 'function') {
       return disabled(record, {
         index,
@@ -64,23 +62,25 @@ var ActionButton = _ref => {
     }
     return disabled;
   };
-  var deleteMsgMap = {
+  const deleteMsgMap = {
     delete: deletePoConfirmMsg,
     mulDelete: mulDeletePoConfirmMsg
   };
 
   // 判断当前行是否正在编辑
-  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));
+  const _isEditing = !virtualKey || btnConfig.isEditable === editingKeys?.includes?.(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')
-  });
+  const delBtnProps = {
+    ...btnConfig.buttonProps,
+    disabled: getDisabled(btnConfig.buttonProps?.disabled ?? (!selectedRowKeys.length && btnConfig.type === 'mulDelete'))
+  };
 
   // 其他操作按钮Props
-  var actionBtnProps = _objectSpread(_objectSpread({}, btnConfig.buttonProps), {}, {
+  const actionBtnProps = {
+    ...btnConfig.buttonProps,
     onClick: () => {
-      btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
+      btnConfig?.onEvent(record, {
         index,
         form,
         name,
@@ -89,14 +89,14 @@ var ActionButton = _ref => {
         selectedRows
       });
     },
-    disabled: getDisabled((_btnConfig$buttonProp3 = btnConfig.buttonProps) === null || _btnConfig$buttonProp3 === void 0 ? void 0 : _btnConfig$buttonProp3.disabled)
-  });
+    disabled: getDisabled(btnConfig.buttonProps?.disabled)
+  };
 
   // 当传入函数时，先转成reactNode
-  if (isFunction(btnConfig.label)) {
-    var addIndex = tableLength ? tableLength - 1 : 0;
-    var namePath = [...name, addIndex];
-    var addRecord = form.getFieldValue(namePath) || {};
+  if (_isFunction(btnConfig.label)) {
+    const addIndex = tableLength ? tableLength - 1 : 0;
+    const namePath = [...name, addIndex];
+    const addRecord = form.getFieldValue(namePath) || {};
     btnConfig.label = btnConfig.label(addRecord, {
       form,
       namePath,
@@ -106,14 +106,14 @@ var ActionButton = _ref => {
       index: addIndex
     });
   }
-  var isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || (delBtnProps === null || delBtnProps === void 0 ? void 0 : delBtnProps.disabled);
+  const isDisabled = !selectedRowKeys.length && btnConfig.type === 'mulDelete' || editingKeys.length || delBtnProps?.disabled;
   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, {
+      children: btnConfig?.needConfirm ? /*#__PURE__*/_jsx(Popconfirm, {
         placement: "topRight",
         title: deleteMsgMap[btnConfig.type],
         onConfirm: () => {
-          btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
+          btnConfig?.onEvent(record, {
             index,
             form,
             name,
@@ -125,22 +125,25 @@ var 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, OMIT_DOM_INVALID_KEYS)), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, {
+          ..._omit(delBtnProps, OMIT_DOM_INVALID_KEYS),
           record,
           index,
           disabled: isDisabled
-        }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, OMIT_DOM_INVALID_KEYS)), {}, {
+        })) : /*#__PURE__*/_jsx(Button, {
+          ..._omit(delBtnProps, OMIT_DOM_INVALID_KEYS),
           disabled: isDisabled,
           type: "link",
           children: btnConfig.label
-        }))
+        })
       }) : /*#__PURE__*/_jsx(_Fragment, {
-        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(delBtnProps, OMIT_DOM_INVALID_KEYS)), {}, {
+        children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, {
+          ..._omit(delBtnProps, OMIT_DOM_INVALID_KEYS),
           record,
           index,
           disabled: isDisabled,
           onClick: () => {
-            btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
+            btnConfig?.onEvent(record, {
               index,
               form,
               name,
@@ -149,11 +152,12 @@ var ActionButton = _ref => {
               selectedRows
             });
           }
-        }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({}, omit(delBtnProps, OMIT_DOM_INVALID_KEYS)), {}, {
+        })) : /*#__PURE__*/_jsx(Button, {
+          ..._omit(delBtnProps, OMIT_DOM_INVALID_KEYS),
           disabled: isDisabled,
           type: "link",
           onClick: () => {
-            btnConfig === null || btnConfig === void 0 || btnConfig.onEvent(record, {
+            btnConfig?.onEvent(record, {
               index,
               form,
               name,
@@ -163,19 +167,20 @@ var ActionButton = _ref => {
             });
           },
           children: btnConfig.label
-        }))
+        })
       })
     }) : /*#__PURE__*/_jsx(_Fragment, {
-      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, _objectSpread(_objectSpread({}, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent', ...OMIT_DOM_INVALID_KEYS])), {}, {
+      children: /*#__PURE__*/React.isValidElement(btnConfig.label) ? ( /*#__PURE__*/React.cloneElement(btnConfig.label, {
+        ..._omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent', ...OMIT_DOM_INVALID_KEYS]),
         record,
         index
-      }))) : /*#__PURE__*/_jsx(Button, _objectSpread(_objectSpread({
-        className: "action-button"
-      }, omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent', ...OMIT_DOM_INVALID_KEYS])), {}, {
+      })) : /*#__PURE__*/_jsx(Button, {
+        className: "action-button",
+        ..._omit(actionBtnProps, ['buttonProps', 'isEditable', 'onEvent', ...OMIT_DOM_INVALID_KEYS]),
         type: "link",
-        icon: (_btnConfig$icon = btnConfig === null || btnConfig === void 0 ? void 0 : btnConfig.icon) !== null && _btnConfig$icon !== void 0 ? _btnConfig$icon : iconMap[btnConfig.type],
+        icon: btnConfig?.icon ?? iconMap[btnConfig.type],
         children: btnConfig.label
-      }))
+      })
     })
   }) : null;
 };