|
|
|
@ -655,7 +655,7 @@ export default {
|
|
|
|
|
getData () {
|
|
|
|
|
const executeParams = {
|
|
|
|
|
dataSourceId: this.dataForm.sourceId,
|
|
|
|
|
script: this.getSql(),
|
|
|
|
|
script: this.dataForm.fieldInfo.join(','),
|
|
|
|
|
// 原始表数据集没有数据集参数
|
|
|
|
|
params: [],
|
|
|
|
|
dataSetType: 'original',
|
|
|
|
@ -673,23 +673,6 @@ export default {
|
|
|
|
|
this.tableLoading = false
|
|
|
|
|
})
|
|
|
|
|
},
|
|
|
|
|
/**
|
|
|
|
|
* 组装sql
|
|
|
|
|
* @returns {string}
|
|
|
|
|
*/
|
|
|
|
|
getSql () {
|
|
|
|
|
let sql = 'SELECT '
|
|
|
|
|
if (this.dataForm.repeatStatus === 1) {
|
|
|
|
|
sql += ' DISTINCT '
|
|
|
|
|
}
|
|
|
|
|
if (this.dataForm.fieldInfo.length > 0) {
|
|
|
|
|
sql += this.dataForm.fieldInfo.join(',')
|
|
|
|
|
} else {
|
|
|
|
|
sql += '*'
|
|
|
|
|
}
|
|
|
|
|
sql += ` FROM ${this.dataForm.tableName}`
|
|
|
|
|
return sql
|
|
|
|
|
},
|
|
|
|
|
/**
|
|
|
|
|
* 保存数据集
|
|
|
|
|
* @param formName 表单名称
|
|
|
|
@ -820,7 +803,6 @@ export default {
|
|
|
|
|
getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName).then((data) => {
|
|
|
|
|
const fieldDescMap = {}
|
|
|
|
|
this.fieldList = data.map(field => {
|
|
|
|
|
field.columnName = '`' + field.columnName + '`'
|
|
|
|
|
fieldDescMap[field.columnName] = field.columnComment
|
|
|
|
|
field.isCheck = false
|
|
|
|
|
if (this.dataForm.fieldInfo.includes(field.columnName)) {
|
|
|
|
@ -874,7 +856,7 @@ export default {
|
|
|
|
|
if (!this.dataForm.sourceId || !this.dataForm.tableName) return
|
|
|
|
|
const executeParams = {
|
|
|
|
|
dataSourceId: this.dataForm.sourceId,
|
|
|
|
|
script: this.getSql(),
|
|
|
|
|
script: this.dataForm.fieldInfo.join(','),
|
|
|
|
|
// 原始表数据集没有数据集参数
|
|
|
|
|
params: [],
|
|
|
|
|
dataSetType: 'original',
|
|
|
|
|