From 6b64ae3e07a76d844eec4bd05302126cbcaca31b Mon Sep 17 00:00:00 2001
From: Charles7c <charles7c@126.com>
Date: Sat, 23 Nov 2024 23:11:25 +0800
Subject: [PATCH] =?UTF-8?q?fix(generator):=20=E4=BF=AE=E5=A4=8D=20columnSi?=
 =?UTF-8?q?ze=20=E7=B1=BB=E5=9E=8B=E9=94=99=E8=AF=AF=EF=BC=8C=E5=85=BC?=
 =?UTF-8?q?=E5=AE=B9=E6=97=A0=E6=B3=A8=E9=87=8A=E5=AD=97=E6=AE=B5=E9=85=8D?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/generator/model/entity/FieldConfigDO.java      | 9 ++++++---
 .../generator/service/impl/GeneratorServiceImpl.java     | 3 +--
 .../src/main/resources/templates/frontend/AddModal.ftl   | 4 ++--
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java
index af488ea3..597f37f9 100644
--- a/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java
+++ b/continew-plugin/continew-plugin-generator/src/main/java/top/continew/admin/generator/model/entity/FieldConfigDO.java
@@ -16,7 +16,6 @@
 
 package top.continew.admin.generator.model.entity;
 
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.db.meta.Column;
 import com.baomidou.mybatisplus.annotation.FieldFill;
@@ -83,7 +82,7 @@ public class FieldConfigDO implements Serializable {
      * 列大小
      */
     @Schema(description = "列大小", example = "255")
-    private String columnSize;
+    private Long columnSize;
 
     /**
      * 字段名称
@@ -165,7 +164,7 @@ public class FieldConfigDO implements Serializable {
         this.setTableName(column.getTableName());
         this.setColumnName(column.getName());
         this.setColumnType(column.getTypeName());
-        this.setColumnSize(Convert.toStr(column.getSize()));
+        this.setColumnSize(column.getSize());
         this.setComment(column.getComment());
         this.setIsRequired(!column.isPk() && !column.isNullable());
         this.setShowInList(true);
@@ -182,4 +181,8 @@ public class FieldConfigDO implements Serializable {
         String[] arr = StrUtil.splitToArray(columnType, StringConstants.SPACE);
         this.columnType = arr.length > 1 ? arr[0].toLowerCase() : columnType.toLowerCase();
     }
+
+    public void setComment(String comment) {
+        this.comment = StrUtil.nullToDefault(comment, StringConstants.EMPTY);
+    }
 }
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 58686ad3..9a495489 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
@@ -18,7 +18,6 @@ package top.continew.admin.generator.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.convert.Convert;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.ClassUtil;
 import cn.hutool.core.util.ObjectUtil;
@@ -157,7 +156,7 @@ public class GeneratorServiceImpl implements GeneratorService {
             // 更新已有字段配置
             if (null != fieldConfig.getCreateTime()) {
                 fieldConfig.setColumnType(column.getTypeName());
-                fieldConfig.setColumnSize(Convert.toStr(column.getSize()));
+                fieldConfig.setColumnSize(column.getSize());
             }
             String fieldType = typeMappingEntrySet.stream()
                 .filter(entry -> entry.getValue().contains(fieldConfig.getColumnType()))
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 83983352..92c0e24d 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
@@ -18,7 +18,7 @@ import { Message } from '@arco-design/web-vue'
 import { useWindowSize } from '@vueuse/core'
 import { get${classNamePrefix}, add${classNamePrefix}, update${classNamePrefix} } from '@/apis/${apiModuleName}/${apiName}'
 import { type Columns, GiForm, type Options } from '@/components/GiForm'
-import { useForm } from '@/hooks'
+import { useResetReactive } from '@/hooks'
 import { useDict } from '@/hooks/app'
 
 const emit = defineEmits<{
@@ -41,7 +41,7 @@ const options: Options = {
   btns: { hide: true },
 }
 
-const { form, resetForm } = useForm({
+const [form, resetForm] = useResetReactive({
   // todo 待补充
 })