From cf7660ed689f2f24b27626308f9123a7632e25a2 Mon Sep 17 00:00:00 2001
From: kiki1373639299 <zkai0106@163.com>
Date: Fri, 21 Nov 2025 18:20:48 +0800
Subject: [PATCH 1/3] =?UTF-8?q?feat(client):=20=E6=96=B0=E5=A2=9E=E5=AE=A2?=
 =?UTF-8?q?=E6=88=B7=E7=AB=AF=E5=8F=82=E6=95=B0=E6=8B=93=E5=B1=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/apis/system/type.ts                       |  11 ++
 src/views/system/config/client/AddModal.vue   | 122 +++++++++++++++++-
 .../system/config/client/DetailDrawer.vue     |  22 +++-
 src/views/system/config/client/index.vue      |  52 +++++++-
 4 files changed, 195 insertions(+), 12 deletions(-)

diff --git a/src/apis/system/type.ts b/src/apis/system/type.ts
index 3c0f665..d1fc317 100644
--- a/src/apis/system/type.ts
+++ b/src/apis/system/type.ts
@@ -295,12 +295,18 @@ export interface ClientResp {
   activeTimeout: string
   timeout: string
   status: string
+  isConcurrent: boolean
+  isShare: boolean
+  maxLoginCount: number
+  replacedRange: string
+  overflowLogoutMode: string
   createUser: string
   createTime: string
   updateUser: string
   updateTime: string
   createUserString: string
   updateUserString: string
+  disabled: boolean
 }
 export interface ClientDetailResp {
   id: string
@@ -310,6 +316,11 @@ export interface ClientDetailResp {
   activeTimeout: string
   timeout: string
   status: string
+  isConcurrent: boolean
+  isShare: boolean
+  maxLoginCount: number
+  replacedRange: string
+  overflowLogoutMode: string
   createUser: string
   createTime: string
   updateUser: string
diff --git a/src/views/system/config/client/AddModal.vue b/src/views/system/config/client/AddModal.vue
index 901c6ce..f3a27c1 100644
--- a/src/views/system/config/client/AddModal.vue
+++ b/src/views/system/config/client/AddModal.vue
@@ -32,16 +32,45 @@ const visible = ref(false)
 const isUpdate = computed(() => !!dataId.value)
 const title = computed(() => (isUpdate.value ? '修改客户端' : '新增客户端'))
 const formRef = ref<InstanceType<typeof GiForm>>()
-const { client_type, auth_type_enum } = useDict('auth_type_enum', 'client_type')
+const { client_type, auth_type_enum, replaced_range_enum, logout_mode_enum } = useDict('auth_type_enum', 'client_type', 'replaced_range_enum', 'logout_mode_enum')
 
 const [form, resetForm] = useResetReactive({
   activeTimeout: 1800,
   timeout: 86400,
-  isConcurrent: 1,
-  isShare: 1,
+  isConcurrent: true,
+  isShare: true,
+  maxLoginCount: -1,
+  replacedRange: 'ALL_DEVICE_TYPE',
+  overflowLogoutMode: 'KICKOUT',
   status: 1,
 })
 
+// 监听 isConcurrent 和 isShare 的变化，处理字段互斥逻辑
+watch(
+  () => form.isConcurrent,
+  (newVal) => {
+    if (!newVal) {
+      // 当 isConcurrent=false 时，禁用相关字段
+      form.isShare = false
+      form.maxLoginCount = -1
+      // replacedRange 只有在 isConcurrent=false 时才有意义
+    } else if (newVal && form.isShare) {
+      // 当 isConcurrent=true 且 isShare=true 时，清空 maxLoginCount
+      form.maxLoginCount = -1
+    }
+  },
+)
+
+watch(
+  () => form.isShare,
+  (newVal) => {
+    if (form.isConcurrent && newVal) {
+      // 当 isConcurrent=true 且 isShare=true 时，清空 maxLoginCount
+      form.maxLoginCount = -1
+    }
+  },
+)
+
 const columns: ColumnItem[] = reactive([
   {
     label: '客户端类型',
@@ -87,7 +116,7 @@ const columns: ColumnItem[] = reactive([
   {
     label: () => (
       <a-tooltip content="-1 代表永不过期">
-        Token 有效期&nbsp;
+        Token 有效期
         <icon-question-circle />
       </a-tooltip>
     ),
@@ -104,6 +133,91 @@ const columns: ColumnItem[] = reactive([
     },
     rules: [{ required: true, message: '请输入 Token 有效期' }],
   },
+  {
+    label: '是否允许同一账号多地同时登录',
+    field: 'isConcurrent',
+    type: 'switch',
+    span: 12,
+    props: {
+      type: 'round',
+      checkedValue: true,
+      uncheckedValue: false,
+      checkedText: '允许',
+      uncheckedText: '不允许',
+    },
+  },
+  {
+    label: '是否共用 token',
+    field: 'isShare',
+    type: 'switch',
+    span: 12,
+    props: {
+      type: 'round',
+      checkedValue: true,
+      uncheckedValue: false,
+      checkedText: '共用',
+      uncheckedText: '不共用',
+    },
+    disabled: () => {
+      return !form.isConcurrent
+    },
+  },
+  {
+    label: () => (
+      <a-tooltip content="-1 代表不限">
+        最大登录数量
+        <icon-question-circle />
+      </a-tooltip>
+    ),
+    field: 'maxLoginCount',
+    type: 'input-number',
+    span: 12,
+    slots: {
+      append: () => (
+        <span style={{ width: '80px', textAlign: 'center' }}>个</span>
+      ),
+    },
+    props: {
+      placeholder: '请输入最大登录数量',
+      min: -1,
+    },
+    disabled: () => {
+      return !form.isConcurrent || form.isShare
+    },
+    rules: [
+      {
+        validator: (value: number, callback: (errorMessage?: string) => void) => {
+          if (value === 0) {
+            callback('最大登录数量不能为0，请输入-1或正整数')
+          }
+          callback()
+        },
+      },
+    ],
+  },
+  {
+    label: '顶人下线的范围',
+    field: 'replacedRange',
+    type: 'select',
+    span: 12,
+    props: {
+      options: replaced_range_enum,
+      placeholder: '请选择顶人下线的范围',
+    },
+    disabled: () => {
+      return form.isConcurrent
+    },
+  },
+  {
+    label: '溢出人数的注销方式',
+    field: 'overflowLogoutMode',
+    type: 'select',
+    span: 24,
+    props: {
+      options: logout_mode_enum,
+      placeholder: '请选择溢出人数的注销方式',
+    },
+  },
   {
     label: '状态',
     field: 'status',
diff --git a/src/views/system/config/client/DetailDrawer.vue b/src/views/system/config/client/DetailDrawer.vue
index f915e50..efbc8bf 100644
--- a/src/views/system/config/client/DetailDrawer.vue
+++ b/src/views/system/config/client/DetailDrawer.vue
@@ -17,6 +17,23 @@
         <a-tag v-if="dataDetail?.status === 1" color="green">启用</a-tag>
         <a-tag v-else color="red">禁用</a-tag>
       </a-descriptions-item>
+      <a-descriptions-item label="是否允许多地登录" :span="2">
+        <a-tag v-if="dataDetail?.isConcurrent" color="blue">允许</a-tag>
+        <a-tag v-else color="orange">不允许</a-tag>
+      </a-descriptions-item>
+      <a-descriptions-item label="是否共用 token" :span="2">
+        <a-tag v-if="dataDetail?.isShare" color="blue">共用</a-tag>
+        <a-tag v-else color="orange">不共用</a-tag>
+      </a-descriptions-item>
+      <a-descriptions-item label="最大登录数量">
+        {{ dataDetail?.maxLoginCount === -1 ? '不限' : dataDetail?.maxLoginCount }}
+      </a-descriptions-item>
+      <a-descriptions-item label="顶人下线范围">
+        <GiCellTag :value="dataDetail?.replacedRange" :dict="replaced_range_enum" />
+      </a-descriptions-item>
+      <a-descriptions-item label="溢出注销方式" :span="2">
+        <GiCellTag :value="dataDetail?.overflowLogoutMode" :dict="logout_mode_enum" />
+      </a-descriptions-item>
       <a-descriptions-item label="创建人">{{ dataDetail?.createUserString }}</a-descriptions-item>
       <a-descriptions-item label="创建时间">{{ dataDetail?.createTime }}</a-descriptions-item>
       <a-descriptions-item label="更新人">{{ dataDetail?.updateUserString }}</a-descriptions-item>
@@ -29,11 +46,14 @@
 import { useWindowSize } from '@vueuse/core'
 import { type ClientDetailResp, getClient as getDetail } from '@/apis/system/client'
 import { useDict } from '@/hooks/app'
+import GiCellTag from '@/components/GiCell/GiCellTag.vue'
 
 const {
   client_type,
   auth_type_enum,
-} = useDict('client_type', 'auth_type_enum')
+  replaced_range_enum,
+  logout_mode_enum,
+} = useDict('client_type', 'auth_type_enum', 'replaced_range_enum', 'logout_mode_enum')
 
 const { width } = useWindowSize()
 
diff --git a/src/views/system/config/client/index.vue b/src/views/system/config/client/index.vue
index e37db58..0d6610b 100644
--- a/src/views/system/config/client/index.vue
+++ b/src/views/system/config/client/index.vue
@@ -60,7 +60,7 @@
 
 <script setup lang="tsx">
 import type { LabelValue } from '@arco-design/web-vue/es/tree-select/interface'
-import type { TableInstance } from '@arco-design/web-vue'
+import { type TableInstance, Tag } from '@arco-design/web-vue'
 import AddModal from './AddModal.vue'
 import DetailDrawer from './DetailDrawer.vue'
 import { type ClientQuery, type ClientResp, deleteClient, listClient } from '@/apis/system/client'
@@ -79,7 +79,9 @@ defineOptions({ name: 'SystemClient' })
 const {
   client_type,
   auth_type_enum,
-} = useDict('client_type', 'auth_type_enum')
+  replaced_range_enum,
+  logout_mode_enum,
+} = useDict('client_type', 'auth_type_enum', 'replaced_range_enum', 'logout_mode_enum')
 
 const queryForm = reactive<ClientQuery>({
   clientType: '',
@@ -89,7 +91,7 @@ const queryForm = reactive<ClientQuery>({
 })
 const formatAuthType = (data: string[]) => {
   return data.map((item: string) => {
-    return auth_type_enum.value.find((d: LabelValue) => d.value === item).label
+    return auth_type_enum.value?.find((d: LabelValue) => d.value === item)?.label
   })
 }
 
@@ -155,15 +157,51 @@ const columns: TableInstance['columns'] = [
       return <GiCellStatus status={record.status} />
     },
   },
+  {
+    title: '是否允许多地登录',
+    dataIndex: 'isConcurrent',
+    align: 'center',
+    render: ({ record }) => {
+      return <Tag>{record.isConcurrent ? '允许' : '不允许'}</Tag>
+    },
+  },
+  {
+    title: '是否共用 token',
+    dataIndex: 'isShare',
+    align: 'center',
+    render: ({ record }) => {
+      return <Tag>{record.isShare ? '共用' : '不共用'}</Tag>
+    },
+  },
+  {
+    title: '最大登录数量',
+    dataIndex: 'maxLoginCount',
+    align: 'center',
+    render: ({ record }) => {
+      return record.maxLoginCount === -1 ? '不限' : record.maxLoginCount
+    },
+  },
+  {
+    title: '顶人下线范围',
+    dataIndex: 'replacedRange',
+    align: 'center',
+    render: ({ record }) => {
+      return <GiCellTag value={record.replacedRange} dict={replaced_range_enum.value} />
+    },
+  },
+  {
+    title: '溢出注销方式',
+    dataIndex: 'overflowLogoutMode',
+    align: 'center',
+    render: ({ record }) => {
+      return <GiCellTag value={record.overflowLogoutMode} dict={logout_mode_enum.value} />
+    },
+  },
   { title: '创建人', dataIndex: 'createUserString', width: 140, ellipsis: true, tooltip: true, show: false },
-  { title: '创建时间', dataIndex: 'createTime', width: 180 },
-  { title: '修改人', dataIndex: 'updateUserString', width: 140, ellipsis: true, tooltip: true, show: false },
-  { title: '修改时间', dataIndex: 'updateTime', width: 180, show: false },
   {
     title: '操作',
     dataIndex: 'action',
     slotName: 'action',
-    width: 160,
     align: 'center',
     fixed: !isMobile() ? 'right' : undefined,
     show: has.hasPermOr(['system:client:get', 'system:client:update', 'system:client:delete']),
-- 
Gitee


From d1b9abfcfeece1d46062a3afbe8e09751a0d98c7 Mon Sep 17 00:00:00 2001
From: kiki1373639299 <zkai0106@163.com>
Date: Tue, 25 Nov 2025 09:09:03 +0800
Subject: [PATCH 2/3] refactor(client): remove isShare field and update related
 logic

- Removed the isShare field from ClientResp and ClientDetailResp interfaces.
- Updated AddModal.vue to reflect the removal of isShare, adjusting the logic for maxLoginCount based on isConcurrent.
- Cleaned up DetailDrawer.vue and index.vue by removing references to isShare.
- Changed status type from string to number in ClientDetailResp for consistency.
---
 src/apis/system/type.ts                       |  4 +-
 src/views/system/config/client/AddModal.vue   | 39 +++----------------
 .../system/config/client/DetailDrawer.vue     |  4 --
 src/views/system/config/client/index.vue      |  8 ----
 4 files changed, 6 insertions(+), 49 deletions(-)

diff --git a/src/apis/system/type.ts b/src/apis/system/type.ts
index d1fc317..fc7c652 100644
--- a/src/apis/system/type.ts
+++ b/src/apis/system/type.ts
@@ -296,7 +296,6 @@ export interface ClientResp {
   timeout: string
   status: string
   isConcurrent: boolean
-  isShare: boolean
   maxLoginCount: number
   replacedRange: string
   overflowLogoutMode: string
@@ -315,9 +314,8 @@ export interface ClientDetailResp {
   authType: string
   activeTimeout: string
   timeout: string
-  status: string
+  status: number
   isConcurrent: boolean
-  isShare: boolean
   maxLoginCount: number
   replacedRange: string
   overflowLogoutMode: string
diff --git a/src/views/system/config/client/AddModal.vue b/src/views/system/config/client/AddModal.vue
index f3a27c1..23bf5a4 100644
--- a/src/views/system/config/client/AddModal.vue
+++ b/src/views/system/config/client/AddModal.vue
@@ -38,34 +38,21 @@ const [form, resetForm] = useResetReactive({
   activeTimeout: 1800,
   timeout: 86400,
   isConcurrent: true,
-  isShare: true,
   maxLoginCount: -1,
   replacedRange: 'ALL_DEVICE_TYPE',
   overflowLogoutMode: 'KICKOUT',
   status: 1,
 })
 
-// 监听 isConcurrent 和 isShare 的变化，处理字段互斥逻辑
+// 监听 isConcurrent 的变化，处理字段互斥逻辑
 watch(
   () => form.isConcurrent,
   (newVal) => {
     if (!newVal) {
-      // 当 isConcurrent=false 时，禁用相关字段
-      form.isShare = false
       form.maxLoginCount = -1
       // replacedRange 只有在 isConcurrent=false 时才有意义
-    } else if (newVal && form.isShare) {
-      // 当 isConcurrent=true 且 isShare=true 时，清空 maxLoginCount
-      form.maxLoginCount = -1
-    }
-  },
-)
-
-watch(
-  () => form.isShare,
-  (newVal) => {
-    if (form.isConcurrent && newVal) {
-      // 当 isConcurrent=true 且 isShare=true 时，清空 maxLoginCount
+    } else if (newVal) {
+      // 当 isConcurrent=true 时，清空 maxLoginCount
       form.maxLoginCount = -1
     }
   },
@@ -146,22 +133,6 @@ const columns: ColumnItem[] = reactive([
       uncheckedText: '不允许',
     },
   },
-  {
-    label: '是否共用 token',
-    field: 'isShare',
-    type: 'switch',
-    span: 12,
-    props: {
-      type: 'round',
-      checkedValue: true,
-      uncheckedValue: false,
-      checkedText: '共用',
-      uncheckedText: '不共用',
-    },
-    disabled: () => {
-      return !form.isConcurrent
-    },
-  },
   {
     label: () => (
       <a-tooltip content="-1 代表不限">
@@ -182,7 +153,7 @@ const columns: ColumnItem[] = reactive([
       min: -1,
     },
     disabled: () => {
-      return !form.isConcurrent || form.isShare
+      return !form.isConcurrent
     },
     rules: [
       {
@@ -212,7 +183,7 @@ const columns: ColumnItem[] = reactive([
     label: '溢出人数的注销方式',
     field: 'overflowLogoutMode',
     type: 'select',
-    span: 24,
+    span: 12,
     props: {
       options: logout_mode_enum,
       placeholder: '请选择溢出人数的注销方式',
diff --git a/src/views/system/config/client/DetailDrawer.vue b/src/views/system/config/client/DetailDrawer.vue
index efbc8bf..889ded9 100644
--- a/src/views/system/config/client/DetailDrawer.vue
+++ b/src/views/system/config/client/DetailDrawer.vue
@@ -21,10 +21,6 @@
         <a-tag v-if="dataDetail?.isConcurrent" color="blue">允许</a-tag>
         <a-tag v-else color="orange">不允许</a-tag>
       </a-descriptions-item>
-      <a-descriptions-item label="是否共用 token" :span="2">
-        <a-tag v-if="dataDetail?.isShare" color="blue">共用</a-tag>
-        <a-tag v-else color="orange">不共用</a-tag>
-      </a-descriptions-item>
       <a-descriptions-item label="最大登录数量">
         {{ dataDetail?.maxLoginCount === -1 ? '不限' : dataDetail?.maxLoginCount }}
       </a-descriptions-item>
diff --git a/src/views/system/config/client/index.vue b/src/views/system/config/client/index.vue
index 0d6610b..0e2b59f 100644
--- a/src/views/system/config/client/index.vue
+++ b/src/views/system/config/client/index.vue
@@ -165,14 +165,6 @@ const columns: TableInstance['columns'] = [
       return <Tag>{record.isConcurrent ? '允许' : '不允许'}</Tag>
     },
   },
-  {
-    title: '是否共用 token',
-    dataIndex: 'isShare',
-    align: 'center',
-    render: ({ record }) => {
-      return <Tag>{record.isShare ? '共用' : '不共用'}</Tag>
-    },
-  },
   {
     title: '最大登录数量',
     dataIndex: 'maxLoginCount',
-- 
Gitee


From 5e1e8bf0a53eec3efeb729d016a7e102e4c1e4a0 Mon Sep 17 00:00:00 2001
From: kiki1373639299 <zkai0106@163.com>
Date: Tue, 25 Nov 2025 09:09:45 +0800
Subject: [PATCH 3/3] refactor(layout): Remove menu width limit under mixed
 layout

---
 src/layout/LayoutMix.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/layout/LayoutMix.vue b/src/layout/LayoutMix.vue
index 357f439..f5d32b7 100644
--- a/src/layout/LayoutMix.vue
+++ b/src/layout/LayoutMix.vue
@@ -10,7 +10,7 @@
       :style="appStore.menuDark ? appStore.themeCSSVar : undefined"
     >
       <Logo :collapsed="appStore.menuCollapse" />
-      <Menu :menus="twoLevelMenus" :menu-style="{ width: '200px', flex: 1 }" />
+      <Menu :menus="twoLevelMenus" :menu-style="{ flex: 1 }" />
       <WwAds class="ads" />
     </section>
 
@@ -83,7 +83,6 @@ const checkAndShowNotices = () => {
   // 如果有token，检查未读公告
   if (token) {
     setTimeout(() => {
-      console.log(noticePopupRef.value)
       noticePopupRef.value?.open()
     }, 1000) // 延迟1秒显示，让页面先加载完成
   }
-- 
Gitee