From ba9378fa2978a8fc70000e2a4bc6eb1dff98a480 Mon Sep 17 00:00:00 2001 From: RubyLiu Date: Thu, 2 Nov 2023 16:56:24 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E9=A1=B9=E7=9B=AE=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=AE=A1=E7=90=86=E5=90=8C=E6=AD=A5=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E5=AF=B9=E6=8E=A5form-create?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/modules/setting/serviceIntegration.ts | 4 +- .../api/requrls/setting/serviceIntegration.ts | 2 +- .../pure/ms-form-create/comp/jiraKey.vue | 19 +++++++- .../pure/ms-form-create/form-create.ts | 3 +- .../menuManagement/components/defectSync.vue | 44 +++++++++---------- .../menuManagement/locale/zh-CN.ts | 2 + 6 files changed, 46 insertions(+), 28 deletions(-) diff --git a/frontend/src/api/modules/setting/serviceIntegration.ts b/frontend/src/api/modules/setting/serviceIntegration.ts index 2683d881ca..cd71ee500b 100644 --- a/frontend/src/api/modules/setting/serviceIntegration.ts +++ b/frontend/src/api/modules/setting/serviceIntegration.ts @@ -38,6 +38,6 @@ export function postValidate(data: any, pluginId: string) { export function configScript(pluginId: string) { return MSR.get({ url: ConfigServiceScriptUrl, params: pluginId }); } -export function getLogo(pluginId: string) { - return MSR.get({ url: getLogoUrl, params: pluginId }); +export function getLogo(pluginId: string, params: { imagePath: string }) { + return MSR.get({ url: `${getLogoUrl}${pluginId}`, params, responseType: 'blob' }, { isReturnNativeResponse: true }); } diff --git a/frontend/src/api/requrls/setting/serviceIntegration.ts b/frontend/src/api/requrls/setting/serviceIntegration.ts index f94359f4fe..ffc1e7a04a 100644 --- a/frontend/src/api/requrls/setting/serviceIntegration.ts +++ b/frontend/src/api/requrls/setting/serviceIntegration.ts @@ -5,4 +5,4 @@ export const ResetServiceUrl = '/service/integration/delete'; export const GetValidateServiceUrl = '/service/integration/validate'; export const PostValidateServiceUrl = '/service/integration/validate/'; export const ConfigServiceScriptUrl = '/service/integration/script'; -export const getLogoUrl = '/plugin/image'; +export const getLogoUrl = '/plugin/image/'; diff --git a/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue b/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue index 149c374384..da4f987818 100644 --- a/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue +++ b/frontend/src/components/pure/ms-form-create/comp/jiraKey.vue @@ -12,7 +12,13 @@ {{ null }} {{ t('project.menu.preview') }} @@ -20,6 +26,7 @@ diff --git a/frontend/src/components/pure/ms-form-create/form-create.ts b/frontend/src/components/pure/ms-form-create/form-create.ts index 8dc881a8f3..05b8ea5c80 100644 --- a/frontend/src/components/pure/ms-form-create/form-create.ts +++ b/frontend/src/components/pure/ms-form-create/form-create.ts @@ -158,8 +158,7 @@ export const JIRAKEY = { title: '', value: '', props: { - moduleValue: '', - placeholder: t('formCreate.PleaseEnter'), + modelValue: '', instructionsIcon: '', }, }; diff --git a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue index fe5f6f863c..cee81a0b9e 100644 --- a/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue +++ b/frontend/src/views/project-management/projectAndPermission/menuManagement/components/defectSync.vue @@ -16,7 +16,7 @@ @@ -76,9 +77,12 @@ -