Merge branch 'dev' into pr@dev_st_fix

backend/src/main/java/io/dataease/controller/panel/AppLogController.java

@@ -3,6 +3,7 @@ package io.dataease.controller.panel;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.auth.annotation.SqlInjectValidator;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
 import io.dataease.controller.handler.annotation.I18n;
@@ -35,6 +36,7 @@ public class AppLogController {
             @ApiImplicitParam(paramType = "path", name = "pageSize", value = "页容量", required = true, dataType = "Integer"),
             @ApiImplicitParam(name = "request", value = "查询条件", required = true)
     })
+    @SqlInjectValidator(value = {"apply_time"})
     public Pager<List<AppLogGridDTO>> logGrid(@PathVariable int goPage, @PathVariable int pageSize,
                                               @RequestBody KeyGridRequest request) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);

backend/src/main/java/io/dataease/ext/ExtDataSourceMapper.java

@@ -10,7 +10,7 @@ import java.util.List;
 
 public interface ExtDataSourceMapper {
 
-    List<DatasourceDTO> query(GridExample example);
+    // List<DatasourceDTO> query(GridExample example);
 
     List<DatasourceDTO> queryUnion(DatasourceUnionRequest request);
 

backend/src/main/java/io/dataease/ext/ExtPanelViewLinkageMapper.xml

@@ -61,7 +61,7 @@
        dataset_table_field.origin_name,
        dataset_table_field.`name`,
        dataset_table_field.de_type
-    from dataset_table_field where table_id = #{table_id}
+    from dataset_table_field where dataset_table_field.group_type = 'd' and table_id = #{table_id}
     </select>
 
     <select id="queryTableFieldWithViewId" resultMap="TableFieldMap">

backend/src/main/java/io/dataease/provider/datasource/JdbcProvider.java

@@ -781,7 +781,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
             case StarRocks:
                 MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class);
                 mysqlConfiguration.getJdbc();
