From d14cdcf05dc112c37395cdfaebec5970e22ed565 Mon Sep 17 00:00:00 2001 From: "Jiangjie.Bai" Date: Tue, 15 Mar 2022 16:29:21 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E7=BB=88=E7=AB=AF=E5=BD=95=E5=83=8F/?= =?UTF-8?q?=E5=91=BD=E4=BB=A4=E5=AD=98=E5=82=A8=E5=88=9B=E5=BB=BA/?= =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=88=90=E5=8A=9F=E5=90=8E=E8=B7=B3=E8=BD=AC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/layout/components/GenericCreateUpdateForm/index.vue | 2 +- src/router/settings/index.js | 2 +- src/views/settings/Terminal/Base.vue | 2 +- .../settings/Terminal/Storage/CommandStorageCreateUpdate.vue | 3 +-- .../settings/Terminal/Storage/ReplayStorageCreateUpdate.vue | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/layout/components/GenericCreateUpdateForm/index.vue b/src/layout/components/GenericCreateUpdateForm/index.vue index 4a4746faf..5fb7ab90a 100644 --- a/src/layout/components/GenericCreateUpdateForm/index.vue +++ b/src/layout/components/GenericCreateUpdateForm/index.vue @@ -181,7 +181,7 @@ export default { default(res, method, vm, addContinue) { const route = this.getNextRoute(res, method) if (!(route.params && route.params.id)) { - route['params'] = { 'id': res.id } + route['params'] = Object.assign(route['params'] || {}, { 'id': res.id }) } this.$emit('submitSuccess', res) diff --git a/src/router/settings/index.js b/src/router/settings/index.js index 6856197e3..08de96f4e 100644 --- a/src/router/settings/index.js +++ b/src/router/settings/index.js @@ -81,7 +81,7 @@ export default { children: [ { path: '', - name: 'TerminalList', + name: 'TerminalSetting', component: () => import('@/views/settings/Terminal'), meta: { title: i18n.t('setting.Terminal'), diff --git a/src/views/settings/Terminal/Base.vue b/src/views/settings/Terminal/Base.vue index bcef4ff96..504dbfc12 100644 --- a/src/views/settings/Terminal/Base.vue +++ b/src/views/settings/Terminal/Base.vue @@ -49,7 +49,7 @@ export default { } } }, - url: '/api/v1/settings/setting/?category=terminal', + getUrl: () => '/api/v1/settings/setting/?category=terminal', hasDetailInMsg: false, submitMethod() { return 'put' diff --git a/src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue b/src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue index e8d429bd3..afe76e067 100644 --- a/src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue +++ b/src/views/settings/Terminal/Storage/CommandStorageCreateUpdate.vue @@ -17,8 +17,7 @@ export default { data() { const commandType = this.$route.query.type || 'es' return { - successUrl: { name: 'Storage', params: { activeMenu: 'CommandStorage' }}, - + successUrl: { name: 'TerminalSetting', params: { activeMenu: 'CommandStorage' }}, initial: { type: commandType, doc_type: 'command' }, fields: [ [this.$t('common.Basic'), ['name', 'type', 'meta', 'is_default', 'comment']] diff --git a/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue b/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue index 5f716de25..ed2542521 100644 --- a/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue +++ b/src/views/settings/Terminal/Storage/ReplayStorageCreateUpdate.vue @@ -21,7 +21,7 @@ export default { const storageType = this.$route.query.type || 's3' const storageTypeMeta = STORAGE_TYPE_META_MAP[storageType] return { - successUrl: { name: 'Storage', params: { activeMenu: 'RelayStorage' }}, + successUrl: { name: 'TerminalSetting', params: { activeMenu: 'RelayStorage' }}, url: `/api/v1/terminal/replay-storages/`, initial: { type: storageType,