@nokecy/qc-ui 1.1.63 → 1.1.64

package/dist/esm/deleteConfirm/index.js

@@ -1,13 +1,21 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+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 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 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; }
 import React from "react";
 import { Modal } from "antd";
 import { ExclamationCircleFilled } from "@ant-design/icons";
-var confirm = Modal.confirm;
 /**
  * DeleteConfirm 删除确认组件
  *
@@ -34,44 +42,54 @@ var DeleteConfirm = function DeleteConfirm(props) {
     _props$danger = props.danger,
     danger = _props$danger === void 0 ? true : _props$danger,
     children = props.children;
-  var showPromiseConfirm = function showPromiseConfirm(event) {
-    // 智能转换 title：支持字符串、ReactNode 或使用默认值
-    var titleText = title || '确认操作';
 
-    // 正文要说清动的是哪条、几条，这只有调用方知道，所以 content 交给调用方。
-    // 不传时的兜底只承诺「不可撤销」：原来的默认正文是把 title 拼进去，
-    // 拼出来是一句病句，而且始终没告诉用户动的是哪条数据。@author nokecy
-    var contentText = content || '该操作不可撤销，请确认后继续。';
-    confirm(_objectSpread(_objectSpread({
-      title: titleText,
-      icon: /*#__PURE__*/React.createElement(ExclamationCircleFilled, null),
-      content: contentText,
-      okButtonProps: {
-        danger: danger
-      }
-    }, okText ? {
-      okText: okText
-    } : {}), {}, {
-      onOk: function onOk() {
-        return new Promise(function (resolve, reject) {
-          // 回调既可能返回 Promise（异步删除），也可能是同步的普通值，两种都要接住。
-          var result = onConfirm(event);
-          if (result && typeof result.then === 'function') {
-            result.then(resolve).catch(function (error) {
-              console.error('Oops errors!', error);
-              reject();
-            });
-          } else {
-            resolve(result);
-          }
-        }).catch(function () {
-          return undefined;
-        });
-      }
+  // 保留宿主主题，并让 antd 接管异步提交的加载与失败恢复。@author nokecy
+  var _Modal$useModal = Modal.useModal(),
+    _Modal$useModal2 = _slicedToArray(_Modal$useModal, 2),
+    modal = _Modal$useModal2[0],
+    contextHolder = _Modal$useModal2[1];
+  var showPromiseConfirm = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(event) {
+      var titleText, contentText;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            // 智能转换 title：支持字符串、ReactNode 或使用默认值
+            titleText = title || '确认操作'; // 正文要说清动的是哪条、几条，这只有调用方知道，所以 content 交给调用方。
+            // 不传时的兜底只承诺「不可撤销」：原来的默认正文是把 title 拼进去，
+            // 拼出来是一句病句，而且始终没告诉用户动的是哪条数据。@author nokecy
+            contentText = content || '该操作不可撤销，请确认后继续。';
+            _context.next = 4;
+            return modal.confirm(_objectSpread(_objectSpread({
+              title: titleText,
+              icon: /*#__PURE__*/React.createElement(ExclamationCircleFilled, null),
+              content: contentText,
+              okButtonProps: {
+                danger: danger
+              }
+            }, okText ? {
+              okText: okText
+            } : {}), {}, {
+              onOk: function onOk() {
+                // 同步异常与异步失败均交回确认框，失败不关闭，可继续重试。
+                // @author nokecy
+                return Promise.resolve().then(function () {
+                  return onConfirm(event);
+                });
+              }
+            }));
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
     }));
-  };
-  return /*#__PURE__*/React.createElement("span", {
+    return function showPromiseConfirm(_x) {
+      return _ref.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/React.createElement(React.Fragment, null, contextHolder, /*#__PURE__*/React.createElement("span", {
     onClick: showPromiseConfirm
-  }, children);
+  }, children));
 };
 export default DeleteConfirm;

package/dist/esm/generatedListPage/OptionsColumn.js

@@ -50,13 +50,15 @@ var OptionsColumn = function OptionsColumn(props) {
             _context.next = 6;
             return defaultHandleDelete(deleteApi, id, refresh);
           case 6:
-            _context.next = 11;
+            _context.next = 12;
             break;
           case 8:
             _context.prev = 8;
             _context.t0 = _context["catch"](3);
             console.error('删除失败:', _context.t0);
-          case 11:
+            // 让确认框结束加载并保留失败状态，避免失败被当作成功关闭。@author nokecy
+            throw _context.t0;
+          case 12:
           case "end":
             return _context.stop();
         }

package/dist/esm/standardFormDialog/StandardFormDialog.js

