Merge remote-tracking branch 'origin/v1.4' into v1.4

backend/src/main/java/io/dataease/commons/constants/DatasourceTypes.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.constants;
+package io.dataease.commons.constants;
 
 public enum DatasourceTypes {
     excel("excel", "excel", "", "", "", "", ""),

backend/src/main/java/io/dataease/commons/utils/ExcelXlsReader.java

@@ -1,6 +1,6 @@
 package io.dataease.commons.utils;
 
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.i18n.Translator;
 import org.apache.poi.hssf.eventusermodel.*;
@@ -331,7 +331,10 @@ public class ExcelXlsReader implements HSSFListener {
                     totalSheets.add(excelSheetData);
                 }else {
                     List<String> tmp = new ArrayList<>(cellList);
-                    totalSheets.stream().filter(s->s.getExcelLable().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp);
+                    if(totalSheets.stream().filter(s->s.getExcelLable().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().size() < 100){
+                        totalSheets.stream().filter(s->s.getExcelLable().equalsIgnoreCase(sheetName)).collect(Collectors.toList()).get(0).getData().add(tmp);
+                    }
+
                     totalRows++;
                 }
             }

backend/src/main/java/io/dataease/commons/utils/ExcelXlsxReader.java

@@ -1,5 +1,5 @@
 package io.dataease.commons.utils;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.i18n.Translator;
 import org.apache.commons.collections4.CollectionUtils;

backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java

@@ -6,7 +6,7 @@ import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableIncrementalConfig;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.response.DataSetDetail;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.dto.dataset.ExcelFileData;
 import io.dataease.service.dataset.DataSetTableService;

backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.controller;
+package io.dataease.controller.datasource;
 
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
@@ -10,8 +10,8 @@ import io.dataease.commons.utils.Pager;
 import io.dataease.controller.ResultHolder;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
-import io.dataease.datasource.dto.DBTableDTO;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.dto.datasource.DBTableDTO;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.DatasourceDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -20,6 +20,7 @@ import springfox.documentation.annotations.ApiIgnore;
 
 import javax.annotation.Resource;
 import java.util.List;
+import java.util.stream.Collectors;
 
 @Api(tags = "数据源：数据源管理")
 @ApiSupport(order = 30)
@@ -32,7 +33,7 @@ public class DatasourceController {
 
     @ApiOperation("新增数据源")
     @PostMapping("/add")
-    public Datasource addDatasource(@RequestBody Datasource datasource) {
+    public Datasource addDatasource(@RequestBody Datasource datasource) throws Exception{
         return datasourceService.addDatasource(datasource);
     }
 
@@ -57,6 +58,12 @@ public class DatasourceController {
         return datasourceService.getDatasourceList(request);
     }
 
+    @ApiOperation("查询当前用户数据源")
+    @GetMapping("/list/{type}")
+    public List<DatasourceDTO> getDatasourceListByType(@PathVariable String type) throws Exception {
+        return getDatasourceList().stream().filter(datasourceDTO -> datasourceDTO.getType().equalsIgnoreCase(type)).collect(Collectors.toList());
+    }
+
     @ApiIgnore
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<DatasourceDTO>> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception {

backend/src/main/java/io/dataease/controller/request/dataset/DataSetTableRequest.java

@@ -1,7 +1,7 @@
 package io.dataease.controller.request.dataset;
 
 import io.dataease.base.domain.DatasetTable;
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

backend/src/main/java/io/dataease/controller/request/datasource/DatasourceRequest.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.request;
+package io.dataease.controller.request.datasource;
 
 import io.dataease.base.domain.Datasource;
 import lombok.Getter;

backend/src/main/java/io/dataease/controller/request/datasource/es/EsReponse.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/controller/request/datasource/es/Requst.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/controller/request/datasource/es/RequstWithCursor.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto.es;
+package io.dataease.controller.request.datasource.es;
 
 import lombok.Data;
 

backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java

@@ -1,19 +0,0 @@
-package io.dataease.datasource.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-
-@Getter
-@Setter
-public class MysqlConfigration extends JdbcConfiguration {
-
-    private String driver = "com.mysql.cj.jdbc.Driver";
-
-    public String getJdbc() {
-        // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
-        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000&useSSL=false"
-                .replace("HOSTNAME", getHost().trim())
-                .replace("PORT", getPort().toString().trim())
-                .replace("DATABASE", getDataBase().trim());
-    }
-}

backend/src/main/java/io/dataease/dto/dataset/ExcelSheetData.java

@@ -1,6 +1,6 @@
 package io.dataease.dto.dataset;
 
-import io.dataease.datasource.dto.TableFiled;
+import io.dataease.dto.datasource.TableFiled;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

backend/src/main/java/io/dataease/dto/datasource/CHConfiguration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/dto/datasource/DBTableDTO.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

backend/src/main/java/io/dataease/dto/datasource/DorisConfiguration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/dto/datasource/EsConfiguration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 
 import lombok.Getter;

backend/src/main/java/io/dataease/dto/datasource/JdbcConfiguration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 
 import lombok.Getter;

backend/src/main/java/io/dataease/dto/datasource/MongodbConfiguration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/dto/datasource/MysqlConfiguration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/dto/datasource/OracleConfiguration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

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

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/dto/datasource/RedshiftConfigration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/dto/datasource/SqlServerConfiguration.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import lombok.Getter;
 import lombok.Setter;

backend/src/main/java/io/dataease/dto/datasource/TableFiled.java

@@ -1,4 +1,4 @@
-package io.dataease.datasource.dto;
+package io.dataease.dto.datasource;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Getter;

backend/src/main/java/io/dataease/dto/panel/PanelViewTableDTO.java

@@ -2,10 +2,6 @@ package io.dataease.dto.panel;
 
 import io.dataease.base.domain.ChartViewWithBLOBs;
 import io.dataease.base.domain.DatasetTableField;
-import io.dataease.base.domain.PanelGroupWithBLOBs;
-import io.dataease.commons.model.ITreeBase;
-import io.dataease.datasource.dto.TableFiled;
-import io.dataease.dto.chart.ChartViewDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 

backend/src/main/java/io/dataease/job/sechedule/Schedular.java

@@ -1,7 +1,7 @@
 package io.dataease.job.sechedule;
 
 import com.fit2cloud.quartz.anno.QuartzScheduled;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.service.dataset.DataSetTableService;
 import org.springframework.stereotype.Component;
 

backend/src/main/java/io/dataease/listener/DataSourceInitStartListener.java

@@ -1,6 +1,6 @@
 package io.dataease.listener;
 
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.service.dataset.DataSetTableService;
 import org.springframework.boot.context.event.ApplicationReadyEvent;
 import org.springframework.context.ApplicationListener;

backend/src/main/java/io/dataease/provider/ProviderFactory.java

@@ -1,8 +1,9 @@
-package io.dataease.datasource.provider;
+package io.dataease.provider;
 
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.provider.DDLProvider;
-import io.dataease.provider.QueryProvider;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.query.DDLProvider;
+import io.dataease.provider.query.QueryProvider;
 import org.springframework.beans.BeansException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.ApplicationContextAware;

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

@@ -1,9 +1,8 @@
-package io.dataease.datasource.provider;
+package io.dataease.provider.datasource;
 
-import io.dataease.datasource.dto.TableFiled;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.dto.datasource.TableFiled;
+import io.dataease.controller.request.datasource.DatasourceRequest;
 
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 

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

@@ -1,17 +1,18 @@
-package io.dataease.datasource.provider;
+package io.dataease.provider.datasource;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
 import io.dataease.commons.utils.HttpClientConfig;
 import io.dataease.commons.utils.HttpClientUtil;
-import io.dataease.datasource.dto.*;
-import io.dataease.datasource.dto.es.EsReponse;
-import io.dataease.datasource.dto.es.Requst;
-import io.dataease.datasource.dto.es.RequstWithCursor;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.controller.request.datasource.es.EsReponse;
+import io.dataease.controller.request.datasource.es.Requst;
+import io.dataease.controller.request.datasource.es.RequstWithCursor;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.dto.datasource.EsConfiguration;
+import io.dataease.dto.datasource.TableFiled;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
-import io.dataease.provider.es.EsQueryProvider;
+import io.dataease.provider.query.es.EsQueryProvider;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
 import org.apache.http.HttpHeaders;

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

@@ -1,4 +1,4 @@
-package io.dataease.datasource.provider;
+package io.dataease.provider.datasource;
 
 
 import java.io.File;

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

@@ -1,15 +1,16 @@
-package io.dataease.datasource.provider;
+package io.dataease.provider.datasource;
 
 import com.alibaba.druid.filter.Filter;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.druid.wall.WallFilter;
 import com.google.gson.Gson;
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.*;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.dto.datasource.*;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.provider.query.QueryProvider;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;

backend/src/main/java/io/dataease/provider/query/DDLProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider;
+package io.dataease.provider.query;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/QueryProvider.java

@@ -1,14 +1,14 @@
-package io.dataease.provider;
+package io.dataease.provider.query;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.Datasource;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.pg.PgConstants;
+import io.dataease.provider.query.pg.PgConstants;
 
 import java.util.List;
 

backend/src/main/java/io/dataease/provider/query/SQLConstants.java

@@ -1,4 +1,4 @@
-package io.dataease.provider;
+package io.dataease.provider.query;
 
 import java.util.ArrayList;
 import java.util.List;

backend/src/main/java/io/dataease/provider/query/ck/CKConstants.java

@@ -1,8 +1,8 @@
-package io.dataease.provider.ck;
+package io.dataease.provider.query.ck;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.ck;
+import static io.dataease.commons.constants.DatasourceTypes.ck;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider.ck;
+package io.dataease.provider.query.ck;
 
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
@@ -9,8 +9,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +26,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/doris/DorisConstants.java

@@ -1,8 +1,8 @@
-package io.dataease.provider.doris;
+package io.dataease.provider.query.doris;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.de_doris;
+import static io.dataease.commons.constants.DatasourceTypes.de_doris;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/doris/DorisDDLProvider.java

@@ -1,6 +1,6 @@
-package io.dataease.provider.doris;
+package io.dataease.provider.query.doris;
 
-import io.dataease.provider.DDLProvider;
+import io.dataease.provider.query.DDLProvider;
 import org.springframework.stereotype.Service;
 
 /**

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

@@ -1,4 +1,4 @@
-package io.dataease.provider.doris;
+package io.dataease.provider.query.doris;
 
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
@@ -8,9 +8,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.ck.CKConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +25,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider.es;
+package io.dataease.provider.query.es;
 
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
@@ -9,8 +9,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +26,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 @Service("esQuery")
 public class EsQueryProvider extends QueryProvider {

backend/src/main/java/io/dataease/provider/query/es/EsSqlLConstants.java

@@ -1,8 +1,8 @@
-package io.dataease.provider.es;
+package io.dataease.provider.query.es;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.es;
+import static io.dataease.commons.constants.DatasourceTypes.es;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/mongodb/MongoConstants.java

@@ -1,9 +1,9 @@
-package io.dataease.provider.mongodb;
+package io.dataease.provider.query.mongodb;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.mongo;
-import static io.dataease.datasource.constants.DatasourceTypes.oracle;
+import static io.dataease.commons.constants.DatasourceTypes.mongo;
+import static io.dataease.commons.constants.DatasourceTypes.oracle;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider.mongodb;
+package io.dataease.provider.query.mongodb;
 
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
@@ -9,9 +9,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.oracle.OracleConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -27,7 +26,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/mysql/MySQLConstants.java

@@ -1,8 +1,8 @@
-package io.dataease.provider.mysql;
+package io.dataease.provider.query.mysql;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.mysql;
+import static io.dataease.commons.constants.DatasourceTypes.mysql;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider.mysql;
+package io.dataease.provider.query.mysql;
 
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableFieldExample;
@@ -8,9 +8,8 @@ import io.dataease.controller.request.chart.ChartExtFilterRequest;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.es.EsSqlLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -26,7 +25,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/oracle/OracleConstants.java

@@ -1,8 +1,8 @@
-package io.dataease.provider.oracle;
+package io.dataease.provider.query.oracle;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.oracle;
+import static io.dataease.commons.constants.DatasourceTypes.oracle;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider.oracle;
+package io.dataease.provider.query.oracle;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.DatasetTableField;
@@ -6,13 +6,13 @@ import io.dataease.base.domain.DatasetTableFieldExample;
 import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
-import io.dataease.datasource.dto.OracleConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
+import io.dataease.dto.datasource.OracleConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -28,7 +28,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/pg/PgConstants.java

@@ -1,8 +1,8 @@
-package io.dataease.provider.pg;
+package io.dataease.provider.query.pg;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.pg;
+import static io.dataease.commons.constants.DatasourceTypes.pg;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider.pg;
+package io.dataease.provider.query.pg;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.DatasetTableField;
@@ -7,13 +7,13 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.sqlserver.SqlServerSQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
+import io.dataease.provider.query.sqlserver.SqlServerSQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -29,7 +29,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 
 @Service("pgQuery")

backend/src/main/java/io/dataease/provider/query/redshift/RedshiftConstants.java

@@ -1,8 +1,8 @@
-package io.dataease.provider.redshift;
+package io.dataease.provider.query.redshift;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.pg;
+import static io.dataease.commons.constants.DatasourceTypes.pg;
 
 /**
  * Redshift 静态变量

backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider.redshift;
+package io.dataease.provider.query.redshift;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.DatasetTableField;
@@ -7,14 +7,14 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
-import io.dataease.provider.pg.PgConstants;
-import io.dataease.provider.sqlserver.SqlServerSQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
+import io.dataease.provider.query.pg.PgConstants;
+import io.dataease.provider.query.sqlserver.SqlServerSQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -30,7 +30,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 
 /**

backend/src/main/java/io/dataease/provider/query/sqlserver/SqlServerSQLConstants.java

@@ -1,8 +1,8 @@
-package io.dataease.provider.sqlserver;
+package io.dataease.provider.query.sqlserver;
 
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.SQLConstants;
 
-import static io.dataease.datasource.constants.DatasourceTypes.sqlServer;
+import static io.dataease.commons.constants.DatasourceTypes.sqlServer;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java

@@ -1,4 +1,4 @@
-package io.dataease.provider.sqlserver;
+package io.dataease.provider.query.sqlserver;
 
 import com.google.gson.Gson;
 import io.dataease.base.domain.DatasetTableField;
@@ -7,12 +7,12 @@ import io.dataease.base.domain.Datasource;
 import io.dataease.base.mapper.DatasetTableFieldMapper;
 import io.dataease.commons.constants.DeTypeConstants;
 import io.dataease.controller.request.chart.ChartExtFilterRequest;
-import io.dataease.datasource.dto.JdbcConfiguration;
+import io.dataease.dto.datasource.JdbcConfiguration;
 import io.dataease.dto.chart.ChartCustomFilterDTO;
 import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
-import io.dataease.provider.QueryProvider;
-import io.dataease.provider.SQLConstants;
+import io.dataease.provider.query.QueryProvider;
+import io.dataease.provider.query.SQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -28,7 +28,7 @@ import java.util.*;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
+import static io.dataease.provider.query.SQLConstants.TABLE_ALIAS_PREFIX;
 
 @Service("sqlserverQuery")
 public class SqlserverQueryProvider extends QueryProvider {

backend/src/main/java/io/dataease/service/chart/ChartViewService.java

@@ -14,16 +14,16 @@ import io.dataease.commons.utils.LogUtil;
 import io.dataease.controller.request.chart.*;
 import io.dataease.controller.response.ChartDetail;
 import io.dataease.controller.response.DataSetDetail;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.chart.*;
 import io.dataease.dto.dataset.DataSetTableUnionDTO;
 import io.dataease.dto.dataset.DataTableInfoDTO;
 import io.dataease.i18n.Translator;
 import io.dataease.listener.util.CacheUtils;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.query.QueryProvider;
 import io.dataease.service.dataset.DataSetTableFieldsService;
 import io.dataease.service.dataset.DataSetTableService;
 import io.dataease.service.dataset.DataSetTableUnionService;

backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java

@@ -16,17 +16,17 @@ import io.dataease.controller.request.dataset.DataSetGroupRequest;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.request.dataset.DataSetTaskRequest;
 import io.dataease.controller.response.DataSetDetail;
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.TableFiled;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.JdbcProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.dto.datasource.TableFiled;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.datasource.JdbcProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
 import io.dataease.dto.dataset.*;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
-import io.dataease.provider.DDLProvider;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.query.DDLProvider;
+import io.dataease.provider.query.QueryProvider;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;

backend/src/main/java/io/dataease/service/dataset/DatasetFunctionService.java

@@ -2,13 +2,12 @@ package io.dataease.service.dataset;
 
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.DatasetTableFunctionMapper;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.service.datasource.DatasourceService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
 import java.util.List;
-import java.util.UUID;
 
 /**
  * @Author gin

backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java

@@ -9,18 +9,18 @@ import io.dataease.base.mapper.ext.ExtChartViewMapper;
 import io.dataease.commons.constants.*;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.*;
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.*;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.JdbcProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.datasource.JdbcProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.dto.datasource.*;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.dataset.DataTableInfoDTO;
 import io.dataease.dto.dataset.ExcelSheetData;
 import io.dataease.exception.DataEaseException;
 import io.dataease.listener.util.CacheUtils;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.query.QueryProvider;
 import io.dataease.service.message.DeMsgutil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;

backend/src/main/java/io/dataease/service/dataset/impl/direct/DirectFieldService.java

@@ -5,13 +5,13 @@ import io.dataease.base.domain.DatasetTable;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.Datasource;
 import io.dataease.commons.utils.CommonBeanFactory;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
-import io.dataease.datasource.service.DatasourceService;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
+import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.dataset.DataSetTableUnionDTO;
 import io.dataease.dto.dataset.DataTableInfoDTO;
-import io.dataease.provider.QueryProvider;
+import io.dataease.provider.query.QueryProvider;
 import io.dataease.service.dataset.DataSetFieldService;
 import io.dataease.service.dataset.DataSetTableFieldsService;
 import io.dataease.service.dataset.DataSetTableService;

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

@@ -1,4 +1,4 @@
-package io.dataease.datasource.service;
+package io.dataease.service.datasource;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
@@ -15,13 +15,13 @@ import io.dataease.controller.ResultHolder;
 import io.dataease.controller.request.DatasourceUnionRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
 import io.dataease.controller.sys.base.ConditionEntity;
-import io.dataease.datasource.constants.DatasourceTypes;
-import io.dataease.datasource.dto.*;
-import io.dataease.datasource.provider.DatasourceProvider;
-import io.dataease.datasource.provider.ProviderFactory;
-import io.dataease.datasource.request.DatasourceRequest;
+import io.dataease.commons.constants.DatasourceTypes;
+import io.dataease.provider.datasource.DatasourceProvider;
+import io.dataease.provider.ProviderFactory;
+import io.dataease.controller.request.datasource.DatasourceRequest;
 import io.dataease.dto.DatasourceDTO;
 import io.dataease.dto.dataset.DataTableInfoDTO;
+import io.dataease.dto.datasource.*;
 import io.dataease.exception.DataEaseException;
 import io.dataease.i18n.Translator;
 import io.dataease.service.dataset.DataSetGroupService;
@@ -57,7 +57,7 @@ public class DatasourceService {
     @Resource
     private CommonThreadPool commonThreadPool;
 
-    public Datasource addDatasource(Datasource datasource) {
+    public Datasource addDatasource(Datasource datasource) throws Exception{
         checkName(datasource);
         long currentTimeMillis = System.currentTimeMillis();
         datasource.setId(UUID.randomUUID().toString());

frontend/src/api/system/datasource.js

@@ -15,6 +15,13 @@ export function listDatasource() {
     method: 'get'
   })
 }
+export function listDatasourceByType(type) {
+  return request({
+    url: '/datasource/list/' + type,
+    loading: true,
+    method: 'get'
+  })
+}
 export function addDs(data) {
   return request({
     url: 'datasource/add/',

frontend/src/lang/en.js

@@ -953,7 +953,8 @@ export default {
     table_page_size: 'Page Size',
     table_page_size_unit: 'Item/Page',
     result_count: 'Result',
-    result_mode_all: 'ALL'
+    result_mode_all: 'ALL',
+    splitCount_less_100: 'Split Count must less 100'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',

frontend/src/lang/tw.js

@@ -954,7 +954,8 @@ export default {
     table_page_size: '分頁',
     table_page_size_unit: '條/頁',
     result_count: '結果展示',
-    result_mode_all: '全部'
+    result_mode_all: '全部',
+    splitCount_less_100: '刻度數不能超過100'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',

frontend/src/lang/zh.js

@@ -957,7 +957,8 @@ export default {
     table_page_size: '分页',
     table_page_size_unit: '条/页',
     result_count: '结果展示',
-    result_mode_all: '全部'
+    result_mode_all: '全部',
+    splitCount_less_100: '刻度数不能超过100'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',

frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue

@@ -160,6 +160,13 @@ export default {
       if (!this.axisForm.show) {
         this.isSetting = false
       }
+      if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
+        this.$message({
+          message: this.$t('chart.splitCount_less_100'),
+          type: 'error'
+        })
+        return
+      }
       this.$emit('onChangeXAxisForm', this.axisForm)
     }
   }

frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue

@@ -163,6 +163,13 @@ export default {
       if (!this.axisForm.show) {
         this.isSetting = false
       }
+      if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
+        this.$message({
+          message: this.$t('chart.splitCount_less_100'),
+          type: 'error'
+        })
+        return
+      }
       this.$emit('onChangeYAxisForm', this.axisForm)
     }
   }

frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue

@@ -171,6 +171,13 @@ export default {
       if (!this.axisForm.show) {
         this.isSetting = false
       }
+      if (this.axisForm.axisValue.splitCount && parseInt(this.axisForm.axisValue.splitCount) > 100) {
+        this.$message({
+          message: this.$t('chart.splitCount_less_100'),
+          type: 'error'
+        })
+        return
+      }
       this.$emit('onChangeYAxisForm', this.axisForm)
     }
   }

frontend/src/views/system/datasource/DsMain.vue

@@ -1,10 +1,10 @@
 <template>
   <de-container v-loading="$store.getters.loadingMap[$store.getters.currentPath]">
     <de-aside-container style="padding: 0 0;">
-      <ds-tree ref="dsTree" @switch-main="switchMain" />
+      <ds-tree ref="dsTree" :datasource="datasource" @switch-main="switchMain" />
     </de-aside-container>
     <de-main-container>
-      <component :is="component" v-if="!!component" :params="param" @refresh-left-tree="refreshTree" @switch-component="switchMain" />
+      <component :is="component" v-if="!!component" :params="param"  @refresh-type="refreshType" @switch-component="switchMain" />
     </de-main-container>
   </de-container>
 </template>
@@ -22,6 +22,7 @@ export default {
   data() {
     return {
       component: DataHome,
+      datasource: {},
       param: null
     }
   },
@@ -53,8 +54,9 @@ export default {
         }
       })
     },
-    refreshTree() {
-      this.$refs.dsTree && this.$refs.dsTree.queryTreeDatas()
+    refreshType(datasource) {
+      this.datasource = datasource;
+      this.$refs.dsTree && this.$refs.dsTree.refreshType(datasource)
     },
     msg2Current(sourceParam) {
       this.$refs.dsTree && this.$refs.dsTree.markInvalid(sourceParam)

frontend/src/views/system/datasource/DsTree.vue

@@ -87,10 +87,16 @@
   </el-col>
 </template>
 <script>
-import { listDatasource, delDs } from '@/api/system/datasource'
+import { listDatasource, listDatasourceByType, delDs } from '@/api/system/datasource'
 
 export default {
   name: 'DsTree',
+  props: {
+    datasource: {
+      type: Object,
+      default: null
+    }
+  },
   data() {
     return {
       expandedArray: [],
@@ -106,7 +112,6 @@ export default {
   },
   mounted() {
     this.queryTreeDatas()
-    // console.log('permis:' + JSON.stringify(this.$store.getters.permissions))
   },
   methods: {
     filterNode(value, data) {
@@ -124,6 +129,19 @@ export default {
       listDatasource().then(res => {
         this.tData = this.buildTree(res.data)
       })
+    },
+    refreshType(datasource) {
+      let typeData = []
+      listDatasourceByType(datasource.type).then(res => {
+        typeData = this.buildTree(res.data)
+        for (let index = 0; index < this.tData.length; index++) {
+          if(typeData[0].id === this.tData[index].id){
+            this.tData[index].children = typeData[0].children
+          }
+        }
+      })
+
+
     },
     buildTree(array) {
       const types = {}
@@ -212,7 +230,7 @@ export default {
       }).then(() => {
         delDs(datasource.id).then(res => {
           this.$success(this.$t('commons.delete_success'))
-          this.queryTreeDatas()
+          this.refreshType(datasource)
         })
       }).catch(() => {
         this.$message({

frontend/src/views/system/datasource/form.vue

@@ -235,14 +235,14 @@ export default {
             $confirm(this.$t('datasource.edit_datasource_msg'), () => {
               method(form).then(res => {
                 this.$success(this.$t('commons.save_success'))
-                this.refreshTree()
+                this.refreshType(form)
                 this.backToList()
               })
             })
           } else {
             method(form).then(res => {
               this.$success(this.$t('commons.save_success'))
-              this.refreshTree()
+              this.refreshType(form)
               this.backToList()
             })
           }
@@ -315,10 +315,9 @@ export default {
     },
     backToList() {
       this.$emit('switch-component', { })
-      // this.$router.push({ name: 'datasource' })
     },
-    refreshTree() {
-      this.$emit('refresh-left-tree')
+    refreshType(form) {
+      this.$emit('refresh-type', form)
     }
   }
 }