From 0a8257a565bb17ad53c32bddb3aca3740fdebddc Mon Sep 17 00:00:00 2001
From: YunaiV <zhijiantianya@gmail.com>
Date: Sat, 11 Nov 2023 22:06:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=EF=BC=9A?=
=?UTF-8?q?=E4=B8=BB=E5=AD=90=E8=A1=A8=20normal=20=E6=A8=A1=E5=BC=8F?=
=?UTF-8?q?=EF=BC=8C1=20=E5=AF=B9=E5=A4=9A=E7=9A=84=20form=20=E7=94=9F?=
=?UTF-8?q?=E6=88=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../service/codegen/inner/CodegenEngine.java | 55 ++++-
.../main/resources/codegen/vue3/api/api.ts.vm | 55 ++++-
.../{form_sub.vue.vm => form_sub_erp.vue.vm} | 0
.../views/components/form_sub_inner.vue.vm | 2 +
.../views/components/form_sub_normal.vue.vm | 226 ++++++++++++++++++
.../{list_sub.vue.vm => list_sub_erp.vue.vm} | 0
.../views/components/list_sub_inner.vue.vm | 0
.../resources/codegen/vue3/views/form.vue.vm | 8 +-
.../codegen/inner/CodegenEngineTest.java | 70 +++++-
9 files changed, 391 insertions(+), 25 deletions(-)
rename yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/{form_sub.vue.vm => form_sub_erp.vue.vm} (100%)
create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm
create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm
rename yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/{list_sub.vue.vm => list_sub_erp.vue.vm} (100%)
create mode 100644 yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
index 3175e4386..ebcf729af 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngine.java
@@ -2,6 +2,7 @@ package cn.iocoder.yudao.module.infra.service.codegen.inner;
import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.map.MapUtil;
+import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import cn.hutool.extra.template.TemplateConfig;
import cn.hutool.extra.template.TemplateEngine;
@@ -27,6 +28,7 @@ import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenColumnDO;
import cn.iocoder.yudao.module.infra.dal.dataobject.codegen.CodegenTableDO;
import cn.iocoder.yudao.module.infra.enums.codegen.CodegenFrontTypeEnum;
import cn.iocoder.yudao.module.infra.enums.codegen.CodegenSceneEnum;
+import cn.iocoder.yudao.module.infra.enums.codegen.CodegenTemplateTypeEnum;
import cn.iocoder.yudao.module.infra.framework.codegen.config.CodegenProperties;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.collect.ImmutableTable;
@@ -111,6 +113,16 @@ public class CodegenEngine {
vue3FilePath("views/${table.moduleName}/${classNameVar}/index.vue"))
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/form.vue"),
vue3FilePath("views/${table.moduleName}/${classNameVar}/${simpleClassName}Form.vue"))
+ .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_normal.vue"), // 特殊：主子表专属逻辑
+ vue3FilePath("views/${table.moduleName}/${classNameVar}/components/${subSimpleClassName}Form.vue"))
+ .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_inner.vue"), // 特殊：主子表专属逻辑
+ vue3FilePath("views/${table.moduleName}/${classNameVar}/components/${subSimpleClassName}Form.vue"))
+ .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/form_sub_erp.vue"), // 特殊：主子表专属逻辑
+ vue3FilePath("views/${table.moduleName}/${classNameVar}/components/${subSimpleClassName}Form.vue"))
+ .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/list_sub_inner.vue"), // 特殊：主子表专属逻辑
+ vue3FilePath("views/${table.moduleName}/${classNameVar}/components/${subSimpleClassName}List.vue"))
+ .put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("views/components/list_sub_erp.vue"), // 特殊：主子表专属逻辑
+ vue3FilePath("views/${table.moduleName}/${classNameVar}/components/${subSimpleClassName}List.vue"))
.put(CodegenFrontTypeEnum.VUE3.getType(), vue3TemplatePath("api/api.ts"),
vue3FilePath("api/${table.moduleName}/${classNameVar}/index.ts"))
// Vue3 Schema 模版
@@ -202,17 +214,9 @@ public class CodegenEngine {
templates.forEach((vmPath, filePath) -> {
// 2.1 特殊：主子表专属逻辑
if (isSubTemplate(vmPath)) {
- if (CollUtil.isEmpty(subTables)) {
- return;
- }
- for (int i = 0; i < subTables.size(); i++) {
- bindingMap.put("subIndex", i);
- generateCode(result, vmPath, filePath, bindingMap);
- }
- bindingMap.remove("subIndex");
+ generateSubCode(table, subTables, result, vmPath, filePath, bindingMap);
return;
}
-
// 2.2 默认生成
generateCode(result, vmPath, filePath, bindingMap);
});
@@ -228,6 +232,35 @@ public class CodegenEngine {
result.put(filePath, content);
}
+ private void generateSubCode(CodegenTableDO table, List<CodegenTableDO> subTables,
+ Map<String, String> result, String vmPath,
+ String filePath, Map<String, Object> bindingMap) {
+ // 没有子表，所以不生成
+ if (CollUtil.isEmpty(subTables)) {
+ return;
+ }
+ // 主子表的模式匹配。目的：过滤掉个性化的模版
+ if (vmPath.contains("_normal")
+ && ObjectUtil.notEqual(table.getTemplateType(), CodegenTemplateTypeEnum.MASTER_NORMAL.getType())) {
+ return;
+ }
+ if (vmPath.contains("_erp")
+ && ObjectUtil.notEqual(table.getTemplateType(), CodegenTemplateTypeEnum.MASTER_ERP.getType())) {
+ return;
+ }
+ if (vmPath.contains("_inner")
+ && ObjectUtil.notEqual(table.getTemplateType(), CodegenTemplateTypeEnum.MASTER_INNER.getType())) {
+ return;
+ }
+
+ // 逐个生成
+ for (int i = 0; i < subTables.size(); i++) {
+ bindingMap.put("subIndex", i);
+ generateCode(result, vmPath, filePath, bindingMap);
+ }
+ bindingMap.remove("subIndex");
+ }
+
/**
* 格式化生成后的代码
*
@@ -323,6 +356,7 @@ public class CodegenEngine {
return templates;
}
+ @SuppressWarnings("unchecked")
private String formatFilePath(String filePath, Map<String, Object> bindingMap) {
filePath = StrUtil.replace(filePath, "${basePackage}",
getStr(bindingMap, "basePackage").replaceAll("\\.", "/"));
@@ -346,6 +380,8 @@ public class CodegenEngine {
filePath = StrUtil.replace(filePath, "${subTable.moduleName}", subTable.getModuleName());
filePath = StrUtil.replace(filePath, "${subTable.businessName}", subTable.getBusinessName());
filePath = StrUtil.replace(filePath, "${subTable.className}", subTable.getClassName());
+ filePath = StrUtil.replace(filePath, "${subSimpleClassName}",
+ ((List<String>) bindingMap.get("subSimpleClassNames")).get(subIndex));
}
return filePath;
}
@@ -417,4 +453,5 @@ public class CodegenEngine {
private static boolean isSubTemplate(String path) {
return path.contains("_sub");
}
+
}
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
index 5476bcbae..63f92751e 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/api/api.ts.vm
@@ -43,4 +43,57 @@ export const delete${simpleClassName} = async (id: number) => {
// 导出${table.classComment} Excel
export const export${simpleClassName} = async (params) => {
return await request.download({ url: `${baseURL}/export-excel`, params })
-}
\ No newline at end of file
+}
+## 特殊：主子表专属逻辑
+#foreach ($subTable in $subTables)
+#set ($index = $foreach.count - 1)
+#set ($subSimpleClassName = $subSimpleClassNames.get($index))
+#set ($subPrimaryColumn = $subPrimaryColumns.get($index))##当前 primary 字段
+#set ($subJoinColumn = $subJoinColumns.get($index))##当前 join 字段
+#set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+#set ($subSimpleClassName_strikeCase = $subSimpleClassName_strikeCases.get($index))
+#set ($subJoinColumn_strikeCase = $subJoinColumn_strikeCases.get($index))
+#set ($subClassNameVar = $subClassNameVars.get($index))
+
+// ==================== 子表（$subTable.classComment） ====================
+## 情况一：MASTER_ERP 时，需要分查询页子表
+#if ( $table.templateType == 11 )
+
+// 获得${subTable.classComment}分页
+export const get${subSimpleClassName}Page = async (params) => {
+ return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/page`, params })
+}
+## 情况二：非 MASTER_ERP 时，需要列表查询子表
+#else
+ #if ( $subTable.subJoinMany )
+
+// 获得${subTable.classComment}列表
+export const get${subSimpleClassName}ListBy${SubJoinColumnName} = async (${subJoinColumn.javaField}) => {
+ return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/list-by-${subJoinColumn_strikeCase}?${subJoinColumn.javaField}=` + ${subJoinColumn.javaField} })
+}
+ #else
+
+// 获得${subTable.classComment}
+export const get${subSimpleClassName}By${SubJoinColumnName} = async (${subJoinColumn.javaField}) => {
+ return await request.get({ url: `${baseURL}/${subSimpleClassName_strikeCase}/get-by-${subJoinColumn_strikeCase}`, ${subJoinColumn.javaField} })
+}
+ #end
+#end
+## 特殊：MASTER_ERP 时，支持单个的新增、修改、删除操作
+#if ( $table.templateType == 11 )
+// 新增${subTable.classComment}
+export const create${subSimpleClassName} = async (data) => {
+ return await request.post({ url: `${baseURL}/${subSimpleClassName_strikeCase}/create`, data })
+}
+
+// 修改${subTable.classComment}
+export const update${subSimpleClassName} = async (data) => {
+ return await request.put({ url: `${baseURL}/${subSimpleClassName_strikeCase}/update`, data })
+}
+
+// 删除${subTable.classComment}
+export const delete${subSimpleClassName} = async (id: number) => {
+ return await request.delete({ url: `${baseURL}/${subSimpleClassName_strikeCase}/delete?id=` + id })
+}
+#end
+#end
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm
similarity index 100%
rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub.vue.vm
rename to yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_erp.vue.vm
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm
new file mode 100644
index 000000000..cffb5f491
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_inner.vue.vm
@@ -0,0 +1,2 @@
+## 主表的 normal 和 inner 使用相同的 form 表单
+#parse("codegen/vue3/views/components/form_sub_inner.vue.vm")
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm
new file mode 100644
index 000000000..135ec1d10
--- /dev/null
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/form_sub_normal.vue.vm
@@ -0,0 +1,226 @@
+#set ($subTable = $subTables.get($subIndex))##当前表
+#set ($subColumns = $subColumnsList.get($subIndex))##当前字段数组
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($subSimpleClassName = $subSimpleClassNames.get($subIndex))
+#set ($subJoinColumn = $subJoinColumns.get($subIndex))##当前 join 字段
+#set ($SubJoinColumnName = $subJoinColumn.javaField.substring(0,1).toUpperCase() + ${subJoinColumn.javaField.substring(1)})##首字母大写
+<template>
+ <el-form
+ ref="formRef"
+ :model="formData"
+ :rules="formRules"
+ v-loading="formLoading"
+ label-width="0px"
+ :inline-message="true"
+ >
+ <el-table :data="formData" class="-mt-10px">
+ <el-table-column label="序号" type="index" width="100" />
+#foreach($column in $subColumns)
+ #if ($column.createOperation || $column.updateOperation)
+ #set ($dictType = $column.dictType)
+ #set ($javaField = $column.javaField)
+ #set ($javaType = $column.javaType)
+ #set ($AttrName = $column.javaField.substring(0,1).toUpperCase() + ${column.javaField.substring(1)})
+ #set ($comment = $column.columnComment)
+ #set ($dictMethod = "getDictOptions")## 计算使用哪个 dict 字典方法
+ #if ($javaType == "Integer" || $javaType == "Long" || $javaType == "Byte" || $javaType == "Short")
+ #set ($dictMethod = "getIntDictOptions")
+ #elseif ($javaType == "String")
+ #set ($dictMethod = "getStrDictOptions")
+ #elseif ($javaType == "Boolean")
+ #set ($dictMethod = "getBoolDictOptions")
+ #end
+ #if ($column.htmlType == "input" && !$column.primaryKey)## 忽略主键，不用在表单里 TODO 芋艿：这里要忽略下 join 字段；
+ <el-table-column label="${comment}" width="150">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <el-input v-model="row.${javaField}" placeholder="请输入${comment}" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #elseif($column.htmlType == "imageUpload")## 图片上传
+ <el-table-column label="${comment}" width="200">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <UploadImg v-model="row.${javaField}" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #elseif($column.htmlType == "fileUpload")## 文件上传
+ <el-table-column label="${comment}" width="200">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <UploadFile v-model="row.${javaField}" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #elseif($column.htmlType == "editor")## 文本编辑器
+ <el-table-column label="${comment}" width="400">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <Editor v-model="row.${javaField}" height="150px" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #elseif($column.htmlType == "select")## 下拉框
+ <el-table-column label="${comment}" width="150">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <el-select v-model="row.${javaField}" placeholder="请选择${comment}">
+ #if ("" != $dictType)## 有数据字典
+ <el-option
+ v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+ :key="dict.value"
+ :label="dict.label"
+ :value="dict.value"
+ />
+ #else##没数据字典
+ <el-option label="请选择字典生成" value="" />
+ #end
+ </el-select>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #elseif($column.htmlType == "checkbox")## 多选框
+ <el-table-column label="${comment}" width="150">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <el-checkbox-group v-model="row.${javaField}">
+ #if ("" != $dictType)## 有数据字典
+ <el-checkbox
+ v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-checkbox>
+ #else##没数据字典
+ <el-checkbox>请选择字典生成</el-checkbox>
+ #end
+ </el-checkbox-group>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #elseif($column.htmlType == "radio")## 单选框
+ <el-table-column label="${comment}" width="150">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <el-radio-group v-model="row.${javaField}">
+ #if ("" != $dictType)## 有数据字典
+ <el-radio
+ v-for="dict in $dictMethod(DICT_TYPE.$dictType.toUpperCase())"
+ :key="dict.value"
+ :label="dict.value"
+ >
+ {{ dict.label }}
+ </el-radio>
+ #else##没数据字典
+ <el-radio label="1">请选择字典生成</el-radio>
+ #end
+ </el-radio-group>
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #elseif($column.htmlType == "datetime")## 时间框
+ <el-table-column label="${comment}" width="150">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <el-date-picker
+ v-model="row.${javaField}"
+ type="date"
+ value-format="x"
+ placeholder="选择${comment}"
+ />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #elseif($column.htmlType == "textarea")## 文本框
+ <el-table-column label="${comment}" width="200">
+ <template #default="{ row, $index }">
+ <el-form-item :prop="`${$index}.${javaField}`" :rules="formRules.${javaField}" class="mb-0px!">
+ <el-input v-model="row.${javaField}" type="textarea" placeholder="请输入${comment}" />
+ </el-form-item>
+ </template>
+ </el-table-column>
+ #end
+ #end
+#end
+ </el-table>
+ </el-form>
+ <el-row justify="center" class="mt-3">
+ <el-button @click="handleAdd" round>+ 添加${subTable.classComment}</el-button>
+ </el-row>
+</template>
+<script setup lang="ts">
+import { getIntDictOptions, getStrDictOptions, getBoolDictOptions, DICT_TYPE } from '@/utils/dict'
+import * as ${simpleClassName}Api from '@/api/${table.moduleName}/${classNameVar}'
+
+const props = defineProps<{
+ ${subJoinColumn.javaField}: undefined // ${subJoinColumn.columnComment}（主表的关联字段）
+}>()
+const formLoading = ref(false) // 表单的加载中
+const formData = ref([])
+const formRules = reactive({
+#foreach ($column in $subColumns)
+ #if (($column.createOperation || $column.updateOperation) && !$column.nullable && !${column.primaryKey})## 创建或者更新操作 && 要求非空 && 非主键
+ #set($comment=$column.columnComment)
+ $column.javaField: [{ required: true, message: '${comment}不能为空', trigger: #if($column.htmlType == 'select')'change'#else'blur'#end }],
+ #end
+#end
+})
+const formRef = ref() // 表单 Ref
+
+/** 监听主表的关联字段的变化，加载对应的子表数据 */
+watch(
+ () => props.${subJoinColumn.javaField},
+ async (val) => {
+ // 情况一：val 为空，说明是新增，则置空
+ if (!val) {
+ formData.value = []
+ return;
+ }
+ // 情况二：val 非空，说明是修改，则加载数据
+ try {
+ formLoading.value = true
+ formData.value = await ${simpleClassName}Api.get${subSimpleClassName}ListBy${SubJoinColumnName}(val)
+ } finally {
+ formLoading.value = false
+ }
+ },
+ { immediate: true }
+)
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+ const row = {
+#foreach ($column in $subColumns)
+ #if ($column.createOperation || $column.updateOperation)
+ #if ($column.htmlType == "checkbox")
+ $column.javaField: [],
+ #else
+ $column.javaField: undefined,
+ #end
+ #end
+#end
+ }
+ row.${subJoinColumn.javaField} = props.${subJoinColumn.javaField}
+ formData.value.push(row)
+}
+
+/** 删除按钮操作 */
+const handleDelete = (index) => {
+ formData.value.splice(index, 1)
+}
+
+/** 表单校验 */
+const validate = () => {
+ return formRef.value.validate()
+}
+
+/** 表单值 */
+const getData = () => {
+ return formData.value
+}
+
+defineExpose({ validate, getData })
+</script>
\ No newline at end of file
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm
similarity index 100%
rename from yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub.vue.vm
rename to yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_erp.vue.vm
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/components/list_sub_inner.vue.vm
new file mode 100644
index 000000000..e69de29bb
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
index 2bc6f315d..f2b3423e7 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
+++ b/yudao-module-infra/yudao-module-infra-biz/src/main/resources/codegen/vue3/views/form.vue.vm
@@ -27,12 +27,10 @@
<el-input v-model="formData.${javaField}" placeholder="请输入${comment}" />
</el-form-item>
#elseif($column.htmlType == "imageUpload")## 图片上传
- #set ($hasImageUploadColumn = true)
<el-form-item label="${comment}">
<UploadImg v-model="formData.${javaField}" />
</el-form-item>
#elseif($column.htmlType == "fileUpload")## 文件上传
- #set ($hasFileUploadColumn = true)
<el-form-item label="${comment}">
<UploadFile v-model="formData.${javaField}" />
</el-form-item>
@@ -124,11 +122,11 @@ const formType = ref('') // 表单的类型：create - 新增；update - 修改
const formData = ref({
#foreach ($column in $columns)
#if ($column.createOperation || $column.updateOperation)
- #if ($column.htmlType == "checkbox")
+ #if ($column.htmlType == "checkbox")
$column.javaField: [],
- #else
+ #else
$column.javaField: undefined,
- #end
+ #end
#end
#end
})
diff --git a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineTest.java b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineTest.java
index 2bbe3309b..7c7384bcd 100644
--- a/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineTest.java
+++ b/yudao-module-infra/yudao-module-infra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/codegen/inner/CodegenEngineTest.java
@@ -208,7 +208,63 @@ public class CodegenEngineTest extends BaseMockitoUnitTest {
.setCreateOperation(true).setUpdateOperation(true).setListOperation(true)
.setListOperationCondition(CodegenColumnListConditionEnum.LIKE.getCondition()).setListOperationResult(true)
.setHtmlType(CodegenColumnHtmlTypeEnum.INPUT.getType());
- List<CodegenColumnDO> contactColumns = Arrays.asList(contactIdColumn, contactStudentIdColumn, contactNameColumn);
+ CodegenColumnDO contactsAvatarColumn = new CodegenColumnDO().setColumnName("avatar").setDataType(JdbcType.VARCHAR.name())
+ .setColumnComment("头像").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(4).setJavaType("String").setJavaField("avatar").setExample("https://www.iocoder.cn/1.png")
+ .setCreateOperation(true).setUpdateOperation(true).setListOperation(false)
+ .setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.UPLOAD_IMAGE.getType());
+ CodegenColumnDO contactVideoColumn = new CodegenColumnDO().setColumnName("video").setDataType(JdbcType.VARCHAR.name())
+ .setColumnComment("视频").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(5).setJavaType("String").setJavaField("video").setExample("https://www.iocoder.cn/1.mp4")
+ .setCreateOperation(true).setUpdateOperation(true).setListOperation(false)
+ .setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.UPLOAD_FILE.getType());
+ CodegenColumnDO contactDescriptionColumn = new CodegenColumnDO().setColumnName("description").setDataType(JdbcType.VARCHAR.name())
+ .setColumnComment("个人简介").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(6).setJavaType("String").setJavaField("description").setExample("我是介绍")
+ .setCreateOperation(true).setUpdateOperation(true).setListOperation(false)
+ .setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.EDITOR.getType());
+ CodegenColumnDO contactSex1Column = new CodegenColumnDO().setColumnName("sex1").setDataType(JdbcType.VARCHAR.name())
+ .setColumnComment("性别 1").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(7).setJavaType("String").setJavaField("sex1").setExample("男")
+ .setCreateOperation(true).setUpdateOperation(true).setListOperation(true)
+ .setListOperationCondition(CodegenColumnListConditionEnum.EQ.getCondition()).setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.SELECT.getType()).setDictType("system_sex1");
+ CodegenColumnDO contactSex2Column = new CodegenColumnDO().setColumnName("sex2").setDataType(JdbcType.INTEGER.name())
+ .setColumnComment("性别 2").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(8).setJavaType("Integer").setJavaField("sex2").setExample("1")
+ .setCreateOperation(true).setUpdateOperation(true).setListOperation(true)
+ .setListOperationCondition(CodegenColumnListConditionEnum.EQ.getCondition()).setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.CHECKBOX.getType()).setDictType("system_sex2");
+ CodegenColumnDO contactSex3Column = new CodegenColumnDO().setColumnName("sex3").setDataType(JdbcType.BOOLEAN.name())
+ .setColumnComment("性别 3").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(9).setJavaType("Boolean").setJavaField("sex3").setExample("true")
+ .setCreateOperation(true).setUpdateOperation(true).setListOperation(true)
+ .setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.RADIO.getType()).setDictType("system_sex3");
+ CodegenColumnDO contactBirthdayColumn = new CodegenColumnDO().setColumnName("birthday").setDataType(JdbcType.DATE.name())
+ .setColumnComment("出生日期").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(10).setJavaType("LocalDateTime").setJavaField("birthday")
+ .setCreateOperation(true).setUpdateOperation(true).setListOperation(true)
+ .setListOperationCondition(CodegenColumnListConditionEnum.EQ.getCondition()).setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.DATETIME.getType());
+ CodegenColumnDO contactMemoColumn = new CodegenColumnDO().setColumnName("memo").setDataType(JdbcType.VARCHAR.name())
+ .setColumnComment("备注").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(11).setJavaType("String").setJavaField("memo").setExample("我是备注")
+ .setCreateOperation(true).setUpdateOperation(true).setListOperation(false)
+ .setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.TEXTAREA.getType());
+ CodegenColumnDO contactCreateTimeColumn = new CodegenColumnDO().setColumnName("create_time").setDataType(JdbcType.DATE.name())
+ .setColumnComment("创建时间").setNullable(false).setPrimaryKey(false)
+ .setOrdinalPosition(12).setJavaType("LocalDateTime").setJavaField("createTime")
+ .setCreateOperation(false).setUpdateOperation(false).setListOperation(true)
+ .setListOperationCondition(CodegenColumnListConditionEnum.BETWEEN.getCondition()).setListOperationResult(true)
+ .setHtmlType(CodegenColumnHtmlTypeEnum.DATETIME.getType());
+ List<CodegenColumnDO> contactColumns = Arrays.asList(contactIdColumn, contactStudentIdColumn,
+ contactNameColumn, contactsAvatarColumn, contactVideoColumn, contactDescriptionColumn,
+ contactSex1Column, contactSex2Column, contactSex3Column, contactBirthdayColumn, contactMemoColumn, contactCreateTimeColumn);
// 子表（地址）
CodegenTableDO addressTable = new CodegenTableDO().setScene(CodegenSceneEnum.ADMIN.getScene())
.setTableName("infra_demo_student_address").setTableComment("学生地址表")
@@ -222,26 +278,20 @@ public class CodegenEngineTest extends BaseMockitoUnitTest {
.setOrdinalPosition(1).setJavaType("Long").setJavaField("id").setExample("1024")
.setCreateOperation(false).setUpdateOperation(true).setListOperation(false)
.setListOperationResult(true);
- CodegenColumnDO addressStudentColumn = new CodegenColumnDO().setColumnName("student_id").setDataType(JdbcType.BIGINT.name())
+ CodegenColumnDO addressStudentIdColumn = new CodegenColumnDO().setColumnName("student_id").setDataType(JdbcType.BIGINT.name())
.setColumnComment("学生编号").setNullable(false).setPrimaryKey(false)
.setOrdinalPosition(2).setJavaType("Long").setJavaField("studentId").setExample("2048")
.setCreateOperation(false).setUpdateOperation(true).setListOperation(false)
.setListOperationResult(true)
.setId(200L);
- CodegenColumnDO addressDetailColumn = new CodegenColumnDO().setColumnName("detail").setDataType(JdbcType.VARCHAR.name())
- .setColumnComment("明细").setNullable(false).setPrimaryKey(false)
- .setOrdinalPosition(3).setJavaType("String").setJavaField("detail").setExample("码头路 88 号")
- .setCreateOperation(true).setUpdateOperation(true).setListOperation(true)
- .setListOperationCondition(CodegenColumnListConditionEnum.LIKE.getCondition()).setListOperationResult(true)
- .setHtmlType(CodegenColumnHtmlTypeEnum.INPUT.getType());
- List<CodegenColumnDO> addressColumns = Arrays.asList(addressIdColumn, addressStudentColumn, addressDetailColumn);
+ List<CodegenColumnDO> addressColumns = Arrays.asList(addressIdColumn, addressStudentIdColumn);
// 调用
Map<String, String> result = codegenEngine.execute(table, columns,
Arrays.asList(contactTable, addressTable), Arrays.asList(contactColumns, addressColumns));
// 断言
- assertEquals(25, result.size());
+ assertEquals(27, result.size());
for (Map.Entry<String, String> entry : result.entrySet()) {
System.out.println(entry.getKey());