代码生成器功能调整

config/nacos/ruoyi-gen.yml

@@ -8,10 +8,10 @@ spring:
         # 主库数据源
         master:
           type: ${spring.datasource.type}
-          driver-class-name: com.mysql.cj.jdbc.Driver
-          url: ${datasource.system-master.url}
-          username: ${datasource.system-master.username}
-          password: ${datasource.system-master.password}
+          driver-class-name: ${datasource.gen.drivername}
+          url: ${datasource.gen.url}
+          username: ${datasource.gen.username}
+          password: ${datasource.gen.password}
 #        oracle:
 #          type: ${spring.datasource.type}
 #          driverClassName: oracle.jdbc.OracleDriver

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/enums/DataBaseType.java

@@ -54,6 +54,9 @@ public enum DataBaseType {
         if (StringUtils.isBlank(databaseProductName)) {
             return null;
         }
+        if(databaseProductName.contains("Kingbase")){
+            return KING_BASE;
+        }
         for (DataBaseType type : values()) {
             if (type.getType().equals(databaseProductName)) {
                 return type;

ruoyi-common/ruoyi-common-mybatis/src/main/java/org/dromara/common/mybatis/helper/DataBaseHelper.java

@@ -54,6 +54,9 @@ public class DataBaseHelper {
     public static boolean isSqlServer() {
         return DataBaseType.SQL_SERVER == getDataBaseType();
     }
+    public static boolean isKingBase() {
+        return DataBaseType.KING_BASE == getDataBaseType();
+    }
 
     public static String findInSet(Object var1, String var2) {
         DataBaseType dataBasyType = getDataBaseType();

ruoyi-modules/ruoyi-gen/pom.xml

@@ -64,6 +64,11 @@
             <artifactId>ruoyi-common-security</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>com.kingbase</groupId>
+            <artifactId>kingbase8</artifactId>
+        </dependency>
+
     </dependencies>
 
     <build>

ruoyi-modules/ruoyi-gen/src/main/java/org/dromara/gen/util/VelocityUtils.java

@@ -120,7 +120,7 @@ public class VelocityUtils {
         templates.add("vm/xml/mapper.xml.vm");
         if (DataBaseHelper.isOracle()) {
             templates.add("vm/sql/oracle/sql.vm");
-        } else if (DataBaseHelper.isPostgerSql()) {
+        } else if (DataBaseHelper.isPostgerSql() || DataBaseHelper.isKingBase()) {
             templates.add("vm/sql/postgres/sql.vm");
         } else {
             templates.add("vm/sql/sql.vm");
@@ -129,6 +129,7 @@ public class VelocityUtils {
         templates.add("vm/ts/types.ts.vm");
         if (GenConstants.TPL_CRUD.equals(tplCategory)) {
             templates.add("vm/vue/index.vue.vm");
+            templates.add("vm/vue/DetailForm.vue.vm");
         } else if (GenConstants.TPL_TREE.equals(tplCategory)) {
             templates.add("vm/vue/index-tree.vue.vm");
         }

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableColumnMapper.xml

@@ -73,6 +73,40 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             WHERE table_name = (#{tableName})
                 AND column_type <![CDATA[ <> ]]> '-'
         </if>
+        <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isKingBase()">
+            SELECT column_name, is_required, is_pk, sort, column_comment, is_increment, column_type
+            FROM (
+                SELECT c.relname AS table_name,
+                       a.attname AS column_name,
+                       d.description AS column_comment,
+                       CASE WHEN a.attnotnull AND con.conname IS NULL THEN 1 ELSE 0
+                       END AS is_required,
+                       CASE WHEN con.conname IS NOT NULL THEN 1 ELSE 0
+                       END AS is_pk,
+                       a.attnum AS sort,
+                       CASE WHEN "position"(pg_get_expr(ad.adbin, ad.adrelid),
+                           ((c.relname::text || '_'::text) || a.attname::text) || '_seq'::text) > 0 THEN 1 ELSE 0
+                       END AS is_increment,
+                       btrim(
+                           CASE WHEN t.typelem <![CDATA[ <> ]]> 0::oid AND t.typlen = '-1'::integer THEN 'ARRAY'::text ELSE
+                                CASE WHEN t.typtype = 'd'::"char" THEN format_type(t.typbasetype, NULL::integer)
+                                ELSE format_type(a.atttypid, NULL::integer) END
+                           END, '"'::text
+                       ) AS column_type
+                FROM pg_attribute a
+                    JOIN (pg_class c JOIN pg_namespace n ON c.relnamespace = n.oid) ON a.attrelid = c.oid
+                    LEFT JOIN pg_description d ON d.objoid = c.oid AND a.attnum = d.objsubid
+                    LEFT JOIN pg_constraint con ON con.conrelid = c.oid AND (a.attnum = ANY (con.conkey))
+                    LEFT JOIN pg_attrdef ad ON a.attrelid = ad.adrelid AND a.attnum = ad.adnum
+                    LEFT JOIN pg_type t ON a.atttypid = t.oid
+                WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'p'::"char"]))
+                    AND a.attnum > 0
+                    AND n.nspname = 'dbo'::name
+                ORDER BY c.relname, a.attnum
+            ) temp
+            WHERE table_name = (#{tableName})
+                AND column_type <![CDATA[ <> ]]> '-'
+        </if>
     </select>
 
 </mapper>

ruoyi-modules/ruoyi-gen/src/main/resources/mapper/generator/GenTableMapper.xml

@@ -14,6 +14,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <id property="columnId" column="column_id"/>
     </resultMap>
 
+
+
     <select id="selectPageDbTableList" resultMap="GenTableResult">
         <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isMySql()">
             select table_name, table_comment, create_time, update_time
@@ -87,6 +89,36 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             </if>
             order by create_time desc
         </if>
+        <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isKingBase()">
+            select table_name, table_comment, create_time, update_time
+            from (
+                SELECT c.relname AS table_name,
+                        obj_description(c.oid) AS table_comment,
+                        CURRENT_TIMESTAMP AS create_time,
+                        CURRENT_TIMESTAMP AS update_time
+                FROM pg_class c
+                    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+                WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'p'::"char"]))
+                    AND c.relname != 'spatial_%'::text
+                    AND n.nspname = 'dbo'::name
+                    AND n.nspname <![CDATA[ <> ]]> ''::name
+            ) list_table
+            where table_name NOT LIKE 'sj_%' AND table_name NOT LIKE 'gen_%'
+            AND table_name NOT LIKE 'act_%' AND table_name NOT LIKE 'flw_%'
+            <if test="genTable.params.genTableNames != null and genTable.params.genTableNames.size > 0">
+                AND table_name NOT IN
+                <foreach collection="genTable.params.genTableNames" open="(" close=")" separator="," item="item">
+                    #{item}
+                </foreach>
+            </if>
+            <if test="genTable.tableName != null and genTable.tableName != ''">
+                AND lower(table_name) like lower(concat('%', #{genTable.tableName}, '%'))
+            </if>
+            <if test="genTable.tableComment != null and genTable.tableComment != ''">
+                AND lower(table_comment) like lower(concat('%', #{genTable.tableComment}, '%'))
+            </if>
+            order by create_time desc
+        </if>
     </select>
 
     <select id="selectDbTableListByNames" resultMap="GenTableResult">
@@ -134,6 +166,27 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 #{name}
             </foreach>
         </if>
+        <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isKingBase()">
+            select table_name, table_comment, create_time, update_time
+            from (
+                SELECT c.relname AS table_name,
+                        obj_description(c.oid) AS table_comment,
+                        CURRENT_TIMESTAMP AS create_time,
+                        CURRENT_TIMESTAMP AS update_time
+                FROM pg_class c
+                    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+                WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'p'::"char"]))
+                    AND c.relname != 'spatial_%'::text
+                    AND n.nspname = 'dbo'::name
+                    AND n.nspname <![CDATA[ <> ]]> ''::name
+            ) list_table
+            where table_name NOT LIKE 'sj_%' and table_name NOT LIKE 'gen_%'
+            and table_name NOT LIKE 'act_%' and table_name NOT LIKE 'flw_%'
+            and table_name in
+            <foreach collection="array" item="name" open="(" separator="," close=")">
+                #{name}
+            </foreach>
+        </if>
     </select>
 
     <select id="selectTableByName" parameterType="String" resultMap="GenTableResult">
@@ -173,6 +226,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             and table_name NOT LIKE 'act_%' and table_name NOT LIKE 'flw_%'
             and table_name = #{tableName}
         </if>
+        <if test="@org.dromara.common.mybatis.helper.DataBaseHelper@isKingBase()">
+            select table_name, table_comment, create_time, update_time
+            from (
+                SELECT c.relname AS table_name,
+                        obj_description(c.oid) AS table_comment,
+                        CURRENT_TIMESTAMP AS create_time,
+                        CURRENT_TIMESTAMP AS update_time
+                FROM pg_class c
+                    LEFT JOIN pg_namespace n ON n.oid = c.relnamespace
+                WHERE (c.relkind = ANY (ARRAY ['r'::"char", 'p'::"char"]))
+                    AND c.relname != 'spatial_%'::text
+                    AND n.nspname = 'dbo'::name
+                    AND n.nspname <![CDATA[ <> ]]> ''::name
+            ) list_table
+            where table_name NOT LIKE 'sj_%' and table_name NOT LIKE 'gen_%'
+            and table_name NOT LIKE 'act_%' and table_name NOT LIKE 'flw_%'
+            and table_name = #{tableName}
+        </if>
     </select>
 
     <select id="selectGenTableById" parameterType="Long" resultMap="GenTableResult">
@@ -200,6 +271,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </select>
 
     <select id="selectTableNameList" resultType="java.lang.String">
-        select table_name from gen_table where data_name = #{dataName,jdbcType=VARCHAR}
+        select table_name from gen_table where data_name = #{dataName,jdbcType=VARCHAR} and del_flag = '0'
     </select>
 </mapper>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/DetailForm.vue.vm

@@ -0,0 +1,246 @@
+<template>
+  <div class="p-2">
+    <Dialog :title="dialog.title" v-model="dialog.visible" width="600px" :draggable="draggable">
+      <el-form ref="formRef" :model="formData" :rules="formRules" label-width="80px" v-loading="formLoading">
+#foreach($column in $columns)
+#set($field=$column.javaField)
+#if(($column.insert || $column.edit) && !$column.pk)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+#set($comment=$column.columnComment)
+#end
+#set($dictType=$column.dictType)
+#if($column.htmlType == "input")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-input v-model="formData.${field}" placeholder="请输入${comment}" />
+        </el-form-item>
+#elseif($column.htmlType == "imageUpload")
+        <el-form-item label="${comment}" prop="${field}">
+          <image-upload v-model="formData.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "fileUpload")
+        <el-form-item label="${comment}" prop="${field}">
+          <file-upload v-model="formData.${field}"/>
+        </el-form-item>
+#elseif($column.htmlType == "editor")
+        <el-form-item label="${comment}">
+          <editor v-model="formData.${field}" :min-height="192"/>
+        </el-form-item>
+#elseif($column.htmlType == "select" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="formData.${field}" placeholder="请选择${comment}">
+            <el-option
+                v-for="dict in ${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>
+#elseif($column.htmlType == "select" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-select v-model="formData.${field}" placeholder="请选择${comment}">
+            <el-option label="请选择字典生成" value="" />
+          </el-select>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="formData.${field}">
+            <el-checkbox
+                v-for="dict in ${dictType}"
+                :key="dict.value"
+                :label="dict.value">
+                {{dict.label}}
+            </el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "checkbox" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-checkbox-group v-model="formData.${field}">
+            <el-checkbox>请选择字典生成</el-checkbox>
+          </el-checkbox-group>
+        </el-form-item>
+#elseif($column.htmlType == "radio" && "" != $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="formData.${field}">
+            <el-radio
+                v-for="dict in ${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>
+#elseif($column.htmlType == "radio" && $dictType)
+        <el-form-item label="${comment}" prop="${field}">
+          <el-radio-group v-model="formData.${field}">
+                <el-radio label="1">请选择字典生成</el-radio>
+          </el-radio-group>
+        </el-form-item>
+#elseif($column.htmlType == "datetime")
+        <el-form-item label="${comment}" prop="${field}">
+          <el-date-picker clearable
+            v-model="form.${field}"
+            type="datetime"
+            value-format="YYYY-MM-DD HH:mm:ss"
+            placeholder="请选择${comment}">
+          </el-date-picker>
+        </el-form-item>
+#elseif($column.htmlType == "textarea")
+        <el-form-item label="${comment}" prop="${field}">
+            <el-input v-model="formData.${field}" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+#end
+#end
+#end
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button :loading="formLoading" type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="dialog.visible = false">取 消</el-button>
+        </div>
+      </template>
+    </Dialog>
+  </div>
+</template>
+
+<script setup name="${BusinessName}" lang="ts">
+import * as ${BusinessName}Api from '@/api/${moduleName}/${businessName}';
+import { ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
+import {useI18n} from "vue-i18n";
+
+defineOptions({ name: '${BusinessName}Form' })
+
+// 接收父组件传入属性
+// const props = defineProps({})
+
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+// 国际化
+const { t } = useI18n()
+
+#if(${dicts} != '')
+#set($dictsNoSymbol=$dicts.replace("'", ""))
+/** 数据字典 */
+const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
+#end
+// 对话框
+const dialog = reactive<DialogOption>({
+    visible: false,
+    title: ''
+});
+// 窗体是否可以拖动
+const draggable = ref(true)
+// 表单的加载中：1）修改时的数据加载；2）提交的按钮禁用
+const formLoading = ref(false)
+// 表单的类型：create - 新增；update - 修改
+const formType = ref('')
+// 表单引用
+const formRef = ref<ElFormInstance>();
+// 表单数据
+const formData = ref<${BusinessName}Form>({
+    #foreach ($column in $columns)
+    #if($column.insert || $column.edit)
+    #if($column.htmlType == "checkbox")
+        $column.javaField: []#if($foreach.count != $columns.size()),#end
+    #elseif($column.javaType == "String")
+        $column.javaField: ''#if($foreach.count != $columns.size()),#end
+    #elseif($column.javaType == "Integer" || $column.javaType == "Long")
+        $column.javaField: 0#if($foreach.count != $columns.size()),#end
+    #else
+        $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    #end
+    #end
+    #end
+})
+// 表单校验规则
+const formRules = reactive({
+#foreach ($column in $columns)
+#if($column.insert || $column.edit)
+#if($column.required)
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#else
+    #set($comment=$column.columnComment)
+#end
+    $column.javaField: [{ required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }]#if($foreach.count != $columns.size()),#end
+#end
+#end
+#end
+})
+/** 当前组件方法 */
+/** 窗体打开事件 */
+const open = async (type: string, id?: number) => {
+    dialog.visible = true
+    dialog.title = t('action.' + type)
+    formType.value = type
+    resetForm()
+    // 修改时，设置数据
+    if (id) {
+        formLoading.value = true
+        try {
+            const res = await ${BusinessName}Api.get${BusinessName}(id);
+            Object.assign(formData.value, res.data);
+        } finally {
+            formLoading.value = false
+        }
+    }
+}
+/** 表单重置 */
+const resetForm = () => {
+    formData.value = {
+    #foreach ($column in $columns)
+    #if($column.insert || $column.edit)
+    #if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
+        $column.javaField: '',
+    #end
+    #end
+    #end
+    }
+  formRef.value?.resetFields();
+}
+// 传回给父组件的属性与方法
+// 提供 open 方法，用于打开弹窗
+defineExpose({open})
+/** 触发父组件的事件 */
+/** 定义 success 事件，用于操作成功后的回调 */
+const emit = defineEmits(['success'])
+/** 提交按钮 */
+const submitForm = async () => {
+    // 校验表单
+    if (!formRef) return
+    const valid = await formRef.value?.validate()
+    if (!valid) return
+    // 提交请求
+    formLoading.value = true
+    try {
+        const data = formData.value as unknown as ${BusinessName}Form
+        if (formType.value === 'create') {
+            await ${BusinessName}Api.add${BusinessName}(data)
+            proxy?.$modal.msgSuccess("新增成功");
+        } else {
+            await ${BusinessName}Api.update${BusinessName}(data)
+            proxy?.$modal.msgSuccess("修改成功");
+        }
+        dialog.visible = false
+        // 发送操作成功的事件
+        emit('success')
+    } finally {
+        formLoading.value = false
+    }
+}
+
+/** 初始化 */
+onMounted(() => {
+
+});
+</script>

ruoyi-modules/ruoyi-gen/src/main/resources/vm/vue/index.vue.vm

@@ -1,9 +1,8 @@
 <template>
   <div class="p-2">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div v-show="showSearch" class="mb-[10px]">
-        <el-card shadow="hover">
-          <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+      <div class="search" v-show="showSearch">
+        <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px" class="-mb-15px">
 #foreach($column in $columns)
 #if($column.query)
 #set($dictType=$column.dictType)
@@ -15,33 +14,38 @@
 #set($comment=$column.columnComment)
 #end
 #if($column.htmlType == "input" || $column.htmlType == "textarea")
-            <el-form-item label="${comment}" prop="${column.javaField}">
-              <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable @keyup.enter="handleQuery" />
-            </el-form-item>
+          <el-form-item label="${comment}" prop="${column.javaField}">
+            <el-input v-model="queryParams.${column.javaField}" placeholder="请输入${comment}" clearable style="width: 240px" @keyup.enter="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 >
-                <el-option v-for="dict in ${dictType}" :key="dict.value" :label="dict.label" :value="dict.value"/>
-              </el-select>
-            </el-form-item>
+          <el-form-item label="${comment}" prop="${column.javaField}">
+            <el-select v-model="queryParams.${column.javaField}" placeholder="请选择${comment}" clearable>
+              <el-option
+                v-for="dict in ${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 >
-                <el-option label="请选择字典生成" value="" />
-              </el-select>
-            </el-form-item>
+          <el-form-item label="${comment}" prop="${column.javaField}">
+            <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
-                v-model="queryParams.${column.javaField}"
-                type="date"
-                value-format="YYYY-MM-DD"
-                placeholder="请选择${comment}"
-              />
-            </el-form-item>
+          <el-form-item label="${comment}" prop="${column.javaField}">
+            <el-date-picker clearable
+              v-model="queryParams.${column.javaField}"
+              type="date"
+              value-format="YYYY-MM-DD"
+              placeholder="请选择${comment}"
+            />
+          </el-form-item>
 #elseif($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-            <el-form-item label="${comment}" style="width: 308px">
-              <el-date-picker
+          <el-form-item label="${comment}" style="width: 308px">
+            <el-date-picker
                 v-model="dateRange${AttrName}"
                 value-format="YYYY-MM-DD HH:mm:ss"
                 type="daterange"
@@ -49,17 +53,16 @@
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
-              />
-            </el-form-item>
+            />
+          </el-form-item>
 #end
 #end
 #end
-            <el-form-item>
-              <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
-              <el-button icon="Refresh" @click="resetQuery">重置</el-button>
-            </el-form-item>
-          </el-form>
-        </el-card>
+          <el-form-item>
+            <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+            <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+          </el-form-item>
+        </el-form>
       </div>
     </transition>
 
@@ -67,18 +70,18 @@
       <template #header>
         <el-row :gutter="10" class="mb8">
           <el-col :span="1.5">
-            <el-button type="primary" plain icon="Plus" @click="handleAdd" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()" v-hasPermi="['${moduleName}:${businessName}:edit']">修改</el-button>
+            <el-button type="primary" plain icon="Plus" @click="openForm('create')" v-hasPermi="['${moduleName}:${businessName}:add']">新增</el-button>
           </el-col>
+            <el-col :span="1.5">
+                <el-button type="success" plain icon="Edit" :disabled="single" @click="openForm('update')" v-hasPermi="['system:post:edit']">修改</el-button>
+            </el-col>
           <el-col :span="1.5">
             <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['${moduleName}:${businessName}:remove']">删除</el-button>
           </el-col>
           <el-col :span="1.5">
             <el-button type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['${moduleName}:${businessName}:export']">导出</el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="showSearch" :columns="columns"  @queryTable="getList"></right-toolbar>
         </el-row>
       </template>
 
@@ -123,7 +126,7 @@
         <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="修改" placement="top">
-              <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']"></el-button>
+              <el-button link type="primary" icon="Edit" @click="openForm('update',scope.row)" v-hasPermi="['${moduleName}:${businessName}:edit']"></el-button>
             </el-tooltip>
             <el-tooltip content="删除" placement="top">
               <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['${moduleName}:${businessName}:remove']"></el-button>
@@ -131,209 +134,94 @@
           </template>
         </el-table-column>
       </el-table>
-
-      <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" @pagination="getList" />
+        <!-- 翻页组件 -->
+      <pagination
+          v-show="total>0"
+          :total="total"
+          v-model:page="queryParams.pageNum"
+          v-model:limit="queryParams.pageSize"
+          @pagination="getList"
+      />
     </el-card>
     <!-- 添加或修改${functionName}对话框 -->
-    <el-dialog :title="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
-      <el-form ref="${businessName}FormRef" :model="form" :rules="rules" label-width="80px">
-#foreach($column in $columns)
-#set($field=$column.javaField)
-#if(($column.insert || $column.edit) && !$column.pk)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
-#else
-#set($comment=$column.columnComment)
-#end
-#set($dictType=$column.dictType)
-#if($column.htmlType == "input")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-input v-model="form.${field}" placeholder="请输入${comment}" />
-        </el-form-item>
-#elseif($column.htmlType == "imageUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <image-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "fileUpload")
-        <el-form-item label="${comment}" prop="${field}">
-          <file-upload v-model="form.${field}"/>
-        </el-form-item>
-#elseif($column.htmlType == "editor")
-        <el-form-item label="${comment}">
-          <editor v-model="form.${field}" :min-height="192"/>
-        </el-form-item>
-#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 ${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>
-#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>
-#elseif($column.htmlType == "checkbox" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox
-                v-for="dict in ${dictType}"
-                :key="dict.value"
-                :label="dict.value">
-                {{dict.label}}
-            </el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "checkbox" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-checkbox-group v-model="form.${field}">
-            <el-checkbox>请选择字典生成</el-checkbox>
-          </el-checkbox-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && "" != $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio
-              v-for="dict in ${dictType}"
-              :key="dict.value"
-#if($column.javaType == "Integer" || $column.javaType == "Long")
-              :value="parseInt(dict.value)"
-#else
-              :value="dict.value"
-#end
-            >{{dict.label}}</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "radio" && $dictType)
-        <el-form-item label="${comment}" prop="${field}">
-          <el-radio-group v-model="form.${field}">
-            <el-radio value="1">请选择字典生成</el-radio>
-          </el-radio-group>
-        </el-form-item>
-#elseif($column.htmlType == "datetime")
-        <el-form-item label="${comment}" prop="${field}">
-          <el-date-picker clearable
-            v-model="form.${field}"
-            type="datetime"
-            value-format="YYYY-MM-DD HH:mm:ss"
-            placeholder="请选择${comment}">
-          </el-date-picker>
-        </el-form-item>
-#elseif($column.htmlType == "textarea")
-        <el-form-item label="${comment}" prop="${field}">
-            <el-input v-model="form.${field}" type="textarea" placeholder="请输入内容" />
-        </el-form-item>
-#end
-#end
-#end
-      </el-form>
-      <template #footer>
-        <div class="dialog-footer">
-          <el-button :loading="buttonLoading" type="primary" @click="submitForm">确 定</el-button>
-          <el-button @click="cancel">取 消</el-button>
-        </div>
-      </template>
-    </el-dialog>
+    <detail-form ref="detailFormRef" @success="getList" apped-to-body/>
   </div>
 </template>
 
 <script setup name="${BusinessName}" lang="ts">
-import { list${BusinessName}, get${BusinessName}, del${BusinessName}, add${BusinessName}, update${BusinessName} } from '@/api/${moduleName}/${businessName}';
-import { ${BusinessName}VO, ${BusinessName}Query, ${BusinessName}Form } from '@/api/${moduleName}/${businessName}/types';
+/** 模块导入 */
+import { list${BusinessName}, del${BusinessName}} from '@/api/${moduleName}/${businessName}';
+import { ${BusinessName}VO} from '@/api/${moduleName}/${businessName}/types';
+import DetailForm from './DetailForm.vue';
+
+defineOptions({ name: '${BusinessName}' })
 
 const { proxy } = getCurrentInstance() as ComponentInternalInstance;
 #if(${dicts} != '')
+/** 当前页面引用的数据字典 */
 #set($dictsNoSymbol=$dicts.replace("'", ""))
 const { ${dictsNoSymbol} } = toRefs<any>(proxy?.useDict(${dicts}));
 #end
-
-const ${businessName}List = ref<${BusinessName}VO[]>([]);
-const buttonLoading = ref(false);
+// 是否加载遮罩层
 const loading = ref(true);
+// 是否显示查询项
 const showSearch = ref(true);
-const ids = ref<Array<string | number>>([]);
+const ${businessName}List = ref<${BusinessName}VO[]>([]);
+// 列表选中的记录Id
+const ids = ref<Array<number | string>>([]);
+// 单选
 const single = ref(true);
+// 多选
 const multiple = ref(true);
+// 总记录数
 const total = ref(0);
+
 #foreach ($column in $columns)
 #if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
+// 日期范围
 #set($AttrName=$column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
 const dateRange${AttrName} = ref<[DateModelType, DateModelType]>(['', '']);
 #end
 #end
-
+// 查询窗体Ref
 const queryFormRef = ref<ElFormInstance>();
-const ${businessName}FormRef = ref<ElFormInstance>();
-
-const dialog = reactive<DialogOption>({
-  visible: false,
-  title: ''
-});
 
-const initFormData: ${BusinessName}Form = {
+const columns = ref<FieldOption[]>([
+#set($arrayIndex = 0)
 #foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.htmlType == "checkbox")
-  $column.javaField: []#if($foreach.count != $columns.size()),#end
+#if($column.isList == "1")
+#set($parentheseIndex=$column.columnComment.indexOf("（"))
+#if($parentheseIndex != -1)
+    #set($comment=$column.columnComment.substring(0, $parentheseIndex))
 #else
-  $column.javaField: undefined#if($foreach.count != $columns.size()),#end
+    #set($comment=$column.columnComment)
 #end
+    ##数组下标$foreach.index
+    { key: $arrayIndex, label: `$comment`, visible: true, children: [] },
+    #set($arrayIndex = $arrayIndex + 1)
 #end
 #end
-}
-const data = reactive<PageData<${BusinessName}Form, ${BusinessName}Query>>({
-  form: {...initFormData},
-  queryParams: {
+]);
+
+// 查询参数
+const queryParams = reactive({
     pageNum: 1,
     pageSize: 10,
 #foreach ($column in $columns)
 #if($column.query)
-#if($column.htmlType != "datetime" || $column.queryType != "BETWEEN")
-    $column.javaField: undefined,
-#end
-#end
-#end
-    params: {
-#foreach ($column in $columns)
-#if($column.query)
-#if($column.htmlType == "datetime" && $column.queryType == "BETWEEN")
-      $column.javaField: undefined#if($foreach.count != $columns.size()),#end
-#end
-#end
-#end
-    }
-  },
-  rules: {
-#foreach ($column in $columns)
-#if($column.insert || $column.edit)
-#if($column.required)
-#set($parentheseIndex=$column.columnComment.indexOf("（"))
-#if($parentheseIndex != -1)
-#set($comment=$column.columnComment.substring(0, $parentheseIndex))
+#if($column.htmlType == "checkbox")
+    $column.javaField: []#if($foreach.count != $columns.size()),#end
+#elseif($column.javaType == "String")
+    $column.javaField: ''#if($foreach.count != $columns.size()),#end
+#elseif($column.javaType == "Integer" || $column.javaType == "Long")
+    $column.javaField: 0#if($foreach.count != $columns.size()),#end
 #else
-#set($comment=$column.columnComment)
-#end
-    $column.javaField: [
-      { required: true, message: "$comment不能为空", trigger: #if($column.htmlType == "select" || $column.htmlType == "radio")"change"#else"blur"#end }
-    ]#if($foreach.count != $columns.size()),#end
+    $column.javaField: undefined#if($foreach.count != $columns.size()),#end
 #end
 #end
 #end
-  }
-});
-
-const { queryParams, form, rules } = toRefs(data);
+    params: {}
+})
 
 /** 查询${functionName}列表 */
 const getList = async () => {
@@ -350,27 +238,16 @@ const getList = async () => {
   proxy?.addDateRange(queryParams.value, dateRange${AttrName}.value, '${AttrName}');
 #end
 #end
-  const res = await list${BusinessName}(queryParams.value);
+  const res = await list${BusinessName}(queryParams);
   ${businessName}List.value = res.rows;
   total.value = res.total;
   loading.value = false;
 }
 
-/** 取消按钮 */
-const cancel = () => {
-  reset();
-  dialog.visible = false;
-}
-
-/** 表单重置 */
-const reset = () => {
-  form.value = {...initFormData};
-  ${businessName}FormRef.value?.resetFields();
-}
 
 /** 搜索按钮操作 */
 const handleQuery = () => {
-  queryParams.value.pageNum = 1;
+  queryParams.pageNum = 1;
   getList();
 }
 
@@ -393,66 +270,27 @@ const handleSelectionChange = (selection: ${BusinessName}VO[]) => {
   multiple.value = !selection.length;
 }
 
-/** 新增按钮操作 */
-const handleAdd = () => {
-  reset();
-  dialog.visible = true;
-  dialog.title = "添加${functionName}";
-}
-
-/** 修改按钮操作 */
-const handleUpdate = async (row?: ${BusinessName}VO) => {
-  reset();
-  const _${pkColumn.javaField} = row?.${pkColumn.javaField} || ids.value[0]
-  const res = await get${BusinessName}(_${pkColumn.javaField});
-  Object.assign(form.value, res.data);
-#foreach ($column in $columns)
-  #if($column.htmlType == "checkbox")
-  form.value.$column.javaField = form.value.${column.javaField}.split(",");
-  #end
-#end
-  dialog.visible = true;
-  dialog.title = "修改${functionName}";
-}
-
-/** 提交按钮 */
-const submitForm = () => {
-  ${businessName}FormRef.value?.validate(async (valid: boolean) => {
-    if (valid) {
-      buttonLoading.value = true;
-      #foreach ($column in $columns)
-        #if($column.htmlType == "checkbox")
-        form.value.$column.javaField = form.value.${column.javaField}.join(",");
-        #end
-      #end
-      if (form.value.${pkColumn.javaField}) {
-        await update${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
-      } else {
-        await add${BusinessName}(form.value).finally(() =>  buttonLoading.value = false);
-      }
-      proxy?.#[[$modal]]#.msgSuccess("操作成功");
-      dialog.visible = false;
-      await getList();
-    }
-  });
-}
-
 /** 删除按钮操作 */
 const handleDelete = async (row?: ${BusinessName}VO) => {
   const _${pkColumn.javaField}s = row?.${pkColumn.javaField} || ids.value;
   await proxy?.#[[$modal]]#.confirm('是否确认删除${functionName}编号为"' + _${pkColumn.javaField}s + '"的数据项？').finally(() => loading.value = false);
   await del${BusinessName}(_${pkColumn.javaField}s);
-  proxy?.#[[$modal]]#.msgSuccess("删除成功");
   await getList();
+  proxy?.#[[$modal]]#.msgSuccess("删除成功");
 }
 
 /** 导出按钮操作 */
 const handleExport = () => {
   proxy?.download('${moduleName}/${businessName}/export', {
-    ...queryParams.value
+    ...queryParams
   }, `${businessName}_#[[${new Date().getTime()}]]#.xlsx`)
 }
-
+/** 弹出框(增加、修改) */
+const detailFormRef = ref();
+const openForm = (type: string, row?: ${BusinessName}VO) => {
+    const id = row?.${pkColumn.javaField} || ids.value[0];
+    detailFormRef?.value.open(type, id)
+}
 onMounted(() => {
   getList();
 });