cosey 0.4.27 → 0.4.29

package/hooks/useUpsert.d.ts

@@ -16,10 +16,13 @@ export interface UseUpsertOptions<Model, Row = Model> {
     onAdd?: (...args: any[]) => void;
     onEdit?: (row: Row, ...args: any[]) => void;
     onShow?: () => void;
+    onShown?: () => void;
+    onShownAdd?: (...args: any[]) => void;
+    onShownEdit?: (...args: any[]) => void;
     detailsFetch?: (row: Row) => any;
     beforeFill?: (row: Row) => any;
-    addFetch?: () => any;
-    editFetch?: (row: Row) => any;
+    addFetch?: (...args: any[]) => any;
+    editFetch?: (row: Row, ...args: any[]) => any;
     success?: (res: any) => any;
     addSuccessText?: string;
     editSuccessText?: string;

package/hooks/useUpsert.js

@@ -1,6 +1,6 @@
 import { ElMessage } from 'element-plus';
 import { cloneDeep, pick } from 'lodash-es';
-import { ref, computed, unref, reactive, useTemplateRef, shallowRef, readonly } from 'vue';
+import { ref, computed, unref, reactive, shallowRef, useTemplateRef, readonly, nextTick } from 'vue';
 import { toRefs } from '@vueuse/core';
 import { useLocale } from './useLocale.js';
 import { uuid } from '../utils/string.js';
@@ -20,6 +20,9 @@ function useUpsert(options) {
     onAdd,
     onEdit,
     onShow,
+    onShown,
+    onShownAdd,
+    onShownEdit,
     detailsFetch,
     beforeFill,
     addFetch,
@@ -43,15 +46,19 @@ function useUpsert(options) {
     },
     title: mergedTitle
   });
+  const data = shallowRef();
+  const row = shallowRef();
+  let addParams = [];
+  let editParams = [];
   const formRefKey = uuid();
   const formRef = useTemplateRef(formRefKey);
   const onSubmit = async () => {
     let res;
     if (type.value === "add") {
-      res = await unref(addFetch)?.();
+      res = await unref(addFetch)?.(...addParams);
       ElMessage.success(unref(addSuccessText) || t("co.common.operateSuccess"));
     } else {
-      res = await unref(editFetch)?.(row.value);
+      res = await unref(editFetch)?.(row.value, ...editParams);
       ElMessage.success(unref(editSuccessText) || t("co.common.operateSuccess"));
     }
     unref(success)?.(res);
@@ -62,17 +69,20 @@ function useUpsert(options) {
     ref: formRefKey,
     submit: onSubmit
   });
-  const data = shallowRef();
-  const row = shallowRef();
   let exposeOptions;
   const expose = {
-    edit: async (...args) => {
+    edit: async (_row, ...args) => {
+      editParams = args;
       type.value = "edit";
-      row.value = args[0];
+      row.value = _row;
       deepAssign(unref(model), initialModel);
-      unref(onEdit)?.(...args);
+      unref(onEdit)?.(_row, ...editParams);
       visible.value = true;
       unref(onShow)?.();
+      nextTick(() => {
+        unref(onShown)?.();
+        unref(onShownEdit)?.(...editParams);
+      });
       let filledRow = row.value;
       if (unref(detailsFetch)) {
         filledRow = await unref(detailsFetch)(row.value);
@@ -82,12 +92,17 @@ function useUpsert(options) {
       Object.assign(unref(model), pick(filledRow, modelKeys));
     },
     add: (...args) => {
+      addParams = args;
       type.value = "add";
       row.value = void 0;
       deepAssign(unref(model), initialModel);
-      unref(onAdd)?.(...args);
+      unref(onAdd)?.(...addParams);
       visible.value = true;
       unref(onShow)?.();
+      nextTick(() => {
+        unref(onShown)?.();
+        unref(onShownAdd)?.(...addParams);
+      });
     },
     setData: (_data) => {
       data.value = _data;

package/package.json

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