-                if(!mysqlConfiguration.getDataBase().matches("^[0-9a-zA-Z_-]{1,}$")){
+                if(!mysqlConfiguration.getDataBase().matches("^[0-9a-zA-Z_.-]{1,}$")){
                     throw new Exception("Invalid database name");
                 }
                 break;
@@ -796,7 +796,7 @@ public class JdbcProvider extends DefaultJdbcProvider {
                 break;
             case sqlServer:
                 SqlServerConfiguration sqlServerConfiguration = new Gson().fromJson(datasource.getConfiguration(), SqlServerConfiguration.class);
-                if(!sqlServerConfiguration.getDataBase().matches("^[0-9a-zA-Z_]{1,}$")){
+                if(!sqlServerConfiguration.getDataBase().matches("^[0-9a-zA-Z_.-]{1,}$")){
                     throw new Exception("Invalid database name");
                 }
                 break;

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

@@ -1077,16 +1077,16 @@ public class DorisQueryProvider extends QueryProvider {
                     String format = transDateFormat(request.getDateStyle(), request.getDatePattern());
                     if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
                         String date = String.format(MySQLConstants.STR_TO_DATE, originName, StringUtils.isNotEmpty(field.getDateFormat()) ? field.getDateFormat() : MysqlConstants.DEFAULT_DATE_FORMAT);
-                        if(request.getOperator().equals("between")){
+                        if (request.getOperator().equals("between")) {
                             whereName = date;
-                        }else {
+                        } else {
                             whereName = String.format(MySQLConstants.DATE_FORMAT, date, format);
                         }
                     }
                     if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3 || field.getDeExtractType() == 4) {
-                        if(request.getOperator().equals("between")){
+                        if (request.getOperator().equals("between")) {
                             whereName = originName;
-                        }else {
+                        } else {
                             String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
                             whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, format);
                         }

backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java

@@ -1095,7 +1095,10 @@ public class ImpalaQueryProvider extends QueryProvider {
                 whereName = "upper(" + whereName + ")";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    if(request.getDatasetTableField().getDeExtractType() == DeTypeConstants.DE_TIME){
+                        simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
+                    }
                     String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
                     String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
                     whereValue = String.format(ImpalaConstants.WHERE_BETWEEN, startTime, endTime);

backend/src/main/java/io/dataease/service/datasource/DatasourceService.java

@@ -6,30 +6,28 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import com.google.gson.reflect.TypeToken;
 import io.dataease.auth.annotation.DeCleaner;
-import io.dataease.commons.constants.RedisConstants;
-import io.dataease.commons.utils.BeanUtils;
-import io.dataease.controller.sys.response.BasicInfo;
-import io.dataease.dto.TaskInstance;
-import io.dataease.ext.ExtDataSourceMapper;
-import io.dataease.ext.ExtTaskInstanceMapper;
-import io.dataease.ext.UtilMapper;
-import io.dataease.ext.query.GridExample;
 import io.dataease.commons.constants.DePermissionType;
+import io.dataease.commons.constants.RedisConstants;
 import io.dataease.commons.constants.SysAuthConstants;
 import io.dataease.commons.exception.DEException;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.CommonThreadPool;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.controller.ResultHolder;
 import io.dataease.controller.datasource.request.UpdataDsRequest;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.request.datasource.ApiDefinition;
-import io.dataease.controller.sys.base.BaseGridRequest;
+import io.dataease.controller.sys.response.BasicInfo;
-import io.dataease.controller.sys.base.ConditionEntity;
 import io.dataease.dto.DatasourceDTO;
+import io.dataease.dto.TaskInstance;
 import io.dataease.dto.dataset.DataTableInfoDTO;
-import io.dataease.dto.datasource.*;
+import io.dataease.dto.datasource.DBTableDTO;
+import io.dataease.dto.datasource.MysqlConfiguration;
+import io.dataease.ext.ExtDataSourceMapper;
+import io.dataease.ext.ExtTaskInstanceMapper;
+import io.dataease.ext.UtilMapper;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.base.domain.*;
 import io.dataease.plugins.common.base.mapper.DatasetTableMapper;
@@ -163,7 +161,7 @@ public class DatasourceService {
         List<DatasourceDTO> datasourceDTOS = extDataSourceMapper.queryUnion(request);
         datasourceDTOS.forEach(this::datasourceTrans);
         if (StringUtils.isBlank(request.getSort())) {
-            datasourceDTOS.sort((o1,o2) -> {
+            datasourceDTOS.sort((o1, o2) -> {
                 int tmp = StringUtils.compareIgnoreCase(o1.getTypeDesc(), o2.getTypeDesc());
                 if (tmp == 0) {
                     tmp = StringUtils.compareIgnoreCase(o1.getName(), o2.getName());
@@ -247,19 +245,6 @@ public class DatasourceService {
         return result;
     }
 
-    public List<DatasourceDTO> gridQuery(BaseGridRequest request) {
-        //如果没有查询条件增加一个默认的条件
-        if (CollectionUtils.isEmpty(request.getConditions())) {
-            ConditionEntity conditionEntity = new ConditionEntity();
-            conditionEntity.setField("1");
-            conditionEntity.setOperator("eq");
-            conditionEntity.setValue("1");
-            request.setConditions(Collections.singletonList(conditionEntity));
-        }
-        GridExample gridExample = request.convertExample();
-        gridExample.setExtendCondition(String.valueOf(AuthUtils.getUser().getUserId()));
-        return extDataSourceMapper.query(gridExample);
-    }
 
     @DeCleaner(DePermissionType.DATASOURCE)
     public ResultHolder deleteDatasource(String datasourceId) throws Exception {
@@ -301,11 +286,12 @@ public class DatasourceService {
             DatasetTableExample datasetTableExample = new DatasetTableExample();
             datasetTableExample.createCriteria().andDataSourceIdEqualTo(id);
             List<DatasetTable> datasetTables = datasetTableMapper.selectByExample(datasetTableExample);
-            List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() {}.getType());
+            List<ApiDefinition> apiDefinitionList = new Gson().fromJson(datasource.getConfiguration(), new TypeToken<List<ApiDefinition>>() {
+            }.getType());
             apiDefinitionList.forEach(apiDefinition -> {
-                if(apiDefinition.isReName()){
+                if (apiDefinition.isReName()) {
                     datasetTables.forEach(datasetTable -> {
-                        if(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getTable().equals(apiDefinition.getOrgName())){
+                        if (new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getTable().equals(apiDefinition.getOrgName())) {
                             DatasetTable record = new DatasetTable();
                             DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO();
                             dataTableInfoDTO.setTable(apiDefinition.getName());
@@ -650,7 +636,7 @@ public class DatasourceService {
 
     public void updateDemoDs() {
         Datasource datasource = datasourceMapper.selectByPrimaryKey("76026997-94f9-4a35-96ca-151084638969");
-        if(datasource == null){
+        if (datasource == null) {
             return;
         }
         MysqlConfiguration mysqlConfiguration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfiguration.class);

frontend/src/components/canvas/components/editor/ComponentWrapper.vue

@@ -159,7 +159,8 @@ export default {
   computed: {
     chart() {
       if (this.config.propValue?.viewId) {
-        return JSON.parse(this.panelViewDetailsInfo[this.config.propValue.viewId])
+        const viewInfo = this.panelViewDetailsInfo[this.config.propValue.viewId];
+        return viewInfo?JSON.parse(viewInfo):null
       }
       return null
     },

frontend/src/components/canvas/components/editor/LinkageField.vue

@@ -171,23 +171,19 @@ export default {
       return this.targetLinkageInfo[this.curLinkageView.propValue.viewId]
     },
     ...mapState([
-      'menuTop',
-      'menuLeft',
-      'menuShow',
-      'curComponent',
-      'componentData',
-      'canvasStyleData',
-      'linkageSettingStatus',
       'targetLinkageInfo',
       'curLinkageView'
     ])
   },
   mounted() {
+    const _this = this
     // 初始化映射关系 如果当前是相同的数据集且没有关联关系，则自动补充映射关系
     checkSameDataSet(this.curLinkageView.propValue.viewId, this.element.propValue.viewId).then(res => {
       if (res.data === 'YES' && this.linkageInfo.linkageFields.length === 0) {
         this.sourceLinkageInfo.targetViewFields.forEach(item => {
-          this.addLinkageField(item.id, item.id)
+          _this.$nextTick(() => {
+            this.addLinkageField(item.id, item.id)
+          })
         })
       }
     })

frontend/src/components/canvas/utils/utils.js

@@ -429,7 +429,10 @@ export function getCacheTree(treeName) {
 }
 
 export function exportExcelDownload(chart, snapshot, width, height, loadingWrapper, callBack) {
-  if (!chart.data?.data?.length) {
+  if (chart.render === 'antv' && !chart.data?.data?.length) {
+    return
+  }
+  if (chart.type === 'echarts' && !(chart.data?.series?.length && chart.data?.series[0].data?.length)) {
     return
   }
   const fields = JSON.parse(JSON.stringify(chart.data.fields))

frontend/src/views/chart/components/filter/QuotaFilterEditor.vue

@@ -117,6 +117,13 @@ export default {
           value: 'ge',
           label: this.$t('chart.filter_ge')
         }]
+      },
+      {
+        label: '',
+        options: [{
+          value: 'not_null',
+          label: this.$t('chart.filter_not_null')
+        }]
       }],
       logic: ''
     }

frontend/src/views/chart/components/filter/ResultFilterEditor.vue

@@ -194,6 +194,13 @@ export default {
             value: 'ge',
             label: this.$t('chart.filter_ge')
           }]
+        },
+        {
+          label: '',
+          options: [{
+            value: 'not_null',
+            label: this.$t('chart.filter_not_null')
+          }]
         }
       ],
       valueOptions: [
@@ -226,6 +233,13 @@ export default {
             value: 'ge',
             label: this.$t('chart.filter_ge')
           }]
+        },
+        {
+          label: '',
+          options: [{
+            value: 'not_null',
+            label: this.$t('chart.filter_not_null')
+          }]
         }
       ],
       options: [],

frontend/src/views/chart/view/PositionAdjust.vue

@@ -81,7 +81,7 @@ export default {
   props: {},
   data() {
     return {
-      maxHeight: 2000,
+      maxHeight: 10000,
       maxTop: 20000
     }
   },

frontend/src/views/panel/list/PanelList.vue

@@ -670,7 +670,10 @@ export default {
         if (this.editPanel.optType === 'toDefaultPanel') {
           this.defaultTree(false)
         }
-        updateCacheTree(this.editPanel.optType, 'panel-main-tree', panelInfo, this.tData)
+
+        updateCacheTree(this.editPanel.optType,
+          panelInfo.panelType === 'system' ? 'panel-default-tree' : 'panel-main-tree', panelInfo,
+          panelInfo.panelType === 'system' ? this.defaultData : this.tData)
         if (this.editPanel.optType === 'rename' && panelInfo.id === this.$store.state.panel.panelInfo.id) {
           this.$store.state.panel.panelInfo.name = panelInfo.name
         }
@@ -850,7 +853,7 @@ export default {
 
     delete(data) {
       const params = {
-        title: data.nodeType === 'folder'?'commons.delete_this_folder':'commons.delete_this_dashboard',
+        title: data.nodeType === 'folder' ? 'commons.delete_this_folder' : 'commons.delete_this_dashboard',
         type: 'danger',
         cb: () => {
           delGroup(data.id).then((response) => {