From 782b8e2f94c867c3ee282287c37c888fff93fc55 Mon Sep 17 00:00:00 2001
From: kailong321200875 <321200875@qq.com>
Date: Fri, 3 Mar 2023 16:19:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=B7=B2=E7=9F=A5BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Descriptions/src/Descriptions.vue         |  8 +++-
 src/components/TagsView/src/TagsView.vue      |  5 ++-
 src/hooks/web/useCrudSchemas.ts               |  3 +-
 src/permission.ts                             |  9 ++--
 src/views/Components/Descriptions.vue         | 20 ++++-----
 src/views/Components/Table/UseTableDemo.vue   | 42 +++++++++++++++++++
 6 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue
index a1c7a070b..4b709924a 100644
--- a/src/components/Descriptions/src/Descriptions.vue
+++ b/src/components/Descriptions/src/Descriptions.vue
@@ -107,7 +107,13 @@ const toggleClick = () => {
             v-bind="getBindItemValue(item)"
           >
             <template #label>
-              <slot :name="`${item.field}-label`" :label="item.label">{{ item.label }}</slot>
+              <slot
+                :name="`${item.field}-label`"
+                :row="{
+                  label: item.label
+                }"
+                >{{ item.label }}</slot
+              >
             </template>
 
             <template #default>
diff --git a/src/components/TagsView/src/TagsView.vue b/src/components/TagsView/src/TagsView.vue
index ba650ab19..464fb5894 100644
--- a/src/components/TagsView/src/TagsView.vue
+++ b/src/components/TagsView/src/TagsView.vue
@@ -412,7 +412,10 @@ watch(
         {
           icon: 'ant-design:close-outlined',
           label: t('common.closeTab'),
-          disabled: !!visitedViews?.length && selectedTag?.meta.affix
+          disabled: !!visitedViews?.length && selectedTag?.meta.affix,
+          command: () => {
+            closeSelectedTag(selectedTag!)
+          }
         },
         {
           divided: true,
diff --git a/src/hooks/web/useCrudSchemas.ts b/src/hooks/web/useCrudSchemas.ts
index 1cc20252d..5acf0786f 100644
--- a/src/hooks/web/useCrudSchemas.ts
+++ b/src/hooks/web/useCrudSchemas.ts
@@ -214,7 +214,6 @@ const filterFormSchema = (crudSchema: CrudSchema[], allSchemas: AllSchemas): For
   for (const task of formRequestTask) {
     task()
   }
-  console.log(formSchema)
   return formSchema
 }
 
@@ -243,7 +242,7 @@ const filterDescriptionsSchema = (crudSchema: CrudSchema[]): DescriptionsSchema[
 
 // 给options添加国际化
 const filterOptions = (options: Recordable, labelField?: string) => {
-  return options.map((v: Recordable) => {
+  return options?.map((v: Recordable) => {
     if (labelField) {
       v['labelField'] = t(v.labelField)
     } else {
diff --git a/src/permission.ts b/src/permission.ts
index 7c7dc28b5..98f99a29f 100644
--- a/src/permission.ts
+++ b/src/permission.ts
@@ -30,11 +30,6 @@ router.beforeEach(async (to, from, next) => {
     if (to.path === '/login') {
       next({ path: '/' })
     } else {
-      if (permissionStore.getIsAddRouters) {
-        next()
-        return
-      }
-
       if (!dictStore.getIsSetDict) {
         // 获取所有字典
         const res = await getDictApi()
@@ -43,6 +38,10 @@ router.beforeEach(async (to, from, next) => {
           dictStore.setIsSetDict(true)
         }
       }
+      if (permissionStore.getIsAddRouters) {
+        next()
+        return
+      }
 
       // 开发者可根据实际情况进行修改
       const roleRouters = wsCache.get('roleRouters') || []
diff --git a/src/views/Components/Descriptions.vue b/src/views/Components/Descriptions.vue
index 1efb0a59a..5b66c6871 100644
--- a/src/views/Components/Descriptions.vue
+++ b/src/views/Components/Descriptions.vue
@@ -82,20 +82,20 @@ const formValidation = () => {
 
   <Form is-custom :model="form" :rules="rules" @register="register">
     <Descriptions :title="t('descriptionsDemo.form')" :data="data" :schema="schema" class="mt-20px">
-      <template #username-label="{ row: scope }">
-        <span class="is-required--item">{{ scope.label }}</span>
+      <template #username-label="{ row }">
+        <span class="is-required--item">{{ row.label }}</span>
       </template>
-      <template #nickName-label="{ row: scope }">
-        <span class="is-required--item">{{ scope.label }}</span>
+      <template #nickName-label="{ row }">
+        <span class="is-required--item">{{ row.label }}</span>
       </template>
-      <template #phone-label="{ row: scope }">
-        <span class="is-required--item">{{ scope.label }}</span>
+      <template #phone-label="{ row }">
+        <span class="is-required--item">{{ row.label }}</span>
       </template>
-      <template #email-label="{ row: scope }">
-        <span class="is-required--item">{{ scope.label }}</span>
+      <template #email-label="{ row }">
+        <span class="is-required--item">{{ row.label }}</span>
       </template>
-      <template #addr-label="{ row: scope }">
-        <span class="is-required--item">{{ scope.label }}</span>
+      <template #addr-label="{ row }">
+        <span class="is-required--item">{{ row.label }}</span>
       </template>
 
       <template #username>
diff --git a/src/views/Components/Table/UseTableDemo.vue b/src/views/Components/Table/UseTableDemo.vue
index 7dd6024b9..d1ee46a89 100644
--- a/src/views/Components/Table/UseTableDemo.vue
+++ b/src/views/Components/Table/UseTableDemo.vue
@@ -21,6 +21,22 @@ const { getList } = methods
 
 getList()
 
+const {
+  register: register2,
+  tableObject: tableObject2,
+  methods: methods2
+} = useTable<TableData>({
+  getListApi: getTableListApi,
+  response: {
+    list: 'list',
+    total: 'total'
+  }
+})
+
+const { getList: getList2 } = methods2
+
+getList2()
+
 const { t } = useI18n()
 
 const columns = reactive<TableColumn[]>([
@@ -178,4 +194,30 @@ const selectAllNone = () => {
       </template>
     </Table>
   </ContentWrap>
+
+  <ContentWrap :title="`UseTable 2 ${t('tableDemo.example')}`">
+    <Table
+      v-model:pageSize="tableObject2.pageSize"
+      v-model:currentPage="tableObject2.currentPage"
+      :columns="columns"
+      :data="tableObject2.tableList"
+      :loading="tableObject2.loading"
+      :pagination="paginationObj"
+      @register="register2"
+    >
+      <template #action="data">
+        <ElButton type="primary" @click="actionFn(data as TableSlotDefault)">
+          {{ t('tableDemo.action') }}
+        </ElButton>
+      </template>
+
+      <template #expand="data">
+        <div class="ml-30px">
+          <div>{{ t('tableDemo.title') }}：{{ data.row.title }}</div>
+          <div>{{ t('tableDemo.author') }}：{{ data.row.author }}</div>
+          <div>{{ t('tableDemo.displayTime') }}：{{ data.row.display_time }}</div>
+        </div>
+      </template>
+    </Table>
+  </ContentWrap>
 </template>