fix: 渠道账号群聊同步缓存 key 及成员名称兜底；统一 Docker/Maven 项目约定

admin-web/src/views/UserManagement.vue

@@ -1,11 +1,11 @@
 <template>
-  <div>
-    <div class="toolbar">
+  <PageCard>
+    <template #toolbar-left>
       <el-select
         v-model="selectedTenant"
         placeholder="选择租户"
         clearable
-        style="width: 200px; margin-right: 12px"
+        style="width: 200px"
         :disabled="!isPlatformAdmin"
         @change="loadUsers"
       >
@@ -16,46 +16,63 @@
           :value="t.tenantCode"
         />
       </el-select>
-      <el-button type="primary" @click="openCreateDialog">创建用户</el-button>
-    </div>
+      <el-input
+        v-model="searchText"
+        placeholder="搜索用户名 / 姓名 / 手机号"
+        clearable
+        style="width: 240px"
+        @keyup.enter="handleSearch"
+      />
+    </template>
+    <template #toolbar-right>
+      <el-button type="primary" @click="openCreateDialog">新增用户</el-button>
+    </template>
 
-    <el-table :data="users" border>
+    <el-table :data="pagedUsers" @row-click="openEditDrawer" class="sino-table">
       <el-table-column prop="id" label="ID" width="80" />
-      <el-table-column prop="tenantCode" label="租户编码" />
-      <el-table-column prop="username" label="用户名" />
-      <el-table-column prop="realName" label="真实姓名" />
-      <el-table-column prop="phone" label="手机号" />
-      <el-table-column prop="roleCodes" label="角色">
+      <el-table-column prop="tenantCode" label="租户编码" min-width="140" />
+      <el-table-column prop="username" label="用户名" min-width="140" />
+      <el-table-column prop="realName" label="真实姓名" min-width="120" />
+      <el-table-column prop="phone" label="手机号" min-width="140" />
+      <el-table-column prop="roleCodes" label="角色" min-width="180">
         <template #default="{ row }">
           {{ formatRoles(row.roleCodes) }}
         </template>
       </el-table-column>
-      <el-table-column prop="status" label="状态" width="100">
+      <el-table-column prop="status" label="状态" width="120">
         <template #default="{ row }">
-          <el-tag :type="row.status === 1 ? 'success' : 'info'">
-            {{ row.status === 1 ? '启用' : '禁用' }}
-          </el-tag>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="260">
-        <template #default="{ row }">
-          <el-button size="small" @click="openEditDialog(row)">编辑</el-button>
-          <el-button size="small" type="danger" @click="handleDelete(row)">删除</el-button>
-          <el-switch
-            v-model="row.status"
-            :active-value="1"
-            :inactive-value="0"
-            style="margin: 0 12px"
-            @change="(val: any) => handleStatusChange(row, val)"
-          />
+          <div class="status-cell" @click.stop>
+            <el-switch
+              v-model="row.status"
+              :active-value="1"
+              :inactive-value="0"
+              inline-prompt
+              active-text="启用"
+              inactive-text="禁用"
+              @change="(val: any) => handleStatusChange(row, val)"
+            />
+          </div>
         </template>
       </el-table-column>
     </el-table>
 
-    <el-dialog v-model="dialogVisible" :title="isEdit ? '编辑用户' : '创建用户'" width="600px">
+    <template #pagination>
+      <el-pagination
+        v-model:current-page="page"
+        v-model:page-size="pageSize"
+        :total="totalCount"
+        :page-sizes="[10, 20, 50, 100]"
+        layout="total, sizes, prev, pager, next"
+        @size-change="handleSizeChange"
+        @current-change="handlePageChange"
+      />
+    </template>
+
+    <!-- 新增用户弹窗 -->
+    <el-dialog v-model="dialogVisible" title="新增用户" width="600px">
       <el-form :model="dialogForm" label-width="100px">
         <el-form-item label="租户">
-          <el-select v-model="dialogForm.tenantCode" :disabled="isEdit" style="width: 100%">
+          <el-select v-model="dialogForm.tenantCode" style="width: 100%">
             <el-option
               v-for="t in tenants"
               :key="t.id"
@@ -65,9 +82,9 @@
           </el-select>
         </el-form-item>
         <el-form-item label="用户名">
-          <el-input v-model="dialogForm.username" :disabled="isEdit" placeholder="用户名" />
+          <el-input v-model="dialogForm.username" placeholder="用户名" />
         </el-form-item>
-        <el-form-item v-if="!isEdit" label="密码">
+        <el-form-item label="密码">
           <el-input v-model="dialogForm.password" type="password" placeholder="密码" />
         </el-form-item>
         <el-form-item label="真实姓名">
@@ -101,7 +118,60 @@
         <el-button type="primary" @click="handleSave">保存</el-button>
       </template>
     </el-dialog>
