From 785acd7d98c77d0e962e31c7d4609b8abf252e57 Mon Sep 17 00:00:00 2001
From: lbw <wangiegie@163.com>
Date: Fri, 6 Jan 2023 11:48:07 +0800
Subject: [PATCH] =?UTF-8?q?:rewind:=20=E5=9B=9E=E6=BB=9A=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E7=94=9F=E6=88=90=E7=9A=84=E9=83=A8=E5=88=86=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E7=9A=84=E5=8D=95=E5=8F=8C=E5=BC=95=E5=8F=B7=E8=A7=84=E5=88=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 db/8pigxx_codegen.sql                         |  2 +-
 .../main/resources/template/avue/crud.js.vm   | 27 +++++++++----------
 2 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/db/8pigxx_codegen.sql b/db/8pigxx_codegen.sql
index 691b5745b..d7e70842f 100644
--- a/db/8pigxx_codegen.sql
+++ b/db/8pigxx_codegen.sql
@@ -62,7 +62,7 @@ CREATE TABLE `gen_form_conf`
 (
     `id`          bigint(20) NOT NULL COMMENT 'ID',
     `table_name`  varchar(64) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci DEFAULT NULL,
-    `form_info`   json       NOT NULL COMMENT '表单信息',
+    `form_info` text COLLATE utf8mb4_general_ci NOT NULL COMMENT '表单信息',
     `create_time` datetime                                                     DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
     `update_time` datetime                                                     DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '修改时间',
     `del_flag`    char(1) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci     DEFAULT '0',
diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/avue/crud.js.vm b/pigx-visual/pigx-codegen/src/main/resources/template/avue/crud.js.vm
index 88de19521..0abf8c0e7 100644
--- a/pigx-visual/pigx-codegen/src/main/resources/template/avue/crud.js.vm
+++ b/pigx-visual/pigx-codegen/src/main/resources/template/avue/crud.js.vm
@@ -1,20 +1,19 @@
 export const tableOption = {
-  'border': true,
-  'index': true,
-  'indexLabel': '序号',
-  'stripe': true,
-  'menuAlign': 'center',
-  'align': 'center',
-  'searchMenuSpan': 6,
-  'column': [
+  "border": true,
+  "index": true,
+  "indexLabel": "序号",
+  "stripe": true,
+  "menuAlign": "center",
+  "align": "center",
+  "searchMenuSpan": 6,
+  "column": [
 #foreach ($column in $columns)
-    {
-      'type': 'input',
-      'label': '$column.comments',
-      'prop': '$column.lowerAttrName',
-      'span': 12
+	  {
+      "type": "input",
+      "label": "$column.comments",
+      "prop": "$column.lowerAttrName",
+      "span": 12
     }#if($foreach.hasNext),#end
 #end
   ]
 }
-