From afbad86b9315794b130c818748759a270245eafe Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 3 Aug 2021 13:18:21 +0800
Subject: [PATCH 01/15] =?UTF-8?q?fix:=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BF=AE=E6=94=B9=E4=BF=9D=E5=AD=98=E6=8C=89=E9=92=AE?=
 =?UTF-8?q?=E8=BF=98=E6=98=AF=E7=81=B0=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/components/DeDrag/DragShadow.vue | 172 ++++++++++++++++++
 .../canvas/components/Editor/index.vue        |   1 +
 2 files changed, 173 insertions(+)
 create mode 100644 frontend/src/components/DeDrag/DragShadow.vue

diff --git a/frontend/src/components/DeDrag/DragShadow.vue b/frontend/src/components/DeDrag/DragShadow.vue
new file mode 100644
index 0000000000..60d9e6d358
--- /dev/null
+++ b/frontend/src/components/DeDrag/DragShadow.vue
@@ -0,0 +1,172 @@
+<template>
+  <div class="home">
+    <Toolbar />
+
+    <main>
+      <!-- 左侧组件列表 -->
+      <!--      <section class="left">-->
+      <!--        <ComponentList />-->
+      <!--      </section>-->
+      <!-- 中间画布 -->
+      <section class="center">
+        <div
+          class="content"
+          @drop="handleDrop"
+          @dragover="handleDragOver"
+          @mousedown="handleMouseDown"
+          @mouseup="deselectCurComponent"
+        >
+          <Editor />
+        </div>
+      </section>
+
+    </main>
+  </div>
+</template>
+
+<script>
+import Editor from '@/components/Editor/index'
+import ComponentList from '@/components/ComponentList' // 左侧列表组件
+import AttrList from '@/components/canvas/components/AttrList' // 右侧属性列表
+import AnimationList from '@/components/canvas/components/AnimationList' // 右侧动画列表
+import EventList from '@/components/canvas/components/EventList' // 右侧事件列表
+import componentList from '@/components/canvas/custom-component/component-list' // 左侧列表数据
+import Toolbar from '@/components/Toolbar'
+import { deepCopy } from '@/utils/utils'
+import { mapState } from 'vuex'
+import generateID from '@/utils/generateID'
+import { listenGlobalKeyDown } from '@/utils/shortcutKey'
+
+export default {
+  // eslint-disable-next-line vue/no-unused-components
+  components: { Editor, ComponentList, AttrList, AnimationList, EventList, Toolbar },
+  data() {
+    return {
+      activeName: 'attr',
+      reSelectAnimateIndex: undefined
+    }
+  },
+  computed: mapState([
+    'componentData',
+    'curComponent',
+    'isClickComponent',
+    'canvasStyleData'
+  ]),
+  created() {
+    this.restore()
+    // 全局监听按键事件
+    listenGlobalKeyDown()
+  },
+  methods: {
+    restore() {
+      // 用保存的数据恢复画布
+      if (localStorage.getItem('canvasData')) {
+        this.$store.commit('setComponentData', this.resetID(JSON.parse(localStorage.getItem('canvasData'))))
+      }
+
+      if (localStorage.getItem('canvasStyle')) {
+        this.$store.commit('setCanvasStyle', JSON.parse(localStorage.getItem('canvasStyle')))
+      }
+    },
+
+    resetID(data) {
+      if (data) {
+        data.forEach(item => {
+          // eslint-disable-next-line no-undef
+          item.type !== 'custom' && (item.id = uuid.v1())
+        })
+      }
+
+      return data
+    },
+
+    handleDrop(e) {
+      e.preventDefault()
+      e.stopPropagation()
+
+      let component
+      const id = e.dataTransfer.getData('componentId')
+      componentList.forEach(componentTemp => {
+        if (id === componentTemp.id) {
+          component = deepCopy(componentTemp)
+        }
+      })
+      // const component = deepCopy(componentList[e.dataTransfer.getData('index')])
+      component.style.top = e.offsetY
+      component.style.left = e.offsetX
+      component.id = generateID()
+      this.$store.commit('addComponent', { component })
+      this.$store.commit('recordSnapshot')
+    },
+
+    handleDragOver(e) {
+      e.preventDefault()
+      e.dataTransfer.dropEffect = 'copy'
+    },
+
+    handleMouseDown() {
+      this.$store.commit('setClickComponentStatus', false)
+    },
+
+    deselectCurComponent(e) {
+      if (!this.isClickComponent) {
+        this.$store.commit('setCurComponent', { component: null, index: null })
+      }
+
+      // 0 左击 1 滚轮 2 右击
+      if (e.button !== 2) {
+        this.$store.commit('hideContextMenu')
+      }
+    }
+  }
+}
+</script>
+
+<style lang="scss">
+.home {
+    height: 100vh;
+    background: #fff;
+
+    main {
+        height: calc(100% - 64px);
+        position: relative;
+
+        .left {
+            position: absolute;
+            height: 100%;
+            width: 200px;
+            left: 0;
+            top: 0;
+            padding-top: 10px;
+        }
+
+        .right {
+            position: absolute;
+            height: 100%;
+            width: 262px;
+            right: 0;
+            top: 0;
+        }
+
+        .center {
+            margin-left: 200px;
+            margin-right: 262px;
+            background: #f5f5f5;
+            height: 100%;
+            overflow: auto;
+            padding: 20px;
+
+            .content {
+                width: 100%;
+                height: 100%;
+                overflow: auto;
+            }
+        }
+    }
+
+    .placeholder {
+        text-align: center;
+        color: #333;
+    }
+}
+</style>
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index b647626b30..e3ba326800 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -275,6 +275,7 @@ export default {
         // 第一次变化 不需要 重置边界 待改进
         if (this.changeIndex++ > 0) {
           this.resizeParentBounds()
+          this.$store.state.styleChangeTimes++
         }
         // this.changeScale()
       },

From 673f4ea4a6b47a1430b7c4a892a76e743bdcb373 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 3 Aug 2021 15:37:32 +0800
Subject: [PATCH 02/15] =?UTF-8?q?feat:=20=E4=BC=98=E5=8C=96=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81=E7=9A=84=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableTaskController.java   |  2 +-
 .../dataset/DataSetTableTaskService.java      | 14 ++++++++-----
 .../resources/i18n/messages_en_US.properties  |  5 ++++-
 .../resources/i18n/messages_zh_CN.properties  |  4 ++++
 .../resources/i18n/messages_zh_TW.properties  |  5 ++++-
 .../src/views/system/task/DatasetTaskList.vue | 21 ++++++++++++-------
 6 files changed, 35 insertions(+), 16 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java
index 5eb8b32c92..14a5c365f9 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java
@@ -57,7 +57,7 @@ public class DataSetTableTaskController {
     }
 
     @PostMapping("/updateStatus")
