xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-09-17 19:06:39 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

优化代码生成模块：1、字典与文件字段添加序列化注解；2、新增 bit-Boolean 类型的映射；新增在create_time与update_time字段上添加自动填充注解。

Browse Source
This commit is contained in:
zhoumingfa 2024-08-04 21:51:40 +08:00
parent 6f183c3366
commit a1043083dc
27 changed files with 255 additions and 224 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/DataSourceConfig.java
View File

@ -7,10 +7,12 @@ import com.alibaba.druid.support.http.StatViewServlet;
import com.alibaba.druid.support.http.WebStatFilter;
import com.alibaba.druid.support.spring.stat.DruidStatInterceptor;
import com.baomidou.mybatisplus.annotation.DbType;
import com.baomidou.mybatisplus.core.config.GlobalConfig;
import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor;
import com.baomidou.mybatisplus.extension.spring.MybatisSqlSessionFactoryBean;
import lombok.extern.slf4j.Slf4j;
import net.lab1024.sa.base.common.domain.DataScopePlugin;
import net.lab1024.sa.base.handler.MybatisPlusFillHandler;
import org.apache.ibatis.plugin.Interceptor;
import org.apache.ibatis.session.SqlSessionFactory;
import org.springframework.aop.support.DefaultPointcutAdvisor;
@ -144,6 +146,8 @@ public class DataSourceConfig {
pluginsList.add(dataScopePlugin);
}
factoryBean.setPlugins(pluginsList.toArray(new Interceptor[pluginsList.size()]));
// 添加字段自动填充处理
factoryBean.setGlobalConfig(new GlobalConfig().setBanner(false).setMetaObjectHandler(new MybatisPlusFillHandler()));
return factoryBean.getObject();
}

4
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/config/RedisConfig.java
View File

