From 86cb7555ebfd6c3e03aeeaf310df7523abcff8ce Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: Thu, 02 Apr 2026 11:08:38 +0800
Subject: [PATCH] 代码生成支持表单布局选项
---
ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm | 411 ++++++++++++++++++++++++++++++++--------------------------
1 files changed, 229 insertions(+), 182 deletions(-)
diff --git a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
index 51c447e..9cd31a4 100644
--- a/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
+++ b/ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index-tree.vue.vm
@@ -1,6 +1,6 @@
<template>
<div class="app-container">
- <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch" label-width="68px">
+ <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
#foreach($column in $columns)
#if($column.query)
#set($dictType=$column.dictType)
@@ -17,30 +17,29 @@
v-model="queryParams.${column.javaField}"
placeholder="请输入${comment}"
clearable
- size="small"
@keyup.enter.native="handleQuery"
/>
</el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && "" != $dictType)
<el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+ <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
<el-option
- v-for="dict in ${column.javaField}Options"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- :value="dict.dictValue"
+ v-for="dict in dict.type.${dictType}"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
/>
</el-select>
</el-form-item>
#elseif(($column.htmlType == "select" || $column.htmlType == "radio") && $dictType)
<el-form-item label="${comment}" prop="${column.javaField}">
- <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable size="small">
+ <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
<el-option label="请选择字典生成" value="" />
</el-select>
</el-form-item>
#elseif($column.htmlType == "datetime" && $column.queryType != "BETWEEN")
<el-form-item label="${comment}" prop="${column.javaField}">
- <el-date-picker clearable size="small"
+ <el-date-picker clearable
v-model="queryParams.${column.javaField}"
type="date"
value-format="yyyy-MM-dd"
@@ -51,7 +50,6 @@
<el-form-item label="${comment}">
<el-date-picker
v-model="daterange${AttrName}"
- size="small"
style="width: 240px"
value-format="yyyy-MM-dd"
type="daterange"
@@ -77,17 +75,27 @@
icon="el-icon-plus"
size="mini"
@click="handleAdd"
- v-hasPermi="['${moduleName}:${businessName}:add']"
+ v-hasPermi="['${permissionPrefix}:add']"
>新增</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button
+ type="info"
+ plain
+ icon="el-icon-sort"
+ size="mini"
+ @click="toggleExpandAll"
+ >展开/折叠</el-button>
</el-col>
<right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
</el-row>
<el-table
+ v-if="refreshTable"
v-loading="loading"
:data="${businessName}List"
row-key="${treeCode}"
- default-expand-all
+ :default-expand-all="isExpandAll"
:tree-props="{children: 'children', hasChildren: 'hasChildren'}"
>
#foreach($column in $columns)
@@ -105,10 +113,20 @@
<span>{{ parseTime(scope.row.${javaField}, '{y}-{m}-{d}') }}</span>
</template>
</el-table-column>
+#elseif($column.list && $column.htmlType == "imageUpload")
+ <el-table-column label="${comment}" align="center" prop="${javaField}" width="100">
+ <template slot-scope="scope">
+ <image-preview :src="scope.row.${javaField}" :width="50" :height="50"/>
+ </template>
+ </el-table-column>
#elseif($column.list && "" != $column.dictType)
<el-table-column label="${comment}" align="center" prop="${javaField}">
<template slot-scope="scope">
- <dict-tag :options="${javaField}Options" :value="scope.row.${javaField}"/>
+#if($column.htmlType == "checkbox")
+ <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField} ? scope.row.${javaField}.split(',') : []"/>
+#else
+ <dict-tag :options="dict.type.${column.dictType}" :value="scope.row.${javaField}"/>
+#end
</template>
</el-table-column>
#elseif($column.list && "" != $javaField)
@@ -126,29 +144,37 @@
type="text"
icon="el-icon-edit"
@click="handleUpdate(scope.row)"
- v-hasPermi="['${moduleName}:${businessName}:edit']"
+ v-hasPermi="['${permissionPrefix}:edit']"
>修改</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-plus"
@click="handleAdd(scope.row)"
- v-hasPermi="['${moduleName}:${businessName}:add']"
+ v-hasPermi="['${permissionPrefix}:add']"
>新增</el-button>
<el-button
size="mini"
type="text"
icon="el-icon-delete"
@click="handleDelete(scope.row)"
- v-hasPermi="['${moduleName}:${businessName}:remove']"
+ v-hasPermi="['${permissionPrefix}:remove']"
>删除</el-button>
</template>
</el-table-column>
</el-table>
<!-- 添加或修改${functionName}对话框 -->
- <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
- <el-form ref="form" :model="form" :rules="rules" label-width="80px">
+#if($table.formColNum == 2)
+#set($dialogWidth = "800px")
+#elseif($table.formColNum == 3)
+#set($dialogWidth = "1100px")
+#else
+#set($dialogWidth = "500px")
+#end
+ <el-dialog :title="title" :visible.sync="open" width="${dialogWidth}" append-to-body>
+ <el-form ref="form" :model="form" :rules="rules" label-width="100px">
+ <el-row>
#foreach($column in $columns)
#set($field=$column.javaField)
#if($column.insert && !$column.pk)
@@ -161,94 +187,127 @@
#end
#set($dictType=$column.dictType)
#if("" != $treeParentCode && $column.javaField == $treeParentCode)
- <el-form-item label="${comment}" prop="${treeParentCode}">
- <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${treeParentCode}">
+ <treeselect v-model="form.${treeParentCode}" :options="${businessName}Options" :normalizer="normalizer" placeholder="请选择${comment}" />
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "input")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" placeholder="请输入${comment}" />
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-input v-model="form.${field}" placeholder="请输入${comment}" />
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "imageUpload")
- <el-form-item label="${comment}">
- <imageUpload v-model="form.${field}"/>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <image-upload v-model="form.${field}"/>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "fileUpload")
- <el-form-item label="${comment}">
- <fileUpload v-model="form.${field}"/>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <file-upload v-model="form.${field}"/>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "editor")
- <el-form-item label="${comment}">
- <editor v-model="form.${field}" :min-height="192"/>
- </el-form-item>
+ <el-col :span="24">
+ <el-form-item label="${comment}">
+ <editor v-model="form.${field}" :min-height="192"/>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "select" && "" != $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="请选择${comment}">
- <el-option
- v-for="dict in ${field}Options"
- :key="dict.dictValue"
- :label="dict.dictLabel"
- #if($column.javaType == "Integer" || $column.javaType == "Long"):value="parseInt(dict.dictValue)"#else:value="dict.dictValue"#end
-
- ></el-option>
- </el-select>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-select v-model="form.${field}" placeholder="请选择${comment}">
+ <el-option
+ v-for="dict in dict.type.${dictType}"
+ :key="dict.value"
+ :label="dict.label"
+#if($column.javaType == "Integer" || $column.javaType == "Long")
+ :value="parseInt(dict.value)"
+#else
+ :value="dict.value"
+#end
+ ></el-option>
+ </el-select>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "select" && $dictType)
- <el-form-item label="${comment}" prop="${field}">
- <el-select v-model="form.${field}" placeholder="请选择${comment}">
- <el-option label="请选择字典生成" value="" />
- </el-select>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-select v-model="form.${field}" placeholder="请选择${comment}">
+ <el-option label="请选择字典生成" value="" />
+ </el-select>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "checkbox" && "" != $dictType)
- <el-form-item label="${comment}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox
- v-for="dict in ${field}Options"
- :key="dict.dictValue"
- :label="dict.dictValue">
- {{dict.dictLabel}}
- </el-checkbox>
- </el-checkbox-group>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-checkbox-group v-model="form.${field}">
+ <el-checkbox
+ v-for="dict in dict.type.${dictType}"
+ :key="dict.value"
+ :label="dict.value">
+ {{dict.label}}
+ </el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "checkbox" && $dictType)
- <el-form-item label="${comment}">
- <el-checkbox-group v-model="form.${field}">
- <el-checkbox>请选择字典生成</el-checkbox>
- </el-checkbox-group>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-checkbox-group v-model="form.${field}">
+ <el-checkbox>请选择字典生成</el-checkbox>
+ </el-checkbox-group>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "radio" && "" != $dictType)
- <el-form-item label="${comment}">
- <el-radio-group v-model="form.${field}">
- <el-radio
- v-for="dict in ${field}Options"
- :key="dict.dictValue"
- #if($column.javaType == "Integer" || $column.javaType == "Long"):label="parseInt(dict.dictValue)"#else:label="dict.dictValue"#end
-
- >{{dict.dictLabel}}</el-radio>
- </el-radio-group>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-radio-group v-model="form.${field}">
+ <el-radio
+ v-for="dict in dict.type.${dictType}"
+ :key="dict.value"
+#if($column.javaType == "Integer" || $column.javaType == "Long")
+ :label="parseInt(dict.value)"
+#else
+ :label="dict.value"
+#end
+ >{{dict.label}}</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "radio" && $dictType)
- <el-form-item label="${comment}">
- <el-radio-group v-model="form.${field}">
- <el-radio label="1">请选择字典生成</el-radio>
- </el-radio-group>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-radio-group v-model="form.${field}">
+ <el-radio label="1">请选择字典生成</el-radio>
+ </el-radio-group>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "datetime")
- <el-form-item label="${comment}" prop="${field}">
- <el-date-picker clearable size="small"
- v-model="form.${field}"
- type="date"
- value-format="yyyy-MM-dd"
- placeholder="选择${comment}">
- </el-date-picker>
- </el-form-item>
+ <el-col :span="${colSpan}">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-date-picker clearable
+ v-model="form.${field}"
+ type="date"
+ value-format="yyyy-MM-dd"
+ placeholder="选择${comment}">
+ </el-date-picker>
+ </el-form-item>
+ </el-col>
#elseif($column.htmlType == "textarea")
- <el-form-item label="${comment}" prop="${field}">
- <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
- </el-form-item>
+ <el-col :span="24">
+ <el-form-item label="${comment}" prop="${field}">
+ <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
+ </el-form-item>
+ </el-col>
#end
#end
#end
#end
+ </el-row>
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitForm">确 定</el-button>
@@ -259,12 +318,15 @@
</template>
<script>
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName}, export${BusinessName} } from "@/api/${moduleName}/${businessName}";
-import Treeselect from "@riophae/vue-treeselect";
-import "@riophae/vue-treeselect/dist/vue-treeselect.css";
+import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from "@/api/${moduleName}/${businessName}"
+import Treeselect from "@riophae/vue-treeselect"
+import "@riophae/vue-treeselect/dist/vue-treeselect.css"
export default {
name: "${BusinessName}",
+#if(${dicts} != '')
+ dicts: [${dicts}],
+#end
components: {
Treeselect
},
@@ -282,17 +344,12 @@
title: "",
// 是否显示弹出层
open: false,
+ // 是否展开，默认全部展开
+ isExpandAll: true,
+ // 重新渲染表格状态
+ refreshTable: true,
#foreach ($column in $columns)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#if(${column.dictType} != '')
- // $comment字典
- ${column.javaField}Options: [],
-#elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
// $comment时间范围
daterange${AttrName}: [],
@@ -302,8 +359,7 @@
queryParams: {
#foreach ($column in $columns)
#if($column.query)
- $column.javaField: null#if($velocityCount != $columns.size()),#end
-
+ $column.javaField: null#if($foreach.count != $columns.size()),#end
#end
#end
},
@@ -320,31 +376,23 @@
#set($comment=$column.columnComment)
#end
$column.javaField: [
- { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select")"change"#else"blur"#end }
- ]#if($velocityCount != $columns.size()),#end
-
+ { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
+ ]#if($foreach.count != $columns.size()),#end
#end
#end
}
- };
+ }
},
created() {
- this.getList();
-#foreach ($column in $columns)
-#if(${column.dictType} != '')
- this.getDicts("${column.dictType}").then(response => {
- this.${column.javaField}Options = response.data;
- });
-#end
-#end
+ this.getList()
},
methods: {
/** 查询${functionName}列表 */
getList() {
- this.loading = true;
+ this.loading = true
#foreach ($column in $columns)
#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
- this.queryParams.params = {};
+ this.queryParams.params = {}
#break
#end
#end
@@ -352,103 +400,106 @@
#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
if (null != this.daterange${AttrName} && '' != this.daterange${AttrName}) {
- this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0];
- this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1];
+ this.queryParams.params["begin${AttrName}"] = this.daterange${AttrName}[0]
+ this.queryParams.params["end${AttrName}"] = this.daterange${AttrName}[1]
}
#end
#end
list${BusinessName}(this.queryParams).then(response => {
- this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
- this.loading = false;
- });
+ this.${businessName}List = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
+ this.loading = false
+ })
},
/** 转换${functionName}数据结构 */
normalizer(node) {
if (node.children && !node.children.length) {
- delete node.children;
+ delete node.children
}
return {
id: node.${treeCode},
label: node.${treeName},
children: node.children
- };
+ }
},
/** 查询${functionName}下拉树结构 */
getTreeselect() {
list${BusinessName}().then(response => {
- this.${businessName}Options = [];
- const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] };
- data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}");
- this.${businessName}Options.push(data);
- });
+ this.${businessName}Options = []
+ const data = { ${treeCode}: 0, ${treeName}: '顶级节点', children: [] }
+ data.children = this.handleTree(response.data, "${treeCode}", "${treeParentCode}")
+ this.${businessName}Options.push(data)
+ })
},
// 取消按钮
cancel() {
- this.open = false;
- this.reset();
+ this.open = false
+ this.reset()
},
// 表单重置
reset() {
this.form = {
#foreach ($column in $columns)
-#if($column.htmlType == "radio")
- $column.javaField: #if($column.javaType == "Integer" || $column.javaType == "Long")0#else"0"#end#if($velocityCount != $columns.size()),#end
-
-#elseif($column.htmlType == "checkbox")
- $column.javaField: []#if($velocityCount != $columns.size()),#end
-
+#if($column.htmlType == "checkbox")
+ $column.javaField: []#if($foreach.count != $columns.size()),#end
#else
- $column.javaField: null#if($velocityCount != $columns.size()),#end
-
+ $column.javaField: null#if($foreach.count != $columns.size()),#end
#end
#end
- };
- this.resetForm("form");
+ }
+ this.resetForm("form")
},
/** 搜索按钮操作 */
handleQuery() {
- this.getList();
+ this.getList()
},
/** 重置按钮操作 */
resetQuery() {
#foreach ($column in $columns)
#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
#set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
- this.daterange${AttrName} = [];
+ this.daterange${AttrName} = []
#end
#end
- this.resetForm("queryForm");
- this.handleQuery();
+ this.resetForm("queryForm")
+ this.handleQuery()
},
/** 新增按钮操作 */
handleAdd(row) {
- this.reset();
- this.getTreeselect();
+ this.reset()
+ this.getTreeselect()
if (row != null && row.${treeCode}) {
- this.form.${treeParentCode} = row.${treeCode};
+ this.form.${treeParentCode} = row.${treeCode}
} else {
- this.form.${treeParentCode} = 0;
+ this.form.${treeParentCode} = 0
}
- this.open = true;
- this.title = "添加${functionName}";
+ this.open = true
+ this.title = "添加${functionName}"
+ },
+ /** 展开/折叠操作 */
+ toggleExpandAll() {
+ this.refreshTable = false
+ this.isExpandAll = !this.isExpandAll
+ this.$nextTick(() => {
+ this.refreshTable = true
+ })
},
/** 修改按钮操作 */
handleUpdate(row) {
- this.reset();
- this.getTreeselect();
+ this.reset()
+ this.getTreeselect()
if (row != null) {
- this.form.${treeParentCode} = row.${treeCode};
+ this.form.${treeParentCode} = row.${treeParentCode}
}
get${BusinessName}(row.${pkColumn.javaField}).then(response => {
- this.form = response.data;
+ this.form = response.data
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.split(",");
+ this.form.$column.javaField = this.form.${column.javaField}.split(",")
#end
#end
- this.open = true;
- this.title = "修改${functionName}";
- });
+ this.open = true
+ this.title = "修改${functionName}"
+ })
},
/** 提交按钮 */
submitForm() {
@@ -456,38 +507,34 @@
if (valid) {
#foreach ($column in $columns)
#if($column.htmlType == "checkbox")
- this.form.$column.javaField = this.form.${column.javaField}.join(",");
+ this.form.$column.javaField = this.form.${column.javaField}.join(",")
#end
#end
if (this.form.${pkColumn.javaField} != null) {
update${BusinessName}(this.form).then(response => {
- this.msgSuccess("修改成功");
- this.open = false;
- this.getList();
- });
+ this.#[[$modal]]#.msgSuccess("修改成功")
+ this.open = false
+ this.getList()
+ })
} else {
add${BusinessName}(this.form).then(response => {
- this.msgSuccess("新增成功");
- this.open = false;
- this.getList();
- });
+ this.#[[$modal]]#.msgSuccess("新增成功")
+ this.open = false
+ this.getList()
+ })
}
}
- });
+ })
},
/** 删除按钮操作 */
handleDelete(row) {
- this.$confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项?', "警告", {
- confirmButtonText: "确定",
- cancelButtonText: "取消",
- type: "warning"
- }).then(function() {
- return del${BusinessName}(row.${pkColumn.javaField});
- }).then(() => {
- this.getList();
- this.msgSuccess("删除成功");
- }).catch(() => {});
+ this.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + row.${pkColumn.javaField} + '"的数据项？').then(function() {
+ return del${BusinessName}(row.${pkColumn.javaField})
+ }).then(() => {
+ this.getList()
+ this.#[[$modal]]#.msgSuccess("删除成功")
+ }).catch(() => {})
}
}
-};
+}
</script>
--
Gitblit v1.9.3