Merge pull request #12587 from dataease/dev

merge v1.18.25

core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java

@@ -21,4 +21,6 @@ public class DatasetTaskGridRequest extends KeywordRequest {
     private String id;
 
     private Long userId;
+
+    private String datasetId;
 }

core/backend/src/main/java/io/dataease/dto/datasource/PgConfiguration.java

@@ -5,12 +5,18 @@ import lombok.Getter;
 import lombok.Setter;
 import org.apache.commons.lang3.StringUtils;
 
+import java.net.URLDecoder;
+import java.util.Arrays;
+import java.util.List;
+
 @Getter
 @Setter
 public class PgConfiguration extends JdbcConfiguration {
 
     private String driver = "org.postgresql.Driver";
     private String extraParams = "";
+    private List<String> illegalParameters = Arrays.asList("socketFactory", "socketFactoryArg", "sslfactory", "sslfactoryarg", "loggerLevel", "loggerFile", "allowUrlInLocalInfile", "allowLoadLocalInfileInPath");
+
 
     public String getJdbc() {
         if (StringUtils.isEmpty(extraParams.trim())) {
@@ -27,6 +33,11 @@ public class PgConfiguration extends JdbcConfiguration {
                         .replace("SCHEMA", getSchema().trim());
             }
         } else {
+            for (String illegalParameter : illegalParameters) {
+                if (getExtraParams().toLowerCase().contains(illegalParameter.toLowerCase()) || URLDecoder.decode(getExtraParams()).contains(illegalParameter.toLowerCase())) {
+                    throw new RuntimeException("Illegal parameter: " + illegalParameter);
+                }
+            }
             return "jdbc:postgresql://HOSTNAME:PORT/DATABASE?EXTRA_PARAMS"
                     .replace("HOSTNAME", getHost().trim())
                     .replace("PORT", getPort().toString().trim())

core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java

@@ -23,6 +23,8 @@ public interface ExtDataSetTaskMapper {
 
     List<DataSetTaskDTO> userTaskList(DatasetTaskGridRequest request);
 
+    String datasetPrivileges(DatasetTaskGridRequest request);
+
     List<DataSetTaskDTO> taskWithTriggers(DatasetTaskGridRequest request);
 
     List<DataSetTaskDTO> findByPanelId(@Param("panelId") String panelId);

core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml

@@ -136,9 +136,12 @@
 
     </select>
 
+    <select id="datasetPrivileges" resultType="String" parameterType="io.dataease.controller.dataset.request.DatasetTaskGridRequest">
+        SELECT get_auths(#{datasetId}, 'dataset', #{userId})
+    </select>
+
     <select id="userTaskList" resultMap="TaskResult" parameterType="io.dataease.controller.dataset.request.DatasetTaskGridRequest">
-        SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{userId}) as
+        SELECT dataset_table.name as table_name,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME
-        `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME
         FROM dataset_table_task
         left join dataset_table on dataset_table.id=dataset_table_task.table_id
         left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME and qrtz_triggers.TRIGGER_STATE != 'PAUSED'

core/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java

@@ -145,6 +145,8 @@ public class DorisQueryProvider extends QueryProvider {
                 if (f.getDeExtractType() == 1) {
                     if (f.getDeType() == 2 || f.getDeType() == 3) {
                         fieldName = String.format(DorisConstants.UNIX_TIMESTAMP, originField) + "*1000";
+                    } else if (f.getDeType().equals(DeTypeConstants.DE_STRING)) {
+                        fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.VARCHAR);
                     } else {
                         fieldName = originField;
                     }

core/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java

@@ -271,7 +271,12 @@ public class DataSetTableTaskService {
             return extDataSetTaskMapper.taskList(request);
         } else {
             request.setUserId(AuthUtils.getUser().getUserId());
-            return extDataSetTaskMapper.userTaskList(request);
+            List<DataSetTaskDTO> dataSetTaskDTOS = extDataSetTaskMapper.userTaskList(request);
+            dataSetTaskDTOS.forEach(dataSetTaskDTO -> {
+                request.setDatasetId(dataSetTaskDTO.getId());
+                dataSetTaskDTO.setPrivileges(extDataSetTaskMapper.datasetPrivileges(request));
+            });
+            return dataSetTaskDTOS;
         }
     }
 
@@ -312,10 +317,10 @@ public class DataSetTableTaskService {
         record.setStatus(datasetTableTask.getStatus());
         datasetTableTaskMapper.updateByExampleSelective(record, datasetTableTaskExample);
 
-        if(datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Pending.name())){
+        if (datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Pending.name())) {
             scheduleService.pauseTrigger(datasetTableTask);
         }
-        if(datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Underway.name())){
+        if (datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Underway.name())) {
             scheduleService.resumeTrigger(datasetTableTask);
         }
     }

core/frontend/src/components/canvas/customComponent/UserView.vue

@@ -878,7 +878,7 @@ export default {
         if (!sourceCustomAttr[param.property]) {
           this.$set(sourceCustomAttr, param.property, {})
         }
-        sourceCustomAttr[param.property][param.value.modifyName] = param.value[param.value.modifyName]
+        Vue.set(sourceCustomAttr[param.property], param.value.modifyName, param.value[param.value.modifyName])
         this.sourceCustomAttrStr = JSON.stringify(sourceCustomAttr)
         this.chart.customAttr = this.sourceCustomAttrStr
         this.$store.commit('updateComponentViewsData', {
@@ -892,7 +892,7 @@ export default {
         if (param.property === 'margin') {
           sourceCustomStyle[param.property] = param.value
         }
-        sourceCustomStyle[param.property][param.value.modifyName] = param.value[param.value.modifyName]
+        Vue.set(sourceCustomStyle[param.property], param.value.modifyName, param.value[param.value.modifyName])
         this.sourceCustomStyleStr = JSON.stringify(sourceCustomStyle)
         this.chart.customStyle = this.sourceCustomStyleStr
         this.$store.commit('updateComponentViewsData', {

core/frontend/src/store/index.js

@@ -847,7 +847,7 @@ const data = {
       }
     },
     setChangeProperties(state, propertyInfo) {
-      state.changeProperties[propertyInfo.custom][propertyInfo.property] = propertyInfo.value
+      Vue.set(state.changeProperties[propertyInfo.custom], propertyInfo.property, propertyInfo.value)
     },
     initCanvasBase(state) {
       this.commit('resetLastValidFilters')

core/frontend/src/views/chart/components/shapeAttr/SizeSelector.vue

@@ -1166,6 +1166,7 @@
 import { CHART_FONT_FAMILY, CHART_FONT_LETTER_SPACE, DEFAULT_SIZE } from '../../chart/chart'
 import { includesAny } from '@/utils/StringUtils'
 import _ from 'lodash'
+import {mapState} from "vuex";
 export default {
   name: 'SizeSelector',
   props: {
@@ -1224,6 +1225,11 @@ export default {
       }
     }
   },
+  computed: {
+    ...mapState([
+      'batchOptStatus'
+    ])
+  },
   mounted() {
     this.init()
     this.initData()
@@ -1303,13 +1309,18 @@ export default {
       this.fontSize = arr
     },
     changeBarSizeCase(modifyName) {
+      this.currentModifyName = modifyName;
       if (!this.doChange) {
         this.doChange = _.debounce(() => this.debounceChange(modifyName), 200)
       }
       this.doChange()
     },
     debounceChange(modifyName) {
-      this.sizeForm['modifyName'] = modifyName
+      if(this.batchOptStatus){
+        this.sizeForm['modifyName'] = this.currentModifyName
+      }else{
+        this.sizeForm['modifyName']=modifyName
+      }
       if (this.sizeForm.gaugeMax <= this.sizeForm.gaugeMin) {
         this.$message.error(this.$t('chart.max_more_than_mix'))
         return