From efe744cfdd0edb327dba7d2dd1a3e81a9377d32b Mon Sep 17 00:00:00 2001
From: dap <15891557205@163.com>
Date: Tue, 13 Jan 2026 19:58:30 +0800
Subject: [PATCH] =?UTF-8?q?refactor(=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86):?=
 =?UTF-8?q?=20=E4=BC=98=E5=8C=96=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E5=92=8C=E6=93=8D=E4=BD=9C=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

重构用户信息模态框中的登录时间显示，移除重复代码并优化标签渲染
将用户列表中的操作菜单改为计算属性方式，简化模板代码
---
 apps/web-antd/src/views/system/user/index.vue | 58 ++++++++++---------
 .../src/views/system/user/user-info-modal.vue | 14 ++---
 2 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/apps/web-antd/src/views/system/user/index.vue b/apps/web-antd/src/views/system/user/index.vue
index 4eef5f9f..03b257ed 100644
--- a/apps/web-antd/src/views/system/user/index.vue
+++ b/apps/web-antd/src/views/system/user/index.vue
@@ -1,26 +1,19 @@
 <script setup lang="ts">
+import type { MenuProps } from 'antdv-next';
+
 import type { VbenFormProps } from '@vben/common-ui';
 
 import type { VxeGridProps } from '#/adapter/vxe-table';
 import type { User } from '#/api/system/user/model';
 
-import { ref } from 'vue';
+import { computed, ref } from 'vue';
 
 import { useAccess } from '@vben/access';
 import { Page, useVbenDrawer, useVbenModal } from '@vben/common-ui';
 import { $t } from '@vben/locales';
 import { preferences } from '@vben/preferences';
-import { getVxePopupContainer } from '@vben/utils';
 
-import {
-  Avatar,
-  Dropdown,
-  Menu,
-  MenuItem,
-  Modal,
-  Popconfirm,
-  Space,
-} from 'antdv-next';
+import { Avatar, Dropdown, Modal, Popconfirm, Space } from 'antdv-next';
 
 import { useVbenVxeGrid, vxeCheckboxChecked } from '#/adapter/vxe-table';
 import {
@@ -61,7 +54,7 @@ const formOptions: VbenFormProps = {
       allowClear: true,
     },
   },
-  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3 xl:grid-cols-4',
+  wrapperClass: 'grid-cols-1 md:grid-cols-2 lg:grid-cols-3',
   handleReset: async () => {
     selectDeptId.value = [];
 
@@ -186,6 +179,26 @@ function handleResetPwd(record: User) {
 }
 
 const { hasAccessByCodes } = useAccess();
+const menuItems = computed(() => {
+  const items: MenuProps['items'] = [{ key: 'info', label: '用户信息' }];
+  if (hasAccessByCodes(['system:user:resetPwd'])) {
+    items.push({ key: 'resetPwd', label: '重置密码' });
+  }
+  return items;
+});
+
+function handleMenuClick(key: string, row: any) {
+  switch (key) {
+    case 'info': {
+      handleUserInfo(row);
+      break;
+    }
+    case 'resetPwd': {
+      handleResetPwd(row);
+      break;
+    }
+  }
+}
 </script>
 
 <template>
@@ -254,7 +267,6 @@ const { hasAccessByCodes } = useAccess();
                 {{ $t('pages.common.edit') }}
               </ghost-button>
               <Popconfirm
-                :get-popup-container="getVxePopupContainer"
                 placement="left"
                 title="确认删除？"
                 @confirm="handleDelete(row)"
@@ -268,19 +280,13 @@ const { hasAccessByCodes } = useAccess();
                 </ghost-button>
               </Popconfirm>
             </Space>
-            <Dropdown placement="bottomRight">
-              <template #overlay>
-                <Menu>
-                  <MenuItem key="1" @click="handleUserInfo(row)">
-                    用户信息
-                  </MenuItem>
-                  <span v-access:code="['system:user:resetPwd']">
-                    <MenuItem key="2" @click="handleResetPwd(row)">
-                      重置密码
-                    </MenuItem>
-                  </span>
-                </Menu>
-              </template>
+            <Dropdown
+              placement="bottomRight"
+              :menu="{
+                items: menuItems,
+                onClick: (info) => handleMenuClick(info.key, row),
+              }"
+            >
               <a-button size="small" type="link">
                 {{ $t('pages.common.more') }}
               </a-button>
diff --git a/apps/web-antd/src/views/system/user/user-info-modal.vue b/apps/web-antd/src/views/system/user/user-info-modal.vue
index ac74874c..3e9a8b89 100644
--- a/apps/web-antd/src/views/system/user/user-info-modal.vue
+++ b/apps/web-antd/src/views/system/user/user-info-modal.vue
@@ -124,20 +124,16 @@ const items = computed<DescriptionsProps['items']>(() => {
     },
     { label: '创建时间', content: currentUser.value.createTime },
     { label: '上次登录IP', content: currentUser.value.loginIp || '-' },
-    { label: '上次登录时间', content: currentUser.value.loginDate || '-' },
     {
       label: '上次登录时间',
       content: (
         <>
           <span>{currentUser.value.loginDate ?? '-'}</span>
-          <Tag
-            bordered={false}
-            class="ml-2"
-            color="processing"
-            v-if="diffLoginTime"
-          >
-            {diffLoginTime}前
-          </Tag>
+          {diffLoginTime.value && (
+            <Tag class="ml-2" color="processing">
+              {diffLoginTime.value}前
+            </Tag>
+          )}
         </>
       ),
     },