[bugfix]Replace favicon icon with png and Cancel the initial value of the node cache #3111 (#3107) (8da0f4a1) · Commits · SUMMER2020 / students / proj-2002251

dolphinscheduler-ui/build/config.js

+1 −1

Original line number	Diff line number	Diff line
		@@ -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,

(4.19 KiB)

File moved.

+2 −1

Original line number	Diff line number	Diff line
		@@ -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)

+21 −2

Original line number	Diff line number	Diff line
		@@ -305,6 +305,7 @@
		description: '',
		// Node echo data
		backfillItem: {},
		cacheBackfillItem: {},
		// Resource(list)
		resourcesList: [],
		successNode: 'success',
		@@ -580,6 +581,23 @@
		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
		})
		@@ -590,7 +608,7 @@
		* 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 () {

+2 −2

Original line number	Diff line number	Diff line
		@@ -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>