@ccs-ui/rc-pro 2.1.9 → 2.2.1-beta-1

package/es/dialog/context.d.ts

@@ -1,19 +1,23 @@
 import { Store } from 'antd/es/form/interface';
-import React, { ReactElement, RefObject } from 'react';
-import { DialogButtonRef, DialogButtonsProps } from './button';
+import React, { RefObject } from 'react';
+import { DialogButtonRef } from './button';
+import { DialogFormRef } from './form';
+import { OkEvent } from './hook';
 type DialogContextType<T = Store> = {
     /** 表单初始值 */
     formInitialValues: T;
-    /** 按钮组件 */
-    Buttons: (e: DialogButtonsProps<T>) => ReactElement;
+    /** ant form 实例 */
+    formRef?: React.RefObject<DialogFormRef<T>>;
     /** 按钮类型 */
     buttonType: 'modal' | 'drawer';
     /** 按钮 ref */
     buttonRef: RefObject<DialogButtonRef>;
     /** drawer footer ref */
     drawerFooterRef?: RefObject<DialogButtonRef>;
-    /** 关闭弹框，可以设置返回值 */
-    closeDialog: (e?: any) => void;
+    /** 关闭弹框回调 */
+    closeDialog: () => void;
+    /** 确定回调 */
+    onOkCallBack: OkEvent<any, any> | undefined;
 };
 declare const DialogContentContext: React.Context<DialogContextType<any>>;
 declare const useDialogContext: <T = Store>() => DialogContextType<T>;

package/es/dialog/context.js

@@ -1,4 +1,7 @@
 import React, { useContext } from 'react';
