|
@@ -216,7 +216,7 @@
|
|
:options="menus"
|
|
:options="menus"
|
|
:normalizer="normalizer"
|
|
:normalizer="normalizer"
|
|
:show-count="true"
|
|
:show-count="true"
|
|
- placeholder=""
|
|
|
|
|
|
+ placeholder="请选择父级路由"
|
|
/>
|
|
/>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
<el-form-item label="是否显示列表" v-if="false">
|
|
<el-form-item label="是否显示列表" v-if="false">
|
|
@@ -543,7 +543,7 @@ export default {
|
|
// 右侧表单编辑
|
|
// 右侧表单编辑
|
|
formData: {
|
|
formData: {
|
|
menuName: "",
|
|
menuName: "",
|
|
- routePath: 1,
|
|
|
|
|
|
+ routePath: undefined,
|
|
isShowList: true,
|
|
isShowList: true,
|
|
timeFormate: "",
|
|
timeFormate: "",
|
|
orderByColumn: "",
|
|
orderByColumn: "",
|
|
@@ -718,7 +718,10 @@ export default {
|
|
},
|
|
},
|
|
// 关联类型变化回调
|
|
// 关联类型变化回调
|
|
relationTypeChangeHandler(row) {
|
|
relationTypeChangeHandler(row) {
|
|
- this.tableFieldList = [...this.tableFieldList, ...row.relationFieldList];
|
|
|
|
|
|
+ let tempRelationFieldList = row.relationFieldList.filter((item) => {
|
|
|
|
+ return !this.tableFieldList.find((val) => val.id === item.id);
|
|
|
|
+ });
|
|
|
|
+ this.tableFieldList = [...this.tableFieldList, ...tempRelationFieldList];
|
|
},
|
|
},
|
|
// 关联字段回调
|
|
// 关联字段回调
|
|
relationFieldChange(row) {
|
|
relationFieldChange(row) {
|
|
@@ -889,11 +892,9 @@ export default {
|
|
// }
|
|
// }
|
|
}
|
|
}
|
|
// 如果主键不包含显示,则添加至sql语句中
|
|
// 如果主键不包含显示,则添加至sql语句中
|
|
- console.log(this.primaryKeyList, this.formData.primaryKey);
|
|
|
|
let isNotInclude = this.primaryKeyList.find(
|
|
let isNotInclude = this.primaryKeyList.find(
|
|
(val) => !val.isShow && val.fieldName == this.formData.primaryKey
|
|
(val) => !val.isShow && val.fieldName == this.formData.primaryKey
|
|
);
|
|
);
|
|
- console.log(isNotInclude);
|
|
|
|
if (isNotInclude) {
|
|
if (isNotInclude) {
|
|
fieldArr.push(isNotInclude.tableName + "." + isNotInclude.fieldName);
|
|
fieldArr.push(isNotInclude.tableName + "." + isNotInclude.fieldName);
|
|
}
|
|
}
|
|
@@ -930,7 +931,6 @@ export default {
|
|
if (relaTypeArr.length) {
|
|
if (relaTypeArr.length) {
|
|
sql += " " + relaTypeArr.join(" ");
|
|
sql += " " + relaTypeArr.join(" ");
|
|
}
|
|
}
|
|
- console.log("sql:", sql);
|
|
|
|
return sql;
|
|
return sql;
|
|
},
|
|
},
|
|
// 处理列表信息
|
|
// 处理列表信息
|