ruoyi-common/ruoyi-common-security/src/main/java/com/ruoyi/common/security/auth/AuthLogic.java
@@ -93,7 +93,7 @@ } /** * 验证当前用户有效期, 如果相差不足360分钟，自动刷新缓存 * 验证当前用户有效期, 如果相差不足120分钟，自动刷新缓存 * * @param loginUser 当前用户信息 */ ruoyi-modules/ruoyi-gen/src/main/java/com/ruoyi/gen/util/VelocityUtils.java
@@ -271,6 +271,23 @@ { List<GenTableColumn> columns = genTable.getColumns(); Set<String> dicts = new HashSet<String>(); addDicts(dicts, columns); if (StringUtils.isNotNull(genTable.getSubTable())) { List<GenTableColumn> subColumns = genTable.getSubTable().getColumns(); addDicts(dicts, subColumns); } return StringUtils.join(dicts, ", "); } /** * 添加字典列表 * * @param dicts 字典列表 * @param columns 列集合 */ public static void addDicts(Set<String> dicts, List<GenTableColumn> columns) { for (GenTableColumn column : columns) { if (!column.isSuperColumn() && StringUtils.isNotEmpty(column.getDictType()) && StringUtils.equalsAny( @@ -280,7 +297,6 @@ dicts.add("'" + column.getDictType() + "'"); } } return StringUtils.join(dicts, ", "); } /** ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm
@@ -44,7 +44,7 @@ v-model="queryParams.${column.javaField}" type="date" value-format="yyyy-MM-dd" placeholder="选择${comment}"> placeholder="请选择${comment}"> </el-date-picker> </el-form-item> #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") @@ -269,7 +269,7 @@ v-model="form.${field}" type="date" value-format="yyyy-MM-dd" placeholder="选择${comment}"> placeholder="请选择${comment}"> </el-date-picker> </el-form-item> #elseif($column.htmlType == "textarea") @@ -302,12 +302,39 @@ #set($comment=$column.columnComment) #end #if($column.pk || $javaField == ${subTableFkclassName}) #elseif($column.list && "" != $javaField) <el-table-column label="$comment" prop="${javaField}"> #elseif($column.list && $column.htmlType == "input") <el-table-column label="$comment" prop="${javaField}" width="150"> <template slot-scope="scope"> <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" /> </template> </el-table-column> #elseif($column.list && $column.htmlType == "datetime") <el-table-column label="$comment" prop="${javaField}" width="240"> <template slot-scope="scope"> <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="yyyy-MM-dd" placeholder="请选择$comment" /> </template> </el-table-column> #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType) <el-table-column label="$comment" prop="${javaField}" width="150"> <template slot-scope="scope"> <el-select v-model="scope.row.$javaField" placeholder="请选择$comment"> <el-option v-for="dict in dict.type.$column.dictType" :key="dict.value" :label="dict.label" :value="dict.value" ></el-option> </el-select> </template> </el-table-column> #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType) <el-table-column label="$comment" prop="${javaField}" width="150"> <template slot-scope="scope"> <el-select v-model="scope.row.$javaField" placeholder="请选择$comment"> <el-option label="请选择字典生成" value="" /> </el-select> </template> </el-table-column> #end #end </el-table> ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/v3/index.vue.vm
@@ -43,7 +43,7 @@ v-model="queryParams.${column.javaField}" type="date" value-format="YYYY-MM-DD" placeholder="选择${comment}"> placeholder="请选择${comment}"> </el-date-picker> </el-form-item> #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN") @@ -260,7 +260,7 @@ v-model="form.${field}" type="date" value-format="YYYY-MM-DD" placeholder="选择${comment}"> placeholder="请选择${comment}"> </el-date-picker> </el-form-item> #elseif($column.htmlType == "textarea") @@ -293,12 +293,44 @@ #set($comment=$column.columnComment) #end #if($column.pk || $javaField == ${subTableFkclassName}) #elseif($column.list && "" != $javaField) <el-table-column label="$comment" prop="${javaField}"> #elseif($column.list && $column.htmlType == "input") <el-table-column label="$comment" prop="${javaField}" width="150"> <template #default="scope"> <el-input v-model="scope.row.$javaField" placeholder="请输入$comment" /> </template> </el-table-column> #elseif($column.list && $column.htmlType == "datetime") <el-table-column label="$comment" prop="${javaField}" width="240"> <template #default="scope"> <el-date-picker clearable v-model="scope.row.$javaField" type="date" value-format="YYYY-MM-DD" placeholder="请选择$comment"> </el-date-picker> </template> </el-table-column> #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" != $column.dictType) <el-table-column label="$comment" prop="${javaField}" width="150"> <template #default="scope"> <el-select v-model="scope.row.$javaField" placeholder="请选择$comment"> <el-option v-for="dict in $column.dictType" :key="dict.value" :label="dict.label" :value="dict.value" ></el-option> </el-select> </template> </el-table-column> #elseif($column.list && ($column.htmlType == "select" || $column.htmlType == "radio") && "" == $column.dictType) <el-table-column label="$comment" prop="${javaField}" width="150"> <template #default="scope"> <el-select v-model="scope.row.$javaField" placeholder="请选择$comment"> <el-option label="请选择字典生成" value="" /> </el-select> </template> </el-table-column> #end #end </el-table> ruoyi-ui/src/views/system/dept/index.vue
@@ -206,7 +206,7 @@ email: [ { type: "email", message: "'请输入正确的邮箱地址", message: "请输入正确的邮箱地址", trigger: ["blur", "change"] } ],
