@nokecy/qc-ui 1.1.63 → 1.1.65

package/dist/esm/generatedListPage/OptionsColumn.js

@@ -3,7 +3,7 @@ function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyri
 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); }); }; }
 import React, { useMemo } from 'react';
-import { Space, Button } from 'antd';
+import { Space, Button, Tooltip } from 'antd';
 import { EditOutlined, DeleteOutlined } from '@ant-design/icons';
 import AccessWrapper from "./_utils/AccessWrapper";
 import { defaultHandleDelete } from "./_utils/defaultHandlers";
@@ -24,10 +24,12 @@ var OptionsColumn = function OptionsColumn(props) {
     formDialog = props.formDialog,
     deleteApi = props.deleteApi,
     _props$useErrorHandle = props.useErrorHandler,
-    useErrorHandler = _props$useErrorHandle === void 0 ? true : _props$useErrorHandle;
+    useErrorHandler = _props$useErrorHandle === void 0 ? true : _props$useErrorHandle,
+    access = props.access,
+    deleteConfirm = props.deleteConfirm;
 
   // 使用权限检查 Hook
-  var _usePermissionCheck = usePermissionCheck(permissions),
+  var _usePermissionCheck = usePermissionCheck(permissions, access),
     canUpdate = _usePermissionCheck.canUpdate,
     canDelete = _usePermissionCheck.canDelete,
     hasPermission = _usePermissionCheck.hasPermission;
@@ -50,13 +52,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();
         }
@@ -80,13 +84,24 @@ var OptionsColumn = function OptionsColumn(props) {
     return null;
   }
   var FormDialogComponent = formDialog === null || formDialog === void 0 ? void 0 : formDialog.component;
+
+  // 确认框要说清删的是哪一条：页面没给标题时取该行的名称或编码。@author nokecy
+  var record = data;
+  var recordLabel = (record === null || record === void 0 ? void 0 : record.name) || (record === null || record === void 0 ? void 0 : record.displayName) || (record === null || record === void 0 ? void 0 : record.code);
+  var resolveText = function resolveText(value, fallback) {
+    return typeof value === 'function' ? value(data) : value !== null && value !== void 0 ? value : fallback;
+  };
+  var deleteTitle = resolveText(deleteConfirm === null || deleteConfirm === void 0 ? void 0 : deleteConfirm.title, recordLabel ? "\u786E\u5B9A\u5220\u9664\u300C".concat(recordLabel, "\u300D\uFF1F") : '确定删除？');
+  var deleteContent = resolveText(deleteConfirm === null || deleteConfirm === void 0 ? void 0 : deleteConfirm.content, '删除后无法恢复。');
   return /*#__PURE__*/React.createElement(Space, {
     onClick: function onClick(event) {
       event.stopPropagation();
     }
   }, showEditButton && FormDialogComponent && /*#__PURE__*/React.createElement(Access, {
     accessible: canUpdate
-  }, /*#__PURE__*/React.createElement(FormDialogComponent, {
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u7F16\u8F91"
+  }, /*#__PURE__*/React.createElement("span", null, /*#__PURE__*/React.createElement(FormDialogComponent, {
     buttonProps: {
       size: "small",
       type: "link",
@@ -94,17 +109,19 @@ var OptionsColumn = function OptionsColumn(props) {
         style: {
           fontSize: 14
         }
-      })
+      }),
+      'aria-label': '编辑'
     },
     key: data.id,
     title: formDialog.editTitle || '编辑',
     entityId: data.id,
     onAfterSubmit: refresh
-  })), showDeleteButton && /*#__PURE__*/React.createElement(Access, {
+  })))), showDeleteButton && /*#__PURE__*/React.createElement(Access, {
     accessible: canDelete
   }, /*#__PURE__*/React.createElement(DeleteConfirm, {
-    title: "\u786E\u5B9A\u5220\u9664?",
-    content: "\u6B64\u64CD\u4F5C\u5C06\u6C38\u4E45\u5220\u9664\u8BE5\u6570\u636E\uFF0C\u4E14\u65E0\u6CD5\u6062\u590D",
+    title: deleteTitle,
+    content: deleteContent,
+    okText: "\u5220\u9664",
     onConfirm: /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -117,11 +134,13 @@ var OptionsColumn = function OptionsColumn(props) {
         }
       }, _callee2);
     }))
