From c13f108d4879b3cf28dfc12997e501430ec1f08d Mon Sep 17 00:00:00 2001 From: "liu.tao3" Date: Thu, 6 Jul 2023 14:30:26 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E7=BC=96=E8=BE=91=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E9=9B=86=E4=BF=9D=E5=AD=98=E5=90=8E=E7=9B=B4=E6=8E=A5=E5=85=B3?= =?UTF-8?q?=E9=97=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../example/customDatasetComponents/jsDataSet/index.vue | 1 + .../packages/DataSetManagement/src/CustomEditForm.vue | 2 ++ .../packages/DataSetManagement/src/JsonEditForm.vue | 1 + .../packages/DataSetManagement/src/OriginalEditForm.vue | 1 + .../packages/DataSetManagement/src/ScriptEditForm.vue | 1 + .../DataSetManagement/src/StoredProcedureEditForm.vue | 7 ++++++- 6 files changed, 12 insertions(+), 1 deletion(-) diff --git a/data-room-ui/example/customDatasetComponents/jsDataSet/index.vue b/data-room-ui/example/customDatasetComponents/jsDataSet/index.vue index 0341557e..bbddb0b4 100644 --- a/data-room-ui/example/customDatasetComponents/jsDataSet/index.vue +++ b/data-room-ui/example/customDatasetComponents/jsDataSet/index.vue @@ -531,6 +531,7 @@ export default { this.$parent.setType = null this.saveloading = false this.saveText = '' + this.goBack() }).catch(() => { this.saveloading = false this.saveText = '' diff --git a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue index ddc44661..b17db323 100644 --- a/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/CustomEditForm.vue @@ -1071,11 +1071,13 @@ export default { customClass: 'bs-el-message-box' }).then(() => { this.saveFun(formName) + this.goBack() }).catch(() => { }) } else { this.saveFun(formName) + this.goBack() } }, /** diff --git a/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue b/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue index 32fb5a7b..d7bced66 100644 --- a/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/JsonEditForm.vue @@ -501,6 +501,7 @@ export default { this.$parent.setType = null this.saveLoading = false this.saveText = '' + this.goBack() }).catch(() => { this.saveLoading = false this.saveText = '' diff --git a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue index 5be3b219..ba237fb7 100644 --- a/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/OriginalEditForm.vue @@ -795,6 +795,7 @@ export default { this.$parent.setType = null this.saveLoading = false this.saveText = '' + this.goBack() }).catch(() => { this.$message.error('保存失败') this.saveLoading = false diff --git a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue index f437d488..f9fa3d83 100644 --- a/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/ScriptEditForm.vue @@ -743,6 +743,7 @@ export default { this.$parent.setType = null this.saveLoading = false this.saveText = '' + this.goBack() }).catch(() => { this.saveLoading = false this.saveText = '' diff --git a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue index 6e376748..f1c291eb 100644 --- a/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue +++ b/data-room-ui/packages/DataSetManagement/src/StoredProcedureEditForm.vue @@ -251,7 +251,7 @@ - + @@ -840,6 +840,7 @@ export default { this.$parent.setType = null this.saveLoading = false this.saveText = '' + this.goBack() }).catch(() => { this.saveLoading = false this.saveText = '' @@ -880,6 +881,10 @@ export default { this.datasetTest() } }, + + goBack () { + this.$emit('back') + }, /** * 执行测试 * @param val