feat:修改sql拼接逻辑

main
liu.tao3 2 years ago
parent dd5ecd54c2
commit d40875bf60

@ -655,7 +655,7 @@ export default {
getData () { getData () {
const executeParams = { const executeParams = {
dataSourceId: this.dataForm.sourceId, dataSourceId: this.dataForm.sourceId,
script: this.getSql(), script: this.dataForm.fieldInfo.join(','),
// //
params: [], params: [],
dataSetType: 'original', dataSetType: 'original',
@ -673,23 +673,6 @@ export default {
this.tableLoading = false 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 表单名称 * @param formName 表单名称
@ -820,7 +803,6 @@ export default {
getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName).then((data) => { getTableFieldList(this.dataForm.sourceId, this.dataForm.tableName).then((data) => {
const fieldDescMap = {} const fieldDescMap = {}
this.fieldList = data.map(field => { this.fieldList = data.map(field => {
field.columnName = '`' + field.columnName + '`'
fieldDescMap[field.columnName] = field.columnComment fieldDescMap[field.columnName] = field.columnComment
field.isCheck = false field.isCheck = false
if (this.dataForm.fieldInfo.includes(field.columnName)) { if (this.dataForm.fieldInfo.includes(field.columnName)) {
@ -874,7 +856,7 @@ export default {
if (!this.dataForm.sourceId || !this.dataForm.tableName) return if (!this.dataForm.sourceId || !this.dataForm.tableName) return
const executeParams = { const executeParams = {
dataSourceId: this.dataForm.sourceId, dataSourceId: this.dataForm.sourceId,
script: this.getSql(), script: this.dataForm.fieldInfo.join(','),
// //
params: [], params: [],
dataSetType: 'original', dataSetType: 'original',

Loading…
Cancel
Save