From e2dba57d8f11c8387d8c9e233546b58f5aa13e6f Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sun, 13 Nov 2022 19:08:32 +0800
Subject: [PATCH] vue3：测试 client、token、errorCode 模块，导出需要优化

---
 yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts  |  2 ++
 yudao-ui-admin-vue3/src/views/system/errorCode/index.vue          | 33 +++++++++++++++++++++++----------
 yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts | 16 ++++++++--------
 yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue      |  1 +
 yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue       |  2 +-
 5 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts b/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
index 5050f54..e7f7af2 100644
--- a/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/errorCode/errorCode.data.ts
@@ -4,12 +4,14 @@ import { useI18n } from '@/hooks/web/useI18n'
 import { DICT_TYPE } from '@/utils/dict'
 import { VxeCrudSchema, useVxeCrudSchemas } from '@/hooks/web/useVxeCrudSchemas'
 const { t } = useI18n() // 国际化
+
 // 表单校验
 export const rules = reactive({
   applicationName: [required],
   code: [required],
   message: [required]
 })
+
 // 新增 + 修改
 const crudSchemas = reactive<VxeCrudSchema>({
   primaryKey: 'id',
diff --git a/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue b/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
index ae83747..d7ea2e4 100644
--- a/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/errorCode/index.vue
@@ -1,6 +1,8 @@
 <template>
   <ContentWrap>
+    <!-- 列表 -->
     <vxe-grid ref="xGrid" v-bind="gridOptions" class="xtable-scrollbar">
+      <!-- 操作：新增 -->
       <template #toolbar_buttons>
         <XButton
           type="primary"
@@ -11,18 +13,21 @@
         />
       </template>
       <template #actionbtns_default="{ row }">
+        <!-- 操作：修改 -->
         <XTextButton
           preIcon="ep:edit"
           :title="t('action.edit')"
           v-hasPermi="['system:error-code:update']"
           @click="handleUpdate(row.id)"
         />
+        <!-- 操作：详情 -->
         <XTextButton
           preIcon="ep:view"
           :title="t('action.detail')"
           v-hasPermi="['system:error-code:update']"
           @click="handleDetail(row.id)"
         />
+        <!-- 操作：删除 -->
         <XTextButton
           preIcon="ep:delete"
           :title="t('action.del')"
@@ -32,6 +37,7 @@
       </template>
     </vxe-grid>
   </ContentWrap>
+  <!-- 弹窗 -->
   <XModal id="errorCodeModel" v-model="dialogVisible" :title="dialogTitle">
     <template #default>
       <!-- 对话框(添加 / 修改) -->
@@ -48,8 +54,8 @@
         :data="detailRef"
       />
     </template>
-    <!-- 操作按钮 -->
     <template #footer>
+      <!-- 按钮：保存 -->
       <XButton
         v-if="['create', 'update'].includes(actionType)"
         type="primary"
@@ -57,35 +63,40 @@
         :loading="actionLoading"
         @click="submitForm"
       />
+      <!-- 按钮：关闭 -->
       <XButton :loading="actionLoading" :title="t('dialog.close')" @click="dialogVisible = false" />
     </template>
   </XModal>
 </template>
 
 <script setup lang="ts">
+// 全局相关的 import
 import { ref, unref } from 'vue'
-import { rules, allSchemas } from './errorCode.data'
-import * as ErrorCodeApi from '@/api/system/errorCode'
 import { useI18n } from '@/hooks/web/useI18n'
 import { useMessage } from '@/hooks/web/useMessage'
 import { useVxeGrid } from '@/hooks/web/useVxeGrid'
 import { VxeGridInstance } from 'vxe-table'
 import { FormExpose } from '@/components/Form'
+// 业务相关的 import
+import { rules, allSchemas } from './errorCode.data'
+import * as ErrorCodeApi from '@/api/system/errorCode'
 
 const { t } = useI18n() // 国际化
 const message = useMessage() // 消息弹窗
+// 列表相关的变量
+const xGrid = ref<VxeGridInstance>() // grid Ref
+const { gridOptions } = useVxeGrid<ErrorCodeApi.ErrorCodeVO>({
+  allSchemas: allSchemas,
+  getListApi: ErrorCodeApi.getErrorCodePageApi
+})
+// 弹窗相关的变量
 const dialogVisible = ref(false) // 是否显示弹出层
 const dialogTitle = ref('edit') // 弹出层标题
 const actionType = ref('') // 操作按钮的类型
-const actionLoading = ref(false) // 按钮Loading
-const xGrid = ref<VxeGridInstance>() // grid Ref
+const actionLoading = ref(false) // 按钮 Loading
 const formRef = ref<FormExpose>() // 表单 Ref
 const detailRef = ref() // 详情 Ref
 
-const { gridOptions } = useVxeGrid<ErrorCodeApi.ErrorCodeVO>({
-  allSchemas: allSchemas,
-  getListApi: ErrorCodeApi.getErrorCodePageApi
-})
 // 设置标题
 const setDialogTile = (type: string) => {
   dialogTitle.value = t('action.' + type)
@@ -125,11 +136,12 @@ const handleDelete = async (rowId: number) => {
       message.success(t('common.delSuccess'))
     })
     .finally(() => {
+      // 刷新列表
       xGrid.value?.commitProxy('query')
     })
 }
 
-// 提交按钮
+// 提交新增/修改的表单
 const submitForm = async () => {
   const elForm = unref(formRef)?.getElFormRef()
   if (!elForm) return
@@ -149,6 +161,7 @@ const submitForm = async () => {
         dialogVisible.value = false
       } finally {
         actionLoading.value = false
+        // 刷新列表
         xGrid.value?.commitProxy('query')
       }
     }
diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts b/yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts
index d0226e3..b119553 100644
--- a/yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts
+++ b/yudao-ui-admin-vue3/src/views/system/oauth2/client/client.data.ts
@@ -40,38 +40,38 @@ const crudSchemas = reactive<VxeCrudSchema>({
     {
       title: t('common.status'),
       field: 'status',
-      dictType: DICT_TYPE.COMMON_STATUS,
+      dictType: DICT_TYPE.COMMON_STATUS, // TODO @星语：编辑时，status 展示为 0 或者 1 了
       isSearch: true
     },
     {
       title: '访问令牌的有效期',
-      field: 'accessTokenValiditySeconds'
+      field: 'accessTokenValiditySeconds' // TODO @星语：数字输入框
     },
     {
       title: '刷新令牌的有效期',
-      field: 'refreshTokenValiditySeconds'
+      field: 'refreshTokenValiditySeconds' // TODO @星语：数字输入框
     },
     {
       title: '授权类型',
       field: 'authorizedGrantTypes',
       dictType: DICT_TYPE.SYSTEM_OAUTH2_GRANT_TYPE,
       form: {
-        component: 'Select'
+        component: 'Select' // TODO @星语：多选
       }
     },
     {
       title: '授权范围',
-      field: 'scopes',
+      field: 'scopes', // TODO @星语：带输入的 SELECT
       isTable: false
     },
     {
       title: '自动授权范围',
-      field: 'autoApproveScopes',
+      field: 'autoApproveScopes', // TODO @星语：带输入的 SELECT
       isTable: false
     },
     {
       title: '可重定向的 URI 地址',
-      field: 'redirectUris',
+      field: 'redirectUris', // TODO @星语：带输入的 SELECT
       isTable: false
     },
     {
@@ -102,7 +102,7 @@ const crudSchemas = reactive<VxeCrudSchema>({
     {
       title: t('common.createTime'),
       field: 'createTime',
-      formatter: 'formatDate',
+      formatter: 'formatDate', // TODO @星语：宽度，保证时间可以展示出来
       isForm: false
     }
   ]
diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue b/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
index 90871f7..454bb4a 100644
--- a/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/oauth2/client/index.vue
@@ -58,6 +58,7 @@
         :rules="rules"
       />
       <!-- 表单：详情 -->
+      <!-- TODO @星语：展示详情时，有点小丑，可额能得看看 -->
       <Descriptions
         v-if="actionType === 'detail'"
         :schema="allSchemas.detailSchema"
diff --git a/yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue b/yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue
index 5760028..9cf54b7 100644
--- a/yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue
+++ b/yudao-ui-admin-vue3/src/views/system/oauth2/token/index.vue
@@ -61,7 +61,7 @@ const handleForceLogout = (rowId: number) => {
     .delConfirm()
     .then(async () => {
       await TokenApi.deleteAccessTokenApi(rowId)
-      message.success(t('common.delSuccess'))
+      message.success(t('common.delSuccess')) // TODO 星语：提示内容不对
     })
     .finally(() => {
       // 刷新列表
--
libgit2 0.21.4