From 5aeac1a8ae58d2ca55de64b13dd722f4d816f008 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 19 八月 2020 17:01:43 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue
---
ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm | 9 ++++-----
1 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
index 495a94c..b52c6f2 100644
--- a/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-generator/src/main/resources/vm/vue/index-tree.vue.vm
@@ -66,7 +66,7 @@
v-hasPermi="['${moduleName}:${businessName}:add']"
>鏂板</el-button>
</el-col>
- <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+ <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
@@ -140,7 +140,7 @@
<el-input v-model="form.${field}" placeholder="璇疯緭鍏�${comment}" />
</el-form-item>
#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
<el-option
v-for="dict in ${field}Options"
@@ -152,7 +152,7 @@
</el-select>
</el-form-item>
#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}">
+ <el-form-item label="${comment}" prop="${field}">
<el-select v-model="form.${field}" placeholder="璇烽�夋嫨${comment}">
<el-option label="璇烽�夋嫨瀛楀吀鐢熸垚" value="" />
</el-select>
@@ -272,9 +272,8 @@
#else
#set($comment=$column.columnComment)
#end
-#set($comment=$column.columnComment)
$column.javaField: [
- { required: true, message: "$comment涓嶈兘涓虹┖", trigger: "blur" }
+ { required: true, message: "$comment涓嶈兘涓虹┖", trigger: "#if($column.htmlType == "select")"change"#else"blur"#end" }
]#if($velocityCount != $columns.size()),#end
#end
--
Gitblit v1.9.3