Browse Source

fix version close function does not take effect. (#4307)

pull/3/MERGE
zhuangchong 4 years ago committed by GitHub
parent
commit
48b5fc6ae4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  2. 6
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue
  3. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue

6
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue

@ -150,7 +150,7 @@
:visible.sync="drawer" :visible.sync="drawer"
size="35%" size="35%"
:with-header="false"> :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>
<el-drawer <el-drawer
:visible.sync="nodeDrawer" :visible.sync="nodeDrawer"
@ -800,6 +800,10 @@
}).catch(e => { }).catch(e => {
this.$message.error(e.msg || '') this.$message.error(e.msg || '')
}) })
},
closeVersion () {
this.drawer = false
} }
}, },
watch: { watch: {

6
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue

@ -126,7 +126,7 @@
:visible.sync="drawer" :visible.sync="drawer"
size="35%" size="35%"
:with-header="false"> :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>
<el-dialog <el-dialog
:title="$t('Please set the parameters before starting')" :title="$t('Please set the parameters before starting')"
@ -434,6 +434,10 @@
}) })
}, },
closeVersion () {
this.drawer = false
},
_batchExport () { _batchExport () {
this.exportDefinition({ this.exportDefinition({
processDefinitionIds: this.strSelectIds, processDefinitionIds: this.strSelectIds,

4
dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/versions.vue

@ -151,9 +151,7 @@
*/ */
_close () { _close () {
// flag Whether to delete a node this.$destroy() // flag Whether to delete a node this.$destroy()
this.$emit('close', { this.$emit('closeVersion')
fromThis: this
})
} }
}, },
created () { created () {

Loading…
Cancel
Save