@ccs-ui/rc-pro 2.2.1 → 2.2.3

package/es/config.js

@@ -15,27 +15,12 @@ import { theme as antTheme, App, ConfigProvider, message, Modal, notification }
 import zhCN from 'antd/locale/zh_CN';
 import React, { useState } from 'react';
 import { AppConfigContext } from "./context";
-import usePatchElement from "./dialog/usePatchElement";
+import { DialogElementsHolder } from "./dialog/hook";
 import ThemeDialog from "./theme-dialog";
 import WaterMarkRelative from "./water-mark/relative";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var ElementsHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_props, ref) {
-  var _usePatchElement = usePatchElement(),
-    _usePatchElement2 = _slicedToArray(_usePatchElement, 2),
-    elements = _usePatchElement2[0],
-    patchElement = _usePatchElement2[1];
-  React.useImperativeHandle(ref, function () {
-    return {
-      patchElement: patchElement
-    };
-  }, []);
-  // eslint-disable-next-line react/jsx-no-useless-fragment
-  return /*#__PURE__*/_jsx(_Fragment, {
-    children: elements
-  });
-}));
+import { jsx as _jsx } from "react/jsx-runtime";
 function AppDialog() {
   var _message$useMessage = message.useMessage(),
     _message$useMessage2 = _slicedToArray(_message$useMessage, 2),
@@ -69,7 +54,7 @@ function AppConfig(_ref) {
     watermark = _ref.watermark,
     themeConfig = _ref.themeConfig,
     fieldNames = _ref.fieldNames;
-  var holderRef = React.useRef(null);
+  var dialogHolderRef = React.useRef(null);
   // 主题
   var appTheme = theme === 'dark' ? darkTheme : defaultTheme;
   var algorithm = function algorithm() {
@@ -96,11 +81,11 @@ function AppConfig(_ref) {
       value: {
         theme: theme,
         themeConfig: themeConfig,
-        holderRef: holderRef,
+        dialogHolderRef: dialogHolderRef,
         fieldNames: fieldNames
       },
-      children: [children, /*#__PURE__*/_jsx(AppDialog, {}), /*#__PURE__*/_jsx(ElementsHolder, {
-        ref: holderRef
+      children: [children, /*#__PURE__*/_jsx(AppDialog, {}), /*#__PURE__*/_jsx(DialogElementsHolder, {
+        ref: dialogHolderRef
       }, "modal-drawer-holder"), (watermark === null || watermark === void 0 ? void 0 : watermark.content) && /*#__PURE__*/_jsx(WaterMarkRelative, {
         content: watermark.content,
         fontColor: "rgba(0,0,0,.15)",

package/es/context/index.d.ts

@@ -38,6 +38,8 @@ type PageContextType = {
     location: Location;
     /** 当前页面是否选中 */
     isActive: boolean;
+    /** dialog holder */
+    dialogHolderRef: React.RefObject<ElementsHolderRef>;
     /** 销毁页面 */
     onDestroy: (path: string) => void;
     /** 获取按钮权限 */
@@ -70,7 +72,7 @@ type CssAppConfigType = {
     /** 全局水印 */
     watermark?: WaterMarkProps;
     /** modal or drawer holder */
-    holderRef?: React.RefObject<ElementsHolderRef>;
+    dialogHolderRef?: React.RefObject<ElementsHolderRef>;
     /** 接口字段指定 */
     fieldNames?: {
         /** CcsProTable 组件字段全局指定 */

package/es/dialog/button.d.ts

@@ -10,13 +10,13 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
     loading?: boolean;
     /** 隐藏取消按钮 */
     hideCancel?: boolean;
-    /** 返回Promise false 则阻止弹窗关闭 */
-    onOk?: (values?: T) => Promise<boolean> | boolean | undefined | void;
+    /** 返回false或Promise false 则阻止弹窗关闭 */
+    onOk?: (values: T) => any;
 };
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onOk" | "onClose" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onOk" | "onClose" | "auth" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/dialog/button.js

@@ -60,17 +60,12 @@ export var DialogButtonHolder = function DialogButtonHolder(_ref) {
       }
 
       // 返回promiss
-      if (_typeof(okResult) === 'object') {
+      if (_typeof(okResult) === 'object' && okResult.then) {
         setLoading(true);
-        try {
-          okResult.then(function (d) {
-            setLoading(false);
-            if (d !== false) onClose();
-          });
-        } catch (error) {
+        okResult.then(function (d) {
           setLoading(false);
-          onClose();
-        }
+          if (d !== false) onClose();
+        });
         return;
       }
       onClose();
@@ -180,7 +175,7 @@ export default function CcsDialogButtons(_ref3) {
   var form = Form.useFormInstance();
   var onOkClick = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var values, formValues, isOk;
+      var values, formValues, okResult;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -202,15 +197,28 @@ export default function CcsDialogButtons(_ref3) {
             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);
+            okResult = onOk(values); // 返回false阻止关闭对话框
+            if (!(okResult === false)) {
+              _context2.next = 11;
+              break;
             }
-          case 12:
+            return _context2.abrupt("return");
+          case 11:
+            if (!(_typeof(okResult) === 'object' && okResult.then)) {
+              _context2.next = 14;
+              break;
+            }
+            okResult.then(function (d) {
+              if (d !== false) {
+                closeDialog();
+                onOkCallBack === null || onOkCallBack === void 0 || onOkCallBack(d);
+              }
+            });
+            return _context2.abrupt("return");
+          case 14:
+            closeDialog();
+            onOkCallBack === null || onOkCallBack === void 0 || onOkCallBack(okResult);
+          case 16:
           case "end":
             return _context2.stop();
         }

package/es/dialog/hook.d.ts

@@ -66,5 +66,6 @@ export type CcsDialogType = {
 export type ElementsHolderRef = {
     patchElement: ReturnType<typeof usePatchElement>[1];
 };
+export declare const DialogElementsHolder: React.MemoExoticComponent<React.ForwardRefExoticComponent<React.RefAttributes<ElementsHolderRef>>>;
 export default function useCcsDialog(): CcsDialogType;
 export {};

package/es/dialog/hook.js

@@ -14,7 +14,6 @@ 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";
@@ -30,7 +29,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
 //   update: (configUpdate: ModalFuncProps) => void;
 // };
 
-var ElementsHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_props, ref) {
+export var DialogElementsHolder = /*#__PURE__*/React.memo( /*#__PURE__*/React.forwardRef(function (_props, ref) {
   var _usePatchElement = usePatchElement(),
     _usePatchElement2 = _slicedToArray(_usePatchElement, 2),
     elements = _usePatchElement2[0],
@@ -56,6 +55,7 @@ export default function useCcsDialog() {
     setActionQueue = _React$useState2[1];
   var appConfig = useAppConfig() || {};
   var CcsPageContext = useCcsPage();
+  var dialogHolderRef = CcsPageContext.dialogHolderRef || appConfig.dialogHolderRef;
   React.useEffect(function () {
     if (actionQueue.length) {
       var cloneQueue = _toConsumableArray(actionQueue);
@@ -80,15 +80,9 @@ export default function useCcsDialog() {
       },
       dialogRef: modalRef
     }, "modal-".concat(modalUuid));
-    // 添加page上下文
-    if (CcsPageContext && CcsPageContext.id) {
-      dialog = /*#__PURE__*/_jsx(PageContext.Provider, {
-        value: CcsPageContext,
-        children: dialog
-      });
-    }
+
     // 优先使用自定义contextHolder、其次使用全局contextHolder
-    var $holderRef = holderRef.current ? holderRef : appConfig.holderRef;
+    var $holderRef = holderRef.current ? holderRef : dialogHolderRef;
     if ($holderRef !== null && $holderRef !== void 0 && $holderRef.current) {
       // 加载了contextHolder
       closeFunc = $holderRef.current.patchElement(dialog);
@@ -153,14 +147,8 @@ export default function useCcsDialog() {
       dialogRef: dialogRef
     }, "drawer-".concat(drawerUuid));
 
-    // 添加page上下文
-    if (CcsPageContext && CcsPageContext.id) {
-      dialog = /*#__PURE__*/_jsx(PageContext.Provider, {
-        value: CcsPageContext,
-        children: dialog
-      });
-    }
-    var $holderRef = holderRef.current ? holderRef : appConfig.holderRef;
+    // 优先使用自定义contextHolder、其次使用全局contextHolder
+    var $holderRef = holderRef.current ? holderRef : dialogHolderRef;
     if ($holderRef !== null && $holderRef !== void 0 && $holderRef.current) {
       var _$holderRef$current;
       // 加载了contextHolder
@@ -239,7 +227,7 @@ export default function useCcsDialog() {
   return {
     openDrawer: fns.openDrawer,
     openModal: fns.openModal,
-    contextHolder: /*#__PURE__*/_jsx(ElementsHolder, {
+    contextHolder: /*#__PURE__*/_jsx(DialogElementsHolder, {
       ref: holderRef
     }, "modal-holder")
   };

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

@@ -1,7 +1,9 @@
+/// <reference types="react" />
 declare const usePage: () => {
     id: string;
     location: import("react-router").Location<any>;
     isActive: boolean;
+    dialogHolderRef: import("react").RefObject<import("../dialog/hook").ElementsHolderRef>;
     onDestroy: (path: string) => void;
     onAuth: (code: string) => boolean;
 };

package/es/layout-keep-alive/page.js

@@ -3,6 +3,7 @@ import classNames from 'classnames';
 import { memo, useRef } from 'react';
 import Scrollbars from 'react-custom-scrollbars';
 import { PageContext } from "../context";
+import { DialogElementsHolder } from "../dialog/hook";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default /*#__PURE__*/memo(function (props) {
@@ -13,9 +14,11 @@ export default /*#__PURE__*/memo(function (props) {
     onDestroy = props.onDestroy,
     breadcrumb = props.breadcrumb;
   var id = "_tab_content_".concat(locationRef.current.key);
+  var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
       id: id,
+      dialogHolderRef: dialogHolderRef,
       isActive: active,
       location: locationRef.current,
       onDestroy: onDestroy,
@@ -38,7 +41,9 @@ export default /*#__PURE__*/memo(function (props) {
         children: [/*#__PURE__*/_jsx(Breadcrumb, {
           items: breadcrumb,
           className: "ccs-breadcrumb"
-        }), children]
+        }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
+          ref: dialogHolderRef
+        }, "modal-drawer-holder")]
       })
     })
   });

package/es/layout-single-page/page.js

@@ -2,6 +2,7 @@ import { Breadcrumb } from 'antd';
 import { memo, useRef } from 'react';
 import Scrollbars from 'react-custom-scrollbars';
 import { PageContext } from "../context";
+import { DialogElementsHolder } from "../dialog/hook";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default /*#__PURE__*/memo(function (props) {
@@ -11,10 +12,12 @@ export default /*#__PURE__*/memo(function (props) {
     urlAuthList = _props$urlAuthList === void 0 ? [] : _props$urlAuthList,
     _props$breadcrumb = props.breadcrumb,
     breadcrumb = _props$breadcrumb === void 0 ? [] : _props$breadcrumb;
+  var dialogHolderRef = useRef(null);
   return /*#__PURE__*/_jsx(PageContext.Provider, {
     value: {
       id: '',
       isActive: true,
+      dialogHolderRef: dialogHolderRef,
       location: locationRef.current,
       onDestroy: function onDestroy() {
         console.error('单页模式不支持');
@@ -29,7 +32,9 @@ export default /*#__PURE__*/memo(function (props) {
       children: [/*#__PURE__*/_jsx(Breadcrumb, {
         items: breadcrumb,
         className: "ccs-breadcrumb"
-      }), children]
+      }), children, /*#__PURE__*/_jsx(DialogElementsHolder, {
+        ref: dialogHolderRef
+      }, "modal-drawer-holder")]
     })
   });
 });

package/package.json

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