@ccs-ui/rc-pro 2.1.6 → 2.1.8

package/es/ccs.d.ts

@@ -130,4 +130,7 @@ type PropsWithNodeChildren = {
 type PropsWithElementChildren = {
     children?: ReactElement;
 };
-export type { AuthButtonItem, MenuType, PropsWithCss, PropsWithElementChildren, PropsWithNodeChildren, RecordType, RouteHistory, TableColumns, TableData, TableFormItems, TableInstance, TableInstanceRef, TriggerChildrenProps, };
+type PropsWithChildren<T> = T & {
+    children?: T[];
+};
+export type { AuthButtonItem, MenuType, PropsWithChildren, PropsWithCss, PropsWithElementChildren, PropsWithNodeChildren, RecordType, RouteHistory, TableColumns, TableData, TableFormItems, TableInstance, TableInstanceRef, TriggerChildrenProps, };

package/es/config.js

@@ -68,7 +68,7 @@ function AppConfig(_ref) {
     isCompact = _ref.isCompact,
     watermark = _ref.watermark,
     themeConfig = _ref.themeConfig,
-    CcsProTableFieldNames = _ref.CcsProTableFieldNames;
+    fieldNames = _ref.fieldNames;
   var holderRef = React.useRef(null);
   // 主题
   var appTheme = theme === 'dark' ? darkTheme : defaultTheme;
@@ -97,7 +97,7 @@ function AppConfig(_ref) {
         theme: theme,
         themeConfig: themeConfig,
         holderRef: holderRef,
-        CcsProTableFieldNames: CcsProTableFieldNames
+        fieldNames: fieldNames
       },
       children: [children, /*#__PURE__*/_jsx(AppDialog, {}), /*#__PURE__*/_jsx(ElementsHolder, {
         ref: holderRef

package/es/context/index.d.ts

@@ -48,6 +48,18 @@ type FnContextType<T = Store> = {
     formInitialValues: T;
     close: () => void;
 };
+type CcsFieldNamesType = {
+    dataSource: string[];
+    total: string[];
+    current: string[];
+    pageSize: string[];
+};
+type CcsDialogFieldNames = {
+    /** 成功标识 */
+    success?: string[];
+    /** 错误信息提示 */
+    errorMsg?: string[];
+};
 type CssAppConfigType = {
     /** 主题 */
     theme?: 'dark' | 'light' | 'colorful';
@@ -59,12 +71,14 @@ type CssAppConfigType = {
     watermark?: WaterMarkProps;
     /** modal or drawer holder */
     holderRef?: React.RefObject<ElementsHolderRef>;
-    /** CcsProTable 组件字段全局指定 */
-    CcsProTableFieldNames?: {
-        dataSource: string[];
-        total: string[];
-        current: string[];
-        pageSize: string[];
+    /** 接口字段指定 */
+    fieldNames?: {
+        /** CcsProTable 组件字段全局指定 */
+        proTable?: CcsFieldNamesType;
+        /** CcsProTable.Tree 组件字段全局指定 */
+        proTableTree?: Pick<CcsFieldNamesType, 'dataSource'>;
+        /** dialog request 判定字段 */
+        dialog?: CcsDialogFieldNames;
     };
 };
 declare const DrawerAndModalContext: React.Context<FnContextType<any>>;
@@ -72,4 +86,4 @@ declare const PageContext: React.Context<PageContextType>;
 declare const TabsContext: React.Context<CcsTabsContextType>;
 declare const AppConfigContext: React.Context<CssAppConfigType>;
 export { AppConfigContext, DrawerAndModalContext, PageContext, TabsContext };
-export type { CcsTabsChangeProps, CcsTabsContextType, CssAppConfigType, FnContextType, };
+export type { CcsFieldNamesType, CcsTabsChangeProps, CcsTabsContextType, CssAppConfigType, FnContextType, };

package/es/dialog/DialogRequestButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogRequestButton: ({ auth, formRef, extraBtn, formInitialValues, request, onCancel, onRequestBefore, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "extraBtn" | "request" | "onRequestBefore"> & {
+declare const DialogRequestButton: <TParams, TData>({ auth, formRef, extraBtn, formInitialValues, request, onOk, onClose, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onOk" | "onClose" | "extraBtn"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/dialog/DialogRequestButton.js

@@ -1,5 +1,5 @@
-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 _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 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; }
@@ -17,6 +17,8 @@ import CcsUtils from '@ccs-ui/utils';
 import { Button } from 'antd';
 import { useState } from 'react';
 import { CcsButton, CcsDialog } from '..';
+import { useDialogFields } from "../hooks/use-app";
+import { getDataFromFields } from "../select";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -27,13 +29,14 @@ var DialogRequestButton = function DialogRequestButton(_ref) {
     _ref$formInitialValue = _ref.formInitialValues,
     formInitialValues = _ref$formInitialValue === void 0 ? {} : _ref$formInitialValue,
     request = _ref.request,
-    onCancel = _ref.onCancel,
-    onRequestBefore = _ref.onRequestBefore;
+    onOk = _ref.onOk,
+    onClose = _ref.onClose;
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     loading = _useState2[0],
     setLoading = _useState2[1];
-  var onOk = /*#__PURE__*/function () {
+  var fieldNames = useDialogFields();
+  var onOkClick = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _formRef$current;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
@@ -48,13 +51,40 @@ var DialogRequestButton = function DialogRequestButton(_ref) {
           case 3:
             formRef.current.formInstance.validateFields().then(function (values) {
               setLoading(true);
-              var params = _objectSpread(_objectSpread({}, formInitialValues), onRequestBefore ? onRequestBefore(values) : values);
+              var params = _objectSpread(_objectSpread({}, formInitialValues), values);
               request(params).then(function (result) {
                 setLoading(false);
-                if (result !== null && result !== void 0 && result.success && onCancel) {
-                  onCancel(params);
+
+                // 获取成功标识
+                var success = getDataFromFields(result, fieldNames.success);
+                // 获取异常信息
+                var msg = getDataFromFields(result, fieldNames.errorMsg);
+                if (success) {
+                  if (onOk) {
+                    var okResult = onOk(params);
+                    // 返回false阻止关闭对话框
+                    if (typeof okResult === 'boolean' && okResult === false) {
+                      return;
+                    }
+
+                    // 返回promiss
+                    if (_typeof(okResult) === 'object') {
+                      try {
+                        okResult.then(function (d) {
+                          if (d !== false) onClose();
+                        });
+                      } catch (error) {
+                        onClose();
+                      }
+                    }
+                    return;
+                  }
+                  onClose();
                 }
-                CcsDialog.easyMessage(result);
+                CcsDialog.easyMessage({
+                  success: success,
+                  msg: msg
+                });
               }).catch(function (err) {
                 setLoading(false);
                 console.log('e', err);
@@ -66,18 +96,18 @@ var DialogRequestButton = function DialogRequestButton(_ref) {
         }
       }, _callee);
     }));
-    return function onOk() {
+    return function onOkClick() {
       return _ref2.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [extraBtn, /*#__PURE__*/_jsx(Button, {
-      onClick: onCancel,
+      onClick: onClose,
       children: "\u53D6\u6D88"
     }), /*#__PURE__*/_jsx(CcsButton, {
       auth: auth || '',
       type: "primary",
-      onClick: onOk,
+      onClick: onOkClick,
       loading: loading,
       children: "\u786E\u5B9A"
     })]

package/es/dialog/DialogSelfOkButton.d.ts

@@ -1,7 +1,7 @@
 import { FormProps } from 'antd';
 import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
-declare const DialogSelfOkButton: ({ auth, formRef, extraBtn, formInitialValues, onCancel, onOk, }: Pick<CcsDialogModalProps, "auth" | "onCancel" | "onOk" | "extraBtn"> & {
+declare const DialogSelfOkButton: <TParams, TData>({ auth, formRef, extraBtn, formInitialValues, onClose, onOk, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "onOk" | "onClose" | "extraBtn"> & {
     formRef: React.RefObject<DialogFormRef>;
     formInitialValues: FormProps['initialValues'];
 }) => import("react/jsx-runtime").JSX.Element;

package/es/dialog/DialogSelfOkButton.js

@@ -1,11 +1,21 @@
+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 _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 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 CcsUtils from '@ccs-ui/utils';
 import { Button } from 'antd';
+import { useState } from 'react';
 import { CcsButton } from '..';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
@@ -16,25 +26,69 @@ var DialogSelfOkButton = function DialogSelfOkButton(_ref) {
     extraBtn = _ref.extraBtn,
     _ref$formInitialValue = _ref.formInitialValues,
     formInitialValues = _ref$formInitialValue === void 0 ? {} : _ref$formInitialValue,
-    onCancel = _ref.onCancel,
+    onClose = _ref.onClose,
     onOk = _ref.onOk;
-  var onHandleOk = function onHandleOk() {
-    var _formRef$current;
-    if (!((_formRef$current = formRef.current) !== null && _formRef$current !== void 0 && _formRef$current.formInstance)) {
-      CcsUtils.showWarning(false, "\u672A\u5B9A\u4E49form");
-      return;
-    }
-    formRef.current.formInstance.validateFields().then(function (values) {
-      var params = _objectSpread(_objectSpread({}, formInitialValues), values);
-      if (onOk) onOk(params);
-      if (onCancel) onCancel(params);
-    });
-  };
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    loading = _useState2[0],
+    setLoading = _useState2[1];
+  var onHandleOk = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _formRef$current;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if ((_formRef$current = formRef.current) !== null && _formRef$current !== void 0 && _formRef$current.formInstance) {
+              _context.next = 3;
+              break;
+            }
+            CcsUtils.showWarning(false, "\u672A\u5B9A\u4E49form");
+            return _context.abrupt("return");
+          case 3:
+            formRef.current.formInstance.validateFields().then(function (values) {
+              var params = _objectSpread(_objectSpread({}, formInitialValues), values);
+              if (onOk) {
+                var okResult = onOk(params);
+                // 返回false阻止关闭对话框
+                if (typeof okResult === 'boolean' && okResult === false) {
+                  return;
+                }
+                // 返回promiss
+                if (_typeof(okResult) === 'object') {
+                  try {
+                    setLoading(true);
+                    okResult.then(function (d) {
+                      if (d !== false) onClose();
+                      setLoading(false);
+                    });
+                  } catch (error) {
+                    setLoading(false);
+                    onClose();
+                  }
+                } else {
+                  // 关闭对话框
+                  onClose();
+                }
+              }
+            });
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onHandleOk() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [extraBtn, /*#__PURE__*/_jsx(Button, {
-      onClick: onCancel,
+      onClick: function onClick() {
+        return onClose();
+      },
       children: "\u53D6\u6D88"
     }), /*#__PURE__*/_jsx(CcsButton, {
+      loading: loading,
       auth: auth || '',
       type: "primary",
       onClick: onHandleOk,

package/es/dialog/HookDrawer.d.ts

@@ -1,8 +1,9 @@
-/// <reference types="react" />
 import { CcsDialogDrawer, CcsDialogDrawerProps } from './hook';
-export type HookDrawerProps = {
+export type HookDrawerProps<TParams, TData> = {
     afterClose: () => void;
-    config: CcsDialogDrawerProps;
+    config: CcsDialogDrawerProps<TParams, TData>;
 };
-declare const _default: import("react").ForwardRefExoticComponent<HookDrawerProps & import("react").RefAttributes<CcsDialogDrawer>>;
-export default _default;
+declare const HookDrawer: <TParams, TData>(props: HookDrawerProps<TParams, TData> & {
+    dialogRef: React.RefObject<CcsDialogDrawer>;
+}) => import("react/jsx-runtime").JSX.Element;
+export default HookDrawer;

package/es/dialog/HookDrawer.js

@@ -1,7 +1,10 @@
 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); }
+var _excluded = ["auth", "form", "content", "className", "rootStyle", "getContainer", "request", "onClose", "onOk"];
 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 _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; }
 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; }
@@ -15,15 +18,16 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { Drawer } from 'antd';
 import classNames from 'classnames';
-import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
+import { useImperativeHandle, useRef, useState } from 'react';
 import CcsDialogButtons, { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
 import DialogRequestButton from "./DialogRequestButton";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
-var HookDrawer = function HookDrawer(_ref, ref) {
-  var hookAfterClose = _ref.afterClose,
-    config = _ref.config;
+var HookDrawer = function HookDrawer(props) {
+  var hookAfterClose = props.afterClose,
+    config = props.config,
+    dialogRef = props.dialogRef;
   var _useState = useState(function () {
       if (config.open === undefined) {
         return _objectSpread(_objectSpread({}, config), {}, {
@@ -38,7 +42,6 @@ var HookDrawer = function HookDrawer(_ref, ref) {
   var buttonRef = useRef(null);
   var footerRef = useRef(null);
   var formRef = useRef(null);
-  var closeRef = useRef();
   var afterClose = function afterClose() {
     hookAfterClose();
   };
@@ -49,80 +52,33 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     rootStyle = innerConfig.rootStyle,
     getContainer = innerConfig.getContainer,
     request = innerConfig.request,
-    onAfterOk = innerConfig.onAfterOk,
-    onAfterCancel = innerConfig.onAfterCancel,
     onClose = innerConfig.onClose,
-    onRequestBefore = innerConfig.onRequestBefore;
+    onOk = innerConfig.onOk,
+    otherInnerConfig = _objectWithoutProperties(innerConfig, _excluded);
   var close = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
-      var _formRef$current, isClose;
+    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!closeRef.current) {
-              _context.next = 6;
-              break;
-            }
-            _context.next = 3;
-            return closeRef.current((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.formInstance.getFieldsValue());
-          case 3:
-            isClose = _context.sent;
-            if (isClose) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return");
-          case 6:
             setInnerConfig(function (c) {
               return _objectSpread(_objectSpread({}, c), {}, {
                 open: false
               });
             });
-            if ((e === null || e === void 0 ? void 0 : e.type) === 'click') {
-              // 通过点击关闭按钮或取消按钮关闭
-              if (onAfterCancel) {
-                onAfterCancel(e);
-              }
-            } else {
-              // 通过调用closeDialog关闭
-              if (onAfterOk) {
-                onAfterOk(e);
-              }
-            }
 
             // 入参有onClose
-            if (onClose) {
-              onClose(e);
-            }
-          case 9:
+            if (onClose) onClose();
+          case 2:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function close(_x) {
-      return _ref2.apply(this, arguments);
+    return function close() {
+      return _ref.apply(this, arguments);
     };
   }();
-
-  // 异步关闭
-  var useCloseDialog = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(closeFn) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            closeRef.current = closeFn;
-          case 1:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function useCloseDialog(_x2) {
-      return _ref3.apply(this, arguments);
-    };
-  }();
-  useImperativeHandle(ref, function () {
+  useImperativeHandle(dialogRef, function () {
     return {
       destroy: close,
       update: function update(newConfig) {
@@ -149,9 +105,9 @@ var HookDrawer = function HookDrawer(_ref, ref) {
       return /*#__PURE__*/_jsx(DialogRequestButton, {
         auth: auth,
         request: request,
-        onCancel: close,
+        onClose: close,
+        onOk: onOk,
         formRef: formRef,
-        onRequestBefore: onRequestBefore,
         formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
       });
     }
@@ -163,7 +119,7 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     afterOpenChange: function afterOpenChange(open) {
       if (!open) afterClose();
     }
-  }, innerConfig), {}, {
+  }, otherInnerConfig), {}, {
     onClose: close,
     className: classNames('ccs-dialog-drawer', className),
     styles: styles,
@@ -182,8 +138,7 @@ var HookDrawer = function HookDrawer(_ref, ref) {
         buttonType: 'drawer',
         closeDialog: close,
         drawerFooterRef: footerRef,
-        formInitialValues: (form === null || form === void 0 ? void 0 : form.initialValues) || {},
-        useCloseDialog: useCloseDialog
+        formInitialValues: (form === null || form === void 0 ? void 0 : form.initialValues) || {}
       },
       children: form ? /*#__PURE__*/_jsx(DialogForm, {
         ref: formRef,
@@ -193,4 +148,4 @@ var HookDrawer = function HookDrawer(_ref, ref) {
     })
   }));
 };
-export default /*#__PURE__*/forwardRef(HookDrawer);
+export default HookDrawer;

package/es/dialog/HookModal.d.ts

@@ -1,8 +1,10 @@
-/// <reference types="react" />
+import React from 'react';
 import { CcsDialogModal, CcsDialogModalProps } from './hook';
-export type HookModalProps = {
+export type HookModalProps<TParams, TData> = {
     afterClose: () => void;
-    config: CcsDialogModalProps;
+    config: CcsDialogModalProps<TParams, TData>;
 };
-declare const _default: import("react").ForwardRefExoticComponent<HookModalProps & import("react").RefAttributes<CcsDialogModal>>;
-export default _default;
+declare const HookModal: <TParams, TData>(props: HookModalProps<TParams, TData> & {
+    dialogRef: React.RefObject<CcsDialogModal>;
+}) => import("react/jsx-runtime").JSX.Element;
+export default HookModal;

package/es/dialog/HookModal.js

@@ -1,7 +1,10 @@
+var _excluded = ["auth", "form", "title", "content", "className", "extraBtn", "request", "onClose", "onOk"];
 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 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 _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; }
 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); }
@@ -15,7 +18,7 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 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 { Modal } from 'antd';
 import classNames from 'classnames';
-import { forwardRef, useImperativeHandle, useRef, useState } from 'react';
+import React, { useImperativeHandle, useRef, useState } from 'react';
 import Draggable from 'react-draggable';
 import CcsDialogButtons, { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
@@ -59,9 +62,10 @@ var DragModal = function DragModal(_ref) {
     })
   });
 };
-var HookModal = function HookModal(_ref2, ref) {
-  var hookAfterClose = _ref2.afterClose,
-    config = _ref2.config;
+var HookModal = function HookModal(props) {
+  var dialogRef = props.dialogRef,
+    hookAfterClose = props.afterClose,
+    config = props.config;
   var _useState = useState(function () {
       if (config.open === undefined) {
         return _objectSpread(_objectSpread({}, config), {}, {
@@ -87,7 +91,6 @@ var HookModal = function HookModal(_ref2, ref) {
     setDragState = _useState4[1];
   var buttonRef = useRef(null);
   var formRef = useRef(null);
-  var closeRef = useRef();
   var afterClose = function afterClose() {
     var _innerConfig$afterClo;
     if (config.destroyOnClose !== false) hookAfterClose();
@@ -97,85 +100,36 @@ var HookModal = function HookModal(_ref2, ref) {
     form = innerConfig.form,
     title = innerConfig.title,
     content = innerConfig.content,
-    _innerConfig$styles = innerConfig.styles,
-    styles = _innerConfig$styles === void 0 ? {} : _innerConfig$styles,
     className = innerConfig.className,
     extraBtn = innerConfig.extraBtn,
     request = innerConfig.request,
-    onCancel = innerConfig.onCancel,
-    onRequestBefore = innerConfig.onRequestBefore,
-    onAfterOk = innerConfig.onAfterOk,
-    onAfterCancel = innerConfig.onAfterCancel;
-  var close = /*#__PURE__*/function () {
-    var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(e) {
-      var _formRef$current, isClose;
+    onClose = innerConfig.onClose,
+    onOk = innerConfig.onOk,
+    otherInnerConfig = _objectWithoutProperties(innerConfig, _excluded);
+  var onHandleClose = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!closeRef.current) {
-              _context.next = 6;
-              break;
-            }
-            _context.next = 3;
-            return closeRef.current((_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.formInstance.getFieldsValue());
-          case 3:
-            isClose = _context.sent;
-            if (isClose) {
-              _context.next = 6;
-              break;
-            }
-            return _context.abrupt("return");
-          case 6:
             setInnerConfig(function (c) {
               return _objectSpread(_objectSpread({}, c), {}, {
                 open: false
               });
             });
-            if ((e === null || e === void 0 ? void 0 : e.type) === 'click') {
-              // 通过点击关闭按钮或取消按钮关闭
-              if (onAfterCancel) {
-                onAfterCancel(e);
-              }
-            } else {
-              // 通过调用closeDialog关闭
-              if (onAfterOk) {
-                onAfterOk(e);
-              }
-            }
 
             // 入参有onClose
-            if (onCancel) {
-              onCancel(e);
-            }
-          case 9:
+            if (onClose) onClose();
+          case 2:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function close(_x) {
-      return _ref3.apply(this, arguments);
+    return function onHandleClose() {
+      return _ref2.apply(this, arguments);
     };
   }();
-
-  // 异步关闭方法
-  var useCloseDialog = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(closeFn) {
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            closeRef.current = closeFn;
-          case 1:
-          case "end":
-            return _context2.stop();
-        }
-      }, _callee2);
-    }));
-    return function useCloseDialog(_x2) {
-      return _ref4.apply(this, arguments);
-    };
-  }();
-  useImperativeHandle(ref, function () {
+  useImperativeHandle(dialogRef, function () {
     return {
       destroy: close,
       update: function update(newConfig) {
@@ -191,22 +145,22 @@ var HookModal = function HookModal(_ref2, ref) {
       return /*#__PURE__*/_jsx(DialogRequestButton, {
         auth: auth,
         request: request,
-        onCancel: close,
+        onClose: onHandleClose,
+        onOk: onOk,
         formRef: formRef,
         extraBtn: extraBtn,
-        onRequestBefore: onRequestBefore,
         formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
       });
     }
 
     // 传入onOk参数
-    if (innerConfig.onOk) {
+    if (onOk) {
       return /*#__PURE__*/_jsx(DialogSelfOkButton, {
         auth: auth,
-        onCancel: close,
+        onClose: onHandleClose,
         formRef: formRef,
         extraBtn: extraBtn,
-        onOk: innerConfig.onOk,
+        onOk: onOk,
         formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
       });
     }
@@ -218,10 +172,9 @@ var HookModal = function HookModal(_ref2, ref) {
     });
   };
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
-    onCancel: close,
+    onCancel: onHandleClose,
     afterClose: afterClose
-  }, innerConfig), {}, {
-    styles: styles,
+  }, otherInnerConfig), {}, {
     className: classNames('ccs-dialog-modal', className),
     footer: renderFooter(),
     title: /*#__PURE__*/_jsx("div", {
@@ -260,8 +213,7 @@ var HookModal = function HookModal(_ref2, ref) {
         buttonType: 'modal',
         Buttons: CcsDialogButtons,
         formInitialValues: (form === null || form === void 0 ? void 0 : form.initialValues) || {},
-        closeDialog: close,
-        useCloseDialog: useCloseDialog
+        closeDialog: onHandleClose
       },
       children: form ? /*#__PURE__*/_jsx(DialogForm, {
         ref: formRef,
@@ -271,4 +223,4 @@ var HookModal = function HookModal(_ref2, ref) {
     })
   }));
 };
-export default /*#__PURE__*/forwardRef(HookModal);
+export default HookModal;

package/es/dialog/button.d.ts

@@ -1,13 +1,14 @@
 import React from 'react';
 import { PropsWithNodeChildren } from '../ccs';
 import { CcsDialogModalProps } from './hook';
-export type DialogButtonsProps = Pick<CcsDialogModalProps, 'okText' | 'onCancel' | 'cancelText' | 'onOk'> & PropsWithNodeChildren & {
+export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClose' | 'cancelText'> & PropsWithNodeChildren & {
     okAuth?: string;
     loading?: boolean;
     hideCancel?: boolean;
+    onOk?: (values?: T) => void;
 };
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
 export declare const DialogButtonHolder: React.MemoExoticComponent<React.ForwardRefExoticComponent<Pick<CcsDialogModalProps, "extraBtn"> & React.RefAttributes<DialogButtonRef>>>;
-export default function CcsDialogButtons({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps): import("react/jsx-runtime").JSX.Element;
+export default function CcsDialogButtons<TParams>({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps<TParams>): import("react/jsx-runtime").JSX.Element;

package/es/dialog/context.d.ts

@@ -5,7 +5,7 @@ type DialogContextType<T = Store> = {
     /** 表单初始值 */
     formInitialValues: T;
     /** 按钮组件 */
-    Buttons: (e: DialogButtonsProps) => ReactElement;
+    Buttons: (e: DialogButtonsProps<T>) => ReactElement;
     /** 按钮类型 */
     buttonType: 'modal' | 'drawer';
     /** 按钮 ref */
@@ -14,8 +14,6 @@ type DialogContextType<T = Store> = {
     drawerFooterRef?: RefObject<DialogButtonRef>;
     /** 关闭弹框，可以设置返回值 */
     closeDialog: (e?: any) => void;
-    /** 关闭方法hooks，关闭需拦截时使用 */
-    useCloseDialog: (closeFn: (values: any) => Promise<boolean>) => void;
 };
 declare const DialogContentContext: React.Context<DialogContextType<any>>;
 declare const useDialogContext: <T = Store>() => DialogContextType<T>;

package/es/dialog/hook.d.ts

@@ -23,7 +23,16 @@ export type DialogRequestData = {
     /** 失败消息 */
     msg: string;
 };
-export type CcsDialogModalProps = ModalFuncProps & {
+export type Service<TParams, TData> = (params: TParams) => Promise<TData>;
+export type OkEvent<TParams> = (params?: TParams) => Promise<boolean> | boolean | void;
+export type Values<TParams extends any> = (params: TParams) => TParams;
+type DialogEvent<TParams, TData> = {
+    /** 确定按钮，返回false 或者 promiss false 则阻止关闭对话框 */
+    onOk?: OkEvent<TParams>;
+    /** 表单接口请求 */
+    request?: Service<TParams, TData>;
+};
+export type CcsDialogModalProps<TParams = any, TData = any> = DialogEvent<TData, TParams> & Omit<ModalFuncProps, 'onCancel' | 'afterOpenChange' | 'onOk' | 'footer'> & {
     /** antd form */
     form?: FormProps;
     /** 表单接口请求权限 */
@@ -32,16 +41,10 @@ export type CcsDialogModalProps = ModalFuncProps & {
     destroyOnClose?: boolean;
     /** 通过参数传递的扩展按钮 */
     extraBtn?: ReactNode;
-    /** 表单接口请求 */
-    request?: (values: any) => Promise<DialogRequestData>;
-    /** request执行前参数处理 */
-    onRequestBefore?: (values: any) => any;
-    /** 通过closeDialog方法关闭dialog */
-    onAfterOk?: (e: any) => void;
-    /** 通过点击关闭按钮或取消按钮关闭 */
-    onAfterCancel?: (e: any) => void;
+    /** 弹框关闭回调 */
+    onClose?: () => void;
 };
-export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
+export type CcsDialogDrawerProps<TParams = any, TData = any> = DialogEvent<TData, TParams> & Omit<DrawerProps, 'extra' | 'onClose' | 'onOk' | 'afterOpenChange' | 'footer'> & {
     /** antd form */
     form?: FormProps;
     /** 表单接口请求权限 */
@@ -50,20 +53,14 @@ export type CcsDialogDrawerProps = Omit<DrawerProps, 'extra'> & {
     content?: ReactNode;
     /** 通过参数传递的扩展按钮 */
     extraBtn?: ReactNode;
-    /** 表单接口请求 */
-    request?: (values: any) => Promise<any>;
-    /** request执行前参数处理 */
-    onRequestBefore?: (values: any) => any;
-    /** 通过closeDialog方法关闭dialog */
-    onAfterOk?: (e: any) => void;
-    /** 通过点击关闭按钮或取消按钮关闭 */
-    onAfterCancel?: (e: any) => void;
+    /** 弹框关闭回调 */
+    onClose?: () => void;
 };
 export type ModalDialog = (...args: Parameters<ModalFunc>) => ReturnType<ModalFunc>;
 export type DrawerDialog = (...args: Parameters<ModalFunc>) => ReturnType<DrawerFunc>;
 export type CcsDialogType = {
-    openDrawer: (props: CcsDialogDrawerProps) => ReturnType<DrawerDialog>;
-    openModal: (props: CcsDialogModalProps) => ReturnType<ModalDialog>;
+    openDrawer: <TParams = any, TData = any>(props: CcsDialogDrawerProps<TParams, TData>) => ReturnType<DrawerDialog>;
+    openModal: <TParams = any, TData = any>(props: CcsDialogModalProps<TParams, TData>) => ReturnType<ModalDialog>;
     contextHolder: React.JSX.Element;
 };
 export type ElementsHolderRef = {

package/es/dialog/hook.js

@@ -21,6 +21,13 @@ import usePatchElement from "./usePatchElement";
 // Add `then` field for `ModalFunc` return instance.
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsx as _jsx } from "react/jsx-runtime";
+// type CcsModalFuncType<TParams, TData> = (
+//   config: CcsDialogModalProps<TParams, TData>,
+// ) => {
+//   destroy: () => void;
+//   update: (configUpdate: ModalFuncProps) => void;
+// };
+
 var ElementsHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_props, ref) {
   var _usePatchElement = usePatchElement(),
     _usePatchElement2 = _slicedToArray(_usePatchElement, 2),
@@ -68,7 +75,7 @@ export default function useCcsDialog() {
         var _closeFunc;
         (_closeFunc = closeFunc) === null || _closeFunc === void 0 || _closeFunc();
       },
-      ref: modalRef
+      dialogRef: modalRef
     }, "modal-".concat(modalUuid));
 
     // 优先使用自定义contextHolder、其次使用全局contextHolder
@@ -134,7 +141,7 @@ export default function useCcsDialog() {
         var _closeFunc2;
         (_closeFunc2 = closeFunc) === null || _closeFunc2 === void 0 || _closeFunc2();
       },
-      ref: modalRef
+      dialogRef: modalRef
     }, "drawer-".concat(drawerUuid));
     var $holderRef = holderRef.current ? holderRef : appConfig.holderRef;
     if ($holderRef !== null && $holderRef !== void 0 && $holderRef.current) {

package/es/hooks/use-app.d.ts

@@ -8,5 +8,12 @@ export declare const useProTableFields: () => {
     total: string[];
     current: string[];
     pageSize: string[];
-} | undefined;
+};
+export declare const useProTableTreeFields: () => {
+    dataSource: string[];
+};
+export declare const useDialogFields: () => {
+    success: string[];
+    errorMsg: string[];
+};
 export default useAppConfig;

package/es/hooks/use-app.js

@@ -1,3 +1,9 @@
+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 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 { useContext } from 'react';
 import { AppConfigContext } from "../context";
 
@@ -13,7 +19,28 @@ var useAppConfig = function useAppConfig() {
   return context;
 };
 export var useProTableFields = function useProTableFields() {
+  var _context$fieldNames;
   var context = useContext(AppConfigContext) || {};
-  return context === null || context === void 0 ? void 0 : context.CcsProTableFieldNames;
+  return _objectSpread({
+    dataSource: ['data', 'result'],
+    current: ['data', 'pageNo'],
+    pageSize: ['data', 'pageSize'],
+    total: ['data', 'totalNum']
+  }, context === null || context === void 0 || (_context$fieldNames = context.fieldNames) === null || _context$fieldNames === void 0 ? void 0 : _context$fieldNames.proTable);
+};
+export var useProTableTreeFields = function useProTableTreeFields() {
+  var _context$fieldNames2;
+  var context = useContext(AppConfigContext) || {};
+  return _objectSpread({
+    dataSource: ['data']
+  }, context === null || context === void 0 || (_context$fieldNames2 = context.fieldNames) === null || _context$fieldNames2 === void 0 ? void 0 : _context$fieldNames2.proTableTree);
+};
+export var useDialogFields = function useDialogFields() {
+  var _context$fieldNames3;
+  var context = useContext(AppConfigContext) || {};
+  return _objectSpread({
+    success: ['success'],
+    errorMsg: ['msg']
+  }, context === null || context === void 0 || (_context$fieldNames3 = context.fieldNames) === null || _context$fieldNames3 === void 0 ? void 0 : _context$fieldNames3.dialog);
 };
 export default useAppConfig;

package/es/layout-keep-alive/index.less

@@ -72,10 +72,11 @@
   }
 
   .ccs-table-item-scroll > div {
-    padding: 10px 16px 16px 16px;
+    padding: 10px 16px 16px;
     flex-direction: column;
     display: none;
   }
+
   .ccs-table-item-scroll.route-avtive > div {
     display: flex;
   }

package/es/layout-single-page/index.less

@@ -6,7 +6,7 @@
   .ccs-table-item-scroll > div {
     display: flex;
     flex-direction: column;
-    padding: 10px 16px 16px 16px;
+    padding: 10px 16px 16px;
   }
 }
 

package/es/pro-table/table.d.ts

@@ -4,7 +4,7 @@ import { TableSticky } from 'rc-table/lib/interface';
 import React, { CSSProperties, ReactElement, ReactNode } from 'react';
 import CCS from '..';
 import { PropsWithCss, PropsWithNodeChildren, TableColumns } from '../ccs';
-import { CssAppConfigType } from '../context';
+import { CcsFieldNamesType } from '../context';
 import './index.less';
 type ParamType = Record<string, any>;
 export type ShowDependType = {
@@ -33,7 +33,7 @@ export type CcsTableProps<T> = Omit<TableProps<T>, 'columns' | 'title'> & {
     /** request 额外参数 dataSource: ['data', 'result']; current: ['data', 'pageNo']; pageSize: ['data', 'pageSize']; total: ['data', 'totalNum'] */
     requestParam?: ParamType;
     /** 接口字段指定,默认： */
-    fieldNames?: CssAppConfigType['CcsProTableFieldNames'];
+    fieldNames?: CcsFieldNamesType;
     /** class name */
     className?: string;
     /** style */

package/es/pro-table/table.js

@@ -1,12 +1,12 @@
 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 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 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); }
@@ -110,12 +110,7 @@ var InternalProTable = function InternalProTable(props) {
   // 接口字段指定全局配置
   var globalFieldNames = useProTableFields();
   // 接口字段指定
-  var fieldNames = ((_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames) || globalFieldNames || {
-    dataSource: ['data', 'result'],
-    current: ['data', 'pageNo'],
-    pageSize: ['data', 'pageSize'],
-    total: ['data', 'totalNum']
-  };
+  var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), (_props$table = props.table) === null || _props$table === void 0 ? void 0 : _props$table.fieldNames);
   var onSearchBefore = props.onSearchBefore || onDefaultFormat;
   var onSearchAfter = props.onSearchAfter || onDefaultFormat;
 
@@ -478,7 +473,6 @@ var InternalProTable = function InternalProTable(props) {
       return /*#__PURE__*/_jsx(TableTree, {
         data: data,
         table: _objectSpread(_objectSpread({}, table), {}, {
-          fieldNames: fieldNames,
           rowSelection: rowSelection,
           title: tableTitle ? function () {
             return tableTitle;

package/es/pro-table/tree.d.ts

@@ -2,6 +2,7 @@ import { TableProps } from 'antd';
 import { TableSticky } from 'rc-table/lib/interface';
 import { RefObject } from 'react';
 import CCS from '..';
+import { CcsFieldNamesType } from '../context';
 import { TableRefType } from '../table';
 import { CcsProTableProps } from './table';
 export type TreeInstance<T> = {
@@ -17,6 +18,7 @@ type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'onSearchBefore' |
     tableContentRef: React.RefObject<HTMLDivElement>;
     setData: React.Dispatch<React.SetStateAction<CCS.TableData<T>>>;
     handlePageChange: any;
+    fieldNames?: Pick<CcsFieldNamesType, 'dataSource'>;
 };
 declare const TableTree: <T extends object = any>(props: TreeTableProps<T>) => import("react/jsx-runtime").JSX.Element;
 export default TableTree;

package/es/pro-table/tree.js

@@ -4,13 +4,13 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 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); }
@@ -20,6 +20,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import CcsUtils from '@ccs-ui/utils';
 import { useImperativeHandle, useState } from 'react';
 import { CcsTable } from '..';
+import { useProTableTreeFields } from "../hooks/use-app";
 import { getDataFromFields } from "../select";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TableTree = function TableTree(props) {
@@ -44,10 +45,14 @@ var TableTree = function TableTree(props) {
     rowKey = _ref.rowKey,
     expandable = _ref.expandable,
     columns = _ref.columns,
-    httpRequest = _ref.request,
-    fieldNames = _ref.fieldNames;
+    httpRequest = _ref.request;
   var childrenColumnName = (expandable === null || expandable === void 0 ? void 0 : expandable.childrenColumnName) || 'children';
 
+  // 接口字段指定全局配置
+  var globalFieldNames = useProTableTreeFields();
+  // 接口字段指定
+  var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), props.fieldNames);
+
   // 获取数据
   var _onRequestTree = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {

package/es/upload/upload-image.js

@@ -109,8 +109,7 @@ export function ImageUpload(_ref) {
                   width: '100%'
                 },
                 src: file.preview
-              }),
-              footer: null
+              })
             });
           case 5:
           case "end":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.1.6",
+  "version": "2.1.8",
   "description": "",
   "license": "MIT",
   "author": {