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

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

@@ -1,154 +1,87 @@
-var _excluded = ["mask"];
-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 _isArray from "lodash/isArray";
 import React, { useCallback, useState, useRef } from 'react';
 import { Space, Button, Modal } from 'antd';
 import { useScroll, useSize } from 'ahooks';
 import classnames from 'classnames';
-import { isArray } from 'lodash';
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * 弹窗组件
  */
-var ProModal = _ref => {
-  var _ref$current;
-  var form = _ref.form,
-    title = _ref.title,
-    width = _ref.width,
-    open = _ref.open,
-    footer = _ref.footer,
-    isView = _ref.isView,
-    maskClosable = _ref.maskClosable,
-    okText = _ref.okText,
-    cancelText = _ref.cancelText,
-    okLoading = _ref.okLoading,
-    okDisabled = _ref.okDisabled,
-    onOk = _ref.onOk,
-    onCancel = _ref.onCancel,
-    children = _ref.children,
-    className = _ref.className,
-    extraLeft = _ref.extraLeft,
-    zIndex = _ref.zIndex,
-    modalProps = _ref.modalProps;
-  var ref = useRef(null);
-  var _ref2 = useScroll((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.parentNode) || {},
-    top = _ref2.top;
-  var _ref3 = useSize(ref) || {},
-    height = _ref3.height;
-  var noRenderFooter = isView || footer === false || footer === null;
-  var _ref4 = modalProps || {},
-    modalMask = _ref4.mask,
-    restModalProps = _objectWithoutProperties(_ref4, _excluded);
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    loading = _useState2[0],
-    toggleLoading = _useState2[1];
-  var _className = classnames(['pro-modal', className, {
+const ProModal = ({
+  form,
+  title,
+  width,
+  open,
+  footer,
+  isView,
+  maskClosable,
+  okText,
+  cancelText,
+  okLoading,
+  okDisabled,
+  onOk,
+  onCancel,
+  children,
+  className,
+  extraLeft,
+  zIndex,
+  modalProps
+}) => {
+  const ref = useRef(null);
+  const {
+    top
+  } = useScroll(ref.current?.parentNode) || {};
+  const {
+    height
+  } = useSize(ref) || {};
+  const noRenderFooter = isView || footer === false || footer === null;
+  const {
+    mask: modalMask,
+    ...restModalProps
+  } = modalProps || {};
+  const [loading, toggleLoading] = useState(false);
+  const _className = classnames(['pro-modal', className, {
     'pro-modal-scrolling': top > 0,
     'pro-modal-no-footer': noRenderFooter,
     'pro-modal-footer-shadow': height >= 450
   }]);
-  var handleFinish = useCallback( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var values;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          _context.prev = 0;
-          if (!open) {
-            _context.next = 24;
-            break;
-          }
-          _context.next = 4;
-          return form.validateFields();
-        case 4:
-          values = _context.sent;
-          if (!(okLoading !== undefined)) {
-            _context.next = 15;
-            break;
-          }
-          _context.t0 = onOk;
-          if (!_context.t0) {
-            _context.next = 12;
-            break;
-          }
-          _context.next = 10;
-          return onOk(values, form);
-        case 10:
-          _context.t1 = _context.sent;
-          _context.t0 = _context.t1 === true;
-        case 12:
-          if (!_context.t0) {
-            _context.next = 14;
-            break;
-          }
-          onCancel && onCancel();
-        case 14:
-          return _context.abrupt("return", true);
-        case 15:
-          toggleLoading(true);
-          _context.t2 = onOk;
-          if (!_context.t2) {
-            _context.next = 22;
-            break;
-          }
-          _context.next = 20;
-          return onOk(values, form);
-        case 20:
-          _context.t3 = _context.sent;
-          _context.t2 = _context.t3 === true;
-        case 22:
-          if (!_context.t2) {
-            _context.next = 24;
-            break;
+  const handleFinish = useCallback(async () => {
+    try {
+      if (open) {
+        const values = await form.validateFields();
+        // 当传入okLoading时不走下面的默认loading逻辑
+        if (okLoading !== undefined) {
+          if (onOk && (await onOk(values, form)) === true) {
+            onCancel && onCancel();
           }
+          return true;
+        }
+        toggleLoading(true);
+        if (onOk && (await onOk(values, form)) === true) {
           onCancel && onCancel();
-        case 24:
-          _context.next = 29;
-          break;
-        case 26:
-          _context.prev = 26;
-          _context.t4 = _context["catch"](0);
-          /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
-          setTimeout(() => {
-            var _ref$current2, _error$errorFields;
-            var errorElement = (_ref$current2 = ref.current) === null || _ref$current2 === void 0 ? void 0 : _ref$current2.querySelector('[class*="form-item-has-error"]');
-            if (errorElement && _context.t4 !== null && _context.t4 !== void 0 && (_error$errorFields = _context.t4.errorFields) !== null && _error$errorFields !== void 0 && _error$errorFields.length) {
-              errorElement.scrollIntoView({
-                behavior: 'smooth',
-                block: 'center'
-              });
-            }
-          }, 100);
-        case 29:
-          _context.prev = 29;
-          toggleLoading(false);
-          return _context.finish(29);
-        case 32:
-        case "end":
-          return _context.stop();
+        }
       }
-    }, _callee, null, [[0, 26, 29, 32]]);
-  })), [onOk, onCancel, form]);
+    } catch (error) {
+      /** 使用setTimeout确保DOM已经更新，错误标记已经渲染 */
+      setTimeout(() => {
+        const errorElement = ref.current?.querySelector('[class*="form-item-has-error"]');
+        if (errorElement && error?.errorFields?.length) {
+          errorElement.scrollIntoView({
+            behavior: 'smooth',
+            block: 'center'
+          });
+        }
+      }, 100);
+    } finally {
+      toggleLoading(false);
+    }
+  }, [onOk, onCancel, form]);
 
   /**
    * 描述：默认底部操作按钮
    *
    */
-  var defaultFooter = /*#__PURE__*/_jsxs("div", {
+  const defaultFooter = /*#__PURE__*/_jsxs("div", {
     className: classnames({
       'pro-modal-footer': extraLeft,
       'pro-modal-footer-123': true
@@ -160,13 +93,13 @@ var ProModal = _ref => {
       }), /*#__PURE__*/_jsx(Button, {
         type: "primary",
         onClick: handleFinish,
-        loading: okLoading !== null && okLoading !== void 0 ? okLoading : loading,
-        disabled: okDisabled !== null && okDisabled !== void 0 ? okDisabled : loading,
+        loading: okLoading ?? loading,
+        disabled: okDisabled ?? loading,
         children: okText
       })]
     })]
   });
-  var renderFooter = () => {
+  const renderFooter = () => {
     if (noRenderFooter) {
       return null;
     }
@@ -176,7 +109,7 @@ var ProModal = _ref => {
         children: footer
       });
     }
-    if (isArray(footer) && footer !== null && footer !== void 0 && footer.length) {
+    if (_isArray(footer) && footer?.length) {
       return /*#__PURE__*/_jsx("div", {
         className: "pro-drawer-footer",
         children: footer.map(item => {
@@ -189,12 +122,12 @@ var ProModal = _ref => {
     }
     return defaultFooter;
   };
-  return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
+  return /*#__PURE__*/_jsx(Modal, {
     className: _className,
     title: title,
     width: width,
     open: open,
-    mask: modalMask !== null && modalMask !== void 0 ? modalMask : {
+    mask: modalMask ?? {
       blur: false
     },
     maskClosable: maskClosable,
@@ -202,12 +135,12 @@ var ProModal = _ref => {
     footer: renderFooter(),
     okText: okText,
     cancelText: cancelText,
-    zIndex: zIndex
-  }, restModalProps), {}, {
+    zIndex: zIndex,
+    ...restModalProps,
     children: /*#__PURE__*/_jsx("div", {
       ref: ref,
       children: children
     })
-  }));
+  });
 };
 export default ProModal;

package/es/ProDrawerForm/index.js

@@ -1,52 +1,34 @@
-var _excluded = ["open", "mode", "size", "disabled", "isView", "form", "proFormProps", "onCancel", "onCloseClean", "children", "okText", "isConfirmClose", "maskClosable", "cancelText"];
-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 _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 React, { createContext, forwardRef, useContext, useImperativeHandle, useMemo } from 'react';
 import { ProDrawer, ProModal } from "./components";
 import ProForm from "../ProForm";
 import { transformBySize } from "./utils";
 import locale from "../locale";
 import { jsx as _jsx } from "react/jsx-runtime";
-var ProDrawerFormContext = /*#__PURE__*/createContext(null);
-export var useProDrawerFormContext = () => useContext(ProDrawerFormContext);
-var ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
-  var _locale$ProDrawerForm, _locale$ProDrawerForm2, _locale$ProDrawerForm3;
-  var open = props.open,
-    _props$mode = props.mode,
-    mode = _props$mode === void 0 ? 'Drawer' : _props$mode,
-    _props$size = props.size,
-    size = _props$size === void 0 ? 'middle' : _props$size,
-    disabled = props.disabled,
-    isView = props.isView,
-    originalForm = props.form,
-    _props$proFormProps = props.proFormProps,
-    proFormProps = _props$proFormProps === void 0 ? {} : _props$proFormProps,
-    onCancel = props.onCancel,
-    _props$onCloseClean = props.onCloseClean,
-    onCloseClean = _props$onCloseClean === void 0 ? true : _props$onCloseClean,
-    children = props.children,
-    okText = props.okText,
-    _props$isConfirmClose = props.isConfirmClose,
-    isConfirmClose = _props$isConfirmClose === void 0 ? true : _props$isConfirmClose,
-    _props$maskClosable = props.maskClosable,
-    maskClosable = _props$maskClosable === void 0 ? false : _props$maskClosable,
-    _props$cancelText = props.cancelText,
-    cancelText = _props$cancelText === void 0 ? locale === null || locale === void 0 || (_locale$ProDrawerForm = locale.ProDrawerForm) === null || _locale$ProDrawerForm === void 0 ? void 0 : _locale$ProDrawerForm.cancel : _props$cancelText,
-    restProps = _objectWithoutProperties(props, _excluded);
-  var nextIsView = isView || disabled;
-  var nextOkText = okText !== null && okText !== void 0 ? okText : mode === 'Drawer' ? locale === null || locale === void 0 || (_locale$ProDrawerForm2 = locale.ProDrawerForm) === null || _locale$ProDrawerForm2 === void 0 ? void 0 : _locale$ProDrawerForm2.save : locale === null || locale === void 0 || (_locale$ProDrawerForm3 = locale.ProDrawerForm) === null || _locale$ProDrawerForm3 === void 0 ? void 0 : _locale$ProDrawerForm3.confirm;
-  var width = restProps.width;
+const ProDrawerFormContext = /*#__PURE__*/createContext(null);
+export const useProDrawerFormContext = () => useContext(ProDrawerFormContext);
+const ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
+  const {
+    open,
+    mode = 'Drawer',
+    size = 'middle',
+    disabled,
+    isView,
+    form: originalForm,
+    proFormProps = {},
+    onCancel,
+    onCloseClean = true,
+    children,
+    okText,
+    isConfirmClose = true,
+    maskClosable = false,
+    cancelText = locale?.ProDrawerForm?.cancel,
+    ...restProps
+  } = props;
+  const nextIsView = isView || disabled;
+  const nextOkText = okText ?? (mode === 'Drawer' ? locale?.ProDrawerForm?.save : locale?.ProDrawerForm?.confirm);
+  let {
+    width
+  } = restProps;
   if (!width && size) {
     width = transformBySize(size);
   }
@@ -55,17 +37,15 @@ var ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
   if (!Number.isNaN(+width)) {
     width = `${width}px`;
   }
-  var _ProForm$useForm = ProForm.useForm(originalForm),
-    _ProForm$useForm2 = _slicedToArray(_ProForm$useForm, 1),
-    form = _ProForm$useForm2[0];
-  var handleCancel = () => {
+  const [form] = ProForm.useForm(originalForm);
+  const handleCancel = () => {
     onCloseClean && form.resetFields();
-    onCancel === null || onCancel === void 0 || onCancel();
+    onCancel?.();
   };
 
   // 暴露form实例给用户
   useImperativeHandle(ref, () => form);
-  var DrawerModal = useMemo(() => {
+  const DrawerModal = useMemo(() => {
     return {
       Drawer: ProDrawer,
       Modal: ProModal
@@ -75,7 +55,8 @@ var ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
     value: {
       source: 'ProDrawerForm'
     },
-    children: open ? /*#__PURE__*/_jsx(DrawerModal, _objectSpread(_objectSpread({}, restProps), {}, {
+    children: open ? /*#__PURE__*/_jsx(DrawerModal, {
+      ...restProps,
       isView: nextIsView,
       open: open,
       form: form,
@@ -85,12 +66,13 @@ var ProDrawerForm = /*#__PURE__*/forwardRef((props, ref) => {
       isConfirmClose: isConfirmClose,
       maskClosable: maskClosable,
       cancelText: cancelText,
-      children: children || /*#__PURE__*/_jsx(ProForm, _objectSpread({
+      children: children || /*#__PURE__*/_jsx(ProForm, {
         form: form,
         disabled: nextIsView,
-        footer: false
-      }, proFormProps))
-    })) : null
+        footer: false,
+        ...proFormProps
+      })
+    }) : null
   });
 });
 export default ProDrawerForm;

package/es/ProDrawerForm/style/index.less

@@ -79,7 +79,8 @@
     left: 0;
     z-index: 101;
     width: 100%;
-    padding: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1)) var(--zaui-space-size-lg, 32px);
+    padding: calc(var(--zaui-space-size-md; 16px) * var(--zaui-size; 1))
+      var(--zaui-space-size-lg, 32px);
     background-color: var(--zaui-global-bg, #fff);
     box-shadow: 8px 2px 8px 0 var(--zaui-shadow, rgba(56, 56, 56, 0.15));
 

package/es/ProDrawerForm/utils/index.js

@@ -2,7 +2,7 @@
  * 将枚举值转成数值px，暴露枚举，隐藏真实数值，暂时不让用户自定义
  * @param size 设计规范的三个尺寸  460 960 1200 对应 'small' | 'middle' | 'large'
  */
-export var transformBySize = size => {
+export const transformBySize = size => {
   switch (size) {
     case 'small':
       return 460;

package/es/ProEditLabel/components/RenderProForm.js

@@ -1,81 +1,75 @@
-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 { 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 { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-var RenderProForm = props => {
-  var _props3, _props6, _props7;
-  var columns = [];
-  var primitiveProps = _objectSpread({}, props);
-  var _props = {};
+const RenderProForm = props => {
+  const columns = [];
+  const primitiveProps = {
+    ...props
+  };
+  let _props = {};
   useEffect(() => {
     // isNode以ReactNode节点方式打开popUp，默认每次打开弹窗清空弹窗内容
-    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));
+    if (primitiveProps?.value && !primitiveProps?.isNode) {
+      _props.form.setFieldsValue(matchFormValue(primitiveProps?.value, _props?.columns));
     }
 
     // 销毁重置表单数据
     return () => {
-      var _props$form;
-      (_props$form = _props.form) === null || _props$form === void 0 || _props$form.resetFields();
+      _props.form?.resetFields();
     };
   }, []);
 
   // 兼容老写法
   if (!props.columns) {
-    columns[0] = _objectSpread(_objectSpread({}, omit(props, ['title', 'tip', 'form', 'onChange', 'isView', 'isNode'])), {}, {
+    columns[0] = {
+      ..._omit(props, ['title', 'tip', 'form', 'onChange', 'isView', 'isNode']),
       name: props.type || 'Input'
-    });
+    };
     _props = {
       columns,
       form: props.form,
       isView: props.isView
     };
   } else {
-    _props = _objectSpread({}, omit(props, ['onChange', 'isNode']));
+    _props = {
+      ..._omit(props, ['onChange', 'isNode'])
+    };
   }
-  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(item => {
+  if (_props?.isView) {
+    _props?.columns?.forEach(item => {
       item.noStyle = true;
     });
   } else {
-    var _props5;
-    (_props5 = _props) === null || _props5 === void 0 || (_props5 = _props5.columns) === null || _props5 === void 0 || _props5.forEach(item => {
+    _props?.columns?.forEach(item => {
       item.noStyle = false;
     });
   }
   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", {
+    children: [primitiveProps?.title && !_props?.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 && _props7.isView) && /*#__PURE__*/_jsx("div", {
+      children: primitiveProps?.title
+    }), primitiveProps?.tip && !_props?.isView && /*#__PURE__*/_jsx("div", {
       className: "pro-edit-label-tip",
       children: /*#__PURE__*/_jsxs(Space, {
         align: "start",
-        children: [/*#__PURE__*/_jsx(InfoCircleOutlined, {}), primitiveProps === null || primitiveProps === void 0 ? void 0 : primitiveProps.tip]
+        children: [/*#__PURE__*/_jsx(InfoCircleOutlined, {}), primitiveProps?.tip]
       })
-    }), /*#__PURE__*/_jsx(ProForm, _objectSpread({
+    }), /*#__PURE__*/_jsx(ProForm, {
       span: 24,
       footer: false,
       onValuesChange: (changeValue, values) => {
-        var _props8;
-        if (((_props8 = _props) === null || _props8 === void 0 ? void 0 : _props8.columns.length) === 1) {
-          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]);
+        if (_props?.columns.length === 1) {
+          primitiveProps.onChange && primitiveProps.onChange(values[_props?.columns[0]?.name]);
           return;
         }
         primitiveProps.onChange && primitiveProps.onChange(values);
-      }
-    }, _props))]
+      },
+      ..._props
+    })]
   });
 };
 export default RenderProForm;