From a89e722e201de8e2b87ed4ab052f89197b4820b9 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Mon, 21 Nov 2022 14:41:01 +0800
Subject: [PATCH 01/25] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE-AntV=E6=8A=98?=
 =?UTF-8?q?=E7=BA=BF=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D=E5=A4=9A=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E6=8A=98=E7=BA=BF=E5=9B=BE=E6=8E=A7=E5=88=B6=E5=A4=84?=
 =?UTF-8?q?=E7=90=86=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

修复多维度折线图在主维度和子维度一样且空值策略为置 0
时显示异常
https://www.tapd.cn/55578866/bugtrace/bugs/view/1155578866001019910
---
 frontend/src/views/chart/chart/util.js | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index ca04a3124f..37dd7d4dc1 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -3398,15 +3398,18 @@ function handleSetZeroMultiDimension(chart, data) {
   let insertCount = 0
   dimensionInfoMap.forEach((dimensionInfo, field) => {
     if (dimensionInfo.set.size < subDimensionSet.size) {
-      const toBeFillDimension = [...subDimensionSet].filter(item => !dimensionInfo.set.has(item))
-      toBeFillDimension.forEach(dimension => {
-        data.splice(dimensionInfo.index + insertCount, 0, {
-          field,
-          value: 0,
-          category: dimension
-        })
+      let subInsertIndex = 0
+      subDimensionSet.forEach(dimension => {
+        if (!dimensionInfo.set.has(dimension)) {
+          data.splice(dimensionInfo.index + insertCount + subInsertIndex, 0, {
+            field,
+            value: 0,
+            category: dimension
+          })
+        }
+        subInsertIndex++
       })
-      insertCount += toBeFillDimension.size
+      insertCount += subDimensionSet.size - dimensionInfo.set.size
     }
   })
 }

From 8dca4400c129a58752fadbc068bb847b99f50e3f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 22 Nov 2022 18:55:25 +0800
Subject: [PATCH 02/25] =?UTF-8?q?feat:=20=E6=97=A5=E6=9C=9F=E6=A0=BC?=
 =?UTF-8?q?=E5=BC=8F=E7=9A=84=E6=94=AF=E6=8C=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableFieldController.java  | 29 ++++++-
 .../response/DatasetTableField4Type.java      |  6 +-
 .../dto/dataset/DatasetTableFieldDTO.java     |  3 +
 .../main/resources/db/migration/V44__1.17.sql |  3 +
 frontend/src/views/dataset/data/FieldEdit.vue | 85 ++++++++++++-------
 5 files changed, 89 insertions(+), 37 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java
index 8b3f97c1e2..e7b0514e1b 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableFieldController.java
@@ -13,6 +13,7 @@ import io.dataease.commons.exception.DEException;
 import io.dataease.controller.request.dataset.DataSetTableRequest;
 import io.dataease.controller.request.dataset.MultFieldValuesRequest;
 import io.dataease.controller.response.DatasetTableField4Type;
+import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.dataease.i18n.Translator;
 import io.dataease.plugins.common.base.domain.DatasetTable;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
@@ -106,9 +107,33 @@ public class DataSetTableFieldController {
         DatasetTableField datasetTableField = DatasetTableField.builder().build();
         datasetTableField.setTableId(tableId);
         datasetTableField.setGroupType("d");
-        List<DatasetTableField> dimensionList = dataSetTableFieldsService.list(datasetTableField);
+        List<DatasetTableFieldDTO> dimensionList = new ArrayList<>();
+        dataSetTableFieldsService.list(datasetTableField).forEach(o -> {
+            DatasetTableFieldDTO datasetTableFieldDTO = new DatasetTableFieldDTO();
+            BeanUtils.copyProperties(o, datasetTableFieldDTO);
+            List<Object> deTypeCascader = new ArrayList<>();
+            deTypeCascader.add(datasetTableFieldDTO.getDeType());
+            if (datasetTableFieldDTO.getDeExtractType() == 0 && datasetTableFieldDTO.getDeType() == 1) {
+                deTypeCascader.add(datasetTableFieldDTO.getDateFormatType());
+            }
+            datasetTableFieldDTO.setDeTypeCascader(deTypeCascader);
+            dimensionList.add(datasetTableFieldDTO);
+        });
+
+
         datasetTableField.setGroupType("q");
-        List<DatasetTableField> quotaList = dataSetTableFieldsService.list(datasetTableField);
+        List<DatasetTableFieldDTO> quotaList = new ArrayList<>();
+        dataSetTableFieldsService.list(datasetTableField).forEach(o -> {
+            DatasetTableFieldDTO datasetTableFieldDTO = new DatasetTableFieldDTO();
+            BeanUtils.copyProperties(o, datasetTableFieldDTO);
+            List<Object> deTypeCascader = new ArrayList<>();
+            deTypeCascader.add(datasetTableFieldDTO.getDeType());
+            if (datasetTableFieldDTO.getDeExtractType() == 0 && datasetTableFieldDTO.getDeType() == 1) {
+                deTypeCascader.add(datasetTableFieldDTO.getDateFormatType());
+            }
+            datasetTableFieldDTO.setDeTypeCascader(deTypeCascader);
+            quotaList.add(datasetTableFieldDTO);
+        });
 
         DatasetTableField4Type datasetTableField4Type = new DatasetTableField4Type();
         datasetTableField4Type.setDimensionList(dimensionList);
diff --git a/backend/src/main/java/io/dataease/controller/response/DatasetTableField4Type.java b/backend/src/main/java/io/dataease/controller/response/DatasetTableField4Type.java
index 5f1081716a..8dbc9421cf 100644
--- a/backend/src/main/java/io/dataease/controller/response/DatasetTableField4Type.java
+++ b/backend/src/main/java/io/dataease/controller/response/DatasetTableField4Type.java
@@ -1,6 +1,6 @@
 package io.dataease.controller.response;
 
-import io.dataease.plugins.common.base.domain.DatasetTableField;
+import io.dataease.dto.dataset.DatasetTableFieldDTO;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -9,7 +9,7 @@ import java.util.List;
 @Data
 public class DatasetTableField4Type {
     @ApiModelProperty("维度")
-    List<DatasetTableField> dimensionList;
+    List<DatasetTableFieldDTO> dimensionList;
     @ApiModelProperty("指标")
-    List<DatasetTableField> quotaList;
+    List<DatasetTableFieldDTO> quotaList;
 }
diff --git a/backend/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java b/backend/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java
index 83a65cb94d..f1455ae21d 100644
--- a/backend/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java
+++ b/backend/src/main/java/io/dataease/dto/dataset/DatasetTableFieldDTO.java
@@ -3,7 +3,10 @@ package io.dataease.dto.dataset;
 import io.dataease.plugins.common.base.domain.DatasetTableField;
 import lombok.Data;
 
+import java.util.List;
+
 @Data
 public class DatasetTableFieldDTO extends DatasetTableField {
     private String jsonPath;
+    private List<Object> deTypeCascader;
 }
diff --git a/backend/src/main/resources/db/migration/V44__1.17.sql b/backend/src/main/resources/db/migration/V44__1.17.sql
index 30b3206948..f1cfbc3ad7 100644
--- a/backend/src/main/resources/db/migration/V44__1.17.sql
+++ b/backend/src/main/resources/db/migration/V44__1.17.sql
@@ -39,3 +39,6 @@ WHERE (`component` = 'msg/setting');
 
 ALTER TABLE `panel_group`
     ADD COLUMN `panel_sort` bigint(13) NULL COMMENT '排序' AFTER `watermark_open`;
+
+ALTER TABLE `dataset_table_field`
+    ADD COLUMN `date_format_type` VARCHAR(255) NULL COMMENT '时间格式类型' AFTER `date_format`;
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index dc35dffd72..90591d6124 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -136,24 +136,24 @@
             </template>
           </el-table-column>
           <el-table-column
-            property="deType"
+            property="deTypeCascader"
             :label="$t('dataset.field_type')"
             min-width="200"
           >
             <template slot-scope="scope">
               <el-cascader
-                v-model="scope.row.deType"
+                v-model="scope.row.deTypeCascader"
                 size="small"
                 popper-class="select-date-resolution-format"
                 :disabled="!hasDataPermission('manage', param.privileges)"
                 class="select-type"
-                :options="fields"
+                :options="getFields(scope.row)"
                 @visible-change="getPopPosition"
                 @change="saveEdit(scope.row)"
               >
                 <template slot-scope="{ node, data }">
                   <span
-                    v-if="node.level === 2 && node.label === '%Y-%m-%d'"
+                    v-if="node.level === 2"
                     class="format-title"
                     :style="popPosition"
                   >{{ $t('chart.date_format') }}</span>
@@ -214,16 +214,16 @@
                   />
                 </span>
               </span>
-              <!--              <el-input-->
-              <!--                v-if="scope.row.deType === 1"-->
-              <!--                v-model="scope.row.dateFormat"-->
-              <!--                :placeholder="$t('dataset.date_format')"-->
-              <!--                size="small"-->
-              <!--                class="input-type"-->
-              <!--                :disabled="!hasDataPermission('manage', param.privileges)"-->
-              <!--                @blur="saveEdit(scope.row)"-->
-              <!--                @keyup.enter.native="saveEdit(scope.row)"-->
-              <!--              />-->
+              <el-input
+                v-if="scope.row.deType === 1 && scope.row.deExtractType === 0"
+                v-model="scope.row.dateFormat"
+                :placeholder="$t('dataset.date_format')"
+                size="small"
+                class="input-type"
+                :disabled="!hasDataPermission('manage', param.privileges)"
+                @blur="saveEdit(scope.row)"
+                @keyup.enter.native="saveEdit(scope.row)"
+              />
             </template>
           </el-table-column>
           <el-table-column
@@ -476,24 +476,24 @@
             </template>
           </el-table-column>
           <el-table-column
-            property="deType"
+            property="deTypeCascader"
             :label="$t('dataset.field_type')"
             min-width="200"
           >
             <template slot-scope="scope">
               <el-cascader
-                v-model="scope.row.deType"
+                v-model="scope.row.deTypeCascader"
                 size="small"
                 popper-class="select-date-resolution-format"
                 :disabled="!hasDataPermission('manage', param.privileges)"
                 class="select-type"
-                :options="fields"
+                :options="getFields(scope.row)"
                 @visible-change="getPopPosition"
                 @change="saveEdit(scope.row)"
               >
                 <template slot-scope="{ node, data }">
                   <span
-                    v-if="node.level === 2 && node.label === '%Y-%m-%d'"
+                    v-if="node.level === 2"
                     class="format-title"
                     :style="popPosition"
                   >{{ $t('chart.date_format') }}</span>
@@ -554,16 +554,16 @@
                   />
                 </span>
               </span>
-              <!--              <el-input-->
-              <!--                v-if="scope.row.deType === 1"-->
-              <!--                v-model="scope.row.dateFormat"-->
-              <!--                :placeholder="$t('dataset.date_format')"-->
-              <!--                size="small"-->
-              <!--                class="input-type"-->
-              <!--                :disabled="!hasDataPermission('manage', param.privileges)"-->
-              <!--                @blur="saveEdit(scope.row)"-->
-              <!--                @keyup.enter.native="saveEdit(scope.row)"-->
-              <!--              />-->
+              <el-input
+                v-if="scope.row.deType === 1 && scope.row.deExtractType === 0"
+                v-model="scope.row.dateFormat"
+                :placeholder="$t('dataset.date_format')"
+                size="small"
+                class="input-type"
+                :disabled="!hasDataPermission('manage', param.privileges)"
+                @blur="saveEdit(scope.row)"
+                @keyup.enter.native="saveEdit(scope.row)"
+              />
             </template>
           </el-table-column>
           <el-table-column
@@ -771,7 +771,7 @@ export default {
         quotaListData: []
       },
       popPosition: {},
-      fields: [],
+      dateformats: [],
       fieldActiveNames: ['d', 'q'],
       searchField: '',
       editCalcField: false,
@@ -835,24 +835,45 @@ export default {
       dateformats(this.param.id).then((response) => {
         const children = (response?.data || []).map(ele => ({ label: ele.dateformat, value: ele.dateformat }))
         children.push({ label: '自定义', value: 'custom' })
-        this.fields = [
+        this.dateformats = children
+      })
+    },
+    getFields(item) {
+      if(item.deExtractType == 0){
+        const children = this.dateformats
+        return [
           { label: this.$t('dataset.text'), value: 0 },
           { label: this.$t('dataset.time'), value: 1, children },
           { label: this.$t('dataset.value'), value: 2 },
           {
             label:
-            this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')',
+              this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')',
             value: 3
           },
           { label: this.$t('dataset.location'), value: 5 }
         ]
-      })
+      }else {
+        return [
+          { label: this.$t('dataset.text'), value: 0 },
+          { label: this.$t('dataset.time'), value: 1 },
+          { label: this.$t('dataset.value'), value: 2 },
+          { label: this.$t('dataset.value') + '(' + this.$t('dataset.float') + ')', value: 3 },
+          { label: this.$t('dataset.location'), value: 5 }
+        ]
+      }
     },
     saveEdit(item) {
       if (item.name && item.name.length > 50) {
         this.$message.error(this.$t('dataset.field_name_less_50'))
         return
       }
+      item.deType = item.deTypeCascader[0]
+      if (item.deTypeCascader.length === 2) { // 时间
+        item.dateFormatType = item.deTypeCascader[1]
+        if(item.dateFormatType !== 'custom'){
+          item.dateFormat = item.dateFormatType
+        }
+      }
 
       post('/dataset/field/save', item)
         .then((response) => {

From 234a4780242be7077e313bd686b034e2aa0dd353 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Tue, 22 Nov 2022 20:43:11 +0800
Subject: [PATCH 03/25] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E9=80=8F?=
 =?UTF-8?q?=E8=A7=86=E8=A1=A8=E8=A1=8C=E6=B1=87=E6=80=BB=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E6=8C=89=E5=90=88=E8=AE=A1=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/chart/table/table-info.js   |  4 ++--
 .../chart/components/shapeAttr/TotalCfg.vue     | 17 +++++++++++++++--
 2 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js
index 3d12c5cc62..63f044588f 100644
--- a/frontend/src/views/chart/chart/table/table-info.js
+++ b/frontend/src/views/chart/chart/table/table-info.js
@@ -424,7 +424,7 @@ export function baseTablePivot(s2, container, chart, action, tableData) {
 
   // 解析合计、小计排序
   const sortParams = []
-  if (totalCfg.row.totalSort && totalCfg.row.totalSort !== 'none' && c.length > 0 && totalCfg.row.showGrandTotals) {
+  if (totalCfg.row.totalSort && totalCfg.row.totalSort !== 'none' && c.length > 0 && totalCfg.row.showGrandTotals && v.indexOf(totalCfg.row.totalSortField) > -1) {
     const sort = {
       sortFieldId: c[0],
       sortMethod: totalCfg.row.totalSort.toUpperCase(),
@@ -436,7 +436,7 @@ export function baseTablePivot(s2, container, chart, action, tableData) {
     sortParams.push(sort)
   }
   totalCfg.col.totalSort = false
-  if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0 && totalCfg.col.showGrandTotals) {
+  if (totalCfg.col.totalSort && totalCfg.col.totalSort !== 'none' && r.length > 0 && totalCfg.col.showGrandTotals && v.indexOf(totalCfg.col.totalSortField) > -1) {
     const sort = {
       sortFieldId: r[0],
       sortMethod: totalCfg.col.totalSort.toUpperCase(),
diff --git a/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue b/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
index 49ef97efe2..d7160abd24 100644
--- a/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
+++ b/frontend/src/views/chart/components/shapeAttr/TotalCfg.vue
@@ -422,12 +422,15 @@ export default {
           this.totalSortFields = JSON.parse(chart.yaxis)
         }
         if (this.totalSortFields.length > 0) {
-          if (this.totalForm.row.totalSortField === '') {
+          if (this.resetTotalSort(this.totalForm.row.totalSortField)) {
             this.totalForm.row.totalSortField = this.totalSortFields[0].dataeaseName
           }
-          if (this.totalForm.col.totalSortField === '') {
+          if (this.resetTotalSort(this.totalForm.col.totalSortField)) {
             this.totalForm.col.totalSortField = this.totalSortFields[0].dataeaseName
           }
+        } else {
+          this.totalForm.row.totalSortField = ''
+          this.totalForm.col.totalSortField = ''
         }
       }
     },
@@ -437,6 +440,16 @@ export default {
     },
     showProperty(property) {
       return this.propertyInner.includes(property)
+    },
+    resetTotalSort(field) {
+      if (field === '') {
+        return true
+      }
+      const sortFieldList = []
+      this.totalSortFields.forEach(ele => {
+        sortFieldList.push(ele.dataeaseName)
+      })
+      return sortFieldList.indexOf(field) === -1
     }
   }
 }

From 164d398ca50d65afecbf974255aa014233c75aba Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 23 Nov 2022 11:32:47 +0800
Subject: [PATCH 04/25] =?UTF-8?q?feat(=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?):=20=E5=AF=8C=E6=96=87=E6=9C=AC=E7=BC=96=E8=BE=91=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../sechedule/strategy/impl/EmailTaskHandler.java   | 13 ++++++-------
 .../strategy/impl/EmailTaskViewHandler.java         |  7 ++-----
 .../dataease/plugins/server/XEmailTaskServer.java   |  6 +++++-
 .../src/main/resources/db/migration/V44__1.17.sql   |  7 +++++++
 4 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
index e0ce934228..da97c6c019 100644
--- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
+++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskHandler.java
@@ -41,6 +41,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.quartz.*;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
+import org.springframework.web.util.HtmlUtils;
 
 import javax.annotation.Resource;
 import java.io.File;
@@ -67,9 +68,7 @@ public class EmailTaskHandler extends TaskHandler implements Job {
     protected JobDataMap jobDataMap(GlobalTaskEntity taskEntity) {
         JobDataMap jobDataMap = new JobDataMap();
         jobDataMap.put("taskEntity", taskEntity);
-        EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
-        XpackEmailTemplateDTO emailTemplateDTO = emailXpackService.emailTemplate(taskEntity.getTaskId());
-        jobDataMap.put("emailTemplate", emailTemplateDTO);
+
         SysUserEntity creator = authUserServiceImpl.getUserByIdNoCache(taskEntity.getCreator());
         jobDataMap.put("creator", creator);
         return jobDataMap;
@@ -109,10 +108,9 @@ public class EmailTaskHandler extends TaskHandler implements Job {
         Long instanceId = saveInstance(taskInstance);
         taskInstance.setInstanceId(instanceId);
 
-        XpackEmailTemplateDTO emailTemplate = (XpackEmailTemplateDTO) jobDataMap.get("emailTemplate");
         SysUserEntity creator = (SysUserEntity) jobDataMap.get("creator");
         LogUtil.info("start execute send panel report task...");
-        proxy(taskEntity.getTaskType()).sendReport(taskInstance, emailTemplate, creator, isTempTask);
+        proxy(taskEntity.getTaskType()).sendReport(taskInstance, creator, isTempTask);
         if (isTempTask) {
             removeTask(scheduleManager, taskEntity);
         }
@@ -160,13 +158,14 @@ public class EmailTaskHandler extends TaskHandler implements Job {
     }
 
     @Async("priorityExecutor")
-    public void sendReport(GlobalTaskInstance taskInstance, XpackEmailTemplateDTO emailTemplateDTO, SysUserEntity user, Boolean isTempTask) {
+    public void sendReport(GlobalTaskInstance taskInstance, SysUserEntity user, Boolean isTempTask) {
 
         EmailXpackService emailXpackService = SpringContextUtil.getBean(EmailXpackService.class);
         AuthUserServiceImpl userService = SpringContextUtil.getBean(AuthUserServiceImpl.class);
         SysUserService sysUserService = SpringContextUtil.getBean(SysUserService.class);
         List<File> files = null;
         try {
+            XpackEmailTemplateDTO emailTemplateDTO = emailXpackService.emailTemplate(taskInstance.getTaskId());
             XpackEmailTaskRequest taskForm = emailXpackService.taskForm(taskInstance.getTaskId());
             if (ObjectUtils.isEmpty(taskForm) || (!isTempTask && CronUtils.taskExpire(taskForm.getEndTime()))) {
                 removeInstance(taskInstance);
@@ -202,7 +201,7 @@ public class EmailTaskHandler extends TaskHandler implements Job {
 
             String contentStr = "";
             if (ObjectUtils.isNotEmpty(content)) {
-                contentStr = new String(content, "UTF-8");
+                contentStr = HtmlUtils.htmlUnescape(new String(content, "UTF-8"));
             }
 
 
diff --git a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskViewHandler.java b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskViewHandler.java
index 5eff2cb4eb..79a53d3120 100644
--- a/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskViewHandler.java
+++ b/backend/src/main/java/io/dataease/job/sechedule/strategy/impl/EmailTaskViewHandler.java
@@ -4,20 +4,17 @@ import io.dataease.auth.entity.SysUserEntity;
 
 import io.dataease.plugins.common.entity.GlobalTaskInstance;
 
-import io.dataease.plugins.xpack.email.dto.response.XpackEmailTemplateDTO;
 
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 
 @Service("emailTaskViewHandler")
 public class EmailTaskViewHandler extends EmailTaskHandler {
 
 
     @Async("priorityExecutor")
-    public void sendReport(GlobalTaskInstance taskInstance, XpackEmailTemplateDTO emailTemplateDTO, SysUserEntity user, Boolean isTempTask) {
-        super.sendReport(taskInstance, emailTemplateDTO, user, isTempTask);
+    public void sendReport(GlobalTaskInstance taskInstance, SysUserEntity user, Boolean isTempTask) {
+        super.sendReport(taskInstance, user, isTempTask);
     }
 }
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 1609e13d27..ecd35e8214 100644
--- a/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
+++ b/backend/src/main/java/io/dataease/plugins/server/XEmailTaskServer.java
@@ -28,6 +28,7 @@ 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.*;
+import org.springframework.web.util.HtmlUtils;
 import springfox.documentation.annotations.ApiIgnore;
 
 import java.io.*;
@@ -136,6 +137,9 @@ public class XEmailTaskServer {
             String emailContent;
             try {
                 emailContent = new String(bytes, "UTF-8");
+                if (StringUtils.isNotBlank(emailContent)) {
+                    emailContent = HtmlUtils.htmlUnescape(emailContent);
+                }
             } catch (Exception e) {
                 throw new RuntimeException(e);
             }
@@ -176,7 +180,7 @@ public class XEmailTaskServer {
         }
         String imageUrl = "/system/ui/image/" + fileId;
         String html = "<div>" +
-                "<h2>" + content + "</h2>" +
+                content +
                 "<img style='width: 100%;' id='" + panelId + "' src='" + imageUrl + "' />" +
                 "</div>";
 
diff --git a/backend/src/main/resources/db/migration/V44__1.17.sql b/backend/src/main/resources/db/migration/V44__1.17.sql
index 30b3206948..c8f6bdb2f3 100644
--- a/backend/src/main/resources/db/migration/V44__1.17.sql
+++ b/backend/src/main/resources/db/migration/V44__1.17.sql
@@ -39,3 +39,10 @@ WHERE (`component` = 'msg/setting');
 
 ALTER TABLE `panel_group`
     ADD COLUMN `panel_sort` bigint(13) NULL COMMENT '排序' AFTER `watermark_open`;
+
+
+
+
+ALTER TABLE `sys_task_email`
+    CHANGE COLUMN `content` `content` MEDIUMBLOB NULL DEFAULT NULL COMMENT '内容' ;
+

From b87630e364e56e285dcd1e6097f3b8942e07320e Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 23 Nov 2022 11:46:09 +0800
Subject: [PATCH 05/25] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=BB=AA=E8=A1=A8=E6=9D=BF=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=A1=A8=E6=A0=BC=E7=AD=89=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E7=9A=84=E8=87=AA=E9=80=82=E5=BA=94=E7=BC=A9=E6=94=BE=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F=EF=BC=8C=E9=98=B2=E6=AD=A2=E7=BB=84=E4=BB=B6=E5=9C=A8?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=8D=E5=90=8C=E5=88=86=E8=BE=A8?=
 =?UTF-8?q?=E7=8E=87=E4=B8=8B=E7=BB=84=E4=BB=B6=E5=A4=A7=E5=B0=8F=E4=B8=8D?=
 =?UTF-8?q?=E9=80=82=E9=85=8D=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/ComponentWrapper.vue    |   6 +-
 .../canvas/components/editor/Preview.vue      |   2 +-
 .../src/components/dataease/DeOutWidget.vue   |  20 ++-
 .../chart/components/ChartComponentS2.vue     |  61 +++++---
 .../chart/components/table/TableNormal.vue    | 145 +++++++++++-------
 5 files changed, 160 insertions(+), 74 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 45a0b017b1..4a757dd5fc 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -201,12 +201,16 @@ export default {
     componentActiveFlag() {
       return !this.mobileLayoutStatus && ((this.curComponent && this.config === this.curComponent && !this.previewVisible && !this.showPosition.includes('email-task')) || this.showPosition.includes('multiplexing'))
     },
+    scale() {
+      return Math.min(this.previewCanvasScale.scalePointWidth, this.previewCanvasScale.scalePointHeight)
+    },
     curGap() {
-      return (this.canvasStyleData.panel.gap === 'yes' && this.config.auxiliaryMatrix) ? this.componentGap : 0
+      return ((this.canvasStyleData.panel.gap === 'yes' && this.config.auxiliaryMatrix) ? this.componentGap : 0) * this.scale
     },
     ...mapState([
       'mobileLayoutStatus',
       'curComponent',
+      'previewCanvasScale',
       'componentGap'
     ])
   },
diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index 4ad3d7717a..7c523fe88c 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/frontend/src/components/canvas/components/editor/Preview.vue
@@ -552,7 +552,7 @@ export default {
               component.style[key] = this.format(component.style[key], this.scaleHeight)
             }
             if (this.needToChangeWidth.includes(key)) {
-              if (key === 'fontSize' && this.terminal === 'mobile') {
+              if (key === 'fontSize' && (this.terminal === 'mobile' || component.type === 'custom')) {
                 // do nothing 移动端字符大小无需按照比例缩放，当前保持不变(包括 v-text 和 过滤组件)
               } else {
                 component.style[key] = this.format(component.style[key], this.scaleWidth)
diff --git a/frontend/src/components/dataease/DeOutWidget.vue b/frontend/src/components/dataease/DeOutWidget.vue
index 31025ae3f4..f12aae39d9 100644
--- a/frontend/src/components/dataease/DeOutWidget.vue
+++ b/frontend/src/components/dataease/DeOutWidget.vue
@@ -2,6 +2,7 @@
   <div
     ref="myContainer"
     class="my-container"
+    :style="autoStyle"
   >
     <div
       ref="conditionMain"
@@ -60,6 +61,8 @@
 
 <script>
 import inputStyleMixin from '@/components/widget/deWidget/inputStyleMixin'
+import { mapState } from 'vuex'
+
 export default {
   name: 'DeOutWidget',
   mixins: [inputStyleMixin],
@@ -112,6 +115,18 @@ export default {
     }
   },
   computed: {
+    scale() {
+      return this.previewCanvasScale.scalePointHeight
+    },
+    autoStyle() {
+      return {
+        height: (100 / this.scale) + '%!important',
+        width: (100 / this.scale) + '%!important',
+        left: 50 * (1 - 1 / this.scale) + '%', // 放大余量 除以 2
+        top: 50 * (1 - 1 / this.scale) + '%', // 放大余量 除以 2
+        transform: 'scale(' + this.scale + ')'
+      }
+    },
     sizeInfo() {
       let size
       if (this.duHeight > this.inputLargeSize) {
@@ -133,7 +148,10 @@ export default {
     },
     isFilterComponent() {
       return ['de-select', 'de-select-grid', 'de-date', 'de-input-search', 'de-number-range', 'de-select-tree'].includes(this.element.component)
-    }
+    },
+    ...mapState([
+      'previewCanvasScale'
+    ])
   },
   watch: {
     'element.style': {
diff --git a/frontend/src/views/chart/components/ChartComponentS2.vue b/frontend/src/views/chart/components/ChartComponentS2.vue
index 45a26c20f4..d8e0a556c2 100644
--- a/frontend/src/views/chart/components/ChartComponentS2.vue
+++ b/frontend/src/views/chart/components/ChartComponentS2.vue
@@ -55,25 +55,32 @@
       />
       <el-row
         v-show="showPage"
-        class="table-page"
+        style="position: relative;"
       >
-        <span class="total-style">
-          {{ $t('chart.total') }}
-          <span>{{ chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) }}</span>
-          {{ $t('chart.items') }}
-        </span>
-        <el-pagination
-          small
-          :current-page="currentPage.page"
-          :page-sizes="[10,20,50,100]"
-          :page-size="currentPage.pageSize"
-          :pager-count="5"
-          layout="prev, pager, next"
-          :total="currentPage.show"
-          class="page-style"
-          @current-change="pageClick"
-          @size-change="pageChange"
-        />
+        <el-row
+          class="table-page"
+          :style="autoStyle"
+        >
+          <span class="total-style">
+            {{ $t('chart.total') }}
+            <span>{{
+              chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
+            }}</span>
+            {{ $t('chart.items') }}
+          </span>
+          <el-pagination
+            small
+            :current-page="currentPage.page"
+            :page-sizes="[10,20,50,100]"
+            :page-size="currentPage.pageSize"
+            :pager-count="5"
+            layout="prev, pager, next"
+            :total="currentPage.show"
+            class="page-style"
+            @current-change="pageClick"
+            @size-change="pageChange"
+          />
+        </el-row>
       </el-row>
     </div>
   </div>
@@ -87,6 +94,7 @@ import { baseTableInfo, baseTableNormal, baseTablePivot } from '@/views/chart/ch
 import TitleRemark from '@/views/chart/view/TitleRemark'
 import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart'
 import ChartTitleUpdate from './ChartTitleUpdate.vue'
+import { mapState } from 'vuex'
 
 export default {
   name: 'ChartComponentS2',
@@ -162,6 +170,18 @@ export default {
   },
 
   computed: {
+    scale() {
+      return this.previewCanvasScale.scalePointWidth
+    },
+    autoStyle() {
+      return {
+        height: (100 / this.scale) + '%!important',
+        width: (100 / this.scale) + '%!important',
+        left: 50 * (1 - 1 / this.scale) + '%', // 放大余量 除以 2
+        top: 50 * (1 - 1 / this.scale) + '%', // 放大余量 除以 2
+        transform: 'scale(' + this.scale + ')'
+      }
+    },
     trackBarStyleTime() {
       return this.trackBarStyle
     },
@@ -173,7 +193,10 @@ export default {
     chartInfo() {
       const { id, title } = this.chart
       return { id, title }
-    }
+    },
+    ...mapState([
+      'previewCanvasScale'
+    ])
   },
   watch: {
     chart: {
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index 6533281768..7529b1efb1 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -44,23 +44,33 @@
         v-show="showPage"
         class="table-page"
       >
-        <span class="total-style">
-          {{ $t('chart.total') }}
-          <span>{{ chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0) }}</span>
-          {{ $t('chart.items') }}
-        </span>
-        <el-pagination
-          small
-          :current-page="currentPage.page"
-          :page-sizes="[10,20,50,100]"
-          :page-size="currentPage.pageSize"
-          :pager-count="5"
-          layout="prev, pager, next"
-          :total="currentPage.show"
-          class="page-style"
-          @current-change="pageClick"
-          @size-change="pageChange"
-        />
+        <el-row style="position: relative;width:100% ">
+          <el-row
+            class="table-page-inner"
+            :style="autoStyle"
+          >
+            <span class="total-style">
+              {{ $t('chart.total') }}
+              <span>{{
+                chart.datasetMode === 0 ? chart.totalItems : ((chart.data && chart.data.tableRow) ? chart.data.tableRow.length : 0)
+              }}</span>
+              {{ $t('chart.items') }}
+            </span>
+            <el-pagination
+              small
+              :current-page="currentPage.page"
+              :page-sizes="[10,20,50,100]"
+              :page-size="currentPage.pageSize"
+              :pager-count="5"
+              layout="prev, pager, next"
+              :total="currentPage.show"
+              class="page-style"
+              @current-change="pageClick"
+              @size-change="pageChange"
+            />
+          </el-row>
+        </el-row>
+
       </el-row>
     </el-row>
   </div>
@@ -70,6 +80,7 @@
 import { hexColorToRGBA } from '../../chart/util'
 import eventBus from '@/components/canvas/utils/eventBus'
 import { DEFAULT_SIZE } from '@/views/chart/chart/chart'
+import { mapState } from 'vuex'
 
 export default {
   name: 'TableNormal',
@@ -147,12 +158,27 @@ export default {
     }
   },
   computed: {
+    scale() {
+      return this.previewCanvasScale.scalePointWidth
+    },
+    autoStyle() {
+      return {
+        height: (100 / this.scale) + '%!important',
+        width: (100 / this.scale) + '%!important',
+        left: 50 * (1 - 1 / this.scale) + '%', // 放大余量 除以 2
+        top: 50 * (1 - 1 / this.scale) + '%', // 放大余量 除以 2
+        transform: 'scale(' + this.scale + ')'
+      }
+    },
     bg_class() {
       return {
         background: hexColorToRGBA('#ffffff', 0),
         borderRadius: this.borderRadius
       }
-    }
+    },
+    ...mapState([
+      'previewCanvasScale'
+    ])
   },
   watch: {
     chart: function() {
@@ -473,38 +499,53 @@ export default {
 </script>
 
 <style scoped>
-  .table-class ::v-deep .body--wrapper{
-    background: rgba(1,1,1,0);
-  }
-  .table-class ::v-deep .elx-cell{
-    max-height: none!important;
-    line-height: normal!important;
-  }
-  .table-page{
-    position: absolute;
-    bottom: 0;
-    display: flex;
-    align-items: center;
-    justify-content: flex-end;
-    width: 100%;
-    overflow: hidden;
-  }
-  .page-style{
-    margin-right: auto;
-  }
-  .total-style{
-    flex: 1;
-    font-size: 12px;
-    color: #606266;
-    white-space:nowrap;
-  }
-  .page-style ::v-deep .el-input__inner{
-    height: 24px;
-  }
-  .page-style ::v-deep button{
-    background: transparent!important;
-  }
-  .page-style ::v-deep li{
-    background: transparent!important;
-  }
+.table-class ::v-deep .body--wrapper {
+  background: rgba(1, 1, 1, 0);
+}
+
+.table-class ::v-deep .elx-cell {
+  max-height: none !important;
+  line-height: normal !important;
+}
+
+.table-page-inner {
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  width: 100%;
+  overflow: hidden;
+}
+
+.table-page {
+  position: absolute;
+  bottom: 0;
+  display: flex;
+  align-items: center;
+  justify-content: flex-end;
+  width: 100%;
+  overflow: hidden;
+}
+
+.page-style {
+  margin-right: auto;
+}
+
+.total-style {
+  flex: 1;
+  font-size: 12px;
+  color: #606266;
+  white-space: nowrap;
+}
+
+.page-style ::v-deep .el-input__inner {
+  height: 24px;
+}
+
+.page-style ::v-deep button {
+  background: transparent !important;
+}
+
+.page-style ::v-deep li {
+  background: transparent !important;
+}
 </style>

From a61e6b684cd10cf1630ab6808b8d1cb640dfcd5c Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 23 Nov 2022 14:01:34 +0800
Subject: [PATCH 06/25] =?UTF-8?q?fix(=E8=BF=87=E6=BB=A4=E5=99=A8):=20?=
 =?UTF-8?q?=E9=80=89=E6=8B=A9=E5=90=8D=E4=B8=BAcount=E7=9A=84=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E6=8E=92=E5=BA=8F=E4=BC=9A=E8=A2=ABsql=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E6=8B=A6=E6=88=AA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application.properties | 22 +++++++++----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties
index 85a8ccf334..81d1e820a9 100644
--- a/backend/src/main/resources/application.properties
+++ b/backend/src/main/resources/application.properties
@@ -65,49 +65,49 @@ management.health.redis.enabled=false
 #management.server.port=8083
 #management.endpoints.web.exposure.include=*
 #spring.freemarker.checkTemplateLocation=false
-#RSA非对称加密参数：私钥
+#RSA\u975E\u5BF9\u79F0\u52A0\u5BC6\u53C2\u6570\uFF1A\u79C1\u94A5
 rsa.private_key=MIIBUwIBADANBgkqhkiG9w0BAQEFAASCAT0wggE5AgEAAkEA0vfvyTdGJkdbHkB8mp0f3FE0GYP3AYPaJF7jUd1M0XxFSE2ceK3k2kw20YvQ09NJKk+OMjWQl9WitG9pB6tSCQIDAQABAkA2SimBrWC2/wvauBuYqjCFwLvYiRYqZKThUS3MZlebXJiLB+Ue/gUifAAKIg1avttUZsHBHrop4qfJCwAI0+YRAiEA+W3NK/RaXtnRqmoUUkb59zsZUBLpvZgQPfj1MhyHDz0CIQDYhsAhPJ3mgS64NbUZmGWuuNKp5coY2GIj/zYDMJp6vQIgUueLFXv/eZ1ekgz2Oi67MNCk5jeTF2BurZqNLR3MSmUCIFT3Q6uHMtsB9Eha4u7hS31tj1UWE+D+ADzp59MGnoftAiBeHT7gDMuqeJHPL4b+kC+gzV4FGTfhR9q3tTbklZkD2A==
 rsa.public_key=MFwwDQYJKoZIhvcNAQEBBQADSwAwSAJBANL378k3RiZHWx5AfJqdH9xRNBmD9wGD2iRe41HdTNF8RUhNnHit5NpMNtGL0NPTSSpPjjI1kJfVorRvaQerUgkCAwEAAQ==
 #spring.cache.type=ehcache
 spring.cache.ehcache.config=classpath:/ehcache/ehcache.xml
-#打印URL路径
+#\u6253\u5370URL\u8DEF\u5F84
 #logging.level.org.springframework.web=trace
 #logging.level.org.springframework.boot.web=trace
 #spring.mvc.log-request-details=true
 pagehelper.PageRowBounds=true
-#excel等用户上传文件路径
+#excel\u7B49\u7528\u6237\u4E0A\u4F20\u6587\u4EF6\u8DEF\u5F84
 upload.file.path=/opt/dataease/data/kettle/
 
-dataease.sqlinjection.whitelists=/dataset/table/sqlPreview,/dataset/table/update
+dataease.sqlinjection.whitelists=/dataset/table/sqlPreview,/dataset/table/update,/dataset/field/multFieldValues,/dataset/field/linkMultFieldValues
 
 
-#开启压缩 提高响应速度 减少带宽压力
+#\u5F00\u542F\u538B\u7F29 \u63D0\u9AD8\u54CD\u5E94\u901F\u5EA6 \u51CF\u5C11\u5E26\u5BBD\u538B\u529B
 server.compression.enabled=true
 server.compression.mime-types=application/javascript,text/css,application/json,application/xml,text/html,text/xml,text/plain
 server.compression.min-response-size=1024
 
-#下面的配置新增到/opt/dataease/conf/dataease/properties
-#缓存类型
+#\u4E0B\u9762\u7684\u914D\u7F6E\u65B0\u589E\u5230/opt/dataease/conf/dataease/properties
+#\u7F13\u5B58\u7C7B\u578B
 ##spring.cache.type=redis
 #spring.cache.type=ehcache
-#redis公共配置
+#redis\u516C\u5171\u914D\u7F6E
 #spring.redis.timeout=10000
 #spring.redis.lettuce.pool.max-active=8
 #spring.redis.lettuce.pool.max-wait=-1
 #spring.redis.lettuce.pool.max-idle=8
 
-#单机模式redis配置
+#\u5355\u673A\u6A21\u5F0Fredis\u914D\u7F6E
 #spring.redis.database=0
 #spring.redis.host=192.168.0.110
 #spring.redis.port=6379
 #spring.redis.password=DataEase_ZNB@REDIS
 
-#哨兵模式redis配置
+#\u54E8\u5175\u6A21\u5F0Fredis\u914D\u7F6E
 #spring.redis.sentinel.master=mymaster
 #spring.redis.sentinel.nodes=192.168.0.110:26379,192.168.0.110:26380,192.168.0.110:26381
 #spring.redis.sentinel.password=
 
-#cluster模式redis配置
+#cluster\u6A21\u5F0Fredis\u914D\u7F6E
 #spring.redis.cluster.nodes=192.168.0.110:7001,192.168.0.110:7002,192.168.0.110:7003,192.168.0.110:7004,192.168.0.110:7005,192.168.0.110:7006
 #spring.redis.cluster.max-redirects=3
 #spring.redis.password=DataEase_ZNB@REDIS

From 3075624a853f4b0a5b2862abf0e335c79a50ecc9 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 23 Nov 2022 14:30:40 +0800
Subject: [PATCH 07/25] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E5=9C=B0?=
 =?UTF-8?q?=E5=9B=BE=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E6=82=AC=E6=B5=AE=E6=97=A0=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/views/chart/view/ChartStyleBatchSet.vue b/frontend/src/views/chart/view/ChartStyleBatchSet.vue
index 3be0d4f6a2..b4209f3be6 100644
--- a/frontend/src/views/chart/view/ChartStyleBatchSet.vue
+++ b/frontend/src/views/chart/view/ChartStyleBatchSet.vue
@@ -27,6 +27,7 @@
       @onTextChange="onTextChange"
       @onLegendChange="onLegendChange"
       @onMarginChange="onMarginChange"
+      @onSuspensionChange="onSuspensionChange"
     />
     <el-row v-else>
       <div class="view-selected-message-class">
@@ -103,6 +104,9 @@ export default {
     onMarginChange(val) {
       this.batchOptChange('customStyle', 'margin', val)
     },
+    onSuspensionChange(val) {
+      this.batchOptChange('customAttr', 'suspension', val)
+    },
     batchOptChange(custom, property, value) {
       this.$store.commit('setChangeProperties', {
         'custom': custom,

From 46d56a552695cb783ecef0ed3f8cc75682f5a545 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 23 Nov 2022 14:50:56 +0800
Subject: [PATCH 08/25] =?UTF-8?q?feat(=E8=BF=87=E6=BB=A4=E5=99=A8):=20?=
 =?UTF-8?q?=E6=96=87=E6=9C=AC=E4=B8=8B=E6=8B=89=E5=88=97=E8=A1=A8=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=87=AA=E5=AE=9A=E4=B9=89=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/widget/deWidget/DeSelectGrid.vue   | 11 +++++++++--
 .../widget/serviceImpl/TextSelectGridServiceImpl.js   |  3 +++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/widget/deWidget/DeSelectGrid.vue b/frontend/src/components/widget/deWidget/DeSelectGrid.vue
index 7faf24fba5..5fa5cd6bc8 100644
--- a/frontend/src/components/widget/deWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/deWidget/DeSelectGrid.vue
@@ -71,7 +71,7 @@
 import { linkMultFieldValues, multFieldValues } from '@/api/dataset/dataset'
 import { getLinkToken, getToken } from '@/utils/auth'
 import bus from '@/utils/bus'
-import { isSameVueObj } from '@/utils'
+import { isSameVueObj, mergeCustomSortOption } from '@/utils'
 import { attrsMap, styleAttrs, textSelectGridWidget } from '@/components/widget/deWidget/serviceNameFn.js'
 
 export default {
@@ -142,6 +142,9 @@ export default {
     cssArr() {
       const { brColor, wordColor, innerBgColor } = this.element.style
       return { brColor, wordColor, innerBgColor }
+    },
+    isCustomSortWidget() {
+      return this.element.serviceName === 'textSelectGridWidget'
     }
   },
   watch: {
@@ -354,7 +357,11 @@ export default {
     },
     optionData(data) {
       if (!data) return null
-      return data.filter(item => !!item).map(item => {
+      let tempData = data.filter(item => !!item)
+      if (this.isCustomSortWidget && this.element.options.attrs?.sort?.sort === 'custom') {
+        tempData = mergeCustomSortOption(this.element.options.attrs.sort.list, tempData)
+      }
+      return tempData.map(item => {
         return {
           id: item,
           text: item
diff --git a/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js
index 1014d2b17d..2a04dbc96b 100644
--- a/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TextSelectGridServiceImpl.js
@@ -96,6 +96,9 @@ class TextSelectGridServiceImpl extends WidgetService {
   isSortWidget() {
     return true
   }
+  isCustomSortWidget() {
+    return true
+  }
   fillValueDerfault(element) {
     const defaultV = element.options.value === null ? '' : element.options.value.toString()
     if (element.options.attrs.multiple) {

From e5335fe38cada400f34ab7bacf1361502b71e0d0 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 23 Nov 2022 15:56:08 +0800
Subject: [PATCH 09/25] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E5=88=86=E4=BA=AB=E6=A0=91=EF=BC=8C=E5=BA=95?=
 =?UTF-8?q?=E5=B1=82=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=BC=9Aloading?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/panel/share.js | 2 +-
 frontend/src/api/system/dept.js | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/api/panel/share.js b/frontend/src/api/panel/share.js
index e711dc0a44..16bef88d09 100644
--- a/frontend/src/api/panel/share.js
+++ b/frontend/src/api/panel/share.js
@@ -38,7 +38,7 @@ export function loadShares(data) {
   return request({
     url: '/api/share/queryWithResourceId',
     method: 'post',
-    loading: true,
+    loading: false,
     data
   })
 }
diff --git a/frontend/src/api/system/dept.js b/frontend/src/api/system/dept.js
index 1937d17234..9ab0075afb 100644
--- a/frontend/src/api/system/dept.js
+++ b/frontend/src/api/system/dept.js
@@ -13,7 +13,7 @@ export function loadTable(data) {
     url: 'api/dept/search',
     method: 'post',
     data,
-    loading: true
+    loading: false
   })
 }
 

From 36dcaa2b05f3d4f8234ffadba1b76b7d5b921484 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 23 Nov 2022 16:01:25 +0800
Subject: [PATCH 10/25] =?UTF-8?q?fix(=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A)?=
 =?UTF-8?q?:=20=E9=A2=84=E8=A7=88=E6=96=87=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index c85d2224ef..8be484db7e 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -2547,9 +2547,9 @@ export default {
     start_time: 'Start time',
     end_time: 'End time',
     chart_data: 'View data',
-    panel_preview: 'Preview panel',
+    panel_preview: 'Preview report',
     preview: 'Preview',
-    emial_preview: 'Emial preview',
+    emial_preview: 'Report preview',
     chart_data_range: 'View data range',
     simple_repeat: 'Simple repeat',
     once_a_day: 'Once a day',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 8ace68307a..36d4a2d7b9 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -2548,9 +2548,9 @@ export default {
     start_time: '開始時間',
     end_time: '結束時間',
     chart_data: '視圖數據',
-    panel_preview: '預覽儀表板',
+    panel_preview: '預覽報告',
     preview: '預覽',
-    emial_preview: '郵件預覽',
+    emial_preview: '報告預覽',
     chart_data_range: '視圖數據範圍',
     simple_repeat: '簡單重複',
     once_a_day: '每天一次',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 11dabf102d..61be12d916 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -2548,9 +2548,9 @@ export default {
     start_time: '开始时间',
     end_time: '结束时间',
     chart_data: '视图数据',
-    panel_preview: '预览仪表板',
+    panel_preview: '预览报告',
     preview: '预览',
-    emial_preview: '邮件预览',
+    emial_preview: '报告预览',
     chart_data_range: '视图数据范围',
     simple_repeat: '简单重复',
     once_a_day: '每天一次',

From b55440d4b760fa005201d8933a1db8719c2598cf Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Wed, 23 Nov 2022 17:47:47 +0800
Subject: [PATCH 11/25] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE-=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC):=20=E8=A1=A8=E6=A0=BC=E6=94=AF=E6=8C=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E6=BB=9A=E5=8A=A8=E6=9D=A1=E9=A2=9C=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

表格支持修改滚动条颜色
https://www.tapd.cn/55578866/prong/stories/view/1155578866001010175
---
 frontend/src/lang/en.js                       |  1 +
 frontend/src/lang/tw.js                       |  1 +
 frontend/src/lang/zh.js                       |  1 +
 frontend/src/views/chart/chart/chart.js       |  8 ++++--
 .../views/chart/chart/common/common_table.js  | 11 +++++++-
 frontend/src/views/chart/chart/util.js        | 24 ++++++++++++++++++
 .../components/shapeAttr/ColorSelector.vue    | 15 +++++++++++
 .../chart/components/table/TableNormal.vue    | 25 ++++++++++++++++---
 .../panelStyle/PanelColorSelector.vue         | 13 ++++++++++
 9 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 1979ce85d2..739856bb18 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1336,6 +1336,7 @@ export default {
     table_align_left: 'Left',
     table_align_center: 'Center',
     table_align_right: 'Right',
+    table_scroll_bar_color: 'Scroll Bar Color',
     draw_back: 'Draw Back',
     senior: 'Senior',
     senior_cfg: 'Senior Config',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 4914de9835..c5d48bf4f0 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1336,6 +1336,7 @@ export default {
     table_align_left: '左對齊',
     table_align_center: '居中',
     table_align_right: '右對齊',
+    table_scroll_bar_color: '滾動條顏色',
     draw_back: '收回',
     senior: '高級',
     senior_cfg: '高級設置',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 88749cf7c9..fcad801da6 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1335,6 +1335,7 @@ export default {
     table_align_left: '左对齐',
     table_align_center: '居中',
     table_align_right: '右对齐',
+    table_scroll_bar_color: '滚动条颜色',
     draw_back: '收回',
     senior: '高级',
     senior_cfg: '高级设置',
diff --git a/frontend/src/views/chart/chart/chart.js b/frontend/src/views/chart/chart/chart.js
index 5f78851539..cd0cfa5b05 100644
--- a/frontend/src/views/chart/chart/chart.js
+++ b/frontend/src/views/chart/chart/chart.js
@@ -28,7 +28,9 @@ export const DEFAULT_COLOR_CASE = {
   tableBorderColor: '#E6E7E4',
   seriesColors: [], // 格式：{"name":"s1","color":"","isCustom":false}
   areaBorderColor: '#303133',
-  areaBaseColor: '#FFFFFF'
+  areaBaseColor: '#FFFFFF',
+  tableScrollBarColor: 'rgba(0, 0, 0, 0.15)',
+  tableScrollBarHoverColor: 'rgba(0, 0, 0, 0.4)'
 }
 
 export const DEFAULT_COLOR_CASE_DARK = {
@@ -44,7 +46,9 @@ export const DEFAULT_COLOR_CASE_DARK = {
   tableBorderColor: '#CCCCCC',
   seriesColors: [], // 格式：{"name":"s1","color":"","isCustom":false}
   areaBorderColor: '#EBEEF5',
-  areaBaseColor: '5470C6'
+  areaBaseColor: '5470C6',
+  tableScrollBarColor: 'rgba(255, 255, 255, 0.5)',
+  tableScrollBarHoverColor: 'rgba(255, 255, 255, 0.8)'
 }
 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 0a318f5e08..154b383410 100644
--- a/frontend/src/views/chart/chart/common/common_table.js
+++ b/frontend/src/views/chart/chart/common/common_table.js
@@ -1,4 +1,4 @@
-import { hexColorToRGBA } from '@/views/chart/chart/util'
+import { hexColorToRGBA, resetRgbOpacity } from '@/views/chart/chart/util'
 import { DEFAULT_COLOR_CASE, DEFAULT_SIZE } from '@/views/chart/chart/chart'
 
 export function getCustomTheme(chart) {
@@ -7,6 +7,8 @@ export function getCustomTheme(chart) {
   const borderColor = hexColorToRGBA(DEFAULT_COLOR_CASE.tableBorderColor, DEFAULT_COLOR_CASE.alpha)
   const headerAlign = DEFAULT_SIZE.tableHeaderAlign
   const itemAlign = DEFAULT_SIZE.tableItemAlign
+  const scrollBarColor = DEFAULT_COLOR_CASE.tableScrollBarColor
+  const scrollBarHoverColor = DEFAULT_COLOR_CASE.tableScrollBarHoverColor
 
   const theme = {
     background: {
@@ -105,6 +107,10 @@ export function getCustomTheme(chart) {
         fontSize: DEFAULT_SIZE.tableItemFontSize,
         textAlign: headerAlign
       }
+    },
+    scrollBar: {
+      thumbColor: scrollBarColor,
+      thumbHoverColor: scrollBarHoverColor
     }
   }
 
@@ -156,6 +162,9 @@ export function getCustomTheme(chart) {
       theme.dataCell.bolderText.fill = c.tableFontColor
       theme.dataCell.text.fill = c.tableFontColor
       theme.dataCell.measureText.fill = c.tableFontColor
+
+      theme.scrollBar.thumbColor = c.tableScrollBarColor
+      theme.scrollBar.thumbHoverColor = resetRgbOpacity(c.tableScrollBarColor, 1.5)
     }
     // size
     if (customAttr.size) {
diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index 37dd7d4dc1..20889f0c7b 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -1,5 +1,6 @@
 import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart'
 import { equalsAny, includesAny } from '@/utils/StringUtils'
+import _ from 'lodash'
 
 export function hexColorToRGBA(hex, alpha) {
   const rgb = [] // 定义rgb数组
@@ -49,6 +50,7 @@ export const TYPE_CONFIGS = [
         'tableHeaderFontColor',
         'tableFontColor',
         'tableBorderColor',
+        'tableScrollBarColor',
         'alpha'
       ],
       'size-selector-ant-v': [
@@ -95,6 +97,7 @@ export const TYPE_CONFIGS = [
         'tableHeaderFontColor',
         'tableFontColor',
         'tableBorderColor',
+        'tableScrollBarColor',
         'alpha'
       ],
       'size-selector-ant-v': [
@@ -144,6 +147,7 @@ export const TYPE_CONFIGS = [
         'tableHeaderFontColor',
         'tableFontColor',
         'tableBorderColor',
+        'tableScrollBarColor',
         'alpha'
       ],
       'size-selector-ant-v': [
@@ -1756,6 +1760,7 @@ export const TYPE_CONFIGS = [
         'tableItemBgColor',
         'tableHeaderFontColor',
         'tableFontColor',
+        'tableScrollBarColor',
         'alpha'
       ],
       'size-selector': [
@@ -1795,6 +1800,7 @@ export const TYPE_CONFIGS = [
         'tableItemBgColor',
         'tableHeaderFontColor',
         'tableFontColor',
+        'tableScrollBarColor',
         'alpha'
       ],
       'size-selector': [
@@ -3430,3 +3436,21 @@ function handleIgnoreData(chart, data) {
     }
   }
 }
+
+export function resetRgbOpacity(sourceColor, times) {
+  if (sourceColor?.startsWith('rgb')) {
+    const numbers = sourceColor.match(/(\d(\.\d+)?)+/g)
+    if (numbers?.length === 4) {
+      const opacity = parseFloat(numbers[3])
+      if (_.isNumber(opacity)) {
+        let resultOpacity = (opacity * times).toFixed(2)
+        if (resultOpacity > 1) {
+          resultOpacity = 1
+        }
+        const colorArr = numbers.slice(0, 3).concat(resultOpacity)
+        return `rgba(${colorArr.join(',')})`
+      }
+    }
+  }
+  return sourceColor
+}
diff --git a/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue b/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
index 6c8d7a0749..4dbebc5b80 100644
--- a/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
+++ b/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
@@ -237,6 +237,20 @@
               @change="changeColorCase('tableBorderColor')"
             />
           </el-form-item>
+          <el-form-item
+            v-show="showProperty('tableScrollBarColor')"
+            :label="$t('chart.table_scroll_bar_color')"
+            class="form-item"
+          >
+            <el-color-picker
+              v-model="colorForm.tableScrollBarColor"
+              class="color-picker-style"
+              :predefine="predefineColors"
+              color-format="rgb"
+              show-alpha
+              @change="changeColorCase('tableScrollBarColor')"
+            />
+          </el-form-item>
         </div>
 
         <el-form-item
@@ -466,6 +480,7 @@ export default {
 
           this.colorForm.tableBorderColor = this.colorForm.tableBorderColor ? this.colorForm.tableBorderColor : DEFAULT_COLOR_CASE.tableBorderColor
           this.colorForm.tableHeaderFontColor = this.colorForm.tableHeaderFontColor ? this.colorForm.tableHeaderFontColor : this.colorForm.tableFontColor
+          this.colorForm.tableScrollBarColor = this.colorForm.tableScrollBarColor ? this.colorForm.tableScrollBarColor : DEFAULT_COLOR_CASE.tableScrollBarColor
 
           this.initCustomColor()
         }
diff --git a/frontend/src/views/chart/components/table/TableNormal.vue b/frontend/src/views/chart/components/table/TableNormal.vue
index 6533281768..4bdabdf37b 100644
--- a/frontend/src/views/chart/components/table/TableNormal.vue
+++ b/frontend/src/views/chart/components/table/TableNormal.vue
@@ -13,7 +13,7 @@
       <ux-grid
         ref="plxTable"
         size="mini"
-        style="width: 100%;"
+        :style="tableStyle"
         :height="height"
         :checkbox-config="{highlight: true}"
         :width-resize="true"
@@ -69,7 +69,7 @@
 <script>
 import { hexColorToRGBA } from '../../chart/util'
 import eventBus from '@/components/canvas/utils/eventBus'
-import { DEFAULT_SIZE } from '@/views/chart/chart/chart'
+import { DEFAULT_COLOR_CASE, DEFAULT_SIZE } from '@/views/chart/chart/chart'
 
 export default {
   name: 'TableNormal',
@@ -143,7 +143,9 @@ export default {
       scrollTimer: null,
       scrollTop: 0,
       showIndex: false,
-      indexLabel: '序号'
+      indexLabel: '序号',
+      scrollBarColor: DEFAULT_COLOR_CASE.tableScrollBarColor,
+      scrollBarHoverColor: DEFAULT_COLOR_CASE.tableScrollBarHoverColor
     }
   },
   computed: {
@@ -152,6 +154,12 @@ export default {
         background: hexColorToRGBA('#ffffff', 0),
         borderRadius: this.borderRadius
       }
+    },
+    tableStyle() {
+      return {
+        width: '100%',
+        '--scroll-bar-color': this.scrollBarColor
+      }
     }
   },
   watch: {
@@ -283,6 +291,7 @@ export default {
           this.table_header_class.background = hexColorToRGBA(customAttr.color.tableHeaderBgColor, customAttr.color.alpha)
           this.table_item_class.color = customAttr.color.tableFontColor
           this.table_item_class.background = hexColorToRGBA(customAttr.color.tableItemBgColor, customAttr.color.alpha)
+          this.scrollBarColor = customAttr.color.tableScrollBarColor ? customAttr.color.tableScrollBarColor : DEFAULT_COLOR_CASE.tableScrollBarColor
         }
         if (customAttr.size) {
           this.table_header_class.fontSize = customAttr.size.tableTitleFontSize + 'px'
@@ -472,7 +481,7 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped lang="scss">
   .table-class ::v-deep .body--wrapper{
     background: rgba(1,1,1,0);
   }
@@ -507,4 +516,12 @@ export default {
   .page-style ::v-deep li{
     background: transparent!important;
   }
+  .table-class{
+    ::-webkit-scrollbar-thumb {
+      background: var(--scroll-bar-color);
+    }
+  }
+  .table-class{
+    scrollbar-color: var(--scroll-bar-color) transparent;
+  }
 </style>
diff --git a/frontend/src/views/panel/subjectSetting/panelStyle/PanelColorSelector.vue b/frontend/src/views/panel/subjectSetting/panelStyle/PanelColorSelector.vue
index 421557c96c..7960725df9 100644
--- a/frontend/src/views/panel/subjectSetting/panelStyle/PanelColorSelector.vue
+++ b/frontend/src/views/panel/subjectSetting/panelStyle/PanelColorSelector.vue
@@ -190,6 +190,19 @@
               @change="changeColorCase('tableBorderColor')"
             />
           </el-form-item>
+          <el-form-item
+            :label="$t('chart.table_scroll_bar_color')"
+            class="form-item"
+          >
+            <el-color-picker
+              v-model="colorForm.tableScrollBarColor"
+              class="color-picker-style"
+              :predefine="predefineColors"
+              color-format="rgb"
+              show-alpha
+              @change="changeColorCase('tableScrollBarColor')"
+            />
+          </el-form-item>
         </div>
       </el-form>
     </el-col>

From 13b2269b32e2e111b126be96f4e93eb9b6b7974a Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 24 Nov 2022 10:54:42 +0800
Subject: [PATCH 12/25] =?UTF-8?q?fix:=20=E7=80=91=E5=B8=83=E5=9B=BE?=
 =?UTF-8?q?=E6=B8=90=E5=8F=98=20=E7=99=BE=E5=88=86=E6=AF=94=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4=E4=B8=BA30%?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/chart/bar/bar_antv.js     |  7 +++---
 .../views/chart/chart/common/common_antv.js   |  6 +++++
 .../src/views/chart/chart/gauge/gauge_antv.js |  6 +++--
 .../src/views/chart/chart/line/line_antv.js   |  9 ++++----
 .../src/views/chart/chart/pie/pie_antv.js     | 12 ----------
 frontend/src/views/chart/chart/util.js        |  5 +---
 .../views/chart/chart/waterfall/waterfall.js  | 23 ++++++++++++-------
 .../components/shapeAttr/ColorSelector.vue    |  2 +-
 frontend/src/views/chart/view/ChartEdit.vue   |  1 +
 9 files changed, 37 insertions(+), 34 deletions(-)

diff --git a/frontend/src/views/chart/chart/bar/bar_antv.js b/frontend/src/views/chart/chart/bar/bar_antv.js
index b799ec2517..ef626eeabe 100644
--- a/frontend/src/views/chart/chart/bar/bar_antv.js
+++ b/frontend/src/views/chart/chart/bar/bar_antv.js
@@ -8,7 +8,8 @@ import {
   getYAxis,
   getPadding,
   getSlider,
-  getAnalyse
+  getAnalyse,
+  setGradientColor
 } from '@/views/chart/chart/common/common_antv'
 import { antVCustomColor } from '@/views/chart/chart/util'
 
@@ -105,7 +106,7 @@ export function baseBarOptionAntV(plot, container, chart, action, isGroup, isSta
   options.color = antVCustomColor(chart)
   if (customAttr.color.gradient) {
     options.color = options.color.map((ele) => {
-      return `l(270) 0:#ffffff00 1:${ele}`
+      return setGradientColor(ele, customAttr.color.gradient, 270)
     })
   }
 
@@ -206,7 +207,7 @@ export function hBaseBarOptionAntV(plot, container, chart, action, isGroup, isSt
   options.color = antVCustomColor(chart)
   if (customAttr.color.gradient) {
     options.color = options.color.map((ele) => {
-      return `l(0) 0:#ffffff00 1:${ele}`
+      return setGradientColor(ele, customAttr.color.gradient)
     })
   }
 
diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js
index 236d7da1b0..759f9c09a6 100644
--- a/frontend/src/views/chart/chart/common/common_antv.js
+++ b/frontend/src/views/chart/chart/common/common_antv.js
@@ -879,3 +879,9 @@ function getLineDash(type) {
       return [0, 0]
   }
 }
+
+export function setGradientColor(rawColor, show = false, angle = 0) {
+  const item = rawColor.split(',')
+  item.splice(3, 1, '0.3)')
+  return show ? `l(${angle}) 0:${item.join(',')} 1:${rawColor}` : rawColor
+}
diff --git a/frontend/src/views/chart/chart/gauge/gauge_antv.js b/frontend/src/views/chart/chart/gauge/gauge_antv.js
index b4b3844d6e..5070f6f2c1 100644
--- a/frontend/src/views/chart/chart/gauge/gauge_antv.js
+++ b/frontend/src/views/chart/chart/gauge/gauge_antv.js
@@ -1,4 +1,4 @@
-import { getPadding, getTheme } from '@/views/chart/chart/common/common_antv'
+import { getPadding, getTheme, setGradientColor } from '@/views/chart/chart/common/common_antv'
 import { Gauge } from '@antv/g2plot'
 import { DEFAULT_LABEL, DEFAULT_SIZE, DEFAULT_THRESHOLD } from '@/views/chart/chart/chart'
 import { getScaleValue } from '@/components/canvas/utils/style'
@@ -154,7 +154,9 @@ export function baseGaugeOptionAntV(plot, container, chart, action, scale = 1) {
   }
 
   if (customAttr.color.gradient) {
-    const colorList = (theme.styleSheet?.paletteQualitative10 || []).map((ele) => `l(0) 0:#ffffff00 1:${ele}`)
+    const colorList = (theme.styleSheet?.paletteQualitative10 || []).map((ele) => {
+      return setGradientColor(ele, customAttr.color.gradient)
+    })
     if (!options.range) {
       options.range = {
         color: colorList
diff --git a/frontend/src/views/chart/chart/line/line_antv.js b/frontend/src/views/chart/chart/line/line_antv.js
index d1a9c93948..c3ef3bfe59 100644
--- a/frontend/src/views/chart/chart/line/line_antv.js
+++ b/frontend/src/views/chart/chart/line/line_antv.js
@@ -8,7 +8,8 @@ import {
   getYAxis,
   getPadding,
   getSlider,
-  getAnalyse
+  getAnalyse,
+  setGradientColor
 } from '@/views/chart/chart/common/common_antv'
 import { antVCustomColor, handleEmptyDataStrategy } from '@/views/chart/chart/util'
 import _ from 'lodash'
@@ -183,10 +184,10 @@ export function baseAreaOptionAntV(plot, container, chart, action, isStack) {
   const areaColors = [...options.color, ...options.color]
   if (customAttr.color.gradient) {
     options.areaStyle = () => {
-      const cr = areaColors.shift()
-      if (cr) {
+      const ele = areaColors.shift()
+      if (ele) {
         return {
-          fill: `l(270) 0:#ffffff00 1:${cr}`
+          fill: setGradientColor(ele, customAttr.color.gradient, 270)
         }
       }
     }
diff --git a/frontend/src/views/chart/chart/pie/pie_antv.js b/frontend/src/views/chart/chart/pie/pie_antv.js
index b3ad13f44a..00fbb8ba81 100644
--- a/frontend/src/views/chart/chart/pie/pie_antv.js
+++ b/frontend/src/views/chart/chart/pie/pie_antv.js
@@ -82,12 +82,6 @@ export function basePieOptionAntV(plot, container, chart, action) {
   // custom color
   options.color = antVCustomColor(chart)
 
-  if (customAttr.color.gradient) {
-    options.color = options.color.map((ele) => {
-      return `l(270) 0:#ffffff00 1:${ele}`
-    })
-  }
-
   // 开始渲染
   if (plot) {
     plot.destroy()
@@ -165,12 +159,6 @@ export function basePieRoseOptionAntV(plot, container, chart, action) {
   // custom color
   options.color = antVCustomColor(chart)
 
-  if (customAttr.color.gradient) {
-    options.color = options.color.map((ele) => {
-      return `l(270) 0:#ffffff00 1:${ele}`
-    })
-  }
-
   // 开始渲染
   if (plot) {
     plot.destroy()
diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index 00084eace9..93e41b6a89 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -943,6 +943,7 @@ export const TYPE_CONFIGS = [
       'color-selector': [
         'value',
         'custom',
+        'gradient',
         'alpha'
       ],
       'label-selector-ant-v': [
@@ -1168,7 +1169,6 @@ export const TYPE_CONFIGS = [
         'value',
         'colorPanel',
         'customColor',
-        'gradient',
         'alpha'
       ],
       'size-selector-ant-v': [
@@ -1228,7 +1228,6 @@ export const TYPE_CONFIGS = [
         'value',
         'colorPanel',
         'customColor',
-        'gradient',
         'alpha'
       ],
       'size-selector-ant-v': [
@@ -1289,7 +1288,6 @@ export const TYPE_CONFIGS = [
         'value',
         'colorPanel',
         'customColor',
-        'gradient',
         'alpha'
       ],
       'size-selector-ant-v': [
@@ -1347,7 +1345,6 @@ export const TYPE_CONFIGS = [
         'value',
         'colorPanel',
         'customColor',
-        'gradient',
         'alpha'
       ],
       'size-selector-ant-v': [
diff --git a/frontend/src/views/chart/chart/waterfall/waterfall.js b/frontend/src/views/chart/chart/waterfall/waterfall.js
index 61a20c363e..79797d01c3 100644
--- a/frontend/src/views/chart/chart/waterfall/waterfall.js
+++ b/frontend/src/views/chart/chart/waterfall/waterfall.js
@@ -4,7 +4,8 @@ import {
   getTheme,
   getTooltip,
   getXAxis,
-  getYAxis
+  getYAxis,
+  setGradientColor
 } from '@/views/chart/chart/common/common_antv'
 import { Waterfall } from '@antv/g2plot'
 import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
@@ -28,11 +29,17 @@ export function baseWaterfallOptionAntV(plot, container, chart, action) {
   }
   // data
   const data = chart.data.data
+  const [risingColorRgba, fallingColorRgba, totalColorRgba] = theme.styleSheet.paletteQualitative10
+
+  let customAttrCopy = {}
+  if (chart.customAttr) {
+    customAttrCopy = JSON.parse(chart.customAttr)
+  }
   // total
   const total = {
     label: '合计',
     style: {
-      fill: theme.styleSheet.paletteQualitative10[2]
+      fill: setGradientColor(totalColorRgba, customAttrCopy.color.gradient, 270)
     }
   }
   // options
@@ -50,25 +57,25 @@ export function baseWaterfallOptionAntV(plot, container, chart, action) {
       items: [
         { name: '增加', marker: {
           style: {
-            fill: theme.styleSheet.paletteQualitative10[0]
+            fill: setGradientColor(risingColorRgba, customAttrCopy.color.gradient, 270)
           }
         }},
         { name: '减少', marker: {
           style: {
-            fill: theme.styleSheet.paletteQualitative10[1]
+            fill: setGradientColor(fallingColorRgba, customAttrCopy.color.gradient, 270)
           }
         }},
         { name: '合计', marker: {
           style: {
-            fill: theme.styleSheet.paletteQualitative10[2]
+            fill: setGradientColor(totalColorRgba, customAttrCopy.color.gradient, 270)
           }
         }}
       ]
     },
     xAxis: xAxis,
     yAxis: yAxis,
-    risingFill: theme.styleSheet.paletteQualitative10[0],
-    fallingFill: theme.styleSheet.paletteQualitative10[1],
+    risingFill: setGradientColor(risingColorRgba, customAttrCopy.color.gradient, 270),
+    fallingFill: setGradientColor(fallingColorRgba, customAttrCopy.color.gradient, 270),
     total: total,
     interactions: [
       {
@@ -79,7 +86,7 @@ export function baseWaterfallOptionAntV(plot, container, chart, action) {
       }
     ]
   }
-  // size
+
   let customAttr = {}
   if (chart.customAttr) {
     customAttr = JSON.parse(chart.customAttr)
diff --git a/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue b/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
index e4972fc2d0..7c7ae00757 100644
--- a/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
+++ b/frontend/src/views/chart/components/shapeAttr/ColorSelector.vue
@@ -477,7 +477,7 @@ export default {
 
           this.colorForm.tableBorderColor = this.colorForm.tableBorderColor ? this.colorForm.tableBorderColor : DEFAULT_COLOR_CASE.tableBorderColor
           this.colorForm.tableHeaderFontColor = this.colorForm.tableHeaderFontColor ? this.colorForm.tableHeaderFontColor : this.colorForm.tableFontColor
-
+          this.$set(this.colorForm, 'gradient', this.colorForm.gradient || false)
           this.initCustomColor()
         }
       }
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 30ac660e0c..eb6fa9ef82 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -1662,6 +1662,7 @@ export default {
   name: 'ChartEdit',
   components: {
     PositionAdjust,
+    // eslint-disable-next-line
     MarginSelector,
     ScrollCfg,
     CalcChartFieldEdit,

From cce1c7f5799fdb57b2d0880b80090b49e27e64d0 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 11:51:25 +0800
Subject: [PATCH 13/25] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E8=A7=86=E5=9B=BE=E6=82=AC=E6=B5=AE=E6=A8=A1?=
 =?UTF-8?q?=E5=BC=8F=E9=BB=98=E8=AE=A4=E5=A4=A7=E5=B0=8F=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/canvas/store/copy.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js
index 86a7feafbc..fbcc6c45a3 100644
--- a/frontend/src/components/canvas/store/copy.js
+++ b/frontend/src/components/canvas/store/copy.js
@@ -12,8 +12,8 @@ export default {
     copyData: null, // 复制粘贴剪切
     isCut: false,
     baseStyle: {
-      width: 300,
-      height: 200,
+      width: 533,
+      height: 300,
       top: 0,
       left: 0
     },

From ce1651fa8231a04c230356e56837b36b0585c60b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 24 Nov 2022 12:09:56 +0800
Subject: [PATCH 14/25] =?UTF-8?q?feat(=E8=BF=87=E6=BB=A4=E5=99=A8):=20?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4=E8=BF=87=E6=BB=A4=E5=99=A8?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=8A=A8=E6=80=81=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/chart/ChartViewService.java       | 32 ++++++++--
 .../serviceImpl/NumberSelectServiceImpl.js    |  3 +
 .../serviceImpl/TextSelectServiceImpl.js      |  3 +
 .../serviceImpl/TimeDateRangeServiceImpl.js   | 15 ++++-
 .../widget/serviceImpl/TimeDateServiceImpl.js |  7 +-
 .../serviceImpl/TimeMonthServiceImpl.js       |  7 +-
 .../widget/serviceImpl/TimeYearServiceImpl.js |  7 +-
 frontend/src/styles/index.scss                | 18 ++++--
 .../panel/filter/filterMain/FilterControl.vue | 64 ++++++++++++++++++-
 9 files changed, 136 insertions(+), 20 deletions(-)

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 4ac293ebc8..958d4005b4 100644
--- a/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
+++ b/backend/src/main/java/io/dataease/service/chart/ChartViewService.java
@@ -1694,15 +1694,34 @@ public class ChartViewService {
                     continue;
                 }
 
+                Boolean isEndParam = false;
                 for (String parameter : chartExtFilterRequest.getParameters()) {
                     if (parameter.contains("|DE|")) {
-                        if (!parameter.split("\\|DE\\|")[0].equals(table.getId())) {
+                        String[] parameterArray = parameter.split("\\|DE\\|");
+                        if (!parameterArray[0].equals(table.getId())) {
                             continue;
                         }
-                        List<SqlVariableDetails> parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter.split("\\|DE\\|")[1])).collect(Collectors.toList());
+                        String paramName = null;
+                        if (parameterArray.length > 1) {
+                            paramName = parameterArray[1];
+                            if (paramName.contains("_START_END_SPLIT")) {
+                                String[] paramNameArray = paramName.split("_START_END_SPLIT");
+                                paramName = paramNameArray[0];
+                                isEndParam = true;
+                            }
+                        } else {
+                            continue;
+                        }
+                        final String finalParamName = paramName;
+                        List<SqlVariableDetails> parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(finalParamName)).collect(Collectors.toList());
                         if (CollectionUtils.isNotEmpty(parameters)) {
-                            String filter = qp.transFilter(chartExtFilterRequest, parameters.get(0));
-                            sql = sql.replace("${" + parameter.split("\\|DE\\|")[1] + "}", filter);
+                            String filter = null;
+                            if (isEndParam) {
+                                filter = transEndParamSql(chartExtFilterRequest, parameters.get(0));
+                            } else {
+                                filter = qp.transFilter(chartExtFilterRequest, parameters.get(0));
+                            }
+                            sql = sql.replace("${" + finalParamName + "}", filter);
                         }
                     } else {
                         List<SqlVariableDetails> parameters = sqlVariables.stream().filter(item -> item.getVariableName().equalsIgnoreCase(parameter)).collect(Collectors.toList());
@@ -1718,6 +1737,11 @@ public class ChartViewService {
         return sql;
     }
 
+    public String transEndParamSql(ChartExtFilterRequest chartExtFilterRequest, SqlVariableDetails sqlVariableDetails) {
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat(sqlVariableDetails.getType().size() > 1 ? sqlVariableDetails.getType().get(1) : "YYYY");
+        return simpleDateFormat.format(new Date(Long.parseLong(chartExtFilterRequest.getValue().get(1))));
+    }
+
     private String getDrillSort(List<ChartViewFieldDTO> xAxis, ChartViewFieldDTO field) {
         String res = "";
         for (ChartViewFieldDTO f : xAxis) {
diff --git a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
index 3dcc29a6f6..d18f91f69f 100644
--- a/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/NumberSelectServiceImpl.js
@@ -107,6 +107,9 @@ class NumberSelectServiceImpl extends WidgetService {
       return defaultV.split(',')[0]
     }
   }
+  isParamWidget() {
+    return true
+  }
 }
 const numberSelectServiceImpl = new NumberSelectServiceImpl()
 export default numberSelectServiceImpl
diff --git a/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js b/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
index 4b5b79d85a..2a28a2d658 100644
--- a/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TextSelectServiceImpl.js
@@ -102,6 +102,9 @@ class TextSelectServiceImpl extends WidgetService {
   isCustomSortWidget() {
     return true
   }
+  isParamWidget() {
+    return true
+  }
 
   fillValueDerfault(element) {
     const defaultV = element.options.value === null ? '' : element.options.value.toString()
diff --git a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
index 301074284a..cd33146057 100644
--- a/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeDateRangeServiceImpl.js
@@ -31,7 +31,10 @@ const dialogPanel = {
         eDynamicSuffix: 'after'
       },
       showTime: false,
-      accuracy: 'HH:mm'
+      accuracy: 'HH:mm',
+      parameters: [],
+      startParameters: [],
+      endParameters: []
     },
     value: '',
     manualModify: false
@@ -329,13 +332,13 @@ class TimeDateRangeServiceImpl extends WidgetService {
     const defaultV = element.options.value === null ? '' : element.options.value.toString()
     if (element.options.attrs.type === 'daterange') {
       if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV ===
-          '[object Object]') {
+        '[object Object]') {
         return []
       }
       return defaultV.split(',').map(item => parseFloat(item))
     } else {
       if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV ===
-          '[object Object]') {
+        '[object Object]') {
         return null
       }
       return parseFloat(defaultV.split(',')[0])
@@ -400,6 +403,12 @@ class TimeDateRangeServiceImpl extends WidgetService {
       { 'text': 'dynamic_year.last', 'callBack': () => this.formatShortValues([this.getStartYear(-1).getTime(), this.getEndYear(-1).getTime()]) }
     ]
   }
+  isParamWidget() {
+    return true
+  }
+  isRangeParamWidget() {
+    return true
+  }
 }
 const timeDateRangeServiceImpl = new TimeDateRangeServiceImpl()
 export default timeDateRangeServiceImpl
diff --git a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
index d9ce3365ad..a1646a5383 100644
--- a/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeDateServiceImpl.js
@@ -189,13 +189,13 @@ class TimeDateServiceImpl extends WidgetService {
     const defaultV = element.options.value === null ? '' : element.options.value.toString()
     if (element.options.attrs.type === 'daterange') {
       if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV ===
-          '[object Object]') {
+        '[object Object]') {
         return []
       }
       return defaultV.split(',').map(item => parseFloat(item))
     } else {
       if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV ===
-          '[object Object]') {
+        '[object Object]') {
         return null
       }
       return parseFloat(defaultV.split(',')[0])
@@ -234,6 +234,9 @@ class TimeDateServiceImpl extends WidgetService {
   isTimeWidget() {
     return true
   }
+  isParamWidget() {
+    return true
+  }
 }
 const timeDateServiceImpl = new TimeDateServiceImpl({
   name: 'timeDateWidget'
diff --git a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
index c8defe995a..1254999750 100644
--- a/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeMonthServiceImpl.js
@@ -150,13 +150,13 @@ class TimeMonthServiceImpl extends WidgetService {
     const defaultV = element.options.value === null ? '' : element.options.value.toString()
     if (element.options.attrs.type === 'daterange') {
       if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV ===
-          '[object Object]') {
+        '[object Object]') {
         return []
       }
       return defaultV.split(',').map(item => parseFloat(item))
     } else {
       if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV ===
-          '[object Object]') {
+        '[object Object]') {
         return null
       }
       return parseFloat(defaultV.split(',')[0])
@@ -186,6 +186,9 @@ class TimeMonthServiceImpl extends WidgetService {
       return timeSection(parseFloat(value), element.options.attrs.type)
     }
   }
+  isParamWidget() {
+    return true
+  }
 }
 const timeMonthServiceImpl = new TimeMonthServiceImpl()
 export default timeMonthServiceImpl
diff --git a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
index 54bbfac589..90d440cdf2 100644
--- a/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/TimeYearServiceImpl.js
@@ -137,13 +137,13 @@ class TimeYearServiceImpl extends WidgetService {
     const defaultV = element.options.value === null ? '' : element.options.value.toString()
     if (element.options.attrs.type === 'daterange') {
       if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV ===
-          '[object Object]') {
+        '[object Object]') {
         return []
       }
       return defaultV.split(',').map(item => parseFloat(item))
     } else {
       if (defaultV === null || typeof defaultV === 'undefined' || defaultV === '' || defaultV ===
-          '[object Object]') {
+        '[object Object]') {
         return null
       }
       return parseFloat(defaultV.split(',')[0])
@@ -173,6 +173,9 @@ class TimeYearServiceImpl extends WidgetService {
       return timeSection(parseFloat(value), element.options.attrs.type)
     }
   }
+  isParamWidget() {
+    return true
+  }
 }
 const timeYearServiceImpl = new TimeYearServiceImpl()
 export default timeYearServiceImpl
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index e4e820d4ac..6cebef7bc6 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -93,7 +93,7 @@ div:focus {
 }
 
 .de-filter-dialog {
-  min-width: 500px !important;
+  min-width: 785px !important;
   width: 55% !important;
 
   .el-dialog__header {
@@ -322,12 +322,12 @@ div:focus {
   margin: 0 2px 1px 0;
 }
 
-.field-icon-dimension{
-  color: #3370FF!important;
+.field-icon-dimension {
+  color: #3370FF !important;
 }
 
-.field-icon-quota{
-  color: #04B49C!important;
+.field-icon-quota {
+  color: #04B49C !important;
 }
 
 .ds-icon-pdf {
@@ -1509,6 +1509,7 @@ div:focus {
 .de-status {
   position: relative;
   margin-left: 15px;
+
   &::before {
     content: '';
     position: absolute;
@@ -1546,6 +1547,7 @@ div:focus {
   &::before {
     background: var(--deDanger, #F54A45);
   }
+
   .el-icon-s-order {
     color: var(--primary, #3370ff);
     cursor: pointer;
@@ -1590,6 +1592,7 @@ div:focus {
     margin: 0;
     margin-right: 8px;
     position: relative;
+
     i {
       position: absolute;
       right: 2px;
@@ -1621,6 +1624,7 @@ div:focus {
     justify-content: center;
     align-items: center;
   }
+
   .arrow-filter:hover {
     background: rgba(31, 35, 41, 0.1);
     border-radius: 4px;
@@ -1633,6 +1637,7 @@ div:focus {
   .el-icon-arrow-left.arrow-filter {
     margin-right: 5px;
   }
+
   .filter-texts-container {
     flex: 1;
     overflow-x: auto;
@@ -1674,11 +1679,13 @@ div:focus {
     transform: translate(-50%, -50%);
   }
 }
+
 .calcu-field {
   .calcu-cont {
     display: flex;
     justify-content: space-between;
   }
+
   .codemirror {
     height: 250px;
     overflow-y: auto;
@@ -1686,6 +1693,7 @@ div:focus {
     border: 1px solid #bbbfc4;
     border-radius: 4px;
   }
+
   .codemirror .CodeMirror-scroll {
     height: 250px;
     overflow-y: auto;
diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index d054c00185..d6dfacc517 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -169,7 +169,51 @@
             width="200"
           >
             <div class="view-container-class">
-              <el-checkbox-group v-model="attrs.parameters">
+              <el-tabs
+                v-if="isRangeParamWidget"
+                v-model="activeName"
+              >
+                <el-tab-pane
+                  v-for="(item, index) in tabsOption"
+                  :key="item.name + index"
+                  :label="item.label"
+                  :name="item.name"
+                >
+                  <el-checkbox-group
+                    v-model="attrs[item.name + 'Parameters']"
+                    @change="val => {changeDynamicParams(val, item.name)}"
+                  >
+                    <el-checkbox
+                      v-for="(item ) in childViews.datasetParams"
+                      :key="item.id"
+                      :label="item.id"
+                      :disabled="attrs[tabsOption[(index + 1)%2].name + 'Parameters'] && attrs[tabsOption[(index + 1)%2].name + 'Parameters'].includes(item.id)"
+                      class="de-checkbox"
+                    >
+                      <div class="span-div">
+                        <span
+                          v-if="item.alias && item.alias.length <= 7"
+                          style="margin-left: 6px"
+                        >{{ item.alias }}</span>
+                        <el-tooltip
+                          v-else
+                          class="item"
+                          effect="dark"
+                          :content="item.alias"
+                          placement="left"
+                        >
+                          <span style="margin-left: 6px">{{ item.alias }}</span>
+                        </el-tooltip>
+                      </div>
+
+                    </el-checkbox>
+                  </el-checkbox-group>
+                </el-tab-pane>
+              </el-tabs>
+              <el-checkbox-group
+                v-else
+                v-model="attrs.parameters"
+              >
                 <el-checkbox
                   v-for="(item ) in childViews.datasetParams"
                   :key="item.id"
@@ -236,7 +280,13 @@ export default {
   },
   data() {
     return {
+      activeName: 'start',
+      tabsOption: [
+        { label: this.$t('dataset.start_time'), name: 'start' },
+        { label: this.$t('dataset.end_time'), name: 'end' }
+      ],
       showParams: false,
+      isRangeParamWidget: false,
       attrs: null,
       titlePopovervisible: false,
       popovervisible: false,
@@ -278,11 +328,21 @@ export default {
 
   created() {
     this.attrs = this.controlAttrs
-    if ('timeYearWidget,timeMonthWidget,timeDateWidget,textSelectWidget,numberSelectWidget'.indexOf(this.widget.name) !== -1) {
+    if (this.widget.isTimeWidget && this.widget.isTimeWidget()) {
       this.showParams = true
+      this.isRangeParamWidget = this.widget.isRangeParamWidget && this.widget.isRangeParamWidget()
     }
   },
   methods: {
+    changeDynamicParams(val, name) {
+      const start = this.attrs.startParameters ? JSON.parse(JSON.stringify(this.attrs.startParameters)) : []
+
+      const end = this.attrs.endParameters ? JSON.parse(JSON.stringify(this.attrs.endParameters)) : []
+      if (end?.length) {
+        end[0] += '_START_END_SPLIT'
+      }
+      this.attrs.parameters = [...new Set([...start, ...end])]
+    },
     sortChange(param) {
       this.element.options.attrs.sort = param
     },

From be9d10056c34b0c28b40763677cc601e2275fb15 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 13:38:35 +0800
Subject: [PATCH 15/25] =?UTF-8?q?revert(=E8=A7=86=E5=9B=BE):=20=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E7=BC=96=E8=BE=91=E5=8E=BB=E6=8E=89=E6=97=A0=E7=94=A8?=
 =?UTF-8?q?=E7=9A=84=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/view/ChartEdit.vue | 62 ++++++++++-----------
 1 file changed, 30 insertions(+), 32 deletions(-)

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 992f8bb1c4..9d34f0a5e5 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -192,7 +192,7 @@
                               @command="chartFieldEdit"
                             >
                               <span class="el-dropdown-link">
-                                <i class="el-icon-s-tools" />
+                                <i class="el-icon-s-tools"/>
                               </span>
                               <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item
@@ -267,7 +267,7 @@
                               @command="chartFieldEdit"
                             >
                               <span class="el-dropdown-link">
-                                <i class="el-icon-s-tools" />
+                                <i class="el-icon-s-tools"/>
                               </span>
                               <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item
@@ -362,7 +362,7 @@
                           style="padding: 6px;"
                         >
                           {{ $t('chart.change_chart_type') }}
-                          <i class="el-icon-caret-bottom" />
+                          <i class="el-icon-caret-bottom"/>
                         </el-button>
                       </el-popover>
                     </span>
@@ -490,8 +490,8 @@
                     >
                       <span class="data-area-label">
                         <span v-if="view.type && view.type.includes('table')">{{
-                          $t('chart.drag_block_table_data_column')
-                        }}</span>
+                            $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' || view.type === 'area')"
                         >{{ $t('chart.drag_block_type_axis') }}</span>
@@ -499,18 +499,18 @@
                           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>
+                            $t('chart.drag_block_funnel_split')
+                          }}</span>
                         <span v-else-if="view.type && view.type.includes('radar')">{{
-                          $t('chart.drag_block_radar_label')
-                        }}</span>
+                            $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>
+                            $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>
+                            $t('chart.drag_block_word_cloud_label')
+                          }}</span>
                         <span v-else-if="view.type && view.type === 'label'">{{ $t('chart.drag_block_label') }}</span>
                         <span v-show="view.type !== 'richTextView'"> / </span>
                         <span v-if="view.type && view.type !== 'table-info'">{{ $t('chart.dimension') }}</span>
@@ -633,8 +633,8 @@
                     >
                       <span class="data-area-label">
                         <span v-if="view.type && view.type.includes('table')">{{
-                          $t('chart.drag_block_table_data_column')
-                        }}</span>
+                            $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' || view.type === 'area')"
                         >{{ $t('chart.drag_block_value_axis') }}</span>
@@ -642,30 +642,30 @@
                           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>
+                            $t('chart.drag_block_funnel_width')
+                          }}</span>
                         <span v-else-if="view.type && view.type.includes('radar')">{{
-                          $t('chart.drag_block_radar_length')
-                        }}</span>
+                            $t('chart.drag_block_radar_length')
+                          }}</span>
                         <span v-else-if="view.type && view.type.includes('gauge')">{{
-                          $t('chart.drag_block_gauge_angel')
-                        }}</span>
+                            $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>
+                            $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>
+                            $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>
+                            $t('chart.drag_block_word_cloud_size')
+                          }}</span>
                         <span v-show="view.type !== 'richTextView'"> / </span>
                         <span>{{ $t('chart.quota') }}</span>
                         <i
@@ -1116,7 +1116,7 @@
           class="padding-tab"
           style="width: 350px;"
         >
-          <position-adjust />
+          <position-adjust/>
         </el-tab-pane>
 
       </el-tabs>
@@ -1268,7 +1268,7 @@
       width="800px"
       class="dialog-css"
     >
-      <quota-filter-editor :item="quotaItem" />
+      <quota-filter-editor :item="quotaItem"/>
       <div
         slot="footer"
         class="dialog-footer"
@@ -1295,7 +1295,7 @@
       width="800px"
       class="dialog-css"
     >
-      <dimension-filter-editor :item="dimensionItem" />
+      <dimension-filter-editor :item="dimensionItem"/>
       <div
         slot="footer"
         class="dialog-footer"
@@ -1661,8 +1661,6 @@ export default {
   name: 'ChartEdit',
   components: {
     PositionAdjust,
-    // eslint-disable-next-line
-    MarginSelector,
     ScrollCfg,
     CalcChartFieldEdit,
     ChartFieldEdit,

From 834aacbc19ac0ab5656e3e64af8909adf7e3ce86 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 14:21:27 +0800
Subject: [PATCH 16/25] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8DTab=E7=BB=84=E4=BB=B6=E9=A2=84=E8=A7=88=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81=E6=97=A0=E6=B3=95=E6=94=BE=E5=A4=A7=E5=86=85=E9=83=A8?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/ComponentWrapper.vue    |  4 +--
 frontend/src/views/panel/edit/index.vue       | 34 ++++++++++---------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 4a757dd5fc..289774c142 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -199,7 +199,7 @@ export default {
       return style
     },
     componentActiveFlag() {
-      return !this.mobileLayoutStatus && ((this.curComponent && this.config === this.curComponent && !this.previewVisible && !this.showPosition.includes('email-task')) || this.showPosition.includes('multiplexing'))
+      return !this.mobileLayoutStatus && ((this.curComponent && this.config.id === this.curComponent.id && !this.previewVisible && !this.showPosition.includes('email-task')) || this.showPosition.includes('multiplexing'))
     },
     scale() {
       return Math.min(this.previewCanvasScale.scalePointWidth, this.previewCanvasScale.scalePointHeight)
@@ -274,7 +274,7 @@ export default {
       } else {
         return {
           ...
-          getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
+            getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
           position: 'relative'
         }
       }
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 1634189267..41080baef7 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -165,8 +165,8 @@
               v-show=" show &&showIndex===1"
               :canvas-id="canvasId"
             />
-            <subject-setting v-show=" show &&showIndex===2" />
-            <assist-component v-show=" show &&showIndex===3" />
+            <subject-setting v-show=" show &&showIndex===2"/>
+            <assist-component v-show=" show &&showIndex===3"/>
           </div>
         </el-drawer>
         <!--PC端画布区域-->
@@ -181,7 +181,7 @@
           :canvas-pid="'0'"
           @canvasScroll="canvasScroll"
         >
-          <canvas-opt-bar slot="optBar" />
+          <canvas-opt-bar slot="optBar"/>
         </de-canvas>
         <!--移动端画布区域 保持宽高比2.5-->
         <el-row
@@ -197,7 +197,7 @@
               :style="customCanvasMobileStyle"
               class="this_mobile_canvas"
             >
-              <el-row class="this_mobile_canvas_top" />
+              <el-row class="this_mobile_canvas_top"/>
               <el-row class="this_mobile_canvas_inner_top">
                 {{ panelInfo.name }}
               </el-row>
@@ -215,7 +215,7 @@
                   :canvas-pid="'0'"
                   :mobile-layout-status="true"
                 >
-                  <canvas-opt-bar slot="optBar" />
+                  <canvas-opt-bar slot="optBar"/>
                 </de-canvas>
               </el-row>
               <el-row class="this_mobile_canvas_inner_bottom">
@@ -245,14 +245,14 @@
                   />
                 </el-col>
               </el-row>
-              <el-row class="this_mobile_canvas_bottom" />
+              <el-row class="this_mobile_canvas_bottom"/>
             </div>
           </el-col>
           <el-col
             :span="16"
             class="this_mobile_canvas_cell this_mobile_canvas_wait_cell"
           >
-            <component-wait />
+            <component-wait/>
           </el-col>
         </el-row>
       </de-main-container>
@@ -270,7 +270,7 @@
           />
         </div>
         <div v-if="showBatchViewToolsAside">
-          <chart-style-batch-set />
+          <chart-style-batch-set/>
         </div>
         <div v-if="!showViewToolsAside&&!showBatchViewToolsAside">
           <el-row style="height: 40px">
@@ -283,10 +283,11 @@
                 @click="changeRightDrawOpen(false)"
               />
             </el-tooltip>
-            <span style="font-weight: bold;font-size: 14px;margin-left: 40px;line-height:40px">{{ $t('panel.position_adjust') }}</span>
+            <span style="font-weight: bold;font-size: 14px;margin-left: 40px;line-height:40px"
+            >{{ $t('panel.position_adjust') }}</span>
           </el-row>
           <el-row>
-            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix" />
+            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix"/>
           </el-row>
         </div>
       </div>
@@ -445,7 +446,8 @@
           />
         </el-col>
         <el-col :span="21">
-          <span style="font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px">{{ $t('panel.panel_cache_use_tips') }}</span>
+          <span style="font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px"
+          >{{ $t('panel.panel_cache_use_tips') }}</span>
         </el-col>
       </el-row>
       <div
@@ -644,7 +646,7 @@ export default {
     },
     // 显示视图工具栏
     showViewToolsAside() {
-      return !this.batchOptStatus && this.curComponent && (this.curComponent.type === 'view' || this.curComponent.type === 'de-tabs')
+      return !this.batchOptStatus && this.curComponent && (this.curComponent.type === 'view')
     },
     showBatchViewToolsAside() {
       return this.batchOptStatus
@@ -961,11 +963,11 @@ export default {
     showPanel(type) {
       if (this.showIndex === -1 || this.showIndex === type) {
         this.$nextTick(() => {
-          if (this.show) {
-            this.showIndex === -1
+            if (this.show) {
+              this.showIndex === -1
+            }
+            this.show = !this.show
           }
-          this.show = !this.show
-        }
         )
       }
       this.showIndex = type

From ded70247ea1a05a723f8b319c7de56ee3932a8a0 Mon Sep 17 00:00:00 2001
From: maninhill <41712985+maninhill@users.noreply.github.com>
Date: Thu, 24 Nov 2022 14:41:45 +0800
Subject: [PATCH 17/25] =?UTF-8?q?chore=EF=BC=9A=E5=8E=BB=E6=8E=89=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E6=95=B0=20badge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e01b092a44..8b61b593d3 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
   <a href="https://app.codacy.com/gh/dataease/dataease?utm_source=github.com&utm_medium=referral&utm_content=dataease/dataease&utm_campaign=Badge_Grade_Dashboard"><img src="https://app.codacy.com/project/badge/Grade/da67574fd82b473992781d1386b937ef" alt="Codacy"></a>
   <a href="https://github.com/dataease/dataease/releases/latest"><img src="https://img.shields.io/github/v/release/dataease/dataease" alt="Latest release"></a>
   <a href="https://github.com/dataease/dataease"><img src="https://img.shields.io/github/stars/dataease/dataease?color=%231890FF&style=flat-square" alt="Stars"></a>
-  <a href="https://github.com/dataease/dataease/releases/latest"><img src="https://img.shields.io/github/downloads/dataease/dataease/total" alt="Downloads"></a>
+
 </p>
 <hr/>
 

From 8e44c5f02c672fbd8d7044434e81f776be3eeb36 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 14:44:16 +0800
Subject: [PATCH 18/25] =?UTF-8?q?refactor(=E7=BB=84=E4=BB=B6):=20=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BD=8D=E7=BD=AE=E8=B0=83=E6=95=B4=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E6=9C=80=E5=A4=A7=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/view/PositionAdjust.vue   | 20 +++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/view/PositionAdjust.vue b/frontend/src/views/chart/view/PositionAdjust.vue
index 6452daaabc..e8332c8a9d 100644
--- a/frontend/src/views/chart/view/PositionAdjust.vue
+++ b/frontend/src/views/chart/view/PositionAdjust.vue
@@ -29,6 +29,8 @@
             v-model="styleInfo.left"
             type="number"
             :min="0"
+            :max="maxLeft"
+            @change="leftOnChange"
             class="hide-icon-number"
           >
             <template slot="append">px</template>
@@ -69,6 +71,8 @@
 
 <script>
 
+import { mapState } from 'vuex'
+
 export default {
   name: 'PositionAdjust',
   props: {},
@@ -76,14 +80,26 @@ export default {
     return {}
   },
   computed: {
+    maxLeft() {
+      return 1600 - this.styleInfo.width - this.componentGap
+    },
     styleInfo() {
       return this.$store.state.curComponent.style
-    }
+    },
+    ...mapState([
+      'componentGap'
+    ])
   },
   watch: {},
   mounted() {
   },
-  methods: {}
+  methods: {
+    leftOnChange() {
+      if (this.styleInfo.left > this.maxLeft) {
+        this.styleInfo.left = this.maxLeft
+      }
+    }
+  }
 }
 </script>
 

From de8480098bbd98c6e5025e2236aa6f5a82ffecee Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 14:55:31 +0800
Subject: [PATCH 19/25] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=B5=8F?=
 =?UTF-8?q?=E8=A7=88=E5=99=A8=E5=A4=8D=E5=88=B6=E6=96=B0=E7=9A=84=E7=AA=97?=
 =?UTF-8?q?=E5=8F=A3=E5=8F=AF=E8=83=BD=E5=87=BA=E7=8E=B0=E4=BB=AA=E8=A1=A8?=
 =?UTF-8?q?=E6=9D=BF=E5=88=97=E8=A1=A8=E6=97=A0=E6=B3=95=E6=98=BE=E7=A4=BA?=
 =?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

---
 frontend/src/views/panel/list/PanelList.vue | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 4a77719708..3ae5ce2a0d 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -174,7 +174,7 @@
                   />
                 </span>
                 <span v-if="data.nodeType === 'folder'">
-                  <svg-icon icon-class="scene" />
+                  <svg-icon icon-class="scene"/>
                 </span>
                 <span
                   :class="data.status"
@@ -211,7 +211,7 @@
                       <el-dropdown-item
                         :command="beforeClickEdit('folder', 'new', data, node)"
                       >
-                        <svg-icon icon-class="scene" />
+                        <svg-icon icon-class="scene"/>
                         <span style="margin-left: 5px">{{ $t('panel.groupAdd') }}</span>
                       </el-dropdown-item>
                       <el-dropdown-item
@@ -334,7 +334,7 @@
             :label="$t('commons.name')"
             prop="name"
           >
-            <el-input v-model="groupForm.name" />
+            <el-input v-model="groupForm.name"/>
           </el-form-item>
         </el-form>
         <div
@@ -345,8 +345,8 @@
             size="mini"
             @click="close()"
           >{{
-            $t('panel.cancel')
-          }}
+              $t('panel.cancel')
+            }}
           </el-button>
           <el-button
             type="primary"
@@ -422,8 +422,8 @@
             size="mini"
             @click="closeMoveGroup()"
           >{{
-            $t('dataset.cancel')
-          }}
+              $t('dataset.cancel')
+            }}
           </el-button>
           <el-button
             :disabled="groupMoveConfirmDisabled"
@@ -926,7 +926,7 @@ export default {
 
       if (userCache) {
         this.defaultData = JSON.parse(modelInfo)
-        if (showFirst && this.defaultData.length > 0) {
+        if (showFirst && this.defaultData && this.defaultData.length > 0) {
           this.activeDefaultNodeAndClickOnly(this.defaultData[0].id)
         }
       }
@@ -935,7 +935,7 @@ export default {
         localStorage.setItem('panel-default-tree', JSON.stringify(res.data))
         if (!userCache) {
           this.defaultData = res.data
-          if (showFirst && this.defaultData.length > 0) {
+          if (showFirst && this.defaultData && this.defaultData.length > 0) {
             this.activeDefaultNodeAndClickOnly(this.defaultData[0].id)
           }
         }

From a40a9b07590c1088e9ada513ead02fd58c2aec76 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 24 Nov 2022 17:11:05 +0800
Subject: [PATCH 20/25] =?UTF-8?q?feat(=E8=A7=86=E5=9B=BE):=20=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E6=A8=AA=E5=90=91=E7=99=BE=E5=88=86=E6=AF=94=E6=9F=B1?=
 =?UTF-8?q?=E7=8A=B6=E5=9B=BE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

视图类型增加横向百分比柱状图
https://www.tapd.cn/55578866/prong/stories/view/1155578866001004512
---
 .../svg/percentage-bar-stack-horizontal.svg   |  1 +
 frontend/src/lang/en.js                       |  1 +
 frontend/src/lang/tw.js                       |  1 +
 frontend/src/lang/zh.js                       |  1 +
 .../src/views/chart/chart/bar/bar_antv.js     |  1 +
 .../views/chart/chart/common/common_antv.js   | 30 +++----
 frontend/src/views/chart/chart/util.js        | 81 +++++++++++++++++++
 .../chart/components/ChartComponentG2.vue     |  5 +-
 8 files changed, 105 insertions(+), 16 deletions(-)
 create mode 100644 frontend/src/icons/svg/percentage-bar-stack-horizontal.svg

diff --git a/frontend/src/icons/svg/percentage-bar-stack-horizontal.svg b/frontend/src/icons/svg/percentage-bar-stack-horizontal.svg
new file mode 100644
index 0000000000..41e752aabf
--- /dev/null
+++ b/frontend/src/icons/svg/percentage-bar-stack-horizontal.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="1663834987781" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="1963" width="200" height="200"><path transform="rotate(90 319.99999999999994,513.6666870117189) " id="svg_1" d="m-64,641.66667l768,0l0,85.33333l-768,0l0,-85.33333zm21.33333,-341.33334l85.33334,0l0,298.66667l-85.33334,0l0,-298.66667zm640,256l85.33334,0l0,42.66667l-85.33334,0l0,-42.66667zm-533.33333,-213.33333l85.33333,0l0,256l-85.33333,0l0,-256zm106.66667,42.66667l85.33333,0l0,213.33333l-85.33333,0l0,-213.33333zm106.66666,42.66666l85.33334,0l0,170.66667l-85.33334,0l0,-170.66667zm106.66667,42.66667l85.33333,0l0,128l-85.33333,0l0,-128zm106.66667,42.66667l85.33333,0l0,85.33333l-85.33333,0l0,-85.33333z"/><path transform="rotate(90 551,513.3333129882814) " id="svg_2" opacity="0.6" d="m188.33333,278.66667l85.33334,0l0,213.33333l-85.33334,0l0,-213.33333zm640,256l85.33334,0l0,213.33333l-85.33334,0l0,-213.33333zm-533.33333,-213.33334l85.33333,0l0,213.33334l-85.33333,0l0,-213.33334zm106.66667,42.66667l85.33333,0l0,213.33333l-85.33333,0l0,-213.33333zm106.66666,42.66667l85.33334,0l0,213.33333l-85.33334,0l0,-213.33333zm106.66667,42.66666l85.33333,0l0,213.33334l-85.33333,0l0,-213.33334zm106.66667,42.66667l85.33333,0l0,213.33333l-85.33333,0l0,-213.33333z"/><path transform="rotate(90 739,513.6666870117189) " stroke="null" id="svg_3" d="m1016.33333,343l85.33334,0l0,341.33333l-85.33334,0l0,-341.33333zm-640,0l85.33334,0l0,85.33333l-85.33334,0l0,-85.33333zm533.33334,0l85.33333,0l0,298.66667l-85.33333,0l0,-298.66667zm-106.66667,0l85.33333,0l0,256l-85.33333,0l0,-256zm-106.66667,0l85.33334,0l0,213.33333l-85.33334,0l0,-213.33333zm-106.66666,0l85.33333,0l0,170.66667l-85.33333,0l0,-170.66667zm-106.66667,0l85.33333,0l0,128l-85.33333,0l0,-128z"/></svg>
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 8be484db7e..23da51d3ac 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -1135,6 +1135,7 @@ export default {
     chart_percentage_bar_stack: 'Percentage Stack Bar',
     chart_bar_horizontal: 'Horizontal Bar',
     chart_bar_stack_horizontal: 'Stack Horizontal Bar',
+    chart_percentage_bar_stack_horizontal: 'Horizontal Percentage Stack Bar',
     chart_line: 'Base Line',
     chart_line_stack: 'Stack Line',
     chart_pie: 'Pie',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 36d4a2d7b9..3e2eb08d24 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -1135,6 +1135,7 @@ export default {
     chart_percentage_bar_stack: '百分比柱狀圖',
     chart_bar_horizontal: '橫嚮柱狀圖',
     chart_bar_stack_horizontal: '橫嚮堆疊柱狀圖',
+    chart_percentage_bar_stack_horizontal: '橫嚮百分比柱狀圖',
     chart_line: '基礎摺線圖',
     chart_line_stack: '堆疊摺線圖',
     chart_pie: '餅圖',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 61be12d916..c77fcf9321 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -1134,6 +1134,7 @@ export default {
     chart_percentage_bar_stack: '百分比柱状图',
     chart_bar_horizontal: '横向柱状图',
     chart_bar_stack_horizontal: '横向堆叠柱状图',
+    chart_percentage_bar_stack_horizontal: '横向百分比柱状图',
     chart_line: '基础折线图',
     chart_line_stack: '堆叠折线图',
     chart_pie: '饼图',
diff --git a/frontend/src/views/chart/chart/bar/bar_antv.js b/frontend/src/views/chart/chart/bar/bar_antv.js
index b799ec2517..191c9e3259 100644
--- a/frontend/src/views/chart/chart/bar/bar_antv.js
+++ b/frontend/src/views/chart/chart/bar/bar_antv.js
@@ -202,6 +202,7 @@ export function hBaseBarOptionAntV(plot, container, chart, action, isGroup, isSt
   } else {
     delete options.isStack
   }
+  options.isPercent = chart.type.includes('percentage')
   // custom color
   options.color = antVCustomColor(chart)
   if (customAttr.color.gradient) {
diff --git a/frontend/src/views/chart/chart/common/common_antv.js b/frontend/src/views/chart/chart/common/common_antv.js
index 236d7da1b0..567d00abc3 100644
--- a/frontend/src/views/chart/chart/common/common_antv.js
+++ b/frontend/src/views/chart/chart/common/common_antv.js
@@ -1,7 +1,7 @@
 import { hexColorToRGBA } from '@/views/chart/chart/util'
 import { formatterItem, valueFormatter } from '@/views/chart/chart/formatter'
 import { DEFAULT_XAXIS_STYLE, DEFAULT_YAXIS_EXT_STYLE, DEFAULT_YAXIS_STYLE } from '@/views/chart/chart/chart'
-import { equalsAny } from '@/utils/StringUtils'
+import { equalsAny, includesAny } from '@/utils/StringUtils'
 
 export function getPadding(chart) {
   if (chart.drill) {
@@ -166,11 +166,8 @@ export function getLabel(chart) {
               extStack = JSON.parse(JSON.stringify(chart.extStack))
             }
 
-            if (chart.type === 'bar-stack' ||
-              chart.type === 'line-stack' ||
-              chart.type === 'bar-stack-horizontal' ||
-              chart.type === 'percentage-bar-stack'
-            ) {
+            if (equalsAny(chart.type, 'bar-stack', 'line-stack',
+              'bar-stack-horizontal', 'percentage-bar-stack', 'percentage-bar-stack-horizontal')) {
               let f
               if (extStack && extStack.length > 0) {
                 f = yAxis[0]
@@ -189,7 +186,10 @@ export function getLabel(chart) {
                 f.formatterCfg = formatterItem
               }
               // 百分比堆叠柱状图保留小数处理
-              if (chart.type === 'percentage-bar-stack') {
+              if (chart.type.includes('percentage')) {
+                if (!param.value) {
+                  return
+                }
                 f.formatterCfg.type = 'percent'
                 f.formatterCfg.decimalCount = l.reserveDecimalCount
                 f.formatterCfg.thousandSeparator = false
@@ -278,10 +278,8 @@ export function getTooltip(chart) {
             }
 
             let obj
-            if (chart.type === 'bar-stack' ||
-              chart.type === 'line-stack' ||
-              chart.type === 'bar-stack-horizontal' ||
-              chart.type === 'percentage-bar-stack') {
+            if (equalsAny(chart.type, 'bar-stack', 'line-stack',
+              'bar-stack-horizontal', 'percentage-bar-stack', 'percentage-bar-stack-horizontal')) {
               let f
               if (extStack && extStack.length > 0) {
                 obj = { name: param.category, value: param.value }
@@ -301,7 +299,11 @@ export function getTooltip(chart) {
               if (!f.formatterCfg) {
                 f.formatterCfg = formatterItem
               }
-              if (chart.type === 'percentage-bar-stack') {
+              if (chart.type.includes('percentage')) {
+                if (!param.value) {
+                  obj.value = 0
+                  return obj
+                }
                 // 保留小数位数和标签保持一致，这边拿一下标签的配置
                 const l = JSON.parse(JSON.stringify(customAttr.label))
                 f.formatterCfg.type = 'percent'
@@ -329,7 +331,7 @@ export function getTooltip(chart) {
                   res = valueFormatter(param.value, formatterItem)
                 }
               }
-            } else if (chart.type.includes('pie') || chart.type.includes('funnel')) {
+            } else if (includesAny(chart.type, 'pie', 'funnel')) {
               obj = { name: param.field, value: param.value }
               for (let i = 0; i < yAxis.length; i++) {
                 const f = yAxis[i]
@@ -339,7 +341,7 @@ export function getTooltip(chart) {
                   res = valueFormatter(param.value, formatterItem)
                 }
               }
-            } else if ((chart.type.includes('bar') || chart.type.includes('line') || chart.type.includes('scatter') || chart.type.includes('radar') || chart.type.includes('area')) && !chart.type.includes('group')) {
+            } else if (includesAny(chart.type, 'bar', 'line', 'scatter', 'radar', 'area') && !chart.type.includes('group')) {
               obj = { name: param.category, value: param.value }
               for (let i = 0; i < yAxis.length; i++) {
                 const f = yAxis[i]
diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index 00084eace9..b7d01cc8ee 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -1149,6 +1149,87 @@ export const TYPE_CONFIGS = [
       ]
     }
   },
+  {
+    render: 'antv',
+    category: 'chart.chart_type_compare',
+    value: 'percentage-bar-stack-horizontal',
+    title: 'chart.chart_percentage_bar_stack_horizontal',
+    icon: 'percentage-bar-stack-horizontal',
+    properties: [
+      'color-selector',
+      'size-selector-ant-v',
+      'label-selector-ant-v',
+      'tooltip-selector-ant-v',
+      'x-axis-selector-ant-v',
+      'y-axis-selector-ant-v',
+      'title-selector-ant-v',
+      'legend-selector-ant-v'
+    ],
+    propertyInner: {
+      'color-selector': [
+        'value',
+        'colorPanel',
+        'customColor',
+        'gradient',
+        'alpha'
+      ],
+      'size-selector-ant-v': [
+        'barDefault',
+        'barGap'
+      ],
+      'label-selector-ant-v': [
+        'show',
+        'fontSize',
+        'color',
+        'position-h',
+        'reserveDecimalCount'
+      ],
+      'tooltip-selector-ant-v': [
+        'show',
+        'textStyle'
+      ],
+      'x-axis-selector-ant-v': [
+        'show',
+        'position',
+        'name',
+        'nameTextStyle',
+        'axisValue',
+        'splitLine',
+        'axisForm',
+        'axisLabel'
+      ],
+      'y-axis-selector-ant-v': [
+        'show',
+        'position',
+        'name',
+        'nameTextStyle',
+        'splitLine',
+        'axisForm',
+        'axisLabel'
+      ],
+      'title-selector-ant-v': [
+        'show',
+        'title',
+        'fontSize',
+        'color',
+        'hPosition',
+        'isItalic',
+        'isBolder',
+        'remarkShow',
+        'fontFamily',
+        'letterSpace',
+        'fontShadow'
+      ],
+      'legend-selector-ant-v': [
+        'show',
+        'icon',
+        'orient',
+        'textStyle',
+        'hPosition',
+        'vPosition'
+      ]
+    }
+  },
   {
     render: 'antv',
     category: 'chart.chart_type_distribute',
diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue
index fe5998d8be..8a0c54f0f0 100644
--- a/frontend/src/views/chart/components/ChartComponentG2.vue
+++ b/frontend/src/views/chart/components/ChartComponentG2.vue
@@ -57,6 +57,7 @@ import TitleRemark from '@/views/chart/view/TitleRemark'
 import { DEFAULT_TITLE_STYLE } from '@/views/chart/chart/chart'
 import { baseMixOptionAntV } from '@/views/chart/chart/mix/mix_antv'
 import ChartTitleUpdate from './ChartTitleUpdate.vue'
+import { equalsAny } from '@/utils/StringUtils'
 
 export default {
   name: 'ChartComponentG2',
@@ -233,13 +234,13 @@ export default {
         this.myChart = baseBarOptionAntV(this.myChart, this.chartId, chart, this.antVAction, true, false)
       } else if (chart.type === 'bar-group') {
         this.myChart = baseBarOptionAntV(this.myChart, this.chartId, chart, this.antVAction, true, false)
-      } else if (chart.type === 'bar-stack' || chart.type === 'percentage-bar-stack') {
+      } else if (equalsAny(chart.type, 'bar-stack', 'percentage-bar-stack')) {
         this.myChart = baseBarOptionAntV(this.myChart, this.chartId, chart, this.antVAction, false, true)
       } else if (chart.type === 'bar-group-stack') {
         this.myChart = baseBarOptionAntV(this.myChart, this.chartId, chart, this.antVAction, true, true)
       } else if (chart.type === 'bar-horizontal') {
         this.myChart = hBaseBarOptionAntV(this.myChart, this.chartId, chart, this.antVAction, true, false)
-      } else if (chart.type === 'bar-stack-horizontal') {
+      } else if (equalsAny(chart.type, 'bar-stack-horizontal', 'percentage-bar-stack-horizontal')) {
         this.myChart = hBaseBarOptionAntV(this.myChart, this.chartId, chart, this.antVAction, false, true)
       } else if (chart.type === 'line') {
         this.myChart = baseLineOptionAntV(this.myChart, this.chartId, chart, this.antVAction)

From b7c5b5bb24318ecab1f2c44f96519641d3b05973 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 17:41:55 +0800
Subject: [PATCH 21/25] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=80=E4=BA=9B=E7=83=AD=E9=94=AE=E5=86=B2?=
 =?UTF-8?q?=E7=AA=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/ComponentWrapper.vue    |  2 +-
 .../canvas/components/editor/Preview.vue      |  4 ++
 frontend/src/components/canvas/store/copy.js  | 20 ++++++-
 .../components/canvas/utils/shortcutKey.js    | 27 +++++++--
 frontend/src/views/chart/view/ChartEdit.vue   | 60 +++++++++----------
 .../src/views/chart/view/PositionAdjust.vue   |  2 +-
 frontend/src/views/dataset/data/FieldEdit.vue | 48 +++++++--------
 frontend/src/views/panel/edit/index.vue       | 45 ++++++++------
 frontend/src/views/panel/list/PanelList.vue   | 14 ++---
 9 files changed, 134 insertions(+), 88 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 289774c142..639bb5f740 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -274,7 +274,7 @@ export default {
       } else {
         return {
           ...
-            getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
+          getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
           position: 'relative'
         }
       }
diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index 7c523fe88c..9f2dfd1854 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/frontend/src/components/canvas/components/editor/Preview.vue
@@ -120,6 +120,7 @@ import { userLoginInfo } from '@/api/systemInfo/userLogin'
 import html2canvas from 'html2canvasde'
 import { queryAll } from '@/api/panel/pdfTemplate'
 import PDFPreExport from '@/views/panel/export/PDFPreExport'
+import { listenGlobalKeyDownPreview } from '@/components/canvas/utils/shortcutKey'
 
 const erd = elementResizeDetectorMaker()
 export default {
@@ -351,6 +352,9 @@ export default {
     }
   },
   created() {
+    if (this.canvasId === 'canvas-main') {
+      listenGlobalKeyDownPreview()
+    }
     // 取消视图请求
     this.$cancelRequest('/chart/view/getData/**')
     this.$cancelRequest('/api/link/viewDetail/**')
diff --git a/frontend/src/components/canvas/store/copy.js b/frontend/src/components/canvas/store/copy.js
index fbcc6c45a3..e9b6694ded 100644
--- a/frontend/src/components/canvas/store/copy.js
+++ b/frontend/src/components/canvas/store/copy.js
@@ -25,6 +25,24 @@ export default {
     }
   },
   mutations: {
+    // 复制到粘贴板
+    copyToClipboard(state) {
+      if (state.curComponent) {
+        Vue.prototype.$copyText('datease-component-' + state.curComponent.id)
+      }
+    },
+    passFromClipboard(state, componentId) {
+      state.componentData.forEach(item => {
+        if (item.id === componentId) {
+          state.copyData = {
+            data: deepCopy(item),
+            index: state.componentData.length
+          }
+        }
+      })
+      state.isCut = false
+      this.commit('paste')
+    },
     copyMultiplexingComponents(state) {
       let pYMax = 0
       const _this = this
@@ -89,10 +107,8 @@ export default {
 
     paste(state, needAdaptor) {
       if (!state.copyData) {
-        toast('请选择组件')
         return
       }
-
       const data = state.copyData.data
       // 仪表板复制的组件默认不在移动端部署中mobileSelected = false
       data.mobileSelected = false
diff --git a/frontend/src/components/canvas/utils/shortcutKey.js b/frontend/src/components/canvas/utils/shortcutKey.js
index 3e1dd16b7f..540c67e8c9 100644
--- a/frontend/src/components/canvas/utils/shortcutKey.js
+++ b/frontend/src/components/canvas/utils/shortcutKey.js
@@ -56,7 +56,27 @@ export function listenGlobalKeyDown() {
     if (keyCode === ctrlKey || keyCode === commandKey) {
       isCtrlOrCommandDown = true
     } else if (isCtrlOrCommandDown) {
-      if (keyCode === zKey || keyCode === yKey || keyCode === vKey || keyCode === cKey || keyCode === sKey || keyCode === enlargeKey) {
+      if (keyCode === zKey || keyCode === yKey || keyCode === cKey || keyCode === sKey || keyCode === enlargeKey) {
+        e.preventDefault()
+        unlockMap[keyCode]()
+      }
+    }
+  }
+
+  window.onkeyup = (e) => {
+    if (e.keyCode === ctrlKey || e.keyCode === commandKey) {
+      isCtrlOrCommandDown = false
+    }
+  }
+}
+
+export function listenGlobalKeyDownPreview() {
+  window.onkeydown = (e) => {
+    const { keyCode } = e
+    if (keyCode === ctrlKey || keyCode === commandKey) {
+      isCtrlOrCommandDown = true
+    } else if (isCtrlOrCommandDown) {
+      if (keyCode === enlargeKey) {
         e.preventDefault()
         unlockMap[keyCode]()
       }
@@ -71,12 +91,11 @@ export function listenGlobalKeyDown() {
 }
 
 function copy() {
-  store.commit('copy')
+  store.commit('copyToClipboard')
 }
 
 function paste() {
-  store.commit('paste')
-  store.commit('recordSnapshot')
+
 }
 
 function cut() {
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 9d34f0a5e5..9b0b7ff39e 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -192,7 +192,7 @@
                               @command="chartFieldEdit"
                             >
                               <span class="el-dropdown-link">
-                                <i class="el-icon-s-tools"/>
+                                <i class="el-icon-s-tools" />
                               </span>
                               <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item
@@ -267,7 +267,7 @@
                               @command="chartFieldEdit"
                             >
                               <span class="el-dropdown-link">
-                                <i class="el-icon-s-tools"/>
+                                <i class="el-icon-s-tools" />
                               </span>
                               <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item
@@ -362,7 +362,7 @@
                           style="padding: 6px;"
                         >
                           {{ $t('chart.change_chart_type') }}
-                          <i class="el-icon-caret-bottom"/>
+                          <i class="el-icon-caret-bottom" />
                         </el-button>
                       </el-popover>
                     </span>
@@ -490,8 +490,8 @@
                     >
                       <span class="data-area-label">
                         <span v-if="view.type && view.type.includes('table')">{{
-                            $t('chart.drag_block_table_data_column')
-                          }}</span>
+                          $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' || view.type === 'area')"
                         >{{ $t('chart.drag_block_type_axis') }}</span>
@@ -499,18 +499,18 @@
                           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>
+                          $t('chart.drag_block_funnel_split')
+                        }}</span>
                         <span v-else-if="view.type && view.type.includes('radar')">{{
-                            $t('chart.drag_block_radar_label')
-                          }}</span>
+                          $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>
+                          $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>
+                          $t('chart.drag_block_word_cloud_label')
+                        }}</span>
                         <span v-else-if="view.type && view.type === 'label'">{{ $t('chart.drag_block_label') }}</span>
                         <span v-show="view.type !== 'richTextView'"> / </span>
                         <span v-if="view.type && view.type !== 'table-info'">{{ $t('chart.dimension') }}</span>
@@ -633,8 +633,8 @@
                     >
                       <span class="data-area-label">
                         <span v-if="view.type && view.type.includes('table')">{{
-                            $t('chart.drag_block_table_data_column')
-                          }}</span>
+                          $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' || view.type === 'area')"
                         >{{ $t('chart.drag_block_value_axis') }}</span>
@@ -642,30 +642,30 @@
                           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>
+                          $t('chart.drag_block_funnel_width')
+                        }}</span>
                         <span v-else-if="view.type && view.type.includes('radar')">{{
-                            $t('chart.drag_block_radar_length')
-                          }}</span>
+                          $t('chart.drag_block_radar_length')
+                        }}</span>
                         <span v-else-if="view.type && view.type.includes('gauge')">{{
-                            $t('chart.drag_block_gauge_angel')
-                          }}</span>
+                          $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>
+                          $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>
+                          $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>
+                          $t('chart.drag_block_word_cloud_size')
+                        }}</span>
                         <span v-show="view.type !== 'richTextView'"> / </span>
                         <span>{{ $t('chart.quota') }}</span>
                         <i
@@ -1116,7 +1116,7 @@
           class="padding-tab"
           style="width: 350px;"
         >
-          <position-adjust/>
+          <position-adjust />
         </el-tab-pane>
 
       </el-tabs>
@@ -1268,7 +1268,7 @@
       width="800px"
       class="dialog-css"
     >
-      <quota-filter-editor :item="quotaItem"/>
+      <quota-filter-editor :item="quotaItem" />
       <div
         slot="footer"
         class="dialog-footer"
@@ -1295,7 +1295,7 @@
       width="800px"
       class="dialog-css"
     >
-      <dimension-filter-editor :item="dimensionItem"/>
+      <dimension-filter-editor :item="dimensionItem" />
       <div
         slot="footer"
         class="dialog-footer"
diff --git a/frontend/src/views/chart/view/PositionAdjust.vue b/frontend/src/views/chart/view/PositionAdjust.vue
index e8332c8a9d..37023bb46c 100644
--- a/frontend/src/views/chart/view/PositionAdjust.vue
+++ b/frontend/src/views/chart/view/PositionAdjust.vue
@@ -30,8 +30,8 @@
             type="number"
             :min="0"
             :max="maxLeft"
-            @change="leftOnChange"
             class="hide-icon-number"
+            @change="leftOnChange"
           >
             <template slot="append">px</template>
           </el-input>
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 90591d6124..652a8bdc16 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -130,8 +130,8 @@
                 "
               >
                 <span style="font-size: 12px; color: #c0c0c0">{{
-                  $t('dataset.calc_field')
-                }}</span>
+                    $t('dataset.calc_field')
+                  }}</span>
               </span>
             </template>
           </el-table-column>
@@ -180,8 +180,8 @@
                     />
                   </span>
                   <span style="color: #8492a6; font-size: 12px">{{
-                    data.label
-                  }}</span>
+                      data.label
+                    }}</span>
                 </template>
               </el-cascader>
               <span class="select-svg-icon">
@@ -284,8 +284,8 @@
                     v-if="scope.row.deExtractType === 3"
                     class="field-class"
                   >{{
-                    $t('dataset.value') + '(' + $t('dataset.float') + ')'
-                  }}</span>
+                      $t('dataset.value') + '(' + $t('dataset.float') + ')'
+                    }}</span>
                 </span>
                 <span v-if="scope.row.deExtractType === 5">
                   <svg-icon
@@ -308,8 +308,8 @@
                 "
               >
                 <span style="font-size: 12px; color: #c0c0c0">{{
-                  $t('dataset.calc_field')
-                }}</span>
+                    $t('dataset.calc_field')
+                  }}</span>
               </span>
             </template>
           </el-table-column>
@@ -356,7 +356,7 @@
                         "
                         command="copy"
                       >
-                        <i class="el-icon-document-copy" />
+                        <i class="el-icon-document-copy"/>
                         {{ $t('dataset.copy') }}
                       </el-dropdown-item>
                       <el-dropdown-item
@@ -365,7 +365,7 @@
                         "
                         command="delete"
                       >
-                        <i class="el-icon-delete" />
+                        <i class="el-icon-delete"/>
                         {{ $t('chart.delete') }}
                       </el-dropdown-item>
                     </slot>
@@ -470,8 +470,8 @@
                 "
               >
                 <span style="font-size: 12px; color: #c0c0c0">{{
-                  $t('dataset.calc_field')
-                }}</span>
+                    $t('dataset.calc_field')
+                  }}</span>
               </span>
             </template>
           </el-table-column>
@@ -520,8 +520,8 @@
                     />
                   </span>
                   <span style="color: #8492a6; font-size: 12px">{{
-                    data.label
-                  }}</span>
+                      data.label
+                    }}</span>
                 </template>
               </el-cascader>
               <span class="select-svg-icon">
@@ -616,8 +616,8 @@
                     v-if="scope.row.deExtractType === 3"
                     class="field-class"
                   >{{
-                    $t('dataset.value') + '(' + $t('dataset.float') + ')'
-                  }}</span>
+                      $t('dataset.value') + '(' + $t('dataset.float') + ')'
+                    }}</span>
                 </span>
                 <span v-if="scope.row.deExtractType === 5">
                   <svg-icon
@@ -640,8 +640,8 @@
                 "
               >
                 <span style="font-size: 12px; color: #c0c0c0">{{
-                  $t('dataset.calc_field')
-                }}</span>
+                    $t('dataset.calc_field')
+                  }}</span>
               </span>
             </template>
           </el-table-column>
@@ -689,7 +689,7 @@
                         "
                         command="copy"
                       >
-                        <i class="el-icon-document-copy" />
+                        <i class="el-icon-document-copy"/>
                         {{ $t('dataset.copy') }}
                       </el-dropdown-item>
                       <el-dropdown-item
@@ -698,7 +698,7 @@
                         "
                         command="delete"
                       >
-                        <i class="el-icon-delete" />
+                        <i class="el-icon-delete"/>
                         {{ $t('chart.delete') }}
                       </el-dropdown-item>
                     </slot>
@@ -742,7 +742,7 @@
 </template>
 
 <script>
-import { post, fieldListDQ, batchEdit, dateformats } from '@/api/dataset/dataset'
+import { batchEdit, dateformats, fieldListDQ, post } from '@/api/dataset/dataset'
 import CalcFieldEdit from './CalcFieldEdit'
 import { getFieldName } from '@/views/dataset/data/utils'
 import msgCfm from '@/components/msgCfm/index'
@@ -839,7 +839,7 @@ export default {
       })
     },
     getFields(item) {
-      if(item.deExtractType == 0){
+      if (item.deExtractType === 0) {
         const children = this.dateformats
         return [
           { label: this.$t('dataset.text'), value: 0 },
@@ -852,7 +852,7 @@ export default {
           },
           { label: this.$t('dataset.location'), value: 5 }
         ]
-      }else {
+      } else {
         return [
           { label: this.$t('dataset.text'), value: 0 },
           { label: this.$t('dataset.time'), value: 1 },
@@ -870,7 +870,7 @@ export default {
       item.deType = item.deTypeCascader[0]
       if (item.deTypeCascader.length === 2) { // 时间
         item.dateFormatType = item.deTypeCascader[1]
-        if(item.dateFormatType !== 'custom'){
+        if (item.dateFormatType !== 'custom') {
           item.dateFormat = item.dateFormatType
         }
       }
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 41080baef7..f6cc43b511 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -165,8 +165,8 @@
               v-show=" show &&showIndex===1"
               :canvas-id="canvasId"
             />
-            <subject-setting v-show=" show &&showIndex===2"/>
-            <assist-component v-show=" show &&showIndex===3"/>
+            <subject-setting v-show=" show &&showIndex===2" />
+            <assist-component v-show=" show &&showIndex===3" />
           </div>
         </el-drawer>
         <!--PC端画布区域-->
@@ -181,7 +181,7 @@
           :canvas-pid="'0'"
           @canvasScroll="canvasScroll"
         >
-          <canvas-opt-bar slot="optBar"/>
+          <canvas-opt-bar slot="optBar" />
         </de-canvas>
         <!--移动端画布区域 保持宽高比2.5-->
         <el-row
@@ -197,7 +197,7 @@
               :style="customCanvasMobileStyle"
               class="this_mobile_canvas"
             >
-              <el-row class="this_mobile_canvas_top"/>
+              <el-row class="this_mobile_canvas_top" />
               <el-row class="this_mobile_canvas_inner_top">
                 {{ panelInfo.name }}
               </el-row>
@@ -215,7 +215,7 @@
                   :canvas-pid="'0'"
                   :mobile-layout-status="true"
                 >
-                  <canvas-opt-bar slot="optBar"/>
+                  <canvas-opt-bar slot="optBar" />
                 </de-canvas>
               </el-row>
               <el-row class="this_mobile_canvas_inner_bottom">
@@ -245,14 +245,14 @@
                   />
                 </el-col>
               </el-row>
-              <el-row class="this_mobile_canvas_bottom"/>
+              <el-row class="this_mobile_canvas_bottom" />
             </div>
           </el-col>
           <el-col
             :span="16"
             class="this_mobile_canvas_cell this_mobile_canvas_wait_cell"
           >
-            <component-wait/>
+            <component-wait />
           </el-col>
         </el-row>
       </de-main-container>
@@ -270,7 +270,7 @@
           />
         </div>
         <div v-if="showBatchViewToolsAside">
-          <chart-style-batch-set/>
+          <chart-style-batch-set />
         </div>
         <div v-if="!showViewToolsAside&&!showBatchViewToolsAside">
           <el-row style="height: 40px">
@@ -283,11 +283,10 @@
                 @click="changeRightDrawOpen(false)"
               />
             </el-tooltip>
-            <span style="font-weight: bold;font-size: 14px;margin-left: 40px;line-height:40px"
-            >{{ $t('panel.position_adjust') }}</span>
+            <span style="font-weight: bold;font-size: 14px;margin-left: 40px;line-height:40px">{{ $t('panel.position_adjust') }}</span>
           </el-row>
           <el-row>
-            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix"/>
+            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix" />
           </el-row>
         </div>
       </div>
@@ -446,8 +445,7 @@
           />
         </el-col>
         <el-col :span="21">
-          <span style="font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px"
-          >{{ $t('panel.panel_cache_use_tips') }}</span>
+          <span style="font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px">{{ $t('panel.panel_cache_use_tips') }}</span>
         </el-col>
       </el-row>
       <div
@@ -646,7 +644,7 @@ export default {
     },
     // 显示视图工具栏
     showViewToolsAside() {
-      return !this.batchOptStatus && this.curComponent && (this.curComponent.type === 'view')
+      return !this.batchOptStatus && this.curComponent && (this.curComponent.type === 'view' || this.curComponent.type === 'de-tabs')
     },
     showBatchViewToolsAside() {
       return this.batchOptStatus
@@ -792,8 +790,8 @@ export default {
     }
   },
   created() {
-    // Global listening for key events
     listenGlobalKeyDown()
+    document.addEventListener('paste', this.passFromClipboard)
   },
   mounted() {
     this.initWatermark()
@@ -810,6 +808,7 @@ export default {
     this.init(this.$store.state.panel.panelInfo.id)
   },
   beforeDestroy() {
+    document.removeEventListener('paste', this.passFromClipboard)
     bus.$off('component-on-drag', this.componentOnDrag)
     // bus.$off('component-dialog-edit', this.editDialog)
     // bus.$off('button-dialog-edit', this.editButtonDialog)
@@ -823,6 +822,14 @@ export default {
     elx && elx.remove()
   },
   methods: {
+    passFromClipboard(event) {
+      // 获取解析 粘贴的文本
+      const text = (event.clipboardData || window.clipboardData).getData('text')
+      if (text && text.includes('datease-component-')) {
+        event.preventDefault()
+        this.$store.commit('passFromClipboard', text.replace('datease-component-', ''))
+      }
+    },
     initWatermark() {
       if (this.panelInfo.watermarkInfo) {
         userLoginInfo().then(res => {
@@ -963,11 +970,11 @@ export default {
     showPanel(type) {
       if (this.showIndex === -1 || this.showIndex === type) {
         this.$nextTick(() => {
-            if (this.show) {
-              this.showIndex === -1
-            }
-            this.show = !this.show
+          if (this.show) {
+            this.showIndex === -1
           }
+          this.show = !this.show
+        }
         )
       }
       this.showIndex = type
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 3ae5ce2a0d..2ece545af3 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -174,7 +174,7 @@
                   />
                 </span>
                 <span v-if="data.nodeType === 'folder'">
-                  <svg-icon icon-class="scene"/>
+                  <svg-icon icon-class="scene" />
                 </span>
                 <span
                   :class="data.status"
@@ -211,7 +211,7 @@
                       <el-dropdown-item
                         :command="beforeClickEdit('folder', 'new', data, node)"
                       >
-                        <svg-icon icon-class="scene"/>
+                        <svg-icon icon-class="scene" />
                         <span style="margin-left: 5px">{{ $t('panel.groupAdd') }}</span>
                       </el-dropdown-item>
                       <el-dropdown-item
@@ -334,7 +334,7 @@
             :label="$t('commons.name')"
             prop="name"
           >
-            <el-input v-model="groupForm.name"/>
+            <el-input v-model="groupForm.name" />
           </el-form-item>
         </el-form>
         <div
@@ -345,8 +345,8 @@
             size="mini"
             @click="close()"
           >{{
-              $t('panel.cancel')
-            }}
+            $t('panel.cancel')
+          }}
           </el-button>
           <el-button
             type="primary"
@@ -422,8 +422,8 @@
             size="mini"
             @click="closeMoveGroup()"
           >{{
-              $t('dataset.cancel')
-            }}
+            $t('dataset.cancel')
+          }}
           </el-button>
           <el-button
             :disabled="groupMoveConfirmDisabled"

From 13dab09d957e003bb5bdc40b001120234ae6908b Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 18:04:21 +0800
Subject: [PATCH 22/25] =?UTF-8?q?refactro(=E5=BA=94=E7=94=A8):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E5=BA=94=E7=94=A8=E6=A8=A1=E6=9D=BF=E7=95=8C=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E9=98=B2=E6=AD=A2=E8=AF=AF=E8=A7=A6=E5=85=B3=E9=97=AD?=
 =?UTF-8?q?=E5=B7=B2=E5=A1=AB=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/editor/ComponentWrapper.vue    |  2 +-
 frontend/src/lang/en.js                       |  1 +
 frontend/src/lang/tw.js                       |  1 +
 frontend/src/lang/zh.js                       |  1 +
 frontend/src/views/chart/view/ChartEdit.vue   | 60 +++++++++----------
 .../src/views/chart/view/PositionAdjust.vue   |  2 +-
 frontend/src/views/dataset/data/FieldEdit.vue |  6 +-
 .../component/AppTemplateApply.vue            | 11 ++--
 frontend/src/views/panel/edit/index.vue       | 32 +++++-----
 frontend/src/views/panel/list/PanelList.vue   | 14 ++---
 10 files changed, 66 insertions(+), 64 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
index 289774c142..639bb5f740 100644
--- a/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/editor/ComponentWrapper.vue
@@ -274,7 +274,7 @@ export default {
       } else {
         return {
           ...
-            getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
+          getStyle(style, ['top', 'left', 'width', 'height', 'rotate']),
           position: 'relative'
         }
       }
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 68c9336d48..47661e6689 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -2680,6 +2680,7 @@ export default {
   'I18N_USER_TEMPLATE_ERROR': 'Template file error',
   'i18n_max_user_import_size': 'File size exceeds 10M',
   app_template: {
+    apply_template: 'Apply template',
     execution_time: 'Execution time',
     app_manager: 'Application management',
     app_upload: 'Upload app',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index bb327cf02d..68a331841e 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -2681,6 +2681,7 @@ export default {
   'I18N_USER_TEMPLATE_ERROR': '模版錯誤',
   'i18n_max_user_import_size': '文件最大不能超過10M',
   app_template: {
+    apply_template: '應用模版',
     execution_time: '执行时间',
     app_manager: '應用管理',
     app_upload: '上傳應用',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index c408133eff..3a441deb21 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -2681,6 +2681,7 @@ export default {
   'I18N_USER_TEMPLATE_ERROR': '模版错误',
   'i18n_max_user_import_size': '文件最大不能超过10M',
   app_template: {
+    apply_template: '应用模板',
     execution_time: '执行时间',
     app_manager: '应用管理',
     app_upload: '上传应用',
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 9d34f0a5e5..9b0b7ff39e 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -192,7 +192,7 @@
                               @command="chartFieldEdit"
                             >
                               <span class="el-dropdown-link">
-                                <i class="el-icon-s-tools"/>
+                                <i class="el-icon-s-tools" />
                               </span>
                               <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item
@@ -267,7 +267,7 @@
                               @command="chartFieldEdit"
                             >
                               <span class="el-dropdown-link">
-                                <i class="el-icon-s-tools"/>
+                                <i class="el-icon-s-tools" />
                               </span>
                               <el-dropdown-menu slot="dropdown">
                                 <el-dropdown-item
@@ -362,7 +362,7 @@
                           style="padding: 6px;"
                         >
                           {{ $t('chart.change_chart_type') }}
-                          <i class="el-icon-caret-bottom"/>
+                          <i class="el-icon-caret-bottom" />
                         </el-button>
                       </el-popover>
                     </span>
@@ -490,8 +490,8 @@
                     >
                       <span class="data-area-label">
                         <span v-if="view.type && view.type.includes('table')">{{
-                            $t('chart.drag_block_table_data_column')
-                          }}</span>
+                          $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' || view.type === 'area')"
                         >{{ $t('chart.drag_block_type_axis') }}</span>
@@ -499,18 +499,18 @@
                           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>
+                          $t('chart.drag_block_funnel_split')
+                        }}</span>
                         <span v-else-if="view.type && view.type.includes('radar')">{{
-                            $t('chart.drag_block_radar_label')
-                          }}</span>
+                          $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>
+                          $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>
+                          $t('chart.drag_block_word_cloud_label')
+                        }}</span>
                         <span v-else-if="view.type && view.type === 'label'">{{ $t('chart.drag_block_label') }}</span>
                         <span v-show="view.type !== 'richTextView'"> / </span>
                         <span v-if="view.type && view.type !== 'table-info'">{{ $t('chart.dimension') }}</span>
@@ -633,8 +633,8 @@
                     >
                       <span class="data-area-label">
                         <span v-if="view.type && view.type.includes('table')">{{
-                            $t('chart.drag_block_table_data_column')
-                          }}</span>
+                          $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' || view.type === 'area')"
                         >{{ $t('chart.drag_block_value_axis') }}</span>
@@ -642,30 +642,30 @@
                           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>
+                          $t('chart.drag_block_funnel_width')
+                        }}</span>
                         <span v-else-if="view.type && view.type.includes('radar')">{{
-                            $t('chart.drag_block_radar_length')
-                          }}</span>
+                          $t('chart.drag_block_radar_length')
+                        }}</span>
                         <span v-else-if="view.type && view.type.includes('gauge')">{{
-                            $t('chart.drag_block_gauge_angel')
-                          }}</span>
+                          $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>
+                          $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>
+                          $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>
+                          $t('chart.drag_block_word_cloud_size')
+                        }}</span>
                         <span v-show="view.type !== 'richTextView'"> / </span>
                         <span>{{ $t('chart.quota') }}</span>
                         <i
@@ -1116,7 +1116,7 @@
           class="padding-tab"
           style="width: 350px;"
         >
-          <position-adjust/>
+          <position-adjust />
         </el-tab-pane>
 
       </el-tabs>
@@ -1268,7 +1268,7 @@
       width="800px"
       class="dialog-css"
     >
-      <quota-filter-editor :item="quotaItem"/>
+      <quota-filter-editor :item="quotaItem" />
       <div
         slot="footer"
         class="dialog-footer"
@@ -1295,7 +1295,7 @@
       width="800px"
       class="dialog-css"
     >
-      <dimension-filter-editor :item="dimensionItem"/>
+      <dimension-filter-editor :item="dimensionItem" />
       <div
         slot="footer"
         class="dialog-footer"
diff --git a/frontend/src/views/chart/view/PositionAdjust.vue b/frontend/src/views/chart/view/PositionAdjust.vue
index e8332c8a9d..37023bb46c 100644
--- a/frontend/src/views/chart/view/PositionAdjust.vue
+++ b/frontend/src/views/chart/view/PositionAdjust.vue
@@ -30,8 +30,8 @@
             type="number"
             :min="0"
             :max="maxLeft"
-            @change="leftOnChange"
             class="hide-icon-number"
+            @change="leftOnChange"
           >
             <template slot="append">px</template>
           </el-input>
diff --git a/frontend/src/views/dataset/data/FieldEdit.vue b/frontend/src/views/dataset/data/FieldEdit.vue
index 90591d6124..9266ab5ad6 100644
--- a/frontend/src/views/dataset/data/FieldEdit.vue
+++ b/frontend/src/views/dataset/data/FieldEdit.vue
@@ -839,7 +839,7 @@ export default {
       })
     },
     getFields(item) {
-      if(item.deExtractType == 0){
+      if (item.deExtractType == 0) {
         const children = this.dateformats
         return [
           { label: this.$t('dataset.text'), value: 0 },
@@ -852,7 +852,7 @@ export default {
           },
           { label: this.$t('dataset.location'), value: 5 }
         ]
-      }else {
+      } else {
         return [
           { label: this.$t('dataset.text'), value: 0 },
           { label: this.$t('dataset.time'), value: 1 },
@@ -870,7 +870,7 @@ export default {
       item.deType = item.deTypeCascader[0]
       if (item.deTypeCascader.length === 2) { // 时间
         item.dateFormatType = item.deTypeCascader[1]
-        if(item.dateFormatType !== 'custom'){
+        if (item.dateFormatType !== 'custom') {
           item.dateFormat = item.dateFormatType
         }
       }
diff --git a/frontend/src/views/panel/appTemplate/component/AppTemplateApply.vue b/frontend/src/views/panel/appTemplate/component/AppTemplateApply.vue
index bfaa038d57..9906ccf393 100644
--- a/frontend/src/views/panel/appTemplate/component/AppTemplateApply.vue
+++ b/frontend/src/views/panel/appTemplate/component/AppTemplateApply.vue
@@ -2,10 +2,11 @@
   <el-drawer
     v-closePress
     v-loading="$store.getters.loadingMap[$store.getters.currentPath]"
-    :title="'应用模板'"
+    :title="$t('app_template.apply_template')"
     :visible.sync="applyDrawer"
     custom-class="de-user-drawer"
     size="600px"
+    :wrapper-closable="false"
     direction="rtl"
   >
     <ds-form
@@ -19,6 +20,7 @@
 
 <script>
 import DsForm from '@/views/system/datasource/DsForm'
+
 export default {
   name: 'AppTemplateApply',
   components: {
@@ -30,8 +32,7 @@ export default {
       applyDrawer: false
     }
   },
-  computed: {
-  },
+  computed: {},
   mounted() {
   },
   methods: {
@@ -52,7 +53,7 @@ export default {
 </script>
 
 <style scoped>
-::v-deep .el-drawer__body{
-  padding: 0px 0px!important;
+::v-deep .el-drawer__body {
+  padding: 0px 0px !important;
 }
 </style>
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 41080baef7..87628019b9 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -165,8 +165,8 @@
               v-show=" show &&showIndex===1"
               :canvas-id="canvasId"
             />
-            <subject-setting v-show=" show &&showIndex===2"/>
-            <assist-component v-show=" show &&showIndex===3"/>
+            <subject-setting v-show=" show &&showIndex===2" />
+            <assist-component v-show=" show &&showIndex===3" />
           </div>
         </el-drawer>
         <!--PC端画布区域-->
@@ -181,7 +181,7 @@
           :canvas-pid="'0'"
           @canvasScroll="canvasScroll"
         >
-          <canvas-opt-bar slot="optBar"/>
+          <canvas-opt-bar slot="optBar" />
         </de-canvas>
         <!--移动端画布区域 保持宽高比2.5-->
         <el-row
@@ -197,7 +197,7 @@
               :style="customCanvasMobileStyle"
               class="this_mobile_canvas"
             >
-              <el-row class="this_mobile_canvas_top"/>
+              <el-row class="this_mobile_canvas_top" />
               <el-row class="this_mobile_canvas_inner_top">
                 {{ panelInfo.name }}
               </el-row>
@@ -215,7 +215,7 @@
                   :canvas-pid="'0'"
                   :mobile-layout-status="true"
                 >
-                  <canvas-opt-bar slot="optBar"/>
+                  <canvas-opt-bar slot="optBar" />
                 </de-canvas>
               </el-row>
               <el-row class="this_mobile_canvas_inner_bottom">
@@ -245,14 +245,14 @@
                   />
                 </el-col>
               </el-row>
-              <el-row class="this_mobile_canvas_bottom"/>
+              <el-row class="this_mobile_canvas_bottom" />
             </div>
           </el-col>
           <el-col
             :span="16"
             class="this_mobile_canvas_cell this_mobile_canvas_wait_cell"
           >
-            <component-wait/>
+            <component-wait />
           </el-col>
         </el-row>
       </de-main-container>
@@ -270,7 +270,7 @@
           />
         </div>
         <div v-if="showBatchViewToolsAside">
-          <chart-style-batch-set/>
+          <chart-style-batch-set />
         </div>
         <div v-if="!showViewToolsAside&&!showBatchViewToolsAside">
           <el-row style="height: 40px">
@@ -283,11 +283,10 @@
                 @click="changeRightDrawOpen(false)"
               />
             </el-tooltip>
-            <span style="font-weight: bold;font-size: 14px;margin-left: 40px;line-height:40px"
-            >{{ $t('panel.position_adjust') }}</span>
+            <span style="font-weight: bold;font-size: 14px;margin-left: 40px;line-height:40px">{{ $t('panel.position_adjust') }}</span>
           </el-row>
           <el-row>
-            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix"/>
+            <position-adjust v-if="curComponent&&!curComponent.auxiliaryMatrix" />
           </el-row>
         </div>
       </div>
@@ -446,8 +445,7 @@
           />
         </el-col>
         <el-col :span="21">
-          <span style="font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px"
-          >{{ $t('panel.panel_cache_use_tips') }}</span>
+          <span style="font-size: 13px;margin-left: 10px;font-weight: bold;line-height: 20px">{{ $t('panel.panel_cache_use_tips') }}</span>
         </el-col>
       </el-row>
       <div
@@ -963,11 +961,11 @@ export default {
     showPanel(type) {
       if (this.showIndex === -1 || this.showIndex === type) {
         this.$nextTick(() => {
-            if (this.show) {
-              this.showIndex === -1
-            }
-            this.show = !this.show
+          if (this.show) {
+            this.showIndex === -1
           }
+          this.show = !this.show
+        }
         )
       }
       this.showIndex = type
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 3ae5ce2a0d..2ece545af3 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -174,7 +174,7 @@
                   />
                 </span>
                 <span v-if="data.nodeType === 'folder'">
-                  <svg-icon icon-class="scene"/>
+                  <svg-icon icon-class="scene" />
                 </span>
                 <span
                   :class="data.status"
@@ -211,7 +211,7 @@
                       <el-dropdown-item
                         :command="beforeClickEdit('folder', 'new', data, node)"
                       >
-                        <svg-icon icon-class="scene"/>
+                        <svg-icon icon-class="scene" />
                         <span style="margin-left: 5px">{{ $t('panel.groupAdd') }}</span>
                       </el-dropdown-item>
                       <el-dropdown-item
@@ -334,7 +334,7 @@
             :label="$t('commons.name')"
             prop="name"
           >
-            <el-input v-model="groupForm.name"/>
+            <el-input v-model="groupForm.name" />
           </el-form-item>
         </el-form>
         <div
@@ -345,8 +345,8 @@
             size="mini"
             @click="close()"
           >{{
-              $t('panel.cancel')
-            }}
+            $t('panel.cancel')
+          }}
           </el-button>
           <el-button
             type="primary"
@@ -422,8 +422,8 @@
             size="mini"
             @click="closeMoveGroup()"
           >{{
-              $t('dataset.cancel')
-            }}
+            $t('dataset.cancel')
+          }}
           </el-button>
           <el-button
             :disabled="groupMoveConfirmDisabled"

From 8dec16b918c0ecb9d32db7d06bb27ccf6e663bca Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 24 Nov 2022 18:14:06 +0800
Subject: [PATCH 23/25] =?UTF-8?q?fix(=E5=85=AC=E5=85=B1=E9=93=BE=E6=8E=A5)?=
 =?UTF-8?q?:=20=E4=B8=8B=E8=BD=BDpdf=E7=BC=BA=E5=A4=B1=E5=9B=BE=E7=89=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../canvas/components/editor/Preview.vue          | 10 ++++------
 frontend/src/views/link/view/index.vue            | 15 +++++++++++++--
 2 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/frontend/src/components/canvas/components/editor/Preview.vue b/frontend/src/components/canvas/components/editor/Preview.vue
index 7c523fe88c..5394f4a0e8 100644
--- a/frontend/src/components/canvas/components/editor/Preview.vue
+++ b/frontend/src/components/canvas/components/editor/Preview.vue
@@ -1,10 +1,6 @@
 <template>
   <div
     :id="previewMainDomId"
-    v-loading="dataLoading"
-    :element-loading-text="$t('panel.data_loading')"
-    element-loading-spinner="el-icon-loading"
-    element-loading-background="rgba(220,220,220,1)"
     class="bg"
     :style="customStyle"
     @scroll="canvasScroll"
@@ -614,7 +610,8 @@ export default {
     },
     downloadAsPDF() {
       this.dataLoading = true
-      const domId = this.canvasInfoTemp
+      this.$emit('change-load-status', true)
+      const domId = this.previewMainDomId
       setTimeout(() => {
         this.exporting = true
         this.backScreenShot = true
@@ -625,6 +622,7 @@ export default {
           html2canvas(document.getElementById(domId)).then(canvas => {
             const snapshot = canvas.toDataURL('image/jpeg', 1) // 是图片质量
             this.dataLoading = false
+            this.$emit('change-load-status', false)
             this.exporting = false
             this.backScreenShot = false
             if (snapshot !== '') {
@@ -632,7 +630,7 @@ export default {
               this.pdfExportShow = true
             }
           })
-        }, 1500)
+        }, 2500)
       }, 500)
     },
     closePreExport() {
diff --git a/frontend/src/views/link/view/index.vue b/frontend/src/views/link/view/index.vue
index 37bda6356e..2070287ccf 100644
--- a/frontend/src/views/link/view/index.vue
+++ b/frontend/src/views/link/view/index.vue
@@ -1,11 +1,18 @@
 <template>
-  <div style="width: 100%;height: 100vh;background-color: #f7f8fa">
+  <div
+    v-loading="dataLoading"
+    style="width: 100%;height: 100vh;background-color: #f7f8fa"
+    :element-loading-text="$t('panel.data_loading')"
+    element-loading-spinner="el-icon-loading"
+    element-loading-background="rgba(220,220,220,1)"
+  >
     <Preview
       v-if="show"
       :component-data="mainCanvasComponentData"
       :canvas-style-data="canvasStyleData"
       :panel-info="panelInfo"
       :user-id="user"
+      @change-load-status="setLoading"
     />
   </div>
 </template>
@@ -38,7 +45,8 @@ export default {
     return {
       canvasId: 'canvas-main',
       show: false,
-      panelInfo: {}
+      panelInfo: {},
+      dataLoading: false
     }
   },
   computed: {
@@ -55,6 +63,9 @@ export default {
     this.viewLog()
   },
   methods: {
+    setLoading(status) {
+      this.dataLoading = !!status
+    },
     viewLog() {
       const param = {
         panelId: this.resourceId,

From e014b26ebba8e1f7c994fe75e88e70371ece25a3 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 18:24:51 +0800
Subject: [PATCH 24/25] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E7=89=88):=20?=
 =?UTF-8?q?Tab=E7=BB=84=E4=BB=B6=E8=BD=AE=E6=92=AD=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E5=92=8C=E8=BD=AE=E6=92=AD=E9=A1=BA=E5=BA=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/deWidget/DeTabs.vue   |  2 +-
 frontend/src/components/widget/deWidget/TabStyle.vue | 11 ++++++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/widget/deWidget/DeTabs.vue b/frontend/src/components/widget/deWidget/DeTabs.vue
index 6e401c8166..60c25fda40 100644
--- a/frontend/src/components/widget/deWidget/DeTabs.vue
+++ b/frontend/src/components/widget/deWidget/DeTabs.vue
@@ -470,8 +470,8 @@ export default {
         let switchCount = 1
         // 轮播定时器
         this.timer = setInterval(() => {
-          switchCount++
           const nowIndex = switchCount % this.element.options.tabList.length
+          switchCount++
           this.activeTabName = this.element.options.tabList[nowIndex].name
         }, switchTime)
       }
diff --git a/frontend/src/components/widget/deWidget/TabStyle.vue b/frontend/src/components/widget/deWidget/TabStyle.vue
index c73831ad80..0813f2d94a 100644
--- a/frontend/src/components/widget/deWidget/TabStyle.vue
+++ b/frontend/src/components/widget/deWidget/TabStyle.vue
@@ -135,8 +135,9 @@
               type="number"
               size="mini"
               :min="2"
+              :max="3600"
               class="hide-icon-number"
-              @change="styleChange"
+              @change="switchTimeChange"
             >
               <template slot="append">S</template>
             </el-input>
@@ -180,6 +181,14 @@ export default {
       const current = this.$refs[pickKey]
       current && (current.showPicker = true)
     },
+    switchTimeChange() {
+      if (!this.styleInfo.switchTime || this.styleInfo.switchTime < 2) {
+        this.styleInfo.switchTime = 2
+      } else if (this.styleInfo.switchTime && this.styleInfo.switchTime > 3600) {
+        this.styleInfo.switchTime = 3600
+      }
+      this.styleChange()
+    },
     styleChange() {
       this.$store.commit('canvasChange')
     }

From fbd98b6142b129968129bf9ab9e67cac8e67466f Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 24 Nov 2022 18:42:23 +0800
Subject: [PATCH 25/25] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=BE=B9=E6=A1=86=E8=AE=BE=E7=BD=AE=E9=A2=84?=
 =?UTF-8?q?=E8=A7=88=E6=97=B6=E8=83=8C=E6=99=AF=E5=9B=BE=E7=89=87=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E4=B8=8D=E5=85=A8=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/background/index.vue | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/background/index.vue b/frontend/src/views/background/index.vue
index f8a6679f35..4fa88fb8d1 100644
--- a/frontend/src/views/background/index.vue
+++ b/frontend/src/views/background/index.vue
@@ -112,7 +112,7 @@
               :http-request="upload"
               :file-list="fileList"
             >
-              <i class="el-icon-plus" />
+              <i class="el-icon-plus"/>
             </el-upload>
             <el-dialog
               top="25vh"
@@ -375,6 +375,7 @@ export default {
 }
 
 .main-row {
+  background-size: 100% 100% !important;
   padding-left: 10px;
   height: 250px;
   overflow-y: auto;