You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2020/12/26 06:03:52 UTC
[incubator-dolphinscheduler] branch dev updated: fix version close
function does not take effect. (#4307)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/incubator-dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new 48b5fc6 fix version close function does not take effect. (#4307)
48b5fc6 is described below
commit 48b5fc6ae46a061346cf985ca0c0614f2e325bd3
Author: zhuangchong <37...@users.noreply.github.com>
AuthorDate: Sat Dec 26 14:03:41 2020 +0800
fix version close function does not take effect. (#4307)
---
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue | 6 +++++-
.../pages/projects/pages/definition/pages/list/_source/list.vue | 6 +++++-
.../pages/projects/pages/definition/pages/list/_source/versions.vue | 4 +---
3 files changed, 11 insertions(+), 5 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
index 109f03c..8e021e4 100755
--- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
@@ -150,7 +150,7 @@
:visible.sync="drawer"
size="35%"
:with-header="false">
- <m-versions :versionData = versionData @mVersionSwitchProcessDefinitionVersion="mVersionSwitchProcessDefinitionVersion" @mVersionGetProcessDefinitionVersionsPage="mVersionGetProcessDefinitionVersionsPage" @mVersionDeleteProcessDefinitionVersion="mVersionDeleteProcessDefinitionVersion"></m-versions>
+ <m-versions :versionData = versionData @mVersionSwitchProcessDefinitionVersion="mVersionSwitchProcessDefinitionVersion" @mVersionGetProcessDefinitionVersionsPage="mVersionGetProcessDefinitionVersionsPage" @mVersionDeleteProcessDefinitionVersion="mVersionDeleteProcessDefinitionVersion" @closeVersion="closeVersion"></m-versions>
</el-drawer>
<el-drawer
:visible.sync="nodeDrawer"
@@ -800,6 +800,10 @@
}).catch(e => {
this.$message.error(e.msg || '')
})
+ },
+
+ closeVersion () {
+ this.drawer = false
}
},
watch: {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
index 0a6c75c..ac06748 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
@@ -126,7 +126,7 @@
:visible.sync="drawer"
size="35%"
:with-header="false">
- <m-versions :versionData = versionData @mVersionSwitchProcessDefinitionVersion="mVersionSwitchProcessDefinitionVersion" @mVersionGetProcessDefinitionVersionsPage="mVersionGetProcessDefinitionVersionsPage" @mVersionDeleteProcessDefinitionVersion="mVersionDeleteProcessDefinitionVersion"></m-versions>
+ <m-versions :versionData = versionData @mVersionSwitchProcessDefinitionVersion="mVersionSwitchProcessDefinitionVersion" @mVersionGetProcessDefinitionVersionsPage="mVersionGetProcessDefinitionVersionsPage" @mVersionDeleteProcessDefinitionVersion="mVersionDeleteProcessDefinitionVersion" @closeVersion="closeVersion"></m-versions>
</el-drawer>
<el-dialog
:title="$t('Please set the parameters before starting')"
@@ -434,6 +434,10 @@
})
},
+ closeVersion () {
+ this.drawer = false
+ },
+
_batchExport () {
this.exportDefinition({
processDefinitionIds: this.strSelectIds,
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
index 14fe497..9f09880 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue
@@ -151,9 +151,7 @@
*/
_close () {
// flag Whether to delete a node this.$destroy()
- this.$emit('close', {
- fromThis: this
- })
+ this.$emit('closeVersion')
}
},
created () {