From 5bca21b52c260a7dee049c918cc444e73121ada8 Mon Sep 17 00:00:00 2001
From: hechang27-sprt <hechang27@outlook.com>
Date: Mon, 29 Dec 2025 17:04:57 +0800
Subject: [PATCH] feat: extra functionality for `modify-form`

---
 packages/base/data/modify-form.vue | 16 ++++++++++------
 plugs/composables/useModifyForm.ts |  4 +++-
 2 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/packages/base/data/modify-form.vue b/packages/base/data/modify-form.vue
index 1ece926..aa684a0 100644
--- a/packages/base/data/modify-form.vue
+++ b/packages/base/data/modify-form.vue
@@ -59,8 +59,12 @@
       </template>
       <slot></slot>
       <el-form-item class="form-btns">
-        <NoobButton type="primary" @click="formConfirm">{{ t(confirm) }}</NoobButton>
-        <NoobButton type="info" @click="emit('cancel')">{{ t(cancel) }}</NoobButton>
+        <NoobButton v-if="confirm || confirm === undefined" type="primary" @click="formConfirm">{{
+          t(typeof confirm === "string" && confirm ? confirm : "base.confirm")
+        }}</NoobButton>
+        <NoobButton v-if="cancel || cancel === undefined" type="info" @click="emit('cancel')">{{
+          t(typeof cancel === "string" && cancel ? cancel : "base.cancel")
+        }}</NoobButton>
       </el-form-item>
     </el-form>
   </div>
@@ -99,8 +103,8 @@ interface Props {
   type?: string | null;
   modify?: boolean;
   items?: FormItem[];
-  confirm?: string;
-  cancel?: string;
+  confirm?: string | boolean | null;
+  cancel?: string | boolean | null;
 }
 
 const prop = withDefaults(defineProps<Props>(), {
@@ -111,8 +115,8 @@ const prop = withDefaults(defineProps<Props>(), {
   type: null,
   modify: false,
   items: () => [],
-  confirm: "base.confirm",
-  cancel: "base.cancel",
+  confirm: undefined,
+  cancel: undefined,
 });
 
 const emit = defineEmits<{
diff --git a/plugs/composables/useModifyForm.ts b/plugs/composables/useModifyForm.ts
index a595efb..94089c7 100644
--- a/plugs/composables/useModifyForm.ts
+++ b/plugs/composables/useModifyForm.ts
@@ -22,12 +22,13 @@ interface Options {
   handleEdit?: (value) => Promise<void>;
   handleCancel?: () => Promise<void>;
   handleError?: (kind: "validation" | "internal", err?) => void;
+  handleClose?: () => void;
   init?: any;
   extraProps?: string[] | "any" | ((code: string) => boolean);
 }
 
 export function useModifyForm(options: Options) {
-  const { formRef, handleAdd, handleEdit, handleCancel, init, extraProps } = options;
+  const { formRef, handleAdd, handleEdit, handleCancel, handleClose, init, extraProps } = options;
   const initValue = init ?? {};
   const props = options.props ?? [];
   const propMap = Object.fromEntries(props.map((prop) => [prop.code, prop]));
@@ -106,6 +107,7 @@ export function useModifyForm(options: Options) {
     },
 
     close() {
+      handleClose?.();
       this.data.dialog = this.flagOnClose;
     },