cosey 0.4.11 → 0.4.13

package/components/form-dialog/form-dialog.d.ts

@@ -40,6 +40,10 @@ export declare const formDialogProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    closeOnPressEscape: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     confirmText: {
         type: StringConstructor;
         default: string;
@@ -76,14 +80,6 @@ export declare const formDialogProps: {
         __epPropKey: true;
     };
     destroyOnClose: BooleanConstructor;
-    closeOnPressEscape: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
     lockScroll: {
         readonly type: PropType<boolean>;
         readonly required: false;

package/components/form-dialog/form-dialog.js

@@ -38,6 +38,10 @@ const formDialogProps = {
   closeOnClickModal: {
     type: Boolean,
     default: false
+  },
+  closeOnPressEscape: {
+    type: Boolean,
+    default: false
   }
 };
 const elFormDialogExposeKeys = ["resetPosition", "handleClose"];

package/components/table/table-export/table-export.d.ts

@@ -27,6 +27,10 @@ export declare const tableExportProps: {
         type: BooleanConstructor;
         default: boolean;
     };
+    closeOnPressEscape: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     confirmText: {
         type: StringConstructor;
         default: string;
@@ -63,14 +67,6 @@ export declare const tableExportProps: {
         __epPropKey: true;
     };
     destroyOnClose: BooleanConstructor;
-    closeOnPressEscape: {
-        readonly type: PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
     lockScroll: {
         readonly type: PropType<boolean>;
         readonly required: false;

package/components/table/table-export/table-export.vue.d.ts

@@ -25,6 +25,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    closeOnPressEscape: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     confirmText: {
         type: StringConstructor;
         default: string;
@@ -61,14 +65,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         __epPropKey: true;
     };
     destroyOnClose: BooleanConstructor;
-    closeOnPressEscape: {
-        readonly type: import("vue").PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
     lockScroll: {
         readonly type: import("vue").PropType<boolean>;
         readonly required: false;
@@ -196,6 +192,10 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         type: BooleanConstructor;
         default: boolean;
     };
+    closeOnPressEscape: {
+        type: BooleanConstructor;
+        default: boolean;
+    };
     confirmText: {
         type: StringConstructor;
         default: string;
@@ -232,14 +232,6 @@ declare const _default: import("vue").DefineComponent<import("vue").ExtractPropT
         __epPropKey: true;
     };
     destroyOnClose: BooleanConstructor;
-    closeOnPressEscape: {
-        readonly type: import("vue").PropType<boolean>;
-        readonly required: false;
-        readonly validator: ((val: unknown) => boolean) | undefined;
-        __epPropKey: true;
-    } & {
-        readonly default: true;
-    };
     lockScroll: {
         readonly type: import("vue").PropType<boolean>;
         readonly required: false;

package/hooks/useUpsert.d.ts

@@ -9,16 +9,17 @@ export interface UseUpsertExpose<Row extends Record<string, any>, Data = any> {
     setOptions: (options: UseUpsertExposeOptions) => any;
 }
 export type UpsertType = 'edit' | 'add';
-export interface UseUpsertOptions<Model, Row = Model, Data = Model> {
+export interface UseUpsertOptions<Model, Row = Model> {
     title?: string;
     stuffTitle?: string;
     model: Model;
-    show?: (type: UpsertType, row?: Row) => void;
-    details?: (row: Row) => any;
+    onAdd?: (...args: any[]) => void;
+    onEdit?: (row: Row, ...args: any[]) => void;
+    onShow?: () => void;
+    detailsFetch?: (row: Row) => any;
     beforeFill?: (row: Row) => any;
-    beforeSubmit?: (model: Model) => Data | Promise<Data>;
-    add?: (data: Data) => any;
-    edit?: (data: Data) => any;
+    addFetch?: () => any;
+    editFetch?: () => any;
     success?: (res: any) => any;
     addSuccessText?: string;
     editSuccessText?: string;
@@ -42,7 +43,7 @@ export interface UseUpsertReturn<Model extends Record<string, any>, Row extends
     isEdit: ComputedRef<boolean>;
     isAdd: ComputedRef<boolean>;
 }
-export declare function useUpsert<Model extends Record<string, any>, Row extends Record<string, any> = Model, Data = any>(options: MaybeRef<UseUpsertOptions<Model, Row, Data>>): UseUpsertReturn<Model, Row, Data>;
+export declare function useUpsert<Model extends Record<string, any>, Row extends Record<string, any> = Model, Data = any>(options: MaybeRef<UseUpsertOptions<Model, Row>>): UseUpsertReturn<Model, Row, Data>;
 export interface UseExternalUpsertOptions {
     success?: () => any;
 }

package/hooks/useUpsert.js

@@ -17,12 +17,13 @@ function useUpsert(options) {
     title,
     addSuccessText,
     editSuccessText,
-    show,
-    details,
+    onAdd,
+    onEdit,
+    onShow,
+    detailsFetch,
     beforeFill,
-    beforeSubmit,
-    add,
-    edit,
+    addFetch,
+    editFetch,
     success
   } = toRefs(computed(() => unref(options)));
   const { t, lang } = useLocale();
@@ -45,13 +46,12 @@ function useUpsert(options) {
   const formRefKey = uuid();
   const formRef = useTemplateRef(formRefKey);
   const onSubmit = async () => {
-    const data2 = await unref(beforeSubmit)?.(unref(model)) || unref(model);
     let res;
     if (type.value === "add") {
-      res = await unref(add)?.(data2);
+      res = await unref(addFetch)?.();
       ElMessage.success(unref(addSuccessText) || t("co.common.addSuccess"));
     } else {
-      res = await unref(edit)?.(data2);
+      res = await unref(editFetch)?.();
       ElMessage.success(unref(editSuccessText) || t("co.common.editSuccess"));
     }
     unref(success)?.(res);
@@ -66,26 +66,28 @@ function useUpsert(options) {
   const row = shallowRef();
   let exposeOptions;
   const expose = {
-    edit: async (_row) => {
+    edit: async (...args) => {
       type.value = "edit";
-      row.value = _row;
+      row.value = args[0];
       deepAssign(unref(model), initialModel);
+      unref(onEdit)?.(...args);
       visible.value = true;
-      unref(show)?.(type.value, row.value);
-      let filledRow = _row;
-      if (unref(details)) {
-        filledRow = await unref(details)(_row);
+      unref(onShow)?.();
+      let filledRow = row.value;
+      if (unref(detailsFetch)) {
+        filledRow = await unref(detailsFetch)(row.value);
       }
       filledRow = { ...filledRow };
       filledRow = unref(beforeFill)?.(filledRow) || filledRow;
       Object.assign(unref(model), pick(filledRow, modelKeys));
     },
-    add: () => {
+    add: (...args) => {
       type.value = "add";
       row.value = void 0;
       deepAssign(unref(model), initialModel);
+      unref(onAdd)?.(...args);
       visible.value = true;
-      unref(show)?.(type.value);
+      unref(onShow)?.();
     },
     setData: (_data) => {
       data.value = _data;

package/package.json

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