From ac412b0ddefa33de90d043e4e71d7c38b53dc946 Mon Sep 17 00:00:00 2001
From: lijiahangmax <ljh1553488six@139.com>
Date: Thu, 25 Sep 2025 14:43:07 +0800
Subject: [PATCH] =?UTF-8?q?:hammer:=20=E4=BF=AE=E6=94=B9=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E5=99=A8=E6=A8=A1=E6=9D=BF.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../orion-vue-views-components-form-drawer.vue.vm   | 13 +++++++------
 .../orion-vue-views-components-form-modal.vue.vm    | 13 +++++++------
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
index 8d290b1d..fb59ae09 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-drawer.vue.vm
@@ -6,7 +6,7 @@
             :unmount-on-close="true"
             :ok-button-props="{ disabled: loading }"
             :cancel-button-props="{ disabled: loading }"
-            :on-before-ok="handlerOk"
+            :on-before-ok="handleOk"
             @cancel="handleClose">
     <a-spin class="full drawer-form-small" :loading="loading">
       <a-form :model="formModel"
@@ -114,7 +114,7 @@
   defineExpose({ openAdd, openUpdate });
 
   // 确定
-  const handlerOk = async () => {
+  const handleOk = async () => {
     setLoading(true);
     try {
       // 验证参数
@@ -133,8 +133,8 @@
         Message.success('修改成功');
         emits('updated');
       }
-      // 清空
-      handlerClear();
+      handleClose();
+      return true;
     } catch (e) {
       return false;
     } finally {
@@ -144,11 +144,12 @@
 
   // 关闭
   const handleClose = () => {
-    handlerClear();
+    handleClear();
+    setVisible(false);
   };
 
   // 清空
-  const handlerClear = () => {
+  const handleClear = () => {
     setLoading(false);
   };
 
diff --git a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
index 14dcc169..307da03e 100644
--- a/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
+++ b/orion-visor-framework/orion-visor-spring-boot-starter-mybatis/src/main/resources/templates/orion-vue-views-components-form-modal.vue.vm
@@ -10,7 +10,7 @@
            :unmount-on-close="true"
            :ok-button-props="{ disabled: loading }"
            :cancel-button-props="{ disabled: loading }"
-           :on-before-ok="handlerOk"
+           :on-before-ok="handleOk"
            @close="handleClose">
     <a-spin class="full" :loading="loading">
       <a-form :model="formModel"
@@ -118,7 +118,7 @@
   defineExpose({ openAdd, openUpdate });
 
   // 确定
-  const handlerOk = async () => {
+  const handleOk = async () => {
     setLoading(true);
     try {
       // 验证参数
@@ -137,8 +137,8 @@
         Message.success('修改成功');
         emits('updated');
       }
-      // 清空
-      handlerClear();
+      handleClose();
+      return true;
     } catch (e) {
       return false;
     } finally {
@@ -148,11 +148,12 @@
 
   // 关闭
   const handleClose = () => {
-    handlerClear();
+    handleClear();
+    setVisible(false);
   };
 
   // 清空
-  const handlerClear = () => {
+  const handleClear = () => {
     setLoading(false);
   };