fix: DataList2Chart

getrebuild · Mar 14, 2024 · 4fb3632 · 4fb3632
1 parent 9d84a38
commit 4fb3632
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/src/main/java/com/rebuild/core/service/dashboard/charts/DataList2Chart.java b/src/main/java/com/rebuild/core/service/dashboard/charts/DataList2Chart.java
@@ -60,15 +60,17 @@ public JSON build() {
         }
 
         int pageSize = config.getJSONObject("option").getIntValue("pageSize");
-        if (pageSize == 0) pageSize = 40;
+        if (pageSize <= 0) pageSize = 40;
+        if (pageSize >= 2000) pageSize = 2000;
 
         JSONObject listConfig = new JSONObject();
         listConfig.put("pageNo", 1);
-        listConfig.put("pageSize", Math.max(pageSize, 1));
+        listConfig.put("pageSize", pageSize);
         listConfig.put("reload", false);
         listConfig.put("statsField", false);
         listConfig.put("entity", entity.getName());
         listConfig.put("fields", fields);
+        listConfig.put("filter", config.getJSONObject("filter"));
         if (sort != null) listConfig.put("sort", sort);
 
         DataListBuilder builder = new DataListBuilderImpl(listConfig, getUser());

diff --git a/src/main/java/com/rebuild/core/service/query/AdvFilterParser.java b/src/main/java/com/rebuild/core/service/query/AdvFilterParser.java
@@ -145,9 +145,10 @@ public String toSqlWhere() {
             String quickFields = filterExpr.getString("quickFields");
             JSONArray quickItems = buildQuickFilterItems(quickFields, 1);
 
-            // v3.6-b4 值1|值2 UNTEST
+//            // v3.6-b4 值1|值2 UNTEST
+//            // 转义可输入 \|
 //            JSONObject values = filterExpr.getJSONObject("values");
-//            String[] valuesPlus = values.values().iterator().next().toString().split("\\|");
+//            String[] valuesPlus = values.values().iterator().next().toString().split("(?<!\\\\)\\|");
 //            if (valuesPlus.length > 1) {
 //                values.clear();
 //                values.put("1", valuesPlus[0].trim());
@@ -161,7 +162,6 @@ public String toSqlWhere() {
 //            }
 
             filterExpr.put("items", quickItems);
-            System.out.println(filterExpr);
         }
 
         JSONArray items = filterExpr.getJSONArray("items");
@@ -201,7 +201,7 @@ public String toSqlWhere() {
         } else if ("AND".equalsIgnoreCase(equation)) {
             return "( " + StringUtils.join(indexItemSqls.values(), " and ") + " )";
         } else {
-            // 高级表达式 eg. (1 AND 2) or (3 AND 4)
+            // 高级表达式 eg: (1 AND 2) or (3 AND 4)
             String[] tokens = equation.toLowerCase().split(" ");
             List<String> itemSqls = new ArrayList<>();
             for (String token : tokens) {