-  </div>
+
+    <!-- 用户详情 / 编辑抽屉 -->
+    <el-drawer v-model="drawerVisible" :title="drawerTitle" size="480px">
+      <el-form :model="drawerForm" label-width="100px" v-if="currentRow">
+        <el-form-item label="租户">
+          <el-select v-model="drawerForm.tenantCode" disabled style="width: 100%">
+            <el-option
+              v-for="t in tenants"
+              :key="t.id"
+              :label="`${t.tenantName}（${t.tenantCode}）`"
+              :value="t.tenantCode"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="用户名">
+          <el-input v-model="drawerForm.username" disabled />
+        </el-form-item>
+        <el-form-item label="真实姓名">
+          <el-input v-model="drawerForm.realName" placeholder="真实姓名" />
+        </el-form-item>
+        <el-form-item label="手机号">
+          <el-input v-model="drawerForm.phone" placeholder="手机号" />
+        </el-form-item>
+        <el-form-item label="角色">
+          <el-select v-model="drawerForm.roleCodes" multiple placeholder="选择角色" style="width: 100%">
+            <el-option
+              v-for="r in roles"
+              :key="r.id"
+              :label="r.roleName"
+              :value="r.roleCode"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="状态">
+          <el-switch
+            v-model="drawerForm.status"
+            :active-value="1"
+            :inactive-value="0"
+            active-text="启用"
+            inactive-text="禁用"
+          />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="drawer-footer">
+          <el-button type="danger" plain @click="handleDrawerDelete">删除</el-button>
+          <div class="drawer-actions">
+            <el-button @click="drawerVisible = false">取消</el-button>
+            <el-button type="primary" @click="handleDrawerSave">保存</el-button>
+          </div>
+        </div>
+      </template>
+    </el-drawer>
+  </PageCard>
 </template>
 
 <script setup lang="ts">
@@ -116,6 +186,7 @@ import {
   listUsers,
   updateUser,
 } from '@/api/account'
+import PageCard from '@/components/PageCard.vue'
 
 const authStore = useAuthStore()
 const isPlatformAdmin = computed(() => authStore.roleCodes.includes('platform_admin'))
@@ -139,6 +210,59 @@ const dialogForm = reactive({
   status: 1,
 })
 
+const searchText = ref('')
+const drawerVisible = ref(false)
+const currentRow = ref<any>(null)
+const page = ref(1)
+const pageSize = ref(10)
+
+const drawerForm = reactive({
+  tenantCode: '',
+  username: '',
+  realName: '',
+  phone: '',
+  roleCodes: [] as string[],
+  status: 1,
+})
+
+const filteredUsers = computed(() => {
+  let list = users.value
+  if (searchText.value) {
+    const kw = searchText.value.toLowerCase()
+    list = list.filter(
+      (u) =>
+        (u.username || '').toLowerCase().includes(kw) ||
+        (u.realName || '').toLowerCase().includes(kw) ||
+        (u.phone || '').toLowerCase().includes(kw)
+    )
+  }
+  return list
+})
+
+const totalCount = computed(() => filteredUsers.value.length)
+
+const pagedUsers = computed(() => {
+  const start = (page.value - 1) * pageSize.value
+  return filteredUsers.value.slice(start, start + pageSize.value)
+})
+
+const drawerTitle = computed(() =>
+  currentRow.value ? `编辑用户 - ${currentRow.value.username}` : '用户详情'
+)
+
+function handleSearch() {
+  page.value = 1
+}
+
+function handlePageChange(val: number) {
+  page.value = val
+}
+
+function handleSizeChange(val: number) {
+  pageSize.value = val
+  page.value = 1
+}
+
 function resetDialogForm() {
   dialogForm.tenantCode = isPlatformAdmin.value ? '' : (authStore.tenantCode || '')
   dialogForm.username = ''
@@ -159,6 +283,24 @@ function fillDialogForm(row: any) {
   dialogForm.status = row.status ?? 1
 }
 
+function resetDrawerForm() {
+  drawerForm.tenantCode = ''
+  drawerForm.username = ''
+  drawerForm.realName = ''
+  drawerForm.phone = ''
+  drawerForm.roleCodes = []
+  drawerForm.status = 1
+}
+
+function fillDrawerForm(row: any) {
+  drawerForm.tenantCode = row.tenantCode ?? ''
+  drawerForm.username = row.username ?? ''
+  drawerForm.realName = row.realName ?? ''
+  drawerForm.phone = row.phone ?? ''
+  drawerForm.roleCodes = row.roleCodes || []
+  drawerForm.status = row.status ?? 1
+}
+
 function openCreateDialog() {
   isEdit.value = false
   editingId.value = null
@@ -173,6 +315,12 @@ function openEditDialog(row: any) {
   dialogVisible.value = true
 }
 
+function openEditDrawer(row: any) {
+  currentRow.value = row
+  fillDrawerForm(row)
+  drawerVisible.value = true
+}
+
 function formatRoles(codes: string[] | undefined) {
   if (!codes || codes.length === 0) return '-'
   return codes
@@ -205,6 +353,7 @@ async function loadUsers() {
   try {
     const res: any = await listUsers(selectedTenant.value || undefined)
     users.value = res.data || []
+    page.value = 1
   } catch (e: any) {
     ElMessage.error(e.message)
   }
@@ -282,6 +431,29 @@ async function handleDelete(row: any) {
   }
 }
 
+async function handleDrawerSave() {
+  if (!currentRow.value) return
+  try {
+    await updateUser(currentRow.value.id, {
+      realName: drawerForm.realName,
+      phone: drawerForm.phone,
+      status: drawerForm.status,
+      roleCodes: drawerForm.roleCodes,
+    })
+    ElMessage.success('保存成功')
+    drawerVisible.value = false
+    await loadUsers()
+  } catch (e: any) {
+    ElMessage.error(e.message)
+  }
+}
+
+async function handleDrawerDelete() {
+  if (!currentRow.value) return
+  await handleDelete(currentRow.value)
+  drawerVisible.value = false
+}
+
 onMounted(() => {
   loadTenants()
   loadRoles()
@@ -290,7 +462,14 @@ onMounted(() => {
 </script>
 
 <style scoped>
-.toolbar {
-  margin-bottom: 16px;
+.drawer-footer {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  width: 100%;
+}
+.drawer-actions {
+  display: flex;
+  gap: 12px;
 }
 </style>