|
@@ -405,6 +405,8 @@ export default {
|
|
if (value.length === 0) callback(new Error("请输入有效数字"));
|
|
if (value.length === 0) callback(new Error("请输入有效数字"));
|
|
};
|
|
};
|
|
return {
|
|
return {
|
|
|
|
+ nameItem: [],
|
|
|
|
+ descItem: [],
|
|
tablelistSort: null,
|
|
tablelistSort: null,
|
|
tableQueryConditions: [],
|
|
tableQueryConditions: [],
|
|
tableList: [],
|
|
tableList: [],
|
|
@@ -489,7 +491,7 @@ export default {
|
|
mainTableFieldOptions: {
|
|
mainTableFieldOptions: {
|
|
handler(val) {
|
|
handler(val) {
|
|
if (val.length) {
|
|
if (val.length) {
|
|
- // console.log(val);
|
|
|
|
|
|
+ console.log(val);
|
|
this.mainTableData = val.map((item, index) => {
|
|
this.mainTableData = val.map((item, index) => {
|
|
return {
|
|
return {
|
|
sort: parseInt(index) + 1,
|
|
sort: parseInt(index) + 1,
|
|
@@ -519,7 +521,6 @@ export default {
|
|
// });
|
|
// });
|
|
}
|
|
}
|
|
},
|
|
},
|
|
-
|
|
|
|
deep: true,
|
|
deep: true,
|
|
immediate: true,
|
|
immediate: true,
|
|
},
|
|
},
|
|
@@ -639,11 +640,9 @@ export default {
|
|
console.log("回显数据", this.echoMessage);
|
|
console.log("回显数据", this.echoMessage);
|
|
let echoMessage = this.echoMessage;
|
|
let echoMessage = this.echoMessage;
|
|
// 主表
|
|
// 主表
|
|
- let tableColumnName = JSON.parse(echoMessage.tableColumnName);
|
|
|
|
- this.listQueryData.mainForm.mainTableName = tableColumnName[0].tbname;
|
|
|
|
- if (this.listQueryData.mainForm.mainTableName) {
|
|
|
|
- this.mainTableFieldOptions = await this.getFieldOptions(this.listQueryData.mainForm.mainTableName);
|
|
|
|
- }
|
|
|
|
|
|
+ this.nameItem = JSON.parse(echoMessage.tableColumnName);
|
|
|
|
+ console.log(this.nameItem);
|
|
|
|
+ this.listQueryData.mainForm.mainTableName = this.nameItem[0].tbname;
|
|
// 表格主键
|
|
// 表格主键
|
|
let tablelistSort = JSON.parse(echoMessage.tablelistSort);
|
|
let tablelistSort = JSON.parse(echoMessage.tablelistSort);
|
|
let dataSortFromEcho = tablelistSort.DataSort; // "student.id"
|
|
let dataSortFromEcho = tablelistSort.DataSort; // "student.id"
|
|
@@ -657,11 +656,15 @@ export default {
|
|
...item
|
|
...item
|
|
}))
|
|
}))
|
|
// 表格
|
|
// 表格
|
|
- this.mainTableData = tableColumnName.map(item => ({
|
|
|
|
|
|
+ this.mainTableData = this.nameItem.map((item, index) => ({
|
|
...item,
|
|
...item,
|
|
- fieldDescription : item.field_des,
|
|
|
|
- column_attribute:JSON.parse(item.column_attribute),
|
|
|
|
|
|
+ fieldDescription: item.field_des,
|
|
|
|
+ column_attribute: JSON.parse(item.column_attribute),
|
|
}))
|
|
}))
|
|
|
|
+ // if(this.listQueryData.mainForm.mainTableName){
|
|
|
|
+ // this.mainTableFieldOptions = await this.getFieldOptions(this.listQueryData.mainForm.mainTableName);
|
|
|
|
+ // }
|
|
|
|
+ console.log(this.mainTableData);
|
|
}
|
|
}
|
|
},
|
|
},
|
|
confirmHandler() {
|
|
confirmHandler() {
|
|
@@ -684,10 +687,10 @@ export default {
|
|
// 展示描述
|
|
// 展示描述
|
|
res.tableColumnName = [];
|
|
res.tableColumnName = [];
|
|
res.tableColumnDesc = [];
|
|
res.tableColumnDesc = [];
|
|
|
|
+ console.log('this.mainTableData', this.mainTableData);
|
|
this.mainTableData.forEach((item, index) => {
|
|
this.mainTableData.forEach((item, index) => {
|
|
- let nameItem = {},
|
|
|
|
- descItem = {};
|
|
|
|
- let { tableName, fieldName, fieldDescription, column_attribute } = item;
|
|
|
|
|
|
+ // console.log('item', item);
|
|
|
|
+ let { tbname, fieldName, fieldDescription, column_attribute } = item;
|
|
const columnAttributeString = JSON.stringify({
|
|
const columnAttributeString = JSON.stringify({
|
|
isDateColumn: column_attribute?.isDateColumn
|
|
isDateColumn: column_attribute?.isDateColumn
|
|
? column_attribute?.isDateColumn
|
|
? column_attribute?.isDateColumn
|
|
@@ -697,20 +700,20 @@ export default {
|
|
: "",
|
|
: "",
|
|
isShow: column_attribute?.isShow ? column_attribute?.isShow : false,
|
|
isShow: column_attribute?.isShow ? column_attribute?.isShow : false,
|
|
});
|
|
});
|
|
- nameItem = {
|
|
|
|
- tbname: tableName,
|
|
|
|
|
|
+ this.nameItem = {
|
|
|
|
+ tbname: tbname,
|
|
fieldName: fieldName,
|
|
fieldName: fieldName,
|
|
- fieldAsName: camelCase(tableName + "_" + fieldName),
|
|
|
|
|
|
+ fieldAsName: camelCase(tbname + "_" + fieldName),
|
|
field_des: fieldDescription,
|
|
field_des: fieldDescription,
|
|
column_attribute: columnAttributeString,
|
|
column_attribute: columnAttributeString,
|
|
};
|
|
};
|
|
- descItem = {
|
|
|
|
- column: camelCase(tableName + "_" + fieldName),
|
|
|
|
|
|
+ this.descItem = {
|
|
|
|
+ column: camelCase(tbname + "_" + fieldName),
|
|
columnDes: fieldDescription,
|
|
columnDes: fieldDescription,
|
|
columnSort: index + 1,
|
|
columnSort: index + 1,
|
|
};
|
|
};
|
|
- res.tableColumnName.push(nameItem);
|
|
|
|
- res.tableColumnDesc.push(descItem);
|
|
|
|
|
|
+ res.tableColumnName.push(this.nameItem);
|
|
|
|
+ res.tableColumnDesc.push(this.descItem);
|
|
});
|
|
});
|
|
// 查询条件
|
|
// 查询条件
|
|
// let queryData = {}
|
|
// let queryData = {}
|
|
@@ -729,15 +732,15 @@ export default {
|
|
let queryDataArray = this.queryContionTableData.map((item) => {
|
|
let queryDataArray = this.queryContionTableData.map((item) => {
|
|
let { fieldName, tableName, value, operator, type } = item;
|
|
let { fieldName, tableName, value, operator, type } = item;
|
|
return {
|
|
return {
|
|
- fieldName: tableName + "." + fieldName,
|
|
|
|
|
|
+ fieldName: fieldName,
|
|
value: value,
|
|
value: value,
|
|
operator: operator,
|
|
operator: operator,
|
|
type: String(type)
|
|
type: String(type)
|
|
};
|
|
};
|
|
});
|
|
});
|
|
- console.log(this.queryContionTableData);
|
|
|
|
|
|
+ // console.log(this.queryContionTableData);
|
|
this.tableQueryConditions.push(...queryDataArray);
|
|
this.tableQueryConditions.push(...queryDataArray);
|
|
- console.log(this.tableQueryConditions);
|
|
|
|
|
|
+ // console.log(this.tableQueryConditions);
|
|
let tableQueryConditionsString = JSON.stringify(this.tableQueryConditions);
|
|
let tableQueryConditionsString = JSON.stringify(this.tableQueryConditions);
|
|
res.tableQueryConditions = tableQueryConditionsString;
|
|
res.tableQueryConditions = tableQueryConditionsString;
|
|
// 排序
|
|
// 排序
|