diff --git a/src/components/Descriptions/src/Descriptions.vue b/src/components/Descriptions/src/Descriptions.vue index a1c7a07..4b70992 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)" > - {{ item.label }} + {{ item.label }} diff --git a/src/components/TagsView/src/TagsView.vue b/src/components/TagsView/src/TagsView.vue index ba650ab..464fb58 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 1cc2025..5acf078 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 7c7dc28..98f99a2 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 1efb0a5..5b66c68 100644 --- a/src/views/Components/Descriptions.vue +++ b/src/views/Components/Descriptions.vue @@ -82,20 +82,20 @@ const formValidation = () => { - - {{ scope.label }} + + {{ row.label }} - - {{ scope.label }} + + {{ row.label }} - - {{ scope.label }} + + {{ row.label }} - - {{ scope.label }} + + {{ row.label }} - - {{ scope.label }} + + {{ row.label }} diff --git a/src/views/Components/Table/UseTableDemo.vue b/src/views/Components/Table/UseTableDemo.vue index 7dd6024..d1ee46a 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({ + getListApi: getTableListApi, + response: { + list: 'list', + total: 'total' + } +}) + +const { getList: getList2 } = methods2 + +getList2() + const { t } = useI18n() const columns = reactive([ @@ -178,4 +194,30 @@ const selectAllNone = () => { + + + + + + {{ t('tableDemo.action') }} + + + + + + {{ t('tableDemo.title') }}:{{ data.row.title }} + {{ t('tableDemo.author') }}:{{ data.row.author }} + {{ t('tableDemo.displayTime') }}:{{ data.row.display_time }} + + + +