diff --git a/src/App.vue b/src/App.vue index 1206b11a..cbefb6f0 100644 --- a/src/App.vue +++ b/src/App.vue @@ -12,6 +12,19 @@ diff --git a/src/components/Layout/BasicLayoutPage.vue b/src/components/Layout/BasicLayoutPage.vue index 1b8af35d..fb83774c 100644 --- a/src/components/Layout/BasicLayoutPage.vue +++ b/src/components/Layout/BasicLayoutPage.vue @@ -38,6 +38,7 @@ import { useMenuStore } from '@/store/menu'; import { clearMenuItem } from 'jetlinks-ui-components/es/ProLayout/util'; import { AccountMenu } from '@/router/menu' import { useSystem } from '@/store/system'; +import { storeToRefs } from 'pinia'; type StateType = { collapsed: boolean; @@ -52,13 +53,13 @@ const route = useRoute(); const menu = useMenuStore(); const system = useSystem(); -const configInfo = system.configInfo; +const {configInfo} = storeToRefs(system); const layoutConf = reactive({ - theme: configInfo.front?.headerTheme || DefaultSetting.layout.theme, + theme: configInfo.value.front?.headerTheme || DefaultSetting.layout.theme, siderWidth: DefaultSetting.layout.siderWidth, - logo: configInfo.front?.logo || DefaultSetting.layout.logo, - title: configInfo.front?.title || DefaultSetting.layout.title, + logo: configInfo.value.front?.logo || DefaultSetting.layout.logo, + title: configInfo.value.front?.title || DefaultSetting.layout.title, menuData: [...clearMenuItem(menu.siderMenus), AccountMenu], // menuData: menu.siderMenus, splitMenus: true, diff --git a/src/views/edge/Resource/Issue/index.vue b/src/views/edge/Resource/Issue/index.vue index d9e73ac9..c7ac1de2 100644 --- a/src/views/edge/Resource/Issue/index.vue +++ b/src/views/edge/Resource/Issue/index.vue @@ -154,6 +154,7 @@ const columns = [ scopedSlots: true, search: { type: 'date', + rename: 'registryTime' }, }, { diff --git a/src/views/system/Basis/index.vue b/src/views/system/Basis/index.vue index 04158667..2017d631 100644 --- a/src/views/system/Basis/index.vue +++ b/src/views/system/Basis/index.vue @@ -427,7 +427,7 @@ const uploader: uploaderType = { }, // 浏览器页签格式校验 beforeIconUpload: (file) => { - const typeBool = uploader.iconTypes.includes(file.type); + const typeBool = file.type.includes('.icon'); const sizeBool = file.size / 1024 / 1024 < 1; if (!typeBool) { message.error(`请上传ico格式的图片`);