@ccs-ui/rc-pro 2.1.9 → 2.2.0

package/es/button/index.d.ts

@@ -45,7 +45,7 @@ export declare function ModalConfirm({ modalRef }: {
 }): import("react/jsx-runtime").JSX.Element;
 type CcsAuthButtonProps = Omit<ButtonProps, 'onClick'> & {
     /** 权限标识 */
-    auth: string;
+    auth?: string;
     /** 文本 */
     text?: string;
     /** 二次确认消息 */

package/es/dialog/HookDrawer.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); }
-var _excluded = ["auth", "form", "content", "className", "rootStyle", "getContainer", "request", "onClose", "onOk"];
+var _excluded = ["auth", "form", "content", "extraBtn", "className", "rootStyle", "getContainer", "requestFieldNames", "preventRequestHandle", "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); }); }; }
@@ -18,10 +18,10 @@ 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 { useImperativeHandle, useRef, useState } from 'react';
-import CcsDialogButtons, { DialogButtonHolder } from "./button";
+import { useImperativeHandle, useMemo, useRef, useState } from 'react';
+import { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
-import DialogRequestButton from "./DialogRequestButton";
+import { FooterButtonHolder } from "./drawer-footer";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
 var HookDrawer = function HookDrawer(props) {
@@ -48,14 +48,17 @@ var HookDrawer = function HookDrawer(props) {
   var auth = innerConfig.auth,
     form = innerConfig.form,
     content = innerConfig.content,
+    extraBtn = innerConfig.extraBtn,
     className = innerConfig.className,
     rootStyle = innerConfig.rootStyle,
     getContainer = innerConfig.getContainer,
+    requestFieldNames = innerConfig.requestFieldNames,
+    preventRequestHandle = innerConfig.preventRequestHandle,
     request = innerConfig.request,
     onClose = innerConfig.onClose,
     onOk = innerConfig.onOk,
     otherInnerConfig = _objectWithoutProperties(innerConfig, _excluded);
-  var close = /*#__PURE__*/function () {
+  var onHandleClose = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -74,13 +77,13 @@ var HookDrawer = function HookDrawer(props) {
         }
       }, _callee);
     }));