+
+// formInstance?: FormInstance<T>;
+
 var DialogContentContext = /*#__PURE__*/React.createContext({});
 var useDialogContext = function useDialogContext() {
   var context = useContext(DialogContentContext);

package/es/dialog/drawer-footer.d.ts

@@ -1,4 +1,6 @@
+import { RefObject } from 'react';
 import { PropsWithNodeChildren } from '../ccs';
+import { DialogButtonRef } from './button';
 type DialogButtonsProps = PropsWithNodeChildren & {
     okText?: string;
     cancelText?: string;
@@ -7,5 +9,8 @@ type DialogButtonsProps = PropsWithNodeChildren & {
     hideCancel?: boolean;
     onOk?: (values?: any) => void;
 };
-export default function CcsDrawerFooter({ okText, okAuth, loading, children, hideCancel, cancelText, onOk, }: DialogButtonsProps): null;
+export declare const FooterButtonHolder: ({ buttonRef, }: {
+    buttonRef: RefObject<DialogButtonRef>;
+}) => import("react/jsx-runtime").JSX.Element;
+export default function CcsDrawerFooter({ children }: DialogButtonsProps): null;
 export {};

package/es/dialog/drawer-footer.js

@@ -1,57 +1,41 @@
-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 { CcsButton } from "./..";
-import { Button, Form } from 'antd';
-import { useEffect } from 'react';
+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 { useEffect, useImperativeHandle, useState } from 'react';
 import CcsDialog from '.';
-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 default function CcsDrawerFooter(_ref) {
-  var okText = _ref.okText,
-    okAuth = _ref.okAuth,
-    loading = _ref.loading,
-    children = _ref.children,
-    hideCancel = _ref.hideCancel,
-    cancelText = _ref.cancelText,
-    onOk = _ref.onOk;
-  var _CcsDialog$useInstanc = CcsDialog.useInstance(),
-    closeDialog = _CcsDialog$useInstanc.closeDialog,
-    drawerFooterRef = _CcsDialog$useInstanc.drawerFooterRef,
-    formInitialValues = _CcsDialog$useInstanc.formInitialValues;
-  var form = Form.useFormInstance();
-  var onOkClick = function onOkClick() {
-    if (!onOk) return;
+import { jsx as _jsx } from "react/jsx-runtime";
+// drawer footer holder
+export var FooterButtonHolder = function FooterButtonHolder(_ref) {
+  var buttonRef = _ref.buttonRef;
+  var _useState = useState(),
+    _useState2 = _slicedToArray(_useState, 2),
+    buttons = _useState2[0],
+    setButtons = _useState2[1];
+  useImperativeHandle(buttonRef, function () {
+    return {
+      onSetButtons: function onSetButtons(e) {
+        setButtons(e);
+      }
+    };
+  });
+  return /*#__PURE__*/_jsx(_Fragment, {
+    children: buttons
+  });
+};
 
-    // form返回表单值和所有初始值
-    if (form) {
-      form.validateFields().then(function (values) {
-        onOk(_objectSpread(_objectSpread({}, formInitialValues), values));
-      });
-      return;
-    }
-    onOk();
-  };
+// drawer footer content
+export default function CcsDrawerFooter(_ref2) {
+  var children = _ref2.children;
+  var _CcsDialog$useInstanc = CcsDialog.useInstance(),
+    drawerFooterRef = _CcsDialog$useInstanc.drawerFooterRef;
   useEffect(function () {
     var _drawerFooterRef$curr;
-    if (!onOk && !children) return;
-    var btns = /*#__PURE__*/_jsxs(_Fragment, {
-      children: [children, onOk && /*#__PURE__*/_jsxs(_Fragment, {
-        children: [!hideCancel && /*#__PURE__*/_jsx(Button, {
-          onClick: closeDialog,
-          children: cancelText || '取消'
-        }), /*#__PURE__*/_jsx(CcsButton, {
-          auth: okAuth || '',
-          type: "primary",
-          loading: loading,
-          onClick: onOkClick,
-          children: okText || '确定'
-        })]
-      })]
+    var btns = /*#__PURE__*/_jsx(_Fragment, {
+      children: children
     });
     drawerFooterRef === null || drawerFooterRef === void 0 || (_drawerFooterRef$curr = drawerFooterRef.current) === null || _drawerFooterRef$curr === void 0 || _drawerFooterRef$curr.onSetButtons(btns);
   });

package/es/dialog/form.d.ts

@@ -1,15 +1,16 @@
 import { FormInstance, FormProps } from 'antd';
 import React, { ReactNode } from 'react';
-type PropsType = {
+type PropsType<TParams> = {
     children: ReactNode;
     formProps: FormProps;
+    formRef: React.RefObject<DialogFormRef<TParams>>;
 };
-export type DialogFormRef = {
-    formInstance: FormInstance;
+export type DialogFormRef<TParams> = {
+    formInstance: FormInstance<TParams>;
 };
 /**
  * 添加form实例
  * @returns
  */
-declare const DialogForm: React.ForwardRefExoticComponent<PropsType & React.RefAttributes<DialogFormRef>>;
+declare const DialogForm: <TParams>({ formRef, children, formProps: { labelCol, wrapperCol, ...restProps }, }: PropsType<TParams>) => import("react/jsx-runtime").JSX.Element;
 export default DialogForm;

package/es/dialog/form.js

@@ -20,8 +20,9 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * 添加form实例
  * @returns
  */
-var DialogForm = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var children = _ref.children,
+var DialogForm = function DialogForm(_ref) {
+  var formRef = _ref.formRef,
+    children = _ref.children,
     _ref$formProps = _ref.formProps,
     labelCol = _ref$formProps.labelCol,
     wrapperCol = _ref$formProps.wrapperCol,
@@ -29,7 +30,7 @@ var DialogForm = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  useImperativeHandle(ref, function () {
+  useImperativeHandle(formRef, function () {
     return {
       formInstance: form
     };
@@ -46,5 +47,5 @@ var DialogForm = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
   }, restProps), {}, {
     children: children
   }));
-});
+};
 export default DialogForm;

package/es/dialog/hook.d.ts

@@ -24,37 +24,37 @@ export type DialogRequestData = {
     msg: string;
 };
 export type Service<TParams, TData> = (params: TParams) => Promise<TData>;
-export type OkEvent<TParams> = (params?: TParams) => Promise<boolean> | boolean | void;
+export type OkEvent<TParams, TData> = (params?: TParams, result?: TData) => Promise<boolean | undefined> | 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<TParams, TData> & Omit<ModalFuncProps, 'onCancel' | 'afterOpenChange' | 'onOk' | 'footer'> & {
+type DialogProps<TParams, TData> = {
     /** antd form */
     form?: FormProps;
     /** 表单接口请求权限 */
     auth?: string;
-    /** 关闭后销毁组件，默认true */
-    destroyOnClose?: boolean;
     /** 通过参数传递的扩展按钮 */
     extraBtn?: ReactNode;
+    /** 确定按钮，返回false 或者 promiss false 则阻止关闭对话框 */
+    onOk?: OkEvent<TParams, TData>;
+    /** 表单接口请求 */
+    request?: Service<TParams, TData>;
+    /** 请求success和errorMsg字段指定 */
+    requestFieldNames?: {
+        success?: string[];
+        errorMsg?: string[];
+    };
+    /** 阻止对request结果进行处理 */
+    preventRequestHandle?: boolean;
     /** 弹框关闭回调 */
     onClose?: () => void;
 };
-export type CcsDialogDrawerProps<TParams = any, TData = any> = DialogEvent<TParams, TData> & Omit<DrawerProps, 'extra' | 'onClose' | 'onOk' | 'afterOpenChange' | 'footer'> & {
-    /** antd form */
-    form?: FormProps;
-    /** 表单接口请求权限 */
-    auth?: string;
+export type CcsDialogModalProps<TParams = any, TData = any> = DialogProps<TParams, TData> & Omit<ModalFuncProps, 'onCancel' | 'afterOpenChange' | 'onOk' | 'footer'> & {
+    /** 关闭后销毁组件，默认true */
+    destroyOnClose?: boolean;
+    hideFooter?: boolean;
+};
+export type CcsDialogDrawerProps<TParams = any, TData = any> = DialogProps<TParams, TData> & Omit<DrawerProps, 'onClose' | 'onOk' | 'afterOpenChange' | 'footer'> & {
     /** 抽屉内容 */
     content?: ReactNode;
-    /** 通过参数传递的扩展按钮 */
-    extraBtn?: ReactNode;
-    /** 弹框关闭回调 */
-    onClose?: () => void;
 };
 export type ModalDialog = (...args: Parameters<ModalFunc>) => ReturnType<ModalFunc>;
 export type DrawerDialog = (...args: Parameters<ModalFunc>) => ReturnType<DrawerFunc>;

package/es/dialog/hook.js

@@ -13,6 +13,8 @@ import CcsUtils from '@ccs-ui/utils';
 import _debounce from 'lodash.debounce';
 import React from 'react';
 import { createRoot } from 'react-dom/client';
+import { useCcsPage } from '..';
+import { PageContext } from "../context";
 import useAppConfig from "../hooks/use-app";
 import HookDrawer from "./HookDrawer";
 import HookModal from "./HookModal";
@@ -53,6 +55,7 @@ export default function useCcsDialog() {
     actionQueue = _React$useState2[0],
     setActionQueue = _React$useState2[1];
   var appConfig = useAppConfig() || {};
+  var CcsPageContext = useCcsPage();
   React.useEffect(function () {
     if (actionQueue.length) {
       var cloneQueue = _toConsumableArray(actionQueue);
@@ -69,7 +72,7 @@ export default function useCcsDialog() {
     // 关闭事件
     var closeFunc;
     // modal
-    var modal = /*#__PURE__*/_jsx(HookModal, {
+    var dialog = /*#__PURE__*/_jsx(HookModal, {
       config: config,
       afterClose: function afterClose() {
         var _closeFunc;
@@ -77,12 +80,19 @@ export default function useCcsDialog() {
       },
       dialogRef: modalRef
     }, "modal-".concat(modalUuid));
-
+    console.log('modal CcsPageContext ...', CcsPageContext);
+    // 添加page上下文
+    if (CcsPageContext && CcsPageContext.id) {
+      dialog = /*#__PURE__*/_jsx(PageContext.Provider, {
+        value: CcsPageContext,
+        children: dialog
+      });
+    }
     // 优先使用自定义contextHolder、其次使用全局contextHolder
     var $holderRef = holderRef.current ? holderRef : appConfig.holderRef;
     if ($holderRef !== null && $holderRef !== void 0 && $holderRef.current) {
       // 加载了contextHolder
-      closeFunc = $holderRef.current.patchElement(modal);
+      closeFunc = $holderRef.current.patchElement(dialog);
     } else {
       CcsUtils.showWarning(false, "\u672A\u4F7F\u7528CssAppConfig\u5168\u5C40\u914D\u7F6E\u3001\u4E5F\u672A\u5C06contextHolder\u63D2\u5165\u7EC4\u4EF6\u4E2D\uFF0C\u5C06\u65E0\u6CD5\u9002\u914Dantd\u4E3B\u9898\u914D\u7F6E\u548C\u83B7\u53D6context\u3002");
       // 未加载contextHolder，创建dom
@@ -90,7 +100,7 @@ export default function useCcsDialog() {
       document.body.append(dialogEle);
       var root = createRoot(dialogEle);
       root.render( /*#__PURE__*/_jsx(_Fragment, {
-        children: modal
+        children: dialog
       }));
       closeFunc = function closeFunc() {
         setTimeout(function () {
@@ -133,21 +143,29 @@ export default function useCcsDialog() {
   }, []);
   var getDrawerFunc = React.useCallback(function (config) {
     drawerUuid += 1;
-    var modalRef = /*#__PURE__*/React.createRef();
+    var dialogRef = /*#__PURE__*/React.createRef();
     var closeFunc;
-    var modal = /*#__PURE__*/_jsx(HookDrawer, {
+    var dialog = /*#__PURE__*/_jsx(HookDrawer, {
       config: config,
       afterClose: function afterClose() {
         var _closeFunc2;
         (_closeFunc2 = closeFunc) === null || _closeFunc2 === void 0 || _closeFunc2();
       },
-      dialogRef: modalRef
+      dialogRef: dialogRef
     }, "drawer-".concat(drawerUuid));
+    console.log('drawer CcsPageContext ...', CcsPageContext);
+    // 添加page上下文
+    if (CcsPageContext && CcsPageContext.id) {
+      dialog = /*#__PURE__*/_jsx(PageContext.Provider, {
+        value: CcsPageContext,
+        children: dialog
+      });
+    }
     var $holderRef = holderRef.current ? holderRef : appConfig.holderRef;
     if ($holderRef !== null && $holderRef !== void 0 && $holderRef.current) {
       var _$holderRef$current;
       // 加载了contextHolder
-      closeFunc = (_$holderRef$current = $holderRef.current) === null || _$holderRef$current === void 0 ? void 0 : _$holderRef$current.patchElement(modal);
+      closeFunc = (_$holderRef$current = $holderRef.current) === null || _$holderRef$current === void 0 ? void 0 : _$holderRef$current.patchElement(dialog);
     } else {
       CcsUtils.showWarning(false, "\u672A\u4F7F\u7528CssAppConfig\u5168\u5C40\u914D\u7F6E\u3001\u4E5F\u672A\u5C06contextHolder\u63D2\u5165\u7EC4\u4EF6\u4E2D\uFF0C\u5C06\u65E0\u6CD5\u9002\u914Dantd\u4E3B\u9898\u914D\u7F6E\u548C\u83B7\u53D6context\u3002");
       // 未加载contextHolder，创建dom
@@ -155,7 +173,7 @@ export default function useCcsDialog() {
       document.body.append(dialogEle);
       var root = createRoot(dialogEle);
       root.render( /*#__PURE__*/_jsx(_Fragment, {
-        children: modal
+        children: dialog
       }));
       closeFunc = function closeFunc() {
         setTimeout(function () {
@@ -169,10 +187,10 @@ export default function useCcsDialog() {
     var instance = {
       destroy: function destroy() {
         function destroyAction() {
-          var _modalRef$current3;
-          (_modalRef$current3 = modalRef.current) === null || _modalRef$current3 === void 0 || _modalRef$current3.destroy();
+          var _dialogRef$current;
+          (_dialogRef$current = dialogRef.current) === null || _dialogRef$current === void 0 || _dialogRef$current.destroy();
         }
-        if (modalRef.current) {
+        if (dialogRef.current) {
           destroyAction();
         } else {
           setActionQueue(function (prev) {
@@ -181,11 +199,12 @@ export default function useCcsDialog() {
         }
       },
       update: function update(newConfig) {
+        console.log('newConfig', newConfig, dialogRef.current);
         function updateAction() {
-          var _modalRef$current4;
-          (_modalRef$current4 = modalRef.current) === null || _modalRef$current4 === void 0 || _modalRef$current4.update(newConfig);
+          var _dialogRef$current2;
+          (_dialogRef$current2 = dialogRef.current) === null || _dialogRef$current2 === void 0 || _dialogRef$current2.update(newConfig);
         }
-        if (modalRef.current) {
+        if (dialogRef.current) {
           updateAction();
         } else {
           setActionQueue(function (prev) {

package/es/dialog/index.d.ts

@@ -1,5 +1,5 @@
 import ThemeDialog from '../theme-dialog';
-import CcsDialogButtons from './button';
+import CcsDialogFooter from './button';
 import { useDialogContext } from './context';
 import CcsDrawerFooter from './drawer-footer';
 import useCcsDialog from './hook';
@@ -10,7 +10,7 @@ type DialogInterface = {
     /** dialog 实例 */
     useInstance: typeof useDialogContext;
     /** dialog 按钮 */
-    Buttons: typeof CcsDialogButtons;
+    Buttons: typeof CcsDialogFooter;
     /** drawer footer */
     DrawerFooter: typeof CcsDrawerFooter;
 };

package/es/dialog/index.js

@@ -1,11 +1,11 @@
 import ThemeDialog from "../theme-dialog";
-import CcsDialogButtons from "./button";
+import CcsDialogFooter from "./button";
 import { useDialogContext } from "./context";
 import CcsDrawerFooter from "./drawer-footer";
 import useCcsDialog from "./hook";
 import "./index.less";
 var CcsDialog = ThemeDialog;
-CcsDialog.Buttons = CcsDialogButtons;
+CcsDialog.Buttons = CcsDialogFooter;
 CcsDialog.useDialog = useCcsDialog;
 CcsDialog.useInstance = useDialogContext;
 CcsDialog.DrawerFooter = CcsDrawerFooter;

package/package.json

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

package/es/dialog/DialogRequestButton.d.ts

@@ -1,8 +0,0 @@
-import { FormProps } from 'antd';
-import { DialogFormRef } from './form';
-import { CcsDialogModalProps } from './hook';
-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;
-export default DialogRequestButton;

package/es/dialog/DialogRequestButton.js

@@ -1,116 +0,0 @@
-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, 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";
-var DialogRequestButton = function DialogRequestButton(_ref) {
-  var auth = _ref.auth,
-    formRef = _ref.formRef,
-    extraBtn = _ref.extraBtn,
-    _ref$formInitialValue = _ref.formInitialValues,
-    formInitialValues = _ref$formInitialValue === void 0 ? {} : _ref$formInitialValue,
-    request = _ref.request,
-    onOk = _ref.onOk,
-    onClose = _ref.onClose;
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    loading = _useState2[0],
-    setLoading = _useState2[1];
-  var fieldNames = useDialogFields();
-  var onOkClick = /*#__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) {
-              setLoading(true);
-              var params = _objectSpread(_objectSpread({}, formInitialValues), values);
-              request(params).then(function (result) {
-                setLoading(false);
-
-                // 获取成功标识
-                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({
-                  success: success,
-                  msg: msg
-                });
-              }).catch(function (err) {
-                setLoading(false);
-                console.log('e', err);
-              });
-            });
-          case 4:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function onOkClick() {
-      return _ref2.apply(this, arguments);
-    };
-  }();
-  return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [extraBtn, /*#__PURE__*/_jsx(Button, {
-      onClick: onClose,
-      children: "\u53D6\u6D88"
-    }), /*#__PURE__*/_jsx(CcsButton, {
-      auth: auth || '',
-      type: "primary",
-      onClick: onOkClick,
-      loading: loading,
-      children: "\u786E\u5B9A"
-    })]
-  });
-};
-export default DialogRequestButton;

package/es/dialog/DialogSelfOkButton.d.ts

@@ -1,8 +0,0 @@
-import { FormProps } from 'antd';
-import { DialogFormRef } from './form';
-import { CcsDialogModalProps } from './hook';
-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;
-export default DialogSelfOkButton;