Merge remote-tracking branch 'origin/dev' into dev

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;