-    return function close() {
+    return function onHandleClose() {
       return _ref.apply(this, arguments);
     };
   }();
   useImperativeHandle(dialogRef, function () {
     return {
-      destroy: close,
+      destroy: onHandleClose,
       update: function update(newConfig) {
         setInnerConfig(function (originConfig) {
           return _objectSpread(_objectSpread({}, originConfig), newConfig);
@@ -100,48 +103,48 @@ var HookDrawer = function HookDrawer(props) {
   styles.mask = _objectSpread({
     background: 'rgba(0, 0, 0, 0.1)'
   }, styles.mask);
-  var renderExtra = function renderExtra() {
-    if (request) {
-      return /*#__PURE__*/_jsx(DialogRequestButton, {
-        auth: auth,
-        request: request,
-        onClose: close,
-        onOk: onOk,
-        formRef: formRef,
-        formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
-      });
-    }
+  var renderExtra = useMemo(function () {
     return /*#__PURE__*/_jsx(DialogButtonHolder, {
-      ref: buttonRef
+      auth: auth,
+      request: request,
+      onClose: onHandleClose,
+      onOk: onOk,
+      formRef: formRef,
+      extraBtn: extraBtn,
+      formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues,
+      buttonRef: buttonRef,
+      preventRequestHandle: preventRequestHandle,
+      requestFieldNames: requestFieldNames
     });
-  };
+  }, []);
   return /*#__PURE__*/_jsx(Drawer, _objectSpread(_objectSpread({
     afterOpenChange: function afterOpenChange(open) {
-      if (!open) afterClose();
-    }
+      if (!open && config.destroyOnClose !== false) afterClose();
+    },
+    extra: renderExtra,
+    footer: /*#__PURE__*/_jsx(FooterButtonHolder, {
+      buttonRef: footerRef
+    })
   }, otherInnerConfig), {}, {
-    onClose: close,
+    onClose: onHandleClose,
     className: classNames('ccs-dialog-drawer', className),
     styles: styles,
     rootStyle: _objectSpread(_objectSpread({}, !isCrInProp ? {
       position: 'absolute'
     } : {}), rootStyle),
     getContainer: isCrInProp ? getContainer : onGetContainer,
-    extra: renderExtra(),
-    footer: /*#__PURE__*/_jsx(DialogButtonHolder, {
-      ref: footerRef
-    }),
     children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
-        Buttons: CcsDialogButtons,
+        formRef: formRef,
         buttonRef: buttonRef,
         buttonType: 'drawer',
-        closeDialog: close,
+        onOkCallBack: onOk,
+        closeDialog: onHandleClose,
         drawerFooterRef: footerRef,
         formInitialValues: (form === null || form === void 0 ? void 0 : form.initialValues) || {}
       },
       children: form ? /*#__PURE__*/_jsx(DialogForm, {
-        ref: formRef,
+        formRef: formRef,
         formProps: form,
         children: content
       }) : content

package/es/dialog/HookModal.js

@@ -1,4 +1,4 @@
-var _excluded = ["auth", "form", "title", "content", "className", "extraBtn", "request", "onClose", "onOk"];
+var _excluded = ["auth", "form", "title", "content", "extraBtn", "className", "hideFooter", "preventRequestHandle", "requestFieldNames", "onOk", "request", "onClose"];
 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); } }
@@ -18,12 +18,10 @@ 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 React, { useImperativeHandle, useRef, useState } from 'react';
+import React, { useImperativeHandle, useMemo, useRef, useState } from 'react';
 import Draggable from 'react-draggable';
-import CcsDialogButtons, { DialogButtonHolder } from "./button";
+import { DialogButtonHolder } from "./button";
 import { DialogContentContext } from "./context";
-import DialogRequestButton from "./DialogRequestButton";
-import DialogSelfOkButton from "./DialogSelfOkButton";
 import DialogForm from "./form";
 import { jsx as _jsx } from "react/jsx-runtime";
 var DragModal = function DragModal(_ref) {
@@ -100,11 +98,14 @@ var HookModal = function HookModal(props) {
     form = innerConfig.form,
     title = innerConfig.title,
     content = innerConfig.content,
-    className = innerConfig.className,
     extraBtn = innerConfig.extraBtn,
+    className = innerConfig.className,
+    hideFooter = innerConfig.hideFooter,
+    preventRequestHandle = innerConfig.preventRequestHandle,
+    requestFieldNames = innerConfig.requestFieldNames,
+    onOk = innerConfig.onOk,
     request = innerConfig.request,
     onClose = innerConfig.onClose,
-    onOk = innerConfig.onOk,
     otherInnerConfig = _objectWithoutProperties(innerConfig, _excluded);
   var onHandleClose = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -131,7 +132,7 @@ var HookModal = function HookModal(props) {
   }();
   useImperativeHandle(dialogRef, function () {
     return {
-      destroy: close,
+      destroy: onHandleClose,
       update: function update(newConfig) {
         setInnerConfig(function (originConfig) {
           return _objectSpread(_objectSpread({}, originConfig), newConfig);
@@ -139,44 +140,27 @@ var HookModal = function HookModal(props) {
       }
     };
   });
-  var renderFooter = function renderFooter() {
-    // 传入接口请求参数
-    if (request) {
-      return /*#__PURE__*/_jsx(DialogRequestButton, {
-        auth: auth,
-        request: request,
-        onClose: onHandleClose,
-        onOk: onOk,
-        formRef: formRef,
-        extraBtn: extraBtn,
-        formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
-      });
-    }
-
-    // 传入onOk参数
-    if (onOk) {
-      return /*#__PURE__*/_jsx(DialogSelfOkButton, {
-        auth: auth,
-        onClose: onHandleClose,
-        formRef: formRef,
-        extraBtn: extraBtn,
-        onOk: onOk,
-        formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues
-      });
-    }
-
+  var renderFooter = useMemo(function () {
     // 对话框中使用buttons生成按钮
     return /*#__PURE__*/_jsx(DialogButtonHolder, {
+      auth: auth,
+      request: request,
+      onClose: onHandleClose,
+      onOk: onOk,
+      formRef: formRef,
       extraBtn: extraBtn,
-      ref: buttonRef
+      formInitialValues: form === null || form === void 0 ? void 0 : form.initialValues,
+      buttonRef: buttonRef,
+      preventRequestHandle: preventRequestHandle,
+      requestFieldNames: requestFieldNames
     });
-  };
+  }, []);
   return /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
     onCancel: onHandleClose,
     afterClose: afterClose
   }, otherInnerConfig), {}, {
     className: classNames('ccs-dialog-modal', className),
-    footer: renderFooter(),
+    footer: hideFooter ? undefined : renderFooter,
     title: /*#__PURE__*/_jsx("div", {
       style: {
         width: '100%',
@@ -209,14 +193,15 @@ var HookModal = function HookModal(props) {
     },
     children: /*#__PURE__*/_jsx(DialogContentContext.Provider, {
       value: {
+        formRef: formRef,
         buttonRef: buttonRef,
         buttonType: 'modal',
-        Buttons: CcsDialogButtons,
-        formInitialValues: (form === null || form === void 0 ? void 0 : form.initialValues) || {},
-        closeDialog: onHandleClose
+        onOkCallBack: onOk,
+        closeDialog: onHandleClose,
+        formInitialValues: (form === null || form === void 0 ? void 0 : form.initialValues) || {}
       },
       children: form ? /*#__PURE__*/_jsx(DialogForm, {
-        ref: formRef,
+        formRef: formRef,
         formProps: form,
         children: content
       }) : content

package/es/dialog/button.d.ts

@@ -1,14 +1,24 @@
-import React from 'react';
+import { FormProps } from 'antd';
+import React, { RefObject } from 'react';
 import { PropsWithNodeChildren } from '../ccs';
+import { DialogFormRef } from './form';
 import { CcsDialogModalProps } from './hook';
 export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClose' | 'cancelText'> & PropsWithNodeChildren & {
+    /** 按钮权限 */
     okAuth?: string;
+    /** loading 状态 */
     loading?: boolean;
+    /** 隐藏取消按钮 */
     hideCancel?: boolean;
-    onOk?: (values?: T) => void;
+    /** 返回Promise false 则阻止弹窗关闭 */
+    onOk?: (values?: T) => Promise<boolean> | boolean;
 };
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: React.MemoExoticComponent<React.ForwardRefExoticComponent<Pick<CcsDialogModalProps, "extraBtn"> & React.RefAttributes<DialogButtonRef>>>;
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onClose" | "onOk" | "auth" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
+    formRef: React.RefObject<DialogFormRef<TParams>>;
+    formInitialValues: FormProps['initialValues'];
+    buttonRef: RefObject<DialogButtonRef>;
+}) => 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/button.js

@@ -1,9 +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 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 _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 _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); }
@@ -11,67 +14,212 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { CcsButton } from "./..";
-import CcsUtils from '@ccs-ui/utils';
 import { Button, Form } from 'antd';
-import React, { useEffect, useImperativeHandle, useRef, useState } from 'react';
+import React, { useEffect, useImperativeHandle, useState } from 'react';
 import 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";
-export var DialogButtonHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var extraBtn = _ref.extraBtn;
+export var DialogButtonHolder = function DialogButtonHolder(_ref) {
+  var auth = _ref.auth,
+    extraBtn = _ref.extraBtn,
+    formRef = _ref.formRef,
+    request = _ref.request,
+    onOk = _ref.onOk,
+    onClose = _ref.onClose,
+    buttonRef = _ref.buttonRef,
+    requestFieldNames = _ref.requestFieldNames,
+    formInitialValues = _ref.formInitialValues,
+    preventRequestHandle = _ref.preventRequestHandle;
   var _useState = useState(),
     _useState2 = _slicedToArray(_useState, 2),
     buttons = _useState2[0],
     setButtons = _useState2[1];
-  var noBtnRef = useRef(null);
-  useImperativeHandle(ref, function () {
+  var _useState3 = useState(false),
+    _useState4 = _slicedToArray(_useState3, 2),
+    loading = _useState4[0],
+    setLoading = _useState4[1];
+  var globalFieldNames = useDialogFields();
+  useImperativeHandle(buttonRef, function () {
     return {
       onSetButtons: function onSetButtons(e) {
-        return setButtons(e);
+        setButtons(e);
       }
     };
   });
-  useEffect(function () {
-    if (buttons) {
-      noBtnRef.current.parentElement.removeAttribute('style');
+
+  // 处理关闭
+  var onHandleClose = function onHandleClose(params, result) {
+    if (onOk) {
+      var okResult = onOk(params, result);
+      // 返回false阻止关闭对话框
+      if (typeof okResult === 'boolean' && okResult === false) {
+        return;
+      }
+
+      // 返回promiss
+      if (_typeof(okResult) === 'object') {
+        setLoading(true);
+        try {
+          okResult.then(function (d) {
+            setLoading(false);
+            if (d !== false) onClose();
+          });
+        } catch (error) {
+          setLoading(false);
+          onClose();
+        }
+        return;
+      }
+      onClose();
     } else {
-      // 没有按钮时，ant-modal-footer padding置0。
-      noBtnRef.current.parentElement.style.padding = '0px';
+      onClose();
     }
-  }, [buttons]);
+  };
+
+  // 确定事件
+  var onOkClick = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+      var _formRef$current;
+      var values, form, formValues;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            values = {};
+            form = (_formRef$current = formRef.current) === null || _formRef$current === void 0 ? void 0 : _formRef$current.formInstance; // 存在form 获取form值
+            if (!form) {
+              _context.next = 7;
+              break;
+            }
+            _context.next = 5;
+            return form.validateFields();
+          case 5:
+            formValues = _context.sent;
+            values = _objectSpread(_objectSpread({}, formInitialValues), formValues);
+          case 7:
+            if (!request) {
+              _context.next = 11;
+              break;
+            }
+            setLoading(true);
+            request(values).then(function (result) {
+              setLoading(false);
+
+              // 不处理请求结果
+              if (preventRequestHandle) {
+                onHandleClose(values, result);
+                return;
+              }
+              var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), requestFieldNames);
+
+              // 获取成功标识
+              var success = getDataFromFields(result, fieldNames.success);
+              // 获取异常信息
+              var msg = getDataFromFields(result, fieldNames.errorMsg);
+              if (success) {
+                // 关闭对话框
+                onHandleClose(values, result);
+              }
+
+              // 抛出操作结果
+              CcsDialog.easyMessage({
+                success: success,
+                msg: msg
+              });
+            }).catch(function (err) {
+              setLoading(false);
+              console.log('e', err);
+            });
+            return _context.abrupt("return");
+          case 11:
+            onHandleClose(values);
+          case 12:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function onOkClick() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  if (!buttons) {
+    return /*#__PURE__*/_jsxs(_Fragment, {
+      children: [extraBtn, /*#__PURE__*/_jsx(Button, {
+        onClick: onClose,
+        children: "\u53D6\u6D88"
+      }), /*#__PURE__*/_jsx(CcsButton, {
+        auth: auth,
+        type: "primary",
+        loading: loading,
+        onClick: onOkClick,
+        children: "\u786E\u5B9A"
+      })]
+    });
+  }
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [extraBtn, buttons, /*#__PURE__*/_jsx("div", {
-      ref: noBtnRef
-    })]
+    children: [extraBtn, buttons]
   });
-}));
-export default function CcsDialogButtons(_ref2) {
-  var okText = _ref2.okText,
-    okAuth = _ref2.okAuth,
-    loading = _ref2.loading,
-    children = _ref2.children,
-    hideCancel = _ref2.hideCancel,
-    cancelText = _ref2.cancelText,
-    onOk = _ref2.onOk;
+};
+export default function CcsDialogButtons(_ref3) {
+  var okText = _ref3.okText,
+    okAuth = _ref3.okAuth,
+    loading = _ref3.loading,
+    children = _ref3.children,
+    hideCancel = _ref3.hideCancel,
+    cancelText = _ref3.cancelText,
+    onOk = _ref3.onOk;
   var _CcsDialog$useInstanc = CcsDialog.useInstance(),
     closeDialog = _CcsDialog$useInstanc.closeDialog,
     buttonRef = _CcsDialog$useInstanc.buttonRef,
     formInitialValues = _CcsDialog$useInstanc.formInitialValues,
-    buttonType = _CcsDialog$useInstanc.buttonType;
+    buttonType = _CcsDialog$useInstanc.buttonType,
+    onOkCallBack = _CcsDialog$useInstanc.onOkCallBack;
   var form = Form.useFormInstance();
-  var onOkClick = function onOkClick() {
-    if (!onOk) return;
-
-    // form返回表单值和所有初始值
-    if (form) {
-      form.validateFields().then(function (values) {
-        onOk(_objectSpread(_objectSpread({}, formInitialValues), values));
-      });
-      return;
-    }
-    onOk();
-  };
+  var onOkClick = /*#__PURE__*/function () {
+    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+      var values, formValues, isOk;
+      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            if (onOk) {
+              _context2.next = 2;
+              break;
+            }
+            return _context2.abrupt("return");
+          case 2:
+            // form返回表单值和所有初始值
+            values = {};
+            if (!form) {
+              _context2.next = 8;
+              break;
+            }
+            _context2.next = 6;
+            return form.validateFields();
+          case 6:
+            formValues = _context2.sent;
+            values = _objectSpread(_objectSpread({}, formInitialValues), formValues);
+          case 8:
+            _context2.next = 10;
+            return onOk(values);
+          case 10:
+            isOk = _context2.sent;
+            if (isOk !== false) {
+              closeDialog();
+              onOkCallBack === null || onOkCallBack === void 0 || onOkCallBack(values);
+            }
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function onOkClick() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
   useEffect(function () {
     var _buttonRef$current;
     if (!onOk && !children) return;
@@ -94,7 +242,6 @@ export default function CcsDialogButtons(_ref2) {
         children: btns
       });
     }
-    CcsUtils.showWarning(!!buttonRef.current, "\u68C0\u6D4B\u5230".concat(buttonType === 'modal' ? 'openModal' : 'openDrawer', "\u4F20\u5165request\u53C2\u6570\uFF0CButtons\u5C06\u4E0D\u80FD\u751F\u6548\u3002"));
     (_buttonRef$current = buttonRef.current) === null || _buttonRef$current === void 0 || _buttonRef$current.onSetButtons(btns);
   });
   return /*#__PURE__*/_jsx(_Fragment, {});