menu

src/main/java/com/xjrsoft/module/system/dto/AddMenuDto.java

@@ -47,6 +47,10 @@ public class AddMenuDto implements Serializable {
     @ApiModelProperty("菜单图标")
     private String icon;
 
+    @Length(max = 2000,message = "图标地址不能大于2000个字符！")
+    @ApiModelProperty("图标地址")
+    private String iconUrl;
+
     @NotNull(message = "菜单地址不能为空!")
     @Length(max = 100,message = "菜单地址不能大于100个字符！")
     @ApiModelProperty("地址")

src/main/java/com/xjrsoft/module/system/dto/UpdateMenuDto.java

@@ -47,6 +47,10 @@ public class UpdateMenuDto implements Serializable {
     @ApiModelProperty("菜单图标")
     private String icon;
 
+    @Length(max = 2000,message = "图标地址不能大于2000个字符！")
+    @ApiModelProperty("图标地址")
+    private String iconUrl;
+
     @NotNull(message = "菜单地址不能为空!")
     @Length(max = 100,message = "菜单地址不能大于100个字符！")
     @ApiModelProperty("地址")

src/main/java/com/xjrsoft/module/system/entity/Menu.java

@@ -47,6 +47,9 @@ public class Menu extends AuditEntity implements Serializable {
     @ApiModelProperty("菜单图标")
     private String icon;
 
+    @ApiModelProperty("图标地址")
+    private String iconUrl;
+
     @ApiModelProperty("地址")
     private String path;
 

src/main/java/com/xjrsoft/module/system/vo/MenuVo.java

@@ -2,6 +2,7 @@ package com.xjrsoft.module.system.vo;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import org.hibernate.validator.constraints.Length;
 
 import java.io.Serializable;
 
@@ -33,6 +34,9 @@ public class MenuVo implements Serializable {
     @ApiModelProperty("菜单图标")
     private String icon;
 
+    @ApiModelProperty("图标地址")
+    private String iconUrl;
+
     @ApiModelProperty("地址")
     private String path;
 

src/main/resources/sqlScript/4.1.1.sql

@@ -23,18 +23,18 @@ CREATE TABLE `xjr_code_schema`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `xjr_workflow_draft`;
 CREATE TABLE `xjr_workflow_draft`  (
-    `id` bigint NOT NULL,
-    `schema_id` bigint NULL DEFAULT NULL COMMENT '模板id',
-    `form_data` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '表单数据',
-    `task_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '流程任务id',
-    `data_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '数据id',
-    `delete_mark` int NOT NULL,
-    `enabled_mark` int NOT NULL,
-    `create_date` datetime NULL DEFAULT NULL,
-    `create_user_id` bigint NULL DEFAULT NULL,
-    `modify_date` datetime NULL DEFAULT NULL,
-    `modify_user_id` bigint NULL DEFAULT NULL,
-    PRIMARY KEY (`id`) USING BTREE
+   `id` bigint NOT NULL,
+   `schema_id` bigint NULL DEFAULT NULL COMMENT '模板id',
+   `form_data` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '表单数据',
+   `task_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '流程任务id',
+   `data_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '数据id',
+   `delete_mark` int NOT NULL,
+   `enabled_mark` int NOT NULL,
+   `create_date` datetime NULL DEFAULT NULL,
+   `create_user_id` bigint NULL DEFAULT NULL,
+   `modify_date` datetime NULL DEFAULT NULL,
+   `modify_user_id` bigint NULL DEFAULT NULL,
+   PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci ROW_FORMAT = DYNAMIC;
 
 -- ----------------------------
@@ -42,21 +42,21 @@ CREATE TABLE `xjr_workflow_draft`  (
 -- ----------------------------
 DROP TABLE IF EXISTS `xjr_workflow_special_menu`;
 CREATE TABLE `xjr_workflow_special_menu`  (
-    `id` bigint NOT NULL COMMENT '主键',
-    `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '功能名称',
-    `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '功能编码',
-    `menu_id` bigint NULL DEFAULT NULL COMMENT '菜单id',
-    `schema_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模板id',
-    `schema_auth_type` int NULL DEFAULT NULL COMMENT '模板权限类型 0 所有 1 指定',
-    `schema_auth_user_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '专项菜单使用人 如果 schema_auth_type == 1 才会有',
-    `field_auth_type` int NULL DEFAULT NULL COMMENT '字段权限 配置 0 所有 1指定',
-    `field_auth_user_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '专项菜单字段权限 指定成员 如果 field_auth_type == 1 才会有',
-    `field_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '表单字段配置',
-    `query_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '查询配置',
-    PRIMARY KEY (`id`) USING BTREE
+  `id` bigint NOT NULL COMMENT '主键',
+  `name` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '功能名称',
+  `code` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '功能编码',
+  `menu_id` bigint NULL DEFAULT NULL COMMENT '菜单id',
+  `schema_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '模板id',
+  `schema_auth_type` int NULL DEFAULT NULL COMMENT '模板权限类型 0 所有 1 指定',
+  `schema_auth_user_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '专项菜单使用人 如果 schema_auth_type == 1 才会有',
+  `field_auth_type` int NULL DEFAULT NULL COMMENT '字段权限 配置 0 所有 1指定',
+  `field_auth_user_id` varchar(4000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL DEFAULT NULL COMMENT '专项菜单字段权限 指定成员 如果 field_auth_type == 1 才会有',
+  `field_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '表单字段配置',
+  `query_config` text CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '查询配置',
+  PRIMARY KEY (`id`) USING BTREE
 ) ENGINE = InnoDB CHARACTER SET = utf8mb4 COLLATE = utf8mb4_0900_ai_ci COMMENT = '专项菜单表' ROW_FORMAT = DYNAMIC;
 
-
+ALTER TABLE xjr_form_template ADD COLUMN `config_json` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '界面设计及菜单设计部分json' AFTER enabled_mark;
 
 ALTER TABLE xjr_department ADD COLUMN `department_type` int NULL DEFAULT NULL COMMENT '组织类别，1：公司，0：部门' AFTER enabled_mark;
 
@@ -83,7 +83,7 @@ ALTER TABLE xjr_user ADD COLUMN `qq_number` varchar(100) CHARACTER SET utf8mb4 C
 ALTER TABLE xjr_user ADD COLUMN `birth_date` datetime(3) NULL DEFAULT NULL COMMENT '生日' AFTER enabled_mark;
 
 
-
+ALTER TABLE xjr_menu ADD COLUMN `icon_url` varchar(2000) CHARACTER SET utf8mb4 COLLATE utf8mb4_0900_ai_ci NULL COMMENT '图标地址' AFTER icon;