From f528f729031e54d7f73ed4c30bed102a2a4f725f Mon Sep 17 00:00:00 2001
From: JEECG <445654970@qq.com>
Date: Tue, 8 Oct 2024 22:33:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=87=E7=BA=A7=E4=BB=AA=E8=A1=A8=E7=9B=98?=
 =?UTF-8?q?=E5=88=B0=E6=9C=80=E6=96=B0=E7=89=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jeecg-system-biz/pom.xml                  |  3 +-
 .../JimuDragExternalServiceImpl.java          | 40 ++++++++++++++-----
 jeecg-boot/pom.xml                            |  4 +-
 3 files changed, 33 insertions(+), 14 deletions(-)

diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml b/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
index b374603f7..bd7a37434 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/pom.xml
@@ -36,8 +36,7 @@
 		</dependency>
 		<dependency>
 			<groupId>org.jeecgframework.jimureport</groupId>
-			<artifactId>drag-free-springboot3</artifactId>
-			<version>1.1.2</version>
+			<artifactId>jimureport-dashboard-spring-boot3-starter</artifactId>
 		</dependency>
 	<!-- 积木报表 mongo redis 支持包 
 		<dependency>
diff --git a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java
index 5836dfe12..eb865bb5b 100644
--- a/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java
+++ b/jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/config/jimureport/JimuDragExternalServiceImpl.java
@@ -44,18 +44,38 @@ public class JimuDragExternalServiceImpl implements IOnlDragExternalService {
      * @return key = dictCode ； value=对应的字典项
      */
     @Override
-    public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList) {
+    public Map<String, List<DragDictModel>> getManyDictItems(List<String> codeList, List<JSONObject> tableDictList) {
         Map<String, List<DragDictModel>> manyDragDictItems  = new HashMap<>();
-        Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
-        dictItemsMap.forEach((k,v)->{
-            List<DragDictModel> dictItems  = new ArrayList<>();
-            v.forEach(dictItem->{
-                DragDictModel dictModel = new DragDictModel();
-                BeanUtils.copyProperties(dictItem,dictModel);
-                dictItems.add(dictModel);
+        if(!CollectionUtils.isEmpty(codeList)){
+            Map<String, List<DictModel>> dictItemsMap = sysBaseApi.getManyDictItems(codeList);
+            dictItemsMap.forEach((k,v)->{
+                List<DragDictModel> dictItems  = new ArrayList<>();
+                v.forEach(dictItem->{
+                    DragDictModel dictModel = new DragDictModel();
+                    BeanUtils.copyProperties(dictItem,dictModel);
+                    dictItems.add(dictModel);
+                });
+                manyDragDictItems.put(k,dictItems);
             });
-            manyDragDictItems.put(k,dictItems);
-        });
+        }
+
+        if(!CollectionUtils.isEmpty(tableDictList)){
+            tableDictList.forEach(item->{
+                List<DragDictModel> dictItems  = new ArrayList<>();
+                JSONObject object = JSONObject.parseObject(item.toString());
+                String dictField = object.getString("dictField");
+                String dictTable = object.getString("dictTable");
+                String dictText = object.getString("dictText");
+                String fieldName = object.getString("fieldName");
+                List<DictModel> dictItemsList = sysBaseApi.queryTableDictItemsByCode(dictTable,dictText,dictField);
+                dictItemsList.forEach(dictItem->{
+                    DragDictModel dictModel = new DragDictModel();
+                    BeanUtils.copyProperties(dictItem,dictModel);
+                    dictItems.add(dictModel);
+                });
+                manyDragDictItems.put(fieldName,dictItems);
+            });
+        }
         return manyDragDictItems;
     }
 
diff --git a/jeecg-boot/pom.xml b/jeecg-boot/pom.xml
index 7c7065d2a..d779c0a18 100644
--- a/jeecg-boot/pom.xml
+++ b/jeecg-boot/pom.xml
@@ -438,8 +438,8 @@
 			<!-- 积木仪表盘-->
 			<dependency>
 				<groupId>org.jeecgframework.jimureport</groupId>
-				<artifactId>drag-free</artifactId>
-				<version>1.1.2</version>
+				<artifactId>jimureport-dashboard-spring-boot3-starter</artifactId>
+				<version>1.8.1-beta</version>
 			</dependency>
 			<!-- chatgpt -->
 			<dependency>