Merge pull request #329 from dataease/dev

Dev

backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java

@@ -13,6 +13,8 @@ public class ChartViewWithBLOBs extends ChartView implements Serializable {
 
     private String yAxis;
 
+    private String extStack;
+
     private String customAttr;
 
     private String customStyle;

backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml

@@ -16,6 +16,7 @@
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.ChartViewWithBLOBs">
     <result column="x_axis" jdbcType="LONGVARCHAR" property="xAxis" />
     <result column="y_axis" jdbcType="LONGVARCHAR" property="yAxis" />
+    <result column="ext_stack" jdbcType="LONGVARCHAR" property="extStack" />
     <result column="custom_attr" jdbcType="LONGVARCHAR" property="customAttr" />
     <result column="custom_style" jdbcType="LONGVARCHAR" property="customStyle" />
     <result column="custom_filter" jdbcType="LONGVARCHAR" property="customFilter" />
@@ -84,7 +85,7 @@
     style_priority
   </sql>
   <sql id="Blob_Column_List">
-    x_axis, y_axis, custom_attr, custom_style, custom_filter, snapshot
+    x_axis, y_axis, ext_stack, custom_attr, custom_style, custom_filter, snapshot
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.ChartViewExample" resultMap="ResultMapWithBLOBs">
     select
@@ -139,14 +140,14 @@
       table_id, `type`, title, 
       create_by, create_time, update_time, 
       style_priority, x_axis, y_axis, 
-      custom_attr, custom_style, custom_filter, 
-      snapshot)
+      ext_stack, custom_attr, custom_style, 
+      custom_filter, snapshot)
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, 
       #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
       #{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, 
-      #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, 
-      #{snapshot,jdbcType=LONGVARCHAR})
+      #{extStack,jdbcType=LONGVARCHAR}, #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, 
+      #{customFilter,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
     insert into chart_view
@@ -187,6 +188,9 @@
       <if test="yAxis != null">
         y_axis,
       </if>
+      <if test="extStack != null">
+        ext_stack,
+      </if>
       <if test="customAttr != null">
         custom_attr,
       </if>
@@ -237,6 +241,9 @@
       <if test="yAxis != null">
         #{yAxis,jdbcType=LONGVARCHAR},
       </if>
+      <if test="extStack != null">
+        #{extStack,jdbcType=LONGVARCHAR},
+      </if>
       <if test="customAttr != null">
         #{customAttr,jdbcType=LONGVARCHAR},
       </if>
@@ -296,6 +303,9 @@
       <if test="record.yAxis != null">
         y_axis = #{record.yAxis,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.extStack != null">
+        ext_stack = #{record.extStack,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.customAttr != null">
         custom_attr = #{record.customAttr,jdbcType=LONGVARCHAR},
       </if>
@@ -327,6 +337,7 @@
       style_priority = #{record.stylePriority,jdbcType=VARCHAR},
       x_axis = #{record.xAxis,jdbcType=LONGVARCHAR},
       y_axis = #{record.yAxis,jdbcType=LONGVARCHAR},
+      ext_stack = #{record.extStack,jdbcType=LONGVARCHAR},
       custom_attr = #{record.customAttr,jdbcType=LONGVARCHAR},
       custom_style = #{record.customStyle,jdbcType=LONGVARCHAR},
       custom_filter = #{record.customFilter,jdbcType=LONGVARCHAR},
@@ -387,6 +398,9 @@
       <if test="yAxis != null">
         y_axis = #{yAxis,jdbcType=LONGVARCHAR},
       </if>
+      <if test="extStack != null">
+        ext_stack = #{extStack,jdbcType=LONGVARCHAR},
+      </if>
       <if test="customAttr != null">
         custom_attr = #{customAttr,jdbcType=LONGVARCHAR},
       </if>
@@ -415,6 +429,7 @@
       style_priority = #{stylePriority,jdbcType=VARCHAR},
       x_axis = #{xAxis,jdbcType=LONGVARCHAR},
       y_axis = #{yAxis,jdbcType=LONGVARCHAR},
+      ext_stack = #{extStack,jdbcType=LONGVARCHAR},
       custom_attr = #{customAttr,jdbcType=LONGVARCHAR},
       custom_style = #{customStyle,jdbcType=LONGVARCHAR},
       custom_filter = #{customFilter,jdbcType=LONGVARCHAR},

backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml

@@ -45,7 +45,8 @@
             `create_time`,
             `update_time`,
             `snapshot`,
-            `style_priority`
+            `style_priority`,
+            `ext_stack`
         ) SELECT
         #{newChartId},
         GET_CHART_VIEW_COPY_NAME ( #{oldChartId} ),
@@ -62,7 +63,8 @@
         `create_time`,
         `update_time`,
         `snapshot`,
-        `style_priority`
+        `style_priority`,
+        `ext_stack`
         FROM
             chart_view
         WHERE

backend/src/main/java/io/dataease/base/mapper/ext/ExtDataSetTaskMapper.xml

@@ -16,6 +16,7 @@
         SELECT dataset_table_task_log.*, dataset_table_task.name
         FROM dataset_table_task_log
         LEFT JOIN dataset_table_task ON dataset_table_task_log.task_id = dataset_table_task.id
+        LEFT JOIN dataset_table ON dataset_table_task_log.table_id = dataset_table.id
         <if test="_parameter != null">
             <include refid="io.dataease.base.mapper.ext.query.GridSql.gridCondition" />
         </if>

backend/src/main/java/io/dataease/base/mapper/ext/ExtSysMsgMapper.xml

@@ -52,7 +52,7 @@
             order by ${orderByClause}
         </if>
         <if test="orderByClause == null">
-            order by sm.status asc
+            order by sm.create_time desc
         </if>
     </select>
 

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

@@ -1,5 +1,5 @@
 package io.dataease.commons.constants;
 
 public enum TaskStatus {
-    Underway, Stopped
+    Underway, Stopped, Pending, Exec
 }

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

@@ -33,10 +33,10 @@ public class DataSetTableTaskLogController {
         dataSetTableTaskLogService.delete(id);
     }
 
-    @PostMapping("list/{goPage}/{pageSize}")
-    public Pager<List<DataSetTaskLogDTO>> list(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) {
+    @PostMapping("list/{type}/{goPage}/{pageSize}")
+    public Pager<List<DataSetTaskLogDTO>> list(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) {
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
-        return PageUtils.setPageInfo(page, dataSetTableTaskLogService.list(request));
+        return PageUtils.setPageInfo(page, dataSetTableTaskLogService.list(request, type));
     }
 
 }

backend/src/main/java/io/dataease/controller/message/MsgController.java

@@ -15,9 +15,15 @@ import io.dataease.controller.message.dto.SettingTreeNode;
 import io.dataease.service.message.SysMsgService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.*;
 import javax.annotation.Resource;
+import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collector;
+import java.util.stream.Collectors;
+import java.util.stream.Stream;
 
 @Api(tags = "系统：消息管理")
 @RequestMapping("/api/sys_msg")
@@ -31,8 +37,13 @@ public class MsgController {
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<MsgGridDto>> messages(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody MsgRequest msgRequest) {
         Long userId = AuthUtils.getUser().getUserId();
+        List<Long> typeIds = null;
+        if (ObjectUtils.isNotEmpty(msgRequest.getType())){
+            List<SysMsgType> sysMsgTypes = sysMsgService.queryMsgTypes();
+            typeIds = sysMsgTypes.stream().filter(sysMsgType -> msgRequest.getType() == sysMsgType.getPid()).map(SysMsgType::getMsgTypeId).collect(Collectors.toList());
+        }
         Page<Object> page = PageHelper.startPage(goPage, pageSize, true);
-        Pager<List<MsgGridDto>> listPager = PageUtils.setPageInfo(page, sysMsgService.queryGrid(userId, msgRequest));
+        Pager<List<MsgGridDto>> listPager = PageUtils.setPageInfo(page, sysMsgService.queryGrid(userId, msgRequest, typeIds));
         return listPager;
     }
 

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

@@ -11,7 +11,7 @@ public class MysqlConfigration extends JdbcDTO {
 
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
-        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8"
+        return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000&socketTimeout=5000"
                 .replace("HOSTNAME", getHost())
                 .replace("PORT", getPort().toString())
                 .replace("DATABASE", getDataBase());

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

@@ -401,6 +401,7 @@ public class JdbcProvider extends DatasourceProvider {
         String driver = null;
         String jdbcurl = null;
         DatasourceTypes datasourceType = DatasourceTypes.valueOf(datasourceRequest.getDatasource().getType());
+        Properties props = new Properties();
         switch (datasourceType) {
             case mysql:
                 MysqlConfigration mysqlConfigration = new Gson().fromJson(datasourceRequest.getDatasource().getConfiguration(), MysqlConfigration.class);
@@ -429,13 +430,14 @@ public class JdbcProvider extends DatasourceProvider {
                 password = oracleConfigration.getPassword();
                 driver = oracleConfigration.getDriver();
                 jdbcurl = oracleConfigration.getJdbc();
+                props.put( "oracle.net.CONNECT_TIMEOUT" , "5000") ;
+                props.put( "oracle.jdbc.ReadTimeout" , "5000" ) ;
                 break;
             default:
                 break;
         }
 
         Class.forName(driver);
-        Properties props = new Properties();
         props.setProperty("user", username);
         if (StringUtils.isNotBlank(password)) {
             props.setProperty("password", password);

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

@@ -120,6 +120,13 @@ public class DatasourceService {
         datasourceProvider.checkStatus(datasourceRequest);
     }
 
+    public void validate(String datasourceId) throws Exception {
+        if(StringUtils.isEmpty(datasourceId)){
+            return;
+        }
+        Datasource datasource = datasourceMapper.selectByPrimaryKey(datasourceId);
+        validate(datasource);
+    }
     public List<String> getSchema(Datasource datasource) throws Exception {
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(datasource.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
@@ -132,6 +139,7 @@ public class DatasourceService {
         DatasourceProvider datasourceProvider = ProviderFactory.getProvider(ds.getType());
         DatasourceRequest datasourceRequest = new DatasourceRequest();
         datasourceRequest.setDatasource(ds);
+        datasourceProvider.checkStatus(datasourceRequest);
         List<String> tables = datasourceProvider.getTables(datasourceRequest);
 
         // 获取当前数据源下的db类型数据集

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

@@ -15,4 +15,5 @@ public class DataSetTaskDTO extends DatasetTableTask {
     private String datasetName;
     private Long nextExecTime;
     private String taskStatus;
+    private String msg;
 }

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

@@ -14,6 +14,7 @@ import java.util.List;
 public class DataTableInfoDTO {
     private String table;
     private String sql;
+    private List<String> sheets;
     private String data;// file path
     private List<DataTableInfoCustomUnion> list;
 }

backend/src/main/java/io/dataease/map/dto/entity/AreaEntity.java

@@ -1,5 +1,6 @@
 package io.dataease.map.dto.entity;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Builder;
 import lombok.Data;
 
@@ -10,6 +11,7 @@ import java.util.Optional;
 
 @Data
 @Builder
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class AreaEntity implements Serializable {
 
     private static final long serialVersionUID = -1326667005437020282L;

backend/src/main/java/io/dataease/map/server/MapServer.java

@@ -5,6 +5,7 @@ import io.dataease.map.api.MapApi;
 import io.dataease.map.dto.entity.AreaEntity;
 import io.dataease.map.service.MapService;
 import io.dataease.map.utils.MapUtils;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RestController;
 import javax.annotation.Resource;
@@ -40,7 +41,9 @@ public class MapServer implements MapApi {
     @Override
     public List<AreaEntity> areaEntitys(@PathVariable String pcode) {
         List<AreaEntity> areaEntities = mapService.areaEntities();
-
+        if (StringUtils.equals(pcode, "0")) {
+            return areaEntities;
+        }
         return mapService.entitysByPid(areaEntities, pcode);
     }
 

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

@@ -36,10 +36,23 @@ public abstract class QueryProvider {
 
     public abstract String getSQLAsTmp(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList);
 
+    public abstract String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack);
+
+    public abstract String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack);
+
     public abstract String searchTable(String table);
 
     public abstract String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList);
 
+    /**
+     * 单指标汇总
+     *
+     * @param sql
+     * @param yAxis
+     * @param customFilter
+     * @param extFilterRequestList
+     * @return
+     */
     public abstract String getSQLSummaryAsTmp(String sql, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList);
 
     public abstract String wrapSql(String sql);

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

@@ -263,6 +263,104 @@ public class DorisQueryProvider extends QueryProvider {
         return getSQL("(" + sql + ")", xAxis, yAxis, customFilter, extFilterRequestList);
     }
 
+    @Override
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(DorisConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
+                .build();
+        List<SQLObj> xFields = new ArrayList<>();
+        List<SQLObj> xWheres = new ArrayList<>();
+        List<SQLObj> xOrders = new ArrayList<>();
+        List<ChartViewFieldDTO> xList = new ArrayList<>();
+        xList.addAll(xAxis);
+        xList.addAll(extStack);
+        if (CollectionUtils.isNotEmpty(xList)) {
+            for (int i = 0; i < xList.size(); i++) {
+                ChartViewFieldDTO x = xList.get(i);
+                String originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getDataeaseName());
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
+                // 处理横轴字段
+                xFields.add(getXFields(x, originField, fieldAlias));
+                // 处理横轴过滤
+                xWheres.addAll(getXWheres(x, originField, fieldAlias));
+                // 处理横轴排序
+                if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
+                    xOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(x.getSort())
+                            .build());
+                }
+            }
+        }
+        List<SQLObj> yFields = new ArrayList<>();
+        List<SQLObj> yWheres = new ArrayList<>();
+        List<SQLObj> yOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(yAxis)) {
+            for (int i = 0; i < yAxis.size(); i++) {
+                ChartViewFieldDTO y = yAxis.get(i);
+                String originField = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getDataeaseName());
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
+                // 处理纵轴字段
+                yFields.add(getYFields(y, originField, fieldAlias));
+                // 处理纵轴过滤
+                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                // 处理纵轴排序
+                if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
+                    yOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(y.getSort())
+                            .build());
+                }
+            }
+        }
+        // 处理视图中字段过滤
+        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        // 处理仪表板字段过滤
+        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        // 构建sql所有参数
+        List<SQLObj> fields = new ArrayList<>();
+        fields.addAll(xFields);
+        fields.addAll(yFields);
+        List<SQLObj> wheres = new ArrayList<>();
+        wheres.addAll(xWheres);
+        if (customWheres != null) wheres.addAll(customWheres);
+        if (extWheres != null) wheres.addAll(extWheres);
+        List<SQLObj> groups = new ArrayList<>();
+        groups.addAll(xFields);
+        // 外层再次套sql
+        List<SQLObj> orders = new ArrayList<>();
+        orders.addAll(xOrders);
+        orders.addAll(yOrders);
+        List<SQLObj> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres);
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("querySql");
+        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String sql = st_sql.render();
+
+        ST st = stg.getInstanceOf("querySql");
+        SQLObj tableSQL = SQLObj.builder()
+                .tableName(String.format(DorisConstants.BRACKETS, sql))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
+                .build();
+        if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
+        if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
+        if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
+        return st.render();
+    }
+
+    @Override
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        return getSQLStack("(" + table + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack);
+    }
+
     @Override
     public String searchTable(String table) {
         return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'";
@@ -471,10 +569,14 @@ public class DorisQueryProvider extends QueryProvider {
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
+                if (request.getDatasetTableField().getDeType() == 1) {
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     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(DorisConstants.WHERE_BETWEEN, startTime, endTime);
+                } else {
+                    whereValue = String.format(MySQLConstants.WHERE_BETWEEN, value.get(0), value.get(1));
+                }
             } else {
                 whereValue = String.format(DorisConstants.WHERE_VALUE_VALUE, value.get(0));
             }

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

@@ -254,6 +254,123 @@ public class MysqlQueryProvider extends QueryProvider {
         return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList);
     }
 
+    @Override
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(MySQLConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
+                .build();
+        List<SQLObj> xFields = new ArrayList<>();
+        List<SQLObj> xWheres = new ArrayList<>();
+        List<SQLObj> xOrders = new ArrayList<>();
+        List<ChartViewFieldDTO> xList = new ArrayList<>();
+        xList.addAll(xAxis);
+        xList.addAll(extStack);
+        if (CollectionUtils.isNotEmpty(xList)) {
+            for (int i = 0; i < xList.size(); i++) {
+                ChartViewFieldDTO x = xList.get(i);
+                String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
+                // 处理横轴字段
+                xFields.add(getXFields(x, originField, fieldAlias));
+                // 处理横轴过滤
+                xWheres.addAll(getXWheres(x, originField, fieldAlias));
+                // 处理横轴排序
+                if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
+                    xOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(x.getSort())
+                            .build());
+                }
+            }
+        }
+        List<SQLObj> yFields = new ArrayList<>();
+        List<SQLObj> yWheres = new ArrayList<>();
+        List<SQLObj> yOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(yAxis)) {
+            for (int i = 0; i < yAxis.size(); i++) {
+                ChartViewFieldDTO y = yAxis.get(i);
+                String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
+                // 处理纵轴字段
+                yFields.add(getYFields(y, originField, fieldAlias));
+                // 处理纵轴过滤
+                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                // 处理纵轴排序
+                if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
+                    yOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(y.getSort())
+                            .build());
+                }
+            }
+        }
+        List<SQLObj> stackFields = new ArrayList<>();
+        List<SQLObj> stackOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(extStack)) {
+            for (int i = 0; i < extStack.size(); i++) {
+                ChartViewFieldDTO stack = extStack.get(i);
+                String originField = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), stack.getOriginName());
+                String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
+                // 处理横轴字段
+                stackFields.add(getXFields(stack, originField, fieldAlias));
+                // 处理横轴排序
+                if (StringUtils.isNotEmpty(stack.getSort()) && !StringUtils.equalsIgnoreCase(stack.getSort(), "none")) {
+                    stackOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(stack.getSort())
+                            .build());
+                }
+            }
+        }
+        // 处理视图中字段过滤
+        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        // 处理仪表板字段过滤
+        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        // 构建sql所有参数
+        List<SQLObj> fields = new ArrayList<>();
+        fields.addAll(xFields);
+        fields.addAll(yFields);
+        List<SQLObj> wheres = new ArrayList<>();
+        wheres.addAll(xWheres);
+        if (customWheres != null) wheres.addAll(customWheres);
+        if (extWheres != null) wheres.addAll(extWheres);
+        List<SQLObj> groups = new ArrayList<>();
+        groups.addAll(xFields);
+        // 外层再次套sql
+        List<SQLObj> orders = new ArrayList<>();
+        orders.addAll(xOrders);
+        orders.addAll(yOrders);
+        List<SQLObj> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres);
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("querySql");
+        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String sql = st_sql.render();
+
+        ST st = stg.getInstanceOf("querySql");
+        SQLObj tableSQL = SQLObj.builder()
+                .tableName(String.format(MySQLConstants.BRACKETS, sql))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
+                .build();
+        if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
+        if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
+        if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
+        return st.render();
+    }
+
+    @Override
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack);
+    }
+
     @Override
     public String searchTable(String table) {
         return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'";
@@ -459,10 +576,14 @@ public class MysqlQueryProvider extends QueryProvider {
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
+                if (request.getDatasetTableField().getDeType() == 1) {
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     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(MySQLConstants.WHERE_BETWEEN, startTime, endTime);
+                } else {
+                    whereValue = String.format(MySQLConstants.WHERE_BETWEEN, value.get(0), value.get(1));
+                }
             } else {
                 whereValue = String.format(MySQLConstants.WHERE_VALUE_VALUE, value.get(0));
             }

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

@@ -7,6 +7,8 @@ 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.doris.DorisConstants;
+import io.dataease.provider.mysql.MySQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -107,8 +109,7 @@ public class OracleQueryProvider extends QueryProvider {
     }
 
 
-
-    private List<SQLObj> xFields(String table, List<DatasetTableField> fields){
+    private List<SQLObj> xFields(String table, List<DatasetTableField> fields) {
         SQLObj tableObj = SQLObj.builder()
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
@@ -155,6 +156,7 @@ public class OracleQueryProvider extends QueryProvider {
         }
         return xFields;
     }
+
     private String sqlColumn(List<SQLObj> xFields) {
         String[] array = xFields.stream().map(f -> {
             return f.getFieldAlias();
@@ -287,6 +289,104 @@ public class OracleQueryProvider extends QueryProvider {
         return getSQL("(" + sqlFix(sql) + ")", xAxis, yAxis, customFilter, extFilterRequestList);
     }
 
+    @Override
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        SQLObj tableObj = SQLObj.builder()
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(OracleConstants.KEYWORD_TABLE, table))
+                .tableAlias(String.format(OracleConstants.ALIAS_FIX, String.format(TABLE_ALIAS_PREFIX, 0)))
+                .build();
+        List<SQLObj> xFields = new ArrayList<>();
+        List<SQLObj> xWheres = new ArrayList<>();
+        List<SQLObj> xOrders = new ArrayList<>();
+        List<ChartViewFieldDTO> xList = new ArrayList<>();
+        xList.addAll(xAxis);
+        xList.addAll(extStack);
+        if (CollectionUtils.isNotEmpty(xList)) {
+            for (int i = 0; i < xList.size(); i++) {
+                ChartViewFieldDTO x = xList.get(i);
+                String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i));
+                // 处理横轴字段
+                xFields.add(getXFields(x, originField, fieldAlias));
+                // 处理横轴过滤
+                xWheres.addAll(getXWheres(x, originField, fieldAlias));
+                // 处理横轴排序
+                if (StringUtils.isNotEmpty(x.getSort()) && !StringUtils.equalsIgnoreCase(x.getSort(), "none")) {
+                    xOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(x.getSort())
+                            .build());
+                }
+            }
+        }
+        List<SQLObj> yFields = new ArrayList<>();
+        List<SQLObj> yWheres = new ArrayList<>();
+        List<SQLObj> yOrders = new ArrayList<>();
+        if (CollectionUtils.isNotEmpty(yAxis)) {
+            for (int i = 0; i < yAxis.size(); i++) {
+                ChartViewFieldDTO y = yAxis.get(i);
+                String originField = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                String fieldAlias = String.format(OracleConstants.ALIAS_FIX, String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i));
+                // 处理纵轴字段
+                yFields.add(getYFields(y, originField, fieldAlias));
+                // 处理纵轴过滤
+                yWheres.addAll(getYWheres(y, originField, fieldAlias));
+                // 处理纵轴排序
+                if (StringUtils.isNotEmpty(y.getSort()) && !StringUtils.equalsIgnoreCase(y.getSort(), "none")) {
+                    yOrders.add(SQLObj.builder()
+                            .orderField(originField)
+                            .orderAlias(fieldAlias)
+                            .orderDirection(y.getSort())
+                            .build());
+                }
+            }
+        }
+        // 处理视图中字段过滤
+        List<SQLObj> customWheres = transCustomFilterList(tableObj, customFilter);
+        // 处理仪表板字段过滤
+        List<SQLObj> extWheres = transExtFilterList(tableObj, extFilterRequestList);
+        // 构建sql所有参数
+        List<SQLObj> fields = new ArrayList<>();
+        fields.addAll(xFields);
+        fields.addAll(yFields);
+        List<SQLObj> wheres = new ArrayList<>();
+        wheres.addAll(xWheres);
+        if (customWheres != null) wheres.addAll(customWheres);
+        if (extWheres != null) wheres.addAll(extWheres);
+        List<SQLObj> groups = new ArrayList<>();
+        groups.addAll(xFields);
+        // 外层再次套sql
+        List<SQLObj> orders = new ArrayList<>();
+        orders.addAll(xOrders);
+        orders.addAll(yOrders);
+        List<SQLObj> aggWheres = new ArrayList<>();
+        aggWheres.addAll(yWheres);
+
+        STGroup stg = new STGroupFile(SQLConstants.SQL_TEMPLATE);
+        ST st_sql = stg.getInstanceOf("querySql");
+        if (CollectionUtils.isNotEmpty(xFields)) st_sql.add("groups", xFields);
+        if (CollectionUtils.isNotEmpty(yFields)) st_sql.add("aggregators", yFields);
+        if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
+        if (ObjectUtils.isNotEmpty(tableObj)) st_sql.add("table", tableObj);
+        String sql = st_sql.render();
+
+        ST st = stg.getInstanceOf("querySql");
+        SQLObj tableSQL = SQLObj.builder()
+                .tableName(String.format(OracleConstants.BRACKETS, sql))
+                .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
+                .build();
+        if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
+        if (CollectionUtils.isNotEmpty(orders)) st.add("orders", orders);
+        if (ObjectUtils.isNotEmpty(tableSQL)) st.add("table", tableSQL);
+        return st.render();
+    }
+
+    @Override
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        return getSQLStack("(" + sqlFix(table) + ")", xAxis, yAxis, customFilter, extFilterRequestList, extStack);
+    }
+
     @Override
     public String searchTable(String table) {
         return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'";
@@ -486,10 +586,14 @@ public class OracleQueryProvider extends QueryProvider {
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "like")) {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
+                if (request.getDatasetTableField().getDeType() == 1) {
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     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(OracleConstants.WHERE_BETWEEN, startTime, endTime);
+                } else {
+                    whereValue = String.format(MySQLConstants.WHERE_BETWEEN, value.get(0), value.get(1));
+                }
             } else {
                 whereValue = String.format(OracleConstants.WHERE_VALUE_VALUE, value.get(0));
             }

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

@@ -271,6 +271,16 @@ public class SqlserverQueryProvider extends QueryProvider {
         return getSQL(" (" + sqlFix(sql) + ") AS tmp ", xAxis, yAxis, customFilter, extFilterRequestList);
     }
 
+    @Override
+    public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        return null;
+    }
+
+    @Override
+    public String getSQLAsTmpStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack) {
+        return null;
+    }
+
     @Override
     public String searchTable(String table) {
         return "SELECT table_name FROM information_schema.TABLES WHERE table_name ='" + table + "'";

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

@@ -134,6 +134,8 @@ public class ChartViewService {
         }.getType());
         List<ChartViewFieldDTO> yAxis = new Gson().fromJson(view.getYAxis(), new TypeToken<List<ChartViewFieldDTO>>() {
         }.getType());
+        List<ChartViewFieldDTO> extStack = new Gson().fromJson(view.getExtStack(), new TypeToken<List<ChartViewFieldDTO>>() {
+        }.getType());
         List<ChartFieldCustomFilterDTO> fieldCustomFilter = new Gson().fromJson(view.getCustomFilter(), new TypeToken<List<ChartFieldCustomFilterDTO>>() {
         }.getType());
         List<ChartCustomFilterDTO> customFilter = fieldCustomFilter.stream().map(ele -> {
@@ -145,25 +147,20 @@ public class ChartViewService {
             return dto;
         }).collect(Collectors.toList());
 
-//        if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
-//            xAxis = new ArrayList<>();
-//            if (CollectionUtils.isEmpty(yAxis)) {
-//                ChartViewDTO dto = new ChartViewDTO();
-//                BeanUtils.copyBean(dto, view);
-//                return dto;
-//            }
-//        } else {
-//            if (CollectionUtils.isEmpty(xAxis) || CollectionUtils.isEmpty(yAxis)) {
-//                ChartViewDTO dto = new ChartViewDTO();
-//                BeanUtils.copyBean(dto, view);
-//                return dto;
-//            }
-//        }
+        if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
+            xAxis = new ArrayList<>();
+            if (CollectionUtils.isEmpty(yAxis)) {
+                ChartViewDTO dto = new ChartViewDTO();
+                BeanUtils.copyBean(dto, view);
+                return dto;
+            }
+        } else {
             if (CollectionUtils.isEmpty(xAxis) && CollectionUtils.isEmpty(yAxis)) {
                 ChartViewDTO dto = new ChartViewDTO();
                 BeanUtils.copyBean(dto, view);
                 return dto;
             }
+        }
 
         // 过滤来自仪表板的条件
         List<ChartExtFilterRequest> extFilterList = new ArrayList<>();
@@ -183,10 +180,10 @@ public class ChartViewService {
             }
         }
 
-        // 获取数据集
+        // 获取数据集,需校验权限
         DatasetTable table = dataSetTableService.get(view.getTableId());
         if (ObjectUtils.isEmpty(table)) {
-            throw new RuntimeException(Translator.get("i18n_dataset_delete"));
+            throw new RuntimeException(Translator.get("i18n_dataset_delete_or_no_permission"));
         }
         // 判断连接方式，直连或者定时抽取 table.mode
         DatasourceRequest datasourceRequest = new DatasourceRequest();
@@ -204,12 +201,16 @@ public class ChartViewService {
                 datasourceRequest.setTable(dataTableInfoDTO.getTable());
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
                     datasourceRequest.setQuery(qp.getSQLSummary(dataTableInfoDTO.getTable(), yAxis, customFilter, extFilterList));
+                } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
+                    datasourceRequest.setQuery(qp.getSQLStack(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList, extStack));
                 } else {
                     datasourceRequest.setQuery(qp.getSQL(dataTableInfoDTO.getTable(), xAxis, yAxis, customFilter, extFilterList));
                 }
             } else if (StringUtils.equalsIgnoreCase(table.getType(), "sql")) {
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
                     datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(dataTableInfoDTO.getSql(), yAxis, customFilter, extFilterList));
+                } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
+                    datasourceRequest.setQuery(qp.getSQLAsTmpStack(dataTableInfoDTO.getSql(), xAxis, yAxis, customFilter, extFilterList, extStack));
                 } else {
                     datasourceRequest.setQuery(qp.getSQLAsTmp(dataTableInfoDTO.getSql(), xAxis, yAxis, customFilter, extFilterList));
                 }
@@ -219,6 +220,8 @@ public class ChartViewService {
                 String sql = dataSetTableService.getCustomSQLDatasource(dt, list, ds);
                 if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
                     datasourceRequest.setQuery(qp.getSQLSummaryAsTmp(sql, yAxis, customFilter, extFilterList));
+                } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
+                    datasourceRequest.setQuery(qp.getSQLAsTmpStack(sql, xAxis, yAxis, customFilter, extFilterList, extStack));
                 } else {
                     datasourceRequest.setQuery(qp.getSQLAsTmp(sql, xAxis, yAxis, customFilter, extFilterList));
                 }
@@ -245,6 +248,8 @@ public class ChartViewService {
             QueryProvider qp = ProviderFactory.getQueryProvider(ds.getType());
             if (StringUtils.equalsIgnoreCase("text", view.getType()) || StringUtils.equalsIgnoreCase("gauge", view.getType())) {
                 datasourceRequest.setQuery(qp.getSQLSummary(tableName, yAxis, customFilter, extFilterList));
+            } else if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
+                datasourceRequest.setQuery(qp.getSQLStack(tableName, xAxis, yAxis, customFilter, extFilterList, extStack));
             } else {
                 datasourceRequest.setQuery(qp.getSQL(tableName, xAxis, yAxis, customFilter, extFilterList));
             }
