diff --git a/dolphinscheduler-ui/build/config.js b/dolphinscheduler-ui/build/config.js index 91d59a06b4bdcc43ca7a042c12780c7b4258c2ea..53a421d9a0a85bad96b4e56408e621951f6cdc9a 100644 --- a/dolphinscheduler-ui/build/config.js +++ b/dolphinscheduler-ui/build/config.js @@ -109,7 +109,7 @@ const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => { filename: newPagePath || path.join('view', p), template: `${path.join('src/view', p)}`, cache: true, - favicon:'./favicon.ico', + favicon:'./favicon.png', inject: true, hash: version, chunks: chunks, diff --git a/dolphinscheduler-ui/favicon.ico b/dolphinscheduler-ui/favicon.png similarity index 100% rename from dolphinscheduler-ui/favicon.ico rename to dolphinscheduler-ui/favicon.png 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 cde94cd3c8eb414f2bab15f9f26fd99afcb152ee..eb58da46f664673c996b2c3ec199fb4ed33b00a9 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 @@ -563,7 +563,8 @@ cacheTaskInfo({item, fromThis}) { self.cacheTasks(item) }, - close ({ flag, fromThis }) { + close ({ item,flag, fromThis }) { + self.addTasks(item) // Edit status does not allow deletion of nodes if (flag) { jsPlumb.remove(id) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue index 8f9066ca2165578aa22a1dab47c06288758add61..54293272dfe5b5036c95653995e5fe7ed9b96d6e 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue @@ -305,6 +305,7 @@ description: '', // Node echo data backfillItem: {}, + cacheBackfillItem: {}, // Resource(list) resourcesList: [], successNode: 'success', @@ -580,17 +581,34 @@ this.isContentBox = false // flag Whether to delete a node this.$destroy() this.$emit('close', { + item: { + type: this.cacheBackfillItem.type, + id: this.cacheBackfillItem.id, + name: this.cacheBackfillItem.name, + params: this.cacheBackfillItem.params, + description: this.cacheBackfillItem.description, + runFlag: this.cacheBackfillItem.runFlag, + conditionResult: this.cacheBackfillItem.conditionResult, + dependence: this.cacheBackfillItem.dependence, + maxRetryTimes: this.cacheBackfillItem.maxRetryTimes, + retryInterval: this.cacheBackfillItem.retryInterval, + timeout: this.cacheBackfillItem.timeout, + taskInstancePriority: this.cacheBackfillItem.taskInstancePriority, + workerGroup: this.cacheBackfillItem.workerGroup, + status: this.cacheBackfillItem.status, + branch: this.cacheBackfillItem.branch + }, flag: flag, fromThis: this }) } - }, + }, watch: { /** * Watch the item change, cache the value it changes **/ _item (val) { - this._cacheItem() + // this._cacheItem() } }, created () { @@ -653,6 +671,7 @@ } else { this.workerGroup = this.store.state.security.workerGroupsListAll[0].id } + this.cacheBackfillItem = o this.isContentBox = true }, mounted () { diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue index 189d59a0c8431b94000551e1446fc41b3d007d13..cdcf0b0785f4a114d31fffb2047a99823f520e31 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue @@ -32,7 +32,7 @@ {{$t('Executor')}} - {{$t('Node Type')}} + {{$t('Node Type')}} {{$t('State')}} @@ -73,7 +73,7 @@ {{item.executorName}} - - {{item.taskType}} + {{item.taskType}} {{item.submitTime | formatDate}}