+  }, /*#__PURE__*/React.createElement(Tooltip, {
+    title: "\u5220\u9664"
   }, /*#__PURE__*/React.createElement(Button, {
     size: "small",
     icon: /*#__PURE__*/React.createElement(DeleteOutlined, null),
     type: "link",
-    title: "\u5220\u9664"
-  }))));
+    "aria-label": "\u5220\u9664"
+  })))));
 };
 export default OptionsColumn;

package/dist/esm/generatedListPage/index.d.ts

@@ -12,7 +12,7 @@ export { default } from './GeneratedListPage';
 export { default as GeneratedListPage } from './GeneratedListPage';
 export { default as ConfigurableToolbar } from './ConfigurableToolbar';
 export { default as OptionsColumn } from './OptionsColumn';
-export type { GeneratedListPageConfig, PermissionConfig, ApiConfig, ListParams, PagedResult, DeleteParams, ExportParams, ToolbarActionConfig, FormDialogConfig, TreeDataConfig, OptionsComponentProps } from './types';
+export type { GeneratedListPageConfig, PermissionConfig, ApiConfig, ListParams, PagedResult, DeleteParams, ExportParams, ToolbarActionConfig, FormDialogConfig, TreeDataConfig, OptionsComponentProps, DeleteConfirmConfig } from './types';
 export { usePermissionCheck, PermissionChecker } from './usePermissionCheck';
 export { usePerformanceMonitor, PerformanceDevTools } from './PerformanceMonitor';
 export { useRequestManager } from './useRequestManager';

package/dist/esm/generatedListPage/types.d.ts

@@ -1,7 +1,7 @@
-/// <reference types="react" />
 import { GridRef } from "../ag-grid-plus/interface";
 import { ColDef } from "ag-grid-community";
 import { ButtonProps } from "antd";
+import { ReactNode } from "react";
 import { PagedApiAdapter } from '../adapters';
 /**
  * 权限配置接口
@@ -203,6 +203,27 @@ export interface GeneratedListPageConfig<T = any> {
     onRefresh?: () => void;
     /** 分页 API 适配器(默认 ABP);非 ABP 后端可注入。@author nokecy */
     pagedApiAdapter?: PagedApiAdapter;
+    /**
+     * 表格组件，默认用包内 AgGridPlus。
+     * 宿主可注入自己的表格基座（属性与 AgGridPlus 相同），让序号、默认复选、编码列收起、
+     * 内部字段隐藏等列表规范在通用列表页上同样生效。@author nokecy
+     */
+    gridComponent?: React.ComponentType<any>;
+    /**
+     * 当前用户已授予的权限（权限名 → 是否授予），通常传 umi 的 useAccess()。
+     * 不传时工具栏与操作列不做权限过滤——没有权限的人也会看到新建、编辑、删除，点了才报 403。@author nokecy
+     */
+    access?: Record<string, boolean>;
+    /** 删除确认框；title、content 可按行生成 */
+    deleteConfirm?: DeleteConfirmConfig<T>;
+}
+/**
+ * 删除确认框配置。
+ * 不传 title 时标题带上该行的名称或编码，让用户看清删的是哪一条；不传 content 时说明删除后无法恢复。@author nokecy
+ */
+export interface DeleteConfirmConfig<T = any> {
+    title?: ReactNode | ((record: T) => ReactNode);
+    content?: ReactNode | ((record: T) => ReactNode);
 }
 /**
  * 操作列组件属性接口
@@ -221,4 +242,8 @@ export interface OptionsComponentProps<T = any> {
     deleteApi?: (params: DeleteParams) => Promise<void>;
     /** 是否使用统一错误处理 */
     useErrorHandler?: boolean;
+    /** 当前用户已授予的权限，见 GeneratedListPageConfig.access */
+    access?: Record<string, boolean>;
+    /** 删除确认框配置 */
+    deleteConfirm?: DeleteConfirmConfig<T>;
 }

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({