From 0700c81946326b0dcaf35c3e6b8bcf665cdb5a96 Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Tue, 30 Jan 2024 17:22:46 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86):=20?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=83=A8=E5=88=86xpackbug&=E6=9D=83=E9=99=90?= =?UTF-8?q?=E8=A1=A5=E5=85=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- frontend/src/App.vue | 1 - frontend/src/api/modules/system.ts | 2 +- frontend/src/assets/style/arco-reset.less | 5 ++ .../components/localExec.vue | 2 +- .../components/business/ms-top-menu/index.vue | 7 +-- frontend/src/locale/zh-CN/index.ts | 2 +- frontend/src/router/guard/userLoginInfo.ts | 12 ++++- .../router/routes/modules/performanceTest.ts | 48 ++++++++--------- frontend/src/router/routes/modules/setting.ts | 4 +- .../src/router/routes/modules/testPlan.ts | 54 +++++++++---------- frontend/src/router/routes/modules/uiTest.ts | 48 ++++++++--------- .../src/router/routes/modules/workbench.ts | 48 ++++++++--------- frontend/src/store/modules/app/index.ts | 12 ++++- frontend/src/store/modules/app/types.ts | 2 +- .../src/store/modules/setting/template.ts | 11 ++-- frontend/src/store/modules/user/index.ts | 7 +-- .../components/caseTable.vue | 35 ++++++------ .../components/recycleCaseTable.vue | 2 +- .../projectAndPermission/index.vue | 30 +++++------ .../components/projectFieldSetting.vue | 8 ++- .../components/templateManagement.vue | 2 +- .../components/workFlowTableIndex.vue | 7 ++- .../organization/project/orgProject.vue | 4 +- .../components/serviceList.vue | 5 +- .../template/components/fieldSetting.vue | 16 +++++- .../template/components/ordFieldSetting.vue | 8 ++- .../template/components/templateItem.vue | 2 +- .../components/templateManagement.vue | 2 +- .../components/workFlowTableIndex.vue | 7 ++- .../template/components/workflowCard.vue | 16 ++++++ .../template/components/workflowTable.vue | 44 ++++++++++++--- .../system/config/components/baseConfig.vue | 2 +- .../src/views/setting/system/config/index.vue | 16 ++++-- .../system/pluginManager/locale/zh-CN.ts | 2 +- .../src/views/setting/system/user/index.vue | 7 ++- 35 files changed, 298 insertions(+), 182 deletions(-) diff --git a/frontend/src/App.vue b/frontend/src/App.vue index b449c9cc7c..182e34f006 100644 --- a/frontend/src/App.vue +++ b/frontend/src/App.vue @@ -52,7 +52,6 @@ onBeforeMount(async () => { try { - await appStore.initSystemPackage(); // 初始化系统包版本 await appStore.initSystemVersion(); // 初始化系统版本 // 企业版才校验license if (appStore.packageType === 'enterprise') { diff --git a/frontend/src/api/modules/system.ts b/frontend/src/api/modules/system.ts index 0fd5fd06a5..15479aade4 100644 --- a/frontend/src/api/modules/system.ts +++ b/frontend/src/api/modules/system.ts @@ -19,5 +19,5 @@ export function switchUserOrg(organizationId: string, userId: string) { // 获取当前系统的版本 export function getPackageType() { - return MSR.get<'community' | 'enterprise'>({ url: PackageTypeUrl }, { ignoreCancelToken: true }); + return MSR.get({ url: PackageTypeUrl }); } diff --git a/frontend/src/assets/style/arco-reset.less b/frontend/src/assets/style/arco-reset.less index 2082dbd225..6e38e16e1c 100644 --- a/frontend/src/assets/style/arco-reset.less +++ b/frontend/src/assets/style/arco-reset.less @@ -78,6 +78,11 @@ margin-top: 16px; } } +.arco-modal-wrapper.arco-modal-wrapper-align-center { + .arco-modal { + top: -5% !important; + } +} .ms-usemodal { .arco-modal-body { @apply p-0; diff --git a/frontend/src/components/business/ms-personal-drawer/components/localExec.vue b/frontend/src/components/business/ms-personal-drawer/components/localExec.vue index e40cfecbf7..564dab39fe 100644 --- a/frontend/src/components/business/ms-personal-drawer/components/localExec.vue +++ b/frontend/src/components/business/ms-personal-drawer/components/localExec.vue @@ -48,7 +48,7 @@ -
+
{{ t('ms.personal.uiLocalExecution') }}
{ + appStore.initSystemPackage(); + });