fix: bug#11249、11247、10637、11250

This commit is contained in:
JiangQiming 2023-03-30 20:24:05 +08:00
parent f25468066b
commit d3af662267
2 changed files with 11 additions and 5 deletions

View File

@ -56,15 +56,21 @@ const system = useSystem();
const {configInfo} = storeToRefs(system); const {configInfo} = storeToRefs(system);
const layoutConf = reactive({ const layoutConf = reactive({
theme: configInfo.value.front?.headerTheme || DefaultSetting.layout.theme, theme: DefaultSetting.layout.theme,
siderWidth: DefaultSetting.layout.siderWidth, siderWidth: DefaultSetting.layout.siderWidth,
logo: configInfo.value.front?.logo || DefaultSetting.layout.logo, logo: DefaultSetting.layout.logo,
title: configInfo.value.front?.title || DefaultSetting.layout.title, title: DefaultSetting.layout.title,
menuData: [...clearMenuItem(menu.siderMenus), AccountMenu], menuData: [...clearMenuItem(menu.siderMenus), AccountMenu],
// menuData: menu.siderMenus, // menuData: menu.siderMenus,
splitMenus: true, splitMenus: true,
}); });
watchEffect(() => {
layoutConf.theme = configInfo.value.front?.headerTheme || DefaultSetting.layout.theme;
layoutConf.title = configInfo.value.front?.title || DefaultSetting.layout.title;
layoutConf.logo = configInfo.value.front?.logo || DefaultSetting.layout.logo;
})
const state = reactive<StateType>({ const state = reactive<StateType>({
pure: false, pure: false,
collapsed: false, // default value collapsed: false, // default value

View File

@ -59,7 +59,7 @@
</template> </template>
<j-input <j-input
v-model:value="formValue['base-path']" v-model:value="formValue['base-path']"
placeholder="请输入高德API Key" placeholder="输入base-path"
/> />
</j-form-item> </j-form-item>
<j-row :gutter="24" :span="24"> <j-row :gutter="24" :span="24">
@ -455,7 +455,7 @@ const uploader: uploaderType = {
}, },
// //
beforeIconUpload: (file) => { beforeIconUpload: (file) => {
const typeBool = file.type.includes('.icon'); const typeBool = file.type.includes('x-icon');
const sizeBool = file.size / 1024 / 1024 < 1; const sizeBool = file.size / 1024 / 1024 < 1;
if (!typeBool) { if (!typeBool) {
message.error(`请上传ico格式的图片`); message.error(`请上传ico格式的图片`);