From 892c84f32a12f10b0b21b74801fd28ccdf248e06 Mon Sep 17 00:00:00 2001
From: "Michelle.Chung" <1242874891@qq.com>
Date: Tue, 27 Jun 2023 09:03:51 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E6=9B=B4=E6=96=B0=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E5=91=BD=E5=90=8D=20activityTimeout=20->=20activeTimeout=20;?=
 =?UTF-8?q?=20update=20=E6=96=B0=E5=A2=9E=E5=AD=97=E6=AE=B5=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E7=B1=BB=E5=9E=8B=20deviceType=20;?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/system/client/types.ts    | 21 ++++++++++++++++++---
 src/views/system/client/index.vue | 29 ++++++++++++++++++++++++-----
 2 files changed, 42 insertions(+), 8 deletions(-)

diff --git a/src/api/system/client/types.ts b/src/api/system/client/types.ts
index 1c505ac..e67f95f 100644
--- a/src/api/system/client/types.ts
+++ b/src/api/system/client/types.ts
@@ -24,10 +24,15 @@ export interface ClientVO {
    */
   grantTypeList: string[];
 
+  /**
+   * 设备类型
+   */
+  deviceType: string;
+
   /**
    * token活跃超时时间
    */
-  activityTimeout: number;
+  activeTimeout: number;
 
   /**
    * token固定超时
@@ -67,10 +72,15 @@ export interface ClientForm extends BaseEntity {
    */
   grantTypeList?: string[];
 
+  /**
+   * 设备类型
+   */
+  deviceType?: string;
+
   /**
    * token活跃超时时间
    */
-  activityTimeout?: number;
+  activeTimeout?: number;
 
   /**
    * token固定超时
@@ -105,10 +115,15 @@ export interface ClientQuery extends PageQuery {
    */
   grantType?: string;
 
+  /**
+   * 设备类型
+   */
+  deviceType?: string;
+
   /**
    * token活跃超时时间
    */
-  activityTimeout?: number;
+  activeTimeout?: number;
 
   /**
    * token固定超时
diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue
index 5191108..2130d03 100644
--- a/src/views/system/client/index.vue
+++ b/src/views/system/client/index.vue
@@ -56,7 +56,12 @@
             </div>
           </template>
         </el-table-column>
-        <el-table-column label="Token活跃超时时间" align="center" prop="activityTimeout" />
+        <el-table-column label="设备类型" align="center">
+          <template #default="scope">
+            <dict-tag :options="sys_device_type" :value="scope.row.deviceType" />
+          </template>
+        </el-table-column>
+        <el-table-column label="Token活跃超时时间" align="center" prop="activeTimeout" />
         <el-table-column label="Token固定超时时间" align="center" prop="timeout" />
         <el-table-column label="状态" align="center" key="status">
           <template #default="scope">
@@ -100,7 +105,15 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item prop="activityTimeout" label-width="auto">
+        <el-form-item label="设备类型" prop="deviceType">
+          <el-select v-model="form.deviceType" placeholder="请输入设备类型">
+            <el-option
+              v-for="dict in sys_device_type"
+              :key="dict.value" :label="dict.label" :value="dict.value"
+            ></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item prop="activeTimeout" label-width="auto">
           <template #label>
             <span>
               <el-tooltip content="指定时间无操作则过期（单位：秒），默认30分钟（1800秒）" placement="top">
@@ -109,7 +122,7 @@
               Token活跃超时时间
             </span>
           </template>
-          <el-input v-model="form.activityTimeout" placeholder="请输入Token活跃超时时间" />
+          <el-input v-model="form.activeTimeout" placeholder="请输入Token活跃超时时间" />
         </el-form-item>
         <el-form-item prop="timeout" label-width="auto">
           <template #label>
@@ -149,6 +162,7 @@ import { ElForm } from 'element-plus';
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 const { sys_normal_disable } = toRefs<any>(proxy?.useDict("sys_normal_disable"));
 const { sys_grant_type } = toRefs<any>(proxy?.useDict("sys_grant_type"));
+const { sys_device_type } = toRefs<any>(proxy?.useDict("sys_device_type"));
 
 const clientList = ref<ClientVO[]>([]);
 const buttonLoading = ref(false);
@@ -173,7 +187,8 @@ const initFormData: ClientForm = {
   clientKey: undefined,
   clientSecret: undefined,
   grantTypeList: undefined,
-  activityTimeout: undefined,
+  deviceType: undefined,
+  activeTimeout: undefined,
   timeout: undefined,
   status: undefined,
 }
@@ -186,7 +201,8 @@ const data = reactive<PageData<ClientForm, ClientQuery>>({
     clientKey: undefined,
     clientSecret: undefined,
     grantType: undefined,
-    activityTimeout: undefined,
+    deviceType: undefined,
+    activeTimeout: undefined,
     timeout: undefined,
     status: undefined,
   },
@@ -206,6 +222,9 @@ const data = reactive<PageData<ClientForm, ClientQuery>>({
     grantTypeList: [
       { required: true, message: "授权类型不能为空", trigger: "change" }
     ],
+    deviceType: [
+      { required: true, message: "设备类型不能为空", trigger: "change" }
+    ],
   }
 });