@@ -18,18 +18,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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; }
-import React, { useState, useCallback, useMemo, useRef, useEffect } from 'react';
+import React, { useCallback, useMemo, useRef, useEffect } from 'react';
 import { FormDialog, FormLayout, FormItem, FormGrid, Input, Select, DatePicker, NumberPicker, Switch } from '@formily/antd-v5';
-import { onFormInit, onFormValidateFailed } from '@formily/core';
-import { Button, message, Spin } from 'antd';
+import { onFormInit, onFormValidateFailed, onFormSubmitEnd } from '@formily/core';
+import { Button, ConfigProvider, message, Spin } from 'antd';
 import portalManager from "./PortalManager";
-import { createSchemaField } from '@formily/react';
+import { createSchemaField, Observer } from '@formily/react';
 
 // 创建默认的 SchemaField,包含基本组件和装饰器
 var SchemaFieldComponents = createSchemaField({
@@ -73,6 +67,7 @@ var defaultUseSchemaField = function defaultUseSchemaField(config) {
  * - 灵活的Schema支持
  * - 性能优化和加载状态管理
  *
+ * @author nokecy
  * @param props 组件属性
  */
 var StandardFormDialog = function StandardFormDialog(props) {
@@ -102,15 +97,11 @@ var StandardFormDialog = function StandardFormDialog(props) {
     _props$useSchemaField = props.useSchemaField,
     useSchemaFieldHook = _props$useSchemaField === void 0 ? defaultUseSchemaField : _props$useSchemaField;
 
-  // 组件状态
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    loading = _useState2[0],
-    setLoading = _useState2[1];
-  var _useState3 = useState(false),
-    _useState4 = _slicedToArray(_useState3, 2),
-    submitting = _useState4[0],
-    setSubmitting = _useState4[1];
+  // 直接观察弹窗表单，避免打开时的 React 状态快照覆盖实时状态。
+  // @author nokecy
+  var formRef = useRef();
+  var confirmingRef = useRef(false);
+  var loadingRef = useRef(false);
 
   // 组件挂载状态追踪 - 防止内存泄漏
   var isMountedRef = useRef(true);
@@ -162,78 +153,81 @@ var StandardFormDialog = function StandardFormDialog(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!entityId) {
-              _context.next = 30;
+            formRef.current = form;
+            if (!(entityId !== undefined && entityId !== null)) {
+              _context.next = 32;
               break;
             }
             // 创建新的 AbortController
             controller = new AbortController();
             abortControllerRef.current = controller;
             if (isMountedRef.current) {
-              _context.next = 5;
+              _context.next = 6;
               break;
             }
             return _context.abrupt("return");
-          case 5:
-            setLoading(true);
-            _context.prev = 6;
+          case 6:
+            loadingRef.current = true;
+            form.setLoading(true);
+            _context.prev = 8;
             if (!customInitializer) {
-              _context.next = 12;
+              _context.next = 14;
               break;
             }
-            _context.next = 10;
+            _context.next = 12;
             return customInitializer(form, entityId);
-          case 10:
-            _context.next = 20;
-            break;
           case 12:
+            _context.next = 22;
+            break;
+          case 14:
             if (!apiConfig.get) {
-              _context.next = 19;
+              _context.next = 21;
               break;
             }
-            _context.next = 15;
+            _context.next = 17;
             return apiConfig.get({
               id: entityId
             });
-          case 15:
+          case 17:
             data = _context.sent;
             // 检查组件是否已卸载或请求是否已取消
             if (!controller.signal.aborted && isMountedRef.current) {
               form.setInitialValues(data);
             }
-            _context.next = 20;
+            _context.next = 22;
             break;
-          case 19:
+          case 21:
             console.warn('编辑模式但未提供get API或自定义初始化函数');
-          case 20:
-            _context.next = 27;
-            break;
           case 22:
-            _context.prev = 22;
-            _context.t0 = _context["catch"](6);
+            _context.next = 29;
+            break;
+          case 24:
+            _context.prev = 24;
+            _context.t0 = _context["catch"](8);
             if (!controller.signal.aborted) {
-              _context.next = 26;
+              _context.next = 28;
               break;
             }
             return _context.abrupt("return");
-          case 26:
+          case 28:
             if (isMountedRef.current) {
               console.error('加载数据失败:', _context.t0);
               errorMessage = ((_error$response = _context.t0.response) === null || _error$response === void 0 || (_error$response = _error$response.data) === null || _error$response === void 0 || (_error$response = _error$response.error) === null || _error$response === void 0 ? void 0 : _error$response.message) || _context.t0.message || '加载数据失败';
               message.error(errorMessage);
             }
-          case 27:
-            _context.prev = 27;
+          case 29:
+            _context.prev = 29;
             // 只在组件仍挂载且请求未取消时更新状态
             if (!controller.signal.aborted && isMountedRef.current) {
-              setLoading(false);
+              loadingRef.current = false;
+              form.setLoading(false);
             }
-            return _context.finish(27);
-          case 30:
+            return _context.finish(29);
+          case 32:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[6, 22, 27, 30]]);
+      }, _callee, null, [[8, 24, 29, 32]]);
     }));
     return function (_x) {
       return _ref.apply(this, arguments);
@@ -280,7 +274,13 @@ var StandardFormDialog = function StandardFormDialog(props) {
     return {
       effects: function effects() {
         onFormInit(initializeForm);
-        onFormValidateFailed(handleValidationFailed);
+        onFormValidateFailed(function (form) {
+          confirmingRef.current = false;
+          handleValidationFailed(form);
+        });
+        onFormSubmitEnd(function () {
+          confirmingRef.current = false;
+        });
       }
     };
   }, [initializeForm, handleValidationFailed]);
