From 4cf99a31bcd6bafbb0d4f2f2d0f7c39c28651b7c Mon Sep 17 00:00:00 2001 From: "xinxin.wu" Date: Tue, 8 Aug 2023 14:29:46 +0800 Subject: [PATCH] =?UTF-8?q?feat(=E7=B3=BB=E7=BB=9F=E8=AE=BE=E7=BD=AE):=20?= =?UTF-8?q?=E6=8F=92=E4=BB=B6=E7=AE=A1=E7=90=86=E8=81=94=E8=B0=83=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/api/requrls/setting/orgnization.ts | 2 +- .../pluginManager/components/pluginTable.vue | 249 +++++------------- .../components/scriptDetailDrawer.vue | 15 ++ .../components/updatePluginModal.vue | 33 +-- .../pluginManager/components/uploadModel.vue | 42 ++- .../setting/system/pluginManager/index.vue | 2 +- .../system/pluginManager/locale/en-US.ts | 3 + .../system/pluginManager/locale/zh-CN.ts | 17 +- 8 files changed, 139 insertions(+), 224 deletions(-) diff --git a/frontend/src/api/requrls/setting/orgnization.ts b/frontend/src/api/requrls/setting/orgnization.ts index 45c46c373a..e301a86d21 100644 --- a/frontend/src/api/requrls/setting/orgnization.ts +++ b/frontend/src/api/requrls/setting/orgnization.ts @@ -1,2 +1,2 @@ -export const GetAllOrgUrl = '/system/organization/list-all'; +export const GetAllOrgUrl = '/system/organization/option/all'; export const Other = ''; diff --git a/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue b/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue index 5cb96b90f1..e4627a2e66 100644 --- a/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue +++ b/frontend/src/views/setting/system/pluginManager/components/pluginTable.vue @@ -7,14 +7,16 @@ - {{ item.label }} + {{ t(item.label) }} @@ -31,7 +33,7 @@ @@ -93,16 +95,16 @@ {{ t('system.plugin.tableDisable') }} - {{ t('system.plugin.tableEnable') }} + {{ t('system.plugin.tableEnable') }} @@ -111,18 +113,29 @@ >{{ t('system.plugin.totalNum') }}{{ totalNum }}{{ t('system.plugin.dataList') }} - - - + + + diff --git a/frontend/src/views/setting/system/pluginManager/components/scriptDetailDrawer.vue b/frontend/src/views/setting/system/pluginManager/components/scriptDetailDrawer.vue index 464f2ff2b2..5fa8460562 100644 --- a/frontend/src/views/setting/system/pluginManager/components/scriptDetailDrawer.vue +++ b/frontend/src/views/setting/system/pluginManager/components/scriptDetailDrawer.vue @@ -5,6 +5,7 @@ :mask="false" :footer="false" :title="t('system.plugin.showScriptTitle', { name: props.config.title })" + @close="handleClose" > @@ -27,6 +29,8 @@ visible: boolean; value: string; config: DrawerConfig; + defaultVal?: string | null; + readOnly?: boolean; }>(); const emit = defineEmits(['update:value', 'update:visible']); @@ -41,6 +45,14 @@ showScriptDrawer.value = val; } ); + watch( + () => props.value, + (val) => { + if (val) { + jobDefinition.value = val; + } + } + ); watch( () => showScriptDrawer.value, @@ -48,6 +60,9 @@ emit('update:visible', val); } ); + function handleClose() { + emit('update:value', jobDefinition.value); + } diff --git a/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue b/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue index b0089bbe09..2611b603d1 100644 --- a/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue +++ b/frontend/src/views/setting/system/pluginManager/components/updatePluginModal.vue @@ -1,10 +1,15 @@