This is an automated email from the ASF dual-hosted git repository.
leonbao 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 8da0f4a [bugfix]Replace favicon icon with png and Cancel the initial
value of the node cache #3111 (#3107)
8da0f4a is described below
commit 8da0f4a1f57cc99e88fae5e7e2c128aeb262dfc2
Author: break60 <[email protected]>
AuthorDate: Thu Jul 2 11:16:46 2020 +0800
[bugfix]Replace favicon icon with png and Cancel the initial value of the
node cache #3111 (#3107)
* [bugfix]Replace favicon icon with png
* Cancel the initial value of the node cache
---
dolphinscheduler-ui/build/config.js | 2 +-
dolphinscheduler-ui/{favicon.ico => favicon.png} | Bin
.../src/js/conf/home/pages/dag/_source/dag.vue | 3 ++-
.../home/pages/dag/_source/formModel/formModel.vue | 23 +++++++++++++++++++--
.../projects/pages/taskInstance/_source/list.vue | 4 ++--
5 files changed, 26 insertions(+), 6 deletions(-)
diff --git a/dolphinscheduler-ui/build/config.js
b/dolphinscheduler-ui/build/config.js
index 91d59a0..53a421d 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 cde94cd..eb58da4 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 8f9066c..5429327 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 189d59a..cdcf0b0 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 @@
<span>{{$t('Executor')}}</span>
</th>
<th scope="col" style="min-width: 70px">
- <span>{{$t('Node Type')}}</span>
+ <span style="margin-left: 5px">{{$t('Node Type')}}</span>
</th>
<th scope="col" style="min-width: 30px">
<span>{{$t('State')}}</span>
@@ -73,7 +73,7 @@
<span v-if="item.executorName">{{item.executorName}}</span>
<span v-else>-</span>
</td>
- <td><span>{{item.taskType}}</span></td>
+ <td><span style="margin-left: 5px">{{item.taskType}}</span></td>
<td><span v-html="_rtState(item.state)" style="cursor:
pointer;"></span></td>
<td>
<span v-if="item.submitTime">{{item.submitTime |
formatDate}}</span>
