cosey 0.6.20 → 0.6.22

package/components/field/components/checkbox-group/checkbox-group.vue.js

@@ -71,8 +71,7 @@ var stdin_default = defineComponent((props, {
       style: {
         display: "flex",
         flexWrap: "wrap",
-        columnGap: "30px",
-        rowGap: "12px"
+        columnGap: "30px"
       }
     }), () => convertedOptions.value.map((item, index) => renderCheckbox(item, index)));
     return componentProps.value.indeterminate ? h(stdin_default$1, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "cosey",
-  "version": "0.6.20",
+  "version": "0.6.22",
   "description": "基于 Vue3 + vite 的后台管理系统框架",
   "type": "module",
   "main": "index.js",

package/utils/message-box.d.ts

@@ -2,12 +2,13 @@ import { type ElMessageBoxOptions } from 'element-plus';
 import { type VNode } from 'vue';
 export declare function warningConfirm(message: string | VNode | (() => VNode), options?: ElMessageBoxOptions): CustomPromise<unknown>;
 declare class CustomPromise<T> extends Promise<T> {
-    onfulfilled: ((value: any) => any | PromiseLike<any>) | undefined | null;
-    onrejected: ((reason?: any) => any | PromiseLike<any>) | undefined | null;
-    onfinally: (() => void) | undefined | null;
+    _onFulfilled: ((value: any) => any | PromiseLike<any>) | undefined | null;
+    _onRejected: ((reason?: any) => any | PromiseLike<any>) | undefined | null;
+    _resolve: null | ((value: any | PromiseLike<any>) => void);
+    _reject: null | ((reason?: any) => void);
     constructor(executor: (resolve: (value: T | PromiseLike<T>) => void, reject: (reason?: any) => void) => void);
-    then<TResult1 = T, TResult2 = never>(onfulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onrejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
-    catch<TResult = never>(onrejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<T | TResult>;
-    finally(onfinally?: (() => void) | undefined | null): Promise<T>;
+    then<TResult1 = T, TResult2 = never>(onFulfilled?: ((value: T) => TResult1 | PromiseLike<TResult1>) | undefined | null, onRejected?: ((reason: any) => TResult2 | PromiseLike<TResult2>) | undefined | null): Promise<TResult1 | TResult2>;
+    catch<TResult = never>(onRejected?: ((reason: any) => TResult | PromiseLike<TResult>) | undefined | null): Promise<T | TResult>;
+    finally(onFinally?: (() => void) | undefined | null): Promise<T>;
 }
 export {};

package/utils/message-box.js

@@ -22,41 +22,52 @@ function warningConfirm(message, options) {
       if (action === "confirm") {
         instance.confirmButtonLoading = true;
         try {
-          await promise.onfulfilled?.(void 0);
+          const res = await promise._onFulfilled?.(void 0);
+          promise._resolve?.(res);
           done();
         } catch (err) {
-          promise.onrejected?.(err);
+          promise._onRejected?.(err);
+          promise._reject?.(err);
         } finally {
           instance.confirmButtonLoading = false;
         }
       } else {
         done();
-        promise.onrejected?.(void 0);
+        promise._onRejected?.(void 0);
+        promise._reject?.();
       }
-      promise.onfinally?.();
     }
   });
   return promise;
 }
 class CustomPromise extends Promise {
-  onfulfilled;
-  onrejected;
-  onfinally;
+  _onFulfilled;
+  _onRejected;
+  _resolve = null;
+  _reject = null;
   constructor(executor) {
     super(executor);
   }
-  then(onfulfilled, onrejected) {
-    this.onfulfilled = onfulfilled;
-    this.onrejected = onrejected;
-    return super.then(onfulfilled, onrejected);
+  then(onFulfilled, onRejected) {
+    this._onFulfilled = onFulfilled;
+    this._onRejected = onRejected;
+    return new Promise((resolve, reject) => {
+      this._resolve = resolve;
+      this._reject = reject;
+    });
   }
-  catch(onrejected) {
-    this.onrejected = onrejected;
-    return super.catch(onrejected);
+  catch(onRejected) {
+    return this.then(null, onRejected);
   }
-  finally(onfinally) {
-    this.onfinally = onfinally;
-    return super.finally(onfinally);
+  finally(onFinally) {
+    return this.then(
+      () => {
+        onFinally?.();
+      },
+      () => {
+        onFinally?.();
+      }
+    );
   }
 }