From 595667fa0edfad525af0f23a1c741049bfb35158 Mon Sep 17 00:00:00 2001 From: baiqi Date: Wed, 9 Aug 2023 10:07:00 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E8=AE=A4=E8=AF=81=E9=A1=B5=E9=9D=A2&=E5=BC=B9=E7=AA=97?= =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.vue | 2 ++ frontend/src/api/requrls/setting/config.ts | 8 ++++---- frontend/src/assets/style/arco-reset.less | 12 +++--------- .../src/components/bussiness/ms-batch-form/index.vue | 2 +- .../src/components/bussiness/ms-top-menu/index.vue | 3 +++ frontend/src/hooks/useModal.ts | 3 ++- frontend/src/views/setting/system/config/index.vue | 2 +- .../src/views/setting/system/resourcePool/detail.vue | 4 ++++ 8 files changed, 20 insertions(+), 16 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index 0ff7e44481..9673343ae4 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -54,6 +54,8 @@ }, ]); setLocalStorage('isInitUrl', 'true'); // 设置已经初始化过 url，避免重复初始化 + } else { + setLocalStorage('isInitUrl', 'true'); // 设置已经初始化过 url，避免重复初始化 } } catch (error) { console.log(error); diff --git a/frontend/src/api/requrls/setting/config.ts b/frontend/src/api/requrls/setting/config.ts index fc635a7d11..3c954e1682 100644 --- a/frontend/src/api/requrls/setting/config.ts +++ b/frontend/src/api/requrls/setting/config.ts @@ -25,10 +25,10 @@ export const GetAuthDetailUrl = '/system/authsource/get'; // 删除认证源 export const DeleteAuthUrl = '/system/authsource/delete'; // 获取系统主页左上角图片 -export const GetTitleImgUrl = '/display/get/title'; +export const GetTitleImgUrl = `${import.meta.env.VITE_API_BASE_URL}/display/get/title`; // 获取登录 logo -export const GetLoginLogoUrl = '/display/get/loginLogo'; +export const GetLoginLogoUrl = `${import.meta.env.VITE_API_BASE_URL}/display/get/loginLogo`; // 获取登录大图 -export const GetLoginImageUrl = '/display/get/loginImage'; +export const GetLoginImageUrl = `${import.meta.env.VITE_API_BASE_URL}/display/get/loginImage`; // 获取平台标签图标 -export const GetPlatformIconUrl = '/display/get/icon'; +export const GetPlatformIconUrl = `${import.meta.env.VITE_API_BASE_URL}/display/get/icon`; diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 642134725d..5b9e7f6b7e 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -93,19 +93,13 @@ } } .ms-modal-medium { - .arco-modal { - width: 680px; - } + width: 680px; } .ms-modal-large { - .arco-modal { - width: 960px; - } + width: 960px; } .ms-modal-small { - .arco-modal { - width: 480px; - } + width: 480px; } /** 气泡确认框 **/ diff --git a/frontend/src/components/bussiness/ms-batch-form/index.vue b/frontend/src/components/bussiness/ms-batch-form/index.vue index 7de81f9b0c..09e2a8136b 100644 --- a/frontend/src/components/bussiness/ms-batch-form/index.vue +++ b/frontend/src/components/bussiness/ms-batch-form/index.vue @@ -50,7 +50,7 @@ 'cursor-pointer', 'items-center', 'justify-center', - 'text-[var(--color-text-brand)]', + 'text-[var(--color-text-4)]', i === 0 ? 'mt-[36px]' : 'mt-[5px]', ]" @click="removeField(i)" diff --git a/frontend/src/components/bussiness/ms-top-menu/index.vue b/frontend/src/components/bussiness/ms-top-menu/index.vue index 5a9a06d9a5..4b901ab2aa 100644 --- a/frontend/src/components/bussiness/ms-top-menu/index.vue +++ b/frontend/src/components/bussiness/ms-top-menu/index.vue @@ -33,6 +33,9 @@ () => appStore.getCurrentTopMenu?.name, (val) => { activeMenus.value = [val || '']; + }, + { + immediate: true, } ); diff --git a/frontend/src/hooks/useModal.ts b/frontend/src/hooks/useModal.ts index e5d31a3939..19344aa352 100644 --- a/frontend/src/hooks/useModal.ts +++ b/frontend/src/hooks/useModal.ts @@ -25,9 +25,10 @@ export default function useModal() { cancelButtonProps: { type: options.mode === 'weak' ? 'text' : 'secondary', }, + simple: false, ...options, titleAlign: 'start', - modalClass: `ms-modal-${options.mode || 'default'} ms-modal-${options.size || 'medium'} ms-modal-${ + modalClass: `ms-modal-${options.mode || 'default'} ms-modal-${options.size || 'small'} ms-modal-${ options.type }`, }), diff --git a/frontend/src/views/setting/system/config/index.vue b/frontend/src/views/setting/system/config/index.vue index 150c3cddc9..e1ed895062 100644 --- a/frontend/src/views/setting/system/config/index.vue +++ b/frontend/src/views/setting/system/config/index.vue @@ -28,7 +28,7 @@ const { t } = useI18n(); - const activeTab = ref('authConfig'); + const activeTab = ref('baseConfig'); const isInitedPageConfig = ref(activeTab.value === 'pageConfig'); const isInitedAuthConfig = ref(activeTab.value === 'authConfig'); diff --git a/frontend/src/views/setting/system/resourcePool/detail.vue b/frontend/src/views/setting/system/resourcePool/detail.vue index feb14a1a30..a247812271 100644 --- a/frontend/src/views/setting/system/resourcePool/detail.vue +++ b/frontend/src/views/setting/system/resourcePool/detail.vue @@ -209,6 +209,7 @@ field="testResourceDTO.ip" class="form-item" :rules="[{ required: true, message: t('system.resourcePool.testResourceDTO.ipRequired') }]" + asterisk-position="end" >