@@ -288,7 +288,7 @@ var StandardFormDialog = function StandardFormDialog(props) {
   // 提交处理函数
   var handleSubmit = useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(payload, next) {
-      var values, isEdit, _error$response2, errorMessage;
+      var values, isEdit, _values$id, _error$response2, errorMessage;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -298,79 +298,82 @@ var StandardFormDialog = function StandardFormDialog(props) {
             }
             return _context2.abrupt("return");
           case 2:
-            setSubmitting(true);
-            _context2.prev = 3;
+            _context2.prev = 2;
             values = payload.values;
-            isEdit = !!values.id || !!entityId; // FormDialog已经在内部处理了验证,无需手动调用validate
+            isEdit = values.id != null || entityId != null; // FormDialog已经在内部处理了验证,无需手动调用validate
             // Formily的FormDialog.forConfirm会自动验证表单
             if (!customSubmitHandler) {
-              _context2.next = 11;
+              _context2.next = 10;
               break;
             }
-            _context2.next = 9;
+            _context2.next = 8;
             return customSubmitHandler(values, isEdit);
-          case 9:
-            _context2.next = 24;
+          case 8:
+            _context2.next = 23;
             break;
-          case 11:
+          case 10:
             if (!isEdit) {
-              _context2.next = 19;
+              _context2.next = 18;
               break;
             }
             if (apiConfig.update) {
-              _context2.next = 14;
+              _context2.next = 13;
               break;
             }
             throw new Error('更新API未配置');
-          case 14:
-            _context2.next = 16;
+          case 13:
+            _context2.next = 15;
             return apiConfig.update({
-              id: values.id || entityId
+              id: (_values$id = values.id) !== null && _values$id !== void 0 ? _values$id : entityId
             }, values);
-          case 16:
+          case 15:
             // 只在组件仍挂载时显示消息
             if (isMountedRef.current) {
               message.success('更新成功');
             }
-            _context2.next = 24;
+            _context2.next = 23;
             break;
-          case 19:
+          case 18:
             if (apiConfig.create) {
-              _context2.next = 21;
+              _context2.next = 20;
               break;
             }
             throw new Error('创建API未配置');
-          case 21:
-            _context2.next = 23;
+          case 20:
+            _context2.next = 22;
             return apiConfig.create(values);
-          case 23:
+          case 22:
             // 只在组件仍挂载时显示消息
             if (isMountedRef.current) {
               message.success('创建成功');
             }
-          case 24:
+          case 23:
             // 调用成功回调
             if (isMountedRef.current && onAfterSubmit) {
               onAfterSubmit();
             }
 
             // 关闭对话框
-            if (isMountedRef.current) {
-              // 标记 Portal 为已关闭
-              portalManager.markAsClosed(portalId);
-              next(payload);
+            if (!isMountedRef.current) {
+              _context2.next = 28;
+              break;
             }
-            _context2.next = 34;
-            break;
+            // 标记 Portal 为已关闭
+            portalManager.markAsClosed(portalId);
+            _context2.next = 28;
+            return next(payload);
           case 28:
-            _context2.prev = 28;
-            _context2.t0 = _context2["catch"](3);
+            _context2.next = 37;
+            break;
+          case 30:
+            _context2.prev = 30;
+            _context2.t0 = _context2["catch"](2);
             if (isMountedRef.current) {
-              _context2.next = 32;
+              _context2.next = 34;
               break;
             }
             return _context2.abrupt("return");
-          case 32:
+          case 34:
             console.error('提交失败:', _context2.t0);
             if (useUnifiedErrorHandling) {
               // 使用统一错误处理
@@ -381,24 +384,19 @@ var StandardFormDialog = function StandardFormDialog(props) {
               message.error('操作失败：' + (_context2.t0.message || '未知错误'));
             }
 
-            // 不调用 next,阻止对话框关闭
-          case 34:
-            _context2.prev = 34;
-            // 只在组件仍挂载时更新状态
-            if (isMountedRef.current) {
-              setSubmitting(false);
-            }
-            return _context2.finish(34);
+            // 拒绝中间件链，让 Formily 结束提交状态并保留弹窗供重试。
+            // @author nokecy
+            throw _context2.t0;
           case 37:
           case "end":
             return _context2.stop();
         }
-      }, _callee2, null, [[3, 28, 34, 37]]);
+      }, _callee2, null, [[2, 30]]);
     }));
     return function (_x2, _x3) {
       return _ref2.apply(this, arguments);
     };
