From 684eadbcc63b369c9ae2e494fb5890fc62245e82 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期一, 11 一月 2021 09:58:41 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-ui/src/views/tool/gen/genInfoForm.vue | 85 +++++++++++++++++++++++++++++++++++++++---
1 files changed, 78 insertions(+), 7 deletions(-)
diff --git a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
index bd4a2d8..27d6a22 100644
--- a/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
+++ b/ruoyi-ui/src/views/tool/gen/genInfoForm.vue
@@ -4,9 +4,10 @@
<el-col :span="12">
<el-form-item prop="tplCategory">
<span slot="label">鐢熸垚妯℃澘</span>
- <el-select v-model="info.tplCategory">
+ <el-select v-model="info.tplCategory" @change="tplSelectChange">
<el-option label="鍗曡〃锛堝鍒犳敼鏌ワ級" value="crud" />
<el-option label="鏍戣〃锛堝鍒犳敼鏌ワ級" value="tree" />
+ <el-option label="涓诲瓙琛紙澧炲垹鏀规煡锛�" value="sub" />
</el-select>
</el-form-item>
</el-col>
@@ -126,8 +127,8 @@
</span>
<el-select v-model="info.treeCode" placeholder="璇烽�夋嫨">
<el-option
- v-for="column in info.columns"
- :key="column.columnName"
+ v-for="(column, index) in info.columns"
+ :key="index"
:label="column.columnName + '锛�' + column.columnComment"
:value="column.columnName"
></el-option>
@@ -144,8 +145,8 @@
</span>
<el-select v-model="info.treeParentCode" placeholder="璇烽�夋嫨">
<el-option
- v-for="column in info.columns"
- :key="column.columnName"
+ v-for="(column, index) in info.columns"
+ :key="index"
:label="column.columnName + '锛�' + column.columnComment"
:value="column.columnName"
></el-option>
@@ -162,8 +163,47 @@
</span>
<el-select v-model="info.treeName" placeholder="璇烽�夋嫨">
<el-option
- v-for="column in info.columns"
- :key="column.columnName"
+ v-for="(column, index) in info.columns"
+ :key="index"
+ :label="column.columnName + '锛�' + column.columnComment"
+ :value="column.columnName"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ </el-row>
+ <el-row v-show="info.tplCategory == 'sub'">
+ <h4 class="form-header">鍏宠仈淇℃伅</h4>
+ <el-col :span="12">
+ <el-form-item>
+ <span slot="label">
+ 鍏宠仈瀛愯〃鐨勮〃鍚�
+ <el-tooltip content="鍏宠仈瀛愯〃鐨勮〃鍚嶏紝 濡傦細sys_user" placement="top">
+ <i class="el-icon-question"></i>
+ </el-tooltip>
+ </span>
+ <el-select v-model="info.subTableName" placeholder="璇烽�夋嫨" @change="subSelectChange">
+ <el-option
+ v-for="(table, index) in tables"
+ :key="index"
+ :label="table.tableName + '锛�' + table.tableComment"
+ :value="table.tableName"
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
+ <el-col :span="12">
+ <el-form-item>
+ <span slot="label">
+ 瀛愯〃鍏宠仈鐨勫閿悕
+ <el-tooltip content="瀛愯〃鍏宠仈鐨勫閿悕锛� 濡傦細user_id" placement="top">
+ <i class="el-icon-question"></i>
+ </el-tooltip>
+ </span>
+ <el-select v-model="info.subTableFkName" placeholder="璇烽�夋嫨">
+ <el-option
+ v-for="(column, index) in subColumns"
+ :key="index"
:label="column.columnName + '锛�' + column.columnComment"
:value="column.columnName"
></el-option>
@@ -185,6 +225,10 @@
type: Object,
default: null
},
+ tables: {
+ type: Array,
+ default: null
+ },
menus: {
type: Array,
default: []
@@ -192,6 +236,7 @@
},
data() {
return {
+ subColumns: [],
rules: {
tplCategory: [
{ required: true, message: "璇烽�夋嫨鐢熸垚妯℃澘", trigger: "blur" }
@@ -212,6 +257,11 @@
};
},
created() {},
+ watch: {
+ 'info.subTableName': function(val) {
+ this.setSubTableColumns(val);
+ }
+ },
methods: {
/** 杞崲鑿滃崟鏁版嵁缁撴瀯 */
normalizer(node) {
@@ -223,6 +273,27 @@
label: node.menuName,
children: node.children
};
+ },
+ /** 閫夋嫨瀛愯〃鍚嶈Е鍙� */
+ subSelectChange(value) {
+ this.info.subTableFkName = '';
+ },
+ /** 閫夋嫨鐢熸垚妯℃澘瑙﹀彂 */
+ tplSelectChange(value) {
+ if(value !== 'sub') {
+ this.info.subTableName = '';
+ this.info.subTableFkName = '';
+ }
+ },
+ /** 璁剧疆鍏宠仈澶栭敭 */
+ setSubTableColumns(value) {
+ for (var item in this.tables) {
+ const name = this.tables[item].tableName;
+ if (value === name) {
+ this.subColumns = this.tables[item].columns;
+ break;
+ }
+ }
}
}
};
--
Gitblit v1.9.3