diff --git a/escheduler-ui/.env b/escheduler-ui/.env index d83fa8435d..9018a5d4e2 100644 --- a/escheduler-ui/.env +++ b/escheduler-ui/.env @@ -2,4 +2,4 @@ API_BASE = http://192.168.xx.xx:12345 # 本地开发如需ip访问项目把"#"号去掉 -#DEV_HOST = 192.168.xx.xx \ No newline at end of file +#DEV_HOST = 192.168.xx.xx diff --git a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue index 76aaccdd93..8e11dca356 100644 --- a/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue +++ b/escheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue @@ -84,6 +84,8 @@ desc: '', // Global custom parameters udpList: [], + // Global custom parameters + udpListCache: [], // Whether to update the process definition syncDefine: true, // Timeout alarm @@ -159,11 +161,7 @@ * Close the popup */ close () { - // Storage global globalParams - this._accuStore() - setTimeout(() => { - this.$emit('close') - }) + this.$emit('close') } }, watch: { @@ -175,11 +173,13 @@ } }, created () { - this.udpList = this.store.state.dag.globalParams - this.name = this.store.state.dag.name - this.desc = this.store.state.dag.desc - this.syncDefine = this.store.state.dag.syncDefine - this.timeout = this.store.state.dag.timeout || 0 + const dag = _.cloneDeep(this.store.state.dag) + this.udpList = dag.globalParams + this.udpListCache = dag.globalParams + this.name = dag.name + this.desc = dag.desc + this.syncDefine = dag.syncDefine + this.timeout = dag.timeout || 0 this.checkedTimeout = this.timeout !== 0 }, mounted () {}, diff --git a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue index 310cc22727..dee30839a1 100644 --- a/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue +++ b/escheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue @@ -32,7 +32,7 @@ - + {{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}} @@ -53,16 +53,16 @@ {{item.desc}} - {{$t('offline')}} - {{$t('online')}} + {{$t('online')}} + {{$t('offline')}} - - - + + @@ -90,7 +91,21 @@ - 删除 + +

{{$t('Delete?')}}

+
+ {{$t('Cancel')}} + {{$t('Confirm')}} +
+ +
+