From 90e3bc0595fdb692644ed7fd9b1a3735962cb68b Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Mon, 4 Nov 2024 21:59:08 +0800
Subject: [PATCH] =?UTF-8?q?chore:=20=E4=BC=98=E5=8C=96=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../generator/model/entity/InnerGenConfigDO.java      |  5 -----
 .../generator/service/impl/GeneratorServiceImpl.java  |  5 -----
 .../src/main/resources/templates/backend/Query.ftl    |  5 +----
 .../main/resources/templates/frontend/AddModal.ftl    | 11 +++++------
 .../src/main/resources/templates/frontend/index.ftl   |  5 +++--
 5 files changed, 9 insertions(+), 22 deletions(-)

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 83d63135..746531ec 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 51bdad60..0ba36fd2 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 @@ public class GeneratorServiceImpl implements GeneratorService {
             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 ebb6b580..3896a0f1 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>
-<#if hasListField>
-import java.util.List;
-</#if>
 
 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};
     </#if>
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 a74ab452..e42ee3ce 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>,</#if></
 
 const options: Options = {
   form: {},
-  col: { xs: 24, sm: 24, md: 24, lg: 24, xl: 24, xxl: 24 },
   btns: { hide: true }
 }
 
-const columns: Columns = reactive([
+const { form, resetForm } = useForm({
+  // todo 待补充
+})
+
+const columns = computed<Columns<typeof form>>(() => [
 <#list fieldConfigs as fieldConfig>
   <#if fieldConfig.showInForm>
   {
@@ -79,10 +82,6 @@ const columns: Columns = reactive([
 </#list>
 ])
 
-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 6fb010cc..b2fa0249 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 @@
       </#list>
       <template #action="{ record }">
         <a-space>
-          <a-link v-permission="['${apiModuleName}:${apiName}:list']" @click="onDetail(record)">查看</a-link>
-          <a-link v-permission="['${apiModuleName}:${apiName}:update']" @click="onUpdate(record)">修改</a-link>
+          <a-link v-permission="['${apiModuleName}:${apiName}:list']" title="查看" @click="onDetail(record)">查看</a-link>
+          <a-link v-permission="['${apiModuleName}:${apiName}:update']" title="修改" @click="onUpdate(record)">修改</a-link>
           <a-link
             v-permission="['${apiModuleName}:${apiName}:delete']"
             status="danger"
             :disabled="record.disabled"
+            title="删除"
             @click="onDelete(record)"
           >
             删除