From a846a8fe74f1e2e5a2c3bae6aa05a0a352024541 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 8 Feb 2022 10:55:20 +0800
Subject: [PATCH 01/47] =?UTF-8?q?fix:=20=E6=97=A5=E6=9C=9F=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E9=BB=98=E8=AE=A4=E5=80=BC=E5=85=BC=E5=AE=B9=E8=80=81?=
 =?UTF-8?q?=E7=89=88=E6=9C=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widget/serviceImpl/TimeDateRangeServiceImpl.js   | 2 +-
 .../src/components/widget/serviceImpl/TimeDateServiceImpl.js    | 2 +-
 .../src/components/widget/serviceImpl/TimeMonthServiceImpl.js   | 2 +-
 .../src/components/widget/serviceImpl/TimeYearServiceImpl.js    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
index c078919a9e..d06b70a722 100644
--- a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
@@ -227,7 +227,7 @@ class TimeDateRangeServiceImpl extends WidgetService {
   }
   getParam(element) {
     let timeArr = []
-    if (element.options.attrs.default.isDynamic) {
+    if (element.options.attrs.default && element.options.attrs.default.isDynamic) {
       let value = this.dynamicDateFormNow(element)
       value = this.formatFilterValue(value)
       timeArr = this.formatValues(value, element)
diff --git a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
index 8e5024cc45..6dfba9a4a4 100644
--- a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
@@ -157,7 +157,7 @@ class TimeDateServiceImpl extends WidgetService {
   }
   getParam(element) {
     let timeArr = []
-    if (element.options.attrs.default.isDynamic) {
+    if (element.options.attrs.default && element.options.attrs.default.isDynamic) {
       let value = this.dynamicDateFormNow(element)
       value = this.formatFilterValue(value)
       timeArr = this.formatValues(value, element)
diff --git a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
index 7471c381c4..53f8c277f6 100644
--- a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
@@ -123,7 +123,7 @@ class TimeMonthServiceImpl extends WidgetService {
   }
   getParam(element) {
     let timeArr = []
-    if (element.options.attrs.default.isDynamic) {
+    if (element.options.attrs.default && element.options.attrs.default.isDynamic) {
       let value = this.dynamicDateFormNow(element)
       value = this.formatFilterValue(value)
       timeArr = this.formatValues(value, element)
diff --git a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
index 2ae0a78234..67ce9ec172 100644
--- a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
@@ -114,7 +114,7 @@ class TimeYearServiceImpl extends WidgetService {
   }
   getParam(element) {
     let timeArr = []
-    if (element.options.attrs.default.isDynamic) {
+    if (element.options.attrs.default && element.options.attrs.default.isDynamic) {
       let value = this.dynamicDateFormNow(element)
       value = this.formatFilterValue(value)
       timeArr = this.formatValues(value, element)

From 81fe530fd9c51dd22f2da79aa0d3a91fadb4cb86 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 8 Feb 2022 11:36:12 +0800
Subject: [PATCH 02/47] =?UTF-8?q?fix:=20api=E6=9D=83=E9=99=90=E5=8D=95?=
 =?UTF-8?q?=E7=8B=AC=E5=A4=84=E7=90=86admin?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aop/DePermissionAnnotationHandler.java    | 28 ++++++++++++-------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
index 5bc267b60d..5654a987b6 100644
--- a/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
+++ b/backend/src/main/java/io/dataease/auth/aop/DePermissionAnnotationHandler.java
@@ -27,7 +27,11 @@ public class DePermissionAnnotationHandler {
 
     @Around(value = "@annotation(io.dataease.auth.annotation.DePermissions)")
     public Object PermissionsAround(ProceedingJoinPoint point) {
+
         try {
+            if (AuthUtils.getUser().getIsAdmin()) {
+                return point.proceed(point.getArgs());
+            }
             MethodSignature ms = (MethodSignature) point.getSignature();
             Method method = ms.getMethod();
             DePermissions annotation = method.getAnnotation(DePermissions.class);
@@ -47,13 +51,13 @@ public class DePermissionAnnotationHandler {
                 Boolean someAccess = false;
                 for (int i = 0; i < dePermissions.length; i++) {
                     DePermission permission = dePermissions[i];
-                    try{
+                    try {
                         boolean currentAccess = access(args[permission.paramIndex()], permission, 0);
                         if (currentAccess) {
                             someAccess = true;
                             break;
                         }
-                    }catch (Exception e) {
+                    } catch (Exception e) {
                         exceptions.add(e);
                     }
                 }
@@ -71,6 +75,9 @@ public class DePermissionAnnotationHandler {
     @Around(value = "@annotation(io.dataease.auth.annotation.DePermission)")
     public Object PermissionAround(ProceedingJoinPoint point) {
         try {
+            if (AuthUtils.getUser().getIsAdmin()) {
+                return point.proceed(point.getArgs());
+            }
             MethodSignature ms = (MethodSignature) point.getSignature();
             Method method = ms.getMethod();
 
@@ -88,20 +95,22 @@ public class DePermissionAnnotationHandler {
     }
 
     private Boolean access(Object arg, DePermission annotation, int layer) throws Exception {
-        if (ObjectUtils.isEmpty(arg)) return true;
+        if (ObjectUtils.isEmpty(arg))
+            return true;
         String type = annotation.type().name().toLowerCase();
         String value = annotation.value();
         Integer requireLevel = annotation.level().getLevel();
 
         Set<String> resourceIds = AuthUtils.permissionByType(type).stream().filter(
-                item -> item.getLevel() >= requireLevel
-        ).map(AuthItem::getAuthSource).collect(Collectors.toSet());
+                item -> item.getLevel() >= requireLevel).map(AuthItem::getAuthSource).collect(Collectors.toSet());
 
         Class<?> parameterType = arg.getClass();
         if (parameterType.isPrimitive() || isWrapClass(parameterType) || isString(parameterType)) {
             boolean permissionValid = resourceIds.contains(arg);
-            if (permissionValid) return true;
-            throw new UnauthorizedException("Subject does not have permission[" + annotation.level().name() +":"+ annotation.type() + ":" + arg + "]");
+            if (permissionValid)
+                return true;
+            throw new UnauthorizedException("Subject does not have permission[" + annotation.level().name() + ":"
+                    + annotation.type() + ":" + arg + "]");
         } else if (isArray(parameterType)) {
             for (int i = 0; i < Array.getLength(arg); i++) {
                 Object o = Array.get(arg, i);
@@ -124,7 +133,7 @@ public class DePermissionAnnotationHandler {
             Object o = argMap.get(values[layer]);
             return access(o, annotation, ++layer);
         } else {
-            //当作自定义类处理
+            // 当作自定义类处理
             String[] values = value.split("u002E");
             String fieldName = values[layer];
 
@@ -135,7 +144,7 @@ public class DePermissionAnnotationHandler {
         return true;
     }
 
-    private Object getFieldValue(Object o, String fieldName) throws Exception{
+    private Object getFieldValue(Object o, String fieldName) throws Exception {
         Class<?> aClass = o.getClass();
         while (null != aClass.getSuperclass()) {
             Field[] declaredFields = aClass.getDeclaredFields();
@@ -183,5 +192,4 @@ public class DePermissionAnnotationHandler {
         return Arrays.stream(wrapClasies).anyMatch(item -> StringUtils.equals(item, clz.getName()));
     }
 
-
 }

From 95641feef743ebb2411de83faf5e555fbb850b01 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 8 Feb 2022 13:50:43 +0800
Subject: [PATCH 03/47] feat: S2 pivot

---
 .../base/domain/ChartViewWithBLOBs.java       |   2 +
 .../dataease/base/mapper/ChartViewMapper.xml  |  37 ++-
 .../service/chart/ChartViewService.java       |   5 +
 .../main/resources/db/migration/V32__1.8.sql  |   2 +
 .../src/main/resources/generatorConfig.xml    |   2 +-
 frontend/src/icons/svg/table-normal.svg       |   2 +-
 frontend/src/icons/svg/table-pivot.svg        |   1 +
 frontend/src/lang/en.js                       |   4 +-
 frontend/src/lang/tw.js                       |   4 +-
 frontend/src/lang/zh.js                       |   4 +-
 .../views/chart/chart/common/common_table.js  |  44 ++++
 .../src/views/chart/chart/table/table-info.js | 114 +++++++-
 .../chart/components/ChartComponentS2.vue     |   8 +-
 .../components/drag-item/DimensionExtItem.vue | 248 ++++++++++++++++++
 .../components/drag-item/DimensionItem.vue    |   1 +
 .../shape-attr/SizeSelectorAntV.vue           |   2 +-
 frontend/src/views/chart/group/Group.vue      |   1 +
 frontend/src/views/chart/view/ChartEdit.vue   |  95 ++++++-
 frontend/src/views/chart/view/ChartType.vue   |  11 +-
 19 files changed, 561 insertions(+), 26 deletions(-)
 create mode 100644 backend/src/main/resources/db/migration/V32__1.8.sql
 create mode 100644 frontend/src/icons/svg/table-pivot.svg
 create mode 100644 frontend/src/views/chart/components/drag-item/DimensionExtItem.vue

diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
index 61779e0cdd..6fdd140eac 100644
--- a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
+++ b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
@@ -13,6 +13,8 @@ import lombok.ToString;
 public class ChartViewWithBLOBs extends ChartView implements Serializable {
     @ApiModelProperty("x轴")
     private String xAxis;
+    @ApiModelProperty("x轴(Row)")
+    private String xAxisExt;
     @ApiModelProperty("y轴")
     private String yAxis;
     @ApiModelProperty("副y轴")
diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
index 1bdedbf438..5cd892b888 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
@@ -18,6 +18,7 @@
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.ChartViewWithBLOBs">
     <result column="x_axis" jdbcType="LONGVARCHAR" property="xAxis" />
+    <result column="x_axis_ext" jdbcType="LONGVARCHAR" property="xAxisExt" />
     <result column="y_axis" jdbcType="LONGVARCHAR" property="yAxis" />
     <result column="y_axis_ext" jdbcType="LONGVARCHAR" property="yAxisExt" />
     <result column="ext_stack" jdbcType="LONGVARCHAR" property="extStack" />
@@ -91,8 +92,8 @@
     create_by, create_time, update_time, style_priority
   </sql>
   <sql id="Blob_Column_List">
-    x_axis, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, custom_filter, 
-    drill_fields, snapshot
+    x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, 
+    custom_filter, drill_fields, snapshot
   </sql>
   <select id="selectByExampleWithBLOBs" parameterType="io.dataease.base.domain.ChartViewExample" resultMap="ResultMapWithBLOBs">
     select
@@ -147,18 +148,20 @@
       table_id, `type`, render, 
       result_count, result_mode, title, 
       create_by, create_time, update_time, 
-      style_priority, x_axis, y_axis, 
-      y_axis_ext, ext_stack, ext_bubble, 
-      custom_attr, custom_style, custom_filter, 
-      drill_fields, snapshot)
+      style_priority, x_axis, x_axis_ext, 
+      y_axis, y_axis_ext, ext_stack, 
+      ext_bubble, custom_attr, custom_style, 
+      custom_filter, drill_fields, snapshot
+      )
     values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, 
       #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{render,jdbcType=VARCHAR}, 
       #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, 
-      #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, 
-      #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, 
-      #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR})
+      #{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, 
+      #{yAxis,jdbcType=LONGVARCHAR}, #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, 
+      #{extBubble,jdbcType=LONGVARCHAR}, #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, 
+      #{customFilter,jdbcType=LONGVARCHAR}, #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}
+      )
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
     insert into chart_view
@@ -205,6 +208,9 @@
       <if test="xAxis != null">
         x_axis,
       </if>
+      <if test="xAxisExt != null">
+        x_axis_ext,
+      </if>
       <if test="yAxis != null">
         y_axis,
       </if>
@@ -276,6 +282,9 @@
       <if test="xAxis != null">
         #{xAxis,jdbcType=LONGVARCHAR},
       </if>
+      <if test="xAxisExt != null">
+        #{xAxisExt,jdbcType=LONGVARCHAR},
+      </if>
       <if test="yAxis != null">
         #{yAxis,jdbcType=LONGVARCHAR},
       </if>
@@ -356,6 +365,9 @@
       <if test="record.xAxis != null">
         x_axis = #{record.xAxis,jdbcType=LONGVARCHAR},
       </if>
+      <if test="record.xAxisExt != null">
+        x_axis_ext = #{record.xAxisExt,jdbcType=LONGVARCHAR},
+      </if>
       <if test="record.yAxis != null">
         y_axis = #{record.yAxis,jdbcType=LONGVARCHAR},
       </if>
@@ -404,6 +416,7 @@
       update_time = #{record.updateTime,jdbcType=BIGINT},
       style_priority = #{record.stylePriority,jdbcType=VARCHAR},
       x_axis = #{record.xAxis,jdbcType=LONGVARCHAR},
+      x_axis_ext = #{record.xAxisExt,jdbcType=LONGVARCHAR},
       y_axis = #{record.yAxis,jdbcType=LONGVARCHAR},
       y_axis_ext = #{record.yAxisExt,jdbcType=LONGVARCHAR},
       ext_stack = #{record.extStack,jdbcType=LONGVARCHAR},
@@ -478,6 +491,9 @@
       <if test="xAxis != null">
         x_axis = #{xAxis,jdbcType=LONGVARCHAR},
       </if>
+      <if test="xAxisExt != null">
+        x_axis_ext = #{xAxisExt,jdbcType=LONGVARCHAR},
+      </if>
       <if test="yAxis != null">
         y_axis = #{yAxis,jdbcType=LONGVARCHAR},
       </if>
@@ -523,6 +539,7 @@
       update_time = #{updateTime,jdbcType=BIGINT},
       style_priority = #{stylePriority,jdbcType=VARCHAR},
       x_axis = #{xAxis,jdbcType=LONGVARCHAR},
+      x_axis_ext = #{xAxisExt,jdbcType=LONGVARCHAR},
       y_axis = #{yAxis,jdbcType=LONGVARCHAR},
       y_axis_ext = #{yAxisExt,jdbcType=LONGVARCHAR},
       ext_stack = #{extStack,jdbcType=LONGVARCHAR},
diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index dca5d3ecfa..6a2266c442 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -219,6 +219,11 @@ public class ChartViewService {
         }
         List<ChartViewFieldDTO> xAxis = new Gson().fromJson(view.getXAxis(), new TypeToken<List<ChartViewFieldDTO>>() {
         }.getType());
+        if (StringUtils.equalsIgnoreCase(view.getType(), "table-pivot")) {
+            List<ChartViewFieldDTO> xAxisExt = new Gson().fromJson(view.getXAxisExt(), new TypeToken<List<ChartViewFieldDTO>>() {
+            }.getType());
+            xAxis.addAll(xAxisExt);
+        }
         List<ChartViewFieldDTO> yAxis = new Gson().fromJson(view.getYAxis(), new TypeToken<List<ChartViewFieldDTO>>() {
         }.getType());
         if (StringUtils.equalsIgnoreCase(view.getType(), "chart-mix")) {
diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
new file mode 100644
index 0000000000..8ba29f5913
--- /dev/null
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -0,0 +1,2 @@
+ALTER TABLE `chart_view` ADD COLUMN `x_axis_ext` LONGTEXT COMMENT 'table-row' AFTER `x_axis`;
+UPDATE `chart_view` SET `x_axis_ext` = '[]';
\ No newline at end of file
diff --git a/backend/src/main/resources/generatorConfig.xml b/backend/src/main/resources/generatorConfig.xml
index e90877a423..ec4f820fc4 100644
--- a/backend/src/main/resources/generatorConfig.xml
+++ b/backend/src/main/resources/generatorConfig.xml
@@ -60,6 +60,6 @@
         </javaClientGenerator>
 
         <!--要生成的数据库表 -->
-        <table tableName="dataset_column_permissions"/>
+        <table tableName="chart_view"/>
     </context>
 </generatorConfiguration>
diff --git a/frontend/src/icons/svg/table-normal.svg b/frontend/src/icons/svg/table-normal.svg
index 9ca48cc2c7..6e3ca6438f 100644
--- a/frontend/src/icons/svg/table-normal.svg
+++ b/frontend/src/icons/svg/table-normal.svg
@@ -1 +1 @@
-<svg t="1630896178915" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1969" width="200" height="200"><path d="M85.333333 170.666667h853.333334v170.666666H85.333333zM85.333333 384h170.666667v469.333333H85.333333z" p-id="1970"></path><path d="M298.666667 384h640v128H298.666667z" opacity=".6" p-id="1971"></path><path d="M298.666667 554.666667h298.666666v128H298.666667zM640 554.666667h298.666667v128H640z" p-id="1972"></path><path d="M298.666667 725.333333h298.666666v128H298.666667zM640 725.333333h298.666667v128H640z" opacity=".6" p-id="1973"></path></svg>
+<svg t="1644288854112" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1947" width="200" height="200"><path d="M85.333333 170.666667h853.333334v170.666666H85.333333zM85.333333 384h170.666667v469.333333H85.333333z" p-id="1948"></path><path d="M298.666667 384h640v128H298.666667z" opacity=".6" p-id="1949"></path><path d="M298.666667 554.666667h640v128H298.666667z" p-id="1950"></path><path d="M298.666667 725.333333h640v128H298.666667z" opacity=".6" p-id="1951"></path></svg>
diff --git a/frontend/src/icons/svg/table-pivot.svg b/frontend/src/icons/svg/table-pivot.svg
new file mode 100644
index 0000000000..9ca48cc2c7
--- /dev/null
+++ b/frontend/src/icons/svg/table-pivot.svg
@@ -0,0 +1 @@
+<svg t="1630896178915" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1969" width="200" height="200"><path d="M85.333333 170.666667h853.333334v170.666666H85.333333zM85.333333 384h170.666667v469.333333H85.333333z" p-id="1970"></path><path d="M298.666667 384h640v128H298.666667z" opacity=".6" p-id="1971"></path><path d="M298.666667 554.666667h298.666666v128H298.666667zM640 554.666667h298.666667v128H640z" p-id="1972"></path><path d="M298.666667 725.333333h298.666666v128H298.666667zM640 725.333333h298.666667v128H640z" opacity=".6" p-id="1973"></path></svg>
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 3135ae9403..8d01f22232 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1020,7 +1020,9 @@ export default {
     table_config: 'Table Config',
     table_column_width_config: 'Column Width',
     table_column_adapt: 'Adapt',
-    table_column_custom: 'Custom'
+    table_column_custom: 'Custom',
+    chart_table_pivot: 'Pivot Table',
+    table_pivot_row: 'Data Row'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 39d208e5fc..08a6a5c72f 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1020,7 +1020,9 @@ export default {
     table_config: '表格配置',
     table_column_width_config: '列寬調整',
     table_column_adapt: '自適應',
-    table_column_custom: '自定義'
+    table_column_custom: '自定義',
+    chart_table_pivot: '透視表',
+    table_pivot_row: '數據行'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 32bfd2af3e..10be2da0ac 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1022,7 +1022,9 @@ export default {
     table_config: '表格配置',
     table_column_width_config: '列宽调整',
     table_column_adapt: '自适应',
-    table_column_custom: '自定义'
+    table_column_custom: '自定义',
+    chart_table_pivot: '透视表',
+    table_pivot_row: '数据行'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/chart/common/common_table.js b/frontend/src/views/chart/chart/common/common_table.js
index 28a9fef32d..5c0bc86d8d 100644
--- a/frontend/src/views/chart/chart/common/common_table.js
+++ b/frontend/src/views/chart/chart/common/common_table.js
@@ -6,10 +6,40 @@ export function getCustomTheme(chart) {
     background: {
       color: '#00000000'
     },
+    cornerCell: {
+      cell: {
+        backgroundColor: hexColorToRGBA(DEFAULT_COLOR_CASE.tableHeaderBgColor, DEFAULT_COLOR_CASE.alpha)
+      },
+      text: {
+        fill: DEFAULT_COLOR_CASE.tableFontColor,
+        fontSize: DEFAULT_SIZE.tableTitleFontSize
+      },
+      bolderText: {
+        fill: DEFAULT_COLOR_CASE.tableFontColor,
+        fontSize: DEFAULT_SIZE.tableTitleFontSize
+      }
+    },
+    rowCell: {
+      cell: {
+        backgroundColor: hexColorToRGBA(DEFAULT_COLOR_CASE.tableHeaderBgColor, DEFAULT_COLOR_CASE.alpha)
+      },
+      text: {
+        fill: DEFAULT_COLOR_CASE.tableFontColor,
+        fontSize: DEFAULT_SIZE.tableTitleFontSize
+      },
+      bolderText: {
+        fill: DEFAULT_COLOR_CASE.tableFontColor,
+        fontSize: DEFAULT_SIZE.tableTitleFontSize
+      }
+    },
     colCell: {
       cell: {
         backgroundColor: hexColorToRGBA(DEFAULT_COLOR_CASE.tableHeaderBgColor, DEFAULT_COLOR_CASE.alpha)
       },
+      text: {
+        fill: DEFAULT_COLOR_CASE.tableFontColor,
+        fontSize: DEFAULT_SIZE.tableTitleFontSize
+      },
       bolderText: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
         fontSize: DEFAULT_SIZE.tableTitleFontSize
@@ -32,15 +62,29 @@ export function getCustomTheme(chart) {
     // color
     if (customAttr.color) {
       const c = JSON.parse(JSON.stringify(customAttr.color))
+      theme.cornerCell.cell.backgroundColor = hexColorToRGBA(c.tableHeaderBgColor, c.alpha)
+      theme.cornerCell.bolderText.fill = c.tableFontColor
+      theme.cornerCell.text.fill = c.tableFontColor
+      theme.rowCell.cell.backgroundColor = hexColorToRGBA(c.tableHeaderBgColor, c.alpha)
+      theme.rowCell.bolderText.fill = c.tableFontColor
+      theme.rowCell.text.fill = c.tableFontColor
       theme.colCell.cell.backgroundColor = hexColorToRGBA(c.tableHeaderBgColor, c.alpha)
       theme.colCell.bolderText.fill = c.tableFontColor
+      theme.colCell.text.fill = c.tableFontColor
+
       theme.dataCell.cell.backgroundColor = hexColorToRGBA(c.tableItemBgColor, c.alpha)
       theme.dataCell.text.fill = c.tableFontColor
     }
     // size
     if (customAttr.size) {
       const s = JSON.parse(JSON.stringify(customAttr.size))
+      theme.cornerCell.bolderText.fontSize = parseInt(s.tableTitleFontSize)
+      theme.cornerCell.text.fontSize = parseInt(s.tableTitleFontSize)
+      theme.rowCell.bolderText.fontSize = parseInt(s.tableTitleFontSize)
+      theme.rowCell.text.fontSize = parseInt(s.tableTitleFontSize)
       theme.colCell.bolderText.fontSize = parseInt(s.tableTitleFontSize)
+      theme.colCell.text.fontSize = parseInt(s.tableTitleFontSize)
+
       theme.dataCell.text.fontSize = parseInt(s.tableItemFontSize)
     }
   }
diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js
index 6c0875653c..d5a6f96938 100644
--- a/frontend/src/views/chart/chart/table/table-info.js
+++ b/frontend/src/views/chart/chart/table/table-info.js
@@ -1,10 +1,10 @@
-import { TableSheet, S2Event } from '@antv/s2'
+import { TableSheet, S2Event, PivotSheet } from '@antv/s2'
 import { getCustomTheme, getSize } from '@/views/chart/chart/common/common_table'
 
 export function baseTableInfo(s2, container, chart, action, tableData) {
   const containerDom = document.getElementById(container)
 
-  // data
+  // fields
   const fields = chart.data.fields
   if (!fields || fields.length === 0) {
     if (s2) {
@@ -102,7 +102,7 @@ export function baseTableInfo(s2, container, chart, action, tableData) {
 export function baseTableNormal(s2, container, chart, action, tableData) {
   const containerDom = document.getElementById(container)
 
-  // data
+  // fields
   const fields = chart.data.fields
   if (!fields || fields.length === 0) {
     if (s2) {
@@ -190,3 +190,111 @@ export function baseTableNormal(s2, container, chart, action, tableData) {
 
   return s2
 }
+
+export function baseTablePivot(s2, container, chart, action, tableData) {
+  const containerDom = document.getElementById(container)
+
+  // row and column
+  const columnFields = JSON.parse(chart.xaxis)
+  const rowFields = JSON.parse(chart.xaxisExt)
+  const valueFields = JSON.parse(chart.yaxis)
+  const c = []; const r = []; const v = []
+  columnFields.forEach(ele => {
+    c.push(ele.dataeaseName)
+  })
+  rowFields.forEach(ele => {
+    r.push(ele.dataeaseName)
+  })
+  valueFields.forEach(ele => {
+    v.push(ele.dataeaseName)
+  })
+
+  // fields
+  const fields = chart.data.fields
+  if (!fields || fields.length === 0) {
+    if (s2) {
+      s2.destroy()
+    }
+    return
+  }
+
+  const columns = []
+  const meta = []
+
+  // add drill list
+  if (chart.drill) {
+    const drillFields = JSON.parse(chart.drillFields)
+    const drillField = drillFields[chart.drillFilters.length]
+
+    const drillFilters = JSON.parse(JSON.stringify(chart.drillFilters))
+    const drillExp = drillFilters[drillFilters.length - 1].datasetTableField
+
+    // 移除所有下钻字段
+    const removeField = []
+    for (let i = 0; i < chart.drillFilters.length; i++) {
+      const ele = chart.drillFilters[i].datasetTableField
+      removeField.push(ele.dataeaseName)
+    }
+
+    // build field
+    fields.forEach(ele => {
+      if (removeField.indexOf(ele.dataeaseName) < 0) {
+        // 用下钻字段替换当前字段
+        if (drillExp.dataeaseName === ele.dataeaseName) {
+          columns.push(drillField.dataeaseName)
+          meta.push({
+            field: drillField.dataeaseName,
+            name: drillField.name
+          })
+        } else {
+          columns.push(ele.dataeaseName)
+          meta.push({
+            field: ele.dataeaseName,
+            name: ele.name
+          })
+        }
+      }
+    })
+  } else {
+    fields.forEach(ele => {
+      columns.push(ele.dataeaseName)
+      meta.push({
+        field: ele.dataeaseName,
+        name: ele.name
+      })
+    })
+  }
+
+  // data config
+  const s2DataConfig = {
+    fields: {
+      rows: r,
+      columns: c,
+      values: v
+    },
+    meta: meta,
+    data: tableData
+  }
+
+  // options
+  const s2Options = {
+    width: containerDom.offsetWidth,
+    height: containerDom.offsetHeight,
+    style: getSize(chart)
+  }
+
+  // 开始渲染
+  if (s2) {
+    s2.destroy()
+  }
+  s2 = new PivotSheet(containerDom, s2DataConfig, s2Options)
+
+  // click
+  s2.on(S2Event.DATA_CELL_CLICK, action)
+
+  // theme
+  const customTheme = getCustomTheme(chart)
+  s2.setThemeCfg({ theme: customTheme })
+
+  return s2
+}
diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index 0b9f2d4490..b11aca62bf 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -4,9 +4,10 @@
     <span v-if="chart.type" v-show="title_show" ref="title" :style="title_class" style="cursor: default;display: block;">
       <p style="padding:6px 10px 0 10px;margin: 0;overflow: hidden;white-space: pre;text-overflow: ellipsis;">{{ chart.title }}</p>
     </span>
-    <div style="width: 100%;overflow: hidden;padding: 8px;" :style="{height:chartHeight,background:container_bg_class.background}">
+    <div ref="tableContainer" style="width: 100%;overflow: hidden;padding: 8px;" :style="{background:container_bg_class.background}">
       <div v-if="chart.type === 'table-normal'" :id="chartId" style="width: 100%;overflow: hidden;" :class="chart.drill ? 'table-dom-normal-drill' : 'table-dom-normal'" />
       <div v-if="chart.type === 'table-info'" :id="chartId" style="width: 100%;overflow: hidden;" :class="chart.drill ? 'table-dom-info-drill' : 'table-dom-info'" />
+      <div v-if="chart.type === 'table-pivot'" :id="chartId" style="width: 100%;overflow: hidden;" class="table-dom-normal" />
       <el-row v-show="chart.type === 'table-info'" class="table-page">
         <span class="total-style">
           {{ $t('chart.total') }}
@@ -34,7 +35,7 @@
 import { uuid } from 'vue-uuid'
 import ViewTrackBar from '@/components/canvas/components/Editor/ViewTrackBar'
 import { hexColorToRGBA } from '@/views/chart/chart/util'
-import { baseTableInfo, baseTableNormal } from '@/views/chart/chart/table/table-info'
+import { baseTableInfo, baseTableNormal, baseTablePivot } from '@/views/chart/chart/table/table-info'
 
 export default {
   name: 'ChartComponentS2',
@@ -189,6 +190,8 @@ export default {
         this.myChart = baseTableInfo(this.myChart, this.chartId, chart, this.antVAction, this.tableData)
       } else if (chart.type === 'table-normal') {
         this.myChart = baseTableNormal(this.myChart, this.chartId, chart, this.antVAction, this.tableData)
+      } else if (chart.type === 'table-pivot') {
+        this.myChart = baseTablePivot(this.myChart, this.chartId, chart, this.antVAction, this.tableData)
       } else {
         if (this.myChart) {
           this.antVRenderStatus = false
@@ -338,6 +341,7 @@ export default {
           if (this.$refs.title) {
             const titleHeight = this.$refs.title.offsetHeight
             this.chartHeight = (currentHeight - titleHeight) + 'px'
+            this.$refs.tableContainer.style.height = this.chartHeight
           }
         }
       })
diff --git a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
new file mode 100644
index 0000000000..68f78092e9
--- /dev/null
+++ b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
@@ -0,0 +1,248 @@
+<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>
+      <span v-if="item.deType === 1" class="summary-span">
+        {{ $t('chart.' + item.dateStyle) }}
+      </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 === '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.deType === 1" class="summary-span">
+            {{ $t('chart.' + item.dateStyle) }}
+          </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-item">({{ $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-files" :command="beforeClickItem('filter')">-->
+          <!--            <span>{{ $t('chart.filter') }}...</span>-->
+          <!--          </el-dropdown-item>-->
+
+          <el-dropdown-item v-show="item.deType === 1" divided>
+            <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="dateStyle">
+              <span class="el-dropdown-link inner-dropdown-menu">
+                <span>
+                  <i class="el-icon-c-scale-to-original" />
+                  <span>{{ $t('chart.dateStyle') }}</span>
+                  <span class="summary-span-item">({{ $t('chart.'+item.dateStyle) }})</span>
+                </span>
+                <i class="el-icon-arrow-right el-icon--right" />
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="beforeDateStyle('y')">{{ $t('chart.y') }}</el-dropdown-item>
+                <el-dropdown-item :command="beforeDateStyle('y_M')">{{ $t('chart.y_M') }}</el-dropdown-item>
+                <el-dropdown-item :command="beforeDateStyle('y_M_d')">{{ $t('chart.y_M_d') }}</el-dropdown-item>
+                <el-dropdown-item :command="beforeDateStyle('H_m_s')" divided>{{ $t('chart.H_m_s') }}</el-dropdown-item>
+                <el-dropdown-item :command="beforeDateStyle('y_M_d_H_m')">{{ $t('chart.y_M_d_H_m') }}</el-dropdown-item>
+                <el-dropdown-item :command="beforeDateStyle('y_M_d_H_m_s')">{{ $t('chart.y_M_d_H_m_s') }}</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-dropdown-item>
+          <el-dropdown-item v-show="item.deType === 1">
+            <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="datePattern">
+              <span class="el-dropdown-link inner-dropdown-menu">
+                <span>
+                  <i class="el-icon-timer" />
+                  <span>{{ $t('chart.datePattern') }}</span>
+                  <span class="summary-span-item">({{ $t('chart.'+item.datePattern) }})</span>
+                </span>
+                <i class="el-icon-arrow-right el-icon--right" />
+              </span>
+              <el-dropdown-menu slot="dropdown">
+                <el-dropdown-item :command="beforeDatePattern('date_sub')">{{ $t('chart.date_sub') }}(1990-01-01)</el-dropdown-item>
+                <el-dropdown-item :command="beforeDatePattern('date_split')">{{ $t('chart.date_split') }}(1990/01/01)</el-dropdown-item>
+              </el-dropdown-menu>
+            </el-dropdown>
+          </el-dropdown-item>
+
+          <el-dropdown-item icon="el-icon-edit-outline" divided :command="beforeClickItem('rename')">
+            <span>{{ $t('chart.show_name_set') }}</span>
+          </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: 'DimensionExtItem',
+  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 'rename':
+          this.showRename()
+          break
+        case 'remove':
+          this.removeItem()
+          break
+        case 'filter':
+          this.editFilter()
+          break
+        default:
+          break
+      }
+    },
+    beforeClickItem(type) {
+      return {
+        type: type
+      }
+    },
+    sort(param) {
+      // console.log(param)
+      this.item.sort = param.type
+      this.$emit('onDimensionItemChange', this.item)
+    },
+    beforeSort(type) {
+      return {
+        type: type
+      }
+    },
+    dateStyle(param) {
+      // console.log(param)
+      this.item.dateStyle = param.type
+      this.$emit('onDimensionItemChange', this.item)
+    },
+    beforeDateStyle(type) {
+      return {
+        type: type
+      }
+    },
+    datePattern(param) {
+      this.item.datePattern = param.type
+      this.$emit('onDimensionItemChange', this.item)
+    },
+    beforeDatePattern(type) {
+      return {
+        type: type
+      }
+    },
+    editFilter() {
+      this.item.index = this.index
+      this.$emit('editItemFilter', this.item)
+    },
+    showRename() {
+      this.item.index = this.index
+      this.item.renameType = 'dimensionExt'
+      this.$emit('onNameEdit', this.item)
+    },
+    removeItem() {
+      this.item.index = this.index
+      this.item.removeType = 'dimensionExt'
+      this.$emit('onDimensionItemRemove', 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;
+    position: absolute;
+    right: 25px;
+  }
+
+  .inner-dropdown-menu{
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+    width: 100%
+  }
+
+  .item-span-style{
+    display: inline-block;
+    width: 70px;
+    white-space: nowrap;
+    text-overflow: ellipsis;
+    overflow: hidden;
+  }
+
+  .summary-span-item{
+    margin-left: 4px;
+    color: #878d9f;
+  }
+</style>
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index 5b71a0f813..089ce6cc3e 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -190,6 +190,7 @@ export default {
     },
     removeItem() {
       this.item.index = this.index
+      this.item.removeType = 'dimension'
       this.$emit('onDimensionItemRemove', this.item)
     }
   }
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
index 74dfa0bf06..ccc4dbd7d1 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
@@ -124,7 +124,7 @@
           </el-tooltip>
         </el-form-item>
         <el-form-item v-show="sizeForm.tableColumnMode === 'custom'" label="" class="form-item form-item-slider">
-          <el-slider v-model="sizeForm.tableColumnWidth" :min="100" :max="500" show-input :show-input-controls="false" input-size="mini" @change="changeBarSizeCase" />
+          <el-slider v-model="sizeForm.tableColumnWidth" :min="10" :max="500" show-input :show-input-controls="false" input-size="mini" @change="changeBarSizeCase" />
         </el-form-item>
       </el-form>
 
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 59eb5bec06..6438a0b6c8 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -768,6 +768,7 @@ export default {
       })
       view.stylePriority = 'view' // 默认样式优先级视图
       view.xaxis = JSON.stringify([])
+      view.xaxisExt = JSON.stringify([])
       view.yaxis = JSON.stringify([])
       view.yaxisExt = JSON.stringify([])
       view.extStack = JSON.stringify([])
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index e9b0c4be34..ee407c8102 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -238,6 +238,45 @@
                       />
                     </span>
                   </el-row>
+                  <!--xAxisExt-->
+                  <el-row
+                    v-if="view.type === 'table-pivot'"
+                    class="padding-lr"
+                  >
+                    <span style="width: 80px;text-align: right;">
+                      <span>{{ $t('chart.table_pivot_row') }}</span>
+                      /
+                      <span>{{ $t('chart.dimension') }}</span>
+                    </span>
+                    <draggable
+                      v-model="view.xaxisExt"
+                      :disabled="!hasDataPermission('manage',param.privileges)"
+                      group="drag"
+                      animation="300"
+                      :move="onMove"
+                      class="drag-block-style"
+                      @add="addXaxisExt"
+                      @update="calcData(true)"
+                    >
+                      <transition-group class="draggable-group">
+                        <dimension-ext-item
+                          v-for="(item,index) in view.xaxisExt"
+                          :key="item.id"
+                          :param="param"
+                          :index="index"
+                          :item="item"
+                          @onDimensionItemChange="dimensionItemChange"
+                          @onDimensionItemRemove="dimensionItemRemove"
+                          @editItemFilter="showDimensionEditFilter"
+                          @onNameEdit="showRename"
+                        />
+                      </transition-group>
+                    </draggable>
+                    <div v-if="!view.xaxisExt || view.xaxisExt.length === 0" class="drag-placeholder-style">
+                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
+                    </div>
+                  </el-row>
+                  <!--xAxis-->
                   <el-row
                     v-if="view.type !=='text' && view.type !== 'gauge' && view.type !== 'liquid'"
                     class="padding-lr"
@@ -289,6 +328,7 @@
                       <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
                     </div>
                   </el-row>
+                  <!--yaxis-->
                   <el-row v-if="view.type !=='table-info'" class="padding-lr" style="margin-top: 6px;">
                     <span style="width: 80px;text-align: right;">
                       <span v-if="view.type && view.type.includes('table')">{{ $t('chart.drag_block_table_data_column') }}</span>
@@ -342,6 +382,7 @@
                       <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
                     </div>
                   </el-row>
+                  <!--yAxisExt-->
                   <el-row v-if="view.type && view.type === 'chart-mix'" class="padding-lr" style="margin-top: 6px;">
                     <span style="width: 80px;text-align: right;">
                       <span>{{ $t('chart.drag_block_value_axis_ext') }}</span>
@@ -378,6 +419,7 @@
                       <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
                     </div>
                   </el-row>
+                  <!--extStack-->
                   <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>
@@ -411,6 +453,7 @@
                       <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
                     </div>
                   </el-row>
+                  <!--extBubble-->
                   <el-row v-if="view.type && view.type.includes('scatter')" class="padding-lr" style="margin-top: 6px;">
                     <span style="width: 80px;text-align: right;">
                       <span>{{ $t('chart.bubble_size') }}</span>
@@ -483,7 +526,7 @@
                     </div>
                   </el-row>
                   <el-row
-                    v-if="view.type && !(view.type.includes('table') && view.render === 'echarts') && !view.type.includes('text') && !view.type.includes('gauge') && view.type !== 'liquid' && view.type !== 'word-cloud'"
+                    v-if="view.type && !(view.type.includes('table') && view.render === 'echarts') && !view.type.includes('text') && !view.type.includes('gauge') && view.type !== 'liquid' && view.type !== 'word-cloud' && view.type !== 'table-pivot'"
                     class="padding-lr"
                     style="margin-top: 6px;"
                   >
@@ -778,7 +821,7 @@
               @onChartClick="chartClick"
             />
             <table-normal
-              v-if="httpRequest.status && chart.type && chart.type.includes('table') && renderComponent() === 'echarts'"
+              v-if="httpRequest.status && chart.type && chart.type.includes('table') && renderComponent() === 'echarts' && chart.type !== 'table-pivot'"
               :show-summary="chart.type === 'table-normal'"
               :chart="chart"
               class="table-class"
@@ -982,10 +1025,12 @@ import SplitSelectorAntV from '@/views/chart/components/component-style/SplitSel
 import CompareEdit from '@/views/chart/components/compare/CompareEdit'
 import { compareItem } from '@/views/chart/chart/compare'
 import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
+import DimensionExtItem from '@/views/chart/components/drag-item/DimensionExtItem'
 
 export default {
   name: 'ChartEdit',
   components: {
+    DimensionExtItem,
     ChartComponentS2,
     CompareEdit,
     SplitSelectorAntV,
@@ -1044,6 +1089,7 @@ export default {
       quotaData: [],
       view: {
         xaxis: [],
+        xaxisExt: [],
         yaxis: [],
         yaxisExt: [],
         extStack: [],
@@ -1236,6 +1282,25 @@ export default {
           ele.filter = []
         }
       })
+      if (view.type === 'table-pivot') {
+        view.xaxisExt.forEach(function(ele) {
+          // if (!ele.summary || ele.summary === '') {
+          //   ele.summary = 'sum'
+          // }
+          if (!ele.dateStyle || ele.dateStyle === '') {
+            ele.dateStyle = 'y_M_d'
+          }
+          if (!ele.datePattern || ele.datePattern === '') {
+            ele.datePattern = 'date_sub'
+          }
+          if (!ele.sort || ele.sort === '') {
+            ele.sort = 'none'
+          }
+          if (!ele.filter) {
+            ele.filter = []
+          }
+        })
+      }
       if (view.type === 'map' && view.yaxis.length > 1) {
         view.yaxis = [view.yaxis[0]]
       }
@@ -1327,7 +1392,8 @@ export default {
       if (view.type === 'liquid' ||
           (view.type.includes('table') && view.render === 'echarts') ||
           view.type.includes('text') ||
-          view.type.includes('gauge')) {
+          view.type.includes('gauge') ||
+          view.type === 'table-pivot') {
         view.drillFields = []
       }
       view.customFilter.forEach(function(ele) {
@@ -1336,6 +1402,7 @@ export default {
         }
       })
       view.xaxis = JSON.stringify(view.xaxis)
+      view.xaxisExt = JSON.stringify(view.xaxisExt)
       view.yaxis = JSON.stringify(view.yaxis)
       view.yaxisExt = JSON.stringify(view.yaxisExt)
       view.customAttr = JSON.stringify(view.customAttr)
@@ -1360,6 +1427,7 @@ export default {
       }).then(response => {
         const view = JSON.parse(JSON.stringify(response.data))
         this.view.xaxis = view.xaxis ? JSON.parse(view.xaxis) : []
+        this.view.xaxisExt = view.xaxisExt ? JSON.parse(view.xaxisExt) : []
         this.view.yaxis = view.yaxis ? JSON.parse(view.yaxis) : []
         this.view.yaxisExt = view.yaxisExt ? JSON.parse(view.yaxisExt) : []
         this.view.extStack = view.extStack ? JSON.parse(view.extStack) : []
@@ -1393,6 +1461,7 @@ export default {
       // 将视图传入echart...组件
       const view = JSON.parse(JSON.stringify(this.view))
       view.xaxis = JSON.stringify(this.view.xaxis)
+      view.xaxisExt = JSON.stringify(this.view.xaxisExt)
       view.yaxis = JSON.stringify(this.view.yaxis)
       view.yaxisExt = JSON.stringify(this.view.yaxisExt)
       view.extStack = JSON.stringify(this.view.extStack)
@@ -1434,6 +1503,7 @@ export default {
           this.initTableData(response.data.tableId)
           this.view = JSON.parse(JSON.stringify(response.data))
           this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
+          this.view.xaxisExt = this.view.xaxisExt ? JSON.parse(this.view.xaxisExt) : []
           this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []
           this.view.yaxisExt = this.view.yaxisExt ? JSON.parse(this.view.yaxisExt) : []
           this.view.extStack = this.view.extStack ? JSON.parse(this.view.extStack) : []
@@ -1477,6 +1547,7 @@ export default {
           this.initTableData(response.data.tableId)
           this.view = JSON.parse(JSON.stringify(response.data))
           this.view.xaxis = this.view.xaxis ? JSON.parse(this.view.xaxis) : []
+          this.view.xaxisExt = this.view.xaxisExt ? JSON.parse(this.view.xaxisExt) : []
           this.view.yaxis = this.view.yaxis ? JSON.parse(this.view.yaxis) : []
           this.view.yaxisExt = this.view.yaxisExt ? JSON.parse(this.view.yaxisExt) : []
           this.view.extStack = this.view.extStack ? JSON.parse(this.view.extStack) : []
@@ -1507,7 +1578,11 @@ export default {
     },
 
     dimensionItemRemove(item) {
-      this.view.xaxis.splice(item.index, 1)
+      if (item.removeType === 'dimension') {
+        this.view.xaxis.splice(item.index, 1)
+      } else if (item.removeType === 'dimensionExt') {
+        this.view.xaxisExt.splice(item.index, 1)
+      }
       this.calcData(true)
     },
 
@@ -1715,6 +1790,8 @@ export default {
             this.view.xaxis[this.itemForm.index].name = this.itemForm.name
           } else if (this.itemForm.renameType === 'quotaExt') {
             this.view.yaxisExt[this.itemForm.index].name = this.itemForm.name
+          } else if (this.itemForm.renameType === 'dimensionExt') {
+            this.view.xaxisExt[this.itemForm.index].name = this.itemForm.name
           }
           this.calcData(true)
           this.closeRename()
@@ -1856,6 +1933,16 @@ export default {
       }
       this.calcData(true)
     },
+    addXaxisExt(e) {
+      if (this.view.type !== 'table-info') {
+        this.dragCheckType(this.view.xaxis, 'd')
+      }
+      this.dragMoveDuplicate(this.view.xaxis, e)
+      if ((this.view.type === 'map' || this.view.type === 'word-cloud') && this.view.xaxis.length > 1) {
+        this.view.xaxis = [this.view.xaxis[0]]
+      }
+      this.calcData(true)
+    },
     addYaxis(e) {
       this.dragCheckType(this.view.yaxis, 'q')
       this.dragMoveDuplicate(this.view.yaxis, e)
diff --git a/frontend/src/views/chart/view/ChartType.vue b/frontend/src/views/chart/view/ChartType.vue
index 546ea41fe5..e11c5ced17 100644
--- a/frontend/src/views/chart/view/ChartType.vue
+++ b/frontend/src/views/chart/view/ChartType.vue
@@ -20,7 +20,16 @@
               <p class="radio-label">{{ $t('chart.chart_table_info') }}</p>
             </el-radio>
           </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
+          <div style="position: relative;display: block;">
+            <el-radio value="table-pivot" label="table-pivot" border class="radio-style">
+              <span :title="$t('chart.chart_table_pivot')">
+                <svg-icon icon-class="table-pivot" class="chart-icon" />
+              </span>
+              <p class="radio-label">{{ $t('chart.chart_table_pivot') }}</p>
+            </el-radio>
+          </div>
+          <!--如需要，以下用于占位-->
+          <!--<el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>-->
         </div>
       </div>
 

From 590fe30c16428120685bff43a74f13c2783e7c76 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 8 Feb 2022 13:56:48 +0800
Subject: [PATCH 04/47] feat: S2 pivot

---
 .../src/views/chart/components/drag-item/DimensionExtItem.vue  | 3 ---
 frontend/src/views/chart/view/ChartEdit.vue                    | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
index 68f78092e9..08fb1c535c 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
@@ -49,9 +49,6 @@
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>
-          <!--          <el-dropdown-item icon="el-icon-files" :command="beforeClickItem('filter')">-->
-          <!--            <span>{{ $t('chart.filter') }}...</span>-->
-          <!--          </el-dropdown-item>-->
 
           <el-dropdown-item v-show="item.deType === 1" divided>
             <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="dateStyle">
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index ee407c8102..195ca65f24 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1284,9 +1284,6 @@ export default {
       })
       if (view.type === 'table-pivot') {
         view.xaxisExt.forEach(function(ele) {
-          // if (!ele.summary || ele.summary === '') {
-          //   ele.summary = 'sum'
-          // }
           if (!ele.dateStyle || ele.dateStyle === '') {
             ele.dateStyle = 'y_M_d'
           }

From 4d3324de528335347946d731f5acd2905150fc7a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 8 Feb 2022 14:03:35 +0800
Subject: [PATCH 05/47] =?UTF-8?q?refactor:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=AF=A6=E6=83=85=E5=A4=96=E5=B1=82?=
 =?UTF-8?q?=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/src/components/uni-col/uni-col.vue     |  317 +++++
 mobile/src/components/uni-icons/icons.js      |  132 --
 mobile/src/components/uni-icons/uni-icons.vue |   71 -
 mobile/src/components/uni-icons/uni.ttf       |  Bin 26164 -> 0 bytes
 mobile/src/components/uni-row/uni-row.vue     |  190 +++
 mobile/src/pages/tabBar/home/detail.nvue      |   36 +-
 mobile/src/uni_modules/uni-icons/changelog.md |   22 +
 .../uni-icons/components/uni-icons/icons.js   | 1169 +++++++++++++++++
 .../components/uni-icons/uni-icons.vue        |   96 ++
 .../components/uni-icons/uniicons.css         |  663 ++++++++++
 .../components/uni-icons/uniicons.ttf         |  Bin 0 -> 35760 bytes
 mobile/src/uni_modules/uni-icons/package.json |   86 ++
 mobile/src/uni_modules/uni-icons/readme.md    |    8 +
 .../src/uni_modules/uni-nav-bar/changelog.md  |   37 +
 .../components/uni-nav-bar/uni-nav-bar.vue    |  343 +++++
 .../components/uni-nav-bar/uni-status-bar.vue |   27 +
 .../src/uni_modules/uni-nav-bar/package.json  |   89 ++
 mobile/src/uni_modules/uni-nav-bar/readme.md  |   15 +
 mobile/src/uni_modules/uni-scss/changelog.md  |    8 +
 mobile/src/uni_modules/uni-scss/index.scss    |    1 +
 mobile/src/uni_modules/uni-scss/package.json  |   82 ++
 mobile/src/uni_modules/uni-scss/readme.md     |    4 +
 .../uni_modules/uni-scss/styles/index.scss    |    7 +
 .../uni-scss/styles/setting/_border.scss      |    3 +
 .../uni-scss/styles/setting/_color.scss       |   66 +
 .../uni-scss/styles/setting/_radius.scss      |   55 +
 .../uni-scss/styles/setting/_space.scss       |   56 +
 .../uni-scss/styles/setting/_styles.scss      |  167 +++
 .../uni-scss/styles/setting/_text.scss        |   24 +
 .../uni-scss/styles/setting/_variables.scss   |  146 ++
 .../uni-scss/styles/tools/functions.scss      |   19 +
 mobile/src/uni_modules/uni-scss/theme.scss    |   31 +
 .../src/uni_modules/uni-scss/variables.scss   |   62 +
 33 files changed, 3811 insertions(+), 221 deletions(-)
 create mode 100644 mobile/src/components/uni-col/uni-col.vue
 delete mode 100644 mobile/src/components/uni-icons/icons.js
 delete mode 100644 mobile/src/components/uni-icons/uni-icons.vue
 delete mode 100644 mobile/src/components/uni-icons/uni.ttf
 create mode 100644 mobile/src/components/uni-row/uni-row.vue
 create mode 100644 mobile/src/uni_modules/uni-icons/changelog.md
 create mode 100644 mobile/src/uni_modules/uni-icons/components/uni-icons/icons.js
 create mode 100644 mobile/src/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
 create mode 100644 mobile/src/uni_modules/uni-icons/components/uni-icons/uniicons.css
 create mode 100644 mobile/src/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
 create mode 100644 mobile/src/uni_modules/uni-icons/package.json
 create mode 100644 mobile/src/uni_modules/uni-icons/readme.md
 create mode 100644 mobile/src/uni_modules/uni-nav-bar/changelog.md
 create mode 100644 mobile/src/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
 create mode 100644 mobile/src/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
 create mode 100644 mobile/src/uni_modules/uni-nav-bar/package.json
 create mode 100644 mobile/src/uni_modules/uni-nav-bar/readme.md
 create mode 100644 mobile/src/uni_modules/uni-scss/changelog.md
 create mode 100644 mobile/src/uni_modules/uni-scss/index.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/package.json
 create mode 100644 mobile/src/uni_modules/uni-scss/readme.md
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/index.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/setting/_border.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/setting/_color.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/setting/_radius.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/setting/_space.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/setting/_styles.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/setting/_text.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/setting/_variables.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/styles/tools/functions.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/theme.scss
 create mode 100644 mobile/src/uni_modules/uni-scss/variables.scss

diff --git a/mobile/src/components/uni-col/uni-col.vue b/mobile/src/components/uni-col/uni-col.vue
new file mode 100644
index 0000000000..84e2deb4cf
--- /dev/null
+++ b/mobile/src/components/uni-col/uni-col.vue
@@ -0,0 +1,317 @@
+<template>
+	<!-- #ifndef APP-NVUE -->
+	<view :class="['uni-col', sizeClass, pointClassList]" :style="{
+		paddingLeft:`${Number(gutter)}rpx`,
+		paddingRight:`${Number(gutter)}rpx`,
+	}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+	<!-- #ifdef APP-NVUE -->
+	<!-- 在nvue上，类名样式不生效，换为style -->
+	<!-- 设置right正值失效，设置 left 负值 -->
+	<view :class="['uni-col']" :style="{
+		paddingLeft:`${Number(gutter)}rpx`,
+		paddingRight:`${Number(gutter)}rpx`,
+		width:`${nvueWidth}rpx`,
+		position:'relative',
+		marginLeft:`${marginLeft}rpx`,
+		left:`${right === 0 ? left : -right}rpx`
+	}">
+		<slot></slot>
+	</view>
+	<!-- #endif -->
+</template>
+
+<script>
+	/**
+	 * Col	布局-列
+	 * @description	搭配uni-row使用，构建布局。
+	 * @tutorial	https://ext.dcloud.net.cn/plugin?id=3958
+	 *
+	 * @property	{span} type = Number 栅格占据的列数
+	 * 						默认 24
+	 * @property	{offset} type = Number 栅格左侧的间隔格数
+	 * @property	{push} type = Number 栅格向右移动格数
+	 * @property	{pull} type = Number 栅格向左移动格数
+	 * @property	{xs} type = [Number, Object] <768px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{sm} type = [Number, Object] ≥768px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{md} type = [Number, Object] ≥992px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{lg} type = [Number, Object] ≥1200px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 * @property	{xl} type = [Number, Object] ≥1920px 响应式栅格数或者栅格属性对象
+	 * 						@description	Number时表示在此屏幕宽度下，栅格占据的列数。Object时可配置多个描述{span: 4, offset: 4}
+	 */
+	const ComponentClass = 'uni-col';
+
+	// -1 默认值，因为在微信小程序端只给Number会有默认值0
+	export default {
+		name: 'uniCol',
+		// #ifdef MP-WEIXIN
+		options: {
+			virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现
+		},
+		// #endif
+		props: {
+			span: {
+				type: Number,
+				default: 24
+			},
+			offset: {
+				type: Number,
+				default: -1
+			},
+			pull: {
+				type: Number,
+				default: -1
+			},
+			push: {
+				type: Number,
+				default: -1
+			},
+			xs: [Number, Object],
+			sm: [Number, Object],
+			md: [Number, Object],
+			lg: [Number, Object],
+			xl: [Number, Object]
+		},
+		data() {
+			return {
+				gutter: 0,
+				sizeClass: '',
+				parentWidth: 0,
+				nvueWidth: 0,
+				marginLeft: 0,
+				right: 0,
+				left: 0
+			}
+		},
+		created() {
+			// 字节小程序中，在computed中读取$parent为undefined
+			let parent = this.$parent;
+
+			while (parent && parent.$options.componentName !== 'uniRow') {
+				parent = parent.$parent;
+			}
+
+			this.updateGutter(parent.gutter)
+			parent.$watch('gutter', (gutter) => {
+				this.updateGutter(gutter)
+			})
+
+			// #ifdef APP-NVUE
+			this.updateNvueWidth(parent.width)
+			parent.$watch('width', (width) => {
+				this.updateNvueWidth(width)
+			})
+			// #endif
+		},
+		computed: {
+			sizeList() {
+				let {
+					span,
+					offset,
+					pull,
+					push
+				} = this;
+
+				return {
+					span,
+					offset,
+					pull,
+					push
+				}
+			},
+			// #ifndef APP-NVUE
+			pointClassList() {
+				let classList = [];
+
+				['xs', 'sm', 'md', 'lg', 'xl'].forEach(point => {
+					const props = this[point];
+					if (typeof props === 'number') {
+						classList.push(`${ComponentClass}-${point}-${props}`)
+					} else if (typeof props === 'object' && props) {
+						Object.keys(props).forEach(pointProp => {
+							classList.push(
+								pointProp === 'span' ?
+								`${ComponentClass}-${point}-${props[pointProp]}` :
+								`${ComponentClass}-${point}-${pointProp}-${props[pointProp]}`
+							)
+						})
+					}
+				});
+
+				// 支付宝小程序使用 :class=[ ['a','b'] ]，渲染错误
+				return classList.join(' ');
+			}
+			// #endif
+		},
+		methods: {
+			updateGutter(parentGutter) {
+				parentGutter = Number(parentGutter);
+				if (!isNaN(parentGutter)) {
+					this.gutter = parentGutter / 2
+				}
+			},
+			// #ifdef APP-NVUE
+			updateNvueWidth(width) {
+				// 用于在nvue端，span，offset，pull，push的计算
+				this.parentWidth = width;
+				['span', 'offset', 'pull', 'push'].forEach(size => {
+					const curSize = this[size];
+					if ((curSize || curSize === 0) && curSize !== -1) {
+						let RPX = 1 / 24 * curSize * width
+						RPX = Number(RPX);
+						switch (size) {
+							case 'span':
+								this.nvueWidth = RPX
+								break;
+							case 'offset':
+								this.marginLeft = RPX
+								break;
+							case 'pull':
+								this.right = RPX
+								break;
+							case 'push':
+								this.left = RPX
+								break;
+						}
+					}
+				});
+			}
+			// #endif
+		},
+		watch: {
+			sizeList: {
+				immediate: true,
+				handler(newVal) {
+					// #ifndef APP-NVUE
+					let classList = [];
+					for (let size in newVal) {
+						const curSize = newVal[size];
+						if ((curSize || curSize === 0) && curSize !== -1) {
+							classList.push(
+								size === 'span' ?
+								`${ComponentClass}-${curSize}` :
+								`${ComponentClass}-${size}-${curSize}`
+							)
+						}
+					}
+					// 支付宝小程序使用 :class=[ ['a','b'] ]，渲染错误
+					this.sizeClass = classList.join(' ');
+					// #endif
+					// #ifdef APP-NVUE
+					this.updateNvueWidth(this.parentWidth);
+					// #endif
+				}
+			}
+		}
+	}
+</script>
+
+<style lang='scss' scoped>
+	/* breakpoints */
+	$--sm: 768px !default;
+	$--md: 992px !default;
+	$--lg: 1200px !default;
+	$--xl: 1920px !default;
+
+	$breakpoints: ('xs' : (max-width: $--sm - 1),
+	'sm' : (min-width: $--sm),
+	'md' : (min-width: $--md),
+	'lg' : (min-width: $--lg),
+	'xl' : (min-width: $--xl));
+
+	$layout-namespace: ".uni-";
+	$col: $layout-namespace+"col";
+
+	@function getSize($size) {
+		/* TODO 1/24 * $size * 100 * 1%; 使用计算后的值，为了解决 vue3 控制台报错 */
+		@return 0.04166666666 * $size * 100 * 1%;
+	}
+
+	@mixin res($key, $map:$breakpoints) {
+		@if map-has-key($map, $key) {
+			@media screen and #{inspect(map-get($map,$key))} {
+				@content;
+			}
+		}
+
+		@else {
+			@warn "Undeinfed point: `#{$key}`";
+		}
+	}
+
+	/* #ifndef APP-NVUE */
+	#{$col} {
+		float: left;
+		box-sizing: border-box;
+	}
+
+	#{$col}-0 {
+		/* #ifdef APP-NVUE */
+		width: 0;
+		height: 0;
+		margin-top: 0;
+		margin-right: 0;
+		margin-bottom: 0;
+		margin-left: 0;
+		/* #endif */
+		/* #ifndef APP-NVUE */
+		display: none;
+		/* #endif */
+	}
+
+	@for $i from 0 through 24 {
+		#{$col}-#{$i} {
+			width: getSize($i);
+		}
+
+		#{$col}-offset-#{$i} {
+			margin-left: getSize($i);
+		}
+
+		#{$col}-pull-#{$i} {
+			position: relative;
+			right: getSize($i);
+		}
+
+		#{$col}-push-#{$i} {
+			position: relative;
+			left: getSize($i);
+		}
+	}
+
+	@each $point in map-keys($breakpoints) {
+		@include res($point) {
+			#{$col}-#{$point}-0 {
+				display: none;
+			}
+
+			@for $i from 0 through 24 {
+				#{$col}-#{$point}-#{$i} {
+					width: getSize($i);
+				}
+
+				#{$col}-#{$point}-offset-#{$i} {
+					margin-left: getSize($i);
+				}
+
+				#{$col}-#{$point}-pull-#{$i} {
+					position: relative;
+					right: getSize($i);
+				}
+
+				#{$col}-#{$point}-push-#{$i} {
+					position: relative;
+					left: getSize($i);
+				}
+			}
+		}
+	}
+
+	/* #endif */
+</style>
diff --git a/mobile/src/components/uni-icons/icons.js b/mobile/src/components/uni-icons/icons.js
deleted file mode 100644
index 60b733214d..0000000000
--- a/mobile/src/components/uni-icons/icons.js
+++ /dev/null
@@ -1,132 +0,0 @@
-export default {
-	"pulldown": "\ue588",
-	"refreshempty": "\ue461",
-	"back": "\ue471",
-	"forward": "\ue470",
-	"more": "\ue507",
-	"more-filled": "\ue537",
-	"scan": "\ue612",
-	"qq": "\ue264",
-	"weibo": "\ue260",
-	"weixin": "\ue261",
-	"pengyouquan": "\ue262",
-	"loop": "\ue565",
-	"refresh": "\ue407",
-	"refresh-filled": "\ue437",
-	"arrowthindown": "\ue585",
-	"arrowthinleft": "\ue586",
-	"arrowthinright": "\ue587",
-	"arrowthinup": "\ue584",
-	"undo-filled": "\ue7d6",
-	"undo": "\ue406",
-	"redo": "\ue405",
-	"redo-filled": "\ue7d9",
-	"bars": "\ue563",
-	"chatboxes": "\ue203",
-	"camera": "\ue301",
-	"chatboxes-filled": "\ue233",
-	"camera-filled": "\ue7ef",
-	"cart-filled": "\ue7f4",
-	"cart": "\ue7f5",
-	"checkbox-filled": "\ue442",
-	"checkbox": "\ue7fa",
-	"arrowleft": "\ue582",
-	"arrowdown": "\ue581",
-	"arrowright": "\ue583",
-	"smallcircle-filled": "\ue801",
-	"arrowup": "\ue580",
-	"circle": "\ue411",
-	"eye-filled": "\ue568",
-	"eye-slash-filled": "\ue822",
-	"eye-slash": "\ue823",
-	"eye": "\ue824",
-	"flag-filled": "\ue825",
-	"flag": "\ue508",
-	"gear-filled": "\ue532",
-	"reload": "\ue462",
-	"gear": "\ue502",
-	"hand-thumbsdown-filled": "\ue83b",
-	"hand-thumbsdown": "\ue83c",
-	"hand-thumbsup-filled": "\ue83d",
-	"heart-filled": "\ue83e",
-	"hand-thumbsup": "\ue83f",
-	"heart": "\ue840",
-	"home": "\ue500",
-	"info": "\ue504",
-	"home-filled": "\ue530",
-	"info-filled": "\ue534",
-	"circle-filled": "\ue441",
-	"chat-filled": "\ue847",
-	"chat": "\ue263",
-	"mail-open-filled": "\ue84d",
-	"email-filled": "\ue231",
-	"mail-open": "\ue84e",
-	"email": "\ue201",
-	"checkmarkempty": "\ue472",
-	"list": "\ue562",
-	"locked-filled": "\ue856",
-	"locked": "\ue506",
-	"map-filled": "\ue85c",
-	"map-pin": "\ue85e",
-	"map-pin-ellipse": "\ue864",
-	"map": "\ue364",
-	"minus-filled": "\ue440",
-	"mic-filled": "\ue332",
-	"minus": "\ue410",
-	"micoff": "\ue360",
-	"mic": "\ue302",
-	"clear": "\ue434",
-	"smallcircle": "\ue868",
-	"close": "\ue404",
-	"closeempty": "\ue460",
-	"paperclip": "\ue567",
-	"paperplane": "\ue503",
-	"paperplane-filled": "\ue86e",
-	"person-filled": "\ue131",
-	"contact-filled": "\ue130",
-	"person": "\ue101",
-	"contact": "\ue100",
-	"images-filled": "\ue87a",
-	"phone": "\ue200",
-	"images": "\ue87b",
-	"image": "\ue363",
-	"image-filled": "\ue877",
-	"location-filled": "\ue333",
-	"location": "\ue303",
-	"plus-filled": "\ue439",
-	"plus": "\ue409",
-	"plusempty": "\ue468",
-	"help-filled": "\ue535",
-	"help": "\ue505",
-	"navigate-filled": "\ue884",
-	"navigate": "\ue501",
-	"mic-slash-filled": "\ue892",
-	"search": "\ue466",
-	"settings": "\ue560",
-	"sound": "\ue590",
-	"sound-filled": "\ue8a1",
-	"spinner-cycle": "\ue465",
-	"download-filled": "\ue8a4",
-	"personadd-filled": "\ue132",
-	"videocam-filled": "\ue8af",
-	"personadd": "\ue102",
-	"upload": "\ue402",
-	"upload-filled": "\ue8b1",
-	"starhalf": "\ue463",
-	"star-filled": "\ue438",
-	"star": "\ue408",
-	"trash": "\ue401",
-	"phone-filled": "\ue230",
-	"compose": "\ue400",
-	"videocam": "\ue300",
-	"trash-filled": "\ue8dc",
-	"download": "\ue403",
-	"chatbubble-filled": "\ue232",
-	"chatbubble": "\ue202",
-	"cloud-download": "\ue8e4",
-	"cloud-upload-filled": "\ue8e5",
-	"cloud-upload": "\ue8e6",
-	"cloud-download-filled": "\ue8e9",
-	"headphones":"\ue8bf",
-	"shop":"\ue609"
-}
diff --git a/mobile/src/components/uni-icons/uni-icons.vue b/mobile/src/components/uni-icons/uni-icons.vue
deleted file mode 100644
index 59b87cf7b8..0000000000
--- a/mobile/src/components/uni-icons/uni-icons.vue
+++ /dev/null
@@ -1,71 +0,0 @@
-<template>
-	<text :style="{ color: color, 'font-size': size + 'px' }" class="uni-icons" :class="[customIcons,customIcons?type:'']" @click="_onClick">{{icons[type]}}</text>
-</template>
-
-<script>
-	import icons from './icons.js';
-	// #ifdef APP-NVUE
-	var domModule = weex.requireModule('dom');
-	domModule.addRule('fontFace', {
-		'fontFamily': "uniicons",
-		'src': "url('data:font/truetype;charset=utf-8;base64,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AXcBeAF5AXoBewF8AX0BfgF/AYABgQGCAYMHdW5pMDAwMAdjb250YWN0BnBlcnNvbglwZXJzb25hZGQNY29udGFjdGZpbGxlZAxwZXJzb25maWxsZWQPcGVyc29uYWRkZmlsbGVkBXBob25lBWVtYWlsCmNoYXRidWJibGUJY2hhdGJveGVzC3Bob25lZmlsbGVkC2VtYWlsZmlsbGVkEGNoYXRidWJibGVmaWxsZWQPY2hhdGJveGVzZmlsbGVkBXdlaWJvBndlaXhpbgtwZW5neW91cXVhbgRjaGF0AnFxCHZpZGVvY2FtBmNhbWVyYQNtaWMIbG9jYXRpb24JbWljZmlsbGVkDmxvY2F0aW9uZmlsbGVkBm1pY29mZgVpbWFnZQNtYXAHY29tcG9zZQV0cmFzaAZ1cGxvYWQIZG93bmxvYWQFY2xvc2UEcmVkbwR1bmRvB3JlZnJlc2gEc3Rhcgt3aGl0ZWNpcmNsZQVjbGVhcg1yZWZyZXNoZmlsbGVkCnN0YXJmaWxsZWQKcGx1c2ZpbGxlZAttaW51c2ZpbGxlZAxjaXJjbGVmaWxsZWQOY2hlY2tib3hmaWxsZWQKY2xvc2VlbXB0eQxyZWZyZXNoZW1wdHkGcmVsb2FkCHN0YXJoYWxmDHNwaW5uZXJjeWNsZQZzZWFyY2gJcGx1c2VtcHR5B2ZvcndhcmQEYmFjaw5jaGVja21hcmtlbXB0eQRob21lCG5hdmlnYXRlBGdlYXIKcGFwZXJwbGFuZQRpbmZvBGhlbHAGbG9ja2VkBG1vcmUEZmxhZwpob21lZmlsbGVkCmdlYXJmaWxsZWQKaW5mb2ZpbGxlZApoZWxwZmlsbGVkCm1vcmVmaWxsZWQIc2V0dGluZ3MEbGlzdARiYXJzBGxvb3AJcGFwZXJjbGlwCWV5ZWZpbGxlZAx1cHdhcmRzYXJyb3cOZG93bndhcmRzYXJyb3cObGVmdHdhcmRzYXJyb3cPcmlnaHR3YXJkc2Fycm93C2Fycm93dGhpbnVwDWFycm93dGhpbmRvd24NYXJyb3d0aGlubGVmdA5hcnJvd3RoaW5yaWdodAhwdWxsZG93bgVzb3VuZARzaG9wBHNjYW4KdW5kb2ZpbGxlZApyZWRvZmlsbGVkDGNhbWVyYWZpbGxlZApjYXJ0ZmlsbGVkBGNhcnQIY2hlY2tib3gRc21hbGxjaXJjbGVmaWxsZWQOZXllc2xhc2hmaWxsZWQIZXllc2xhc2gDZXllCmZsYWdmaWxsZWQVaGFuZHRodW1ic2Rvd25fZmlsbGVkDmhhbmR0aHVtYnNkb3duEmhhbmR0aHVtYnN1cGZpbGxlZAtoZWFydGZpbGxlZAxoYW5kdGh1bWJzdXAOYmxhY2toZWFydHN1aXQKY2hhdGZpbGxlZA5tYWlsb3BlbmZpbGxlZAhtYWlsb3Blbgxsb2NrZWRmaWxsZWQJbWFwZmlsbGVkBm1hcHBpbg1tYXBwaW5lbGxpcHNlC3NtYWxsY2lyY2xlEHBhcGVycGxhbmVmaWxsZWQLaW1hZ2VmaWxsZWQMaW1hZ2VzZmlsbGVkBmltYWdlcw5uYXZpZ2F0ZWZpbGxlZA5taWNzbGFzaGZpbGxlZAtzb3VuZGZpbGxlZA5kb3dubG9hZGZpbGxlZA52aWRlb2NhbWZpbGxlZAx1cGxvYWRmaWxsZWQKaGVhZHBob25lcwt0cmFzaGZpbGxlZA1jbG91ZGRvd25sb2FkEWNsb3VkdXBsb2FkZmlsbGVkC2Nsb3VkdXBsb2FkE2Nsb3VkZG93bmxvYWRmaWxsZWQHdW5pMDAwOQAAAAAB//8AAgABAAAADAAAABYAAAACAAEAAQCFAAEABAAAAAIAAAAAAAAAAQAAAADVpCcIAAAAANoxE3MAAAAA2jSpUA==')"
-	});
-	// #endif
-
-	/**
-	 * Icons 图标
-	 * @description 用于展示 icons 图标
-	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
-	 * @property {Number} size 图标大小
-	 * @property {String} type 图标图案，参考示例
-	 * @property {String} color 图标颜色
-	 * @event {Function} click 点击 Icon 触发事件
-	 */
-	export default {
-		name: 'UniIcons',
-		emits: ['click'],
-		props: {
-			type: {
-				type: String,
-				default: ''
-			},
-			color: {
-				type: String,
-				default: '#333333'
-			},
-			size: {
-				type: [Number, String],
-				default: 16
-			},
-			customIcons: {
-				type: String,
-				default: ''
-			}
-		},
-		data() {
-			return {
-				icons: icons
-			}
-		},
-		methods: {
-			_onClick() {
-				this.$emit('click')
-			}
-		}
-	}
-</script>
-
-<style scoped>
-	/* #ifndef APP-NVUE */
-	@font-face {
-		font-family: uniicons;
-		src: url("./uni.ttf") format("truetype");
-	}
-
-	/* #endif */
-	.uni-icons {
-		font-family: uniicons;
-		text-decoration: none;
-		text-align: center;
-	}
-</style>
\ No newline at end of file
diff --git a/mobile/src/components/uni-icons/uni.ttf b/mobile/src/components/uni-icons/uni.ttf
deleted file mode 100644
index 60a1968d08cc6056c70b5402b2effac43c6f96a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 26164
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

diff --git a/mobile/src/components/uni-row/uni-row.vue b/mobile/src/components/uni-row/uni-row.vue
new file mode 100644
index 0000000000..f8e854239a
--- /dev/null
+++ b/mobile/src/components/uni-row/uni-row.vue
@@ -0,0 +1,190 @@
+<template>
+	<view :class="[ 'uni-row', typeClass , justifyClass, alignClass, ]" :style="{
+		marginLeft:`${Number(marginValue)}rpx`,
+		marginRight:`${Number(marginValue)}rpx`,
+	}">
+		<slot></slot>
+	</view>
+</template>
+
+<script>
+	const ComponentClass = 'uni-row';
+	const modifierSeparator = '--';
+	/**
+	 * Row	布局-行
+	 * @description	流式栅格系统，随着屏幕或视口分为 24 份，可以迅速简便地创建布局。
+	 * @tutorial	https://ext.dcloud.net.cn/plugin?id=3958
+	 *
+	 * @property	{gutter} type = Number 栅格间隔
+	 * @property	{justify} type = String flex 布局下的水平排列方式
+	 * 						可选	start/end/center/space-around/space-between	start
+	 * 						默认值	start
+	 * @property	{align} type = String flex 布局下的垂直排列方式
+	 * 						可选	top/middle/bottom
+	 * 						默认值	top
+	 * @property	{width} type = String|Number nvue下需要自行配置宽度用于计算
+	 * 						默认值 750
+	 */
+
+
+	export default {
+		name: 'uniRow',
+		componentName: 'uniRow',
+		// #ifdef MP-WEIXIN
+		options: {
+			virtualHost: true // 在微信小程序中将组件节点渲染为虚拟节点，更加接近Vue组件的表现，可使用flex布局
+		},
+		// #endif
+		props: {
+			type: String,
+			gutter: Number,
+			justify: {
+				type: String,
+				default: 'start'
+			},
+			align: {
+				type: String,
+				default: 'top'
+			},
+			// nvue如果使用span等属性，需要配置宽度
+			width: {
+				type: [String, Number],
+				default: 750
+			}
+		},
+		created() {
+			// #ifdef APP-NVUE
+			this.type = 'flex';
+			// #endif
+		},
+		computed: {
+			marginValue() {
+				// #ifndef APP-NVUE
+				if (this.gutter) {
+					return -(this.gutter / 2);
+				}
+				// #endif
+				return 0;
+			},
+			typeClass() {
+				return this.type === 'flex' ? `${ComponentClass + modifierSeparator}flex` : '';
+			},
+			justifyClass() {
+				return this.justify !== 'start' ? `${ComponentClass + modifierSeparator}flex-justify-${this.justify}` : ''
+			},
+			alignClass() {
+				return this.align !== 'top' ? `${ComponentClass + modifierSeparator}flex-align-${this.align}` : ''
+			}
+		}
+	};
+</script>
+
+<style lang="scss">
+	$layout-namespace: ".uni-";
+	$row:$layout-namespace+"row";
+	$modifier-separator: "--";
+
+	@mixin utils-clearfix {
+		$selector: &;
+
+		@at-root {
+
+			/* #ifndef APP-NVUE */
+			#{$selector}::before,
+			#{$selector}::after {
+				display: table;
+				content: "";
+			}
+
+			#{$selector}::after {
+				clear: both;
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	@mixin utils-flex ($direction: row) {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: $direction;
+	}
+
+	@mixin set-flex($state) {
+		@at-root &-#{$state} {
+			@content
+		}
+	}
+
+	#{$row} {
+		position: relative;
+		flex-direction: row;
+
+		/* #ifdef APP-NVUE */
+		flex: 1;
+		/* #endif */
+
+		/* #ifndef APP-NVUE */
+		box-sizing: border-box;
+		/* #endif */
+
+		// 非nvue使用float布局
+		@include utils-clearfix;
+
+		// 在QQ、字节、百度小程序平台，编译后使用shadow dom，不可使用flex布局，使用float
+		@at-root {
+
+			/* #ifndef MP-QQ || MP-TOUTIAO || MP-BAIDU */
+			&#{$modifier-separator}flex {
+				@include utils-flex;
+				flex-wrap: wrap;
+				flex: 1;
+
+				&:before,
+				&:after {
+					/* #ifndef APP-NVUE */
+					display: none;
+					/* #endif */
+				}
+
+				@include set-flex(justify-center) {
+					justify-content: center;
+				}
+
+				@include set-flex(justify-end) {
+					justify-content: flex-end;
+				}
+
+				@include set-flex(justify-space-between) {
+					justify-content: space-between;
+				}
+
+				@include set-flex(justify-space-around) {
+					justify-content: space-around;
+				}
+
+				@include set-flex(align-middle) {
+					align-items: center;
+				}
+
+				@include set-flex(align-bottom) {
+					align-items: flex-end;
+				}
+			}
+
+			/* #endif */
+		}
+
+	}
+
+	// 字节、QQ配置后不生效
+	// 此处用法无法使用scoped
+	/* #ifdef MP-WEIXIN || MP-TOUTIAO || MP-QQ */
+	:host {
+		display: block;
+	}
+
+	/* #endif */
+</style>
diff --git a/mobile/src/pages/tabBar/home/detail.nvue b/mobile/src/pages/tabBar/home/detail.nvue
index efcc926bee..9f92ddb352 100644
--- a/mobile/src/pages/tabBar/home/detail.nvue
+++ b/mobile/src/pages/tabBar/home/detail.nvue
@@ -1,9 +1,21 @@
 <template>
 	<view class="page dataease-main">
-        <uni-list>
-            <uni-list-item class="person-title" :title="banner.title" />
-        </uni-list>
-		
+       
+		<uni-nav-bar :title="banner.title" >
+			<view slot="right">
+				<uni-row class="demo-uni-row" >
+					<uni-col :span="12" @click="enshrine">
+						<uni-icons v-if="hasStar" type="star-filled" size="18" color="#007AFF"></uni-icons>
+						<uni-icons v-else type="star" size="18" color="#999"></uni-icons>
+					</uni-col>
+					
+					<uni-col :span="12" @click="refresh" style="margin: 0 10rpx;">
+						<uni-icons type="reload" size="18" color="#999"></uni-icons>
+					</uni-col>
+				</uni-row>
+				
+			</view>
+		</uni-nav-bar>
 		<view class="article-content">
             <view v-if="url">
                 <web-view
@@ -17,19 +29,7 @@
 		<ad v-if="htmlNodes.length > 0" unit-id="adunit-01b7a010bf53d74e"></ad>
 		<!-- #endif -->
 
-        <view  class="card-actions">
-            <view v-if="banner.index === 2" class="card-actions-item">
-
-            </view>
-            <view v-else class="card-actions-item" @click="enshrine">
-                <uni-icons v-if="hasStar" type="star-filled" size="18" color="#007AFF"></uni-icons>
-                <uni-icons v-else type="star" size="18" color="#999"></uni-icons>
-            </view>
-            
-            <view class="card-actions-item" @click="refresh">
-                <uni-icons type="reload" size="18" color="#999"></uni-icons>
-            </view>
-        </view>
+       
 	</view>
 </template>
 
@@ -271,7 +271,7 @@
     
 }
 .article-content {
-    height: calc(100vh - 110px);
+    height: 100vh;
     margin: 5px 0;
     background: #ffffff;
 }
diff --git a/mobile/src/uni_modules/uni-icons/changelog.md b/mobile/src/uni_modules/uni-icons/changelog.md
new file mode 100644
index 0000000000..64498853cd
--- /dev/null
+++ b/mobile/src/uni_modules/uni-icons/changelog.md
@@ -0,0 +1,22 @@
+## 1.3.5（2022-01-24）
+- 优化 size 属性可以传入不带单位的字符串数值
+## 1.3.4（2022-01-24）
+- 优化 size 支持其他单位
+## 1.3.3（2022-01-17）
+- 修复 nvue 有些图标不显示的bug，兼容老版本图标
+## 1.3.2（2021-12-01）
+- 优化 示例可复制图标名称
+## 1.3.1（2021-11-23）
+- 优化 兼容旧组件 type 值
+## 1.3.0（2021-11-19）
+- 新增 更多图标
+- 优化 自定义图标使用方式
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-icons](https://uniapp.dcloud.io/component/uniui/uni-icons)
+## 1.1.7（2021-11-08）
+## 1.2.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.1.5（2021-05-12）
+- 新增 组件示例地址
+## 1.1.4（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/mobile/src/uni_modules/uni-icons/components/uni-icons/icons.js b/mobile/src/uni_modules/uni-icons/components/uni-icons/icons.js
new file mode 100644
index 0000000000..78899364ed
--- /dev/null
+++ b/mobile/src/uni_modules/uni-icons/components/uni-icons/icons.js
@@ -0,0 +1,1169 @@
+export default {
+  "id": "2852637",
+  "name": "uniui图标库",
+  "font_family": "uniicons",
+  "css_prefix_text": "uniui-",
+  "description": "",
+  "glyphs": [
+    {
+      "icon_id": "25027049",
+      "name": "yanse",
+      "font_class": "color",
+      "unicode": "e6cf",
+      "unicode_decimal": 59087
+    },
+    {
+      "icon_id": "25027048",
+      "name": "wallet",
+      "font_class": "wallet",
+      "unicode": "e6b1",
+      "unicode_decimal": 59057
+    },
+    {
+      "icon_id": "25015720",
+      "name": "settings-filled",
+      "font_class": "settings-filled",
+      "unicode": "e6ce",
+      "unicode_decimal": 59086
+    },
+    {
+      "icon_id": "25015434",
+      "name": "shimingrenzheng-filled",
+      "font_class": "auth-filled",
+      "unicode": "e6cc",
+      "unicode_decimal": 59084
+    },
+    {
+      "icon_id": "24934246",
+      "name": "shop-filled",
+      "font_class": "shop-filled",
+      "unicode": "e6cd",
+      "unicode_decimal": 59085
+    },
+    {
+      "icon_id": "24934159",
+      "name": "staff-filled-01",
+      "font_class": "staff-filled",
+      "unicode": "e6cb",
+      "unicode_decimal": 59083
+    },
+    {
+      "icon_id": "24932461",
+      "name": "VIP-filled",
+      "font_class": "vip-filled",
+      "unicode": "e6c6",
+      "unicode_decimal": 59078
+    },
+    {
+      "icon_id": "24932462",
+      "name": "plus_circle_fill",
+      "font_class": "plus-filled",
+      "unicode": "e6c7",
+      "unicode_decimal": 59079
+    },
+    {
+      "icon_id": "24932463",
+      "name": "folder_add-filled",
+      "font_class": "folder-add-filled",
+      "unicode": "e6c8",
+      "unicode_decimal": 59080
+    },
+    {
+      "icon_id": "24932464",
+      "name": "yanse-filled",
+      "font_class": "color-filled",
+      "unicode": "e6c9",
+      "unicode_decimal": 59081
+    },
+    {
+      "icon_id": "24932465",
+      "name": "tune-filled",
+      "font_class": "tune-filled",
+      "unicode": "e6ca",
+      "unicode_decimal": 59082
+    },
+    {
+      "icon_id": "24932455",
+      "name": "a-rilidaka-filled",
+      "font_class": "calendar-filled",
+      "unicode": "e6c0",
+      "unicode_decimal": 59072
+    },
+    {
+      "icon_id": "24932456",
+      "name": "notification-filled",
+      "font_class": "notification-filled",
+      "unicode": "e6c1",
+      "unicode_decimal": 59073
+    },
+    {
+      "icon_id": "24932457",
+      "name": "wallet-filled",
+      "font_class": "wallet-filled",
+      "unicode": "e6c2",
+      "unicode_decimal": 59074
+    },
+    {
+      "icon_id": "24932458",
+      "name": "paihangbang-filled",
+      "font_class": "medal-filled",
+      "unicode": "e6c3",
+      "unicode_decimal": 59075
+    },
+    {
+      "icon_id": "24932459",
+      "name": "gift-filled",
+      "font_class": "gift-filled",
+      "unicode": "e6c4",
+      "unicode_decimal": 59076
+    },
+    {
+      "icon_id": "24932460",
+      "name": "fire-filled",
+      "font_class": "fire-filled",
+      "unicode": "e6c5",
+      "unicode_decimal": 59077
+    },
+    {
+      "icon_id": "24928001",
+      "name": "refreshempty",
+      "font_class": "refreshempty",
+      "unicode": "e6bf",
+      "unicode_decimal": 59071
+    },
+    {
+      "icon_id": "24926853",
+      "name": "location-ellipse",
+      "font_class": "location-filled",
+      "unicode": "e6af",
+      "unicode_decimal": 59055
+    },
+    {
+      "icon_id": "24926735",
+      "name": "person-filled",
+      "font_class": "person-filled",
+      "unicode": "e69d",
+      "unicode_decimal": 59037
+    },
+    {
+      "icon_id": "24926703",
+      "name": "personadd-filled",
+      "font_class": "personadd-filled",
+      "unicode": "e698",
+      "unicode_decimal": 59032
+    },
+    {
+      "icon_id": "24923351",
+      "name": "back",
+      "font_class": "back",
+      "unicode": "e6b9",
+      "unicode_decimal": 59065
+    },
+    {
+      "icon_id": "24923352",
+      "name": "forward",
+      "font_class": "forward",
+      "unicode": "e6ba",
+      "unicode_decimal": 59066
+    },
+    {
+      "icon_id": "24923353",
+      "name": "arrowthinright",
+      "font_class": "arrow-right",
+      "unicode": "e6bb",
+      "unicode_decimal": 59067
+    },
+		{
+		  "icon_id": "24923353",
+		  "name": "arrowthinright",
+		  "font_class": "arrowthinright",
+		  "unicode": "e6bb",
+		  "unicode_decimal": 59067
+		},
+    {
+      "icon_id": "24923354",
+      "name": "arrowthinleft",
+      "font_class": "arrow-left",
+      "unicode": "e6bc",
+      "unicode_decimal": 59068
+    },
+		{
+		  "icon_id": "24923354",
+		  "name": "arrowthinleft",
+		  "font_class": "arrowthinleft",
+		  "unicode": "e6bc",
+		  "unicode_decimal": 59068
+		},
+    {
+      "icon_id": "24923355",
+      "name": "arrowthinup",
+      "font_class": "arrow-up",
+      "unicode": "e6bd",
+      "unicode_decimal": 59069
+    },
+		{
+		  "icon_id": "24923355",
+		  "name": "arrowthinup",
+		  "font_class": "arrowthinup",
+		  "unicode": "e6bd",
+		  "unicode_decimal": 59069
+		},
+    {
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrow-down",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },{
+      "icon_id": "24923356",
+      "name": "arrowthindown",
+      "font_class": "arrowthindown",
+      "unicode": "e6be",
+      "unicode_decimal": 59070
+    },
+    {
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "bottom",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },{
+      "icon_id": "24923349",
+      "name": "arrowdown",
+      "font_class": "arrowdown",
+      "unicode": "e6b8",
+      "unicode_decimal": 59064
+    },
+    {
+      "icon_id": "24923346",
+      "name": "arrowright",
+      "font_class": "right",
+      "unicode": "e6b5",
+      "unicode_decimal": 59061
+    },
+		{
+		  "icon_id": "24923346",
+		  "name": "arrowright",
+		  "font_class": "arrowright",
+		  "unicode": "e6b5",
+		  "unicode_decimal": 59061
+		},
+    {
+      "icon_id": "24923347",
+      "name": "arrowup",
+      "font_class": "top",
+      "unicode": "e6b6",
+      "unicode_decimal": 59062
+    },
+		{
+		  "icon_id": "24923347",
+		  "name": "arrowup",
+		  "font_class": "arrowup",
+		  "unicode": "e6b6",
+		  "unicode_decimal": 59062
+		},
+    {
+      "icon_id": "24923348",
+      "name": "arrowleft",
+      "font_class": "left",
+      "unicode": "e6b7",
+      "unicode_decimal": 59063
+    },
+		{
+		  "icon_id": "24923348",
+		  "name": "arrowleft",
+		  "font_class": "arrowleft",
+		  "unicode": "e6b7",
+		  "unicode_decimal": 59063
+		},
+    {
+      "icon_id": "24923334",
+      "name": "eye",
+      "font_class": "eye",
+      "unicode": "e651",
+      "unicode_decimal": 58961
+    },
+    {
+      "icon_id": "24923335",
+      "name": "eye-filled",
+      "font_class": "eye-filled",
+      "unicode": "e66a",
+      "unicode_decimal": 58986
+    },
+    {
+      "icon_id": "24923336",
+      "name": "eye-slash",
+      "font_class": "eye-slash",
+      "unicode": "e6b3",
+      "unicode_decimal": 59059
+    },
+    {
+      "icon_id": "24923337",
+      "name": "eye-slash-filled",
+      "font_class": "eye-slash-filled",
+      "unicode": "e6b4",
+      "unicode_decimal": 59060
+    },
+    {
+      "icon_id": "24923305",
+      "name": "info-filled",
+      "font_class": "info-filled",
+      "unicode": "e649",
+      "unicode_decimal": 58953
+    },
+    {
+      "icon_id": "24923299",
+      "name": "reload-01",
+      "font_class": "reload",
+      "unicode": "e6b2",
+      "unicode_decimal": 59058
+    },
+    {
+      "icon_id": "24923195",
+      "name": "mic_slash_fill",
+      "font_class": "micoff-filled",
+      "unicode": "e6b0",
+      "unicode_decimal": 59056
+    },
+    {
+      "icon_id": "24923165",
+      "name": "map-pin-ellipse",
+      "font_class": "map-pin-ellipse",
+      "unicode": "e6ac",
+      "unicode_decimal": 59052
+    },
+    {
+      "icon_id": "24923166",
+      "name": "map-pin",
+      "font_class": "map-pin",
+      "unicode": "e6ad",
+      "unicode_decimal": 59053
+    },
+    {
+      "icon_id": "24923167",
+      "name": "location",
+      "font_class": "location",
+      "unicode": "e6ae",
+      "unicode_decimal": 59054
+    },
+    {
+      "icon_id": "24923064",
+      "name": "starhalf",
+      "font_class": "starhalf",
+      "unicode": "e683",
+      "unicode_decimal": 59011
+    },
+    {
+      "icon_id": "24923065",
+      "name": "star",
+      "font_class": "star",
+      "unicode": "e688",
+      "unicode_decimal": 59016
+    },
+    {
+      "icon_id": "24923066",
+      "name": "star-filled",
+      "font_class": "star-filled",
+      "unicode": "e68f",
+      "unicode_decimal": 59023
+    },
+    {
+      "icon_id": "24899646",
+      "name": "a-rilidaka",
+      "font_class": "calendar",
+      "unicode": "e6a0",
+      "unicode_decimal": 59040
+    },
+    {
+      "icon_id": "24899647",
+      "name": "fire",
+      "font_class": "fire",
+      "unicode": "e6a1",
+      "unicode_decimal": 59041
+    },
+    {
+      "icon_id": "24899648",
+      "name": "paihangbang",
+      "font_class": "medal",
+      "unicode": "e6a2",
+      "unicode_decimal": 59042
+    },
+    {
+      "icon_id": "24899649",
+      "name": "font",
+      "font_class": "font",
+      "unicode": "e6a3",
+      "unicode_decimal": 59043
+    },
+    {
+      "icon_id": "24899650",
+      "name": "gift",
+      "font_class": "gift",
+      "unicode": "e6a4",
+      "unicode_decimal": 59044
+    },
+    {
+      "icon_id": "24899651",
+      "name": "link",
+      "font_class": "link",
+      "unicode": "e6a5",
+      "unicode_decimal": 59045
+    },
+    {
+      "icon_id": "24899652",
+      "name": "notification",
+      "font_class": "notification",
+      "unicode": "e6a6",
+      "unicode_decimal": 59046
+    },
+    {
+      "icon_id": "24899653",
+      "name": "staff",
+      "font_class": "staff",
+      "unicode": "e6a7",
+      "unicode_decimal": 59047
+    },
+    {
+      "icon_id": "24899654",
+      "name": "VIP",
+      "font_class": "vip",
+      "unicode": "e6a8",
+      "unicode_decimal": 59048
+    },
+    {
+      "icon_id": "24899655",
+      "name": "folder_add",
+      "font_class": "folder-add",
+      "unicode": "e6a9",
+      "unicode_decimal": 59049
+    },
+    {
+      "icon_id": "24899656",
+      "name": "tune",
+      "font_class": "tune",
+      "unicode": "e6aa",
+      "unicode_decimal": 59050
+    },
+    {
+      "icon_id": "24899657",
+      "name": "shimingrenzheng",
+      "font_class": "auth",
+      "unicode": "e6ab",
+      "unicode_decimal": 59051
+    },
+    {
+      "icon_id": "24899565",
+      "name": "person",
+      "font_class": "person",
+      "unicode": "e699",
+      "unicode_decimal": 59033
+    },
+    {
+      "icon_id": "24899566",
+      "name": "email-filled",
+      "font_class": "email-filled",
+      "unicode": "e69a",
+      "unicode_decimal": 59034
+    },
+    {
+      "icon_id": "24899567",
+      "name": "phone-filled",
+      "font_class": "phone-filled",
+      "unicode": "e69b",
+      "unicode_decimal": 59035
+    },
+    {
+      "icon_id": "24899568",
+      "name": "phone",
+      "font_class": "phone",
+      "unicode": "e69c",
+      "unicode_decimal": 59036
+    },
+    {
+      "icon_id": "24899570",
+      "name": "email",
+      "font_class": "email",
+      "unicode": "e69e",
+      "unicode_decimal": 59038
+    },
+    {
+      "icon_id": "24899571",
+      "name": "personadd",
+      "font_class": "personadd",
+      "unicode": "e69f",
+      "unicode_decimal": 59039
+    },
+    {
+      "icon_id": "24899558",
+      "name": "chatboxes-filled",
+      "font_class": "chatboxes-filled",
+      "unicode": "e692",
+      "unicode_decimal": 59026
+    },
+    {
+      "icon_id": "24899559",
+      "name": "contact",
+      "font_class": "contact",
+      "unicode": "e693",
+      "unicode_decimal": 59027
+    },
+    {
+      "icon_id": "24899560",
+      "name": "chatbubble-filled",
+      "font_class": "chatbubble-filled",
+      "unicode": "e694",
+      "unicode_decimal": 59028
+    },
+    {
+      "icon_id": "24899561",
+      "name": "contact-filled",
+      "font_class": "contact-filled",
+      "unicode": "e695",
+      "unicode_decimal": 59029
+    },
+    {
+      "icon_id": "24899562",
+      "name": "chatboxes",
+      "font_class": "chatboxes",
+      "unicode": "e696",
+      "unicode_decimal": 59030
+    },
+    {
+      "icon_id": "24899563",
+      "name": "chatbubble",
+      "font_class": "chatbubble",
+      "unicode": "e697",
+      "unicode_decimal": 59031
+    },
+    {
+      "icon_id": "24881290",
+      "name": "upload-filled",
+      "font_class": "upload-filled",
+      "unicode": "e68e",
+      "unicode_decimal": 59022
+    },
+    {
+      "icon_id": "24881292",
+      "name": "upload",
+      "font_class": "upload",
+      "unicode": "e690",
+      "unicode_decimal": 59024
+    },
+    {
+      "icon_id": "24881293",
+      "name": "weixin",
+      "font_class": "weixin",
+      "unicode": "e691",
+      "unicode_decimal": 59025
+    },
+    {
+      "icon_id": "24881274",
+      "name": "compose",
+      "font_class": "compose",
+      "unicode": "e67f",
+      "unicode_decimal": 59007
+    },
+    {
+      "icon_id": "24881275",
+      "name": "qq",
+      "font_class": "qq",
+      "unicode": "e680",
+      "unicode_decimal": 59008
+    },
+    {
+      "icon_id": "24881276",
+      "name": "download-filled",
+      "font_class": "download-filled",
+      "unicode": "e681",
+      "unicode_decimal": 59009
+    },
+    {
+      "icon_id": "24881277",
+      "name": "pengyouquan",
+      "font_class": "pyq",
+      "unicode": "e682",
+      "unicode_decimal": 59010
+    },
+    {
+      "icon_id": "24881279",
+      "name": "sound",
+      "font_class": "sound",
+      "unicode": "e684",
+      "unicode_decimal": 59012
+    },
+    {
+      "icon_id": "24881280",
+      "name": "trash-filled",
+      "font_class": "trash-filled",
+      "unicode": "e685",
+      "unicode_decimal": 59013
+    },
+    {
+      "icon_id": "24881281",
+      "name": "sound-filled",
+      "font_class": "sound-filled",
+      "unicode": "e686",
+      "unicode_decimal": 59014
+    },
+    {
+      "icon_id": "24881282",
+      "name": "trash",
+      "font_class": "trash",
+      "unicode": "e687",
+      "unicode_decimal": 59015
+    },
+    {
+      "icon_id": "24881284",
+      "name": "videocam-filled",
+      "font_class": "videocam-filled",
+      "unicode": "e689",
+      "unicode_decimal": 59017
+    },
+    {
+      "icon_id": "24881285",
+      "name": "spinner-cycle",
+      "font_class": "spinner-cycle",
+      "unicode": "e68a",
+      "unicode_decimal": 59018
+    },
+    {
+      "icon_id": "24881286",
+      "name": "weibo",
+      "font_class": "weibo",
+      "unicode": "e68b",
+      "unicode_decimal": 59019
+    },
+    {
+      "icon_id": "24881288",
+      "name": "videocam",
+      "font_class": "videocam",
+      "unicode": "e68c",
+      "unicode_decimal": 59020
+    },
+    {
+      "icon_id": "24881289",
+      "name": "download",
+      "font_class": "download",
+      "unicode": "e68d",
+      "unicode_decimal": 59021
+    },
+    {
+      "icon_id": "24879601",
+      "name": "help",
+      "font_class": "help",
+      "unicode": "e679",
+      "unicode_decimal": 59001
+    },
+    {
+      "icon_id": "24879602",
+      "name": "navigate-filled",
+      "font_class": "navigate-filled",
+      "unicode": "e67a",
+      "unicode_decimal": 59002
+    },
+    {
+      "icon_id": "24879603",
+      "name": "plusempty",
+      "font_class": "plusempty",
+      "unicode": "e67b",
+      "unicode_decimal": 59003
+    },
+    {
+      "icon_id": "24879604",
+      "name": "smallcircle",
+      "font_class": "smallcircle",
+      "unicode": "e67c",
+      "unicode_decimal": 59004
+    },
+    {
+      "icon_id": "24879605",
+      "name": "minus-filled",
+      "font_class": "minus-filled",
+      "unicode": "e67d",
+      "unicode_decimal": 59005
+    },
+    {
+      "icon_id": "24879606",
+      "name": "micoff",
+      "font_class": "micoff",
+      "unicode": "e67e",
+      "unicode_decimal": 59006
+    },
+    {
+      "icon_id": "24879588",
+      "name": "closeempty",
+      "font_class": "closeempty",
+      "unicode": "e66c",
+      "unicode_decimal": 58988
+    },
+    {
+      "icon_id": "24879589",
+      "name": "clear",
+      "font_class": "clear",
+      "unicode": "e66d",
+      "unicode_decimal": 58989
+    },
+    {
+      "icon_id": "24879590",
+      "name": "navigate",
+      "font_class": "navigate",
+      "unicode": "e66e",
+      "unicode_decimal": 58990
+    },
+    {
+      "icon_id": "24879591",
+      "name": "minus",
+      "font_class": "minus",
+      "unicode": "e66f",
+      "unicode_decimal": 58991
+    },
+    {
+      "icon_id": "24879592",
+      "name": "image",
+      "font_class": "image",
+      "unicode": "e670",
+      "unicode_decimal": 58992
+    },
+    {
+      "icon_id": "24879593",
+      "name": "mic",
+      "font_class": "mic",
+      "unicode": "e671",
+      "unicode_decimal": 58993
+    },
+    {
+      "icon_id": "24879594",
+      "name": "paperplane",
+      "font_class": "paperplane",
+      "unicode": "e672",
+      "unicode_decimal": 58994
+    },
+    {
+      "icon_id": "24879595",
+      "name": "close",
+      "font_class": "close",
+      "unicode": "e673",
+      "unicode_decimal": 58995
+    },
+    {
+      "icon_id": "24879596",
+      "name": "help-filled",
+      "font_class": "help-filled",
+      "unicode": "e674",
+      "unicode_decimal": 58996
+    },
+    {
+      "icon_id": "24879597",
+      "name": "plus-filled",
+      "font_class": "paperplane-filled",
+      "unicode": "e675",
+      "unicode_decimal": 58997
+    },
+    {
+      "icon_id": "24879598",
+      "name": "plus",
+      "font_class": "plus",
+      "unicode": "e676",
+      "unicode_decimal": 58998
+    },
+    {
+      "icon_id": "24879599",
+      "name": "mic-filled",
+      "font_class": "mic-filled",
+      "unicode": "e677",
+      "unicode_decimal": 58999
+    },
+    {
+      "icon_id": "24879600",
+      "name": "image-filled",
+      "font_class": "image-filled",
+      "unicode": "e678",
+      "unicode_decimal": 59000
+    },
+    {
+      "icon_id": "24855900",
+      "name": "locked-filled",
+      "font_class": "locked-filled",
+      "unicode": "e668",
+      "unicode_decimal": 58984
+    },
+    {
+      "icon_id": "24855901",
+      "name": "info",
+      "font_class": "info",
+      "unicode": "e669",
+      "unicode_decimal": 58985
+    },
+    {
+      "icon_id": "24855903",
+      "name": "locked",
+      "font_class": "locked",
+      "unicode": "e66b",
+      "unicode_decimal": 58987
+    },
+    {
+      "icon_id": "24855884",
+      "name": "camera-filled",
+      "font_class": "camera-filled",
+      "unicode": "e658",
+      "unicode_decimal": 58968
+    },
+    {
+      "icon_id": "24855885",
+      "name": "chat-filled",
+      "font_class": "chat-filled",
+      "unicode": "e659",
+      "unicode_decimal": 58969
+    },
+    {
+      "icon_id": "24855886",
+      "name": "camera",
+      "font_class": "camera",
+      "unicode": "e65a",
+      "unicode_decimal": 58970
+    },
+    {
+      "icon_id": "24855887",
+      "name": "circle",
+      "font_class": "circle",
+      "unicode": "e65b",
+      "unicode_decimal": 58971
+    },
+    {
+      "icon_id": "24855888",
+      "name": "checkmarkempty",
+      "font_class": "checkmarkempty",
+      "unicode": "e65c",
+      "unicode_decimal": 58972
+    },
+    {
+      "icon_id": "24855889",
+      "name": "chat",
+      "font_class": "chat",
+      "unicode": "e65d",
+      "unicode_decimal": 58973
+    },
+    {
+      "icon_id": "24855890",
+      "name": "circle-filled",
+      "font_class": "circle-filled",
+      "unicode": "e65e",
+      "unicode_decimal": 58974
+    },
+    {
+      "icon_id": "24855891",
+      "name": "flag",
+      "font_class": "flag",
+      "unicode": "e65f",
+      "unicode_decimal": 58975
+    },
+    {
+      "icon_id": "24855892",
+      "name": "flag-filled",
+      "font_class": "flag-filled",
+      "unicode": "e660",
+      "unicode_decimal": 58976
+    },
+    {
+      "icon_id": "24855893",
+      "name": "gear-filled",
+      "font_class": "gear-filled",
+      "unicode": "e661",
+      "unicode_decimal": 58977
+    },
+    {
+      "icon_id": "24855894",
+      "name": "home",
+      "font_class": "home",
+      "unicode": "e662",
+      "unicode_decimal": 58978
+    },
+    {
+      "icon_id": "24855895",
+      "name": "home-filled",
+      "font_class": "home-filled",
+      "unicode": "e663",
+      "unicode_decimal": 58979
+    },
+    {
+      "icon_id": "24855896",
+      "name": "gear",
+      "font_class": "gear",
+      "unicode": "e664",
+      "unicode_decimal": 58980
+    },
+    {
+      "icon_id": "24855897",
+      "name": "smallcircle-filled",
+      "font_class": "smallcircle-filled",
+      "unicode": "e665",
+      "unicode_decimal": 58981
+    },
+    {
+      "icon_id": "24855898",
+      "name": "map-filled",
+      "font_class": "map-filled",
+      "unicode": "e666",
+      "unicode_decimal": 58982
+    },
+    {
+      "icon_id": "24855899",
+      "name": "map",
+      "font_class": "map",
+      "unicode": "e667",
+      "unicode_decimal": 58983
+    },
+    {
+      "icon_id": "24855825",
+      "name": "refresh-filled",
+      "font_class": "refresh-filled",
+      "unicode": "e656",
+      "unicode_decimal": 58966
+    },
+    {
+      "icon_id": "24855826",
+      "name": "refresh",
+      "font_class": "refresh",
+      "unicode": "e657",
+      "unicode_decimal": 58967
+    },
+    {
+      "icon_id": "24855808",
+      "name": "cloud-upload",
+      "font_class": "cloud-upload",
+      "unicode": "e645",
+      "unicode_decimal": 58949
+    },
+    {
+      "icon_id": "24855809",
+      "name": "cloud-download-filled",
+      "font_class": "cloud-download-filled",
+      "unicode": "e646",
+      "unicode_decimal": 58950
+    },
+    {
+      "icon_id": "24855810",
+      "name": "cloud-download",
+      "font_class": "cloud-download",
+      "unicode": "e647",
+      "unicode_decimal": 58951
+    },
+    {
+      "icon_id": "24855811",
+      "name": "cloud-upload-filled",
+      "font_class": "cloud-upload-filled",
+      "unicode": "e648",
+      "unicode_decimal": 58952
+    },
+    {
+      "icon_id": "24855813",
+      "name": "redo",
+      "font_class": "redo",
+      "unicode": "e64a",
+      "unicode_decimal": 58954
+    },
+    {
+      "icon_id": "24855814",
+      "name": "images-filled",
+      "font_class": "images-filled",
+      "unicode": "e64b",
+      "unicode_decimal": 58955
+    },
+    {
+      "icon_id": "24855815",
+      "name": "undo-filled",
+      "font_class": "undo-filled",
+      "unicode": "e64c",
+      "unicode_decimal": 58956
+    },
+    {
+      "icon_id": "24855816",
+      "name": "more",
+      "font_class": "more",
+      "unicode": "e64d",
+      "unicode_decimal": 58957
+    },
+    {
+      "icon_id": "24855817",
+      "name": "more-filled",
+      "font_class": "more-filled",
+      "unicode": "e64e",
+      "unicode_decimal": 58958
+    },
+    {
+      "icon_id": "24855818",
+      "name": "undo",
+      "font_class": "undo",
+      "unicode": "e64f",
+      "unicode_decimal": 58959
+    },
+    {
+      "icon_id": "24855819",
+      "name": "images",
+      "font_class": "images",
+      "unicode": "e650",
+      "unicode_decimal": 58960
+    },
+    {
+      "icon_id": "24855821",
+      "name": "paperclip",
+      "font_class": "paperclip",
+      "unicode": "e652",
+      "unicode_decimal": 58962
+    },
+    {
+      "icon_id": "24855822",
+      "name": "settings",
+      "font_class": "settings",
+      "unicode": "e653",
+      "unicode_decimal": 58963
+    },
+    {
+      "icon_id": "24855823",
+      "name": "search",
+      "font_class": "search",
+      "unicode": "e654",
+      "unicode_decimal": 58964
+    },
+    {
+      "icon_id": "24855824",
+      "name": "redo-filled",
+      "font_class": "redo-filled",
+      "unicode": "e655",
+      "unicode_decimal": 58965
+    },
+    {
+      "icon_id": "24841702",
+      "name": "list",
+      "font_class": "list",
+      "unicode": "e644",
+      "unicode_decimal": 58948
+    },
+    {
+      "icon_id": "24841489",
+      "name": "mail-open-filled",
+      "font_class": "mail-open-filled",
+      "unicode": "e63a",
+      "unicode_decimal": 58938
+    },
+    {
+      "icon_id": "24841491",
+      "name": "hand-thumbsdown-filled",
+      "font_class": "hand-down-filled",
+      "unicode": "e63c",
+      "unicode_decimal": 58940
+    },
+    {
+      "icon_id": "24841492",
+      "name": "hand-thumbsdown",
+      "font_class": "hand-down",
+      "unicode": "e63d",
+      "unicode_decimal": 58941
+    },
+    {
+      "icon_id": "24841493",
+      "name": "hand-thumbsup-filled",
+      "font_class": "hand-up-filled",
+      "unicode": "e63e",
+      "unicode_decimal": 58942
+    },
+    {
+      "icon_id": "24841494",
+      "name": "hand-thumbsup",
+      "font_class": "hand-up",
+      "unicode": "e63f",
+      "unicode_decimal": 58943
+    },
+    {
+      "icon_id": "24841496",
+      "name": "heart-filled",
+      "font_class": "heart-filled",
+      "unicode": "e641",
+      "unicode_decimal": 58945
+    },
+    {
+      "icon_id": "24841498",
+      "name": "mail-open",
+      "font_class": "mail-open",
+      "unicode": "e643",
+      "unicode_decimal": 58947
+    },
+    {
+      "icon_id": "24841488",
+      "name": "heart",
+      "font_class": "heart",
+      "unicode": "e639",
+      "unicode_decimal": 58937
+    },
+    {
+      "icon_id": "24839963",
+      "name": "loop",
+      "font_class": "loop",
+      "unicode": "e633",
+      "unicode_decimal": 58931
+    },
+    {
+      "icon_id": "24839866",
+      "name": "pulldown",
+      "font_class": "pulldown",
+      "unicode": "e632",
+      "unicode_decimal": 58930
+    },
+    {
+      "icon_id": "24813798",
+      "name": "scan",
+      "font_class": "scan",
+      "unicode": "e62a",
+      "unicode_decimal": 58922
+    },
+    {
+      "icon_id": "24813786",
+      "name": "bars",
+      "font_class": "bars",
+      "unicode": "e627",
+      "unicode_decimal": 58919
+    },
+    {
+      "icon_id": "24813788",
+      "name": "cart-filled",
+      "font_class": "cart-filled",
+      "unicode": "e629",
+      "unicode_decimal": 58921
+    },
+    {
+      "icon_id": "24813790",
+      "name": "checkbox",
+      "font_class": "checkbox",
+      "unicode": "e62b",
+      "unicode_decimal": 58923
+    },
+    {
+      "icon_id": "24813791",
+      "name": "checkbox-filled",
+      "font_class": "checkbox-filled",
+      "unicode": "e62c",
+      "unicode_decimal": 58924
+    },
+    {
+      "icon_id": "24813794",
+      "name": "shop",
+      "font_class": "shop",
+      "unicode": "e62f",
+      "unicode_decimal": 58927
+    },
+    {
+      "icon_id": "24813795",
+      "name": "headphones",
+      "font_class": "headphones",
+      "unicode": "e630",
+      "unicode_decimal": 58928
+    },
+    {
+      "icon_id": "24813796",
+      "name": "cart",
+      "font_class": "cart",
+      "unicode": "e631",
+      "unicode_decimal": 58929
+    }
+  ]
+}
diff --git a/mobile/src/uni_modules/uni-icons/components/uni-icons/uni-icons.vue b/mobile/src/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
new file mode 100644
index 0000000000..86e744452d
--- /dev/null
+++ b/mobile/src/uni_modules/uni-icons/components/uni-icons/uni-icons.vue
@@ -0,0 +1,96 @@
+<template>
+	<!-- #ifdef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" @click="_onClick">{{unicode}}</text>
+	<!-- #endif -->
+	<!-- #ifndef APP-NVUE -->
+	<text :style="{ color: color, 'font-size': iconSize }" class="uni-icons" :class="['uniui-'+type,customPrefix,customPrefix?type:'']" @click="_onClick"></text>
+	<!-- #endif -->
+</template>
+
+<script>
+	import icons from './icons.js';
+	const getVal = (val) => {
+		const reg = /^[0-9]*$/g
+		return (typeof val === 'number' ||　reg.test(val) )? val + 'px' : val;
+	} 
+	// #ifdef APP-NVUE
+	var domModule = weex.requireModule('dom');
+	import iconUrl from './uniicons.ttf'
+	domModule.addRule('fontFace', {
+		'fontFamily': "uniicons",
+		'src': "url('"+iconUrl+"')"
+	});
+	// #endif
+
+	/**
+	 * Icons 图标
+	 * @description 用于展示 icons 图标
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=28
+	 * @property {Number} size 图标大小
+	 * @property {String} type 图标图案，参考示例
+	 * @property {String} color 图标颜色
+	 * @property {String} customPrefix 自定义图标
+	 * @event {Function} click 点击 Icon 触发事件
+	 */
+	export default {
+		name: 'UniIcons',
+		emits:['click'],
+		props: {
+			type: {
+				type: String,
+				default: ''
+			},
+			color: {
+				type: String,
+				default: '#333333'
+			},
+			size: {
+				type: [Number, String],
+				default: 16
+			},
+			customPrefix:{
+				type: String,
+				default: ''
+			}
+		},
+		data() {
+			return {
+				icons: icons.glyphs
+			}
+		},
+		computed:{
+			unicode(){
+				let code = this.icons.find(v=>v.font_class === this.type)
+				if(code){
+					return unescape(`%u${code.unicode}`)
+				}
+				return ''
+			},
+			iconSize(){
+				return getVal(this.size)
+			}
+		},
+		methods: {
+			_onClick() {
+				this.$emit('click')
+			}
+		}
+	}
+</script>
+
+<style lang="scss">
+	/* #ifndef APP-NVUE */
+	@import './uniicons.css';
+	@font-face {
+		font-family: uniicons;
+		src: url('./uniicons.ttf') format('truetype');
+	}
+
+	/* #endif */
+	.uni-icons {
+		font-family: uniicons;
+		text-decoration: none;
+		text-align: center;
+	}
+
+</style>
diff --git a/mobile/src/uni_modules/uni-icons/components/uni-icons/uniicons.css b/mobile/src/uni_modules/uni-icons/components/uni-icons/uniicons.css
new file mode 100644
index 0000000000..2f56eabde9
--- /dev/null
+++ b/mobile/src/uni_modules/uni-icons/components/uni-icons/uniicons.css
@@ -0,0 +1,663 @@
+.uniui-color:before {
+  content: "\e6cf";
+}
+
+.uniui-wallet:before {
+  content: "\e6b1";
+}
+
+.uniui-settings-filled:before {
+  content: "\e6ce";
+}
+
+.uniui-auth-filled:before {
+  content: "\e6cc";
+}
+
+.uniui-shop-filled:before {
+  content: "\e6cd";
+}
+
+.uniui-staff-filled:before {
+  content: "\e6cb";
+}
+
+.uniui-vip-filled:before {
+  content: "\e6c6";
+}
+
+.uniui-plus-filled:before {
+  content: "\e6c7";
+}
+
+.uniui-folder-add-filled:before {
+  content: "\e6c8";
+}
+
+.uniui-color-filled:before {
+  content: "\e6c9";
+}
+
+.uniui-tune-filled:before {
+  content: "\e6ca";
+}
+
+.uniui-calendar-filled:before {
+  content: "\e6c0";
+}
+
+.uniui-notification-filled:before {
+  content: "\e6c1";
+}
+
+.uniui-wallet-filled:before {
+  content: "\e6c2";
+}
+
+.uniui-medal-filled:before {
+  content: "\e6c3";
+}
+
+.uniui-gift-filled:before {
+  content: "\e6c4";
+}
+
+.uniui-fire-filled:before {
+  content: "\e6c5";
+}
+
+.uniui-refreshempty:before {
+  content: "\e6bf";
+}
+
+.uniui-location-filled:before {
+  content: "\e6af";
+}
+
+.uniui-person-filled:before {
+  content: "\e69d";
+}
+
+.uniui-personadd-filled:before {
+  content: "\e698";
+}
+
+.uniui-back:before {
+  content: "\e6b9";
+}
+
+.uniui-forward:before {
+  content: "\e6ba";
+}
+
+.uniui-arrow-right:before {
+  content: "\e6bb";
+}
+
+.uniui-arrowthinright:before {
+  content: "\e6bb";
+}
+
+.uniui-arrow-left:before {
+  content: "\e6bc";
+}
+
+.uniui-arrowthinleft:before {
+  content: "\e6bc";
+}
+
+.uniui-arrow-up:before {
+  content: "\e6bd";
+}
+
+.uniui-arrowthinup:before {
+  content: "\e6bd";
+}
+
+.uniui-arrow-down:before {
+  content: "\e6be";
+}
+
+.uniui-arrowthindown:before {
+  content: "\e6be";
+}
+
+.uniui-bottom:before {
+  content: "\e6b8";
+}
+
+.uniui-arrowdown:before {
+  content: "\e6b8";
+}
+
+.uniui-right:before {
+  content: "\e6b5";
+}
+
+.uniui-arrowright:before {
+  content: "\e6b5";
+}
+
+.uniui-top:before {
+  content: "\e6b6";
+}
+
+.uniui-arrowup:before {
+  content: "\e6b6";
+}
+
+.uniui-left:before {
+  content: "\e6b7";
+}
+
+.uniui-arrowleft:before {
+  content: "\e6b7";
+}
+
+.uniui-eye:before {
+  content: "\e651";
+}
+
+.uniui-eye-filled:before {
+  content: "\e66a";
+}
+
+.uniui-eye-slash:before {
+  content: "\e6b3";
+}
+
+.uniui-eye-slash-filled:before {
+  content: "\e6b4";
+}
+
+.uniui-info-filled:before {
+  content: "\e649";
+}
+
+.uniui-reload:before {
+  content: "\e6b2";
+}
+
+.uniui-micoff-filled:before {
+  content: "\e6b0";
+}
+
+.uniui-map-pin-ellipse:before {
+  content: "\e6ac";
+}
+
+.uniui-map-pin:before {
+  content: "\e6ad";
+}
+
+.uniui-location:before {
+  content: "\e6ae";
+}
+
+.uniui-starhalf:before {
+  content: "\e683";
+}
+
+.uniui-star:before {
+  content: "\e688";
+}
+
+.uniui-star-filled:before {
+  content: "\e68f";
+}
+
+.uniui-calendar:before {
+  content: "\e6a0";
+}
+
+.uniui-fire:before {
+  content: "\e6a1";
+}
+
+.uniui-medal:before {
+  content: "\e6a2";
+}
+
+.uniui-font:before {
+  content: "\e6a3";
+}
+
+.uniui-gift:before {
+  content: "\e6a4";
+}
+
+.uniui-link:before {
+  content: "\e6a5";
+}
+
+.uniui-notification:before {
+  content: "\e6a6";
+}
+
+.uniui-staff:before {
+  content: "\e6a7";
+}
+
+.uniui-vip:before {
+  content: "\e6a8";
+}
+
+.uniui-folder-add:before {
+  content: "\e6a9";
+}
+
+.uniui-tune:before {
+  content: "\e6aa";
+}
+
+.uniui-auth:before {
+  content: "\e6ab";
+}
+
+.uniui-person:before {
+  content: "\e699";
+}
+
+.uniui-email-filled:before {
+  content: "\e69a";
+}
+
+.uniui-phone-filled:before {
+  content: "\e69b";
+}
+
+.uniui-phone:before {
+  content: "\e69c";
+}
+
+.uniui-email:before {
+  content: "\e69e";
+}
+
+.uniui-personadd:before {
+  content: "\e69f";
+}
+
+.uniui-chatboxes-filled:before {
+  content: "\e692";
+}
+
+.uniui-contact:before {
+  content: "\e693";
+}
+
+.uniui-chatbubble-filled:before {
+  content: "\e694";
+}
+
+.uniui-contact-filled:before {
+  content: "\e695";
+}
+
+.uniui-chatboxes:before {
+  content: "\e696";
+}
+
+.uniui-chatbubble:before {
+  content: "\e697";
+}
+
+.uniui-upload-filled:before {
+  content: "\e68e";
+}
+
+.uniui-upload:before {
+  content: "\e690";
+}
+
+.uniui-weixin:before {
+  content: "\e691";
+}
+
+.uniui-compose:before {
+  content: "\e67f";
+}
+
+.uniui-qq:before {
+  content: "\e680";
+}
+
+.uniui-download-filled:before {
+  content: "\e681";
+}
+
+.uniui-pyq:before {
+  content: "\e682";
+}
+
+.uniui-sound:before {
+  content: "\e684";
+}
+
+.uniui-trash-filled:before {
+  content: "\e685";
+}
+
+.uniui-sound-filled:before {
+  content: "\e686";
+}
+
+.uniui-trash:before {
+  content: "\e687";
+}
+
+.uniui-videocam-filled:before {
+  content: "\e689";
+}
+
+.uniui-spinner-cycle:before {
+  content: "\e68a";
+}
+
+.uniui-weibo:before {
+  content: "\e68b";
+}
+
+.uniui-videocam:before {
+  content: "\e68c";
+}
+
+.uniui-download:before {
+  content: "\e68d";
+}
+
+.uniui-help:before {
+  content: "\e679";
+}
+
+.uniui-navigate-filled:before {
+  content: "\e67a";
+}
+
+.uniui-plusempty:before {
+  content: "\e67b";
+}
+
+.uniui-smallcircle:before {
+  content: "\e67c";
+}
+
+.uniui-minus-filled:before {
+  content: "\e67d";
+}
+
+.uniui-micoff:before {
+  content: "\e67e";
+}
+
+.uniui-closeempty:before {
+  content: "\e66c";
+}
+
+.uniui-clear:before {
+  content: "\e66d";
+}
+
+.uniui-navigate:before {
+  content: "\e66e";
+}
+
+.uniui-minus:before {
+  content: "\e66f";
+}
+
+.uniui-image:before {
+  content: "\e670";
+}
+
+.uniui-mic:before {
+  content: "\e671";
+}
+
+.uniui-paperplane:before {
+  content: "\e672";
+}
+
+.uniui-close:before {
+  content: "\e673";
+}
+
+.uniui-help-filled:before {
+  content: "\e674";
+}
+
+.uniui-paperplane-filled:before {
+  content: "\e675";
+}
+
+.uniui-plus:before {
+  content: "\e676";
+}
+
+.uniui-mic-filled:before {
+  content: "\e677";
+}
+
+.uniui-image-filled:before {
+  content: "\e678";
+}
+
+.uniui-locked-filled:before {
+  content: "\e668";
+}
+
+.uniui-info:before {
+  content: "\e669";
+}
+
+.uniui-locked:before {
+  content: "\e66b";
+}
+
+.uniui-camera-filled:before {
+  content: "\e658";
+}
+
+.uniui-chat-filled:before {
+  content: "\e659";
+}
+
+.uniui-camera:before {
+  content: "\e65a";
+}
+
+.uniui-circle:before {
+  content: "\e65b";
+}
+
+.uniui-checkmarkempty:before {
+  content: "\e65c";
+}
+
+.uniui-chat:before {
+  content: "\e65d";
+}
+
+.uniui-circle-filled:before {
+  content: "\e65e";
+}
+
+.uniui-flag:before {
+  content: "\e65f";
+}
+
+.uniui-flag-filled:before {
+  content: "\e660";
+}
+
+.uniui-gear-filled:before {
+  content: "\e661";
+}
+
+.uniui-home:before {
+  content: "\e662";
+}
+
+.uniui-home-filled:before {
+  content: "\e663";
+}
+
+.uniui-gear:before {
+  content: "\e664";
+}
+
+.uniui-smallcircle-filled:before {
+  content: "\e665";
+}
+
+.uniui-map-filled:before {
+  content: "\e666";
+}
+
+.uniui-map:before {
+  content: "\e667";
+}
+
+.uniui-refresh-filled:before {
+  content: "\e656";
+}
+
+.uniui-refresh:before {
+  content: "\e657";
+}
+
+.uniui-cloud-upload:before {
+  content: "\e645";
+}
+
+.uniui-cloud-download-filled:before {
+  content: "\e646";
+}
+
+.uniui-cloud-download:before {
+  content: "\e647";
+}
+
+.uniui-cloud-upload-filled:before {
+  content: "\e648";
+}
+
+.uniui-redo:before {
+  content: "\e64a";
+}
+
+.uniui-images-filled:before {
+  content: "\e64b";
+}
+
+.uniui-undo-filled:before {
+  content: "\e64c";
+}
+
+.uniui-more:before {
+  content: "\e64d";
+}
+
+.uniui-more-filled:before {
+  content: "\e64e";
+}
+
+.uniui-undo:before {
+  content: "\e64f";
+}
+
+.uniui-images:before {
+  content: "\e650";
+}
+
+.uniui-paperclip:before {
+  content: "\e652";
+}
+
+.uniui-settings:before {
+  content: "\e653";
+}
+
+.uniui-search:before {
+  content: "\e654";
+}
+
+.uniui-redo-filled:before {
+  content: "\e655";
+}
+
+.uniui-list:before {
+  content: "\e644";
+}
+
+.uniui-mail-open-filled:before {
+  content: "\e63a";
+}
+
+.uniui-hand-down-filled:before {
+  content: "\e63c";
+}
+
+.uniui-hand-down:before {
+  content: "\e63d";
+}
+
+.uniui-hand-up-filled:before {
+  content: "\e63e";
+}
+
+.uniui-hand-up:before {
+  content: "\e63f";
+}
+
+.uniui-heart-filled:before {
+  content: "\e641";
+}
+
+.uniui-mail-open:before {
+  content: "\e643";
+}
+
+.uniui-heart:before {
+  content: "\e639";
+}
+
+.uniui-loop:before {
+  content: "\e633";
+}
+
+.uniui-pulldown:before {
+  content: "\e632";
+}
+
+.uniui-scan:before {
+  content: "\e62a";
+}
+
+.uniui-bars:before {
+  content: "\e627";
+}
+
+.uniui-cart-filled:before {
+  content: "\e629";
+}
+
+.uniui-checkbox:before {
+  content: "\e62b";
+}
+
+.uniui-checkbox-filled:before {
+  content: "\e62c";
+}
+
+.uniui-shop:before {
+  content: "\e62f";
+}
+
+.uniui-headphones:before {
+  content: "\e630";
+}
+
+.uniui-cart:before {
+  content: "\e631";
+}
diff --git a/mobile/src/uni_modules/uni-icons/components/uni-icons/uniicons.ttf b/mobile/src/uni_modules/uni-icons/components/uni-icons/uniicons.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..835f33bc9411461b8b9046b3fec742e921d6ce3a
GIT binary patch
literal 35760
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

literal 0
HcmV?d00001

diff --git a/mobile/src/uni_modules/uni-icons/package.json b/mobile/src/uni_modules/uni-icons/package.json
new file mode 100644
index 0000000000..d1c4e77d4f
--- /dev/null
+++ b/mobile/src/uni_modules/uni-icons/package.json
@@ -0,0 +1,86 @@
+{
+  "id": "uni-icons",
+  "displayName": "uni-icons 图标",
+  "version": "1.3.5",
+  "description": "图标组件，用于展示移动端常见的图标，可自定义颜色、大小。",
+  "keywords": [
+    "uni-ui",
+    "uniui",
+    "icon",
+    "图标"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.2.14"
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": ["uni-scss"],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/mobile/src/uni_modules/uni-icons/readme.md b/mobile/src/uni_modules/uni-icons/readme.md
new file mode 100644
index 0000000000..86234ba1ce
--- /dev/null
+++ b/mobile/src/uni_modules/uni-icons/readme.md
@@ -0,0 +1,8 @@
+## Icons 图标
+> **组件名：uni-icons**
+> 代码块： `uIcons`
+
+用于展示 icons 图标 。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-icons)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
diff --git a/mobile/src/uni_modules/uni-nav-bar/changelog.md b/mobile/src/uni_modules/uni-nav-bar/changelog.md
new file mode 100644
index 0000000000..fbacca4ba0
--- /dev/null
+++ b/mobile/src/uni_modules/uni-nav-bar/changelog.md
@@ -0,0 +1,37 @@
+## 1.3.4（2022-01-24）
+- 更新 组件示例
+## 1.3.3（2022-01-24）
+- 新增 left-width/right-width属性 ，可修改左右两侧的宽度
+## 1.3.2（2022-01-18）
+- 修复 在vue下，标题不垂直居中的bug
+## 1.3.1（2022-01-18）
+- 修复 height 属性类型错误
+## 1.3.0（2022-01-18）
+- 新增 height 属性,可修改组件高度
+- 新增 dark 属性可可开启暗黑模式
+- 优化 标题字数过多显示省略号
+- 优化 插槽，插入内容可完全覆盖
+## 1.2.1（2022-01-10）
+- 修复 color 属性不生效的bug
+## 1.2.0（2021-11-19）
+- 优化 组件UI，并提供设计资源，详见:[https://uniapp.dcloud.io/component/uniui/resource](https://uniapp.dcloud.io/component/uniui/resource)
+- 文档迁移，详见:[https://uniapp.dcloud.io/component/uniui/uni-nav-bar](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+## 1.1.0（2021-07-30）
+- 组件兼容 vue3，如何创建vue3项目，详见 [uni-app 项目支持 vue3 介绍](https://ask.dcloud.net.cn/article/37834)
+## 1.0.11（2021-05-12）
+- 新增 组件示例地址
+## 1.0.10（2021-04-30）
+- 修复 在nvue下fixed为true，宽度不能撑满的Bug
+## 1.0.9（2021-04-21）
+- 优化 添加依赖 uni-icons, 导入后自动下载依赖
+## 1.0.8（2021-04-14）
+- uni-ui 修复 uni-nav-bar 当 fixed 属性为 true 时铺不满屏幕的 bug
+
+## 1.0.7（2021-02-25）
+- 修复 easycom 下，找不到 uni-status-bar 的bug
+
+## 1.0.6（2021-02-05）
+- 优化 组件引用关系，通过uni_modules引用组件
+
+## 1.0.5（2021-02-05）
+- 调整为uni_modules目录规范
diff --git a/mobile/src/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue b/mobile/src/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
new file mode 100644
index 0000000000..08712ab647
--- /dev/null
+++ b/mobile/src/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-nav-bar.vue
@@ -0,0 +1,343 @@
+<template>
+	<view class="uni-navbar" :class="{'uni-dark':dark}">
+		<view :class="{ 'uni-navbar--fixed': fixed, 'uni-navbar--shadow': shadow, 'uni-navbar--border': border }"
+			:style="{ 'background-color': themeBgColor }" class="uni-navbar__content">
+			<status-bar v-if="statusBar" />
+			<view :style="{ color: themeColor,backgroundColor: themeBgColor ,height:navbarHeight}"
+				class="uni-navbar__header">
+				<view @tap="onClickLeft" class="uni-navbar__header-btns uni-navbar__header-btns-left"
+					:style="{width:leftIconWidth}">
+					<slot name="left">
+						<view class="uni-navbar__content_view" v-if="leftIcon.length > 0">
+							<uni-icons :color="themeColor" :type="leftIcon" size="20" />
+						</view>
+						<view :class="{ 'uni-navbar-btn-icon-left': !leftIcon.length > 0 }" class="uni-navbar-btn-text"
+							v-if="leftText.length">
+							<text :style="{ color: themeColor, fontSize: '12px' }">{{ leftText }}</text>
+						</view>
+					</slot>
+				</view>
+				<view class="uni-navbar__header-container " @tap="onClickTitle">
+					<slot>
+						<view class="uni-navbar__header-container-inner" v-if="title.length>0">
+							<text class="uni-nav-bar-text uni-ellipsis-1"
+								:style="{color: themeColor }">{{ title }}</text>
+						</view>
+					</slot>
+				</view>
+				<view @click="onClickRight" class="uni-navbar__header-btns uni-navbar__header-btns-right"
+					:style="{width:rightIconWidth}">
+					<slot name="right">
+						<view v-if="rightIcon.length">
+							<uni-icons :color="themeColor" :type="rightIcon" size="22" />
+						</view>
+						<view class="uni-navbar-btn-text" v-if="rightText.length && !rightIcon.length">
+							<text class="uni-nav-bar-right-text" :style="{ color: themeColor}">{{ rightText }}</text>
+						</view>
+					</slot>
+				</view>
+			</view>
+		</view>
+		<view class="uni-navbar__placeholder" v-if="fixed">
+			<status-bar v-if="statusBar" />
+			<view class="uni-navbar__placeholder-view" :style="{ height:navbarHeight}" />
+		</view>
+	</view>
+</template>
+
+<script>
+	import statusBar from "./uni-status-bar.vue";
+	const getVal = (val) => typeof val === 'number' ? val + 'px' : val;
+
+	/**
+	 * NavBar 自定义导航栏
+	 * @description 导航栏组件，主要用于头部导航
+	 * @tutorial https://ext.dcloud.net.cn/plugin?id=52
+	 * @property {Boolean} dark 开启黑暗模式
+	 * @property {String} title 标题文字
+	 * @property {String} leftText 左侧按钮文本
+	 * @property {String} rightText 右侧按钮文本
+	 * @property {String} leftIcon 左侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）
+	 * @property {String} rightIcon 右侧按钮图标（图标类型参考 [Icon 图标](http://ext.dcloud.net.cn/plugin?id=28) type 属性）
+	 * @property {String} color 图标和文字颜色
+	 * @property {String} backgroundColor 导航栏背景颜色
+	 * @property {Boolean} fixed = [true|false] 是否固定顶部
+	 * @property {Boolean} statusBar = [true|false] 是否包含状态栏
+	 * @property {Boolean} shadow = [true|false] 导航栏下是否有阴影
+	 * @event {Function} clickLeft 左侧按钮点击时触发
+	 * @event {Function} clickRight 右侧按钮点击时触发
+	 * @event {Function} clickTitle 中间标题点击时触发
+	 */
+	export default {
+		name: "UniNavBar",
+		components: {
+			statusBar
+		},
+		emits: ['clickLeft', 'clickRight', 'clickTitle'],
+		props: {
+			dark: {
+				type: Boolean,
+				default: false
+			},
+			title: {
+				type: String,
+				default: ""
+			},
+			leftText: {
+				type: String,
+				default: ""
+			},
+			rightText: {
+				type: String,
+				default: ""
+			},
+			leftIcon: {
+				type: String,
+				default: ""
+			},
+			rightIcon: {
+				type: String,
+				default: ""
+			},
+			fixed: {
+				type: [Boolean, String],
+				default: false
+			},
+			color: {
+				type: String,
+				default: ""
+			},
+			backgroundColor: {
+				type: String,
+				default: ""
+			},
+			statusBar: {
+				type: [Boolean, String],
+				default: false
+			},
+			shadow: {
+				type: [Boolean, String],
+				default: false
+			},
+			border: {
+				type: [Boolean, String],
+				default: true
+			},
+			height: {
+				type: [Number, String],
+				default: 44
+			},
+			leftWidth: {
+				type: [Number, String],
+				default: 60
+			},
+			rightWidth: {
+				type: [Number, String],
+				default: 60
+			},
+		},
+		computed: {
+			themeBgColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.backgroundColor) {
+						return this.backgroundColor
+					} else {
+						return this.dark ? '#333' : '#FFF'
+					}
+				}
+				return this.backgroundColor || '#FFF'
+			},
+			themeColor() {
+				if (this.dark) {
+					// 默认值
+					if (this.color) {
+						return this.color
+					} else {
+						return this.dark ? '#fff' : '#333'
+					}
+				}
+				return this.color || '#333'
+			},
+			navbarHeight() {
+				return getVal(this.height)
+			},
+			leftIconWidth() {
+				return getVal(this.leftWidth)
+			},
+			rightIconWidth() {
+				return getVal(this.rightWidth)
+			}
+		},
+		mounted() {
+			if (uni.report && this.title !== '') {
+				uni.report('title', this.title)
+			}
+		},
+		methods: {
+			onClickLeft() {
+				this.$emit("clickLeft");
+			},
+			onClickRight() {
+				this.$emit("clickRight");
+			},
+			onClickTitle() {
+				this.$emit("clickTitle");
+			}
+		}
+	};
+</script>
+
+<style lang="scss" scoped>
+	$nav-height: 44px;
+
+	.uni-navbar {
+		// box-sizing: border-box;
+	}
+
+	.uni-nav-bar-text {
+		/* #ifdef APP-PLUS */
+		font-size: 34rpx;
+		/* #endif */
+		/* #ifndef APP-PLUS */
+		font-size: 14px;
+		/* #endif */
+	}
+
+	.uni-nav-bar-right-text {
+		font-size: 12px;
+	}
+
+	.uni-navbar__content {
+		position: relative;
+		// background-color: #fff;
+		// box-sizing: border-box;
+		background-color: transparent;
+	}
+
+	.uni-navbar__content_view {
+		// box-sizing: border-box;
+	}
+
+	.uni-navbar-btn-text {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: column;
+		justify-content: flex-start;
+		align-items: center;
+		line-height: 12px;
+	}
+
+	.uni-navbar__header {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		padding: 0 10px;
+		flex-direction: row;
+		height: $nav-height;
+		font-size: 12px;
+	}
+
+	.uni-navbar__header-btns {
+		/* #ifndef APP-NVUE */
+		overflow: hidden;
+		display: flex;
+		/* #endif */
+		flex-wrap: nowrap;
+		flex-direction: row;
+		width: 120rpx;
+		// padding: 0 6px;
+		justify-content: center;
+		align-items: center;
+		/* #ifdef H5 */
+		cursor: pointer;
+		/* #endif */
+	}
+
+	.uni-navbar__header-btns-left {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		width: 120rpx;
+		justify-content: flex-start;
+		align-items: center;
+	}
+
+	.uni-navbar__header-btns-right {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 150rpx;
+		// padding-right: 30rpx;
+		justify-content: flex-end;
+		align-items: center;
+	}
+
+	.uni-navbar__header-container {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		padding: 0 10px;
+		overflow: hidden;
+	}
+
+	.uni-navbar__header-container-inner {
+		/* #ifndef APP-NVUE */
+		display: flex;
+		/* #endif */
+		flex: 1;
+		flex-direction: row;
+		align-items: center;
+		justify-content: center;
+		font-size: 12px;
+		overflow: hidden;
+		// box-sizing: border-box;
+	}
+
+
+	.uni-navbar__placeholder-view {
+		height: $nav-height;
+	}
+
+	.uni-navbar--fixed {
+		position: fixed;
+		z-index: 998;
+		/* #ifdef H5 */
+		left: var(--window-left);
+		right: var(--window-right);
+		/* #endif */
+		/* #ifndef H5 */
+		left: 0;
+		right: 0;
+		/* #endif */
+
+	}
+
+	.uni-navbar--shadow {
+		box-shadow: 0 1px 6px #ccc;
+	}
+
+	.uni-navbar--border {
+		border-bottom-width: 1rpx;
+		border-bottom-style: solid;
+		border-bottom-color: #eee;
+	}
+
+	.uni-ellipsis-1 {
+		overflow: hidden;
+		/* #ifndef APP-NVUE */
+		white-space: nowrap;
+		text-overflow: ellipsis;
+		/* #endif */
+		/* #ifdef APP-NVUE */
+		lines: 1;
+		text-overflow: ellipsis;
+		/* #endif */
+	}
+
+	// 暗主题配置
+	.uni-dark {}
+</style>
diff --git a/mobile/src/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue b/mobile/src/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
new file mode 100644
index 0000000000..6a688744fd
--- /dev/null
+++ b/mobile/src/uni_modules/uni-nav-bar/components/uni-nav-bar/uni-status-bar.vue
@@ -0,0 +1,27 @@
+<template>
+	<view :style="{ height: statusBarHeight }" class="uni-status-bar">
+		<slot />
+	</view>
+</template>
+
+<script>
+	export default {
+		name: 'UniStatusBar',
+		data() {
+			return {
+				statusBarHeight: 20
+			}
+		},
+		mounted() {
+			this.statusBarHeight = uni.getSystemInfoSync().statusBarHeight + 'px'
+		}
+	}
+</script>
+
+<style lang="scss" >
+	.uni-status-bar {
+		// width: 750rpx;
+		height: 20px;
+		// height: var(--status-bar-height);
+	}
+</style>
diff --git a/mobile/src/uni_modules/uni-nav-bar/package.json b/mobile/src/uni_modules/uni-nav-bar/package.json
new file mode 100644
index 0000000000..e1473ca11f
--- /dev/null
+++ b/mobile/src/uni_modules/uni-nav-bar/package.json
@@ -0,0 +1,89 @@
+{
+  "id": "uni-nav-bar",
+  "displayName": "uni-nav-bar 自定义导航栏",
+  "version": "1.3.4",
+  "description": "自定义导航栏组件，主要用于头部导航。",
+  "keywords": [
+    "uni-ui",
+    "导航",
+    "导航栏",
+    "自定义导航栏"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": ""
+  },
+  "directories": {
+    "example": "../../temps/example_temps"
+  },
+  "dcloudext": {
+    "category": [
+      "前端组件",
+      "通用组件"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [
+			"uni-scss",
+			"uni-icons"
+		],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "y"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "u",
+          "联盟": "u"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
\ No newline at end of file
diff --git a/mobile/src/uni_modules/uni-nav-bar/readme.md b/mobile/src/uni_modules/uni-nav-bar/readme.md
new file mode 100644
index 0000000000..3934b32775
--- /dev/null
+++ b/mobile/src/uni_modules/uni-nav-bar/readme.md
@@ -0,0 +1,15 @@
+
+
+## NavBar 导航栏
+> **组件名：uni-nav-bar**
+> 代码块： `uNavBar`
+
+导航栏组件，主要用于头部导航。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-nav-bar)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
+
+
+
+
+
diff --git a/mobile/src/uni_modules/uni-scss/changelog.md b/mobile/src/uni_modules/uni-scss/changelog.md
new file mode 100644
index 0000000000..b863bb0f5b
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/changelog.md
@@ -0,0 +1,8 @@
+## 1.0.3（2022-01-21）
+- 优化 组件示例
+## 1.0.2（2021-11-22）
+- 修复 / 符号在 vue 不同版本兼容问题引起的报错问题
+## 1.0.1（2021-11-22）
+- 修复 vue3中scss语法兼容问题
+## 1.0.0（2021-11-18）
+- init
diff --git a/mobile/src/uni_modules/uni-scss/index.scss b/mobile/src/uni_modules/uni-scss/index.scss
new file mode 100644
index 0000000000..1744a5f984
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/index.scss
@@ -0,0 +1 @@
+@import './styles/index.scss';
diff --git a/mobile/src/uni_modules/uni-scss/package.json b/mobile/src/uni_modules/uni-scss/package.json
new file mode 100644
index 0000000000..7cc0ccb73f
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/package.json
@@ -0,0 +1,82 @@
+{
+  "id": "uni-scss",
+  "displayName": "uni-scss 辅助样式",
+  "version": "1.0.3",
+  "description": "uni-sass是uni-ui提供的一套全局样式 ，通过一些简单的类名和sass变量，实现简单的页面布局操作，比如颜色、边距、圆角等。",
+  "keywords": [
+    "uni-scss",
+    "uni-ui",
+    "辅助样式"
+],
+  "repository": "https://github.com/dcloudio/uni-ui",
+  "engines": {
+    "HBuilderX": "^3.1.0"
+  },
+  "dcloudext": {
+    "category": [
+        "JS SDK",
+        "通用 SDK"
+    ],
+    "sale": {
+      "regular": {
+        "price": "0.00"
+      },
+      "sourcecode": {
+        "price": "0.00"
+      }
+    },
+    "contact": {
+      "qq": ""
+    },
+    "declaration": {
+      "ads": "无",
+      "data": "无",
+      "permissions": "无"
+    },
+    "npmurl": "https://www.npmjs.com/package/@dcloudio/uni-ui"
+  },
+  "uni_modules": {
+    "dependencies": [],
+    "encrypt": [],
+    "platforms": {
+      "cloud": {
+        "tcb": "y",
+        "aliyun": "y"
+      },
+      "client": {
+        "App": {
+          "app-vue": "y",
+          "app-nvue": "u"
+        },
+        "H5-mobile": {
+          "Safari": "y",
+          "Android Browser": "y",
+          "微信浏览器(Android)": "y",
+          "QQ浏览器(Android)": "y"
+        },
+        "H5-pc": {
+          "Chrome": "y",
+          "IE": "y",
+          "Edge": "y",
+          "Firefox": "y",
+          "Safari": "y"
+        },
+        "小程序": {
+          "微信": "y",
+          "阿里": "y",
+          "百度": "y",
+          "字节跳动": "y",
+          "QQ": "y"
+        },
+        "快应用": {
+          "华为": "n",
+          "联盟": "n"
+        },
+        "Vue": {
+            "vue2": "y",
+            "vue3": "y"
+        }
+      }
+    }
+  }
+}
diff --git a/mobile/src/uni_modules/uni-scss/readme.md b/mobile/src/uni_modules/uni-scss/readme.md
new file mode 100644
index 0000000000..b7d1c25f3d
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/readme.md
@@ -0,0 +1,4 @@
+`uni-sass` 是 `uni-ui`提供的一套全局样式 ，通过一些简单的类名和`sass`变量，实现简单的页面布局操作，比如颜色、边距、圆角等。
+
+### [查看文档](https://uniapp.dcloud.io/component/uniui/uni-sass)
+#### 如使用过程中有任何问题，或者您对uni-ui有一些好的建议，欢迎加入 uni-ui 交流群：871950839 
\ No newline at end of file
diff --git a/mobile/src/uni_modules/uni-scss/styles/index.scss b/mobile/src/uni_modules/uni-scss/styles/index.scss
new file mode 100644
index 0000000000..ffac4fecdf
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/index.scss
@@ -0,0 +1,7 @@
+@import './setting/_variables.scss';
+@import './setting/_border.scss';
+@import './setting/_color.scss';
+@import './setting/_space.scss';
+@import './setting/_radius.scss';
+@import './setting/_text.scss';
+@import './setting/_styles.scss';
diff --git a/mobile/src/uni_modules/uni-scss/styles/setting/_border.scss b/mobile/src/uni_modules/uni-scss/styles/setting/_border.scss
new file mode 100644
index 0000000000..12a11c3227
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/setting/_border.scss
@@ -0,0 +1,3 @@
+.uni-border {
+	border: 1px $uni-border-1 solid;
+}
\ No newline at end of file
diff --git a/mobile/src/uni_modules/uni-scss/styles/setting/_color.scss b/mobile/src/uni_modules/uni-scss/styles/setting/_color.scss
new file mode 100644
index 0000000000..1ededd94d9
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/setting/_color.scss
@@ -0,0 +1,66 @@
+
+// TODO 暂时不需要 class ，需要用户使用变量实现 ，如果使用类名其实并不推荐
+// @mixin get-styles($k,$c) {
+// 	@if $k == size or $k == weight{
+// 		font-#{$k}:#{$c}
+// 	}@else{
+// 		#{$k}:#{$c}
+// 	}
+// }
+$uni-ui-color:(
+	// 主色
+	primary: $uni-primary,
+	primary-disable: $uni-primary-disable,
+	primary-light: $uni-primary-light,
+	// 辅助色
+	success: $uni-success,
+	success-disable: $uni-success-disable,
+	success-light: $uni-success-light,
+	warning: $uni-warning,
+	warning-disable: $uni-warning-disable,
+	warning-light: $uni-warning-light,
+	error: $uni-error,
+	error-disable: $uni-error-disable,
+	error-light: $uni-error-light,
+	info: $uni-info,
+	info-disable: $uni-info-disable,
+	info-light: $uni-info-light,
+	// 中性色
+	main-color: $uni-main-color,
+	base-color: $uni-base-color,
+	secondary-color: $uni-secondary-color,
+	extra-color: $uni-extra-color,
+	// 背景色
+	bg-color: $uni-bg-color,
+	// 边框颜色
+	border-1: $uni-border-1,
+	border-2: $uni-border-2,
+	border-3: $uni-border-3,
+	border-4: $uni-border-4,
+	// 黑色
+	black:$uni-black,
+	// 白色
+	white:$uni-white,
+	// 透明
+	transparent:$uni-transparent
+) !default;
+@each $key, $child in $uni-ui-color {
+	.uni-#{"" + $key} {
+		color: $child;
+	}
+	.uni-#{"" + $key}-bg {
+		background-color: $child;
+	}
+}
+.uni-shadow-sm {
+	box-shadow: $uni-shadow-sm;
+}
+.uni-shadow-base {
+	box-shadow: $uni-shadow-base;
+}
+.uni-shadow-lg {
+	box-shadow: $uni-shadow-lg;
+}
+.uni-mask {
+	background-color:$uni-mask;
+}
diff --git a/mobile/src/uni_modules/uni-scss/styles/setting/_radius.scss b/mobile/src/uni_modules/uni-scss/styles/setting/_radius.scss
new file mode 100644
index 0000000000..9a0428bb87
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/setting/_radius.scss
@@ -0,0 +1,55 @@
+@mixin radius($r,$d:null ,$important: false){
+  $radius-value:map-get($uni-radius, $r) if($important, !important, null);
+  // Key exists within the $uni-radius variable
+  @if (map-has-key($uni-radius, $r) and  $d){
+		@if $d == t {
+				border-top-left-radius:$radius-value;
+				border-top-right-radius:$radius-value;
+		}@else if $d == r {
+				border-top-right-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == b {
+				border-bottom-left-radius:$radius-value;
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == l {
+				border-top-left-radius:$radius-value;
+				border-bottom-left-radius:$radius-value;
+		}@else if $d == tl {
+				border-top-left-radius:$radius-value;
+		}@else if $d == tr {
+				border-top-right-radius:$radius-value;
+		}@else if $d == br {
+				border-bottom-right-radius:$radius-value;
+		}@else if $d == bl {
+				border-bottom-left-radius:$radius-value;
+		}
+  }@else{
+		border-radius:$radius-value;
+  }
+}
+
+@each $key, $child in $uni-radius {
+	@if($key){
+		.uni-radius-#{"" + $key} {
+				@include radius($key)
+		}
+	}@else{
+		.uni-radius {
+				@include radius($key)
+		}
+	}
+}
+
+@each $direction in t, r, b, l,tl, tr, br, bl {
+	@each $key, $child in $uni-radius {
+		@if($key){
+			.uni-radius-#{"" + $direction}-#{"" + $key} {
+				@include radius($key,$direction,false)
+			}
+		}@else{
+			.uni-radius-#{$direction} {
+				@include radius($key,$direction,false)
+			}
+		}
+	}
+}
diff --git a/mobile/src/uni_modules/uni-scss/styles/setting/_space.scss b/mobile/src/uni_modules/uni-scss/styles/setting/_space.scss
new file mode 100644
index 0000000000..3c89528978
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/setting/_space.scss
@@ -0,0 +1,56 @@
+
+@mixin fn($space,$direction,$size,$n) {
+	@if $n {
+		#{$space}-#{$direction}: #{$size*$uni-space-root}px
+	} @else {
+		 #{$space}-#{$direction}: #{-$size*$uni-space-root}px
+	}
+}
+@mixin get-styles($direction,$i,$space,$n){
+	@if $direction == t {
+		@include fn($space, top,$i,$n);
+	} 
+	@if $direction == r {
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == b {
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == l {
+	 @include fn($space, left,$i,$n);
+	} 
+	@if $direction == x {
+		@include fn($space, left,$i,$n);
+		@include fn($space, right,$i,$n);
+	} 
+	@if $direction == y {
+		@include fn($space, top,$i,$n);
+		@include fn($space, bottom,$i,$n);
+	} 
+	@if $direction == a {
+		@if $n {
+			#{$space}:#{$i*$uni-space-root}px;
+		} @else {
+			#{$space}:#{-$i*$uni-space-root}px;
+		}
+	} 
+}
+
+@each $orientation in m,p {
+	$space: margin;
+	@if $orientation == m {
+		$space: margin;
+	} @else {
+		$space: padding;
+	}
+	@for $i from 0 through 16 {
+		@each $direction in t, r, b, l, x, y, a {
+			.uni-#{$orientation}#{$direction}-#{$i} { 
+				@include  get-styles($direction,$i,$space,true);
+			} 
+			.uni-#{$orientation}#{$direction}-n#{$i} { 
+				@include  get-styles($direction,$i,$space,false);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/mobile/src/uni_modules/uni-scss/styles/setting/_styles.scss b/mobile/src/uni_modules/uni-scss/styles/setting/_styles.scss
new file mode 100644
index 0000000000..689afec661
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/setting/_styles.scss
@@ -0,0 +1,167 @@
+/* #ifndef APP-NVUE */
+
+$-color-white:#fff;
+$-color-black:#000;
+@mixin base-style($color) {
+	color: #fff;
+	background-color: $color;
+	border-color: mix($-color-black, $color, 8%);
+	&:not([hover-class]):active {
+		background: mix($-color-black, $color, 10%);
+		border-color: mix($-color-black, $color, 20%);
+		color: $-color-white;
+		outline: none;
+	}
+}
+@mixin is-color($color) {
+	@include base-style($color);
+	&[loading] {
+		@include base-style($color);
+		&::before {
+			margin-right:5px;
+		}
+	}
+	&[disabled] {
+	  &,
+		&[loading],
+	  &:not([hover-class]):active {
+	    color: $-color-white;
+			border-color: mix(darken($color,10%), $-color-white);
+	    background-color: mix($color, $-color-white);
+	  }
+	}
+
+}
+@mixin base-plain-style($color) {
+	color:$color;
+	background-color: mix($-color-white, $color, 90%);
+	border-color: mix($-color-white, $color, 70%);
+	&:not([hover-class]):active {
+	  background: mix($-color-white, $color, 80%);
+	  color: $color;
+	  outline: none;
+		border-color: mix($-color-white, $color, 50%);
+	}
+}
+@mixin is-plain($color){
+	&[plain] {
+		@include base-plain-style($color);
+		&[loading] {
+			@include base-plain-style($color);
+			&::before {
+				margin-right:5px;
+			}
+		}
+		&[disabled] {
+		  &,
+		  &:active {
+		    color: mix($-color-white, $color, 40%);
+		    background-color: mix($-color-white, $color, 90%);
+				border-color: mix($-color-white, $color, 80%);
+		  }
+		}
+	}
+}
+
+
+.uni-btn {
+	margin: 5px;
+	color: #393939;
+	border:1px solid #ccc;
+	font-size: 16px;
+	font-weight: 200;
+	background-color: #F9F9F9;
+	// TODO 暂时处理边框隐藏一边的问题
+	overflow: visible;
+	&::after{
+		border: none;
+	}
+
+	&:not([type]),&[type=default] {
+		color: #999;
+		&[loading] {
+			background: none;
+			&::before {
+				margin-right:5px;
+			}
+		}
+
+
+
+		&[disabled]{
+			color: mix($-color-white, #999, 60%);
+		  &,
+			&[loading],
+		  &:active {
+				color: mix($-color-white, #999, 60%);
+		    background-color: mix($-color-white,$-color-black , 98%);
+				border-color: mix($-color-white,  #999, 85%);
+		  }
+		}
+
+		&[plain] {
+			color: #999;
+			background: none;
+			border-color: $uni-border-1;
+			&:not([hover-class]):active {
+				background: none;
+			  color: mix($-color-white, $-color-black, 80%);
+				border-color: mix($-color-white, $-color-black, 90%);
+			  outline: none;
+			}
+			&[disabled]{
+			  &,
+				&[loading],
+			  &:active {
+			    background: none;
+					color: mix($-color-white, #999, 60%);
+					border-color: mix($-color-white,  #999, 85%);
+			  }
+			}
+		}
+	}
+
+	&:not([hover-class]):active {
+	  color: mix($-color-white, $-color-black, 50%);
+	}
+
+	&[size=mini] {
+		font-size: 16px;
+		font-weight: 200;
+		border-radius: 8px;
+	}
+
+
+
+	&.uni-btn-small {
+		font-size: 14px;
+	}
+	&.uni-btn-mini {
+		font-size: 12px;
+	}
+
+	&.uni-btn-radius {
+		border-radius: 999px;
+	}
+	&[type=primary] {
+		@include is-color($uni-primary);
+		@include is-plain($uni-primary)
+	}
+	&[type=success] {
+		@include is-color($uni-success);
+		@include is-plain($uni-success)
+	}
+	&[type=error] {
+		@include is-color($uni-error);
+		@include is-plain($uni-error)
+	}
+	&[type=warning] {
+		@include is-color($uni-warning);
+		@include is-plain($uni-warning)
+	}
+	&[type=info] {
+		@include is-color($uni-info);
+		@include is-plain($uni-info)
+	}
+}
+/* #endif */
diff --git a/mobile/src/uni_modules/uni-scss/styles/setting/_text.scss b/mobile/src/uni_modules/uni-scss/styles/setting/_text.scss
new file mode 100644
index 0000000000..a34d08f3f7
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/setting/_text.scss
@@ -0,0 +1,24 @@
+@mixin get-styles($k,$c) {
+	@if $k == size or $k == weight{
+		font-#{$k}:#{$c}
+	}@else{
+		#{$k}:#{$c}
+	}
+}
+
+@each $key, $child in $uni-headings {
+	/* #ifndef APP-NVUE */
+	.uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+	/* #ifdef APP-NVUE */
+	.container .uni-#{$key} {
+		@each $k, $c in $child {
+			@include get-styles($k,$c)
+		}
+	}
+	/* #endif */
+}
diff --git a/mobile/src/uni_modules/uni-scss/styles/setting/_variables.scss b/mobile/src/uni_modules/uni-scss/styles/setting/_variables.scss
new file mode 100644
index 0000000000..557d3d7c9c
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/setting/_variables.scss
@@ -0,0 +1,146 @@
+// @use "sass:math";
+@import  '../tools/functions.scss';
+// 间距基础倍数
+$uni-space-root: 2 !default;
+// 边框半径默认值
+$uni-radius-root:5px !default;
+$uni-radius: () !default;
+// 边框半径断点
+$uni-radius: map-deep-merge(
+  (
+    0: 0,
+		// TODO 当前版本暂时不支持 sm 属性
+    // 'sm': math.div($uni-radius-root, 2),
+    null: $uni-radius-root,
+    'lg': $uni-radius-root * 2,
+    'xl': $uni-radius-root * 6,
+    'pill': 9999px,
+    'circle': 50%
+  ),
+  $uni-radius
+);
+// 字体家族
+$body-font-family: 'Roboto', sans-serif !default;
+// 文本
+$heading-font-family: $body-font-family !default;
+$uni-headings: () !default;
+$letterSpacing: -0.01562em;
+$uni-headings: map-deep-merge(
+  (
+    'h1': (
+      size: 32px,
+			weight: 300,
+			line-height: 50px,
+			// letter-spacing:-0.01562em
+    ),
+    'h2': (
+      size: 28px,
+      weight: 300,
+      line-height: 40px,
+      // letter-spacing: -0.00833em
+    ),
+    'h3': (
+      size: 24px,
+      weight: 400,
+      line-height: 32px,
+      // letter-spacing: normal
+    ),
+    'h4': (
+      size: 20px,
+      weight: 400,
+      line-height: 30px,
+      // letter-spacing: 0.00735em
+    ),
+    'h5': (
+      size: 16px,
+      weight: 400,
+      line-height: 24px,
+      // letter-spacing: normal
+    ),
+    'h6': (
+      size: 14px,
+      weight: 500,
+      line-height: 18px,
+      // letter-spacing: 0.0125em
+    ),
+    'subtitle': (
+      size: 12px,
+      weight: 400,
+      line-height: 20px,
+      // letter-spacing: 0.00937em
+    ),
+    'body': (
+      font-size: 14px,
+			font-weight: 400,
+			line-height: 22px,
+			// letter-spacing: 0.03125em
+    ),
+    'caption': (
+      'size': 12px,
+      'weight': 400,
+      'line-height': 20px,
+      // 'letter-spacing': 0.03333em,
+      // 'text-transform': false
+    )
+  ),
+  $uni-headings
+);
+
+
+
+// 主色
+$uni-primary: #2979ff !default;
+$uni-primary-disable:lighten($uni-primary,20%) !default;
+$uni-primary-light: lighten($uni-primary,25%) !default;
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37 !default;
+$uni-success-disable:lighten($uni-success,20%) !default;
+$uni-success-light: lighten($uni-success,25%) !default;
+
+$uni-warning: #f3a73f !default;
+$uni-warning-disable:lighten($uni-warning,20%) !default;
+$uni-warning-light: lighten($uni-warning,25%) !default;
+
+$uni-error: #e43d33 !default;
+$uni-error-disable:lighten($uni-error,20%) !default;
+$uni-error-light: lighten($uni-error,25%) !default;
+
+$uni-info: #8f939c !default;
+$uni-info-disable:lighten($uni-info,20%) !default;
+$uni-info-light: lighten($uni-info,25%) !default;
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a !default; 			// 主要文字
+$uni-base-color: #6a6a6a !default;			// 常规文字
+$uni-secondary-color: #909399 !default;	// 次要文字
+$uni-extra-color: #c7c7c7 !default;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0 !default;
+$uni-border-2: #EDEDED !default;
+$uni-border-3: #DCDCDC !default;
+$uni-border-4: #B9B9B9 !default;
+
+// 常规色
+$uni-black: #000000 !default;
+$uni-white: #ffffff !default;
+$uni-transparent: rgba($color: #000000, $alpha: 0) !default;
+
+// 背景色
+$uni-bg-color: #f7f7f7 !default;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px !default;
+$uni-spacing-base: 15px !default;
+$uni-spacing-lg: 30px !default;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5) !default;
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2) !default;
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5) !default;
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4) !default;
diff --git a/mobile/src/uni_modules/uni-scss/styles/tools/functions.scss b/mobile/src/uni_modules/uni-scss/styles/tools/functions.scss
new file mode 100644
index 0000000000..ac6f63e53a
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/styles/tools/functions.scss
@@ -0,0 +1,19 @@
+// 合并 map
+@function map-deep-merge($parent-map, $child-map){
+	$result: $parent-map;
+	@each $key, $child in $child-map {
+		$parent-has-key: map-has-key($result, $key);
+		$parent-value: map-get($result, $key);
+		$parent-type: type-of($parent-value);
+		$child-type: type-of($child);
+		$parent-is-map: $parent-type == map;
+		$child-is-map: $child-type == map;
+			
+		@if (not $parent-has-key) or ($parent-type != $child-type) or (not ($parent-is-map and $child-is-map)){
+			$result: map-merge($result, ( $key: $child ));
+		}@else {
+			$result: map-merge($result, ( $key: map-deep-merge($parent-value, $child) ));
+		}
+	}
+	@return $result;
+};
diff --git a/mobile/src/uni_modules/uni-scss/theme.scss b/mobile/src/uni_modules/uni-scss/theme.scss
new file mode 100644
index 0000000000..80ee62f7d8
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/theme.scss
@@ -0,0 +1,31 @@
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+// 主色
+$uni-primary: #2979ff;
+// 辅助色
+$uni-success: #4cd964;
+// 警告色
+$uni-warning: #f0ad4e;
+// 错误色
+$uni-error: #dd524d;
+// 描述色
+$uni-info: #909399;
+// 中性色
+$uni-main-color: #303133;
+$uni-base-color: #606266;
+$uni-secondary-color: #909399;
+$uni-extra-color: #C0C4CC;
+// 背景色
+$uni-bg-color: #f5f5f5;
+// 边框颜色
+$uni-border-1: #DCDFE6;
+$uni-border-2: #E4E7ED;
+$uni-border-3: #EBEEF5;
+$uni-border-4: #F2F6FC;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
diff --git a/mobile/src/uni_modules/uni-scss/variables.scss b/mobile/src/uni_modules/uni-scss/variables.scss
new file mode 100644
index 0000000000..1c062d42b2
--- /dev/null
+++ b/mobile/src/uni_modules/uni-scss/variables.scss
@@ -0,0 +1,62 @@
+@import './styles/setting/_variables.scss';
+// 间距基础倍数
+$uni-space-root: 2;
+// 边框半径默认值
+$uni-radius-root:5px;
+
+// 主色
+$uni-primary: #2979ff;
+$uni-primary-disable:mix(#fff,$uni-primary,50%);
+$uni-primary-light: mix(#fff,$uni-primary,80%);
+
+// 辅助色
+// 除了主色外的场景色，需要在不同的场景中使用（例如危险色表示危险的操作）。
+$uni-success: #18bc37;
+$uni-success-disable:mix(#fff,$uni-success,50%);
+$uni-success-light: mix(#fff,$uni-success,80%);
+
+$uni-warning: #f3a73f;
+$uni-warning-disable:mix(#fff,$uni-warning,50%);
+$uni-warning-light: mix(#fff,$uni-warning,80%);
+
+$uni-error: #e43d33;
+$uni-error-disable:mix(#fff,$uni-error,50%);
+$uni-error-light: mix(#fff,$uni-error,80%);
+
+$uni-info: #8f939c;
+$uni-info-disable:mix(#fff,$uni-info,50%);
+$uni-info-light: mix(#fff,$uni-info,80%);
+
+// 中性色
+// 中性色用于文本、背景和边框颜色。通过运用不同的中性色，来表现层次结构。
+$uni-main-color: #3a3a3a; 			// 主要文字
+$uni-base-color: #6a6a6a;			// 常规文字
+$uni-secondary-color: #909399;	// 次要文字
+$uni-extra-color: #c7c7c7;			// 辅助说明
+
+// 边框颜色
+$uni-border-1: #F0F0F0;
+$uni-border-2: #EDEDED;
+$uni-border-3: #DCDCDC;
+$uni-border-4: #B9B9B9;
+
+// 常规色
+$uni-black: #000000;
+$uni-white: #ffffff;
+$uni-transparent: rgba($color: #000000, $alpha: 0);
+
+// 背景色
+$uni-bg-color: #f7f7f7;
+
+/* 水平间距 */
+$uni-spacing-sm: 8px;
+$uni-spacing-base: 15px;
+$uni-spacing-lg: 30px;
+
+// 阴影
+$uni-shadow-sm:0 0 5px rgba($color: #d8d8d8, $alpha: 0.5);
+$uni-shadow-base:0 1px 8px 1px rgba($color: #a5a5a5, $alpha: 0.2);
+$uni-shadow-lg:0px 1px 10px 2px rgba($color: #a5a4a4, $alpha: 0.5);
+
+// 蒙版
+$uni-mask: rgba($color: #000000, $alpha: 0.4);

From ec45a8224415f322a3d809cf77fead13ce969838 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 8 Feb 2022 14:27:40 +0800
Subject: [PATCH 06/47] feat: S2 pivot

---
 frontend/src/views/chart/view/ChartEdit.vue | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 195ca65f24..a868617587 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1867,7 +1867,9 @@ export default {
       if (this.view.tableId !== this.changeTable.id) {
         this.view.tableId = this.changeTable.id
         this.view.xaxis = []
+        this.view.xaxisExt = []
         this.view.yaxis = []
+        this.view.yaxisExt = []
         this.view.customFilter = []
         this.view.extStack = []
         this.view.extBubble = []

From 69b188208596701db6a033f9de4ee405c8e4d7c1 Mon Sep 17 00:00:00 2001
From: junjie <752696511@qq.com>
Date: Wed, 9 Feb 2022 16:35:29 +0800
Subject: [PATCH 07/47] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E8=8C=83=E5=9B=B4=E4=B8=8D=E5=8F=97=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E6=8E=A7=E5=88=B6=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index a868617587..d6583e5b59 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -233,6 +233,7 @@
                         :no-children-text="$t('commons.treeselect.no_children_text')"
                         :no-options-text="$t('commons.treeselect.no_options_text')"
                         :no-results-text="$t('commons.treeselect.no_results_text')"
+                        :disabled="!hasDataPermission('manage',param.privileges)"
                         @input="calcData"
                         @deselect="calcData"
                       />

From 064ca3b8c34bb9d7752b4a1ead5c1a65f65b31c8 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 9 Feb 2022 18:01:48 +0800
Subject: [PATCH 08/47] =?UTF-8?q?feat:=20=E6=9D=83=E9=99=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=94=AF=E6=8C=81=E6=8C=89=E7=85=A7=E8=B5=84=E6=BA=90?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=8E=88=E6=9D=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/plugins/server/XAuthServer.java  | 16 ++++++++--------
 frontend/src/lang/en.js                          |  3 ++-
 frontend/src/lang/tw.js                          |  3 ++-
 frontend/src/lang/zh.js                          |  3 ++-
 4 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
index 012939cda2..c3a3c41a5c 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
@@ -27,35 +27,35 @@ public class XAuthServer {
 
     @PostMapping("/authModels")
     @I18n
-    public List<XpackVAuthModelDTO> authModels(@RequestBody XpackBaseTreeRequest request){
+    public List<XpackVAuthModelDTO> authModels(@RequestBody XpackBaseTreeRequest request) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         CurrentUserDto user = AuthUtils.getUser();
         return sysAuthService.searchAuthModelTree(request, user.getUserId(), user.getIsAdmin());
     }
 
     @PostMapping("/authDetails")
-    public Map<String,List<XpackSysAuthDetailDTO>> authDetails(@RequestBody XpackSysAuthRequest request){
+    public Map<String, List<XpackSysAuthDetailDTO>> authDetails(@RequestBody XpackSysAuthRequest request) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         return sysAuthService.searchAuthDetails(request);
     }
 
-    @GetMapping("/authDetailsModel/{authType}")
+    @GetMapping("/authDetailsModel/{authType}/{direction}")
     @I18n
-    public List<XpackSysAuthDetail>authDetailsModel(@PathVariable String authType){
+    public List<XpackSysAuthDetail> authDetailsModel(@PathVariable String authType, @PathVariable String direction) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
-        List<XpackSysAuthDetail> authDetails =  sysAuthService.searchAuthDetailsModel(authType);
-        if(authType.equalsIgnoreCase("dataset")){
+        List<XpackSysAuthDetail> authDetails = sysAuthService.searchAuthDetailsModel(authType);
+        if ("source".equals(direction) && authType.equalsIgnoreCase("dataset")) {
             XpackSysAuthDetail xpackSysAuthDetail = new XpackSysAuthDetail();
             xpackSysAuthDetail.setPrivilegeName("i18n_auth_row_permission");
             xpackSysAuthDetail.setPrivilegeType(20);
             xpackSysAuthDetail.setPrivilegeValue(1);
-            authDetails.add(0,xpackSysAuthDetail);
+            authDetails.add(0, xpackSysAuthDetail);
         }
         return authDetails;
     }
 
     @PostMapping("/authChange")
-    public void authChange(@RequestBody XpackSysAuthRequest request){
+    public void authChange(@RequestBody XpackSysAuthRequest request) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         CurrentUserDto user = AuthUtils.getUser();
         sysAuthService.authChange(request, user.getUserId(), user.getUsername(), user.getIsAdmin());
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index c1a0036c7a..5a41d7facf 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1544,7 +1544,8 @@ export default {
 
   },
   auth: {
-    authConfig: 'Auth Config',
+    authConfig: 'Configure Permissions By User',
+    sourceConfig: 'Configure Permissions By Source',
     authQuickConfig: 'Auth Quick Config',
     dept: 'Dept',
     role: 'Role',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 622f135d37..ed91d55cab 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1553,7 +1553,8 @@ export default {
 
   },
   auth: {
-    authConfig: '權限配置',
+    authConfig: '按用户配置權限',
+    sourceConfig: '按资源配置權限',
     authQuickConfig: '權限快捷配置',
     dept: '組織',
     role: '角色',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 79869971c1..aec81e92aa 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1562,7 +1562,8 @@ export default {
 
   },
   auth: {
-    authConfig: '权限配置',
+    authConfig: '按用户配置权限',
+    sourceConfig: '按资源配置权限',
     authQuickConfig: '权限快捷配置',
     dept: '组织',
     role: '角色',

From 51412b6641cabe28304eb1b51d82f7cc72d58ae6 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 10 Feb 2022 10:22:45 +0800
Subject: [PATCH 09/47] feat: S2 pivot

---
 frontend/src/views/chart/view/ChartEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index d6583e5b59..76467520ec 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1946,7 +1946,7 @@ export default {
     addYaxis(e) {
       this.dragCheckType(this.view.yaxis, 'q')
       this.dragMoveDuplicate(this.view.yaxis, e)
-      if ((this.view.type === 'map' || this.view.type === 'waterfall' || this.view.type === 'word-cloud') && this.view.yaxis.length > 1) {
+      if ((this.view.type === 'map' || this.view.type === 'waterfall' || this.view.type === 'word-cloud' || this.view.type === 'table-pivot') && this.view.yaxis.length > 1) {
         this.view.yaxis = [this.view.yaxis[0]]
       }
       this.calcData(true)

From 05bd33b246c53ae9aaae803944b8ccba711b9a6d Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 10 Feb 2022 14:19:59 +0800
Subject: [PATCH 10/47] feat: S2 pivot

---
 frontend/src/views/chart/view/ChartEdit.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 76467520ec..d6583e5b59 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1946,7 +1946,7 @@ export default {
     addYaxis(e) {
       this.dragCheckType(this.view.yaxis, 'q')
       this.dragMoveDuplicate(this.view.yaxis, e)
-      if ((this.view.type === 'map' || this.view.type === 'waterfall' || this.view.type === 'word-cloud' || this.view.type === 'table-pivot') && this.view.yaxis.length > 1) {
+      if ((this.view.type === 'map' || this.view.type === 'waterfall' || this.view.type === 'word-cloud') && this.view.yaxis.length > 1) {
         this.view.yaxis = [this.view.yaxis[0]]
       }
       this.calcData(true)

From 330bd292321486394d96018f269756e858345432 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 10 Feb 2022 17:10:58 +0800
Subject: [PATCH 11/47] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=96=B0tab?=
 =?UTF-8?q?=E9=A1=B5=E9=A2=84=E8=A7=88=E6=97=A0=E6=B3=95=E6=89=93=E5=BC=80?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/canvas/components/Editor/PreviewEject.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/components/canvas/components/Editor/PreviewEject.vue b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
index d9c76d0453..6c23856e7f 100644
--- a/frontend/src/components/canvas/components/Editor/PreviewEject.vue
+++ b/frontend/src/components/canvas/components/Editor/PreviewEject.vue
@@ -53,7 +53,7 @@ export default {
       }
       // 加载视图数据
       initPanelData(this.panelId, function() {
-        this.dataLoading = false
+        _this.dataLoading = false
         // 如果含有跳转参数 进行触发
         const tempParam = localStorage.getItem('jumpInfoParam')
         if (tempParam) {

From 107635933ed590284228de13c8ec358f46663c05 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 10 Feb 2022 18:04:38 +0800
Subject: [PATCH 12/47] =?UTF-8?q?refactor:=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E9=A2=84=E8=A7=88=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/query/doris/DorisQueryProvider.java       | 10 +---------
 frontend/src/views/dataset/data/TabDataPreview.vue     |  8 +++++---
 frontend/src/views/dataset/data/ViewTable.vue          |  6 +++---
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
index 9ba233dc06..4e2a59f65d 100644
--- a/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/doris/DorisQueryProvider.java
@@ -76,7 +76,7 @@ public class DorisQueryProvider extends QueryProvider {
 
     @Override
     public String createSQLPreview(String sql, String orderBy) {
-        return "SELECT * FROM (" + sql + ") AS tmp ORDER BY " + orderBy + " LIMIT 0,1000";
+        return "SELECT * FROM (" + sqlFix(sql) + ") AS tmp LIMIT 0,1000";
     }
 
     @Override
@@ -147,14 +147,6 @@ public class DorisQueryProvider extends QueryProvider {
         if (customWheres != null) wheres.add(customWheres);
         if (CollectionUtils.isNotEmpty(wheres)) st_sql.add("filters", wheres);
 
-        if ((fields.size() > 0)) {
-            xOrders.add(SQLObj.builder()
-                    .orderDirection("asc")
-                    .orderField(fields.get(0).getDataeaseName())
-                    .orderAlias(String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, "0"))
-                    .build());
-            st_sql.add("orders", xOrders);
-        }
         return st_sql.render();
     }
 
diff --git a/frontend/src/views/dataset/data/TabDataPreview.vue b/frontend/src/views/dataset/data/TabDataPreview.vue
index f7db8d26af..cb2ff98435 100644
--- a/frontend/src/views/dataset/data/TabDataPreview.vue
+++ b/frontend/src/views/dataset/data/TabDataPreview.vue
@@ -58,9 +58,10 @@
         {{ $t('dataset.preview_item') }}
       </span>
       <el-pagination
+        v-show="false"
         :current-page="currentPage.page"
-        :page-sizes="[100]"
-        :page-size="currentPage.pageSize"
+        :page-sizes="[parseInt(form.row)]"
+        :page-size="parseInt(form.row)"
         :pager-count="5"
         layout="sizes, prev, pager, next"
         :total="currentPage.show"
@@ -104,7 +105,7 @@ export default {
       height: 500,
       currentPage: {
         page: 1,
-        pageSize: 100,
+        pageSize: parseInt(this.form.row),
         show: parseInt(this.form.row)
       }
     }
@@ -153,6 +154,7 @@ export default {
         return
       }
       this.currentPage.show = parseInt(this.form.row)
+      this.currentPage.pageSize = parseInt(this.form.row)
       this.currentPage.page = 1
       this.$emit('reSearch', { form: this.form, page: this.currentPage })
     },
diff --git a/frontend/src/views/dataset/data/ViewTable.vue b/frontend/src/views/dataset/data/ViewTable.vue
index 816b129141..4616c13cb8 100644
--- a/frontend/src/views/dataset/data/ViewTable.vue
+++ b/frontend/src/views/dataset/data/ViewTable.vue
@@ -93,7 +93,7 @@ export default {
       data: [],
       page: {
         page: 1,
-        pageSize: 100,
+        pageSize: 1000,
         show: 1000
       },
       tabActive: 'dataPreview',
@@ -160,7 +160,7 @@ export default {
           this.data = []
           this.page = {
             page: 1,
-            pageSize: 100,
+            pageSize: 1000,
             show: 0
           }
         })
@@ -218,7 +218,7 @@ export default {
     resetPage() {
       this.page = {
         page: 1,
-        pageSize: 100,
+        pageSize: 1000,
         show: 1000
       }
     },

From 417d869d46d8c36378c60b50dac75d8420b01a75 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 10 Feb 2022 18:17:41 +0800
Subject: [PATCH 13/47] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=E6=B0=94?=
 =?UTF-8?q?=E6=B3=A1=E5=9C=B0=E5=9B=BE=E6=8F=92=E4=BB=B6=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               |   5 +
 .../plugins/server/view/PluginViewServer.java |  33 +
 frontend/src/api/chart/chart.js               |   7 +
 frontend/src/icons/svg/buddle-map.svg         |   1 +
 frontend/src/main.js                          |   2 +
 frontend/src/views/chart/chart/util.js        | 281 +++++++
 frontend/src/views/chart/view/ChartEdit.vue   | 723 +++++++++---------
 frontend/src/views/chart/view/ChartType.vue   | 477 ++----------
 .../src/views/system/plugin/PluginCom.vue     |  14 +-
 9 files changed, 777 insertions(+), 766 deletions(-)
 create mode 100644 backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java
 create mode 100644 frontend/src/icons/svg/buddle-map.svg

diff --git a/backend/pom.xml b/backend/pom.xml
index 0ffce51cf3..3783dad76e 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -216,6 +216,11 @@
             <artifactId>dataease-plugin-interface</artifactId>
             <version>1.7</version>
         </dependency>
+        <dependency>
+            <groupId>io.dataease</groupId>
+            <artifactId>dataease-plugin-view</artifactId>
+            <version>1.7</version>
+        </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
diff --git a/backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java b/backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java
new file mode 100644
index 0000000000..d57b1088ab
--- /dev/null
+++ b/backend/src/main/java/io/dataease/plugins/server/view/PluginViewServer.java
@@ -0,0 +1,33 @@
+package io.dataease.plugins.server.view;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.Map.Entry;
+
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.dataease.plugins.config.SpringContextUtil;
+import io.dataease.plugins.view.entity.PluginViewType;
+import io.dataease.plugins.view.service.ViewPluginService;
+
+@RequestMapping("/plugin/view")
+@RestController
+public class PluginViewServer {
+
+    @PostMapping("/types")
+    public List<PluginViewType> types() {
+        List<PluginViewType> result = new ArrayList<>();
+        Map<String, ViewPluginService> beanMap = SpringContextUtil.getApplicationContext()
+                .getBeansOfType(ViewPluginService.class);
+        if (beanMap.keySet().size() == 0) {
+            return result;
+        }
+        for (Entry<String, ViewPluginService> entry : beanMap.entrySet()) {
+            result.add(entry.getValue().viewType());
+        }
+        return result;
+    }
+}
diff --git a/frontend/src/api/chart/chart.js b/frontend/src/api/chart/chart.js
index 87abbcd662..d143acf1da 100644
--- a/frontend/src/api/chart/chart.js
+++ b/frontend/src/api/chart/chart.js
@@ -69,3 +69,10 @@ export function ajaxGetDataOnly(id, data) {
     data
   })
 }
+
+export function pluginTypes() {
+  return request({
+    url: '/plugin/view/types',
+    method: 'post'
+  })
+}
diff --git a/frontend/src/icons/svg/buddle-map.svg b/frontend/src/icons/svg/buddle-map.svg
new file mode 100644
index 0000000000..a56a4cf8c7
--- /dev/null
+++ b/frontend/src/icons/svg/buddle-map.svg
@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1644388374047" class="icon" viewBox="0 0 1303 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="4486" xmlns:xlink="http://www.w3.org/1999/xlink" width="254.4921875" height="200"><defs><style type="text/css"></style></defs><path d="M1303.272727 188.881455V82.106182h-8.704l-30.394182 32.861091c-4.328727 4.096-8.704 4.096-13.032727 4.096h-13.032727c-4.328727 0-13.032727-4.096-13.032727-8.192l-21.736728-16.430546c-4.328727-4.096-8.657455-8.238545-13.032727-8.238545h-26.065454c-4.328727 0-13.032727-4.096-17.361455-8.192L1099.077818 12.334545c-4.328727-4.142545-8.657455-8.238545-13.032727-8.238545L1055.650909 0h-8.704l-47.755636 16.430545v24.669091l-8.704 53.341091c0 4.096-4.328727 8.192-4.328728 8.192L977.454545 110.871273c-4.328727 4.096-8.704 4.096-13.032727 4.096h-8.704c-8.657455 0-17.361455 4.096-17.361454 12.334545l-8.704 20.48a18.199273 18.199273 0 0 0 17.408 24.669091h21.690181l17.408-12.334545 13.032728 8.238545c8.657455 8.192 4.328727 24.669091-8.704 28.718546l-39.098182 12.334545v24.669091h-39.098182l-8.704 24.622545-34.722909-4.142545c-8.704 0-13.032727 4.142545-17.408 8.238545l-8.657455 12.288 13.032728 12.334546-34.769455 36.957091c-4.328727 4.096-8.704 4.096-13.032727 4.096h-52.130909c-4.328727 0-8.704 0-13.032727 4.096l-13.032728 12.334545c-4.328727 4.096-8.704 4.096-13.032727 4.096h-39.098182c-4.328727 0-8.704 0-13.032727-4.096l-26.065455-20.526545c-4.328727 0-4.328727-4.096-8.704-4.096l-95.557818-4.096c-4.328727 0-8.704-4.142545-13.032727-8.238546l-52.130909-65.675636c-4.328727-4.142545-8.704-8.238545-13.032727-8.238546h-4.328728c-8.704 0-17.408-8.192-17.408-16.430545v-28.718545l-4.328727-24.669091c0-4.096-4.328727-8.192-8.704-12.288H390.981818c-4.328727 0-8.704-4.096-8.704-8.238546l-8.657454-24.622545H351.883636l-13.032727 16.430545h-21.736727v20.526546H273.687273c-4.328727 0-13.032727 4.096-13.032728 8.238545l-17.361454 24.622546c-4.375273 4.096-8.704 8.192-17.408 8.192h-21.690182c-8.704 0-17.408 8.238545-17.408 16.430545v24.669091c0 4.096 0 8.192-4.328727 8.192l-13.032727 20.48c-4.328727 4.189091-4.328727 8.238545-13.032728 8.238545l-47.802182 12.334546H34.769455c-4.375273 0-8.704 4.096-13.032728 4.096l-13.032727 16.430545C0 320.279273 0 324.421818 0 328.471273v20.526545h17.361455V414.72c0 4.096 4.375273 8.192 8.704 12.288l30.394181 24.669091c4.375273 4.096 4.375273 4.096 4.375273 8.192l8.657455 28.765091v53.341091H52.130909v32.861091c0 4.096 4.328727 8.192 4.328727 12.334545l39.098182 32.814546h21.736727l86.900364 82.152727 4.328727 4.096 73.867637 28.718545 13.032727-16.384h26.065455c8.657455 0 13.032727 4.096 17.361454 8.192l13.032727 24.669091c4.328727 4.049455 8.704 8.192 17.361455 8.192H390.981818c4.328727 0 4.328727 0 8.704-4.142545l43.426909-24.622546c4.328727-4.096 13.032727-4.096 17.361455 0l39.098182 16.430546v-16.430546h21.736727l8.704 24.669091v36.910546c0 4.142545 0 8.238545-4.375273 12.334545l-21.690182 20.526546v20.526545l17.361455 4.096c4.328727 0 13.032727 4.142545 13.032727 12.334545l4.328727 12.334546v28.718545l43.473455 28.765091a13.824 13.824 0 0 0 8.657455 4.096h8.704c8.704 0 17.361455-8.238545 17.361454-16.430545s8.704-16.430545 17.408-16.430546h43.426909c4.328727 0 8.704 0 13.032727-4.096l13.032728-8.192c8.704-4.142545 17.361455-4.142545 26.065454 4.096l30.394182 32.814546c4.375273 4.142545 8.704 8.238545 13.032727 8.238545h52.130909l4.375273 20.526546-30.440727 32.861091v20.48l21.736727 12.334545c8.704 4.142545 21.736727 0 26.065455-8.192l21.736727-28.765091c4.328727-4.096 4.328727-8.192 4.328727-12.288l-4.328727-28.765091c0-8.192 4.328727-20.48 13.032727-20.48l30.394182-8.238545h8.704l17.361455 4.096 21.736727-8.192 4.328727-20.526546c0-8.238545 8.704-12.334545 13.032727-12.334545l26.065455-8.238546c4.328727 0 4.328727 0 8.704-4.096l82.525091-69.818181c4.328727-4.096 4.328727-4.096 4.328727-8.192l13.032727-61.579637c0-4.096 4.375273-8.192 8.704-12.334545l21.736728-12.288c4.328727-4.142545 8.657455-12.334545 8.657454-16.430546l-8.657454-73.914181c0-4.096-4.375273-8.192-8.704-12.334546l-17.361455-12.288c-4.375273-4.142545-8.704-8.238545-8.704-12.334545l-4.328727-16.430546c0-4.096-4.375273-8.192-8.704-12.288l-30.394182-24.669091c-8.704-4.096-8.704-16.430545-4.375273-24.622545l17.408-28.765091c0-4.096 4.328727-4.096 8.657455-8.192l34.769454-12.334546v-20.48h-34.769454c-4.328727 0-13.032727 4.096-17.361455 8.192l-13.032727 16.430546-13.032727 12.288-4.328727-20.48-30.440728-8.238546L1081.716364 344.901818l8.704 12.334546v24.622545c0 4.096 0 12.334545 4.328727 12.334546l4.328727 4.096a29.090909 29.090909 0 0 0 26.065455 0l60.834909-57.483637c4.328727-4.096 4.328727-8.238545 4.328727-16.430545l-4.328727-16.430546 39.098182-4.096c4.328727 0 8.704-4.096 13.032727-4.096l34.769454-32.861091c4.328727-4.096 8.657455-12.334545 4.328728-20.526545l-21.736728-45.149091 17.408-16.430545H1303.272727v4.096z" fill="#C1CADC" p-id="4487"></path><path d="M407.272727 551.377455a22.481455 22.481455 0 0 1-17.221818-8.378182c-0.791273-0.930909-1.768727-1.954909-2.792727-3.211637a482.397091 482.397091 0 0 1-29.323637-37.236363 302.917818 302.917818 0 0 1-18.01309-28.392728C330.565818 457.122909 325.818182 442.973091 325.818182 432.128c0-10.472727 2.141091-20.619636 6.376727-30.208 4.096-9.216 10.007273-17.547636 17.454546-24.669091 7.447273-7.121455 16.197818-12.706909 25.879272-16.616727a84.526545 84.526545 0 0 1 63.488 0c9.681455 3.909818 18.385455 9.495273 25.879273 16.616727 7.447273 7.121455 13.358545 15.453091 17.454545 24.669091 4.189091 9.588364 6.376727 19.735273 6.376728 30.254545 0 10.798545-4.747636 24.948364-14.103273 41.984a298.542545 298.542545 0 0 1-17.966545 28.392728 469.504 469.504 0 0 1-29.323637 37.236363l-2.699636 3.025455a22.714182 22.714182 0 0 1-17.268364 8.564364H407.272727zM672.023273 787.688727a16.523636 16.523636 0 0 1-12.939637-6.702545l-2.094545-2.56a384.186182 384.186182 0 0 1-22.016-29.789091 245.154909 245.154909 0 0 1-13.498182-22.714182c-6.981818-13.637818-10.565818-24.948364-10.565818-33.652364a62.510545 62.510545 0 0 1 37.282909-57.204363c7.540364-3.258182 15.546182-4.887273 23.784727-4.933818h0.046546a59.950545 59.950545 0 0 1 43.194182 18.245818 61.998545 61.998545 0 0 1 17.873454 43.892363c0 8.704-3.537455 20.014545-10.565818 33.652364-3.630545 6.981818-8.145455 14.615273-13.498182 22.714182a373.946182 373.946182 0 0 1-22.016 29.789091l-2.001454 2.420363a16.663273 16.663273 0 0 1-12.939637 6.842182h-0.093091zM896 669.556364a34.676364 34.676364 0 0 1-25.786182-11.729455l-4.235636-4.514909a682.961455 682.961455 0 0 1-44.032-52.130909 421.143273 421.143273 0 0 1-26.996364-39.749818c-14.010182-23.877818-21.131636-43.659636-21.131636-58.833455 0-14.661818 3.258182-28.858182 9.588363-42.263273a108.916364 108.916364 0 0 1 26.158546-34.583272c11.217455-9.960727 24.296727-17.826909 38.865454-23.272728a134.795636 134.795636 0 0 1 47.569455-8.610909h0.046545c16.523636 0 32.488727 2.885818 47.569455 8.610909 14.568727 5.445818 27.601455 13.312 38.818909 23.272728 11.170909 10.007273 20.014545 21.597091 26.205091 34.583272 6.330182 13.358545 9.541818 27.601455 9.541818 42.263273 0 15.173818-7.121455 34.955636-21.131636 58.833455-7.214545 12.241455-16.290909 25.6-26.996364 39.703272a664.715636 664.715636 0 0 1-44.032 52.177455l-3.956363 4.235636a35.002182 35.002182 0 0 1-25.925819 12.008728h-0.139636z" fill="#8A90A2" p-id="4488"></path><path d="M1066.356364 850.385455c0 2.932364-7.447273 2.932364-7.447273 5.864727v23.319273c0 2.932364 0 5.864727 7.447273 8.750545l29.556363 17.547636 22.248728-11.682909c0-2.932364 7.400727-2.932364 7.400727-5.864727l14.801454-61.253818h-37.050181l-37.003637 23.365818z" fill="#C1CADC" p-id="4489"></path></svg>
\ No newline at end of file
diff --git a/frontend/src/main.js b/frontend/src/main.js
index 9f8248118f..f4272a1bfb 100644
--- a/frontend/src/main.js
+++ b/frontend/src/main.js
@@ -24,9 +24,11 @@ import DeComplexSelect from '@/components/business/condition-table/DeComplexSele
 import '@/components/canvas/custom-component' // 注册自定义组件
 
 import '@/utils/DateUtil'
+import draggable from 'vuedraggable'
 Vue.config.productionTip = false
 Vue.use(VueClipboard)
 Vue.use(widgets)
+Vue.component('draggable', draggable)
 Vue.prototype.$api = api
 
 import * as echarts from 'echarts'
diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index 1bec7413d9..4991c2a24b 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -26,3 +26,284 @@ export function digToHex(dig) {
   }
   return prefix.concat(num.toString(16).toUpperCase())
 }
+
+export const TYPE_CONFIGS = [
+  {
+    render: 'antv',
+    category: 'chart.chart_type_table',
+    value: 'table-normal',
+    title: 'chart.chart_table_normal',
+    icon: 'table-normal'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_table',
+    value: 'table-info',
+    title: 'chart.chart_table_info',
+    icon: 'table-info'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_table',
+    value: 'table-pivot',
+    title: 'chart.chart_table_pivot',
+    icon: 'table-pivot'
+  },
+
+  {
+    render: 'antv',
+    category: 'chart.chart_type_quota',
+    value: 'text',
+    title: 'chart.chart_card',
+    icon: 'text'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_quota',
+    value: 'gauge',
+    title: 'chart.chart_gauge',
+    icon: 'gauge'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_quota',
+    value: 'liquid',
+    title: 'chart.chart_liquid',
+    icon: 'liquid'
+  },
+
+  {
+    render: 'antv',
+    category: 'chart.chart_type_trend',
+    value: 'line',
+    title: 'chart.chart_line',
+    icon: 'line'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_trend',
+    value: 'line-stack',
+    title: 'chart.chart_line_stack',
+    icon: 'line-stack'
+  },
+
+  {
+    render: 'antv',
+    category: 'chart.chart_type_compare',
+    value: 'bar',
+    title: 'chart.chart_bar',
+    icon: 'bar'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_compare',
+    value: 'bar-stack',
+    title: 'chart.chart_bar_stack',
+    icon: 'bar-stack'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_compare',
+    value: 'waterfall',
+    title: 'chart.chart_waterfall',
+    icon: 'waterfall'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_compare',
+    value: 'bar-horizontal',
+    title: 'chart.chart_bar_horizontal',
+    icon: 'bar-horizontal'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_compare',
+    value: 'bar-stack-horizontal',
+    title: 'chart.chart_bar_stack_horizontal',
+    icon: 'bar-stack-horizontal'
+  },
+
+  {
+    render: 'antv',
+    category: 'chart.chart_type_distribute',
+    value: 'pie',
+    title: 'chart.chart_pie',
+    icon: 'pie'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_distribute',
+    value: 'pie-rose',
+    title: 'chart.chart_pie_rose',
+    icon: 'pie-rose'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_distribute',
+    value: 'radar',
+    title: 'chart.chart_radar',
+    icon: 'radar'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_distribute',
+    value: 'treemap',
+    title: 'chart.chart_treemap',
+    icon: 'treemap'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_distribute',
+    value: 'word-cloud',
+    title: 'chart.chart_word_cloud',
+    icon: 'word-cloud'
+  },
+
+  {
+    render: 'antv',
+    category: 'chart.chart_type_relation',
+    value: 'scatter',
+    title: 'chart.chart_scatter',
+    icon: 'scatter'
+  },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_relation',
+    value: 'funnel',
+    title: 'chart.chart_funnel',
+    icon: 'funnel'
+  },
+  /* 下面是echarts图表类型 */
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_table',
+    value: 'table-normal',
+    title: 'chart.chart_table_normal',
+    icon: 'table-normal'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_table',
+    value: 'table-info',
+    title: 'chart.chart_table_info',
+    icon: 'table-info'
+  },
+
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_quota',
+    value: 'text',
+    title: 'chart.chart_card',
+    icon: 'text'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_quota',
+    value: 'gauge',
+    title: 'chart.chart_gauge',
+    icon: 'gauge'
+  },
+
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_trend',
+    value: 'line',
+    title: 'chart.chart_line',
+    icon: 'line'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_trend',
+    value: 'line-stack',
+    title: 'chart.chart_line_stack',
+    icon: 'line-stack'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_trend',
+    value: 'chart-mix',
+    title: 'chart.chart_mix',
+    icon: 'chart-mix'
+  },
+
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_compare',
+    value: 'bar',
+    title: 'chart.chart_bar',
+    icon: 'bar'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_compare',
+    value: 'bar-stack',
+    title: 'chart.chart_bar_stack',
+    icon: 'bar-stack'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_compare',
+    value: 'bar-horizontal',
+    title: 'chart.chart_bar_horizontal',
+    icon: 'bar-horizontal'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_compare',
+    value: 'bar-stack-horizontal',
+    title: 'chart.chart_bar_stack_horizontal',
+    icon: 'bar-stack-horizontal'
+  },
+
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_distribute',
+    value: 'pie',
+    title: 'chart.chart_pie',
+    icon: 'pie'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_distribute',
+    value: 'pie-rose',
+    title: 'chart.chart_pie_rose',
+    icon: 'pie-rose'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_distribute',
+    value: 'radar',
+    title: 'chart.chart_radar',
+    icon: 'radar'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_distribute',
+    value: 'treemap',
+    title: 'chart.chart_treemap',
+    icon: 'treemap'
+  },
+
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_relation',
+    value: 'scatter',
+    title: 'chart.chart_scatter',
+    icon: 'scatter'
+  },
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_relation',
+    value: 'funnel',
+    title: 'chart.chart_funnel',
+    icon: 'funnel'
+  },
+
+  {
+    render: 'echarts',
+    category: 'chart.chart_type_space',
+    value: 'map',
+    title: 'chart.chart_map',
+    icon: 'map'
+  }
+]
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index a868617587..ee36986e32 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -219,348 +219,352 @@
                       </el-radio-group>
                     </el-row>
                   </el-row>
-                  <el-row v-if="view.type ==='map'" class="padding-lr">
-                    <span style="width: 80px;text-align: right;">
-                      <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"
-                        :no-children-text="$t('commons.treeselect.no_children_text')"
-                        :no-options-text="$t('commons.treeselect.no_options_text')"
-                        :no-results-text="$t('commons.treeselect.no_results_text')"
-                        @input="calcData"
-                        @deselect="calcData"
-                      />
-                    </span>
-                  </el-row>
-                  <!--xAxisExt-->
-                  <el-row
-                    v-if="view.type === 'table-pivot'"
-                    class="padding-lr"
-                  >
-                    <span style="width: 80px;text-align: right;">
-                      <span>{{ $t('chart.table_pivot_row') }}</span>
-                      /
-                      <span>{{ $t('chart.dimension') }}</span>
-                    </span>
-                    <draggable
-                      v-model="view.xaxisExt"
-                      :disabled="!hasDataPermission('manage',param.privileges)"
-                      group="drag"
-                      animation="300"
-                      :move="onMove"
-                      class="drag-block-style"
-                      @add="addXaxisExt"
-                      @update="calcData(true)"
-                    >
-                      <transition-group class="draggable-group">
-                        <dimension-ext-item
-                          v-for="(item,index) in view.xaxisExt"
-                          :key="item.id"
-                          :param="param"
-                          :index="index"
-                          :item="item"
-                          @onDimensionItemChange="dimensionItemChange"
-                          @onDimensionItemRemove="dimensionItemRemove"
-                          @editItemFilter="showDimensionEditFilter"
-                          @onNameEdit="showRename"
+                  <plugin-com v-if="isPlugin" :component-name="view.type + '-data'" :obj="{view, param, chart}" />
+                  <div v-else>
+                    <el-row v-if="view.type ==='map'" class="padding-lr">
+                      <span style="width: 80px;text-align: right;">
+                        <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"
+                          :no-children-text="$t('commons.treeselect.no_children_text')"
+                          :no-options-text="$t('commons.treeselect.no_options_text')"
+                          :no-results-text="$t('commons.treeselect.no_results_text')"
+                          @input="calcData"
+                          @deselect="calcData"
                         />
-                      </transition-group>
-                    </draggable>
-                    <div v-if="!view.xaxisExt || view.xaxisExt.length === 0" class="drag-placeholder-style">
-                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
-                    </div>
-                  </el-row>
-                  <!--xAxis-->
-                  <el-row
-                    v-if="view.type !=='text' && view.type !== 'gauge' && view.type !== 'liquid'"
-                    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') || view.type.includes('scatter') || view.type === 'chart-mix' || view.type === 'waterfall')"
-                      >{{ $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 === 'map'">{{ $t('chart.area') }}</span>
-                      <span v-else-if="view.type && view.type.includes('treemap')">{{ $t('chart.drag_block_treemap_label') }}</span>
-                      <span v-else-if="view.type && view.type === 'word-cloud'">{{ $t('chart.drag_block_word_cloud_label') }}</span>
-                      /
-                      <span v-if="view.type && view.type !== 'table-info'">{{ $t('chart.dimension') }}</span>
-                      <span
-                        v-else-if="view.type && view.type === 'table-info'"
-                      >{{ $t('chart.dimension_or_quota') }}</span>
-                    </span>
-                    <draggable
-                      v-model="view.xaxis"
-                      :disabled="!hasDataPermission('manage',param.privileges)"
-                      group="drag"
-                      animation="300"
-                      :move="onMove"
-                      class="drag-block-style"
-                      @add="addXaxis"
-                      @update="calcData(true)"
+                      </span>
+                    </el-row>
+                    <!--xAxisExt-->
+                    <el-row
+                      v-if="view.type === 'table-pivot'"
+                      class="padding-lr"
                     >
-                      <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>
-                  <!--yaxis-->
-                  <el-row v-if="view.type !=='table-info'" class="padding-lr" style="margin-top: 6px;">
-                    <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') || view.type.includes('scatter') || view.type === 'waterfall')"
-                      >{{ $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 === 'map'">{{ $t('chart.chart_data') }}</span>
-                      <span v-else-if="view.type && view.type.includes('tree')">{{ $t('chart.drag_block_treemap_size') }}</span>
-                      <span v-else-if="view.type && view.type === 'chart-mix'">{{ $t('chart.drag_block_value_axis_main') }}</span>
-                      <span v-else-if="view.type && view.type === 'liquid'">{{ $t('chart.drag_block_progress') }}</span>
-                      <span v-else-if="view.type && view.type === 'word-cloud'">{{ $t('chart.drag_block_word_cloud_size') }}</span>
-                      /
-                      <span>{{ $t('chart.quota') }}</span>
-                    </span>
-                    <draggable
-                      v-model="view.yaxis"
-                      :disabled="!hasDataPermission('manage',param.privileges)"
-                      group="drag"
-                      animation="300"
-                      :move="onMove"
-                      class="drag-block-style"
-                      @add="addYaxis"
-                      @update="calcData(true)"
+                      <span style="width: 80px;text-align: right;">
+                        <span>{{ $t('chart.table_pivot_row') }}</span>
+                        /
+                        <span>{{ $t('chart.dimension') }}</span>
+                      </span>
+                      <draggable
+                        v-model="view.xaxisExt"
+                        :disabled="!hasDataPermission('manage',param.privileges)"
+                        group="drag"
+                        animation="300"
+                        :move="onMove"
+                        class="drag-block-style"
+                        @add="addXaxisExt"
+                        @update="calcData(true)"
+                      >
+                        <transition-group class="draggable-group">
+                          <dimension-ext-item
+                            v-for="(item,index) in view.xaxisExt"
+                            :key="item.id"
+                            :param="param"
+                            :index="index"
+                            :item="item"
+                            @onDimensionItemChange="dimensionItemChange"
+                            @onDimensionItemRemove="dimensionItemRemove"
+                            @editItemFilter="showDimensionEditFilter"
+                            @onNameEdit="showRename"
+                          />
+                        </transition-group>
+                      </draggable>
+                      <div v-if="!view.xaxisExt || view.xaxisExt.length === 0" class="drag-placeholder-style">
+                        <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
+                      </div>
+                    </el-row>
+                    <!--xAxis-->
+                    <el-row
+                      v-if="view.type !=='text' && view.type !== 'gauge' && view.type !== 'liquid'"
+                      class="padding-lr"
                     >
-                      <transition-group class="draggable-group">
-                        <quota-item
-                          v-for="(item,index) in view.yaxis"
-                          :key="item.id"
-                          :param="param"
-                          :index="index"
-                          :item="item"
-                          :chart="chart"
-                          @onQuotaItemChange="quotaItemChange"
-                          @onQuotaItemRemove="quotaItemRemove"
-                          @editItemFilter="showQuotaEditFilter"
-                          @onNameEdit="showRename"
-                          @editItemCompare="showQuotaEditCompare"
-                        />
-                      </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>
-                  <!--yAxisExt-->
-                  <el-row v-if="view.type && view.type === 'chart-mix'" class="padding-lr" style="margin-top: 6px;">
-                    <span style="width: 80px;text-align: right;">
-                      <span>{{ $t('chart.drag_block_value_axis_ext') }}</span>
-                      /
-                      <span>{{ $t('chart.quota') }}</span>
-                    </span>
-                    <draggable
-                      v-model="view.yaxisExt"
-                      :disabled="!hasDataPermission('manage',param.privileges)"
-                      group="drag"
-                      animation="300"
-                      :move="onMove"
-                      class="drag-block-style"
-                      @add="addYaxisExt"
-                      @update="calcData(true)"
+                      <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') || view.type.includes('scatter') || view.type === 'chart-mix' || view.type === 'waterfall')"
+                        >{{ $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 === 'map'">{{ $t('chart.area') }}</span>
+                        <span v-else-if="view.type && view.type.includes('treemap')">{{ $t('chart.drag_block_treemap_label') }}</span>
+                        <span v-else-if="view.type && view.type === 'word-cloud'">{{ $t('chart.drag_block_word_cloud_label') }}</span>
+                        /
+                        <span v-if="view.type && view.type !== 'table-info'">{{ $t('chart.dimension') }}</span>
+                        <span
+                          v-else-if="view.type && view.type === 'table-info'"
+                        >{{ $t('chart.dimension_or_quota') }}</span>
+                      </span>
+                      <draggable
+                        v-model="view.xaxis"
+                        :disabled="!hasDataPermission('manage',param.privileges)"
+                        group="drag"
+                        animation="300"
+                        :move="onMove"
+                        class="drag-block-style"
+                        @add="addXaxis"
+                        @update="calcData(true)"
+                      >
+                        <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>
+                    <!--yaxis-->
+                    <el-row v-if="view.type !=='table-info'" class="padding-lr" style="margin-top: 6px;">
+                      <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') || view.type.includes('scatter') || view.type === 'waterfall')"
+                        >{{ $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 === 'map'">{{ $t('chart.chart_data') }}</span>
+                        <span v-else-if="view.type && view.type.includes('tree')">{{ $t('chart.drag_block_treemap_size') }}</span>
+                        <span v-else-if="view.type && view.type === 'chart-mix'">{{ $t('chart.drag_block_value_axis_main') }}</span>
+                        <span v-else-if="view.type && view.type === 'liquid'">{{ $t('chart.drag_block_progress') }}</span>
+                        <span v-else-if="view.type && view.type === 'word-cloud'">{{ $t('chart.drag_block_word_cloud_size') }}</span>
+                        /
+                        <span>{{ $t('chart.quota') }}</span>
+                      </span>
+                      <draggable
+                        v-model="view.yaxis"
+                        :disabled="!hasDataPermission('manage',param.privileges)"
+                        group="drag"
+                        animation="300"
+                        :move="onMove"
+                        class="drag-block-style"
+                        @add="addYaxis"
+                        @update="calcData(true)"
+                      >
+                        <transition-group class="draggable-group">
+                          <quota-item
+                            v-for="(item,index) in view.yaxis"
+                            :key="item.id"
+                            :param="param"
+                            :index="index"
+                            :item="item"
+                            :chart="chart"
+                            @onQuotaItemChange="quotaItemChange"
+                            @onQuotaItemRemove="quotaItemRemove"
+                            @editItemFilter="showQuotaEditFilter"
+                            @onNameEdit="showRename"
+                            @editItemCompare="showQuotaEditCompare"
+                          />
+                        </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>
+                    <!--yAxisExt-->
+                    <el-row v-if="view.type && view.type === 'chart-mix'" class="padding-lr" style="margin-top: 6px;">
+                      <span style="width: 80px;text-align: right;">
+                        <span>{{ $t('chart.drag_block_value_axis_ext') }}</span>
+                        /
+                        <span>{{ $t('chart.quota') }}</span>
+                      </span>
+                      <draggable
+                        v-model="view.yaxisExt"
+                        :disabled="!hasDataPermission('manage',param.privileges)"
+                        group="drag"
+                        animation="300"
+                        :move="onMove"
+                        class="drag-block-style"
+                        @add="addYaxisExt"
+                        @update="calcData(true)"
+                      >
+                        <transition-group class="draggable-group">
+                          <quota-ext-item
+                            v-for="(item,index) in view.yaxisExt"
+                            :key="item.id"
+                            :param="param"
+                            :index="index"
+                            :item="item"
+                            :chart="chart"
+                            @onQuotaItemChange="quotaItemChange"
+                            @onQuotaItemRemove="quotaItemRemove"
+                            @editItemFilter="showQuotaEditFilter"
+                            @onNameEdit="showRename"
+                            @editItemCompare="showQuotaEditCompare"
+                          />
+                        </transition-group>
+                      </draggable>
+                      <div v-if="!view.yaxisExt || view.yaxisExt.length === 0" class="drag-placeholder-style">
+                        <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
+                      </div>
+                    </el-row>
+                    <!--extStack-->
+                    <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"
+                        @update="calcData(true)"
+                      >
+                        <transition-group class="draggable-group">
+                          <chart-drag-item
+                            v-for="(item,index) in view.extStack"
+                            :key="item.id"
+                            :conf="'sort'"
+                            :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>
+                    <!--extBubble-->
+                    <el-row v-if="view.type && view.type.includes('scatter')" class="padding-lr" style="margin-top: 6px;">
+                      <span style="width: 80px;text-align: right;">
+                        <span>{{ $t('chart.bubble_size') }}</span>
+                        /
+                        <span>{{ $t('chart.quota') }}</span>
+                        <el-tooltip class="item" effect="dark" placement="bottom">
+                          <div slot="content">
+                            该指标生效时，样式大小中的气泡大小属性将失效
+                          </div>
+                          <i class="el-icon-info" style="cursor: pointer;color: #606266;" />
+                        </el-tooltip>
+                      </span>
+                      <draggable
+                        v-model="view.extBubble"
+                        :disabled="!hasDataPermission('manage',param.privileges)"
+                        group="drag"
+                        animation="300"
+                        :move="onMove"
+                        class="drag-block-style"
+                        @add="addBubble"
+                        @update="calcData(true)"
+                      >
+                        <transition-group class="draggable-group">
+                          <chart-drag-item
+                            v-for="(item,index) in view.extBubble"
+                            :key="item.id"
+                            :conf="'summary'"
+                            :param="param"
+                            :index="index"
+                            :item="item"
+                            @onItemChange="bubbleItemChange"
+                            @onItemRemove="bubbleItemRemove"
+                          />
+                        </transition-group>
+                      </draggable>
+                      <div v-if="!view.extBubble || view.extBubble.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" />-->
+                      <!--                    </el-button>-->
+                      <draggable
+                        v-model="view.customFilter"
+                        :disabled="!hasDataPermission('manage',param.privileges)"
+                        group="drag"
+                        animation="300"
+                        :move="onMove"
+                        class="theme-item-class"
+                        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;"
+                        @add="addCustomFilter"
+                        @update="calcData(true)"
+                      >
+                        <transition-group class="draggable-group">
+                          <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
+                      v-if="view.type && !(view.type.includes('table') && view.render === 'echarts') && !view.type.includes('text') && !view.type.includes('gauge') && view.type !== 'liquid' && view.type !== 'word-cloud' && view.type !== 'table-pivot'"
+                      class="padding-lr"
+                      style="margin-top: 6px;"
                     >
-                      <transition-group class="draggable-group">
-                        <quota-ext-item
-                          v-for="(item,index) in view.yaxisExt"
-                          :key="item.id"
-                          :param="param"
-                          :index="index"
-                          :item="item"
-                          :chart="chart"
-                          @onQuotaItemChange="quotaItemChange"
-                          @onQuotaItemRemove="quotaItemRemove"
-                          @editItemFilter="showQuotaEditFilter"
-                          @onNameEdit="showRename"
-                          @editItemCompare="showQuotaEditCompare"
-                        />
-                      </transition-group>
-                    </draggable>
-                    <div v-if="!view.yaxisExt || view.yaxisExt.length === 0" class="drag-placeholder-style">
-                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
-                    </div>
-                  </el-row>
-                  <!--extStack-->
-                  <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"
-                      @update="calcData(true)"
-                    >
-                      <transition-group class="draggable-group">
-                        <chart-drag-item
-                          v-for="(item,index) in view.extStack"
-                          :key="item.id"
-                          :conf="'sort'"
-                          :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>
-                  <!--extBubble-->
-                  <el-row v-if="view.type && view.type.includes('scatter')" class="padding-lr" style="margin-top: 6px;">
-                    <span style="width: 80px;text-align: right;">
-                      <span>{{ $t('chart.bubble_size') }}</span>
-                      /
-                      <span>{{ $t('chart.quota') }}</span>
-                      <el-tooltip class="item" effect="dark" placement="bottom">
-                        <div slot="content">
-                          该指标生效时，样式大小中的气泡大小属性将失效
-                        </div>
-                        <i class="el-icon-info" style="cursor: pointer;color: #606266;" />
-                      </el-tooltip>
-                    </span>
-                    <draggable
-                      v-model="view.extBubble"
-                      :disabled="!hasDataPermission('manage',param.privileges)"
-                      group="drag"
-                      animation="300"
-                      :move="onMove"
-                      class="drag-block-style"
-                      @add="addBubble"
-                      @update="calcData(true)"
-                    >
-                      <transition-group class="draggable-group">
-                        <chart-drag-item
-                          v-for="(item,index) in view.extBubble"
-                          :key="item.id"
-                          :conf="'summary'"
-                          :param="param"
-                          :index="index"
-                          :item="item"
-                          @onItemChange="bubbleItemChange"
-                          @onItemRemove="bubbleItemRemove"
-                        />
-                      </transition-group>
-                    </draggable>
-                    <div v-if="!view.extBubble || view.extBubble.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" />-->
-                    <!--                    </el-button>-->
-                    <draggable
-                      v-model="view.customFilter"
-                      :disabled="!hasDataPermission('manage',param.privileges)"
-                      group="drag"
-                      animation="300"
-                      :move="onMove"
-                      class="theme-item-class"
-                      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;"
-                      @add="addCustomFilter"
-                      @update="calcData(true)"
-                    >
-                      <transition-group class="draggable-group">
-                        <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
-                    v-if="view.type && !(view.type.includes('table') && view.render === 'echarts') && !view.type.includes('text') && !view.type.includes('gauge') && view.type !== 'liquid' && view.type !== 'word-cloud' && view.type !== 'table-pivot'"
-                    class="padding-lr"
-                    style="margin-top: 6px;"
-                  >
-                    <span style="width: 80px;text-align: right;">
-                      <span>{{ $t('chart.drill') }}</span>
-                      /
-                      <span>{{ $t('chart.dimension') }}</span>
-                    </span>
-                    <draggable
-                      v-model="view.drillFields"
-                      :disabled="!hasDataPermission('manage',param.privileges)"
-                      group="drag"
-                      animation="300"
-                      :move="onMove"
-                      class="drag-block-style"
-                      @add="addDrill"
-                      @update="calcData(true)"
-                    >
-                      <transition-group class="draggable-group">
-                        <drill-item
-                          v-for="(item,index) in view.drillFields"
-                          :key="item.id"
-                          :param="param"
-                          :index="index"
-                          :item="item"
-                          @onDimensionItemChange="drillItemChange"
-                          @onDimensionItemRemove="drillItemRemove"
-                        />
-                      </transition-group>
-                    </draggable>
-                    <div v-if="!view.drillFields || view.drillFields.length === 0" class="drag-placeholder-style">
-                      <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
-                    </div>
-                  </el-row>
+                      <span style="width: 80px;text-align: right;">
+                        <span>{{ $t('chart.drill') }}</span>
+                        /
+                        <span>{{ $t('chart.dimension') }}</span>
+                      </span>
+                      <draggable
+                        v-model="view.drillFields"
+                        :disabled="!hasDataPermission('manage',param.privileges)"
+                        group="drag"
+                        animation="300"
+                        :move="onMove"
+                        class="drag-block-style"
+                        @add="addDrill"
+                        @update="calcData(true)"
+                      >
+                        <transition-group class="draggable-group">
+                          <drill-item
+                            v-for="(item,index) in view.drillFields"
+                            :key="item.id"
+                            :param="param"
+                            :index="index"
+                            :item="item"
+                            @onDimensionItemChange="drillItemChange"
+                            @onDimensionItemRemove="drillItemRemove"
+                          />
+                        </transition-group>
+                      </draggable>
+                      <div v-if="!view.drillFields || view.drillFields.length === 0" class="drag-placeholder-style">
+                        <span class="drag-placeholder-style-span">{{ $t('chart.placeholder_field') }}</span>
+                      </div>
+                    </el-row>
+                  </div>
+
                 </el-row>
               </div>
             </el-col>
@@ -796,8 +800,14 @@
       <el-col style="height: 100%;min-width: 500px;border-top: 1px solid #E6E6E6;">
         <el-row style="width: 100%;height: 100%;" class="padding-lr">
           <div ref="imageWrapper" style="height: 100%">
+            <plugin-com
+              v-if="httpRequest.status && chart.type && isPlugin"
+              :component-name="chart.type + '-view'"
+              :obj="{chart}"
+              class="chart-class"
+            />
             <chart-component
-              v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'echarts'"
+              v-else-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'echarts'"
               ref="dynamicChart"
               :chart-id="chart.id"
               :chart="chart"
@@ -805,7 +815,7 @@
               @onChartClick="chartClick"
             />
             <chart-component-g2
-              v-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'antv'"
+              v-else-if="httpRequest.status && chart.type && !chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'antv'"
               ref="dynamicChart"
               :chart-id="chart.id"
               :chart="chart"
@@ -813,7 +823,7 @@
               @onChartClick="chartClick"
             />
             <chart-component-s2
-              v-if="httpRequest.status && chart.type && chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'antv'"
+              v-else-if="httpRequest.status && chart.type && chart.type.includes('table') && !chart.type.includes('text') && renderComponent() === 'antv'"
               ref="dynamicChart"
               :chart-id="chart.id"
               :chart="chart"
@@ -821,13 +831,13 @@
               @onChartClick="chartClick"
             />
             <table-normal
-              v-if="httpRequest.status && chart.type && chart.type.includes('table') && renderComponent() === 'echarts' && chart.type !== 'table-pivot'"
+              v-else-if="httpRequest.status && chart.type && chart.type.includes('table') && renderComponent() === 'echarts' && chart.type !== 'table-pivot'"
               :show-summary="chart.type === 'table-normal'"
               :chart="chart"
               class="table-class"
             />
             <label-normal
-              v-if="httpRequest.status && chart.type && chart.type.includes('text')"
+              v-else-if="httpRequest.status && chart.type && chart.type.includes('text')"
               :chart="chart"
               class="table-class"
             />
@@ -966,7 +976,6 @@
 
 <script>
 import { ajaxGetDataOnly, post } from '@/api/chart/chart'
-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'
@@ -1026,7 +1035,8 @@ import CompareEdit from '@/views/chart/components/compare/CompareEdit'
 import { compareItem } from '@/views/chart/chart/compare'
 import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
 import DimensionExtItem from '@/views/chart/components/drag-item/DimensionExtItem'
-
+import PluginCom from '@/views/system/plugin/PluginCom'
+import { pluginTypes } from '@/api/chart/chart'
 export default {
   name: 'ChartEdit',
   components: {
@@ -1068,10 +1078,10 @@ export default {
     ChartComponent,
     QuotaItem,
     DimensionItem,
-    draggable,
     ChartDragItem,
     DrillItem,
-    DrillPath
+    DrillPath,
+    PluginCom
   },
   props: {
     param: {
@@ -1161,7 +1171,9 @@ export default {
       drill: false,
       hasEdit: false,
       quotaItemCompare: {},
-      showEditQuotaCompare: false
+      showEditQuotaCompare: false,
+      plugins: [],
+      isPlugin: false
     }
   },
   computed: {
@@ -1182,6 +1194,7 @@ export default {
       this.fieldFilter(val)
     },
     'chartType': function(newVal, oldVal) {
+      this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
       if (newVal === 'map' && newVal !== oldVal) {
         this.initAreas()
       }
@@ -1193,13 +1206,27 @@ export default {
     // this.initAreas()
   },
   mounted() {
+    this.bindPluginEvent()
     // this.get(this.$store.state.chart.viewId);
     this.getData(this.param.id)
     // this.myEcharts();
   },
   activated() {
   },
+  beforeCreate() {
+    pluginTypes().then(res => {
+      this.plugins = res.data
+      this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
+    })
+  },
   methods: {
+    bindPluginEvent() {
+      bus.$on('show-dimension-edit-filter', this.showDimensionEditFilter)
+      bus.$on('show-rename', this.showRename)
+      bus.$on('show-quota-edit-filter', this.showQuotaEditFilter)
+      bus.$on('show-quota-edit-compare', this.showQuotaEditCompare)
+      bus.$on('calc-data', this.calcData)
+    },
     initTableData(id) {
       if (id != null) {
         post('/dataset/table/getWithPermission/' + id, null).then(response => {
diff --git a/frontend/src/views/chart/view/ChartType.vue b/frontend/src/views/chart/view/ChartType.vue
index e11c5ced17..b52e190f6b 100644
--- a/frontend/src/views/chart/view/ChartType.vue
+++ b/frontend/src/views/chart/view/ChartType.vue
@@ -1,439 +1,88 @@
 <template>
   <div class="chart-type">
-    <div v-if="chart.render && chart.render === 'antv'">
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_table') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="table-normal" label="table-normal" border class="radio-style">
-              <span :title="$t('chart.chart_table_normal')">
-                <svg-icon icon-class="table-normal" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_table_normal') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="table-info" label="table-info" border class="radio-style">
-              <span :title="$t('chart.chart_table_info')">
-                <svg-icon icon-class="table-info" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_table_info') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="table-pivot" label="table-pivot" border class="radio-style">
-              <span :title="$t('chart.chart_table_pivot')">
-                <svg-icon icon-class="table-pivot" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_table_pivot') }}</p>
-            </el-radio>
-          </div>
-          <!--如需要，以下用于占位-->
-          <!--<el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>-->
-        </div>
-      </div>
+    <div v-for="(renderItem, category) in renderMap[chart.render]" :key="category">
+      <el-divider class="chart-type-divider">{{ $t(category) }}</el-divider>
 
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_quota') }}</el-divider>
-      <div style="display: block;">
+      <div v-for="(container, i) in renderItem" :key="i" style="display: block;">
         <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="text" label="text" border class="radio-style">
-              <span :title="$t('chart.chart_card')">
-                <svg-icon icon-class="text" class="chart-icon" />
+          <div v-for="(item, idx) in container" :key="idx" style="position: relative;display: block;" :style="{'top': item.isPlugin ? '5px' : '0'}">
+            <el-radio v-if="item.placeholder" value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
+            <plugin-com v-else-if="item.isPlugin" :component-name="item.value + '-type'" />
+            <el-radio v-else :value="item.value" :label="item.value" border class="radio-style">
+              <span :title="$t(item.title)">
+                <svg-icon :icon-class="item.icon" class="chart-icon" />
               </span>
-              <p class="radio-label">{{ $t('chart.chart_card') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="gauge" label="gauge" border class="radio-style">
-              <span :title="$t('chart.chart_gauge')">
-                <svg-icon icon-class="gauge" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_gauge') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="liquid" label="liquid" border class="radio-style">
-              <span :title="$t('chart.chart_liquid')">
-                <svg-icon icon-class="liquid" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_liquid') }}</p>
+              <p class="radio-label">{{ $t(item.title) }}</p>
             </el-radio>
           </div>
         </div>
       </div>
 
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_trend') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="line" label="line" border class="radio-style">
-              <span :title="$t('chart.chart_line')">
-                <svg-icon icon-class="line" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_line') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="line-stack" label="line-stack" border class="radio-style">
-              <span :title="$t('chart.chart_line_stack')">
-                <svg-icon icon-class="line-stack" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_line_stack') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_compare') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="bar" label="bar" border class="radio-style">
-              <span :title="$t('chart.chart_bar')">
-                <svg-icon icon-class="bar" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_bar') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="bar-stack" label="bar-stack" border class="radio-style">
-              <span :title="$t('chart.chart_bar_stack')">
-                <svg-icon icon-class="bar-stack" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_bar_stack') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="waterfall" label="waterfall" border class="radio-style">
-              <span :title="$t('chart.chart_waterfall')">
-                <svg-icon icon-class="waterfall" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_waterfall') }}</p>
-            </el-radio>
-          </div>
-        </div>
-      </div>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="bar-horizontal" label="bar-horizontal" border class="radio-style">
-              <span :title="$t('chart.chart_bar_horizontal')">
-                <svg-icon icon-class="bar-horizontal" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_bar_horizontal') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="bar-stack-horizontal" label="bar-stack-horizontal" border class="radio-style">
-              <span :title="$t('chart.chart_bar_stack_horizontal')">
-                <svg-icon icon-class="bar-stack-horizontal" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_bar_stack_horizontal') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_distribute') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="pie" label="pie" border class="radio-style">
-              <span :title="$t('chart.chart_pie')">
-                <svg-icon icon-class="pie" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_pie') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="pie-rose" label="pie-rose" border class="radio-style">
-              <span :title="$t('chart.chart_pie_rose')">
-                <svg-icon icon-class="pie-rose" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_pie_rose') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="radar" label="radar" border class="radio-style">
-              <span :title="$t('chart.chart_radar')">
-                <svg-icon icon-class="radar" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_radar') }}</p>
-            </el-radio>
-          </div>
-        </div>
-      </div>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="treemap" label="treemap" border class="radio-style">
-              <span :title="$t('chart.chart_treemap')">
-                <svg-icon icon-class="treemap" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_treemap') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="word-cloud" label="word-cloud" border class="radio-style">
-              <span :title="$t('chart.chart_word_cloud')">
-                <svg-icon icon-class="word-cloud" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_word_cloud') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_relation') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="scatter" label="scatter" border class="radio-style">
-              <span :title="$t('chart.chart_scatter')">
-                <svg-icon icon-class="scatter" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_scatter') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="funnel" label="funnel" border class="radio-style">
-              <span :title="$t('chart.chart_funnel')">
-                <svg-icon icon-class="funnel" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_funnel') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
     </div>
-    <div v-else-if="chart.render && chart.render === 'echarts'">
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_table') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="table-normal" label="table-normal" border class="radio-style">
-              <span :title="$t('chart.chart_table_normal')">
-                <svg-icon icon-class="table-normal" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_table_normal') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="table-info" label="table-info" border class="radio-style">
-              <span :title="$t('chart.chart_table_info')">
-                <svg-icon icon-class="table-info" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_table_info') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_quota') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="text" label="text" border class="radio-style">
-              <span :title="$t('chart.chart_card')">
-                <svg-icon icon-class="text" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_card') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="gauge" label="gauge" border class="radio-style">
-              <span :title="$t('chart.chart_gauge')">
-                <svg-icon icon-class="gauge" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_gauge') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_trend') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="line" label="line" border class="radio-style">
-              <span :title="$t('chart.chart_line')">
-                <svg-icon icon-class="line" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_line') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="line-stack" label="line-stack" border class="radio-style">
-              <span :title="$t('chart.chart_line_stack')">
-                <svg-icon icon-class="line-stack" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_line_stack') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="chart-mix" label="chart-mix" border class="radio-style">
-              <span :title="$t('chart.chart_mix')">
-                <svg-icon icon-class="chart-mix" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_mix') }}</p>
-            </el-radio>
-          </div>
-        </div>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_compare') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="bar" label="bar" border class="radio-style">
-              <span :title="$t('chart.chart_bar')">
-                <svg-icon icon-class="bar" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_bar') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="bar-stack" label="bar-stack" border class="radio-style">
-              <span :title="$t('chart.chart_bar_stack')">
-                <svg-icon icon-class="bar-stack" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_bar_stack') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="bar-horizontal" label="bar-horizontal" border class="radio-style">
-              <span :title="$t('chart.chart_bar_horizontal')">
-                <svg-icon icon-class="bar-horizontal" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_bar_horizontal') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="bar-stack-horizontal" label="bar-stack-horizontal" border class="radio-style">
-              <span :title="$t('chart.chart_bar_stack_horizontal')">
-                <svg-icon icon-class="bar-stack-horizontal" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_bar_stack_horizontal') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_distribute') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="pie" label="pie" border class="radio-style">
-              <span :title="$t('chart.chart_pie')">
-                <svg-icon icon-class="pie" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_pie') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="pie-rose" label="pie-rose" border class="radio-style">
-              <span :title="$t('chart.chart_pie_rose')">
-                <svg-icon icon-class="pie-rose" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_pie_rose') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="radar" label="radar" border class="radio-style">
-              <span :title="$t('chart.chart_radar')">
-                <svg-icon icon-class="radar" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_radar') }}</p>
-            </el-radio>
-          </div>
-        </div>
-      </div>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="treemap" label="treemap" border class="radio-style">
-              <span :title="$t('chart.chart_treemap')">
-                <svg-icon icon-class="treemap" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_treemap') }}</p>
-            </el-radio>
-          </div>
-          <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>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_relation') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="scatter" label="scatter" border class="radio-style">
-              <span :title="$t('chart.chart_scatter')">
-                <svg-icon icon-class="scatter" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_scatter') }}</p>
-            </el-radio>
-          </div>
-          <div style="position: relative;display: block;">
-            <el-radio value="funnel" label="funnel" border class="radio-style">
-              <span :title="$t('chart.chart_funnel')">
-                <svg-icon icon-class="funnel" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_funnel') }}</p>
-            </el-radio>
-          </div>
-          <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>
-        </div>
-      </div>
-
-      <el-divider class="chart-type-divider">{{ $t('chart.chart_type_space') }}</el-divider>
-      <div style="display: block;">
-        <div class="radio-row">
-          <div style="position: relative;display: block;">
-            <el-radio value="map" label="map" border class="radio-style">
-              <span :title="$t('chart.chart_map')">
-                <svg-icon icon-class="map" class="chart-icon" />
-              </span>
-              <p class="radio-label">{{ $t('chart.chart_map') }}</p>
-            </el-radio>
-          </div>
-          <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>
-      </div>
-    </div>
-    <!--占位行-->
-  <!--                      <div style="width: 100%;display: flex;display: -webkit-flex;justify-content: space-between;flex-direction: row;flex-wrap: wrap;">-->
-  <!--                        <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>-->
-  <!--                        <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>-->
-  <!--                        <el-radio value="" label="" disabled class="disabled-none-cursor"><svg-icon icon-class="" class="chart-icon" /></el-radio>-->
-  <!--                      </div>-->
   </div>
 </template>
 
 <script>
+import { TYPE_CONFIGS } from '@/views/chart/chart/util'
+import { pluginTypes } from '@/api/chart/chart'
+import PluginCom from '@/views/system/plugin/PluginCom'
 export default {
   name: 'ChartType',
+  components: { PluginCom },
   props: {
     chart: {
       type: Object,
       required: true
     }
+  },
+  data() {
+    return {
+      defaultTypes: TYPE_CONFIGS,
+      allTypes: [],
+      renderMap: {}
+    }
+  },
+  beforeCreate() {
+    pluginTypes().then(res => {
+      const plugins = res.data
+      plugins.forEach(plugin => {
+        plugin.isPlugin = true
+      })
+      this.pluginTypes = [...this.defaultTypes, ...plugins]
+      this.formatTypes()
+    })
+  },
+  methods: {
+    formatTypes() {
+      this.pluginTypes.forEach(item => {
+        const { render, category } = item
+        this.renderMap[render] = this.renderMap[render] || {}
+        const renderItem = this.renderMap[render]
+        renderItem[category] = renderItem[category] || []
+
+        const len = renderItem[category].length
+        if (len === 0 || renderItem[category][len - 1].length === 3) {
+          renderItem[category][len] = []
+          renderItem[category][len].push(item)
+        } else {
+          renderItem[category][len - 1].push(item)
+        }
+      })
+
+      // 填充占位符
+
+      Object.keys(this.renderMap).forEach(key => {
+        Object.keys(this.renderMap[key]).forEach(category => {
+          this.renderMap[key][category].forEach(container => {
+            const len = container.length
+            let reduc = 3 - len
+            while (reduc--) {
+              container.push({ placeholder: true })
+            }
+          })
+        })
+      })
+    }
   }
 }
 </script>
diff --git a/frontend/src/views/system/plugin/PluginCom.vue b/frontend/src/views/system/plugin/PluginCom.vue
index 7a7767b33b..fc555d3ccc 100644
--- a/frontend/src/views/system/plugin/PluginCom.vue
+++ b/frontend/src/views/system/plugin/PluginCom.vue
@@ -1,7 +1,13 @@
 <template>
   <div>
-    <async-component v-if="showAsync" :url="url" :obj="obj" @execute-axios="executeAxios"
-                     @on-add-languanges="addLanguages" @plugin-call-back="pluginCallBack"/>
+    <async-component
+      v-if="showAsync"
+      :url="url"
+      :obj="obj"
+      @execute-axios="executeAxios"
+      @on-add-languanges="addLanguages"
+      @plugin-call-back="pluginCallBack"
+    />
     <div v-else>
       <h1>未知组件无法展示</h1>
     </div>
@@ -12,7 +18,7 @@
 import AsyncComponent from '@/components/AsyncComponent'
 import i18n from '@/lang'
 import bus from '@/utils/bus'
-import {execute} from '@/api/system/dynamic'
+import { execute } from '@/api/system/dynamic'
 
 export default {
   name: 'PluginCom',
@@ -67,7 +73,7 @@ export default {
     },
 
     pluginCallBack(param) {
-      const {eventName, eventParam} = param
+      const { eventName, eventParam } = param
       bus.$emit(eventName, eventParam)
     }
   }

From 302fc5db74d2fd77551fd184436043a5d5b955b1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 10 Feb 2022 18:58:41 +0800
Subject: [PATCH 14/47] =?UTF-8?q?refactor:=20=E5=8D=87=E7=BA=A7=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E5=8F=B71.8.0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml  | 6 +++---
 frontend/pom.xml | 2 +-
 mobile/pom.xml   | 2 +-
 pom.xml          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/backend/pom.xml b/backend/pom.xml
index 3783dad76e..eb3d1cdf4a 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
@@ -214,12 +214,12 @@
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-interface</artifactId>
-            <version>1.7</version>
+            <version>1.8.0</version>
         </dependency>
         <dependency>
             <groupId>io.dataease</groupId>
             <artifactId>dataease-plugin-view</artifactId>
-            <version>1.7</version>
+            <version>1.8.0</version>
         </dependency>
         <dependency>
             <groupId>cn.hutool</groupId>
diff --git a/frontend/pom.xml b/frontend/pom.xml
index f051750be0..1ca3d3227d 100644
--- a/frontend/pom.xml
+++ b/frontend/pom.xml
@@ -6,7 +6,7 @@
   <parent>
     <artifactId>dataease-server</artifactId>
     <groupId>io.dataease</groupId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
diff --git a/mobile/pom.xml b/mobile/pom.xml
index 24639cbaf5..9585aafe53 100644
--- a/mobile/pom.xml
+++ b/mobile/pom.xml
@@ -6,7 +6,7 @@
     <parent>
         <artifactId>dataease-server</artifactId>
         <groupId>io.dataease</groupId>
-        <version>1.7.0</version>
+        <version>1.8.0</version>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index a202953b21..e59e6851b1 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>io.dataease</groupId>
     <artifactId>dataease-server</artifactId>
-    <version>1.7.0</version>
+    <version>1.8.0</version>
     <packaging>pom</packaging>
 
     <parent>

From 7a1e79e314e7aa935414e6b2a66f6549e9a19883 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 11 Feb 2022 10:14:01 +0800
Subject: [PATCH 15/47] =?UTF-8?q?feat:=20=E6=9D=83=E9=99=90=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E6=8C=89=E8=B5=84=E6=BA=90=E6=8E=88=E6=9D=83=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=E6=94=AF=E6=8C=81=E8=A1=8C=E5=88=97=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/io/dataease/plugins/server/XAuthServer.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
index c3a3c41a5c..dbfce409a2 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
@@ -44,7 +44,7 @@ public class XAuthServer {
     public List<XpackSysAuthDetail> authDetailsModel(@PathVariable String authType, @PathVariable String direction) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         List<XpackSysAuthDetail> authDetails = sysAuthService.searchAuthDetailsModel(authType);
-        if ("source".equals(direction) && authType.equalsIgnoreCase("dataset")) {
+        if (authType.equalsIgnoreCase("dataset")) {
             XpackSysAuthDetail xpackSysAuthDetail = new XpackSysAuthDetail();
             xpackSysAuthDetail.setPrivilegeName("i18n_auth_row_permission");
             xpackSysAuthDetail.setPrivilegeType(20);

From 756b056d990c1421c81b986adb969e21c8236f9a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 11 Feb 2022 14:22:17 +0800
Subject: [PATCH 16/47] =?UTF-8?q?refactor:=20=E6=A0=BC=E5=BC=8F=E5=8C=96?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue | 43 ++++++++++-----------
 1 file changed, 21 insertions(+), 22 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index cdb04dd73d..75abeb94f1 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -222,29 +222,28 @@
 
                   <plugin-com v-if="isPlugin" :component-name="view.type + '-data'" :obj="{view, param, chart}" />
                   <div v-else>
-                    
 
-                  <el-row v-if="view.type ==='map'" class="padding-lr">
-                    <span style="width: 80px;text-align: right;">
-                      <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"
-                        :no-children-text="$t('commons.treeselect.no_children_text')"
-                        :no-options-text="$t('commons.treeselect.no_options_text')"
-                        :no-results-text="$t('commons.treeselect.no_results_text')"
-                        :disabled="!hasDataPermission('manage',param.privileges)"
-                        @input="calcData"
-                        @deselect="calcData"
-                      />
-                    </span>
-                  </el-row>
-                  
+                    <el-row v-if="view.type ==='map'" class="padding-lr">
+                      <span style="width: 80px;text-align: right;">
+                        <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"
+                          :no-children-text="$t('commons.treeselect.no_children_text')"
+                          :no-options-text="$t('commons.treeselect.no_options_text')"
+                          :no-results-text="$t('commons.treeselect.no_results_text')"
+                          :disabled="!hasDataPermission('manage',param.privileges)"
+                          @input="calcData"
+                          @deselect="calcData"
+                        />
+                      </span>
+                    </el-row>
+
                     <!--xAxisExt-->
                     <el-row
                       v-if="view.type === 'table-pivot'"

From 2c1f0533f25357458ea9e5e8517416f815873e09 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 11 Feb 2022 15:23:32 +0800
Subject: [PATCH 17/47] feat: S2 pivot

---
 frontend/src/views/chart/chart/chart.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 9356fd684b..b54373983f 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -31,7 +31,7 @@ export const DEFAULT_SIZE = {
   tableTitleHeight: 36,
   tableItemHeight: 36,
   tablePageSize: '20',
-  tableColumnMode: 'adapt',
+  tableColumnMode: 'custom',
   tableColumnWidth: 100,
   gaugeMin: 0,
   gaugeMax: 100,

From 9eee9ed0f2d39f25a289afb0e9ea58176a4a7825 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 11 Feb 2022 16:47:01 +0800
Subject: [PATCH 18/47] =?UTF-8?q?refactor:=20=E6=96=87=E6=A1=88=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js | 10 +++++-----
 frontend/src/lang/tw.js | 10 +++++-----
 frontend/src/lang/zh.js | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index cd5c218afa..5a5221100a 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1556,11 +1556,11 @@ export default {
     dept: 'Dept',
     role: 'Role',
     user: 'User',
-    linkAuth: 'Datasource Permissions',
-    datasetAuth: 'Dataset Permissions',
-    chartAuth: 'Chart Permissions',
-    panelAuth: 'Dashboard Permissions',
-    menuAuth: 'Menu and operation permission',
+    linkAuth: 'Datasource',
+    datasetAuth: 'Dataset',
+    chartAuth: 'Chart',
+    panelAuth: 'Panel',
+    menuAuth: 'Menu And Operation',
     deptHead: 'All Dept',
     roleHead: 'All Role',
     userHead: 'All User',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 786b4049a1..2c1451ad1e 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1565,11 +1565,11 @@ export default {
     dept: '組織',
     role: '角色',
     user: '用戶',
-    linkAuth: '數據源權限',
-    datasetAuth: '數據集權限',
-    chartAuth: '視圖權限',
-    panelAuth: '儀錶闆權限',
-    menuAuth: '菜單和操作權限',
+    linkAuth: '數據源',
+    datasetAuth: '數據集',
+    chartAuth: '視圖',
+    panelAuth: '儀錶闆',
+    menuAuth: '菜單和操作',
     deptHead: '所有組織',
     roleHead: '所有角色',
     userHead: '所有用戶',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 82f4c3edca..bcd59ca48b 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1574,11 +1574,11 @@ export default {
     dept: '组织',
     role: '角色',
     user: '用户',
-    linkAuth: '数据源权限',
-    datasetAuth: '数据集权限',
-    chartAuth: '视图权限',
-    panelAuth: '仪表板权限',
-    menuAuth: '菜单和操作权限',
+    linkAuth: '数据源',
+    datasetAuth: '数据集',
+    chartAuth: '视图',
+    panelAuth: '仪表板',
+    menuAuth: '菜单和操作',
     deptHead: '所有组织',
     roleHead: '所有角色',
     userHead: '所有用户',

From 8f39fbe3f51f8c2654a39942aae2efae56341d43 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 11 Feb 2022 16:53:57 +0800
Subject: [PATCH 19/47] feat: S2 pivot

---
 frontend/src/views/chart/chart/chart.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index b54373983f..1cbef872f4 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -2,8 +2,8 @@ export const DEFAULT_COLOR_CASE = {
   value: 'default',
   colors: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'],
   alpha: 100,
-  tableHeaderBgColor: '#4e81bb',
-  tableItemBgColor: '#c6d9f0',
+  tableHeaderBgColor: '#c1d1f6',
+  tableItemBgColor: '#e2eafe',
   tableFontColor: '#000000',
   tableStripe: true,
   dimensionColor: '#000000',

From 511fd05a0ca287fcc8ab9b31fada08ac26614860 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 14 Feb 2022 10:05:46 +0800
Subject: [PATCH 20/47] =?UTF-8?q?fix:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E5=B8=83=E5=B1=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/src/pages.json                    | 16 ++-----
 mobile/src/pages/tabBar/home/detail.nvue | 61 ++++++++++++++++++------
 2 files changed, 50 insertions(+), 27 deletions(-)

diff --git a/mobile/src/pages.json b/mobile/src/pages.json
index 37fcdcbc57..247f83315a 100644
--- a/mobile/src/pages.json
+++ b/mobile/src/pages.json
@@ -27,19 +27,9 @@
             "style": {
                 "navigationBarTitleText": "",
                 "app-plus": {
-                    "titleNView": {
-                        "type": "transparent",
-                        "buttons": [{
-                            "type": "share"
-                        }]
-                    }
-                },
-                "h5": {
-                    "titleNView": {
-                        "type": "transparent",
-                        "buttons": []
-                    }
-                }
+					"titleNView": false,
+					"bounce": "none"
+				}
             }
         },
         {
diff --git a/mobile/src/pages/tabBar/home/detail.nvue b/mobile/src/pages/tabBar/home/detail.nvue
index 9f92ddb352..f99e72806c 100644
--- a/mobile/src/pages/tabBar/home/detail.nvue
+++ b/mobile/src/pages/tabBar/home/detail.nvue
@@ -1,33 +1,36 @@
 <template>
 	<view class="page dataease-main">
        
-		<uni-nav-bar :title="banner.title" >
-			<view slot="right">
+		<uni-nav-bar :fixed="false" left-icon="arrowleft"  @clickLeft="back" :title="banner.title" >
+			<block slot="right">
 				<uni-row class="demo-uni-row" >
-					<uni-col :span="12" @click="enshrine">
-						<uni-icons v-if="hasStar" type="star-filled" size="18" color="#007AFF"></uni-icons>
-						<uni-icons v-else type="star" size="18" color="#999"></uni-icons>
+					<uni-col :span="12">
+						<view @click="enshrine">
+						<uni-icons v-if="hasStar"  type="star-filled" size="18" color="#007AFF"></uni-icons>
+						<uni-icons v-else type="star"  size="18" color="#999"></uni-icons>
+						</view>
 					</uni-col>
 					
-					<uni-col :span="12" @click="refresh" style="margin: 0 10rpx;">
-						<uni-icons type="reload" size="18" color="#999"></uni-icons>
+					<uni-col :span="12"  style="margin: 0 10rpx;">
+						<view @click="refresh">
+						<uni-icons type="reload" size="18" color="#999" ></uni-icons>
+						</view>
 					</uni-col>
 				</uni-row>
 				
-			</view>
+			</block>
+			
 		</uni-nav-bar>
-		<view class="article-content">
+		<view class="article-content" style="height: 100% !important;">
             <view v-if="url">
                 <web-view
                 :webview-styles="webViewStyles"
-                style="height: calc(100vh - 112px);"
+                style="height: 100vh;"
                 >
                 </web-view>
             </view>
 		</view>
-		<!-- #ifdef MP-WEIXIN || MP-QQ -->
-		<ad v-if="htmlNodes.length > 0" unit-id="adunit-01b7a010bf53d74e"></ad>
-		<!-- #endif -->
+		
 
        
 	</view>
@@ -271,7 +274,7 @@
     
 }
 .article-content {
-    height: 100vh;
+    
     margin: 5px 0;
     background: #ffffff;
 }
@@ -295,6 +298,36 @@
     margin-left: 5px;
 }
 
+.input-view {
+		/* #ifndef APP-PLUS-NVUE */
+		display: flex;
+		/* #endif */
+		flex-direction: row;
+		// width: 500rpx;
+		flex: 1;
+		background-color: #f8f8f8;
+		height: $nav-height;
+		border-radius: 15px;
+		padding: 0 15px;
+		flex-wrap: nowrap;
+		margin: 7px 0;
+		line-height: $nav-height;
+	}
+
+	.input-uni-icon {
+		line-height: $nav-height;
+	}
+
+	.nav-bar-input {
+		height: $nav-height;
+		line-height: $nav-height;
+		/* #ifdef APP-PLUS-NVUE */
+		width: 370rpx;
+		/* #endif */
+		padding: 0 5px;
+		font-size: 14px;
+		background-color: #f8f8f8;
+	}
 
 
 </style>

From 0aa2a69ff162f4b378424ebbebb8bec07f388867 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 14 Feb 2022 10:08:28 +0800
Subject: [PATCH 21/47] =?UTF-8?q?feat:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E9=9B=86=E6=88=90=E6=8F=92=E4=BB=B6=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/custom-component/UserView.vue      | 35 ++++++++++++++-----
 1 file changed, 27 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 74903dd566..a2f3bd3cd1 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -16,8 +16,15 @@
         {{ $t('chart.chart_error_tips') }}
       </div>
     </div>
+    <plugin-com
+      v-if="isPlugin"
+      :ref="element.propValue.id"
+      :component-name="chart.type + '-view'"
+      :obj="{chart, trackMenu, searchCount, terminalType: scaleCoefficientType}"
+      class="chart-class"
+    />
     <chart-component
-      v-if="charViewShowFlag"
+      v-else-if="charViewShowFlag"
       :ref="element.propValue.id"
       class="chart-class"
       :chart="chart"
@@ -28,7 +35,7 @@
       @onJumpClick="jumpClick"
     />
     <chart-component-g2
-      v-if="charViewG2ShowFlag"
+      v-else-if="charViewG2ShowFlag"
       :ref="element.propValue.id"
       class="chart-class"
       :chart="chart"
@@ -38,7 +45,7 @@
       @onJumpClick="jumpClick"
     />
     <chart-component-s2
-      v-if="charViewS2ShowFlag"
+      v-else-if="charViewS2ShowFlag"
       :ref="element.propValue.id"
       class="chart-class"
       :chart="chart"
@@ -48,13 +55,13 @@
       @onJumpClick="jumpClick"
     />
     <table-normal
-      v-if="tableShowFlag"
+      v-else-if="tableShowFlag"
       :ref="element.propValue.id"
       :show-summary="chart.type === 'table-normal'"
       :chart="chart"
       class="table-class"
     />
-    <label-normal v-if="labelShowFlag" :ref="element.propValue.id" :chart="chart" class="table-class" />
+    <label-normal v-else-if="labelShowFlag" :ref="element.propValue.id" :chart="chart" class="table-class" />
     <div style="position: absolute;left: 8px;bottom:8px;">
       <drill-path :drill-filters="drillFilters" @onDrillJump="drillJump" />
     </div>
@@ -82,10 +89,11 @@ import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
 import EditBarView from '@/components/canvas/components/Editor/EditBarView'
 import { customAttrTrans, customStyleTrans, recursionTransObj } from '@/components/canvas/utils/style'
 import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
-
+import { pluginTypes } from '@/api/chart/chart'
+import PluginCom from '@/views/system/plugin/PluginCom'
 export default {
   name: 'UserView',
-  components: { ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
+  components: { PluginCom, ChartComponentS2, EditBarView, ChartComponent, TableNormal, LabelNormal, DrillPath, ChartComponentG2 },
   props: {
     element: {
       type: Object,
@@ -108,6 +116,7 @@ export default {
       required: false,
       default: false
     },
+    // eslint-disable-next-line vue/require-default-prop
     componentIndex: {
       type: Number,
       required: false
@@ -153,7 +162,9 @@ export default {
       pre: null,
       preCanvasPanel: null,
       sourceCustomAttrStr: null,
-      sourceCustomStyleStr: null
+      sourceCustomStyleStr: null,
+      isPlugin: false,
+      plugins: []
     }
   },
   computed: {
@@ -260,6 +271,7 @@ export default {
   },
 
   watch: {
+
     'cfilters': {
       handler: function(val1, val2) {
         if (isChange(val1, val2) && !this.isFirstLoad) {
@@ -320,6 +332,7 @@ export default {
       }
     },
     'chartType': function(newVal, oldVal) {
+      this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
       if (newVal === 'map' && newVal !== oldVal) {
         this.initAreas()
       }
@@ -334,6 +347,12 @@ export default {
       deep: true
     }
   },
+  beforeCreate() {
+    pluginTypes().then(res => {
+      this.plugins = res.data
+      this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
+    })
+  },
   created() {
     this.refId = uuid.v1
     if (this.element && this.element.propValue && this.element.propValue.viewId) {

From f6bfccdb2464ba9323b94b3bf34f21e041c2e3bd Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 14 Feb 2022 11:56:58 +0800
Subject: [PATCH 22/47] =?UTF-8?q?fix:=20=E6=96=B0=E5=BB=BA=E8=B5=84?=
 =?UTF-8?q?=E6=BA=90=E7=BC=93=E5=AD=98=E4=B8=80=E8=87=B4=E6=80=A7=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/auth/annotation/DeCleaner.java   | 14 ++++
 .../auth/aop/DeCleanerAnnotationHandler.java  | 74 +++++++++++++++++++
 .../auth/service/impl/ExtAuthServiceImpl.java |  6 ++
 .../service/dataset/DataSetGroupService.java  |  3 +
 .../service/datasource/DatasourceService.java |  3 +
 .../service/panel/PanelGroupService.java      |  3 +
 6 files changed, 103 insertions(+)
 create mode 100644 backend/src/main/java/io/dataease/auth/annotation/DeCleaner.java
 create mode 100644 backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java

diff --git a/backend/src/main/java/io/dataease/auth/annotation/DeCleaner.java b/backend/src/main/java/io/dataease/auth/annotation/DeCleaner.java
new file mode 100644
index 0000000000..40f9c57c26
--- /dev/null
+++ b/backend/src/main/java/io/dataease/auth/annotation/DeCleaner.java
@@ -0,0 +1,14 @@
+package io.dataease.auth.annotation;
+
+import io.dataease.commons.constants.DePermissionType;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Target({ElementType.TYPE, ElementType.METHOD})
+@Retention(RetentionPolicy.RUNTIME)
+public @interface DeCleaner {
+    DePermissionType value();
+}
diff --git a/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java b/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java
new file mode 100644
index 0000000000..276d43b1ca
--- /dev/null
+++ b/backend/src/main/java/io/dataease/auth/aop/DeCleanerAnnotationHandler.java
@@ -0,0 +1,74 @@
+package io.dataease.auth.aop;
+
+
+import io.dataease.auth.annotation.DeCleaner;
+import io.dataease.auth.api.dto.CurrentUserDto;
+import io.dataease.commons.constants.AuthConstants;
+import io.dataease.commons.constants.DePermissionType;
+import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.LogUtil;
+import io.dataease.listener.util.CacheUtils;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.reflect.MethodSignature;
+import org.springframework.stereotype.Component;
+
+import java.lang.reflect.Method;
+
+@Aspect
+@Component
+public class DeCleanerAnnotationHandler {
+
+    @Around(value = "@annotation(io.dataease.auth.annotation.DeCleaner)")
+    public Object CleanerAround(ProceedingJoinPoint point) {
+        try {
+            CurrentUserDto user = AuthUtils.getUser();
+            MethodSignature ms = (MethodSignature) point.getSignature();
+            Method method = ms.getMethod();
+            DeCleaner deCleaner = method.getAnnotation(DeCleaner.class);
+            DePermissionType type = deCleaner.value();
+            switch (type.name()) {
+                case "DATASOURCE":
+                    cleanDataSource();
+                    break;
+                case "DATASET":
+                    cleanDataSet();
+                    break;
+                default:
+                    cleanPanel();
+                    break;
+            }
+            return point.proceed(point.getArgs());
+
+        }catch (Throwable e) {
+            LogUtil.error(e.getMessage(), e);
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void cleanPanel() {
+        CurrentUserDto user = AuthUtils.getUser();
+        CacheUtils.remove(AuthConstants.USER_PANEL_NAME, "user" + user.getUserId());
+        CacheUtils.remove(AuthConstants.DEPT_PANEL_NAME, "dept" + user.getDeptId());
+        user.getRoles().forEach(role -> {
+            CacheUtils.remove(AuthConstants.ROLE_PANEL_NAME, "role" + role.getId());
+        });
+    }
+    public void cleanDataSet() {
+        CurrentUserDto user = AuthUtils.getUser();
+        CacheUtils.remove(AuthConstants.USER_DATASET_NAME, "user" + user.getUserId());
+        CacheUtils.remove(AuthConstants.DEPT_DATASET_NAME, "dept" + user.getDeptId());
+        user.getRoles().forEach(role -> {
+            CacheUtils.remove(AuthConstants.ROLE_DATASET_NAME, "role" + role.getId());
+        });
+    }
+    public void cleanDataSource() {
+        CurrentUserDto user = AuthUtils.getUser();
+        CacheUtils.remove(AuthConstants.USER_LINK_NAME, "user" + user.getUserId());
+        CacheUtils.remove(AuthConstants.DEPT_LINK_NAME, "dept" + user.getDeptId());
+        user.getRoles().forEach(role -> {
+            CacheUtils.remove(AuthConstants.ROLE_LINK_NAME, "role" + role.getId());
+        });
+    }
+}
diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
index f900cd4bc1..3828fbe35a 100644
--- a/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/ExtAuthServiceImpl.java
@@ -1,12 +1,15 @@
 package io.dataease.auth.service.impl;
 
+import io.dataease.auth.api.dto.CurrentUserDto;
 import io.dataease.auth.entity.AuthItem;
 import io.dataease.auth.service.ExtAuthService;
 import io.dataease.base.domain.SysAuth;
 import io.dataease.base.mapper.ext.ExtAuthMapper;
 import io.dataease.commons.constants.AuthConstants;
 import io.dataease.commons.model.AuthURD;
+import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.LogUtil;
+import io.dataease.listener.util.CacheUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.springframework.cache.annotation.CacheEvict;
 import org.springframework.cache.annotation.Cacheable;
@@ -146,4 +149,7 @@ public class ExtAuthServiceImpl implements ExtAuthService {
     public void clearRoleResource(Long roleId) {
         LogUtil.info("all permission resource of role {} is cleanning...", roleId);
     }
+
+
+
 }
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java
index 2a5f04ec2f..a6b42f3038 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetGroupService.java
@@ -1,9 +1,11 @@
 package io.dataease.service.dataset;
 
+import io.dataease.auth.annotation.DeCleaner;
 import io.dataease.base.domain.DatasetGroup;
 import io.dataease.base.domain.DatasetGroupExample;
 import io.dataease.base.mapper.DatasetGroupMapper;
 import io.dataease.base.mapper.ext.ExtDataSetGroupMapper;
+import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.BeanUtils;
 import io.dataease.commons.utils.TreeUtils;
@@ -39,6 +41,7 @@ public class DataSetGroupService {
     @Resource
     private SysAuthService sysAuthService;
 
+    @DeCleaner(DePermissionType.DATASET)
     public DataSetGroupDTO save(DatasetGroup datasetGroup) {
         checkName(datasetGroup);
         if (StringUtils.isEmpty(datasetGroup.getId())) {
diff --git a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
index c709074ebf..de0b6e37de 100644
--- a/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
+++ b/backend/src/main/java/io/dataease/service/datasource/DatasourceService.java
@@ -2,10 +2,12 @@ package io.dataease.service.datasource;
 
 import com.alibaba.fastjson.JSONObject;
 import com.google.gson.Gson;
+import io.dataease.auth.annotation.DeCleaner;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.*;
 import io.dataease.base.mapper.ext.ExtDataSourceMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
+import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.exception.DEException;
 import io.dataease.commons.model.AuthURD;
 import io.dataease.commons.utils.AuthUtils;
@@ -51,6 +53,7 @@ public class DatasourceService {
     @Resource
     private CommonThreadPool commonThreadPool;
 
+    @DeCleaner(DePermissionType.DATASOURCE)
     public Datasource addDatasource(Datasource datasource) throws Exception{
         checkName(datasource);
         long currentTimeMillis = System.currentTimeMillis();
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index b063082e99..beba7b4fae 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -1,10 +1,12 @@
 package io.dataease.service.panel;
 
+import io.dataease.auth.annotation.DeCleaner;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.ChartViewMapper;
 import io.dataease.base.mapper.PanelGroupMapper;
 import io.dataease.base.mapper.ext.ExtPanelGroupMapper;
 import io.dataease.base.mapper.ext.ExtPanelLinkJumpMapper;
+import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.PanelConstants;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.TreeUtils;
@@ -75,6 +77,7 @@ public class PanelGroupService {
         return TreeUtils.mergeTree(panelGroupDTOList, "default_panel");
     }
 
+    @DeCleaner(DePermissionType.PANEL)
     @Transactional
     public PanelGroup saveOrUpdate(PanelGroupRequest request) {
         try {

From 24d9762b872bd56aef181d42bbf8f0b1bc763c82 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 14 Feb 2022 12:27:33 +0800
Subject: [PATCH 23/47] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/lang/en.js                       |  3 +-
 frontend/src/lang/tw.js                       |  3 +-
 frontend/src/lang/zh.js                       |  3 +-
 .../components/drag-item/ChartDragItem.vue    | 33 +++++++++++++-
 .../components/drag-item/DimensionExtItem.vue | 30 ++++++++++++-
 .../components/drag-item/DimensionItem.vue    | 30 ++++++++++++-
 .../chart/components/drag-item/DrillItem.vue  | 33 +++++++++++++-
 .../chart/components/drag-item/FilterItem.vue | 33 +++++++++++++-
 .../components/drag-item/QuotaExtItem.vue     | 45 +++++++++++--------
 .../chart/components/drag-item/QuotaItem.vue  | 45 +++++++++++--------
 .../drag-item/components/FieldErrorTips.vue   | 21 +++++++++
 .../views/chart/components/drag-item/utils.js | 33 ++++++++++++++
 frontend/src/views/chart/view/ChartEdit.vue   | 17 ++++++-
 13 files changed, 277 insertions(+), 52 deletions(-)
 create mode 100644 frontend/src/views/chart/components/drag-item/components/FieldErrorTips.vue
 create mode 100644 frontend/src/views/chart/components/drag-item/utils.js

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 5a5221100a..17460c1dcc 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1022,7 +1022,8 @@ export default {
     table_column_adapt: 'Adapt',
     table_column_custom: 'Custom',
     chart_table_pivot: 'Pivot Table',
-    table_pivot_row: 'Data Row'
+    table_pivot_row: 'Data Row',
+    field_error_tips: 'This field is changed(Include dimension、quota，field type，deleted),please edit again.'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 2c1451ad1e..8d27954f15 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1022,7 +1022,8 @@ export default {
     table_column_adapt: '自適應',
     table_column_custom: '自定義',
     chart_table_pivot: '透視表',
-    table_pivot_row: '數據行'
+    table_pivot_row: '數據行',
+    field_error_tips: '該字段所對應的數據集原始字段發生變更（包括維度、指標，字段類型，字段被刪除等），建議重新編輯'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index bcd59ca48b..8706d7c50d 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1024,7 +1024,8 @@ export default {
     table_column_adapt: '自适应',
     table_column_custom: '自定义',
     chart_table_pivot: '透视表',
-    table_pivot_row: '数据行'
+    table_pivot_row: '数据行',
+    field_error_tips: '该字段所对应的数据集原始字段发生变更（包括维度、指标，字段类型，字段被删除等），建议重新编辑'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
index 8fded96dda..da927853f9 100644
--- a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
+++ b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
       <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" />
@@ -10,6 +10,7 @@
         <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>
+      <field-error-tips v-if="tagType === 'danger'" />
       <span v-if="item.summary" class="summary-span">{{ $t('chart.'+item.summary) }}</span>
       <span v-if="item.deType === 1" class="summary-span">
         {{ $t('chart.' + item.dateStyle) }}
@@ -17,7 +18,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" :type="item.groupType === 'q'?'success':''">
+        <el-tag size="small" class="item-axis" :type="tagType">
           <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" />
@@ -27,6 +28,7 @@
             <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>
+          <field-error-tips v-if="tagType === 'danger'" />
           <span v-if="item.summary" class="summary-span">{{ $t('chart.'+item.summary) }}</span>
           <span v-if="item.deType === 1" class="summary-span">
             {{ $t('chart.' + item.dateStyle) }}
@@ -120,8 +122,12 @@
 </template>
 
 <script>
+import { getItemType } from '@/views/chart/components/drag-item/utils'
+import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
+
 export default {
   name: 'ChartDragItem',
+  components: { FieldErrorTips },
   props: {
     param: {
       type: Object,
@@ -138,10 +144,30 @@ export default {
     conf: {
       type: String,
       required: true
+    },
+    dimensionData: {
+      type: Array,
+      required: true
+    },
+    quotaData: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
+      tagType: getItemType(this.dimensionData, this.quotaData, this.item)
+    }
+  },
+  watch: {
+    dimensionData: function() {
+      this.getItemTagType()
+    },
+    quotaData: function() {
+      this.getItemTagType()
+    },
+    item: function() {
+      this.getItemTagType()
     }
   },
   mounted() {
@@ -208,6 +234,9 @@ export default {
       return {
         type: type
       }
+    },
+    getItemTagType() {
+      this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
     }
   }
 }
diff --git a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
index 08fb1c535c..f2859ecb4d 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
       <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" />
@@ -10,13 +10,14 @@
         <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>
+      <field-error-tips v-if="tagType === 'danger'" />
       <span v-if="item.deType === 1" class="summary-span">
         {{ $t('chart.' + item.dateStyle) }}
       </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 === 'q'?'success':''">
+        <el-tag size="small" class="item-axis" :type="tagType">
           <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" />
@@ -26,6 +27,7 @@
             <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>
+          <field-error-tips v-if="tagType === 'danger'" />
           <span v-if="item.deType === 1" class="summary-span">
             {{ $t('chart.' + item.dateStyle) }}
           </span>
@@ -100,8 +102,12 @@
 </template>
 
 <script>
+import { getItemType } from '@/views/chart/components/drag-item/utils'
+import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
+
 export default {
   name: 'DimensionExtItem',
+  components: { FieldErrorTips },
   props: {
     param: {
       type: Object,
@@ -114,10 +120,27 @@ export default {
     index: {
       type: Number,
       required: true
+    },
+    dimensionData: {
+      type: Array,
+      required: true
+    },
+    quotaData: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
+      tagType: getItemType(this.dimensionData, this.quotaData, this.item)
+    }
+  },
+  watch: {
+    dimensionData: function() {
+      this.getItemTagType()
+    },
+    item: function() {
+      this.getItemTagType()
     }
   },
   mounted() {
@@ -188,6 +211,9 @@ export default {
       this.item.index = this.index
       this.item.removeType = 'dimensionExt'
       this.$emit('onDimensionItemRemove', this.item)
+    },
+    getItemTagType() {
+      this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
     }
   }
 }
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index 089ce6cc3e..24599853a4 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
       <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" />
@@ -10,13 +10,14 @@
         <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>
+      <field-error-tips v-if="tagType === 'danger'" />
       <span v-if="item.deType === 1" class="summary-span">
         {{ $t('chart.' + item.dateStyle) }}
       </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 === 'q'?'success':''">
+        <el-tag size="small" class="item-axis" :type="tagType">
           <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" />
@@ -26,6 +27,7 @@
             <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>
+          <field-error-tips v-if="tagType === 'danger'" />
           <span v-if="item.deType === 1" class="summary-span">
             {{ $t('chart.' + item.dateStyle) }}
           </span>
@@ -103,8 +105,12 @@
 </template>
 
 <script>
+import { getItemType } from '@/views/chart/components/drag-item/utils'
+import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
+
 export default {
   name: 'DimensionItem',
+  components: { FieldErrorTips },
   props: {
     param: {
       type: Object,
@@ -117,10 +123,27 @@ export default {
     index: {
       type: Number,
       required: true
+    },
+    dimensionData: {
+      type: Array,
+      required: true
+    },
+    quotaData: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
+      tagType: getItemType(this.dimensionData, this.quotaData, this.item)
+    }
+  },
+  watch: {
+    dimensionData: function() {
+      this.getItemTagType()
+    },
+    item: function() {
+      this.getItemTagType()
     }
   },
   mounted() {
@@ -192,6 +215,9 @@ export default {
       this.item.index = this.index
       this.item.removeType = 'dimension'
       this.$emit('onDimensionItemRemove', this.item)
+    },
+    getItemTagType() {
+      this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
     }
   }
 }
diff --git a/frontend/src/views/chart/components/drag-item/DrillItem.vue b/frontend/src/views/chart/components/drag-item/DrillItem.vue
index 9aa7192cc3..740b60d71f 100644
--- a/frontend/src/views/chart/components/drag-item/DrillItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DrillItem.vue
@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
       <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" />
@@ -10,10 +10,11 @@
         <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>
+      <field-error-tips v-if="tagType === 'danger'" />
     </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 === 'q'?'success':''">
+        <el-tag size="small" class="item-axis" :type="tagType">
           <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" />
@@ -23,6 +24,7 @@
             <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>
+          <field-error-tips v-if="tagType === 'danger'" />
           <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
         </el-tag>
         <el-dropdown-menu slot="dropdown">
@@ -36,8 +38,12 @@
 </template>
 
 <script>
+import { getItemType } from '@/views/chart/components/drag-item/utils'
+import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
+
 export default {
   name: 'DrillItem',
+  components: { FieldErrorTips },
   props: {
     param: {
       type: Object,
@@ -50,10 +56,30 @@ export default {
     index: {
       type: Number,
       required: true
+    },
+    dimensionData: {
+      type: Array,
+      required: true
+    },
+    quotaData: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
+      tagType: getItemType(this.dimensionData, this.quotaData, this.item)
+    }
+  },
+  watch: {
+    dimensionData: function() {
+      this.getItemTagType()
+    },
+    quotaData: function() {
+      this.getItemTagType()
+    },
+    item: function() {
+      this.getItemTagType()
     }
   },
   mounted() {
@@ -79,6 +105,9 @@ export default {
     removeItem() {
       this.item.index = this.index
       this.$emit('onDimensionItemRemove', this.item)
+    },
+    getItemTagType() {
+      this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
     }
   }
 }
diff --git a/frontend/src/views/chart/components/drag-item/FilterItem.vue b/frontend/src/views/chart/components/drag-item/FilterItem.vue
index 08674eaaff..2bdfc59f21 100644
--- a/frontend/src/views/chart/components/drag-item/FilterItem.vue
+++ b/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" :type="item.groupType === 'q'?'success':''">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
       <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" />
@@ -8,10 +8,11 @@
         <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
       </span>
       <span class="item-span-style" :title="item.name">{{ item.name }}</span>
+      <field-error-tips v-if="tagType === 'danger'" />
     </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 === 'q'?'success':''">
+        <el-tag size="small" class="item-axis" :type="tagType">
           <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" />
@@ -19,6 +20,7 @@
             <svg-icon v-if="item.deType === 5" icon-class="field_location" class="field-icon-location" />
           </span>
           <span class="item-span-style" :title="item.name">{{ item.name }}</span>
+          <field-error-tips v-if="tagType === 'danger'" />
           <i class="el-icon-arrow-down el-icon--right" style="position: absolute;top: 6px;right: 10px;" />
         </el-tag>
         <el-dropdown-menu slot="dropdown">
@@ -35,8 +37,12 @@
 </template>
 
 <script>
+import { getItemType } from '@/views/chart/components/drag-item/utils'
+import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
+
 export default {
   name: 'FilterItem',
+  components: { FieldErrorTips },
   props: {
     param: {
       type: Object,
@@ -49,10 +55,30 @@ export default {
     index: {
       type: Number,
       required: true
+    },
+    dimensionData: {
+      type: Array,
+      required: true
+    },
+    quotaData: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
+      tagType: getItemType(this.dimensionData, this.quotaData, this.item)
+    }
+  },
+  watch: {
+    dimensionData: function() {
+      this.getItemTagType()
+    },
+    quotaData: function() {
+      this.getItemTagType()
+    },
+    item: function() {
+      this.getItemTagType()
     }
   },
   mounted() {
@@ -85,6 +111,9 @@ export default {
     removeItem() {
       this.item.index = this.index
       this.$emit('onFilterItemRemove', this.item)
+    },
+    getItemTagType() {
+      this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
     }
   }
 }
diff --git a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
index 003187f7e9..b9d54ba434 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
       <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" />
@@ -13,13 +13,14 @@
         <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>
+      <field-error-tips v-if="tagType === 'danger'" />
       <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
         {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
       </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 === 'q'?'success':''">
+        <el-tag size="small" class="item-axis" :type="tagType">
           <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" />
@@ -32,6 +33,7 @@
             <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>
+          <field-error-tips v-if="tagType === 'danger'" />
           <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
             {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
           </span>
@@ -75,22 +77,6 @@
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>
-          <!-- 快速计算先隐藏-->
-          <!--          <el-dropdown-item v-if="item.id !== 'count'">-->
-          <!--            <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="quickCalc">-->
-          <!--              <span class="el-dropdown-link inner-dropdown-menu">-->
-          <!--                <span>-->
-          <!--                  <i class="el-icon-s-grid" />-->
-          <!--                  <span>{{ $t('chart.quick_calc') }}</span>-->
-          <!--                  <span class="summary-span-item">(无)</span>-->
-          <!--                </span>-->
-          <!--                <i class="el-icon-arrow-right el-icon&#45;&#45;right" />-->
-          <!--              </span>-->
-          <!--              <el-dropdown-menu slot="dropdown">-->
-          <!--                <el-dropdown-item :command="beforeQuickCalc('none')">无</el-dropdown-item>-->
-          <!--              </el-dropdown-menu>-->
-          <!--            </el-dropdown>-->
-          <!--          </el-dropdown-item>-->
 
           <!--同比/环比-->
           <el-dropdown-item v-show="chart.type !== 'table-info'">
@@ -144,9 +130,12 @@
 
 <script>
 import { compareItem } from '@/views/chart/chart/compare'
+import { getItemType } from '@/views/chart/components/drag-item/utils'
+import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
 
 export default {
   name: 'QuotaExtItem',
+  components: { FieldErrorTips },
   props: {
     param: {
       type: Object,
@@ -163,12 +152,21 @@ export default {
     chart: {
       type: Object,
       required: true
+    },
+    dimensionData: {
+      type: Array,
+      required: true
+    },
+    quotaData: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
       compareItem: compareItem,
-      disableEditCompare: false
+      disableEditCompare: false,
+      tagType: getItemType(this.dimensionData, this.quotaData, this.item)
     }
   },
   watch: {
@@ -177,6 +175,12 @@ export default {
     },
     'chart.extStack': function() {
       this.isEnableCompare()
+    },
+    quotaData: function() {
+      this.getItemTagType()
+    },
+    item: function() {
+      this.getItemTagType()
     }
   },
   mounted() {
@@ -296,6 +300,9 @@ export default {
       this.item.index = this.index
       this.item.calcType = 'quotaExt'
       this.$emit('editItemCompare', this.item)
+    },
+    getItemTagType() {
+      this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
     }
   }
 }
diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
index 3851e35ab4..98db334d05 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
@@ -1,6 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="item.groupType === 'q'?'success':''">
+    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
       <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" />
@@ -13,13 +13,14 @@
         <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>
+      <field-error-tips v-if="tagType === 'danger'" />
       <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
         {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
       </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 === 'q'?'success':''">
+        <el-tag size="small" class="item-axis" :type="tagType">
           <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" />
@@ -32,6 +33,7 @@
             <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>
+          <field-error-tips v-if="tagType === 'danger'" />
           <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
             {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
           </span>
@@ -75,22 +77,6 @@
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>
-          <!-- 快速计算先隐藏-->
-          <!--          <el-dropdown-item v-if="item.id !== 'count'">-->
-          <!--            <el-dropdown placement="right-start" size="mini" style="width: 100%" @command="quickCalc">-->
-          <!--              <span class="el-dropdown-link inner-dropdown-menu">-->
-          <!--                <span>-->
-          <!--                  <i class="el-icon-s-grid" />-->
-          <!--                  <span>{{ $t('chart.quick_calc') }}</span>-->
-          <!--                  <span class="summary-span-item">(无)</span>-->
-          <!--                </span>-->
-          <!--                <i class="el-icon-arrow-right el-icon&#45;&#45;right" />-->
-          <!--              </span>-->
-          <!--              <el-dropdown-menu slot="dropdown">-->
-          <!--                <el-dropdown-item :command="beforeQuickCalc('none')">无</el-dropdown-item>-->
-          <!--              </el-dropdown-menu>-->
-          <!--            </el-dropdown>-->
-          <!--          </el-dropdown-item>-->
 
           <!--同比/环比-->
           <el-dropdown-item v-show="chart.type !== 'table-info'">
@@ -144,9 +130,12 @@
 
 <script>
 import { compareItem } from '@/views/chart/chart/compare'
+import { getItemType } from '@/views/chart/components/drag-item/utils'
+import FieldErrorTips from '@/views/chart/components/drag-item/components/FieldErrorTips'
 
 export default {
   name: 'QuotaItem',
+  components: { FieldErrorTips },
   props: {
     param: {
       type: Object,
@@ -163,17 +152,32 @@ export default {
     chart: {
       type: Object,
       required: true
+    },
+    dimensionData: {
+      type: Array,
+      required: true
+    },
+    quotaData: {
+      type: Array,
+      required: true
     }
   },
   data() {
     return {
       compareItem: compareItem,
-      disableEditCompare: false
+      disableEditCompare: false,
+      tagType: getItemType(this.dimensionData, this.quotaData, this.item)
     }
   },
   watch: {
     'chart': function() {
       this.isEnableCompare()
+    },
+    quotaData: function() {
+      this.getItemTagType()
+    },
+    item: function() {
+      this.getItemTagType()
     }
   },
   mounted() {
@@ -293,6 +297,9 @@ export default {
       this.item.index = this.index
       this.item.calcType = 'quota'
       this.$emit('editItemCompare', this.item)
+    },
+    getItemTagType() {
+      this.tagType = getItemType(this.dimensionData, this.quotaData, this.item)
     }
   }
 }
diff --git a/frontend/src/views/chart/components/drag-item/components/FieldErrorTips.vue b/frontend/src/views/chart/components/drag-item/components/FieldErrorTips.vue
new file mode 100644
index 0000000000..9d7b574721
--- /dev/null
+++ b/frontend/src/views/chart/components/drag-item/components/FieldErrorTips.vue
@@ -0,0 +1,21 @@
+<template>
+  <div class="tips-class">
+    <el-tooltip class="item" effect="dark" :content="$t('chart.field_error_tips')" placement="bottom">
+      <span><i class="el-icon-warning" /></span>
+    </el-tooltip>
+  </div>
+</template>
+
+<script>
+export default {
+  name: 'FieldErrorTips'
+}
+</script>
+
+<style scoped>
+.tips-class{
+  position: absolute;
+  right: 10px;
+  z-index: 10;
+}
+</style>
diff --git a/frontend/src/views/chart/components/drag-item/utils.js b/frontend/src/views/chart/components/drag-item/utils.js
new file mode 100644
index 0000000000..8ed6a57939
--- /dev/null
+++ b/frontend/src/views/chart/components/drag-item/utils.js
@@ -0,0 +1,33 @@
+export function getItemType(dimensionData, quotaData, item) {
+  // 将item的字段在数据集维度、指标字段中查询一遍，如果遇到id不存在、字段类型不一致、维度指标不一致，则提示
+  const status = item.groupType
+  let checked = false
+  if (status === 'd') {
+    for (let i = 0; i < dimensionData.length; i++) {
+      const ele = dimensionData[i]
+      if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) {
+        checked = true
+        break
+      }
+    }
+  }
+  if (status === 'q') {
+    for (let i = 0; i < quotaData.length; i++) {
+      const ele = quotaData[i]
+      if (ele.id === item.id && ele.deType === item.deType && ele.groupType === item.groupType) {
+        checked = true
+        break
+      }
+    }
+  }
+
+  if (checked) {
+    if (status === 'd') {
+      return ''
+    } else if (status === 'q') {
+      return 'success'
+    }
+  } else {
+    return 'danger'
+  }
+}
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 75abeb94f1..e7c85caaa6 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -271,6 +271,8 @@
                             :param="param"
                             :index="index"
                             :item="item"
+                            :dimension-data="dimensionData"
+                            :quota-data="quotaData"
                             @onDimensionItemChange="dimensionItemChange"
                             @onDimensionItemRemove="dimensionItemRemove"
                             @editItemFilter="showDimensionEditFilter"
@@ -323,6 +325,8 @@
                             :param="param"
                             :index="index"
                             :item="item"
+                            :dimension-data="dimensionData"
+                            :quota-data="quotaData"
                             @onDimensionItemChange="dimensionItemChange"
                             @onDimensionItemRemove="dimensionItemRemove"
                             @editItemFilter="showDimensionEditFilter"
@@ -376,6 +380,8 @@
                             :index="index"
                             :item="item"
                             :chart="chart"
+                            :dimension-data="dimensionData"
+                            :quota-data="quotaData"
                             @onQuotaItemChange="quotaItemChange"
                             @onQuotaItemRemove="quotaItemRemove"
                             @editItemFilter="showQuotaEditFilter"
@@ -413,6 +419,8 @@
                             :index="index"
                             :item="item"
                             :chart="chart"
+                            :dimension-data="dimensionData"
+                            :quota-data="quotaData"
                             @onQuotaItemChange="quotaItemChange"
                             @onQuotaItemRemove="quotaItemRemove"
                             @editItemFilter="showQuotaEditFilter"
@@ -450,6 +458,8 @@
                             :param="param"
                             :index="index"
                             :item="item"
+                            :dimension-data="dimensionData"
+                            :quota-data="quotaData"
                             @onItemChange="stackItemChange"
                             @onItemRemove="stackItemRemove"
                           />
@@ -490,6 +500,8 @@
                             :param="param"
                             :index="index"
                             :item="item"
+                            :dimension-data="dimensionData"
+                            :quota-data="quotaData"
                             @onItemChange="bubbleItemChange"
                             @onItemRemove="bubbleItemRemove"
                           />
@@ -522,6 +534,8 @@
                             :param="param"
                             :index="index"
                             :item="item"
+                            :dimension-data="dimensionData"
+                            :quota-data="quotaData"
                             @onFilterItemRemove="filterItemRemove"
                             @editItemFilter="showEditFilter"
                           />
@@ -558,6 +572,8 @@
                             :param="param"
                             :index="index"
                             :item="item"
+                            :dimension-data="dimensionData"
+                            :quota-data="quotaData"
                             @onDimensionItemChange="drillItemChange"
                             @onDimensionItemRemove="drillItemRemove"
                           />
@@ -568,7 +584,6 @@
                       </div>
                     </el-row>
                   </div>
-
                 </el-row>
               </div>
             </el-col>

From 64fce59957d9048d839e68af63cace02162a30d9 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Mon, 14 Feb 2022 12:41:17 +0800
Subject: [PATCH 24/47] feat: S2 pivot

---
 frontend/src/views/chart/chart/common/common_table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/chart/common/common_table.js b/frontend/src/views/chart/chart/common/common_table.js
index 5c0bc86d8d..8a98c6986a 100644
--- a/frontend/src/views/chart/chart/common/common_table.js
+++ b/frontend/src/views/chart/chart/common/common_table.js
@@ -106,7 +106,7 @@ export function getSize(chart) {
       size.cellCfg = {
         height: s.tableItemHeight
       }
-      if (!s.tableColumnMode || s.tableColumnMode === 'adapt') {
+      if (s.tableColumnMode && s.tableColumnMode === 'adapt') {
         delete size.cellCfg.width
         size.layoutWidthType = 'compact'
       } else {

From 0445176e7cf71bea476874f7220f3e896ad5ca07 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 14 Feb 2022 16:50:26 +0800
Subject: [PATCH 25/47] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E6=BA=90=E3=80=81=E9=83=A8=E5=88=86=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86api=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtAuthMapper.xml         |  6 ++---
 .../io/dataease/commons/utils/AuthUtils.java  |  7 ++---
 .../dataset/DataSetGroupController.java       | 14 ++++++++++
 .../dataset/DataSetTableController.java       | 26 +++++++++++++++++++
 .../datasource/DatasourceController.java      | 16 ++++++++++++
 .../sys/SystemParameterController.java        |  6 +++++
 .../dataease/plugins/server/ThemeServer.java  |  3 +++
 .../dataease/plugins/server/XAuthServer.java  |  5 ++++
 .../dataease/plugins/server/XDeptServer.java  |  5 ++++
 .../plugins/server/XDisplayServer.java        |  2 ++
 .../plugins/server/XEmailTaskServer.java      |  5 ++++
 .../dataease/plugins/server/XLdapServer.java  |  2 ++
 .../dataease/plugins/server/XOidcServer.java  |  2 ++
 .../dataease/plugins/server/XRoleServer.java  |  5 ++++
 14 files changed, 98 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml
index b0498ecded..2fb26a2579 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtAuthMapper.xml
@@ -40,7 +40,7 @@
             sys_auth a
         LEFT JOIN sys_auth_detail d on d.auth_id = a.id
         WHERE
-            auth_source_type = 'datasource'
+            auth_source_type = 'link'
             AND auth_target_type = 'user'
             AND auth_target = #{userId}
             AND d.privilege_value = 1
@@ -80,7 +80,7 @@
             sys_auth a
         LEFT JOIN sys_auth_detail d on d.auth_id = a.id
         WHERE
-            auth_source_type = 'datasource'
+            auth_source_type = 'link'
             AND auth_target_type = 'role'
             AND auth_target = #{roleId}
             AND d.privilege_value = 1
@@ -119,7 +119,7 @@
             sys_auth a
         LEFT JOIN sys_auth_detail d on d.auth_id = a.id
         WHERE
-            auth_source_type = 'datasource'
+            auth_source_type = 'link'
             AND auth_target_type = 'dept'
             AND auth_target = #{deptId}
             AND d.privilege_value = 1
diff --git a/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java b/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java
index 5fc77ab5cf..30a7f3a2df 100644
--- a/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java
+++ b/backend/src/main/java/io/dataease/commons/utils/AuthUtils.java
@@ -4,6 +4,7 @@ import io.dataease.auth.api.dto.CurrentRoleDto;
 import io.dataease.auth.api.dto.CurrentUserDto;
 import io.dataease.auth.entity.AuthItem;
 import io.dataease.auth.service.ExtAuthService;
+import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.commons.model.AuthURD;
 import org.apache.commons.lang3.StringUtils;
@@ -56,7 +57,7 @@ public class AuthUtils {
         Long deptId = user.getDeptId();
         List<CurrentRoleDto> roles = user.getRoles();
         Set<AuthItem> result = new HashSet<>();
-        if (StringUtils.equals("link", type)) {
+        if (StringUtils.equals(DePermissionType.DATASOURCE.name().toLowerCase(), type)) {
             Set<AuthItem> userSet = extAuthService.dataSourceIdByUser(userId).stream().collect(Collectors.toSet());
             Set<AuthItem> roleSet = roles.stream().map(role -> extAuthService.dataSourceIdByRole(role.getId())).flatMap(Collection::stream).collect(Collectors.toSet());
             Set<AuthItem> deptSet = extAuthService.dataSourceIdByDept(deptId).stream().collect(Collectors.toSet());
@@ -69,7 +70,7 @@ public class AuthUtils {
             return result;
         }
 
-        else if (StringUtils.equals("dataset", type)) {
+        else if (StringUtils.equals(DePermissionType.DATASET.name().toLowerCase(), type)) {
             Set<AuthItem> userSet = extAuthService.dataSetIdByUser(userId).stream().collect(Collectors.toSet());
             Set<AuthItem> roleSet = roles.stream().map(role -> extAuthService.dataSetIdByRole(role.getId())).flatMap(Collection::stream).collect(Collectors.toSet());
             Set<AuthItem> deptSet = extAuthService.dataSetIdByDept(deptId).stream().collect(Collectors.toSet());
@@ -81,7 +82,7 @@ public class AuthUtils {
             });
             return result;
         }
-        else if (StringUtils.equals("panel", type)) {
+        else if (StringUtils.equals(DePermissionType.PANEL.name().toLowerCase(), type)) {
             Set<AuthItem> userSet = extAuthService.panelIdByUser(userId).stream().collect(Collectors.toSet());
             Set<AuthItem> roleSet = roles.stream().map(role -> extAuthService.panelIdByRole(role.getId())).flatMap(Collection::stream).collect(Collectors.toSet());
             Set<AuthItem> deptSet = extAuthService.panelIdByDept(deptId).stream().collect(Collectors.toSet());
diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
index 0a52e11796..f4cdcff78b 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetGroupController.java
@@ -1,13 +1,19 @@
 package io.dataease.controller.dataset;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.auth.annotation.DePermission;
+import io.dataease.auth.annotation.DePermissions;
 import io.dataease.base.domain.DatasetGroup;
+import io.dataease.commons.constants.DePermissionType;
+import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.controller.request.dataset.DataSetGroupRequest;
 import io.dataease.dto.dataset.DataSetGroupDTO;
 import io.dataease.service.dataset.DataSetGroupService;
 import io.dataease.service.dataset.ExtractDataService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -28,12 +34,18 @@ public class DataSetGroupController {
     @Resource
     private ExtractDataService extractDataService;
 
+    @RequiresPermissions("data:read")
+    @DePermissions(value = {
+            @DePermission(type = DePermissionType.DATASET, value = "id"),
+            @DePermission(type = DePermissionType.DATASET, value = "pid", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
+    }, logical = Logical.AND)
     @ApiOperation("保存")
     @PostMapping("/save")
     public DataSetGroupDTO save(@RequestBody DatasetGroup datasetGroup) {
         return dataSetGroupService.save(datasetGroup);
     }
 
+    @RequiresPermissions("data:read")
     @ApiOperation("查询树")
     @PostMapping("/tree")
     public List<DataSetGroupDTO> tree(@RequestBody DataSetGroupRequest datasetGroup) {
@@ -46,6 +58,8 @@ public class DataSetGroupController {
         return dataSetGroupService.treeNode(datasetGroup);
     }
 
+    @RequiresPermissions("data:read")
+    @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
     @ApiOperation("删除")
     @PostMapping("/delete/{id}")
     public void tree(@PathVariable String id) throws Exception {
diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index 54841a4805..1a23f7b32a 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -1,9 +1,13 @@
 package io.dataease.controller.dataset;
 
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.auth.annotation.DePermission;
+import io.dataease.auth.annotation.DePermissions;
 import io.dataease.base.domain.DatasetTable;
 import io.dataease.base.domain.DatasetTableField;
 import io.dataease.base.domain.DatasetTableIncrementalConfig;
+import io.dataease.commons.constants.DePermissionType;
+import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.response.DataSetDetail;
 import io.dataease.dto.datasource.TableFiled;
@@ -11,6 +15,8 @@ import io.dataease.dto.dataset.DataSetTableDTO;
 import io.dataease.dto.dataset.ExcelFileData;
 import io.dataease.service.dataset.DataSetTableService;
 import io.swagger.annotations.*;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -30,12 +36,24 @@ public class DataSetTableController {
     @Resource
     private DataSetTableService dataSetTableService;
 
+    @RequiresPermissions("data:read")
+    @DePermissions(value = {
+        @DePermission(type = DePermissionType.DATASET, value = "id"),
+        @DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
+        @DePermission(type = DePermissionType.DATASOURCE, value = "dataSourceId", level = ResourceAuthLevel.DATASET_LEVEL_USE)
+    }, logical = Logical.AND)
     @ApiOperation("批量保存")
     @PostMapping("batchAdd")
     public void batchAdd(@RequestBody List<DataSetTableRequest> datasetTable) throws Exception {
         dataSetTableService.batchInsert(datasetTable);
     }
 
+    @RequiresPermissions("data:read")
+    @DePermissions(value = {
+            @DePermission(type = DePermissionType.DATASET, value = "id", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
+            @DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
+            @DePermission(type = DePermissionType.DATASOURCE, value = "dataSourceId", level = ResourceAuthLevel.DATASET_LEVEL_USE)
+    }, logical = Logical.AND)
     @ApiOperation("更新")
     @PostMapping("update")
     public void save(@RequestBody DataSetTableRequest datasetTable) throws Exception {
@@ -46,12 +64,19 @@ public class DataSetTableController {
         }
     }
 
+    @RequiresPermissions("data:read")
+    @DePermissions(value = {
+            @DePermission(type = DePermissionType.DATASET, value = "id", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
+            @DePermission(type = DePermissionType.DATASET, value = "sceneId", level = ResourceAuthLevel.DATASET_LEVEL_MANAGE),
+            @DePermission(type = DePermissionType.DATASOURCE, value = "dataSourceId", level = ResourceAuthLevel.DATASET_LEVEL_USE)
+    }, logical = Logical.AND)
     @ApiOperation("修改")
     @PostMapping("alter")
     public void alter(@RequestBody DataSetTableRequest request) throws Exception {
         dataSetTableService.alter(request);
     }
 
+    @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_MANAGE)
     @ApiOperation("删除")
     @PostMapping("delete/{id}")
     public void delete(@ApiParam(name = "id", value = "数据集ID", required = true) @PathVariable String id) throws Exception {
@@ -70,6 +95,7 @@ public class DataSetTableController {
         return dataSetTableService.listAndGroup(dataSetTableRequest);
     }
 
+    @DePermission(type = DePermissionType.DATASET, level = ResourceAuthLevel.DATASET_LEVEL_USE)
     @ApiOperation("详息")
     @PostMapping("get/{id}")
     public DatasetTable get(@ApiParam(name = "id", value = "数据集ID", required = true) @PathVariable String id) {
diff --git a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
index df0015db1d..240ddb768a 100644
--- a/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
+++ b/backend/src/main/java/io/dataease/controller/datasource/DatasourceController.java
@@ -3,7 +3,11 @@ package io.dataease.controller.datasource;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.xiaoymin.knife4j.annotations.ApiSupport;
+import io.dataease.auth.annotation.DePermission;
+import io.dataease.auth.annotation.DePermissions;
 import io.dataease.base.domain.Datasource;
+import io.dataease.commons.constants.DePermissionType;
+import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.PageUtils;
 import io.dataease.commons.utils.Pager;
@@ -15,6 +19,8 @@ import io.dataease.service.datasource.DatasourceService;
 import io.dataease.dto.DatasourceDTO;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.Logical;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
 
@@ -31,18 +37,24 @@ public class DatasourceController {
     @Resource
     private DatasourceService datasourceService;
 
+    @RequiresPermissions("datasource:add")
+    @DePermission(type = DePermissionType.DATASOURCE, value = "id")
     @ApiOperation("新增数据源")
     @PostMapping("/add")
     public Datasource addDatasource(@RequestBody Datasource datasource) throws Exception{
         return datasourceService.addDatasource(datasource);
     }
 
+    @RequiresPermissions("datasource:read")
+    @DePermission(type = DePermissionType.DATASOURCE, value = "id")
     @ApiOperation("验证数据源")
     @PostMapping("/validate")
     public ResultHolder validate(@RequestBody Datasource datasource) throws Exception {
         return datasourceService.validate(datasource);
     }
 
+    @RequiresPermissions("datasource:read")
+    @DePermission(type = DePermissionType.DATASOURCE)
     @ApiOperation("验证数据源")
     @GetMapping("/validate/{datasourceId}")
     public ResultHolder validate(@PathVariable String datasourceId) {
@@ -64,6 +76,7 @@ public class DatasourceController {
         return getDatasourceList().stream().filter(datasourceDTO -> datasourceDTO.getType().equalsIgnoreCase(type)).collect(Collectors.toList());
     }
 
+    @RequiresPermissions("datasource:read")
     @ApiIgnore
     @PostMapping("/list/{goPage}/{pageSize}")
     public Pager<List<DatasourceDTO>> getDatasourceList(@RequestBody BaseGridRequest request, @PathVariable int goPage, @PathVariable int pageSize) throws Exception {
@@ -71,12 +84,15 @@ public class DatasourceController {
         return PageUtils.setPageInfo(page, datasourceService.gridQuery(request));
     }
 
+    @DePermission(type = DePermissionType.DATASOURCE, level = ResourceAuthLevel.LINK_LEVEL_MANAGE)
     @ApiOperation("删除数据源")
     @PostMapping("/delete/{datasourceID}")
     public void deleteDatasource(@PathVariable(value = "datasourceID") String datasourceID) throws Exception {
         datasourceService.deleteDatasource(datasourceID);
     }
 
+    @RequiresPermissions("datasource:add")
+    @DePermission(type = DePermissionType.DATASOURCE, value = "id", level = ResourceAuthLevel.LINK_LEVEL_MANAGE)
     @ApiOperation("更新数据源")
     @PostMapping("/update")
     public void updateDatasource(@RequestBody Datasource Datasource) {
diff --git a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java
index 00adf25aa8..e3751a563c 100644
--- a/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java
+++ b/backend/src/main/java/io/dataease/controller/sys/SystemParameterController.java
@@ -11,6 +11,7 @@ import io.dataease.service.FileService;
 import io.dataease.service.system.EmailService;
 import io.dataease.service.system.SystemParameterService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
@@ -39,11 +40,13 @@ public class SystemParameterController {
     private EmailService emailService;
 
 
+    @RequiresPermissions("sysparam:read")
     @GetMapping("/mail/info")
     public MailInfo mailInfo() {
         return emailService.mailInfo();
     }
 
+    @RequiresPermissions("sysparam:read")
     @GetMapping("/basic/info")
     public BasicInfo basicInfo() {
         return systemParameterService.basicInfo();
@@ -55,11 +58,13 @@ public class SystemParameterController {
         return StringUtils.isNotBlank(basicInfo.getFrontTimeOut()) ? Integer.parseInt(basicInfo.getFrontTimeOut()) : 10;
     }
 
+    @RequiresPermissions("sysparam:read")
     @PostMapping("/edit/email")
     public void editMail(@RequestBody List<SystemParameter> systemParameter) {
         emailService.editMail(systemParameter);
     }
 
+    @RequiresPermissions("sysparam:read")
     @PostMapping("/edit/basic")
     public void editBasic(@RequestBody List<SystemParameter> systemParameter) {
         systemParameterService.editBasic(systemParameter);
@@ -76,6 +81,7 @@ public class SystemParameterController {
     }
 
 
+    @RequiresPermissions("sysparam:read")
     @GetMapping("/base/info")
     public List<SystemParameterDTO> getBaseInfo() {
         return systemParameterService.getSystemParameterInfo(ParamConstants.Classify.BASE.getValue());
diff --git a/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java b/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java
index 5e1ee1769d..df49eba490 100644
--- a/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/ThemeServer.java
@@ -3,6 +3,7 @@ package io.dataease.plugins.server;
 import java.util.List;
 
 import org.apache.commons.lang3.ObjectUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -36,6 +37,7 @@ public class ThemeServer {
         return themeXpackService.queryItems(themeId);
     }
 
+    @RequiresPermissions("sysparam:read")
     @PostMapping("/save")
     public void save(@RequestPart("request") ThemeRequest request,
             @RequestPart(value = "file", required = false) MultipartFile bodyFile) {
@@ -55,6 +57,7 @@ public class ThemeServer {
 
     }
 
+    @RequiresPermissions("sysparam:read")
     @PostMapping("/delete/{themeId}")
     public void delete(@PathVariable("themeId") int themeId) {
         ThemeXpackService themeXpackService = SpringContextUtil.getBean(ThemeXpackService.class);
diff --git a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
index dbfce409a2..2aec82d079 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XAuthServer.java
@@ -14,6 +14,7 @@ import io.dataease.plugins.xpack.auth.dto.response.XpackSysAuthDetailDTO;
 import io.dataease.plugins.xpack.auth.dto.response.XpackVAuthModelDTO;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import io.dataease.plugins.xpack.auth.service.AuthXpackService;
 
@@ -25,6 +26,7 @@ public class XAuthServer {
 
     private static final Set<String> cacheTypes = new HashSet<>();
 
+    @RequiresPermissions("auth:read")
     @PostMapping("/authModels")
     @I18n
     public List<XpackVAuthModelDTO> authModels(@RequestBody XpackBaseTreeRequest request) {
@@ -33,12 +35,14 @@ public class XAuthServer {
         return sysAuthService.searchAuthModelTree(request, user.getUserId(), user.getIsAdmin());
     }
 
+    @RequiresPermissions("auth:read")
     @PostMapping("/authDetails")
     public Map<String, List<XpackSysAuthDetailDTO>> authDetails(@RequestBody XpackSysAuthRequest request) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
         return sysAuthService.searchAuthDetails(request);
     }
 
+    @RequiresPermissions("auth:read")
     @GetMapping("/authDetailsModel/{authType}/{direction}")
     @I18n
     public List<XpackSysAuthDetail> authDetailsModel(@PathVariable String authType, @PathVariable String direction) {
@@ -54,6 +58,7 @@ public class XAuthServer {
         return authDetails;
     }
 
+    @RequiresPermissions("auth:read")
     @PostMapping("/authChange")
     public void authChange(@RequestBody XpackSysAuthRequest request) {
         AuthXpackService sysAuthService = SpringContextUtil.getBean(AuthXpackService.class);
diff --git a/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
index 76dc14c8eb..0c3b911405 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XDeptServer.java
@@ -14,6 +14,7 @@ import io.dataease.plugins.xpack.dept.dto.response.XpackSysDept;
 import io.dataease.plugins.xpack.dept.service.DeptXpackService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -66,6 +67,7 @@ public class XDeptServer {
         return nodes;
     }
 
+    @RequiresPermissions("dept:add")
     @ApiOperation("创建")
     @PostMapping("/create")
     public int create(@RequestBody XpackCreateDept dept){
@@ -73,6 +75,7 @@ public class XDeptServer {
         return deptService.add(dept);
     }
 
+    @RequiresPermissions("dept:del")
     @ApiOperation("删除")
     @PostMapping("/delete")
     public void delete(@RequestBody List<XpackDeleteDept> requests){
@@ -83,6 +86,7 @@ public class XDeptServer {
         deptService.batchDelete(requests);
     }
 
+    @RequiresPermissions("dept:edit")
     @ApiOperation("更新")
     @PostMapping("/update")
     public int update(@RequestBody XpackCreateDept dept){
@@ -91,6 +95,7 @@ public class XDeptServer {
     }
 
 
+    @RequiresPermissions("dept:del")
     @ApiIgnore
     @ApiOperation("删除")
     @PostMapping("/nodesByDeptId/{deptId}")
diff --git a/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java b/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java
index 36e26fc1bb..b689183768 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XDisplayServer.java
@@ -4,6 +4,7 @@ package io.dataease.plugins.server;
 import io.dataease.plugins.config.SpringContextUtil;
 import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
 import io.dataease.plugins.xpack.display.service.DisplayXpackService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 import java.util.List;
@@ -22,6 +23,7 @@ public class XDisplayServer {
         return disPlayXpackService.systemSettings();
     }
 
+    @RequiresPermissions("sysparam:read")
     @PostMapping(value="/save", consumes = {"multipart/form-data"})
     public void saveUIInfo(@RequestPart("request") Map<String,List<SysSettingDto>> systemParameterMap, @RequestPart(value = "files", required = false) List<MultipartFile> bodyFiles) throws Exception {
         DisplayXpackService disPlayXpackService = SpringContextUtil.getBean(DisplayXpackService.class);
diff --git a/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java b/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
index 31595ae413..317fe48079 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
@@ -20,6 +20,7 @@ import io.dataease.service.ScheduleService;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -39,6 +40,7 @@ public class XEmailTaskServer {
     @Resource
     private PriorityThreadPoolExecutor priorityExecutor;
 
+    @RequiresPermissions("task-email:read")
     @PostMapping("/queryTasks/{goPage}/{pageSize}")
     public Pager<List<XpackTaskGridDTO>> queryTask(@PathVariable int goPage, @PathVariable int pageSize,
             @RequestBody XpackGridRequest request) {
@@ -71,6 +73,7 @@ public class XEmailTaskServer {
         return listPager;
     }
 
+    @RequiresPermissions("task-email:add")
     @PostMapping("/save")
     public void save(@RequestBody XpackEmailCreate param) throws Exception {
         XpackEmailTaskRequest request = param.fillContent();
@@ -81,6 +84,7 @@ public class XEmailTaskServer {
         scheduleService.addSchedule(globalTask);
     }
 
+    @RequiresPermissions("task-email:read")
     @PostMapping("/queryForm/{taskId}")
     public XpackEmailCreate queryForm(@PathVariable Long taskId) {
         EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
@@ -141,6 +145,7 @@ public class XEmailTaskServer {
 
     }
 
+    @RequiresPermissions("task-email:del")
     @PostMapping("/delete/{taskId}")
     public void delete(@PathVariable Long taskId) {
         EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
diff --git a/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java b/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java
index 2a6c2c7d6a..44f77c9833 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XLdapServer.java
@@ -6,6 +6,7 @@ import io.dataease.plugins.config.SpringContextUtil;
 import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
 import io.dataease.plugins.xpack.ldap.dto.response.LdapInfo;
 import io.dataease.plugins.xpack.ldap.service.LdapXpackService;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -21,6 +22,7 @@ public class XLdapServer {
         return ldapXpackService.info();
     }
 
+    @RequiresPermissions("sysparam:read")
     @PostMapping("/save")
     public void save(@RequestBody List<SysSettingDto> settings) {
         LdapXpackService ldapXpackService = SpringContextUtil.getBean(LdapXpackService.class);
diff --git a/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java b/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java
index becea9e55a..bf600f0aae 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XOidcServer.java
@@ -5,6 +5,7 @@ import io.dataease.plugins.config.SpringContextUtil;
 import io.dataease.plugins.xpack.display.dto.response.SysSettingDto;
 import io.dataease.plugins.xpack.oidc.service.OidcXpackService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.web.bind.annotation.*;
 import java.util.HashMap;
 import java.util.List;
@@ -21,6 +22,7 @@ public class XOidcServer {
         return oidcXpackService.oidcSettings();
     }
 
+    @RequiresPermissions("sysparam:read")
     @PostMapping("/save")
     public void save(@RequestBody List<SysSettingDto> settings) {
         OidcXpackService oidcXpackService = SpringContextUtil.getBean(OidcXpackService.class);
diff --git a/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java b/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java
index e3ba4da452..200a00155f 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XRoleServer.java
@@ -13,6 +13,7 @@ import io.dataease.plugins.xpack.role.dto.response.XpackRoleItemDto;
 import io.dataease.plugins.xpack.role.service.RoleXpackService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import springfox.documentation.annotations.ApiIgnore;
@@ -26,6 +27,7 @@ public class XRoleServer {
     @Autowired
     private ExtAuthService extAuthService;
 
+    @RequiresPermissions("role:add")
     @ApiOperation("新增角色")
     @PostMapping("/create")
     public void create(@RequestBody XpackRoleDto role){
@@ -34,6 +36,7 @@ public class XRoleServer {
     }
 
 
+    @RequiresPermissions("role:del")
     @ApiOperation("删除角色")
     @PostMapping("/delete/{roleId}")
     public void delete(@PathVariable("roleId") Long roleId){
@@ -43,6 +46,7 @@ public class XRoleServer {
     }
 
 
+    @RequiresPermissions("role:edit")
     @ApiOperation("更新角色")
     @PostMapping("/update")
     public void update(@RequestBody XpackRoleDto role){
@@ -50,6 +54,7 @@ public class XRoleServer {
         roleXpackService.update(role);
     }
 
+    @RequiresPermissions("role:read")
     @ApiOperation("分页查询")
     @PostMapping("/roleGrid/{goPage}/{pageSize}")
     public Pager<List<XpackRoleDto>> roleGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody XpackGridRequest request) {

From 769b7bc271d9805231f74d0828e3350395c2140e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 14 Feb 2022 18:57:35 +0800
Subject: [PATCH 26/47] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E5=BD=92?=
 =?UTF-8?q?=E5=B1=9E=E4=BA=8E=E4=BB=AA=E8=A1=A8=E6=9D=BF=EF=BC=8C=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E8=A7=86=E5=9B=BE=E8=8F=9C=E5=8D=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtChartViewMapper.java   |   2 +-
 .../base/mapper/ext/ExtChartViewMapper.xml    |   8 +-
 .../base/mapper/ext/ExtPanelGroupMapper.java  |   2 +
 .../base/mapper/ext/ExtPanelGroupMapper.xml   |  17 ++
 .../base/mapper/ext/ExtVAuthModelMapper.java  |   5 +-
 .../base/mapper/ext/ExtVAuthModelMapper.xml   | 265 +++++++++++-------
 .../io/dataease/commons/utils/TreeUtils.java  |   4 +
 .../controller/chart/ChartViewController.java |   6 +-
 .../panel/PanelGroupController.java           |   7 +
 .../request/authModel/VAuthModelRequest.java  |   6 +
 .../dataease/dto/authModel/VAuthModelDTO.java |   8 +
 .../service/chart/ChartViewService.java       |   4 +-
 .../service/panel/PanelGroupService.java      |  40 ++-
 .../main/resources/db/migration/V32__1.8.sql  | 199 ++++++++++++-
 .../resources/i18n/messages_en_US.properties  |   3 +-
 .../resources/i18n/messages_zh_CN.properties  |   1 +
 .../resources/i18n/messages_zh_TW.properties  |   1 +
 frontend/src/api/chart/chart.js               |   6 +-
 frontend/src/api/panel/panel.js               |   8 +
 frontend/src/components/canvas/store/copy.js  |   2 +-
 frontend/src/views/panel/ViewSelect/index.vue |  39 +--
 frontend/src/views/panel/edit/index.vue       |  33 ++-
 22 files changed, 519 insertions(+), 147 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java
index 38493a9e63..e2f7104248 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.java
@@ -14,7 +14,7 @@ public interface ExtChartViewMapper {
 
     ChartViewDTO searchOne(ChartViewRequest request);
 
-    void chartCopy(@Param("newChartId")String newChartId,@Param("oldChartId")String oldChartId);
+    void chartCopy(@Param("newChartId")String newChartId,@Param("oldChartId")String oldChartId,@Param("panelId")String panelId);
 
     @Select("select id from chart_view where table_id = #{tableId}")
     List<String> allViewIds(@Param("tableId") String tableId);
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
index e3ae63638c..e17913ef66 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtChartViewMapper.xml
@@ -109,11 +109,12 @@
             `y_axis_ext`,
             `render`,
             `result_count`,
-            `result_mode`
+            `result_mode`,
+            `chart_type`
         ) SELECT
         #{newChartId},
         GET_CHART_VIEW_COPY_NAME ( #{oldChartId} ),
-        `scene_id`,
+        #{panelId},
         `table_id`,
         `type`,
         GET_CHART_VIEW_COPY_NAME ( #{oldChartId} ),
@@ -133,7 +134,8 @@
         `y_axis_ext`,
         `render`,
         `result_count`,
-        `result_mode`
+        `result_mode`,
+        'private'
         FROM
             chart_view
         WHERE
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
index c9e9a9fe44..1abad5be54 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.java
@@ -19,5 +19,7 @@ public interface ExtPanelGroupMapper {
 
     void copyPanelView(@Param("pid") String panelId);
 
+    //移除未使用的视图
+    void removeUselessViews(@Param("panelId") String panelId);
 
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
index fb26c568f1..756ff29ef4 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelGroupMapper.xml
@@ -178,4 +178,21 @@
         panel_id = #{panelId}
     </insert>
 
+    <delete id="removeUselessViews">
+        DELETE
+        FROM
+            chart_view
+        WHERE
+            chart_view.chart_type = 'private'
+            AND chart_view.scene_id = #{panelId}
+            AND id NOT IN (
+            SELECT
+                panel_view.chart_view_id
+            FROM
+                panel_view
+            WHERE
+                panel_view.panel_id = #{panelId}
+            )
+    </delete>
+
 </mapper>
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.java b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.java
index d74b1044e4..cb0fd05188 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.java
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.java
@@ -8,6 +8,9 @@ import java.util.List;
 
 public interface ExtVAuthModelMapper {
 
-    List<VAuthModelDTO> queryAuthModel (@Param("record") VAuthModelRequest record);
+    List<VAuthModelDTO> queryAuthModel(@Param("record") VAuthModelRequest record);
 
+    List<VAuthModelDTO> queryAuthModelViews (@Param("record") VAuthModelRequest record);
+
+    List<VAuthModelDTO> queryAuthViewsOriginal (@Param("record") VAuthModelRequest record);
 }
diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
index 912b404ae0..c99b4a0d0e 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
@@ -4,106 +4,175 @@
     <resultMap extends="io.dataease.base.mapper.VAuthModelMapper.ResultMapWithBLOBs" id="ExtResultMap"
                type="io.dataease.dto.authModel.VAuthModelDTO">
         <result column="privileges" jdbcType="VARCHAR" property="privileges"/>
+        <result column="inner_id" jdbcType="VARCHAR" property="innerId"/>
     </resultMap>
 
     <select id="queryAuthModel" resultMap="ExtResultMap">
-		SELECT
-		v_auth_model.id,
-		v_auth_model.name,
-		v_auth_model.label,
-		v_auth_model.pid,
-		v_auth_model.node_type,
-		v_auth_model.model_type,
-		v_auth_model.model_inner_type,
-		v_auth_model.auth_type,
-		v_auth_model.create_by,
-		v_auth_model.level,
-		v_auth_model.mode,
-		v_auth_model.data_source_id,
-		authInfo.PRIVILEGES AS `privileges`
-	FROM
-		( SELECT GET_V_AUTH_MODEL_ID_P_USE ( #{record.userId}, #{record.modelType} ) cids ) t,
-		v_auth_model
-		LEFT JOIN (
-		SELECT
-			auth_source,
-			group_concat( DISTINCT sys_auth_detail.privilege_extend ) AS `privileges`
-		FROM
-			(
-				`sys_auth`
-				LEFT JOIN `sys_auth_detail` ON ((
-						`sys_auth`.`id` = `sys_auth_detail`.`auth_id`
-					)))
-		WHERE
-			sys_auth_detail.privilege_value = 1
-			AND sys_auth.auth_source_type = #{record.modelType}
-			AND (
-				(
-					sys_auth.auth_target_type = 'dept'
-					AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{record.userId} )
-				)
-				OR (
-					sys_auth.auth_target_type = 'user'
-					AND sys_auth.auth_target = #{record.userId}
-				)
-				OR (
-					sys_auth.auth_target_type = 'role'
-					AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{record.userId} )
-				)
-			)
-		GROUP BY
-			`sys_auth`.`auth_source`
-		) authInfo ON v_auth_model.id = authInfo.auth_source
-	WHERE
-		FIND_IN_SET( v_auth_model.id, cids )
-		<if test="record.id != null">
-			and v_auth_model.id = #{record.id,jdbcType=VARCHAR}
-		</if>
-		<if test="record.pid != null">
-			and v_auth_model.pid = #{record.pid,jdbcType=VARCHAR}
-		</if>
-		<if test="record.nodeType != null">
-			and v_auth_model.node_type = #{record.nodeType,jdbcType=VARCHAR}
-		</if>
-		<if test="record.modelType != null">
-			and v_auth_model.model_type = #{record.modelType,jdbcType=VARCHAR}
-		</if>
-		<if test="record.modelInnerType != null">
-			and v_auth_model.model_inner_type = #{record.modelInnerType,jdbcType=VARCHAR}
-		</if>
-		<if test="record.authType != null">
-			and v_auth_model.auth_type = #{record.authType,jdbcType=VARCHAR}
-		</if>
-		<if test="record.createBy != null">
-			and v_auth_model.create_by = #{record.createBy,jdbcType=VARCHAR}
-		</if>
-		<if test="record.level != null">
-			and v_auth_model.`level` = #{record.level,jdbcType=BIGINT}
-		</if>
-		<if test="record.mode != null">
-	  		<if test="record.mode == 0">
-				and v_auth_model.`mode` = 0
-			</if>
-			<if test='record.mode == 1 and record.modelType != null and record.modelType == "dataset"'>
-				and (v_auth_model.`mode` = 1 or (v_auth_model.`model_inner_type` = 'group' and v_auth_model.model_type = 'dataset'))
-			</if>
-		</if>
-		<if test="record.dataSourceId != null">
-			and v_auth_model.data_source_id = #{record.dataSourceId,jdbcType=VARCHAR}
-		</if>
-		<if test="record.name != null">
-			and v_auth_model.`name` = #{record.name,jdbcType=LONGVARCHAR}
-		</if>
-		<if test="record.label != null">
-			and v_auth_model.`label` = #{record.label,jdbcType=LONGVARCHAR}
-		</if>
-		<if test="record.modelInnerTypeArray != null and record.modelInnerTypeArray.size() > 0">
-			and v_auth_model.model_inner_type in
-			<foreach collection="record.modelInnerTypeArray" item="item" separator="," open="(" close=")">
-				#{item}
-			</foreach>
-		</if>
-		ORDER BY v_auth_model.node_type desc, CONVERT(v_auth_model.label using gbk) asc
-  </select>
+        SELECT
+        v_auth_model.id,
+        v_auth_model.name,
+        v_auth_model.label,
+        v_auth_model.pid,
+        v_auth_model.node_type,
+        v_auth_model.model_type,
+        v_auth_model.model_inner_type,
+        v_auth_model.auth_type,
+        v_auth_model.create_by,
+        v_auth_model.level,
+        v_auth_model.mode,
+        v_auth_model.data_source_id,
+        authInfo.PRIVILEGES AS `privileges`
+        FROM
+        ( SELECT GET_V_AUTH_MODEL_ID_P_USE ( #{record.userId}, #{record.modelType} ) cids ) t,
+        v_auth_model
+        LEFT JOIN (
+        SELECT
+        auth_source,
+        group_concat( DISTINCT sys_auth_detail.privilege_extend ) AS `privileges`
+        FROM
+        (
+        `sys_auth`
+        LEFT JOIN `sys_auth_detail` ON ((
+        `sys_auth`.`id` = `sys_auth_detail`.`auth_id`
+        )))
+        WHERE
+        sys_auth_detail.privilege_value = 1
+        AND sys_auth.auth_source_type = #{record.modelType}
+        AND (
+        (
+        sys_auth.auth_target_type = 'dept'
+        AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{record.userId} )
+        )
+        OR (
+        sys_auth.auth_target_type = 'user'
+        AND sys_auth.auth_target = #{record.userId}
+        )
+        OR (
+        sys_auth.auth_target_type = 'role'
+        AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{record.userId} )
+        )
+        )
+        GROUP BY
+        `sys_auth`.`auth_source`
+        ) authInfo ON v_auth_model.id = authInfo.auth_source
+        WHERE
+        FIND_IN_SET( v_auth_model.id, cids )
+        <if test="record.id != null">
+            and v_auth_model.id = #{record.id,jdbcType=VARCHAR}
+        </if>
+        <if test="record.pid != null">
+            and v_auth_model.pid = #{record.pid,jdbcType=VARCHAR}
+        </if>
+        <if test="record.nodeType != null">
+            and v_auth_model.node_type = #{record.nodeType,jdbcType=VARCHAR}
+        </if>
+        <if test="record.modelType != null">
+            and v_auth_model.model_type = #{record.modelType,jdbcType=VARCHAR}
+        </if>
+        <if test="record.modelInnerType != null">
+            and v_auth_model.model_inner_type = #{record.modelInnerType,jdbcType=VARCHAR}
+        </if>
+        <if test="record.authType != null">
+            and v_auth_model.auth_type = #{record.authType,jdbcType=VARCHAR}
+        </if>
+        <if test="record.createBy != null">
+            and v_auth_model.create_by = #{record.createBy,jdbcType=VARCHAR}
+        </if>
+        <if test="record.level != null">
+            and v_auth_model.`level` = #{record.level,jdbcType=BIGINT}
+        </if>
+        <if test="record.mode != null">
+            <if test="record.mode == 0">
+                and v_auth_model.`mode` = 0
+            </if>
+            <if test='record.mode == 1 and record.modelType != null and record.modelType == "dataset"'>
+                and (v_auth_model.`mode` = 1 or (v_auth_model.`model_inner_type` = 'group' and v_auth_model.model_type =
+                'dataset'))
+            </if>
+        </if>
+        <if test="record.dataSourceId != null">
+            and v_auth_model.data_source_id = #{record.dataSourceId,jdbcType=VARCHAR}
+        </if>
+        <if test="record.name != null">
+            and v_auth_model.`name` = #{record.name,jdbcType=LONGVARCHAR}
+        </if>
+        <if test="record.label != null">
+            and v_auth_model.`label` = #{record.label,jdbcType=LONGVARCHAR}
+        </if>
+        <if test="record.modelInnerTypeArray != null and record.modelInnerTypeArray.size() > 0">
+            and v_auth_model.model_inner_type in
+            <foreach collection="record.modelInnerTypeArray" item="item" separator="," open="(" close=")">
+                #{item}
+            </foreach>
+        </if>
+        ORDER BY v_auth_model.node_type desc, CONVERT(v_auth_model.label using gbk) asc
+    </select>
+
+    <select id="queryAuthModelViews" resultMap="ExtResultMap">
+        SELECT
+        panel_view.id,
+        chart_view.id as 'inner_id',
+        chart_view.NAME,
+        chart_view.NAME AS 'label',
+        panel_view.panel_id AS pid,
+        chart_view.type as 'model_inner_type',
+        'leaf' AS node_type,
+        'view' AS model_type
+        FROM
+        panel_view
+        LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
+        <where>
+
+            <if test="record.pids != null and record.pids.size() > 0">
+                and panel_view.panel_id in
+                <foreach collection="record.pids" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ORDER BY CONVERT(chart_view.name using gbk) asc
+    </select>
+
+
+    <select id="queryAuthViewsOriginal" resultMap="ExtResultMap">
+        select * from (
+        SELECT
+            chart_group.id,
+            chart_group.id AS 'inner_id',
+            chart_group.NAME,
+            chart_group.NAME AS 'label',
+            chart_group.pid AS pid,
+            chart_group.type AS 'model_inner_type',
+            'spine' AS node_type,
+            'view' AS model_type
+        FROM
+            chart_group
+
+            UNION ALL
+
+        SELECT
+            panel_view.id,
+            chart_view.id AS 'inner_id',
+            chart_view.NAME,
+            chart_view.NAME AS 'label',
+            chart_view.scene_id AS pid,
+            chart_view.type AS 'model_inner_type',
+            'leaf' AS node_type,
+            'view' AS model_type
+        FROM
+            panel_view
+            LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
+        <where>
+            chart_view.chart_type ='public'
+            <if test="record.pids != null and record.pids.size() > 0">
+                and panel_view.panel_id in
+                <foreach collection="record.pids" item="item" separator="," open="(" close=")">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        ) viewsOriginal
+        ORDER BY viewsOriginal.node_type desc, CONVERT(viewsOriginal.label using gbk) asc
+    </select>
 
 </mapper>
diff --git a/backend/src/main/java/io/dataease/commons/utils/TreeUtils.java b/backend/src/main/java/io/dataease/commons/utils/TreeUtils.java
index 13796111b9..d5cf0d96b3 100644
--- a/backend/src/main/java/io/dataease/commons/utils/TreeUtils.java
+++ b/backend/src/main/java/io/dataease/commons/utils/TreeUtils.java
@@ -2,6 +2,7 @@ package io.dataease.commons.utils;
 
 import io.dataease.commons.model.ITreeBase;
 import org.springframework.util.Assert;
+import org.springframework.util.CollectionUtils;
 
 import java.util.*;
 import java.util.stream.Collectors;
@@ -18,6 +19,9 @@ public class TreeUtils{
      */
     public static<T extends ITreeBase> List<T> mergeTree(List<T> tree,String ... rootPid) {
         Assert.notNull(rootPid, "Root Pid cannot be null");
+        if(CollectionUtils.isEmpty(tree)){
+            return null;
+        }
         List<T> result = new ArrayList<>();
         // 构建id-节点map映射
         Map<String, T> treePidMap = tree.stream().collect(Collectors.toMap(T::getId, t -> t));
diff --git a/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java b/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java
index 714edd2007..d55cf8be57 100644
--- a/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java
+++ b/backend/src/main/java/io/dataease/controller/chart/ChartViewController.java
@@ -72,9 +72,9 @@ public class ChartViewController {
     }
 
     @ApiOperation("复制")
-    @PostMapping("chartCopy/{id}")
-    public String chartCopy(@PathVariable String id) {
-        return chartViewService.chartCopy(id);
+    @PostMapping("chartCopy/{id}/{panelId}")
+    public String chartCopy(@PathVariable String id, @PathVariable String panelId) {
+        return chartViewService.chartCopy(id,panelId);
     }
 
     @ApiIgnore
diff --git a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
index 62383c6c02..e059975190 100644
--- a/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
+++ b/backend/src/main/java/io/dataease/controller/panel/PanelGroupController.java
@@ -9,6 +9,7 @@ import io.dataease.commons.constants.DePermissionType;
 import io.dataease.commons.constants.ResourceAuthLevel;
 import io.dataease.controller.handler.annotation.I18n;
 import io.dataease.controller.request.panel.PanelGroupRequest;
+import io.dataease.dto.authModel.VAuthModelDTO;
 import io.dataease.dto.panel.PanelGroupDTO;
 import io.dataease.service.panel.PanelGroupService;
 import io.swagger.annotations.Api;
@@ -70,5 +71,11 @@ public class PanelGroupController {
         return panelGroupService.findOne(id);
     }
 
+    @ApiOperation("仪表板视图信息")
+    @PostMapping("/queryPanelViewTree")
+    @I18n
+    public List<VAuthModelDTO> queryPanelViewTree(){
+        return panelGroupService.queryPanelViewTree();
+    }
 
 }
diff --git a/backend/src/main/java/io/dataease/controller/request/authModel/VAuthModelRequest.java b/backend/src/main/java/io/dataease/controller/request/authModel/VAuthModelRequest.java
index 223859b936..5ec7201638 100644
--- a/backend/src/main/java/io/dataease/controller/request/authModel/VAuthModelRequest.java
+++ b/backend/src/main/java/io/dataease/controller/request/authModel/VAuthModelRequest.java
@@ -14,9 +14,15 @@ import java.util.List;
 public class VAuthModelRequest extends VAuthModelDTO {
 
     private String userId;
+
     private String privileges;
+
     private Integer datasetMode;
+
     private boolean clearEmptyDir;
+
     private List<String> modelInnerTypeArray;
 
+    private List<String> pids;
+
 }
diff --git a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
index a3ce5a3978..53b4bf5135 100644
--- a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
+++ b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
@@ -17,5 +17,13 @@ public class VAuthModelDTO extends VAuthModelWithBLOBs  implements ITreeBase<VAu
     private String privileges;
 
     private List<VAuthModelDTO> children;
+
     private long allLeafs = 0l;
+
+    private String innerId;
+
+    public String toString(){
+        return this.getId();
+    }
+
 }
diff --git a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
index 6a2266c442..eaab61bbab 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -1684,9 +1684,9 @@ public class ChartViewService {
         return chartViewMapper.selectByPrimaryKey(id);
     }
 
-    public String chartCopy(String id) {
+    public String chartCopy(String id,String panelId) {
         String newChartId = UUID.randomUUID().toString();
-        extChartViewMapper.chartCopy(newChartId, id);
+        extChartViewMapper.chartCopy(newChartId, id,panelId);
         return newChartId;
     }
 
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index b063082e99..eee054f986 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -3,12 +3,16 @@ package io.dataease.service.panel;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.ChartViewMapper;
 import io.dataease.base.mapper.PanelGroupMapper;
+import io.dataease.base.mapper.VAuthModelMapper;
 import io.dataease.base.mapper.ext.ExtPanelGroupMapper;
 import io.dataease.base.mapper.ext.ExtPanelLinkJumpMapper;
+import io.dataease.base.mapper.ext.ExtVAuthModelMapper;
 import io.dataease.commons.constants.PanelConstants;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.TreeUtils;
+import io.dataease.controller.request.authModel.VAuthModelRequest;
 import io.dataease.controller.request.panel.PanelGroupRequest;
+import io.dataease.dto.authModel.VAuthModelDTO;
 import io.dataease.dto.chart.ChartViewDTO;
 import io.dataease.dto.panel.PanelGroupDTO;
 import io.dataease.exception.DataEaseException;
@@ -28,6 +32,7 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 /**
  * Author: wangjiahao
@@ -59,7 +64,10 @@ public class PanelGroupService {
     private PanelViewService panelViewService;
     @Resource
     private ExtPanelLinkJumpMapper extPanelLinkJumpMapper;
-
+    @Resource
+    private ExtVAuthModelMapper extVAuthModelMapper;
+    @Resource
+    private VAuthModelMapper vAuthModelMapper;
 
     public List<PanelGroupDTO> tree(PanelGroupRequest panelGroupRequest) {
         String userId = String.valueOf(AuthUtils.getUser().getUserId());
@@ -157,6 +165,9 @@ public class PanelGroupService {
         if (!CollectionUtils.isNotEmpty(panelGroupDTOList)) {
             DataEaseException.throwException("未查询到用户对应的资源权限，请尝试刷新重新保存");
         }
+
+        //移除没有用到的仪表板私有视图
+        extPanelGroupMapper.removeUselessViews(panelId);
         return panelGroupDTOList.get(0);
     }
 
@@ -214,4 +225,31 @@ public class PanelGroupService {
         return chartViewDTOList;
     }
 
+    public List<VAuthModelDTO> queryPanelViewTree(){
+        List<VAuthModelDTO> result = new ArrayList<>();
+        VAuthModelRequest panelRequest = new VAuthModelRequest();
+        panelRequest.setUserId(String.valueOf(AuthUtils.getUser().getUserId()));
+        panelRequest.setModelType("panel");
+        List<VAuthModelDTO> panelResult =  extVAuthModelMapper.queryAuthModel(panelRequest);
+        // 获取仪表板下面的视图
+        if(CollectionUtils.isNotEmpty(panelResult)){
+            result.addAll(panelResult);
+            List<String> panelIds = panelResult.stream().map(VAuthModelDTO::getId).collect(Collectors.toList());
+            VAuthModelRequest viewRequest = new VAuthModelRequest();
+            viewRequest.setPids(panelIds);
+            List<VAuthModelDTO> viewResult = extVAuthModelMapper.queryAuthModelViews(viewRequest);
+            if(CollectionUtils.isNotEmpty(viewResult)){
+                result.addAll(viewResult);
+            }
+            result = TreeUtils.mergeTree(panelResult,"panel_list");
+            // 原有视图的目录结构
+            List<VAuthModelDTO> viewOriginal = extVAuthModelMapper.queryAuthViewsOriginal(viewRequest);
+            if(CollectionUtils.isNotEmpty(viewOriginal) && viewOriginal.size()>1){
+                result.addAll(TreeUtils.mergeTree(viewOriginal,"public_chart"));
+            }
+        }
+
+        return result;
+    }
+
 }
diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
index 8ba29f5913..a5615ccf45 100644
--- a/backend/src/main/resources/db/migration/V32__1.8.sql
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -1,2 +1,199 @@
 ALTER TABLE `chart_view` ADD COLUMN `x_axis_ext` LONGTEXT COMMENT 'table-row' AFTER `x_axis`;
-UPDATE `chart_view` SET `x_axis_ext` = '[]';
\ No newline at end of file
+UPDATE `chart_view` SET `x_axis_ext` = '[]';
+
+
+INSERT INTO `chart_group` (`id`, `name`, `pid`, `level`, `type`, `create_by`, `create_time`) VALUES ('0', 'i18n_public_chart', 'public_chart', -1, 'group', 'admin', NULL);
+
+ALTER TABLE `chart_view`
+MODIFY COLUMN `scene_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场景ID chart_type为privat的时候 是仪表板id' AFTER `title`,
+ADD COLUMN `chart_type` varchar(255) NULL DEFAULT 'public' COMMENT '视图类型 public 公共 历史可复用的视图，private 私有 专属某个仪表板' AFTER `style_priority`;
+
+delete  from sys_auth_detail where auth_id in(select id  from sys_auth where auth_source_type = 'chart');
+delete from sys_auth where auth_source_type = 'chart';
+
+DROP TRIGGER `new_auth_chart_view`;
+DROP TRIGGER `delete_auth_chart_view`;
+
+delete from sys_menu where menu_id ='10';
+
+DROP VIEW
+IF
+	EXISTS `v_auth_model`;
+CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `v_auth_model` AS SELECT
+`sys_user`.`user_id` AS `id`,
+`sys_user`.`username` AS `name`,
+`sys_user`.`username` AS `label`,
+'0' AS `pid`,
+'leaf' AS `node_type`,
+'user' AS `model_type`,
+'user' AS `model_inner_type`,
+'target' AS `auth_type`,
+`sys_user`.`create_by` AS `create_by`,
+0 AS `level`,
+0 AS `mode`,
+'0' AS `data_source_id`
+FROM
+	`sys_user`
+WHERE
+	( `sys_user`.`is_admin` <> 1 ) UNION ALL
+SELECT
+	`sys_role`.`role_id` AS `id`,
+	`sys_role`.`name` AS `name`,
+	`sys_role`.`name` AS `label`,
+	'0' AS `pid`,
+	'leaf' AS `node_type`,
+	'role' AS `model_type`,
+	'role' AS `model_inner_type`,
+	'target' AS `auth_type`,
+	`sys_role`.`create_by` AS `create_by`,
+	0 AS `level`,
+	0 AS `mode`,
+	'0' AS `data_source_id`
+FROM
+	`sys_role` UNION ALL
+SELECT
+	`sys_dept`.`dept_id` AS `id`,
+	`sys_dept`.`name` AS `name`,
+	`sys_dept`.`name` AS `lable`,(
+		cast( `sys_dept`.`pid` AS CHAR charset utf8mb4 ) COLLATE utf8mb4_general_ci
+	) AS `pid`,
+IF
+	(( `sys_dept`.`sub_count` = 0 ), 'leaf', 'spine' ) AS `node_type`,
+	'dept' AS `model_type`,
+	'dept' AS `model_inner_type`,
+	'target' AS `auth_type`,
+	`sys_dept`.`create_by` AS `create_by`,
+	0 AS `level`,
+	0 AS `mode`,
+	'0' AS `data_source_id`
+FROM
+	`sys_dept` UNION ALL
+SELECT
+	`datasource`.`id` AS `id`,
+	`datasource`.`name` AS `NAME`,
+	`datasource`.`name` AS `label`,
+	'0' AS `pid`,
+	'leaf' AS `node_type`,
+	'link' AS `model_type`,
+	`datasource`.`type` AS `model_inner_type`,
+	'source' AS `auth_type`,
+	`datasource`.`create_by` AS `create_by`,
+	0 AS `level`,
+	0 AS `mode`,
+	'0' AS `data_source_id`
+FROM
+	`datasource` UNION ALL
+SELECT
+	`dataset_group`.`id` AS `id`,
+	`dataset_group`.`name` AS `NAME`,
+	`dataset_group`.`name` AS `lable`,
+IF
+	( isnull( `dataset_group`.`pid` ), '0', `dataset_group`.`pid` ) AS `pid`,
+	'spine' AS `node_type`,
+	'dataset' AS `model_type`,
+	`dataset_group`.`type` AS `model_inner_type`,
+	'source' AS `auth_type`,
+	`dataset_group`.`create_by` AS `create_by`,
+	`dataset_group`.`level` AS `level`,
+	0 AS `mode`,
+	'0' AS `data_source_id`
+FROM
+	`dataset_group` UNION ALL
+SELECT
+	`dataset_table`.`id` AS `id`,
+	`dataset_table`.`name` AS `NAME`,
+	`dataset_table`.`name` AS `lable`,
+	`dataset_table`.`scene_id` AS `pid`,
+	'leaf' AS `node_type`,
+	'dataset' AS `model_type`,
+	`dataset_table`.`type` AS `model_inner_type`,
+	'source' AS `auth_type`,
+	`dataset_table`.`create_by` AS `create_by`,
+	0 AS `level`,
+	`dataset_table`.`mode` AS `mode`,
+	`dataset_table`.`data_source_id` AS `data_source_id`
+FROM
+	`dataset_table` UNION ALL
+SELECT
+	`panel_group`.`id` AS `id`,
+	`panel_group`.`name` AS `NAME`,
+	`panel_group`.`name` AS `label`,(
+	CASE
+			`panel_group`.`id`
+			WHEN 'panel_list' THEN
+			'0'
+			WHEN 'default_panel' THEN
+			'0' ELSE `panel_group`.`pid`
+		END
+		) AS `pid`,
+	IF
+		(( `panel_group`.`node_type` = 'folder' ), 'spine', 'leaf' ) AS `node_type`,
+		'panel' AS `model_type`,
+		`panel_group`.`panel_type` AS `model_inner_type`,
+		'source' AS `auth_type`,
+		`panel_group`.`create_by` AS `create_by`,
+		0 AS `level`,
+		0 AS `mode`,
+		'0' AS `data_source_id`
+	FROM
+		`panel_group` UNION ALL
+	SELECT
+		`sys_menu`.`menu_id` AS `menu_id`,
+		`sys_menu`.`title` AS `name`,
+		`sys_menu`.`title` AS `label`,
+		`sys_menu`.`pid` AS `pid`,
+	IF
+		(( `sys_menu`.`sub_count` > 0 ), 'spine', 'leaf' ) AS `node_type`,
+		'menu' AS `model_type`,(
+		CASE
+				`sys_menu`.`type`
+				WHEN 0 THEN
+				'folder'
+				WHEN 1 THEN
+				'menu'
+				WHEN 2 THEN
+				'button'
+			END
+			) AS `model_inner_type`,
+			'source' AS `auth_type`,
+			`sys_menu`.`create_by` AS `create_by`,
+			0 AS `level`,
+			0 AS `mode`,
+			'0' AS `data_source_id`
+		FROM
+			`sys_menu`
+		WHERE
+			((
+					`sys_menu`.`i_frame` <> 1
+					)
+			OR isnull( `sys_menu`.`i_frame` )) UNION ALL
+		SELECT
+			`plugin_sys_menu`.`menu_id` AS `menu_id`,
+			`plugin_sys_menu`.`title` AS `name`,
+			`plugin_sys_menu`.`title` AS `label`,
+			`plugin_sys_menu`.`pid` AS `pid`,
+		IF
+			(( `plugin_sys_menu`.`sub_count` > 0 ), 'spine', 'leaf' ) AS `node_type`,
+			'menu' AS `model_type`,(
+			CASE
+					`plugin_sys_menu`.`type`
+					WHEN 0 THEN
+					'folder'
+					WHEN 1 THEN
+					'menu'
+					WHEN 2 THEN
+					'button'
+				END
+				) AS `model_inner_type`,
+				'source' AS `auth_type`,
+				`plugin_sys_menu`.`create_by` AS `create_by`,
+				0 AS `level`,
+				0 AS `mode`,
+				'0' AS `data_source_id`
+			FROM
+				`plugin_sys_menu`
+			WHERE
+				((
+						`plugin_sys_menu`.`i_frame` <> 1
+					)
+	OR isnull( `plugin_sys_menu`.`i_frame` ));
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 8b8f3705cf..02915a79c1 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -118,4 +118,5 @@ i18n_calc_field_error=Field expression error
 i18n_cp_exist=Column permission of the same type already exists
 connection_failed=Connection Failed
 theme_name_repeat=name of theme has been existed
-theme_name_empty=name can not be empty
\ No newline at end of file
+theme_name_empty=name can not be empty
+i18n_public_chart= Public Chart
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index e52791f02a..c8702d818b 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -118,3 +118,4 @@ i18n_cp_exist=已有同类型的列权限存在
 connection_failed=连接失败
 theme_name_repeat=名称已存在
 theme_name_empty=名称不能为空
+i18n_public_chart= 存量视图
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index c3f6464aaa..1f8e756ea5 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -119,3 +119,4 @@ i18n_cp_exist=已有同類型的列權限存在
 connection_failed=連接失敗
 theme_name_repeat=名稱已存在
 theme_name_empty=名稱不能為空
+i18n_public_chart= 存量视图
diff --git a/frontend/src/api/chart/chart.js b/frontend/src/api/chart/chart.js
index d143acf1da..b7657defbc 100644
--- a/frontend/src/api/chart/chart.js
+++ b/frontend/src/api/chart/chart.js
@@ -28,11 +28,11 @@ export function getChartTree(data) {
   })
 }
 
-export function chartCopy(id) {
+export function chartCopy(id, panelId) {
   return request({
-    url: '/chart/view/chartCopy/' + id,
+    url: '/chart/view/chartCopy/' + id + '/' + panelId,
     method: 'post',
-    loading: true
+    loading: false
   })
 }
 export function chartGroupTree(data) {
diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index 675355f064..0a399b81af 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -154,3 +154,11 @@ export function initPanelData(panelId, callback) {
     callback(response)
   })
 }
+
+export function queryPanelViewTree() {
+  return request({
+    url: '/panel/group/queryPanelViewTree',
+    method: 'post'
+  })
+}
+
diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js
index 3b6f34f511..f8bcfa22c7 100644
--- a/frontend/src/components/canvas/store/copy.js
+++ b/frontend/src/components/canvas/store/copy.js
@@ -47,7 +47,7 @@ export default {
 
       // 如果是用户视图 测先进行底层复制
       if (data.type === 'view') {
-        chartCopy(data.propValue.viewId).then(res => {
+        chartCopy(data.propValue.viewId, state.panel.panelInfo.id).then(res => {
           const newView = deepCopy(data)
           newView.id = uuid.v1()
           newView.propValue.viewId = res.data
diff --git a/frontend/src/views/panel/ViewSelect/index.vue b/frontend/src/views/panel/ViewSelect/index.vue
index 20e9ccbe39..dbfa684887 100644
--- a/frontend/src/views/panel/ViewSelect/index.vue
+++ b/frontend/src/views/panel/ViewSelect/index.vue
@@ -2,7 +2,7 @@
   <el-col v-loading="loading">
     <el-row style="margin-top: 5px">
       <el-row style="margin-left: 5px;margin-right: 5px">
-        <el-col :span="selectModel ? 23 : 16">
+        <el-col :span="23">
           <el-input
             v-model="templateFilterText"
             :placeholder="$t('panel.filter_keywords')"
@@ -11,9 +11,9 @@
             prefix-icon="el-icon-search"
           />
         </el-col>
-        <el-col v-if="!selectModel" :span="7">
-          <el-button type="primary" size="mini" style="float: right" @click="newChart">新建 </el-button>
-        </el-col>
+        <!--        <el-col v-if="!selectModel" :span="7">-->
+        <!--          <el-button type="primary" size="mini" style="float: right" @click="newChart">新建 </el-button>-->
+        <!--        </el-col>-->
 
       </el-row>
       <el-row style="margin-top: 5px">
@@ -31,46 +31,35 @@
           :filter-node-method="filterNode"
           :highlight-current="true"
           @node-drag-start="handleDragStart"
-          @node-click="nodeClick"
-
           @check="checkChanged"
-
           @node-drag-end="dragEnd"
         >
           <span slot-scope="{ node, data }" class="custom-tree-node">
             <span>
-              <span v-if="data.type==='scene'||data.type==='group'">
+              <span v-if="data.modelType==='panel'|| data.nodeType === 'spine'">
                 <el-button
                   icon="el-icon-folder"
                   type="text"
                 />
               </span>
               <span v-else>
-                <svg-icon :icon-class="data.type" style="width: 14px;height: 14px" />
+                <svg-icon :icon-class="data.modelInnerType" style="width: 14px;height: 14px" />
               </span>
               <span style="margin-left: 6px;font-size: 14px">{{ data.name }}</span>
             </span>
           </span>
         </el-tree>
       </el-row>
-      <!--      <el-row v-if="detailItem&&detailItem.snapshot" class="detail-class">-->
-      <!--        <el-card class="filter-card-class">-->
-      <!--          <div slot="header" class="button-div-class">-->
-      <!--            <span>{{ detailItem.name }}</span>-->
-      <!--          </div>-->
-      <!--          <img draggable="false" class="view-list-thumbnails" :src="detailItem.snapshot" alt="">-->
-      <!--        </el-card>-->
-      <!--      </el-row>-->
     </el-row>
   </el-col>
 </template>
 
 <script>
-import { tree, findOne } from '@/api/panel/view'
 import componentList from '@/components/canvas/custom-component/component-list'
 import { deepCopy } from '@/components/canvas/utils/utils'
 import eventBus from '@/components/canvas/utils/eventBus'
 import { mapState } from 'vuex'
+import { queryPanelViewTree } from '@/api/panel/panel'
 
 export default {
   name: 'ViewSelect',
@@ -113,15 +102,9 @@ export default {
       if (!value) return true
       return data.name.indexOf(value) !== -1
     },
-    nodeClick(data, node) {
-      findOne(data.id).then(res => {
-        this.detailItem = res.data
-      })
-    },
     loadData() {
-      const param = {}
       this.loading = true
-      tree(param).then(res => {
+      queryPanelViewTree().then(res => {
         const nodeDatas = res.data
         if (this.selectModel) {
           this.setParentDisable(nodeDatas)
@@ -135,7 +118,7 @@ export default {
       ev.dataTransfer.effectAllowed = 'copy'
       const dataTrans = {
         type: 'view',
-        id: node.data.id
+        id: node.data.innerId
       }
       ev.dataTransfer.setData('componentInfo', JSON.stringify(dataTrans))
       eventBus.$emit('startMoveIn')
@@ -146,7 +129,7 @@ export default {
     },
     // 判断节点能否被拖拽
     allowDrag(draggingNode) {
-      if (draggingNode.data.type === 'scene' || draggingNode.data.type === 'group') {
+      if (draggingNode.data.modelType === 'panel' || draggingNode.data.nodeType === 'spine') {
         return false
       } else {
         return true
@@ -171,7 +154,7 @@ export default {
     },
     setParentDisable(nodes) {
       nodes.forEach(node => {
-        if (node.type === 'group') {
+        if (node.modelType === 'panel' || node.nodeType === 'spine') {
           node.disabled = true
         }
         if (node.children && node.children.length > 0) {
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 831f6989d6..7d25ec253f 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -25,7 +25,7 @@
           <div style="width: 60px;height: 100%;overflow: hidden auto;position: relative;margin: 0px auto; font-size: 14px">
             <!-- 视图图表 start -->
             <div class="button-div-class" style=" width: 24px;height: 24px;text-align: center;line-height: 1;position: relative;margin: 16px auto 0px;">
-              <el-button :class="show&&showIndex===0? 'button-show':'button-closed'" circle class="el-icon-circle-plus-outline" size="mini" @click="showPanel(0)" />
+              <el-button circle class="el-icon-circle-plus-outline" size="mini" @click="newChart()" />
             </div>
             <div class="button-text" style="position: relative; margin: 18px auto 16px;">
               <div style="max-width: 100%;text-align: center;white-space: nowrap;text-overflow: ellipsis;position: relative;flex-shrink: 0;">
@@ -66,6 +66,21 @@
               <div style="width: 60px;height: 1px;line-height: 1px;text-align: center;white-space: pre;text-overflow: ellipsis;position: relative;flex-shrink: 0;" />
             </div>
             <!-- 其他组件 end -->
+
+            <!-- 视图复用 start -->
+            <div class="button-div-class" style=" width: 24px;height: 24px;text-align: center;line-height: 1;position: relative;margin: 16px auto 0px;">
+              <el-button :class="show&&showIndex===0? 'button-show':'button-closed'" circle class="el-icon-copy-document" size="mini" @click="showPanel(0)" />
+            </div>
+            <div class="button-text" style="position: relative; margin: 18px auto 16px;">
+              <div style="max-width: 100%;text-align: center;white-space: nowrap;text-overflow: ellipsis;position: relative;flex-shrink: 0;">
+                <!--                {{ $t('panel.view') }}-->
+                复用
+              </div>
+            </div>
+            <div style="height: 1px; position: relative; margin: 0px auto;background-color:#E6E6E6;">
+              <div style="width: 60px;height: 1px;line-height: 1px;text-align: center;white-space: pre;text-overflow: ellipsis;position: relative;flex-shrink: 0;" />
+            </div>
+            <!-- 视图复用 end -->
           </div>
         </div>
       </de-aside-container>
@@ -228,7 +243,7 @@ import elementResizeDetectorMaker from 'element-resize-detector'
 import AssistComponent from '@/views/panel/AssistComponent'
 import PanelTextEditor from '@/components/canvas/custom-component/PanelTextEditor'
 import ChartGroup from '@/views/chart/group/Group'
-import { searchAdviceSceneId } from '@/api/chart/chart'
+import { chartCopy, searchAdviceSceneId } from '@/api/chart/chart'
 // 引入样式
 import '@/components/canvas/assets/iconfont/iconfont.css'
 import '@/components/canvas/styles/animate.css'
@@ -628,8 +643,18 @@ export default {
       component.id = newComponentId
       // 新拖入的组件矩阵状态 和仪表板当前的矩阵状态 保持一致
       component.auxiliaryMatrix = this.canvasStyleData.auxiliaryMatrix
-      this.$store.commit('addComponent', { component })
-      this.$store.commit('recordSnapshot', 'handleDrop')
+
+      // 视图统一调整为复制
+      if (componentInfo.type === 'view') {
+        chartCopy(component.propValue.viewId, this.panelInfo.id).then(res => {
+          component.propValue.viewId = res.data
+          this.$store.commit('addComponent', { component })
+          this.$store.commit('recordSnapshot', 'handleDrop')
+        })
+      } else {
+        this.$store.commit('addComponent', { component })
+        this.$store.commit('recordSnapshot', 'handleDrop')
+      }
       this.clearCurrentInfo()
     },
     clearCurrentInfo() {

From 954f68ec91e95f334fb4793a846a52eaa7df6388 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 10:47:01 +0800
Subject: [PATCH 27/47] =?UTF-8?q?feat:=20=E5=85=AC=E5=85=B1=E8=BF=9E?=
 =?UTF-8?q?=E6=8E=A5title=E5=B1=95=E7=A4=BA=E5=BD=93=E5=89=8D=E4=BB=AA?=
 =?UTF-8?q?=E8=A1=A8=E6=9D=BF=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/auth/service/impl/ShiroServiceImpl.java    | 1 +
 frontend/src/views/link/view/index.vue                          | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
index 8afa6e7281..01a9dd903b 100644
--- a/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
+++ b/backend/src/main/java/io/dataease/auth/service/impl/ShiroServiceImpl.java
@@ -45,6 +45,7 @@ public class ShiroServiceImpl implements ShiroService {
         // 获取主题信息
         filterChainDefinitionMap.put("/plugin/theme/themes", ANON);
         filterChainDefinitionMap.put("/plugin/theme/items/**", ANON);
+        filterChainDefinitionMap.put("/plugin/view/types", ANON);
 
         // 验证链接
         filterChainDefinitionMap.put("/api/link/validate**", ANON);
diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue
index 307a3d4395..4ac41383a6 100644
--- a/frontend/src/views/link/view/index.vue
+++ b/frontend/src/views/link/view/index.vue
@@ -40,6 +40,8 @@ export default {
           id: res.data.id,
           name: res.data.name
         })
+        // 设置浏览器title为当前仪表板名称
+        document.title = res.data.name
         // 刷新联动信息
         getPanelAllLinkageInfo(this.resourceId).then(rsp => {
           this.$store.commit('setNowPanelTrackInfo', rsp.data)

From 3f20e23bb9fba34cf9d7baa2b7a9daf8210d304c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 11:37:13 +0800
Subject: [PATCH 28/47] =?UTF-8?q?feat:=20=E5=85=AC=E5=85=B1=E9=93=BE?=
 =?UTF-8?q?=E6=8E=A5=E4=BD=BF=E7=94=A88=E4=BD=8D=E9=9A=8F=E6=9C=BA?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E5=90=8E=E7=BC=80,=E5=85=BC=E5=AE=B9?=
 =?UTF-8?q?=E8=80=81=E7=89=88=E6=9C=AC=E6=95=B0=E5=AD=97=E5=90=8E=E7=BC=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/domain/PanelLinkMapping.java         |  2 +
 .../base/domain/PanelLinkMappingExample.java  | 70 +++++++++++++++++++
 .../base/mapper/PanelLinkMappingMapper.xml    | 29 ++++++--
 .../io/dataease/commons/utils/CodingUtil.java | 30 ++++++++
 .../dataease/controller/IndexController.java  | 12 +++-
 .../service/panel/PanelLinkService.java       | 24 ++++++-
 .../main/resources/db/migration/V32__1.8.sql  |  3 +
 7 files changed, 160 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkMapping.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkMapping.java
index 7321d46342..0bb0bebfd3 100644
--- a/backend/src/main/java/io/dataease/base/domain/PanelLinkMapping.java
+++ b/backend/src/main/java/io/dataease/base/domain/PanelLinkMapping.java
@@ -11,5 +11,7 @@ public class PanelLinkMapping implements Serializable {
 
     private Long userId;
 
+    private String uuid;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/base/domain/PanelLinkMappingExample.java b/backend/src/main/java/io/dataease/base/domain/PanelLinkMappingExample.java
index a4e98885dc..baa9094e73 100644
--- a/backend/src/main/java/io/dataease/base/domain/PanelLinkMappingExample.java
+++ b/backend/src/main/java/io/dataease/base/domain/PanelLinkMappingExample.java
@@ -293,6 +293,76 @@ public class PanelLinkMappingExample {
             addCriterion("user_id not between", value1, value2, "userId");
             return (Criteria) this;
         }
+
+        public Criteria andUuidIsNull() {
+            addCriterion("uuid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidIsNotNull() {
+            addCriterion("uuid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidEqualTo(String value) {
+            addCriterion("uuid =", value, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidNotEqualTo(String value) {
+            addCriterion("uuid <>", value, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidGreaterThan(String value) {
+            addCriterion("uuid >", value, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidGreaterThanOrEqualTo(String value) {
+            addCriterion("uuid >=", value, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidLessThan(String value) {
+            addCriterion("uuid <", value, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidLessThanOrEqualTo(String value) {
+            addCriterion("uuid <=", value, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidLike(String value) {
+            addCriterion("uuid like", value, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidNotLike(String value) {
+            addCriterion("uuid not like", value, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidIn(List<String> values) {
+            addCriterion("uuid in", values, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidNotIn(List<String> values) {
+            addCriterion("uuid not in", values, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidBetween(String value1, String value2) {
+            addCriterion("uuid between", value1, value2, "uuid");
+            return (Criteria) this;
+        }
+
+        public Criteria andUuidNotBetween(String value1, String value2) {
+            addCriterion("uuid not between", value1, value2, "uuid");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.xml b/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.xml
index 1ec9fe2a52..aa8ee9b55e 100644
--- a/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/PanelLinkMappingMapper.xml
@@ -5,6 +5,7 @@
     <id column="id" jdbcType="BIGINT" property="id" />
     <result column="resource_id" jdbcType="VARCHAR" property="resourceId" />
     <result column="user_id" jdbcType="BIGINT" property="userId" />
+    <result column="uuid" jdbcType="VARCHAR" property="uuid" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -65,7 +66,7 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, resource_id, user_id
+    id, resource_id, user_id, uuid
   </sql>
   <select id="selectByExample" parameterType="io.dataease.base.domain.PanelLinkMappingExample" resultMap="BaseResultMap">
     select
@@ -98,10 +99,10 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.dataease.base.domain.PanelLinkMapping">
-    insert into panel_link_mapping (id, resource_id, user_id
-      )
-    values (#{id,jdbcType=BIGINT}, #{resourceId,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}
-      )
+    insert into panel_link_mapping (id, resource_id, user_id, 
+      uuid)
+    values (#{id,jdbcType=BIGINT}, #{resourceId,jdbcType=VARCHAR}, #{userId,jdbcType=BIGINT}, 
+      #{uuid,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.PanelLinkMapping">
     insert into panel_link_mapping
@@ -115,6 +116,9 @@
       <if test="userId != null">
         user_id,
       </if>
+      <if test="uuid != null">
+        uuid,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -126,6 +130,9 @@
       <if test="userId != null">
         #{userId,jdbcType=BIGINT},
       </if>
+      <if test="uuid != null">
+        #{uuid,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="io.dataease.base.domain.PanelLinkMappingExample" resultType="java.lang.Long">
@@ -146,6 +153,9 @@
       <if test="record.userId != null">
         user_id = #{record.userId,jdbcType=BIGINT},
       </if>
+      <if test="record.uuid != null">
+        uuid = #{record.uuid,jdbcType=VARCHAR},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -155,7 +165,8 @@
     update panel_link_mapping
     set id = #{record.id,jdbcType=BIGINT},
       resource_id = #{record.resourceId,jdbcType=VARCHAR},
-      user_id = #{record.userId,jdbcType=BIGINT}
+      user_id = #{record.userId,jdbcType=BIGINT},
+      uuid = #{record.uuid,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -169,13 +180,17 @@
       <if test="userId != null">
         user_id = #{userId,jdbcType=BIGINT},
       </if>
+      <if test="uuid != null">
+        uuid = #{uuid,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
   <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.PanelLinkMapping">
     update panel_link_mapping
     set resource_id = #{resourceId,jdbcType=VARCHAR},
-      user_id = #{userId,jdbcType=BIGINT}
+      user_id = #{userId,jdbcType=BIGINT},
+      uuid = #{uuid,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/commons/utils/CodingUtil.java b/backend/src/main/java/io/dataease/commons/utils/CodingUtil.java
index ca256b47b7..ec283b549b 100644
--- a/backend/src/main/java/io/dataease/commons/utils/CodingUtil.java
+++ b/backend/src/main/java/io/dataease/commons/utils/CodingUtil.java
@@ -7,6 +7,7 @@ import javax.crypto.*;
 import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import java.security.MessageDigest;
+import java.util.UUID;
 
 /**
  * 加密解密工具
@@ -19,6 +20,13 @@ public class CodingUtil {
 
     private static final char[] HEX_DIGITS = {'0', '1', '2', '3', '4', '5', '6', '7', '8', '9', 'a', 'b', 'c', 'd', 'e', 'f'};
 
+
+    public static String[] chars = new String[] { "a", "b", "c", "d", "e", "f",
+            "g", "h", "i", "j", "k", "l", "m", "n", "o", "p", "q", "r", "s",
+            "t", "u", "v", "w", "x", "y", "z", "0", "1", "2", "3", "4", "5",
+            "6", "7", "8", "9", "A", "B", "C", "D", "E", "F", "G", "H", "I",
+            "J", "K", "L", "M", "N", "O", "P", "Q", "R", "S", "T", "U", "V",
+            "W", "X", "Y", "Z" };
     /**
      * MD5加密
      *
@@ -165,4 +173,26 @@ public class CodingUtil {
         }
 
     }
+
+    public static boolean isNumeric(String str){
+        for (int i = str.length();--i>=0;){
+            if (!Character.isDigit(str.charAt(i))){
+                return false;
+            }
+        }
+        return true;
+    }
+
+
+
+    public static String shortUuid() {
+        StringBuffer shortBuffer = new StringBuffer();
+        String uuid = UUID.randomUUID().toString().replace("-", "");
+        for (int i = 0; i < 8; i++) {
+            String str = uuid.substring(i * 4, i * 4 + 4);
+            int x = Integer.parseInt(str, 16);
+            shortBuffer.append(chars[x % 0x3E]);
+        }
+        return shortBuffer.toString();
+    }
 }
diff --git a/backend/src/main/java/io/dataease/controller/IndexController.java b/backend/src/main/java/io/dataease/controller/IndexController.java
index e9d77d1056..e2c5128d71 100644
--- a/backend/src/main/java/io/dataease/controller/IndexController.java
+++ b/backend/src/main/java/io/dataease/controller/IndexController.java
@@ -3,6 +3,7 @@ package io.dataease.controller;
 import io.dataease.commons.exception.DEException;
 import io.dataease.commons.license.DefaultLicenseService;
 import io.dataease.commons.license.F2CLicenseResponse;
+import io.dataease.commons.utils.CodingUtil;
 import io.dataease.commons.utils.LogUtil;
 import io.dataease.commons.utils.ServletUtils;
 import io.dataease.service.panel.PanelLinkService;
@@ -48,8 +49,13 @@ public class IndexController {
     }
 
     @GetMapping("/link/{index}")
-    public void link(@PathVariable(value = "index", required = true) Long index) {
-        String url = panelLinkService.getUrlByIndex(index);
+    public void link(@PathVariable(value = "index", required = true) String index) {
+        String url;
+        if (CodingUtil.isNumeric(index)) {
+            url = panelLinkService.getUrlByIndex(Long.parseLong(index));
+        }else {
+            url = panelLinkService.getUrlByUuid(index);
+        }
         HttpServletResponse response = ServletUtils.response();
         try {
             response.sendRedirect(url);
@@ -59,6 +65,8 @@ public class IndexController {
         }
     }
 
+
+
     @GetMapping("/tempMobileLink/{id}/{token}")
     public void tempMobileLink(@PathVariable("id") String id, @PathVariable("token") String token) {
         String url = "/#preview/" + id;
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
index 2ec72e2990..fb9f271662 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
@@ -8,7 +8,9 @@ import io.dataease.base.mapper.PanelGroupMapper;
 import io.dataease.base.mapper.PanelLinkMapper;
 import io.dataease.base.mapper.PanelLinkMappingMapper;
 import io.dataease.base.mapper.ext.ExtPanelLinkMapper;
+import io.dataease.commons.exception.DEException;
 import io.dataease.commons.utils.AuthUtils;
+import io.dataease.commons.utils.CodingUtil;
 import io.dataease.commons.utils.ServletUtils;
 import io.dataease.controller.request.panel.link.EnablePwdRequest;
 import io.dataease.controller.request.panel.link.LinkRequest;
@@ -114,7 +116,13 @@ public class PanelLinkService {
             PanelLinkMapping mapping = new PanelLinkMapping();
             mapping.setResourceId(resourceId);
             mapping.setUserId(AuthUtils.getUser().getUserId());
+            mapping.setUuid(CodingUtil.shortUuid());
             panelLinkMappingMapper.insert(mapping);
+        }else {
+            mappings.stream().filter(mapping -> StringUtils.isBlank(mapping.getUuid())).forEach(item -> {
+                item.setUuid(CodingUtil.shortUuid());
+                panelLinkMappingMapper.updateByPrimaryKey(item);
+            });
         }
         return convertDto(one);
     }
@@ -206,7 +214,7 @@ public class PanelLinkService {
         example.createCriteria().andResourceIdEqualTo(resourceId).andUserIdEqualTo(AuthUtils.getUser().getUserId());
         List<PanelLinkMapping> mappings = panelLinkMappingMapper.selectByExample(example);
         PanelLinkMapping mapping = mappings.get(0);
-        return SHORT_URL_PREFIX + mapping.getId();
+        return SHORT_URL_PREFIX + mapping.getUuid();
     }
 
     public String getUrlByIndex(Long index) {
@@ -216,4 +224,18 @@ public class PanelLinkService {
         PanelLink one = findOne(resourceId, userId);
         return convertDto(one).getUri();
     }
+
+    public String getUrlByUuid(String uuid) {
+        PanelLinkMappingExample example = new PanelLinkMappingExample();
+        example.createCriteria().andUuidEqualTo(uuid);
+        List<PanelLinkMapping> mappings = panelLinkMappingMapper.selectByExample(example);
+        if (CollectionUtils.isEmpty(mappings)) {
+            DEException.throwException("link is not exist");
+        }
+        PanelLinkMapping mapping = mappings.get(0);
+        String resourceId = mapping.getResourceId();
+        Long userId = mapping.getUserId();
+        PanelLink one = findOne(resourceId, userId);
+        return convertDto(one).getUri();
+    }
 }
diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
index a5615ccf45..8f57f6b9cd 100644
--- a/backend/src/main/resources/db/migration/V32__1.8.sql
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -197,3 +197,6 @@ SELECT
 						`plugin_sys_menu`.`i_frame` <> 1
 					)
 	OR isnull( `plugin_sys_menu`.`i_frame` ));
+
+ALTER TABLE `panel_link_mapping`
+ADD COLUMN `uuid` varchar(8) NULL COMMENT 'uuid' AFTER `user_id`;

From b449734df5f03b7d435ed91b9b9380ce3f75534d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 15 Feb 2022 11:56:38 +0800
Subject: [PATCH 29/47] =?UTF-8?q?refactor:=20=E4=BC=98=E5=8C=96=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=BD=92=E5=B1=9E=E4=BA=8E=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD=EF=BC=8C=E6=9B=B4=E6=96=B0flyway=E5=92=8C?=
 =?UTF-8?q?=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/dto/authModel/VAuthModelDTO.java |   2 +-
 .../service/panel/PanelGroupService.java      |   2 +-
 .../main/resources/db/migration/V32__1.8.sql  | 112 ++++++++++++++++++
 .../resources/i18n/messages_en_US.properties  |   2 +-
 .../resources/i18n/messages_zh_CN.properties  |   2 +-
 .../resources/i18n/messages_zh_TW.properties  |   2 +-
 frontend/src/views/chart/group/Group.vue      |  14 ---
 frontend/src/views/panel/edit/index.vue       |   7 +-
 8 files changed, 119 insertions(+), 24 deletions(-)

diff --git a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
index 53b4bf5135..fd1ddc516c 100644
--- a/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
+++ b/backend/src/main/java/io/dataease/dto/authModel/VAuthModelDTO.java
@@ -23,7 +23,7 @@ public class VAuthModelDTO extends VAuthModelWithBLOBs  implements ITreeBase<VAu
     private String innerId;
 
     public String toString(){
-        return this.getId();
+        return this.getName();
     }
 
 }
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index a21b6c4551..bba789b07a 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -244,7 +244,7 @@ public class PanelGroupService {
             if(CollectionUtils.isNotEmpty(viewResult)){
                 result.addAll(viewResult);
             }
-            result = TreeUtils.mergeTree(panelResult,"panel_list");
+            result = TreeUtils.mergeTree(result,"panel_list");
             // 原有视图的目录结构
             List<VAuthModelDTO> viewOriginal = extVAuthModelMapper.queryAuthViewsOriginal(viewRequest);
             if(CollectionUtils.isNotEmpty(viewOriginal) && viewOriginal.size()>1){
diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
index a5615ccf45..bbe4ecdcf8 100644
--- a/backend/src/main/resources/db/migration/V32__1.8.sql
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -197,3 +197,115 @@ SELECT
 						`plugin_sys_menu`.`i_frame` <> 1
 					)
 	OR isnull( `plugin_sys_menu`.`i_frame` ));
+
+
+
+delete from panel_view where id in (
+'5dafcf9b-8e0a-11ec-8e4b-0242ac130002',
+'5dafd1d1-8e0a-11ec-8e4b-0242ac130002',
+'5dafd224-8e0a-11ec-8e4b-0242ac130002',
+'5dafd26e-8e0a-11ec-8e4b-0242ac130002',
+'5dafd2ac-8e0a-11ec-8e4b-0242ac130002',
+'5dafd2f1-8e0a-11ec-8e4b-0242ac130002',
+'5dafd32e-8e0a-11ec-8e4b-0242ac130002',
+'5dafd363-8e0a-11ec-8e4b-0242ac130002',
+'6c200051-8e0a-11ec-8e4b-0242ac130002',
+'6c2002c2-8e0a-11ec-8e4b-0242ac130002',
+'6c20030f-8e0a-11ec-8e4b-0242ac130002',
+'6c2003ca-8e0a-11ec-8e4b-0242ac130002',
+'6c20040d-8e0a-11ec-8e4b-0242ac130002',
+'6c200442-8e0a-11ec-8e4b-0242ac130002',
+'6c200478-8e0a-11ec-8e4b-0242ac130002',
+'6c2004a9-8e0a-11ec-8e4b-0242ac130002',
+'6c2004e4-8e0a-11ec-8e4b-0242ac130002',
+'6c200530-8e0a-11ec-8e4b-0242ac130002',
+'6c200568-8e0a-11ec-8e4b-0242ac130002',
+'6c200598-8e0a-11ec-8e4b-0242ac130002',
+'7611e439-8e0a-11ec-8e4b-0242ac130002',
+'7611e678-8e0a-11ec-8e4b-0242ac130002',
+'7611e6c4-8e0a-11ec-8e4b-0242ac130002',
+'7611e700-8e0a-11ec-8e4b-0242ac130002',
+'7611e7d0-8e0a-11ec-8e4b-0242ac130002',
+'7611e80a-8e0a-11ec-8e4b-0242ac130002',
+'7611e844-8e0a-11ec-8e4b-0242ac130002',
+'7611e87d-8e0a-11ec-8e4b-0242ac130002',
+'7611e8b5-8e0a-11ec-8e4b-0242ac130002',
+'7611e8ed-8e0a-11ec-8e4b-0242ac130002',
+'7611e923-8e0a-11ec-8e4b-0242ac130002',
+'7611e957-8e0a-11ec-8e4b-0242ac130002',
+'7611e98f-8e0a-11ec-8e4b-0242ac130002',
+'7611e9c9-8e0a-11ec-8e4b-0242ac130002',
+'7611ea05-8e0a-11ec-8e4b-0242ac130002',
+'7611ea46-8e0a-11ec-8e4b-0242ac130002',
+'805b082d-8e0a-11ec-8e4b-0242ac130002',
+'805b0a85-8e0a-11ec-8e4b-0242ac130002',
+'805b0abb-8e0a-11ec-8e4b-0242ac130002',
+'805b0ae0-8e0a-11ec-8e4b-0242ac130002',
+'805b0b0f-8e0a-11ec-8e4b-0242ac130002',
+'805b0b2d-8e0a-11ec-8e4b-0242ac130002',
+'805b0bdb-8e0a-11ec-8e4b-0242ac130002',
+'805b0cc1-8e0a-11ec-8e4b-0242ac130002',
+'805b0cf8-8e0a-11ec-8e4b-0242ac130002',
+'805b0d31-8e0a-11ec-8e4b-0242ac130002'
+);
+
+INSERT INTO `panel_view` VALUES ('5dafcf9b-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', '84b444e1-0088-44f9-acdc-cc39018413bc', NULL, NULL, NULL, NULL, NULL), ('5dafd1d1-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'c68db172-2df2-4aa2-aad6-077cf1684e14', NULL, NULL, NULL, NULL, NULL), ('5dafd224-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'f8d62b2b-b99a-4b6c-8378-d7c2ec4ea766', NULL, NULL, NULL, NULL, NULL), ('5dafd26e-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'c4943403-4960-4ad8-a9c5-12c46c538c34', NULL, NULL, NULL, NULL, NULL), ('5dafd2ac-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'f257452d-6fc1-4499-bdce-bd10b3e1c520', NULL, NULL, NULL, NULL, NULL), ('5dafd2f1-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', '8271c4e4-43ab-48c6-b7b4-67ccaba3f80b', NULL, NULL, NULL, NULL, NULL), ('5dafd32e-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'a0058881-b29f-4b5c-911f-7f1480b07eb0', NULL, NULL, NULL, NULL, NULL), ('5dafd363-8e0a-11ec-8e4b-0242ac130002', '117f679e-8355-4645-a692-47e2009cbc0d', 'c36cd358-0501-4f83-a323-f754485d00b1', NULL, NULL, NULL, NULL, NULL), ('6c200051-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '95f8e3a2-62a5-48a7-a719-fcf53746da8d', NULL, NULL, NULL, NULL, NULL), ('6c2002c2-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '8a26a936-89bf-45a8-b1ce-d5ef1719465d', NULL, NULL, NULL, NULL, NULL), ('6c20030f-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '8d1c3f30-0639-452e-9883-164f37353324', NULL, NULL, NULL, NULL, NULL), ('6c2003ca-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '175b25df-1939-4582-a9c5-d9e8ed3ea2b1', NULL, NULL, NULL, NULL, NULL), ('6c20040d-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', 'c3da496f-073c-413a-bebd-e7f1a4a00ba7', NULL, NULL, NULL, NULL, NULL), ('6c200442-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', 'da18eecd-feff-4140-a291-cce4abf1afaa', NULL, NULL, NULL, NULL, NULL), ('6c200478-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '3f201733-bbb3-485e-a1d6-0fe4f00b5304', NULL, NULL, NULL, NULL, NULL), ('6c2004a9-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '692d5bdc-aa70-4fce-b830-b8d6620539c6', NULL, NULL, NULL, NULL, NULL), ('6c2004e4-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', 'aff5be0c-f195-4fce-bd2b-b8d0e63764de', NULL, NULL, NULL, NULL, NULL), ('6c200530-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', 'cb66836d-a34c-40c6-87e7-0db0375ec19e', NULL, NULL, NULL, NULL, NULL), ('6c200568-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '1d06e2a0-d936-4192-b523-2eb1e8cebd51', NULL, NULL, NULL, NULL, NULL), ('6c200598-8e0a-11ec-8e4b-0242ac130002', 'c8d4c4b4-2293-417f-b76d-3632cc217bb1', '0de1d446-8300-4ab3-a4ef-4e8f8579cb2e', NULL, NULL, NULL, NULL, NULL), ('7611e439-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', 'ebac2821-d1a0-4f26-b5d9-cd5c60ac75ab', NULL, NULL, NULL, NULL, NULL), ('7611e678-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '5ad64afc-132c-40ea-8f69-2f8bfe6b31d4', NULL, NULL, NULL, NULL, NULL), ('7611e6c4-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '4242cbb0-fca4-4b27-b2a7-ca576a18815e', NULL, NULL, NULL, NULL, NULL), ('7611e700-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', 'c52b6d95-b404-4130-8635-5903cb8d0e84', NULL, NULL, NULL, NULL, NULL), ('7611e7d0-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '2e6f8b45-116d-46c4-a287-f3054e798556', NULL, NULL, NULL, NULL, NULL), ('7611e80a-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '504c0abd-7d31-4771-8ef9-a3494c7bb33c', NULL, NULL, NULL, NULL, NULL), ('7611e844-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '02136575-effb-4a0c-b5be-9886d20259b3', NULL, NULL, NULL, NULL, NULL), ('7611e87d-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '8412d80d-1830-4128-bc6a-019cf32afc7f', NULL, NULL, NULL, NULL, NULL), ('7611e8b5-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '0f9cd623-f319-4bb5-9751-7478abee3bd2', NULL, NULL, NULL, NULL, NULL), ('7611e8ed-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', 'a1d7bfef-f20c-4739-bfe4-cc55ed0b3fc8', NULL, NULL, NULL, NULL, NULL), ('7611e923-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '68fc74f2-1790-427a-ac22-49fb20edbe9a', NULL, NULL, NULL, NULL, NULL), ('7611e957-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '97400660-27a5-4502-a7cd-274190953a6c', NULL, NULL, NULL, NULL, NULL), ('7611e98f-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '07ece816-f983-493e-b25d-7bfb467d787d', NULL, NULL, NULL, NULL, NULL), ('7611e9c9-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', 'c124c0f3-3f1f-4635-bac7-f3e1f5503099', NULL, NULL, NULL, NULL, NULL), ('7611ea05-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '984059ca-3f9d-4ee4-9616-e409dd11991e', NULL, NULL, NULL, NULL, NULL), ('7611ea46-8e0a-11ec-8e4b-0242ac130002', 'd2bda4c3-3c25-40c6-bed3-994ffe2949df', '2de7c3d3-e642-4509-aff1-b2520ebfe85e', NULL, NULL, NULL, NULL, NULL), ('805b082d-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '3a5e4081-4cd5-427f-bd3a-ff7815efaf25', NULL, NULL, NULL, NULL, NULL), ('805b0a85-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '57760693-15db-4de9-9170-55ee7d1eb0eb', NULL, NULL, NULL, NULL, NULL), ('805b0abb-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '0d8bc9d7-b76b-4ec5-96e7-0df1c3426205', NULL, NULL, NULL, NULL, NULL), ('805b0ae0-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '03410ec1-1bd0-4afd-ac37-9306e00e328c', NULL, NULL, NULL, NULL, NULL), ('805b0b0f-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', 'eaa8947b-d9e7-4ca4-ba65-08965dfa620c', NULL, NULL, NULL, NULL, NULL), ('805b0b2d-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '93a58625-3730-4a07-99bd-75f174ff428d', NULL, NULL, NULL, NULL, NULL), ('805b0bdb-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '2f9bf4d5-b1d3-4cac-9df2-2c8827d65bbf', NULL, NULL, NULL, NULL, NULL), ('805b0cc1-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '1aad98e5-3f99-4c0a-aa75-ca9236de0f09', NULL, NULL, NULL, NULL, NULL), ('805b0cf8-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '5f694f25-b0fd-45f6-acbd-9dd338e196ce', NULL, NULL, NULL, NULL, NULL), ('805b0d31-8e0a-11ec-8e4b-0242ac130002', 'ceb6cd6c-531e-4a23-a467-caa5ef7218cc', '9ecb6827-f47f-4b19-b788-81a6b55940af', NULL, NULL, NULL, NULL, NULL);
+
+update chart_view set chart_type ='private'
+where id in (
+'84b444e1-0088-44f9-acdc-cc39018413bc',
+'c68db172-2df2-4aa2-aad6-077cf1684e14',
+'f8d62b2b-b99a-4b6c-8378-d7c2ec4ea766',
+'c4943403-4960-4ad8-a9c5-12c46c538c34',
+'f257452d-6fc1-4499-bdce-bd10b3e1c520',
+'8271c4e4-43ab-48c6-b7b4-67ccaba3f80b',
+'a0058881-b29f-4b5c-911f-7f1480b07eb0',
+'c36cd358-0501-4f83-a323-f754485d00b1',
+'95f8e3a2-62a5-48a7-a719-fcf53746da8d',
+'8a26a936-89bf-45a8-b1ce-d5ef1719465d',
+'8d1c3f30-0639-452e-9883-164f37353324',
+'175b25df-1939-4582-a9c5-d9e8ed3ea2b1',
+'c3da496f-073c-413a-bebd-e7f1a4a00ba7',
+'da18eecd-feff-4140-a291-cce4abf1afaa',
+'3f201733-bbb3-485e-a1d6-0fe4f00b5304',
+'692d5bdc-aa70-4fce-b830-b8d6620539c6',
+'aff5be0c-f195-4fce-bd2b-b8d0e63764de',
+'cb66836d-a34c-40c6-87e7-0db0375ec19e',
+'1d06e2a0-d936-4192-b523-2eb1e8cebd51',
+'0de1d446-8300-4ab3-a4ef-4e8f8579cb2e',
+'ebac2821-d1a0-4f26-b5d9-cd5c60ac75ab',
+'5ad64afc-132c-40ea-8f69-2f8bfe6b31d4',
+'4242cbb0-fca4-4b27-b2a7-ca576a18815e',
+'c52b6d95-b404-4130-8635-5903cb8d0e84',
+'2e6f8b45-116d-46c4-a287-f3054e798556',
+'504c0abd-7d31-4771-8ef9-a3494c7bb33c',
+'02136575-effb-4a0c-b5be-9886d20259b3',
+'8412d80d-1830-4128-bc6a-019cf32afc7f',
+'0f9cd623-f319-4bb5-9751-7478abee3bd2',
+'a1d7bfef-f20c-4739-bfe4-cc55ed0b3fc8',
+'68fc74f2-1790-427a-ac22-49fb20edbe9a',
+'97400660-27a5-4502-a7cd-274190953a6c',
+'07ece816-f983-493e-b25d-7bfb467d787d',
+'c124c0f3-3f1f-4635-bac7-f3e1f5503099',
+'984059ca-3f9d-4ee4-9616-e409dd11991e',
+'2de7c3d3-e642-4509-aff1-b2520ebfe85e',
+'3a5e4081-4cd5-427f-bd3a-ff7815efaf25',
+'57760693-15db-4de9-9170-55ee7d1eb0eb',
+'0d8bc9d7-b76b-4ec5-96e7-0df1c3426205',
+'03410ec1-1bd0-4afd-ac37-9306e00e328c',
+'eaa8947b-d9e7-4ca4-ba65-08965dfa620c',
+'93a58625-3730-4a07-99bd-75f174ff428d',
+'2f9bf4d5-b1d3-4cac-9df2-2c8827d65bbf',
+'1aad98e5-3f99-4c0a-aa75-ca9236de0f09',
+'5f694f25-b0fd-45f6-acbd-9dd338e196ce',
+'9ecb6827-f47f-4b19-b788-81a6b55940af'
+);
+
+delete from chart_group where id in (
+'2c200620-f2f3-4224-a41d-381fa061591b',
+'3f551269-d985-4633-884d-d118704da2db',
+'4de97755-5d5a-4fe0-9af0-27601f967787',
+'5a8e8b0a-2f64-4d1b-aac1-d284b2b8436f',
+'bc7542d8-2b7e-4909-81ff-3627b0227501',
+'bfa7d87f-c76f-4406-9f19-0adccb7c568d'
+)
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index 02915a79c1..db35d7a38e 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -119,4 +119,4 @@ i18n_cp_exist=Column permission of the same type already exists
 connection_failed=Connection Failed
 theme_name_repeat=name of theme has been existed
 theme_name_empty=name can not be empty
-i18n_public_chart= Public Chart
+i18n_public_chart=【Public Chart】
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index c8702d818b..a44472bba1 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -118,4 +118,4 @@ i18n_cp_exist=已有同类型的列权限存在
 connection_failed=连接失败
 theme_name_repeat=名称已存在
 theme_name_empty=名称不能为空
-i18n_public_chart= 存量视图
+i18n_public_chart=【存量视图】
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 1f8e756ea5..11914ecbda 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -119,4 +119,4 @@ i18n_cp_exist=已有同類型的列權限存在
 connection_failed=連接失敗
 theme_name_repeat=名稱已存在
 theme_name_empty=名稱不能為空
-i18n_public_chart= 存量视图
+i18n_public_chart=【存量视图】
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 6438a0b6c8..6207b3e8a0 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -188,20 +188,6 @@
               <el-input v-model="chartName" style="height: 34px" size="mini" />
             </el-form-item>
           </el-col>
-          <el-col v-if="optFrom==='panel'" :span="12">
-            <el-form-item :label="$t('chart.belong_group')">
-              <treeselect
-                v-model="currGroup.id"
-                :clearable="false"
-                :options="chartGroupTreeAvailable"
-                :normalizer="normalizer"
-                :placeholder="$t('chart.select_group')"
-                :no-children-text="$t('commons.treeselect.no_children_text')"
-                :no-options-text="$t('commons.treeselect.no_options_text')"
-                :no-results-text="$t('commons.treeselect.no_results_text')"
-              />
-            </el-form-item>
-          </el-col>
         </el-form>
       </el-row>
 
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 7d25ec253f..bba738616c 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -801,12 +801,9 @@ export default {
       }
     },
     newChart() {
-      this.adviceGroupId = null
+      this.adviceGroupId = this.panelInfo.id
       this.show = false
-      searchAdviceSceneId(this.panelInfo.id).then(res => {
-        this.adviceGroupId = res.data
-        this.$refs['chartGroup'].selectTable()
-      })
+      this.$refs['chartGroup'].selectTable()
     },
     newViewInfo(newViewInfo) {
       let component

From dada0b9f8d22f0c2097b8b887dbe94af38bbee73 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 12:35:17 +0800
Subject: [PATCH 30/47] =?UTF-8?q?feat:=20=E5=88=86=E4=BA=AB=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E5=90=8D=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
index d21efce40f..42870d2106 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelShareMapper.xml
@@ -34,9 +34,10 @@
     </delete>
 
     <select id="query" resultMap="treeNodeMap">
-        select distinct s.panel_group_id as id, IFNULL(s.granter,g.create_by) as creator, g.name
+        select distinct s.panel_group_id as id, u.nick_name as creator, g.name
         from panel_share s
         left join panel_group g on g.id = s.panel_group_id
+        left join sys_user u on u.username = IFNULL(s.granter,g.create_by)
         where
         ( s.target_id = #{userId} and s.type = 0 ) or
         ( s.target_id = #{deptId} and s.type = 2 ) or

From 05ac9999c52fedbdbc7a208fe49f3c24cc5bde52 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 14:19:02 +0800
Subject: [PATCH 31/47] =?UTF-8?q?refactor:=20=E5=9F=BA=E7=A1=80=E6=99=AF?=
 =?UTF-8?q?=E8=B1=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 5f284057f1..343a08d346 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,18 +2,18 @@ FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre:
 
 RUN echo -e 'http://mirrors.aliyun.com/alpine/edge/main/\nhttp://mirrors.aliyun.com/alpine/edge/community/' > /etc/apk/repositories 
 
-RUN apk add chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
+#RUN apk add chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
 
-RUN mkdir -p /usr/local/sbin/ \
-    && cp /usr/bin/chromedriver /usr/local/sbin/ \
-    && chmod a+x /usr/local/sbin/chromedriver
+#RUN mkdir -p /usr/local/sbin/ \
+#    && cp /usr/bin/chromedriver /usr/local/sbin/ \
+#    && chmod a+x /usr/local/sbin/chromedriver
 
 ADD simsun.ttc /usr/share/fonts/
 
-RUN cd /usr/share/fonts/ \
-    && mkfontscale \
-    && mkfontdir \
-    && fc-cache -fv
+#RUN cd /usr/share/fonts/ \
+#    && mkfontscale \
+#    && mkfontdir \
+#    && fc-cache -fv
 
 ARG IMAGE_TAG
 

From 6da93cdcda026aed438d465e91d415f30b13dcb9 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 15 Feb 2022 14:46:25 +0800
Subject: [PATCH 32/47] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0flyway?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/db/migration/V32__1.8.sql | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
index 725be3d641..2e33e1ab09 100644
--- a/backend/src/main/resources/db/migration/V32__1.8.sql
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -308,7 +308,7 @@ delete from chart_group where id in (
 '5a8e8b0a-2f64-4d1b-aac1-d284b2b8436f',
 'bc7542d8-2b7e-4909-81ff-3627b0227501',
 'bfa7d87f-c76f-4406-9f19-0adccb7c568d'
-)
+);
 
 ALTER TABLE `panel_link_mapping`
 ADD COLUMN `uuid` varchar(8) NULL COMMENT 'uuid' AFTER `user_id`;

From 2aa80670a5f2bc8783f35d1290a8b9d09b525241 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 15:14:23 +0800
Subject: [PATCH 33/47] =?UTF-8?q?feat:=20=E7=A7=BB=E5=8A=A8=E7=AB=AF?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E9=A2=9C=E8=89=B2=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/src/pages.json             |   6 +++---
 mobile/src/static/dir_select.png  | Bin 0 -> 9103 bytes
 mobile/src/static/home_select.png | Bin 0 -> 7215 bytes
 mobile/src/static/me.png          | Bin 6958 -> 4051 bytes
 mobile/src/static/me_select.png   | Bin 0 -> 11764 bytes
 5 files changed, 3 insertions(+), 3 deletions(-)
 create mode 100644 mobile/src/static/dir_select.png
 create mode 100644 mobile/src/static/home_select.png
 create mode 100644 mobile/src/static/me_select.png

diff --git a/mobile/src/pages.json b/mobile/src/pages.json
index 247f83315a..1e6be356ac 100644
--- a/mobile/src/pages.json
+++ b/mobile/src/pages.json
@@ -173,18 +173,18 @@
 		"list": [{
 				"pagePath": "pages/tabBar/home/index",
 				"iconPath": "static/home.png",
-				"selectedIconPath": "static/home.png",
+				"selectedIconPath": "static/home_select.png",
 				"text": "%navigate.menuHome%"
 			},
 			{
 				"pagePath": "pages/tabBar/dir/index",
 				"iconPath": "static/dir.png",
-				"selectedIconPath": "static/dir.png",
+				"selectedIconPath": "static/dir_select.png",
 				"text": "%navigate.menuDir%"
 			}, {
 				"pagePath": "pages/tabBar/me/index",
 				"iconPath": "static/me.png",
-				"selectedIconPath": "static/me.png",
+				"selectedIconPath": "static/me_select.png",
 				"text": "%navigate.menuMe%"
 			}
 		]
diff --git a/mobile/src/static/dir_select.png b/mobile/src/static/dir_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..58c000c055cd2e3d7bf06911c811d6bfe4ac8f7b
GIT binary patch
literal 9103
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
Ilx!pa3o!H6JOBUy

literal 0
HcmV?d00001

diff --git a/mobile/src/static/home_select.png b/mobile/src/static/home_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..6de418970662c91fbc1de6da1b43fd8c9d0069bc
GIT binary patch
literal 7215
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
T7foIfL<016jG<Lp4iWzW1YSeA

literal 0
HcmV?d00001

diff --git a/mobile/src/static/me.png b/mobile/src/static/me.png
index 267d53768802003baa5d5d62c19e5724fbb1f4f6..f69ffae73e55599ef9bfeb410b1f046843096ce1 100644
GIT binary patch
literal 4051
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
DNp%?v

literal 6958
zcmb_>_g7Qh^YsOzbV(>mCxjXSK{^UZFtk8GgTg}*1wsb}X@WFkAs~j{i;4+|H0f19
zL5hann?b5d2Wis2*U$Seygwv&t+QsGxik07%-;J%UN_NaW9DN90D#TV0F48m9shoe
zXTblW|BAE02b~X2Uk51e7Wf4Kd_N7*sGARMS8lV^2;7P*{@qB&L67KDz9BTze(edP
zM|kX&kiTb{)_Eb2Ir^w&d#K;k_Lr9X0k?F}Q&Zv7r-Ti13d1$%nIk!_+IFv8_9=mh
z68Tct3c?LIxY0tL_V)r-EXJ5@?Q?|{2NVbLOhahFs<mc|neUsr!%VMs=j(j1hkamF
z(gkEy&e6Tl_JPQtmX|*;w!-f++2=**HgmLggUjxWqugZWNsoefa2*$~ZLMm3t(oKh
z`$~U{Hak0e{nBvJL{eIS-NJ22Y<k6u)bhZs1!vd>FFM%2Et<DS#=1&o`Ar%{Xq-cA
zalI!~-6vuyfOd2po%w`#aA`{jfWOkDn@&PToM-}vX8<An*7meOS;ZL5?Lo8M63g<1
z9^}CXH(4-}etH)}Y%uMrN>q*mYy%3s1DZ_?J*^Ip!{}ajQ`yx>KF&}`K-FlB=P-oM
zDE2J&<(oHe)NgQQ0YLkyW|ZJ>6?fIEr^44RlgjP!c)X0eL&3=i<9~z-b!m;BE8o2{
zcje1t-`<D7EYLUpC>L!99JIZo=d)+(x9|O%#4}On5ZP}Z&fg`2QkYphIDSJtyaA|*
zIt<tr(1^qrPvA98BhR^9gN<Sn`_h%&hZ8#!B*VC1a*%K&GGjYqT+gY|cOV!0!lK0X
zV<|0qN&k@y3Wxr(do-K6Zw7d|FmEH?O~w#~*$LAm1kZ#KzbuNQcUNQ09&I!F2Cm5h
zZ2GziDwYHYIA<O51H<2X+D=5Ga(Kb?{n|7;jv-nfvjIN9-ES;k{GX+rcP)~;S1p_{
zVNFnqEM7ZcxU|)Ds@dDqB%Du?)<xYNT-p|{8XHMoNW#n;pfe+g`lqxjyR_D{Tf@#0
zw1r^SV`sn&t{5}*Y`rHwWCND7{MzKV&Y%y^0?{?a)&)auWtZn9hTQyuc%JLTi#TcV
z!tM-xz8j;kHD<MB#p3z$o;_0;_96dV4L>j$9hXu)Zt>ji;r!2^Ki~3B_@hI-yu9v@
z_?<8Ta|zokAstkG>-YvGu4Fjpx=ZXVgDiDe99Y*y1bui`C3rt4F^Cfg27vEbl|D{d
zU*qTG-dPfqK3vCiLBj9gGp~PxZhVC^5~5e?a#jx-d#GjUtj+@K+6b$J(wA|+li@%w
zz51N%AU&dv!dR|@^t%8AYt9bH8F2tonkc@x8a80ZNPWz4V!xjFGduBb$eY~6bOwOt
z;!$quFkl6!<u6Mc<})dT9Ult5dbFxuE3(^9<pCb{`b`B^TCK1nw+}EyRz-~n)@veF
zlW)l|O~2oRZ!L;#_I3CiIsGtLC}q%@Zn`1yv7ktfKTVx1aN&+JB~hbW5TpKe9_<^7
zxjj3GF@n-|O`R9`&GZIq4CCixP9d^kkWW}-sRE`b5t46S@aU<X8a+^A1nXLg{F#OP
z!<?6sSa%laHn!U<u^AD3KjapZ*Q<=7BtkYc))dgjK4a@Fh@iJOV6-+~%3u%ObhDUn
z+J3p!5=;Ca<AX+D2rnPsWsNArn0)G9?xf$8CibLY>_6;$r%n7*(kzvim$z2Vu#dcE
zqz~=cD%Nie5IY^0W;$q9V$iSn<5AC+iFWI}VWa$3b;Ypj#m@M;3)Ec-f+&!XB>E1S
z;{$`;j@Rko;ie2q0@DeGXFJCZ6taBe_)+(CTg_%99z&%V37iQMQIWKR#wHEqK14Ch
z+Wkm{^N5yhN)a&_e@VQ-C1_DHVv+1fZ~Uhmmro54klaYLOH)xwj)b2?62nsDH|~q%
z6!ITL&&1>0c!7@ZMY*4;v_Y$rk2grF-nm?m{F@gd)JX|@e{@ZLokn@x=cT7n^=Z3{
zUw^fWvF1o!Zm=ymQ8O(0NlPKXvlnI2t>p5N5m=w4F1w55vIXWg3s5SjpSEvbw4GxT
zJ<=1BNPuII>MUAUek?R_Kt8!#Whk(&+HbttLEV13VGiqyn<~q<nB_4A^W`LJ?@<PE
zvVC9K9sIZ00=3ju1A0KU`f#l3lE57Pey;hE?=36D(0F22t@|~0=dd3+YS1QFpOY-&
z8M^`52nmZ$o4t5iND`4hWar2aNyL?%)^$tsu)sTl^||TGE3L;#1`nMIYs(!;^nG4f
zmXpWR2`^)$pHF|F|A^miK6oA~E*alZRZfRv^2_<#jb{m7La^I?BR77>d1LZpfaZCo
zmTwylogz-;R1>KB6In6W3)EoZ@ZUT=y=rV8*b#YP!UjJV_z*!B8P~QweFm5iDHbI!
zQMB)2V#ZzM11RwDDRJl51n>7;yEYCoE`NDOty__4Z&Di_X-%7Gt?BJb!qMo%tJ~FK
zx_!mlLAP-typnAkty>L8u#GoQzZLjY49ClT#c)D2daT2VMx0(6+U`d*34)6PN{r6W
zgRie_S<=mUCU>meX>-*!foanpo%roZE`j*yG%9wX#`TI%VXtQhjh2umZ1f-M`<u$f
zH@zg4OW*N?%ot+Im(weqlCLJcyV8}zR4#qU+H_r@rd=`4P?1&f7ErwNx-wb7p)Il$
zasv}`1~?X%un!Z<nR@xc<?LA`C7V7xrQP@FKKf6II_uQdMXW@}c|LI<{qdm@B0hT6
zoCA6tW0<?E+WOA$R|I=HBe@e2muKcJ_rVSAn;3~&sW8PL14m&g{@eWMiq`|PJJ-S_
zIK^Cr`>^Pn6;_LyX^I%6VP8-Xb-HcUSuq*jxJLU#-O4!44QqlzK1Bp6%rdLITRV8=
zypWr6omiv5NbrA=wIhC^jRTDocVr_==qc{A!a@q=-u64|At_pHfVb+8U1;3RNo5mb
ziH;QjnnL^Sh6sxBhIM@sp$v`y)03&iDV%-QK0I}cxB33Hn-b@Rnh^79SYM}Rj5ZxB
z7?9;sg8fB{CT_^%IHciAaf7I)pttCo$mYZ4+DPzyr{#GZh@}OkV60EH9!%$@6^iE^
zJ<>X0z8j9is36*gyc!6^e)HcK!rQ|x_2CHy2q(jiN#ksZoSN#EXUzEQwhNSFMxg#n
zv^Nv%c48je$KMm6Rmi$r8(qEkY@47tI2vm$rqA0=T9!Lu(-j;s{h^iY(7q(yb;*L4
z5}as-*!JN|!otEd2M>?sYD<)K!ZC;^Y!&6@V{Znn+(gt3p>3kY4bmG-?0AGOU%s5~
zyD;8blegpQ<+TnS@mq^=zx%-Uk^@t`#5}v=tDMSY{Z#XG_;ld+PU7B*TDY;vk%J8C
zc|=6Oe@&qw{p!!<T#M#yzhHa_Hj%^=9){jOzXk$qsyr<FLogzjRFdHwY?MJaU~eL|
zLj#R2k;Bi`;VW>zn}F%?)E}Wb=<+(e$w<VdEcgq$>Cb96VcsWj#$kWKeR|fP2gjk*
z%*5y)IK*EUx=GhgG+12+Pwp9MFW4Zg`Z<E0tKu+*Z3hLMlNymkJS`*6UJ3Pn==UFa
z))8@Z_qlFY`s?XBmy4IW-wnAfy~HyBJlNQ_5F&X!=9_k7HqrJJ5SNd-*C(fs6kj9e
zwpR#?=G16f$)26M+VxdCmR!yX)$N-M`Y4oftsqQiSkUM~($^cLS+OB^rDJ0(FC!u%
zcW(Wr8Pe$EN14G*4Y|^FC?J4EN1nb~9zAitu8ouIowh9v5RE<@N+}AzuS~`UQqK2m
z*^-ExJHcx_@}XFCiK1X(85Et}+Byu!FKkr~8&=92zhbvO+|pRnKpSHq)lZ2tCcJ!)
zZy_0H0&VU2aKPRem|*tXV1ixHcxzw#hYv?@H-&yI6k-s!N#@JA=bJ;Lzzsx0ay>B7
zMxhcliN{$6Uju}jf;T%Q*^$@AhjCD{w=lv|eJ;{Gb1<^QeIup>)|H6k1L8@DuxO%K
zWx)oHkDyeRXp~<$YW9@)FbE2X_bv9FIXHHu2AdIP!_ciyzQuDlDM8|1ONwi|8%M8k
z-WYi5BT=r0tmFW`3oJT}ajYgqfs<ft>_8Oo;*|KLj)Eq>-%MOPU`bW4isu44PDP6n
ze@aT6ypfv1{zXTa6(dY*im#NI7j&B6pQV6ZTZ{Et;E!Fm`k)4`$G9T+Ob`X9-t3)u
z3s^6Enij?aW8?23om^EdX9Y~K>)WO`xVnl*mP-AEu`LC@kT@W>L%CkLdlA;hoqIYY
z=PCx-DVV%)I)CG!xa#~Oj)NSRf6ae?HA#LSY#)JE?v~!soc~5rj*Zny=Jce)?Ck6l
zM=D^3At+_Ld`wAeN>^G++rL<}U1}Jld-#2;;R<XcRcr#b5rTr+B$1tGb}8Zpvp6FY
zehDXW=LKD>r5D(A02#0p^{pCAPV10_oxNOX73#HjBn)Uii=_87KDMOX#C@MB@;XdQ
z3o(<sWY#))$ob3=j^8t4Chl#+8M_UCm%nP-4GBXk=DnA6nfaQgtU_sQ9cNC){k{ws
zSkq?ANBnw<hunG`PuHjX1%aj;&+`!=oQ%hcj&Sx}8IVdZbYMa-3@=j0Lhjz3J`1E~
zDU1fx7atT`6(uK@t2hSizrR&5r1@F?@OdU+tls~AV`F2st*wo$6_o#lgA6-vJ0iy7
zca;?BVPP6tTA}xv7I%^+>rS0IWudrb=XyvVo|n2`qd*HVZtdj2)AJ$O&9SYfq@T8f
zCHW^wxOnqhzscm{CkV%-ieXi<Si*)|GJN9c=vKoPY@<vjPQNunu-$T0?ol=V{w*%u
z7peOdGNJNYr>&OAZ>ucpWEzUaJN$K0=R1d=F2ujSCjt|9L{R<ur6_Zmdk7#k&Jljl
z>UQ7)0^KxS*?4qN{jlHE3%AN~QA-Jz`ns17*dM6-nGZM0sHclMF>xqnfVAjYnxch?
zPOBu{^rOwr1K*rXdPsP6M?_klqc{ViQI?S~`d8TUK*^BCAtsXExOPC5kzC2G;MtRW
zDn**LxuT$;BfGN^?{w|jwF^-QOXO3YQfD>$wh1C}>j^wI3j#LEyG-%+ZXJebbfRi+
z1o?W5**>@89Tq@`Z@=(bt0d8-o~bGcr<iKV2;b%0+!`WEwYo^#@guaFsf&rf@OKNm
z%OQr5HkDRWvaBu7fb}1V*s}MYBF1m~%ysZ9qA!mZZANb2EEvi*d28b@XcQZ*sEzdF
zKwMmIc8m9(+Zp69XhR?{?^F7}Yd^27g1CyjemR7Gf1%S&q4wFux-mQ_(DA->w3u(q
zt{T!w8hau8KMeCs%(=P`n~g28Tj+5u5*JQQItTp#aiy#9%y^i+>x549TsMqlzbtR{
z{^GqjE-kC2wY>f+3>NkQ@@sm|rBEvGRCw@sQ2!vo5;yZhqBGjXBKlmfdw(kj+2_B;
z(E)J&NU*cAcHH=03wUt>%NZ^5{qrpVJgIb5P*}Jr#KXgQRkhF;`j3zj#tI8Qefp$&
znWV@L6Gv7I8cn|aVmE)-$)h;(R;td~*Z0q&?2bbQ1>MXcCVoBZX2L0Buv&EzRn<x5
zEQ)K)Ks^wC$Q5`7$kuIj&XEc_2M7u9@bE}~r7JSAA6jaZK?MoYT?xG-3X<iKAEj;E
ze4txf{bmyFAJ6^c_ps3WqaLUPjKDt3?kdwK!$Smx+-*w!#p(xH-V1pdE^crqqMdKV
z9TXNW^E`H|tXo^?%GmW0aK3{M=2rY>zIXmARpT`5&gPYU+fY@Mh0OR<Vn(WE6{%rP
zwCP&wOU^J_?-V#&S`s9%Rv=HrvqUAG{daI+t&w6t_z~3mj?;I!_9Js%+29*Tc4(V#
zRGs9?WR0RvE=>K9YPZV2Q5zfH>Q6522T?c%`2WU2igX31?VOIq0fYI%TVQ#z54u%e
ztr$=1T#-THcY3lvE|IRRK4erBW(9B;tPDh+N+o!RQ%#{8d2$WwpHCH-7sYGZQIc^S
zb5A)<QaAq$n7(2Jt^sgzY-@J{Mw9b+e7_4=cK~7sh@$l?RTG=s(&il>P4me&K^T6=
zjV-%_szcH=;{LUhb;O3a$Phk{f=-Tw27LMX=^+6;tu3GBxpX@8%~_;ZMBxQrAB^~=
zjJPRVI!1GgGU4)X+ODW|yAq`eo@M?lkLRQ(?wxY771HhN0^#t3N4(;Cu-4t95MVk}
zD(buJnn;j9{#Cl>zj_L4`PIi72rYI%?$|nXQH^xCTFZ3uTq??6uQjXs7~P7bHmt1q
zC)4PfrTNp&-{~_7OACB5t7Zh;b%jEjRw=Ss0uzh`1I=i8R`CL2Fz);d*Haypz<Mk+
zJgqvm*;`=0cAl1@df%3|vh}0fsVlu=z~oAomw<E76Z!Zo@0mp)@czK_9@h-ajW?9y
zrHd;mK}c6NTDI*QrvLHrhI&-Ad4f^<%*fuiJyBqEGcxC=R#Bxf;dA6-pj?2!q8Fg1
zqXm+<xLJ&}X+tu7GY3fLz3wWrUKB%tV8fQUS3;DU^SZ(s$_A{u$NtdY4mv75yGyf}
zVoD~>dWf(BjDhb3Rpjvt;-uL_eVE)wW_=K}_TZh6Tmx|pW}NPU;OAwb$sK$vZ8I8B
ztv2%^Gkuz4?-ECg?INGWeTL$9md8rcm0bG~=-~VHKNYr45g%G`=>`lfZP$;l^vvym
z+6Pa&H_2|n0a`k>$xc7SMto=pg={V~u2G;MEilBG=GUv1-$JMDSCeKZd35^}tY>PJ
zxhOZQX4P6iUFk8g#I-0zwkR}$_==S<ZRGi<FDW+!8~fvjT|moowiLxJh6(L!tH^r~
zZtv=4Of|4^Nh*2btFOL|v#*?gbPjz;npMN~l-}o@-j+r2p=y`_{38SNIJ|rRjvk^;
z64a+&3DHpoHGomfIm6JDTgMEr^MBltHH~6Kybx>4`dL6tN_rglpvKxF7egXxjq6xX
zkaZzv7#Mc_Z|@!fa6hxMuV&Okm7>bRoe=R5{n$36t89R!bk$eAx-aOPYtm1RoT71<
zO?DPT{F=2yoG0o?FTN4c(c9bm;|5nJORdZ%R8el&DooQzv>-!{9wf2aXpyLfPo}c}
z3`GnmxDA2!PAiGP(xtkT@d2;=#XA<<^EaJ%o}YL6xEz&ZFtp@X8}+mH&uLU5ZgX$v
zJa6wqLK>~0^7!6!74u4c#)sJf8VK8@(%gf`=!#r@i6%9V9#H60H#aI;&uMV^?H7LF
z7);xx^}d5$m41TNlr%JD>W8;W0Sz*2F2ouHBY~<K=K8nl@)W9h_h_CPtn;;RuA}*`
zoJD*#jEo{>fWn8;U6C0{0(|c#-|d0{8slE$iMLau7$xb!uaJLo1}8zrrlz-c_xqzY
zPcf`PYo~W+t*EFd?nO_O2qP;Sn;^Gt9QCo1f<nORWbKP{vQhm~0k}L#usfW9xh+*9
z!Dp<&2^k<@&U&qRH$<Hy<Pl#rbYlPo4c2&hPtvc>Bvuc*k>r{gJ3fnoj_&fiHeYy0
z0^uS#_YvP#T3~3kds9FX{QqH`vcj*QGR10%#D3d6iEYQGH3yLUzXAaD*#xoO+TttK
z<^`H5<k9@KdJL#5%>(OkVzX)c7mBtI;{Pn~F8t#%7G~MowFF}KQu5+$QQ~4?IrI|t
ztT-0^-WnM7{>wl|Nn9qc$ICnrXcy+??W|iu<WH=G(v%5%jbYr1O_I-&+By4naX&4&
zTR@Wg@ifrCOsYvD&OvXl_Hz^P|7kYrpvxS`F@~_~m=IpzSmfD39!Fmh^3OQ#7c&Z1
zEEJ=xlFyr^OD=LrdhIRxEy_k~g?sU$V#4rv4}bh5lY*Msp5BOGSn}t%UCus>|2YD;
z>SRVp8^&kqqDRD$m0KaJ|70u<v~kd<EltGbMnQcK>vHgQIzJL86O_1}8ZF&Jg0iz0
zF|lci&a3jC<4WqW!Wo-ouXaurnW|Q<XwoBl7(CIfBMhkZj6a&r1Joo?<H>qPq(v(l
zDp*5MUKo|~B7a`!ddSHHHTVIcq}Dba+)e457%&$qX!*PopA&=051?<ZWJ<A=t{iTk
zpAWkSiF5m4$AdZdM=j7}bFNcytzpXqNq6@PVx0p*(%c!%QuQ1c%VTzU<x*Q*f5(<m
z;v-62J2)@DMPXV#X&C<7;&1yOBwYmjMvKsmYfLG>&YwYfSqe!l=*1>ZoOzE{ijQ!p
zGFAMiExZ{b2V2&9ntpu-e@VII+U}S|<k+1`g*h$hUSX7?h_yt{O}Jf1kTlIsZ>I!Z
zgv5!p6Zcv`O@*am_?0Jv+C-JWzuMA5wAt!h+KLMl6YqHjk`|<gj~_ki?0{9tMSWsX
z$_l*qotQ+D-|XC^hFi>>PAr*U+KF`L%o+c}A-CBTz<DB>fv#suC`P)rnOdu{-U;rJ
zUr(o97OI+1iLM9>{Oqpjc^+(0%m8tM<jW2doLU84_q>4f1Jn1@d0!BvpTIj-=1uZY
zWk=gWkGb**q55b+xudM}C^fqNZ$yI!RaT{pWS!=%h6{+c+)zXgsb`TCAocwMC7$sC
z2aJN*jc3*@z-!PuiV`>ID$n{0K3<G;am&+R8Dj2tz3LHm?y)}6<&{Ybh<IGlo?#z#
zrnL~4a|WI)>OuowXw?t2jUUU<cR^#9qpjQnQBya-5E|EBby91yxmTr_tI9u%##$5?
z+Atzq4jRKE=5Vqao5PP0a4&wCc$S7oXUrrcIPb&(8#=(b3ZLeQhZ#gPZ^w5h6GLB_
zXl9t-gN(U7UkqH+N7t$(y5*Ubr8!s1(og8#6$K3ZX2q?Rlzu(7dVVQ@U|eBL`az0`
zS?epStg`zB17X`kjgr~QiBr`D5M+q2Eb#2#9gUYr`I!Jt5VhUQ@oc{!07A59ENRL$
z86bS~<@CH_{sY9WNSltrPg5X9Bxkrxlrl$vpzVi_6Wgi;Xg!6VAl*^}(Hrx51$Qsi
zf5=W^+`sU%2zU`x6KnaTJ`%K6?W=O&J_|be{EW&si3P3eBC7-oyg(;h7xBZ>_Ymu0
YZEYggTXB*6-~||9sB3~Q*11dgKiTB|#sB~S

diff --git a/mobile/src/static/me_select.png b/mobile/src/static/me_select.png
new file mode 100644
index 0000000000000000000000000000000000000000..d8f205b0e45c7a0278277dd42a7a2f0e68989f0d
GIT binary patch
literal 11764
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
DT$VUL

literal 0
HcmV?d00001


From 3288ca2dc219fd8d455b7271db472d8b2249a1cb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 15:28:56 +0800
Subject: [PATCH 34/47] =?UTF-8?q?refactor:=20=E5=88=87=E6=8D=A2=E9=95=9C?=
 =?UTF-8?q?=E5=83=8F=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 343a08d346..9c696618fe 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,6 +1,6 @@
 FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre:edge
 
-RUN echo -e 'http://mirrors.aliyun.com/alpine/edge/main/\nhttp://mirrors.aliyun.com/alpine/edge/community/' > /etc/apk/repositories 
+RUN echo -e 'https://dl-cdn.alpinelinux.org/alpine/edge/main/\nhttps://dl-cdn.alpinelinux.org/alpine/edge/community/' > /etc/apk/repositories 
 
 #RUN apk add chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
 

From ab8e29e527373596f4845045c74cd0ff2f88daa6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 15:52:13 +0800
Subject: [PATCH 35/47] =?UTF-8?q?refactor:=20=E5=88=87=E6=8D=A2chromium?=
 =?UTF-8?q?=E9=95=9C=E5=83=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Dockerfile | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 9c696618fe..a6ca401801 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -2,18 +2,14 @@ FROM registry.cn-qingdao.aliyuncs.com/dataease/fabric8-java-alpine-openjdk8-jre:
 
 RUN echo -e 'https://dl-cdn.alpinelinux.org/alpine/edge/main/\nhttps://dl-cdn.alpinelinux.org/alpine/edge/community/' > /etc/apk/repositories 
 
-#RUN apk add chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
-
-#RUN mkdir -p /usr/local/sbin/ \
-#    && cp /usr/bin/chromedriver /usr/local/sbin/ \
-#    && chmod a+x /usr/local/sbin/chromedriver
+RUN apk add chromium chromium-chromedriver fontconfig --no-cache --allow-untrusted
 
 ADD simsun.ttc /usr/share/fonts/
 
-#RUN cd /usr/share/fonts/ \
-#    && mkfontscale \
-#    && mkfontdir \
-#    && fc-cache -fv
+RUN cd /usr/share/fonts/ \
+    && mkfontscale \
+    && mkfontdir \
+    && fc-cache -fv
 
 ARG IMAGE_TAG
 

From f2978cb1e75e090130fb84a25afaa1e85ed6ae08 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 15 Feb 2022 15:56:51 +0800
Subject: [PATCH 36/47] feat: S2 pivot

---
 frontend/src/lang/en.js                       |  3 +-
 frontend/src/lang/tw.js                       |  3 +-
 frontend/src/lang/zh.js                       |  3 +-
 frontend/src/views/chart/chart/chart.js       |  7 +--
 .../views/chart/chart/common/common_table.js  | 47 +++++++++++++++----
 .../chart/components/ChartComponentS2.vue     |  2 +-
 .../components/shape-attr/ColorSelector.vue   |  5 ++
 7 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 17460c1dcc..eec352dc43 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1023,7 +1023,8 @@ export default {
     table_column_custom: 'Custom',
     chart_table_pivot: 'Pivot Table',
     table_pivot_row: 'Data Row',
-    field_error_tips: 'This field is changed(Include dimension、quota，field type，deleted),please edit again.'
+    field_error_tips: 'This field is changed(Include dimension、quota，field type，deleted),please edit again.',
+    table_border_color: 'Border Color'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 8d27954f15..5326010421 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1023,7 +1023,8 @@ export default {
     table_column_custom: '自定義',
     chart_table_pivot: '透視表',
     table_pivot_row: '數據行',
-    field_error_tips: '該字段所對應的數據集原始字段發生變更（包括維度、指標，字段類型，字段被刪除等），建議重新編輯'
+    field_error_tips: '該字段所對應的數據集原始字段發生變更（包括維度、指標，字段類型，字段被刪除等），建議重新編輯',
+    table_border_color: '邊框顏色'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 8706d7c50d..457e03810f 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1025,7 +1025,8 @@ export default {
     table_column_custom: '自定义',
     chart_table_pivot: '透视表',
     table_pivot_row: '数据行',
-    field_error_tips: '该字段所对应的数据集原始字段发生变更（包括维度、指标，字段类型，字段被删除等），建议重新编辑'
+    field_error_tips: '该字段所对应的数据集原始字段发生变更（包括维度、指标，字段类型，字段被删除等），建议重新编辑',
+    table_border_color: '边框颜色'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 1cbef872f4..0da2d37248 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -2,12 +2,13 @@ export const DEFAULT_COLOR_CASE = {
   value: 'default',
   colors: ['#5470c6', '#91cc75', '#fac858', '#ee6666', '#73c0de', '#3ba272', '#fc8452', '#9a60b4', '#ea7ccc'],
   alpha: 100,
-  tableHeaderBgColor: '#c1d1f6',
-  tableItemBgColor: '#e2eafe',
+  tableHeaderBgColor: '#e1eaff',
+  tableItemBgColor: '#ffffff',
   tableFontColor: '#000000',
   tableStripe: true,
   dimensionColor: '#000000',
-  quotaColor: '#000000'
+  quotaColor: '#000000',
+  tableBorderColor: '#cfdaf4'
 }
 export const DEFAULT_SIZE = {
   barDefault: true,
diff --git a/frontend/src/views/chart/chart/common/common_table.js b/frontend/src/views/chart/chart/common/common_table.js
index 8a98c6986a..4f5fed19ca 100644
--- a/frontend/src/views/chart/chart/common/common_table.js
+++ b/frontend/src/views/chart/chart/common/common_table.js
@@ -2,13 +2,22 @@ import { hexColorToRGBA } from '@/views/chart/chart/util'
 import { DEFAULT_COLOR_CASE, DEFAULT_SIZE } from '@/views/chart/chart/chart'
 
 export function getCustomTheme(chart) {
+  const headerColor = hexColorToRGBA(DEFAULT_COLOR_CASE.tableHeaderBgColor, DEFAULT_COLOR_CASE.alpha)
+  const itemColor = hexColorToRGBA(DEFAULT_COLOR_CASE.tableItemBgColor, DEFAULT_COLOR_CASE.alpha)
+  const borderColor = hexColorToRGBA(DEFAULT_COLOR_CASE.tableBorderColor, DEFAULT_COLOR_CASE.alpha)
   const theme = {
     background: {
       color: '#00000000'
     },
+    splitLine: {
+      horizontalBorderColor: borderColor,
+      verticalBorderColor: borderColor
+    },
     cornerCell: {
       cell: {
-        backgroundColor: hexColorToRGBA(DEFAULT_COLOR_CASE.tableHeaderBgColor, DEFAULT_COLOR_CASE.alpha)
+        backgroundColor: headerColor,
+        horizontalBorderColor: borderColor,
+        verticalBorderColor: borderColor
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
@@ -21,7 +30,9 @@ export function getCustomTheme(chart) {
     },
     rowCell: {
       cell: {
-        backgroundColor: hexColorToRGBA(DEFAULT_COLOR_CASE.tableHeaderBgColor, DEFAULT_COLOR_CASE.alpha)
+        backgroundColor: headerColor,
+        horizontalBorderColor: borderColor,
+        verticalBorderColor: borderColor
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
@@ -34,7 +45,9 @@ export function getCustomTheme(chart) {
     },
     colCell: {
       cell: {
-        backgroundColor: hexColorToRGBA(DEFAULT_COLOR_CASE.tableHeaderBgColor, DEFAULT_COLOR_CASE.alpha)
+        backgroundColor: headerColor,
+        horizontalBorderColor: borderColor,
+        verticalBorderColor: borderColor
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
@@ -47,7 +60,9 @@ export function getCustomTheme(chart) {
     },
     dataCell: {
       cell: {
-        backgroundColor: hexColorToRGBA(DEFAULT_COLOR_CASE.tableItemBgColor, DEFAULT_COLOR_CASE.alpha)
+        backgroundColor: itemColor,
+        horizontalBorderColor: borderColor,
+        verticalBorderColor: borderColor
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
@@ -62,17 +77,33 @@ export function getCustomTheme(chart) {
     // color
     if (customAttr.color) {
       const c = JSON.parse(JSON.stringify(customAttr.color))
-      theme.cornerCell.cell.backgroundColor = hexColorToRGBA(c.tableHeaderBgColor, c.alpha)
+      const h_c = hexColorToRGBA(c.tableHeaderBgColor, c.alpha)
+      const i_c = hexColorToRGBA(c.tableItemBgColor, c.alpha)
+      const b_c = c.tableBorderColor ? hexColorToRGBA(c.tableBorderColor, c.alpha) : hexColorToRGBA(DEFAULT_COLOR_CASE.tableBorderColor, c.alpha)
+      theme.splitLine.horizontalBorderColor = b_c
+      theme.splitLine.verticalBorderColor = b_c
+
+      theme.cornerCell.cell.backgroundColor = h_c
+      theme.cornerCell.cell.horizontalBorderColor = b_c
+      theme.cornerCell.cell.verticalBorderColor = b_c
       theme.cornerCell.bolderText.fill = c.tableFontColor
       theme.cornerCell.text.fill = c.tableFontColor
-      theme.rowCell.cell.backgroundColor = hexColorToRGBA(c.tableHeaderBgColor, c.alpha)
+
+      theme.rowCell.cell.backgroundColor = h_c
+      theme.rowCell.cell.horizontalBorderColor = b_c
+      theme.rowCell.cell.verticalBorderColor = b_c
       theme.rowCell.bolderText.fill = c.tableFontColor
       theme.rowCell.text.fill = c.tableFontColor
-      theme.colCell.cell.backgroundColor = hexColorToRGBA(c.tableHeaderBgColor, c.alpha)
+
+      theme.colCell.cell.backgroundColor = h_c
+      theme.colCell.cell.horizontalBorderColor = b_c
+      theme.colCell.cell.verticalBorderColor = b_c
       theme.colCell.bolderText.fill = c.tableFontColor
       theme.colCell.text.fill = c.tableFontColor
 
-      theme.dataCell.cell.backgroundColor = hexColorToRGBA(c.tableItemBgColor, c.alpha)
+      theme.dataCell.cell.backgroundColor = i_c
+      theme.dataCell.cell.horizontalBorderColor = b_c
+      theme.dataCell.cell.verticalBorderColor = b_c
       theme.dataCell.text.fill = c.tableFontColor
     }
     // size
diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index b11aca62bf..e4b4b3b1fd 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -135,7 +135,7 @@ export default {
   methods: {
     initData() {
       let datas = []
-      if (this.chart.data) {
+      if (this.chart.data && this.chart.data.fields) {
         this.fields = JSON.parse(JSON.stringify(this.chart.data.fields))
         const attr = JSON.parse(this.chart.customAttr)
         this.currentPage.pageSize = parseInt(attr.size.tablePageSize ? attr.size.tablePageSize : 20)
diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
index 9eda638590..97178ce053 100644
--- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
@@ -63,6 +63,9 @@
           <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_font_color')" class="form-item">
             <el-color-picker v-model="colorForm.tableFontColor" class="color-picker-style" :predefine="predefineColors" @change="changeColorCase" />
           </el-form-item>
+          <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_border_color')" class="form-item">
+            <el-color-picker v-model="colorForm.tableBorderColor" class="color-picker-style" :predefine="predefineColors" @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">-->
           <!--                <el-checkbox v-model="colorForm.tableStripe" @change="changeColorCase">{{ $t('chart.stripe') }}</el-checkbox>-->
@@ -240,6 +243,8 @@ export default {
             this.customColor = this.colorForm.colors[0]
             this.colorIndex = 0
           }
+
+          this.colorForm.tableBorderColor = this.colorForm.tableBorderColor ? this.colorForm.tableBorderColor : DEFAULT_COLOR_CASE.tableBorderColor
         }
       }
     },

From c02de72a7e3adf414cbcfa2d457063c0a9e07b0b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 16:54:59 +0800
Subject: [PATCH 37/47] =?UTF-8?q?refactor:=20=E9=87=8D=E6=9E=84=E5=85=AC?=
 =?UTF-8?q?=E5=85=B1=E9=93=BE=E6=8E=A5=E7=9F=AD=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/panel/PanelLinkService.java       | 22 +++++++++++++------
 frontend/src/views/link/generate/index.vue    |  2 +-
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
index fb9f271662..214e623cf7 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
@@ -45,11 +45,19 @@ public class PanelLinkService {
     @Resource
     private PanelLinkMappingMapper panelLinkMappingMapper;
 
+    @Transactional
     public void changeValid(LinkRequest request) {
         PanelLink po = new PanelLink();
         po.setResourceId(request.getResourceId());
         po.setValid(request.isValid());
-        mapper.updateByExampleSelective(po, example(request.getResourceId(), AuthUtils.getUser().getUserId()));
+        Long userId = AuthUtils.getUser().getUserId();
+        mapper.updateByExampleSelective(po, example(request.getResourceId(), userId));
+
+        PanelLinkMappingExample example = new PanelLinkMappingExample();
+        example.createCriteria().andResourceIdEqualTo(request.getResourceId()).andUserIdEqualTo(userId);
+        PanelLinkMapping mapping = new PanelLinkMapping();
+        mapping.setUuid(CodingUtil.shortUuid());
+        panelLinkMappingMapper.updateByExampleSelective(mapping, example);
     }
 
     private PanelLinkExample example(String panelLinkId, Long userId){
@@ -118,11 +126,6 @@ public class PanelLinkService {
             mapping.setUserId(AuthUtils.getUser().getUserId());
             mapping.setUuid(CodingUtil.shortUuid());
             panelLinkMappingMapper.insert(mapping);
-        }else {
-            mappings.stream().filter(mapping -> StringUtils.isBlank(mapping.getUuid())).forEach(item -> {
-                item.setUuid(CodingUtil.shortUuid());
-                panelLinkMappingMapper.updateByPrimaryKey(item);
-            });
         }
         return convertDto(one);
     }
@@ -214,14 +217,19 @@ public class PanelLinkService {
         example.createCriteria().andResourceIdEqualTo(resourceId).andUserIdEqualTo(AuthUtils.getUser().getUserId());
         List<PanelLinkMapping> mappings = panelLinkMappingMapper.selectByExample(example);
         PanelLinkMapping mapping = mappings.get(0);
-        return SHORT_URL_PREFIX + mapping.getUuid();
+        String uuid = mapping.getUuid();
+        return SHORT_URL_PREFIX + (StringUtils.isBlank(uuid) ? mapping.getId() : uuid);
     }
 
     public String getUrlByIndex(Long index) {
         PanelLinkMapping mapping = panelLinkMappingMapper.selectByPrimaryKey(index);
+
         String resourceId = mapping.getResourceId();
         Long userId = mapping.getUserId();
         PanelLink one = findOne(resourceId, userId);
+        if (StringUtils.isNotBlank(mapping.getUuid())) {
+            one.setResourceId("error-resource-id");
+        }
         return convertDto(one).getUri();
     }
 
diff --git a/frontend/src/views/link/generate/index.vue b/frontend/src/views/link/generate/index.vue
index 5572ba106c..d307a58eeb 100644
--- a/frontend/src/views/link/generate/index.vue
+++ b/frontend/src/views/link/generate/index.vue
@@ -230,7 +230,7 @@ export default {
         valid: value
       }
       switchValid(param).then(res => {
-
+        this.requestShort()
       })
     },
     requestShort() {

From a47eb8209eaf9dea8b5fe2753edc30e3e10da310 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 15 Feb 2022 17:07:34 +0800
Subject: [PATCH 38/47] =?UTF-8?q?fix:=20=E9=87=8D=E6=96=B0=E5=BC=80?=
 =?UTF-8?q?=E5=90=AF=E9=93=BE=E6=8E=A5=E5=90=8E=EF=BC=8C=E8=80=81=E7=9A=84?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/service/panel/PanelLinkService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
index 214e623cf7..8325c7591c 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
@@ -238,7 +238,9 @@ public class PanelLinkService {
         example.createCriteria().andUuidEqualTo(uuid);
         List<PanelLinkMapping> mappings = panelLinkMappingMapper.selectByExample(example);
         if (CollectionUtils.isEmpty(mappings)) {
-            DEException.throwException("link is not exist");
+            PanelLink panelLink = new PanelLink();
+            panelLink.setResourceId("error-resource-id");
+            return BASEURL + buildLinkParam(panelLink);
         }
         PanelLinkMapping mapping = mappings.get(0);
         String resourceId = mapping.getResourceId();

From 57c0f2d74514f17f1195a674b03e5f6081847e2c Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 15 Feb 2022 17:07:40 +0800
Subject: [PATCH 39/47] =?UTF-8?q?refactor:=20=E6=9B=B4=E6=96=B0=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=88=97=E8=A1=A8=E5=9B=BE=E6=A0=87=EF=BC=8C=E6=9B=B4?=
 =?UTF-8?q?=E6=AD=A3=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=AD=98=E9=87=8F=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E5=88=97=E8=A1=A8=E9=87=8D=E5=A4=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../base/mapper/ext/ExtVAuthModelMapper.xml         | 11 ++++++-----
 .../src/main/resources/db/migration/V32__1.8.sql    |  2 +-
 frontend/src/views/panel/ViewSelect/index.vue       | 13 ++++++++-----
 3 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
index c99b4a0d0e..133ca26079 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtVAuthModelMapper.xml
@@ -119,8 +119,8 @@
         'leaf' AS node_type,
         'view' AS model_type
         FROM
-        panel_view
-        LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
+        chart_view
+        LEFT JOIN panel_view ON panel_view.chart_view_id = chart_view.id
         <where>
 
             <if test="record.pids != null and record.pids.size() > 0">
@@ -151,7 +151,8 @@
             UNION ALL
 
         SELECT
-            panel_view.id,
+            distinct
+            chart_view.id,
             chart_view.id AS 'inner_id',
             chart_view.NAME,
             chart_view.NAME AS 'label',
@@ -160,8 +161,8 @@
             'leaf' AS node_type,
             'view' AS model_type
         FROM
-            panel_view
-            LEFT JOIN chart_view ON panel_view.chart_view_id = chart_view.id
+            chart_view
+            LEFT JOIN panel_view ON panel_view.chart_view_id = chart_view.id
         <where>
             chart_view.chart_type ='public'
             <if test="record.pids != null and record.pids.size() > 0">
diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
index 2e33e1ab09..26059ceef2 100644
--- a/backend/src/main/resources/db/migration/V32__1.8.sql
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -2,7 +2,7 @@ ALTER TABLE `chart_view` ADD COLUMN `x_axis_ext` LONGTEXT COMMENT 'table-row' AF
 UPDATE `chart_view` SET `x_axis_ext` = '[]';
 
 
-INSERT INTO `chart_group` (`id`, `name`, `pid`, `level`, `type`, `create_by`, `create_time`) VALUES ('0', 'i18n_public_chart', 'public_chart', -1, 'group', 'admin', NULL);
+INSERT INTO `chart_group` (`id`, `name`, `pid`, `level`, `type`, `create_by`, `create_time`) VALUES ('0', 'i18n_public_chart', 'public_chart', -1, 'history', 'admin', NULL);
 
 ALTER TABLE `chart_view`
 MODIFY COLUMN `scene_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场景ID chart_type为privat的时候 是仪表板id' AFTER `title`,
diff --git a/frontend/src/views/panel/ViewSelect/index.vue b/frontend/src/views/panel/ViewSelect/index.vue
index dbfa684887..c246762728 100644
--- a/frontend/src/views/panel/ViewSelect/index.vue
+++ b/frontend/src/views/panel/ViewSelect/index.vue
@@ -36,11 +36,14 @@
         >
           <span slot-scope="{ node, data }" class="custom-tree-node">
             <span>
-              <span v-if="data.modelType==='panel'|| data.nodeType === 'spine'">
-                <el-button
-                  icon="el-icon-folder"
-                  type="text"
-                />
+              <span v-if="data.modelInnerType==='history'">
+                <i class="el-icon-collection" />
+              </span>
+              <span v-else-if="data.nodeType === 'spine'">
+                <i class="el-icon-folder" />
+              </span>
+              <span v-else-if="data.modelType==='panel'&& data.nodeType === 'leaf'">
+                <svg-icon icon-class="panel" class="ds-icon-scene" />
               </span>
               <span v-else>
                 <svg-icon :icon-class="data.modelInnerType" style="width: 14px;height: 14px" />

From c8bf150e9cc47882345060b07c67e97351ef6b9b Mon Sep 17 00:00:00 2001
From: fit2cloudrd <reaperww@gmail.com>
Date: Wed, 16 Feb 2022 13:39:03 +0800
Subject: [PATCH 40/47] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8Dv32=5F=5F1.8.sql?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E4=B8=AD=E6=8B=BC=E5=86=99=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=8F=8A=E6=A0=BC=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/resources/db/migration/V32__1.8.sql | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
index 26059ceef2..1a1c8cc3a2 100644
--- a/backend/src/main/resources/db/migration/V32__1.8.sql
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -5,10 +5,10 @@ UPDATE `chart_view` SET `x_axis_ext` = '[]';
 INSERT INTO `chart_group` (`id`, `name`, `pid`, `level`, `type`, `create_by`, `create_time`) VALUES ('0', 'i18n_public_chart', 'public_chart', -1, 'history', 'admin', NULL);
 
 ALTER TABLE `chart_view`
-MODIFY COLUMN `scene_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场景ID chart_type为privat的时候 是仪表板id' AFTER `title`,
+MODIFY COLUMN `scene_id` varchar(50) CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci NOT NULL COMMENT '场景ID chart_type为private的时候 是仪表板id' AFTER `title`,
 ADD COLUMN `chart_type` varchar(255) NULL DEFAULT 'public' COMMENT '视图类型 public 公共 历史可复用的视图，private 私有 专属某个仪表板' AFTER `style_priority`;
 
-delete  from sys_auth_detail where auth_id in(select id  from sys_auth where auth_source_type = 'chart');
+delete from sys_auth_detail where auth_id in(select id from sys_auth where auth_source_type = 'chart');
 delete from sys_auth where auth_source_type = 'chart';
 
 DROP TRIGGER `new_auth_chart_view`;
@@ -16,9 +16,7 @@ DROP TRIGGER `delete_auth_chart_view`;
 
 delete from sys_menu where menu_id ='10';
 
-DROP VIEW
-IF
-	EXISTS `v_auth_model`;
+DROP VIEW IF EXISTS `v_auth_model`;
 CREATE ALGORITHM = UNDEFINED SQL SECURITY DEFINER VIEW `v_auth_model` AS SELECT
 `sys_user`.`user_id` AS `id`,
 `sys_user`.`username` AS `name`,

From 995fe08298404848444aca57af6163206f75e23a Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 16 Feb 2022 16:10:39 +0800
Subject: [PATCH 41/47] =?UTF-8?q?fix:=20nginx=E5=89=8D=E5=90=8E=E5=88=86?=
 =?UTF-8?q?=E7=A6=BB=E9=83=A8=E7=BD=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/pom.xml                               | 104 +++++++++++-------
 .../dataease/controller/IndexController.java  |   4 +-
 .../service/panel/PanelLinkService.java       |  28 +++--
 .../resources/application-stage.properties    |   1 +
 .../resources/application-whole.properties    |   1 +
 .../src/main/resources/application.properties |   1 +
 frontend/.env.staging                         |   2 +-
 frontend/src/utils/request.js                 |   2 +-
 mobile/.env.staging                           |   8 ++
 mobile/package.json                           |   2 +
 10 files changed, 97 insertions(+), 56 deletions(-)
 create mode 100644 backend/src/main/resources/application-stage.properties
 create mode 100644 backend/src/main/resources/application-whole.properties
 create mode 100644 mobile/.env.staging

diff --git a/backend/pom.xml b/backend/pom.xml
index eb3d1cdf4a..b7de8b16dd 100644
--- a/backend/pom.xml
+++ b/backend/pom.xml
@@ -407,48 +407,74 @@
                 </dependencies>
             </plugin>
 
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <?m2e execute onConfiguration?>
-                        <id>main-class-placement</id>
-                        <phase>generate-resources</phase>
-                        <configuration>
-                            <target>
-                                <move todir="src/main/resources/static">
-                                    <fileset dir="../frontend/dist">
-                                        <exclude name="*.html"/>
-                                    </fileset>
-                                </move>
-                                <move todir="src/main/resources/templates">
-                                    <fileset dir="../frontend/dist">
-                                        <include name="*.html"/>
-                                    </fileset>
-                                </move>
-
-                                <copy todir="src/main/resources/static/de-app">
-                                    <fileset dir="../mobile/dist">
-                                        <exclude name="*.html"/>
-                                    </fileset>
-                                </copy>
-
-
-                                <copy file="../mobile/dist/index.html" tofile="src/main/resources/templates/app.html" />
-
-
-                            </target>
-                        </configuration>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
+            
         </plugins>
     </build>
 
+    <profiles>
+        <profile>
+            <id>whole</id>
+            <properties>
+                <profiles.active>whole</profiles.active>
+            </properties>
+            <activation>
+                <activeByDefault>true</activeByDefault>
+            </activation>
+            <build>
+                <plugins>
+
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-antrun-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <?m2e execute onConfiguration?>
+                                <id>main-class-placement</id>
+                                <phase>generate-resources</phase>
+                                <configuration>
+                                    <target>
+                                        <move todir="src/main/resources/static">
+                                            <fileset dir="../frontend/dist">
+                                                <exclude name="*.html"/>
+                                            </fileset>
+                                        </move>
+                                        <move todir="src/main/resources/templates">
+                                            <fileset dir="../frontend/dist">
+                                                <include name="*.html"/>
+                                            </fileset>
+                                        </move>
+
+                                        <copy todir="src/main/resources/static/de-app">
+                                            <fileset dir="../mobile/dist">
+                                                <exclude name="*.html"/>
+                                            </fileset>
+                                        </copy>
+
+
+                                        <copy file="../mobile/dist/index.html" tofile="src/main/resources/templates/app.html" />
+
+
+                                    </target>
+                                </configuration>
+                                <goals>
+                                    <goal>run</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+
+        <profile>
+            <id>stage</id>
+            <properties>
+                <profiles.active>stage</profiles.active>
+            </properties>
+        </profile>
+    </profiles>
+    
+
     <repositories>
         <repository>
             <id>pentaho-public</id>
diff --git a/backend/src/main/java/io/dataease/controller/IndexController.java b/backend/src/main/java/io/dataease/controller/IndexController.java
index e2c5128d71..bf8ad7eca0 100644
--- a/backend/src/main/java/io/dataease/controller/IndexController.java
+++ b/backend/src/main/java/io/dataease/controller/IndexController.java
@@ -53,7 +53,7 @@ public class IndexController {
         String url;
         if (CodingUtil.isNumeric(index)) {
             url = panelLinkService.getUrlByIndex(Long.parseLong(index));
-        }else {
+        } else {
             url = panelLinkService.getUrlByUuid(index);
         }
         HttpServletResponse response = ServletUtils.response();
@@ -65,8 +65,6 @@ public class IndexController {
         }
     }
 
-
-
     @GetMapping("/tempMobileLink/{id}/{token}")
     public void tempMobileLink(@PathVariable("id") String id, @PathVariable("token") String token) {
         String url = "/#preview/" + id;
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
index 8325c7591c..65ee577faa 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelLinkService.java
@@ -8,7 +8,6 @@ import io.dataease.base.mapper.PanelGroupMapper;
 import io.dataease.base.mapper.PanelLinkMapper;
 import io.dataease.base.mapper.PanelLinkMappingMapper;
 import io.dataease.base.mapper.ext.ExtPanelLinkMapper;
-import io.dataease.commons.exception.DEException;
 import io.dataease.commons.utils.AuthUtils;
 import io.dataease.commons.utils.CodingUtil;
 import io.dataease.commons.utils.ServletUtils;
@@ -20,6 +19,7 @@ import io.dataease.dto.panel.link.GenerateDto;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -27,7 +27,6 @@ import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.util.List;
-import java.util.Optional;
 
 @Service
 public class PanelLinkService {
@@ -36,6 +35,9 @@ public class PanelLinkService {
     private static final String USERPARAM = "&user=";
     private static final String SHORT_URL_PREFIX = "/link/";
 
+    @Value("${server.servlet.context-path}")
+    private String contextPath;
+
     @Resource
     private PanelLinkMapper mapper;
     @Resource
@@ -60,7 +62,7 @@ public class PanelLinkService {
         panelLinkMappingMapper.updateByExampleSelective(mapping, example);
     }
 
-    private PanelLinkExample example(String panelLinkId, Long userId){
+    private PanelLinkExample example(String panelLinkId, Long userId) {
         PanelLinkExample example = new PanelLinkExample();
         example.createCriteria().andResourceIdEqualTo(panelLinkId).andUserIdEqualTo(userId);
         return example;
@@ -88,18 +90,18 @@ public class PanelLinkService {
     private PanelLink findOne(String resourceId) {
         PanelLinkExample example = new PanelLinkExample();
         example.createCriteria().andResourceIdEqualTo(resourceId).andUserIdIsNull();
-        List<PanelLink> list =  mapper.selectByExample(example);
+        List<PanelLink> list = mapper.selectByExample(example);
         return CollectionUtils.isNotEmpty(list) ? list.get(0) : null;
     }
 
     public PanelLink findOne(String resourceId, Long userId) {
-        if(userId == null){
+        if (userId == null) {
             return findOne(resourceId);
         }
         List<PanelLink> panelLinks = mapper.selectByExample(example(resourceId, userId));
-        if(CollectionUtils.isNotEmpty(panelLinks)){
+        if (CollectionUtils.isNotEmpty(panelLinks)) {
             return panelLinks.get(0);
-        }else {
+        } else {
             return null;
         }
     }
@@ -152,8 +154,8 @@ public class PanelLinkService {
 
     private String buildLinkParam(PanelLink link) {
         String linkParam = encrypt(link.getResourceId());
-        if(link.getUserId() != null){
-            linkParam = linkParam+ USERPARAM + link.getUserId().toString();
+        if (link.getUserId() != null) {
+            linkParam = linkParam + USERPARAM + link.getUserId().toString();
         }
         return linkParam;
     }
@@ -172,7 +174,8 @@ public class PanelLinkService {
     public Boolean validateHeads(PanelLink panelLink) throws Exception {
         HttpServletRequest request = ServletUtils.request();
         String token = request.getHeader("LINK-PWD-TOKEN");
-        if (!panelLink.getEnablePwd() || StringUtils.isEmpty(token) || StringUtils.equals("undefined", token) || StringUtils.equals("null", token)) {
+        if (!panelLink.getEnablePwd() || StringUtils.isEmpty(token) || StringUtils.equals("undefined", token)
+                || StringUtils.equals("null", token)) {
             String resourceId = panelLink.getResourceId();
             String pwd = "dataease";
             String tk = JWTUtils.signLink(resourceId, panelLink.getUserId(), pwd);
@@ -181,7 +184,8 @@ public class PanelLinkService {
             httpServletResponse.setHeader("LINK-PWD-TOKEN", tk);
             return false;
         }
-        if (StringUtils.isEmpty(panelLink.getPwd())) return false;
+        if (StringUtils.isEmpty(panelLink.getPwd()))
+            return false;
         return JWTUtils.verifyLink(token, panelLink.getResourceId(), panelLink.getUserId(), panelLink.getPwd());
     }
 
@@ -218,7 +222,7 @@ public class PanelLinkService {
         List<PanelLinkMapping> mappings = panelLinkMappingMapper.selectByExample(example);
         PanelLinkMapping mapping = mappings.get(0);
         String uuid = mapping.getUuid();
-        return SHORT_URL_PREFIX + (StringUtils.isBlank(uuid) ? mapping.getId() : uuid);
+        return contextPath + SHORT_URL_PREFIX + (StringUtils.isBlank(uuid) ? mapping.getId() : uuid);
     }
 
     public String getUrlByIndex(Long index) {
diff --git a/backend/src/main/resources/application-stage.properties b/backend/src/main/resources/application-stage.properties
new file mode 100644
index 0000000000..4e1c3c1d54
--- /dev/null
+++ b/backend/src/main/resources/application-stage.properties
@@ -0,0 +1 @@
+server.servlet.context-path=/de-api
\ No newline at end of file
diff --git a/backend/src/main/resources/application-whole.properties b/backend/src/main/resources/application-whole.properties
new file mode 100644
index 0000000000..99b93b71c8
--- /dev/null
+++ b/backend/src/main/resources/application-whole.properties
@@ -0,0 +1 @@
+server.servlet.context-path=
\ No newline at end of file
diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 4b4a49e919..fdb33ea352 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -1,3 +1,4 @@
+spring.profiles.active=@profiles.active@
 spring.application.name=dataease
 
 server.port=8081
diff --git a/frontend/.env.staging b/frontend/.env.staging
index a8793a0989..44c8f6dec2 100644
--- a/frontend/.env.staging
+++ b/frontend/.env.staging
@@ -4,5 +4,5 @@ NODE_ENV = production
 ENV = 'staging'
 
 # base api
-VUE_APP_BASE_API = '/stage-api'
+VUE_APP_BASE_API = '/de-api/'
 
diff --git a/frontend/src/utils/request.js b/frontend/src/utils/request.js
index fa250e5cad..dc79cca838 100644
--- a/frontend/src/utils/request.js
+++ b/frontend/src/utils/request.js
@@ -14,7 +14,7 @@ import Cookies from 'js-cookie'
 
 const getTimeOut = () => {
   let time = 10
-  const url = '/system/requestTimeOut'
+  const url = process.env.VUE_APP_BASE_API + 'system/requestTimeOut'
   const xhr = new XMLHttpRequest()
   xhr.onreadystatechange = () => {
     if (xhr.readyState === 4 && xhr.status === 200) {
diff --git a/mobile/.env.staging b/mobile/.env.staging
new file mode 100644
index 0000000000..44c8f6dec2
--- /dev/null
+++ b/mobile/.env.staging
@@ -0,0 +1,8 @@
+NODE_ENV = production
+
+# just a flag
+ENV = 'staging'
+
+# base api
+VUE_APP_BASE_API = '/de-api/'
+
diff --git a/mobile/package.json b/mobile/package.json
index 73618117cb..d22d55817a 100644
--- a/mobile/package.json
+++ b/mobile/package.json
@@ -5,6 +5,8 @@
   "scripts": {
     "serve": "npm run dev:h5",
     "build": "npm run build:h5",
+    "build:stage": "npm run build:h5:stage",
+    "build:h5:stage": "cross-env NODE_ENV=production UNI_PLATFORM=h5 UNI_OUTPUT_DIR=dist vue-cli-service uni-build --mode staging",
     "build:app-plus": "cross-env NODE_ENV=production UNI_PLATFORM=app-plus vue-cli-service uni-build",
     "build:custom": "cross-env NODE_ENV=production uniapp-cli custom",
     "build:h5": "cross-env NODE_ENV=production UNI_PLATFORM=h5 UNI_OUTPUT_DIR=dist vue-cli-service uni-build",

From bddb3bc6059a3efb6f608ed299feea48219a6689 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Wed, 16 Feb 2022 16:55:00 +0800
Subject: [PATCH 42/47] feat: S2 pivot align

---
 frontend/src/lang/en.js                       |  7 +++-
 frontend/src/lang/tw.js                       |  7 +++-
 frontend/src/lang/zh.js                       |  7 +++-
 frontend/src/views/chart/chart/chart.js       |  2 ++
 .../views/chart/chart/common/common_table.js  | 36 +++++++++++++++----
 .../shape-attr/SizeSelectorAntV.vue           | 20 ++++++++++-
 6 files changed, 68 insertions(+), 11 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index eec352dc43..5b0dee7a33 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1024,7 +1024,12 @@ export default {
     chart_table_pivot: 'Pivot Table',
     table_pivot_row: 'Data Row',
     field_error_tips: 'This field is changed(Include dimension、quota，field type，deleted),please edit again.',
-    table_border_color: 'Border Color'
+    table_border_color: 'Border Color',
+    table_header_align: 'Header Align',
+    table_item_align: 'Body Align',
+    table_align_left: 'Left',
+    table_align_center: 'Center',
+    table_align_right: 'Right'
   },
   dataset: {
     sheet_warn: 'There are multiple sheet pages, and the first one is extracted by default',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 5326010421..9a027ee2a9 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1024,7 +1024,12 @@ export default {
     chart_table_pivot: '透視表',
     table_pivot_row: '數據行',
     field_error_tips: '該字段所對應的數據集原始字段發生變更（包括維度、指標，字段類型，字段被刪除等），建議重新編輯',
-    table_border_color: '邊框顏色'
+    table_border_color: '邊框顏色',
+    table_header_align: '表頭對齊方式',
+    table_item_align: '表格對齊方式',
+    table_align_left: '左對齊',
+    table_align_center: '居中',
+    table_align_right: '右對齊'
   },
   dataset: {
     sheet_warn: '有多個 Sheet 頁，默認抽取第一個',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 457e03810f..6c56cafdc1 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1026,7 +1026,12 @@ export default {
     chart_table_pivot: '透视表',
     table_pivot_row: '数据行',
     field_error_tips: '该字段所对应的数据集原始字段发生变更（包括维度、指标，字段类型，字段被删除等），建议重新编辑',
-    table_border_color: '边框颜色'
+    table_border_color: '边框颜色',
+    table_header_align: '表头对齐方式',
+    table_item_align: '表格对齐方式',
+    table_align_left: '左对齐',
+    table_align_center: '居中',
+    table_align_right: '右对齐'
   },
   dataset: {
     sheet_warn: '有多个 Sheet 页，默认抽取第一个',
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 0da2d37248..df770bd6e8 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -34,6 +34,8 @@ export const DEFAULT_SIZE = {
   tablePageSize: '20',
   tableColumnMode: 'custom',
   tableColumnWidth: 100,
+  tableHeaderAlign: 'left',
+  tableItemAlign: 'right',
   gaugeMin: 0,
   gaugeMax: 100,
   gaugeStartAngle: 225,
diff --git a/frontend/src/views/chart/chart/common/common_table.js b/frontend/src/views/chart/chart/common/common_table.js
index 4f5fed19ca..4ffed26eeb 100644
--- a/frontend/src/views/chart/chart/common/common_table.js
+++ b/frontend/src/views/chart/chart/common/common_table.js
@@ -5,6 +5,9 @@ export function getCustomTheme(chart) {
   const headerColor = hexColorToRGBA(DEFAULT_COLOR_CASE.tableHeaderBgColor, DEFAULT_COLOR_CASE.alpha)
   const itemColor = hexColorToRGBA(DEFAULT_COLOR_CASE.tableItemBgColor, DEFAULT_COLOR_CASE.alpha)
   const borderColor = hexColorToRGBA(DEFAULT_COLOR_CASE.tableBorderColor, DEFAULT_COLOR_CASE.alpha)
+  const headerAlign = DEFAULT_SIZE.tableHeaderAlign
+  const itemAlign = DEFAULT_SIZE.tableItemAlign
+
   const theme = {
     background: {
       color: '#00000000'
@@ -21,11 +24,13 @@ export function getCustomTheme(chart) {
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
-        fontSize: DEFAULT_SIZE.tableTitleFontSize
+        fontSize: DEFAULT_SIZE.tableTitleFontSize,
+        textAlign: headerAlign
       },
       bolderText: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
-        fontSize: DEFAULT_SIZE.tableTitleFontSize
+        fontSize: DEFAULT_SIZE.tableTitleFontSize,
+        textAlign: headerAlign
       }
     },
     rowCell: {
@@ -36,11 +41,13 @@ export function getCustomTheme(chart) {
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
-        fontSize: DEFAULT_SIZE.tableTitleFontSize
+        fontSize: DEFAULT_SIZE.tableTitleFontSize,
+        textAlign: headerAlign
       },
       bolderText: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
-        fontSize: DEFAULT_SIZE.tableTitleFontSize
+        fontSize: DEFAULT_SIZE.tableTitleFontSize,
+        textAlign: headerAlign
       }
     },
     colCell: {
@@ -51,11 +58,13 @@ export function getCustomTheme(chart) {
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
-        fontSize: DEFAULT_SIZE.tableTitleFontSize
+        fontSize: DEFAULT_SIZE.tableTitleFontSize,
+        textAlign: headerAlign
       },
       bolderText: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
-        fontSize: DEFAULT_SIZE.tableTitleFontSize
+        fontSize: DEFAULT_SIZE.tableTitleFontSize,
+        textAlign: headerAlign
       }
     },
     dataCell: {
@@ -66,7 +75,8 @@ export function getCustomTheme(chart) {
       },
       text: {
         fill: DEFAULT_COLOR_CASE.tableFontColor,
-        fontSize: DEFAULT_SIZE.tableItemFontSize
+        fontSize: DEFAULT_SIZE.tableItemFontSize,
+        textAlign: itemAlign
       }
     }
   }
@@ -109,14 +119,26 @@ export function getCustomTheme(chart) {
     // size
     if (customAttr.size) {
       const s = JSON.parse(JSON.stringify(customAttr.size))
+      const h_a = s.tableHeaderAlign ? s.tableHeaderAlign : DEFAULT_SIZE.tableHeaderAlign
+      const i_a = s.tableItemAlign ? s.tableItemAlign : DEFAULT_SIZE.tableItemAlign
+
       theme.cornerCell.bolderText.fontSize = parseInt(s.tableTitleFontSize)
+      theme.cornerCell.bolderText.textAlign = h_a
       theme.cornerCell.text.fontSize = parseInt(s.tableTitleFontSize)
+      theme.cornerCell.text.textAlign = h_a
+
       theme.rowCell.bolderText.fontSize = parseInt(s.tableTitleFontSize)
+      theme.rowCell.bolderText.textAlign = h_a
       theme.rowCell.text.fontSize = parseInt(s.tableTitleFontSize)
+      theme.rowCell.text.textAlign = h_a
+
       theme.colCell.bolderText.fontSize = parseInt(s.tableTitleFontSize)
+      theme.colCell.bolderText.textAlign = h_a
       theme.colCell.text.fontSize = parseInt(s.tableTitleFontSize)
+      theme.colCell.text.textAlign = h_a
 
       theme.dataCell.text.fontSize = parseInt(s.tableItemFontSize)
+      theme.dataCell.text.textAlign = i_a
     }
   }
 
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
index ccc4dbd7d1..07330a78f6 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
@@ -101,6 +101,16 @@
             <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_header_align')" class="form-item">
+          <el-select v-model="sizeForm.tableHeaderAlign" :placeholder="$t('chart.table_header_align')" @change="changeBarSizeCase">
+            <el-option v-for="option in alignOptions" :key="option.value" :label="option.name" :value="option.value" />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="$t('chart.table_item_align')" class="form-item">
+          <el-select v-model="sizeForm.tableItemAlign" :placeholder="$t('chart.table_item_align')" @change="changeBarSizeCase">
+            <el-option v-for="option in alignOptions" :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 form-item-slider">
           <el-slider v-model="sizeForm.tableTitleHeight" :min="20" :max="100" show-input :show-input-controls="false" input-size="mini" @change="changeBarSizeCase" />
         </el-form-item>
@@ -302,7 +312,12 @@ export default {
         { name: '50' + this.$t('chart.table_page_size_unit'), value: '50' },
         { name: '100' + this.$t('chart.table_page_size_unit'), value: '100' }
       ],
-      fontSize: []
+      fontSize: [],
+      alignOptions: [
+        { name: this.$t('chart.table_align_left'), value: 'left' },
+        { name: this.$t('chart.table_align_center'), value: 'center' },
+        { name: this.$t('chart.table_align_right'), value: 'right' }
+      ]
     }
   },
   watch: {
@@ -344,6 +359,9 @@ export default {
 
           this.sizeForm.tableColumnMode = this.sizeForm.tableColumnMode ? this.sizeForm.tableColumnMode : DEFAULT_SIZE.tableColumnMode
           this.sizeForm.tableColumnWidth = this.sizeForm.tableColumnWidth ? this.sizeForm.tableColumnWidth : DEFAULT_SIZE.tableColumnWidth
+
+          this.sizeForm.tableHeaderAlign = this.sizeForm.tableHeaderAlign ? this.sizeForm.tableHeaderAlign : DEFAULT_SIZE.tableHeaderAlign
+          this.sizeForm.tableItemAlign = this.sizeForm.tableItemAlign ? this.sizeForm.tableItemAlign : DEFAULT_SIZE.tableItemAlign
         }
       }
     },

From e1ed447063c7c55b23421b8be41f0fa1247c7da8 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 17 Feb 2022 14:22:30 +0800
Subject: [PATCH 43/47] =?UTF-8?q?refactor:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E5=85=BC=E5=AE=B9=E6=8F=92=E4=BB=B6=E8=A7=86=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/base/domain/ChartView.java    |  43 +--
 .../base/domain/ChartViewExample.java         | 270 +++++++++++++-----
 .../base/domain/ChartViewWithBLOBs.java       |  23 +-
 .../dataease/base/mapper/ChartViewMapper.xml  | 108 ++++---
 .../main/resources/db/migration/V32__1.8.sql  |   3 +
 .../canvas/custom-component/UserView.vue      |  16 +-
 frontend/src/views/chart/group/Group.vue      |  11 +-
 frontend/src/views/chart/view/ChartEdit.vue   |  24 +-
 frontend/src/views/chart/view/ChartType.vue   |  35 ++-
 9 files changed, 355 insertions(+), 178 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/domain/ChartView.java b/backend/src/main/java/io/dataease/base/domain/ChartView.java
index 69777d3f87..569746859c 100644
--- a/backend/src/main/java/io/dataease/base/domain/ChartView.java
+++ b/backend/src/main/java/io/dataease/base/domain/ChartView.java
@@ -1,38 +1,39 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
-
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 @Data
 public class ChartView implements Serializable {
-    @ApiModelProperty("ID")
     private String id;
-    @ApiModelProperty("名称")
+
     private String name;
-    @ApiModelProperty("分组ID")
-    private String sceneId;
-    @ApiModelProperty("数据集ID")
-    private String tableId;
-    @ApiModelProperty("图表类型")
-    private String type;
-    @ApiModelProperty("chart渲染方式")
-    private String render;
-    @ApiModelProperty("展示结果")
-    private Integer resultCount;
-    @ApiModelProperty("展示模式")
-    private String resultMode;
-    @ApiModelProperty("标题")
+
     private String title;
-    @ApiModelProperty("创建人")
+
+    private String sceneId;
+
+    private String tableId;
+
+    private String type;
+
+    private String render;
+
+    private Integer resultCount;
+
+    private String resultMode;
+
     private String createBy;
-    @ApiModelProperty("创建时间")
+
     private Long createTime;
-    @ApiModelProperty("更新时间")
+
     private Long updateTime;
-    @ApiModelProperty("样式优先级")
+
     private String stylePriority;
 
+    private String chartType;
+
+    private Boolean isPlugin;
+
     private static final long serialVersionUID = 1L;
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java
index 9def62d21e..51a45711b1 100644
--- a/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java
+++ b/backend/src/main/java/io/dataease/base/domain/ChartViewExample.java
@@ -244,6 +244,76 @@ public class ChartViewExample {
             return (Criteria) this;
         }
 
+        public Criteria andTitleIsNull() {
+            addCriterion("title is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIsNotNull() {
+            addCriterion("title is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleEqualTo(String value) {
+            addCriterion("title =", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotEqualTo(String value) {
+            addCriterion("title <>", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThan(String value) {
+            addCriterion("title >", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleGreaterThanOrEqualTo(String value) {
+            addCriterion("title >=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThan(String value) {
+            addCriterion("title <", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLessThanOrEqualTo(String value) {
+            addCriterion("title <=", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleLike(String value) {
+            addCriterion("title like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotLike(String value) {
+            addCriterion("title not like", value, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleIn(List<String> values) {
+            addCriterion("title in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotIn(List<String> values) {
+            addCriterion("title not in", values, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleBetween(String value1, String value2) {
+            addCriterion("title between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
+        public Criteria andTitleNotBetween(String value1, String value2) {
+            addCriterion("title not between", value1, value2, "title");
+            return (Criteria) this;
+        }
+
         public Criteria andSceneIdIsNull() {
             addCriterion("scene_id is null");
             return (Criteria) this;
@@ -654,76 +724,6 @@ public class ChartViewExample {
             return (Criteria) this;
         }
 
-        public Criteria andTitleIsNull() {
-            addCriterion("title is null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleIsNotNull() {
-            addCriterion("title is not null");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleEqualTo(String value) {
-            addCriterion("title =", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotEqualTo(String value) {
-            addCriterion("title <>", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleGreaterThan(String value) {
-            addCriterion("title >", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleGreaterThanOrEqualTo(String value) {
-            addCriterion("title >=", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleLessThan(String value) {
-            addCriterion("title <", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleLessThanOrEqualTo(String value) {
-            addCriterion("title <=", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleLike(String value) {
-            addCriterion("title like", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotLike(String value) {
-            addCriterion("title not like", value, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleIn(List<String> values) {
-            addCriterion("title in", values, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotIn(List<String> values) {
-            addCriterion("title not in", values, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleBetween(String value1, String value2) {
-            addCriterion("title between", value1, value2, "title");
-            return (Criteria) this;
-        }
-
-        public Criteria andTitleNotBetween(String value1, String value2) {
-            addCriterion("title not between", value1, value2, "title");
-            return (Criteria) this;
-        }
-
         public Criteria andCreateByIsNull() {
             addCriterion("create_by is null");
             return (Criteria) this;
@@ -983,6 +983,136 @@ public class ChartViewExample {
             addCriterion("style_priority not between", value1, value2, "stylePriority");
             return (Criteria) this;
         }
+
+        public Criteria andChartTypeIsNull() {
+            addCriterion("chart_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeIsNotNull() {
+            addCriterion("chart_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeEqualTo(String value) {
+            addCriterion("chart_type =", value, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeNotEqualTo(String value) {
+            addCriterion("chart_type <>", value, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeGreaterThan(String value) {
+            addCriterion("chart_type >", value, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeGreaterThanOrEqualTo(String value) {
+            addCriterion("chart_type >=", value, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeLessThan(String value) {
+            addCriterion("chart_type <", value, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeLessThanOrEqualTo(String value) {
+            addCriterion("chart_type <=", value, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeLike(String value) {
+            addCriterion("chart_type like", value, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeNotLike(String value) {
+            addCriterion("chart_type not like", value, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeIn(List<String> values) {
+            addCriterion("chart_type in", values, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeNotIn(List<String> values) {
+            addCriterion("chart_type not in", values, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeBetween(String value1, String value2) {
+            addCriterion("chart_type between", value1, value2, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andChartTypeNotBetween(String value1, String value2) {
+            addCriterion("chart_type not between", value1, value2, "chartType");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginIsNull() {
+            addCriterion("is_plugin is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginIsNotNull() {
+            addCriterion("is_plugin is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginEqualTo(Boolean value) {
+            addCriterion("is_plugin =", value, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginNotEqualTo(Boolean value) {
+            addCriterion("is_plugin <>", value, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginGreaterThan(Boolean value) {
+            addCriterion("is_plugin >", value, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginGreaterThanOrEqualTo(Boolean value) {
+            addCriterion("is_plugin >=", value, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginLessThan(Boolean value) {
+            addCriterion("is_plugin <", value, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginLessThanOrEqualTo(Boolean value) {
+            addCriterion("is_plugin <=", value, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginIn(List<Boolean> values) {
+            addCriterion("is_plugin in", values, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginNotIn(List<Boolean> values) {
+            addCriterion("is_plugin not in", values, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_plugin between", value1, value2, "isPlugin");
+            return (Criteria) this;
+        }
+
+        public Criteria andIsPluginNotBetween(Boolean value1, Boolean value2) {
+            addCriterion("is_plugin not between", value1, value2, "isPlugin");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {
diff --git a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
index 6fdd140eac..d928332ac5 100644
--- a/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
+++ b/backend/src/main/java/io/dataease/base/domain/ChartViewWithBLOBs.java
@@ -1,8 +1,6 @@
 package io.dataease.base.domain;
 
 import java.io.Serializable;
-
-import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
@@ -11,27 +9,26 @@ import lombok.ToString;
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 public class ChartViewWithBLOBs extends ChartView implements Serializable {
-    @ApiModelProperty("x轴")
     private String xAxis;
-    @ApiModelProperty("x轴(Row)")
+
     private String xAxisExt;
-    @ApiModelProperty("y轴")
+
     private String yAxis;
-    @ApiModelProperty("副y轴")
+
     private String yAxisExt;
-    @ApiModelProperty("堆叠")
+
     private String extStack;
-    @ApiModelProperty("气泡")
+
     private String extBubble;
-    @ApiModelProperty("图形属性")
+
     private String customAttr;
-    @ApiModelProperty("组件样式")
+
     private String customStyle;
-    @ApiModelProperty("过滤条件")
+
     private String customFilter;
-    @ApiModelProperty("下钻字段")
+
     private String drillFields;
-    @ApiModelProperty("快照")
+
     private String snapshot;
 
     private static final long serialVersionUID = 1L;
diff --git a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
index 5cd892b888..d7e9404ad0 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ChartViewMapper.xml
@@ -4,17 +4,19 @@
   <resultMap id="BaseResultMap" type="io.dataease.base.domain.ChartView">
     <id column="id" jdbcType="VARCHAR" property="id" />
     <result column="name" jdbcType="VARCHAR" property="name" />
+    <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="scene_id" jdbcType="VARCHAR" property="sceneId" />
     <result column="table_id" jdbcType="VARCHAR" property="tableId" />
     <result column="type" jdbcType="VARCHAR" property="type" />
     <result column="render" jdbcType="VARCHAR" property="render" />
     <result column="result_count" jdbcType="INTEGER" property="resultCount" />
     <result column="result_mode" jdbcType="VARCHAR" property="resultMode" />
-    <result column="title" jdbcType="VARCHAR" property="title" />
     <result column="create_by" jdbcType="VARCHAR" property="createBy" />
     <result column="create_time" jdbcType="BIGINT" property="createTime" />
     <result column="update_time" jdbcType="BIGINT" property="updateTime" />
     <result column="style_priority" jdbcType="VARCHAR" property="stylePriority" />
+    <result column="chart_type" jdbcType="VARCHAR" property="chartType" />
+    <result column="is_plugin" jdbcType="BIT" property="isPlugin" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="io.dataease.base.domain.ChartViewWithBLOBs">
     <result column="x_axis" jdbcType="LONGVARCHAR" property="xAxis" />
@@ -88,8 +90,8 @@
     </where>
   </sql>
   <sql id="Base_Column_List">
-    id, `name`, scene_id, table_id, `type`, render, result_count, result_mode, title, 
-    create_by, create_time, update_time, style_priority
+    id, `name`, title, scene_id, table_id, `type`, render, result_count, result_mode, 
+    create_by, create_time, update_time, style_priority, chart_type, is_plugin
   </sql>
   <sql id="Blob_Column_List">
     x_axis, x_axis_ext, y_axis, y_axis_ext, ext_stack, ext_bubble, custom_attr, custom_style, 
@@ -144,24 +146,24 @@
     </if>
   </delete>
   <insert id="insert" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
-    insert into chart_view (id, `name`, scene_id, 
-      table_id, `type`, render, 
-      result_count, result_mode, title, 
+    insert into chart_view (id, `name`, title, 
+      scene_id, table_id, `type`, 
+      render, result_count, result_mode, 
       create_by, create_time, update_time, 
-      style_priority, x_axis, x_axis_ext, 
-      y_axis, y_axis_ext, ext_stack, 
-      ext_bubble, custom_attr, custom_style, 
-      custom_filter, drill_fields, snapshot
-      )
-    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{sceneId,jdbcType=VARCHAR}, 
-      #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, #{render,jdbcType=VARCHAR}, 
-      #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
+      style_priority, chart_type, is_plugin, 
+      x_axis, x_axis_ext, y_axis, 
+      y_axis_ext, ext_stack, ext_bubble, 
+      custom_attr, custom_style, custom_filter, 
+      drill_fields, snapshot)
+    values (#{id,jdbcType=VARCHAR}, #{name,jdbcType=VARCHAR}, #{title,jdbcType=VARCHAR}, 
+      #{sceneId,jdbcType=VARCHAR}, #{tableId,jdbcType=VARCHAR}, #{type,jdbcType=VARCHAR}, 
+      #{render,jdbcType=VARCHAR}, #{resultCount,jdbcType=INTEGER}, #{resultMode,jdbcType=VARCHAR}, 
       #{createBy,jdbcType=VARCHAR}, #{createTime,jdbcType=BIGINT}, #{updateTime,jdbcType=BIGINT}, 
-      #{stylePriority,jdbcType=VARCHAR}, #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, 
-      #{yAxis,jdbcType=LONGVARCHAR}, #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, 
-      #{extBubble,jdbcType=LONGVARCHAR}, #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, 
-      #{customFilter,jdbcType=LONGVARCHAR}, #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR}
-      )
+      #{stylePriority,jdbcType=VARCHAR}, #{chartType,jdbcType=VARCHAR}, #{isPlugin,jdbcType=BIT}, 
+      #{xAxis,jdbcType=LONGVARCHAR}, #{xAxisExt,jdbcType=LONGVARCHAR}, #{yAxis,jdbcType=LONGVARCHAR}, 
+      #{yAxisExt,jdbcType=LONGVARCHAR}, #{extStack,jdbcType=LONGVARCHAR}, #{extBubble,jdbcType=LONGVARCHAR}, 
+      #{customAttr,jdbcType=LONGVARCHAR}, #{customStyle,jdbcType=LONGVARCHAR}, #{customFilter,jdbcType=LONGVARCHAR}, 
+      #{drillFields,jdbcType=LONGVARCHAR}, #{snapshot,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
     insert into chart_view
@@ -172,6 +174,9 @@
       <if test="name != null">
         `name`,
       </if>
+      <if test="title != null">
+        title,
+      </if>
       <if test="sceneId != null">
         scene_id,
       </if>
@@ -190,9 +195,6 @@
       <if test="resultMode != null">
         result_mode,
       </if>
-      <if test="title != null">
-        title,
-      </if>
       <if test="createBy != null">
         create_by,
       </if>
@@ -205,6 +207,12 @@
       <if test="stylePriority != null">
         style_priority,
       </if>
+      <if test="chartType != null">
+        chart_type,
+      </if>
+      <if test="isPlugin != null">
+        is_plugin,
+      </if>
       <if test="xAxis != null">
         x_axis,
       </if>
@@ -246,6 +254,9 @@
       <if test="name != null">
         #{name,jdbcType=VARCHAR},
       </if>
+      <if test="title != null">
+        #{title,jdbcType=VARCHAR},
+      </if>
       <if test="sceneId != null">
         #{sceneId,jdbcType=VARCHAR},
       </if>
@@ -264,9 +275,6 @@
       <if test="resultMode != null">
         #{resultMode,jdbcType=VARCHAR},
       </if>
-      <if test="title != null">
-        #{title,jdbcType=VARCHAR},
-      </if>
       <if test="createBy != null">
         #{createBy,jdbcType=VARCHAR},
       </if>
@@ -279,6 +287,12 @@
       <if test="stylePriority != null">
         #{stylePriority,jdbcType=VARCHAR},
       </if>
+      <if test="chartType != null">
+        #{chartType,jdbcType=VARCHAR},
+      </if>
+      <if test="isPlugin != null">
+        #{isPlugin,jdbcType=BIT},
+      </if>
       <if test="xAxis != null">
         #{xAxis,jdbcType=LONGVARCHAR},
       </if>
@@ -329,6 +343,9 @@
       <if test="record.name != null">
         `name` = #{record.name,jdbcType=VARCHAR},
       </if>
+      <if test="record.title != null">
+        title = #{record.title,jdbcType=VARCHAR},
+      </if>
       <if test="record.sceneId != null">
         scene_id = #{record.sceneId,jdbcType=VARCHAR},
       </if>
@@ -347,9 +364,6 @@
       <if test="record.resultMode != null">
         result_mode = #{record.resultMode,jdbcType=VARCHAR},
       </if>
-      <if test="record.title != null">
-        title = #{record.title,jdbcType=VARCHAR},
-      </if>
       <if test="record.createBy != null">
         create_by = #{record.createBy,jdbcType=VARCHAR},
       </if>
@@ -362,6 +376,12 @@
       <if test="record.stylePriority != null">
         style_priority = #{record.stylePriority,jdbcType=VARCHAR},
       </if>
+      <if test="record.chartType != null">
+        chart_type = #{record.chartType,jdbcType=VARCHAR},
+      </if>
+      <if test="record.isPlugin != null">
+        is_plugin = #{record.isPlugin,jdbcType=BIT},
+      </if>
       <if test="record.xAxis != null">
         x_axis = #{record.xAxis,jdbcType=LONGVARCHAR},
       </if>
@@ -404,17 +424,19 @@
     update chart_view
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
       scene_id = #{record.sceneId,jdbcType=VARCHAR},
       table_id = #{record.tableId,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
       render = #{record.render,jdbcType=VARCHAR},
       result_count = #{record.resultCount,jdbcType=INTEGER},
       result_mode = #{record.resultMode,jdbcType=VARCHAR},
-      title = #{record.title,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
       style_priority = #{record.stylePriority,jdbcType=VARCHAR},
+      chart_type = #{record.chartType,jdbcType=VARCHAR},
+      is_plugin = #{record.isPlugin,jdbcType=BIT},
       x_axis = #{record.xAxis,jdbcType=LONGVARCHAR},
       x_axis_ext = #{record.xAxisExt,jdbcType=LONGVARCHAR},
       y_axis = #{record.yAxis,jdbcType=LONGVARCHAR},
@@ -434,17 +456,19 @@
     update chart_view
     set id = #{record.id,jdbcType=VARCHAR},
       `name` = #{record.name,jdbcType=VARCHAR},
+      title = #{record.title,jdbcType=VARCHAR},
       scene_id = #{record.sceneId,jdbcType=VARCHAR},
       table_id = #{record.tableId,jdbcType=VARCHAR},
       `type` = #{record.type,jdbcType=VARCHAR},
       render = #{record.render,jdbcType=VARCHAR},
       result_count = #{record.resultCount,jdbcType=INTEGER},
       result_mode = #{record.resultMode,jdbcType=VARCHAR},
-      title = #{record.title,jdbcType=VARCHAR},
       create_by = #{record.createBy,jdbcType=VARCHAR},
       create_time = #{record.createTime,jdbcType=BIGINT},
       update_time = #{record.updateTime,jdbcType=BIGINT},
-      style_priority = #{record.stylePriority,jdbcType=VARCHAR}
+      style_priority = #{record.stylePriority,jdbcType=VARCHAR},
+      chart_type = #{record.chartType,jdbcType=VARCHAR},
+      is_plugin = #{record.isPlugin,jdbcType=BIT}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -455,6 +479,9 @@
       <if test="name != null">
         `name` = #{name,jdbcType=VARCHAR},
       </if>
+      <if test="title != null">
+        title = #{title,jdbcType=VARCHAR},
+      </if>
       <if test="sceneId != null">
         scene_id = #{sceneId,jdbcType=VARCHAR},
       </if>
@@ -473,9 +500,6 @@
       <if test="resultMode != null">
         result_mode = #{resultMode,jdbcType=VARCHAR},
       </if>
-      <if test="title != null">
-        title = #{title,jdbcType=VARCHAR},
-      </if>
       <if test="createBy != null">
         create_by = #{createBy,jdbcType=VARCHAR},
       </if>
@@ -488,6 +512,12 @@
       <if test="stylePriority != null">
         style_priority = #{stylePriority,jdbcType=VARCHAR},
       </if>
+      <if test="chartType != null">
+        chart_type = #{chartType,jdbcType=VARCHAR},
+      </if>
+      <if test="isPlugin != null">
+        is_plugin = #{isPlugin,jdbcType=BIT},
+      </if>
       <if test="xAxis != null">
         x_axis = #{xAxis,jdbcType=LONGVARCHAR},
       </if>
@@ -527,17 +557,19 @@
   <update id="updateByPrimaryKeyWithBLOBs" parameterType="io.dataease.base.domain.ChartViewWithBLOBs">
     update chart_view
     set `name` = #{name,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
       scene_id = #{sceneId,jdbcType=VARCHAR},
       table_id = #{tableId,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
       render = #{render,jdbcType=VARCHAR},
       result_count = #{resultCount,jdbcType=INTEGER},
       result_mode = #{resultMode,jdbcType=VARCHAR},
-      title = #{title,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
       style_priority = #{stylePriority,jdbcType=VARCHAR},
+      chart_type = #{chartType,jdbcType=VARCHAR},
+      is_plugin = #{isPlugin,jdbcType=BIT},
       x_axis = #{xAxis,jdbcType=LONGVARCHAR},
       x_axis_ext = #{xAxisExt,jdbcType=LONGVARCHAR},
       y_axis = #{yAxis,jdbcType=LONGVARCHAR},
@@ -554,17 +586,19 @@
   <update id="updateByPrimaryKey" parameterType="io.dataease.base.domain.ChartView">
     update chart_view
     set `name` = #{name,jdbcType=VARCHAR},
+      title = #{title,jdbcType=VARCHAR},
       scene_id = #{sceneId,jdbcType=VARCHAR},
       table_id = #{tableId,jdbcType=VARCHAR},
       `type` = #{type,jdbcType=VARCHAR},
       render = #{render,jdbcType=VARCHAR},
       result_count = #{resultCount,jdbcType=INTEGER},
       result_mode = #{resultMode,jdbcType=VARCHAR},
-      title = #{title,jdbcType=VARCHAR},
       create_by = #{createBy,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=BIGINT},
       update_time = #{updateTime,jdbcType=BIGINT},
-      style_priority = #{stylePriority,jdbcType=VARCHAR}
+      style_priority = #{stylePriority,jdbcType=VARCHAR},
+      chart_type = #{chartType,jdbcType=VARCHAR},
+      is_plugin = #{isPlugin,jdbcType=BIT}
     where id = #{id,jdbcType=VARCHAR}
   </update>
 </mapper>
\ No newline at end of file
diff --git a/backend/src/main/resources/db/migration/V32__1.8.sql b/backend/src/main/resources/db/migration/V32__1.8.sql
index 1a1c8cc3a2..7657d638ed 100644
--- a/backend/src/main/resources/db/migration/V32__1.8.sql
+++ b/backend/src/main/resources/db/migration/V32__1.8.sql
@@ -310,3 +310,6 @@ delete from chart_group where id in (
 
 ALTER TABLE `panel_link_mapping`
 ADD COLUMN `uuid` varchar(8) NULL COMMENT 'uuid' AFTER `user_id`;
+
+ALTER TABLE `chart_view`
+ADD COLUMN `is_plugin` bit(1) NULL COMMENT '是否插件' AFTER `chart_type`;
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index a2f3bd3cd1..6162ddc46a 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -17,7 +17,7 @@
       </div>
     </div>
     <plugin-com
-      v-if="isPlugin"
+      v-if="chart.isPlugin"
       :ref="element.propValue.id"
       :component-name="chart.type + '-view'"
       :obj="{chart, trackMenu, searchCount, terminalType: scaleCoefficientType}"
@@ -89,7 +89,6 @@ import ChartComponentG2 from '@/views/chart/components/ChartComponentG2'
 import EditBarView from '@/components/canvas/components/Editor/EditBarView'
 import { customAttrTrans, customStyleTrans, recursionTransObj } from '@/components/canvas/utils/style'
 import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
-import { pluginTypes } from '@/api/chart/chart'
 import PluginCom from '@/views/system/plugin/PluginCom'
 export default {
   name: 'UserView',
@@ -162,9 +161,7 @@ export default {
       pre: null,
       preCanvasPanel: null,
       sourceCustomAttrStr: null,
-      sourceCustomStyleStr: null,
-      isPlugin: false,
-      plugins: []
+      sourceCustomStyleStr: null
     }
   },
   computed: {
@@ -332,7 +329,7 @@ export default {
       }
     },
     'chartType': function(newVal, oldVal) {
-      this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
+      // this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
       if (newVal === 'map' && newVal !== oldVal) {
         this.initAreas()
       }
@@ -347,12 +344,7 @@ export default {
       deep: true
     }
   },
-  beforeCreate() {
-    pluginTypes().then(res => {
-      this.plugins = res.data
-      this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
-    })
-  },
+
   created() {
     this.refId = uuid.v1
     if (this.element && this.element.propValue && this.element.propValue.viewId) {
diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 6207b3e8a0..f90c4f38b1 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -218,7 +218,7 @@
                 v-model="view.type"
                 style="width: 100%"
               >
-                <chart-type :chart="view" style="height: 350px;" />
+                <chart-type ref="cu-chart-type" :chart="view" style="height: 350px;" />
               </el-radio-group>
             </div>
           </el-row>
@@ -420,6 +420,11 @@ export default {
       currentKey: null
     }
   },
+  computed: {
+    chartType() {
+      return this.view.type
+    }
+  },
   watch: {
     saveStatus() {
     },
@@ -436,6 +441,9 @@ export default {
     searchType(val) {
       this.searchPids = []
       this.$refs.chartTreeRef.filter(this.filterText)
+    },
+    chartType(val) {
+      this.view.isPlugin = val && this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(val)
     }
 
   },
@@ -733,6 +741,7 @@ export default {
       view.sceneId = this.currGroup.id
       view.tableId = this.table.id
       view.type = this.view.type
+      view.isPlugin = this.view.isPlugin
       view.render = this.view.render
       view.resultMode = 'custom'
       view.resultCount = 1000
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index e7c85caaa6..0d94a7d8e5 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -160,7 +160,7 @@
                                 :disabled="!hasDataPermission('manage',param.privileges)"
                                 @change="changeChartType()"
                               >
-                                <chart-type :chart="view" style="height: 480px" />
+                                <chart-type ref="cu-chart-type" :chart="view" style="height: 480px" />
                               </el-radio-group>
                             </div>
                           </el-row>
@@ -220,7 +220,7 @@
                     </el-row>
                   </el-row>
 
-                  <plugin-com v-if="isPlugin" :component-name="view.type + '-data'" :obj="{view, param, chart}" />
+                  <plugin-com v-if="view.isPlugin" :component-name="view.type + '-data'" :obj="{view, param, chart}" />
                   <div v-else>
 
                     <el-row v-if="view.type ==='map'" class="padding-lr">
@@ -820,7 +820,7 @@
         <el-row style="width: 100%;height: 100%;" class="padding-lr">
           <div ref="imageWrapper" style="height: 100%">
             <plugin-com
-              v-if="httpRequest.status && chart.type && isPlugin"
+              v-if="httpRequest.status && chart.type && view.isPlugin"
               :component-name="chart.type + '-view'"
               :obj="{chart}"
               class="chart-class"
@@ -1055,7 +1055,6 @@ import { compareItem } from '@/views/chart/chart/compare'
 import ChartComponentS2 from '@/views/chart/components/ChartComponentS2'
 import DimensionExtItem from '@/views/chart/components/drag-item/DimensionExtItem'
 import PluginCom from '@/views/system/plugin/PluginCom'
-import { pluginTypes } from '@/api/chart/chart'
 export default {
   name: 'ChartEdit',
   components: {
@@ -1143,7 +1142,8 @@ export default {
           split: DEFAULT_SPLIT
         },
         customFilter: [],
-        render: 'antv'
+        render: 'antv',
+        isPlugin: false
       },
       moveId: -1,
       chart: {
@@ -1190,9 +1190,8 @@ export default {
       drill: false,
       hasEdit: false,
       quotaItemCompare: {},
-      showEditQuotaCompare: false,
-      plugins: [],
-      isPlugin: false
+      showEditQuotaCompare: false
+
     }
   },
   computed: {
@@ -1213,7 +1212,7 @@ export default {
       this.fieldFilter(val)
     },
     'chartType': function(newVal, oldVal) {
-      this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
+      this.view.isPlugin = this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(newVal)
       if (newVal === 'map' && newVal !== oldVal) {
         this.initAreas()
       }
@@ -1232,12 +1231,7 @@ export default {
   },
   activated() {
   },
-  beforeCreate() {
-    pluginTypes().then(res => {
-      this.plugins = res.data
-      this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
-    })
-  },
+
   methods: {
     bindPluginEvent() {
       bus.$on('show-dimension-edit-filter', this.showDimensionEditFilter)
diff --git a/frontend/src/views/chart/view/ChartType.vue b/frontend/src/views/chart/view/ChartType.vue
index b52e190f6b..b270062578 100644
--- a/frontend/src/views/chart/view/ChartType.vue
+++ b/frontend/src/views/chart/view/ChartType.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="chart-type">
+  <div v-if="loadFinish" class="chart-type">
     <div v-for="(renderItem, category) in renderMap[chart.render]" :key="category">
       <el-divider class="chart-type-divider">{{ $t(category) }}</el-divider>
 
@@ -38,21 +38,38 @@ export default {
   data() {
     return {
       defaultTypes: TYPE_CONFIGS,
-      allTypes: [],
-      renderMap: {}
+      renderMap: {},
+      loadFinish: false
     }
   },
-  beforeCreate() {
-    pluginTypes().then(res => {
-      const plugins = res.data
+  created() {
+    const plugins = localStorage.getItem('plugin-views') && JSON.parse(localStorage.getItem('plugin-views'))
+    if (plugins) {
+      this.initTypes(plugins)
+    } else {
+      pluginTypes().then(res => {
+        const plugins = res.data
+        localStorage.setItem('plugin-views', JSON.stringify(plugins))
+        this.initTypes(plugins)
+      }).catch(e => {
+        localStorage.setItem('plugin-views', null)
+        this.initTypes([])
+      })
+    }
+  },
+  methods: {
+    currentIsPlugin(type) {
+      const plugins = localStorage.getItem('plugin-views') && JSON.parse(localStorage.getItem('plugin-views')) || []
+      return plugins.some(plugin => plugin.value === type)
+    },
+    initTypes(plugins) {
       plugins.forEach(plugin => {
         plugin.isPlugin = true
       })
       this.pluginTypes = [...this.defaultTypes, ...plugins]
       this.formatTypes()
-    })
-  },
-  methods: {
+      this.loadFinish = true
+    },
     formatTypes() {
       this.pluginTypes.forEach(item => {
         const { render, category } = item

From 4671ea996e111143cb3697e35496cab609ff8f3f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 17 Feb 2022 18:39:44 +0800
Subject: [PATCH 44/47] =?UTF-8?q?feat:=20=E5=85=BC=E5=AE=B9=E6=8F=92?=
 =?UTF-8?q?=E4=BB=B6=E8=A7=86=E5=9B=BE=E6=A0=B7=E5=BC=8F=E8=AE=BE=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/AsyncComponent/index.vue  | 15 +++++++++++----
 .../canvas/custom-component/UserView.vue          |  9 ++++++++-
 frontend/src/views/chart/view/ChartEdit.vue       | 12 +++++++++++-
 frontend/src/views/system/plugin/PluginCom.vue    | 10 ++++++++--
 4 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/AsyncComponent/index.vue b/frontend/src/components/AsyncComponent/index.vue
index 09dd19ef4c..67779ffafb 100644
--- a/frontend/src/components/AsyncComponent/index.vue
+++ b/frontend/src/components/AsyncComponent/index.vue
@@ -1,14 +1,15 @@
 <template>
   <component
     :is="mode"
+    :ref="refId"
+    :obj="obj"
     v-bind="$attrs"
     v-on="$listeners"
-    :obj="obj"
   />
 </template>
 
 <script>
-
+import { uuid } from 'vue-uuid'
 import { get } from '@/api/system/dynamic'
 
 export default {
@@ -28,7 +29,8 @@ export default {
   data() {
     return {
       resData: '',
-      mode: ''
+      mode: '',
+      refId: null
     }
   },
   watch: {
@@ -59,8 +61,13 @@ export default {
       }
     }
   },
+  created() {
+    this.refId = uuid.v1
+  },
   methods: {
-
+    chartResize() {
+      this.$refs[this.refId] && this.$refs[this.refId].chartResize && this.$refs[this.refId].chartResize()
+    }
   }
 }
 </script>
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 6162ddc46a..947e4d7d89 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -76,7 +76,7 @@ import ChartComponent from '@/views/chart/components/ChartComponent.vue'
 import TableNormal from '@/views/chart/components/table/TableNormal'
 import LabelNormal from '../../../views/chart/components/normal/LabelNormal'
 import { uuid } from 'vue-uuid'
-
+import bus from '@/utils/bus'
 import { mapState } from 'vuex'
 import { isChange } from '@/utils/conditionUtil'
 import { BASE_CHART_STRING } from '@/views/chart/chart/chart'
@@ -164,6 +164,9 @@ export default {
       sourceCustomStyleStr: null
     }
   },
+  mounted() {
+    this.bindPluginEvent()
+  },
   computed: {
     scaleCoefficient() {
       if (this.terminal === 'pc' && !this.mobileLayoutStatus) {
@@ -354,6 +357,10 @@ export default {
     }
   },
   methods: {
+    bindPluginEvent() {
+      bus.$on('plugin-chart-click', this.chartClick)
+      bus.$on('plugin-jump-click', this.jumpClick)
+    },
     // 根据仪表板的缩放比例，修改视图内部参数
     mergeScale() {
       const scale = Math.min(this.previewCanvasScale.scalePointWidth, this.previewCanvasScale.scalePointHeight) * this.scaleCoefficient
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 0d94a7d8e5..916aa15627 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -220,7 +220,7 @@
                     </el-row>
                   </el-row>
 
-                  <plugin-com v-if="view.isPlugin" :component-name="view.type + '-data'" :obj="{view, param, chart}" />
+                  <plugin-com v-if="view.isPlugin" :component-name="view.type + '-data'" :obj="{view, param, chart, dimensionData, quotaData}" />
                   <div v-else>
 
                     <el-row v-if="view.type ==='map'" class="padding-lr">
@@ -591,7 +591,15 @@
         </el-tab-pane>
         <el-tab-pane :label="$t('chart.chart_style')" class="padding-tab" style="width: 360px;">
           <el-row class="view-panel">
+            <plugin-com
+              v-if="view.isPlugin"
+              style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;width: 100%;"
+              class="attr-style theme-border-class"
+              :component-name="view.type + '-style'"
+              :obj="{view, param, chart}"
+            />
             <div
+              v-else
               style="overflow:auto;border-right: 1px solid #e6e6e6;height: 100%;width: 100%;"
               class="attr-style theme-border-class"
             >
@@ -1238,7 +1246,9 @@ export default {
       bus.$on('show-rename', this.showRename)
       bus.$on('show-quota-edit-filter', this.showQuotaEditFilter)
       bus.$on('show-quota-edit-compare', this.showQuotaEditCompare)
+      bus.$on('show-edit-filter', this.showEditFilter)
       bus.$on('calc-data', this.calcData)
+      bus.$on('plugins-calc-style', this.calcStyle)
     },
     initTableData(id) {
       if (id != null) {
diff --git a/frontend/src/views/system/plugin/PluginCom.vue b/frontend/src/views/system/plugin/PluginCom.vue
index fc555d3ccc..040863b621 100644
--- a/frontend/src/views/system/plugin/PluginCom.vue
+++ b/frontend/src/views/system/plugin/PluginCom.vue
@@ -2,6 +2,7 @@
   <div>
     <async-component
       v-if="showAsync"
+      :ref="refId"
       :url="url"
       :obj="obj"
       @execute-axios="executeAxios"
@@ -19,7 +20,7 @@ import AsyncComponent from '@/components/AsyncComponent'
 import i18n from '@/lang'
 import bus from '@/utils/bus'
 import { execute } from '@/api/system/dynamic'
-
+import { uuid } from 'vue-uuid'
 export default {
   name: 'PluginCom',
   components: {
@@ -39,10 +40,12 @@ export default {
     return {
       showAsync: false,
       baseUrl: '/api/pluginCommon/component/',
-      url: null
+      url: null,
+      refId: null
     }
   },
   created() {
+    this.refId = uuid.v1
     if (this.componentName) {
       this.showAsync = true
       this.url = this.baseUrl + this.componentName
@@ -75,6 +78,9 @@ export default {
     pluginCallBack(param) {
       const { eventName, eventParam } = param
       bus.$emit(eventName, eventParam)
+    },
+    chartResize() {
+      this.$refs[this.refId] && this.$refs[this.refId].chartResize && this.$refs[this.refId].chartResize()
     }
   }
 }

From 4e19debe21b57691ce27c347bdd301c8f5ece059 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 18 Feb 2022 10:45:02 +0800
Subject: [PATCH 45/47] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E7=BB=93?=
 =?UTF-8?q?=E6=9E=9C=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 916aa15627..0b59744444 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1284,16 +1284,10 @@ export default {
     buildParam(getData, trigger, needRefreshGroup = false, switchType = false) {
       if (!this.view.resultCount ||
           this.view.resultCount === '' ||
-          this.view.resultCount.length > 4 ||
           isNaN(Number(this.view.resultCount)) ||
           String(this.view.resultCount).includes('.') ||
           parseInt(this.view.resultCount) < 1) {
-        this.$message({
-          message: this.$t('dataset.pls_input_less_5'),
-          type: 'error',
-          showClose: true
-        })
-        return
+        this.view.resultCount = '1000'
       }
       if (switchType && (this.view.type === 'table-info' || this.chart.type === 'table-info') && this.view.xaxis.length > 0) {
         this.$message({

From cfc01bf46c9e666686db1546e34845c62530eb2b Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Fri, 18 Feb 2022 16:49:49 +0800
Subject: [PATCH 46/47] =?UTF-8?q?feat:=20=E8=A7=86=E5=9B=BE=E6=9D=83?=
 =?UTF-8?q?=E9=99=90=E8=B7=9F=E9=9A=8F=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../BackgroundColorSelector.vue               |  2 +-
 .../component-style/LegendSelector.vue        |  2 +-
 .../component-style/LegendSelectorAntV.vue    |  2 +-
 .../component-style/SplitSelector.vue         |  2 +-
 .../component-style/SplitSelectorAntV.vue     |  2 +-
 .../component-style/TitleSelector.vue         |  2 +-
 .../component-style/TitleSelectorAntV.vue     |  2 +-
 .../component-style/XAxisSelector.vue         |  2 +-
 .../component-style/XAxisSelectorAntV.vue     |  2 +-
 .../component-style/YAxisExtSelector.vue      |  2 +-
 .../component-style/YAxisExtSelectorAntV.vue  |  2 +-
 .../component-style/YAxisSelector.vue         |  2 +-
 .../component-style/YAxisSelectorAntV.vue     |  2 +-
 .../components/drag-item/ChartDragItem.vue    | 18 +-------------
 .../components/drag-item/DimensionExtItem.vue | 17 +------------
 .../components/drag-item/DimensionItem.vue    | 17 +------------
 .../chart/components/drag-item/DrillItem.vue  | 14 +----------
 .../chart/components/drag-item/FilterItem.vue | 12 +---------
 .../components/drag-item/QuotaExtItem.vue     | 20 +---------------
 .../chart/components/drag-item/QuotaItem.vue  | 20 +---------------
 .../components/shape-attr/ColorSelector.vue   |  3 +--
 .../components/shape-attr/LabelSelector.vue   |  4 ++--
 .../shape-attr/LabelSelectorAntV.vue          |  4 ++--
 .../components/shape-attr/SizeSelector.vue    | 24 +++++++++----------
 .../shape-attr/SizeSelectorAntV.vue           | 24 +++++++++----------
 .../components/shape-attr/TooltipSelector.vue |  2 +-
 .../shape-attr/TooltipSelectorAntV.vue        |  2 +-
 27 files changed, 51 insertions(+), 156 deletions(-)

diff --git a/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue b/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
index 3ee96ded4d..d51a1ed91c 100644
--- a/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
+++ b/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini" :disabled="param && !hasDataPermission('manage',param.privileges)">
+      <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.color')" class="form-item">
           <el-color-picker v-model="colorForm.color" class="color-picker-style" :predefine="predefineColors" @change="changeBackgroundStyle" />
         </el-form-item>
diff --git a/frontend/src/views/chart/components/component-style/LegendSelector.vue b/frontend/src/views/chart/components/component-style/LegendSelector.vue
index 48508bf452..87d475e4cb 100644
--- a/frontend/src/views/chart/components/component-style/LegendSelector.vue
+++ b/frontend/src/views/chart/components/component-style/LegendSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="legendForm" :model="legendForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/LegendSelectorAntV.vue b/frontend/src/views/chart/components/component-style/LegendSelectorAntV.vue
index 1b8fc02722..12ceb1d4ae 100644
--- a/frontend/src/views/chart/components/component-style/LegendSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/LegendSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="legendForm" :model="legendForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/SplitSelector.vue b/frontend/src/views/chart/components/component-style/SplitSelector.vue
index 3d932d27a9..12055a69d6 100644
--- a/frontend/src/views/chart/components/component-style/SplitSelector.vue
+++ b/frontend/src/views/chart/components/component-style/SplitSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="splitForm" :model="splitForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/SplitSelectorAntV.vue b/frontend/src/views/chart/components/component-style/SplitSelectorAntV.vue
index 3a6854fdc1..69ad6ae232 100644
--- a/frontend/src/views/chart/components/component-style/SplitSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/SplitSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="splitForm" :model="splitForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue
index 9b4e430084..7ef8543423 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelector.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="titleForm" :model="titleForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
index a2937bee6c..758ad7820b 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="titleForm" :model="titleForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/XAxisSelector.vue b/frontend/src/views/chart/components/component-style/XAxisSelector.vue
index 2706619bce..e47a232526 100644
--- a/frontend/src/views/chart/components/component-style/XAxisSelector.vue
+++ b/frontend/src/views/chart/components/component-style/XAxisSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
index 10d81c10c4..26a0e70bb4 100644
--- a/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/XAxisSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/YAxisExtSelector.vue b/frontend/src/views/chart/components/component-style/YAxisExtSelector.vue
index 6ed7b72151..8d8e3564d8 100644
--- a/frontend/src/views/chart/components/component-style/YAxisExtSelector.vue
+++ b/frontend/src/views/chart/components/component-style/YAxisExtSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue b/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue
index 9fc47388aa..602f3173b5 100644
--- a/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/YAxisExtSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/YAxisSelector.vue b/frontend/src/views/chart/components/component-style/YAxisSelector.vue
index d981c1879b..9530e3ad09 100644
--- a/frontend/src/views/chart/components/component-style/YAxisSelector.vue
+++ b/frontend/src/views/chart/components/component-style/YAxisSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue b/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue
index f13242255c..ae83346a3c 100644
--- a/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue
+++ b/frontend/src/views/chart/components/component-style/YAxisSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="axisForm" :model="axisForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
index da927853f9..7b6ba842d9 100644
--- a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
+++ b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
@@ -1,22 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
-      <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>
-      <field-error-tips v-if="tagType === 'danger'" />
-      <span v-if="item.summary" class="summary-span">{{ $t('chart.'+item.summary) }}</span>
-      <span v-if="item.deType === 1" class="summary-span">
-        {{ $t('chart.' + item.dateStyle) }}
-      </span>
-    </el-tag>
-    <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis" :type="tagType">
           <span style="float: left">
diff --git a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
index f2859ecb4d..747a916ae1 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionExtItem.vue
@@ -1,21 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
-      <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>
-      <field-error-tips v-if="tagType === 'danger'" />
-      <span v-if="item.deType === 1" class="summary-span">
-        {{ $t('chart.' + item.dateStyle) }}
-      </span>
-    </el-tag>
-    <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis" :type="tagType">
           <span style="float: left">
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index 24599853a4..45a6f436a3 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -1,21 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
-      <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>
-      <field-error-tips v-if="tagType === 'danger'" />
-      <span v-if="item.deType === 1" class="summary-span">
-        {{ $t('chart.' + item.dateStyle) }}
-      </span>
-    </el-tag>
-    <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis" :type="tagType">
           <span style="float: left">
diff --git a/frontend/src/views/chart/components/drag-item/DrillItem.vue b/frontend/src/views/chart/components/drag-item/DrillItem.vue
index 740b60d71f..5e24b37397 100644
--- a/frontend/src/views/chart/components/drag-item/DrillItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DrillItem.vue
@@ -1,18 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
-      <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>
-      <field-error-tips v-if="tagType === 'danger'" />
-    </el-tag>
-    <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis" :type="tagType">
           <span style="float: left">
diff --git a/frontend/src/views/chart/components/drag-item/FilterItem.vue b/frontend/src/views/chart/components/drag-item/FilterItem.vue
index 2bdfc59f21..600de8f41c 100644
--- a/frontend/src/views/chart/components/drag-item/FilterItem.vue
+++ b/frontend/src/views/chart/components/drag-item/FilterItem.vue
@@ -1,16 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
-      <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" />
-      </span>
-      <span class="item-span-style" :title="item.name">{{ item.name }}</span>
-      <field-error-tips v-if="tagType === 'danger'" />
-    </el-tag>
-    <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis" :type="tagType">
           <span style="float: left">
diff --git a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
index b9d54ba434..28c0ed9cdf 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
@@ -1,24 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
-      <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="chart.type ==='chart-mix' && item.chartType === 'bar'" icon-class="bar" class-name="field-icon-sort" />
-        <svg-icon v-if="chart.type ==='chart-mix' && item.chartType === 'line'" icon-class="line" class-name="field-icon-sort" />
-        <svg-icon v-if="chart.type ==='chart-mix' && item.chartType === 'scatter'" icon-class="scatter" class-name="field-icon-sort" />
-        <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>
-      <field-error-tips v-if="tagType === 'danger'" />
-      <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
-        {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
-      </span>
-    </el-tag>
-    <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis" :type="tagType">
           <span style="float: left">
diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
index 98db334d05..5fada430df 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
@@ -1,24 +1,6 @@
 <template>
   <span>
-    <el-tag v-if="!hasDataPermission('manage',param.privileges)" size="small" class="item-axis" :type="tagType">
-      <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="chart.type ==='chart-mix' && item.chartType === 'bar'" icon-class="bar" class-name="field-icon-sort" />
-        <svg-icon v-if="chart.type ==='chart-mix' && item.chartType === 'line'" icon-class="line" class-name="field-icon-sort" />
-        <svg-icon v-if="chart.type ==='chart-mix' && item.chartType === 'scatter'" icon-class="scatter" class-name="field-icon-sort" />
-        <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>
-      <field-error-tips v-if="tagType === 'danger'" />
-      <span v-if="chart.type !== 'table-info' && item.summary" class="summary-span">
-        {{ $t('chart.' + item.summary) }}<span v-if="item.compareCalc && item.compareCalc.type && item.compareCalc.type !== '' && item.compareCalc.type !== 'none'">-{{ $t('chart.' + item.compareCalc.type) }}</span>
-      </span>
-    </el-tag>
-    <el-dropdown v-else trigger="click" size="mini" @command="clickItem">
+    <el-dropdown trigger="click" size="mini" @command="clickItem">
       <span class="el-dropdown-link">
         <el-tag size="small" class="item-axis" :type="tagType">
           <span style="float: left">
diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
index 97178ce053..eaf684e362 100644
--- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
@@ -1,14 +1,13 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini" :disabled="param && !hasDataPermission('manage',param.privileges)">
+      <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-popover
               placement="bottom"
               width="400"
               trigger="click"
-              :disabled="param && !hasDataPermission('manage',param.privileges)"
             >
               <div style="padding: 6px 10px;">
                 <div>
diff --git a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
index 54258414cf..9b1d2645bc 100644
--- a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%;">
     <el-col>
-      <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 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>
@@ -39,7 +39,7 @@
         </div>
       </el-form>
 
-      <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 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>
diff --git a/frontend/src/views/chart/components/shape-attr/LabelSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/LabelSelectorAntV.vue
index 50142634b7..9015d13366 100644
--- a/frontend/src/views/chart/components/shape-attr/LabelSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/LabelSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%;">
     <el-col>
-      <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 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>
@@ -25,7 +25,7 @@
         </div>
       </el-form>
 
-      <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 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>
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index 892ea3bd90..5fe74d9514 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <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 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>
@@ -13,7 +13,7 @@
         </el-form-item>
       </el-form>
 
-      <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 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>
@@ -44,7 +44,7 @@
         <!--        </el-form-item>-->
       </el-form>
 
-      <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 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>
@@ -65,13 +65,13 @@
         </span>
       </el-form>
 
-      <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 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" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <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>
@@ -83,7 +83,7 @@
         </el-form-item>
       </el-form>
 
-      <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 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" />
@@ -112,7 +112,7 @@
         </el-form-item>
       </el-form>
 
-      <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 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>
@@ -127,7 +127,7 @@
         </el-form-item>
       </el-form>
 
-      <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 v-show="chart.type && chart.type.includes('text')" ref="sizeFormPie" :model="sizeForm" label-width="100px" size="mini">
         <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" />
@@ -146,7 +146,7 @@
         </el-form-item>
       </el-form>
 
-      <el-form v-show="chart.type && chart.type.includes('scatter')" ref="sizeFormLine" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('scatter')" ref="sizeFormLine" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.bubble_symbol')" class="form-item">
           <el-select v-model="sizeForm.scatterSymbol" :placeholder="$t('chart.line_symbol')" @change="changeBarSizeCase">
             <el-option
@@ -162,7 +162,7 @@
         </el-form-item>
       </el-form>
 
-      <el-form v-show="chart.type && chart.type === 'treemap'" ref="sizeFormLine" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type === 'treemap'" ref="sizeFormLine" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.width')" class="form-item form-item-slider">
           <el-slider v-model="sizeForm.treemapWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />
         </el-form-item>
@@ -171,7 +171,7 @@
         </el-form-item>
       </el-form>
 
-      <el-form v-show="chart.type && chart.type === 'chart-mix'" ref="sizeFormBar" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type === 'chart-mix'" ref="sizeFormBar" :model="sizeForm" label-width="80px" size="mini">
         <el-divider content-position="center" class="divider-style">{{ $t('chart.chart_bar') }}</el-divider>
         <el-form-item :label="$t('chart.adapt')" class="form-item">
           <el-checkbox v-model="sizeForm.barDefault" @change="changeBarSizeCase">{{ $t('chart.adapt') }}</el-checkbox>
@@ -227,7 +227,7 @@
         </el-form-item>
       </el-form>
 
-      <el-form v-show="chart.type && chart.type === 'liquid'" ref="sizeFormLine" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type === 'liquid'" ref="sizeFormLine" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.liquid_shape')" class="form-item">
           <el-select v-model="sizeForm.liquidShape" :placeholder="$t('chart.liquid_shape')" @change="changeBarSizeCase">
             <el-option
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
index 07330a78f6..ebe711e1c2 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <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 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>
@@ -13,7 +13,7 @@
         </el-form-item>
       </el-form>
 
-      <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 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>
@@ -41,7 +41,7 @@
         </el-form-item>
       </el-form>
 
-      <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 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_percent')" 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>
@@ -62,13 +62,13 @@
         <!--        </span>-->
       </el-form>
 
-      <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 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" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <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>
@@ -80,7 +80,7 @@
         </el-form-item>
       </el-form>
 
-      <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 v-show="chart.type && chart.type.includes('table')" ref="sizeFormPie" :model="sizeForm" label-width="100px" size="mini">
         <el-form-item v-show="chart.type && chart.type === 'table-info'" :label="$t('chart.table_page_size')" class="form-item">
           <el-select v-model="sizeForm.tablePageSize" :placeholder="$t('chart.table_page_size')" @change="changeBarSizeCase">
             <el-option
@@ -138,7 +138,7 @@
         </el-form-item>
       </el-form>
 
-      <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 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>-->
@@ -153,7 +153,7 @@
         </el-form-item>
       </el-form>
 
-      <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 v-show="chart.type && chart.type.includes('text')" ref="sizeFormPie" :model="sizeForm" label-width="100px" size="mini">
         <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" />
@@ -172,7 +172,7 @@
         </el-form-item>
       </el-form>
 
-      <el-form v-show="chart.type && chart.type.includes('scatter')" ref="sizeFormLine" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type.includes('scatter')" ref="sizeFormLine" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.bubble_symbol')" class="form-item">
           <el-select v-model="sizeForm.scatterSymbol" :placeholder="$t('chart.line_symbol')" @change="changeBarSizeCase">
             <el-option
@@ -188,7 +188,7 @@
         </el-form-item>
       </el-form>
 
-      <el-form v-show="chart.type && chart.type === 'treemap'" ref="sizeFormLine" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type === 'treemap'" ref="sizeFormLine" :model="sizeForm" label-width="80px" size="mini">
         <!--        <el-form-item :label="$t('chart.width')" class="form-item form-item-slider">-->
         <!--          <el-slider v-model="sizeForm.treemapWidth" show-input :show-input-controls="false" input-size="mini" :min="0" :max="100" @change="changeBarSizeCase" />-->
         <!--        </el-form-item>-->
@@ -197,7 +197,7 @@
         <!--        </el-form-item>-->
       </el-form>
 
-      <el-form v-show="chart.type && chart.type === 'chart-mix'" ref="sizeFormBar" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type === 'chart-mix'" ref="sizeFormBar" :model="sizeForm" label-width="80px" size="mini">
         <el-divider content-position="center" class="divider-style">{{ $t('chart.chart_bar') }}</el-divider>
         <el-form-item :label="$t('chart.adapt')" class="form-item">
           <el-checkbox v-model="sizeForm.barDefault" @change="changeBarSizeCase">{{ $t('chart.adapt') }}</el-checkbox>
@@ -253,7 +253,7 @@
         </el-form-item>
       </el-form>
 
-      <el-form v-show="chart.type && chart.type === 'liquid'" ref="sizeFormLine" :disabled="param && !hasDataPermission('manage',param.privileges)" :model="sizeForm" label-width="80px" size="mini">
+      <el-form v-show="chart.type && chart.type === 'liquid'" ref="sizeFormLine" :model="sizeForm" label-width="80px" size="mini">
         <el-form-item :label="$t('chart.liquid_shape')" class="form-item">
           <el-select v-model="sizeForm.liquidShape" :placeholder="$t('chart.liquid_shape')" @change="changeBarSizeCase">
             <el-option
diff --git a/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue b/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
index 3804118b83..a66584501e 100644
--- a/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="tooltipForm" :model="tooltipForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>
diff --git a/frontend/src/views/chart/components/shape-attr/TooltipSelectorAntV.vue b/frontend/src/views/chart/components/shape-attr/TooltipSelectorAntV.vue
index 99732aa68b..914e2e639a 100644
--- a/frontend/src/views/chart/components/shape-attr/TooltipSelectorAntV.vue
+++ b/frontend/src/views/chart/components/shape-attr/TooltipSelectorAntV.vue
@@ -1,7 +1,7 @@
 <template>
   <div style="width: 100%">
     <el-col>
-      <el-form ref="tooltipForm" :model="tooltipForm" label-width="80px" size="mini" :disabled="!hasDataPermission('manage',param.privileges)">
+      <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>

From c1ec061127464ded8107dd0762af02a96eefc6d3 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 18 Feb 2022 17:44:16 +0800
Subject: [PATCH 47/47] =?UTF-8?q?refactor:=20=E5=AE=8C=E5=96=84=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E6=8F=92=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/AsyncComponent/index.vue   |  6 ++-
 .../canvas/custom-component/UserView.vue      | 50 +++++++++++++++----
 frontend/src/views/chart/view/ChartEdit.vue   | 47 ++++++++++-------
 .../src/views/system/plugin/PluginCom.vue     |  5 +-
 4 files changed, 76 insertions(+), 32 deletions(-)

diff --git a/frontend/src/components/AsyncComponent/index.vue b/frontend/src/components/AsyncComponent/index.vue
index 67779ffafb..7c0b613372 100644
--- a/frontend/src/components/AsyncComponent/index.vue
+++ b/frontend/src/components/AsyncComponent/index.vue
@@ -65,8 +65,12 @@ export default {
     this.refId = uuid.v1
   },
   methods: {
-    chartResize() {
+    /* chartResize() {
       this.$refs[this.refId] && this.$refs[this.refId].chartResize && this.$refs[this.refId].chartResize()
+    }, */
+    callPluginInner(param) {
+      const { methodName, methodParam } = param
+      this.$refs[this.refId] && this.$refs[this.refId][methodName] && this.$refs[this.refId][methodName](methodParam)
     }
   }
 }
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index 947e4d7d89..a17634a791 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -298,7 +298,9 @@ export default {
         }
         // 如果gap有变化刷新
         if (this.preCanvasPanel && this.preCanvasPanel.gap !== newVal.panel.gap) {
-          this.$refs[this.element.propValue.id].chartResize()
+          this.chart.isPlugin
+            ? this.$refs[this.element.propValue.id].callPluginInner({ methodName: 'chartResize' })
+            : this.$refs[this.element.propValue.id].chartResize()
         }
         this.preCanvasPanel = deepCopy(newVal.panel)
       },
@@ -313,7 +315,9 @@ export default {
             this.changeIndex++
             this.chartResize(this.changeIndex)
           } else {
-            this.$refs[this.element.propValue.id].chartResize()
+            this.chart.isPlugin
+              ? this.$refs[this.element.propValue.id].callPluginInner({ methodName: 'chartResize' })
+              : this.$refs[this.element.propValue.id].chartResize()
           }
         }
       },
@@ -333,7 +337,7 @@ export default {
     },
     'chartType': function(newVal, oldVal) {
       // this.isPlugin = this.plugins.some(plugin => plugin.value === this.chart.type)
-      if (newVal === 'map' && newVal !== oldVal) {
+      if ((newVal === 'map' || newVal === 'buddle-map') && newVal !== oldVal) {
         this.initAreas()
       }
     },
@@ -360,6 +364,10 @@ export default {
     bindPluginEvent() {
       bus.$on('plugin-chart-click', this.chartClick)
       bus.$on('plugin-jump-click', this.jumpClick)
+      bus.$on('plugin-add-view-track-filter', this.addViewTrackFilter)
+    },
+    addViewTrackFilter(linkageParam) {
+      this.$store.commit('addViewTrackFilter', linkageParam)
     },
     // 根据仪表板的缩放比例，修改视图内部参数
     mergeScale() {
@@ -477,7 +485,7 @@ export default {
 
     chartClick(param) {
       if (this.drillClickDimensionList.length < this.chart.drillFields.length - 1) {
-        this.chart.type === 'map' && this.sendToChildren(param)
+        (this.chart.type === 'map' || this.chart.type === 'buddle-map') && this.sendToChildren(param)
         this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
         this.getData(this.element.propValue.viewId)
       } else if (this.chart.drillFields.length > 0) {
@@ -547,17 +555,22 @@ export default {
     resetDrill() {
       const length = this.drillClickDimensionList.length
       this.drillClickDimensionList = []
-      if (this.chart.type === 'map') {
+      if (this.chart.type === 'map' || this.chart.type === 'buddle-map') {
         this.backToParent(0, length)
         const current = this.$refs[this.element.propValue.id]
-        current && current.registerDynamicMap && current.registerDynamicMap(null)
+
+        if (this.chart.isPlugin) {
+          current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: null })
+        } else {
+          current && current.registerDynamicMap && current.registerDynamicMap(null)
+        }
       }
     },
 
     drillJump(index) {
       const length = this.drillClickDimensionList.length
       this.drillClickDimensionList = this.drillClickDimensionList.slice(0, index)
-      if (this.chart.type === 'map') {
+      if (this.chart.type === 'map' || this.chart.type === 'buddle-map') {
         this.backToParent(index, length)
       }
       this.getData(this.element.propValue.viewId)
@@ -576,7 +589,11 @@ export default {
 
       this.currentAcreaNode = tempNode
       const current = this.$refs[this.element.propValue.id]
-      current && current.registerDynamicMap && current.registerDynamicMap(this.currentAcreaNode.code)
+      if (this.chart.isPlugin) {
+        current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: this.currentAcreaNode.code })
+      } else {
+        current && current.registerDynamicMap && current.registerDynamicMap(this.currentAcreaNode.code)
+      }
     },
 
     // 切换下一级地图
@@ -593,7 +610,11 @@ export default {
         const nextNode = currentNode.children.find(item => item.name === name)
         this.currentAcreaNode = nextNode
         const current = this.$refs[this.element.propValue.id]
-        nextNode && current && current.registerDynamicMap && current.registerDynamicMap(nextNode.code)
+        if (this.chart.isPlugin) {
+          nextNode && current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: nextNode.code })
+        } else {
+          nextNode && current && current.registerDynamicMap && current.registerDynamicMap(nextNode.code)
+        }
       }
     },
 
@@ -622,7 +643,12 @@ export default {
       const areaNode = this.findEntityByname(name, [])
       if (!areaNode) return
       const current = this.$refs[this.element.propValue.id]
-      current && current.registerDynamicMap && current.registerDynamicMap(areaNode.code)
+
+      if (this.chart.isPlugin) {
+        current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: areaNode.code })
+      } else {
+        current && current.registerDynamicMap && current.registerDynamicMap(areaNode.code)
+      }
     },
     // 根据地名获取areaCode
     findEntityByname(name, array) {
@@ -650,7 +676,9 @@ export default {
       if (this.$refs[this.element.propValue.id]) {
         this.timeMachine = setTimeout(() => {
           if (index === this.changeIndex) {
-            this.$refs[this.element.propValue.id].chartResize()
+            this.chart.isPlugin
+              ? this.$refs[this.element.propValue.id].callPluginInner({ methodName: 'chartResize' })
+              : this.$refs[this.element.propValue.id].chartResize()
           }
           this.destroyTimeMachine()
         }, 50)
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 916aa15627..600bf77536 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -829,6 +829,7 @@
           <div ref="imageWrapper" style="height: 100%">
             <plugin-com
               v-if="httpRequest.status && chart.type && view.isPlugin"
+              ref="dynamicChart"
               :component-name="chart.type + '-view'"
               :obj="{chart}"
               class="chart-class"
@@ -1221,7 +1222,7 @@ export default {
     },
     'chartType': function(newVal, oldVal) {
       this.view.isPlugin = this.$refs['cu-chart-type'] && this.$refs['cu-chart-type'].currentIsPlugin(newVal)
-      if (newVal === 'map' && newVal !== oldVal) {
+      if ((newVal === 'map' || newVal === 'buddle-map') && newVal !== oldVal) {
         this.initAreas()
       }
       this.$emit('typeChange', newVal)
@@ -1249,6 +1250,7 @@ export default {
       bus.$on('show-edit-filter', this.showEditFilter)
       bus.$on('calc-data', this.calcData)
       bus.$on('plugins-calc-style', this.calcStyle)
+      bus.$on('plugin-chart-click', this.chartClick)
     },
     initTableData(id) {
       if (id != null) {
@@ -2102,7 +2104,7 @@ export default {
     chartClick(param) {
       if (this.drillClickDimensionList.length < this.view.drillFields.length - 1) {
         // const isSwitch = (this.chart.type === 'map' && this.sendToChildren(param))
-        if (this.chart.type === 'map') {
+        if (this.chart.type === 'map' || this.chart.type === 'buddle-map') {
           if (this.sendToChildren(param)) {
             this.drillClickDimensionList.push({ dimensionList: param.data.dimensionList })
             // this.getData(this.param.id)
@@ -2125,16 +2127,22 @@ export default {
     resetDrill() {
       const length = this.drillClickDimensionList.length
       this.drillClickDimensionList = []
-      if (this.chart.type === 'map') {
+      if (this.chart.type === 'map' || this.chart.type === 'buddle-map') {
         this.backToParent(0, length)
         this.currentAcreaNode = null
-        this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(null)
+        const current = this.$refs.dynamicChart
+        if (this.view.isPlugin) {
+          current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: null })
+        } else {
+          current && current.registerDynamicMap && current.registerDynamicMap(null)
+        }
+        // this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(null)
       }
     },
     drillJump(index) {
       const length = this.drillClickDimensionList.length
       this.drillClickDimensionList = this.drillClickDimensionList.slice(0, index)
-      if (this.chart.type === 'map') {
+      if (this.chart.type === 'map' || this.chart.type === 'buddle-map') {
         this.backToParent(index, length)
       }
 
@@ -2154,7 +2162,13 @@ export default {
       }
 
       this.currentAcreaNode = tempNode
-      this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(this.currentAcreaNode.code)
+      // this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(this.currentAcreaNode.code)
+      const current = this.$refs.dynamicChart
+      if (this.view.isPlugin) {
+        current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: this.currentAcreaNode.code })
+      } else {
+        current && current.registerDynamicMap && current.registerDynamicMap(this.currentAcreaNode.code)
+      }
     },
 
     // 切换下一级地图
@@ -2172,22 +2186,17 @@ export default {
         if (!nextNode || !nextNode.code) return null
         // this.view.customAttr.areaCode = nextNode.code
         this.currentAcreaNode = nextNode
-        this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(nextNode.code)
+        // this.$refs.dynamicChart && this.$refs.dynamicChart.registerDynamicMap && this.$refs.dynamicChart.registerDynamicMap(nextNode.code)
+        const current = this.$refs.dynamicChart
+        if (this.view.isPlugin) {
+          nextNode && current && current.callPluginInner({ methodName: 'registerDynamicMap', methodParam: nextNode.code })
+        } else {
+          nextNode && current && current.registerDynamicMap && current.registerDynamicMap(nextNode.code)
+        }
         return nextNode
       }
     },
-    // 根据地名获取areaCode
-    // findEntityByname(name, array) {
-    //   if (array === null || array.length === 0) array = this.places
-    //   for (let index = 0; index < array.length; index++) {
-    //     const node = array[index]
-    //     if (node.name === name) return node
-    //     if (node.children && node.children.length > 0) {
-    //       const temp = this.findEntityByname(name, node.children)
-    //       if (temp) return temp
-    //     }
-    //   }
-    // }
+
     findEntityByCode(code, array) {
       if (array === null || array.length === 0) array = this.places
       for (let index = 0; index < array.length; index++) {
diff --git a/frontend/src/views/system/plugin/PluginCom.vue b/frontend/src/views/system/plugin/PluginCom.vue
index 040863b621..e75548225c 100644
--- a/frontend/src/views/system/plugin/PluginCom.vue
+++ b/frontend/src/views/system/plugin/PluginCom.vue
@@ -79,8 +79,11 @@ export default {
       const { eventName, eventParam } = param
       bus.$emit(eventName, eventParam)
     },
-    chartResize() {
+    /* chartResize() {
       this.$refs[this.refId] && this.$refs[this.refId].chartResize && this.$refs[this.refId].chartResize()
+    }, */
+    callPluginInner(param) {
+      this.$refs[this.refId] && this.$refs[this.refId].callPluginInner && this.$refs[this.refId].callPluginInner(param)
     }
   }
 }