Fix 修复代码生成的模板问题

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/java/mapper.java.vm

@@ -3,6 +3,7 @@ package ${packageName}.mapper;
 import ${packageName}.domain.${ClassName};
 import ${packageName}.domain.vo.${ClassName}Vo;
 import com.vber.common.core.mapper.BaseMapperPlus;
+import org.springframework.stereotype.Repository;
 
 /**
  * ${functionName}Mapper接口

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/java/vo.java.vm

@@ -9,6 +9,7 @@ import com.vber.common.annotation.ExcelDictFormat;
 import com.vber.common.convert.ExcelDictConvert;
 import lombok.Data;
 
+import java.io.Serializable;
 import java.util.Date;
 
 
@@ -20,7 +21,7 @@ import java.util.Date;
  */
 @Data
 @ExcelIgnoreUnannotated
-public class ${ClassName}Vo {
+public class ${ClassName}Vo implements Serializable {
 
     private static final long serialVersionUID = 1L;
 

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/sql/oracle/sql.vm

@@ -1,6 +1,6 @@
 -- 菜单 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate, '', null, '${functionName}菜单');
+values(${table.menuIds[0]}, '${functionName}管理', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate, '', null, '${functionName}菜单');
 
 -- 按钮 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon,btn_class, btn_script, create_by, create_time, update_by, update_time, remark)
@@ -17,3 +17,15 @@ values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon,btn_class, btn_script, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1,  0, 'F', '0', '0', '${permissionPrefix}:export', 'cloud-download', 'btn btn-light-info','handleExport', 'admin', sysdate, '', null, '');
+
+insert into sys_role_menu values ('1', ${table.menuIds[1]});
+insert into sys_role_menu values ('1', ${table.menuIds[2]});
+insert into sys_role_menu values ('1', ${table.menuIds[3]});
+insert into sys_role_menu values ('1', ${table.menuIds[4]});
+insert into sys_role_menu values ('1', ${table.menuIds[5]});
+
+insert into sys_role_menu values ('2', ${table.menuIds[1]});
+insert into sys_role_menu values ('2', ${table.menuIds[2]});
+insert into sys_role_menu values ('2', ${table.menuIds[3]});
+insert into sys_role_menu values ('2', ${table.menuIds[4]});
+insert into sys_role_menu values ('2', ${table.menuIds[5]});

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/sql/postgres/sql.vm

@@ -1,6 +1,6 @@
 -- 菜单 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', now(), '', null, '${functionName}菜单');
+values(${table.menuIds[0]}, '${functionName}管理', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', now(), '', null, '${functionName}菜单');
 
 -- 按钮 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon,btn_class, btn_script, create_by, create_time, update_by, update_time, remark)
@@ -18,3 +18,14 @@ values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon,btn_class, btn_script, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', 'cloud-download', 'btn btn-light-info','handleExport', 'admin', now(), '', null, '');
 
+insert into sys_role_menu values ('1', ${table.menuIds[1]});
+insert into sys_role_menu values ('1', ${table.menuIds[2]});
+insert into sys_role_menu values ('1', ${table.menuIds[3]});
+insert into sys_role_menu values ('1', ${table.menuIds[4]});
+insert into sys_role_menu values ('1', ${table.menuIds[5]});
+
+insert into sys_role_menu values ('2', ${table.menuIds[1]});
+insert into sys_role_menu values ('2', ${table.menuIds[2]});
+insert into sys_role_menu values ('2', ${table.menuIds[3]});
+insert into sys_role_menu values ('2', ${table.menuIds[4]});
+insert into sys_role_menu values ('2', ${table.menuIds[5]});

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/sql/sql.vm

@@ -1,19 +1,31 @@
 -- 菜单 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
+values(${table.menuIds[0]}, '${functionName}管理', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}', '#', 'admin', sysdate(), '', null, '${functionName}菜单');
 
 -- 按钮 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, btn_class, btn_script, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[1]}, '${functionName}查询', ${table.menuIds[0]}, '1',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:query', 'eye','','', 'admin', sysdate(), '', null, '');
 
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon,btn_class, btn_script, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[2]}, '${functionName}新增', ${table.menuIds[0]}, '2',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:add', 'plus-square', 'btn btn-light-primary','handleCreate', 'admin', sysdate(), '', null, '');
 
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, btn_class, btn_script,create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[3]}, '${functionName}修改', ${table.menuIds[0]}, '3',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:edit', 'pencil-square', 'btn btn-light-success','handleUpdate@1', 'admin', sysdate(), '', null, '');
 
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, btn_class, btn_script,create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:remove', 'dash-square', 'btn btn-light-danger','handleDelete@0', 'admin', sysdate(), '', null, '');
 
-insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
+insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, btn_class, btn_script,create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', 'cloud-download', 'btn btn-light-info','handleExport', 'admin', sysdate(), '', null, '');
+
+insert into sys_role_menu values ('1', ${table.menuIds[1]});
+insert into sys_role_menu values ('1', ${table.menuIds[2]});
+insert into sys_role_menu values ('1', ${table.menuIds[3]});
+insert into sys_role_menu values ('1', ${table.menuIds[4]});
+insert into sys_role_menu values ('1', ${table.menuIds[5]});
+
+insert into sys_role_menu values ('2', ${table.menuIds[1]});
+insert into sys_role_menu values ('2', ${table.menuIds[2]});
+insert into sys_role_menu values ('2', ${table.menuIds[3]});
+insert into sys_role_menu values ('2', ${table.menuIds[4]});
+insert into sys_role_menu values ('2', ${table.menuIds[5]});

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/sql/sqlserver/sql.vm

@@ -1,6 +1,6 @@
 -- 菜单 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon, create_by, create_time, update_by, update_time, remark)
-values(${table.menuIds[0]}, '${functionName}', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', getdate(), '', null, '${functionName}菜单');
+values(${table.menuIds[0]}, '${functionName}管理', '${parentMenuId}', '1', '${businessName}', '${moduleName}/${businessName}/index', 1, 0, 'C', '0', '0', '${permissionPrefix}:list', '#', 'admin', getdate(), '', null, '${functionName}菜单');
 
 -- 按钮 SQL
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon,btn_class, btn_script, create_by, create_time, update_by, update_time, remark)
@@ -17,3 +17,15 @@ values(${table.menuIds[4]}, '${functionName}删除', ${table.menuIds[0]}, '4',
 
 insert into sys_menu (menu_id, menu_name, parent_id, order_num, path, component, is_frame, is_cache, menu_type, visible, status, perms, icon,btn_class, btn_script, create_by, create_time, update_by, update_time, remark)
 values(${table.menuIds[5]}, '${functionName}导出', ${table.menuIds[0]}, '5',  '#', '', 1, 0, 'F', '0', '0', '${permissionPrefix}:export', 'cloud-download', 'btn btn-light-info','handleExport', 'admin', getdate(), '', null, '');
+
+insert into sys_role_menu values ('1', ${table.menuIds[1]});
+insert into sys_role_menu values ('1', ${table.menuIds[2]});
+insert into sys_role_menu values ('1', ${table.menuIds[3]});
+insert into sys_role_menu values ('1', ${table.menuIds[4]});
+insert into sys_role_menu values ('1', ${table.menuIds[5]});
+
+insert into sys_role_menu values ('2', ${table.menuIds[1]});
+insert into sys_role_menu values ('2', ${table.menuIds[2]});
+insert into sys_role_menu values ('2', ${table.menuIds[3]});
+insert into sys_role_menu values ('2', ${table.menuIds[4]});
+insert into sys_role_menu values ('2', ${table.menuIds[5]});

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/ts/api.ts.vm

@@ -25,12 +25,12 @@ class ${businessName}Api {
     addOrUpdate${BusinessName} = (data: any) => {
         return new Promise((r) => {
             if (data.${pkColumn.javaField}) {
-                update${BusinessName}(data).then((res: any) => {
+                this.update${BusinessName}(data).then((res: any) => {
                     message.msgSuccess("修改成功")
                     r(res)
                 })
             } else {
-                add${BusinessName}(data).then((res: any) => {
+                this.add${BusinessName}(data).then((res: any) => {
                     message.msgSuccess("新增成功")
                     r(res)
                 })

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/vue/index-tree.vue.vm

@@ -122,7 +122,7 @@
             #end
         #end
     ] as any,
-    permission: permissionNames.${ModuleName}${BusinessName}List,
+    permission: permissionNames.${ModuleName}${BusinessName},
     handleBtns: [],
     handleFuns: {
       handleUpdate: () => {

SERVER/VberAdminPlus/vber-generator/src/main/resources/vm/vue/index.vue.vm

@@ -121,7 +121,7 @@
             #end
         #end
     ] as any,
-    permission: permissionNames.${ModuleName}${BusinessName}List,
+    permission: permissionNames.${ModuleName}${BusinessName},
     handleBtns: [],
     handleFuns: {
       handleUpdate: () => {