!36 update

Merge pull request !36 from Foming/dev

README.md

@@ -21,10 +21,10 @@
 ####   组件介绍
 
 &emsp;&emsp; 大屏设计（AJ-Report）是一个可视化拖拽编辑的，直观，酷炫，具有科技感的图表工具全开源项目。 内置的基础功能包括数据源，数据集，报表管理，项目部分截图如下。<br>
-**在线案例还在努力创造中，敬请期待！！！**  
+**[更多案例](https://report.anji-plus.com/report-doc/guide/bigScreenCase.html)** <br>
 ![操作](https://images.gitee.com/uploads/images/2021/0703/094742_c0243f70_1728982.gif "2021-07-03_09-43-50.gif")
 
-![更多案例](https://report.anji-plus.com/report-doc/static/Rhea.mp4) <br>
+![视频](https://report.anji-plus.com/report-doc/static/Rhea.mp4) <br>
 
 ## 数据流程图
 
@@ -145,7 +145,6 @@ sql文件的目录在：report-core --> src --> main --> resources -- > db.migra
 <a href='https://www.gykjweb.com/'><img src="https://report.anji-plus.com/file/download/d13b03f5-0c20-4878-9a79-f3c76b44bfd9" width = "130" height = "130" /> </a> <br>
 <a href='http://www.plian.net/'><img src="https://report.anji-plus.com/file/download/7838f2c2-fdce-4ca7-8373-14d13dcda5cc" width = "130" height = "50" /> </a>
 
-
 ## 未来计划
 
 - 大屏宽高动态可视化

doc/docs/.vuepress/config.js

@@ -15,6 +15,7 @@ module.exports = {
             {text: 'GitHub', link: 'https://github.com/anji-plus/report'},
             {text: 'Gitee', link: 'https://gitee.com/anji-plus/report'},
             {text: '谁在使用', link: '/guide/briefUsing'},
+            {text: '更多案例', link: '/guide/bigScreenCase'},
         ],
         sidebar: {
             '/guide/': [

doc/docs/guide/bigScreenCase.md

@@ -0,0 +1,7 @@
+## 案例一：
+
+由社区 **[~无痕~@tengzhouboy](https://gitee.com/tengzhouboy)** 提供 <br>
+[AJ-Report分享链接](https://report.anji-plus.com/index.html#/aj/mtwbjPot) <br>
+
+![img.png](../picture/bigScreenCase/img.png) <br>
+

report-core/src/main/java/com/anjiplus/template/gaea/business/modules/dataset/service/impl/DataSetServiceImpl.java

@@ -35,6 +35,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -313,7 +314,7 @@ public class DataSetServiceImpl implements DataSetService {
         DataSourceDto dataSourceDto = new DataSourceDto();
         BeanUtils.copyProperties(dataSource, dataSourceDto);
         dataSourceDto.setDynSentence(dynSentence);
-        dataSourceDto.setContextData(dto.getContextData());
+        dataSourceDto.setContextData(setContextData(dto.getDataSetParamDtoList()));
 
         //获取total,判断DataSetParamDtoList中是否传入分页参数
         Map<String, Object> collect = dto.getDataSetParamDtoList().stream().collect(Collectors.toMap(DataSetParamDto::getParamName, DataSetParamDto::getSampleItem));
@@ -389,4 +390,17 @@ public class DataSetServiceImpl implements DataSetService {
 //        dataSetTransformService.insertBatch(dataSetTransformList);
     }
 
+    /**
+     * dataSetParamDtoList转map
+     * @param dataSetParamDtoList
+     * @return
+     */
+    public Map<String, Object> setContextData(List<DataSetParamDto> dataSetParamDtoList){
+        Map<String, Object> map = new HashMap<>();
+        if (null != dataSetParamDtoList && dataSetParamDtoList.size() > 0) {
+            dataSetParamDtoList.forEach(dataSetParamDto -> map.put(dataSetParamDto.getParamName(), dataSetParamDto.getSampleItem()));
+        }
+        return map;
+    }
+
 }

report-ui/src/views/report/bigscreen/designer/widget/widgetTable.vue

@@ -196,7 +196,6 @@ export default {
     },
     tableFiledWidth(index){
       var styleJson = {};
-      debugger
       if(this.optionsSetUp.dynamicAddTable[index].width ){
         styleJson["width"] = this.optionsSetUp.dynamicAddTable[index].width
       }

report-ui/src/views/report/resultset/index.vue

@@ -274,7 +274,6 @@ export default {
   },
   methods: {
     operateDataset(type, prop) {
-      debugger
       this.dialogVisibleSetDataSet = true;
       if (prop && prop.msg) {
         this.dataSet = prop.msg;