@ -6,6 +6,7 @@ import com.fasterxml.jackson.annotation.PropertyAccessor;
import com.fasterxml.jackson.databind.DeserializationFeature;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.fasterxml.jackson.databind.SerializationFeature;
import com.fasterxml.jackson.databind.jsontype.impl.LaissezFaireSubTypeValidator;
import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;
@ -43,7 +44,8 @@ public class RedisConfig {
.setSerializationInclusion(JsonInclude.Include.NON_NULL);
om.setVisibility(PropertyAccessor.ALL, JsonAutoDetect.Visibility.ANY);
om.enableDefaultTyping(ObjectMapper.DefaultTyping.NON_FINAL);
// enableDefaultTyping 官方已弃用 所以改为 activateDefaultTyping
om.activateDefaultTyping(LaissezFaireSubTypeValidator.instance, ObjectMapper.DefaultTyping.NON_FINAL);
jackson2JsonRedisSerializer.setObjectMapper(om);
RedisTemplate<String, Object> template = new RedisTemplate<>();
template.setConnectionFactory(factory);

40
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/handler/MybatisPlusFillHandler.java Normal file
View File

@ -0,0 +1,40 @@
package net.lab1024.sa.base.handler;
import com.baomidou.mybatisplus.core.handlers.MetaObjectHandler;
import lombok.extern.slf4j.Slf4j;
import org.apache.ibatis.reflection.MetaObject;
import org.springframework.stereotype.Component;
import java.time.LocalDateTime;
/**
* Mybatis Plus 插入或者更新时指定字段设置值
*
* @author zhoumingfa
*/
@Component
@Slf4j
public class MybatisPlusFillHandler implements MetaObjectHandler {
public static final String CREATE_TIME = "createTime";
public static final String UPDATE_TIME = "updateTime";
@Override
public void insertFill(MetaObject metaObject) {
if (metaObject.hasSetter(CREATE_TIME)) {
this.fillStrategy(metaObject, CREATE_TIME, LocalDateTime.now());
}
if (metaObject.hasSetter(UPDATE_TIME)) {
this.fillStrategy(metaObject, UPDATE_TIME, LocalDateTime.now());
}
}
@Override
public void updateFill(MetaObject metaObject) {
if (metaObject.hasSetter(UPDATE_TIME)) {
this.fillStrategy(metaObject, UPDATE_TIME, LocalDateTime.now());
}
}
}

2
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/constant/CodeFrontComponentEnum.java
View File

@ -41,7 +41,7 @@ public enum CodeFrontComponentEnum implements BaseEnum {
}
@Override
public Object getValue() {
public String getValue() {
return value;
}

1
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/form/CodeGeneratorConfigForm.java
View File

@ -32,7 +32,6 @@ public class CodeGeneratorConfigForm {
@Schema(description = "表名")
private String tableName;
@Valid
@NotNull(message = "基础信息不能为空")
@Schema(description = "基础信息")

4
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/domain/model/CodeInsertAndUpdateField.java
View File

@ -39,8 +39,8 @@ public class CodeInsertAndUpdateField {
@Schema(description = "更新标识")
private Boolean updateFlag;
@SchemaEnum(value = CodeGeneratorPageTypeEnum.class)
@CheckEnum(value = CodeFrontComponentEnum.class, message = "3.增加、修改 增加、修改 组件类型 枚举值错误", required = true)
@SchemaEnum(value = CodeFrontComponentEnum.class)
@CheckEnum(value = CodeFrontComponentEnum.class, message = "3.增加、修改 组件类型 枚举值错误", required = true)
private String frontComponent;
}

1
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/CodeGeneratorTemplateService.java
View File

@ -94,6 +94,7 @@ public class CodeGeneratorTemplateService {
String fileName = templateFile.startsWith("java") ? upperCamel + templateSplit[templateSplit.length - 1] : lowerHyphen + "-" + templateSplit[templateSplit.length - 1];
String fullPathFileName = templateFile.replaceAll(templateSplit[templateSplit.length - 1], fileName);
fullPathFileName = fullPathFileName.replaceAll("java/", "java/" + basic.getModuleName().toLowerCase() + "/");
fullPathFileName = fullPathFileName.replaceAll("js/", "js/" + basic.getModuleName().toLowerCase() + "/");
String fileContent = generate(tableName, templateFile, codeGeneratorConfigEntity);
File file = new File(uuid + "/" + fullPathFileName);

33
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/CodeGenerateBaseVariableService.java
View File

@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable;
import com.google.common.base.CaseFormat;
import net.lab1024.sa.base.common.util.SmartStringUtil;
import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@ -88,43 +89,33 @@ public abstract class CodeGenerateBaseVariableService {
}
CodeInsertAndUpdateField field = first.get();
return SmartStringUtil.contains(field.getFrontComponent(), "Upload" );
return SmartStringUtil.equals(field.getFrontComponent(), CodeFrontComponentEnum.FILE_UPLOAD.getValue());
}
/**
* 是否为 枚举
* 是否为 字典
*/
protected boolean isDict(String columnName, CodeGeneratorConfigForm form) {
List<CodeField> fields = form.getFields();
if (CollectionUtils.isEmpty(fields)) {
return false;
}
Optional<CodeField> first = fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst();
if (first.isPresent()) {
return false;
}
CodeField codeField = first.get();
return codeField.getDict() != null;
CodeField codeField = getCodeField(columnName, form);
return codeField != null && codeField.getDict() != null;
}
/**
* 是否为 枚举
*/
protected boolean isEnum(String columnName, CodeGeneratorConfigForm form) {
CodeField codeField = getCodeField(columnName, form);
return codeField != null && codeField.getEnumName() != null;
}
private CodeField getCodeField(String columnName, CodeGeneratorConfigForm form) {
List<CodeField> fields = form.getFields();
if (CollectionUtils.isEmpty(fields)) {
return false;
return null;
}
Optional<CodeField> first = fields.stream().filter(e -> columnName.equals(e.getColumnName())).findFirst();
if (first.isPresent()) {
return false;
}
CodeField codeField = first.get();
return codeField.getEnumName() != null;
return first.orElse(null);
}
/**

4
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/AddFormVariableService.java
View File

@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
import cn.hutool.core.bean.BeanUtil;
import net.lab1024.sa.base.common.util.SmartStringUtil;
import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@ -100,7 +101,6 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService {
}
}
//字典
if (SmartStringUtil.isNotEmpty(codeField.getDict())) {
finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictValueVoDeserializer.class)");
@ -109,7 +109,7 @@ public class AddFormVariableService extends CodeGenerateBaseVariableService {
}
//文件上传
if (SmartStringUtil.contains(field.getFrontComponent(), "Upload")) {
if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
finalFieldMap.put("file", "\n @JsonDeserialize(using = FileKeyVoDeserializer.class)");
packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");

11
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/EntityVariableService.java
View File

@ -54,14 +54,21 @@ public class EntityVariableService extends CodeGenerateBaseVariableService {
// mybatis plus
result.add("import com.baomidou.mybatisplus.annotation.TableName;");
// 自动填充注解
boolean existCreateAndUpdate = fields.stream().anyMatch(e -> "create_time".equals(e.getColumnName()) || "update_time".equals(e.getColumnName()));
if (existCreateAndUpdate) {
result.add("import com.baomidou.mybatisplus.annotation.FieldFill;");
result.add("import com.baomidou.mybatisplus.annotation.TableField;");
}
//主键
boolean isExistPrimaryKey = fields.stream().filter(e -> e.getPrimaryKeyFlag() != null && e.getPrimaryKeyFlag()).findFirst().isPresent();
boolean isExistPrimaryKey = fields.stream().anyMatch(e -> e.getPrimaryKeyFlag() != null && e.getPrimaryKeyFlag());
if (isExistPrimaryKey) {
result.add("import com.baomidou.mybatisplus.annotation.TableId;");
}
//自增
boolean isExistAutoIncrease = fields.stream().filter(e -> e.getAutoIncreaseFlag() != null && e.getAutoIncreaseFlag()).findFirst().isPresent();
boolean isExistAutoIncrease = fields.stream().anyMatch(e -> e.getAutoIncreaseFlag() != null && e.getAutoIncreaseFlag());
if (isExistAutoIncrease) {
result.add("import com.baomidou.mybatisplus.annotation.IdType;");
}

23
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/MapperVariableService.java
View File

@ -3,12 +3,13 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
import cn.hutool.core.bean.BeanUtil;
import net.lab1024.sa.base.module.support.codegenerator.constant.CodeQueryFieldQueryTypeEnum;
import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdateField;
import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeQueryField;
import net.lab1024.sa.base.module.support.codegenerator.service.variable.CodeGenerateBaseVariableService;
import org.apache.commons.collections4.CollectionUtils;
import java.util.*;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
/**
* @Author 1024创新实验室-主任:卓大
@ -74,20 +75,4 @@ public class MapperVariableService extends CodeGenerateBaseVariableService {
return variablesMap;
}
public List<String> getPackageList(List<CodeInsertAndUpdateField> fields, CodeGeneratorConfigForm form) {
if (CollectionUtils.isEmpty(fields)) {
return new ArrayList<>();
}
HashSet<String> packageList = new HashSet<>();
//1、javabean相关的包
packageList.addAll(getJavaBeanImportClass(form));
//2、dao
packageList.add("import " + form.getBasic().getJavaPackageName() + ".dao." + form.getBasic().getModuleName() + "Dao;" );
return new ArrayList<>(packageList);
}
}

4
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/QueryFormVariableService.java
View File

@ -75,9 +75,6 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
CodeField codeField = null;
switch (queryTypeEnum) {
case LIKE:
finalFieldMap.put("javaType", "String");
break;
case EQUAL:
codeField = getCodeFieldByColumnName(field.getColumnNameList().get(0), form);
if (codeField == null) {
@ -119,6 +116,7 @@ public class QueryFormVariableService extends CodeGenerateBaseVariableService {
// lombok
packageList.add("import lombok.Data;");
packageList.add("import lombok.EqualsAndHashCode;");
List<String> packageNameList = packageList.stream().filter(Objects::nonNull).collect(Collectors.toList());
Collections.sort(packageNameList);

3
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/UpdateFormVariableService.java
View File

@ -2,6 +2,7 @@ package net.lab1024.sa.base.module.support.codegenerator.service.variable.backen
import cn.hutool.core.bean.BeanUtil;
import net.lab1024.sa.base.common.util.SmartStringUtil;
import net.lab1024.sa.base.module.support.codegenerator.constant.CodeFrontComponentEnum;
import net.lab1024.sa.base.module.support.codegenerator.domain.form.CodeGeneratorConfigForm;
import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeField;
import net.lab1024.sa.base.module.support.codegenerator.domain.model.CodeInsertAndUpdate;
@ -123,7 +124,7 @@ public class UpdateFormVariableService extends CodeGenerateBaseVariableService {
}
//文件上传
if (SmartStringUtil.contains(field.getFrontComponent(), "Upload")) {
if (CodeFrontComponentEnum.FILE_UPLOAD.equalsValue(field.getFrontComponent())) {
finalFieldMap.put("file", "\n @JsonDeserialize(using = FileKeyVoDeserializer.class)");
packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");

12
smart-admin-api/sa-base/src/main/java/net/lab1024/sa/base/module/support/codegenerator/service/variable/backend/domain/VOVariableService.java
View File

@ -87,16 +87,16 @@ public class VOVariableService extends CodeGenerateBaseVariableService {
//字典
if (isDict(field.getColumnName(), form)) {
finalFieldMap.put("dict", "\n @JsonDeserialize(using = DictValueVoDeserializer.class)");
packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
packageList.add("import net.lab1024.sa.base.common.json.deserializer.DictValueVoDeserializer;");
finalFieldMap.put("dict", "\n @JsonSerialize(using = DictValueVoSerializer.class)");
packageList.add("import com.fasterxml.jackson.databind.annotation.JsonSerialize;");
packageList.add("import net.lab1024.sa.base.common.json.serializer.DictValueVoSerializer;");
}
//文件上传
if (isFile(field.getColumnName(), form)) {
finalFieldMap.put("file", "\n @JsonDeserialize(using = FileKeyVoDeserializer.class)");
packageList.add("import com.fasterxml.jackson.databind.annotation.JsonDeserialize;");
packageList.add("import net.lab1024.sa.base.common.json.deserializer.FileKeyVoDeserializer;");
finalFieldMap.put("file", "\n @JsonSerialize(using = FileKeyVoSerializer.class)");
packageList.add("import com.fasterxml.jackson.databind.annotation.JsonSerialize;");
packageList.add("import net.lab1024.sa.base.common.json.serializer.FileKeyVoSerializer;");
}
packageList.add(getJavaPackageName(codeField.getJavaType()));

1
smart-admin-api/sa-base/src/main/resources/code-generator-template/java/constant/enum.java.vm
View File

@ -2,6 +2,7 @@ package ${packageName};
import lombok.AllArgsConstructor;
import lombok.Getter;
import net.lab1024.sa.base.common.enumeration.BaseEnum;
/**
* ${enumDesc}

7
smart-admin-api/sa-base/src/main/resources/code-generator-template/java/dao/Dao.java.vm
View File

@ -38,14 +38,15 @@ public interface ${name.upperCamel}Dao extends BaseMapper<${name.upperCamel}Enti
* 更新删除状态
*/
long updateDeleted(@Param("${primaryKeyFieldName}")${primaryKeyJavaType} ${primaryKeyFieldName},@Param("${deletedFlag}")boolean deletedFlag);
#end
#if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
/**
* 批量更新删除状态
*/
void batchUpdateDeleted(@Param("idList")List<${primaryKeyJavaType}> idList,@Param("${deletedFlag}")boolean deletedFlag);
#end
#end
#end
#end
#end
#end
}

6
smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/entity/Entity.java.vm
View File

@ -26,6 +26,12 @@ public class ${name.upperCamel}Entity {
#if($field.primaryKeyFlag && !$field.autoIncreaseFlag)
@TableId
#end
#if($field.columnName == "create_time")
@TableField(fill = FieldFill.INSERT)
#end
#if($field.columnName == "update_time")
@TableField(fill = FieldFill.INSERT_UPDATE)
#end
private $field.javaType $field.fieldName;
#end

1
smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/form/QueryForm.java.vm
View File

@ -14,6 +14,7 @@ $importClass
*/
@Data
@EqualsAndHashCode(callSuper = false)
public class ${name.upperCamel}QueryForm extends PageParam {
#foreach ($field in $fields)

8
smart-admin-api/sa-base/src/main/resources/code-generator-template/java/domain/vo/VO.java.vm
View File

@ -17,14 +17,8 @@ public class ${name.upperCamel}VO {
#foreach ($field in $fields)
#if($field.isEnum)
${field.apiModelProperty}
${field.apiModelProperty}$!{field.notEmpty}$!{field.dict}$!{field.file}
private $field.javaType $field.fieldName;
#end
#if(!$field.isEnum)
${field.apiModelProperty}$!{field.dict}$!{field.file}
private $field.javaType $field.fieldName;
#end
#end
}

27
smart-admin-api/sa-base/src/main/resources/code-generator-template/java/mapper/Mapper.xml.vm
View File

@ -2,10 +2,17 @@
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="${daoClassName}">
<!-- 查询结果列 -->
<sql id="base_columns">
#foreach ($field in $fields)
${tableName}.${field.columnName}#if($foreach.hasNext),#end
#end
</sql>
<!-- 分页查询 -->
<select id="queryPage" resultType="${basic.javaPackageName}.domain.vo.${name.upperCamel}VO">
SELECT
*
<include refid="base_columns"/>
FROM ${tableName}
#if($queryFields.size() > 0)
<where>
@ -23,15 +30,15 @@
#end
#if(${queryField.queryTypeEnum} == "Date")
<if test="queryForm.${queryField.fieldName} != null">
AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') = #{queryForm.${queryField.fieldName}}
AND ${tableName}.${queryField.columnName} = #{queryForm.${queryField.fieldName}}
</if>
#end
#if(${queryField.queryTypeEnum} == "DateRange")
<if test="queryForm.${queryField.fieldName}Begin != null">
AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') &gt;= #{queryForm.${queryField.fieldName}Begin}
AND ${tableName}.${queryField.columnName} &gt;= #{queryForm.${queryField.fieldName}Begin}
</if>
<if test="queryForm.${queryField.fieldName}End != null">
AND DATE_FORMAT(${tableName}.${queryField.columnName}, '%Y-%m-%d') &lt;= #{queryForm.${queryField.fieldName}End}
AND ${tableName}.${queryField.columnName} &lt;= #{queryForm.${queryField.fieldName}End}
</if>
#end
#end
@ -39,21 +46,10 @@
#end
</select>
#if($dao.deletedFieldUpperName != $null)
<update id="batchUpdate${dao.deletedFieldUpperName}">
update ${mapper.tableName} set ${mapper.deletedColumnName} = #{deletedFlag}
where ${mapper.mainKeyColumnName} in
<foreach collection="idList" open="(" close=")" separator="," item="item">
#{item}
</foreach>
</update>
#end
#if($deleteInfo.isSupportDelete)
### 假删除
#if(!${deleteInfo.isPhysicallyDeleted})
#if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
<update id="batchUpdateDeleted">
update ${tableName} set deleted_flag = #{deletedFlag}
where ${primaryKeyColumnName} in
@ -71,4 +67,5 @@
#end
#end
#end
</mapper>

2
smart-admin-api/sa-base/src/main/resources/code-generator-template/java/service/Service.java.vm
View File

@ -64,7 +64,7 @@ public class ${name.upperCamel}Service {
#end
#if($deleteInfo.isSupportDelete)
#if($deleteInfo.deleteEnum == "BATCH" || $deleteInfo.deleteEnum == "SingleAndBatch")
#if($deleteInfo.deleteEnum == "Batch" || $deleteInfo.deleteEnum == "SingleAndBatch")
/**
* 批量删除
*

5
smart-admin-api/sa-base/src/main/resources/code-generator-template/js/form.vue.vm
View File

@ -62,7 +62,7 @@
<a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "Upload")
#if($field.frontComponent == "FileUpload")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<FileUpload
:defaultFileList="form.$!{field.fieldName}"
@ -122,7 +122,7 @@
<a-date-picker show-time valueFormat="YYYY-MM-DD HH:mm:ss" v-model:value="form.$!{field.fieldName}" style="width: 100%" placeholder="$!{field.label}" />
</a-form-item>
#end
#if($field.frontComponent == "Upload")
#if($field.frontComponent == "FileUpload")
<a-form-item label="$!{field.label}" name="${field.fieldName}">
<FileUpload
:defaultFileList="form.$!{field.fieldName}"
@ -188,7 +188,6 @@
const formRef = ref();
const formDefault = {
$!{primaryKeyFieldName}: undefined,
#foreach ($field in $formFields)
$!{field.fieldName}: undefined, //$!{field.label}
#end

3
smart-admin-api/sa-base/src/main/resources/code-generator-template/js/list.vue.vm
View File

@ -99,7 +99,7 @@
:row-selection="{ selectedRowKeys: selectedRowKeyList, onChange: onSelectChange }"
#end
>
<template #bodyCell="{ text, record, column }">
<template #bodyCell="{ record, column }">
<template v-if="column.dataIndex === 'action'">
<div class="smart-table-operate">
#if($insertAndUpdate.isSupportInsertAndUpdate)
@ -145,6 +145,7 @@
#foreach ($import in $frontImportList)
$!{import}
#end
// ---------------------------- 表格列 ----------------------------
const columns = ref([

8
smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/code-generator-util.js
View File

@ -2,6 +2,7 @@ import { convertUpperCamel } from '/@/utils/str-util';
// -------------------------------- java 类型 --------------------------------
export const JavaTypeMap = new Map();
JavaTypeMap.set('bit', 'Boolean');
JavaTypeMap.set('int', 'Integer');
JavaTypeMap.set('tinyint', 'Integer');
JavaTypeMap.set('smallint', 'Integer');
@ -37,6 +38,7 @@ export function getJavaType(dataType) {
// -------------------------------- js 类型 --------------------------------
export const JsTypeMap = new Map();
JsTypeMap.set('bit', 'Boolean');
JsTypeMap.set('int', 'Number');
JsTypeMap.set('tinyint', 'Number');
JsTypeMap.set('smallint', 'Number');
@ -56,11 +58,10 @@ JsTypeMap.set('date', 'Date');
JsTypeMap.set('datetime', 'Date');
export const JsTypeList = [
'Boolean', //
'Number', //
'String', //
'Date', //
'Boolean', //
'String', //
];
export function getJsType(dataType) {
@ -70,8 +71,9 @@ export function getJsType(dataType) {
// -------------------------------- 前端组件 --------------------------------
export const FrontComponentMap = new Map();
FrontComponentMap.set('bit', 'BooleanSelect');
FrontComponentMap.set('int', 'InputNumber');
FrontComponentMap.set('tinyint', 'BooleanSelect');
FrontComponentMap.set('tinyint', 'InputNumber');
FrontComponentMap.set('smallint', 'InputNumber');
FrontComponentMap.set('integer', 'InputNumber');
FrontComponentMap.set('year', 'Date');

5
smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form-delete.vue
View File

@ -68,11 +68,12 @@
if (deletedFlagColumn) {
deleteFlagColumnName.value = deletedFlagColumn.columnName;
}
console.log(deletedFlagColumn);
//表单
let deleteInfo = config.delete;
let deleteInfo = config.deleteInfo;
formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete ? deleteInfo.isSupportDelete : true;
formData.isSupportDelete = deleteInfo && deleteInfo.isSupportDelete;
formData.isPhysicallyDeleted = deleteInfo && deleteInfo.isPhysicallyDeleted ? deleteInfo.isPhysicallyDeleted : !deletedFlagColumn;
formData.deleteEnum = deleteInfo && deleteInfo.deleteEnum ? deleteInfo.deleteEnum : CODE_DELETE_ENUM.SINGLE_AND_BATCH.value;
}

2
smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/form/code-generator-table-config-form.vue
View File

@ -12,7 +12,7 @@
title="代码配置"
style=""
:open="visibleFlag"
:width="1000"
:width="1500"
:footerStyle="{ textAlign: 'right' }"
@close="onClose"
:maskClosable="false"

2
smart-admin-web/javascript-ant-design-vue3/src/views/support/code-generator/components/preview/code-generator-preview-modal.vue
View File

@ -11,7 +11,7 @@
<a-drawer
title="代码预览"
:open="visibleFlag"
:width="1200"
:width="1500"
:footerStyle="{ textAlign: 'right' }"
:bodyStyle="{ padding: '8px 24px' }"
@close="onClose"