From 4e70486cd66a803b3058723b88a610bf69abcd87 Mon Sep 17 00:00:00 2001
From: likunming <likunming@163.com>
Date: Mon, 25 Nov 2024 13:06:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A1=A8=E6=A0=BC=E5=86=85?=
 =?UTF-8?q?=E7=BD=AE=E6=8C=89=E9=92=AE=E8=A7=A6=E5=8F=91afterEditOpen?=
 =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E7=9A=84=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/platform/components/grid/GridTop.vue         | 12 ++++++++++--
 .../src/platform/components/toolbar/WToolbar.vue     |  4 +++-
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/io.sc.platform.core.frontend/src/platform/components/grid/GridTop.vue b/io.sc.platform.core.frontend/src/platform/components/grid/GridTop.vue
index 41ed7c39..96c221a6 100644
--- a/io.sc.platform.core.frontend/src/platform/components/grid/GridTop.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/grid/GridTop.vue
@@ -640,7 +640,11 @@ const handleChildrenBtn = (arr, moreQueryShow) => {
         tempArr.push(buttonObj[btn]);
       }
     } else if (typeof btn === 'object' && btn.extend && buttonObj[btn.extend]) {
-      tempArr.push({ ...buttonObj[btn.extend], ...btn, _click: buttonObj[btn.extend].click });
+      let overrideClick = false;
+      if (btn.click) {
+        overrideClick = true;
+      }
+      tempArr.push({ ...buttonObj[btn.extend], ...btn, _click: buttonObj[btn.extend].click, overrideClick });
     } else {
       tempArr.push(btn);
     }
@@ -680,7 +684,11 @@ const handleToolbarActions = () => {
       buttons_.value.push(handleChildrenBtn(btn, moreQueryShow));
     } else if (typeof btn === 'object' && btn.extend && buttonObj[btn.extend]) {
       // 继承内置按钮
-      buttons_.value.push({ ...buttonObj[btn.extend], ...btn, _click: buttonObj[btn.extend].click });
+      let overrideClick = false;
+      if (btn.click) {
+        overrideClick = true;
+      }
+      buttons_.value.push({ ...buttonObj[btn.extend], ...btn, _click: buttonObj[btn.extend].click, overrideClick: overrideClick });
     } else {
       buttons_.value.push(btn);
     }
diff --git a/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue b/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
index 97e766ff..ce117a27 100644
--- a/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
+++ b/io.sc.platform.core.frontend/src/platform/components/toolbar/WToolbar.vue
@@ -473,7 +473,9 @@ const buttonClick = async (button) => {
     let callAfterEditorOpen = true;
     const clickProps = { ...args };
     if (button._click) {
-      callAfterEditorOpen = false;
+      if (button.overrideClick) {
+        callAfterEditorOpen = false;
+      }
       clickProps['_click'] = (_args: any) => {
         button._click(_args || args);
         callAfterEditorOpen = true;