Browse Source

[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
pull/3/MERGE
break60 4 years ago committed by lenboo
parent
commit
5bfcdd2af1
  1. 2
      dolphinscheduler-ui/build/config.js
  2. 0
      dolphinscheduler-ui/favicon.png
  3. 3
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
  4. 21
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
  5. 4
      dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/taskInstance/_source/list.vue

2
dolphinscheduler-ui/build/config.js

@ -109,7 +109,7 @@ const pages = glob.sync(['*/!(_*).html'], { cwd: viewDir }).map(p => {
filename: newPagePath || path.join('view', p), filename: newPagePath || path.join('view', p),
template: `${path.join('src/view', p)}`, template: `${path.join('src/view', p)}`,
cache: true, cache: true,
favicon:'./favicon.ico', favicon:'./favicon.png',
inject: true, inject: true,
hash: version, hash: version,
chunks: chunks, chunks: chunks,

0
dolphinscheduler-ui/favicon.ico → dolphinscheduler-ui/favicon.png

Before

Width:  |  Height:  |  Size: 4.2 KiB

After

Width:  |  Height:  |  Size: 4.2 KiB

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

@ -563,7 +563,8 @@
cacheTaskInfo({item, fromThis}) { cacheTaskInfo({item, fromThis}) {
self.cacheTasks(item) self.cacheTasks(item)
}, },
close ({ flag, fromThis }) { close ({ item,flag, fromThis }) {
self.addTasks(item)
// Edit status does not allow deletion of nodes // Edit status does not allow deletion of nodes
if (flag) { if (flag) {
jsPlumb.remove(id) jsPlumb.remove(id)

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

@ -305,6 +305,7 @@
description: '', description: '',
// Node echo data // Node echo data
backfillItem: {}, backfillItem: {},
cacheBackfillItem: {},
// Resource(list) // Resource(list)
resourcesList: [], resourcesList: [],
successNode: 'success', successNode: 'success',
@ -580,6 +581,23 @@
this.isContentBox = false this.isContentBox = false
// flag Whether to delete a node this.$destroy() // flag Whether to delete a node this.$destroy()
this.$emit('close', { 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, flag: flag,
fromThis: this fromThis: this
}) })
@ -590,7 +608,7 @@
* Watch the item change, cache the value it changes * Watch the item change, cache the value it changes
**/ **/
_item (val) { _item (val) {
this._cacheItem() // this._cacheItem()
} }
}, },
created () { created () {
@ -653,6 +671,7 @@
} else { } else {
this.workerGroup = this.store.state.security.workerGroupsListAll[0].id this.workerGroup = this.store.state.security.workerGroupsListAll[0].id
} }
this.cacheBackfillItem = o
this.isContentBox = true this.isContentBox = true
}, },
mounted () { mounted () {

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

@ -32,7 +32,7 @@
<span>{{$t('Executor')}}</span> <span>{{$t('Executor')}}</span>
</th> </th>
<th scope="col" style="min-width: 70px"> <th scope="col" style="min-width: 70px">
<span>{{$t('Node Type')}}</span> <span style="margin-left: 5px">{{$t('Node Type')}}</span>
</th> </th>
<th scope="col" style="min-width: 30px"> <th scope="col" style="min-width: 30px">
<span>{{$t('State')}}</span> <span>{{$t('State')}}</span>
@ -73,7 +73,7 @@
<span v-if="item.executorName">{{item.executorName}}</span> <span v-if="item.executorName">{{item.executorName}}</span>
<span v-else>-</span> <span v-else>-</span>
</td> </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-html="_rtState(item.state)" style="cursor: pointer;"></span></td>
<td> <td>
<span v-if="item.submitTime">{{item.submitTime | formatDate}}</span> <span v-if="item.submitTime">{{item.submitTime | formatDate}}</span>

Loading…
Cancel
Save