From 24f2f5958d71e69f256d274afc240499bd21dbbb Mon Sep 17 00:00:00 2001
From: xingyu4j <xingyu4j@vip.qq.com>
Date: Sun, 22 Jun 2025 16:22:16 +0800
Subject: [PATCH] fix: tenant style

---
 .../nodes-config/modules/condition-dialog.vue |  1 +
 .../effects/layouts/src/widgets/help/help.vue | 26 +++++++++++--------
 .../tenant-dropdown/tenant-dropdown.vue       | 22 +++++++++++-----
 3 files changed, 32 insertions(+), 17 deletions(-)

diff --git a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition-dialog.vue b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition-dialog.vue
index dc8d6a86..6e82fc26 100644
--- a/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition-dialog.vue
+++ b/apps/web-antd/src/components/simple-process-design/components/nodes-config/modules/condition-dialog.vue
@@ -63,6 +63,7 @@ const [Modal, modalApi] = useVbenModal({
 });
 
 // TODO xingyu 暴露 modalApi 给父组件是否合适? trigger-node-config.vue 会有多个 conditionDialog 实例
+// 不用暴露啊，用 useVbenModal 就可以了
 defineExpose({ modalApi });
 </script>
 <template>
diff --git a/packages/effects/layouts/src/widgets/help/help.vue b/packages/effects/layouts/src/widgets/help/help.vue
index 640da345..5e42d43b 100644
--- a/packages/effects/layouts/src/widgets/help/help.vue
+++ b/packages/effects/layouts/src/widgets/help/help.vue
@@ -26,12 +26,12 @@ const [Modal, modalApi] = useVbenModal({
 });
 </script>
 <template>
-  <Modal class="w-2/5" :title="$t('ui.widgets.qa')">
+  <Modal class="w-1/3" :title="$t('ui.widgets.qa')">
     <div class="mt-2 flex flex-col">
-      <div class="mt-2 flex flex-row">
+      <div class="mt-2 flex flex-col">
         <!-- TODO @xingyu：要不要垂直？1. 项目地址；2. 问题反馈；3. 开发文档 -->
         <VbenButtonGroup class="basis-1/3" :gap="2" border size="large">
-          <p class="p-2">项目地址:</p>
+          <p class="w-24 p-2">项目地址:</p>
           <VbenButton
             variant="link"
             @click="
@@ -51,7 +51,7 @@ const [Modal, modalApi] = useVbenModal({
         </VbenButtonGroup>
 
         <VbenButtonGroup class="basis-1/3" :gap="2" border size="large">
-          <p class="p-2">issues:</p>
+          <p class="w-24 p-2">issues:</p>
           <VbenButton
             variant="link"
             @click="
@@ -75,7 +75,7 @@ const [Modal, modalApi] = useVbenModal({
         </VbenButtonGroup>
 
         <VbenButtonGroup class="basis-1/3" :gap="2" border size="large">
-          <p class="p-2">开发文档:</p>
+          <p class="w-24 p-2">开发文档:</p>
           <VbenButton
             variant="link"
             @click="openWindow('https://doc.iocoder.cn/quick-start/')"
@@ -87,13 +87,17 @@ const [Modal, modalApi] = useVbenModal({
           </VbenButton>
         </VbenButtonGroup>
       </div>
-      <p class="mt-2 flex justify-center">
-        <span>
-          <img src="/wx-xingyu.png" alt="数舵科技" />
-        </span>
-      </p>
+      <div class="mt-2 flex justify-start">
+        <p class="w-24 p-2">软件外包:</p>
+        <img
+          src="/wx-xingyu.png"
+          alt="数舵科技"
+          class="cursor-pointer"
+          @click="openWindow('https://shuduokeji.com')"
+        />
+      </div>
       <p class="mt-2 flex justify-center pt-4 text-sm italic">
-        本项目采用<Badge variant="destructive">MIT</Badge>
+        本项目采用 <Badge class="mx-2" variant="destructive">MIT</Badge>
         开源协议，个人与企业可100% 免费使用。
       </p>
     </div>
diff --git a/packages/effects/layouts/src/widgets/tenant-dropdown/tenant-dropdown.vue b/packages/effects/layouts/src/widgets/tenant-dropdown/tenant-dropdown.vue
index e53f9f5b..069a0b28 100644
--- a/packages/effects/layouts/src/widgets/tenant-dropdown/tenant-dropdown.vue
+++ b/packages/effects/layouts/src/widgets/tenant-dropdown/tenant-dropdown.vue
@@ -1,6 +1,9 @@
 <script lang="ts" setup>
 import { computed } from 'vue';
 
+import { IconifyIcon } from '@vben/icons';
+import { $t } from '@vben/locales';
+
 import {
   Button,
   DropdownMenu,
@@ -46,17 +49,18 @@ async function handleChange(id: number | undefined) {
 }
 </script>
 <template>
-  <!-- TODO @xingyu：1）未选择的时候，空着一块，有点怪。是不是有个 placeholder 会好看点哈（之前有 page.tenant.placeholder）？2）是不是要支持个 clear 选择 -->
   <DropdownMenu>
-    <DropdownMenuTrigger as-child>
+    <DropdownMenuTrigger>
       <Button
         variant="outline"
-        class="hover:bg-accent ml-1 mr-2 h-8 w-24 cursor-pointer rounded-full p-1.5"
+        class="hover:bg-accent ml-1 mr-2 h-8 w-32 cursor-pointer rounded-full p-1.5"
       >
-        {{ tenants.find((item) => item.id === visitTenantId)?.name }}
+        <IconifyIcon icon="lucide:align-justify" class="mr-4" />
+        {{ $t('page.tenant.placeholder') }}
+        <!-- {{ tenants.find((item) => item.id === visitTenantId)?.name }} -->
       </Button>
     </DropdownMenuTrigger>
-    <DropdownMenuContent class="w-56 p-0 pb-1">
+    <DropdownMenuContent class="w-40 p-0 pb-1">
       <DropdownMenuGroup>
         <DropdownMenuItem
           v-for="tenant in tenants"
@@ -65,7 +69,13 @@ async function handleChange(id: number | undefined) {
           class="mx-1 flex cursor-pointer items-center rounded-sm py-1 leading-8"
           @click="handleChange(tenant.id)"
         >
-          {{ tenant.name }}
+          <template v-if="tenant.id === visitTenantId">
+            <IconifyIcon icon="lucide:check" class="mr-2" />
+            {{ tenant.name }}
+          </template>
+          <template v-else>
+            {{ tenant.name }}
+          </template>
         </DropdownMenuItem>
       </DropdownMenuGroup>
     </DropdownMenuContent>