From 7723116d916d7955935091b4e74a2ca19988c213 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 27 Aug 2021 11:49:56 +0800
Subject: [PATCH 01/30] =?UTF-8?q?refactor:=20=E8=A7=86=E5=9B=BE=E6=8B=96?=
 =?UTF-8?q?=E6=8B=BD=E9=A1=B9=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/chart/components/drag-item/ChartDragItem.vue   | 9 ++-------
 .../views/chart/components/drag-item/DimensionItem.vue   | 2 +-
 .../src/views/chart/components/drag-item/QuotaItem.vue   | 2 +-
 3 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
index 329b7d9154..0b5ba92f6f 100644
--- a/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
+++ b/frontend/src/views/chart/components/drag-item/ChartDragItem.vue
@@ -55,7 +55,7 @@
                 <span>
                   <i class="el-icon-sort" />
                   <span>{{ $t('chart.sort') }}</span>
-                  <span class="summary-span">({{ $t('chart.'+item.sort) }})</span>
+                  <span class="summary-span-item">({{ $t('chart.'+item.sort) }})</span>
                 </span>
                 <i class="el-icon-arrow-right el-icon--right" />
               </span>
@@ -171,11 +171,6 @@ export default {
     font-size: 12px;
   }
 
-  .summary-span{
-    margin-left: 4px;
-    color: #878d9f;;
-  }
-
   .inner-dropdown-menu{
     display: flex;
     justify-content: space-between;
@@ -185,7 +180,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 100px;
+    width: 80px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/components/drag-item/DimensionItem.vue b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
index dbbfea12b7..acbc047608 100644
--- a/frontend/src/views/chart/components/drag-item/DimensionItem.vue
+++ b/frontend/src/views/chart/components/drag-item/DimensionItem.vue
@@ -227,7 +227,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 100px;
+    width: 80px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;
diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
index 93e33f59a2..203db6db54 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
@@ -237,7 +237,7 @@ export default {
 
   .item-span-style{
     display: inline-block;
-    width: 70px;
+    width: 80px;
     white-space: nowrap;
     text-overflow: ellipsis;
     overflow: hidden;

From 9132355ebc6bafea5dc4ffbbc8f3ed66af0bd7e8 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Fri, 27 Aug 2021 16:36:55 +0800
Subject: [PATCH 02/30] =?UTF-8?q?fix:=20=E9=A1=B6=E7=BA=A7=E5=9C=B0?=
 =?UTF-8?q?=E5=90=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 backend/src/main/java/io/dataease/map/utils/MapUtils.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/map/utils/MapUtils.java b/backend/src/main/java/io/dataease/map/utils/MapUtils.java
index 15d64ce2e7..523c6fd447 100644
--- a/backend/src/main/java/io/dataease/map/utils/MapUtils.java
+++ b/backend/src/main/java/io/dataease/map/utils/MapUtils.java
@@ -121,7 +121,7 @@ public class MapUtils {
     }
 
     private static AreaEntity root() {
-        return AreaEntity.builder().code("100000").name("中华人名共和国").build();
+        return AreaEntity.builder().code("100000").name("中华人民共和国").build();
     }
 
     public static void recursionWrite(List<AreaEntity> areaEntityList) {

From cdee8d66f9e16d28c1223fd4a07a5c4c2e44871f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 27 Aug 2021 18:05:04 +0800
Subject: [PATCH 03/30] =?UTF-8?q?fix:=20sqlserver=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=AF=86=E5=88=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/sqlserver/SqlserverQueryProvider.java   | 1 +
 1 file changed, 1 insertion(+)

diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
index 37d0ec4881..a9a07b1ce0 100644
--- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
@@ -37,6 +37,7 @@ public class SqlserverQueryProvider extends QueryProvider {
 
     @Override
     public Integer transFieldType(String field) {
+        field = field.toUpperCase();
         switch (field) {
             case "CHAR":
             case "NCHAR":

From 5d36a577b446ff13f101e5e4fbadff31f6a5587c Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Fri, 27 Aug 2021 18:21:02 +0800
Subject: [PATCH 04/30] =?UTF-8?q?fix:=20=E9=A2=9C=E8=89=B2=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E5=99=A8=E5=8E=BB=E6=8E=89=E6=B8=85=E7=A9=BA=EF=BC=9B?=
 =?UTF-8?q?=E7=9F=A9=E5=BD=A2=E6=A0=91=E5=9B=BE=E6=A0=87=E7=AD=BE=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=EF=BC=9Bdoris=20=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/doris/DorisQueryProvider.java   | 2 ++
 frontend/src/styles/index.scss                                | 4 ++++
 frontend/src/views/chart/chart/treemap/treemap.js             | 1 +
 3 files changed, 7 insertions(+)

diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
index f7638fe8c9..8fe11624f3 100644
--- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
@@ -121,6 +121,8 @@ public class DorisQueryProvider extends QueryProvider {
                         fieldName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
                     } else if (f.getDeType() == 2) {
                         fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_INT_FORMAT);
+                    } else if (f.getDeType() == 3) {
+                        fieldName = String.format(DorisConstants.CAST, originField, DorisConstants.DEFAULT_FLOAT_FORMAT);
                     } else {
                         fieldName = originField;
                     }
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 701346fe3d..5b939fd1e4 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -349,3 +349,7 @@ div:focus {
   width: 5px;
   height: 5px;
 }
+
+.el-color-dropdown__link-btn {
+  display: none!important;
+}
diff --git a/frontend/src/views/chart/chart/treemap/treemap.js b/frontend/src/views/chart/chart/treemap/treemap.js
index c4b7dc719f..4db4572bea 100644
--- a/frontend/src/views/chart/chart/treemap/treemap.js
+++ b/frontend/src/views/chart/chart/treemap/treemap.js
@@ -54,6 +54,7 @@ export function baseTreemapOption(chart_option, chart) {
         // y.type = 'treemap'
         chart_option.series[0].data.push(y)
       }
+      chart_option.series[0].name = chart.data.series[0].name
     }
   }
   // console.log(chart_option);

From 7dfe9ccf34f6bb5422026d4f4802ca5694f8abfc Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 30 Aug 2021 15:47:39 +0800
Subject: [PATCH 05/30] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E9=87=8D=E5=91=BD=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/dataset/DataSetTableController.java  |  6 ++++++
 .../service/dataset/DataSetTableService.java        |  8 ++++++++
 frontend/src/api/dataset/dataset.js                 |  9 +++++++++
 frontend/src/views/dataset/group/Group.vue          | 13 ++-----------
 4 files changed, 25 insertions(+), 11 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index ab6c300345..4fa8d70494 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -46,6 +46,12 @@ public class DataSetTableController {
         }
     }
 
+    @ApiOperation("重命名")
+    @PostMapping("rename")
+    public void rename(@RequestBody DataSetTableRequest request) throws Exception {
+        dataSetTableService.rename(request);
+    }
+    
     @ApiOperation("删除")
     @PostMapping("delete/{id}")
     public void delete(@PathVariable String id) throws Exception {
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index d3cb79db85..94b1f45169 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -251,6 +251,14 @@ public class DataSetTableService {
         return datasetTable;
     }
 
+    public void rename(DataSetTableRequest request)throws Exception {
+        checkName(request);
+        DatasetTable datasetTable = new DatasetTable();
+        datasetTable.setId(request.getId());
+        datasetTable.setName(request.getName());
+        datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
+    }
+
     public void delete(String id) throws Exception {
         DatasetTable table = datasetTableMapper.selectByPrimaryKey(id);
         datasetTableMapper.deleteByPrimaryKey(id);
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index 5813b7611c..0efcf06d48 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -43,6 +43,15 @@ export function addTable(data) {
   })
 }
 
+export function rename(data) {
+  return request({
+    url: '/dataset/table/rename',
+    method: 'post',
+    loading: true,
+    data
+  })
+}
+
 export function delTable(tableId) {
   return request({
     url: '/dataset/table/delete/' + tableId,
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index 2163d42f21..a78d2973e8 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -341,7 +341,7 @@
 </template>
 
 <script>
-import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post, isKettleRunning} from '@/api/dataset/dataset'
+import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post, isKettleRunning, rename} from '@/api/dataset/dataset'
 import GroupMoveSelector from './GroupMoveSelector'
 import DsMoveSelector from './DsMoveSelector'
 
@@ -551,30 +551,21 @@ export default {
     },
 
     saveTable(table) {
-      //   console.log(table)
       table.mode = parseInt(table.mode)
       this.$refs['tableForm'].validate((valid) => {
         if (valid) {
           table.isRename = true
-          addTable(table).then(response => {
+          rename(table).then(response => {
             this.closeTable()
             this.$message({
               message: this.$t('dataset.save_success'),
               type: 'success',
               showClose: true
             })
-            // this.tableTree()
             this.refreshNodeBy(table.sceneId)
-            // this.$router.push('/dataset/home')
-            // this.$emit('switchComponent', { name: 'ViewTable', param: table.id })
             this.$store.dispatch('dataset/setTable', new Date().getTime())
           })
         } else {
-          // this.$message({
-          //   message: this.$t('commons.input_content'),
-          //   type: 'error',
-          //   showClose: true
-          // })
           return false
         }
       })

From a90bc12900695fc451f3623d853c7c6d5bc2bf0f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 30 Aug 2021 16:18:03 +0800
Subject: [PATCH 06/30] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E9=9B=86?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataset/DataSetTableController.java       |  8 +++---
 .../service/dataset/DataSetTableService.java  |  7 ++---
 frontend/src/api/dataset/dataset.js           |  4 +--
 frontend/src/views/dataset/group/Group.vue    | 28 ++-----------------
 4 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
index 4fa8d70494..76c2288b81 100644
--- a/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
+++ b/backend/src/main/java/io/dataease/controller/dataset/DataSetTableController.java
@@ -46,10 +46,10 @@ public class DataSetTableController {
         }
     }
 
-    @ApiOperation("重命名")
-    @PostMapping("rename")
-    public void rename(@RequestBody DataSetTableRequest request) throws Exception {
-        dataSetTableService.rename(request);
+    @ApiOperation("修改")
+    @PostMapping("alter")
+    public void alter(@RequestBody DataSetTableRequest request) throws Exception {
+        dataSetTableService.alter(request);
     }
     
     @ApiOperation("删除")
diff --git a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
index 94b1f45169..93e1158b4a 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -251,12 +251,9 @@ public class DataSetTableService {
         return datasetTable;
     }
 
-    public void rename(DataSetTableRequest request)throws Exception {
+    public void alter(DataSetTableRequest request)throws Exception {
         checkName(request);
-        DatasetTable datasetTable = new DatasetTable();
-        datasetTable.setId(request.getId());
-        datasetTable.setName(request.getName());
-        datasetTableMapper.updateByPrimaryKeySelective(datasetTable);
+        datasetTableMapper.updateByPrimaryKeySelective(request);
     }
 
     public void delete(String id) throws Exception {
diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index 0efcf06d48..be73f0862d 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -43,9 +43,9 @@ export function addTable(data) {
   })
 }
 
-export function rename(data) {
+export function alter(data) {
   return request({
-    url: '/dataset/table/rename',
+    url: '/dataset/table/alter',
     method: 'post',
     loading: true,
     data
diff --git a/frontend/src/views/dataset/group/Group.vue b/frontend/src/views/dataset/group/Group.vue
index a78d2973e8..1d86c4b06b 100644
--- a/frontend/src/views/dataset/group/Group.vue
+++ b/frontend/src/views/dataset/group/Group.vue
@@ -341,7 +341,7 @@
 </template>
 
 <script>
-import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post, isKettleRunning, rename} from '@/api/dataset/dataset'
+import { loadTable, getScene, addGroup, delGroup, addTable, delTable, post, isKettleRunning, alter} from '@/api/dataset/dataset'
 import GroupMoveSelector from './GroupMoveSelector'
 import DsMoveSelector from './DsMoveSelector'
 
@@ -419,23 +419,12 @@ export default {
     }
   },
   computed: {
-    // sceneData: function() {
-    //   // this.tableTree()
-    //   // console.log(this.$store.state.dataset.sceneData)
-    //   this.refreshNodeBy(this.currGroup.id)
-    //   return this.$store.state.dataset.sceneData
-    // }
   },
   created() {
     this.kettleState()
   },
   watch: {
     search(val) {
-      // if (val && val !== '') {
-      //   this.tableData = JSON.parse(JSON.stringify(this.tables.filter(ele => { return ele.name.includes(val) })))
-      // } else {
-      //   this.tableData = JSON.parse(JSON.stringify(this.tables))
-      // }
       this.$emit('switchComponent', { name: '' })
       this.tData = []
       this.expandedArray = []
@@ -526,7 +515,6 @@ export default {
     },
 
     saveGroup(group) {
-      // console.log(group);
       this.$refs['groupForm'].validate((valid) => {
         if (valid) {
           addGroup(group).then(res => {
@@ -536,15 +524,9 @@ export default {
               type: 'success',
               showClose: true
             })
-            // this.tree(this.groupForm)
             this.refreshNodeBy(group.pid)
           })
         } else {
-          // this.$message({
-          //   message: this.$t('commons.input_error'),
-          //   type: 'error',
-          //   showClose: true
-          // })
           return false
         }
       })
@@ -555,7 +537,7 @@ export default {
       this.$refs['tableForm'].validate((valid) => {
         if (valid) {
           table.isRename = true
-          rename(table).then(response => {
+          alter(table).then(response => {
             this.closeTable()
             this.$message({
               message: this.$t('dataset.save_success'),
@@ -787,14 +769,10 @@ export default {
       }
     },
     saveMoveDs() {
-      // if (this.tDs && this.tDs.type === 'group') {
-      //   return
-      // }
       this.dsForm.sceneId = this.tDs.id
       this.dsForm.isRename = true
-      addTable(this.dsForm).then(res => {
+      alter(this.dsForm).then(res => {
         this.closeMoveDs()
-        // this.tableTree()
         this.refreshNodeBy(this.dsForm.sceneId)
       })
     },

From 136bbd9a28c5955ea18a26972b1dd7f8098c2cbb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Mon, 30 Aug 2021 17:21:54 +0800
Subject: [PATCH 07/30] =?UTF-8?q?fix:=E6=9D=A1=E4=BB=B6=E7=BB=84=E4=BB=B6?=
 =?UTF-8?q?=E5=80=BC=E5=9B=9E=E6=98=BE=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/widget/DeWidget/DeInputSearch.vue   | 14 +++++++++++---
 .../components/widget/DeWidget/DeNumberRange.vue   |  9 +++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeInputSearch.vue b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
index 36cb3083a9..18f23069b9 100644
--- a/frontend/src/components/widget/DeWidget/DeInputSearch.vue
+++ b/frontend/src/components/widget/DeWidget/DeInputSearch.vue
@@ -2,7 +2,7 @@
 
   <el-input
     v-if="options!== null && options.attrs!==null"
-    v-model="values"
+    v-model="value"
     resize="vertical"
     :placeholder="$t(options.attrs.placeholder)"
     @keypress.enter.native="search"
@@ -31,22 +31,30 @@ export default {
     return {
       options: null,
       operator: 'like',
-      values: null,
+      value: null,
       canEdit: false
     }
   },
   created() {
     this.options = this.element.options
+    if (this.inDraw && this.options.value && this.options.value.length > 0) {
+      this.value = this.options.value[0]
+    }
   },
   methods: {
     search() {
     //   this.options.value && this.setCondition()
+      this.options.value = []
+      if (this.inDraw && this.value) {
+        this.options.value = [this.value]
+      }
+
       this.setCondition()
     },
     setCondition() {
       const param = {
         component: this.element,
-        value: !this.values ? [] : Array.isArray(this.values) ? this.values : [this.values],
+        value: !this.options.value ? [] : Array.isArray(this.options.value) ? this.options.value : [this.options.value],
         operator: this.operator
       }
       this.inDraw && this.$store.commit('addViewFilter', param)
diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
index 17dc4cde31..c005736cbe 100644
--- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue
+++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
@@ -66,6 +66,12 @@ export default {
   },
   created() {
     this.options = this.element.options
+    if (this.inDraw && this.options.value && this.options.value.length > 0) {
+      this.form.min = this.options.value[0]
+      if (this.options.value.length > 1) {
+        this.form.max = this.options.value[1]
+      }
+    }
   },
   methods: {
     searchWithKey(index) {
@@ -134,6 +140,7 @@ export default {
         if (!valid) {
           return false
         }
+
         this.setCondition()
         this.styleChange()
       })
@@ -145,6 +152,8 @@ export default {
         value: [this.form.min, this.form.max],
         operator: this.operator
       }
+
+      this.inDraw && (this.options.value = param.value)
       if (this.form.min && this.form.max) {
         this.inDraw && this.$store.commit('addViewFilter', param)
         return

From 1fcc794a1c8dc9dcec2940b98e63b5e677432328 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 31 Aug 2021 10:29:20 +0800
Subject: [PATCH 08/30] =?UTF-8?q?refactor:=E8=A7=86=E5=9B=BE=E4=B8=8B?=
 =?UTF-8?q?=E9=92=BB=E6=8F=90=E7=A4=BA=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/components/ChartComponent.vue | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index 7c81e1e8a0..f23c41b0f5 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -218,7 +218,10 @@ export default {
     trackClick(trackAction) {
       const param = this.pointParam
       if (!param || !param.data || !param.data.dimensionList) {
-        this.$warning(this.$t('panel.no_drill_field'))
+        // 地图提示没有关联字段 其他没有维度信息的 直接返回
+        if (this.chart.type === 'map') {
+          this.$warning(this.$t('panel.no_drill_field'))
+        }
         return
       }
       const linkageParam = {

From d0bb428ac16b2da3b224613655cfccbb7adc6eac Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 31 Aug 2021 11:13:31 +0800
Subject: [PATCH 09/30] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF?=
 =?UTF-8?q?=E5=A4=9A=E4=B8=AA=E5=9C=B0=E5=9B=BEresize=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/ChartComponent.vue | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/views/chart/components/ChartComponent.vue b/frontend/src/views/chart/components/ChartComponent.vue
index f23c41b0f5..92a1374e18 100644
--- a/frontend/src/views/chart/components/ChartComponent.vue
+++ b/frontend/src/views/chart/components/ChartComponent.vue
@@ -214,6 +214,13 @@ export default {
       // 指定图表的配置项和数据
       const chart = this.myChart
       chart.resize()
+      this.reDrawMap()
+    },
+    reDrawMap() {
+      const chart = this.chart
+      if (chart.type === 'map') {
+        this.preDraw()
+      }
     },
     trackClick(trackAction) {
       const param = this.pointParam

From e72b70d45e846276e66e3128eba96404c068fab0 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 11:50:03 +0800
Subject: [PATCH 10/30] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=95=B0=E6=8D=AE=E6=BA=90=E5=8F=82=E6=95=B0=E9=87=8C?=
 =?UTF-8?q?=E9=A6=96=E5=B0=BE=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/datasource/dto/MysqlConfigration.java   |  6 +++---
 .../dataease/datasource/dto/OracleConfigration.java  | 12 ++++++------
 .../io/dataease/datasource/dto/PgConfigration.java   |  6 +++---
 .../datasource/dto/SqlServerConfigration.java        |  5 ++++-
 frontend/src/views/dataset/data/UpdateInfo.vue       |  4 ++--
 5 files changed, 18 insertions(+), 15 deletions(-)

diff --git a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java
index aa912d19bc..a94e3d0c4a 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/MysqlConfigration.java
@@ -12,8 +12,8 @@ public class MysqlConfigration extends JdbcDTO {
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
         return "jdbc:mysql://HOSTNAME:PORT/DATABASE?characterEncoding=UTF-8&connectTimeout=5000"
-                .replace("HOSTNAME", getHost())
-                .replace("PORT", getPort().toString())
-                .replace("DATABASE", getDataBase());
+                .replace("HOSTNAME", getHost().trim())
+                .replace("PORT", getPort().toString().trim())
+                .replace("DATABASE", getDataBase().trim());
     }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
index 6323791f90..d348e0d030 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/OracleConfigration.java
@@ -14,14 +14,14 @@ public class OracleConfigration extends JdbcDTO {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
         if(getConnectionType().equalsIgnoreCase("serviceName")){
             return "jdbc:oracle:thin:@HOSTNAME:PORT/DATABASE"
-                    .replace("HOSTNAME", getHost())
-                    .replace("PORT", getPort().toString())
-                    .replace("DATABASE", getDataBase());
+                    .replace("HOSTNAME", getHost().trim())
+                    .replace("PORT", getPort().toString().trim())
+                    .replace("DATABASE", getDataBase().trim());
         }else {
             return "jdbc:oracle:thin:@HOSTNAME:PORT:DATABASE"
-                    .replace("HOSTNAME", getHost())
-                    .replace("PORT", getPort().toString())
-                    .replace("DATABASE", getDataBase());
+                    .replace("HOSTNAME", getHost().trim())
+                    .replace("PORT", getPort().toString().trim())
+                    .replace("DATABASE", getDataBase().trim());
         }
     }
 }
diff --git a/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java
index 3258c575c0..e3fd2ae4d3 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/PgConfigration.java
@@ -12,8 +12,8 @@ public class PgConfigration extends JdbcDTO {
     public String getJdbc() {
         // 连接参数先写死，后边要把编码、时区等参数放到数据源的设置中
         return "jdbc:postgresql://HOSTNAME:PORT/DATABASE"
-                .replace("HOSTNAME", getHost())
-                .replace("PORT", getPort().toString())
-                .replace("DATABASE", getDataBase());
+                .replace("HOSTNAME", getHost().trim())
+                .replace("PORT", getPort().toString().trim())
+                .replace("DATABASE", getDataBase().trim());
     }
 }
\ No newline at end of file
diff --git a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
index 7282704586..f08c31167c 100644
--- a/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
+++ b/backend/src/main/java/io/dataease/datasource/dto/SqlServerConfigration.java
@@ -10,6 +10,9 @@ public class SqlServerConfigration extends JdbcDTO {
     private String driver = "com.microsoft.sqlserver.jdbc.SQLServerDriver";
 
     public String getJdbc(){
-        return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE".replace("HOSTNAME", getHost()).replace("PORT", getPort().toString()).replace("DATABASE", getDataBase());
+        return "jdbc:sqlserver://HOSTNAME:PORT;DatabaseName=DATABASE"
+                .replace("HOSTNAME", getHost().trim())
+                .replace("PORT", getPort().toString().trim())
+                .replace("DATABASE", getDataBase().trim());
     }
 }
diff --git a/frontend/src/views/dataset/data/UpdateInfo.vue b/frontend/src/views/dataset/data/UpdateInfo.vue
index 6383d4ba36..975a744b73 100644
--- a/frontend/src/views/dataset/data/UpdateInfo.vue
+++ b/frontend/src/views/dataset/data/UpdateInfo.vue
@@ -513,8 +513,8 @@ export default {
       }
       this.update_task = true
     },
-    listTask() {
-      post('/dataset/task/list', { tableId: this.table.id }).then(response => {
+    listTask(loading = true) {
+      post('/dataset/task/list', { tableId: this.table.id }, loading).then(response => {
         this.taskData = response.data
       })
     },

From 41c5de5f9ac8fc180aaa1794c71138156d6931cb Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Tue, 31 Aug 2021 12:41:51 +0800
Subject: [PATCH 11/30] =?UTF-8?q?fix:=20=E9=9B=B7=E8=BE=BE=E5=9B=BE?=
 =?UTF-8?q?=E7=A9=BA=E6=95=B0=E6=8D=AE=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/radar/radar.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/views/chart/chart/radar/radar.js b/frontend/src/views/chart/chart/radar/radar.js
index 56e6ec55d1..d2b582981c 100644
--- a/frontend/src/views/chart/chart/radar/radar.js
+++ b/frontend/src/views/chart/chart/radar/radar.js
@@ -28,6 +28,9 @@ export function baseRadarOption(chart_option, chart) {
     const maxValues = []
     for (let i = 0; i < chart.data.series.length; i++) {
       const y = chart.data.series[i]
+      if (y.data.length === 0) {
+        continue
+      }
       // color
       y.itemStyle = {
         color: hexColorToRGBA(customAttr.color.colors[i % 9], customAttr.color.alpha)

From 2c267172c5cba27480612d83b399f91ef18a4d67 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 31 Aug 2021 12:48:10 +0800
Subject: [PATCH 12/30] =?UTF-8?q?refactor:=20=E5=9C=B0=E5=9B=BE=E4=B8=8A?=
 =?UTF-8?q?=E6=89=80=E6=9C=89=E6=95=B0=E6=8D=AE=E4=B8=BA0=E6=97=B6=20?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E7=81=B0=E7=99=BD=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/map/map.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/frontend/src/views/chart/chart/map/map.js b/frontend/src/views/chart/chart/map/map.js
index 6c003a0fd2..de611a0051 100644
--- a/frontend/src/views/chart/chart/map/map.js
+++ b/frontend/src/views/chart/chart/map/map.js
@@ -47,6 +47,9 @@ export function baseMapOption(chart_option, chart) {
         chart_option.visualMap.min = 0
         chart_option.visualMap.max = 0
       }
+      if (chart_option.visualMap.min === 0 && chart_option.visualMap.max === 0) {
+        chart_option.visualMap.max = 100
+      }
       // color
       if (customAttr.color && customAttr.color.colors) {
         chart_option.visualMap.inRange.color = customAttr.color.colors

From 439e9da1abc6443121b14ec645852c0b2b1aa2f0 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 12:29:04 +0800
Subject: [PATCH 13/30] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86=20oracle=20sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/oracle/OracleQueryProvider.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
index 138a2cac52..47b7cd6837 100644
--- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
@@ -635,7 +635,7 @@ public class OracleQueryProvider extends QueryProvider {
             stringBuilder.append(" \"").append(f.getOriginName()).append("\"");
             return stringBuilder.toString();
         }).toArray(String[]::new);
-        return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), "\"" + table + "\"");
+        return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table );
     }
 
     @Override

From 9f51920c55fda1d275f439d175129b76cdab5a05 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 12:49:15 +0800
Subject: [PATCH 14/30] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96excel=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/dataset/ExtractDataService.java   | 8 ++++++--
 1 file changed, 6 insertions(+), 2 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 7b86ae2968..df86334a8f 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -1129,7 +1129,7 @@ public class ExtractDataService {
             "         get(Fields.Out, filed).setValue(r, 0);\n" +
             "         get(Fields.Out, filed).getValueMeta().setType(2);\n" +
             "       }\n" +
-            "     }\n";
+            "     }\n" ;
 
     private final static String handleExcelIntColumn = " \t\tif(tmp != null && tmp.endsWith(\".0\")){\n" +
             "            try {\n" +
@@ -1144,7 +1144,11 @@ public class ExtractDataService {
             "            tmp = tmp.replaceAll(\"\\r\",\" \");\n" +
             "            tmp = tmp.replaceAll(\"\\n\",\" \");\n" +
             "            get(Fields.Out, filed).setValue(r, tmp);\n" +
-            "        } ";
+            "        } \n" +
+            "\t\tif(tmp == null){\n" +
+            " \t\t\ttmp = \"\";\n" +
+            "\t\t\tget(Fields.Out, filed).setValue(r, tmp);\n" +
+            "\t\t}";
 
     private final static String code = "import org.pentaho.di.core.row.ValueMetaInterface;\n" +
             "import java.util.List;\n" +

From 17ca2b2164f06c7a830815ed90407198a7198ba1 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 31 Aug 2021 13:00:26 +0800
Subject: [PATCH 15/30] =?UTF-8?q?fix:=20=E4=BF=AE=E6=94=B9=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E7=BB=84=E7=BB=87=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 8532718ef6..3f3ab667a7 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -542,7 +542,7 @@ export default {
     create: 'Create',
     modify: 'Modify',
     delete: 'Delete',
-    delete_confirm: 'Deleting the organization will be associated with deleting the subordinate organization, Are you sure you want to delete it?',
+    delete_confirm: 'Are you sure you want to delete the organization?',
     input_name: 'Please enter name',
     select_organization: 'Please select organization',
     search_by_name: 'Search by name',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 16e2f4543b..1981b08af8 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -542,7 +542,7 @@ export default {
     create: '新建組織',
     modify: '修改組織',
     delete: '刪除組織',
-    delete_confirm: '刪除該組織會關聯刪除該組織的下屬組織，確定要刪除嗎?',
+    delete_confirm: '確定要刪除該組織嗎?',
     input_name: '請輸入組織名稱',
     select_organization: '請選擇組織',
     search_by_name: '根據名稱搜索',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index e2d201ea11..b8a3385134 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -542,7 +542,7 @@ export default {
     create: '新建组织',
     modify: '修改组织',
     delete: '删除组织',
-    delete_confirm: '删除该组织会关联删除该组织的下属组织，确定要删除吗?',
+    delete_confirm: '确定要删除该组织吗?',
     input_name: '请输入组织名称',
     select_organization: '请选择组织',
     search_by_name: '根据名称搜索',

From 6b1f54808b936b73fa391a15761c364dc077f568 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 31 Aug 2021 15:26:49 +0800
Subject: [PATCH 16/30] =?UTF-8?q?fix:=20=E5=AE=8C=E5=96=84sql=E6=B3=A8?=
 =?UTF-8?q?=E5=85=A5=E6=8B=A6=E6=88=AA=E5=99=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/wrapper/XssAndSqlHttpServletRequestWrapper.java     | 2 +-
 frontend/src/lang/en.js                                         | 2 +-
 frontend/src/lang/tw.js                                         | 2 +-
 frontend/src/lang/zh.js                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

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 a2fc32e868..dd0f688bbe 100644
--- a/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
+++ b/backend/src/main/java/io/dataease/commons/wrapper/XssAndSqlHttpServletRequestWrapper.java
@@ -235,7 +235,7 @@ public class XssAndSqlHttpServletRequestWrapper extends HttpServletRequestWrappe
             if (Arrays.stream(whiteLists.split(",")).anyMatch(item -> url.indexOf(item) != -1)) return false;
         }
         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.*)");
+                "|(.*\\b(select|update|union|and|or|delete|insert|trancate|char|into|substr|ascii|declare|exec|count|master|into|drop|execute|sleep|extractvalue|updatexml|substring|database|concat|rand)\\b.*)");
         Matcher matcher=pattern.matcher(orders.toLowerCase());
         return matcher.find();
     }
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 8532718ef6..3f3ab667a7 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -542,7 +542,7 @@ export default {
     create: 'Create',
     modify: 'Modify',
     delete: 'Delete',
-    delete_confirm: 'Deleting the organization will be associated with deleting the subordinate organization, Are you sure you want to delete it?',
+    delete_confirm: 'Are you sure you want to delete the organization?',
     input_name: 'Please enter name',
     select_organization: 'Please select organization',
     search_by_name: 'Search by name',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 16e2f4543b..1981b08af8 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -542,7 +542,7 @@ export default {
     create: '新建組織',
     modify: '修改組織',
     delete: '刪除組織',
-    delete_confirm: '刪除該組織會關聯刪除該組織的下屬組織，確定要刪除嗎?',
+    delete_confirm: '確定要刪除該組織嗎?',
     input_name: '請輸入組織名稱',
     select_organization: '請選擇組織',
     search_by_name: '根據名稱搜索',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index e2d201ea11..b8a3385134 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -542,7 +542,7 @@ export default {
     create: '新建组织',
     modify: '修改组织',
     delete: '删除组织',
-    delete_confirm: '删除该组织会关联删除该组织的下属组织，确定要删除吗?',
+    delete_confirm: '确定要删除该组织吗?',
     input_name: '请输入组织名称',
     select_organization: '请选择组织',
     search_by_name: '根据名称搜索',

From ddd53d9c6973a2c81f879f90dfe5625a3bc5ce3b Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 31 Aug 2021 16:14:34 +0800
Subject: [PATCH 17/30] =?UTF-8?q?fix:=20=E6=94=B6=E8=97=8F=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=90=8D=E7=A7=B0=E8=BF=87?=
 =?UTF-8?q?=E9=95=BF=E5=B1=95=E7=A4=BA...?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/enshrine/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/panel/enshrine/index.vue b/frontend/src/views/panel/enshrine/index.vue
index 578816a7a7..28b6752394 100644
--- a/frontend/src/views/panel/enshrine/index.vue
+++ b/frontend/src/views/panel/enshrine/index.vue
@@ -10,7 +10,7 @@
       <el-table-column prop="name" :label="$t('commons.name')">
         <template :id="scope.row.storeId" slot-scope="scope">
           <div class="start-item">
-            <div class="filter-db-row star-item-content" @click="showPanel(scope.row)">
+            <div class="filter-db-row star-item-content" style="white-space:nowrap;overflow:hidden;text-overflow:ellipsis;" @click="showPanel(scope.row)">
               <svg-icon icon-class="panel" class="ds-icon-scene" />
               <span> {{ scope.row.name }}</span>
             </div>

From ca80014096aec73759b6b169a0f2a08a114f1d97 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 31 Aug 2021 16:15:10 +0800
Subject: [PATCH 18/30] =?UTF-8?q?fix:=20=E6=97=A5=E6=9C=9F=E7=BB=84?=
 =?UTF-8?q?=E4=BB=B6=E5=BF=85=E9=A1=BB=E7=82=B9=E5=B7=A6=E4=BE=A7=E6=8C=82?=
 =?UTF-8?q?=E4=BB=B6=E6=89=8D=E8=83=BD=E5=BC=B9=E5=87=BA=E6=97=A5=E6=9C=9F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/DeDrag/index.vue                      | 4 ++--
 .../components/canvas/components/Editor/ComponentWrapper.vue  | 2 +-
 frontend/src/components/canvas/components/Editor/Shape.vue    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index eefbe0ffc2..e6f77f7220 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -20,7 +20,7 @@
     @mouseenter="enter"
     @mouseleave="leave"
   >
-    <edit-bar style="transform: translateZ(10px)" v-if="active||linkageSettingStatus" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" />
+    <edit-bar v-if="active||linkageSettingStatus" style="transform: translateZ(10px)" :active-model="'edit'" :element="element" @showViewDetails="showViewDetails" />
     <div
       v-for="(handlei, indexi) in actualHandles"
       :key="indexi"
@@ -629,7 +629,7 @@ export default {
     elementMouseDown(e) {
       // private 设置当前组件数据及状态
       this.$store.commit('setClickComponentStatus', true)
-      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range') {
+      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') {
         e.preventDefault()
       }
       // 阻止冒泡事件
diff --git a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
index b789d127d8..51bc67d471 100644
--- a/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
+++ b/frontend/src/components/canvas/components/Editor/ComponentWrapper.vue
@@ -104,7 +104,7 @@ export default {
     elementMouseDown(e) {
       // private 设置当前组件数据及状态
       this.$store.commit('setClickComponentStatus', true)
-      if (this.config.component !== 'v-text' && this.config.component !== 'rect-shape' && this.config.component !== 'de-input-search' && this.config.component !== 'de-select-grid' && this.config.component !== 'de-number-range') {
+      if (this.config.component !== 'v-text' && this.config.component !== 'rect-shape' && this.config.component !== 'de-input-search' && this.config.component !== 'de-select-grid' && this.config.component !== 'de-number-range' && this.config.component !== 'de-date') {
         e.preventDefault()
       }
       // 阻止冒泡事件
diff --git a/frontend/src/components/canvas/components/Editor/Shape.vue b/frontend/src/components/canvas/components/Editor/Shape.vue
index b4c0e74bbf..ffd2f9885b 100644
--- a/frontend/src/components/canvas/components/Editor/Shape.vue
+++ b/frontend/src/components/canvas/components/Editor/Shape.vue
@@ -226,7 +226,7 @@ export default {
 
     handleMouseDownOnShape(e) {
       this.$store.commit('setClickComponentStatus', true)
-      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range') {
+      if (this.element.component !== 'v-text' && this.element.component !== 'rect-shape' && this.element.component !== 'de-input-search' && this.element.component !== 'de-select-grid' && this.element.component !== 'de-number-range' && this.element.component !== 'de-date') {
         e.preventDefault()
       }
 

From 3b05a56aa9367e1a326baa3c1d8a86eac29448e7 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Tue, 31 Aug 2021 16:28:42 +0800
Subject: [PATCH 19/30] =?UTF-8?q?fix:=20=E4=B8=AA=E4=BA=BA=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E8=A1=A8=E5=8D=95=E4=B8=AD=E8=A7=92=E8=89=B2=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF=E5=B1=95=E7=A4=BA=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/system/user/privateForm.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/views/system/user/privateForm.vue b/frontend/src/views/system/user/privateForm.vue
index 2bbfb99ba0..3a2647b498 100644
--- a/frontend/src/views/system/user/privateForm.vue
+++ b/frontend/src/views/system/user/privateForm.vue
@@ -77,7 +77,7 @@ import '@riophae/vue-treeselect/dist/vue-treeselect.css'
 import { PHONE_REGEX } from '@/utils/validate'
 import { LOAD_CHILDREN_OPTIONS, LOAD_ROOT_OPTIONS } from '@riophae/vue-treeselect'
 import { getDeptTree, treeByDeptId } from '@/api/system/dept'
-import { allRoles } from '@/api/system/role'
+import { allRoles } from '@/api/system/user'
 import { updatePerson, persionInfo } from '@/api/system/user'
 export default {
 

From ac4fc7ef92a81c38a2a9f83ba4cc61c849b8620f Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 16:57:01 +0800
Subject: [PATCH 20/30] =?UTF-8?q?fix:=20oracle=20=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E8=BD=AC=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/io/dataease/provider/oracle/OracleConstants.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleConstants.java b/backend/src/main/java/io/dataease/provider/oracle/OracleConstants.java
index 55907606d5..69dcfa32cd 100644
--- a/backend/src/main/java/io/dataease/provider/oracle/OracleConstants.java
+++ b/backend/src/main/java/io/dataease/provider/oracle/OracleConstants.java
@@ -17,7 +17,7 @@ public class OracleConstants extends SQLConstants {
 
     public static final String UNIX_TIMESTAMP = "UNIX_TIMESTAMP(%s)";
 
-    public static final String DATE_FORMAT = "DATE_FORMAT(%s,'%s')";
+    public static final String DATE_FORMAT = "to_timestamp(%s,'%s')";
 
     public static final String FROM_UNIXTIME = "FROM_UNIXTIME(%s,'%s')";
 

From 2e3152d0de5846469f23304a23135400f1008d26 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 18:01:16 +0800
Subject: [PATCH 21/30] =?UTF-8?q?fix:=20=E6=A0=A1=E9=AA=8C=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/service/dataset/DataSetTableTaskService.java | 5 +++++
 backend/src/main/resources/i18n/messages_en_US.properties    | 3 ++-
 backend/src/main/resources/i18n/messages_zh_CN.properties    | 1 +
 backend/src/main/resources/i18n/messages_zh_TW.properties    | 3 ++-
 4 files changed, 10 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 5cffd5e742..96f44d4c22 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableTaskService.java
@@ -191,6 +191,11 @@ public class DataSetTableTaskService {
             if(dataSetTaskDTOS.get(0).getNextExecTime() == null || dataSetTaskDTOS.get(0).getNextExecTime() <= 0){
                 datasetTableTask.setStatus(TaskStatus.Stopped.name());
                 update(datasetTableTask);
+                return;
+            }
+            if(dataSetTaskDTOS.get(0).getNextExecTime() > datasetTableTask.getEndTime()){
+                datasetTableTask.setStatus(TaskStatus.Stopped.name());
+                update(datasetTableTask);
             }
         }
     }
diff --git a/backend/src/main/resources/i18n/messages_en_US.properties b/backend/src/main/resources/i18n/messages_en_US.properties
index c1735c6cb2..9ad714f65d 100644
--- a/backend/src/main/resources/i18n/messages_en_US.properties
+++ b/backend/src/main/resources/i18n/messages_en_US.properties
@@ -280,4 +280,5 @@ i18n_datasource_connect_error=Data source connection exception:
 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
+i18n_Exec=Running
+i18n_no_trigger=The current setting does not trigger task generation.
\ 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 9ccd5e60bf..ac52f22368 100644
--- a/backend/src/main/resources/i18n/messages_zh_CN.properties
+++ b/backend/src/main/resources/i18n/messages_zh_CN.properties
@@ -280,4 +280,5 @@ i18n_check_sql_error=校验增量 SQL 异常,
 i18n_change_task_status_error=不允许暂停，任务状态为：
 i18n_Stopped=执行结束
 i18n_Exec=运行中
+i18n_no_trigger=当前设置没有触发任务生成
 
diff --git a/backend/src/main/resources/i18n/messages_zh_TW.properties b/backend/src/main/resources/i18n/messages_zh_TW.properties
index 9e79137c74..de243c1861 100644
--- a/backend/src/main/resources/i18n/messages_zh_TW.properties
+++ b/backend/src/main/resources/i18n/messages_zh_TW.properties
@@ -282,4 +282,5 @@ i18n_datasource_connect_error=數據源連接異常:
 i18n_check_sql_error=校驗增量SQL異常,
 i18n_change_task_status_error=不允許暫停，任務狀態為：
 i18n_Stopped=執行結束
-i18n_Exec=運行中
\ No newline at end of file
+i18n_Exec=運行中
+i18n_no_trigger=当前设置没有触发任务生成 當前設置沒有觸發任務生成.
\ No newline at end of file

From 60b1275395f74e050a5ad5a5a996a6017b744018 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 20:41:57 +0800
Subject: [PATCH 22/30] =?UTF-8?q?fix:=20=E6=8A=BD=E5=8F=96=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/ExtractDataService.java   | 38 ++++++++++---------
 1 file changed, 20 insertions(+), 18 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 df86334a8f..fd015ba7d2 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -1001,8 +1001,9 @@ public class ExtractDataService {
     }
 
     private StepMeta udjc(List<DatasetTableField> datasetTableFields, DatasourceTypes datasourceType) {
-        String needToChangeColumnType = "";
+//        String needToChangeColumnType = "";
         String handleBinaryTypeCode = "";
+        String excelCompletion = "";
 
         for (DatasetTableField datasetTableField : datasetTableFields) {
             if(datasetTableField.getDeExtractType() == 5){
@@ -1016,9 +1017,8 @@ public class ExtractDataService {
         fields.add(fieldInfo);
         userDefinedJavaClassMeta.setFieldInfo(fields);
         List<UserDefinedJavaClassDef> definitions = new ArrayList<UserDefinedJavaClassDef>();
-        String tmp_code = code.replace("alterColumnTypeCode", needToChangeColumnType);
+        String tmp_code = code.replace("handleWraps", handleWraps).replace("handleBinaryType", handleBinaryTypeCode);
 
-        tmp_code = tmp_code.replace("handleWraps", handleWraps);
         String Column_Fields = "";
         if (datasourceType.equals(DatasourceTypes.oracle)) {
             Column_Fields = String.join(",", datasetTableFields.stream().map(DatasetTableField::getOriginName).collect(Collectors.toList()));
@@ -1027,12 +1027,13 @@ public class ExtractDataService {
         }
 
         if (datasourceType.equals(DatasourceTypes.excel)) {
-            tmp_code = tmp_code.replace("handleExcelIntColumn", handleExcelIntColumn).replace("Column_Fields", Column_Fields);
+            tmp_code = tmp_code.replace("handleExcelIntColumn", handleExcelIntColumn).replace("Column_Fields", Column_Fields)
+                    .replace("ExcelCompletion", excelCompletion);
         } else {
-            tmp_code = tmp_code.replace("handleExcelIntColumn", "").replace("Column_Fields", Column_Fields);
+            tmp_code = tmp_code.replace("handleExcelIntColumn", "").replace("Column_Fields", Column_Fields)
+                    .replace("ExcelCompletion", "");;
         }
 
-        tmp_code = tmp_code.replace("handleBinaryType", handleBinaryTypeCode);
         UserDefinedJavaClassDef userDefinedJavaClassDef = new UserDefinedJavaClassDef(UserDefinedJavaClassDef.ClassType.TRANSFORM_CLASS, "Processor", tmp_code);
 
         userDefinedJavaClassDef.setActive(true);
@@ -1121,15 +1122,15 @@ public class ExtractDataService {
             "     \t}";
 
 
-    private final static String alterColumnTypeCode = "    if(\"FILED\".equalsIgnoreCase(filed)){\n" +
-            "\t   if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" +
-            "         get(Fields.Out, filed).setValue(r, 1);\n" +
-            "         get(Fields.Out, filed).getValueMeta().setType(2);\n" +
-            "       }else{\n" +
-            "         get(Fields.Out, filed).setValue(r, 0);\n" +
-            "         get(Fields.Out, filed).getValueMeta().setType(2);\n" +
-            "       }\n" +
-            "     }\n" ;
+//    private final static String alterColumnTypeCode = "    if(\"FILED\".equalsIgnoreCase(filed)){\n" +
+//            "\t   if(tmp != null && tmp.equalsIgnoreCase(\"Y\")){\n" +
+//            "         get(Fields.Out, filed).setValue(r, 1);\n" +
+//            "         get(Fields.Out, filed).getValueMeta().setType(2);\n" +
+//            "       }else{\n" +
+//            "         get(Fields.Out, filed).setValue(r, 0);\n" +
+//            "         get(Fields.Out, filed).getValueMeta().setType(2);\n" +
+//            "       }\n" +
+//            "     }\n" ;
 
     private final static String handleExcelIntColumn = " \t\tif(tmp != null && tmp.endsWith(\".0\")){\n" +
             "            try {\n" +
@@ -1144,8 +1145,9 @@ public class ExtractDataService {
             "            tmp = tmp.replaceAll(\"\\r\",\" \");\n" +
             "            tmp = tmp.replaceAll(\"\\n\",\" \");\n" +
             "            get(Fields.Out, filed).setValue(r, tmp);\n" +
-            "        } \n" +
-            "\t\tif(tmp == null){\n" +
+            "        } \n";
+
+    private final static String excelCompletion = "\t\tif(tmp == null){\n" +
             " \t\t\ttmp = \"\";\n" +
             "\t\t\tget(Fields.Out, filed).setValue(r, tmp);\n" +
             "\t\t}";
@@ -1180,7 +1182,7 @@ public class ExtractDataService {
             "    for (String filed : fileds) {\n" +
             "        String tmp = get(Fields.In, filed).getString(r);\n" +
             "handleWraps \n" +
-            "alterColumnTypeCode \n" +
+            "ExcelCompletion \n" +
             "handleBinaryType \n" +
             "handleExcelIntColumn \n" +
             "        str = str + tmp;\n" +

From 7f0cdcd1bd85a778b71259c10a635b7eb8461082 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 21:55:59 +0800
Subject: [PATCH 23/30] =?UTF-8?q?fix:=20oracle=20=E8=A1=A8=E5=90=8D?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E5=B0=8F=E5=86=99=E5=AD=97=E6=AF=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/oracle/OracleQueryProvider.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
index 47b7cd6837..fb66621274 100644
--- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
@@ -635,12 +635,17 @@ public class OracleQueryProvider extends QueryProvider {
             stringBuilder.append(" \"").append(f.getOriginName()).append("\"");
             return stringBuilder.toString();
         }).toArray(String[]::new);
-        return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), table );
+        return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), "\"" + table + "\"");
     }
 
     @Override
     public String createRawQuerySQLAsTmp(String sql, List<DatasetTableField> fields) {
-        return createRawQuerySQL(" (" + sqlFix(sql) + ") DE_TMP ", fields, null);
+        String[] array = fields.stream().map(f -> {
+            StringBuilder stringBuilder = new StringBuilder();
+            stringBuilder.append(" \"").append(f.getOriginName()).append("\"");
+            return stringBuilder.toString();
+        }).toArray(String[]::new);
+        return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), " (" + sqlFix(sql) + ") DE_TMP " );
     }
 
     public String transMysqlFilterTerm(String term) {

From 37977644dd27c4a53d4ddad17d42c7486b64817e Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Tue, 31 Aug 2021 22:44:28 +0800
Subject: [PATCH 24/30] =?UTF-8?q?feat:=20=E9=BB=98=E8=AE=A4=E5=8E=BB?=
 =?UTF-8?q?=E6=8E=89=E6=95=B0=E6=8D=AE=E6=BA=90=E5=8F=82=E6=95=B0=E9=87=8C?=
 =?UTF-8?q?=E9=A6=96=E5=B0=BE=E7=A9=BA=E6=A0=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/service/dataset/ExtractDataService.java   | 10 +++++-----
 1 file changed, 5 insertions(+), 5 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 fd015ba7d2..4f70c0b40c 100644
--- a/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/ExtractDataService.java
@@ -555,7 +555,7 @@ public class ExtractDataService {
         datasetTableTaskLog.setTaskId(taskId);
         datasetTableTaskLog.setStatus(JobStatus.Underway.name());
         datasetTableTaskLog.setTriggerType(TriggerType.Custom.name());
-        for (int i = 0; i < 5; i++) {
+        for (int i = 0; i < 10; i++) {
             List<DatasetTableTaskLog> datasetTableTaskLogs = dataSetTableTaskLogService.select(datasetTableTaskLog);
             if (CollectionUtils.isNotEmpty(datasetTableTaskLogs)) {
                 return datasetTableTaskLogs.get(0);
@@ -768,7 +768,7 @@ public class ExtractDataService {
         switch (datasourceType) {
             case mysql:
                 MysqlConfigration mysqlConfigration = new Gson().fromJson(datasource.getConfiguration(), MysqlConfigration.class);
-                dataMeta = new DatabaseMeta("db", "MYSQL", "Native", mysqlConfigration.getHost(), mysqlConfigration.getDataBase(), mysqlConfigration.getPort().toString(), mysqlConfigration.getUsername(), mysqlConfigration.getPassword());
+                dataMeta = new DatabaseMeta("db", "MYSQL", "Native", mysqlConfigration.getHost().trim(), mysqlConfigration.getDataBase().trim(), mysqlConfigration.getPort().toString(), mysqlConfigration.getUsername(), mysqlConfigration.getPassword());
                 dataMeta.addExtraOption("MYSQL", "characterEncoding", "UTF-8");
                 transMeta.addDatabase(dataMeta);
                 selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL);
@@ -777,7 +777,7 @@ public class ExtractDataService {
                 break;
             case sqlServer:
                 SqlServerConfigration sqlServerConfigration = new Gson().fromJson(datasource.getConfiguration(), SqlServerConfigration.class);
-                dataMeta = new DatabaseMeta("db", "MSSQLNATIVE", "Native", sqlServerConfigration.getHost(), sqlServerConfigration.getDataBase(), sqlServerConfigration.getPort().toString(), sqlServerConfigration.getUsername(), sqlServerConfigration.getPassword());
+                dataMeta = new DatabaseMeta("db", "MSSQLNATIVE", "Native", sqlServerConfigration.getHost().trim(), sqlServerConfigration.getDataBase(), sqlServerConfigration.getPort().toString(), sqlServerConfigration.getUsername(), sqlServerConfigration.getPassword());
                 transMeta.addDatabase(dataMeta);
                 selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL);
                 inputStep = inputStep(transMeta, selectSQL);
@@ -785,7 +785,7 @@ public class ExtractDataService {
                 break;
             case pg:
                 PgConfigration pgConfigration = new Gson().fromJson(datasource.getConfiguration(), PgConfigration.class);
-                dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfigration.getHost(), pgConfigration.getDataBase(), pgConfigration.getPort().toString(), pgConfigration.getUsername(), pgConfigration.getPassword());
+                dataMeta = new DatabaseMeta("db", "POSTGRESQL", "Native", pgConfigration.getHost().trim(), pgConfigration.getDataBase(), pgConfigration.getPort().toString(), pgConfigration.getUsername(), pgConfigration.getPassword());
                 transMeta.addDatabase(dataMeta);
                 selectSQL = getSelectSQL(extractType, datasetTable, datasource, datasetTableFields, selectSQL);
                 inputStep = inputStep(transMeta, selectSQL);
@@ -797,7 +797,7 @@ public class ExtractDataService {
                     String database = "(DESCRIPTION =(ADDRESS = (PROTOCOL = TCP)(HOST = ORACLE_HOSTNAME)(PORT = ORACLE_PORT))(CONNECT_DATA = (SERVER = DEDICATED)(SERVICE_NAME = ORACLE_SERVICE_NAME )))".replace("ORACLE_HOSTNAME", oracleConfigration.getHost()).replace("ORACLE_PORT", oracleConfigration.getPort().toString()).replace("ORACLE_SERVICE_NAME", oracleConfigration.getDataBase());
                     dataMeta = new DatabaseMeta("db", "ORACLE", "Native", "", database, "-1", oracleConfigration.getUsername(), oracleConfigration.getPassword());
                 } else {
-                    dataMeta = new DatabaseMeta("db", "ORACLE", "Native", oracleConfigration.getHost(), oracleConfigration.getDataBase(), oracleConfigration.getPort().toString(), oracleConfigration.getUsername(), oracleConfigration.getPassword());
+                    dataMeta = new DatabaseMeta("db", "ORACLE", "Native", oracleConfigration.getHost().trim(), oracleConfigration.getDataBase(), oracleConfigration.getPort().toString(), oracleConfigration.getUsername(), oracleConfigration.getPassword());
                 }
                 transMeta.addDatabase(dataMeta);
 

From 2d367809d7546eab58ce4a930396a7051698d8f6 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 1 Sep 2021 11:55:30 +0800
Subject: [PATCH 25/30] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A1=E7=AE=97=E8=BF=87=E6=BB=A4=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/constants/DeTypeConstants.java    |   3 +-
 .../provider/doris/DorisConstants.java        |   2 +
 .../provider/doris/DorisQueryProvider.java    |  22 ++-
 .../provider/mysql/MySQLConstants.java        |   2 +
 .../provider/mysql/MysqlQueryProvider.java    |  22 ++-
 .../provider/oracle/OracleQueryProvider.java  |  24 ++-
 .../io/dataease/provider/pg/PgConstants.java  |   2 +
 .../dataease/provider/pg/PgQueryProvider.java | 151 ++++++++++--------
 .../sqlserver/SqlserverQueryProvider.java     |  66 ++++----
 9 files changed, 176 insertions(+), 118 deletions(-)

diff --git a/backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java b/backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java
index 50a925c2ee..a03ca54f05 100644
--- a/backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java
+++ b/backend/src/main/java/io/dataease/commons/constants/DeTypeConstants.java
@@ -7,6 +7,7 @@ public class DeTypeConstants {
     public final static Integer DE_INT = 2;
     public final static Integer DE_FLOAT = 3;
     public final static Integer DE_BOOL = 4;
-    public final static Integer DE_Binary = 5;
+    public final static Integer DE_LOCATION = 5;
+    public final static Integer DE_BINARY = 6;
 
 }
diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisConstants.java b/backend/src/main/java/io/dataease/provider/doris/DorisConstants.java
index fda5ea41ef..22792a429e 100644
--- a/backend/src/main/java/io/dataease/provider/doris/DorisConstants.java
+++ b/backend/src/main/java/io/dataease/provider/doris/DorisConstants.java
@@ -19,6 +19,8 @@ public class DorisConstants extends SQLConstants {
 
     public static final String FROM_UNIXTIME = "FROM_UNIXTIME(%s,'%s')";
 
+    public static final String STR_TO_DATE = "STR_TO_DATE(%s,'%s')";
+
     public static final String CAST = "CAST(%s AS %s)";
 
     public static final String DEFAULT_DATE_FORMAT = "%Y-%m-%d %H:%i:%S";
diff --git a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
index 8fe11624f3..c1169c8fb5 100644
--- a/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/doris/DorisQueryProvider.java
@@ -686,9 +686,14 @@ public class DorisQueryProvider extends QueryProvider {
                 originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName());
             }
 
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
-                whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
+                    whereName = String.format(DorisConstants.STR_TO_DATE, originName, DorisConstants.DEFAULT_DATE_FORMAT);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
+                    whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
+                }
             } else if (field.getDeType() == 0) {
                 whereName = String.format(DorisConstants.CAST, originName, DorisConstants.VARCHAR);
             } else {
@@ -738,9 +743,14 @@ public class DorisQueryProvider extends QueryProvider {
                 originName = String.format(DorisConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getDataeaseName());
             }
 
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
-                whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
+                    whereName = String.format(DorisConstants.STR_TO_DATE, originName, DorisConstants.DEFAULT_DATE_FORMAT);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(DorisConstants.CAST, originName, DorisConstants.DEFAULT_INT_FORMAT) + "/1000";
+                    whereName = String.format(DorisConstants.FROM_UNIXTIME, cast, DorisConstants.DEFAULT_DATE_FORMAT);
+                }
             } else if (field.getDeType() == 0) {
                 whereName = String.format(DorisConstants.CAST, originName, DorisConstants.VARCHAR);
             } else {
diff --git a/backend/src/main/java/io/dataease/provider/mysql/MySQLConstants.java b/backend/src/main/java/io/dataease/provider/mysql/MySQLConstants.java
index bf1c9d950d..8ab8567e2d 100644
--- a/backend/src/main/java/io/dataease/provider/mysql/MySQLConstants.java
+++ b/backend/src/main/java/io/dataease/provider/mysql/MySQLConstants.java
@@ -19,6 +19,8 @@ public class MySQLConstants extends SQLConstants {
 
     public static final String FROM_UNIXTIME = "FROM_UNIXTIME(%s,'%s')";
 
+    public static final String STR_TO_DATE = "STR_TO_DATE(%s,'%s')";
+
     public static final String CAST = "CAST(%s AS %s)";
 
     public static final String DEFAULT_DATE_FORMAT = "%Y-%m-%d %H:%i:%S";
diff --git a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
index 7d95965a19..8661579cf1 100644
--- a/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/mysql/MysqlQueryProvider.java
@@ -671,9 +671,14 @@ public class MysqlQueryProvider extends QueryProvider {
             } else {
                 originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
             }
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
-                whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                    whereName = String.format(MySQLConstants.STR_TO_DATE, originName, MySQLConstants.DEFAULT_DATE_FORMAT);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
+                    whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
+                }
             } else {
                 whereName = originName;
             }
@@ -721,9 +726,14 @@ public class MysqlQueryProvider extends QueryProvider {
                 originName = String.format(MySQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
             }
 
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
-                whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                    whereName = String.format(MySQLConstants.STR_TO_DATE, originName, MySQLConstants.DEFAULT_DATE_FORMAT);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(MySQLConstants.CAST, originName, MySQLConstants.DEFAULT_INT_FORMAT) + "/1000";
+                    whereName = String.format(MySQLConstants.FROM_UNIXTIME, cast, MySQLConstants.DEFAULT_DATE_FORMAT);
+                }
             } else {
                 whereName = originName;
             }
diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
index fb66621274..97447177f0 100644
--- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
@@ -645,7 +645,7 @@ public class OracleQueryProvider extends QueryProvider {
             stringBuilder.append(" \"").append(f.getOriginName()).append("\"");
             return stringBuilder.toString();
         }).toArray(String[]::new);
-        return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), " (" + sqlFix(sql) + ") DE_TMP " );
+        return MessageFormat.format("SELECT {0} FROM {1} ORDER BY null", StringUtils.join(array, ","), " (" + sqlFix(sql) + ") DE_TMP ");
     }
 
     public String transMysqlFilterTerm(String term) {
@@ -706,9 +706,14 @@ public class OracleQueryProvider extends QueryProvider {
                 originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
             }
 
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
-                whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
+                    whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
+                    whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
+                }
             } else {
                 whereName = originName;
             }
@@ -756,9 +761,14 @@ public class OracleQueryProvider extends QueryProvider {
                 originName = String.format(OracleConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
             }
 
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
-                whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
+                    whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(OracleConstants.CAST, originName, OracleConstants.DEFAULT_INT_FORMAT) + "/1000";
+                    whereName = String.format(OracleConstants.FROM_UNIXTIME, cast, OracleConstants.DEFAULT_DATE_FORMAT);
+                }
             } else {
                 whereName = originName;
             }
diff --git a/backend/src/main/java/io/dataease/provider/pg/PgConstants.java b/backend/src/main/java/io/dataease/provider/pg/PgConstants.java
index e9f9555ae3..1fcf7f0d8e 100644
--- a/backend/src/main/java/io/dataease/provider/pg/PgConstants.java
+++ b/backend/src/main/java/io/dataease/provider/pg/PgConstants.java
@@ -19,6 +19,8 @@ public class PgConstants extends SQLConstants {
 
     public static final String FROM_UNIXTIME = "to_timestamp(%s)";
 
+    public static final String TO_DATE = "to_date(%s,'%s')";
+
     public static final String CAST = "CAST(%s AS %s)";
 
     public static final String DEFAULT_DATE_FORMAT = "'YYYY-MM-DD HH24:MI:SS'";
diff --git a/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java
index 9944e3b1b8..5bdc712e38 100644
--- a/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/pg/PgQueryProvider.java
@@ -32,7 +32,6 @@ import java.util.regex.Pattern;
 import static io.dataease.provider.SQLConstants.TABLE_ALIAS_PREFIX;
 
 
-
 @Service("pgQuery")
 public class PgQueryProvider extends QueryProvider {
     @Resource
@@ -86,7 +85,7 @@ public class PgQueryProvider extends QueryProvider {
             case "TINYINT":
                 return DeTypeConstants.DE_BOOL;// 布尔
             case "bytea":
-                return DeTypeConstants.DE_Binary;// 二进制
+                return DeTypeConstants.DE_BINARY;// 二进制
             default:
                 return DeTypeConstants.DE_STRING;
         }
@@ -100,11 +99,11 @@ public class PgQueryProvider extends QueryProvider {
     @Override
     public String createQuerySQL(String table, List<DatasetTableField> fields, boolean isGroup, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
-                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
 
-        setSchema(tableObj,ds);
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(fields)) {
             for (int i = 0; i < fields.size(); i++) {
@@ -114,35 +113,35 @@ public class PgQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(f.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(f.getExtField()) && f.getExtField() == 1) {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName());
                 } else {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), f.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
                 String fieldName = "";
                 // 处理横轴字段
                 if (f.getDeExtractType() == DeTypeConstants.DE_TIME) {
                     if (f.getDeType() == DeTypeConstants.DE_INT || f.getDeType() == DeTypeConstants.DE_FLOAT) {
-                        fieldName = String.format( PgConstants.UNIX_TIMESTAMP, originField);
+                        fieldName = String.format(PgConstants.UNIX_TIMESTAMP, originField);
                     } else {
                         fieldName = originField;
                     }
                 } else if (f.getDeExtractType() == DeTypeConstants.DE_STRING) {
                     if (f.getDeType() == DeTypeConstants.DE_INT) {
-                        fieldName = String.format( PgConstants.CAST, originField, PgConstants.DEFAULT_INT_FORMAT);
+                        fieldName = String.format(PgConstants.CAST, originField, PgConstants.DEFAULT_INT_FORMAT);
                     } else if (f.getDeType() == DeTypeConstants.DE_FLOAT) {
-                        fieldName = String.format( PgConstants.CAST, originField, PgConstants.DEFAULT_FLOAT_FORMAT);
+                        fieldName = String.format(PgConstants.CAST, originField, PgConstants.DEFAULT_FLOAT_FORMAT);
                     } else if (f.getDeType() == DeTypeConstants.DE_TIME) {
-                        fieldName = String.format( PgConstants.CAST, originField, "timestamp");
+                        fieldName = String.format(PgConstants.CAST, originField, "timestamp");
                     } else {
                         fieldName = originField;
                     }
                 } else {
                     if (f.getDeType() == DeTypeConstants.DE_TIME) {
-                        String cast = String.format( PgConstants.CAST, originField,  "bigint");
-                        fieldName = String.format( PgConstants.FROM_UNIXTIME, cast );
+                        String cast = String.format(PgConstants.CAST, originField, "bigint");
+                        fieldName = String.format(PgConstants.FROM_UNIXTIME, cast);
                     } else if (f.getDeType() == DeTypeConstants.DE_INT) {
-                        fieldName = String.format( PgConstants.CAST, originField, PgConstants.DEFAULT_INT_FORMAT);
+                        fieldName = String.format(PgConstants.CAST, originField, PgConstants.DEFAULT_INT_FORMAT);
                     } else {
                         fieldName = originField;
                     }
@@ -190,10 +189,10 @@ public class PgQueryProvider extends QueryProvider {
     @Override
     public String getSQL(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
-                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
-        setSchema(tableObj,ds);
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -205,9 +204,9 @@ public class PgQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(x.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
                 } else {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
                 // 处理横轴字段
@@ -235,9 +234,9 @@ public class PgQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(y.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 } else {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
                 // 处理纵轴字段
@@ -285,7 +284,7 @@ public class PgQueryProvider extends QueryProvider {
 
         ST st = stg.getInstanceOf("querySql");
         SQLObj tableSQL = SQLObj.builder()
-                .tableName(String.format( PgConstants.BRACKETS, sql))
+                .tableName(String.format(PgConstants.BRACKETS, sql))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
                 .build();
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
@@ -303,10 +302,10 @@ public class PgQueryProvider extends QueryProvider {
     @Override
     public String getSQLStack(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extStack, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
-                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
-        setSchema(tableObj,ds);
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -321,9 +320,9 @@ public class PgQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(x.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
                 } else {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
                 // 处理横轴字段
@@ -351,9 +350,9 @@ public class PgQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(y.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 } else {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
                 // 处理纵轴字段
@@ -401,7 +400,7 @@ public class PgQueryProvider extends QueryProvider {
 
         ST st = stg.getInstanceOf("querySql");
         SQLObj tableSQL = SQLObj.builder()
-                .tableName(String.format( PgConstants.BRACKETS, sql))
+                .tableName(String.format(PgConstants.BRACKETS, sql))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
                 .build();
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
@@ -418,10 +417,10 @@ public class PgQueryProvider extends QueryProvider {
     @Override
     public String getSQLScatter(String table, List<ChartViewFieldDTO> xAxis, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList, List<ChartViewFieldDTO> extBubble, Datasource ds) {
         SQLObj tableObj = SQLObj.builder()
-                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
-        setSchema(tableObj,ds);
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -433,9 +432,9 @@ public class PgQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(x.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(x.getExtField()) && x.getExtField() == 1) {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
                 } else {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), x.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_X_PREFIX, i);
                 // 处理横轴字段
@@ -466,9 +465,9 @@ public class PgQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(y.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 } else {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
                 // 处理纵轴字段
@@ -516,7 +515,7 @@ public class PgQueryProvider extends QueryProvider {
 
         ST st = stg.getInstanceOf("querySql");
         SQLObj tableSQL = SQLObj.builder()
-                .tableName(String.format( PgConstants.BRACKETS, sql))
+                .tableName(String.format(PgConstants.BRACKETS, sql))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
                 .build();
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
@@ -539,7 +538,7 @@ public class PgQueryProvider extends QueryProvider {
     public String getSQLSummary(String table, List<ChartViewFieldDTO> yAxis, List<ChartCustomFilterDTO> customFilter, List<ChartExtFilterRequest> extFilterRequestList) {
         // 字段汇总 排序等
         SQLObj tableObj = SQLObj.builder()
-                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format( PgConstants.KEYWORD_TABLE, table))
+                .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(PgConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
         List<SQLObj> yFields = new ArrayList<>();
@@ -553,9 +552,9 @@ public class PgQueryProvider extends QueryProvider {
                     // 解析origin name中有关联的字段生成sql表达式
                     originField = calcFieldRegex(y.getOriginName(), tableObj);
                 } else if (ObjectUtils.isNotEmpty(y.getExtField()) && y.getExtField() == 1) {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 } else {
-                    originField = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
+                    originField = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), y.getOriginName());
                 }
                 String fieldAlias = String.format(SQLConstants.FIELD_ALIAS_Y_PREFIX, i);
                 // 处理纵轴字段
@@ -598,7 +597,7 @@ public class PgQueryProvider extends QueryProvider {
 
         ST st = stg.getInstanceOf("querySql");
         SQLObj tableSQL = SQLObj.builder()
-                .tableName(String.format( PgConstants.BRACKETS, sql))
+                .tableName(String.format(PgConstants.BRACKETS, sql))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 1))
                 .build();
         if (CollectionUtils.isNotEmpty(aggWheres)) st.add("filters", aggWheres);
@@ -629,11 +628,11 @@ public class PgQueryProvider extends QueryProvider {
             stringBuilder.append("\"").append(f.getOriginName()).append("\" AS ").append(f.getDataeaseName());
             return stringBuilder.toString();
         }).toArray(String[]::new);
-        if(ds != null){
+        if (ds != null) {
             String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema();
             String tableWithSchema = String.format(SqlServerSQLConstants.KEYWORD_TABLE, schema) + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, table);
             return MessageFormat.format("SELECT {0} FROM {1}  ", StringUtils.join(array, ","), tableWithSchema);
-        }else {
+        } else {
             return MessageFormat.format("SELECT {0} FROM {1}  ", StringUtils.join(array, ","), table);
         }
     }
@@ -695,18 +694,23 @@ public class PgQueryProvider extends QueryProvider {
                 // 解析origin name中有关联的字段生成sql表达式
                 originName = calcFieldRegex(field.getOriginName(), tableObj);
             } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
             } else {
-                originName = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
             }
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format( PgConstants.CAST, originName,  "bigint");
-                whereName = String.format( PgConstants.FROM_UNIXTIME, cast);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                    whereName = String.format(PgConstants.TO_DATE, originName, PgConstants.DEFAULT_DATE_FORMAT);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(PgConstants.CAST, originName, "bigint");
+                    whereName = String.format(PgConstants.FROM_UNIXTIME, cast);
+                }
             } else {
                 whereName = originName;
             }
             if (StringUtils.equalsIgnoreCase(request.getTerm(), "null")) {
-                whereValue =  PgConstants.WHERE_VALUE_NULL;
+                whereValue = PgConstants.WHERE_VALUE_NULL;
             } else if (StringUtils.equalsIgnoreCase(request.getTerm(), "not_null")) {
                 whereTerm = String.format(whereTerm, originName);
             } else if (StringUtils.containsIgnoreCase(request.getTerm(), "in")) {
@@ -714,7 +718,7 @@ public class PgQueryProvider extends QueryProvider {
             } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
                 whereValue = "'%" + value + "%'";
             } else {
-                whereValue = String.format( PgConstants.WHERE_VALUE_VALUE, value);
+                whereValue = String.format(PgConstants.WHERE_VALUE_VALUE, value);
             }
             list.add(SQLObj.builder()
                     .whereField(whereName)
@@ -744,14 +748,19 @@ public class PgQueryProvider extends QueryProvider {
                 // 解析origin name中有关联的字段生成sql表达式
                 originName = calcFieldRegex(field.getOriginName(), tableObj);
             } else if (ObjectUtils.isNotEmpty(field.getExtField()) && field.getExtField() == 1) {
-                originName = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
             } else {
-                originName = String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
+                originName = String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
             }
 
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format( PgConstants.CAST, originName,  "bigint");
-                whereName = String.format( PgConstants.FROM_UNIXTIME, cast);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                    whereName = String.format(PgConstants.TO_DATE, originName, PgConstants.DEFAULT_DATE_FORMAT);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(PgConstants.CAST, originName, "bigint");
+                    whereName = String.format(PgConstants.FROM_UNIXTIME, cast);
+                }
             } else {
                 whereName = originName;
             }
@@ -765,12 +774,12 @@ public class PgQueryProvider extends QueryProvider {
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
                     String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
-                    whereValue = String.format( PgConstants.WHERE_BETWEEN, startTime, endTime);
+                    whereValue = String.format(PgConstants.WHERE_BETWEEN, startTime, endTime);
                 } else {
-                    whereValue = String.format( PgConstants.WHERE_BETWEEN, value.get(0), value.get(1));
+                    whereValue = String.format(PgConstants.WHERE_BETWEEN, value.get(0), value.get(1));
                 }
             } else {
-                whereValue = String.format( PgConstants.WHERE_VALUE_VALUE, value.get(0));
+                whereValue = String.format(PgConstants.WHERE_VALUE_VALUE, value.get(0));
             }
             list.add(SQLObj.builder()
                     .whereField(whereName)
@@ -817,10 +826,10 @@ public class PgQueryProvider extends QueryProvider {
         String fieldName = "";
         if (x.getDeExtractType() == DeTypeConstants.DE_TIME) {
             if (x.getDeType() == 2 || x.getDeType() == 3) {
-                fieldName = String.format( PgConstants.UNIX_TIMESTAMP, originField);
+                fieldName = String.format(PgConstants.UNIX_TIMESTAMP, originField);
             } else if (x.getDeType() == DeTypeConstants.DE_TIME) {
                 String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
-                fieldName = String.format( PgConstants.DATE_FORMAT, originField, format);
+                fieldName = String.format(PgConstants.DATE_FORMAT, originField, format);
             } else {
                 fieldName = originField;
             }
@@ -828,11 +837,11 @@ public class PgQueryProvider extends QueryProvider {
             if (x.getDeType() == DeTypeConstants.DE_TIME) {
                 String format = transDateFormat(x.getDateStyle(), x.getDatePattern());
                 if (x.getDeExtractType() == DeTypeConstants.DE_STRING) {
-                    fieldName = String.format( PgConstants.DATE_FORMAT, originField, format);
+                    fieldName = String.format(PgConstants.DATE_FORMAT, originField, format);
                 } else {
-                    String cast = String.format( PgConstants.CAST, originField,  "bigint");
-                    String from_unixtime = String.format( PgConstants.FROM_UNIXTIME, cast);
-                    fieldName = String.format( PgConstants.DATE_FORMAT, from_unixtime, format);
+                    String cast = String.format(PgConstants.CAST, originField, "bigint");
+                    String from_unixtime = String.format(PgConstants.FROM_UNIXTIME, cast);
+                    fieldName = String.format(PgConstants.DATE_FORMAT, from_unixtime, format);
                 }
             } else {
                 fieldName = originField;
@@ -847,17 +856,17 @@ public class PgQueryProvider extends QueryProvider {
     private SQLObj getYFields(ChartViewFieldDTO y, String originField, String fieldAlias) {
         String fieldName = "";
         if (StringUtils.equalsIgnoreCase(y.getOriginName(), "*")) {
-            fieldName =  PgConstants.AGG_COUNT;
+            fieldName = PgConstants.AGG_COUNT;
         } else if (SQLConstants.DIMENSION_TYPE.contains(y.getDeType())) {
-            fieldName = String.format( PgConstants.AGG_FIELD, y.getSummary(), originField);
+            fieldName = String.format(PgConstants.AGG_FIELD, y.getSummary(), originField);
         } else {
             if (StringUtils.equalsIgnoreCase(y.getSummary(), "avg") || StringUtils.containsIgnoreCase(y.getSummary(), "pop")) {
-                String cast = String.format( PgConstants.CAST, originField, y.getDeType() == DeTypeConstants.DE_INT ?  PgConstants.DEFAULT_INT_FORMAT :  PgConstants.DEFAULT_FLOAT_FORMAT);
-                String agg = String.format( PgConstants.AGG_FIELD, y.getSummary(), cast);
-                fieldName = String.format( PgConstants.CAST, agg,  PgConstants.DEFAULT_FLOAT_FORMAT);
+                String cast = String.format(PgConstants.CAST, originField, y.getDeType() == DeTypeConstants.DE_INT ? PgConstants.DEFAULT_INT_FORMAT : PgConstants.DEFAULT_FLOAT_FORMAT);
+                String agg = String.format(PgConstants.AGG_FIELD, y.getSummary(), cast);
+                fieldName = String.format(PgConstants.CAST, agg, PgConstants.DEFAULT_FLOAT_FORMAT);
             } else {
-                String cast = String.format( PgConstants.CAST, originField, y.getDeType() == DeTypeConstants.DE_INT ?  PgConstants.DEFAULT_INT_FORMAT :  PgConstants.DEFAULT_FLOAT_FORMAT);
-                fieldName = String.format( PgConstants.AGG_FIELD, y.getSummary(), cast);
+                String cast = String.format(PgConstants.CAST, originField, y.getDeType() == DeTypeConstants.DE_INT ? PgConstants.DEFAULT_INT_FORMAT : PgConstants.DEFAULT_FLOAT_FORMAT);
+                fieldName = String.format(PgConstants.AGG_FIELD, y.getSummary(), cast);
             }
         }
         return SQLObj.builder()
@@ -874,7 +883,7 @@ public class PgQueryProvider extends QueryProvider {
                 String whereValue = "";
                 // 原始类型不是时间，在de中被转成时间的字段做处理
                 if (StringUtils.equalsIgnoreCase(f.getTerm(), "null")) {
-                    whereValue =  PgConstants.WHERE_VALUE_NULL;
+                    whereValue = PgConstants.WHERE_VALUE_NULL;
                 } else if (StringUtils.equalsIgnoreCase(f.getTerm(), "not_null")) {
                     whereTerm = String.format(whereTerm, originField);
                 } else if (StringUtils.containsIgnoreCase(f.getTerm(), "in")) {
@@ -882,7 +891,7 @@ public class PgQueryProvider extends QueryProvider {
                 } else if (StringUtils.containsIgnoreCase(f.getTerm(), "like")) {
                     whereValue = "'%" + f.getValue() + "%'";
                 } else {
-                    whereValue = String.format( PgConstants.WHERE_VALUE_VALUE, f.getValue());
+                    whereValue = String.format(PgConstants.WHERE_VALUE_VALUE, f.getValue());
                 }
                 list.add(SQLObj.builder()
                         .whereField(fieldAlias)
@@ -913,7 +922,7 @@ public class PgQueryProvider extends QueryProvider {
         List<DatasetTableField> calcFields = datasetTableFieldMapper.selectByExample(datasetTableFieldExample);
         for (DatasetTableField ele : calcFields) {
             originField = originField.replaceAll("\\[" + ele.getId() + "]",
-                    String.format( PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName()));
+                    String.format(PgConstants.KEYWORD_FIX, tableObj.getTableAlias(), ele.getOriginName()));
         }
         return originField;
     }
diff --git a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
index a9a07b1ce0..6753379231 100644
--- a/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/sqlserver/SqlserverQueryProvider.java
@@ -13,6 +13,7 @@ import io.dataease.dto.chart.ChartViewFieldDTO;
 import io.dataease.dto.sqlObj.SQLObj;
 import io.dataease.provider.QueryProvider;
 import io.dataease.provider.SQLConstants;
+import io.dataease.provider.mysql.MySQLConstants;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -73,7 +74,7 @@ public class SqlserverQueryProvider extends QueryProvider {
             case "TINYINT":
                 return DeTypeConstants.DE_BOOL;// 布尔
             case "TIMESTAMP":
-                return DeTypeConstants.DE_Binary;// 二进制
+                return DeTypeConstants.DE_BINARY;// 二进制
             default:
                 return DeTypeConstants.DE_STRING;
         }
@@ -91,7 +92,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
-        setSchema(tableObj,ds);
+        setSchema(tableObj, ds);
 
         List<SQLObj> xFields = new ArrayList<>();
         if (CollectionUtils.isNotEmpty(fields)) {
@@ -159,12 +160,12 @@ public class SqlserverQueryProvider extends QueryProvider {
 
     @Override
     public String createQueryTableWithLimit(String table, List<DatasetTableField> fields, Integer limit, boolean isGroup, Datasource ds) {
-        return createQuerySQL(table, fields, isGroup, ds) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset  0 rows fetch next " + limit  + " rows only";
+        return createQuerySQL(table, fields, isGroup, ds) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset  0 rows fetch next " + limit + " rows only";
     }
 
     @Override
     public String createQuerySqlWithLimit(String sql, List<DatasetTableField> fields, Integer limit, boolean isGroup) {
-        return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset  0 rows fetch next " + limit  + " rows only";
+        return createQuerySQLAsTmp(sql, fields, isGroup) + " ORDER BY \"" + fields.get(0).getOriginName() + "\" offset  0 rows fetch next " + limit + " rows only";
     }
 
     @Override
@@ -173,7 +174,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
-        setSchema(tableObj,ds);
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -270,7 +271,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
-        setSchema(tableObj,ds);
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -388,7 +389,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 .tableName((table.startsWith("(") && table.endsWith(")")) ? table : String.format(SqlServerSQLConstants.KEYWORD_TABLE, table))
                 .tableAlias(String.format(TABLE_ALIAS_PREFIX, 0))
                 .build();
-        setSchema(tableObj,ds);
+        setSchema(tableObj, ds);
         List<SQLObj> xFields = new ArrayList<>();
         List<SQLObj> xWheres = new ArrayList<>();
         List<SQLObj> xOrders = new ArrayList<>();
@@ -588,11 +589,11 @@ public class SqlserverQueryProvider extends QueryProvider {
             stringBuilder.append("\"").append(f.getOriginName()).append("\" AS ").append(f.getDataeaseName());
             return stringBuilder.toString();
         }).toArray(String[]::new);
-        if(ds != null){
+        if (ds != null) {
             String schema = new Gson().fromJson(ds.getConfiguration(), JdbcDTO.class).getSchema();
             String tableWithSchema = String.format(SqlServerSQLConstants.KEYWORD_TABLE, schema) + "." + String.format(SqlServerSQLConstants.KEYWORD_TABLE, table);
             return MessageFormat.format("SELECT {0} FROM {1}  ", StringUtils.join(array, ","), tableWithSchema);
-        }else {
+        } else {
             return MessageFormat.format("SELECT {0} FROM {1}  ", StringUtils.join(array, ","), table);
         }
     }
@@ -651,9 +652,15 @@ public class SqlserverQueryProvider extends QueryProvider {
             String whereTerm = transMysqlFilterTerm(request.getTerm());
             String whereValue = "";
             String originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
-            if (field.getDeType() == DeTypeConstants.DE_TIME && field.getDeExtractType() != DeTypeConstants.DE_TIME) {
-                String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
-                whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
+
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                    whereName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originName);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
+                    whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
+                }
             } else {
                 whereName = originName;
             }
@@ -692,9 +699,14 @@ public class SqlserverQueryProvider extends QueryProvider {
             String whereValue = "";
             String originName = String.format(SqlServerSQLConstants.KEYWORD_FIX, tableObj.getTableAlias(), field.getOriginName());
 
-            if (field.getDeType() == 1 && field.getDeExtractType() != 1) {
-                String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
-                whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
+            if (field.getDeType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
+                    whereName = String.format(SqlServerSQLConstants.STRING_TO_DATE, originName);
+                }
+                if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
+                    String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originName + "/1000");
+                    whereName = String.format(SqlServerSQLConstants.FROM_UNIXTIME, cast);
+                }
             } else {
                 whereName = originName;
             }
@@ -744,30 +756,30 @@ public class SqlserverQueryProvider extends QueryProvider {
             case "y":
                 return "CONVERT(varchar(100), datepart(yy, " + originField + "))";
             case "y_M":
-                if(split.equalsIgnoreCase("-")){
+                if (split.equalsIgnoreCase("-")) {
                     return "substring( convert(varchar," + originField + ",120),1,7)";
-                }else {
-                    return "replace("+ "substring( convert(varchar," + originField + ",120),1,7), '-','/')";
+                } else {
+                    return "replace(" + "substring( convert(varchar," + originField + ",120),1,7), '-','/')";
                 }
             case "y_M_d":
-                if(split.equalsIgnoreCase("-")){
+                if (split.equalsIgnoreCase("-")) {
                     return "CONVERT(varchar(100), " + originField + ", 23)";
-                }else {
+                } else {
                     return "CONVERT(varchar(100), " + originField + ", 111)";
                 }
             case "H_m_s":
                 return "CONVERT(varchar(100), " + originField + ", 8)";
             case "y_M_d_H_m":
-                if(split.equalsIgnoreCase("-")){
+                if (split.equalsIgnoreCase("-")) {
                     return "substring( convert(varchar," + originField + ",120),1,16)";
-                }else {
-                    return "replace("+ "substring( convert(varchar," + originField + ",120),1,16), '-','/')";
+                } else {
+                    return "replace(" + "substring( convert(varchar," + originField + ",120),1,16), '-','/')";
                 }
             case "y_M_d_H_m_s":
-                if(split.equalsIgnoreCase("-")){
+                if (split.equalsIgnoreCase("-")) {
                     return "convert(varchar," + originField + ",120)";
-                }else {
-                    return "replace("+ "convert(varchar," + originField + ",120), '-','/')";
+                } else {
+                    return "replace(" + "convert(varchar," + originField + ",120), '-','/')";
                 }
             default:
                 return "convert(varchar," + originField + ",120)";
@@ -790,7 +802,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                     String cast = String.format(SqlServerSQLConstants.STRING_TO_DATE, originField);
                     fieldName = transDateFormat(x.getDateStyle(), x.getDatePattern(), cast);
                 } else {// 数值转时间
-                    String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originField+ "/1000");
+                    String cast = String.format(SqlServerSQLConstants.LONG_TO_DATE, originField + "/1000");
                     fieldName = transDateFormat(x.getDateStyle(), x.getDatePattern(), cast);
                 }
             } else {

From 554e9c15721fc36ca4e38e953d18fe9283b33f86 Mon Sep 17 00:00:00 2001
From: junjie <junjie.xia@fit2cloud.com>
Date: Wed, 1 Sep 2021 13:28:05 +0800
Subject: [PATCH 26/30] =?UTF-8?q?fix:=20=E6=95=B0=E6=8D=AE=E6=BA=90?=
 =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AE=A1=E7=AE=97=E8=BF=87=E6=BB=A4=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../provider/oracle/OracleQueryProvider.java       | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
index 97447177f0..4750b06fe7 100644
--- a/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/oracle/OracleQueryProvider.java
@@ -707,7 +707,7 @@ public class OracleQueryProvider extends QueryProvider {
             }
 
             if (field.getDeType() == 1) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
                     whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT);
                 }
                 if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
@@ -726,7 +726,11 @@ public class OracleQueryProvider extends QueryProvider {
             } else if (StringUtils.containsIgnoreCase(request.getTerm(), "like")) {
                 whereValue = "'%" + value + "%'";
             } else {
-                whereValue = String.format(OracleConstants.WHERE_VALUE_VALUE, value);
+                if (field.getDeType() == 1) {
+                    whereValue = String.format(OracleConstants.TO_DATE, "'" + value + "'", OracleConstants.DEFAULT_DATE_FORMAT);
+                } else {
+                    whereValue = String.format(OracleConstants.WHERE_VALUE_VALUE, value);
+                }
             }
             list.add(SQLObj.builder()
                     .whereField(whereName)
@@ -762,7 +766,7 @@ public class OracleQueryProvider extends QueryProvider {
             }
 
             if (field.getDeType() == 1) {
-                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5 || field.getDeExtractType() == 1) {
+                if (field.getDeExtractType() == 0 || field.getDeExtractType() == 5) {
                     whereName = String.format(OracleConstants.TO_DATE, originName, OracleConstants.DEFAULT_DATE_FORMAT);
                 }
                 if (field.getDeExtractType() == 2 || field.getDeExtractType() == 3) {
@@ -782,7 +786,9 @@ public class OracleQueryProvider extends QueryProvider {
                     SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
                     String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
                     String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
-                    whereValue = String.format(OracleConstants.WHERE_BETWEEN, startTime, endTime);
+                    String st = String.format(OracleConstants.TO_DATE, "'" + startTime + "'", OracleConstants.DEFAULT_DATE_FORMAT);
+                    String et = String.format(OracleConstants.TO_DATE, "'" + endTime + "'", OracleConstants.DEFAULT_DATE_FORMAT);
+                    whereValue = st + " AND " + et;
                 } else {
                     whereValue = String.format(OracleConstants.WHERE_BETWEEN, value.get(0), value.get(1));
                 }

From 22e0d8f3073edb0a63f8b94048fee9f9baca822a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 1 Sep 2021 14:03:55 +0800
Subject: [PATCH 27/30] =?UTF-8?q?fix:1.=E9=87=8D=E5=81=9A=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98=EF=BC=9B?=
 =?UTF-8?q?2.=E8=BE=93=E5=85=A5=E6=96=87=E5=AD=97=E4=BF=9D=E5=AD=98?=
 =?UTF-8?q?=E6=8C=89=E9=92=AE=E4=BE=9D=E7=84=B6=E6=98=AF=E7=81=B0=E7=9A=84?=
 =?UTF-8?q?=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/index.vue      |  2 +-
 .../canvas/components/Editor/ContextMenu.vue  | 12 +++++-----
 .../canvas/components/Editor/SettingMenu.vue  | 12 +++++-----
 .../canvas/components/Editor/index.vue        | 22 +++++++++----------
 .../canvas/components/FilterTextAttr.vue      |  3 +--
 .../canvas/components/RectangleAttr.vue       |  2 +-
 .../components/canvas/components/TextAttr.vue |  2 +-
 .../components/canvas/components/Toolbar.vue  |  8 +++----
 .../canvas/custom-component/VText.vue         |  1 +
 frontend/src/components/canvas/index.vue      |  2 +-
 .../src/components/canvas/store/snapshot.js   |  5 +++++
 .../src/components/widget/DeWidget/DeDate.vue |  2 +-
 .../widget/DeWidget/DeNumberRange.vue         |  4 ++--
 .../components/widget/DeWidget/DeSelect.vue   |  2 +-
 .../widget/DeWidget/DeSelectGrid.vue          |  2 +-
 .../src/views/panel/AssistComponent/index.vue |  2 +-
 .../PanelStyle/BackgroundSelector.vue         |  2 +-
 .../PanelStyle/ComponentGap.vue               |  2 +-
 .../PreSubject/SubjectTemplateItem.vue        |  2 +-
 .../src/views/panel/SubjectSetting/index.vue  |  2 +-
 frontend/src/views/panel/edit/index.vue       | 13 ++++++-----
 21 files changed, 55 insertions(+), 49 deletions(-)

diff --git a/frontend/src/components/DeDrag/index.vue b/frontend/src/components/DeDrag/index.vue
index e6f77f7220..af6a34ce39 100644
--- a/frontend/src/components/DeDrag/index.vue
+++ b/frontend/src/components/DeDrag/index.vue
@@ -1176,7 +1176,7 @@ export default {
       if (this.canvasStyleData.auxiliaryMatrix) {
         this.recordMatrixCurStyle()
       }
-      this.hasMove && this.$store.commit('recordSnapshot')
+      this.hasMove && this.$store.commit('recordSnapshot', 'handleUp')
       // 记录snapshot后 移动已记录设置为false
       this.hasMove = false
 
diff --git a/frontend/src/components/canvas/components/Editor/ContextMenu.vue b/frontend/src/components/canvas/components/Editor/ContextMenu.vue
index 96035a5c02..5a1e319f18 100644
--- a/frontend/src/components/canvas/components/Editor/ContextMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/ContextMenu.vue
@@ -87,13 +87,13 @@ export default {
 
     paste() {
       this.$store.commit('paste', true)
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'paste')
     },
 
     deleteComponent() {
       this.deleteCurCondition()
       this.$store.commit('deleteComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'deleteComponent')
       this.$store.commit('setCurComponent', { component: null, index: null })
     },
 
@@ -106,22 +106,22 @@ export default {
 
     upComponent() {
       this.$store.commit('upComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'upComponent')
     },
 
     downComponent() {
       this.$store.commit('downComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'downComponent')
     },
 
     topComponent() {
       this.$store.commit('topComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'topComponent')
     },
 
     bottomComponent() {
       this.$store.commit('bottomComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'bottomComponent')
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/Editor/SettingMenu.vue b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
index a7c2c2a277..de8e9c7951 100644
--- a/frontend/src/components/canvas/components/Editor/SettingMenu.vue
+++ b/frontend/src/components/canvas/components/Editor/SettingMenu.vue
@@ -86,13 +86,13 @@ export default {
 
     paste() {
       this.$store.commit('paste', true)
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','paste')
     },
 
     deleteComponent() {
       this.deleteCurCondition()
       this.$store.commit('deleteComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','deleteComponent')
       this.$store.commit('setCurComponent', { component: null, index: null })
     },
 
@@ -105,22 +105,22 @@ export default {
 
     upComponent() {
       this.$store.commit('upComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','upComponent')
     },
 
     downComponent() {
       this.$store.commit('downComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','downComponent')
     },
 
     topComponent() {
       this.$store.commit('topComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','topComponent')
     },
 
     bottomComponent() {
       this.$store.commit('bottomComponent')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','bottomComponent')
     },
     linkageSetting() {
       debugger
diff --git a/frontend/src/components/canvas/components/Editor/index.vue b/frontend/src/components/canvas/components/Editor/index.vue
index 0065e5f052..2b2103b6aa 100644
--- a/frontend/src/components/canvas/components/Editor/index.vue
+++ b/frontend/src/components/canvas/components/Editor/index.vue
@@ -292,17 +292,17 @@ export default {
       },
       deep: true
     },
-    canvasStyleData: {
-      handler(newVal, oldVla) {
-        // 第一次变化 不需要 重置边界 待改进
-        if (this.changeIndex++ > 0) {
-          this.resizeParentBounds()
-          this.$store.state.styleChangeTimes++
-        }
-        // this.changeScale()
-      },
-      deep: true
-    },
+    // canvasStyleData: {
+    //   handler(newVal, oldVla) {
+    //     // 第一次变化 不需要 重置边界 待改进
+    //     if (this.changeIndex++ > 0) {
+    //       // this.resizeParentBounds()
+    //       this.$store.state.styleChangeTimes++
+    //     }
+    //     // this.changeScale()
+    //   },
+    //   deep: true
+    // },
     componentData: {
       handler(newVal, oldVla) {
         // console.log('11111')
diff --git a/frontend/src/components/canvas/components/FilterTextAttr.vue b/frontend/src/components/canvas/components/FilterTextAttr.vue
index 83874a5062..d74188b565 100644
--- a/frontend/src/components/canvas/components/FilterTextAttr.vue
+++ b/frontend/src/components/canvas/components/FilterTextAttr.vue
@@ -154,8 +154,7 @@ export default {
       }
     },
     styleChange() {
-      debugger
-      this.$store.state.styleChangeTimes++
+      this.$store.commit('recordStyleChange')
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/RectangleAttr.vue b/frontend/src/components/canvas/components/RectangleAttr.vue
index f109a05f1f..24dc65d033 100644
--- a/frontend/src/components/canvas/components/RectangleAttr.vue
+++ b/frontend/src/components/canvas/components/RectangleAttr.vue
@@ -206,7 +206,7 @@ export default {
       }
     },
     styleChange() {
-      this.$store.state.styleChangeTimes++
+      this.$store.commit('recordStyleChange')
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/TextAttr.vue b/frontend/src/components/canvas/components/TextAttr.vue
index 04281743e1..72260705ad 100644
--- a/frontend/src/components/canvas/components/TextAttr.vue
+++ b/frontend/src/components/canvas/components/TextAttr.vue
@@ -189,7 +189,7 @@ export default {
       }
     },
     styleChange() {
-      this.$store.state.styleChangeTimes++
+      this.$store.commit('recordStyleChange')
     }
   }
 }
diff --git a/frontend/src/components/canvas/components/Toolbar.vue b/frontend/src/components/canvas/components/Toolbar.vue
index 1e6e80cd51..e316e0a2f0 100644
--- a/frontend/src/components/canvas/components/Toolbar.vue
+++ b/frontend/src/components/canvas/components/Toolbar.vue
@@ -214,12 +214,12 @@ export default {
 
     compose() {
       this.$store.commit('compose')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','compose')
     },
 
     decompose() {
       this.$store.commit('decompose')
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','decompose')
     },
 
     undo() {
@@ -267,7 +267,7 @@ export default {
             }
           })
 
-          this.$store.commit('recordSnapshot')
+          this.$store.commit('recordSnapshot','handleFileChange')
         }
 
         img.src = fileResult
@@ -306,7 +306,7 @@ export default {
     clearCanvas() {
       this.$store.commit('setComponentData', [])
       this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','clearCanvas')
     },
 
     handlePreviewChange() {
diff --git a/frontend/src/components/canvas/custom-component/VText.vue b/frontend/src/components/canvas/custom-component/VText.vue
index 8106661306..e91c102318 100644
--- a/frontend/src/components/canvas/custom-component/VText.vue
+++ b/frontend/src/components/canvas/custom-component/VText.vue
@@ -67,6 +67,7 @@ export default {
   methods: {
     handleInput(e) {
       this.$emit('input', this.element, e.target.innerHTML)
+      this.$store.commit('recordStyleChange')
     },
 
     handleKeydown(e) {
diff --git a/frontend/src/components/canvas/index.vue b/frontend/src/components/canvas/index.vue
index 60d9e6d358..bbdf3fc9fb 100644
--- a/frontend/src/components/canvas/index.vue
+++ b/frontend/src/components/canvas/index.vue
@@ -96,7 +96,7 @@ export default {
       component.style.left = e.offsetX
       component.id = generateID()
       this.$store.commit('addComponent', { component })
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','handleDrop')
     },
 
     handleDragOver(e) {
diff --git a/frontend/src/components/canvas/store/snapshot.js b/frontend/src/components/canvas/store/snapshot.js
index 4fb86cf075..1e26aded05 100644
--- a/frontend/src/components/canvas/store/snapshot.js
+++ b/frontend/src/components/canvas/store/snapshot.js
@@ -52,6 +52,11 @@ export default {
     refreshSaveStatus(state) {
       state.changeTimes = 0
       state.lastSaveSnapshotIndex = deepCopy(state.snapshotIndex)
+    },
+    recordStyleChange(state) {
+      if (state.curComponent) {
+        state.styleChangeTimes++
+      }
     }
   }
 }
diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index fc6abdc5e4..4018dd5110 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -86,7 +86,7 @@ export default {
       }
     },
     styleChange() {
-      this.$store.state.styleChangeTimes++
+      this.$store.commit('recordStyleChange')
     }
   }
 }
diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
index c005736cbe..e46c0c01ac 100644
--- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue
+++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
@@ -142,7 +142,7 @@ export default {
         }
 
         this.setCondition()
-        this.styleChange()
+        this.$store.commit('recordStyleChange')
       })
     },
     setCondition() {
@@ -177,7 +177,7 @@ export default {
       }
     },
     styleChange() {
-      this.$store.state.styleChangeTimes++
+      this.$store.commit('recordStyleChange')
     }
   }
 }
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index db6978ca48..679a36074f 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -104,7 +104,7 @@ export default {
       this.inDraw && this.$store.commit('addViewFilter', param)
     },
     styleChange() {
-      this.$store.state.styleChangeTimes++
+      this.$store.commit('recordStyleChange')
     }
 
   }
diff --git a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
index ccf8d14349..bd665dd369 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectGrid.vue
@@ -211,7 +211,7 @@ export default {
     //   return data[this.defaultProp.label].indexOf(value) !== -1
     // },
     styleChange() {
-      this.$store.state.styleChangeTimes++
+      this.$store.commit('recordStyleChange')
     }
 
   }
diff --git a/frontend/src/views/panel/AssistComponent/index.vue b/frontend/src/views/panel/AssistComponent/index.vue
index 01866467c1..af3f5ffdac 100644
--- a/frontend/src/views/panel/AssistComponent/index.vue
+++ b/frontend/src/views/panel/AssistComponent/index.vue
@@ -115,7 +115,7 @@ export default {
             }
           })
 
-          this.$store.commit('recordSnapshot')
+          this.$store.commit('recordSnapshot','handleFileChange')
         }
 
         img.src = fileResult
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
index 0dd626b352..80d9182335 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/BackgroundSelector.vue
@@ -80,7 +80,7 @@ export default {
       const canvasStyleData = deepCopy(this.canvasStyleData)
       canvasStyleData.panel = this.panel
       this.$store.commit('setCanvasStyle', canvasStyleData)
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','commitStyle')
     },
     onChangeType() {
       this.commitStyle()
diff --git a/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentGap.vue b/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentGap.vue
index 34dddcece0..e547952fe4 100644
--- a/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentGap.vue
+++ b/frontend/src/views/panel/SubjectSetting/PanelStyle/ComponentGap.vue
@@ -44,7 +44,7 @@ export default {
       const canvasStyleData = deepCopy(this.canvasStyleData)
       canvasStyleData.panel = this.panel
       this.$store.commit('setCanvasStyle', canvasStyleData)
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','onChangePanelStyle')
     }
   }
 }
diff --git a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
index 3e8446c375..ba37438f4e 100644
--- a/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
+++ b/frontend/src/views/panel/SubjectSetting/PreSubject/SubjectTemplateItem.vue
@@ -189,7 +189,7 @@ export default {
     },
     subjectChange() {
       this.$store.commit('setCanvasStyle', JSON.parse(this.subjectItem.details))
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','subjectChange')
       bus.$emit('onSubjectChange')
     },
     templateEdit() {
diff --git a/frontend/src/views/panel/SubjectSetting/index.vue b/frontend/src/views/panel/SubjectSetting/index.vue
index 1596a089f1..ad863bbb70 100644
--- a/frontend/src/views/panel/SubjectSetting/index.vue
+++ b/frontend/src/views/panel/SubjectSetting/index.vue
@@ -135,7 +135,7 @@ export default {
       chart.customFilter = JSON.stringify(this.chart.customFilter)
       canvasStyleData.chart = chart
       this.$store.commit('setCanvasStyle', canvasStyleData)
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot','save')
     }
   }
 }
diff --git a/frontend/src/views/panel/edit/index.vue b/frontend/src/views/panel/edit/index.vue
index 5d621c2e0b..683ee0bef9 100644
--- a/frontend/src/views/panel/edit/index.vue
+++ b/frontend/src/views/panel/edit/index.vue
@@ -311,6 +311,7 @@ export default {
       this.init(newVal.id)
     },
     '$store.state.styleChangeTimes'() {
+      // console.log('styleChangeTimes' + this.$store.state.styleChangeTimes)
       if (this.$store.state.styleChangeTimes > 0) {
         this.destroyTimeMachine()
         this.recordStyleChange(this.$store.state.styleChangeTimes)
@@ -383,7 +384,7 @@ export default {
           //   this.$store.commit('setComponentData', this.resetID(JSON.parse(response.data.panelData)))
           const panelStyle = JSON.parse(response.data.panelStyle)
           this.$store.commit('setCanvasStyle', panelStyle)
-          this.$store.commit('recordSnapshot')// 记录快照
+          this.$store.commit('recordSnapshot', 'init')// 记录快照
           // 刷新联动信息
           getPanelAllLinkageInfo(panelId).then(rsp => {
             this.$store.commit('setNowPanelTrackInfo', rsp.data)
@@ -493,7 +494,7 @@ export default {
       component.style.left = this.getPositionX(e.layerX)
       component.id = newComponentId
       this.$store.commit('addComponent', { component })
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'handleDrop')
       this.clearCurrentInfo()
 
       // // 文字组件
@@ -545,7 +546,7 @@ export default {
 
       //   this.$store.commit('addComponent', { component })
       this.$store.commit('setComponentWithId', component)
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'sureFilter')
       this.cancelFilter()
     },
     reFreshComponent(component) {
@@ -625,7 +626,7 @@ export default {
             }
           })
 
-          this.$store.commit('recordSnapshot')
+          this.$store.commit('recordSnapshot', 'handleFileChange')
         }
 
         img.src = fileResult
@@ -677,7 +678,7 @@ export default {
       component.style.left = 600
       component.id = newComponentId
       this.$store.commit('addComponent', { component })
-      this.$store.commit('recordSnapshot')
+      this.$store.commit('recordSnapshot', 'newViewInfo')
       this.clearCurrentInfo()
       this.$store.commit('setCurComponent', { component: component, index: this.componentData.length - 1 })
 
@@ -703,7 +704,7 @@ export default {
     recordStyleChange(index) {
       this.timeMachine = setTimeout(() => {
         if (index === this.$store.state.styleChangeTimes) {
-          this.$store.commit('recordSnapshot')
+          this.$store.commit('recordSnapshot', 'recordStyleChange')
           this.$store.state.styleChangeTimes = 0
         }
         this.destroyTimeMachine()

From 7f862b1fc713fb7aa1d3378e61f096aeb1a48bee Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 1 Sep 2021 14:14:22 +0800
Subject: [PATCH 28/30] =?UTF-8?q?refactor:=E4=BB=AA=E8=A1=A8=E7=89=88?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E5=88=97=E8=A1=A8=E7=BB=84=E4=BB=B6=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E6=8E=92=E5=BA=8F=E6=96=B9=E5=BC=8F=E5=92=8C=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml
index 8e0a523da4..82b22623a3 100644
--- a/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml
+++ b/backend/src/main/java/io/dataease/base/mapper/ext/ExtPanelViewMapper.xml
@@ -17,7 +17,7 @@
         <where>
             FIND_IN_SET(chart_group.id,cids)
         </where>
-        order by create_time desc
+        order by `type` desc,name asc
 
     </select>
 
@@ -27,7 +27,7 @@
         <where>
             FIND_IN_SET(chart_view.id,cids)
         </where>
-        order by create_time desc
+        order by `type` desc,name asc
     </select>
 
 

From 93e40832fb2ed6b5f00aca242abb3fd07d4b6646 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 1 Sep 2021 15:14:50 +0800
Subject: [PATCH 29/30] =?UTF-8?q?fix:=E5=85=A8=E5=B1=8F=E6=A8=A1=E5=BC=8F?=
 =?UTF-8?q?=E4=B8=8B=E8=BE=93=E5=85=A5=E6=A1=86=E8=BE=93=E5=85=A5=E5=86=85?=
 =?UTF-8?q?=E5=AE=B9=E8=87=AA=E5=8A=A8=E9=80=80=E5=87=BA=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/package.json b/frontend/package.json
index d33d755db0..927ead41c3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -41,7 +41,7 @@
     "vue-axios": "3.2.4",
     "vue-clipboard2": "0.3.1",
     "vue-codemirror": "^4.0.6",
-    "vue-fullscreen": "^2.5.1",
+    "vue-fullscreen": "^2.5.2",
     "vue-i18n": "7.3.2",
     "vue-router": "3.0.6",
     "vue-uuid": "2.0.2",

From 06145622db91ac4ce9ab825236378dcd087dd305 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 1 Sep 2021 16:00:02 +0800
Subject: [PATCH 30/30] =?UTF-8?q?refactor:=E5=A2=9E=E5=8A=A0=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E5=91=98=E8=8F=9C=E5=8D=95=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/db/migration/V25__add_auth.sql  | 69 +++++++++++++++++++
 1 file changed, 69 insertions(+)

diff --git a/backend/src/main/resources/db/migration/V25__add_auth.sql b/backend/src/main/resources/db/migration/V25__add_auth.sql
index 9fa1d70f01..811a40b967 100644
--- a/backend/src/main/resources/db/migration/V25__add_auth.sql
+++ b/backend/src/main/resources/db/migration/V25__add_auth.sql
@@ -383,3 +383,72 @@ INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_typ
 INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('dc1d32ff-064a-11ec-a2b0-0242ac130003', 'd78c6e77-9cc7-44f8-a730-32ca6ca33f60', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1629967913000, NULL);
 INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('dc1d3358-064a-11ec-a2b0-0242ac130003', 'd78c6e77-9cc7-44f8-a730-32ca6ca33f60', 'i18n_auth_manage', 5, 0, 'manage', '基础权限-管理', 'admin', 1629967913000, NULL);
 INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('dc1d33a4-064a-11ec-a2b0-0242ac130003', 'd78c6e77-9cc7-44f8-a730-32ca6ca33f60', 'i18n_auth_view', 1, 1, 'view', '基础权限-查看', 'admin', 1629967913000, NULL);
+
+
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('00590a7c-8e7b-45f4-8428-55532be07602', '10', 'menu', '1', 'role', 1630482462199, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('06ba0edb-143d-4b51-a864-8cfcf2b5d71e', '1', 'menu', '1', 'role', 1630482426344, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('1a18aa12-8daa-4f47-b5eb-999e473273df', '6', 'menu', '1', 'role', 1630482450994, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('1bf39d8d-7fe9-4832-8df3-f74b21a69288', '4', 'menu', '1', 'role', 1630482450458, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('359771bb-95b8-40ad-a6c5-b5c39c93cb10', '24', 'menu', '1', 'role', 1630482459156, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('5960fd93-013c-4636-8f6b-2e6b49b7e869', '5', 'menu', '1', 'role', 1630482450626, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('5e0a9ad5-81ed-4f83-91f6-a74be724bda7', '23', 'menu', '1', 'role', 1630482452131, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('5ec5c9a7-04c0-4655-9b63-9ca5a439e2f3', '18', 'menu', '1', 'role', 1630482451166, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('60b3644b-2493-4805-8204-90880cfac9c6', '8', 'menu', '1', 'role', 1630482460538, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('74ff225f-2a79-4221-9b32-c6eb9bcadd61', '19', 'menu', '1', 'role', 1630482451329, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('7823499e-dbb6-42a9-a28f-22377de18a39', '40', 'menu', '1', 'role', 1630482427369, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('88c778e6-ede3-4397-af4c-375e1feac8ef', '41', 'menu', '1', 'role', 1630482452340, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('998e402b-6f15-48dc-ae4d-2cd04460a3f3', '15', 'menu', '1', 'role', 1630482426695, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('9f01c7ef-753b-4dea-97d4-c199f84c2c74', '17', 'menu', '1', 'role', 1630482427049, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('a6837d68-80a6-4a26-a7c0-e84001dfc817', '34', 'menu', '1', 'role', 1630482458991, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('b319dc39-c499-423b-8e99-22e9a0caba6f', '58', 'menu', '1', 'role', 1630482427545, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('bdd3bed8-35d4-4aa8-84c2-85e2412d6cbb', '2', 'menu', '1', 'role', 1630482426513, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('c18b47e9-aa22-4f17-b12c-a3459ca4dd90', '28', 'menu', '1', 'role', 1630482427208, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('d3d558e5-b0b1-4475-bb69-f20fa5c47f4f', '22', 'menu', '1', 'role', 1630482451962, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('d400c00f-9c18-4eb6-a70f-9c8caf8dddfe', '21', 'menu', '1', 'role', 1630482451749, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('d8d18115-c7b9-4e99-96a8-fd1bbfddf543', '16', 'menu', '1', 'role', 1630482426857, NULL, 'admin', NULL);
+INSERT INTO `sys_auth` (`id`, `auth_source`, `auth_source_type`, `auth_target`, `auth_target_type`, `auth_time`, `auth_details`, `auth_user`, `update_time`) VALUES ('f17dc7f3-c97a-41b4-a2f4-1a04a857ae8a', '20', 'menu', '1', 'role', 1630482451497, NULL, 'admin', NULL);
+
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cf3c570c-0af8-11ec-a2b0-0242ac130003', '06ba0edb-143d-4b51-a864-8cfcf2b5d71e', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482428000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cf3c59d1-0af8-11ec-a2b0-0242ac130003', '06ba0edb-143d-4b51-a864-8cfcf2b5d71e', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482428000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cf573296-0af8-11ec-a2b0-0242ac130003', 'bdd3bed8-35d4-4aa8-84c2-85e2412d6cbb', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482428000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cf57354a-0af8-11ec-a2b0-0242ac130003', 'bdd3bed8-35d4-4aa8-84c2-85e2412d6cbb', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482428000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cf705f77-0af8-11ec-a2b0-0242ac130003', '998e402b-6f15-48dc-ae4d-2cd04460a3f3', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cf7061d1-0af8-11ec-a2b0-0242ac130003', '998e402b-6f15-48dc-ae4d-2cd04460a3f3', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cf8b490d-0af8-11ec-a2b0-0242ac130003', 'd8d18115-c7b9-4e99-96a8-fd1bbfddf543', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cf8b4b35-0af8-11ec-a2b0-0242ac130003', 'd8d18115-c7b9-4e99-96a8-fd1bbfddf543', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cfa66a8d-0af8-11ec-a2b0-0242ac130003', '9f01c7ef-753b-4dea-97d4-c199f84c2c74', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cfa66ca4-0af8-11ec-a2b0-0242ac130003', '9f01c7ef-753b-4dea-97d4-c199f84c2c74', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cfbf0608-0af8-11ec-a2b0-0242ac130003', 'c18b47e9-aa22-4f17-b12c-a3459ca4dd90', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cfbf0839-0af8-11ec-a2b0-0242ac130003', 'c18b47e9-aa22-4f17-b12c-a3459ca4dd90', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cfd814bc-0af8-11ec-a2b0-0242ac130003', '7823499e-dbb6-42a9-a28f-22377de18a39', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cfd816d7-0af8-11ec-a2b0-0242ac130003', '7823499e-dbb6-42a9-a28f-22377de18a39', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cff28219-0af8-11ec-a2b0-0242ac130003', 'b319dc39-c499-423b-8e99-22e9a0caba6f', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('cff28507-0af8-11ec-a2b0-0242ac130003', 'b319dc39-c499-423b-8e99-22e9a0caba6f', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482429000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('dd9ba5c6-0af8-11ec-a2b0-0242ac130003', '1bf39d8d-7fe9-4832-8df3-f74b21a69288', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482452000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('dd9ba7e8-0af8-11ec-a2b0-0242ac130003', '1bf39d8d-7fe9-4832-8df3-f74b21a69288', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482452000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('ddb3094b-0af8-11ec-a2b0-0242ac130003', '5960fd93-013c-4636-8f6b-2e6b49b7e869', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482452000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('ddb30bd2-0af8-11ec-a2b0-0242ac130003', '5960fd93-013c-4636-8f6b-2e6b49b7e869', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482452000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('ddec6eab-0af8-11ec-a2b0-0242ac130003', '1a18aa12-8daa-4f47-b5eb-999e473273df', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482453000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('ddeccfa8-0af8-11ec-a2b0-0242ac130003', '1a18aa12-8daa-4f47-b5eb-999e473273df', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482453000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de0719cb-0af8-11ec-a2b0-0242ac130003', '5ec5c9a7-04c0-4655-9b63-9ca5a439e2f3', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482453000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de071bd9-0af8-11ec-a2b0-0242ac130003', '5ec5c9a7-04c0-4655-9b63-9ca5a439e2f3', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482453000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de202758-0af8-11ec-a2b0-0242ac130003', '74ff225f-2a79-4221-9b32-c6eb9bcadd61', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482453000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de202961-0af8-11ec-a2b0-0242ac130003', '74ff225f-2a79-4221-9b32-c6eb9bcadd61', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482453000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de42f5ec-0af8-11ec-a2b0-0242ac130003', 'f17dc7f3-c97a-41b4-a2f4-1a04a857ae8a', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482453000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de42f8b4-0af8-11ec-a2b0-0242ac130003', 'f17dc7f3-c97a-41b4-a2f4-1a04a857ae8a', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482453000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de65f6d9-0af8-11ec-a2b0-0242ac130003', 'd400c00f-9c18-4eb6-a70f-9c8caf8dddfe', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482454000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de65fa72-0af8-11ec-a2b0-0242ac130003', 'd400c00f-9c18-4eb6-a70f-9c8caf8dddfe', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482454000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de80ddc9-0af8-11ec-a2b0-0242ac130003', 'd3d558e5-b0b1-4475-bb69-f20fa5c47f4f', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482454000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de80e001-0af8-11ec-a2b0-0242ac130003', 'd3d558e5-b0b1-4475-bb69-f20fa5c47f4f', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482454000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de9f30cd-0af8-11ec-a2b0-0242ac130003', '5e0a9ad5-81ed-4f83-91f6-a74be724bda7', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482454000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('de9f32d3-0af8-11ec-a2b0-0242ac130003', '5e0a9ad5-81ed-4f83-91f6-a74be724bda7', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482454000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('dec15e1b-0af8-11ec-a2b0-0242ac130003', '88c778e6-ede3-4397-af4c-375e1feac8ef', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482454000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('dec16031-0af8-11ec-a2b0-0242ac130003', '88c778e6-ede3-4397-af4c-375e1feac8ef', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482454000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('e2b029b9-0af8-11ec-a2b0-0242ac130003', 'a6837d68-80a6-4a26-a7c0-e84001dfc817', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482461000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('e2b02bcb-0af8-11ec-a2b0-0242ac130003', 'a6837d68-80a6-4a26-a7c0-e84001dfc817', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482461000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('e2c9aba7-0af8-11ec-a2b0-0242ac130003', '359771bb-95b8-40ad-a6c5-b5c39c93cb10', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482461000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('e2c9adc8-0af8-11ec-a2b0-0242ac130003', '359771bb-95b8-40ad-a6c5-b5c39c93cb10', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482461000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('e39cb3fe-0af8-11ec-a2b0-0242ac130003', '60b3644b-2493-4805-8204-90880cfac9c6', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482462000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('e39cb619-0af8-11ec-a2b0-0242ac130003', '60b3644b-2493-4805-8204-90880cfac9c6', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482462000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('e49bef48-0af8-11ec-a2b0-0242ac130003', '00590a7c-8e7b-45f4-8428-55532be07602', 'i18n_auth_grant', 15, 0, 'grant', '基础权限-授权', 'admin', 1630482464000, NULL);
+INSERT INTO `sys_auth_detail` (`id`, `auth_id`, `privilege_name`, `privilege_type`, `privilege_value`, `privilege_extend`, `remark`, `create_user`, `create_time`, `update_time`) VALUES ('e49bf17e-0af8-11ec-a2b0-0242ac130003', '00590a7c-8e7b-45f4-8428-55532be07602', 'i18n_auth_use', 1, 1, 'use', '基础权限-使用', 'admin', 1630482464000, NULL);