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

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;
+    /** 返回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>, "onOk" | "onClose" | "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

@@ -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.js

@@ -80,14 +80,14 @@ 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
-      });
-    }
+    // if (CcsPageContext && CcsPageContext.id) {
+    //   dialog = (
+    //     <PageContext.Provider value={CcsPageContext}>
+    //       {dialog}
+    //     </PageContext.Provider>
+    //   );
+    // }
     // 优先使用自定义contextHolder、其次使用全局contextHolder
     var $holderRef = holderRef.current ? holderRef : appConfig.holderRef;
     if ($holderRef !== null && $holderRef !== void 0 && $holderRef.current) {
@@ -153,7 +153,7 @@ export default function useCcsDialog() {
       },
       dialogRef: dialogRef
     }, "drawer-".concat(drawerUuid));
-    console.log('drawer CcsPageContext ...', CcsPageContext);
+
     // 添加page上下文
     if (CcsPageContext && CcsPageContext.id) {
       dialog = /*#__PURE__*/_jsx(PageContext.Provider, {
@@ -199,7 +199,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.1-beta-1",
+  "version": "2.2.2",
   "description": "",
   "license": "MIT",
   "author": {