Merge branch 'master' of github.com:gcpaas/DataRoom

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/constant/PageDesignConstant.java

@@ -167,6 +167,11 @@ public interface PageDesignConstant {
              */
             String TIME_PICKER = "timePicker";
 
+            /**
+             * echarts组件
+             */
+            String ECHARTS_COMPONENT = "echartsComponent";
+
 
         }
     }

DataRoom/dataroom-core/src/main/java/com/gccloud/dataroom/core/module/chart/components/EchartsComponentChart.java

@@ -0,0 +1,84 @@
+package com.gccloud.dataroom.core.module.chart.components;
+
+import com.gccloud.dataroom.core.constant.PageDesignConstant;
+import com.gccloud.dataroom.core.module.chart.bean.Chart;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * 自定义Echarts组件
+ * @author hongyang
+ * @version 1.0
+ * @date 2023/3/28 14:25
+ */
+@Data
+public class EchartsComponentChart extends Chart {
+
+    @ApiModelProperty(notes = "父编码")
+    private String parentCode;
+
+    @ApiModelProperty(notes = "版本")
+    private String version;
+
+    @ApiModelProperty(notes = "类型")
+    private String type = PageDesignConstant.BigScreen.Type.ECHARTS_COMPONENT;
+
+    @ApiModelProperty(notes = "自定义处理配置脚本")
+    private String optionHandler;
+
+    @ApiModelProperty(notes = "自定义处理数据源脚本")
+    private String dataHandler;
+
+    @ApiModelProperty(notes = "组件的构造函数分类")
+    private String chartType;
+
+    @ApiModelProperty(notes = "组件的配置，直接从g2官网复制")
+    private Object option;
+
+    @ApiModelProperty(notes = "右侧面板自定义配置")
+    private List<Setting> setting;
+
+    @ApiModelProperty(notes = "组件的唯一名称")
+    private String name;
+
+
+    @Data
+    public static class Setting {
+
+        @ApiModelProperty(notes = "配置项名称")
+        private String label;
+
+        @ApiModelProperty(notes = "配置项组件类型")
+        private String type;
+
+        @ApiModelProperty(notes = "配置项字段")
+        private String field;
+
+        @ApiModelProperty(notes = "配置项对应options中的字段")
+        private String optionField;
+
+        @ApiModelProperty(notes = "是否多选")
+        private Boolean multiple;
+
+        @ApiModelProperty(notes = "值")
+        private Object value;
+
+        @ApiModelProperty(notes = "所属tab页")
+        private String tabName;
+
+        @ApiModelProperty(notes = "多选时选项")
+        private Object options;
+
+        @ApiModelProperty(notes = "步长")
+        private Integer step;
+
+        @ApiModelProperty(notes = "所属样式分组")
+        private String groupName;
+
+    }
+
+
+
+}

data-room-ui/packages/js/utils/registerConfig.js

@@ -73,7 +73,7 @@ function registerRouters (config, router) {
           }
         },
         {
-          path: '/big-screen-map-data',
+          path: config?.routers?.mapData || '/big-screen-map-data',
           component: () => import('data-room-ui/MapDataManagement'),
           meta: {
             title: '地图数据管理'
@@ -110,7 +110,7 @@ function registerRouters (config, router) {
     {
       path: '/dataRoom-redirect',
       name: 'Redirect',
-      component: () =>import('data-room-ui/Layout/Redirect/index.vue'),
+      component: () => import('data-room-ui/Layout/Redirect/index.vue')
     },
     {
       path: config?.routers?.bizComponentDesignUrl || '/big-screen-biz-component-design',