-    public void updateStatus(@RequestBody DatasetTableTask datasetTableTask) {
+    public void updateStatus(@RequestBody DatasetTableTask datasetTableTask) throws Exception{
         dataSetTableTaskService.updateDatasetTableTaskStatus(datasetTableTask);
     }
 
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
index e3fb3369ed..5ee2153f2e 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -1,6 +1,5 @@
 package io.dataease.service.dataset;
 
-import com.google.gson.Gson;
 import io.dataease.base.domain.*;
 import io.dataease.base.mapper.DatasetTableMapper;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
@@ -53,8 +52,6 @@ public class DataSetTableTaskService {
     private ExtDataSetTaskMapper extDataSetTaskMapper;
     @Resource
     private DatasetTableMapper datasetTableMapper;
-    @Resource
-    private UtilMapper utilMapper;
 
     public DatasetTableTask save(DataSetTaskRequest dataSetTaskRequest) throws Exception {
         checkName(dataSetTaskRequest);
@@ -99,9 +96,10 @@ public class DataSetTableTaskService {
         // simple
         if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { // SIMPLE 类型，提前占位
             execNow(datasetTableTask);
+        }else {
+            checkTaskIsStopped(datasetTableTask);
         }
         scheduleService.addSchedule(datasetTableTask);
-        checkTaskIsStopped(datasetTableTask);
         return datasetTableTask;
     }
 
@@ -282,7 +280,13 @@ public class DataSetTableTaskService {
         }
     }
 
-    public void updateDatasetTableTaskStatus(DatasetTableTask datasetTableTask){
+    public void updateDatasetTableTaskStatus(DatasetTableTask datasetTableTask)throws Exception{
+
+        DatasetTableTask dbDatasetTableTask = datasetTableTaskMapper.selectByPrimaryKey(datasetTableTask.getId());
+        if(dbDatasetTableTask.getStatus().equalsIgnoreCase(TaskStatus.Exec.name()) || dbDatasetTableTask.getStatus().equals(TaskStatus.Stopped.name())){
+            throw new Exception(Translator.get("i18n_change_task_status_error") + Translator.get("i18n_" + dbDatasetTableTask.getStatus()));
+        }
+
         DatasetTableTaskExample datasetTableTaskExample = new DatasetTableTaskExample();
         DatasetTableTaskExample.Criteria criteria = datasetTableTaskExample.createCriteria();
         criteria.andIdEqualTo(datasetTableTask.getId());
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index df267ca744..c1735c6cb2 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -277,4 +277,7 @@ i18n_data_not_sync=Please sync data first
 i18n_excel_colume_change=The column name of Excel is inconsistent with the original data set
 i18n_timed_task=Timed Task
 i18n_datasource_connect_error=Data source connection exception: 
-i18n_check_sql_error=Check incremental SQL exception,
\ No newline at end of file
+i18n_check_sql_error=Check incremental SQL exception,
+i18n_change_task_status_error=Suspension is not allowed. The task status is：
+i18n_Stopped=END
+i18n_Exec=Running
\ No newline at end of file
diff --git a/backend/src/main/resources/i18n/messages_zh_CN.properties b/backend/src/main/resources/i18n/messages_zh_CN.properties
index 63e928d866..9ccd5e60bf 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -277,3 +277,7 @@ i18n_excel_colume_change=Excel的列名与原数据集不一致
 i18n_timed_task=定时任务
 i18n_datasource_connect_error=数据源连接异常: 
 i18n_check_sql_error=校验增量 SQL 异常, 
+i18n_change_task_status_error=不允许暂停，任务状态为：
+i18n_Stopped=执行结束
+i18n_Exec=运行中
+
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 6ca4b80ab5..9e79137c74 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -279,4 +279,7 @@ i18n_data_not_sync=請先完成數據同步
 i18n_excel_colume_change=Excel的列名與原數據集不一致
 i18n_timed_task=定時任務
 i18n_datasource_connect_error=數據源連接異常: 
-i18n_check_sql_error=校驗增量SQL異常,
\ No newline at end of file
+i18n_check_sql_error=校驗增量SQL異常,
+i18n_change_task_status_error=不允許暫停，任務狀態為：
+i18n_Stopped=執行結束
+i18n_Exec=運行中
\ No newline at end of file
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index 3ae0ebb40d..53cd99bdf9 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -416,15 +416,20 @@ export default {
       this.update_task = true
     },
     changeTaskStatus(task) {
-      const param = task
-      param.status = task.status === 'Underway' ? 'Pending' : 'Underway'
+      let param = JSON.parse(JSON.stringify(task));
       post('/dataset/task/updateStatus', task).then(response => {
-        task.status = param.status
-        this.$message({
-          message: this.$t('dataset.task.change_success'),
-          type: 'success',
-          showClose: true
-        })
+        if(response.success){
+          task.status = param.status
+          this.$message({
+            message: this.$t('dataset.task.change_success'),
+            type: 'success',
+            showClose: true
+          })
+        }else {
+          this.search(this.last_condition, false)
+        }
+      }).catch(() => {
+        this.search(this.last_condition, false)
       })
     },
     execTask(task) {

From 5eaaa236f15706cef07efaa67652a6ea7aac835a Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 3 Aug 2021 15:53:35 +0800
Subject: [PATCH 03/15] =?UTF-8?q?fix:=20=E6=9F=A5=E8=AF=A2=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/task/TaskRecord.vue | 17 ++++++++++++++---
 1 file changed, 14 insertions(+), 3 deletions(-)

diff --git a/frontend/src/views/system/task/TaskRecord.vue b/frontend/src/views/system/task/TaskRecord.vue
index 5ac4a2dd7a..2fa6084a57 100644
--- a/frontend/src/views/system/task/TaskRecord.vue
+++ b/frontend/src/views/system/task/TaskRecord.vue
@@ -140,8 +140,8 @@ export default {
     createTimer() {
       if (!this.timer) {
         this.timer = setInterval(() => {
-          this.search(this.last_condition, false)
-        }, 1000)
+          this.timerSearch(this.last_condition, false)
+        }, 15000)
       }
     },
     destroyTimer() {
@@ -168,7 +168,7 @@ export default {
     },
     select(selection) {
     },
-    search(condition, showLoading = true) {
+    timerSearch(condition, showLoading = true) {
       if(!this.lastRequestComplete){
         return;
       }else {
@@ -188,6 +188,17 @@ export default {
         this.lastRequestComplete = true;
       })
     },
+    search(condition, showLoading = true) {
+      this.last_condition = condition
+      condition = formatQuickCondition(condition, 'dataset_table_task.name')
+      const temp = formatCondition(condition)
+      const param = temp || {}
+      param['orders'] = formatOrders(this.orderConditions)
+      post('/dataset/taskLog/list/notexcel/' + this.paginationConfig.currentPage + '/' + this.paginationConfig.pageSize, param, showLoading).then(response => {
+        this.data = response.data.listObject
+        this.paginationConfig.total = response.data.itemCount
+      })
+    },
     showErrorMassage(massage) {
       this.show_error_massage = true
       this.error_massage = massage

From 38838e3162fa168b64fa7ec59c2ee5c386cf7c92 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 3 Aug 2021 17:01:16 +0800
Subject: [PATCH 04/15] =?UTF-8?q?refactor:=20=E5=8E=BB=E6=8E=89=E5=A4=9A?=
 =?UTF-8?q?=E4=BD=99=E8=AF=B7=E6=B1=82;=E6=95=B0=E6=8D=AE=E9=9B=86tree?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue           |  2 +-
 frontend/src/views/chart/view/ChartEdit.vue        |  4 ++--
 .../dataset/common/DatasetGroupSelectorTree.vue    | 14 ++++++++------
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index cb401db247..4fb5c85aba 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -257,13 +257,13 @@
 
     <!--添加视图-选择数据集-->
     <el-dialog
+      v-if="selectTableFlag"
       v-dialogDrag
       :title="$t('chart.add_chart')"
       :visible="selectTableFlag"
       :show-close="false"
       width="70%"
       class="dialog-css"
-      :destroy-on-close="true"
     >
       <el-row style="width: 800px;">
         <el-form ref="form" :model="table" label-width="80px" size="mini" class="form-item">
diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index a0f28d62b4..be0025150f 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -398,13 +398,13 @@
 
     <!--视图更换数据集-->
     <el-dialog
+      v-if="selectTableFlag"
       v-dialogDrag
       :title="changeDsTitle"
       :visible="selectTableFlag"
       :show-close="false"
       width="70%"
       class="dialog-css"
-      :destroy-on-close="true"
     >
       <table-selector @getTable="getTable" />
       <p style="margin-top: 10px;color:#F56C6C;font-size: 12px;">{{ $t('chart.change_ds_tip') }}</p>
@@ -416,11 +416,11 @@
 
     <!--编辑视图使用的数据集的字段-->
     <el-dialog
+      v-if="editDsField"
       v-dialogDrag
       :visible="editDsField"
       :show-close="false"
       class="dialog-css"
-      :destroy-on-close="true"
       :fullscreen="true"
     >
       <field-edit :param="{table:table}" @switchComponent="closeEditDsField" />
diff --git a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
index 18e859b0fe..3664bce2b2 100644
--- a/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
+++ b/frontend/src/views/dataset/common/DatasetGroupSelectorTree.vue
@@ -68,7 +68,6 @@
 
 <script>
 import { isKettleRunning, post } from '@/api/dataset/dataset'
-import { authModel } from '@/api/system/sysAuth'
 import { hasDataPermission } from '@/utils/permission'
 
 export default {
@@ -403,11 +402,14 @@ export default {
 
     searchTree(val) {
       const queryCondition = {
-        withExtend: 'parent',
-        modelType: 'dataset',
+        // withExtend: 'parent',
+        // modelType: 'dataset',
         name: val
       }
-      authModel(queryCondition).then(res => {
+      // authModel(queryCondition).then(res => {
+      //   this.data = this.buildTree(res.data)
+      // })
+      post('/dataset/table/search', queryCondition).then(res => {
         this.data = this.buildTree(res.data)
       })
     },
@@ -420,8 +422,8 @@ export default {
       const roots = []
       arrs.forEach(el => {
         // 判断根节点 ###
-        el.type = el.modelInnerType
-        el.isLeaf = el.leaf
+        // el.type = el.modelInnerType
+        // el.isLeaf = el.leaf
         if (el[this.treeProps.parentId] === null || el[this.treeProps.parentId] === 0 || el[this.treeProps.parentId] === '0') {
           roots.push(el)
           return

From 7f537ba1a6abbeab94f79bd0ac85b737eb0e0bac Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 3 Aug 2021 18:30:51 +0800
Subject: [PATCH 05/15] =?UTF-8?q?fix:=20=E6=B2=A1=E6=9C=89=E7=BB=8F?=
 =?UTF-8?q?=E8=BF=87=E5=85=A8=E9=87=8F=E6=9B=B4=E6=96=B0=E4=B8=8D=E8=83=BD?=
 =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=A2=9E=E9=87=8F=E6=9B=B4=E6=96=B0=EF=BC=8C?=
 =?UTF-8?q?=E5=B9=B6=E8=AE=B0=E5=BD=95=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/ExtractDataService.java       | 15 ++++++++++-----
 .../src/views/system/task/DatasetTaskList.vue     |  3 ++-
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index d49469e0e7..ccdfda18bd 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -297,6 +297,7 @@ public class ExtractDataService {
                     saveErrorLog(datasetTableId, taskId, e);
                     msg = false;
                     lastExecStatus = JobStatus.Error;
+                    execTime = null;
                 } finally {
                     try { deleteFile("all_scope", datasetTableId); }catch (Exception ignore){ System.out.println(ignore.getMessage());}
                     try { sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, msg); }catch (Exception ignore){ System.out.println(ignore.getMessage());}
@@ -316,14 +317,17 @@ public class ExtractDataService {
                         return;
                     }
 
-                    if (datasetTable.getLastUpdateTime() == 0 || datasetTable.getLastUpdateTime() == null) {
-                        updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, null);
-                        return;
-                    }
-
                     if (datasetTableTask == null ) {
                         datasetTableTaskLog = writeDatasetTableTaskLog(datasetTableId, taskId);
                     }
+
+                    if (datasetTable.getLastUpdateTime() == null || datasetTable.getLastUpdateTime() == 0) {
+                        updateTableStatus(datasetTableId, datasetTable, JobStatus.Completed, null);
+                        saveErrorLog(datasetTableId, taskId, new Exception("未进行全量同步"));
+                        lastExecStatus = JobStatus.Error;
+                        return;
+                    }
+
                     execTime = System.currentTimeMillis();
                     if (StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd()) && StringUtils.isNotEmpty(datasetTableIncrementalConfig.getIncrementalAdd().replace(" ", ""))) {// 增量添加
                         String sql = datasetTableIncrementalConfig.getIncrementalAdd().replace(lastUpdateTime, datasetTable.getLastUpdateTime().toString())
@@ -348,6 +352,7 @@ public class ExtractDataService {
                     saveErrorLog(datasetTableId, taskId, e);
                     msg = false;
                     lastExecStatus = JobStatus.Error;
+                    execTime = null;
                 } finally {
                     try { deleteFile("incremental_add", datasetTableId); deleteFile("incremental_delete", datasetTableId); }catch (Exception ignore){}
                     try { sendWebMsg(datasetTable, datasetTableTask, datasetTableTaskLog, msg); }catch (Exception ignore){}
diff --git a/frontend/src/views/system/task/DatasetTaskList.vue b/frontend/src/views/system/task/DatasetTaskList.vue
index 53cd99bdf9..ef53ae2cca 100644
--- a/frontend/src/views/system/task/DatasetTaskList.vue
+++ b/frontend/src/views/system/task/DatasetTaskList.vue
@@ -417,7 +417,8 @@ export default {
     },
     changeTaskStatus(task) {
       let param = JSON.parse(JSON.stringify(task));
-      post('/dataset/task/updateStatus', task).then(response => {
+      param.status = task.status === 'Underway' ? 'Pending' : 'Underway'
+      post('/dataset/task/updateStatus', param).then(response => {
         if(response.success){
           task.status = param.status
           this.$message({

From 2e888d3587d3802840c2ca4b76b211a5119630fd Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 3 Aug 2021 18:58:02 +0800
Subject: [PATCH 06/15] =?UTF-8?q?fix:=20=E6=9B=B4=E6=96=B0=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81->=20=E6=89=A7=E8=A1=8C=E7=BB=93?=
 =?UTF-8?q?=E6=9D=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/dataset/DataSetTableTaskService.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
index 5ee2153f2e..5cffd5e742 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -4,7 +4,6 @@ import io.dataease.base.domain.*;
 import io.dataease.base.mapper.DatasetTableMapper;
 import io.dataease.base.mapper.DatasetTableTaskMapper;
 import io.dataease.base.mapper.ext.ExtDataSetTaskMapper;
-import io.dataease.base.mapper.ext.UtilMapper;
 import io.dataease.base.mapper.ext.query.GridExample;
 import io.dataease.commons.constants.JobStatus;
 import io.dataease.commons.constants.ScheduleType;
@@ -93,13 +92,15 @@ public class DataSetTableTaskService {
             datasetTableTaskMapper.updateByPrimaryKeySelective(datasetTableTask);
         }
 
+        scheduleService.addSchedule(datasetTableTask);
+
         // simple
         if (datasetTableTask.getRate().equalsIgnoreCase(ScheduleType.SIMPLE.toString())) { // SIMPLE 类型，提前占位
             execNow(datasetTableTask);
         }else {
             checkTaskIsStopped(datasetTableTask);
         }
-        scheduleService.addSchedule(datasetTableTask);
+
         return datasetTableTask;
     }
 

From 9579d08b72c0067c98bc032bc5bb22b4a1414f47 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Wed, 4 Aug 2021 10:33:12 +0800
Subject: [PATCH 07/15] =?UTF-8?q?fix:=20=E5=8E=9F=E5=A7=8B=E8=A1=A8?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=88=97=E6=97=B6=EF=BC=8C=E5=90=8C=E6=AD=A5?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/dataset/ExtractDataService.java  | 2 +-
 frontend/src/views/dataset/data/UpdateInfo.vue                | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
index ccdfda18bd..8aafc110d1 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -283,7 +283,7 @@ public class ExtractDataService {
                     createDorisTable(DorisTableUtils.dorisTmpName(DorisTableUtils.dorisName(datasetTableId)), dorisTablColumnSql);
                     generateTransFile("all_scope", datasetTable, datasource, datasetTableFields, null);
                     if (datasetTable.getType().equalsIgnoreCase("sql")) {
-                        generateJobFile("all_scope", datasetTable, fetchSqlField(new Gson().fromJson(datasetTable.getInfo(), DataTableInfoDTO.class).getSql(), datasource));
+                        generateJobFile("all_scope", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList())));
                     } else {
                         generateJobFile("all_scope", datasetTable, String.join(",", datasetTableFields.stream().map(DatasetTableField::getDataeaseName).collect(Collectors.toList())));
                     }
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index a1e6a6d85c..fa1a15ad64 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -433,10 +433,14 @@ export default {
   created() {
     this.timer = setInterval(() => {
       this.listTaskLog(false)
+    }, 5000);
+    this.taskTimer = setInterval(() => {
+      this.listTask(false)
     }, 5000)
   },
   beforeDestroy() {
     clearInterval(this.timer)
+    clearInterval(this.taskTimer)
   },
   methods: {
     calHeight() {

From ba1d20b07bfd2206e2a00997bf8e814d59a3b8f7 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 4 Aug 2021 12:03:03 +0800
Subject: [PATCH 08/15] =?UTF-8?q?refactor:=20tree=E8=8F=9C=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E7=BD=AE=E9=A3=98=E7=A7=BB=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/group/Group.vue        | 6 ++++--
 frontend/src/views/dataset/group/Group.vue      | 6 ++++--
 frontend/src/views/panel/list/PanelList.vue     | 6 ++++--
 frontend/src/views/system/datasource/DsTree.vue | 6 ++++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/frontend/src/views/chart/group/Group.vue b/frontend/src/views/chart/group/Group.vue
index 4fb5c85aba..0013a5df9e 100644
--- a/frontend/src/views/chart/group/Group.vue
+++ b/frontend/src/views/chart/group/Group.vue
@@ -1045,10 +1045,12 @@ export default {
     text-overflow: ellipsis;
   }
   .father .child {
-    display: none;
+    /*display: none;*/
+    visibility: hidden;
   }
   .father:hover .child {
-    display: inline;
+    /*display: inline;*/
+    visibility: visible;
   }
   .tree-style {
     padding: 10px 15px;
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 3f5b8c37af..308b44ca2e 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -989,10 +989,12 @@ export default {
     text-overflow: ellipsis;
   }
   .father .child {
-    display: none;
+    /*display: none;*/
+    visibility: hidden;
   }
   .father:hover .child {
-    display: inline;
+    /*display: inline;*/
+    visibility: visible;
   }
 
   .dialog-css >>> .el-dialog__body {
diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 6530fb6fed..8b42d39483 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -647,10 +647,12 @@ export default {
   }
 
   .father .child {
-    display: none;
+    /*display: none;*/
+    visibility: hidden;
   }
   .father:hover .child {
-    display: inline;
+    /*display: inline;*/
+    visibility: visible;
   }
 
 </style>
diff --git a/frontend/src/views/system/datasource/DsTree.vue b/frontend/src/views/system/datasource/DsTree.vue
index 8026935124..6b4e026daa 100644
--- a/frontend/src/views/system/datasource/DsTree.vue
+++ b/frontend/src/views/system/datasource/DsTree.vue
@@ -298,10 +298,12 @@ export default {
     text-overflow: ellipsis;
   }
   .father .child {
-    display: none;
+    /*display: none;*/
+    visibility: hidden;
   }
   .father:hover .child {
-    display: inline;
+    /*display: inline;*/
+    visibility: visible;
   }
   .tree-style {
     padding: 10px 15px;

From 5e34d52d6de65b8eb54092764219bb4637b12dda Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 4 Aug 2021 15:14:47 +0800
Subject: [PATCH 09/15] =?UTF-8?q?fix:=20sql=E6=B3=A8=E5=85=A5=E5=92=8Cxss?=
 =?UTF-8?q?=E6=94=BB=E5=87=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/commons/filter/SqlFilter.java |  78 ++++
 .../holder/ThreadLocalContextHolder.java      |  24 ++
 .../XssAndSqlHttpServletRequestWrapper.java   | 370 ++++++++++++++++++
 .../java/io/dataease/config/FilterConfig.java |  21 +
 4 files changed, 493 insertions(+)
 create mode 100644 backend/src/main/java/io/dataease/commons/filter/SqlFilter.java
 create mode 100644 backend/src/main/java/io/dataease/commons/holder/ThreadLocalContextHolder.java
 create mode 100644 backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
 create mode 100644 backend/src/main/java/io/dataease/config/FilterConfig.java

diff --git a/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java b/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java
new file mode 100644
index 0000000000..3a913cb270
--- /dev/null
+++ b/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java
@@ -0,0 +1,78 @@
+package io.dataease.commons.filter;
+
+import io.dataease.commons.holder.ThreadLocalContextHolder;
+import io.dataease.commons.wrapper.XssAndSqlHttpServletRequestWrapper;
+import org.apache.commons.lang3.StringUtils;
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import java.io.*;
+
+
+public class SqlFilter implements Filter {
+
+
+
+
+    @Override
+    public void destroy() {
+        // TODO Auto-generated method stub
+
+    }
+
+    @Override
+    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
+
+        String method = "GET";
+        String param = "";
+        XssAndSqlHttpServletRequestWrapper xssRequest = null;
+        if (request instanceof HttpServletRequest) {
+            method = ((HttpServletRequest) request).getMethod();
+            xssRequest = new XssAndSqlHttpServletRequestWrapper((HttpServletRequest) request);
+        }
+        if ("POST".equalsIgnoreCase(method)) {
+            param = this.getBodyString(xssRequest.getReader());
+            if(StringUtils.isNotBlank(param)){
+                if(xssRequest.checkXSSAndSql(param)){
+                    response.setCharacterEncoding("UTF-8");
+                    response.setContentType("application/json;charset=UTF-8");
+                    PrintWriter out = response.getWriter();
+                    String msg = ThreadLocalContextHolder.getData().toString();
+                    out.write(msg);
+                    return;
+                }
+            }
+        }
+        if (xssRequest.checkParameter()) {
+            response.setCharacterEncoding("UTF-8");
+            response.setContentType("application/json;charset=UTF-8");
+            PrintWriter out = response.getWriter();
+            String msg = ThreadLocalContextHolder.getData().toString();
+            out.write(msg);
+            return;
+        }
+        chain.doFilter(xssRequest, response);
+    }
+
+    @Override
+    public void init(FilterConfig filterConfig) throws ServletException {
+
+    }
+
+    // 获取request请求body中参数
+    public static String getBodyString(BufferedReader br) {
+        String inputLine;
+        String str = "";
+        try {
+            while ((inputLine = br.readLine()) != null) {
+                str += inputLine;
+            }
+            br.close();
+        } catch (IOException e) {
+            System.out.println("IOException: " + e);
+        }
+        return str;
+
+    }
+
+
+}
diff --git a/backend/src/main/java/io/dataease/commons/holder/ThreadLocalContextHolder.java b/backend/src/main/java/io/dataease/commons/holder/ThreadLocalContextHolder.java
new file mode 100644
index 0000000000..6aad695532
--- /dev/null
+++ b/backend/src/main/java/io/dataease/commons/holder/ThreadLocalContextHolder.java
@@ -0,0 +1,24 @@
+package io.dataease.commons.holder;
+
+public class ThreadLocalContextHolder {
+
+
+    private static ThreadLocal<Object> sceneThreadLocal = new ThreadLocal<>();
+
+
+    public static Object getData() {
+        return sceneThreadLocal.get();
+    }
+
+    public static void setData(Object data) {
+        if (ThreadLocalContextHolder.sceneThreadLocal == null) {
+            ThreadLocalContextHolder.sceneThreadLocal = new ThreadLocal<>();
+        }
+        ThreadLocalContextHolder.sceneThreadLocal.set(data);
+    }
+
+    public static void clearScene() {
+        setData(null);
+    }
+
+}
diff --git a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
new file mode 100644
index 0000000000..34fff33383
--- /dev/null
+++ b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
@@ -0,0 +1,370 @@
+package io.dataease.commons.wrapper;
+
+
+import java.io.BufferedReader;
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Map;
+import java.util.Set;
+import java.util.Vector;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import javax.servlet.ReadListener;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletRequestWrapper;
+
+import io.dataease.commons.holder.ThreadLocalContextHolder;
+import org.springframework.util.StreamUtils;
+
+
+public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrapper {
+
+
+    HttpServletRequest orgRequest = null;
+    private Map<String, String[]> parameterMap;
+    private final byte[] body; //用于保存读取body中数据
+
+    public XssAndSqlHttpServletRequestWrapper(HttpServletRequest request) throws IOException{
+        super(request);
+        orgRequest = request;
+        parameterMap = request.getParameterMap();
+        body = StreamUtils.copyToByteArray(request.getInputStream());
+    }
+
+    // 重写几个HttpServletRequestWrapper中的方法
+    /**
+     * 获取所有参数名
+     *
+     * @return 返回所有参数名
+     */
+    @Override
+    public Enumeration<String> getParameterNames() {
+        Vector<String> vector = new Vector<String>(parameterMap.keySet());
+        return vector.elements();
+    }
+
+    /**
+     * 覆盖getParameter方法，将参数名和参数值都做xss & sql过滤。<br/>
+     * 如果需要获得原始的值，则通过super.getParameterValues(name)来获取<br/>
+     * getParameterNames,getParameterValues和getParameterMap也可能需要覆盖
+     */
+    @Override
+    public String getParameter(String name) {
+        String[] results = parameterMap.get(name);
+        if (results == null || results.length <= 0)
+            return null;
+        else {
+            String value = results[0];
+            if (value != null) {
+                value = xssEncode(value);
+            }
+            return value;
+        }
+    }
+
+    /**
+     * 获取指定参数名的所有值的数组，如：checkbox的所有数据 接收数组变量 ，如checkobx类型
+     */
+    @Override
+    public String[] getParameterValues(String name) {
+        String[] results = parameterMap.get(name);
+        if (results == null || results.length <= 0)
+            return null;
+        else {
+            int length = results.length;
+            for (int i = 0; i < length; i++) {
+                results[i] = xssEncode(results[i]);
+            }
+            return results;
+        }
+    }
+
+    /**
+     * 覆盖getHeader方法，将参数名和参数值都做xss & sql过滤。<br/>
+     * 如果需要获得原始的值，则通过super.getHeaders(name)来获取<br/>
+     * getHeaderNames 也可能需要覆盖
+     */
+    @Override
+    public String getHeader(String name) {
+
+        String value = super.getHeader(xssEncode(name));
+        if (value != null) {
+            value = xssEncode(value);
+        }
+        return value;
+    }
+
+    /**
+     * 将容易引起xss & sql漏洞的半角字符直接替换成全角字符
+     *
+     * @param s
+     * @return
+     */
+    private static String xssEncode(String s) {
+        if (s == null || s.isEmpty()) {
+            return s;
+        } else {
+            s = stripXSSAndSql(s);
+        }
+        StringBuilder sb = new StringBuilder(s.length() + 16);
+        for (int i = 0; i < s.length(); i++) {
+            char c = s.charAt(i);
+            switch (c) {
+                case '>':
+                    sb.append("＞");// 转义大于号
+                    break;
+                case '<':
+                    sb.append("＜");// 转义小于号
+                    break;
+                // case '\'':
+                // sb.append("＇");// 转义单引号
+                // break;
+                // case '\"':
+                // sb.append("＂");// 转义双引号
+                // break;
+                case '&':
+                    sb.append("＆");// 转义&
+                    break;
+                case '#':
+                    sb.append("＃");// 转义#
+                    break;
+                default:
+                    sb.append(c);
+                    break;
+            }
+        }
+        return sb.toString();
+    }
+
+    /**
+     * 获取最原始的request
+     *
+     * @return
+     */
+    public HttpServletRequest getOrgRequest() {
+        return orgRequest;
+    }
+
+    /**
+     * 获取最原始的request的静态方法
+     *
+     * @return
+     */
+    public static HttpServletRequest getOrgRequest(HttpServletRequest req) {
+        if (req instanceof XssAndSqlHttpServletRequestWrapper) {
+            return ((XssAndSqlHttpServletRequestWrapper) req).getOrgRequest();
+        }
+
+        return req;
+    }
+
+    /**
+     *
+     * 防止xss跨脚本攻击（替换，根据实际情况调整）
+     */
+
+    public static String stripXSSAndSql(String value) {
+        if (value != null) {
+            // NOTE: It's highly recommended to use the ESAPI library and
+            // uncomment the following line to
+            // avoid encoded attacks.
+            // value = ESAPI.encoder().canonicalize(value);
+            // Avoid null characters
+            /** value = value.replaceAll("", ""); ***/
+            // Avoid anything between script tags
+            Pattern scriptPattern = Pattern.compile(
+                    "<[\r\n| | ]*script[\r\n| | ]*>(.*?)</[\r\n| | ]*script[\r\n| | ]*>", Pattern.CASE_INSENSITIVE);
+            value = scriptPattern.matcher(value).replaceAll("");
+            // Avoid anything in a
+            // src="http://www.yihaomen.com/article/java/..." type of
+            // e-xpression
+            scriptPattern = Pattern.compile("src[\r\n| | ]*=[\r\n| | ]*[\\\"|\\\'](.*?)[\\\"|\\\']",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            value = scriptPattern.matcher(value).replaceAll("");
+            // Remove any lonesome </script> tag
+            scriptPattern = Pattern.compile("</[\r\n| | ]*script[\r\n| | ]*>", Pattern.CASE_INSENSITIVE);
+            value = scriptPattern.matcher(value).replaceAll("");
+            // Remove any lonesome <script ...> tag
+            scriptPattern = Pattern.compile("<[\r\n| | ]*script(.*?)>",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            value = scriptPattern.matcher(value).replaceAll("");
+            // Avoid eval(...) expressions
+            scriptPattern = Pattern.compile("eval\\((.*?)\\)",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            value = scriptPattern.matcher(value).replaceAll("");
+            // Avoid e-xpression(...) expressions
+            scriptPattern = Pattern.compile("e-xpression\\((.*?)\\)",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            value = scriptPattern.matcher(value).replaceAll("");
+            // Avoid javascript:... expressions
+            scriptPattern = Pattern.compile("javascript[\r\n| | ]*:[\r\n| | ]*", Pattern.CASE_INSENSITIVE);
+            value = scriptPattern.matcher(value).replaceAll("");
+            // Avoid vbscript:... expressions
+            scriptPattern = Pattern.compile("vbscript[\r\n| | ]*:[\r\n| | ]*", Pattern.CASE_INSENSITIVE);
+            value = scriptPattern.matcher(value).replaceAll("");
+            // Avoid onload= expressions
+            scriptPattern = Pattern.compile("onload(.*?)=",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            value = scriptPattern.matcher(value).replaceAll("");
+        }
+        return value;
+    }
+
+    public static boolean checkSqlInjection(Object obj){
+        Pattern pattern= Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+|\\-).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)" +
+                "|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\\b.*)");
+        Matcher matcher=pattern.matcher(obj.toString().toLowerCase());
+        return matcher.find();
+    }
+
+
+    public static boolean checkXSSAndSql(String value) {
+        boolean flag = false;
+
+        if (value != null) {
+            boolean b = checkSqlInjection(value);
+            if(b) {
+                ThreadLocalContextHolder.setData("包含SQL注入的参数，请检查参数！");
+                return true;
+            }
+            // NOTE: It's highly recommended to use the ESAPI library and
+            // uncomment the following line to
+            // avoid encoded attacks.
+            // value = ESAPI.encoder().canonicalize(value);
+            // Avoid null characters
+            /** value = value.replaceAll("", ""); ***/
+            // Avoid anything between script tags
+            Pattern scriptPattern = Pattern.compile(
+                    "<[\r\n| | ]*script[\r\n| | ]*>(.*?)</[\r\n| | ]*script[\r\n| | ]*>", Pattern.CASE_INSENSITIVE);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                // threadLocal.set("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+            // Avoid anything in a
+            // src="http://www.yihaomen.com/article/java/..." type of
+            // e-xpression
+            scriptPattern = Pattern.compile("src[\r\n| | ]*=[\r\n| | ]*[\\\"|\\\'](.*?)[\\\"|\\\']",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+            // Remove any lonesome </script> tag
+            scriptPattern = Pattern.compile("</[\r\n| | ]*script[\r\n| | ]*>", Pattern.CASE_INSENSITIVE);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+            // Remove any lonesome <script ...> tag
+            scriptPattern = Pattern.compile("<[\r\n| | ]*script(.*?)>",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+            // Avoid eval(...) expressions
+            scriptPattern = Pattern.compile("eval\\((.*?)\\)",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+            // Avoid e-xpression(...) expressions
+            scriptPattern = Pattern.compile("e-xpression\\((.*?)\\)",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+            // Avoid javascript:... expressions
+            scriptPattern = Pattern.compile("javascript[\r\n| | ]*:[\r\n| | ]*", Pattern.CASE_INSENSITIVE);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+            // Avoid vbscript:... expressions
+            scriptPattern = Pattern.compile("vbscript[\r\n| | ]*:[\r\n| | ]*", Pattern.CASE_INSENSITIVE);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+            // Avoid onload= expressions
+            scriptPattern = Pattern.compile("onload(.*?)=",
+                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
+            flag = scriptPattern.matcher(value).find();
+            if (flag) {
+                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
+                return flag;
+            }
+        }
+        return flag;
+    }
+
+    public final boolean checkParameter() {
+        Map<String, String[]> submitParams = new HashMap(parameterMap);
+        Set<String> submitNames = submitParams.keySet();
+        for (String submitName : submitNames) {
+            Object submitValues = submitParams.get(submitName);
+            if ((submitValues instanceof String)) {
+                if (checkXSSAndSql((String) submitValues)) {
+                    return true;
+                }
+            } else if ((submitValues instanceof String[])) {
+                for (String submitValue : (String[])submitValues){
+                    if (checkXSSAndSql(submitValue)) {
+                        return true;
+                    }
+                }
+            }
+        }
+        return false;
+    }
+
+    @Override
+    public BufferedReader getReader() throws IOException {
+        return new BufferedReader(new InputStreamReader(getInputStream()));
+    }
+
+    @Override
+    public ServletInputStream getInputStream() throws IOException {
+        final ByteArrayInputStream bais = new ByteArrayInputStream(body);
+        return new ServletInputStream() {
+
+            @Override
+            public int read() throws IOException {
+                return bais.read();
+            }
+
+            @Override
+            public boolean isFinished() {
+                // TODO Auto-generated method stub
+                return false;
+            }
+
+            @Override
+            public boolean isReady() {
+                // TODO Auto-generated method stub
+                return false;
+            }
+
+            @Override
+            public void setReadListener(ReadListener arg0) {
+                // TODO Auto-generated method stub
+
+            }
+        };
+    }
+
+}
diff --git a/backend/src/main/java/io/dataease/config/FilterConfig.java b/backend/src/main/java/io/dataease/config/FilterConfig.java
new file mode 100644
index 0000000000..ba5d3b6935
--- /dev/null
+++ b/backend/src/main/java/io/dataease/config/FilterConfig.java
@@ -0,0 +1,21 @@
+package io.dataease.config;
+
+import io.dataease.commons.filter.SqlFilter;
+import org.springframework.boot.web.servlet.FilterRegistrationBean;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class FilterConfig {
+
+    @Bean
+    public FilterRegistrationBean registration(){
+        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
+        filterRegistrationBean.setFilter(new SqlFilter());//实例化Filter类
+        filterRegistrationBean.addUrlPatterns("/*");//设置匹配模式,这里设置为所有，可以按需求设置为"/hello"等等
+        filterRegistrationBean.setName("SqlFilter");//设置过滤器名称
+        filterRegistrationBean.setOrder(1);//设置执行顺序
+        return filterRegistrationBean;
+    }
+
+}

From 6ba4cc0b38d3158bb63a4e4f81bbdbd12506e83c Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 4 Aug 2021 16:43:00 +0800
Subject: [PATCH 10/15] =?UTF-8?q?fix:=20sql=E6=B3=A8=E5=85=A5=E6=8E=92?=
 =?UTF-8?q?=E9=99=A4=E5=87=8F=E5=8F=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/wrapper/XssAndSqlHttpServletRequestWrapper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
index 34fff33383..5bff936f5d 100644
--- a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
+++ b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
@@ -215,7 +215,7 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe
     }
 
     public static boolean checkSqlInjection(Object obj){
-        Pattern pattern= Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+|\\-).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)" +
+        Pattern pattern= Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)" +
                 "|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\\b.*)");
         Matcher matcher=pattern.matcher(obj.toString().toLowerCase());
         return matcher.find();

From cacd1b564eb15192885eeb8992cf22eb06d57a35 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 4 Aug 2021 17:33:47 +0800
Subject: [PATCH 11/15] =?UTF-8?q?Revert=20"fix:=20sql=E6=B3=A8=E5=85=A5?=
 =?UTF-8?q?=E6=8E=92=E9=99=A4=E5=87=8F=E5=8F=B7"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6ba4cc0b38d3158bb63a4e4f81bbdbd12506e83c.
---
 .../commons/wrapper/XssAndSqlHttpServletRequestWrapper.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
index 5bff936f5d..34fff33383 100644
--- a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
+++ b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
@@ -215,7 +215,7 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe
     }
 
     public static boolean checkSqlInjection(Object obj){
-        Pattern pattern= Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)" +
+        Pattern pattern= Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+|\\-).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)" +
                 "|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\\b.*)");
         Matcher matcher=pattern.matcher(obj.toString().toLowerCase());
         return matcher.find();

From 7fb330f390daff9d05ea8625cbfd5aebf1049bb6 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 4 Aug 2021 17:35:06 +0800
Subject: [PATCH 12/15] =?UTF-8?q?Revert=20"fix:=20sql=E6=B3=A8=E5=85=A5?=
 =?UTF-8?q?=E5=92=8Cxss=E6=94=BB=E5=87=BB"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 5e34d52d6de65b8eb54092764219bb4637b12dda.
---
 .../io/dataease/commons/filter/SqlFilter.java |  78 ----
 .../holder/ThreadLocalContextHolder.java      |  24 --
 .../XssAndSqlHttpServletRequestWrapper.java   | 370 ------------------
 .../java/io/dataease/config/FilterConfig.java |  21 -
 4 files changed, 493 deletions(-)
 delete mode 100644 backend/src/main/java/io/dataease/commons/filter/SqlFilter.java
 delete mode 100644 backend/src/main/java/io/dataease/commons/holder/ThreadLocalContextHolder.java
 delete mode 100644 backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
 delete mode 100644 backend/src/main/java/io/dataease/config/FilterConfig.java

diff --git a/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java b/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java
deleted file mode 100644
index 3a913cb270..0000000000
--- a/backend/src/main/java/io/dataease/commons/filter/SqlFilter.java
+++ /dev/null
@@ -1,78 +0,0 @@
-package io.dataease.commons.filter;
-
-import io.dataease.commons.holder.ThreadLocalContextHolder;
-import io.dataease.commons.wrapper.XssAndSqlHttpServletRequestWrapper;
-import org.apache.commons.lang3.StringUtils;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import java.io.*;
-
-
-public class SqlFilter implements Filter {
-
-
-
-
-    @Override
-    public void destroy() {
-        // TODO Auto-generated method stub
-
-    }
-
-    @Override
-    public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-
-        String method = "GET";
-        String param = "";
-        XssAndSqlHttpServletRequestWrapper xssRequest = null;
-        if (request instanceof HttpServletRequest) {
-            method = ((HttpServletRequest) request).getMethod();
-            xssRequest = new XssAndSqlHttpServletRequestWrapper((HttpServletRequest) request);
-        }
-        if ("POST".equalsIgnoreCase(method)) {
-            param = this.getBodyString(xssRequest.getReader());
-            if(StringUtils.isNotBlank(param)){
-                if(xssRequest.checkXSSAndSql(param)){
-                    response.setCharacterEncoding("UTF-8");
-                    response.setContentType("application/json;charset=UTF-8");
-                    PrintWriter out = response.getWriter();
-                    String msg = ThreadLocalContextHolder.getData().toString();
-                    out.write(msg);
-                    return;
-                }
-            }
-        }
-        if (xssRequest.checkParameter()) {
-            response.setCharacterEncoding("UTF-8");
-            response.setContentType("application/json;charset=UTF-8");
-            PrintWriter out = response.getWriter();
-            String msg = ThreadLocalContextHolder.getData().toString();
-            out.write(msg);
-            return;
-        }
-        chain.doFilter(xssRequest, response);
-    }
-
-    @Override
-    public void init(FilterConfig filterConfig) throws ServletException {
-
-    }
-
-    // 获取request请求body中参数
-    public static String getBodyString(BufferedReader br) {
-        String inputLine;
-        String str = "";
-        try {
-            while ((inputLine = br.readLine()) != null) {
-                str += inputLine;
-            }
-            br.close();
-        } catch (IOException e) {
-            System.out.println("IOException: " + e);
-        }
-        return str;
-
-    }
-
-
-}
diff --git a/backend/src/main/java/io/dataease/commons/holder/ThreadLocalContextHolder.java b/backend/src/main/java/io/dataease/commons/holder/ThreadLocalContextHolder.java
deleted file mode 100644
index 6aad695532..0000000000
--- a/backend/src/main/java/io/dataease/commons/holder/ThreadLocalContextHolder.java
+++ /dev/null
@@ -1,24 +0,0 @@
-package io.dataease.commons.holder;
-
-public class ThreadLocalContextHolder {
-
-
-    private static ThreadLocal<Object> sceneThreadLocal = new ThreadLocal<>();
-
-
-    public static Object getData() {
-        return sceneThreadLocal.get();
-    }
-
-    public static void setData(Object data) {
-        if (ThreadLocalContextHolder.sceneThreadLocal == null) {
-            ThreadLocalContextHolder.sceneThreadLocal = new ThreadLocal<>();
-        }
-        ThreadLocalContextHolder.sceneThreadLocal.set(data);
-    }
-
-    public static void clearScene() {
-        setData(null);
-    }
-
-}
diff --git a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
deleted file mode 100644
index 34fff33383..0000000000
--- a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
+++ /dev/null
@@ -1,370 +0,0 @@
-package io.dataease.commons.wrapper;
-
-
-import java.io.BufferedReader;
-import java.io.ByteArrayInputStream;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.util.Enumeration;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.Set;
-import java.util.Vector;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-import javax.servlet.ReadListener;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
-
-import io.dataease.commons.holder.ThreadLocalContextHolder;
-import org.springframework.util.StreamUtils;
-
-
-public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrapper {
-
-
-    HttpServletRequest orgRequest = null;
-    private Map<String, String[]> parameterMap;
-    private final byte[] body; //用于保存读取body中数据
-
-    public XssAndSqlHttpServletRequestWrapper(HttpServletRequest request) throws IOException{
-        super(request);
-        orgRequest = request;
-        parameterMap = request.getParameterMap();
-        body = StreamUtils.copyToByteArray(request.getInputStream());
-    }
-
-    // 重写几个HttpServletRequestWrapper中的方法
-    /**
-     * 获取所有参数名
-     *
-     * @return 返回所有参数名
-     */
-    @Override
-    public Enumeration<String> getParameterNames() {
-        Vector<String> vector = new Vector<String>(parameterMap.keySet());
-        return vector.elements();
-    }
-
-    /**
-     * 覆盖getParameter方法，将参数名和参数值都做xss & sql过滤。<br/>
-     * 如果需要获得原始的值，则通过super.getParameterValues(name)来获取<br/>
-     * getParameterNames,getParameterValues和getParameterMap也可能需要覆盖
-     */
-    @Override
-    public String getParameter(String name) {
-        String[] results = parameterMap.get(name);
-        if (results == null || results.length <= 0)
-            return null;
-        else {
-            String value = results[0];
-            if (value != null) {
-                value = xssEncode(value);
-            }
-            return value;
-        }
-    }
-
-    /**
-     * 获取指定参数名的所有值的数组，如：checkbox的所有数据 接收数组变量 ，如checkobx类型
-     */
-    @Override
-    public String[] getParameterValues(String name) {
-        String[] results = parameterMap.get(name);
-        if (results == null || results.length <= 0)
-            return null;
-        else {
-            int length = results.length;
-            for (int i = 0; i < length; i++) {
-                results[i] = xssEncode(results[i]);
-            }
-            return results;
-        }
-    }
-
-    /**
-     * 覆盖getHeader方法，将参数名和参数值都做xss & sql过滤。<br/>
-     * 如果需要获得原始的值，则通过super.getHeaders(name)来获取<br/>
-     * getHeaderNames 也可能需要覆盖
-     */
-    @Override
-    public String getHeader(String name) {
-
-        String value = super.getHeader(xssEncode(name));
-        if (value != null) {
-            value = xssEncode(value);
-        }
-        return value;
-    }
-
-    /**
-     * 将容易引起xss & sql漏洞的半角字符直接替换成全角字符
-     *
-     * @param s
-     * @return
-     */
-    private static String xssEncode(String s) {
-        if (s == null || s.isEmpty()) {
-            return s;
-        } else {
-            s = stripXSSAndSql(s);
-        }
-        StringBuilder sb = new StringBuilder(s.length() + 16);
-        for (int i = 0; i < s.length(); i++) {
-            char c = s.charAt(i);
-            switch (c) {
-                case '>':
-                    sb.append("＞");// 转义大于号
-                    break;
-                case '<':
-                    sb.append("＜");// 转义小于号
-                    break;
-                // case '\'':
-                // sb.append("＇");// 转义单引号
-                // break;
-                // case '\"':
-                // sb.append("＂");// 转义双引号
-                // break;
-                case '&':
-                    sb.append("＆");// 转义&
-                    break;
-                case '#':
-                    sb.append("＃");// 转义#
-                    break;
-                default:
-                    sb.append(c);
-                    break;
-            }
-        }
-        return sb.toString();
-    }
-
-    /**
-     * 获取最原始的request
-     *
-     * @return
-     */
-    public HttpServletRequest getOrgRequest() {
-        return orgRequest;
-    }
-
-    /**
-     * 获取最原始的request的静态方法
-     *
-     * @return
-     */
-    public static HttpServletRequest getOrgRequest(HttpServletRequest req) {
-        if (req instanceof XssAndSqlHttpServletRequestWrapper) {
-            return ((XssAndSqlHttpServletRequestWrapper) req).getOrgRequest();
-        }
-
-        return req;
-    }
-
-    /**
-     *
-     * 防止xss跨脚本攻击（替换，根据实际情况调整）
-     */
-
-    public static String stripXSSAndSql(String value) {
-        if (value != null) {
-            // NOTE: It's highly recommended to use the ESAPI library and
-            // uncomment the following line to
-            // avoid encoded attacks.
-            // value = ESAPI.encoder().canonicalize(value);
-            // Avoid null characters
-            /** value = value.replaceAll("", ""); ***/
-            // Avoid anything between script tags
-            Pattern scriptPattern = Pattern.compile(
-                    "<[\r\n| | ]*script[\r\n| | ]*>(.*?)</[\r\n| | ]*script[\r\n| | ]*>", Pattern.CASE_INSENSITIVE);
-            value = scriptPattern.matcher(value).replaceAll("");
-            // Avoid anything in a
-            // src="http://www.yihaomen.com/article/java/..." type of
-            // e-xpression
-            scriptPattern = Pattern.compile("src[\r\n| | ]*=[\r\n| | ]*[\\\"|\\\'](.*?)[\\\"|\\\']",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
-            // Remove any lonesome </script> tag
-            scriptPattern = Pattern.compile("</[\r\n| | ]*script[\r\n| | ]*>", Pattern.CASE_INSENSITIVE);
-            value = scriptPattern.matcher(value).replaceAll("");
-            // Remove any lonesome <script ...> tag
-            scriptPattern = Pattern.compile("<[\r\n| | ]*script(.*?)>",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
-            // Avoid eval(...) expressions
-            scriptPattern = Pattern.compile("eval\\((.*?)\\)",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
-            // Avoid e-xpression(...) expressions
-            scriptPattern = Pattern.compile("e-xpression\\((.*?)\\)",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
-            // Avoid javascript:... expressions
-            scriptPattern = Pattern.compile("javascript[\r\n| | ]*:[\r\n| | ]*", Pattern.CASE_INSENSITIVE);
-            value = scriptPattern.matcher(value).replaceAll("");
-            // Avoid vbscript:... expressions
-            scriptPattern = Pattern.compile("vbscript[\r\n| | ]*:[\r\n| | ]*", Pattern.CASE_INSENSITIVE);
-            value = scriptPattern.matcher(value).replaceAll("");
-            // Avoid onload= expressions
-            scriptPattern = Pattern.compile("onload(.*?)=",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            value = scriptPattern.matcher(value).replaceAll("");
-        }
-        return value;
-    }
-
-    public static boolean checkSqlInjection(Object obj){
-        Pattern pattern= Pattern.compile("(.*\\=.*\\-\\-.*)|(.*(\\+|\\-).*)|(.*\\w+(%|\\$|#|&)\\w+.*)|(.*\\|\\|.*)|(.*\\s+(and|or)\\s+.*)" +
-                "|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute)\\b.*)");
-        Matcher matcher=pattern.matcher(obj.toString().toLowerCase());
-        return matcher.find();
-    }
-
-
-    public static boolean checkXSSAndSql(String value) {
-        boolean flag = false;
-
-        if (value != null) {
-            boolean b = checkSqlInjection(value);
-            if(b) {
-                ThreadLocalContextHolder.setData("包含SQL注入的参数，请检查参数！");
-                return true;
-            }
-            // NOTE: It's highly recommended to use the ESAPI library and
-            // uncomment the following line to
-            // avoid encoded attacks.
-            // value = ESAPI.encoder().canonicalize(value);
-            // Avoid null characters
-            /** value = value.replaceAll("", ""); ***/
-            // Avoid anything between script tags
-            Pattern scriptPattern = Pattern.compile(
-                    "<[\r\n| | ]*script[\r\n| | ]*>(.*?)</[\r\n| | ]*script[\r\n| | ]*>", Pattern.CASE_INSENSITIVE);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                // threadLocal.set("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-            // Avoid anything in a
-            // src="http://www.yihaomen.com/article/java/..." type of
-            // e-xpression
-            scriptPattern = Pattern.compile("src[\r\n| | ]*=[\r\n| | ]*[\\\"|\\\'](.*?)[\\\"|\\\']",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-            // Remove any lonesome </script> tag
-            scriptPattern = Pattern.compile("</[\r\n| | ]*script[\r\n| | ]*>", Pattern.CASE_INSENSITIVE);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-            // Remove any lonesome <script ...> tag
-            scriptPattern = Pattern.compile("<[\r\n| | ]*script(.*?)>",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-            // Avoid eval(...) expressions
-            scriptPattern = Pattern.compile("eval\\((.*?)\\)",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-            // Avoid e-xpression(...) expressions
-            scriptPattern = Pattern.compile("e-xpression\\((.*?)\\)",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-            // Avoid javascript:... expressions
-            scriptPattern = Pattern.compile("javascript[\r\n| | ]*:[\r\n| | ]*", Pattern.CASE_INSENSITIVE);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-            // Avoid vbscript:... expressions
-            scriptPattern = Pattern.compile("vbscript[\r\n| | ]*:[\r\n| | ]*", Pattern.CASE_INSENSITIVE);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-            // Avoid onload= expressions
-            scriptPattern = Pattern.compile("onload(.*?)=",
-                    Pattern.CASE_INSENSITIVE | Pattern.MULTILINE | Pattern.DOTALL);
-            flag = scriptPattern.matcher(value).find();
-            if (flag) {
-                ThreadLocalContextHolder.setData("包含XSS攻击脚本，请检查参数！");
-                return flag;
-            }
-        }
-        return flag;
-    }
-
-    public final boolean checkParameter() {
-        Map<String, String[]> submitParams = new HashMap(parameterMap);
-        Set<String> submitNames = submitParams.keySet();
-        for (String submitName : submitNames) {
-            Object submitValues = submitParams.get(submitName);
-            if ((submitValues instanceof String)) {
-                if (checkXSSAndSql((String) submitValues)) {
-                    return true;
-                }
-            } else if ((submitValues instanceof String[])) {
-                for (String submitValue : (String[])submitValues){
-                    if (checkXSSAndSql(submitValue)) {
-                        return true;
-                    }
-                }
-            }
-        }
-        return false;
-    }
-
-    @Override
-    public BufferedReader getReader() throws IOException {
-        return new BufferedReader(new InputStreamReader(getInputStream()));
-    }
-
-    @Override
-    public ServletInputStream getInputStream() throws IOException {
-        final ByteArrayInputStream bais = new ByteArrayInputStream(body);
-        return new ServletInputStream() {
-
-            @Override
-            public int read() throws IOException {
-                return bais.read();
-            }
-
-            @Override
-            public boolean isFinished() {
-                // TODO Auto-generated method stub
-                return false;
-            }
-
-            @Override
-            public boolean isReady() {
-                // TODO Auto-generated method stub
-                return false;
-            }
-
-            @Override
-            public void setReadListener(ReadListener arg0) {
-                // TODO Auto-generated method stub
-
-            }
-        };
-    }
-
-}
diff --git a/backend/src/main/java/io/dataease/config/FilterConfig.java b/backend/src/main/java/io/dataease/config/FilterConfig.java
deleted file mode 100644
index ba5d3b6935..0000000000
--- a/backend/src/main/java/io/dataease/config/FilterConfig.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package io.dataease.config;
-
-import io.dataease.commons.filter.SqlFilter;
-import org.springframework.boot.web.servlet.FilterRegistrationBean;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-
-@Configuration
-public class FilterConfig {
-
-    @Bean
-    public FilterRegistrationBean registration(){
-        FilterRegistrationBean filterRegistrationBean = new FilterRegistrationBean();
-        filterRegistrationBean.setFilter(new SqlFilter());//实例化Filter类
-        filterRegistrationBean.addUrlPatterns("/*");//设置匹配模式,这里设置为所有，可以按需求设置为"/hello"等等
-        filterRegistrationBean.setName("SqlFilter");//设置过滤器名称
-        filterRegistrationBean.setOrder(1);//设置执行顺序
-        return filterRegistrationBean;
-    }
-
-}

From 5506e6961f76fc2d57f639e7ec7319a106247c3b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 5 Aug 2021 09:44:37 +0800
Subject: [PATCH 13/15] =?UTF-8?q?fix:=20flywaysql=E5=8E=BB=E9=99=A4navicat?=
 =?UTF-8?q?=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/resources/db/migration/V14__area_code.sql | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/backend/src/main/resources/db/migration/V14__area_code.sql b/backend/src/main/resources/db/migration/V14__area_code.sql
index 7610a0d1d8..1a5624ccda 100644
--- a/backend/src/main/resources/db/migration/V14__area_code.sql
+++ b/backend/src/main/resources/db/migration/V14__area_code.sql
@@ -1,18 +1,4 @@
-/*
- Navicat Premium Data Transfer
 
- Source Server         : ali_sh_mysql
- Source Server Type    : MySQL
- Source Server Version : 50732
- Source Host           : 47.117.200.215:3306
- Source Schema         : dataease
-
- Target Server Type    : MySQL
- Target Server Version : 50732
- File Encoding         : 65001
-
- Date: 13/07/2021 18:09:09
-*/
 
 SET NAMES utf8mb4;
 SET FOREIGN_KEY_CHECKS = 0;

From 88f4a801718bfc2f43f1eddd2e2a743e973821a7 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 5 Aug 2021 11:05:55 +0800
Subject: [PATCH 14/15] =?UTF-8?q?refactor:=20=E9=A2=9C=E8=89=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E6=9B=B4=E6=8D=A2=E4=B8=BA=E5=8E=9F=E7=94=9F?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component-style/BackgroundColorSelector.vue        |  2 +-
 .../components/component-style/LegendSelector.vue      |  2 +-
 .../chart/components/component-style/SplitSelector.vue |  8 ++++----
 .../chart/components/component-style/TitleSelector.vue |  2 +-
 .../chart/components/component-style/XAxisSelector.vue |  6 +++---
 .../chart/components/component-style/YAxisSelector.vue |  6 +++---
 .../chart/components/shape-attr/ColorSelector.vue      | 10 +++++-----
 .../chart/components/shape-attr/LabelSelector.vue      |  4 ++--
 .../chart/components/shape-attr/TooltipSelector.vue    |  2 +-
 .../SubjectSetting/PanelStyle/BackgroundSelector.vue   |  2 +-
 10 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue b/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
index 92bb45d204..dcbef97a90 100644
--- a/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
+++ b/frontend/src/views/chart/components/component-style/BackgroundColorSelector.vue
@@ -9,7 +9,7 @@
         <el-col>
           <el-form ref="colorForm" :model="colorForm" label-width="80px" size="mini">
             <el-form-item :label="$t('chart.color')" class="form-item">
-              <colorPicker v-model="colorForm.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeBackgroundStyle" />
+              <el-color-picker v-model="colorForm.color" style="cursor: pointer;z-index: 1004;" @change="changeBackgroundStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.not_alpha')" class="form-item form-item-slider">
               <el-slider v-model="colorForm.alpha" show-input :show-input-controls="false" input-size="mini" @change="changeBackgroundStyle" />
diff --git a/frontend/src/views/chart/components/component-style/LegendSelector.vue b/frontend/src/views/chart/components/component-style/LegendSelector.vue
index 069954d350..a095862393 100644
--- a/frontend/src/views/chart/components/component-style/LegendSelector.vue
+++ b/frontend/src/views/chart/components/component-style/LegendSelector.vue
@@ -34,7 +34,7 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="legendForm.textStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLegendStyle" />
+              <el-color-picker v-model="legendForm.textStyle.color" style="cursor: pointer;z-index: 999;" @change="changeLegendStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.text_h_position')" class="form-item">
               <el-radio-group v-model="legendForm.hPosition" size="mini" @change="changeLegendStyle">
diff --git a/frontend/src/views/chart/components/component-style/SplitSelector.vue b/frontend/src/views/chart/components/component-style/SplitSelector.vue
index f9be20bc1c..ceb6e763ec 100644
--- a/frontend/src/views/chart/components/component-style/SplitSelector.vue
+++ b/frontend/src/views/chart/components/component-style/SplitSelector.vue
@@ -12,7 +12,7 @@
               <el-checkbox v-model="splitForm.name.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
             </el-form-item>
             <el-form-item :label="$t('chart.color')" class="form-item">
-              <colorPicker v-model="splitForm.name.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />
+              <el-color-picker v-model="splitForm.name.color" style="cursor: pointer;z-index: 1004;" @change="changeSplitStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.text_fontsize')" class="form-item form-item-slider">
               <el-select v-model="splitForm.name.fontSize" :placeholder="$t('chart.text_fontsize')" @change="changeSplitStyle">
@@ -23,13 +23,13 @@
               <el-checkbox v-model="splitForm.axisLine.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
             </el-form-item>
             <el-form-item :label="$t('chart.axis_color')" class="form-item">
-              <colorPicker v-model="splitForm.axisLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />
+              <el-color-picker v-model="splitForm.axisLine.lineStyle.color" style="cursor: pointer;z-index: 1004;" @change="changeSplitStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_label')" class="form-item">
               <el-checkbox v-model="splitForm.axisLabel.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
             </el-form-item>
             <el-form-item :label="$t('chart.axis_label_color')" class="form-item">
-              <colorPicker v-model="splitForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />
+              <el-color-picker v-model="splitForm.axisLabel.color" style="cursor: pointer;z-index: 1004;" @change="changeSplitStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.label_fontsize')" class="form-item form-item-slider">
               <el-select v-model="splitForm.axisLabel.fontSize" :placeholder="$t('chart.label_fontsize')" @change="changeSplitStyle">
@@ -40,7 +40,7 @@
               <el-checkbox v-model="splitForm.splitLine.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
             </el-form-item>
             <el-form-item :label="$t('chart.split_color')" class="form-item">
-              <colorPicker v-model="splitForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeSplitStyle" />
+              <el-color-picker v-model="splitForm.splitLine.lineStyle.color" style="cursor: pointer;z-index: 1004;" @change="changeSplitStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.shadow')" class="form-item">
               <el-checkbox v-model="splitForm.splitArea.show" @change="changeSplitStyle">{{ $t('chart.show') }}</el-checkbox>
diff --git a/frontend/src/views/chart/components/component-style/TitleSelector.vue b/frontend/src/views/chart/components/component-style/TitleSelector.vue
index f67c4b42cd..04b2987196 100644
--- a/frontend/src/views/chart/components/component-style/TitleSelector.vue
+++ b/frontend/src/views/chart/components/component-style/TitleSelector.vue
@@ -28,7 +28,7 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="titleForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeTitleStyle" />
+              <el-color-picker v-model="titleForm.color" style="cursor: pointer;z-index: 999;" @change="changeTitleStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.text_h_position')" class="form-item">
               <el-radio-group v-model="titleForm.hPosition" size="mini" @change="changeTitleStyle">
diff --git a/frontend/src/views/chart/components/component-style/XAxisSelector.vue b/frontend/src/views/chart/components/component-style/XAxisSelector.vue
index 9b7ae420b0..cbb988ba02 100644
--- a/frontend/src/views/chart/components/component-style/XAxisSelector.vue
+++ b/frontend/src/views/chart/components/component-style/XAxisSelector.vue
@@ -22,7 +22,7 @@
               <el-input v-model="axisForm.name" size="mini" @blur="changeXAxisStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_name_color')" class="form-item">
-              <colorPicker v-model="axisForm.nameTextStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />
+              <el-color-picker v-model="axisForm.nameTextStyle.color" style="cursor: pointer;z-index: 1004;" @change="changeXAxisStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_name_fontsize')" class="form-item form-item-slider">
               <el-select v-model="axisForm.nameTextStyle.fontSize" :placeholder="$t('chart.axis_name_fontsize')" @change="changeXAxisStyle">
@@ -35,7 +35,7 @@
             </el-form-item>
             <span v-show="axisForm.splitLine.show">
               <el-form-item :label="$t('chart.axis_color')" class="form-item">
-                <colorPicker v-model="axisForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />
+                <el-color-picker v-model="axisForm.splitLine.lineStyle.color" style="cursor: pointer;z-index: 1004;" @change="changeXAxisStyle" />
               </el-form-item>
               <el-form-item :label="$t('chart.axis_width')" class="form-item form-item-slider">
                 <el-slider v-model="axisForm.splitLine.lineStyle.width" :min="1" :max="10" show-input :show-input-controls="false" input-size="mini" @change="changeXAxisStyle" />
@@ -54,7 +54,7 @@
             </el-form-item>
             <span v-show="axisForm.axisLabel.show">
               <el-form-item :label="$t('chart.axis_label_color')" class="form-item">
-                <colorPicker v-model="axisForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeXAxisStyle" />
+                <el-color-picker v-model="axisForm.axisLabel.color" style="cursor: pointer;z-index: 1004;" @change="changeXAxisStyle" />
               </el-form-item>
               <el-form-item :label="$t('chart.axis_label_rotate')" class="form-item form-item-slider">
                 <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeXAxisStyle" />
diff --git a/frontend/src/views/chart/components/component-style/YAxisSelector.vue b/frontend/src/views/chart/components/component-style/YAxisSelector.vue
index 2af4893f26..f44934bb2c 100644
--- a/frontend/src/views/chart/components/component-style/YAxisSelector.vue
+++ b/frontend/src/views/chart/components/component-style/YAxisSelector.vue
@@ -22,7 +22,7 @@
               <el-input v-model="axisForm.name" size="mini" @blur="changeYAxisStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_name_color')" class="form-item">
-              <colorPicker v-model="axisForm.nameTextStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />
+              <el-color-picker v-model="axisForm.nameTextStyle.color" style="cursor: pointer;z-index: 1004;" @change="changeYAxisStyle" />
             </el-form-item>
             <el-form-item :label="$t('chart.axis_name_fontsize')" class="form-item form-item-slider">
               <el-select v-model="axisForm.nameTextStyle.fontSize" :placeholder="$t('chart.axis_name_fontsize')" @change="changeYAxisStyle">
@@ -35,7 +35,7 @@
             </el-form-item>
             <span v-show="axisForm.splitLine.show">
               <el-form-item :label="$t('chart.axis_color')" class="form-item">
-                <colorPicker v-model="axisForm.splitLine.lineStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />
+                <el-color-picker v-model="axisForm.splitLine.lineStyle.color" style="cursor: pointer;z-index: 1004;" @change="changeYAxisStyle" />
               </el-form-item>
               <el-form-item :label="$t('chart.axis_width')" class="form-item form-item-slider">
                 <el-slider v-model="axisForm.splitLine.lineStyle.width" :min="1" :max="10" show-input :show-input-controls="false" input-size="mini" @change="changeYAxisStyle" />
@@ -54,7 +54,7 @@
             </el-form-item>
             <span v-show="axisForm.axisLabel.show">
               <el-form-item :label="$t('chart.axis_label_color')" class="form-item">
-                <colorPicker v-model="axisForm.axisLabel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeYAxisStyle" />
+                <el-color-picker v-model="axisForm.axisLabel.color" style="cursor: pointer;z-index: 1004;" @change="changeYAxisStyle" />
               </el-form-item>
               <el-form-item :label="$t('chart.axis_label_rotate')" class="form-item form-item-slider">
                 <el-slider v-model="axisForm.axisLabel.rotate" show-input :show-input-controls="false" :min="-90" :max="90" input-size="mini" @change="changeYAxisStyle" />
diff --git a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
index 1baffa05a0..c6248dfdf6 100644
--- a/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/ColorSelector.vue
@@ -21,21 +21,21 @@
               </el-form-item>
 
               <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.dimension_color')" class="form-item">
-                <colorPicker v-model="colorForm.dimensionColor" style="margin-top: 6px;cursor: pointer;z-index: 1003;border: solid 1px black" @change="changeColorCase" />
+                <el-color-picker v-model="colorForm.dimensionColor" style="cursor: pointer;z-index: 1003;" @change="changeColorCase" />
               </el-form-item>
               <el-form-item v-show="(chart.type && chart.type.includes('text')) || sourceType==='panelTable'" :label="$t('chart.quota_color')" class="form-item">
-                <colorPicker v-model="colorForm.quotaColor" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeColorCase" />
+                <el-color-picker v-model="colorForm.quotaColor" style="cursor: pointer;z-index: 1004;" @change="changeColorCase" />
               </el-form-item>
             </div>
             <div v-if="sourceType==='view' || sourceType==='panelTable'">
               <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_header_bg')" class="form-item">
-                <colorPicker v-model="colorForm.tableHeaderBgColor" style="margin-top: 6px;cursor: pointer;z-index: 1002;border: solid 1px black" @change="changeColorCase" />
+                <el-color-picker v-model="colorForm.tableHeaderBgColor" style="cursor: pointer;z-index: 1002;" @change="changeColorCase" />
               </el-form-item>
               <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_bg')" class="form-item">
-                <colorPicker v-model="colorForm.tableItemBgColor" style="margin-top: 6px;cursor: pointer;z-index: 1003;border: solid 1px black" @change="changeColorCase" />
+                <el-color-picker v-model="colorForm.tableItemBgColor" style="cursor: pointer;z-index: 1003;" @change="changeColorCase" />
               </el-form-item>
               <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.table_item_font_color')" class="form-item">
-                <colorPicker v-model="colorForm.tableFontColor" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" @change="changeColorCase" />
+                <el-color-picker v-model="colorForm.tableFontColor" style="cursor: pointer;z-index: 1004;" @change="changeColorCase" />
               </el-form-item>
               <!--              暂时不支持该功能-->
               <!--              <el-form-item v-show="(chart.type && chart.type.includes('table')) || sourceType==='panelTable'" :label="$t('chart.stripe')" class="form-item">-->
diff --git a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
index 7695ef9779..52e9132019 100644
--- a/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/LabelSelector.vue
@@ -21,7 +21,7 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="labelForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLabelAttr" />
+              <el-color-picker v-model="labelForm.color" style="cursor: pointer;z-index: 999;" @change="changeLabelAttr" />
             </el-form-item>
             <el-form-item :label="$t('chart.label_position')" class="form-item">
               <el-select v-model="labelForm.position" :placeholder="$t('chart.label_position')" @change="changeLabelAttr">
@@ -54,7 +54,7 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="labelForm.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeLabelAttr" />
+              <el-color-picker v-model="labelForm.color" style="cursor: pointer;z-index: 999;" @change="changeLabelAttr" />
             </el-form-item>
             <el-form-item class="form-item">
               <span slot="label">
diff --git a/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue b/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
index 575be0d1e4..78133fcc37 100644
--- a/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/TooltipSelector.vue
@@ -24,7 +24,7 @@
               </el-select>
             </el-form-item>
             <el-form-item :label="$t('chart.text_color')" class="form-item">
-              <colorPicker v-model="tooltipForm.textStyle.color" style="margin-top: 6px;cursor: pointer;z-index: 999;border: solid 1px black" @change="changeTooltipAttr" />
+              <el-color-picker v-model="tooltipForm.textStyle.color" style="cursor: pointer;z-index: 999;" @change="changeTooltipAttr" />
             </el-form-item>
             <el-form-item class="form-item">
               <span slot="label">
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
index 6df37ee2cf..3c9e9f1477 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
@@ -12,7 +12,7 @@
               <el-radio v-model="panel.backgroundType" label="color" @change="onChangeType">{{ $t('chart.color') }}</el-radio>
             </el-col>
             <el-col :span="18">
-              <colorPicker v-model="panel.color" style="margin-top: 6px;cursor: pointer;z-index: 1004;border: solid 1px black" />
+              <el-color-picker v-model="panel.color" style="cursor: pointer;z-index: 1004;" />
             </el-col>
           </el-row>
           <el-row style="height: 60px;margin-top:10px;overflow: hidden">

From 4d68e78f833cfd9c541f38684084ee9f8784ef8c Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Thu, 5 Aug 2021 11:24:53 +0800
Subject: [PATCH 15/15] =?UTF-8?q?refactor:=20=E6=8C=87=E6=A0=87=E5=8D=A1?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E9=80=89=E9=A1=B9=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../chart/components/normal/LabelNormal.vue      | 12 ++++++------
 .../chart/components/shape-attr/SizeSelector.vue | 16 ++++++++--------
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/frontend/src/views/chart/components/normal/LabelNormal.vue b/frontend/src/views/chart/components/normal/LabelNormal.vue
index ac5bd9d95f..d0bbcbe3e2 100644
--- a/frontend/src/views/chart/components/normal/LabelNormal.vue
+++ b/frontend/src/views/chart/components/normal/LabelNormal.vue
@@ -6,15 +6,15 @@
       id="label-content"
       :style="content_class"
     >
-      <p v-for="item in chart.data.series" :key="item.name" :style="label_content_class">
-        {{ item.data[0] }}
-      </p>
       <span v-if="quotaShow" :style="label_space">
-        <p v-if="dimensionShow" :style="label_class">
-          <!--        {{ chart.data.x[0] }}-->
-          {{ chart.data.series[0].name }}
+        <p v-for="item in chart.data.series" :key="item.name" :style="label_content_class">
+          {{ item.data[0] }}
         </p>
       </span>
+      <p v-if="dimensionShow" :style="label_class">
+        <!--        {{ chart.data.x[0] }}-->
+        {{ chart.data.series[0].name }}
+      </p>
     </div>
   </div>
 </template>
diff --git a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
index e4f8812044..27de7c081f 100644
--- a/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
+++ b/frontend/src/views/chart/components/shape-attr/SizeSelector.vue
@@ -121,14 +121,6 @@
           </el-form>
 
           <el-form v-show="chart.type && chart.type.includes('text')" ref="sizeFormPie" :model="sizeForm" label-width="100px" size="mini">
-            <el-form-item :label="$t('chart.dimension_show')" class="form-item">
-              <el-checkbox v-model="sizeForm.dimensionShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>
-            </el-form-item>
-            <el-form-item :label="$t('chart.dimension_font_size')" class="form-item">
-              <el-select v-model="sizeForm.dimensionFontSize" :placeholder="$t('chart.dimension_font_size')" @change="changeBarSizeCase">
-                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
-              </el-select>
-            </el-form-item>
             <el-form-item :label="$t('chart.quota_show')" class="form-item">
               <el-checkbox v-model="sizeForm.quotaShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>
             </el-form-item>
@@ -137,6 +129,14 @@
                 <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
               </el-select>
             </el-form-item>
+            <el-form-item :label="$t('chart.dimension_show')" class="form-item">
+              <el-checkbox v-model="sizeForm.dimensionShow" @change="changeBarSizeCase">{{ $t('chart.show') }}</el-checkbox>
+            </el-form-item>
+            <el-form-item :label="$t('chart.dimension_font_size')" class="form-item">
+              <el-select v-model="sizeForm.dimensionFontSize" :placeholder="$t('chart.dimension_font_size')" @change="changeBarSizeCase">
+                <el-option v-for="option in fontSize" :key="option.value" :label="option.name" :value="option.value" />
+              </el-select>
+            </el-form-item>
             <el-form-item :label="$t('chart.space_split')" class="form-item">
               <el-input-number v-model="sizeForm.spaceSplit" size="mini" @change="changeBarSizeCase" />
             </el-form-item>