Browse Source

Download workflow instance map width adjustment and change "desc" field to "description" (#1073)

* Dependency workflow add dependency correction value

* Download workflow instance map width adjustment and change "desc" field to "description"
pull/2/head
break60 5 years ago committed by lgcareer
parent
commit
bd73bf93d3
  1. 2
      dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js
  2. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
  3. 2
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
  4. 4
      dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue

2
dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/plugIn/downChart.js vendored

@ -37,7 +37,7 @@ DownChart.prototype.maxVal = function () {
let x = parseInt(_.maxBy(tasksAllList, 'x').x + 100) let x = parseInt(_.maxBy(tasksAllList, 'x').x + 100)
resolve({ resolve({
width: x > 600 ? x : dom.width(), width: (x > 600 ? x : dom.width()) + 100,
height: (y > 500 ? y : dom.height()) + 100 height: (y > 500 ? y : dom.height()) + 100
}) })
}) })

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue

@ -67,7 +67,7 @@
this._verification().then(res => { this._verification().then(res => {
if (this.name === this.item.alias) { if (this.name === this.item.alias) {
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
this.desc === this.item.desc ? reject({msg:'内容未修改'}) : resolve() this.desc === this.item.description ? reject({msg:'内容未修改'}) : resolve()
}) })
}else{ }else{
return this.store.dispatch('resource/resourceVerifyName', { return this.store.dispatch('resource/resourceVerifyName', {
@ -109,7 +109,7 @@
let item = this.item || {} let item = this.item || {}
if (item) { if (item) {
this.name = item.alias this.name = item.alias
this.desc = item.desc this.desc = item.description
} }
}, },
mounted () { mounted () {

2
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue

@ -267,7 +267,7 @@
this.className = this.item.className || '' this.className = this.item.className || ''
this.argTypes = this.item.argTypes || '' this.argTypes = this.item.argTypes || ''
this.database = this.item.database || '' this.database = this.item.database || ''
this.desc = this.item.desc || '' this.desc = this.item.description || ''
this.resourceId = _.filter(this.udfResourceList, v => v.id === this.item.resourceId)[0] this.resourceId = _.filter(this.udfResourceList, v => v.id === this.item.resourceId)[0]
} else { } else {
this.resourceId = this.udfResourceList.length && this.udfResourceList[0] || [] this.resourceId = this.udfResourceList.length && this.udfResourceList[0] || []

4
dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue

@ -67,7 +67,7 @@
this._verification().then(res => { this._verification().then(res => {
if (this.name === this.item.alias) { if (this.name === this.item.alias) {
return new Promise((resolve,reject) => { return new Promise((resolve,reject) => {
this.desc === this.item.desc ? reject({msg:'内容未修改'}) : resolve() this.desc === this.item.description ? reject({msg:'内容未修改'}) : resolve()
}) })
}else{ }else{
return this.store.dispatch('resource/resourceVerifyName', { return this.store.dispatch('resource/resourceVerifyName', {
@ -108,7 +108,7 @@
let item = this.item || {} let item = this.item || {}
if (item) { if (item) {
this.name = item.alias this.name = item.alias
this.desc = item.desc this.desc = item.description
} }
}, },
mounted () { mounted () {

Loading…
Cancel
Save