From 4bbdc1e87bc4df9e7d41b50388364155720c8723 Mon Sep 17 00:00:00 2001
From: RuoYi <yzz_ivy@163.com>
Date: 星期日, 15 三月 2020 20:25:58 +0800
Subject: [PATCH] 修复TagsView组件中，鼠标滚轮按下的时候，可以关闭不可关闭的tag
---
ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java | 39 ++++++++++++++++++++++++++++++++-------
1 files changed, 32 insertions(+), 7 deletions(-)
diff --git a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
index 7548bc9..6ed760c 100644
--- a/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
+++ b/ruoyi/src/main/java/com/ruoyi/framework/web/domain/BaseEntity.java
@@ -4,7 +4,6 @@
import java.util.Date;
import java.util.HashMap;
import java.util.Map;
-import com.alibaba.fastjson.JSON;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -40,9 +39,16 @@
/** 鏁版嵁鏉冮檺 */
private String dataScope;
- /** 璇锋眰鍙傛暟 */
+ /** 寮�濮嬫椂闂� */
@JsonIgnore
- private String params;
+ private String beginTime;
+
+ /** 缁撴潫鏃堕棿 */
+ @JsonIgnore
+ private String endTime;
+
+ /** 璇锋眰鍙傛暟 */
+ private Map<String, Object> params;
public String getSearchValue()
{
@@ -114,17 +120,36 @@
this.dataScope = dataScope;
}
- @SuppressWarnings("unchecked")
+ public String getBeginTime()
+ {
+ return beginTime;
+ }
+
+ public void setBeginTime(String beginTime)
+ {
+ this.beginTime = beginTime;
+ }
+
+ public String getEndTime()
+ {
+ return endTime;
+ }
+
+ public void setEndTime(String endTime)
+ {
+ this.endTime = endTime;
+ }
+
public Map<String, Object> getParams()
{
if (params == null)
{
- return new HashMap<>();
+ params = new HashMap<>();
}
- return JSON.parseObject(params, Map.class);
+ return params;
}
- public void setParams(String params)
+ public void setParams(Map<String, Object> params)
{
this.params = params;
}
--
Gitblit v1.9.3