@@ -279,67 +284,24 @@ public class ChartViewService {
                     }
                 }
             }
-
-
         }
         if (StringUtils.containsIgnoreCase(view.getType(), "pie") && data.size() > 1000) {
             data = data.subList(0, 1000);
         }
 
+        Map<String, Object> map = new TreeMap<>();
         // 图表组件可再扩展
-        List<String> x = new ArrayList<>();
-        List<Series> series = new ArrayList<>();
-        for (ChartViewFieldDTO y : yAxis) {
-            Series series1 = new Series();
-            series1.setName(y.getName());
-            series1.setType(view.getType());
-            series1.setData(new ArrayList<>());
-            series.add(series1);
-        }
-        for (String[] d : data) {
-            StringBuilder a = new StringBuilder();
-            for (int i = 0; i < xAxis.size(); i++) {
-                if (i == xAxis.size() - 1) {
-                    a.append(d[i]);
+        Map<String, Object> mapChart;
+        if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
+            mapChart = transStackChartData(xAxis, yAxis, view, data, extStack);
         } else {
-                    a.append(d[i]).append("\n");
+            mapChart = transChartData(xAxis, yAxis, view, data);
         }
-            }
-            x.add(a.toString());
-            for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) {
-                int j = i - xAxis.size();
-                try {
-                    series.get(j).getData().add(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i]));
-                } catch (Exception e) {
-                    series.get(j).getData().add(new BigDecimal(0));
-                }
-            }
-        }
-        // table组件
-        List<ChartViewFieldDTO> fields = new ArrayList<>();
-        List<Map<String, Object>> tableRow = new ArrayList<>();
-        if (ObjectUtils.isNotEmpty(xAxis) && !StringUtils.equalsIgnoreCase("text", view.getType()) && !StringUtils.equalsIgnoreCase("gauge", view.getType())) {
-            fields.addAll(xAxis);
-        }
-        fields.addAll(yAxis);
-        data.forEach(ele -> {
-            Map<String, Object> d = new HashMap<>();
-            for (int i = 0; i < fields.size(); i++) {
-                ChartViewFieldDTO chartViewFieldDTO = fields.get(i);
-                if (chartViewFieldDTO.getDeType() == 0 || chartViewFieldDTO.getDeType() == 1) {
-                    d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
-                } else if (chartViewFieldDTO.getDeType() == 2 || chartViewFieldDTO.getDeType() == 3) {
-                    d.put(fields.get(i).getDataeaseName(), new BigDecimal(StringUtils.isEmpty(ele[i]) ? "0" : ele[i]).setScale(2, RoundingMode.HALF_UP));
-                }
-            }
-            tableRow.add(d);
-        });
+        // table组件，明细表，也用于导出数据
+        Map<String, Object> mapTableNormal = transTableNormal(xAxis, yAxis, view, data, extStack);
 
-        Map<String, Object> map = new HashMap<>();
-        map.put("x", x);
-        map.put("series", series);
-        map.put("fields", fields);
-        map.put("tableRow", tableRow);
+        map.putAll(mapChart);
+        map.putAll(mapTableNormal);
 
         ChartViewDTO dto = new ChartViewDTO();
         BeanUtils.copyBean(dto, view);
@@ -384,6 +346,166 @@ public class ChartViewService {
         return result;
     }
 
+    private Map<String, Object> transChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data) {
+        Map<String, Object> map = new HashMap<>();
+
+        List<String> x = new ArrayList<>();
+        List<Series> series = new ArrayList<>();
+        for (ChartViewFieldDTO y : yAxis) {
+            Series series1 = new Series();
+            series1.setName(y.getName());
+            series1.setType(view.getType());
+            series1.setData(new ArrayList<>());
+            series.add(series1);
+        }
+        for (String[] d : data) {
+            StringBuilder a = new StringBuilder();
+            for (int i = 0; i < xAxis.size(); i++) {
+                if (i == xAxis.size() - 1) {
+                    a.append(d[i]);
+                } else {
+                    a.append(d[i]).append("\n");
+                }
+            }
+            x.add(a.toString());
+            for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) {
+                int j = i - xAxis.size();
+                try {
+                    series.get(j).getData().add(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i]));
+                } catch (Exception e) {
+                    series.get(j).getData().add(new BigDecimal(0));
+                }
+            }
+        }
+
+        map.put("x", x);
+        map.put("series", series);
+        return map;
+    }
+
+    private Map<String, Object> transStackChartData(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extStack) {
+        Map<String, Object> map = new HashMap<>();
+
+        List<String> x = new ArrayList<>();
+        List<String> stack = new ArrayList<>();
+        List<Series> series = new ArrayList<>();
+
+        if (CollectionUtils.isNotEmpty(extStack)) {
+            BigDecimal defaultValue = StringUtils.containsIgnoreCase(view.getType(), "line") ? new BigDecimal(0) : null;
+            // 构建横轴
+            for (String[] d : data) {
+                StringBuilder a = new StringBuilder();
+                for (int i = 0; i < xAxis.size(); i++) {
+                    if (i == xAxis.size() - 1) {
+                        a.append(d[i]);
+                    } else {
+                        a.append(d[i]).append("\n");
+                    }
+                }
+                x.add(a.toString());
+            }
+            x = x.stream().distinct().collect(Collectors.toList());
+            // 构建堆叠
+            for (String[] d : data) {
+                stack.add(d[xAxis.size()]);
+            }
+            stack = stack.stream().distinct().collect(Collectors.toList());
+            for (String s : stack) {
+                Series series1 = new Series();
+                series1.setName(s);
+                series1.setType(view.getType());
+                List<BigDecimal> list = new ArrayList<>();
+                for (int i = 0; i < x.size(); i++) {
+                    list.add(defaultValue);
+                }
+                series1.setData(list);
+                series.add(series1);
+            }
+            for (Series ss : series) {
+                for (int i = 0; i < x.size(); i++) {
+                    for (String[] row : data) {
+                        String stackColumn = row[xAxis.size()];
+                        if (StringUtils.equals(ss.getName(), stackColumn)) {
+                            StringBuilder a = new StringBuilder();
+                            for (int j = 0; j < xAxis.size(); j++) {
+                                if (j == xAxis.size() - 1) {
+                                    a.append(row[j]);
+                                } else {
+                                    a.append(row[j]).append("\n");
+                                }
+                            }
+                            if (StringUtils.equals(a.toString(), x.get(i))) {
+                                ss.getData().set(i, new BigDecimal(row[xAxis.size() + extStack.size()]));
+                                break;
+                            }
+                        }
+                    }
+                }
+            }
+        } else {
+            for (ChartViewFieldDTO y : yAxis) {
+                Series series1 = new Series();
+                series1.setName(y.getName());
+                series1.setType(view.getType());
+                series1.setData(new ArrayList<>());
+                series.add(series1);
+            }
+            for (String[] d : data) {
+                StringBuilder a = new StringBuilder();
+                for (int i = 0; i < xAxis.size(); i++) {
+                    if (i == xAxis.size() - 1) {
+                        a.append(d[i]);
+                    } else {
+                        a.append(d[i]).append("\n");
+                    }
+                }
+                x.add(a.toString());
+                for (int i = xAxis.size(); i < xAxis.size() + yAxis.size(); i++) {
+                    int j = i - xAxis.size();
+                    try {
+                        series.get(j).getData().add(new BigDecimal(StringUtils.isEmpty(d[i]) ? "0" : d[i]));
+                    } catch (Exception e) {
+                        series.get(j).getData().add(new BigDecimal(0));
+                    }
+                }
+            }
+        }
+
+        map.put("x", x);
+        map.put("series", series);
+        return map;
+    }
+
+    private Map<String, Object> transTableNormal(List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, ChartViewWithBLOBs view, List<String[]> data, List<ChartViewFieldDTO> extStack) {
+        Map<String, Object> map = new TreeMap<>();
+        List<ChartViewFieldDTO> fields = new ArrayList<>();
+        List<Map<String, Object>> tableRow = new ArrayList<>();
+        if (ObjectUtils.isNotEmpty(xAxis)) {
+            fields.addAll(xAxis);
+        }
+        if (StringUtils.containsIgnoreCase(view.getType(), "stack")) {
+            if (ObjectUtils.isNotEmpty(extStack)) {
+                fields.addAll(extStack);
+            }
+        }
+        fields.addAll(yAxis);
+        data.forEach(ele -> {
+            Map<String, Object> d = new HashMap<>();
+            for (int i = 0; i < fields.size(); i++) {
+                ChartViewFieldDTO chartViewFieldDTO = fields.get(i);
+                if (chartViewFieldDTO.getDeType() == 0 || chartViewFieldDTO.getDeType() == 1) {
+                    d.put(fields.get(i).getDataeaseName(), StringUtils.isEmpty(ele[i]) ? "" : ele[i]);
+                } else if (chartViewFieldDTO.getDeType() == 2 || chartViewFieldDTO.getDeType() == 3) {
+                    d.put(fields.get(i).getDataeaseName(), new BigDecimal(StringUtils.isEmpty(ele[i]) ? "0" : ele[i]).setScale(2, RoundingMode.HALF_UP));
+                }
+            }
+            tableRow.add(d);
+        });
+        map.put("fields", fields);
+        map.put("tableRow", tableRow);
+        return map;
+    }
+
     private void checkName(ChartViewWithBLOBs chartView) {
 //        if (StringUtils.isEmpty(chartView.getId())) {
 //            return;

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

@@ -101,7 +101,7 @@ public class DataSetTableService {
     private void extractData(DataSetTableRequest datasetTable) throws Exception {
         if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
             commonThreadPool.addTask(() -> {
-                extractDataService.extractExcelData(datasetTable.getId(), "all_scope");
+                extractDataService.extractExcelData(datasetTable.getId(), "all_scope", "初始导入");
             });
             return;
         }
@@ -131,7 +131,6 @@ public class DataSetTableService {
             datasetTable.setId(UUID.randomUUID().toString());
             datasetTable.setCreateBy(AuthUtils.getUser().getUsername());
             datasetTable.setCreateTime(System.currentTimeMillis());
-            DataTableInfoDTO dataTableInfoDTO = new DataTableInfoDTO();
             int insert = datasetTableMapper.insert(datasetTable);
             // 添加表成功后，获取当前表字段和类型，抽象到dataease数据库
             if (insert == 1) {
@@ -151,11 +150,11 @@ public class DataSetTableService {
                     if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
                         if (datasetTable.getEditType() == 0) {
                             commonThreadPool.addTask(() -> {
-                                extractDataService.extractExcelData(datasetTable.getId(), "all_scope");
+                                extractDataService.extractExcelData(datasetTable.getId(), "all_scope", "替换");
                             });
                         } else if (datasetTable.getEditType() == 1) {
                             commonThreadPool.addTask(() -> {
-                                extractDataService.extractExcelData(datasetTable.getId(), "add_scope");
+                                extractDataService.extractExcelData(datasetTable.getId(), "add_scope", "追加");
                             });
                         }
                     }
@@ -299,6 +298,12 @@ public class DataSetTableService {
         datasetTableField.setTableId(dataSetTableRequest.getId());
         datasetTableField.setChecked(Boolean.TRUE);
         List<DatasetTableField> fields = dataSetTableFieldsService.list(datasetTableField);
+        if (CollectionUtils.isEmpty(fields)) {
+            map.put("fields", fields);
+            map.put("data", new ArrayList<>());
+            map.put("page", new DataSetPreviewPage());
+            return map;
+        }
         String[] fieldArray = fields.stream().map(DatasetTableField::getDataeaseName).toArray(String[]::new);
 
         DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(dataSetTableRequest.getInfo(), DataTableInfoDTO.class);
@@ -410,20 +415,10 @@ public class DataSetTableService {
                 }
             }
         } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "excel")) {
-            if (StringUtils.isEmpty(datasetTable.getSyncStatus()) || datasetTable.getSyncStatus().equalsIgnoreCase(JobStatus.Underway.name())) {
-                map.put("status", "warnning");
-                map.put("msg", Translator.get("i18n_processing_data"));
-                dataSetPreviewPage.setTotal(0);
-            } else if (datasetTable.getSyncStatus().equalsIgnoreCase(JobStatus.Error.name())) {
-                List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.getByTableId(datasetTable.getId());
-                map.put("status", "error");
-                if (CollectionUtils.isNotEmpty(datasetTableTaskLogs)) {
-                    map.put("msg", "Failed to extract data: " + datasetTableTaskLogs.get(0).getInfo());
-                } else {
-                    map.put("msg", "Failed to extract data.");
+            if (!checkDorisTableIsExists(dataSetTableRequest.getId())) {
+                throw new RuntimeException(Translator.get("i18n_data_not_sync"));
             }
-                dataSetPreviewPage.setTotal(0);
-            } else {
+
             Datasource ds = (Datasource) CommonBeanFactory.getBean("DorisDatasource");
             JdbcProvider jdbcProvider = CommonBeanFactory.getBean(JdbcProvider.class);
             DatasourceRequest datasourceRequest = new DatasourceRequest();
@@ -442,7 +437,6 @@ public class DataSetTableService {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            }
         } else if (StringUtils.equalsIgnoreCase(datasetTable.getType(), "custom")) {
             if (datasetTable.getMode() == 0) {
                 Datasource ds = datasourceMapper.selectByPrimaryKey(dataSetTableRequest.getDataSourceId());
@@ -1392,9 +1386,8 @@ public class DataSetTableService {
         List<String> taskIds = datasetTableTaskLogMapper.selectByExample(datasetTableTaskLogExample).stream().map(DatasetTableTaskLog::getTaskId).collect(Collectors.toList());
         datasetTableTaskLogMapper.updateByExampleSelective(datasetTableTaskLog, datasetTableTaskLogExample);
 
-        DatasetTableTask datasetTableTask = new DatasetTableTask();
-        datasetTableTask.setLastExecStatus(JobStatus.Error.name());
-        dataSetTableTaskService.update(taskIds, datasetTableTask);
+        dataSetTableTaskService.updateTaskStatus(taskIds, JobStatus.Error);
+        //TODO check task status
 
         for (DatasetTable jobStoppeddDatasetTable : jobStoppeddDatasetTables) {
             extractDataService.deleteFile("all_scope", jobStoppeddDatasetTable.getId());

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

@@ -47,7 +47,8 @@ public class DataSetTableTaskLogService {
         datasetTableTaskLogMapper.deleteByPrimaryKey(id);
     }
 
-    public List<DataSetTaskLogDTO> list(BaseGridRequest request) {
+    public List<DataSetTaskLogDTO> list(BaseGridRequest request, String type) {
+        if(!type.equalsIgnoreCase("excel")){
             ConditionEntity entity = new ConditionEntity();
             entity.setField("task_id");
             entity.setOperator("not null");
@@ -57,8 +58,16 @@ public class DataSetTableTaskLogService {
             }
             conditionEntities.add(entity);
             request.setConditions(conditionEntities);
+        }
+
         GridExample gridExample = request.convertExample();
-        return extDataSetTaskMapper.list(gridExample);
+        List<DataSetTaskLogDTO> dataSetTaskLogDTOS = extDataSetTaskMapper.list(gridExample);
+        dataSetTaskLogDTOS.forEach(dataSetTaskLogDTO -> {
+            if(StringUtils.isEmpty(dataSetTaskLogDTO.getName())){
+                dataSetTaskLogDTO.setName(dataSetTaskLogDTO.getTaskId());
+            }
+        });
+        return dataSetTaskLogDTOS;
     }
 
     public void deleteByTaskId(String taskId){
@@ -95,6 +104,7 @@ public class DataSetTableTaskLogService {
         if(CollectionUtils.isNotEmpty(datasetTableTaskLogs)){
             dataSetTaskDTO.setLastExecStatus(datasetTableTaskLogs.get(0).getStatus());
             dataSetTaskDTO.setLastExecTime(datasetTableTaskLogs.get(0).getCreateTime());
+            dataSetTaskDTO.setMsg(datasetTableTaskLogs.get(0).getInfo());
         }
         return dataSetTaskDTO;
     }

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

@@ -5,6 +5,7 @@ import io.dataease.base.domain.*;
 import io.dataease.base.mapper.DatasetTableMapper;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
 import io.dataease.base.mapper.ext.ExtDataSetTaskMapper;
+import io.dataease.base.mapper.ext.UtilMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.commons.constants.JobStatus;
 import io.dataease.commons.constants.ScheduleType;
@@ -12,6 +13,7 @@ import io.dataease.commons.constants.TaskStatus;
 import io.dataease.commons.constants.TriggerType;
 import io.dataease.controller.request.dataset.DataSetTaskRequest;
 import io.dataease.controller.sys.base.BaseGridRequest;
+import io.dataease.controller.sys.base.ConditionEntity;
 import io.dataease.controller.sys.response.SysUserGridResponse;
 import io.dataease.controller.sys.response.SysUserRole;
 import io.dataease.dto.dataset.DataSetTaskDTO;
@@ -27,6 +29,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.util.Arrays;
 import java.util.List;
 import java.util.UUID;
 import java.util.stream.Collectors;
@@ -48,12 +51,11 @@ public class DataSetTableTaskService {
     @Lazy
     private DataSetTableService dataSetTableService;
     @Resource
-    private ExtractDataService extractDataService;
-    @Resource
     private ExtDataSetTaskMapper extDataSetTaskMapper;
     @Resource
     private DatasetTableMapper datasetTableMapper;
-
+    @Resource
+    private UtilMapper utilMapper;
 
     public DatasetTableTask save(DataSetTaskRequest dataSetTaskRequest) throws Exception {
         checkName(dataSetTaskRequest);
@@ -82,22 +84,21 @@ public class DataSetTableTaskService {
         if (StringUtils.isEmpty(datasetTableTask.getId())) {
             datasetTableTask.setId(UUID.randomUUID().toString());
             datasetTableTask.setCreateTime(System.currentTimeMillis());
+            if (StringUtils.equalsIgnoreCase(datasetTableTask.getRate(), ScheduleType.SIMPLE.toString())){
+                datasetTableTask.setStatus(TaskStatus.Exec.name());
+            }else {
                 datasetTableTask.setStatus(TaskStatus.Underway.name());
+            }
             datasetTableTaskMapper.insert(datasetTableTask);
         } else {
             datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
         }
 
         // simple
-        if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString()) && datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Underway.name())) { // SIMPLE 类型，提前占位
+        if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { // SIMPLE 类型，提前占位
             execNow(datasetTableTask);
-            scheduleService.addSchedule(datasetTableTask);
         }
-        //cron、simple_cron
-        if(!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){
         scheduleService.addSchedule(datasetTableTask);
-        }
-
         return datasetTableTask;
     }
 
@@ -122,6 +123,7 @@ public class DataSetTableTaskService {
         if(!existSyncTask){
             datasetTableTask.setLastExecTime(System.currentTimeMillis());
             datasetTableTask.setLastExecStatus(JobStatus.Underway.name());
+            datasetTableTask.setStatus(TaskStatus.Exec.name());
             update(datasetTableTask);
             DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
             datasetTableTaskLog.setTableId(datasetTableTask.getTableId());
@@ -159,17 +161,48 @@ public class DataSetTableTaskService {
         return datasetTableTaskMapper.selectByPrimaryKey(id);
     }
 
-    public void update(DatasetTableTask datasetTableTask) {
-        datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
-    }
-
-    public void update(List<String> taskIds, DatasetTableTask datasetTableTask) {
+    public void updateTaskStatus(List<String> taskIds, JobStatus lastExecStatus) {
         if (CollectionUtils.isEmpty(taskIds)){
             return;
         }
         DatasetTableTaskExample example = new DatasetTableTaskExample();
         example.createCriteria().andIdIn(taskIds);
-        datasetTableTaskMapper.updateByExampleSelective(datasetTableTask, example);
+        List<DatasetTableTask>  datasetTableTasks = datasetTableTaskMapper.selectByExample(example);
+        for (DatasetTableTask tableTask : datasetTableTasks) {
+            updateTaskStatus(tableTask, lastExecStatus);
+        }
+    }
+
+    public void updateTaskStatus(DatasetTableTask datasetTableTask, JobStatus lastExecStatus){
+        datasetTableTask.setLastExecStatus(lastExecStatus.name());
+        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.name())){
+            datasetTableTask.setStatus(TaskStatus.Stopped.name());
+        }else {
+            if(StringUtils.isNotEmpty(datasetTableTask.getEnd()) && datasetTableTask.getEnd().equalsIgnoreCase("1")){
+                BaseGridRequest request = new BaseGridRequest();
+                ConditionEntity conditionEntity = new ConditionEntity();
+                conditionEntity.setField("dataset_table_task.id");
+                conditionEntity.setOperator("eq");
+                conditionEntity.setValue(datasetTableTask.getId());
+                request.setConditions(Arrays.asList(conditionEntity));
+                List<DataSetTaskDTO> dataSetTaskDTOS = taskList(request);
+                if(CollectionUtils.isEmpty(dataSetTaskDTOS)){
+                    return;
+                }
+                if(dataSetTaskDTOS.get(0).getNextExecTime() == null || dataSetTaskDTOS.get(0).getNextExecTime() <= 0){
+                    datasetTableTask.setStatus(TaskStatus.Stopped.name());
+                }else {
+                    datasetTableTask.setStatus(TaskStatus.Underway.name());
+                }
+            }else {
+                datasetTableTask.setStatus(TaskStatus.Underway.name());
+            }
+        }
+        update(datasetTableTask);
+    }
+
+    public void update(DatasetTableTask datasetTableTask) {
+        datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
     }
 
     public List<DatasetTableTask> list(DatasetTableTask datasetTableTask) {
@@ -217,12 +250,11 @@ public class DataSetTableTaskService {
 
     public void execTask(DatasetTableTask datasetTableTask) throws Exception{
         execNow(datasetTableTask);
-        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.CRON.toString())){
+        if(!datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
             scheduleService.fireNow(datasetTableTask);
         }
-        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
-            scheduleService.addSchedule(datasetTableTask);
-        }
-
+//        if(datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())){
+//            scheduleService.addSchedule(datasetTableTask);
+//        }
     }
 }

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

@@ -6,6 +6,7 @@ import io.dataease.base.mapper.DatasetTableMapper;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
 import io.dataease.base.mapper.DatasourceMapper;
 import io.dataease.base.mapper.ext.ExtChartViewMapper;
+import io.dataease.base.mapper.ext.UtilMapper;
 import io.dataease.commons.constants.*;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.*;
@@ -15,6 +16,7 @@ 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.dto.dataset.DataTableInfoDTO;
 import io.dataease.exception.DataEaseException;
 import io.dataease.listener.util.CacheUtils;
@@ -22,8 +24,8 @@ import io.dataease.provider.QueryProvider;
 import io.dataease.service.message.DeMsgutil;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.impl.client.CloseableHttpClient;
@@ -90,9 +92,12 @@ public class ExtractDataService {
     private DatasetTableMapper datasetTableMapper;
     @Resource
     private DatasetTableTaskMapper datasetTableTaskMapper;
-
+    @Resource
+    private DatasourceService datasourceService;
     @Resource
     private ExtChartViewMapper extChartViewMapper;
+    @Resource
+    private UtilMapper utilMapper;
 
     private static String lastUpdateTime = "${__last_update_time__}";
     private static String currentUpdateTime = "${__current_update_time__}";
@@ -128,31 +133,32 @@ public class ExtractDataService {
             "fi\n" +
             "rm -rf %s\n";
 
-    public synchronized boolean existSyncTask(DatasetTable  datasetTable,  DatasetTableTask datasetTableTask){
+    public synchronized boolean existSyncTask(DatasetTable datasetTable, DatasetTableTask datasetTableTask) {
         datasetTable.setSyncStatus(JobStatus.Underway.name());
         DatasetTableExample example = new DatasetTableExample();
         example.createCriteria().andIdEqualTo(datasetTable.getId()).andSyncStatusNotEqualTo(JobStatus.Underway.name());
         example.or(example.createCriteria().andIdEqualTo(datasetTable.getId()).andSyncStatusIsNull());
         Boolean existSyncTask = datasetTableMapper.updateByExampleSelective(datasetTable, example) == 0;
-        if(existSyncTask){
+        if (existSyncTask) {
             DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
             datasetTableTaskLog.setTaskId(datasetTableTask.getId());
             datasetTableTaskLog.setTableId(datasetTable.getId());
             datasetTableTaskLog.setStatus(JobStatus.Underway.name());
             List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog);
-            if(CollectionUtils.isNotEmpty(datasetTableTaskLogs) && datasetTableTaskLogs.get(0).getTriggerType().equalsIgnoreCase(TriggerType.Custom.name())){
+            if (CollectionUtils.isNotEmpty(datasetTableTaskLogs) && datasetTableTaskLogs.get(0).getTriggerType().equalsIgnoreCase(TriggerType.Custom.name())) {
                 return false;
             }
             return true;
-        }else {
+        } else {
             datasetTableTask.setLastExecTime(System.currentTimeMillis());
             datasetTableTask.setLastExecStatus(JobStatus.Underway.name());
+            datasetTableTask.setStatus(TaskStatus.Exec.name());
             dataSetTableTaskService.update(datasetTableTask);
             return false;
         }
     }
 
-    public void extractExcelData(String datasetTableId, String type) {
+    public void extractExcelData(String datasetTableId, String type, String ops) {
         Datasource datasource = new Datasource();
         datasource.setType("excel");
         DatasetTable datasetTable = getDatasetTable(datasetTableId);
@@ -176,25 +182,21 @@ public class ExtractDataService {
         switch (updateType) {
             case all_scope:  // 全量更新
                 try {
-                    datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableTaskLog, datasetTableId, null);
+                    datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, ops);
                     createDorisTable(DorisTableUtils.dorisName(datasetTableId), dorisTablColumnSql);
                     createDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)), dorisTablColumnSql);
                     generateTransFile("all_scope", datasetTable, datasource, datasetTableFields, null);
-                    if (datasetTable.getType().equalsIgnoreCase("sql")) {
-                        generateJobFile("all_scope", datasetTable, fetchSqlField(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getSql(), datasource));
-                    } else {
                     generateJobFile("all_scope", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList())));
-                    }
                     Long execTime = System.currentTimeMillis();
                     extractData(datasetTable, "all_scope");
                     replaceTable(DorisTableUtils.dorisName(datasetTableId));
                     saveSucessLog(datasetTableTaskLog);
-                    sendWebMsg(datasetTable, null, true);
+//                    sendWebMsg(datasetTable, null, true);
                     deleteFile("all_scope", datasetTableId);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
                 } catch (Exception e) {
                     saveErrorLog(datasetTableId, null, e);
-                    sendWebMsg(datasetTable, null, false);
+//                    sendWebMsg(datasetTable, null, false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
                     dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)));
                     deleteFile("all_scope", datasetTableId);
@@ -204,17 +206,17 @@ public class ExtractDataService {
 
             case add_scope: // 增量更新
                 try {
-                    datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableTaskLog, datasetTableId, null);
+                    datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, ops);
                     generateTransFile("incremental_add", datasetTable, datasource, datasetTableFields, null);
                     generateJobFile("incremental_add", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList())));
                     Long execTime = System.currentTimeMillis();
                     extractData(datasetTable, "incremental_add");
                     saveSucessLog(datasetTableTaskLog);
-                    sendWebMsg(datasetTable, null, true);
+//                    sendWebMsg(datasetTable, null, true);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
                 } catch (Exception e) {
                     saveErrorLog(datasetTableId, null, e);
-                    sendWebMsg(datasetTable, null, false);
+//                    sendWebMsg(datasetTable, null, false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
                     deleteFile("incremental_add", datasetTableId);
                     deleteFile("incremental_delete", datasetTableId);
@@ -224,7 +226,7 @@ public class ExtractDataService {
         }
         //侵入式清除下属视图缓存
         List<String> viewIds = extChartViewMapper.allViewIds(datasetTableId);
-        if (CollectionUtils.isNotEmpty(viewIds)){
+        if (CollectionUtils.isNotEmpty(viewIds)) {
             viewIds.forEach(viewId -> {
                 CacheUtils.remove(JdbcConstants.VIEW_CACHE_KEY, viewId);
             });
@@ -233,26 +235,26 @@ public class ExtractDataService {
 
     public void extractData(String datasetTableId, String taskId, String type, JobExecutionContext context) {
         DatasetTable datasetTable = getDatasetTable(datasetTableId);
-        if(datasetTable == null){
+        if (datasetTable == null) {
             LogUtil.error("Can not find DatasetTable: " + datasetTableId);
             return;
         }
         DatasetTableTask datasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(taskId);
-        if(datasetTableTask == null){
+        if (datasetTableTask == null) {
             return;
         }
-        if(datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Stopped.name())){
+        if (datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Stopped.name()) || datasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Pending.name())) {
             LogUtil.info("Skip synchronization task, task ID : " + datasetTableTask.getId());
             return;
         }
-        if(existSyncTask(datasetTable, datasetTableTask)){
+        if (existSyncTask(datasetTable, datasetTableTask)) {
             LogUtil.info("Skip synchronization task for dataset, dataset ID : " + datasetTableId);
             return;
         }
 
-        DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
+        DatasetTableTaskLog datasetTableTaskLog = getDatasetTableTaskLog(datasetTableId, taskId);
         UpdateType updateType = UpdateType.valueOf(type);
-        if(context != null){
+        if (context != null) {
             datasetTable.setQrtzInstance(context.getFireInstanceId());
             datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
         }
@@ -276,19 +278,16 @@ public class ExtractDataService {
 
         switch (updateType) {
             case all_scope:  // 全量更新
-                try{
-                    if(datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.CRON.toString())) {
-                        datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableTaskLog, datasetTableId, taskId);
-                    }
-                    if(datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
-                        datasetTableTaskLog = getDatasetTableTaskLog(datasetTableTaskLog, datasetTableId, taskId);
+                try {
+                    if (datasetTableTask == null ) {
+                        datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, taskId);
                     }
                     createDorisTable(DorisTableUtils.dorisName(datasetTableId), dorisTablColumnSql);
                     createDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)), dorisTablColumnSql);
                     generateTransFile("all_scope", datasetTable, datasource, datasetTableFields, null);
-                    if(datasetTable.getType().equalsIgnoreCase("sql")){
+                    if (datasetTable.getType().equalsIgnoreCase("sql")) {
                         generateJobFile("all_scope", datasetTable, fetchSqlField(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getSql(), datasource));
-                    }else {
+                    } else {
                         generateJobFile("all_scope", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList())));
                     }
                     Long execTime = System.currentTimeMillis();
@@ -296,24 +295,24 @@ public class ExtractDataService {
                     replaceTable(DorisTableUtils.dorisName(datasetTableId));
                     saveSucessLog(datasetTableTaskLog);
 
-                    sendWebMsg(datasetTable, taskId,true);
+                    sendWebMsg(datasetTable, datasetTableTask, true);
 
                     deleteFile("all_scope", datasetTableId);
 
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
-                    datasetTableTask.setLastExecStatus(JobStatus.Completed.name());
-                    dataSetTableTaskService.update(datasetTableTask);
 
-                }catch (Exception e){
+                    dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed);
+
+                } catch (Exception e) {
                     saveErrorLog(datasetTableId, taskId, e);
-                    datasetTableTask.setLastExecStatus(JobStatus.Error.name());
-                    dataSetTableTaskService.update(datasetTableTask);
 
-                    sendWebMsg(datasetTable, taskId,false);
+                    dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error);
+
+                    sendWebMsg(datasetTable, datasetTableTask, false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
                     dropDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)));
                     deleteFile("all_scope", datasetTableId);
-                }finally {
+                } finally {
                 }
                 break;
 
@@ -330,11 +329,8 @@ public class ExtractDataService {
                         return;
                     }
 
-                    if(datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.CRON.toString())) {
-                        datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableTaskLog, datasetTableId, taskId);
-                    }
-                    if(datasetTableTask != null && datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
-                        datasetTableTaskLog = getDatasetTableTaskLog(datasetTableTaskLog, datasetTableId, taskId);
+                    if (datasetTableTask == null ) {
+                        datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, taskId);
                     }
                     Long execTime = System.currentTimeMillis();
                     if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加
@@ -354,29 +350,34 @@ public class ExtractDataService {
                     }
                     saveSucessLog(datasetTableTaskLog);
 
-                    sendWebMsg(datasetTable, taskId,true);
+                    sendWebMsg(datasetTable, datasetTableTask, true);
 
                     deleteFile("incremental_add", datasetTableId);
                     deleteFile("incremental_delete", datasetTableId);
 
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, execTime);
-                    datasetTableTask.setLastExecStatus(JobStatus.Completed.name());
-                    dataSetTableTaskService.update(datasetTableTask);
-                }catch (Exception e){
+
+                    dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Completed);
+                } catch (Exception e) {
                     saveErrorLog(datasetTableId, taskId, e);
-                    sendWebMsg(datasetTable, taskId,false);
+                    sendWebMsg(datasetTable, datasetTableTask, false);
                     updateTableStatus(datasetTableId, datasetTable, JobStatus.Error, null);
-                    datasetTableTask.setLastExecStatus(JobStatus.Error.name());
-                    dataSetTableTaskService.update(datasetTableTask);
+
+                    dataSetTableTaskService.updateTaskStatus(datasetTableTask, JobStatus.Error);
+
                     deleteFile("incremental_add", datasetTableId);
                     deleteFile("incremental_delete", datasetTableId);
-                }finally {
+                } finally {
+                    if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) {
+                        datasetTableTask.setStatus(TaskStatus.Stopped.name());
+                        dataSetTableTaskService.update(datasetTableTask);
+                    }
                 }
                 break;
         }
         //侵入式清除下属视图缓存
         List<String> viewIds = extChartViewMapper.allViewIds(datasetTableId);
