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 e703013073..97009bbef3 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue @@ -24,7 +24,7 @@ :id="v" v-for="(item,v) in tasksTypeList" @mousedown="_getDagId(v)"> -
+
@@ -66,7 +66,7 @@ :class="_operationClass(item)" :id="item.code" @click="_ckOperation(item,$event)"> - + { + const titleTpl = (item, description) => { let $item = _.filter(taskList, v => v.name === item.name)[0] - return `
${i18n.$t('Name')}:${$item.name}
${i18n.$t('State')}:${desc}
${i18n.$t('type')}:${$item.taskType}
${i18n.$t('host')}:${$item.host || '-'}
${i18n.$t('Retry Count')}:${$item.retryTimes}
${i18n.$t('Submit Time')}:${formatDate($item.submitTime)}
${i18n.$t('Start Time')}:${formatDate($item.startTime)}
${i18n.$t('End Time')}:${$item.endTime ? formatDate($item.endTime) : '-'}
` + return `
${i18n.$t('Name')}:${$item.name}
${i18n.$t('State')}:${description}
${i18n.$t('type')}:${$item.taskType}
${i18n.$t('host')}:${$item.host || '-'}
${i18n.$t('Retry Count')}:${$item.retryTimes}
${i18n.$t('Submit Time')}:${formatDate($item.submitTime)}
${i18n.$t('Start Time')}:${formatDate($item.startTime)}
${i18n.$t('End Time')}:${$item.endTime ? formatDate($item.endTime) : '-'}
` } // remove tip state dom @@ -212,7 +212,7 @@ dom.attr('data-state-id', v1.stateId) dom.attr('data-dependent-result', v1.dependentResult || '') state.append(`${v1.icoUnicode}`) - state.find('b').attr('title', titleTpl(v2, v1.desc)) + state.find('b').attr('title', titleTpl(v2, v1.description)) } }) }) 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 ae641da54a..9707449e8b 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 @@ -60,7 +60,7 @@ - +
{{$t('Description')}} @@ -72,7 +72,7 @@ :autosize="{minRows:2}" type="textarea" :disabled="isDetails" - v-model="desc" + v-model="description" :placeholder="$t('Please enter description')" autocomplete="off"> @@ -229,8 +229,8 @@ spinnerLoading: false, // node name name: ``, - // desc - desc: '', + // description + description: '', // Node echo data backfillItem: {}, // Resource(list) @@ -377,7 +377,7 @@ id: this.id, name: this.name, params: this.params, - desc: this.desc, + description: this.description, runFlag: this.runFlag, dependence: this.dependence, maxRetryTimes: this.maxRetryTimes, @@ -452,7 +452,7 @@ this.name = o.name this.taskInstancePriority = o.taskInstancePriority this.runFlag = o.runFlag || 'NORMAL' - this.desc = o.desc + this.description = o.description this.maxRetryTimes = o.maxRetryTimes this.retryInterval = o.retryInterval this.workerGroupId = o.workerGroupId diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue index 2902a663d0..1bd48d8fb1 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/udp/udp.vue @@ -34,7 +34,7 @@
@@ -101,8 +101,8 @@ return { // dag name name: '', - // dag desc - desc: '', + // dag description + description: '', // Global custom parameters udpList: [], // Global custom parameters @@ -140,7 +140,7 @@ this.store.commit('dag/setName', _.cloneDeep(this.name)) this.store.commit('dag/setTimeout', _.cloneDeep(this.timeout)) this.store.commit('dag/setTenantId', _.cloneDeep(this.tenantId)) - this.store.commit('dag/setDesc', _.cloneDeep(this.desc)) + this.store.commit('dag/setDesc', _.cloneDeep(this.description)) this.store.commit('dag/setSyncDefine', this.syncDefine) }, /** @@ -201,7 +201,7 @@ this.udpList = dag.globalParams this.udpListCache = dag.globalParams this.name = dag.name - this.desc = dag.desc + this.description = dag.description this.syncDefine = dag.syncDefine this.timeout = dag.timeout || 0 this.checkedTimeout = this.timeout !== 0 diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue index 78fa8aa7ba..ec88a96f09 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/createDataSource.vue @@ -162,7 +162,7 @@ type: 'MYSQL', // name name: '', - // desc + // description note: '', // host host: '', diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue index d7cc5a4c44..a58b01a63f 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/datasource/pages/list/_source/list.vue @@ -64,7 +64,7 @@ - {{item.note}} + {{item.note}} - diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue index 42b7e0eb95..91172cf744 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/list.vue @@ -69,7 +69,7 @@ - - {{item.desc}} + {{item.description}} - @@ -153,7 +153,7 @@ methods: { ...mapActions('dag', ['editProcessState', 'getStartCheck', 'getReceiver', 'deleteDefinition', 'batchDeleteDefinition','exportDefinition']), _rtPublishStatus (code) { - return _.filter(publishStatus, v => v.code === code)[0].desc + return _.filter(publishStatus, v => v.code === code)[0].description }, _treeView (item) { this.$router.push({ path: `/projects/definition/tree/${item.id}` }) diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue index b10d9cbdab..b78a72d8a3 100644 --- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue +++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/createProject.vue @@ -34,7 +34,7 @@