@ccs-ui/rc-pro 2.2.0 → 2.2.1

package/es/dialog/button.d.ts

@@ -11,12 +11,12 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
     /** 隐藏取消按钮 */
     hideCancel?: boolean;
     /** 返回Promise false 则阻止弹窗关闭 */
-    onOk?: (values?: T) => Promise<boolean> | boolean;
+    onOk?: (values?: T) => Promise<boolean> | boolean | undefined | void;
 };
 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>, "onClose" | "onOk" | "auth" | "extraBtn" | "request" | "requestFieldNames" | "preventRequestHandle"> & {
+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"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/dialog/button.js

@@ -229,7 +229,7 @@ export default function CcsDialogButtons(_ref3) {
           onClick: closeDialog,
           children: cancelText || '取消'
         }), /*#__PURE__*/_jsx(CcsButton, {
-          auth: okAuth || '',
+          auth: okAuth,
           type: "primary",
           loading: loading,
           onClick: onOkClick,

package/es/dialog/hook.d.ts

@@ -24,7 +24,7 @@ export type DialogRequestData = {
     msg: string;
 };
 export type Service<TParams, TData> = (params: TParams) => Promise<TData>;
-export type OkEvent<TParams, TData> = (params?: TParams, result?: TData) => 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 DialogProps<TParams, TData> = {
     /** antd form */

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,18 @@ 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;
     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 +99,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 () {
@@ -135,7 +144,7 @@ export default function useCcsDialog() {
     drawerUuid += 1;
     var dialogRef = /*#__PURE__*/React.createRef();
     var closeFunc;
-    var modal = /*#__PURE__*/_jsx(HookDrawer, {
+    var dialog = /*#__PURE__*/_jsx(HookDrawer, {
       config: config,
       afterClose: function afterClose() {
         var _closeFunc2;
@@ -143,11 +152,19 @@ 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;
     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 +172,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 () {
@@ -181,7 +198,6 @@ export default function useCcsDialog() {
         }
       },
       update: function update(newConfig) {
-        console.log('newConfig', newConfig, dialogRef.current);
         function updateAction() {
           var _dialogRef$current2;
           (_dialogRef$current2 = dialogRef.current) === null || _dialogRef$current2 === void 0 || _dialogRef$current2.update(newConfig);

package/package.json

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