@@ -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 @@
@@ -56,7 +56,7 @@
data () {
return {
store,
- desc: '',
+ description: '',
projectName: ''
}
},
@@ -71,7 +71,7 @@
let param = {
projectName: _.trim(this.projectName),
- desc: _.trim(this.desc)
+ description: _.trim(this.description)
}
// edit
@@ -104,7 +104,7 @@
created () {
if (this.item) {
this.projectName = this.item.name
- this.desc = this.item.desc
+ this.description = this.item.description
}
},
mounted () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
index 9c10212b83..cb27f7bf2b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/list/_source/list.vue
@@ -17,7 +17,7 @@
-
+
{{$t('#')}}
@@ -66,7 +66,7 @@
{{item.instRunningCount}}
|
- {{item.desc}}
+ {{item.description}}
-
|
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 3533418458..651258dec5 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
@@ -61,7 +61,7 @@
{{parseInt(pageNo === 1 ? ($index + 1) : (($index + 1) + (pageSize * (pageNo - 1))))}}
|
- {{item.name}}
+ {{item.name}}
|
{{item.processInstanceName}} |
{{item.taskType}} |
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
index 8472b0f811..267f391330 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/create/index.vue
@@ -48,7 +48,7 @@
@@ -92,7 +92,7 @@
return {
suffix: 'sh',
fileName: '',
- desc: '',
+ description: '',
fileTypeList: filtTypeArr,
content: '',
spinnerLoading: false
@@ -108,7 +108,7 @@
type: 'FILE',
fileName: this.fileName,
suffix: this.suffix,
- desc: this.desc,
+ description: this.description,
content: editor.getValue()
}).then(res => {
this.$message.success(res.msg)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
index b6f4c774d3..f66da861cc 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/list.vue
@@ -52,7 +52,7 @@
{{item.fileName}} |
- {{item.description}}
+ {{item.description}}
-
|
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
index d03306c3a9..6248b9338a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/file/pages/list/_source/rename.vue
@@ -34,7 +34,7 @@
@@ -55,7 +55,7 @@
data () {
return {
store,
- desc: '',
+ description: '',
name: ''
}
},
@@ -67,7 +67,7 @@
this._verification().then(res => {
if (this.name === this.item.alias) {
return new Promise((resolve,reject) => {
- this.desc === this.item.description ? reject({msg:'内容未修改'}) : resolve()
+ this.description === this.item.description ? reject({msg:'内容未修改'}) : resolve()
})
}else{
return this.store.dispatch('resource/resourceVerifyName', {
@@ -78,7 +78,7 @@
}).then(res => {
return this.store.dispatch('resource/resourceRename', {
name: this.name,
- desc: this.desc,
+ description: this.description,
id: this.item.id,
type: 'FILE'
})
@@ -109,7 +109,7 @@
let item = this.item || {}
if (item) {
this.name = item.alias
- this.desc = item.description
+ this.description = item.description
}
},
mounted () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
index ab8bc14f1d..058977b03a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/createUdf.vue
@@ -101,7 +101,7 @@
@@ -128,7 +128,7 @@
className: '',
argTypes: '',
database: '',
- desc: '',
+ description: '',
resourceId: {},
udfResourceList: [],
isUpdate: false,
@@ -164,7 +164,7 @@
className: this.className,
argTypes: this.argTypes, // Can not pass this parameter
database: this.database, // Can not pass this parameter
- desc: this.desc,
+ description: this.description,
resourceId: this.resourceId.id
}
@@ -267,7 +267,7 @@
this.className = this.item.className || ''
this.argTypes = this.item.argTypes || ''
this.database = this.item.database || ''
- this.desc = this.item.description || ''
+ this.description = this.item.description || ''
this.resourceId = _.filter(this.udfResourceList, v => v.id === this.item.resourceId)[0]
} else {
this.resourceId = this.udfResourceList.length && this.udfResourceList[0] || []
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
index c8b1fecb02..6fcebbf8a6 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/function/_source/list.vue
@@ -67,7 +67,7 @@ v-ps
{{item.type}}
|
- {{item.description}}
+ {{item.description}}
-
|
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
index 1e68a14a3d..ef2479c91a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/list.vue
@@ -58,7 +58,7 @@
{{_rtSize(item.size)}}
|
- {{item.description}}
+ {{item.description}}
-
|
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
index 49b4b1127b..59fd32c728 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/resource/pages/udf/pages/resource/_source/rename.vue
@@ -34,7 +34,7 @@
@@ -55,7 +55,7 @@
data () {
return {
store,
- desc: '',
+ description: '',
name: ''
}
},
@@ -67,7 +67,7 @@
this._verification().then(res => {
if (this.name === this.item.alias) {
return new Promise((resolve,reject) => {
- this.desc === this.item.description ? reject({msg:'内容未修改'}) : resolve()
+ this.description === this.item.description ? reject({msg:'内容未修改'}) : resolve()
})
}else{
return this.store.dispatch('resource/resourceVerifyName', {
@@ -78,7 +78,7 @@
}).then(res => {
return this.store.dispatch('resource/resourceRename', {
name: this.name,
- desc: this.desc,
+ description: this.description,
id: this.item.id,
type: 'UDF'
})
@@ -108,7 +108,7 @@
let item = this.item || {}
if (item) {
this.name = item.alias
- this.desc = item.description
+ this.description = item.description
}
},
mounted () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
index 0d8f5e737f..9f39b5eb01 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/createTenement.vue
@@ -62,7 +62,7 @@
@@ -88,7 +88,7 @@
queueId: {},
tenantCode: '',
tenantName: '',
- desc: ''
+ description: ''
}
},
props: {
@@ -152,7 +152,7 @@
tenantCode: this.tenantCode,
tenantName: this.tenantName,
queueId: this.queueId.id,
- desc: this.desc
+ description: this.description
}
if (this.item) {
param.id = this.item.id
@@ -181,7 +181,7 @@
})
this.tenantCode = this.item.tenantCode
this.tenantName = this.item.tenantName
- this.desc = this.item.desc
+ this.description = this.item.description
}
})
},
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
index 7be513c844..ae8d53dbb5 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/tenement/_source/list.vue
@@ -59,7 +59,7 @@
|
- {{item.desc}}
+ {{item.description}}
-
|
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
index 6c1001063f..4aec9642ff 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/users/index.vue
@@ -18,7 +18,7 @@
-
+
{{$t('Create User')}}
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
index 1ee5f92421..f9ea2e617a 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/createWarning.vue
@@ -50,7 +50,7 @@
@@ -72,7 +72,7 @@
store,
groupName: '',
groupType: 'EMAIL',
- desc: '',
+ description: '',
options: [{ code: `${i18n.$t('Email')}`, id: 'EMAIL' }, { code: `${i18n.$t('SMS')}`, id: 'SMS' }]
}
},
@@ -111,7 +111,7 @@
let param = {
groupName: this.groupName,
groupType: this.groupType,
- desc: this.desc
+ description: this.description
}
if (this.item) {
param.id = this.item.id
@@ -134,7 +134,7 @@
if (this.item) {
this.groupName = this.item.groupName
this.groupType = this.item.groupType
- this.desc = this.item.desc
+ this.description = this.item.description
}
},
mounted () {
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
index 4923d40f77..8b0e38d605 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/security/pages/warningGroups/_source/list.vue
@@ -52,7 +52,7 @@
|
{{item.groupType === 'EMAIL' ? `${$t('Email')}` : `${$t('SMS')}`}} |
- {{item.desc}}
+ {{item.description}}
-
|
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
index 9d73918f6d..7ef6193d65 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/actions.js
@@ -100,8 +100,8 @@ export default {
}, res => {
// name
state.name = res.data.name
- // desc
- state.desc = res.data.desc
+ // description
+ state.description = res.data.description
// connects
state.connects = JSON.parse(res.data.connects)
// locations
@@ -133,7 +133,7 @@ export default {
// name
state.name = res.data.name
// desc
- state.desc = res.data.desc
+ state.description = res.data.description
// connects
state.connects = JSON.parse(res.data.connects)
// locations
@@ -173,7 +173,7 @@ export default {
io.post(`projects/${state.projectName}/process/save`, {
processDefinitionJson: JSON.stringify(data),
name: _.trim(state.name),
- desc: _.trim(state.desc),
+ description: _.trim(state.description),
locations: JSON.stringify(state.locations),
connects: JSON.stringify(state.connects)
}, res => {
@@ -199,7 +199,7 @@ export default {
locations: JSON.stringify(state.locations),
connects: JSON.stringify(state.connects),
name: _.trim(state.name),
- desc: _.trim(state.desc),
+ description: _.trim(state.description),
id: payload
}, res => {
resolve(res)
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
index 4a94fe093e..95631642d3 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/mutations.js
@@ -71,10 +71,10 @@ export default {
state.globalParams = payload
},
/**
- * set desc
+ * set description
*/
setDesc (state, payload) {
- state.desc = payload
+ state.description = payload
},
/**
* Whether to update the process definition
@@ -104,7 +104,7 @@ export default {
state.globalParams = payload && payload.globalParams || []
state.tasks = payload && payload.tasks || []
state.name = payload && payload.name || ''
- state.desc = payload && payload.desc || ''
+ state.description = payload && payload.description || ''
state.timeout = payload && payload.timeout || 0
state.tenantId = payload && payload.tenantId || -1
state.processListS = payload && payload.processListS || []
diff --git a/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js b/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
index 26891a6774..122839974b 100644
--- a/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
+++ b/dolphinscheduler-ui/src/js/conf/home/store/dag/state.js
@@ -23,8 +23,8 @@ let projectName = localStore.getItem('projectName')
export default {
// name
name: '',
- // desc
- desc: '',
+ // description
+ description: '',
// Node global parameter
globalParams: [],
// Node information
diff --git a/dolphinscheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue
index e4e3ff8975..05381dbc85 100644
--- a/dolphinscheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue
+++ b/dolphinscheduler-ui/src/js/module/components/fileUpdate/definitionUpdate.vue
@@ -89,8 +89,8 @@
store,
// name
name: '',
- // desc
- desc: '',
+ // description
+ description: '',
// progress
progress: 0,
// file
diff --git a/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue
index 16f61d61c9..41d2f3b3a5 100644
--- a/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue
+++ b/dolphinscheduler-ui/src/js/module/components/fileUpdate/fileUpdate.vue
@@ -60,7 +60,7 @@
@@ -101,8 +101,8 @@
store,
// name
name: '',
- // desc
- desc: '',
+ // description
+ description: '',
// progress
progress: 0,
// file
@@ -172,7 +172,7 @@
formData.append('file', this.file)
formData.append('type', this.type)
formData.append('name', this.name)
- formData.append('desc', this.desc)
+ formData.append('description', this.description)
io.post(`resources/create`, res => {
this.$message.success(res.msg)
resolve()
diff --git a/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue b/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue
index c55d021c0b..4285df5720 100644
--- a/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue
+++ b/dolphinscheduler-ui/src/js/module/components/fileUpdate/udfUpdate.vue
@@ -106,7 +106,7 @@
formData.append('file', this.file)
formData.append('type', 'UDF')
formData.append('name', this.udfName)
- formData.append('desc', this.udfDesc)
+ formData.append('description', this.udfDesc)
this.spinnerLoading = true
this.$emit('on-update-present', false)
io.post(`resources/create`, res => {
| |