From d6b6151aea494409e60196f9e1331e19c9013cad Mon Sep 17 00:00:00 2001
From: 〝走走停停 <1103914483@qq.com>
Date: 星期二, 08 十二月 2020 17:49:51 +0800
Subject: [PATCH] update ruoyi-ui/src/assets/styles/ruoyi.scss.
---
ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
index 0001785..65c2d7c 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/constant/GenConstants.java
@@ -22,8 +22,14 @@
/** 树名称字段 */
public static final String TREE_NAME = "treeName";
+ /** 上级菜单ID字段 */
+ public static final String PARENT_MENU_ID = "parentMenuId";
+
+ /** 上级菜单名称字段 */
+ public static final String PARENT_MENU_NAME = "parentMenuName";
+
/** 数据库字符串类型 */
- public static final String[] COLUMNTYPE_STR = { "char", "varchar", "narchar", "varchar2", "tinytext", "text",
+ public static final String[] COLUMNTYPE_STR = { "char", "varchar", "nvarchar", "varchar2", "tinytext", "text",
"mediumtext", "longtext" };
/** 数据库时间类型 */
@@ -31,7 +37,7 @@
/** 数据库数字类型 */
public static final String[] COLUMNTYPE_NUMBER = { "tinyint", "smallint", "mediumint", "int", "number", "integer",
- "bigint", "float", "float", "double", "decimal" };
+ "bit", "bigint", "float", "double", "decimal" };
/** 页面不需要编辑字段 */
public static final String[] COLUMNNAME_NOT_EDIT = { "id", "create_by", "create_time", "del_flag" };
@@ -68,6 +74,12 @@
/** 日期控件 */
public static final String HTML_DATETIME = "datetime";
+ /** 上传控件 */
+ public static final String HTML_UPLOAD_IMAGE = "uploadImage";
+
+ /** 富文本控件 */
+ public static final String HTML_EDITOR = "editor";
+
/** 字符串类型 */
public static final String TYPE_STRING = "String";
--
Gitblit v1.9.2