Sfoglia il codice sorgente

fix 修复代码生成模板部分问题

Yue 9 mesi fa
parent
commit
daebe509a3

+ 6 - 7
SERVER/VberAdminPlusV3/.script/sql/admin.sql

@@ -852,9 +852,8 @@ VALUES
 
     -- 系统工具
     (90, '系统工具', '0', 90, 'tool', NULL, '', 1, 0, 'M', '0', '0', '', 'code-slash', '', '', 100, 1, SYSDATE(), NULL,
-     NULL, '系统工具目录'), #(140, '表单构建', 90, '1', 'build', 'tool/build/index', '', 1, 0, 'C', '0', '0',
-                              'tool:build', 'file-code', '', '', 100, 1, sysdate(), null, null, '表单构建菜单'),
-    (141, '代码生成', 90, 2, 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen', 'code-square', '', '', 100,
+     NULL, '系统工具目录'),
+    (140, '代码生成', 90, 2, 'gen', 'tool/gen/index', '', 1, 0, 'C', '0', '0', 'tool:gen', 'code-square', '', '', 100,
      1, SYSDATE(), NULL, NULL, '代码生成菜单'),
     (1101, '生成查询', 141, 1, '#', '', '', 1, 0, 'F', '0', '0', 'tool:gen:query', 'eye', '', '', 100, 1, SYSDATE(),
      NULL, NULL, ''),
@@ -994,10 +993,10 @@ VALUES (1, '000000', '用户管理-账号初始密码', 'sys.user.initPassword',
 -- ----------------------------
 -- 初始化-公告信息表数据
 -- ----------------------------
-#
-INSERT INTO sys_notice (notice_id, tenant_id, notice_title, notice_type, notice_content, status, create_org, create_by, create_time, update_by, update_time, remark)
-# VALUES ('1', '000000', '温馨提醒:2018-07-01 新版本发布啦', 2, '新版本内容', '0', 100, 1, SYSDATE(), NULL, NULL, '管理员'),
-#        (2, '000000', '维护通知:2018-07-01 系统凌晨维护', '1', '维护内容', '0', 100, 1, SYSDATE(), NULL, NULL, '管理员');
+-- #
+-- INSERT INTO sys_notice (notice_id, tenant_id, notice_title, notice_type, notice_content, status, create_org, create_by, create_time, update_by, update_time, remark)
+-- # VALUES ('1', '000000', '温馨提醒:2018-07-01 新版本发布啦', 2, '新版本内容', '0', 100, 1, SYSDATE(), NULL, NULL, '管理员'),
+-- #        (2, '000000', '维护通知:2018-07-01 系统凌晨维护', '1', '维护内容', '0', 100, 1, SYSDATE(), NULL, NULL, '管理员');
 
 -- ----------------------------
 -- 初始化-文件服务配置表数据

+ 4 - 0
SERVER/VberAdminPlusV3/vber-modules/vber-generator/src/main/java/com/vber/generator/domain/GenTableColumn.java

@@ -216,6 +216,10 @@ public class GenTableColumn extends BaseEntity {
         return isUsableColumn(javaField);
     }
 
+    public int getNumColumn() {
+        return javaType.equals("Long") || javaType.equals("Integer") ? 1 : 0;
+    }
+
     public String readConverterExp() {
         String remarks = StringUtils.substringBetween(this.columnComment, "(", ")");
         StringBuffer sb = new StringBuffer();

+ 3 - 3
SERVER/VberAdminPlusV3/vber-modules/vber-generator/src/main/resources/vm/vue/view-tree.vue.vm

@@ -54,7 +54,7 @@
             #end
         #end
       {field: "actions", name: `操作`, width: 150},
-    ],
+    ] as any[],
     queryParams: {
         #foreach ($column in $columns)
             #set($field=$column.javaField)
@@ -155,7 +155,7 @@
               },
             #end
         #end
-    ] as any,
+    ] as any[],
     permission: "${permissionPrefix}",
     handleBtns: [],
     handleFuns: {
@@ -303,7 +303,7 @@
                 #end
             #end
         #end
-    ] as any,
+    ] as any[],
     resetForm: () => {
       form.value = emptyFormData.value
       get${BusinessName}TreeSelect()

+ 3 - 3
SERVER/VberAdminPlusV3/vber-modules/vber-generator/src/main/resources/vm/vue/view.vue.vm

@@ -53,7 +53,7 @@
             #end
         #end
       {field: "actions", name: `操作`, width: 150},
-    ],
+    ] as any[],
     queryParams: {
         #foreach ($column in $columns)
             #set($field=$column.javaField)
@@ -154,7 +154,7 @@
               },
             #end
         #end
-    ] as any,
+    ] as any[],
     permission: "${permissionPrefix}",
     handleBtns: [],
     handleFuns: {
@@ -288,7 +288,7 @@
                 #end
             #end
         #end
-    ] as any,
+    ] as any[],
     resetForm: () => {
       form.value = emptyFormData.value
     },