-  }(), [entityId, customSubmitHandler, apiConfig, onAfterSubmit, useUnifiedErrorHandling]);
+  }(), [entityId, customSubmitHandler, apiConfig, onAfterSubmit, useUnifiedErrorHandling, portalId]);
 
   // 点击处理函数
   var handleClick = useCallback(function () {
@@ -407,42 +405,42 @@ var StandardFormDialog = function StandardFormDialog(props) {
     var formDialog = FormDialog({
       title: title,
       width: width,
-      okButtonProps: {
-        loading: submitting,
-        disabled: loading || submitting
+      // 不设置静态 loading，使用 FormDialog 自带的 form.submitting。
+      // @author nokecy
+      maskClosable: false,
+      onOk: function onOk() {
+        if (confirmingRef.current || loadingRef.current) return false;
+        confirmingRef.current = true;
       },
-      cancelButtonProps: {
-        disabled: submitting
+      onCancel: function onCancel() {
+        return !confirmingRef.current && !loadingRef.current;
       },
-      closable: !submitting,
-      maskClosable: !submitting
-    }, portalId, function () {
-      return /*#__PURE__*/React.createElement("div", {
-        style: {
-          minHeight: 200,
-          position: 'relative'
-        }
-      }, loading && /*#__PURE__*/React.createElement("div", {
-        style: {
-          position: 'absolute',
-          top: 0,
-          left: 0,
-          right: 0,
-          bottom: 0,
-          background: 'rgba(255, 255, 255, 0.8)',
-          display: 'flex',
-          alignItems: 'center',
-          justifyContent: 'center',
-          zIndex: 1000
-        }
-      }, /*#__PURE__*/React.createElement(Spin, {
-        tip: "\u52A0\u8F7D\u6570\u636E\u4E2D..."
-      })), /*#__PURE__*/React.createElement(FormLayout, schema.form, /*#__PURE__*/React.createElement(SchemaField, {
-        schema: schema.schema
-      })));
+      footer: function footer(_, _ref3) {
+        var OkBtn = _ref3.OkBtn,
+          CancelBtn = _ref3.CancelBtn;
+        return /*#__PURE__*/React.createElement(Observer, null, function () {
+          var _formRef$current, _formRef$current2, _formRef$current3;
+          return /*#__PURE__*/React.createElement(ConfigProvider, {
+            componentDisabled: ((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.loading) || ((_formRef$current2 = formRef.current) === null || _formRef$current2 === void 0 ? void 0 : _formRef$current2.validating) || ((_formRef$current3 = formRef.current) === null || _formRef$current3 === void 0 ? void 0 : _formRef$current3.submitting)
+          }, /*#__PURE__*/React.createElement(CancelBtn, null), /*#__PURE__*/React.createElement(OkBtn, null));
+        });
+      }
+    }, portalId, function (form) {
+      return /*#__PURE__*/React.createElement(Observer, null, function () {
+        return /*#__PURE__*/React.createElement(Spin, {
+          spinning: form.loading,
+          tip: "\u52A0\u8F7D\u6570\u636E\u4E2D..."
+        }, /*#__PURE__*/React.createElement("div", {
+          style: {
+            minHeight: 200
+          }
+        }, /*#__PURE__*/React.createElement(FormLayout, schema.form, /*#__PURE__*/React.createElement(SchemaField, {
+          schema: schema.schema
+        }))));
+      });
     });
     formDialog.forConfirm(handleSubmit).open(formProps);
-  }, [title, width, portalId, schema, formProps, handleSubmit, loading, submitting]);
+  }, [title, width, portalId, schema, SchemaField, formProps, handleSubmit]);
   return /*#__PURE__*/React.createElement(FormDialog.Portal, {
     id: portalId
   }, /*#__PURE__*/React.createElement(Button, _extends({