From e1023bb3313282b00d6dcdefd5d7e30d7aaa1bfc Mon Sep 17 00:00:00 2001 From: 疯狂的狮子Li <15040126243@163.com> Date: 星期四, 30 十一月 2023 11:13:29 +0800 Subject: [PATCH] update 优化 代码中存在的警告 --- src/views/system/client/index.vue | 87 +++++++++++++++++++++++-------------------- 1 files changed, 47 insertions(+), 40 deletions(-) diff --git a/src/views/system/client/index.vue b/src/views/system/client/index.vue index 1a5e191..b39b9e5 100644 --- a/src/views/system/client/index.vue +++ b/src/views/system/client/index.vue @@ -4,10 +4,10 @@ <div class="search" v-show="showSearch"> <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="100px"> <el-form-item label="瀹㈡埛绔痥ey" prop="clientKey"> - <el-input v-model="queryParams.clientKey" placeholder="璇疯緭鍏ュ鎴风key" clearable @keyup.enter="handleQuery" /> + <el-input v-model="queryParams.clientKey" placeholder="璇疯緭鍏ュ鎴风key" clearable style="width: 240px" @keyup.enter="handleQuery" /> </el-form-item> <el-form-item label="瀹㈡埛绔閽�" prop="clientSecret"> - <el-input v-model="queryParams.clientSecret" placeholder="璇疯緭鍏ュ鎴风绉橀挜" clearable @keyup.enter="handleQuery" /> + <el-input v-model="queryParams.clientSecret" placeholder="璇疯緭鍏ュ鎴风绉橀挜" clearable style="width: 240px" @keyup.enter="handleQuery" /> </el-form-item> <el-form-item label="鐘舵��" prop="status"> <el-select v-model="queryParams.status" placeholder="鐘舵��" clearable> @@ -29,10 +29,14 @@ <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['system:client:add']">鏂板</el-button> </el-col> <el-col :span="1.5"> - <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:client:edit']">淇敼</el-button> + <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['system:client:edit']"> + 淇敼 + </el-button> </el-col> <el-col :span="1.5"> - <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:client:remove']">鍒犻櫎</el-button> + <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:client:remove']"> + 鍒犻櫎 + </el-button> </el-col> <el-col :span="1.5"> <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:client:export']">瀵煎嚭</el-button> @@ -47,8 +51,17 @@ <el-table-column label="瀹㈡埛绔痠d" align="center" prop="clientId" /> <el-table-column label="瀹㈡埛绔痥ey" align="center" prop="clientKey" /> <el-table-column label="瀹㈡埛绔閽�" align="center" prop="clientSecret" /> - <el-table-column label="鎺堟潈绫诲瀷" align="center" prop="grantType" /> - <el-table-column label="Token娲昏穬瓒呮椂鏃堕棿" align="center" prop="activityTimeout" /> + <el-table-column label="鎺堟潈绫诲瀷" align="center"> + <template #default="scope"> + <dict-tag :options="sys_grant_type" :value="scope.row.grantTypeList" /> + </template> + </el-table-column> + <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"> @@ -67,13 +80,7 @@ </el-table-column> </el-table> - <pagination - v-show="total>0" - :total="total" - v-model:page="queryParams.pageNum" - v-model:limit="queryParams.pageSize" - @pagination="getList" - /> + <pagination v-show="total>0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" /> </el-card> <!-- 娣诲姞鎴栦慨鏀瑰鎴风绠$悊瀵硅瘽妗� --> <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body> @@ -86,13 +93,15 @@ </el-form-item> <el-form-item label="鎺堟潈绫诲瀷" prop="grantTypeList"> <el-select v-model="form.grantTypeList" multiple placeholder="璇疯緭鍏ユ巿鏉冪被鍨�"> - <el-option - v-for="dict in sys_grant_type" - :key="dict.value" :label="dict.label" :value="dict.value" - ></el-option> + <el-option v-for="dict in sys_grant_type" :key="dict.value" :label="dict.label" :value="dict.value"></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"> @@ -101,7 +110,7 @@ Token娲昏穬瓒呮椂鏃堕棿 </span> </template> - <el-input v-model="form.activityTimeout" placeholder="璇疯緭鍏oken娲昏穬瓒呮椂鏃堕棿" /> + <el-input v-model="form.activeTimeout" placeholder="璇疯緭鍏oken娲昏穬瓒呮椂鏃堕棿" /> </el-form-item> <el-form-item prop="timeout" label-width="auto"> <template #label> @@ -135,12 +144,11 @@ <script setup name="Client" lang="ts"> import { listClient, getClient, delClient, addClient, updateClient, changeStatus } from '@/api/system/client'; import { ClientVO, ClientQuery, ClientForm } from '@/api/system/client/types'; -import { ComponentInternalInstance } from 'vue'; -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); @@ -151,8 +159,8 @@ const multiple = ref(true); const total = ref(0); -const queryFormRef = ref(ElForm); -const clientFormRef = ref(ElForm); +const queryFormRef = ref<ElFormInstance>(); +const clientFormRef = ref<ElFormInstance>(); const dialog = reactive<DialogOption>({ visible: false, @@ -165,7 +173,8 @@ clientKey: undefined, clientSecret: undefined, grantTypeList: undefined, - activityTimeout: undefined, + deviceType: undefined, + activeTimeout: undefined, timeout: undefined, status: undefined, } @@ -178,7 +187,8 @@ clientKey: undefined, clientSecret: undefined, grantType: undefined, - activityTimeout: undefined, + deviceType: undefined, + activeTimeout: undefined, timeout: undefined, status: undefined, }, @@ -197,6 +207,9 @@ ], grantTypeList: [ { required: true, message: "鎺堟潈绫诲瀷涓嶈兘涓虹┖", trigger: "change" } + ], + deviceType: [ + { required: true, message: "璁惧绫诲瀷涓嶈兘涓虹┖", trigger: "change" } ], } }); @@ -221,7 +234,7 @@ /** 琛ㄥ崟閲嶇疆 */ const reset = () => { form.value = {...initFormData}; - clientFormRef.value.resetFields(); + clientFormRef.value?.resetFields(); } /** 鎼滅储鎸夐挳鎿嶄綔 */ @@ -232,7 +245,7 @@ /** 閲嶇疆鎸夐挳鎿嶄綔 */ const resetQuery = () => { - queryFormRef.value.resetFields(); + queryFormRef.value?.resetFields(); handleQuery(); } @@ -245,30 +258,24 @@ /** 鏂板鎸夐挳鎿嶄綔 */ const handleAdd = () => { + reset(); dialog.visible = true; dialog.title = "娣诲姞瀹㈡埛绔鐞�"; - nextTick(() => { - reset(); - }); } /** 淇敼鎸夐挳鎿嶄綔 */ -const handleUpdate = (row?: ClientVO) => { - loading.value = true +const handleUpdate = async (row?: ClientVO) => { + reset(); + const _id = row?.id || ids.value[0] + const res = await getClient(_id); + Object.assign(form.value, res.data); dialog.visible = true; dialog.title = "淇敼瀹㈡埛绔鐞�"; - nextTick(async () => { - reset(); - const _id = row?.id || ids.value[0] - const res = await getClient(_id); - loading.value = false; - Object.assign(form.value, res.data); - }); } /** 鎻愪氦鎸夐挳 */ const submitForm = () => { - clientFormRef.value.validate(async (valid: boolean) => { + clientFormRef.value?.validate(async (valid: boolean) => { if (valid) { buttonLoading.value = true; if (form.value.id) { -- Gitblit v1.9.3