ContiNew/continew-admin
1
1
Fork 0
mirror of https://github.com/continew-org/continew-admin.git synced 2025-11-09 16:57:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: 修复 FormTypeEnum 错误，并优化命名

Browse Source
This commit is contained in:
Charles7c
2024-05-24 09:21:50 +08:00
parent 8632b22bd5
commit cf18c1046b
3 changed files with 48 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
continew-admin-generator/src/main/java/top/continew/admin/generator/enums/FormTypeEnum.java
View File

@@ -32,49 +32,61 @@ import top.continew.starter.data.mybatis.plus.base.IBaseEnum;
public enum FormTypeEnum implements IBaseEnum<Integer> { public enum FormTypeEnum implements IBaseEnum<Integer> {
/** /**
* 文本框 * 输入框
*/ */
TEXT(1, "文本框"), INPUT(1, "输入框"),
/** /**
* 文本域 * 数字输入框
*/ */
TEXT_AREA(2, "文本域"), INPUT_NUMBER(2, "数字输入框"),
/**
* 密码输入框
*/
INPUT_PASSWORD(3, "密码输入框"),
/** /**
* 下拉框 * 下拉框
*/ */
SELECT(3, "下拉框"), SELECT(4, "下拉框"),
/** /**
* 单选框 * 单选框
*/ */
RADIO(4, "单选框"), RADIO(5, "单选框"),
/**
* 日期框
*/
DATE(5, "日期框"),
/**
* 日期时间框
*/
DATE_TIME(6, "日期时间框"),;
/**
* 树形选择
*/
TREE_SELECT(7, "树选择"),
/**
* 复选框
*/
CHECK_GROUP(8, "复选框"),
/**
* 数字输入框
*/
INPUT_NUMBER(9, "数字输入框"),
/**
* 密码输入框
*/
INPUT_PASSWORD(10, "密码输入框"),
/** /**
* 开关 * 开关
*/ */
SWITCH(11, "开关"),; SWITCH(6, "开关"),
/**
* 复选框
*/
CHECK_BOX(7, "复选框"),
/**
* 文本域
*/
TEXT_AREA(8, "文本域"),
/**
* 日期时间框
*/
DATE_TIME(9, "日期时间框"),
/**
* 日期框
*/
DATE(10, "日期框"),
/**
* 树形选择
*/
TREE_SELECT(11, "树选择"),
;
private final Integer value; private final Integer value;
private final String description; private final String description;
} }

2
continew-admin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java
View File

@@ -159,7 +159,7 @@ public class FieldConfigDO implements Serializable {
this.setShowInList(true); this.setShowInList(true);
this.setShowInForm(this.getIsRequired()); this.setShowInForm(this.getIsRequired());
this.setShowInQuery(this.getIsRequired()); this.setShowInQuery(this.getIsRequired());
this.setFormType(FormTypeEnum.TEXT); this.setFormType(FormTypeEnum.INPUT);
this.setQueryType("String".equals(this.getFieldType()) ? QueryTypeEnum.LIKE : QueryTypeEnum.EQ); this.setQueryType("String".equals(this.getFieldType()) ? QueryTypeEnum.LIKE : QueryTypeEnum.EQ);
} }

8
continew-admin-generator/src/main/resources/templates/frontend/AddModal.ftl
View File

@@ -31,9 +31,9 @@ const formRef = ref<InstanceType<typeof GiForm>>()
<#list fieldConfigs as fieldConfig> <#list fieldConfigs as fieldConfig>
<#if fieldConfig.showInForm> <#if fieldConfig.showInForm>
<#-- SELECT/RADIO/CHECK_GROUP/TREE_SELECT控件从服务器端获取数据 --> <#-- SELECT/RADIO/CHECK_BOX/TREE_SELECT控件从服务器端获取数据 -->
<#if fieldConfig.formType = 'SELECT' || fieldConfig.formType = 'RADIO' <#if fieldConfig.formType = 'SELECT' || fieldConfig.formType = 'RADIO'
|| fieldConfig.formType = 'CHECK_GROUP' || fieldConfig.formType = 'TREE_SELECT'> || fieldConfig.formType = 'CHECK_BOX' || fieldConfig.formType = 'TREE_SELECT'>
const { ${fieldConfig.columnName}_enum } = useDict('${fieldConfig.columnName}_enum') const { ${fieldConfig.columnName}_enum } = useDict('${fieldConfig.columnName}_enum')
</#if> </#if>
</#if> </#if>
@@ -51,7 +51,7 @@ const columns: Columns = [
{ {
label: '${fieldConfig.comment}', label: '${fieldConfig.comment}',
field: '${fieldConfig.fieldName}', field: '${fieldConfig.fieldName}',
<#if fieldConfig.formType = 'TEXT'> <#if fieldConfig.formType = 'INPUT'>
type: 'input', type: 'input',
<#elseif fieldConfig.formType = 'TEXT_AREA'> <#elseif fieldConfig.formType = 'TEXT_AREA'>
type: 'textarea', type: 'textarea',
@@ -65,7 +65,7 @@ const columns: Columns = [
type: 'input-password', type: 'input-password',
<#elseif fieldConfig.formType = 'SWITCH'> <#elseif fieldConfig.formType = 'SWITCH'>
type: 'switch', type: 'switch',
<#elseif fieldConfig.formType = 'CHECK_GROUP'> <#elseif fieldConfig.formType = 'CHECK_BOX'>
type: 'check-group', type: 'check-group',
props: { props: {
options: ${fieldConfig.columnName}_enum, options: ${fieldConfig.columnName}_enum,