diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java index 83d631351..746531ec1 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/InnerGenConfigDO.java @@ -96,11 +96,6 @@ public class InnerGenConfigDO extends GenConfigDO { */ private boolean hasBigDecimalField; - /** - * 是否包含 List 字段 - */ - private boolean hasListField; - /** * 是否包含 Time 包字段 */ diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java index 51bdad604..0ba36fd2a 100644 --- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java +++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/service/impl/GeneratorServiceImpl.java @@ -367,11 +367,6 @@ private void pretreatment(InnerGenConfigDO genConfig) { if (TIME_PACKAGE_CLASS.contains(fieldType)) { genConfig.setHasTimeField(true); } - QueryTypeEnum queryType = fieldConfig.getQueryType(); - if (null != queryType && StrUtil.equalsAny(queryType.name(), QueryTypeEnum.IN.name(), QueryTypeEnum.NOT_IN - .name(), QueryTypeEnum.BETWEEN.name())) { - genConfig.setHasListField(true); - } // 字典码 if (StrUtil.isNotBlank(fieldConfig.getDictCode())) { genConfig.setHasDictField(true); diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl index ebb6b580b..3896a0f1f 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/backend/Query.ftl @@ -8,9 +8,6 @@ import java.time.*; <#if hasBigDecimalField> import java.math.BigDecimal; -<#if hasListField> -import java.util.List; - import lombok.Data; @@ -41,7 +38,7 @@ public class ${className} implements Serializable { @Schema(description = "${fieldConfig.comment}") @Query(type = QueryType.${fieldConfig.queryType}) <#if fieldConfig.queryType = 'IN' || fieldConfig.queryType = 'NOT_IN' || fieldConfig.queryType = 'BETWEEN'> - private List<${fieldConfig.fieldType}> ${fieldConfig.fieldName}; + private ${fieldConfig.fieldType}[] ${fieldConfig.fieldName}; <#else> private ${fieldConfig.fieldType} ${fieldConfig.fieldName}; diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl index a74ab452b..e42ee3ce2 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/AddModal.ftl @@ -35,11 +35,14 @@ const { <#list dictCodes as dictCode>${dictCode}<#if dictCode_has_next>,>(() => [ <#list fieldConfigs as fieldConfig> <#if fieldConfig.showInForm> { @@ -79,10 +82,6 @@ const columns: Columns = reactive([ ]) -const { form, resetForm } = useForm({ - // todo 待补充 -}) - // 重置 const reset = () => { formRef.value?.formRef?.resetFields() diff --git a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl index 6fb010cc8..b2fa0249f 100644 --- a/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl +++ b/continew-plugin/continew-plugin-generator/src/main/resources/templates/frontend/index.ftl @@ -83,12 +83,13 @@