From 66c1d390b948a673cdf1207f2a6bab456b1ad269 Mon Sep 17 00:00:00 2001
From: Jin Mao <50581550+jinmao88@users.noreply.github.com>
Date: Sun, 23 Mar 2025 10:02:22 +0800
Subject: [PATCH 1/2] feat(ui): logo icon support click events (#5725)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(ui): 扩展auth页面添加点击 Logo 的事件处理

在 `authentication.vue` 中新增 `clickLogo` 属性，允许在点击 Logo 时执行自定义操作。在 `auth.vue` 中实现了一个示例的点击事件处理函数，用于测试该功能。

* feat(layout): 添加点击 logo 的事件处理函数

在 BasicLayout 组件中添加了 clickLogo 事件处理函数，并通过 emit 方法触发 clickLogo 事件。同时，在 basic.vue 中实现了 handleClickLogo 函数，用于处理 logo 点击事件。

* fix(ui): 移除logo点击事件的控制台日志
---
 .../effects/layouts/src/authentication/authentication.vue | 8 +++++++-
 packages/effects/layouts/src/basic/layout.vue             | 7 ++++++-
 playground/src/layouts/auth.vue                           | 2 ++
 playground/src/layouts/basic.vue                          | 7 ++++++-
 4 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/packages/effects/layouts/src/authentication/authentication.vue b/packages/effects/layouts/src/authentication/authentication.vue
index 0c79591e..40115458 100644
--- a/packages/effects/layouts/src/authentication/authentication.vue
+++ b/packages/effects/layouts/src/authentication/authentication.vue
@@ -17,6 +17,7 @@ interface Props {
   toolbar?: boolean;
   copyright?: boolean;
   toolbarList?: ToolbarType[];
+  clickLogo?: () => void;
 }
 
 withDefaults(defineProps<Props>(), {
@@ -28,6 +29,7 @@ withDefaults(defineProps<Props>(), {
   sloganImage: '',
   toolbar: true,
   toolbarList: () => ['color', 'language', 'layout', 'theme'],
+  clickLogo: () => {},
 });
 
 const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =
@@ -61,7 +63,11 @@ const { authPanelCenter, authPanelLeft, authPanelRight, isDark } =
     </AuthenticationFormView>
 
     <!-- 头部 Logo 和应用名称 -->
-    <div v-if="logo || appName" class="absolute left-0 top-0 z-10 flex flex-1">
+    <div
+      v-if="logo || appName"
+      class="absolute left-0 top-0 z-10 flex flex-1"
+      @click="clickLogo"
+    >
       <div
         class="text-foreground lg:text-foreground ml-4 mt-4 flex flex-1 items-center sm:left-6 sm:top-6"
       >
diff --git a/packages/effects/layouts/src/basic/layout.vue b/packages/effects/layouts/src/basic/layout.vue
index 1fb90448..4a8e963a 100644
--- a/packages/effects/layouts/src/basic/layout.vue
+++ b/packages/effects/layouts/src/basic/layout.vue
@@ -34,7 +34,7 @@ import { LayoutTabbar } from './tabbar';
 
 defineOptions({ name: 'BasicLayout' });
 
-const emit = defineEmits<{ clearPreferencesAndLogout: [] }>();
+const emit = defineEmits<{ clearPreferencesAndLogout: []; clickLogo: [] }>();
 
 const {
   isDark,
@@ -149,6 +149,10 @@ function clearPreferencesAndLogout() {
   emit('clearPreferencesAndLogout');
 }
 
+function clickLogo() {
+  emit('clickLogo');
+}
+
 watch(
   () => preferences.app.layout,
   async (val) => {
@@ -221,6 +225,7 @@ const headerSlots = computed(() => {
         :src="preferences.logo.source"
         :text="preferences.app.name"
         :theme="showHeaderNav ? headerTheme : theme"
+        @click="clickLogo"
       />
     </template>
     <!-- 头部区域 -->
diff --git a/playground/src/layouts/auth.vue b/playground/src/layouts/auth.vue
index 18d415bc..c33a632a 100644
--- a/playground/src/layouts/auth.vue
+++ b/playground/src/layouts/auth.vue
@@ -8,6 +8,7 @@ import { $t } from '#/locales';
 
 const appName = computed(() => preferences.app.name);
 const logo = computed(() => preferences.logo.source);
+const clickLogo = () => {};
 </script>
 
 <template>
@@ -16,6 +17,7 @@ const logo = computed(() => preferences.logo.source);
     :logo="logo"
     :page-description="$t('authentication.pageDesc')"
     :page-title="$t('authentication.pageTitle')"
+    :click-logo="clickLogo"
   >
     <!-- 自定义工具栏 -->
     <!-- <template #toolbar></template> -->
diff --git a/playground/src/layouts/basic.vue b/playground/src/layouts/basic.vue
index 3fa423af..2da8ab70 100644
--- a/playground/src/layouts/basic.vue
+++ b/playground/src/layouts/basic.vue
@@ -106,6 +106,8 @@ function handleMakeAll() {
   notifications.value.forEach((item) => (item.isRead = true));
 }
 
+function handleClickLogo() {}
+
 watch(
   () => preferences.app.watermark,
   async (enable) => {
@@ -124,7 +126,10 @@ watch(
 </script>
 
 <template>
-  <BasicLayout @clear-preferences-and-logout="handleLogout">
+  <BasicLayout
+    @clear-preferences-and-logout="handleLogout"
+    @click-logo="handleClickLogo"
+  >
     <template #user-dropdown>
       <UserDropdown
         :avatar

From 3f0d30897f6dc9d9c9a03ccb2dabbebe881602ea Mon Sep 17 00:00:00 2001
From: Netfan <netfan@foxmail.com>
Date: Sun, 23 Mar 2025 11:34:21 +0800
Subject: [PATCH 2/2] fix: menu drawer can not be closed after a successful
 submitting (#5770)

---
 .../src/views/system/menu/modules/form.vue    | 20 ++-----------------
 1 file changed, 2 insertions(+), 18 deletions(-)

diff --git a/playground/src/views/system/menu/modules/form.vue b/playground/src/views/system/menu/modules/form.vue
index f04cb4f7..3cf40e35 100644
--- a/playground/src/views/system/menu/modules/form.vue
+++ b/playground/src/views/system/menu/modules/form.vue
@@ -32,7 +32,6 @@ const emit = defineEmits<{
   success: [];
 }>();
 const formData = ref<SystemMenuApi.SystemMenu>();
-const loading = ref(false);
 const titleSuffix = ref<string>();
 const schema: VbenFormSchema[] = [
   {
@@ -445,9 +444,6 @@ const [Form, formApi] = useVbenForm({
 });
 
 const [Drawer, drawerApi] = useVbenDrawer({
-  onBeforeClose() {
-    if (loading.value) return false;
-  },
   onConfirm: onSubmit,
   onOpenChange(isOpen) {
     if (isOpen) {
@@ -474,13 +470,7 @@ const [Drawer, drawerApi] = useVbenDrawer({
 async function onSubmit() {
   const { valid } = await formApi.validate();
   if (valid) {
-    loading.value = true;
-    drawerApi.setState({
-      closeOnClickModal: false,
-      closeOnPressEscape: false,
-      confirmLoading: true,
-      loading: true,
-    });
+    drawerApi.lock();
     const data =
       await formApi.getValues<
         Omit<SystemMenuApi.SystemMenu, 'children' | 'id'>
@@ -498,13 +488,7 @@ async function onSubmit() {
       drawerApi.close();
       emit('success');
     } finally {
-      loading.value = false;
-      drawerApi.setState({
-        closeOnClickModal: true,
-        closeOnPressEscape: true,
-        confirmLoading: false,
-        loading: false,
-      });
+      drawerApi.unlock();
     }
   }
 }