commit:同步2.0版本

This commit is contained in:
Jerry
2021-10-20 12:11:51 +08:00
parent 50807a7a7e
commit abbbd90690
54 changed files with 4443 additions and 72 deletions

View File

@@ -94,7 +94,7 @@ export default {
},
isInit: false
},
pageListWidget: new TableWidget(this.loadOnlinePageData, this.loadOnlinePageVerify, false, false)
pageListWidget: new TableWidget(this.loadOnlinePageData, this.loadOnlinePageVerify, true, false)
}
},
methods: {

View File

@@ -856,8 +856,8 @@ export default {
tableName: relation.slaveTable.tableName,
tableId: relation.slaveTableId,
relationType: relation.relationType,
masterColumnName: relation.masterColumn.columnName,
slaveColumnName: relation.slaveColumn.columnName,
masterColumnName: (relation.masterColumn || {}).columnName || '未知字段',
slaveColumnName: (relation.slaveColumn || {}).columnName || '未知字段',
cascadeDelete: relation.cascadeDelete,
leftJoin: relation.leftJoin,
tag: relation