|
|
@@ -192,6 +192,20 @@ export default {
|
|
|
{ required: true, message: '递归列不能为空', trigger: 'blur' }
|
|
|
]
|
|
|
},
|
|
|
+ {//treeShowLabel
|
|
|
+ label: '展示列',
|
|
|
+ prop: 'treeShowLabel',
|
|
|
+ component: 'el-select',
|
|
|
+ attrs: {
|
|
|
+ placeholder: '请选择表格展示列',
|
|
|
+ clearable: true,
|
|
|
+ },
|
|
|
+ options: [],
|
|
|
+ selectSlot: true,
|
|
|
+ rules: [
|
|
|
+ { required: true, message: '展示列不能为空', trigger: 'blur' }
|
|
|
+ ]
|
|
|
+ },
|
|
|
],
|
|
|
// 树形表格总配置
|
|
|
treeTableFormItems: [
|
|
|
@@ -373,6 +387,7 @@ export default {
|
|
|
treeTableName: formTopData.treeTableName,//树形绑定的表名
|
|
|
treeTablePrimaryKey: formTopData.treeTablePrimaryKey,//树形表主键
|
|
|
treeTableDgl: formTopData.treeTableDgl,//树形表后台递归列
|
|
|
+ treeShowLabel: fromTopData.treeShowLabel,// 树形展示列
|
|
|
treeTableCondition: formTopData.treeTableCondition,//树形表是lable/还是value作为条件
|
|
|
tableId: x.tableId,//关联表
|
|
|
tableNameDes: this.tableList[0].dtName,//关联表
|
|
|
@@ -385,7 +400,7 @@ export default {
|
|
|
this.$message.success("新增成功");
|
|
|
this.$tab.closePage();
|
|
|
this.$router.push({
|
|
|
- path: "/system/fromModel/index/treeTable/index",
|
|
|
+ path: "/system/fromModel/index/treeTable",
|
|
|
});
|
|
|
} else {
|
|
|
this.$message.warning("新增成功");
|
|
|
@@ -399,6 +414,8 @@ export default {
|
|
|
treeTableName: formTopData.treeTableName,//树形绑定的表名
|
|
|
treeTablePrimaryKey: formTopData.treeTablePrimaryKey,//树形表主键
|
|
|
treeTableDgl: formTopData.treeTableDgl,//树形表后台递归列
|
|
|
+ treeShowLabel: formTopData.treeShowLabel,//树形表展示列
|
|
|
+
|
|
|
treeTableCondition: formTopData.treeTableCondition,//树形表是lable/还是value作为条件
|
|
|
tableId: x.tableId,//关联表
|
|
|
tableNameDes: this.tableList[0].dtName,//关联表
|
|
|
@@ -410,7 +427,7 @@ export default {
|
|
|
this.$message.success("修改成功");
|
|
|
this.$tab.closePage();
|
|
|
this.$router.push({
|
|
|
- path: "/system/fromModel/index/treeTable/index",
|
|
|
+ path: "/system/fromModel/index/treeTable",
|
|
|
});
|
|
|
} else {
|
|
|
this.$message.warning("修改失败");
|
|
|
@@ -433,13 +450,20 @@ export default {
|
|
|
async judgmentMenu(mode) {
|
|
|
let result;
|
|
|
if (mode == 2) {
|
|
|
+ let tableId = this.$refs.treeTableFormItems.queryParams['tableId']
|
|
|
+ let addTableKey;
|
|
|
+ if(tableId){//0314-cs
|
|
|
+ let res = await getTableInfo(tableId);
|
|
|
+ console.log('[res0314----]',res)
|
|
|
+ addTableKey = res.data.tableKey
|
|
|
+ }
|
|
|
let menuName = this.$refs.dynamicForm.queryParams['menuName']
|
|
|
let parentId = this.$refs.dynamicForm.queryParams['menuId']
|
|
|
this.uuid = uuidv4();
|
|
|
- this.tableKey = uuidv4();
|
|
|
+ // this.tableKey = uuidv4();
|
|
|
this.treeTableKey = uuidv4();
|
|
|
let tableKeyObj = {
|
|
|
- tableKey: this.uuid,
|
|
|
+ tableKey: addTableKey,
|
|
|
treeTableKey: this.treeTableKey,
|
|
|
};
|
|
|
let payLoad = {
|
|
|
@@ -568,6 +592,8 @@ export default {
|
|
|
// 1. 清除 treeTablePrimaryKey treeTableDgl
|
|
|
this.$refs.dynamicForm.queryParams.treeTablePrimaryKey = null; // 或者设置为空数组 []
|
|
|
this.$refs.dynamicForm.queryParams.treeTableDgl = null; // 或者设置为空数组 []
|
|
|
+ this.$refs.dynamicForm.queryParams.treeShowLabel = null; // 或者设置为空数组 []
|
|
|
+
|
|
|
// 清空 treeTablePrimaryKey 的 options（可选，如果需要清空选项）
|
|
|
this.treeFormItems[5].options = [];
|
|
|
this.treeFormItems[7].options = [];
|
|
|
@@ -597,7 +623,8 @@ export default {
|
|
|
// 清空 treeTablePrimaryKey treeTableDgl 的值
|
|
|
this.$refs.dynamicForm.queryParams.treeTablePrimaryKey = null; // 或者设置为空数组 []
|
|
|
this.$refs.dynamicForm.queryParams.treeTableDgl = null; // 或者设置为空数组 []
|
|
|
-
|
|
|
+ this.$refs.dynamicForm.queryParams.treeShowLabel = null; // 或者设置为空数组 []
|
|
|
+
|
|
|
// 清空 treeTablePrimaryKey 的 options（可选，如果需要清空选项）
|
|
|
this.treeFormItems[5].options = [];
|
|
|
this.treeFormItems[7].options = [];
|
|
|
@@ -679,6 +706,7 @@ export default {
|
|
|
tableId,
|
|
|
tableNameDes,
|
|
|
treeTableJoinTable,
|
|
|
+ treeShowLabel,
|
|
|
} = this.editor;
|
|
|
Object.assign(this.$refs.dynamicForm.queryParams, {
|
|
|
menuName,
|
|
|
@@ -686,6 +714,7 @@ export default {
|
|
|
treeTableName,
|
|
|
treeTablePrimaryKey,
|
|
|
treeTableDgl,
|
|
|
+ treeShowLabel,
|
|
|
treeTableCondition,
|
|
|
});
|
|
|
Object.assign(this.$refs.treeTableFormItems.queryParams, {
|
sql715