-        if (CollectionUtils.isNotEmpty(viewIds)){
+        if (CollectionUtils.isNotEmpty(viewIds)) {
             viewIds.forEach(viewId -> {
                 CacheUtils.remove(JdbcConstants.VIEW_CACHE_KEY, viewId);
             });
@@ -384,7 +385,8 @@ public class ExtractDataService {
 
     }
 
-    private void sendWebMsg(DatasetTable datasetTable, String taskId, Boolean status) {
+    private void sendWebMsg(DatasetTable datasetTable, DatasetTableTask datasetTableTask, Boolean status) {
+        String taskId = datasetTableTask.getId();
         String msg = status ? "成功" : "失败";
         Long typeId = status ? 5L : 6L;
         String id = datasetTable.getId();
@@ -392,18 +394,22 @@ public class ExtractDataService {
         Set<Long> userIds = AuthUtils.userIdsByURD(authURD);
         Gson gson = new Gson();
         userIds.forEach(userId -> {
-            Map<String,Object> param = new HashMap<>();
+            Map<String, Object> param = new HashMap<>();
             param.put("tableId", id);
-           if(StringUtils.isNotEmpty(taskId)){
+            if (StringUtils.isNotEmpty(taskId)) {
                 param.put("taskId", taskId);
             }
-            DeMsgutil.sendMsg(userId, typeId, 1L, "数据集【"+datasetTable.getName()+"】同步"+msg, gson.toJson(param));
+            String content = "数据集【" + datasetTable.getName() + "】同步" + msg;
+            if (ObjectUtils.isNotEmpty(datasetTableTask) && ObjectUtils.isNotEmpty(datasetTableTask.getName())) {
+                content += " 任务名称【" + datasetTableTask.getName() + "】";
+            }
+            DeMsgutil.sendMsg(userId, typeId, 1L, content, gson.toJson(param));
         });
     }
 
     private void updateTableStatus(String datasetTableId, DatasetTable datasetTable, JobStatus completed, Long execTime) {
         datasetTable.setSyncStatus(completed.name());
-        if(execTime != null){
+        if (execTime != null) {
             datasetTable.setLastUpdateTime(execTime);
         }
         DatasetTableExample example = new DatasetTableExample();
@@ -417,16 +423,16 @@ public class ExtractDataService {
         dataSetTableTaskLogService.save(datasetTableTaskLog);
     }
 
-    private void saveErrorLog(String datasetTableId, String taskId, Exception e){
+    private void saveErrorLog(String datasetTableId, String taskId, Exception e) {
         LogUtil.error("Extract data error: " + datasetTableId, e);
         DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
         datasetTableTaskLog.setTableId(datasetTableId);
         datasetTableTaskLog.setStatus(JobStatus.Underway.name());
-        if(StringUtils.isNotEmpty(taskId)){
+        if (StringUtils.isNotEmpty(taskId)) {
             datasetTableTaskLog.setTaskId(taskId);
         }
         List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog);
-        if(CollectionUtils.isNotEmpty(datasetTableTaskLogs)){
+        if (CollectionUtils.isNotEmpty(datasetTableTaskLogs)) {
             datasetTableTaskLog = datasetTableTaskLogs.get(0);
             datasetTableTaskLog.setStatus(JobStatus.Error.name());
             datasetTableTaskLog.setInfo(e.getMessage());
@@ -445,7 +451,7 @@ public class ExtractDataService {
                     if (datasetTableField.getSize() > 65533 || datasetTableField.getSize() * 3 > 65533) {
                         Column_Fields = Column_Fields + "varchar(65533)" + ",`";
                     } else {
-                        Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize()*3)) + ",`";
+                        Column_Fields = Column_Fields + "varchar(lenth)".replace("lenth", String.valueOf(datasetTableField.getSize() * 3)) + ",`";
                     }
                     break;
                 case 1:
@@ -488,7 +494,8 @@ public class ExtractDataService {
             datasourceRequest.setDatasource(dorisDatasource);
             datasourceRequest.setQuery(dropTableSql.replace("TABLE_NAME", dorisTableName));
             jdbcProvider.exec(datasourceRequest);
-        }catch (Exception ignore){}
+        } catch (Exception ignore) {
+        }
     }
 
     private void replaceTable(String dorisTableName) throws Exception {
@@ -501,47 +508,51 @@ public class ExtractDataService {
         jdbcProvider.exec(datasourceRequest);
     }
 
-    private DatasetTable getDatasetTable(String datasetTableId){
-        for (int i=0;i<5;i++){
+    private DatasetTable getDatasetTable(String datasetTableId) {
+        for (int i = 0; i < 5; i++) {
             DatasetTable datasetTable = dataSetTableService.get(datasetTableId);
-            if(datasetTable == null){
+            if (datasetTable == null) {
                 try {
                     Thread.sleep(1000);
-                }catch (Exception ignore){}
-            }else {
+                } catch (Exception ignore) {
+                }
+            } else {
                 return datasetTable;
             }
         }
         return null;
     }
 
-    private DatasetTableTaskLog writeDatasetTableTaskLog(DatasetTableTaskLog datasetTableTaskLog, String datasetTableId, String taskId) {
+    private DatasetTableTaskLog writeDatasetTableTaskLog(String datasetTableId, String taskId) {
+        DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
         datasetTableTaskLog.setTableId(datasetTableId);
         datasetTableTaskLog.setTaskId(taskId);
         datasetTableTaskLog.setStatus(JobStatus.Underway.name());
         datasetTableTaskLog.setTriggerType(TriggerType.Cron.name());
         List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog);
-        if(CollectionUtils.isEmpty(datasetTableTaskLogs)){
+        if (CollectionUtils.isEmpty(datasetTableTaskLogs)) {
             datasetTableTaskLog.setStartTime(System.currentTimeMillis());
             dataSetTableTaskLogService.save(datasetTableTaskLog);
             return datasetTableTaskLog;
-        }else {
+        } else {
             return datasetTableTaskLogs.get(0);
         }
     }
 
-    private DatasetTableTaskLog getDatasetTableTaskLog(DatasetTableTaskLog datasetTableTaskLog, String datasetTableId, String taskId) {
+    private DatasetTableTaskLog getDatasetTableTaskLog(String datasetTableId, String taskId) {
+        DatasetTableTaskLog datasetTableTaskLog = new DatasetTableTaskLog();
         datasetTableTaskLog.setTableId(datasetTableId);
         datasetTableTaskLog.setTaskId(taskId);
         datasetTableTaskLog.setStatus(JobStatus.Underway.name());
-        for (int i=0;i<5;i++){
+        for (int i = 0; i < 5; i++) {
             List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog);
-            if(CollectionUtils.isNotEmpty(datasetTableTaskLogs)){
+            if (CollectionUtils.isNotEmpty(datasetTableTaskLogs)) {
                 return datasetTableTaskLogs.get(0);
             }
             try {
                 Thread.sleep(1000);
-            }catch (Exception ignore){}
+            } catch (Exception ignore) {
+            }
         }
         datasetTableTaskLog.setStartTime(System.currentTimeMillis());
         dataSetTableTaskLogService.save(datasetTableTaskLog);
@@ -549,6 +560,7 @@ public class ExtractDataService {
     }
 
     private void extractData(DatasetTable datasetTable, String extractType) throws Exception {
+        datasourceService.validate(datasetTable.getDataSourceId());
         KettleFileRepository repository = CommonBeanFactory.getBean(KettleFileRepository.class);
         RepositoryDirectoryInterface repositoryDirectoryInterface = repository.loadRepositoryDirectoryTree();
         JobMeta jobMeta = null;
@@ -694,7 +706,7 @@ public class ExtractDataService {
         datasourceRequest.setDatasource(ds);
         datasourceRequest.setQuery(qp.wrapSql(sql));
         List<String> dorisFileds = new ArrayList<>();
-        datasourceProvider.fetchResultField(datasourceRequest).stream().map(TableFiled::getFieldName).forEach(filed ->{
+        datasourceProvider.fetchResultField(datasourceRequest).stream().map(TableFiled::getFieldName).forEach(filed -> {
             dorisFileds.add(DorisTableUtils.columnName(filed));
         });
         return String.join(",", dorisFileds);
@@ -716,7 +728,7 @@ public class ExtractDataService {
             case mysql:
                 MysqlConfigration mysqlConfigration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfigration.class);
                 dataMeta = new DatabaseMeta("db", "MYSQL", "Native", mysqlConfigration.getHost(), mysqlConfigration.getDataBase(), mysqlConfigration.getPort().toString(), mysqlConfigration.getUsername(), mysqlConfigration.getPassword());
-                dataMeta.addExtraOption("MYSQL","characterEncoding", "UTF-8");
+                dataMeta.addExtraOption("MYSQL", "characterEncoding", "UTF-8");
                 transMeta.addDatabase(dataMeta);
                 selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL);
                 inputStep = inputStep(transMeta, selectSQL);
@@ -732,10 +744,10 @@ public class ExtractDataService {
                 break;
             case oracle:
                 OracleConfigration oracleConfigration = new Gson().fromJson(datasource.getConfiguration(), OracleConfigration.class);
-                if(oracleConfigration.getConnectionType().equalsIgnoreCase("serviceName")){
+                if (oracleConfigration.getConnectionType().equalsIgnoreCase("serviceName")) {
                     String database = "(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = ORACLE_HOSTNAME)(PORT = ORACLE_PORT))(CONNECT_DATA = (SERVER = DEDICATED)(SERVICE_NAME = ORACLE_SERVICE_NAME )))".replace("ORACLE_HOSTNAME", oracleConfigration.getHost()).replace("ORACLE_PORT", oracleConfigration.getPort().toString()).replace("ORACLE_SERVICE_NAME", oracleConfigration.getDataBase());
                     dataMeta = new DatabaseMeta("db", "ORACLE", "Native", "", database, "-1", oracleConfigration.getUsername(), oracleConfigration.getPassword());
-                }else {
+                } else {
                     dataMeta = new DatabaseMeta("db", "ORACLE", "Native", oracleConfigration.getHost(), oracleConfigration.getDataBase(), oracleConfigration.getPort().toString(), oracleConfigration.getUsername(), oracleConfigration.getPassword());
                 }
                 transMeta.addDatabase(dataMeta);
@@ -745,8 +757,7 @@ public class ExtractDataService {
                 udjcStep = udjc(datasetTableFields, DatasourceTypes.oracle);
                 break;
             case excel:
-                String filePath = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getData();
-                inputStep = excelInputStep(filePath, datasetTableFields);
+                inputStep = excelInputStep(datasetTable.getInfo(), datasetTableFields);
                 udjcStep = udjc(datasetTableFields, DatasourceTypes.excel);
             default:
                 break;
@@ -794,12 +805,12 @@ public class ExtractDataService {
             selectSQL = qp.createRawQuerySQL(tableName, datasetTableFields);
         }
 
-        if(extractType.equalsIgnoreCase("all_scope") && datasetTable.getType().equalsIgnoreCase("sql")){
+        if (extractType.equalsIgnoreCase("all_scope") && datasetTable.getType().equalsIgnoreCase("sql")) {
             selectSQL = new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getSql();
             QueryProvider qp = ProviderFactory.getQueryProvider(datasource.getType());
             selectSQL = qp.createRawQuerySQLAsTmp(selectSQL, datasetTableFields);
         }
-        if(!extractType.equalsIgnoreCase("all_scope")){
+        if (!extractType.equalsIgnoreCase("all_scope")) {
             QueryProvider qp = ProviderFactory.getQueryProvider(datasource.getType());
             selectSQL = qp.createRawQuerySQLAsTmp(selectSQL, datasetTableFields);
         }
@@ -817,41 +828,30 @@ public class ExtractDataService {
         return fromStep;
     }
 
-    private StepMeta excelInputStep(String filePath, List<DatasetTableField> datasetTableFields) {
-        String suffix = filePath.substring(filePath.lastIndexOf(".") + 1);
+    private StepMeta excelInputStep(String Info, List<DatasetTableField> datasetTableFields){
+        DataTableInfoDTO dataTableInfoDTO = new Gson().fromJson(Info, DataTableInfoDTO.class);
+        String suffix = dataTableInfoDTO.getData().substring(dataTableInfoDTO.getData().lastIndexOf(".") + 1);
         ExcelInputMeta excelInputMeta = new ExcelInputMeta();
         if (StringUtils.equalsIgnoreCase(suffix, "xlsx")) {
             excelInputMeta.setSpreadSheetType(SpreadSheetType.SAX_POI);
-            try{
-                InputStream inputStream = new FileInputStream(filePath);
-                XSSFWorkbook xssfWorkbook = new XSSFWorkbook(inputStream);
-                XSSFSheet sheet0 = xssfWorkbook.getSheetAt(0);
-                excelInputMeta.setSheetName(new String[]{sheet0.getSheetName()});
-            }catch (Exception e){
-                e.printStackTrace();
-            }
+            excelInputMeta.setSheetName(new String[]{dataTableInfoDTO.getSheets().get(0)});
         }
         if (StringUtils.equalsIgnoreCase(suffix, "xls")) {
             excelInputMeta.setSpreadSheetType(SpreadSheetType.JXL);
-            try{
-                InputStream inputStream = new FileInputStream(filePath);
-                HSSFWorkbook workbook = new HSSFWorkbook(inputStream);
-                HSSFSheet sheet0 = workbook.getSheetAt(0);
-                excelInputMeta.setSheetName(new String[]{sheet0.getSheetName()});
-            }catch (Exception e){e.printStackTrace();}
+            excelInputMeta.setSheetName(new String[]{dataTableInfoDTO.getSheets().get(0)});
         }
         excelInputMeta.setPassword("Encrypted");
-        excelInputMeta.setFileName(new String[]{filePath});
+        excelInputMeta.setFileName(new String[]{dataTableInfoDTO.getData()});
         excelInputMeta.setStartsWithHeader(true);
         excelInputMeta.setIgnoreEmptyRows(true);
         ExcelInputField[] fields = new ExcelInputField[datasetTableFields.size()];
         for (int i = 0; i < datasetTableFields.size(); i++) {
             ExcelInputField field = new ExcelInputField();
             field.setName(datasetTableFields.get(i).getOriginName());
-            if(datasetTableFields.get(i).getDeExtractType() == 1){
+            if (datasetTableFields.get(i).getDeExtractType() == 1) {
                 field.setType("String");
                 field.setFormat("yyyy-MM-dd HH:mm:ss");
-            }else {
+            } else {
                 field.setType("String");
             }
             fields[i] = field;
@@ -892,14 +892,14 @@ public class ExtractDataService {
 
         tmp_code = tmp_code.replace("handleWraps", handleWraps);
         String Column_Fields = "";
-        if(datasourceType.equals(DatasourceTypes.excel) || datasourceType.equals(DatasourceTypes.oracle)){
+        if (datasourceType.equals(DatasourceTypes.excel) || datasourceType.equals(DatasourceTypes.oracle)) {
             Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList()));
-        }else {
+        } else {
             Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList()));
         }
-        if(datasourceType.equals(DatasourceTypes.excel)){
+        if (datasourceType.equals(DatasourceTypes.excel)) {
             tmp_code = tmp_code.replace("handleExcelIntColumn", handleExcelIntColumn).replace("Column_Fields", Column_Fields);
-        }else {
+        } else {
             tmp_code = tmp_code.replace("handleExcelIntColumn", "").replace("Column_Fields", Column_Fields);
         }
         UserDefinedJavaClassDef userDefinedJavaClassDef = new UserDefinedJavaClassDef(UserDefinedJavaClassDef.ClassType.TRANSFORM_CLASS, "Processor", tmp_code);
@@ -914,7 +914,7 @@ public class ExtractDataService {
         return userDefinedJavaClassStep;
     }
 
-    public void deleteFile(String type, String dataSetTableId){
+    public void deleteFile(String type, String dataSetTableId) {
         String transName = null;
         String jobName = null;
         String fileName = null;
@@ -938,18 +938,21 @@ public class ExtractDataService {
             default:
                 break;
         }
-        try{
+        try {
             File file = new File(root_path + fileName + "." + extention);
             FileUtils.forceDelete(file);
-        }catch (Exception e){}
-        try{
+        } catch (Exception e) {
+        }
+        try {
             File file = new File(root_path + jobName + ".kjb");
             FileUtils.forceDelete(file);
-        }catch (Exception e){}
-        try{
+        } catch (Exception e) {
+        }
+        try {
             File file = new File(root_path + transName + ".ktr");
             FileUtils.forceDelete(file);
-        }catch (Exception e){}
+        } catch (Exception e) {
+        }
     }
 
     public boolean isKettleRunning() {
@@ -957,7 +960,7 @@ public class ExtractDataService {
             if (!InetAddress.getByName(carte).isReachable(1000)) {
                 return false;
             }
-       }catch (Exception e){
+        } catch (Exception e) {
             return false;
         }
 

backend/src/main/java/io/dataease/service/message/SysMsgService.java

@@ -67,7 +67,7 @@ public class SysMsgService {
         return sysMsgs;
     }
 
-    public List<MsgGridDto> queryGrid(Long userId, MsgRequest msgRequest) {
+    public List<MsgGridDto> queryGrid(Long userId, MsgRequest msgRequest, List<Long> typeIds) {
         String orderClause = " create_time desc";
         SysMsgExample example = new SysMsgExample();
         SysMsgExample.Criteria criteria = example.createCriteria();
@@ -79,13 +79,16 @@ public class SysMsgService {
             orderClause = String.join(", ", orders);
         }
 
-        if (ObjectUtils.isNotEmpty(msgRequest.getType())) {
+        /*if (ObjectUtils.isNotEmpty(msgRequest.getType())) {
             SysMsgTypeExample sysMsgTypeExample = new SysMsgTypeExample();
             sysMsgTypeExample.createCriteria().andPidEqualTo(msgRequest.getType());
 
             List<SysMsgType> sysMsgTypes = sysMsgTypeMapper.selectByExample(sysMsgTypeExample);
             List<Long> typeIds = sysMsgTypes.stream().map(SysMsgType::getMsgTypeId).collect(Collectors.toList());
             criteria.andTypeIdIn(typeIds);
+        }*/
+        if (CollectionUtils.isNotEmpty(typeIds)){
+            criteria.andTypeIdIn(typeIds);
         }
 
         if (ObjectUtils.isNotEmpty(msgRequest.getStatus())) {

backend/src/main/resources/db/migration/V10__web_msg.sql

@@ -56,9 +56,9 @@ BEGIN;
 INSERT INTO `sys_msg_type` VALUES (1, 0, 'i18n_msg_type_panel_share', 'panel', 'to-msg-share');
 INSERT INTO `sys_msg_type` VALUES (2, 1, 'i18n_msg_type_panel_share', 'panel', 'to-msg-share');
 INSERT INTO `sys_msg_type` VALUES (3, 1, 'i18n_msg_type_panel_share_cacnel', 'panel', 'to-msg-share');
-INSERT INTO `sys_msg_type` VALUES (4, 0, 'i18n_msg_type_dataset_sync', 'dataset', 'to-msg-dataset');
-INSERT INTO `sys_msg_type` VALUES (5, 4, 'i18n_msg_type_dataset_sync_success', 'dataset', 'to-msg-dataset');
-INSERT INTO `sys_msg_type` VALUES (6, 4, 'i18n_msg_type_dataset_sync_faild', 'dataset', 'to-msg-dataset');
+INSERT INTO `sys_msg_type` VALUES (4, 0, 'i18n_msg_type_dataset_sync', 'sys-task-dataset', 'to-msg-dataset');
+INSERT INTO `sys_msg_type` VALUES (5, 4, 'i18n_msg_type_dataset_sync_success', 'sys-task-dataset', 'to-msg-dataset');
+INSERT INTO `sys_msg_type` VALUES (6, 4, 'i18n_msg_type_dataset_sync_faild', 'sys-task-dataset', 'to-msg-dataset');
 COMMIT;
 
 -- ----------------------------

backend/src/main/resources/db/migration/V13__system_task.sql

@@ -1,15 +1,26 @@
-INSERT INTO `sys_menu` VALUES (57, 1, 3, 1, '任务管理', 'sys-task', 'system/task/index', 2000,  'task', 'system-task', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
-INSERT INTO `sys_menu` VALUES (58, 57, 0, 1, '数据集任务', 'sys-task-dataset', 'system/task/dataset', 1,  'task', 'dataset', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
+INSERT INTO `sys_menu` VALUES (58, 1, 0, 1, 'i18n_timed_task', 'sys-task-dataset', 'system/task/dataset', 1001,  'task', 'dataset', b'0', b'0', b'0', NULL, NULL, NULL, NULL, NULL);
+
 ALTER TABLE `dataset_table_task`
     ADD COLUMN `last_exec_time` BIGINT(13) NULL DEFAULT NULL COMMENT '上次执行时间' AFTER `create_time`,
     ADD COLUMN `status` VARCHAR(50) NULL DEFAULT NULL COMMENT '任务状态' AFTER `last_exec_time`,
     ADD COLUMN `last_exec_status` VARCHAR(50) NULL DEFAULT NULL COMMENT '上次执行结果' AFTER `last_exec_time`;
 
-update dataset_table_task set status='Underway';
 update dataset_table_task set rate='SIMPLE' where rate='SIMPLE_COMPLETE';
 
+update dataset_table_task set status='Stopped' where rate='SIMPLE';
+update dataset_table_task set status='Underway' where rate='CRON';
+
+
+UPDATE dataset_table_task
+SET dataset_table_task.last_exec_time = (SELECT dataset_table_task_log.start_time FROM dataset_table_task_log WHERE dataset_table_task_log.task_id = dataset_table_task.id limit 1);
+
+UPDATE dataset_table_task
+SET dataset_table_task.last_exec_status = (SELECT dataset_table_task_log.status FROM dataset_table_task_log WHERE dataset_table_task_log.task_id = dataset_table_task.id limit 1);
+
 
 ALTER TABLE `dataset_table_task_log` ADD COLUMN `trigger_type` VARCHAR(45) NULL AFTER `create_time`;
+ALTER TABLE `dataset_table_task` ADD COLUMN `extra_data` LONGTEXT NULL AFTER `last_exec_status`;
+
 update dataset_table_task_log set trigger_type='Cron';
 
-ALTER TABLE `dataset_table_task` ADD COLUMN `extra_data` LONGTEXT NULL AFTER `last_exec_status`;
+update dataset_table_task_log set dataset_table_task_log.task_id='初始导入' where dataset_table_task_log.task_id is null;

backend/src/main/resources/db/migration/V16__alter_chart_view.sql

@@ -0,0 +1,4 @@
+ALTER TABLE `chart_view` ADD COLUMN `ext_stack` LONGTEXT COMMENT '堆叠项' AFTER `y_axis`;
+
+UPDATE `chart_view` SET `ext_stack` = '[]';
+UPDATE `chart_view` SET `custom_filter` = '[]';

backend/src/main/resources/generatorConfig.xml

@@ -64,7 +64,7 @@
 
         <!--要生成的数据库表 -->
 
-<!--                <table tableName="datasource"/>-->
+                <table tableName="chart_view"/>
 <!--        <table tableName="sys_dict"/>-->
 <!--        <table tableName="sys_dict_item"/>-->
 <!--        <table tableName="dataset_table_field"/>-->
@@ -74,9 +74,9 @@
 <!--        </table>-->
 <!--        <table tableName="v_dataset"/>-->
 <!--        <table tableName="sys_auth_detail"/>-->
-        <table tableName="dataset_table_task">
-            <columnOverride column="extra_data" javaType="java.lang.String" jdbcType="VARCHAR" />
-        </table>
+<!--        <table tableName="dataset_table_task">-->
+<!--            <columnOverride column="extra_data" javaType="java.lang.String" jdbcType="VARCHAR" />-->
+<!--        </table>-->
 
 
     </context>

backend/src/main/resources/i18n/messages_en_US.properties

@@ -251,7 +251,7 @@ i18n_datasource_not_allow_delete_msg= datasets are using this data source and ca
 i18n_task_name_repeat=Name is used in same data set
 i18n_id_or_pwd_error=Invalid ID or password
 i18n_datasource_delete=Data source is delete
-i18n_dataset_delete=Data set is delete
+i18n_dataset_delete_or_no_permission=Data set is delete or no permission
 i18n_chart_delete=Chart is delete
 i18n_not_exec_add_sync=There is no completed synchronization task. Incremental synchronization cannot be performed
 i18n_excel_header_empty=Excel first row can not empty
@@ -274,3 +274,4 @@ i18n_msg_type_dataset_sync_success=Dataset synchronization successful
 i18n_msg_type_dataset_sync_faild=Dataset synchronization failed
 i18n_data_not_sync=Please sync data first
 i18n_excel_colume_change=The column name of Excel is inconsistent with the original data set
+i18n_timed_task=Timed Task

backend/src/main/resources/i18n/messages_zh_CN.properties

@@ -250,7 +250,7 @@ i18n_datasource_not_allow_delete_msg= 个数据集正在使用此数据源，无
 i18n_task_name_repeat=同一数据集下任务名称已被使用
 i18n_id_or_pwd_error=无效的ID或密码
 i18n_datasource_delete=当前用到的数据源已被删除
-i18n_dataset_delete=当前用到的数据集已被删除
+i18n_dataset_delete_or_no_permission=当前用到的数据集没有权限或已被删除
 i18n_chart_delete=当前用到的视图已被删除
 i18n_not_exec_add_sync=没有已完成的同步任务，无法进行增量同步
 i18n_excel_header_empty=Excel第一行为空
@@ -273,3 +273,4 @@ i18n_msg_type_dataset_sync_success=数据集同步成功
 i18n_msg_type_dataset_sync_faild=数据集同步失败
 i18n_data_not_sync=请先完成数据同步
 i18n_excel_colume_change=Excel的列名与原数据集不一致
+i18n_timed_task=定时任务

backend/src/main/resources/i18n/messages_zh_TW.properties

@@ -253,7 +253,7 @@ i18n_datasource_not_allow_delete_msg= 個數據集正在使用此數據源，無
 i18n_task_name_repeat=同一數據集下任務名稱已被使用
 i18n_id_or_pwd_error=無效的ID或密碼
 i18n_datasource_delete=當前用到的數據源已被刪除
-i18n_dataset_delete=當前用到的數據集已被刪除
+i18n_dataset_delete_or_no_permission=當前用到的數據集沒有權限或已被刪除
 i18n_chart_delete=當前用到的視圖已被刪除
 i18n_not_exec_add_sync=沒有已經完成的同步任務，無法進行增量同步
 i18n_excel_header_empty=Excel第一行為空
@@ -276,3 +276,4 @@ i18n_msg_type_dataset_sync_success=數據集同步成功
 i18n_msg_type_dataset_sync_faild=數據集同步失敗
 i18n_data_not_sync=請先完成數據同步
 i18n_excel_colume_change=Excel的列名與原數據集不一致
+i18n_timed_task=定時任務

frontend/src/api/map/map.js

@@ -0,0 +1,17 @@
+import request from '@/utils/request'
+
+export const areaMapping = () => {
+  return request({
+    url: '/api/map/areaEntitys/0',
+    method: 'get',
+    loading: true
+  })
+}
+
+export function geoJson(areaCode) {
+  return request({
+    url: '/api/map/resourceFull/' + areaCode,
+    method: 'get',
+    loading: true
+  })
+}

frontend/src/components/DeDrag/index.vue

@@ -623,7 +623,7 @@ export default {
     elementMouseDown(e) {
       // private 设置当前组件数据及状态
       this.$store.commit('setClickComponentStatus', true)
-      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search') {
+      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-number-range') {
         e.preventDefault()
       }
       // 阻止冒泡事件
@@ -1448,6 +1448,7 @@ export default {
     },
     // 记录当前样式
     recordCurStyle() {
+      debugger
       const style = {
         ...this.defaultStyle
       }
@@ -1462,6 +1463,7 @@ export default {
 
     // 记录当前样式 矩阵处理
     recordMatrixCurStyle() {
+      debugger
       const left = Math.round(this.left / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth
       const top = Math.round(this.top / this.curCanvasScale.matrixStyleHeight) * this.curCanvasScale.matrixStyleHeight
       const width = Math.round(this.width / this.curCanvasScale.matrixStyleWidth) * this.curCanvasScale.matrixStyleWidth
@@ -1474,7 +1476,7 @@ export default {
       style.width = width
       style.height = height
       style.rotate = this.rotate
-      this.hasMove = true
+      // this.hasMove = true
       this.$store.commit('setShapeStyle', style)
     },
     mountedFunction() {

frontend/src/components/canvas/components/Editor/Shape.vue

@@ -226,7 +226,7 @@ export default {
 
     handleMouseDownOnShape(e) {
       this.$store.commit('setClickComponentStatus', true)
-      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search') {
+      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-number-range') {
         e.preventDefault()
       }
 

frontend/src/components/canvas/components/RectangleAttr.vue

@@ -3,7 +3,7 @@
     <div style="position: relative;">
       <div style="width: 80px;margin-top: 2px;margin-left: 2px;float: left">
         <el-tooltip content="边框风格">
-          <el-select v-model="styleInfo.borderStyle" size="mini">
+          <el-select v-model="styleInfo.borderStyle" size="mini" @change="styleChange">
             <el-option
               v-for="item in lineStyle"
               :key="item.value"
@@ -21,7 +21,7 @@
 
       <div style="width: 55px;float: left;margin-top: 2px;margin-left: 2px;">
         <el-tooltip content="边框宽度">
-          <el-select v-model="styleInfo.borderWidth" size="mini" placeholder="">
+          <el-select v-model="styleInfo.borderWidth" size="mini" placeholder="" @change="styleChange">
             <el-option
               v-for="item in lineFont"
               :key="item.value"
@@ -38,7 +38,7 @@
             <i class="iconfont icon-huabi" @click="goBoardColor" />
           </el-tooltip>
           <div :style="boardDivColor" />
-          <el-color-picker ref="boardColorPicker" v-model="styleInfo.borderColor" style="margin-top: 7px;height: 0px" size="mini" />
+          <el-color-picker ref="boardColorPicker" v-model="styleInfo.borderColor" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange"/>
         </div>
       </div>
 
@@ -48,7 +48,7 @@
             <i class="iconfont icon-beijingse1" @click="goBackgroundColor" />
           </el-tooltip>
           <div :style="backgroundDivColor" />
-          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" />
+          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange"/>
         </div>
       </div>
     </div>
@@ -158,6 +158,9 @@ export default {
       } else {
         return y
       }
+    },
+    styleChange() {
+      this.$store.state.styleChangeTimes++
     }
   }
 }
@@ -172,7 +175,7 @@ export default {
   }
   .el-card-main {
     height: 34px;
-    z-index: 1000000000;
+    z-index: 10;
     width: 210px;
     position: absolute;
 

frontend/src/components/canvas/custom-component/component-list.js

@@ -122,7 +122,8 @@ const list = [
       borderStyle: 'solid',
       borderWidth: 1,
       borderColor: '#000000',
-      backgroundColor: '#ffffff'
+      backgroundColor: '#ffffff',
+      borderRadius: 0
     }
   },
   {

frontend/src/components/canvas/store/snapshot.js

@@ -7,7 +7,8 @@ export default {
     snapshotStyleData: [], // 样式改变也记录快照
     snapshotIndex: -1, // 快照索引
     changeTimes: -1, // 修改次数
-    lastSaveSnapshotIndex: 0 // 最后保存是snapshotIndex的索引
+    lastSaveSnapshotIndex: 0, // 最后保存是snapshotIndex的索引
+    styleChangeTimes: 0 // 组件样式修改次数
   },
   mutations: {
     undo(state) {

frontend/src/components/widget/DeWidget/DeDate.vue

@@ -4,10 +4,10 @@
     ref="dateRef"
     v-model="options.value"
     :type="options.attrs.type"
-    :range-separator="options.attrs.rangeSeparator"
-    :start-placeholder="options.attrs.startPlaceholder"
-    :end-placeholder="options.attrs.endPlaceholder"
-    :placeholder="options.attrs.placeholder"
+    :range-separator="$t(options.attrs.rangeSeparator)"
+    :start-placeholder="$t(options.attrs.startPlaceholder)"
+    :end-placeholder="$t(options.attrs.endPlaceholder)"
+    :placeholder="$t(options.attrs.placeholder)"
     style="min-height: 36px;"
     @change="dateChange"
   />

frontend/src/components/widget/DeWidget/DeInputSearch.vue

@@ -4,7 +4,7 @@
     v-if="options!== null && options.attrs!==null"
     v-model="values"
     resize="vertical"
-    :placeholder="options.attrs.placeholder"
+    :placeholder="$t(options.attrs.placeholder)"
     @keypress.enter.native="search"
     @dblclick="setEdit"
   >

frontend/src/components/widget/DeWidget/DeNumberRange.vue

@@ -0,0 +1,182 @@
+<template>
+
+  <el-form v-if="options!== null && options.attrs!==null" ref="form" :model="form" :rules="rules">
+    <div class="de-number-range-container">
+      <el-form-item prop="min">
+        <el-input v-model="form.min" :placeholder="$t(options.attrs.placeholder_min)" @change="handleMinChange" />
+      </el-form-item>
+      <span>{{ $t('denumberrange.split_placeholder') }}</span>
+      <el-form-item prop="max">
+        <el-input v-model="form.max" :placeholder="$t(options.attrs.placeholder_max)" @change="handleMaxChange" />
+      </el-form-item>
+    </div>
+  </el-form>
+
+</template>
+
+<script>
+const MIN_NUMBER = -2147483648
+const MAX_NUMBER = 2147483647
+export default {
+
+  props: {
+    element: {
+      type: Object,
+      default: null
+    },
+    inDraw: {
+      type: Boolean,
+      default: true
+    }
+  },
+
+  data() {
+    return {
+      options: null,
+      operator: 'between',
+      values: null,
+      canEdit: false,
+
+      form: { min: '', max: '' },
+      rules: {
+        min: [
+        //   { required: true, message: this.$t('denumberrange.please_key_min'), trigger: 'blur' },
+          { validator: this.validateCom, trigger: 'blur' },
+          { validator: this.validateMin, trigger: 'blur' }
+        ],
+        max: [
+        //   { required: true, message: this.$t('denumberrange.please_key_max'), trigger: 'blur' },
+          { validator: this.validateCom, trigger: 'blur' },
+          { validator: this.validateMax, trigger: 'blur' }
+        ]
+      },
+      changeIndex: 0,
+      timeMachine: null
+    }
+  },
+  watch: {
+    form: {
+      handler(value) {
+        this.destryTimeMachine()
+        this.changeIndex++
+        this.searchWithKey(this.changeIndex)
+      },
+      deep: true
+    }
+  },
+  created() {
+    this.options = this.element.options
+  },
+  methods: {
+    searchWithKey(index) {
+      this.timeMachine = setTimeout(() => {
+        if (index === this.changeIndex) {
+          this.search()
+        }
+        this.destryTimeMachine()
+      }, 1000)
+    },
+    destryTimeMachine() {
+      this.timeMachine && clearTimeout(this.timeMachine)
+      this.timeMachine = null
+    },
+    getFormData() {
+      const ret = {}
+      this.$refs.form.validate((valid) => {
+        ret.valid = valid
+        ret.form = this.form
+      })
+      return ret
+    },
+    resetForm() {
+      this.$refs.form.resetFields()
+    },
+    handleMinChange() {
+      this.$refs.form.validateField('max')
+    },
+    handleMaxChange() {
+      this.$refs.form.validateField('min')
+    },
+    validateCom(rule, value, callback) {
+      if (!value) return callback()
+      const one = Number(value)
+      if (Number.isInteger(one)) {
+        if (one < MIN_NUMBER) {
+          return callback(new Error(this.$t('denumberrange.out_of_min')))
+        } else if (one > MAX_NUMBER) {
+          return callback(new Error(this.$t('denumberrange.out_of_max')))
+        }
+        return callback()
+      }
+      return callback(new Error(this.$t('denumberrange.must_int')))
+    },
+    validateMin(rule, value, callback) {
+      if (!value) return callback()
+      const one = Number(value)
+      const max = Number(this.form.max)
+      if (!max || one < max) {
+        return callback()
+      }
+      return callback(new Error(this.$t('denumberrange.min_out_max')))
+    },
+    validateMax(rule, value, callback) {
+      if (!value) return callback()
+      const one = Number(value)
+      const min = Number(this.form.min)
+      if (!min || one > min) {
+        return callback()
+      }
+      return callback(new Error(this.$t('denumberrange.max_out_min')))
+    },
+
+    search() {
+      this.$refs.form.validate(valid => {
+        if (!valid) {
+          return false
+        }
+        this.setCondition()
+      })
+    },
+    setCondition() {
+      const param = {
+        component: this.element,
+        // value: !this.values ? [] : Array.isArray(this.values) ? this.values : [this.values],
+        value: [this.form.min, this.form.max],
+        operator: this.operator
+      }
+      if (this.form.min && this.form.max) {
+        this.inDraw && this.$store.commit('addViewFilter', param)
+        return
+      }
+      if (!this.form.min && !this.form.max) {
+        param.value = []
+        this.inDraw && this.$store.commit('addViewFilter', param)
+        return
+      }
+      if (this.form.min) {
+        param.value = [this.form.min]
+        param.operator = 'ge'
+        this.inDraw && this.$store.commit('addViewFilter', param)
+        return
+      }
+      if (this.form.max) {
+        param.value = [this.form.max]
+        param.operator = 'le'
+        this.inDraw && this.$store.commit('addViewFilter', param)
+        return
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss" scoped>
+.de-number-range-container {
+  display: inline;
+  >>>div.el-form-item {
+    width: calc(50% - 10px) !important;
+    display: inline-block;
+    padding: 0 5px;
+  }
+}
+</style>

frontend/src/components/widget/DeWidget/DeSelect.vue

@@ -7,7 +7,7 @@
     :collapse-tags="showNumber"
     :clearable="!options.attrs.multiple"
     :multiple="options.attrs.multiple"
-    :placeholder="options.attrs.placeholder"
+    :placeholder="$t(options.attrs.placeholder)"
     :popper-append-to-body="inScreen"
     @change="changeValue"
   >

frontend/src/components/widget/bean/Condition.js

@@ -1,7 +1,7 @@
 /**
  * fieldId 字段ID
  * value 字段值
- * operator 操作[eq, ne, gt, ge, lt, le, in, not in, like, not like]
+ * operator 操作[eq, ne, gt, ge, lt, le, in, not in, like, not like, between]
  * viewIds 过滤视图范围
  */
 export class Condition {

frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js

@@ -0,0 +1,67 @@
+import { WidgetService } from '../service/WidgetService'
+
+const leftPanel = {
+  icon: 'iconfont icon-zuoce-qujian',
+  label: 'denumberrange.label',
+  defaultClass: 'text-filter'
+}
+
+const dialogPanel = {
+  options: {
+    attrs: {
+      placeholder_min: 'denumberrange.please_key_min',
+      placeholder_max: 'denumberrange.please_key_max',
+      viewIds: []
+    },
+    value: ''
+  },
+  defaultClass: 'text-filter',
+  component: 'de-number-range'
+}
+const drawPanel = {
+  type: 'custom',
+  style: {
+    width: 500,
+    // height: 45.5,
+    height: 90,
+    fontSize: 14,
+    fontWeight: 500,
+    lineHeight: '',
+    letterSpacing: 0,
+    textAlign: '',
+    color: ''
+  },
+  component: 'de-number-range'
+}
+
+class NumberRangeServiceImpl extends WidgetService {
+  constructor(options = {}) {
+    Object.assign(options, { name: 'numberRangeWidget' })
+    super(options)
+    this.filterDialog = true
+    this.showSwitch = false
+  }
+
+  initLeftPanel() {
+    const value = JSON.parse(JSON.stringify(leftPanel))
+    return value
+  }
+
+  initFilterDialog() {
+    const value = JSON.parse(JSON.stringify(dialogPanel))
+    return value
+  }
+
+  initDrawPanel() {
+    const value = JSON.parse(JSON.stringify(drawPanel))
+    return value
+  }
+
+  filterFieldMethod(fields) {
+    return fields.filter(field => {
+      return field['deType'] === 2
+    })
+  }
+}
+const numberRangeServiceImpl = new NumberRangeServiceImpl()
+export default numberRangeServiceImpl

frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js

@@ -3,7 +3,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-xialakuang',
-  label: '数字下拉',
+  label: 'denumberselect.label',
   defaultClass: 'text-filter'
 }
 
@@ -11,7 +11,7 @@ const dialogPanel = {
   options: {
     attrs: {
       multiple: false,
-      placeholder: '请选择',
+      placeholder: 'denumberselect.placeholder',
       datas: [],
       key: 'id',
       label: 'text',

frontend/src/components/widget/serviceImpl/TextInputServiceImpl.js

@@ -2,14 +2,14 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-shuru',
-  label: '文本搜索',
+  label: 'deinputsearch.label',
   defaultClass: 'text-filter'
 }
 
 const dialogPanel = {
   options: {
     attrs: {
-      placeholder: '请输入关键字',
+      placeholder: 'deinputsearch.placeholder',
       viewIds: []
 
     },

frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js

@@ -3,7 +3,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-xialakuang',
-  label: '文本下拉',
+  label: 'detextselect.label',
   defaultClass: 'text-filter'
 }
 
@@ -11,7 +11,7 @@ const dialogPanel = {
   options: {
     attrs: {
       multiple: false,
-      placeholder: '请选择',
+      placeholder: 'detextselect.placeholder',
       viewIds: [],
       datas: [],
       key: 'id',

frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js

@@ -2,7 +2,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-riqi',
-  label: '日期范围',
+  label: 'dedaterange.label',
   defaultClass: 'time-filter'
 }
 
@@ -10,9 +10,9 @@ const dialogPanel = {
   options: {
     attrs: {
       type: 'daterange',
-      rangeSeparator: '至',
-      startPlaceholder: '开始日期',
-      endPlaceholder: '结束日期',
+      rangeSeparator: 'dedaterange.split_placeholder',
+      startPlaceholder: 'dedaterange.to_placeholder',
+      endPlaceholder: 'dedaterange.from_placeholder',
       viewIds: []
     },
     value: ''

frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js

@@ -2,7 +2,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-ri',
-  label: '日期',
+  label: 'dedate.label',
   defaultClass: 'time-filter'
 }
 
@@ -10,7 +10,7 @@ const dialogPanel = {
   options: {
     attrs: {
       type: 'date',
-      placeholder: '请选择日期',
+      placeholder: 'dedate.placeholder',
       viewIds: []
     },
     value: ''

frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js

@@ -2,7 +2,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-yue',
-  label: '年月',
+  label: 'deyearmonth.label',
   defaultClass: 'time-filter'
 }
 
@@ -10,7 +10,7 @@ const dialogPanel = {
   options: {
     attrs: {
       type: 'month',
-      placeholder: '请选择年月',
+      placeholder: 'deyearmonth.placeholder',
       viewIds: []
     },
     value: ''

frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js

@@ -2,7 +2,7 @@ import { WidgetService } from '../service/WidgetService'
 
 const leftPanel = {
   icon: 'iconfont icon-nian',
-  label: '年份',
+  label: 'deyear.label',
   defaultClass: 'time-filter'
 }
 
@@ -10,7 +10,7 @@ const dialogPanel = {
   options: {
     attrs: {
       type: 'year',
-      placeholder: '请选择年份',
+      placeholder: 'deyear.placeholder',
       viewIds: []
     },
     value: ''

frontend/src/icons/svg/map.svg

@@ -0,0 +1 @@
+<svg t="1626859344070" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="819" width="200" height="200"><path d="M948.3 170.5c-7.2-6.1-17.4-8.7-26.6-7.2l-237.1 42-60.4-20c-17.4-5.6-35.8 3.6-41.5 20.5-5.6 16.9 3.6 35.8 20.5 41.5l68.6 22.5c1.5 0.5 3.1 1 4.6 1v265.7L541.2 495c-11.8-3.6-23.6 3.1-27.1 14.3s3.1 23.6 14.3 27.1l148 45.6v273.9L392.8 776V652.8c0-12.3-9.7-22-22-22s-22 9.7-22 22v123.9L130.7 811V195.1c0-17.9-14.8-32.8-32.8-32.8s-32.8 14.8-32.8 32.8v654.3c0 9.7 4.1 18.4 11.3 25.1 7.2 6.1 16.9 9.2 26.1 7.7l270.8-42.5 304.1 85.5c3.1 1 5.6 1 8.7 1 2 0 4.1 0 5.6-0.5l240.1-43.5c15.4-3.1 26.6-16.4 26.6-32.3V195.6c1.7-9.7-2.9-19-10.1-25.1z" p-id="820"></path><path d="M376.4 97.8c-102.4 0-185.3 82.9-185.3 185.3 0 28.2 6.7 55.8 20.5 82.9 10.8 21 109.1 159.7 138.8 201.7 6.1 8.7 15.9 13.8 26.6 13.8 10.8 0 20.5-5.1 26.6-13.8 29.7-42.5 127.5-181.8 137.7-201.2 13.3-25.6 20.5-54.8 20.5-83.5 0-102.3-83-185.2-185.4-185.2z m0.5 240.1c-30.2 0-54.8-24.6-54.8-54.8s24.1-54.8 54.8-54.8c30.2 0 54.8 24.6 54.8 54.8s-24.6 54.8-54.8 54.8z" p-id="821"></path></svg>

frontend/src/icons/svg/sort-asc.svg

@@ -0,0 +1 @@
+<svg t="1626861945234" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="5279" width="200" height="200"><path d="M0 0h307.2v122.88H0V0z m0 460.8h614.4v122.88H0V460.8z m0 440.32h1024V1024H0v-122.88z" p-id="5280"></path></svg>

frontend/src/icons/svg/sort-desc.svg

@@ -0,0 +1 @@
+<svg t="1626861978178" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4648" width="200" height="200"><path d="M0 0h1024v122.88H0V0z m0 460.8h614.4v122.88H0V460.8z m0 440.32h307.2V1024H0v-122.88z" p-id="4649"></path></svg>

frontend/src/lang/en.js

@@ -750,6 +750,7 @@ export default {
     chart_funnel: 'Funnel',
     chart_radar: 'Radar',
     chart_gauge: 'Gauge',
+    chart_map: 'Map',
     dateStyle: 'Date Style',
     datePattern: 'Date Format',
     y: 'Year',
@@ -817,11 +818,17 @@ export default {
     drag_block_funnel_width: 'Funnel Width',
     drag_block_funnel_split: 'Funnel Split',
     drag_block_radar_length: 'Branch Length',
-    drag_block_radar_label: 'Branch Label'
+    drag_block_radar_label: 'Branch Label',
+    stack_item: 'Stack Item',
+    map_range: 'Map range',
+    select_map_range: 'Please select map range',
+    area: 'Area',
+    placeholder_field: 'Drag Field To Here'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
     datalist: 'Data Set',
+    name: 'DataSet Name',
     add_group: 'Add Group',
     add_scene: 'Add Scene',
     group: 'Group',
@@ -956,9 +963,10 @@ export default {
       task_status: 'Task status',
       dataset: 'Data set',
       search_by_name: 'Search by name',
-      underway: 'Running',
-      stopped: 'Stopped',
-      exec: 'Execute',
+      underway: 'Waiting for execution',
+      stopped: 'End',
+      pending: 'Pause',
+      exec: 'Execute Once',
       confirm_exec: 'Manual trigger execution？',
       change_success: 'State switch successful'
     },
@@ -1282,5 +1290,46 @@ export default {
     i18n_msg_type_dataset_sync_faild: 'Dataset synchronization failed',
     i18n_msg_type_all: 'All type',
     channel_inner_msg: 'On site news'
+  },
+  denumberrange: {
+    label: 'Number range',
+    split_placeholder: 'To',
+    please_key_min: 'Please key min value',
+    please_key_max: 'Please key max value',
+    out_of_min: 'The min value cannot be less than the min integer -2³²',
+    out_of_max: 'The max value cannot be more than the max integer 2³²-1',
+    must_int: 'Please key interger',
+    min_out_max: 'The min value must be less than the max value',
+    max_out_min: 'The max value must be more than the min value'
+  },
+  denumberselect: {
+    label: 'Number selector',
+    placeholder: 'Please select'
+  },
+  deinputsearch: {
+    label: 'Text search',
+    placeholder: 'Please key keyword'
+  },
+  detextselect: {
+    label: 'Text selector',
+    placeholder: 'Please select'
+  },
+  dedaterange: {
+    label: 'Date range',
+    to_placeholder: 'End date',
+    from_placeholder: 'Start date',
+    split_placeholder: 'To'
+  },
+  dedate: {
+    label: 'Date',
+    placeholder: 'Please select date'
+  },
+  deyearmonth: {
+    label: 'Month',
+    placeholder: 'Please select month'
+  },
+  deyear: {
+    label: 'Year',
+    placeholder: 'Please select year'
   }
 }

frontend/src/lang/tw.js

@@ -750,6 +750,7 @@ export default {
     chart_funnel: '漏鬥圖',
     chart_radar: '雷達圖',
     chart_gauge: '儀表盤',
+    chart_map: '地圖',
     dateStyle: '日期顯示',
     datePattern: '日期格式',
     y: '年',
@@ -817,11 +818,17 @@ export default {
     drag_block_funnel_width: '漏鬥層寬',
     drag_block_funnel_split: '漏鬥分層',
     drag_block_radar_length: '分支長度',
-    drag_block_radar_label: '分支標簽'
+    drag_block_radar_label: '分支標簽',
+    map_range: '地圖範圍',
+    select_map_range: '請選擇地圖範圍',
+    area: '地區',
+    stack_item: '堆疊項',
+    placeholder_field: '拖動字段至此處'
   },
   dataset: {
     sheet_warn: '有多個sheet頁面，默認抽取第一個',
     datalist: '數據集',
+    name: '數據集名稱',
     add_group: '添加分組',
     add_scene: '添加場景',
     group: '分組',
@@ -956,9 +963,10 @@ export default {
       task_status: '任務狀態',
       dataset: '數據集',
       search_by_name: '根據名稱搜索',
-      underway: '運行中',
-      stopped: '停止',
-      exec: '執行',
+      underway: '等待執行',
+      stopped: '執行结束',
+      pending: '暫停',
+      exec: '執行一次',
       confirm_exec: '手動觸發執行？',
       change_success: '狀態切換成功'
     },
@@ -1121,7 +1129,7 @@ export default {
     lineHeight: '行高',
     letterSpacing: '字間距',
     textAlign: '左右對齊',
-    opacity: '透明度',
+    opacity: '不透明度',
     verticalAlign: '上下對齊',
     text_align_left: '左對齊',
     text_align_center: '左右居中',
@@ -1282,5 +1290,46 @@ export default {
     i18n_msg_type_dataset_sync_faild: '數據集同步失敗',
     i18n_msg_type_all: '全部類型',
     channel_inner_msg: '站內消息'
+  },
+  denumberrange: {
+    label: '數值區間',
+    split_placeholder: '至',
+    please_key_min: '請輸入最小值',
+    please_key_max: '請輸入最大值',
+    out_of_min: '最小值不能小于最小整數-2³²',
+    out_of_max: '最大值不能大于最大整數2³²-1',
+    must_int: '請輸入整數',
+    min_out_max: '最小值必須小于最大值',
+    max_out_min: '最大值必須大于最小值'
+  },
+  denumberselect: {
+    label: '數字下拉',
+    placeholder: '請選擇'
+  },
+  deinputsearch: {
+    label: '文本搜索',
+    placeholder: '請輸入關鍵字'
+  },
+  detextselect: {
+    label: '文本下拉',
+    placeholder: '請選擇'
+  },
+  dedaterange: {
+    label: '日期範圍',
+    to_placeholder: '結束日期',
+    from_placeholder: '開始日期',
+    split_placeholder: '至'
+  },
+  dedate: {
+    label: '日期',
+    placeholder: '請選擇日期'
+  },
+  deyearmonth: {
+    label: '年月',
+    placeholder: '請選擇年月'
+  },
+  deyear: {
+    label: '年份',
+    placeholder: '請選擇年份'
   }
 }

frontend/src/lang/zh.js

@@ -750,6 +750,7 @@ export default {
     chart_funnel: '漏斗图',
     chart_radar: '雷达图',
     chart_gauge: '仪表盘',
+    chart_map: '地图',
     dateStyle: '日期显示',
     datePattern: '日期格式',
     y: '年',
@@ -817,11 +818,17 @@ export default {
     drag_block_funnel_width: '漏斗层宽',
     drag_block_funnel_split: '漏斗分层',
     drag_block_radar_length: '分支长度',
-    drag_block_radar_label: '分支标签'
+    drag_block_radar_label: '分支标签',
+    map_range: '地图范围',
+    select_map_range: '请选择地图范围',
+    area: '地区',
+    stack_item: '堆叠项',
+    placeholder_field: '拖动字段至此处'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
     datalist: '数据集',
+    name: '数据集名称',
     add_group: '添加分组',
     add_scene: '添加场景',
     group: '分组',
@@ -956,9 +963,10 @@ export default {
       task_status: '任务状态',
       dataset: '数据集',
       search_by_name: '根据名称搜索',
-      underway: '运行中',
-      stopped: '停止',
-      exec: '执行',
+      underway: '等待执行',
+      stopped: '执行结束',
+      pending: '暂停',
+      exec: '执行一次',
       confirm_exec: '手动触发执行？',
       change_success: '状态切换成功'
     },
@@ -1122,7 +1130,7 @@ export default {
     lineHeight: '行高',
     letterSpacing: '字间距',
     textAlign: '左右对齐',
-    opacity: '透明度',
+    opacity: '不透明度',
     verticalAlign: '上下对齐',
     text_align_left: '左对齐',
     text_align_center: '左右居中',
@@ -1284,5 +1292,46 @@ export default {
     i18n_msg_type_dataset_sync_faild: '数据集同步失败',
     i18n_msg_type_all: '全部类型',
     channel_inner_msg: '站内消息'
+  },
+  denumberrange: {
+    label: '数值区间',
+    split_placeholder: '至',
+    please_key_min: '请输入最小值',
+    please_key_max: '请输入最大值',
+    out_of_min: '最小值不能小于最小整数-2³²',
+    out_of_max: '最大值不能大于最大整数2³²-1',
+    must_int: '请输入整数',
+    min_out_max: '最小值必须小于最大值',
+    max_out_min: '最大值必须大于最小值'
+  },
+  denumberselect: {
+    label: '数字下拉',
+    placeholder: '请选择'
+  },
+  deinputsearch: {
+    label: '文本搜索',
+    placeholder: '请输入关键字'
+  },
+  detextselect: {
+    label: '文本下拉',
+    placeholder: '请选择'
+  },
+  dedaterange: {
+    label: '日期范围',
+    to_placeholder: '结束日期',
+    from_placeholder: '开始日期',
+    split_placeholder: '至'
+  },
+  dedate: {
+    label: '日期',
+    placeholder: '请选择日期'
+  },
+  deyearmonth: {
+    label: '年月',
+    placeholder: '请选择年月'
+  },
+  deyear: {
+    label: '年份',
+    placeholder: '请选择年份'
   }
 }

frontend/src/layout/index.vue

@@ -121,6 +121,8 @@ export default {
         width: 100% !important;
         position: initial !important;
         height: calc(100vh - 80px) !important;
+        overflow-x: hidden !important;
+        overflow-y: auto !important;
       }
   }
 </style>

frontend/src/store/index.js

@@ -72,6 +72,7 @@ const data = {
     },
 
     setCurComponent(state, { component, index }) {
+      state.styleChangeTimes = 0
       state.curComponent = component
       state.curComponentIndex = index
     },

frontend/src/store/modules/permission.js

@@ -72,6 +72,7 @@ export const fillMeta = (router) => {
   router.name.includes('system-user-form') && (router.meta.activeMenu = '/system/user')
   router.name.includes('system-role-form') && (router.meta.activeMenu = '/system/role')
   router.name.includes('system-dept-form') && (router.meta.activeMenu = '/system/dept')
+  // router.name.includes('sys-task-dataset') && (router.meta.activeMenu = '/system/dstask')
   // return router
 }
 

frontend/src/styles/deicon/demo_index.html

@@ -54,6 +54,30 @@
       <div class="content unicode" style="display: block;">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+              <span class="icon iconfont">&#xe603;</span>
+                <div class="name">弧形框</div>
+                <div class="code-name">&amp;#xe603;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe602;</span>
+                <div class="name">弧形框</div>
+                <div class="code-name">&amp;#xe602;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe642;</span>
+                <div class="name">透明</div>
+                <div class="code-name">&amp;#xe642;</div>
+              </li>
+          
+            <li class="dib">
+              <span class="icon iconfont">&#xe61a;</span>
+                <div class="name">弧度</div>
+                <div class="code-name">&amp;#xe61a;</div>
+              </li>
+          
             <li class="dib">
               <span class="icon iconfont">&#xe62d;</span>
                 <div class="name">放大</div>
@@ -282,9 +306,9 @@
 <pre><code class="language-css"
 >@font-face {
   font-family: 'iconfont';
-  src: url('iconfont.woff2?t=1626147352097') format('woff2'),
-       url('iconfont.woff?t=1626147352097') format('woff'),
-       url('iconfont.ttf?t=1626147352097') format('truetype');
+  src: url('iconfont.woff2?t=1626927148990') format('woff2'),
+       url('iconfont.woff?t=1626927148990') format('woff'),
+       url('iconfont.ttf?t=1626927148990') format('truetype');
 }
 </code></pre>
           <h3 id="-iconfont-">第二步：定义使用 iconfont 的样式</h3>
@@ -310,6 +334,42 @@
       <div class="content font-class">
         <ul class="icon_lists dib-box">
           
+          <li class="dib">
+            <span class="icon iconfont icon-weibiaoti-1"></span>
+            <div class="name">
+              弧形框
+            </div>
+            <div class="code-name">.icon-weibiaoti-1
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-weibiaoti-"></span>
+            <div class="name">
+              弧形框
+            </div>
+            <div class="code-name">.icon-weibiaoti-
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-touming"></span>
+            <div class="name">
+              透明
+            </div>
+            <div class="code-name">.icon-touming
+            </div>
+          </li>
+          
+          <li class="dib">
+            <span class="icon iconfont icon-fangxing-"></span>
+            <div class="name">
+              弧度
+            </div>
+            <div class="code-name">.icon-fangxing-
+            </div>
+          </li>
+          
           <li class="dib">
             <span class="icon iconfont icon-fangda"></span>
             <div class="name">
@@ -652,6 +712,38 @@
       <div class="content symbol">
           <ul class="icon_lists dib-box">
           
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weibiaoti-1"></use>
+                </svg>
+                <div class="name">弧形框</div>
+                <div class="code-name">#icon-weibiaoti-1</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-weibiaoti-"></use>
+                </svg>
+                <div class="name">弧形框</div>
+                <div class="code-name">#icon-weibiaoti-</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-touming"></use>
+                </svg>
+                <div class="name">透明</div>
+                <div class="code-name">#icon-touming</div>
+            </li>
+          
+            <li class="dib">
+                <svg class="icon svg-icon" aria-hidden="true">
+                  <use xlink:href="#icon-fangxing-"></use>
+                </svg>
+                <div class="name">弧度</div>
+                <div class="code-name">#icon-fangxing-</div>
+            </li>
+          
             <li class="dib">
                 <svg class="icon svg-icon" aria-hidden="true">
                   <use xlink:href="#icon-fangda"></use>

frontend/src/styles/deicon/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 2459092 */
-  src: url('iconfont.woff2?t=1626147352097') format('woff2'),
-       url('iconfont.woff?t=1626147352097') format('woff'),
-       url('iconfont.ttf?t=1626147352097') format('truetype');
+  src: url('iconfont.woff2?t=1626927148990') format('woff2'),
+       url('iconfont.woff?t=1626927148990') format('woff'),
+       url('iconfont.ttf?t=1626927148990') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,22 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-weibiaoti-1:before {
+  content: "\e603";
+}
+
+.icon-weibiaoti-:before {
+  content: "\e602";
+}
+
+.icon-touming:before {
+  content: "\e642";
+}
+
+.icon-fangxing-:before {
+  content: "\e61a";
+}
+
 .icon-fangda:before {
   content: "\e62d";
 }

frontend/src/styles/deicon/iconfont.json

@@ -5,6 +5,34 @@
   "css_prefix_text": "icon-",
   "description": "",
   "glyphs": [
+    {
+      "icon_id": "12617190",
+      "name": "弧形框",
+      "font_class": "weibiaoti-1",
+      "unicode": "e603",
+      "unicode_decimal": 58883
+    },
+    {
+      "icon_id": "12617065",
+      "name": "弧形框",
+      "font_class": "weibiaoti-",
+      "unicode": "e602",
+      "unicode_decimal": 58882
+    },
+    {
+      "icon_id": "4454064",
+      "name": "透明",
+      "font_class": "touming",
+      "unicode": "e642",
+      "unicode_decimal": 58946
+    },
+    {
+      "icon_id": "7311866",
+      "name": "弧度",
+      "font_class": "fangxing-",
+      "unicode": "e61a",
+      "unicode_decimal": 58906
+    },
     {
       "icon_id": "20921234",
       "name": "放大",

frontend/src/styles/index.scss

@@ -211,17 +211,19 @@ div:focus {
 }
 .custom-component-class {
   width: 100%;
+  
+  div:not(.de-number-range-container ) {
+    width: 100% !important;
+  }
+
   div.el-input-group__append {
     width: 10% !important;
   }
-  div {
-    width: 100% !important;
-  }
 }
 
 %field-icon{
   font-size: 13px;
-  margin: 0 3px 0 0;
+  margin: 0 2px 0 0;
 }
 .field-icon-text{
   @extend %field-icon;
@@ -239,6 +241,12 @@ div:focus {
   @extend %field-icon;
   color: #F56C6C;
 }
+.field-icon-sort{
+  font-size: 10px;
+  @extend %field-icon;
+  color: #999999;
+  margin: 0 2px 1px 0;
+}
 .ds-icon-scene{
   width: 13px;
   height: 13px;

frontend/src/views/Tinymce/FilterTextAttr.vue

@@ -7,7 +7,7 @@
       </el-tooltip>
 
       <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.fontSize" type="number" size="mini" min="12" max="128" />
+        <el-input v-model="styleInfo.fontSize" type="number" size="mini" min="12" max="128" @change="styleChange"/>
       </div>
 
       <el-tooltip :content="$t('panel.fontWeight')">
@@ -15,7 +15,7 @@
       </el-tooltip>
 
       <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.fontWeight" type="number" size="mini" min="100" step="100" max="900" />
+        <el-input v-model="styleInfo.fontWeight" type="number" size="mini" min="100" step="100" max="900" @change="styleChange"/>
       </div>
 
       <el-tooltip :content="$t('panel.letterSpacing')">
@@ -23,7 +23,7 @@
       </el-tooltip>
 
       <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.letterSpacing" type="number" size="mini" min="0" max="99" />
+        <el-input v-model="styleInfo.letterSpacing" type="number" size="mini" min="0" max="99" @change="styleChange"/>
       </div>
 
       <div style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;">
@@ -32,7 +32,7 @@
             <i class="icon iconfont icon-zimua" @click="goColor" />
           </el-tooltip>
           <div :style="letterDivColor" />
-          <el-color-picker ref="colorPicker" v-model="styleInfo.color" style="margin-top: 7px;height: 0px" size="mini" />
+          <el-color-picker ref="colorPicker" v-model="styleInfo.color" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange"/>
         </div>
       </div>
 
@@ -42,7 +42,7 @@
             <i class="iconfont icon-beijingse1" @click="goBackgroundColor" />
           </el-tooltip>
           <div :style="backgroundDivColor" />
-          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" />
+          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange"/>
         </div>
       </div>
     </div>
@@ -136,6 +136,10 @@ export default {
       } else {
         return y
       }
+    },
+    styleChange() {
+      debugger
+      this.$store.state.styleChangeTimes++
     }
   }
 }
@@ -150,7 +154,7 @@ export default {
   }
   .el-card-main {
     height: 34px;
-    z-index: 1000000000;
+    z-index: 10;
     width: 350px;
     position: absolute;
 

frontend/src/views/Tinymce/RectangleAttr.vue

@@ -1,184 +0,0 @@
-<template>
-  <el-card class="el-card-main" :style="mainStyle">
-    <div style="position: relative;">
-      <div style="width: 80px;margin-top: 2px;margin-left: 2px;float: left">
-        <el-tooltip content="边框风格">
-          <el-select v-model="styleInfo.borderStyle" size="mini">
-            <el-option
-              v-for="item in lineStyle"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            >
-              <span style="float: left;">
-                <i :class="item.icon" />
-              </span>
-              <span style="float: right; color: #8492a6; font-size: 12px">{{ item.label }}</span>
-            </el-option>
-          </el-select>
-        </el-tooltip>
-      </div>
-
-      <div style="width: 55px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-tooltip content="边框宽度">
-          <el-select v-model="styleInfo.borderWidth" size="mini" placeholder="">
-            <el-option
-              v-for="item in lineFont"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-            />
-          </el-select>
-        </el-tooltip>
-      </div>
-
-      <div style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;">
-        <div style="width: 16px;height: 18px">
-          <el-tooltip content="边框颜色">
-            <i class="iconfont icon-huabi" @click="goBoardColor" />
-          </el-tooltip>
-          <div :style="boardDivColor" />
-          <el-color-picker ref="boardColorPicker" v-model="styleInfo.borderColor" style="margin-top: 7px;height: 0px" size="mini" />
-        </div>
-      </div>
-
-      <div style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;">
-        <div style="width: 16px;height: 18px">
-          <el-tooltip content="背景颜色">
-            <i class="iconfont icon-beijingse1" @click="goBackgroundColor" />
-          </el-tooltip>
-          <div :style="backgroundDivColor" />
-          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" />
-        </div>
-      </div>
-    </div>
-  </el-card>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-export default {
-  props: {
-    scrollLeft: {
-      type: Number,
-      default: 0
-    },
-    scrollTop: {
-      type: Number,
-      default: 0
-    }
-  },
-  data() {
-    return {
-      lineStyle: [{
-        icon: 'iconfont icon-solid_line',
-        value: 'solid',
-        label: '实线'
-      }, {
-        icon: 'iconfont icon-xuxian',
-        value: 'dashed',
-        label: '虚线'
-      }, {
-        icon: 'iconfont icon-dianxian',
-        value: 'dotted',
-        label: '点线'
-      }],
-      lineFont: [{
-        value: '0',
-        label: '0'
-      }, {
-        value: '1',
-        label: '1'
-      }, {
-        value: '2',
-        label: '2'
-      }, {
-        value: '3',
-        label: '3'
-      }, {
-        value: '4',
-        label: '4'
-      }, {
-        value: '5',
-        label: '5'
-      }]
-    }
-  },
-  computed: {
-
-    boardDivColor() {
-      const style = {
-        height: '2px',
-        background: this.styleInfo.borderColor
-      }
-      return style
-    },
-    backgroundDivColor() {
-      const style = {
-        height: '2px',
-        background: this.styleInfo.backgroundColor
-      }
-      return style
-    },
-
-    mainStyle() {
-      const style = {
-        left: this.getPositionX(this.curComponent.style.left - this.scrollLeft) + 'px',
-        top: (this.getPositionY(this.curComponent.style.top) - this.scrollTop - 3) + 'px'
-      }
-      return style
-    },
-    styleInfo() {
-      return this.$store.state.curComponent.style
-    },
-    ...mapState([
-      'curComponent',
-      'curCanvasScale',
-      'canvasStyleData'
-    ])
-
-  },
-  methods: {
-    goBoardColor() {
-      this.$refs.boardColorPicker.handleTrigger()
-    },
-    goBackgroundColor() {
-      this.$refs.backgroundColorPicker.handleTrigger()
-    },
-    getPositionX(x) {
-      if (this.canvasStyleData.selfAdaption) {
-        return (x * this.curCanvasScale.scaleWidth / 100) + 60
-      } else {
-        return x + 60
-      }
-    },
-    getPositionY(y) {
-      if (this.canvasStyleData.selfAdaption) {
-        return y * this.curCanvasScale.scaleHeight / 100
-      } else {
-        return y
-      }
-    }
-  }
-}
-</script>
-
-<style lang="scss" scoped>
-  .attr-list {
-    overflow: auto;
-    padding: 20px;
-    padding-top: 0;
-    height: 100%;
-  }
-  .el-card-main {
-    height: 34px;
-    z-index: 1000000000;
-    width: 210px;
-    position: absolute;
-
-  }
-  .el-card-main ::v-deep .el-card__body {
-    padding: 0px!important;
-
-  }
-</style>

frontend/src/views/Tinymce/TextAttr.vue

@@ -2,7 +2,7 @@
   <el-card class="el-card-main" :style="mainStyle">
     <div style="position: relative;">
       <div style="width: 100px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-radio-group v-model="styleInfo.textAlign" size="mini">
+        <el-radio-group v-model="styleInfo.textAlign" size="mini" @change="styleChange">
           <el-radio-button
             v-for="item in textAlignOptions"
             :key="item.label"
@@ -22,7 +22,7 @@
       </el-tooltip>
 
       <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.fontSize" type="number" size="mini" min="12" max="128" />
+        <el-input v-model="styleInfo.fontSize" type="number" size="mini" min="12" max="128" @change="styleChange" />
       </div>
 
       <el-tooltip :content="$t('panel.fontWeight')">
@@ -30,7 +30,7 @@
       </el-tooltip>
 
       <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.fontWeight" type="number" size="mini" min="100" step="100" max="900" />
+        <el-input v-model="styleInfo.fontWeight" type="number" size="mini" min="100" step="100" max="900" @change="styleChange" />
       </div>
 
       <el-tooltip :content="$t('panel.letterSpacing')">
@@ -38,7 +38,7 @@
       </el-tooltip>
 
       <div style="width: 70px;float: left;margin-top: 2px;margin-left: 2px;">
-        <el-input v-model="styleInfo.letterSpacing" type="number" size="mini" min="0" max="99" />
+        <el-input v-model="styleInfo.letterSpacing" type="number" size="mini" min="0" max="99" @change="styleChange" />
       </div>
 
       <div style="width: 20px;float: left;margin-top: 2px;margin-left: 10px;">
@@ -47,7 +47,7 @@
             <i class="icon iconfont icon-zimua" @click="goColor" />
           </el-tooltip>
           <div :style="letterDivColor" />
-          <el-color-picker ref="colorPicker" v-model="styleInfo.color" style="margin-top: 7px;height: 0px" size="mini" />
+          <el-color-picker ref="colorPicker" v-model="styleInfo.color" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange" />
         </div>
       </div>
 
@@ -57,7 +57,7 @@
             <i class="iconfont icon-beijingse1" @click="goBackgroundColor" />
           </el-tooltip>
           <div :style="backgroundDivColor" />
-          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" />
+          <el-color-picker ref="backgroundColorPicker" v-model="styleInfo.backgroundColor" style="margin-top: 7px;height: 0px" size="mini" @change="styleChange" />
         </div>
       </div>
     </div>
@@ -151,6 +151,9 @@ export default {
       } else {
         return y
       }
+    },
+    styleChange() {
+      this.$store.state.styleChangeTimes++
     }
   }
 }
@@ -165,7 +168,7 @@ export default {
   }
   .el-card-main {
     height: 34px;
-    z-index: 1000000000;
+    z-index: 10;
     width: 450px;
     position: absolute;
 

frontend/src/views/chart/chart/chart.js

@@ -205,7 +205,31 @@ export const BASE_BAR = {
   series: [],
   dataZoom: [
     {
-      type: 'inside'
+      type: 'slider',
+      show: false,
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'slider',
+      show: false,
+      yAxisIndex: [0],
+      left: '93%',
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      yAxisIndex: [0],
+      start: 1,
+      end: 100
     }
   ]
 }
@@ -237,7 +261,31 @@ export const HORIZONTAL_BAR = {
   series: [],
   dataZoom: [
     {
-      type: 'inside'
+      type: 'slider',
+      show: false,
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'slider',
+      show: false,
+      yAxisIndex: [0],
+      left: '93%',
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      yAxisIndex: [0],
+      start: 1,
+      end: 100
     }
   ]
 }
@@ -271,7 +319,31 @@ export const BASE_LINE = {
   series: [],
   dataZoom: [
     {
-      type: 'inside'
+      type: 'slider',
+      show: false,
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'slider',
+      show: false,
+      yAxisIndex: [0],
+      left: '93%',
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      xAxisIndex: [0],
+      start: 1,
+      end: 100
+    },
+    {
+      type: 'inside',
+      yAxisIndex: [0],
+      start: 1,
+      end: 100
     }
   ]
 }
@@ -528,3 +600,37 @@ export const BASE_CHART = {
   },
   customFilter: []
 }
+
+export const BASE_MAP = {
+  title: {
+    text: '',
+    textStyle: {
+      fontWeight: 'normal'
+    }
+  },
+
+  tooltip: {},
+  visualMap: {
+    min: 50,
+    max: 52,
+    text: ['High', 'Low'],
+    realtime: false,
+    calculable: true,
+    inRange: {
+      color: ['lightskyblue', 'yellow', 'orangered']
+    }
+  },
+  //   legend: {},
+  series: [
+    {
+      name: '',
+      type: 'map',
+      map: 'HK',
+      roam: true,
+      //   label: {
+      //     show: true
+      //   },
+      data: []
+    }
+  ]
+}

frontend/src/views/chart/chart/common/common.js

@@ -29,7 +29,7 @@ export function componentStyle(chart_option, chart) {
       customStyle.text.isBolder ? style.fontWeight = 'bold' : style.fontWeight = 'normal'
       chart_option.title.textStyle = style
     }
-    if (customStyle.legend) {
+    if (customStyle.legend && chart_option.legend) {
       chart_option.legend.show = customStyle.legend.show
       // 水平方向
       if (customStyle.legend.hPosition === 'left') {

frontend/src/views/chart/chart/map/map.js

@@ -0,0 +1,59 @@
+import { hexColorToRGBA } from '@/views/chart/chart/util'
+import { componentStyle } from '../common/common'
+
+export function baseMapOption(chart_option, chart) {
+  // 处理shape attr
+  let customAttr = {}
+  if (chart.customAttr) {
+    customAttr = JSON.parse(chart.customAttr)
+    if (customAttr.color) {
+      chart_option.color = customAttr.color.colors
+    }
+    // tooltip
+    if (customAttr.tooltip) {
+      const tooltip = JSON.parse(JSON.stringify(customAttr.tooltip))
+      const reg = new RegExp('\n', 'g')
+      tooltip.formatter = tooltip.formatter.replace(reg, '<br/>')
+      chart_option.tooltip = tooltip
+    }
+  }
+  // 处理data
+  if (chart.data) {
+    chart_option.title.text = chart.title
+    if (chart.data.series.length > 0) {
+      chart_option.series[0].name = chart.data.series[0].name
+      // size
+      if (customAttr.size) {
+        chart_option.series[0].radius = [customAttr.size.pieInnerRadius + '%', customAttr.size.pieOuterRadius + '%']
+      }
+      // label
+      if (customAttr.label) {
+        chart_option.series[0].label = customAttr.label
+        chart_option.series[0].labelLine = customAttr.label.labelLine
+      }
+      // visualMap
+      const valueArr = chart.data.series[0].data
+      chart_option.visualMap.min = Math.min(...valueArr)
+      chart_option.visualMap.max = Math.max(...valueArr)
+      if (customAttr.color && customAttr.color.colors) {
+        chart_option.visualMap.inRange.color = customAttr.color.colors
+      }
+      for (let i = 0; i < valueArr.length; i++) {
+        const y = {
+          name: chart.data.x[i],
+          value: valueArr[i]
+        }
+        // color
+        y.itemStyle = {
+          color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha),
+          borderRadius: 0
+        }
+        chart_option.series[0].data.push(y)
+      }
+    }
+  }
+  // console.log(chart_option);
+  componentStyle(chart_option, chart)
+  return chart_option
+}
+

frontend/src/views/chart/components/ChartComponent.vue

@@ -5,15 +5,17 @@
 </template>
 
 <script>
-import { BASE_BAR, BASE_LINE, HORIZONTAL_BAR, BASE_PIE, BASE_FUNNEL, BASE_RADAR, BASE_GAUGE } from '../chart/chart'
+import { BASE_BAR, BASE_LINE, HORIZONTAL_BAR, BASE_PIE, BASE_FUNNEL, BASE_RADAR, BASE_GAUGE, BASE_MAP } from '../chart/chart'
 import { baseBarOption, stackBarOption, horizontalBarOption, horizontalStackBarOption } from '../chart/bar/bar'
 import { baseLineOption, stackLineOption } from '../chart/line/line'
 import { basePieOption, rosePieOption } from '../chart/pie/pie'
+import { baseMapOption } from '../chart/map/map'
 import { baseFunnelOption } from '../chart/funnel/funnel'
 import { baseRadarOption } from '../chart/radar/radar'
 import { baseGaugeOption } from '../chart/gauge/gauge'
-import eventBus from '@/components/canvas/utils/eventBus'
+// import eventBus from '@/components/canvas/utils/eventBus'
 import { uuid } from 'vue-uuid'
+import { geoJson } from '@/api/map/map'
 
 export default {
   name: 'ChartComponent',
@@ -93,6 +95,29 @@ export default {
       } else if (chart.type === 'gauge') {
         chart_option = baseGaugeOption(JSON.parse(JSON.stringify(BASE_GAUGE)), chart)
       }
+
+      if (chart.type === 'map') {
+        const customAttr = JSON.parse(chart.customAttr)
+        if (!customAttr.areaCode) return
+
+        let areaJson
+        if ((areaJson = localStorage.getItem('areaJson' + customAttr.areaCode)) !== null) {
+          this.initMapChart(areaJson, chart)
+          return
+        }
+        geoJson(customAttr.areaCode).then(res => {
+          this.initMapChart(res.data, chart)
+          // localStorage最大容量只有5M，先取消缓存
+          // localStorage.setItem('areaJson' + customAttr.areaCode, res.data)
+        })
+        return
+      }
+      this.myEcharts(chart_option)
+    },
+    initMapChart(geoJson, chart) {
+      this.$echarts.registerMap('HK', geoJson)
+      const base_json = JSON.parse(JSON.stringify(BASE_MAP))
+      const chart_option = baseMapOption(base_json, chart)
       this.myEcharts(chart_option)
     },
     myEcharts(option) {

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

@@ -1,25 +1,35 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">
+      <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini" :disabled="param && !hasDataPermission('manage',param.privileges)">
         <el-form-item :label="$t('chart.color')" class="form-item">
-              <colorPicker v-model="colorForm.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeBackgroundStyle" />
+          <el-color-picker v-model="colorForm.color" class="color-picker-style" @change="changeBackgroundStyle" />
         </el-form-item>
         <el-form-item :label="$t('chart.not_alpha')" class="form-item form-item-slider">
           <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeBackgroundStyle" />
         </el-form-item>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.color')" class="form-item">-->
+    <!--              <colorPicker v-model="colorForm.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeBackgroundStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.not_alpha')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeBackgroundStyle" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
 
-        <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.background') }}<i class="el-icon-setting el-icon--right" /></el-button>
-      </el-popover>
-    </div>
+    <!--        <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.background') }}<i class="el-icon-setting el-icon&#45;&#45;right" /></el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -100,4 +110,8 @@ export default {
   .el-form-item{
     margin-bottom: 6px;
   }
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
 </style>

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

@@ -1,17 +1,11 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        v-model="isSetting"
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form ref="legendForm" :model="legendForm" label-width="80px" size="mini">
-            <!--            <el-form-item :label="$t('chart.show')" class="form-item">-->
-            <!--              <el-checkbox v-model="legendForm.show" @change="changeLegendStyle">{{ $t('chart.show') }}</el-checkbox>-->
-            <!--            </el-form-item>-->
+      <el-form ref="legendForm" :model="legendForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+        <el-form-item :label="$t('chart.show')" class="form-item">
+          <el-checkbox v-model="legendForm.show" @change="changeLegendStyle">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="legendForm.show">
           <el-form-item :label="$t('chart.icon')" class="form-item">
             <el-select v-model="legendForm.icon" :placeholder="$t('chart.icon')" @change="changeLegendStyle">
               <el-option
@@ -34,7 +28,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="legendForm.textStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLegendStyle" />
+            <el-color-picker v-model="legendForm.textStyle.color" class="color-picker-style" @change="changeLegendStyle" />
           </el-form-item>
           <el-form-item :label="$t('chart.text_h_position')" class="form-item">
             <el-radio-group v-model="legendForm.hPosition" size="mini" @change="changeLegendStyle">
@@ -50,21 +44,74 @@
               <el-radio-button label="bottom">{{ $t('chart.text_pos_bottom') }}</el-radio-button>
             </el-radio-group>
           </el-form-item>
+        </div>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        v-model="isSetting"-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="legendForm" :model="legendForm" label-width="80px" size="mini">-->
+    <!--            &lt;!&ndash;            <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
+    <!--            &lt;!&ndash;              <el-checkbox v-model="legendForm.show" @change="changeLegendStyle">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
+    <!--            &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+    <!--            <el-form-item :label="$t('chart.icon')" class="form-item">-->
+    <!--              <el-select v-model="legendForm.icon" :placeholder="$t('chart.icon')" @change="changeLegendStyle">-->
+    <!--                <el-option-->
+    <!--                  v-for="item in iconSymbolOptions"-->
+    <!--                  :key="item.value"-->
+    <!--                  :label="item.name"-->
+    <!--                  :value="item.value"-->
+    <!--                />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.orient')" class="form-item">-->
+    <!--              <el-radio-group v-model="legendForm.orient" size="mini" @change="changeLegendStyle">-->
+    <!--                <el-radio-button label="horizontal">{{ $t('chart.horizontal') }}</el-radio-button>-->
+    <!--                <el-radio-button label="vertical">{{ $t('chart.vertical') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
+    <!--              <el-select v-model="legendForm.textStyle.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeLegendStyle">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_color')" class="form-item">-->
+    <!--              <colorPicker v-model="legendForm.textStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLegendStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_h_position')" class="form-item">-->
+    <!--              <el-radio-group v-model="legendForm.hPosition" size="mini" @change="changeLegendStyle">-->
+    <!--                <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>-->
+    <!--                <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>-->
+    <!--                <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_v_position')" class="form-item">-->
+    <!--              <el-radio-group v-model="legendForm.vPosition" size="mini" @change="changeLegendStyle">-->
+    <!--                <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>-->
+    <!--                <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>-->
+    <!--                <el-radio-button label="bottom">{{ $t('chart.text_pos_bottom') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!legendForm.show || !hasDataPermission('manage',param.privileges)">
-          {{ $t('chart.legend') }}<i class="el-icon-setting el-icon--right" />
-          <el-switch
-            v-model="legendForm.show"
-            :disabled="!hasDataPermission('manage',param.privileges)"
-            class="switch-style"
-            @click.stop.native
-            @change="changeLegendStyle"
-          />
-        </el-button>
-      </el-popover>
-    </div>
+    <!--        <el-button slot="reference" size="mini" class="shape-item" :disabled="!legendForm.show || !hasDataPermission('manage',param.privileges)">-->
+    <!--          {{ $t('chart.legend') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
+    <!--          <el-switch-->
+    <!--            v-model="legendForm.show"-->
+    <!--            :disabled="!hasDataPermission('manage',param.privileges)"-->
+    <!--            class="switch-style"-->
+    <!--            @click.stop.native-->
+    <!--            @change="changeLegendStyle"-->
+    <!--          />-->
+    <!--        </el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -171,4 +218,8 @@ export default {
   right: 10px;
   margin-top: -4px;
 }
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
 </style>

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

@@ -1,18 +1,12 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form ref="splitForm" :model="splitForm" label-width="80px" size="mini">
+      <el-form ref="splitForm" :model="splitForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
         <el-form-item :label="$t('chart.name')" class="form-item">
           <el-checkbox v-model="splitForm.name.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
         <el-form-item :label="$t('chart.color')" class="form-item">
-              <colorPicker v-model="splitForm.name.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />
+          <el-color-picker v-model="splitForm.name.color" class="color-picker-style" @change="changeSplitStyle" />
         </el-form-item>
         <el-form-item :label="$t('chart.text_fontsize')" class="form-item form-item-slider">
           <el-select v-model="splitForm.name.fontSize" :placeholder="$t('chart.text_fontsize')" @change="changeSplitStyle">
@@ -23,13 +17,13 @@
           <el-checkbox v-model="splitForm.axisLine.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
         <el-form-item :label="$t('chart.axis_color')" class="form-item">
-              <colorPicker v-model="splitForm.axisLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />
+          <el-color-picker v-model="splitForm.axisLine.lineStyle.color" class="color-picker-style" @change="changeSplitStyle" />
         </el-form-item>
         <el-form-item :label="$t('chart.axis_label')" class="form-item">
           <el-checkbox v-model="splitForm.axisLabel.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
         <el-form-item :label="$t('chart.axis_label_color')" class="form-item">
-              <colorPicker v-model="splitForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />
+          <el-color-picker v-model="splitForm.axisLabel.color" class="color-picker-style" @change="changeSplitStyle" />
         </el-form-item>
         <el-form-item :label="$t('chart.label_fontsize')" class="form-item form-item-slider">
           <el-select v-model="splitForm.axisLabel.fontSize" :placeholder="$t('chart.label_fontsize')" @change="changeSplitStyle">
@@ -40,19 +34,66 @@
           <el-checkbox v-model="splitForm.splitLine.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
         <el-form-item :label="$t('chart.split_color')" class="form-item">
-              <colorPicker v-model="splitForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />
+          <el-color-picker v-model="splitForm.splitLine.lineStyle.color" class="color-picker-style" @change="changeSplitStyle" />
         </el-form-item>
         <el-form-item :label="$t('chart.shadow')" class="form-item">
           <el-checkbox v-model="splitForm.splitArea.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="splitForm" :model="splitForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.name')" class="form-item">-->
+    <!--              <el-checkbox v-model="splitForm.name.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.color')" class="form-item">-->
+    <!--              <colorPicker v-model="splitForm.name.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_fontsize')" class="form-item form-item-slider">-->
+    <!--              <el-select v-model="splitForm.name.fontSize" :placeholder="$t('chart.text_fontsize')" @change="changeSplitStyle">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.axis_line')" class="form-item">-->
+    <!--              <el-checkbox v-model="splitForm.axisLine.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.axis_color')" class="form-item">-->
+    <!--              <colorPicker v-model="splitForm.axisLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.axis_label')" class="form-item">-->
+    <!--              <el-checkbox v-model="splitForm.axisLabel.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.axis_label_color')" class="form-item">-->
+    <!--              <colorPicker v-model="splitForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.label_fontsize')" class="form-item form-item-slider">-->
+    <!--              <el-select v-model="splitForm.axisLabel.fontSize" :placeholder="$t('chart.label_fontsize')" @change="changeSplitStyle">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.split_line')" class="form-item">-->
+    <!--              <el-checkbox v-model="splitForm.splitLine.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.split_color')" class="form-item">-->
+    <!--              <colorPicker v-model="splitForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.shadow')" class="form-item">-->
+    <!--              <el-checkbox v-model="splitForm.splitArea.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
 
-        <el-button slot="reference" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">
-          {{ $t('chart.split') }}<i class="el-icon-setting el-icon--right" />
-        </el-button>
-      </el-popover>
-    </div>
+    <!--        <el-button slot="reference" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">-->
+    <!--          {{ $t('chart.split') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
+    <!--        </el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -156,4 +197,8 @@ export default {
   right: 10px;
   margin-top: -4px;
 }
+  .color-picker-style{
+    cursor: pointer;
+    z-index: 1003;
+  }
 </style>

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

@@ -1,17 +1,11 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        v-model="isSetting"
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form ref="titleForm" :model="titleForm" label-width="80px" size="mini">
-            <!--            <el-form-item :label="$t('chart.show')" class="form-item">-->
-            <!--              <el-checkbox v-model="titleForm.show" @change="changeTitleStyle">{{ $t('chart.show') }}</el-checkbox>-->
-            <!--            </el-form-item>-->
+      <el-form ref="titleForm" :model="titleForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+        <el-form-item :label="$t('chart.show')" class="form-item">
+          <el-checkbox v-model="titleForm.show" @change="changeTitleStyle">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="titleForm.show">
           <el-form-item :label="$t('chart.title')" class="form-item">
             <el-input
               v-model="titleForm.title"
@@ -28,7 +22,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="titleForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeTitleStyle" />
+            <el-color-picker v-model="titleForm.color" class="color-picker-style" @change="changeTitleStyle" />
           </el-form-item>
           <el-form-item :label="$t('chart.text_h_position')" class="form-item">
             <el-radio-group v-model="titleForm.hPosition" size="mini" @change="changeTitleStyle">
@@ -48,21 +42,72 @@
             <el-checkbox v-model="titleForm.isItalic" @change="changeTitleStyle">{{ $t('chart.italic') }}</el-checkbox>
             <el-checkbox v-model="titleForm.isBolder" @change="changeTitleStyle">{{ $t('chart.bolder') }}</el-checkbox>
           </el-form-item>
+        </div>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        v-model="isSetting"-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="titleForm" :model="titleForm" label-width="80px" size="mini">-->
+    <!--            &lt;!&ndash;            <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
+    <!--            &lt;!&ndash;              <el-checkbox v-model="titleForm.show" @change="changeTitleStyle">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
+    <!--            &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+    <!--            <el-form-item :label="$t('chart.title')" class="form-item">-->
+    <!--              <el-input-->
+    <!--                v-model="titleForm.title"-->
+    <!--                size="mini"-->
+    <!--                :placeholder="$t('chart.title')"-->
+    <!--                clearable-->
+    <!--                @blur="changeTitleStyle"-->
+    <!--                @input="inputOnInput($event)"-->
+    <!--              />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
+    <!--              <el-select v-model="titleForm.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeTitleStyle">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_color')" class="form-item">-->
+    <!--              <colorPicker v-model="titleForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeTitleStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_h_position')" class="form-item">-->
+    <!--              <el-radio-group v-model="titleForm.hPosition" size="mini" @change="changeTitleStyle">-->
+    <!--                <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>-->
+    <!--                <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>-->
+    <!--                <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item v-show="chart.type && !chart.type.includes('table')" :label="$t('chart.text_v_position')" class="form-item">-->
+    <!--              <el-radio-group v-model="titleForm.vPosition" size="mini" @change="changeTitleStyle">-->
+    <!--                <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>-->
+    <!--                <el-radio-button label="center">{{ $t('chart.text_pos_center') }}</el-radio-button>-->
+    <!--                <el-radio-button label="bottom">{{ $t('chart.text_pos_bottom') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_style')" class="form-item">-->
+    <!--              <el-checkbox v-model="titleForm.isItalic" @change="changeTitleStyle">{{ $t('chart.italic') }}</el-checkbox>-->
+    <!--              <el-checkbox v-model="titleForm.isBolder" @change="changeTitleStyle">{{ $t('chart.bolder') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!titleForm.show || !hasDataPermission('manage',param.privileges)">
-          {{ $t('chart.title') }}<i class="el-icon-setting el-icon--right" />
-          <el-switch
-            v-model="titleForm.show"
-            :disabled="!hasDataPermission('manage',param.privileges)"
-            class="switch-style"
-            @click.stop.native
-            @change="changeTitleStyle"
-          />
-        </el-button>
-      </el-popover>
-    </div>
+    <!--        <el-button slot="reference" size="mini" class="shape-item" :disabled="!titleForm.show || !hasDataPermission('manage',param.privileges)">-->
+    <!--          {{ $t('chart.title') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
+    <!--          <el-switch-->
+    <!--            v-model="titleForm.show"-->
+    <!--            :disabled="!hasDataPermission('manage',param.privileges)"-->
+    <!--            class="switch-style"-->
+    <!--            @click.stop.native-->
+    <!--            @change="changeTitleStyle"-->
+    <!--          />-->
+    <!--        </el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -170,4 +215,8 @@ export default {
   right: 10px;
   margin-top: -4px;
 }
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
 </style>

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

@@ -1,17 +1,11 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        v-model="isSetting"
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini">
-            <!--            <el-form-item :label="$t('chart.show')" class="form-item">-->
-            <!--              <el-checkbox v-model="axisForm.show" @change="changeXAxisStyle">{{ $t('chart.show') }}</el-checkbox>-->
-            <!--            </el-form-item>-->
+      <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+        <el-form-item :label="$t('chart.show')" class="form-item">
+          <el-checkbox v-model="axisForm.show" @change="changeXAxisStyle">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="axisForm.show">
           <el-form-item :label="$t('chart.position')" class="form-item">
             <el-radio-group v-model="axisForm.position" size="mini" @change="changeXAxisStyle">
               <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>
@@ -25,7 +19,7 @@
             <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeXAxisStyle" />
           </el-form-item>
           <el-form-item :label="$t('chart.axis_name_color')" class="form-item">
-              <colorPicker v-model="axisForm.nameTextStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />
+            <el-color-picker v-model="axisForm.nameTextStyle.color" class="color-picker-style" @change="changeXAxisStyle" />
           </el-form-item>
           <el-form-item :label="$t('chart.axis_name_fontsize')" class="form-item form-item-slider">
             <el-select v-model="axisForm.nameTextStyle.fontSize" :placeholder="$t('chart.axis_name_fontsize')" @change="changeXAxisStyle">
@@ -38,7 +32,7 @@
           </el-form-item>
           <span v-show="axisForm.splitLine.show">
             <el-form-item :label="$t('chart.axis_color')" class="form-item">
-                <colorPicker v-model="axisForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />
+              <el-color-picker v-model="axisForm.splitLine.lineStyle.color" class="el-color-picker" @change="changeXAxisStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_width')" class="form-item form-item-slider">
               <el-slider v-model="axisForm.splitLine.lineStyle.width" :min="1" :max="10" show-input :show-input-controls="false" input-size="mini" @change="changeXAxisStyle" />
@@ -57,7 +51,7 @@
           </el-form-item>
           <span v-show="axisForm.axisLabel.show">
             <el-form-item :label="$t('chart.axis_label_color')" class="form-item">
-                <colorPicker v-model="axisForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />
+              <el-color-picker v-model="axisForm.axisLabel.color" class="el-color-picker" @change="changeXAxisStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_label_fontsize')" class="form-item form-item-slider">
               <el-select v-model="axisForm.axisLabel.fontSize" :placeholder="$t('chart.axis_label_fontsize')" @change="changeXAxisStyle">
@@ -69,21 +63,93 @@
           <el-form-item :label="$t('chart.content_formatter')" class="form-item">
             <el-input v-model="axisForm.axisLabel.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeXAxisStyle" />
           </el-form-item>
+        </div>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        v-model="isSetting"-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini">-->
+    <!--            &lt;!&ndash;            <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
+    <!--            &lt;!&ndash;              <el-checkbox v-model="axisForm.show" @change="changeXAxisStyle">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
+    <!--            &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+    <!--            <el-form-item :label="$t('chart.position')" class="form-item">-->
+    <!--              <el-radio-group v-model="axisForm.position" size="mini" @change="changeXAxisStyle">-->
+    <!--                <el-radio-button label="top">{{ $t('chart.text_pos_top') }}</el-radio-button>-->
+    <!--                <el-radio-button label="bottom">{{ $t('chart.text_pos_bottom') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.name')" class="form-item">-->
+    <!--              <el-input v-model="axisForm.name" size="mini" @blur="changeXAxisStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.rotate')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeXAxisStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.axis_name_color')" class="form-item">-->
+    <!--              <colorPicker v-model="axisForm.nameTextStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.axis_name_fontsize')" class="form-item form-item-slider">-->
+    <!--              <el-select v-model="axisForm.nameTextStyle.fontSize" :placeholder="$t('chart.axis_name_fontsize')" @change="changeXAxisStyle">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-divider />-->
+    <!--            <el-form-item :label="$t('chart.axis_show')" class="form-item">-->
+    <!--              <el-checkbox v-model="axisForm.splitLine.show" @change="changeXAxisStyle">{{ $t('chart.axis_show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <span v-show="axisForm.splitLine.show">-->
+    <!--              <el-form-item :label="$t('chart.axis_color')" class="form-item">-->
+    <!--                <colorPicker v-model="axisForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item :label="$t('chart.axis_width')" class="form-item form-item-slider">-->
+    <!--                <el-slider v-model="axisForm.splitLine.lineStyle.width" :min="1" :max="10" show-input :show-input-controls="false" input-size="mini" @change="changeXAxisStyle" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item :label="$t('chart.axis_type')" class="form-item">-->
+    <!--                <el-radio-group v-model="axisForm.splitLine.lineStyle.type" size="mini" @change="changeXAxisStyle">-->
+    <!--                  <el-radio-button label="solid">{{ $t('chart.axis_type_solid') }}</el-radio-button>-->
+    <!--                  <el-radio-button label="dashed">{{ $t('chart.axis_type_dashed') }}</el-radio-button>-->
+    <!--                  <el-radio-button label="dotted">{{ $t('chart.axis_type_dotted') }}</el-radio-button>-->
+    <!--                </el-radio-group>-->
+    <!--              </el-form-item>-->
+    <!--            </span>-->
+    <!--            <el-divider />-->
+    <!--            <el-form-item :label="$t('chart.axis_label_show')" class="form-item">-->
+    <!--              <el-checkbox v-model="axisForm.axisLabel.show" @change="changeXAxisStyle">{{ $t('chart.axis_label_show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <span v-show="axisForm.axisLabel.show">-->
+    <!--              <el-form-item :label="$t('chart.axis_label_color')" class="form-item">-->
+    <!--                <colorPicker v-model="axisForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item :label="$t('chart.axis_label_fontsize')" class="form-item form-item-slider">-->
+    <!--                <el-select v-model="axisForm.axisLabel.fontSize" :placeholder="$t('chart.axis_label_fontsize')" @change="changeXAxisStyle">-->
+    <!--                  <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--                </el-select>-->
+    <!--              </el-form-item>-->
+    <!--            </span>-->
+    <!--            <el-divider />-->
+    <!--            <el-form-item :label="$t('chart.content_formatter')" class="form-item">-->
+    <!--              <el-input v-model="axisForm.axisLabel.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeXAxisStyle" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show || !hasDataPermission('manage',param.privileges)">
-          {{ $t('chart.xAxis') }}<i class="el-icon-setting el-icon--right" />
-          <el-switch
-            v-model="axisForm.show"
-            :disabled="!hasDataPermission('manage',param.privileges)"
-            class="switch-style"
-            @click.stop.native
-            @change="changeXAxisStyle"
-          />
-        </el-button>
-      </el-popover>
-    </div>
+    <!--        <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show || !hasDataPermission('manage',param.privileges)">-->
+    <!--          {{ $t('chart.xAxis') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
+    <!--          <el-switch-->
+    <!--            v-model="axisForm.show"-->
+    <!--            :disabled="!hasDataPermission('manage',param.privileges)"-->
+    <!--            class="switch-style"-->
+    <!--            @click.stop.native-->
+    <!--            @change="changeXAxisStyle"-->
+    <!--          />-->
+    <!--        </el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -191,4 +257,8 @@ export default {
   right: 10px;
   margin-top: -4px;
 }
+  .color-picker-style{
+    cursor: pointer;
+    z-index: 1003;
+  }
 </style>

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

@@ -1,17 +1,11 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        v-model="isSetting"
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini">
-            <!--            <el-form-item :label="$t('chart.show')" class="form-item">-->
-            <!--              <el-checkbox v-model="axisForm.show" @change="changeYAxisStyle">{{ $t('chart.show') }}</el-checkbox>-->
-            <!--            </el-form-item>-->
+      <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+        <el-form-item :label="$t('chart.show')" class="form-item">
+          <el-checkbox v-model="axisForm.show" @change="changeYAxisStyle">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="axisForm.show">
           <el-form-item :label="$t('chart.position')" class="form-item">
             <el-radio-group v-model="axisForm.position" size="mini" @change="changeYAxisStyle">
               <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>
@@ -25,7 +19,7 @@
             <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeYAxisStyle" />
           </el-form-item>
           <el-form-item :label="$t('chart.axis_name_color')" class="form-item">
-              <colorPicker v-model="axisForm.nameTextStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />
+            <el-color-picker v-model="axisForm.nameTextStyle.color" class="color-picker-style" @change="changeYAxisStyle" />
           </el-form-item>
           <el-form-item :label="$t('chart.axis_name_fontsize')" class="form-item form-item-slider">
             <el-select v-model="axisForm.nameTextStyle.fontSize" :placeholder="$t('chart.axis_name_fontsize')" @change="changeYAxisStyle">
@@ -38,7 +32,7 @@
           </el-form-item>
           <span v-show="axisForm.splitLine.show">
             <el-form-item :label="$t('chart.axis_color')" class="form-item">
-                <colorPicker v-model="axisForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />
+              <el-color-picker v-model="axisForm.splitLine.lineStyle.color" class="el-color-picker" @change="changeYAxisStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_width')" class="form-item form-item-slider">
               <el-slider v-model="axisForm.splitLine.lineStyle.width" :min="1" :max="10" show-input :show-input-controls="false" input-size="mini" @change="changeYAxisStyle" />
@@ -57,7 +51,7 @@
           </el-form-item>
           <span v-show="axisForm.axisLabel.show">
             <el-form-item :label="$t('chart.axis_label_color')" class="form-item">
-                <colorPicker v-model="axisForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />
+              <el-color-picker v-model="axisForm.axisLabel.color" class="el-color-picker" @change="changeYAxisStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_label_fontsize')" class="form-item form-item-slider">
               <el-select v-model="axisForm.axisLabel.fontSize" :placeholder="$t('chart.axis_label_fontsize')" @change="changeYAxisStyle">
@@ -69,21 +63,93 @@
           <el-form-item :label="$t('chart.content_formatter')" class="form-item">
             <el-input v-model="axisForm.axisLabel.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeYAxisStyle" />
           </el-form-item>
+        </div>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        v-model="isSetting"-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini">-->
+    <!--            &lt;!&ndash;            <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
+    <!--            &lt;!&ndash;              <el-checkbox v-model="axisForm.show" @change="changeYAxisStyle">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
+    <!--            &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+    <!--            <el-form-item :label="$t('chart.position')" class="form-item">-->
+    <!--              <el-radio-group v-model="axisForm.position" size="mini" @change="changeYAxisStyle">-->
+    <!--                <el-radio-button label="left">{{ $t('chart.text_pos_left') }}</el-radio-button>-->
+    <!--                <el-radio-button label="right">{{ $t('chart.text_pos_right') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.name')" class="form-item">-->
+    <!--              <el-input v-model="axisForm.name" size="mini" @blur="changeYAxisStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.rotate')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeYAxisStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.axis_name_color')" class="form-item">-->
+    <!--              <colorPicker v-model="axisForm.nameTextStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.axis_name_fontsize')" class="form-item form-item-slider">-->
+    <!--              <el-select v-model="axisForm.nameTextStyle.fontSize" :placeholder="$t('chart.axis_name_fontsize')" @change="changeYAxisStyle">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-divider />-->
+    <!--            <el-form-item :label="$t('chart.axis_show')" class="form-item">-->
+    <!--              <el-checkbox v-model="axisForm.splitLine.show" @change="changeYAxisStyle">{{ $t('chart.axis_show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <span v-show="axisForm.splitLine.show">-->
+    <!--              <el-form-item :label="$t('chart.axis_color')" class="form-item">-->
+    <!--                <colorPicker v-model="axisForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item :label="$t('chart.axis_width')" class="form-item form-item-slider">-->
+    <!--                <el-slider v-model="axisForm.splitLine.lineStyle.width" :min="1" :max="10" show-input :show-input-controls="false" input-size="mini" @change="changeYAxisStyle" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item :label="$t('chart.axis_type')" class="form-item">-->
+    <!--                <el-radio-group v-model="axisForm.splitLine.lineStyle.type" size="mini" @change="changeYAxisStyle">-->
+    <!--                  <el-radio-button label="solid">{{ $t('chart.axis_type_solid') }}</el-radio-button>-->
+    <!--                  <el-radio-button label="dashed">{{ $t('chart.axis_type_dashed') }}</el-radio-button>-->
+    <!--                  <el-radio-button label="dotted">{{ $t('chart.axis_type_dotted') }}</el-radio-button>-->
+    <!--                </el-radio-group>-->
+    <!--              </el-form-item>-->
+    <!--            </span>-->
+    <!--            <el-divider />-->
+    <!--            <el-form-item :label="$t('chart.axis_label_show')" class="form-item">-->
+    <!--              <el-checkbox v-model="axisForm.axisLabel.show" @change="changeYAxisStyle">{{ $t('chart.axis_label_show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <span v-show="axisForm.axisLabel.show">-->
+    <!--              <el-form-item :label="$t('chart.axis_label_color')" class="form-item">-->
+    <!--                <colorPicker v-model="axisForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item :label="$t('chart.axis_label_fontsize')" class="form-item form-item-slider">-->
+    <!--                <el-select v-model="axisForm.axisLabel.fontSize" :placeholder="$t('chart.axis_label_fontsize')" @change="changeYAxisStyle">-->
+    <!--                  <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--                </el-select>-->
+    <!--              </el-form-item>-->
+    <!--            </span>-->
+    <!--            <el-divider />-->
+    <!--            <el-form-item :label="$t('chart.content_formatter')" class="form-item">-->
+    <!--              <el-input v-model="axisForm.axisLabel.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeYAxisStyle" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show || !hasDataPermission('manage',param.privileges)">
-          {{ $t('chart.yAxis') }}<i class="el-icon-setting el-icon--right" />
-          <el-switch
-            v-model="axisForm.show"
-            :disabled="!hasDataPermission('manage',param.privileges)"
-            class="switch-style"
-            @click.stop.native
-            @change="changeYAxisStyle"
-          />
-        </el-button>
-      </el-popover>
-    </div>
+    <!--        <el-button slot="reference" size="mini" class="shape-item" :disabled="!axisForm.show || !hasDataPermission('manage',param.privileges)">-->
+    <!--          {{ $t('chart.yAxis') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
+    <!--          <el-switch-->
+    <!--            v-model="axisForm.show"-->
+    <!--            :disabled="!hasDataPermission('manage',param.privileges)"-->
+    <!--            class="switch-style"-->
+    <!--            @click.stop.native-->
+    <!--            @change="changeYAxisStyle"-->
+    <!--          />-->
+    <!--        </el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -191,4 +257,8 @@ export default {
   right: 10px;
   margin-top: -4px;
 }
+  .color-picker-style{
+    cursor: pointer;
+    z-index: 1003;
+  }
 </style>

frontend/src/views/chart/components/drag-item/ChartDragItem.vue

@@ -0,0 +1,156 @@
+<template>
+  <span>
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
+      <span style="float: left">
+        <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
+        <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
+        <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
+        <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+        <svg-icon v-if="item.sort === 'asc'" icon-class="sort-asc" class-name="field-icon-sort" />
+        <svg-icon v-if="item.sort === 'desc'" icon-class="sort-desc" class-name="field-icon-sort" />
+      </span>
+      <span class="item-span-style" :title="item.name">{{ item.name }}</span>
+    </el-tag>
+    <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
+      <span class="el-dropdown-link">
+        <el-tag size="small" class="item-axis" :type="item.groupType === 'd'?'':'success'">
+          <span style="float: left">
+            <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
+            <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
+            <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
+            <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+            <svg-icon v-if="item.sort === 'asc'" icon-class="sort-asc" class-name="field-icon-sort" />
+            <svg-icon v-if="item.sort === 'desc'" icon-class="sort-desc" class-name="field-icon-sort" />
+          </span>
+          <span class="item-span-style" :title="item.name">{{ item.name }}</span>
+          <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
+        </el-tag>
+        <el-dropdown-menu slot="dropdown">
+          <el-dropdown-item>
+            <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="sort">
+              <span class="el-dropdown-link inner-dropdown-menu">
+                <span>
+                  <i class="el-icon-sort" />
+                  <span>{{ $t('chart.sort') }}</span>
+                  <span class="summary-span">({{ $t('chart.'+item.sort) }})</span>
+                </span>
+                <i class="el-icon-arrow-right el-icon--right" />
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="beforeSort('none')">{{ $t('chart.none') }}</el-dropdown-item>
+                <el-dropdown-item :command="beforeSort('asc')">{{ $t('chart.asc') }}</el-dropdown-item>
+                <el-dropdown-item :command="beforeSort('desc')">{{ $t('chart.desc') }}</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-dropdown-item>
+          <el-dropdown-item icon="el-icon-delete" divided :command="beforeClickItem('remove')">
+            <span>{{ $t('chart.delete') }}</span>
+          </el-dropdown-item>
+        </el-dropdown-menu>
+      </span>
+    </el-dropdown>
+  </span>
+</template>
+
+<script>
+export default {
+  name: 'ChartDragItem',
+  props: {
+    param: {
+      type: Object,
+      required: true
+    },
+    item: {
+      type: Object,
+      required: true
+    },
+    index: {
+      type: Number,
+      required: true
+    }
+  },
+  data() {
+    return {
+    }
+  },
+  mounted() {
+  },
+  methods: {
+    clickItem(param) {
+      if (!param) {
+        return
+      }
+      switch (param.type) {
+        case 'remove':
+          this.removeItem()
+          break
+        default:
+          break
+      }
+    },
+    beforeClickItem(type) {
+      return {
+        type: type
+      }
+    },
+    sort(param) {
+      // console.log(param)
+      this.item.sort = param.type
+      this.$emit('onItemChange', this.item)
+    },
+    beforeSort(type) {
+      return {
+        type: type
+      }
+    },
+    removeItem() {
+      this.item.index = this.index
+      this.$emit('onItemRemove', this.item)
+    }
+  }
+}
+</script>
+
+<style scoped>
+  .item-axis {
+    padding: 1px 6px;
+    margin: 0 3px 2px 3px;
+    text-align: left;
+    height: 24px;
+    line-height: 22px;
+    display: flex;
+    border-radius: 4px;
+    box-sizing: border-box;
+    white-space: nowrap;
+    width: 159px;
+  }
+
+  .item-axis:hover {
+    background-color: #fdfdfd;
+    cursor: pointer;
+  }
+
+  span {
+    font-size: 12px;
+  }
+
+  .summary-span{
+    margin-left: 4px;
+    color: #878d9f;;
+  }
+
+  .inner-dropdown-menu{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%
+  }
+
+  .item-span-style{
+    display: inline-block;
+    width: 100px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+</style>

frontend/src/views/chart/components/drag-item/DimensionItem.vue

@@ -1,22 +1,26 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
       <span style="float: left">
         <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
         <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
         <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
         <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+        <svg-icon v-if="item.sort === 'asc'" icon-class="sort-asc" class-name="field-icon-sort" />
+        <svg-icon v-if="item.sort === 'desc'" icon-class="sort-desc" class-name="field-icon-sort" />
       </span>
       <span class="item-span-style" :title="item.name">{{ item.name }}</span>
     </el-tag>
     <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
-        <el-tag size="small" class="item-axis">
+        <el-tag size="small" class="item-axis" :type="item.groupType === 'd'?'':'success'">
           <span style="float: left">
             <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
             <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
             <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
             <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+            <svg-icon v-if="item.sort === 'asc'" icon-class="sort-asc" class-name="field-icon-sort" />
+            <svg-icon v-if="item.sort === 'desc'" icon-class="sort-desc" class-name="field-icon-sort" />
           </span>
           <span class="item-span-style" :title="item.name">{{ item.name }}</span>
           <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />

frontend/src/views/chart/components/drag-item/FilterItem.vue

@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
       <span style="float: left">
         <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
         <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
@@ -11,7 +11,7 @@
     </el-tag>
     <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
-        <el-tag size="small" class="item-axis">
+        <el-tag size="small" class="item-axis" :type="item.groupType === 'd'?'':'success'">
           <span style="float: left">
             <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
             <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />

frontend/src/views/chart/components/drag-item/QuotaItem.vue

@@ -1,23 +1,27 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
       <span style="float: left">
         <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
         <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
         <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
         <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+        <svg-icon v-if="item.sort === 'asc'" icon-class="sort-asc" class-name="field-icon-sort" />
+        <svg-icon v-if="item.sort === 'desc'" icon-class="sort-desc" class-name="field-icon-sort" />
       </span>
       <span class="item-span-style" :title="item.name">{{ item.name }}</span>
       <span v-if="item.summary" class="summary-span">{{ $t('chart.'+item.summary) }}</span>
     </el-tag>
     <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
-        <el-tag size="small" class="item-axis">
+        <el-tag size="small" class="item-axis" :type="item.groupType === 'd'?'':'success'">
           <span style="float: left">
             <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
             <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
             <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
             <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
+            <svg-icon v-if="item.sort === 'asc'" icon-class="sort-asc" class-name="field-icon-sort" />
+            <svg-icon v-if="item.sort === 'desc'" icon-class="sort-desc" class-name="field-icon-sort" />
           </span>
           <span class="item-span-style" :title="item.name">{{ item.name }}</span>
           <span v-if="item.summary" class="summary-span">{{ $t('chart.'+item.summary) }}</span>
@@ -30,7 +34,7 @@
                 <span>
                   <i class="el-icon-notebook-2" />
                   <span>{{ $t('chart.summary') }}</span>
-                  <span class="summary-span">({{ $t('chart.'+item.summary) }})</span>
+                  <span class="summary-span-item">({{ $t('chart.'+item.summary) }})</span>
                 </span>
                 <i class="el-icon-arrow-right el-icon--right" />
               </span>
@@ -52,7 +56,7 @@
           <!--                <span>-->
           <!--                  <i class="el-icon-s-grid" />-->
           <!--                  <span>{{ $t('chart.quick_calc') }}</span>-->
-          <!--                  <span class="summary-span">(无)</span>-->
+          <!--                  <span class="summary-span-item">(无)</span>-->
           <!--                </span>-->
           <!--                <i class="el-icon-arrow-right el-icon&#45;&#45;right" />-->
           <!--              </span>-->
@@ -67,7 +71,7 @@
                 <span>
                   <i class="el-icon-sort" />
                   <span>{{ $t('chart.sort') }}</span>
-                  <span class="summary-span">({{ $t('chart.'+item.sort) }})</span>
+                  <span class="summary-span-item">({{ $t('chart.'+item.sort) }})</span>
                 </span>
                 <i class="el-icon-arrow-right el-icon--right" />
               </span>
@@ -212,9 +216,16 @@ export default {
     font-size: 12px;
   }
 
+  .summary-span-item{
+    margin-left: 4px;
+    color: #878d9f;
+  }
+
   .summary-span{
     margin-left: 4px;
-    color: #878d9f;;
+    color: #878d9f;
+    position: absolute;
+    right: 30px;
   }
 
   .inner-dropdown-menu{
@@ -226,7 +237,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 80px;
+    width: 70px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;

frontend/src/views/chart/components/shape-attr/ColorSelector.vue

@@ -1,13 +1,7 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">
+      <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini" :disabled="param && !hasDataPermission('manage',param.privileges)">
         <div v-if="sourceType==='view' || sourceType==='panelEchart'">
           <el-form-item v-show="chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :label="$t('chart.color_case')" class="form-item">
             <el-select v-model="colorForm.value" :placeholder="$t('chart.pls_slc_color_case')" size="mini" @change="changeColorCase">
@@ -21,21 +15,21 @@
           </el-form-item>
 
           <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">
-                <colorPicker v-model="colorForm.dimensionColor" style="margin-top: 6px;cursor: pointer;z-index: 1003;border: solid 1px black" @change="changeColorCase" />
+            <el-color-picker v-model="colorForm.dimensionColor" class="color-picker-style" @change="changeColorCase" />
           </el-form-item>
           <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.quota_color')" class="form-item">
-                <colorPicker v-model="colorForm.quotaColor" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeColorCase" />
+            <el-color-picker v-model="colorForm.quotaColor" class="color-picker-style" @change="changeColorCase" />
           </el-form-item>
         </div>
         <div v-if="sourceType==='view' || sourceType==='panelTable'">
           <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_header_bg')" class="form-item">
-                <colorPicker v-model="colorForm.tableHeaderBgColor" style="margin-top: 6px;cursor: pointer;z-index: 1002;border: solid 1px black" @change="changeColorCase" />
+            <el-color-picker v-model="colorForm.tableHeaderBgColor" class="color-picker-style" @change="changeColorCase" />
           </el-form-item>
           <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_bg')" class="form-item">
-                <colorPicker v-model="colorForm.tableItemBgColor" style="margin-top: 6px;cursor: pointer;z-index: 1003;border: solid 1px black" @change="changeColorCase" />
+            <el-color-picker v-model="colorForm.tableItemBgColor" class="color-picker-style" @change="changeColorCase" />
           </el-form-item>
           <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_font_color')" class="form-item">
-                <colorPicker v-model="colorForm.tableFontColor" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeColorCase" />
+            <el-color-picker v-model="colorForm.tableFontColor" class="color-picker-style" @change="changeColorCase" />
           </el-form-item>
           <!--              暂时不支持该功能-->
           <!--              <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.stripe')" class="form-item">-->
@@ -48,10 +42,58 @@
         </el-form-item>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">-->
+    <!--            <div v-if="sourceType==='view' || sourceType==='panelEchart'">-->
+    <!--              <el-form-item v-show="chart.type && !chart.type.includes('table') && !chart.type.includes('text')" :label="$t('chart.color_case')" class="form-item">-->
+    <!--                <el-select v-model="colorForm.value" :placeholder="$t('chart.pls_slc_color_case')" size="mini" @change="changeColorCase">-->
+    <!--                  <el-option v-for="option in colorCases" :key="option.value" :label="option.name" :value="option.value" style="display: flex;align-items: center;">-->
+    <!--                    <div style="float: left">-->
+    <!--                      <span v-for="(c,index) in option.colors" :key="index" :style="{width: '20px',height: '20px',float: 'left',backgroundColor: c}" />-->
+    <!--                    </div>-->
+    <!--                    <span style="margin-left: 4px;">{{ option.name }}</span>-->
+    <!--                  </el-option>-->
+    <!--                </el-select>-->
+    <!--              </el-form-item>-->
 
-        <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.color') }}<i class="el-icon-setting el-icon--right" /></el-button>
-      </el-popover>
-    </div>
+    <!--              <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">-->
+    <!--                <colorPicker v-model="colorForm.dimensionColor" style="margin-top: 6px;cursor: pointer;z-index: 1003;border: solid 1px black" @change="changeColorCase" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.quota_color')" class="form-item">-->
+    <!--                <colorPicker v-model="colorForm.quotaColor" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeColorCase" />-->
+    <!--              </el-form-item>-->
+    <!--            </div>-->
+    <!--            <div v-if="sourceType==='view' || sourceType==='panelTable'">-->
+    <!--              <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_header_bg')" class="form-item">-->
+    <!--                <colorPicker v-model="colorForm.tableHeaderBgColor" style="margin-top: 6px;cursor: pointer;z-index: 1002;border: solid 1px black" @change="changeColorCase" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_bg')" class="form-item">-->
+    <!--                <colorPicker v-model="colorForm.tableItemBgColor" style="margin-top: 6px;cursor: pointer;z-index: 1003;border: solid 1px black" @change="changeColorCase" />-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_font_color')" class="form-item">-->
+    <!--                <colorPicker v-model="colorForm.tableFontColor" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeColorCase" />-->
+    <!--              </el-form-item>-->
+    <!--              &lt;!&ndash;              暂时不支持该功能&ndash;&gt;-->
+    <!--              &lt;!&ndash;              <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.stripe')" class="form-item">&ndash;&gt;-->
+    <!--              &lt;!&ndash;                <el-checkbox v-model="colorForm.tableStripe" @change="changeColorCase">{{ $t('chart.stripe') }}</el-checkbox>&ndash;&gt;-->
+    <!--              &lt;!&ndash;              </el-form-item>&ndash;&gt;-->
+    <!--            </div>-->
+
+    <!--            <el-form-item v-show="chart.type && !chart.type.includes('text')" :label="$t('chart.not_alpha')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeColorCase" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
+
+    <!--        <el-button slot="reference" :disabled="param && !hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.color') }}<i class="el-icon-setting el-icon&#45;&#45;right" /></el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -226,4 +268,8 @@ export default {
   .el-form-item{
     margin-bottom: 6px;
   }
+  .color-picker-style{
+    cursor: pointer;
+    z-index: 1003;
+  }
 </style>

frontend/src/views/chart/components/shape-attr/LabelSelector.vue

@@ -1,18 +1,12 @@
 <template>
-  <div>
-    <div style="width: 100%">
-      <el-popover
-        v-model="isSetting"
-        placement="right"
-        width="400"
-        trigger="click"
-      >
+  <div style="width: 100%;">
     <el-col>
-          <el-form v-show="chart.type && !chart.type.includes('gauge')" ref="labelForm" :model="labelForm" label-width="80px" size="mini">
-            <!--            <el-form-item :label="$t('chart.show')" class="form-item">-->
-            <!--              <el-checkbox v-model="labelForm.show" @change="changeLabelAttr">{{ $t('chart.show') }}</el-checkbox>-->
-            <!--            </el-form-item>-->
-            <el-form-item :label="$t('chart.pie_label_line_show')" class="form-item">
+      <el-form v-show="chart.type && !chart.type.includes('gauge')" ref="labelForm" :disabled="!hasDataPermission('manage',param.privileges)" :model="labelForm" label-width="80px" size="mini">
+        <el-form-item :label="$t('chart.show')" class="form-item">
+          <el-checkbox v-model="labelForm.show" @change="changeLabelAttr">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="labelForm.show">
+          <el-form-item v-show="chart.type && chart.type.includes('pie')" :label="$t('chart.pie_label_line_show')" class="form-item">
             <el-checkbox v-model="labelForm.labelLine.show" @change="changeLabelAttr">{{ $t('chart.pie_label_line_show') }}</el-checkbox>
           </el-form-item>
           <el-form-item :label="$t('chart.text_fontsize')" class="form-item">
@@ -21,7 +15,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="labelForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLabelAttr" />
+            <el-color-picker v-model="labelForm.color" class="color-picker-style" @change="changeLabelAttr" />
           </el-form-item>
           <el-form-item :label="$t('chart.label_position')" class="form-item">
             <el-select v-model="labelForm.position" :placeholder="$t('chart.label_position')" @change="changeLabelAttr">
@@ -42,9 +36,10 @@
             </span>
             <el-input v-model="labelForm.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeLabelAttr" />
           </el-form-item>
+        </div>
       </el-form>
 
-          <el-form v-show="chart.type && chart.type.includes('gauge')" ref="labelForm" :model="labelForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('gauge')" ref="labelForm" :disabled="!hasDataPermission('manage',param.privileges)" :model="labelForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.show')" class="form-item">
           <el-checkbox v-model="labelForm.show" @change="changeLabelAttr">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
@@ -54,7 +49,7 @@
           </el-select>
         </el-form-item>
         <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="labelForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLabelAttr" />
+          <el-color-picker v-model="labelForm.color" class="color-picker-style" @change="changeLabelAttr" />
         </el-form-item>
         <el-form-item class="form-item">
           <span slot="label">
@@ -66,19 +61,85 @@
         </el-form-item>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        v-model="isSetting"-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form v-show="chart.type && !chart.type.includes('gauge')" ref="labelForm" :model="labelForm" label-width="80px" size="mini">-->
+    <!--            &lt;!&ndash;            <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
+    <!--            &lt;!&ndash;              <el-checkbox v-model="labelForm.show" @change="changeLabelAttr">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
+    <!--            &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+    <!--            <el-form-item :label="$t('chart.pie_label_line_show')" class="form-item">-->
+    <!--              <el-checkbox v-model="labelForm.labelLine.show" @change="changeLabelAttr">{{ $t('chart.pie_label_line_show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
+    <!--              <el-select v-model="labelForm.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeLabelAttr">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_color')" class="form-item">-->
+    <!--              <colorPicker v-model="labelForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLabelAttr" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.label_position')" class="form-item">-->
+    <!--              <el-select v-model="labelForm.position" :placeholder="$t('chart.label_position')" @change="changeLabelAttr">-->
+    <!--                <el-option v-for="option in labelPosition" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item class="form-item">-->
+    <!--              <span slot="label">-->
+    <!--                <span class="span-box">-->
+    <!--                  <span>{{ $t('chart.content_formatter') }}</span>-->
+    <!--                  <el-tooltip class="item" effect="dark" placement="bottom">-->
+    <!--                    <div slot="content">-->
+    <!--                      字符串模板 模板变量有：<br>{a}：系列名。<br>{b}：数据名。<br>{c}：数据值。<br>{d}：百分比（用于饼图等）。-->
+    <!--                    </div>-->
+    <!--                    <i class="el-icon-info" style="cursor: pointer;" />-->
+    <!--                  </el-tooltip>-->
+    <!--                </span>-->
+    <!--              </span>-->
+    <!--              <el-input v-model="labelForm.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeLabelAttr" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!labelForm.show || !hasDataPermission('manage',param.privileges)">
-          {{ $t('chart.label') }}<i class="el-icon-setting el-icon--right" />
-          <el-switch
-            v-model="labelForm.show"
-            :disabled="!hasDataPermission('manage',param.privileges)"
-            class="switch-style"
-            @click.stop.native
-            @change="changeLabelAttr"
-          />
-        </el-button>
-      </el-popover>
-    </div>
+    <!--          <el-form v-show="chart.type && chart.type.includes('gauge')" ref="labelForm" :model="labelForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.show')" class="form-item">-->
+    <!--              <el-checkbox v-model="labelForm.show" @change="changeLabelAttr">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
+    <!--              <el-select v-model="labelForm.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeLabelAttr">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_color')" class="form-item">-->
+    <!--              <colorPicker v-model="labelForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLabelAttr" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item class="form-item">-->
+    <!--              <span slot="label">-->
+    <!--                <span class="span-box">-->
+    <!--                  <span>{{ $t('chart.content_formatter') }}</span>-->
+    <!--                </span>-->
+    <!--              </span>-->
+    <!--              <el-input v-model="labelForm.gaugeFormatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" @blur="changeLabelAttr" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
+
+    <!--        <el-button slot="reference" size="mini" class="shape-item" :disabled="!labelForm.show || !hasDataPermission('manage',param.privileges)">-->
+    <!--          {{ $t('chart.label') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
+    <!--          <el-switch-->
+    <!--            v-model="labelForm.show"-->
+    <!--            :disabled="!hasDataPermission('manage',param.privileges)"-->
+    <!--            class="switch-style"-->
+    <!--            @click.stop.native-->
+    <!--            @change="changeLabelAttr"-->
+    <!--          />-->
+    <!--        </el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -189,4 +250,8 @@ export default {
     right: 10px;
     margin-top: -4px;
   }
+  .color-picker-style{
+    cursor: pointer;
+    z-index: 1003;
+  }
 </style>

frontend/src/views/chart/components/shape-attr/SizeSelector.vue

@@ -1,13 +1,7 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form v-show="chart.type && chart.type.includes('bar')" ref="sizeFormBar" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('bar')" ref="sizeFormBar" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.adapt')" class="form-item">
           <el-checkbox v-model="sizeForm.barDefault" @change="changeBarSizeCase">{{ $t('chart.adapt') }}</el-checkbox>
         </el-form-item>
@@ -19,7 +13,7 @@
         </el-form-item>
       </el-form>
 
-          <el-form v-show="chart.type && chart.type.includes('line')" ref="sizeFormLine" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('line')" ref="sizeFormLine" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.line_width')" class="form-item form-item-slider">
           <el-slider v-model="sizeForm.lineWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="10" @change="changeBarSizeCase" />
         </el-form-item>
@@ -50,7 +44,7 @@
         </el-form-item>
       </el-form>
 
-          <el-form v-show="chart.type && chart.type.includes('pie')" ref="sizeFormPie" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('pie')" ref="sizeFormPie" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.pie_inner_radius')" class="form-item form-item-slider">
           <el-slider v-model="sizeForm.pieInnerRadius" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />
         </el-form-item>
@@ -71,13 +65,13 @@
         </span>
       </el-form>
 
-          <el-form v-show="chart.type && chart.type.includes('funnel')" ref="sizeFormPie" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('funnel')" ref="sizeFormPie" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.funnel_width')" class="form-item form-item-slider">
           <el-slider v-model="sizeForm.funnelWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />
         </el-form-item>
       </el-form>
 
-          <el-form v-show="chart.type && chart.type.includes('radar')" ref="sizeFormPie" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('radar')" ref="sizeFormPie" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.shape')" class="form-item">
           <el-radio-group v-model="sizeForm.radarShape" size="mini" @change="changeBarSizeCase">
             <el-radio-button label="polygon">{{ $t('chart.polygon') }}</el-radio-button>
@@ -86,7 +80,7 @@
         </el-form-item>
       </el-form>
 
-          <el-form v-show="chart.type && chart.type.includes('table')" ref="sizeFormPie" :model="sizeForm" label-width="100px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('table')" ref="sizeFormPie" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="100px" size="mini">
         <el-form-item :label="$t('chart.table_title_fontsize')" class="form-item">
           <el-select v-model="sizeForm.tableTitleFontSize" :placeholder="$t('chart.table_title_fontsize')" @change="changeBarSizeCase">
             <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
@@ -105,7 +99,7 @@
         </el-form-item>
       </el-form>
 
-          <el-form v-show="chart.type && chart.type.includes('gauge')" ref="sizeFormGauge" :model="sizeForm" label-width="100px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('gauge')" ref="sizeFormGauge" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="100px" size="mini">
         <el-form-item :label="$t('chart.min')" class="form-item form-item-slider">
           <el-input-number v-model="sizeForm.gaugeMin" size="mini" @change="changeBarSizeCase" />
         </el-form-item>
@@ -120,7 +114,7 @@
         </el-form-item>
       </el-form>
 
-          <el-form v-show="chart.type && chart.type.includes('text')" ref="sizeFormPie" :model="sizeForm" label-width="100px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('text')" ref="sizeFormPie" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="100px" size="mini">
         <el-form-item :label="$t('chart.dimension_show')" class="form-item">
           <el-checkbox v-model="sizeForm.dimensionShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>
         </el-form-item>
@@ -142,10 +136,150 @@
         </el-form-item>
       </el-form>
     </el-col>
+    <!--      <el-popover-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form v-show="chart.type && chart.type.includes('bar')" ref="sizeFormBar" :model="sizeForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.adapt')" class="form-item">-->
+    <!--              <el-checkbox v-model="sizeForm.barDefault" @change="changeBarSizeCase">{{ $t('chart.adapt') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.bar_width')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.barWidth" :disabled="sizeForm.barDefault" show-input :show-input-controls="false" input-size="mini" :min="1" :max="80" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.bar_gap')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.barGap" :disabled="sizeForm.barDefault" show-input :show-input-controls="false" input-size="mini" :min="0" :max="5" :step="0.1" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
 
-        <el-button slot="reference" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.size') }}<i class="el-icon-setting el-icon--right" /></el-button>
-      </el-popover>
-    </div>
+    <!--          <el-form v-show="chart.type && chart.type.includes('line')" ref="sizeFormLine" :model="sizeForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.line_width')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.lineWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="10" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.line_type')" class="form-item">-->
+    <!--              <el-radio-group v-model="sizeForm.lineType" @change="changeBarSizeCase">-->
+    <!--                <el-radio-button label="solid">{{ $t('chart.line_type_solid') }}</el-radio-button>-->
+    <!--                <el-radio-button label="dashed">{{ $t('chart.line_type_dashed') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.line_symbol')" class="form-item">-->
+    <!--              <el-select v-model="sizeForm.lineSymbol" :placeholder="$t('chart.line_symbol')" @change="changeBarSizeCase">-->
+    <!--                <el-option-->
+    <!--                  v-for="item in lineSymbolOptions"-->
+    <!--                  :key="item.value"-->
+    <!--                  :label="item.name"-->
+    <!--                  :value="item.value"-->
+    <!--                />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.line_symbol_size')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.lineSymbolSize" show-input :show-input-controls="false" input-size="mini" :min="0" :max="20" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.line_smooth')" class="form-item">-->
+    <!--              <el-checkbox v-model="sizeForm.lineSmooth" @change="changeBarSizeCase">{{ $t('chart.line_smooth') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.line_area')" class="form-item">-->
+    <!--              <el-checkbox v-model="sizeForm.lineArea" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+
+    <!--          <el-form v-show="chart.type && chart.type.includes('pie')" ref="sizeFormPie" :model="sizeForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.pie_inner_radius')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.pieInnerRadius" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.pie_outer_radius')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.pieOuterRadius" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+
+    <!--            <span v-show="chart.type && chart.type.includes('pie-rose')">-->
+    <!--              <el-form-item :label="$t('chart.rose_type')" class="form-item">-->
+    <!--                <el-radio-group v-model="sizeForm.pieRoseType" size="mini" @change="changeBarSizeCase">-->
+    <!--                  <el-radio-button label="radius">{{ $t('chart.radius_mode') }}</el-radio-button>-->
+    <!--                  <el-radio-button label="area">{{ $t('chart.area_mode') }}</el-radio-button>-->
+    <!--                </el-radio-group>-->
+    <!--              </el-form-item>-->
+    <!--              <el-form-item :label="$t('chart.rose_radius')" class="form-item form-item-slider">-->
+    <!--                <el-slider v-model="sizeForm.pieRoseRadius" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />-->
+    <!--              </el-form-item>-->
+    <!--            </span>-->
+    <!--          </el-form>-->
+
+    <!--          <el-form v-show="chart.type && chart.type.includes('funnel')" ref="sizeFormPie" :model="sizeForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.funnel_width')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.funnelWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+
+    <!--          <el-form v-show="chart.type && chart.type.includes('radar')" ref="sizeFormPie" :model="sizeForm" label-width="80px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.shape')" class="form-item">-->
+    <!--              <el-radio-group v-model="sizeForm.radarShape" size="mini" @change="changeBarSizeCase">-->
+    <!--                <el-radio-button label="polygon">{{ $t('chart.polygon') }}</el-radio-button>-->
+    <!--                <el-radio-button label="circle">{{ $t('chart.circle') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+
+    <!--          <el-form v-show="chart.type && chart.type.includes('table')" ref="sizeFormPie" :model="sizeForm" label-width="100px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.table_title_fontsize')" class="form-item">-->
+    <!--              <el-select v-model="sizeForm.tableTitleFontSize" :placeholder="$t('chart.table_title_fontsize')" @change="changeBarSizeCase">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.table_item_fontsize')" class="form-item">-->
+    <!--              <el-select v-model="sizeForm.tableItemFontSize" :placeholder="$t('chart.table_item_fontsize')" @change="changeBarSizeCase">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.table_title_height')" class="form-item">-->
+    <!--              <el-slider v-model="sizeForm.tableTitleHeight" :min="36" :max="100" show-input :show-input-controls="false" input-size="mini" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.table_item_height')" class="form-item">-->
+    <!--              <el-slider v-model="sizeForm.tableItemHeight" :min="36" :max="100" show-input :show-input-controls="false" input-size="mini" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+
+    <!--          <el-form v-show="chart.type && chart.type.includes('gauge')" ref="sizeFormGauge" :model="sizeForm" label-width="100px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.min')" class="form-item form-item-slider">-->
+    <!--              <el-input-number v-model="sizeForm.gaugeMin" size="mini" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.max')" class="form-item form-item-slider">-->
+    <!--              <el-input-number v-model="sizeForm.gaugeMax" size="mini" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.start_angle')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.gaugeStartAngle" show-input :show-input-controls="false" input-size="mini" :min="-360" :max="360" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.end_angle')" class="form-item form-item-slider">-->
+    <!--              <el-slider v-model="sizeForm.gaugeEndAngle" show-input :show-input-controls="false" input-size="mini" :min="-360" :max="360" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+
+    <!--          <el-form v-show="chart.type && chart.type.includes('text')" ref="sizeFormPie" :model="sizeForm" label-width="100px" size="mini">-->
+    <!--            <el-form-item :label="$t('chart.dimension_show')" class="form-item">-->
+    <!--              <el-checkbox v-model="sizeForm.dimensionShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.dimension_font_size')" class="form-item">-->
+    <!--              <el-select v-model="sizeForm.dimensionFontSize" :placeholder="$t('chart.dimension_font_size')" @change="changeBarSizeCase">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.quota_show')" class="form-item">-->
+    <!--              <el-checkbox v-model="sizeForm.quotaShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.quota_font_size')" class="form-item">-->
+    <!--              <el-select v-model="sizeForm.quotaFontSize" :placeholder="$t('chart.quota_font_size')" @change="changeBarSizeCase">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.space_split')" class="form-item">-->
+    <!--              <el-input-number v-model="sizeForm.spaceSplit" size="mini" @change="changeBarSizeCase" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
+
+    <!--        <el-button slot="reference" :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="shape-item">{{ $t('chart.size') }}<i class="el-icon-setting el-icon&#45;&#45;right" /></el-button>-->
+    <!--      </el-popover>-->
   </div>
 </template>
 

frontend/src/views/chart/components/shape-attr/TooltipSelector.vue

@@ -1,17 +1,11 @@
 <template>
-  <div>
   <div style="width: 100%">
-      <el-popover
-        v-model="isSetting"
-        placement="right"
-        width="400"
-        trigger="click"
-      >
     <el-col>
-          <el-form ref="tooltipForm" :model="tooltipForm" label-width="80px" size="mini">
-            <!--            <el-form-item :label="$t('chart.show')" class="form-item">-->
-            <!--              <el-checkbox v-model="tooltipForm.show" @change="changeTooltipAttr">{{ $t('chart.show') }}</el-checkbox>-->
-            <!--            </el-form-item>-->
+      <el-form ref="tooltipForm" :model="tooltipForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+        <el-form-item :label="$t('chart.show')" class="form-item">
+          <el-checkbox v-model="tooltipForm.show" @change="changeTooltipAttr">{{ $t('chart.show') }}</el-checkbox>
+        </el-form-item>
+        <div v-show="tooltipForm.show">
           <el-form-item :label="$t('chart.trigger_position')" class="form-item">
             <el-radio-group v-model="tooltipForm.trigger" size="mini" @change="changeTooltipAttr">
               <el-radio-button label="item">{{ $t('chart.tooltip_item') }}</el-radio-button>
@@ -24,7 +18,7 @@
             </el-select>
           </el-form-item>
           <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="tooltipForm.textStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeTooltipAttr" />
+            <el-color-picker v-model="tooltipForm.textStyle.color" class="color-picker-style" @change="changeTooltipAttr" />
           </el-form-item>
           <el-form-item class="form-item">
             <span slot="label">
@@ -52,21 +46,76 @@
             </span>
             <el-input v-model="tooltipForm.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" :placeholder="$t('chart.formatter_plc')" @blur="changeTooltipAttr" />
           </el-form-item>
+        </div>
       </el-form>
     </el-col>
+    <!--    <div style="width: 100%">-->
+    <!--      <el-popover-->
+    <!--        v-model="isSetting"-->
+    <!--        placement="right"-->
+    <!--        width="400"-->
+    <!--        trigger="click"-->
+    <!--      >-->
+    <!--        <el-col>-->
+    <!--          <el-form ref="tooltipForm" :model="tooltipForm" label-width="80px" size="mini">-->
+    <!--            &lt;!&ndash;            <el-form-item :label="$t('chart.show')" class="form-item">&ndash;&gt;-->
+    <!--            &lt;!&ndash;              <el-checkbox v-model="tooltipForm.show" @change="changeTooltipAttr">{{ $t('chart.show') }}</el-checkbox>&ndash;&gt;-->
+    <!--            &lt;!&ndash;            </el-form-item>&ndash;&gt;-->
+    <!--            <el-form-item :label="$t('chart.trigger_position')" class="form-item">-->
+    <!--              <el-radio-group v-model="tooltipForm.trigger" size="mini" @change="changeTooltipAttr">-->
+    <!--                <el-radio-button label="item">{{ $t('chart.tooltip_item') }}</el-radio-button>-->
+    <!--                <el-radio-button label="axis">{{ $t('chart.tooltip_axis') }}</el-radio-button>-->
+    <!--              </el-radio-group>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_fontsize')" class="form-item">-->
+    <!--              <el-select v-model="tooltipForm.textStyle.fontSize" :placeholder="$t('chart.text_fontsize')" size="mini" @change="changeTooltipAttr">-->
+    <!--                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />-->
+    <!--              </el-select>-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item :label="$t('chart.text_color')" class="form-item">-->
+    <!--              <colorPicker v-model="tooltipForm.textStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeTooltipAttr" />-->
+    <!--            </el-form-item>-->
+    <!--            <el-form-item class="form-item">-->
+    <!--              <span slot="label">-->
+    <!--                <span class="span-box">-->
+    <!--                  <span>{{ $t('chart.content_formatter') }}</span>-->
+    <!--                  <el-tooltip class="item" effect="dark" placement="bottom">-->
+    <!--                    <div slot="content">-->
+    <!--                      模板变量有 {a}, {b}，{c}，{d}，{e}，分别表示系列名，数据名，数据值等。-->
+    <!--                      <br>-->
+    <!--                      在 trigger 为 'axis' 的时候，会有多个系列的数据，此时可以通过 {a0}, {a1}, {a2} 这种后面加索引的方式表示系列的索引。-->
+    <!--                      <br>-->
+    <!--                      不同图表类型下的 {a}，{b}，{c}，{d} 含义不一样。 其中变量{a}, {b}, {c}, {d}在不同图表类型下代表数据含义为：-->
+    <!--                      <br><br>-->
+    <!--                      折线（区域）图、柱状（条形）图、K线图 : {a}（系列名称），{b}（类目值），{c}（数值）, {d}（无）-->
+    <!--                      <br>-->
+    <!--                      散点图（气泡）图 : {a}（系列名称），{b}（数据名称），{c}（数值数组）, {d}（无）-->
+    <!--                      <br>-->
+    <!--                      地图 : {a}（系列名称），{b}（区域名称），{c}（合并数值）, {d}（无）-->
+    <!--                      <br>-->
+    <!--                      饼图、仪表板、漏斗图: {a}（系列名称），{b}（数据项名称），{c}（数值）, {d}（百分比）-->
+    <!--                    </div>-->
+    <!--                    <i class="el-icon-info" style="cursor: pointer;" />-->
+    <!--                  </el-tooltip>-->
+    <!--                </span>-->
+    <!--              </span>-->
+    <!--              <el-input v-model="tooltipForm.formatter" type="textarea" :autosize="{ minRows: 4, maxRows: 4}" :placeholder="$t('chart.formatter_plc')" @blur="changeTooltipAttr" />-->
+    <!--            </el-form-item>-->
+    <!--          </el-form>-->
+    <!--        </el-col>-->
 
-        <el-button slot="reference" size="mini" class="shape-item" :disabled="!tooltipForm.show || !hasDataPermission('manage',param.privileges)">
-          {{ $t('chart.tooltip') }}<i class="el-icon-setting el-icon--right" />
-          <el-switch
-            v-model="tooltipForm.show"
-            :disabled="!hasDataPermission('manage',param.privileges)"
-            class="switch-style"
-            @click.stop.native
-            @change="changeTooltipAttr"
-          />
-        </el-button>
-      </el-popover>
-    </div>
+    <!--        <el-button slot="reference" size="mini" class="shape-item" :disabled="!tooltipForm.show || !hasDataPermission('manage',param.privileges)">-->
+    <!--          {{ $t('chart.tooltip') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
+    <!--          <el-switch-->
+    <!--            v-model="tooltipForm.show"-->
+    <!--            :disabled="!hasDataPermission('manage',param.privileges)"-->
+    <!--            class="switch-style"-->
+    <!--            @click.stop.native-->
+    <!--            @change="changeTooltipAttr"-->
+    <!--          />-->
+    <!--        </el-button>-->
+    <!--      </el-popover>-->
+    <!--    </div>-->
   </div>
 </template>
 
@@ -165,4 +214,8 @@ export default {
   right: 10px;
   margin-top: -4px;
 }
+.color-picker-style{
+  cursor: pointer;
+  z-index: 1003;
+}
 </style>

frontend/src/views/chart/components/table/TableNormal.vue

@@ -264,4 +264,8 @@ export default {
   .table-class>>>.body--wrapper{
     background: rgba(1,1,1,0);
   }
+  .table-class>>>.elx-cell{
+    max-height: none!important;
+    line-height: normal!important;
+  }
 </style>

frontend/src/views/chart/group/Group.vue

@@ -741,6 +741,9 @@ export default {
         background: DEFAULT_BACKGROUND_COLOR,
         split: DEFAULT_SPLIT
       })
+      view.xaxis = JSON.stringify([])
+      view.yaxis = JSON.stringify([])
+      view.extStack = JSON.stringify([])
       view.customFilter = JSON.stringify([])
       post('/chart/view/save', view).then(response => {
         this.closeCreateChart()

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

@@ -55,7 +55,7 @@
                   @add="moveToDimension"
                 >
                   <transition-group>
-                    <span v-for="item in dimensionData" :key="item.id" class="item" :title="item.name">
+                    <span v-for="item in dimensionData" :key="item.id" class="item-dimension" :title="item.name">
                       <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
                       <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
                       <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
@@ -77,7 +77,7 @@
                   @add="moveToQuota"
                 >
                   <transition-group>
-                    <span v-for="item in quotaData" :key="item.id" class="item" :title="item.name">
+                    <span v-for="item in quotaData" :key="item.id" class="item-quota" :title="item.name">
                       <svg-icon v-if="item.deType === 0" icon-class="field_text" class="field-icon-text" />
                       <svg-icon v-if="item.deType === 1" icon-class="field_time" class="field-icon-time" />
                       <svg-icon v-if="item.deType === 2 || item.deType === 3" icon-class="field_value" class="field-icon-value" />
@@ -190,6 +190,11 @@
                             <svg-icon icon-class="gauge" class="chart-icon" />
                           </span>
                         </el-radio>
+                        <el-radio value="map" label="map">
+                          <span :title="$t('chart.chart_map')">
+                            <svg-icon icon-class="map" class="chart-icon" />
+                          </span>
+                        </el-radio>
                         <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
                         <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
                       </div>
@@ -212,13 +217,30 @@
               </div>
               <div style="overflow:auto;border-top: 1px solid #e6e6e6" class="attr-style">
                 <el-row style="height: 100%;">
-                  <el-row v-if="chart.type !=='text' && chart.type !== 'gauge'" class="padding-lr">
+                  <el-row v-if="view.type ==='map'" class="padding-lr">
                     <span style="width: 80px;text-align: right;">
-                      <span v-if="chart.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
-                      <span v-else-if="chart.type.includes('bar') || chart.type.includes('line')">{{ $t('chart.drag_block_type_axis') }}</span>
-                      <span v-else-if="chart.type.includes('pie')">{{ $t('chart.drag_block_pie_label') }}</span>
-                      <span v-else-if="chart.type.includes('funnel')">{{ $t('chart.drag_block_funnel_split') }}</span>
-                      <span v-else-if="chart.type.includes('radar')">{{ $t('chart.drag_block_radar_label') }}</span>
+                      <span>{{ $t('chart.map_range') }}</span>
+                    </span>
+                    <span class="tree-select-span">
+                      <treeselect
+                        ref="mapSelector"
+                        v-model="view.customAttr.areaCode"
+                        :options="places"
+                        :placeholder="$t('chart.select_map_range')"
+                        :normalizer="normalizer"
+                        @input="save"
+                        @deselect="save"
+                      />
+                    </span>
+                  </el-row>
+                  <el-row v-if="view.type !=='text' && view.type !== 'gauge'" class="padding-lr">
+                    <span style="width: 80px;text-align: right;">
+                      <span v-if="view.type && view.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
+                      <span v-else-if="view.type && (view.type.includes('bar') || view.type.includes('line'))">{{ $t('chart.drag_block_type_axis') }}</span>
+                      <span v-else-if="view.type && view.type.includes('pie')">{{ $t('chart.drag_block_pie_label') }}</span>
+                      <span v-else-if="view.type && view.type.includes('funnel')">{{ $t('chart.drag_block_funnel_split') }}</span>
+                      <span v-else-if="view.type && view.type.includes('radar')">{{ $t('chart.drag_block_radar_label') }}</span>
+                      <span v-else-if="view.type && view.type.includes('map')">{{ $t('chart.area') }}</span>
                       /
                       <span>{{ $t('chart.dimension') }}</span>
                     </span>
@@ -228,23 +250,27 @@
                       group="drag"
                       animation="300"
                       :move="onMove"
-                      style="padding:2px 0 0 0;width:100%;min-height: 32px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
+                      class="drag-block-style"
                       @add="addXaxis"
                     >
                       <transition-group class="draggable-group">
                         <dimension-item v-for="(item,index) in view.xaxis" :key="item.id" :param="param" :index="index" :item="item" @onDimensionItemChange="dimensionItemChange" @onDimensionItemRemove="dimensionItemRemove" @editItemFilter="showDimensionEditFilter" @onNameEdit="showRename" />
                       </transition-group>
                     </draggable>
+                    <div v-if="!view.xaxis || view.xaxis.length === 0" class="drag-placeholder-style">
+                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
+                    </div>
                   </el-row>
                   <el-row class="padding-lr" style="margin-top: 6px;">
                     <span style="width: 80px;text-align: right;">
-                      <span v-if="chart.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
-                      <span v-else-if="chart.type.includes('bar') || chart.type.includes('line')">{{ $t('chart.drag_block_value_axis') }}</span>
-                      <span v-else-if="chart.type.includes('pie')">{{ $t('chart.drag_block_pie_angel') }}</span>
-                      <span v-else-if="chart.type.includes('funnel')">{{ $t('chart.drag_block_funnel_width') }}</span>
-                      <span v-else-if="chart.type.includes('radar')">{{ $t('chart.drag_block_radar_length') }}</span>
-                      <span v-else-if="chart.type.includes('gauge')">{{ $t('chart.drag_block_gauge_angel') }}</span>
-                      <span v-else-if="chart.type.includes('text')">{{ $t('chart.drag_block_label_value') }}</span>
+                      <span v-if="view.type && view.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
+                      <span v-else-if="view.type && (view.type.includes('bar') || view.type.includes('line'))">{{ $t('chart.drag_block_value_axis') }}</span>
+                      <span v-else-if="view.type && view.type.includes('pie')">{{ $t('chart.drag_block_pie_angel') }}</span>
+                      <span v-else-if="view.type && view.type.includes('funnel')">{{ $t('chart.drag_block_funnel_width') }}</span>
+                      <span v-else-if="view.type && view.type.includes('radar')">{{ $t('chart.drag_block_radar_length') }}</span>
+                      <span v-else-if="view.type && view.type.includes('gauge')">{{ $t('chart.drag_block_gauge_angel') }}</span>
+                      <span v-else-if="view.type && view.type.includes('text')">{{ $t('chart.drag_block_label_value') }}</span>
+                      <span v-else-if="view.type && view.type.includes('map')">{{ $t('chart.chart_data') }}</span>
                       /
                       <span>{{ $t('chart.quota') }}</span>
                     </span>
@@ -254,15 +280,41 @@
                       group="drag"
                       animation="300"
                       :move="onMove"
-                      style="padding:2px 0 0 0;width:100%;min-height: 32px;border-radius: 4px;border: 1px solid #DCDFE6;overflow-x: auto;display: flex;align-items: center;background-color: white;"
+                      class="drag-block-style"
                       @add="addYaxis"
                     >
                       <transition-group class="draggable-group">
                         <quota-item v-for="(item,index) in view.yaxis" :key="item.id" :param="param" :index="index" :item="item" @onQuotaItemChange="quotaItemChange" @onQuotaItemRemove="quotaItemRemove" @editItemFilter="showQuotaEditFilter" @onNameEdit="showRename" />
                       </transition-group>
                     </draggable>
+                    <div v-if="!view.yaxis || view.yaxis.length === 0" class="drag-placeholder-style">
+                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
+                    </div>
                   </el-row>
-                  <div class="padding-lr filter-class" style="margin-top: 6px;">
+                  <el-row v-if="view.type && view.type.includes('stack')" class="padding-lr" style="margin-top: 6px;">
+                    <span style="width: 80px;text-align: right;">
+                      <span>{{ $t('chart.stack_item') }}</span>
+                      /
+                      <span>{{ $t('chart.dimension') }}</span>
+                    </span>
+                    <draggable
+                      v-model="view.extStack"
+                      :disabled="!hasDataPermission('manage',param.privileges)"
+                      group="drag"
+                      animation="300"
+                      :move="onMove"
+                      class="drag-block-style"
+                      @add="addStack"
+                    >
+                      <transition-group class="draggable-group">
+                        <chart-drag-item v-for="(item,index) in view.extStack" :key="item.id" :param="param" :index="index" :item="item" @onItemChange="stackItemChange" @onItemRemove="stackItemRemove" />
+                      </transition-group>
+                    </draggable>
+                    <div v-if="!view.extStack || view.extStack.length === 0" class="drag-placeholder-style">
+                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
+                    </div>
+                  </el-row>
+                  <el-row class="padding-lr" style="margin-top: 6px;">
                     <span>{{ $t('chart.result_filter') }}</span>
                     <!--                    <el-button :disabled="!hasDataPermission('manage',param.privileges)" size="mini" class="filter-btn-class" @click="showResultFilter">-->
                     <!--                      {{ $t('chart.filter_condition') }}<i class="el-icon-setting el-icon&#45;&#45;right" />-->
@@ -280,14 +332,18 @@
                         <filter-item v-for="(item,index) in view.customFilter" :key="item.id" :param="param" :index="index" :item="item" @onFilterItemRemove="filterItemRemove" @editItemFilter="showEditFilter" />
                       </transition-group>
                     </draggable>
+                    <div v-if="!view.customFilter || view.customFilter.length === 0" class="drag-placeholder-style">
+                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
                     </div>
                   </el-row>
+                </el-row>
               </div>
             </el-col>
           </el-row>
         </el-tab-pane>
         <el-tab-pane :label="$t('chart.chart_style')" class="padding-tab" style="width: 360px;">
-          <div style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;" class="attr-style">
+          <el-row class="view-panel">
+            <div style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;width: 100%;" class="attr-style">
               <el-row class="padding-lr">
                 <span>{{ $t('chart.style_priority') }}</span>
                 <el-row>
@@ -297,27 +353,62 @@
                   </el-radio-group>
                 </el-row>
               </el-row>
-            <el-row class="padding-lr">
-              <span>{{ $t('chart.shape_attr') }}</span>
               <el-row>
+                <span class="padding-lr">{{ $t('chart.shape_attr') }}</span>
+                <el-collapse v-model="attrActiveNames" class="style-collapse">
+                  <el-collapse-item name="color" :title="$t('chart.color')">
                     <color-selector :param="param" class="attr-selector" :chart="chart" @onColorChange="onColorChange" />
+                  </el-collapse-item>
+                  <el-collapse-item v-show="chart.type !== 'map'" name="size" :title="$t('chart.size')">
                     <size-selector :param="param" class="attr-selector" :chart="chart" @onSizeChange="onSizeChange" />
-                <label-selector v-show="!view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onLabelChange="onLabelChange" />
-                <tooltip-selector v-show="!view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onTooltipChange="onTooltipChange" />
+                  </el-collapse-item>
+                  <el-collapse-item v-show="!view.type.includes('table') && !view.type.includes('text')" name="label" :title="$t('chart.label')">
+                    <label-selector :param="param" class="attr-selector" :chart="chart" @onLabelChange="onLabelChange" />
+                  </el-collapse-item>
+                  <el-collapse-item v-show="!view.type.includes('table') && !view.type.includes('text')" name="tooltip" :title="$t('chart.tooltip')">
+                    <tooltip-selector :param="param" class="attr-selector" :chart="chart" @onTooltipChange="onTooltipChange" />
+                  </el-collapse-item>
+                </el-collapse>
+                <!--              <el-row>-->
+                <!--                <color-selector :param="param" class="attr-selector" :chart="chart" @onColorChange="onColorChange" />-->
+                <!--                <size-selector v-show="chart.type !== 'map'" :param="param" class="attr-selector" :chart="chart" @onSizeChange="onSizeChange" />-->
+                <!--                <label-selector v-show="!view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onLabelChange="onLabelChange" />-->
+                <!--                <tooltip-selector v-show="!view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onTooltipChange="onTooltipChange" />-->
+                <!--              </el-row>-->
               </el-row>
-            </el-row>
-            <el-row class="padding-lr">
-              <span>{{ $t('chart.module_style') }}</span>
               <el-row>
-                <x-axis-selector v-show="view.type.includes('bar') || view.type.includes('line')" :param="param" class="attr-selector" :chart="chart" @onChangeXAxisForm="onChangeXAxisForm" />
-                <y-axis-selector v-show="view.type.includes('bar') || view.type.includes('line')" :param="param" class="attr-selector" :chart="chart" @onChangeYAxisForm="onChangeYAxisForm" />
-                <split-selector v-show="view.type.includes('radar')" :param="param" class="attr-selector" :chart="chart" @onChangeSplitForm="onChangeSplitForm" />
+                <span class="padding-lr">{{ $t('chart.module_style') }}</span>
+                <el-collapse v-model="styleActiveNames" class="style-collapse">
+                  <el-collapse-item v-show="view.type && (view.type.includes('bar') || view.type.includes('line'))" name="xAxis" :title="$t('chart.xAxis')">
+                    <x-axis-selector :param="param" class="attr-selector" :chart="chart" @onChangeXAxisForm="onChangeXAxisForm" />
+                  </el-collapse-item>
+                  <el-collapse-item v-show="view.type && (view.type.includes('bar') || view.type.includes('line'))" name="yAxis" :title="$t('chart.yAxis')">
+                    <y-axis-selector :param="param" class="attr-selector" :chart="chart" @onChangeYAxisForm="onChangeYAxisForm" />
+                  </el-collapse-item>
+                  <el-collapse-item v-show="view.type && view.type.includes('radar')" name="split" :title="$t('chart.split')">
+                    <split-selector :param="param" class="attr-selector" :chart="chart" @onChangeSplitForm="onChangeSplitForm" />
+                  </el-collapse-item>
+                  <el-collapse-item name="title" :title="$t('chart.title')">
                     <title-selector :param="param" class="attr-selector" :chart="chart" @onTextChange="onTextChange" />
-                <legend-selector v-show="!view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onLegendChange="onLegendChange" />
+                  </el-collapse-item>
+                  <el-collapse-item v-show="view.type && !view.type.includes('map') && !view.type.includes('table') && !view.type.includes('text')" name="legend" :title="$t('chart.legend')">
+                    <legend-selector :param="param" class="attr-selector" :chart="chart" @onLegendChange="onLegendChange" />
+                  </el-collapse-item>
+                  <el-collapse-item name="background" :title="$t('chart.background')">
                     <background-color-selector :param="param" class="attr-selector" :chart="chart" @onChangeBackgroundForm="onChangeBackgroundForm" />
-              </el-row>
+                  </el-collapse-item>
+                </el-collapse>
+                <!--              <el-row>-->
+                <!--                <x-axis-selector v-show="view.type && (view.type.includes('bar') || view.type.includes('line'))" :param="param" class="attr-selector" :chart="chart" @onChangeXAxisForm="onChangeXAxisForm" />-->
+                <!--                <y-axis-selector v-show="view.type && (view.type.includes('bar') || view.type.includes('line'))" :param="param" class="attr-selector" :chart="chart" @onChangeYAxisForm="onChangeYAxisForm" />-->
+                <!--                <split-selector v-show="view.type && view.type.includes('radar')" :param="param" class="attr-selector" :chart="chart" @onChangeSplitForm="onChangeSplitForm" />-->
+                <!--                <title-selector :param="param" class="attr-selector" :chart="chart" @onTextChange="onTextChange" />-->
+                <!--                <legend-selector v-show="view.type && !view.type.includes('map') && !view.type.includes('table') && !view.type.includes('text')" :param="param" class="attr-selector" :chart="chart" @onLegendChange="onLegendChange" />-->
+                <!--                <background-color-selector :param="param" class="attr-selector" :chart="chart" @onChangeBackgroundForm="onChangeBackgroundForm" />-->
+                <!--              </el-row>-->
               </el-row>
             </div>
+          </el-row>
         </el-tab-pane>
       </el-tabs>
 
@@ -434,6 +525,7 @@ import draggable from 'vuedraggable'
 import DimensionItem from '../components/drag-item/DimensionItem'
 import QuotaItem from '../components/drag-item/QuotaItem'
 import FilterItem from '../components/drag-item/FilterItem'
+import ChartDragItem from '../components/drag-item/ChartDragItem'
 import ResultFilterEditor from '../components/filter/ResultFilterEditor'
 import ChartComponent from '../components/ChartComponent'
 import bus from '@/utils/bus'
@@ -465,10 +557,10 @@ import QuotaFilterEditor from '../components/filter/QuotaFilterEditor'
 import DimensionFilterEditor from '../components/filter/DimensionFilterEditor'
 import TableNormal from '../components/table/TableNormal'
 import LabelNormal from '../components/normal/LabelNormal'
-import html2canvas from 'html2canvasde'
+// import html2canvas from 'html2canvasde'
 import TableSelector from './TableSelector'
 import FieldEdit from '../../dataset/data/FieldEdit'
-
+import { areaMapping } from '@/api/map/map'
 export default {
   name: 'ChartEdit',
   components: {
@@ -494,7 +586,8 @@ export default {
     ChartComponent,
     QuotaItem,
     DimensionItem,
-    draggable
+    draggable,
+    ChartDragItem
   },
   props: {
     param: {
@@ -513,6 +606,7 @@ export default {
       view: {
         xaxis: [],
         yaxis: [],
+        extStack: [],
         show: true,
         type: 'bar',
         title: '',
@@ -563,7 +657,10 @@ export default {
       searchField: '',
       editDsField: false,
       changeDsTitle: '',
-      filterItem: {}
+      filterItem: {},
+      places: [],
+      attrActiveNames: [],
+      styleActiveNames: []
     }
   },
   computed: {
@@ -587,6 +684,7 @@ export default {
   },
   created() {
     // this.get(this.$store.state.chart.viewId);
+    this.initAreas()
   },
   mounted() {
     // this.get(this.$store.state.chart.viewId);
@@ -623,6 +721,8 @@ export default {
           this.httpRequest.msg = err.response.data.message
           return true
         })
+      } else {
+        this.resetDatasetField()
       }
     },
     save(getData, trigger, needRefreshGroup = false) {
@@ -667,6 +767,11 @@ export default {
           ele.filter = []
         }
       })
+      view.extStack.forEach(function(ele) {
+        if (!ele.sort || ele.sort === '') {
+          ele.sort = 'none'
+        }
+      })
       if (view.type.startsWith('pie') || view.type.startsWith('funnel') || view.type.startsWith('text') || view.type.startsWith('gauge')) {
         if (view.yaxis.length > 1) {
           view.yaxis.splice(1, view.yaxis.length)
@@ -688,6 +793,7 @@ export default {
       view.customAttr = JSON.stringify(view.customAttr)
       view.customStyle = JSON.stringify(view.customStyle)
       view.customFilter = JSON.stringify(view.customFilter)
+      view.extStack = JSON.stringify(view.extStack)
       post('/chart/view/save', view).then(response => {
         // this.get(response.data.id);
         // this.getData(response.data.id)
@@ -707,67 +813,67 @@ export default {
       })
     },
 
-    saveSnapshot() {
-      if (this.view.title && this.view.title.length > 50) {
-        this.$warning(this.$t('chart.title_limit'))
-        return
-      }
-      if (this.loading) {
-        return
-      }
-      this.loading = true
-      html2canvas(this.$refs.imageWrapper).then(canvas => {
-        const snapshot = canvas.toDataURL('image/jpeg', 0.1) // 0.1是图片质量
-        if (snapshot !== '') {
-          const view = JSON.parse(JSON.stringify(this.view))
-          view.id = this.view.id
-          view.sceneId = this.view.sceneId
-          view.name = this.view.name ? this.view.name : this.table.name
-          view.tableId = this.view.tableId
-          view.xaxis.forEach(function(ele) {
+    // saveSnapshot() {
+    //   if (this.view.title && this.view.title.length > 50) {
+    //     this.$warning(this.$t('chart.title_limit'))
+    //     return
+    //   }
+    //   if (this.loading) {
+    //     return
+    //   }
+    //   this.loading = true
+    //   html2canvas(this.$refs.imageWrapper).then(canvas => {
+    //     const snapshot = canvas.toDataURL('image/jpeg', 0.1) // 0.1是图片质量
+    //     if (snapshot !== '') {
+    //       const view = JSON.parse(JSON.stringify(this.view))
+    //       view.id = this.view.id
+    //       view.sceneId = this.view.sceneId
+    //       view.name = this.view.name ? this.view.name : this.table.name
+    //       view.tableId = this.view.tableId
+    //       view.xaxis.forEach(function(ele) {
+    //         // if (!ele.summary || ele.summary === '') {
+    //         //   ele.summary = 'sum'
+    //         // }
+    //         if (!ele.sort || ele.sort === '') {
+    //           ele.sort = 'none'
+    //         }
+    //         if (!ele.filter) {
+    //           ele.filter = []
+    //         }
+    //       })
+    //       view.yaxis.forEach(function(ele) {
     //         if (!ele.summary || ele.summary === '') {
+    //           if (ele.id === 'count') {
+    //             ele.summary = 'count'
+    //           } else {
     //             ele.summary = 'sum'
     //           }
-            if (!ele.sort || ele.sort === '') {
-              ele.sort = 'none'
-            }
-            if (!ele.filter) {
-              ele.filter = []
-            }
-          })
-          view.yaxis.forEach(function(ele) {
-            if (!ele.summary || ele.summary === '') {
-              if (ele.id === 'count') {
-                ele.summary = 'count'
-              } else {
-                ele.summary = 'sum'
-              }
-            }
-            if (!ele.sort || ele.sort === '') {
-              ele.sort = 'none'
-            }
-            if (!ele.filter) {
-              ele.filter = []
-            }
-          })
-          if (view.type.startsWith('pie') || view.type.startsWith('funnel') || view.type.startsWith('gauge')) {
-            if (view.yaxis.length > 1) {
-              view.yaxis.splice(1, view.yaxis.length)
-            }
-          }
-          view.xaxis = JSON.stringify(view.xaxis)
-          view.yaxis = JSON.stringify(view.yaxis)
-          view.customAttr = JSON.stringify(view.customAttr)
-          view.customStyle = JSON.stringify(view.customStyle)
-          view.customFilter = JSON.stringify(view.customFilter)
-          view.snapshot = snapshot
-          post('/chart/view/save', view).then(response => {
-            this.loading = false
-            this.$success(this.$t('commons.save_success'))
-          })
-        }
-      })
-    },
+    //         }
+    //         if (!ele.sort || ele.sort === '') {
+    //           ele.sort = 'none'
+    //         }
+    //         if (!ele.filter) {
+    //           ele.filter = []
+    //         }
+    //       })
+    //       if (view.type.startsWith('pie') || view.type.startsWith('funnel') || view.type.startsWith('gauge')) {
+    //         if (view.yaxis.length > 1) {
+    //           view.yaxis.splice(1, view.yaxis.length)
+    //         }
+    //       }
+    //       view.xaxis = JSON.stringify(view.xaxis)
+    //       view.yaxis = JSON.stringify(view.yaxis)
+    //       view.customAttr = JSON.stringify(view.customAttr)
+    //       view.customStyle = JSON.stringify(view.customStyle)
+    //       view.customFilter = JSON.stringify(view.customFilter)
+    //       view.snapshot = snapshot
+    //       post('/chart/view/save', view).then(response => {
+    //         this.loading = false
+    //         this.$success(this.$t('commons.save_success'))
+    //       })
+    //     }
+    //   })
+    // },
     closeEdit() {
       if (this.view.title && this.view.title.length > 50) {
         this.$warning(this.$t('chart.title_limit'))
@@ -787,6 +893,7 @@ export default {
           this.view = JSON.parse(JSON.stringify(response.data))
           this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
           this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []
+          this.view.extStack = this.view.extStack ? JSON.parse(this.view.extStack) : []
           this.view.customAttr = this.view.customAttr ? JSON.parse(this.view.customAttr) : {}
           this.view.customStyle = this.view.customStyle ? JSON.parse(this.view.customStyle) : {}
           this.view.customFilter = this.view.customFilter ? JSON.parse(this.view.customFilter) : {}
@@ -815,6 +922,7 @@ export default {
           this.view = JSON.parse(JSON.stringify(response.data))
           this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
           this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []
+          this.view.extStack = this.view.extStack ? JSON.parse(this.view.extStack) : []
           this.view.customAttr = this.view.customAttr ? JSON.parse(this.view.customAttr) : {}
           this.view.customStyle = this.view.customStyle ? JSON.parse(this.view.customStyle) : {}
           this.view.customFilter = this.view.customFilter ? JSON.parse(this.view.customFilter) : {}
@@ -1094,11 +1202,14 @@ export default {
     hideTab() {
       this.tabStatus = false
     },
-    resetView() {
+    resetDatasetField() {
       this.dimension = []
       this.dimensionData = []
       this.quota = []
       this.quotaData = []
+    },
+    resetView() {
+      this.resetDatasetField()
       this.view = {
         xAxis: [],
         yAxis: [],
@@ -1201,12 +1312,53 @@ export default {
       }
       this.dragMoveDuplicate(this.view.customFilter, e)
       this.save(true)
+    },
+
+    initAreas() {
+      let mapping
+      if ((mapping = localStorage.getItem('areaMapping')) !== null) {
+        this.places = JSON.parse(mapping)
+        return
+      }
+      Object.keys(this.places).length === 0 && areaMapping().then(res => {
+        this.places = res.data
+        localStorage.setItem('areaMapping', JSON.stringify(res.data))
+      })
+    },
+
+    normalizer(node) {
+      const resultNode = {
+        id: node.code,
+        label: node.name
+      }
+      if (node.children && node.children.length > 0) {
+        resultNode.children = node.children
+      }
+
+      if (resultNode.children && (!node.children || node.children.length === 0)) {
+        delete resultNode.children
+      }
+      return resultNode
+    },
+    addStack(e) {
+      this.dragCheckType(this.dimensionData, 'd')
+      if (this.view.extStack && this.view.extStack.length > 1) {
+        this.view.extStack = [this.view.extStack[0]]
+      }
+      this.save(true)
+    },
+    stackItemChange(item) {
+      this.save(true)
+    },
+    stackItemRemove(item) {
+      this.view.extStack.splice(item.index, 1)
+      this.save(true)
     }
   }
 }
 </script>
 
-<style scoped>
+<style lang='scss' scoped>
   .padding-lr {
     padding: 0 6px;
   }
@@ -1240,7 +1392,7 @@ export default {
     overflow:auto;
   }
 
-  .item {
+  .item-dimension {
     padding: 2px 10px;
     margin: 2px 2px 0 2px;
     border: solid 1px #eee;
@@ -1250,13 +1402,23 @@ export default {
     background-color: white;
     display: block;
     word-break: break-all;
-
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
   }
 
-  .item-on-move {
+  .item-dimension + .item-dimension {
+    margin-top: 2px;
+  }
+
+  .item-dimension:hover {
+    color: #1890ff;
+    background: #e8f4ff;
+    border-color: #a3d3ff;
+    cursor: pointer;
+  }
+
+  .item-quota {
     padding: 2px 10px;
     margin: 2px 2px 0 2px;
     border: solid 1px #eee;
@@ -1264,20 +1426,21 @@ export default {
     color: #606266;
     /*background-color: rgba(35,46,64,.05);*/
     background-color: white;
-
+    display: block;
+    word-break: break-all;
     overflow: hidden;
     white-space: nowrap;
     text-overflow: ellipsis;
   }
 
-  .item + .item {
+  .item-quota + .item-quota {
     margin-top: 2px;
   }
 
-  .item:hover {
-    color: #1890ff;
-    background: #e8f4ff;
-    border-color: #a3d3ff;
+  .item-quota:hover {
+    color: #67c23a;
+    background: #f0f9eb;
+    border-color: #b2d3a3;
     cursor: pointer;
   }
 
@@ -1344,27 +1507,30 @@ export default {
 
   .attr-selector{
     width:100%;
-    height: 32px;
-    margin:0 0 6px 0;
+    height: 100%;
+    margin:6px 0;
     padding:0 4px;
     display: flex;
     align-items: center;
     background-color: white
   }
 
+  .style-collapse>>>.el-collapse-item__content {
+    padding-bottom: 0!important;
+  }
+  .style-collapse>>>.el-collapse-item__header {
+    height: 34px;
+    line-height: 34px;
+    padding: 0 0 0 6px;
+    font-size: 12px;
+    font-weight: 400;
+  }
+
   .disabled-none-cursor{
     cursor: not-allowed;
     pointer-events:none;
   }
 
-  .filter-class{
-    height: calc(35% - 102px);
-  }
-
-  .filter-class>>>.filter-inner-class{
-    height: calc(100% - 40px);
-  }
-
   .chart-class{
     height: 100%;
     padding: 10px;
@@ -1413,4 +1579,31 @@ export default {
     line-height: 40px;
     padding: 0 0 0 10px;
   }
+  .tree-select-span {
+      >>>div.vue-treeselect__control {
+          height: 32px !important;
+          font-weight: normal !important;
+      }
+  }
+  .drag-block-style{
+    padding:2px 0 0 0;
+    width:100%;
+    min-height: 32px;
+    border-radius: 4px;
+    border: 1px solid #DCDFE6;
+    overflow-x: hidden;
+    display: flex;
+    align-items: center;
+    background-color: white;
+  }
+  .drag-placeholder-style{
+    position: absolute;
+    top: calc(50% - 2px);
+    left: 0;
+    width: 100%;
+    color: #CCCCCC;
+  }
+  .drag-placeholder-style-span{
+    padding-left: 16px;
+  }
 </style>

frontend/src/views/dataset/add/AddExcel.vue

@@ -258,7 +258,7 @@ export default {
           type: 'excel',
           mode: parseInt(this.mode),
           // info: '{"data":"' + this.path + '"}',
-          info: JSON.stringify({ data: this.path }),
+          info: JSON.stringify({ data: this.path, sheets: [this.sheets[0]]}),
           fields: this.fields
         }
       } else {

frontend/src/views/dataset/data/UpdateInfo.vue

@@ -1,7 +1,7 @@
 <template>
   <el-col>
     <el-row>
-      <el-button v-if="hasDataPermission('manage',param.privileges)" icon="el-icon-setting" size="mini" @click="showConfig">
+      <el-button v-if="hasDataPermission('manage',param.privileges) || table.type !== 'excel'" icon="el-icon-setting" size="mini" @click="showConfig">
         {{ $t('dataset.update_setting') }}
       </el-button>
       <el-button icon="el-icon-refresh" size="mini" @click="refreshLog">
@@ -615,8 +615,8 @@ export default {
       }
     },
     listTaskLog(loading = true) {
-      const params = {"conditions":[{"field":"dataset_table_task.table_id","operator":"eq","value": this.table.id}],"orders":[]}
-      post('/dataset/taskLog/list/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
+      const params = {"conditions":[{"field":"dataset_table_task_log.table_id","operator":"eq","value": this.table.id}],"orders":[]}
+      post('/dataset/taskLog/list/' +  this.table.type + '/' + this.page.currentPage + '/' + this.page.pageSize, params, loading).then(response => {
         this.taskLogData = response.data.listObject
         this.page.total = response.data.itemCount
       })

frontend/src/views/dataset/data/ViewTable.vue

@@ -51,7 +51,7 @@
       <el-tab-pane v-if="table.type !== 'custom'" :label="$t('dataset.join_view')" name="joinView">
         <union-view :param="param" :table="table" />
       </el-tab-pane>
-      <el-tab-pane v-if="table.mode === 1 && (table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">
+      <el-tab-pane v-if="table.mode === 1 && (table.type === 'excel' || table.type === 'db' || table.type === 'sql')" :label="$t('dataset.update_info')" name="updateInfo">
         <update-info :param="param" :table="table" />
       </el-tab-pane>
     </el-tabs>

frontend/src/views/dataset/group/Group.vue

@@ -100,7 +100,7 @@
                               <svg-icon icon-class="ds-sql" class="ds-icon-sql" />
                               {{ $t('dataset.sql_data') }}
                             </el-dropdown-item>
-                            <el-dropdown-item :command="beforeClickAddData('excel',data)">
+                            <el-dropdown-item :command="beforeClickAddData('excel',data)" :disabled="!kettleRunning">
                               <svg-icon icon-class="ds-excel" class="ds-icon-excel" />
                               {{ $t('dataset.excel_data') }}
                             </el-dropdown-item>
@@ -341,7 +341,7 @@
 </template>
 
 <script>
-import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post } from '@/api/dataset/dataset'
+import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post , isKettleRunning} from '@/api/dataset/dataset'
 import { authModel } from '@/api/system/sysAuth'
 import GroupMoveSelector from './GroupMoveSelector'
 import DsMoveSelector from './DsMoveSelector'
@@ -415,7 +415,8 @@ export default {
         id: 'id',
         parentId: 'pid'
       },
-      isTreeSearch: false
+      isTreeSearch: false,
+      kettleRunning: false
     }
   },
   computed: {
@@ -426,6 +427,9 @@ export default {
     //   return this.$store.state.dataset.sceneData
     // }
   },
+  created() {
+    this.kettleState()
+  },
   watch: {
     search(val) {
       // if (val && val !== '') {
@@ -467,7 +471,11 @@ export default {
         'node': node
       }
     },
-
+    kettleState() {
+      isKettleRunning().then(res => {
+        this.kettleRunning = res.data
+      })
+    },
     clickMore(param) {
       // console.log(param)
       switch (param.type) {

frontend/src/views/dataset/index.vue

@@ -26,7 +26,7 @@ import AddExcel from './add/AddExcel'
 import AddCustom from './add/AddCustom'
 import FieldEdit from './data/FieldEdit'
 import { removeClass } from '@/utils'
-import bus from '@/utils/bus'
+// import bus from '@/utils/bus'
 export default {
   name: 'DataSet',
   components: { DeMainContainer, DeContainer, DeAsideContainer, Group, DataHome, ViewTable, AddDB, AddSQL, AddExcel, AddCustom },
@@ -39,9 +39,9 @@ export default {
   },
   mounted() {
     removeClass(document.body, 'showRightPanel')
-    bus.$on('to-msg-dataset', params => {
-      this.toMsgShare(params)
-    })
+    // bus.$on('to-msg-dataset', params => {
+    //   this.toMsgShare(params)
+    // })
   },
   created() {
     this.$store.dispatch('app/toggleSideBarHide', true)

frontend/src/views/msg/all.vue

@@ -36,7 +36,7 @@
         </template>
       </el-table-column>
 
-      <el-table-column prop="type" sortable="custom" :label="$t('webmsg.type')" width="140">
+      <el-table-column prop="typeId" sortable="custom" :label="$t('webmsg.type')" width="140">
         <template slot-scope="scope">
           <span>{{ getTypeName(scope.row.typeId) }}</span>
         </template>
@@ -101,7 +101,7 @@ export default {
       }
 
       if (this.orderConditions.length === 0) {
-        param.orders = [' status asc ', 'create_time desc ']
+        param.orders = ['create_time desc ']
       } else {
         param.orders = formatOrders(this.orderConditions)
       }
@@ -139,6 +139,9 @@ export default {
       if (prop === 'createTime') {
         prop = 'create_time'
       }
+      if (prop === 'typeId') {
+        prop = 'type_id'
+      }
       addOrder({ field: prop, value: order }, this.orderConditions)
       this.search()
     }