From d4371270d6542def6da22306136554e564a143b1 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 28 Jul 2022 17:19:13 +0800
Subject: [PATCH 01/18] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E5=A4=84=E7=90=86sql=E5=8F=98=E9=87=8F=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  | 24 +++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

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 b99f672017..134ac278c7 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -57,6 +57,7 @@ import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.select.PlainSelect;
 import net.sf.jsqlparser.statement.select.Select;
 import net.sf.jsqlparser.statement.select.SubSelect;
+import net.sf.jsqlparser.statement.select.WithItem;
 import net.sf.jsqlparser.util.deparser.ExpressionDeParser;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.ObjectUtils;
@@ -1027,7 +1028,22 @@ public class DataSetTableService {
             expr.accept(getExpressionDeParser(stringBuilder));
         }
         plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
-        return plainSelect.toString();
+
+
+        StringBuilder builder = new StringBuilder();
+        if (CollectionUtils.isNotEmpty(select.getWithItemsList())) {
+            builder.append("WITH");
+            builder.append(" ");
+        }
+        for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) {
+            WithItem withItem = iter.next();
+            builder.append(withItem.toString());
+            if (iter.hasNext()) {
+                builder.append(",");
+            }
+        }
+        builder.append(plainSelect);
+        return builder.toString();
     }
 
     public Map<String, Object> getSQLPreview(DataSetTableRequest dataSetTableRequest) throws Exception {
@@ -2569,8 +2585,12 @@ public class DataSetTableService {
 
             @Override
             public void visit(ExpressionList expressionList) {
-                for (Expression expression : expressionList.getExpressions()) {
+                for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {
+                    Expression expression = iter.next();
                     expression.accept(this);
+                    if (iter.hasNext()) {
+                        buffer.append(", ");
+                    }
                 }
             }
 

From 5ce82e474a19a31046dfb655e5eb89f46a9a6646 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 28 Jul 2022 17:24:18 +0800
Subject: [PATCH 02/18] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E8=AE=B0?=
 =?UTF-8?q?=E5=BD=95=E6=95=B0=E5=AD=97=E6=AE=B5=E4=B8=8D=E5=BA=94=E6=9C=89?=
 =?UTF-8?q?=E5=8E=BB=E9=87=8D=E8=AE=A1=E6=95=B0=E8=81=9A=E5=90=88=E6=96=B9?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/components/drag-item/QuotaExtItem.vue | 2 +-
 frontend/src/views/chart/components/drag-item/QuotaItem.vue    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
index 28911cc2d3..2e5f75b78b 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaExtItem.vue
@@ -57,7 +57,7 @@
                 <el-dropdown-item v-if="item.id !== 'count' && item.deType !== 0 && item.deType !== 1 && item.deType !== 5" :command="beforeSummary('stddev_pop')">{{ $t('chart.stddev_pop') }}</el-dropdown-item>
                 <el-dropdown-item v-if="item.id !== 'count' && item.deType !== 0 && item.deType !== 1 && item.deType !== 5" :command="beforeSummary('var_pop')">{{ $t('chart.var_pop') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeSummary('count')">{{ $t('chart.count') }}</el-dropdown-item>
-                <el-dropdown-item :command="beforeSummary('count_distinct')">{{ $t('chart.count_distinct') }}</el-dropdown-item>
+                <el-dropdown-item v-if="item.id !== 'count'" :command="beforeSummary('count_distinct')">{{ $t('chart.count_distinct') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>
diff --git a/frontend/src/views/chart/components/drag-item/QuotaItem.vue b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
index 78c78dad68..a728c41dd1 100644
--- a/frontend/src/views/chart/components/drag-item/QuotaItem.vue
+++ b/frontend/src/views/chart/components/drag-item/QuotaItem.vue
@@ -57,7 +57,7 @@
                 <el-dropdown-item v-if="item.id !== 'count' && item.deType !== 0 && item.deType !== 1 && item.deType !== 5" :command="beforeSummary('stddev_pop')">{{ $t('chart.stddev_pop') }}</el-dropdown-item>
                 <el-dropdown-item v-if="item.id !== 'count' && item.deType !== 0 && item.deType !== 1 && item.deType !== 5" :command="beforeSummary('var_pop')">{{ $t('chart.var_pop') }}</el-dropdown-item>
                 <el-dropdown-item :command="beforeSummary('count')">{{ $t('chart.count') }}</el-dropdown-item>
-                <el-dropdown-item :command="beforeSummary('count_distinct')">{{ $t('chart.count_distinct') }}</el-dropdown-item>
+                <el-dropdown-item v-if="item.id !== 'count'" :command="beforeSummary('count_distinct')">{{ $t('chart.count_distinct') }}</el-dropdown-item>
               </el-dropdown-menu>
             </el-dropdown>
           </el-dropdown-item>

From 085c162e4a1b0006a9acd77056fe117296d11d78 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 28 Jul 2022 17:26:30 +0800
Subject: [PATCH 03/18] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E6=BA=90):=20ck=20?=
 =?UTF-8?q?=E5=AD=97=E6=AE=B5=E8=AF=86=E5=88=AB=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/provider/query/ck/CKQueryProvider.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
index 87a6701f01..5f2df87142 100644
--- a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
@@ -78,7 +78,7 @@ public class CKQueryProvider extends QueryProvider {
             case "UINT64":
                 return 2;// 整型
             case "FLOAT32":
-            case "Float64":
+            case "FLOAT64":
             case "DECIMAL":
                 return 3;// 浮点
             case "BIT":

From 9104c1e0bdce00b11a6386ac924067c860c2fc7a Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 28 Jul 2022 17:37:09 +0800
Subject: [PATCH 04/18] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=E8=AE=BE=E7=BD=AE=E5=A2=9E=E5=8A=A0=E7=BB=B4?=
 =?UTF-8?q?=E5=BA=A6=E6=8E=92=E5=BA=8F=EF=BC=8C=E6=8C=89=E9=92=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/ext/ExtPanelLinkJumpMapper.xml   |  3 +--
 .../canvas/custom-component/UserView.vue         | 16 +++++++++-------
 frontend/src/views/panel/LinkJumpSet/index.vue   |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml b/backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml
index f19db4f75d..47c0df8a6a 100644
--- a/backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml
+++ b/backend/src/main/java/io/dataease/ext/ExtPanelLinkJumpMapper.xml
@@ -51,8 +51,7 @@
             LEFT JOIN panel_link_mapping on panel_link_jump_info.target_panel_id = panel_link_mapping.resource_id
         WHERE
             chart_view.id =#{source_view_id}
-        ORDER BY
-            ifnull( panel_link_jump_info.checked, 0 ) DESC
+        ORDER BY CONVERT(dataset_table_field.NAME using gbk)
     </select>
 
     <select id="queryWithPanelId" resultMap="BaseResultMapDTO">
diff --git a/frontend/src/components/canvas/custom-component/UserView.vue b/frontend/src/components/canvas/custom-component/UserView.vue
index ef5975f605..b14ec0ca81 100644
--- a/frontend/src/components/canvas/custom-component/UserView.vue
+++ b/frontend/src/components/canvas/custom-component/UserView.vue
@@ -289,13 +289,13 @@ export default {
       const trackMenuInfo = []
       let linkageCount = 0
       let jumpCount = 0
-      this.chart.data && this.chart.data.sourceFields && this.chart.data.sourceFields.forEach(item => {
+      this.chart.data && this.chart.data.fields && this.chart.data.fields.forEach(item => {
         const sourceInfo = this.chart.id + '#' + item.id
         if (this.nowPanelTrackInfo[sourceInfo]) {
           linkageCount++
         }
       })
-      this.chart.data && this.chart.data.sourceFields && this.chart.data.sourceFields.forEach(item => {
+      this.chart.data && this.chart.data.fields && this.chart.data.fields.forEach(item => {
         const sourceInfo = this.chart.id + '#' + item.id
         if (this.nowPanelJumpInfo[sourceInfo]) {
           jumpCount++
@@ -685,11 +685,13 @@ export default {
           window.open(url, jumpInfo.jumpType)
         }
       } else {
-        this.$message({
-          type: 'warn',
-          message: '未获取跳转信息',
-          showClose: true
-        })
+        if (this.chart.type.indexOf('table') === -1) {
+          this.$message({
+            type: 'warn',
+            message: '未获取跳转信息',
+            showClose: true
+          })
+        }
       }
     },
     setIdValueTrans(from, to, content, colList) {
diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index e64f89b917..270fd24073 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -580,7 +580,7 @@ export default {
 }
 
 .bottom {
-  margin-top: 20px;
+  margin-top: 10px;
   text-align: center;
 
 }

From 8d24cc3ba16664808e0d3535e2d98a0d737a65a9 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 28 Jul 2022 17:47:59 +0800
Subject: [PATCH 05/18] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=AD=9B=E9=80=89bug=E4=BF=AE=E5=A4=8D=20=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=85=A8=E9=80=89?=
 =?UTF-8?q?=20=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ElTreeSelect/index.vue     | 31 ++++++-
 .../src/components/ElVisualSelect/index.vue   | 32 ++++++-
 .../components/widget/DeWidget/DeSelect.vue   | 20 +++--
 .../widget/DeWidget/DeSelectTree.vue          |  5 ++
 frontend/src/directive/index.js               | 14 +++
 frontend/src/lang/en.js                       |  4 +
 frontend/src/lang/tw.js                       |  4 +
 frontend/src/lang/zh.js                       |  4 +
 frontend/src/styles/index.scss                | 88 +++++++++++++++++++
 .../system/datasource/DsConfiguration.vue     |  2 +-
 frontend/src/views/system/user/filterUser.vue | 10 ++-
 frontend/src/views/system/user/index.vue      | 56 ++----------
 12 files changed, 211 insertions(+), 59 deletions(-)

diff --git a/frontend/src/components/ElTreeSelect/index.vue b/frontend/src/components/ElTreeSelect/index.vue
index af475cab2a..cbb1b28644 100644
--- a/frontend/src/components/ElTreeSelect/index.vue
+++ b/frontend/src/components/ElTreeSelect/index.vue
@@ -33,6 +33,7 @@
       <el-input v-if="treeParams.filterable" v-model="keywords" size="mini" class="input-with-select mb10">
         <el-button slot="append" icon="el-icon-search" @click="_searchFun" />
       </el-input>
+      <p v-if="selectParams.multiple" class="tree-select-all"><el-checkbox :indeterminate="isIndeterminate" v-customStyle="customStyle" @change="selectAllChane" v-model="selectAll">{{ $t('dataset.check_all') }}</el-checkbox></p>
       <el-scrollbar tag="div" wrap-class="el-select-dropdown__wrap" view-class="el-select-dropdown__list" class="is-empty">
         <!-- 树列表 -->
         <el-tree
@@ -203,10 +204,15 @@ export default {
           }
         }
       }
+    },
+    customStyle: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
     return {
+      selectAll: false,
       guid: guid(),
       propsValue: 'flowId',
       propsLabel: 'name',
@@ -229,6 +235,10 @@ export default {
     popperClass() {
       const _c = 'el-tree-select-popper ' + this.popoverClass
       return this.disabled ? _c + ' disabled ' : _c
+    },
+    isIndeterminate() {
+      if (!this.selectParams.multiple) return;
+      return this.ids.length > 0 && this.ids.length !== this._checkSum().length
     }
   },
   watch: {
@@ -283,6 +293,21 @@ export default {
     off(document, 'mouseup', this._popoverHideFun)
   },
   methods: {
+    selectAllChane(val) {
+      if (val) {
+        this.ids = this._checkSum();
+        this._emitFun();
+        return
+      } 
+      this._selectClearFun()
+    },
+    _checkSum() {
+        let arr = [];
+        (this.data || []).forEach(ele => {
+          arr = [...this.allKidIds(ele), ...arr]
+        })
+        return arr
+    },
     _treeCheckChange() {
       this.$emit("treeCheckChange")
     },
@@ -494,6 +519,7 @@ export default {
         `vm:` 当前组件的vm
         */
       node.checkedKeys = checkedNodes.map(node => node.id)
+      this.selectAll = this._checkSum().length === this.ids.length;
       this.$emit('check', data, node, vm)
       this._emitFun()
     },
@@ -549,6 +575,7 @@ export default {
       this.$emit('input', multiple ? [] : '')
       // 下拉框清空，对外抛出``this.$emit('select-clear');`
       this.$emit('select-clear')
+      this.selectAll = false;
       this._updatePopoverLocationFun()
     },
     // 判断类型，抛出当前选中id
@@ -625,7 +652,9 @@ export default {
 .el-tree-select .select-option {
     display: none !important;
 }
-
+.tree-select-all {
+    padding: 10px 20px 0 24px;
+  }
 [aria-disabled='true'] > .el-tree-node__content {
     color: inherit !important;
     background: transparent !important;
diff --git a/frontend/src/components/ElVisualSelect/index.vue b/frontend/src/components/ElVisualSelect/index.vue
index 96596484aa..eeda732b70 100644
--- a/frontend/src/components/ElVisualSelect/index.vue
+++ b/frontend/src/components/ElVisualSelect/index.vue
@@ -6,12 +6,14 @@
     :class="classId"
     popper-class="VisualSelects coustom-de-select"
     no-match-text=" "
+    clearable
     v-bind="$attrs"
     v-on="$listeners"
     @change="visualChange"
     @visible-change="popChange"
   >
-    <el-option v-for="item in options" :key="item.id" :label="item.text" :value="item.id" />
+    <p v-if="startIndex === 0 && $attrs.multiple" class="select-all"><el-checkbox :indeterminate="isIndeterminate" v-customStyle="customStyle" @change="selectAllChane" v-model="selectAll">{{ $t('dataset.check_all') }}</el-checkbox></p>
+    <el-option v-for="item in options" :key="item.id" :label="item.text" :value="item.id"  :class="setSelect(item.id)"/>
   </el-select>
 </template>
 
@@ -31,6 +33,10 @@ export default {
       require: true,
       default: uuid.v1()
     },
+    customStyle: {
+      type: Object,
+      default: () => {}
+    },
     list: {
       type: Array,
       default: () => {
@@ -60,7 +66,13 @@ export default {
       itemHeight: 34, // select组件选项高度
       maxHeightDom: null,
       defaultFirst: false,
-      show: true
+      show: true,
+      selectAll: false
+    }
+  },
+  computed: {
+    isIndeterminate() {
+      return Array.isArray(this.selectValue) && this.selectValue.length > 0 && this.selectValue.length !== this.list.length
     }
   },
   watch: {
@@ -102,6 +114,16 @@ export default {
     })
   },
   methods: {
+    setSelect(id) {
+      if (Array.isArray(this.selectValue)) {
+        return  this.selectValue.map( ele => ele.id ).includes(id) && 'selected'
+      }
+      return this.selectValue === id && 'selected';
+    },
+    selectAllChane(val) {
+      this.visualChange(val ? [...this.list.map( ele => ele.id )] : [])
+      this.$emit('handleShowNumber');
+    },
     addScrollDiv(selectDom) {
       this.maxHeightDom = document.createElement('div')
       this.maxHeightDom.className = 'el-select-height'
@@ -171,6 +193,9 @@ export default {
       this.reCacularHeight()
     },
     visualChange(val) {
+      if(this.$attrs.multiple) {
+        this.selectAll = val.length === this.list.length;
+      }
       this.$emit('visual-change', val)
     }
   }
@@ -206,4 +231,7 @@ export default {
     height: 0;
   }
 }
+.select-all {
+    padding: 10px 20px 0 20px;
+  }
 </style>
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index 969c2b556e..ce3aac9589 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -16,10 +16,12 @@
     :key-word="keyWord"
     popper-class="coustom-de-select"
     :list="datas"
+    :customStyle="customStyle"
     @change="changeValue"
     @focus="setOptionWidth"
     @blur="onBlur"
     @visual-change="visualChange"
+    @handleShowNumber="handleShowNumber"
   >
     <el-option
       v-for="item in templateDatas || datas"
@@ -104,6 +106,10 @@ export default {
     },
     panelInfo() {
       return this.$store.state.panel.panelInfo
+    },
+    customStyle() {
+      const { brColor, wordColor, innerBgColor } = this.element.style;
+      return { brColor, wordColor, innerBgColor }
     }
   },
 
@@ -211,7 +217,7 @@ export default {
     },
     onScroll() {
       if (this.onFocus) {
-        this.$refs.deSelect.blur()
+        this.$refs.deSelect.$refs.visualSelect.blur()
       }
     },
     resetDefaultValue(id) {
@@ -251,7 +257,7 @@ export default {
       }
     },
     visualChange(value) {
-      this.value = value
+      this.value = value;
       this.$nextTick(() => {
         if (!this.element.options.attrs.multiple) {
           return
@@ -271,18 +277,22 @@ export default {
         this.element.options.manualModify = true
       }
       this.setCondition()
+      this.handleShowNumber()
+    },
+    handleShowNumber() {
       this.showNumber = false
+      const tags = this.$refs.deSelect.$refs.visualSelect.$refs.tags
 
       this.$nextTick(() => {
-        if (!this.element.options.attrs.multiple || !this.$refs.deSelect || !this.$refs.deSelect.$refs.tags) {
+        if (!this.element.options.attrs.multiple || !this.$refs.deSelect || !tags) {
           return
         }
-        const kids = this.$refs.deSelect.$refs.tags.children[0].children
+        const kids = tags.children[0].children
         let contentWidth = 0
         kids.forEach(kid => {
           contentWidth += kid.offsetWidth
         })
-        this.showNumber = contentWidth > ((this.$refs.deSelect.$refs.tags.clientWidth - 30) * 0.9)
+        this.showNumber = contentWidth > ((tags.clientWidth - 30) * 0.9)
         this.handleElTagStyle()
       })
     },
diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
index 3df7e2a9ad..8773586e06 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
@@ -10,6 +10,7 @@
     :tree-params="treeParams"
     :filter-node-method="_filterFun"
     :tree-render-fun="_renderFun"
+    :customStyle="customStyle"
     @searchFun="_searchFun"
     @node-click="changeNode"
     @removeTag="changeNodeIds"
@@ -106,6 +107,10 @@ export default {
     },
     isSingle() {
       return this.element.options.attrs.multiple
+    },
+    customStyle() {
+      const { brColor, wordColor, innerBgColor } = this.element.style;
+      return { brColor, wordColor, innerBgColor }
     }
   },
 
diff --git a/frontend/src/directive/index.js b/frontend/src/directive/index.js
index edb3f4f522..e44e82bfae 100644
--- a/frontend/src/directive/index.js
+++ b/frontend/src/directive/index.js
@@ -86,6 +86,19 @@ const btnPress =  {
   },
 }
 
+const customStyle = {
+  inserted: function (el, binding) {
+    const label = el.querySelector('.el-checkbox__label');
+    if (label) {
+      if (label.getAttribute("data-color") === binding.value.wordColor) {
+        return
+      };
+      label.style.setProperty('color', binding.value.wordColor, 'important');
+      label.setAttribute("data-color", binding.value.wordColor);
+    }
+  },
+}
+
 
 export default {
   install(Vue) {
@@ -96,6 +109,7 @@ export default {
     Vue.directive('bottom-to-top-drag', bottom2TopDrag)
     Vue.directive('closePress', closePress)
     Vue.directive('btnPress', btnPress)
+    Vue.directive('customStyle', customStyle)
   }
 }
 
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index 9542bd31bf..e5299323e2 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -562,6 +562,10 @@ export default {
     clear_filter: 'Empty condition',
     recover_pwd: 'Restore to the original password?',
     filter_method: 'Filter criteria',
+    filter: 'screen',
+    list: 'List item',
+    list_info: 'Please select the information to be displayed in the list',
+    sure_delete: 'Are you sure to delete this user?',
   },
   ldap: {
     url: 'LDAP url',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 64e2f8a689..01d7cd00c0 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -563,6 +563,10 @@ export default {
     clear_filter: '清空條件',
     recover_pwd: '是否恢復為初始密碼?',
     filter_method: '篩選條件',
+    filter: '篩選',
+    list: '列表項',
+    list_info: '請選擇列表中要展示的信息',
+    sure_delete: '確定刪除該用戶嗎？',
   },
   ldap: {
     url: 'LDAP地址',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index 0b9fe75c47..7a0481801f 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -564,6 +564,10 @@ export default {
     clear_filter: '清空条件',
     recover_pwd: '是否恢复为初始密码?',
     filter_method: '筛选条件',
+    filter: '筛选',
+    list: '列表项',
+    list_info: '请选择列表中要展示的信息',
+    sure_delete: '确定删除该用户吗？',
   },
   ldap: {
     url: 'LDAP地址',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 81324cd956..8dc0a4483b 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -888,3 +888,91 @@ div:focus {
   }
 }
 
+.el-tabs {
+  .el-tabs__item.is-active {
+    box-shadow: none !important;
+  }
+}
+
+.de-message {
+  min-width: 20px !important;
+  padding: 16px 20px !important;
+  flex-direction: row;
+  box-shadow: 0px 4px 8px 0px #1f23291a;
+  span {
+    font-family: PingFang SC;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 22px;
+    letter-spacing: 0px;
+    text-align: left;
+    color: #1f2329;
+  }
+
+  i {
+    height: 14.666666984558105px;
+    width: 14.666669845581055px;
+    margin-right: 8.67px;
+  }
+}
+.de-message-fail {
+  border: 1px solid #f54a45 !important;
+  background: #fef1f1 !important;
+  i {
+    color: #f54a45;
+  }
+}
+
+.de-message-success {
+  border: 1px solid #34c724 !important;
+  background: #f0fbef !important;
+  i {
+    color: #34c724;
+  }
+}
+
+.pagination-cont {
+  text-align: right;
+  margin-top: 10px;
+  ::v-deep .el-pager li {
+    background-color: #fff;
+    border: 1px solid #bbbfc4;
+    border-radius: 4px;
+    color: #1f2329;
+    box-sizing: border-box;
+    line-height: 26px;
+    font-family: SF Pro Text;
+    font-size: 14px;
+    font-weight: 400;
+  }
+
+  ::v-deep .btn-prev,
+  ::v-deep .btn-next {
+    background: #fff;
+    background-color: #fff;
+    border: 1px solid #bbbfc4;
+    border-radius: 4px;
+    color: #bbbfc4;
+  }
+
+  ::v-deep .el-pagination__total {
+    font-family: "PingFang SC";
+    font-style: normal;
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 22px;
+    color: #1f2329;
+    line-height: 28px;
+  }
+
+  ::v-deep .number.active,
+  ::v-deep .el-input__inner:hover {
+    border-color: #3370ff;
+    color: #3370ff !important;
+    background-color: #fff !important;
+  }
+
+  ::v-deep .el-icon-more {
+    border: none !important;
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index 12908135da..acb4bc7d4e 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -1039,7 +1039,7 @@ export default {
 
           for (var j = 0; j < this.apiItem.fields.length; j++) {
             if(this.apiItem.fields[j].name === jsonFields[i].name){
-              this.$refs.apiItemTable.toggleRowSelection(jsonFields[i]);
+              jsonFields[i].checked = false;
               this.$message.error(jsonFields[i].name + ', ' + i18n.t('datasource.has_repeat_field_name'))
               return
             }
diff --git a/frontend/src/views/system/user/filterUser.vue b/frontend/src/views/system/user/filterUser.vue
index 58b78d054e..16a89a77d6 100644
--- a/frontend/src/views/system/user/filterUser.vue
+++ b/frontend/src/views/system/user/filterUser.vue
@@ -354,17 +354,19 @@ export default {
 
   .filter {
     display: flex;
-    align-items: center;
-    height: 46px;
+    min-height: 46px;
     > :nth-child(1) {
-      margin-right: 88px;
       color: #1f2329;
       font-family: "PingFang SC";
       font-style: normal;
       font-weight: 400;
       font-size: 14px;
+      line-height: 24px;
+      white-space: nowrap;
+      width: 116px;
     }
     .filter-item {
+      flex: 1;
       .item,
       .more {
         font-family: PingFang SC;
@@ -378,6 +380,8 @@ export default {
         background: #f5f6f7;
         border-radius: 2px;
         cursor: pointer;
+        display: inline-block;
+        margin-bottom: 12px;
       }
 
       .active,
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 852426a6d7..1f2d6df965 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -30,21 +30,21 @@
           :class="[filterTexts.length ? 'active-btn filter-not-null' : 'filter-zero']"
           icon="iconfont icon-icon-filter"
           @click="filterShow"
-          >筛选<template v-if="filterTexts.length">
+          >{{ $t('user.filter') }}<template v-if="filterTexts.length">
             ({{ filterTexts.length }})
           </template>
         </el-button>
         <el-dropdown trigger="click" :hide-on-click="false">
           <el-button v-btnPress class="normal btn filter-zero" icon="el-icon-setting"
-            >列表项</el-button
+            >{{ $t('user.list') }}</el-button
           >
           <el-dropdown-menu class="list-colums-slect" slot="dropdown">
-            <p class="title">请选择列表中要展示的信息</p>
+            <p class="title">{{ $t('user.list_info') }}</p>
             <el-checkbox
               :indeterminate="isIndeterminate"
               v-model="checkAll"
               @change="handleCheckAllChange"
-              >全选</el-checkbox
+              >{{ $t('dataset.check_all')}}</el-checkbox
             >
             <el-checkbox-group
               v-model="checkedColumnNames"
@@ -483,7 +483,7 @@ export default {
       this.initSearch();
     },
     onCopy(e) {
-      this.$success(this.$t("commons.copy_success"));
+      this.openMessageSuccess("commons.copy_success");
     },
     onError(e) {},
     handleSizeChange(pageSize) {
@@ -531,7 +531,7 @@ export default {
       this.$refs.userEditer.init(row);
     },
     del(row) {
-      this.$confirm(this.$t("确定删除该用户吗？"), "", {
+      this.$confirm(this.$t("user.sure_delete"), "", {
         confirmButtonText: this.$t("commons.delete"),
         cancelButtonText: this.$t("commons.cancel"),
         cancelButtonClass: "de-confirm-fail-btn de-confirm-fail-cancel",
@@ -541,7 +541,7 @@ export default {
       })
         .then(() => {
           delUser(encodeURIComponent(row.userId)).then((res) => {
-            this.openMessageSuccess();
+            this.openMessageSuccess("commons.delete_success");
             this.initSearch();
           });
         })
@@ -549,11 +549,11 @@ export default {
           this.$info(this.$t("commons.delete_cancel"));
         });
     },
-    openMessageSuccess() {
+    openMessageSuccess(text) {
       const h = this.$createElement;
       this.$message({
         message: h("p", null, [
-          h("span", null, this.$t("commons.delete_success")),
+          h("span", null, this.$t(text)),
         ]),
         iconClass: "el-icon-success",
         customClass: "de-message-success de-message",
@@ -852,44 +852,6 @@ export default {
 }
 </style>
 <style lang="scss">
-.de-message {
-  min-width: 20px !important;
-  padding: 16px 20px !important;
-  flex-direction: row;
-  box-shadow: 0px 4px 8px 0px #1f23291a;
-  span {
-    font-family: PingFang SC;
-    font-size: 14px;
-    font-weight: 500;
-    line-height: 22px;
-    letter-spacing: 0px;
-    text-align: left;
-    color: #1f2329;
-  }
-
-  i {
-    height: 14.666666984558105px;
-    width: 14.666669845581055px;
-    margin-right: 8.67px;
-  }
-}
-.de-message-fail {
-  border: 1px solid #f54a45 !important;
-  background: #fef1f1 !important;
-  i {
-    color: #f54a45;
-  }
-}
-
-.de-message-success {
-  border: 1px solid #34c724 !important;
-  background: #f0fbef !important;
-  i {
-    color: #34c724;
-  }
-}
-</style>
-<style lang="scss">
 .de-confirm {
   border: none;
   .el-message-box__header {

From 2de5f85393a5b3c2e0bb47ce354e4805edab5756 Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Thu, 28 Jul 2022 17:47:59 +0800
Subject: [PATCH 06/18] =?UTF-8?q?fix:=20=E7=94=A8=E6=88=B7=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86=E7=AD=9B=E9=80=89bug=E4=BF=AE=E5=A4=8D=20=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=85=A8=E9=80=89?=
 =?UTF-8?q?=20=E6=B8=85=E9=99=A4=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/ElTreeSelect/index.vue     | 31 ++++++-
 .../src/components/ElVisualSelect/index.vue   | 32 ++++++-
 .../components/widget/DeWidget/DeSelect.vue   | 20 +++--
 .../widget/DeWidget/DeSelectTree.vue          |  5 ++
 frontend/src/directive/index.js               | 14 +++
 frontend/src/lang/en.js                       |  4 +
 frontend/src/lang/tw.js                       |  4 +
 frontend/src/lang/zh.js                       |  4 +
 frontend/src/styles/index.scss                | 88 +++++++++++++++++++
 .../system/datasource/DsConfiguration.vue     |  2 +-
 frontend/src/views/system/user/filterUser.vue | 10 ++-
 frontend/src/views/system/user/index.vue      | 56 ++----------
 12 files changed, 211 insertions(+), 59 deletions(-)

diff --git a/frontend/src/components/ElTreeSelect/index.vue b/frontend/src/components/ElTreeSelect/index.vue
index af475cab2a..cbb1b28644 100644
--- a/frontend/src/components/ElTreeSelect/index.vue
+++ b/frontend/src/components/ElTreeSelect/index.vue
@@ -33,6 +33,7 @@
       <el-input v-if="treeParams.filterable" v-model="keywords" size="mini" class="input-with-select mb10">
         <el-button slot="append" icon="el-icon-search" @click="_searchFun" />
       </el-input>
+      <p v-if="selectParams.multiple" class="tree-select-all"><el-checkbox :indeterminate="isIndeterminate" v-customStyle="customStyle" @change="selectAllChane" v-model="selectAll">{{ $t('dataset.check_all') }}</el-checkbox></p>
       <el-scrollbar tag="div" wrap-class="el-select-dropdown__wrap" view-class="el-select-dropdown__list" class="is-empty">
         <!-- 树列表 -->
         <el-tree
@@ -203,10 +204,15 @@ export default {
           }
         }
       }
+    },
+    customStyle: {
+      type: Object,
+      default: () => {}
     }
   },
   data() {
     return {
+      selectAll: false,
       guid: guid(),
       propsValue: 'flowId',
       propsLabel: 'name',
@@ -229,6 +235,10 @@ export default {
     popperClass() {
       const _c = 'el-tree-select-popper ' + this.popoverClass
       return this.disabled ? _c + ' disabled ' : _c
+    },
+    isIndeterminate() {
+      if (!this.selectParams.multiple) return;
+      return this.ids.length > 0 && this.ids.length !== this._checkSum().length
     }
   },
   watch: {
@@ -283,6 +293,21 @@ export default {
     off(document, 'mouseup', this._popoverHideFun)
   },
   methods: {
+    selectAllChane(val) {
+      if (val) {
+        this.ids = this._checkSum();
+        this._emitFun();
+        return
+      } 
+      this._selectClearFun()
+    },
+    _checkSum() {
+        let arr = [];
+        (this.data || []).forEach(ele => {
+          arr = [...this.allKidIds(ele), ...arr]
+        })
+        return arr
+    },
     _treeCheckChange() {
       this.$emit("treeCheckChange")
     },
@@ -494,6 +519,7 @@ export default {
         `vm:` 当前组件的vm
         */
       node.checkedKeys = checkedNodes.map(node => node.id)
+      this.selectAll = this._checkSum().length === this.ids.length;
       this.$emit('check', data, node, vm)
       this._emitFun()
     },
@@ -549,6 +575,7 @@ export default {
       this.$emit('input', multiple ? [] : '')
       // 下拉框清空，对外抛出``this.$emit('select-clear');`
       this.$emit('select-clear')
+      this.selectAll = false;
       this._updatePopoverLocationFun()
     },
     // 判断类型，抛出当前选中id
@@ -625,7 +652,9 @@ export default {
 .el-tree-select .select-option {
     display: none !important;
 }
-
+.tree-select-all {
+    padding: 10px 20px 0 24px;
+  }
 [aria-disabled='true'] > .el-tree-node__content {
     color: inherit !important;
     background: transparent !important;
diff --git a/frontend/src/components/ElVisualSelect/index.vue b/frontend/src/components/ElVisualSelect/index.vue
index 96596484aa..eeda732b70 100644
--- a/frontend/src/components/ElVisualSelect/index.vue
+++ b/frontend/src/components/ElVisualSelect/index.vue
@@ -6,12 +6,14 @@
     :class="classId"
     popper-class="VisualSelects coustom-de-select"
     no-match-text=" "
+    clearable
     v-bind="$attrs"
     v-on="$listeners"
     @change="visualChange"
     @visible-change="popChange"
   >
-    <el-option v-for="item in options" :key="item.id" :label="item.text" :value="item.id" />
+    <p v-if="startIndex === 0 && $attrs.multiple" class="select-all"><el-checkbox :indeterminate="isIndeterminate" v-customStyle="customStyle" @change="selectAllChane" v-model="selectAll">{{ $t('dataset.check_all') }}</el-checkbox></p>
+    <el-option v-for="item in options" :key="item.id" :label="item.text" :value="item.id"  :class="setSelect(item.id)"/>
   </el-select>
 </template>
 
@@ -31,6 +33,10 @@ export default {
       require: true,
       default: uuid.v1()
     },
+    customStyle: {
+      type: Object,
+      default: () => {}
+    },
     list: {
       type: Array,
       default: () => {
@@ -60,7 +66,13 @@ export default {
       itemHeight: 34, // select组件选项高度
       maxHeightDom: null,
       defaultFirst: false,
-      show: true
+      show: true,
+      selectAll: false
+    }
+  },
+  computed: {
+    isIndeterminate() {
+      return Array.isArray(this.selectValue) && this.selectValue.length > 0 && this.selectValue.length !== this.list.length
     }
   },
   watch: {
@@ -102,6 +114,16 @@ export default {
     })
   },
   methods: {
+    setSelect(id) {
+      if (Array.isArray(this.selectValue)) {
+        return  this.selectValue.map( ele => ele.id ).includes(id) && 'selected'
+      }
+      return this.selectValue === id && 'selected';
+    },
+    selectAllChane(val) {
+      this.visualChange(val ? [...this.list.map( ele => ele.id )] : [])
+      this.$emit('handleShowNumber');
+    },
     addScrollDiv(selectDom) {
       this.maxHeightDom = document.createElement('div')
       this.maxHeightDom.className = 'el-select-height'
@@ -171,6 +193,9 @@ export default {
       this.reCacularHeight()
     },
     visualChange(val) {
+      if(this.$attrs.multiple) {
+        this.selectAll = val.length === this.list.length;
+      }
       this.$emit('visual-change', val)
     }
   }
@@ -206,4 +231,7 @@ export default {
     height: 0;
   }
 }
+.select-all {
+    padding: 10px 20px 0 20px;
+  }
 </style>
diff --git a/frontend/src/components/widget/DeWidget/DeSelect.vue b/frontend/src/components/widget/DeWidget/DeSelect.vue
index 969c2b556e..ce3aac9589 100644
--- a/frontend/src/components/widget/DeWidget/DeSelect.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelect.vue
@@ -16,10 +16,12 @@
     :key-word="keyWord"
     popper-class="coustom-de-select"
     :list="datas"
+    :customStyle="customStyle"
     @change="changeValue"
     @focus="setOptionWidth"
     @blur="onBlur"
     @visual-change="visualChange"
+    @handleShowNumber="handleShowNumber"
   >
     <el-option
       v-for="item in templateDatas || datas"
@@ -104,6 +106,10 @@ export default {
     },
     panelInfo() {
       return this.$store.state.panel.panelInfo
+    },
+    customStyle() {
+      const { brColor, wordColor, innerBgColor } = this.element.style;
+      return { brColor, wordColor, innerBgColor }
     }
   },
 
@@ -211,7 +217,7 @@ export default {
     },
     onScroll() {
       if (this.onFocus) {
-        this.$refs.deSelect.blur()
+        this.$refs.deSelect.$refs.visualSelect.blur()
       }
     },
     resetDefaultValue(id) {
@@ -251,7 +257,7 @@ export default {
       }
     },
     visualChange(value) {
-      this.value = value
+      this.value = value;
       this.$nextTick(() => {
         if (!this.element.options.attrs.multiple) {
           return
@@ -271,18 +277,22 @@ export default {
         this.element.options.manualModify = true
       }
       this.setCondition()
+      this.handleShowNumber()
+    },
+    handleShowNumber() {
       this.showNumber = false
+      const tags = this.$refs.deSelect.$refs.visualSelect.$refs.tags
 
       this.$nextTick(() => {
-        if (!this.element.options.attrs.multiple || !this.$refs.deSelect || !this.$refs.deSelect.$refs.tags) {
+        if (!this.element.options.attrs.multiple || !this.$refs.deSelect || !tags) {
           return
         }
-        const kids = this.$refs.deSelect.$refs.tags.children[0].children
+        const kids = tags.children[0].children
         let contentWidth = 0
         kids.forEach(kid => {
           contentWidth += kid.offsetWidth
         })
-        this.showNumber = contentWidth > ((this.$refs.deSelect.$refs.tags.clientWidth - 30) * 0.9)
+        this.showNumber = contentWidth > ((tags.clientWidth - 30) * 0.9)
         this.handleElTagStyle()
       })
     },
diff --git a/frontend/src/components/widget/DeWidget/DeSelectTree.vue b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
index 3df7e2a9ad..8773586e06 100644
--- a/frontend/src/components/widget/DeWidget/DeSelectTree.vue
+++ b/frontend/src/components/widget/DeWidget/DeSelectTree.vue
@@ -10,6 +10,7 @@
     :tree-params="treeParams"
     :filter-node-method="_filterFun"
     :tree-render-fun="_renderFun"
+    :customStyle="customStyle"
     @searchFun="_searchFun"
     @node-click="changeNode"
     @removeTag="changeNodeIds"
@@ -106,6 +107,10 @@ export default {
     },
     isSingle() {
       return this.element.options.attrs.multiple
+    },
+    customStyle() {
+      const { brColor, wordColor, innerBgColor } = this.element.style;
+      return { brColor, wordColor, innerBgColor }
     }
   },
 
diff --git a/frontend/src/directive/index.js b/frontend/src/directive/index.js
index edb3f4f522..e44e82bfae 100644
--- a/frontend/src/directive/index.js
+++ b/frontend/src/directive/index.js
@@ -86,6 +86,19 @@ const btnPress =  {
   },
 }
 
+const customStyle = {
+  inserted: function (el, binding) {
+    const label = el.querySelector('.el-checkbox__label');
+    if (label) {
+      if (label.getAttribute("data-color") === binding.value.wordColor) {
+        return
+      };
+      label.style.setProperty('color', binding.value.wordColor, 'important');
+      label.setAttribute("data-color", binding.value.wordColor);
+    }
+  },
+}
+
 
 export default {
   install(Vue) {
@@ -96,6 +109,7 @@ export default {
     Vue.directive('bottom-to-top-drag', bottom2TopDrag)
     Vue.directive('closePress', closePress)
     Vue.directive('btnPress', btnPress)
+    Vue.directive('customStyle', customStyle)
   }
 }
 
diff --git a/frontend/src/lang/en.js b/frontend/src/lang/en.js
index fd02cbac02..41c7a12949 100644
--- a/frontend/src/lang/en.js
+++ b/frontend/src/lang/en.js
@@ -563,6 +563,10 @@ export default {
     clear_filter: 'Empty condition',
     recover_pwd: 'Restore to the original password?',
     filter_method: 'Filter criteria',
+    filter: 'screen',
+    list: 'List item',
+    list_info: 'Please select the information to be displayed in the list',
+    sure_delete: 'Are you sure to delete this user?',
   },
   ldap: {
     url: 'LDAP url',
diff --git a/frontend/src/lang/tw.js b/frontend/src/lang/tw.js
index 8bc3716a97..ff160c5712 100644
--- a/frontend/src/lang/tw.js
+++ b/frontend/src/lang/tw.js
@@ -564,6 +564,10 @@ export default {
     clear_filter: '清空條件',
     recover_pwd: '是否恢復為初始密碼?',
     filter_method: '篩選條件',
+    filter: '篩選',
+    list: '列表項',
+    list_info: '請選擇列表中要展示的信息',
+    sure_delete: '確定刪除該用戶嗎？',
   },
   ldap: {
     url: 'LDAP地址',
diff --git a/frontend/src/lang/zh.js b/frontend/src/lang/zh.js
index cb557a7e8e..451cde01a4 100644
--- a/frontend/src/lang/zh.js
+++ b/frontend/src/lang/zh.js
@@ -565,6 +565,10 @@ export default {
     clear_filter: '清空条件',
     recover_pwd: '是否恢复为初始密码?',
     filter_method: '筛选条件',
+    filter: '筛选',
+    list: '列表项',
+    list_info: '请选择列表中要展示的信息',
+    sure_delete: '确定删除该用户吗？',
   },
   ldap: {
     url: 'LDAP地址',
diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 81324cd956..8dc0a4483b 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -888,3 +888,91 @@ div:focus {
   }
 }
 
+.el-tabs {
+  .el-tabs__item.is-active {
+    box-shadow: none !important;
+  }
+}
+
+.de-message {
+  min-width: 20px !important;
+  padding: 16px 20px !important;
+  flex-direction: row;
+  box-shadow: 0px 4px 8px 0px #1f23291a;
+  span {
+    font-family: PingFang SC;
+    font-size: 14px;
+    font-weight: 500;
+    line-height: 22px;
+    letter-spacing: 0px;
+    text-align: left;
+    color: #1f2329;
+  }
+
+  i {
+    height: 14.666666984558105px;
+    width: 14.666669845581055px;
+    margin-right: 8.67px;
+  }
+}
+.de-message-fail {
+  border: 1px solid #f54a45 !important;
+  background: #fef1f1 !important;
+  i {
+    color: #f54a45;
+  }
+}
+
+.de-message-success {
+  border: 1px solid #34c724 !important;
+  background: #f0fbef !important;
+  i {
+    color: #34c724;
+  }
+}
+
+.pagination-cont {
+  text-align: right;
+  margin-top: 10px;
+  ::v-deep .el-pager li {
+    background-color: #fff;
+    border: 1px solid #bbbfc4;
+    border-radius: 4px;
+    color: #1f2329;
+    box-sizing: border-box;
+    line-height: 26px;
+    font-family: SF Pro Text;
+    font-size: 14px;
+    font-weight: 400;
+  }
+
+  ::v-deep .btn-prev,
+  ::v-deep .btn-next {
+    background: #fff;
+    background-color: #fff;
+    border: 1px solid #bbbfc4;
+    border-radius: 4px;
+    color: #bbbfc4;
+  }
+
+  ::v-deep .el-pagination__total {
+    font-family: "PingFang SC";
+    font-style: normal;
+    font-weight: 400;
+    font-size: 14px;
+    line-height: 22px;
+    color: #1f2329;
+    line-height: 28px;
+  }
+
+  ::v-deep .number.active,
+  ::v-deep .el-input__inner:hover {
+    border-color: #3370ff;
+    color: #3370ff !important;
+    background-color: #fff !important;
+  }
+
+  ::v-deep .el-icon-more {
+    border: none !important;
+  }
+}
\ No newline at end of file
diff --git a/frontend/src/views/system/datasource/DsConfiguration.vue b/frontend/src/views/system/datasource/DsConfiguration.vue
index 12908135da..acb4bc7d4e 100644
--- a/frontend/src/views/system/datasource/DsConfiguration.vue
+++ b/frontend/src/views/system/datasource/DsConfiguration.vue
@@ -1039,7 +1039,7 @@ export default {
 
           for (var j = 0; j < this.apiItem.fields.length; j++) {
             if(this.apiItem.fields[j].name === jsonFields[i].name){
-              this.$refs.apiItemTable.toggleRowSelection(jsonFields[i]);
+              jsonFields[i].checked = false;
               this.$message.error(jsonFields[i].name + ', ' + i18n.t('datasource.has_repeat_field_name'))
               return
             }
diff --git a/frontend/src/views/system/user/filterUser.vue b/frontend/src/views/system/user/filterUser.vue
index 58b78d054e..16a89a77d6 100644
--- a/frontend/src/views/system/user/filterUser.vue
+++ b/frontend/src/views/system/user/filterUser.vue
@@ -354,17 +354,19 @@ export default {
 
   .filter {
     display: flex;
-    align-items: center;
-    height: 46px;
+    min-height: 46px;
     > :nth-child(1) {
-      margin-right: 88px;
       color: #1f2329;
       font-family: "PingFang SC";
       font-style: normal;
       font-weight: 400;
       font-size: 14px;
+      line-height: 24px;
+      white-space: nowrap;
+      width: 116px;
     }
     .filter-item {
+      flex: 1;
       .item,
       .more {
         font-family: PingFang SC;
@@ -378,6 +380,8 @@ export default {
         background: #f5f6f7;
         border-radius: 2px;
         cursor: pointer;
+        display: inline-block;
+        margin-bottom: 12px;
       }
 
       .active,
diff --git a/frontend/src/views/system/user/index.vue b/frontend/src/views/system/user/index.vue
index 852426a6d7..1f2d6df965 100644
--- a/frontend/src/views/system/user/index.vue
+++ b/frontend/src/views/system/user/index.vue
@@ -30,21 +30,21 @@
           :class="[filterTexts.length ? 'active-btn filter-not-null' : 'filter-zero']"
           icon="iconfont icon-icon-filter"
           @click="filterShow"
-          >筛选<template v-if="filterTexts.length">
+          >{{ $t('user.filter') }}<template v-if="filterTexts.length">
             ({{ filterTexts.length }})
           </template>
         </el-button>
         <el-dropdown trigger="click" :hide-on-click="false">
           <el-button v-btnPress class="normal btn filter-zero" icon="el-icon-setting"
-            >列表项</el-button
+            >{{ $t('user.list') }}</el-button
           >
           <el-dropdown-menu class="list-colums-slect" slot="dropdown">
-            <p class="title">请选择列表中要展示的信息</p>
+            <p class="title">{{ $t('user.list_info') }}</p>
             <el-checkbox
               :indeterminate="isIndeterminate"
               v-model="checkAll"
               @change="handleCheckAllChange"
-              >全选</el-checkbox
+              >{{ $t('dataset.check_all')}}</el-checkbox
             >
             <el-checkbox-group
               v-model="checkedColumnNames"
@@ -483,7 +483,7 @@ export default {
       this.initSearch();
     },
     onCopy(e) {
-      this.$success(this.$t("commons.copy_success"));
+      this.openMessageSuccess("commons.copy_success");
     },
     onError(e) {},
     handleSizeChange(pageSize) {
@@ -531,7 +531,7 @@ export default {
       this.$refs.userEditer.init(row);
     },
     del(row) {
-      this.$confirm(this.$t("确定删除该用户吗？"), "", {
+      this.$confirm(this.$t("user.sure_delete"), "", {
         confirmButtonText: this.$t("commons.delete"),
         cancelButtonText: this.$t("commons.cancel"),
         cancelButtonClass: "de-confirm-fail-btn de-confirm-fail-cancel",
@@ -541,7 +541,7 @@ export default {
       })
         .then(() => {
           delUser(encodeURIComponent(row.userId)).then((res) => {
-            this.openMessageSuccess();
+            this.openMessageSuccess("commons.delete_success");
             this.initSearch();
           });
         })
@@ -549,11 +549,11 @@ export default {
           this.$info(this.$t("commons.delete_cancel"));
         });
     },
-    openMessageSuccess() {
+    openMessageSuccess(text) {
       const h = this.$createElement;
       this.$message({
         message: h("p", null, [
-          h("span", null, this.$t("commons.delete_success")),
+          h("span", null, this.$t(text)),
         ]),
         iconClass: "el-icon-success",
         customClass: "de-message-success de-message",
@@ -852,44 +852,6 @@ export default {
 }
 </style>
 <style lang="scss">
-.de-message {
-  min-width: 20px !important;
-  padding: 16px 20px !important;
-  flex-direction: row;
-  box-shadow: 0px 4px 8px 0px #1f23291a;
-  span {
-    font-family: PingFang SC;
-    font-size: 14px;
-    font-weight: 500;
-    line-height: 22px;
-    letter-spacing: 0px;
-    text-align: left;
-    color: #1f2329;
-  }
-
-  i {
-    height: 14.666666984558105px;
-    width: 14.666669845581055px;
-    margin-right: 8.67px;
-  }
-}
-.de-message-fail {
-  border: 1px solid #f54a45 !important;
-  background: #fef1f1 !important;
-  i {
-    color: #f54a45;
-  }
-}
-
-.de-message-success {
-  border: 1px solid #34c724 !important;
-  background: #f0fbef !important;
-  i {
-    color: #34c724;
-  }
-}
-</style>
-<style lang="scss">
 .de-confirm {
   border: none;
   .el-message-box__header {

From 68591b8bda28a0c9e1adbd215c28a1e4f6ec91fb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 28 Jul 2022 17:52:15 +0800
Subject: [PATCH 07/18] =?UTF-8?q?perf(=E7=B3=BB=E7=BB=9F=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?-=E5=AE=9A=E6=97=B6=E6=8A=A5=E5=91=8A):=20=E5=8F=91=E9=80=81?=
 =?UTF-8?q?=E8=A7=86=E5=9B=BE=E4=BF=A1=E6=81=AF=E9=9C=80=E8=A6=81=E5=B8=A6?=
 =?UTF-8?q?=E5=85=A5=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/dto/chart/FilterParamTO.java  |  18 ++
 .../service/chart/FilterBuildTemplate.java    | 187 ++++++++++++++++++
 .../service/chart/ViewExportExcel.java        |  34 +---
 .../service/chart/build/NumberRangeBuild.java |  65 ++++++
 .../service/chart/build/SelectBuild.java      |  57 ++++++
 .../service/chart/build/SelectTreeBuild.java  |  63 ++++++
 .../service/chart/build/TextInputBuild.java   |  47 +++++
 .../service/chart/build/TimeYearBuild.java    |  73 +++++++
 8 files changed, 516 insertions(+), 28 deletions(-)
 create mode 100644 backend/src/main/java/io/dataease/dto/chart/FilterParamTO.java
 create mode 100644 backend/src/main/java/io/dataease/service/chart/FilterBuildTemplate.java
 create mode 100644 backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java
 create mode 100644 backend/src/main/java/io/dataease/service/chart/build/SelectBuild.java
 create mode 100644 backend/src/main/java/io/dataease/service/chart/build/SelectTreeBuild.java
 create mode 100644 backend/src/main/java/io/dataease/service/chart/build/TextInputBuild.java
 create mode 100644 backend/src/main/java/io/dataease/service/chart/build/TimeYearBuild.java

diff --git a/backend/src/main/java/io/dataease/dto/chart/FilterParamTO.java b/backend/src/main/java/io/dataease/dto/chart/FilterParamTO.java
new file mode 100644
index 0000000000..828e2fd445
--- /dev/null
+++ b/backend/src/main/java/io/dataease/dto/chart/FilterParamTO.java
@@ -0,0 +1,18 @@
+package io.dataease.dto.chart;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class FilterParamTO {
+
+    private Map<String, Object> component;
+
+    private List<String> value;
+
+    private String operator;
+
+    private Boolean isTree = false;
+}
diff --git a/backend/src/main/java/io/dataease/service/chart/FilterBuildTemplate.java b/backend/src/main/java/io/dataease/service/chart/FilterBuildTemplate.java
new file mode 100644
index 0000000000..a162996fb5
--- /dev/null
+++ b/backend/src/main/java/io/dataease/service/chart/FilterBuildTemplate.java
@@ -0,0 +1,187 @@
+package io.dataease.service.chart;
+
+import io.dataease.commons.utils.CommonBeanFactory;
+import io.dataease.dto.chart.FilterParamTO;
+import io.dataease.plugins.common.request.chart.ChartExtFilterRequest;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+public abstract class FilterBuildTemplate {
+
+    protected abstract FilterParamTO buildParam(Map<String, Object> component);
+
+    public Map<String, List<ChartExtFilterRequest>> buildFilters(List<Map<String, Object>> components) {
+        Map<String, Object> searchButton = components.stream().filter(item -> {
+            if (ObjectUtils.isEmpty(item.get("type"))) return false;
+            if (ObjectUtils.isEmpty(item.get("serviceName"))) return false;
+            return StringUtils.equals("custom-button", item.get("type").toString()) && StringUtils.equals("buttonSureWidget", item.get("serviceName").toString());
+        }).findFirst().orElseGet(null);
+
+        List<Map<String, Object>> filters = componentsFilter(components, "custom", null, null);
+
+        if(ObjectUtils.isNotEmpty(searchButton)) {
+            Map<String, Object> options = (Map<String, Object>) searchButton.get("options");
+            Map<String, Object> attrs = (Map<String, Object>) options.get("attrs");
+            Boolean customRange = (Boolean)attrs.get("customRange");
+            Boolean autoTrigger = (Boolean) attrs.get("autoTrigger");
+            List<String> filterIds = (List<String>) attrs.get("filterIds");
+            if (!autoTrigger) { // 不是自动触发 // 需要过滤掉按钮关联的条件组件
+                if (customRange) { // 自定义控制范围 //过滤掉被按钮关联的
+                    filters = filters.stream().filter(filter -> !filterIds.contains(filter.get("id"))).collect(Collectors.toList());
+                } else { // 按钮控制所有 // 过滤掉所有条件
+                    filters = new ArrayList<>();
+                }
+            }
+        }
+
+        Map<String, List<ChartExtFilterRequest>> emptyResult = buildEmpty(components);
+
+        emptyResult = fillFilters(emptyResult, filters);
+
+        return emptyResult;
+    }
+
+    private Map<String, List<ChartExtFilterRequest>> fillFilters(Map<String, List<ChartExtFilterRequest>> emptyResult, List<Map<String, Object>> filters) {
+        filters.forEach(element -> {
+            FilterParamTO filterParamTO = buildParam(element);
+            ChartExtFilterRequest condition = formatCondition(filterParamTO);
+            Boolean vValid = valueValid(condition);
+            String filterComponentId = condition.getComponentId();
+            emptyResult.entrySet().forEach(entry -> {
+                String viewId = entry.getKey();
+                boolean vidMatch = viewIdMatch(condition.getViewIds(), viewId);
+                List<ChartExtFilterRequest> viewFilters = emptyResult.get(viewId);
+                int j = viewFilters.size();
+                while (j-- > 0) {
+                    ChartExtFilterRequest filter = viewFilters.get(j);
+                    if (StringUtils.equals(filter.getComponentId(), filterComponentId)) {
+                        viewFilters.remove(j);
+                    }
+                }
+                if (vidMatch && vValid) {
+                    viewFilters.add(condition);
+                }
+            });
+        });
+
+        return emptyResult;
+    }
+
+    private Boolean valueValid(ChartExtFilterRequest condition) {
+        return ObjectUtils.isNotEmpty(condition) && CollectionUtils.isNotEmpty(condition.getValue()) && StringUtils.isNotBlank(condition.getValue().get(0));
+    }
+
+    private Boolean viewIdMatch(List<String>  viewIds, String viewId) {
+        return CollectionUtils.isEmpty(viewIds) || viewIds.contains(viewId);
+    }
+
+    private ChartExtFilterRequest formatCondition(FilterParamTO filterParamTO) {
+
+        Boolean isTree = filterParamTO.getIsTree();
+        List<String> value = filterParamTO.getValue();
+        Map<String, Object> component = filterParamTO.getComponent();
+        Map<String, Object> attrs = (Map<String, Object>) ((Map<String, Object>) component.get("options")).get("attrs");
+        String fieldId = attrs.get("fieldId").toString();
+        List<String> viewIds = (List<String>)attrs.get("viewIds");
+        List<String> parameters = (List<String>) attrs.get("parameters");
+        Boolean multiple = ObjectUtils.isNotEmpty(attrs.get("multiple")) && (Boolean) attrs.get("multiple");
+        if (isTree && !multiple && CollectionUtils.isNotEmpty(value)) {
+            // 单选树
+            String val = value.get(0);
+            if (StringUtils.isNotBlank(val)) {
+                int len = val.split(",").length;
+                if (len > 0) {
+                    List<String> fieldIdList = Arrays.asList(fieldId.split(","));
+                    fieldId = fieldIdList.stream().limit(len).collect(Collectors.joining(","));
+                }
+            }
+        }
+        ChartExtFilterRequest condition = new ChartExtFilterRequest();
+        condition.setComponentId(component.get("id").toString());
+        condition.setFieldId(fieldId);
+        condition.setValue(value);
+        condition.setOperator(filterParamTO.getOperator());
+        condition.setViewIds(viewIds);
+        condition.setParameters(parameters);
+        condition.setIsTree(isTree);
+        return condition;
+    }
+
+    private Map<String, List<ChartExtFilterRequest>> buildEmpty(List<Map<String, Object>> components) {
+        Map<String, List<ChartExtFilterRequest>> result = new HashMap<>();
+        components.forEach(element -> {
+            if (StringUtils.equals(element.get("type").toString(), "'view'")) {
+                String viewId = ((Map<String, Object>) element.get("propValue")).get("viewId").toString();
+                result.put(viewId, new ArrayList<>());
+            }
+            if (StringUtils.equals(element.get("type").toString(), "'de-tabs'")) {
+                List<Map<String, Object>> tabs = (List<Map<String, Object>>) ((Map<String, Object>) element.get("options")).get("tabList");
+                if (CollectionUtils.isNotEmpty(tabs)) {
+                    tabs.forEach(tab -> {
+                        Object contentObj = null;
+                        if ((contentObj = tab.get("content")) != null) {
+                            Map<String, Object> content = (Map<String, Object>) contentObj;
+                            Object propObj = null;
+                            if ((propObj = content.get("propValue")) != null) {
+                                Map<String, String> prop = (Map<String, String>) propObj;
+                                String viewId = prop.get("viewId");
+                                if (StringUtils.isNotBlank(viewId)) {
+                                    result.put(viewId, new ArrayList<>());
+                                }
+                            }
+                        }
+
+                    });
+                }
+
+
+            }
+        });
+        return result;
+    }
+
+    public static List<Map<String, Object>> componentsFilter(List<Map<String, Object>> components, String type,
+                                                       String componentType, String serviceName) {
+        return components.stream().filter(component -> {
+            String ctype =  Optional.ofNullable(component.get("type")).orElse("").toString();
+            String cComponentType = Optional.ofNullable(component.get("component")).orElse("").toString();
+            String cServiceName = Optional.ofNullable(component.get("serviceName")).orElse("").toString();
+
+            boolean typeMatch = true;
+            boolean componentTypeMatch = true;
+            boolean serviceNameMatch = true;
+
+            if (StringUtils.isNotBlank(type)) {
+                typeMatch = StringUtils.equals(type, ctype);
+            }
+
+            if (StringUtils.isNotBlank(componentType)) {
+                componentTypeMatch = StringUtils.equals(componentType, cComponentType);
+            }
+
+            if (StringUtils.isNotBlank(serviceName)) {
+                serviceNameMatch = StringUtils.equals(serviceName, cServiceName);
+            }
+
+            return typeMatch && componentTypeMatch && serviceNameMatch;
+
+        }).collect(Collectors.toList());
+
+    }
+
+    public static FilterBuildTemplate getInstance(String serviceName) {
+        Map<String, String> beanMapping = new HashMap<>();
+        beanMapping.put("numberRangeWidget", "numberRangeWidget");
+        beanMapping.put("textSelectTreeWidget", "textSelectTreeWidget");
+        beanMapping.put("textInputWidget", "textInputWidget");
+        String beanName = beanMapping.get(serviceName);
+        if (StringUtils.isBlank(beanName) && StringUtils.contains(serviceName, "select")) {
+            beanName = "selectWidget";
+        }
+        return (FilterBuildTemplate)CommonBeanFactory.getBean(beanName);
+    }
+}
diff --git a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
index 3c8788bafe..67f830aee8 100644
--- a/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
+++ b/backend/src/main/java/io/dataease/service/chart/ViewExportExcel.java
@@ -44,7 +44,7 @@ public class ViewExportExcel {
         PanelGroupDTO panelDto = panelGroupService.findOne(panelId);
         String componentsJson = panelDto.getPanelData();
         List<Map<String, Object>> components = gson.fromJson(componentsJson, tokenType);
-        ChartExtRequest chartExtRequest = buildViewRequest(componentsFilter(components, "custom", null, null));
+        ChartExtRequest chartExtRequest = buildViewRequest(FilterBuildTemplate.componentsFilter(components, "custom", null, null));
         List<File> results = new ArrayList<>();
         List<ExcelSheetModel> sheets = viewIds.stream().map(viewId -> viewFiles(viewId, chartExtRequest)).collect(Collectors.toList());
         File excelFile = ExcelUtils.exportExcel(sheets, panelDto.getName());
@@ -52,34 +52,7 @@ public class ViewExportExcel {
         return results;
     }
 
-    private List<Map<String, Object>> componentsFilter(List<Map<String, Object>> components, String type,
-            String componentType, String serviceName) {
-        return components.stream().filter(component -> {
-            String ctype =  Optional.ofNullable(component.get("type")).orElse("").toString();
-            String cComponentType = Optional.ofNullable(component.get("component")).orElse("").toString();
-            String cServiceName = Optional.ofNullable(component.get("serviceName")).orElse("").toString();
 
-            boolean typeMatch = true;
-            boolean componentTypeMatch = true;
-            boolean serviceNameMatch = true;
-
-            if (StringUtils.isNotBlank(type)) {
-                typeMatch = StringUtils.equals(type, ctype);
-            }
-
-            if (StringUtils.isNotBlank(componentType)) {
-                componentTypeMatch = StringUtils.equals(componentType, cComponentType);
-            }
-
-            if (StringUtils.isNotBlank(serviceName)) {
-                serviceNameMatch = StringUtils.equals(serviceName, cServiceName);
-            }
-
-            return typeMatch && componentTypeMatch && serviceNameMatch;
-
-        }).collect(Collectors.toList());
-
-    }
 
     private ChartExtRequest buildViewRequest(List<Map<String, Object>> filters) {
         ChartExtRequest chartExtRequest = new ChartExtRequest();
@@ -95,6 +68,11 @@ public class ViewExportExcel {
         return chartExtRequest;
     }
 
+    private List<ChartExtFilterRequest> initFilters(List<Map<String, Object>> components) {
+
+        return null;
+    }
+
     private ExcelSheetModel viewFiles(String viewId, ChartExtRequest request) {
         ExcelSheetModel result = new ExcelSheetModel();
         ChartViewDTO chartViewDTO = null;
diff --git a/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java b/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java
new file mode 100644
index 0000000000..42ea023770
--- /dev/null
+++ b/backend/src/main/java/io/dataease/service/chart/build/NumberRangeBuild.java
@@ -0,0 +1,65 @@
+package io.dataease.service.chart.build;
+
+import cn.hutool.core.collection.CollectionUtil;
+import io.dataease.dto.chart.FilterParamTO;
+import io.dataease.service.chart.FilterBuildTemplate;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+@Service("numberRangeWidget")
+public class NumberRangeBuild extends FilterBuildTemplate {
+
+    @Override
+    protected FilterParamTO buildParam(Map<String, Object> component) {
+        FilterParamTO result = new FilterParamTO();
+        result.setComponent(component);
+        result.setValue(null);
+        result.setOperator("eq");
+        Object optionObj = null;
+        Object valueObj = null;
+
+        Map<String, Object> options = null;
+        List<String> values = null;
+        if((optionObj = component.get("options")) != null && (valueObj = (options = (Map<String, Object>) optionObj).get("value")) != null && CollectionUtil.isNotEmpty((values = (List<String>) valueObj))) {
+            String min = values.get(0);
+            String max = null;
+
+            if(values.size() > 1) {
+                max = values.get(1);
+            }
+            result.setOperator("between");
+            result.getValue().set(0, min);
+            result.getValue().set(1, max);
+
+            if (StringUtils.isNotBlank(min) && StringUtils.isNotBlank(max)) {
+                return result;
+            }
+
+            if (StringUtils.isBlank(min) && StringUtils.isBlank(max)) {
+                result.setValue(null);
+                return result;
+            }
+
+            if (StringUtils.isNotBlank(min)) {
+                List<String> tempValues = new ArrayList<>();
+                tempValues.add(min);
+                result.setValue(tempValues);
+                result.setOperator("ge");
+                return result;
+            }
+
+            if (StringUtils.isNotBlank(max)) {
+                List<String> tempValues = new ArrayList<>();
+                tempValues.add(max);
+                result.setValue(tempValues);
+                result.setOperator("le");
+                return result;
+            }
+        }
+        return result;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/service/chart/build/SelectBuild.java b/backend/src/main/java/io/dataease/service/chart/build/SelectBuild.java
new file mode 100644
index 0000000000..5a55d50488
--- /dev/null
+++ b/backend/src/main/java/io/dataease/service/chart/build/SelectBuild.java
@@ -0,0 +1,57 @@
+package io.dataease.service.chart.build;
+
+import io.dataease.dto.chart.FilterParamTO;
+import io.dataease.service.chart.FilterBuildTemplate;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service("selectWidget")
+public class SelectBuild extends FilterBuildTemplate {
+    @Override
+    protected FilterParamTO buildParam(Map<String, Object> component) {
+        FilterParamTO result = new FilterParamTO();
+        result.setComponent(component);
+        result.setValue(null);
+        result.setOperator("eq");
+        Object valueObj = null;
+
+        List<String> realValues = null;
+        if(ObjectUtils.isEmpty(component.get("options"))) return result;
+        Map<String, Object> options = (Map<String, Object>)component.get("options");
+
+        valueObj = options.get("value");
+        String defaultValue = "";
+        Map<String, Object> attrs = (Map<String, Object>) options.get("attrs");
+        boolean multiple = (boolean) attrs.get("multiple");
+        if(!ObjectUtils.isEmpty(valueObj)) {
+            if(valueObj instanceof List) {
+                defaultValue = "";
+            }else {
+                defaultValue = valueObj.toString();
+            }
+        }
+        if(multiple) {
+            if (StringUtils.isBlank(defaultValue)) {
+                realValues = new ArrayList<>();
+            }else {
+                realValues = Arrays.asList(defaultValue.split(","));
+            }
+        } else {
+            if (StringUtils.isBlank(defaultValue)) {
+                realValues = new ArrayList<>();
+            }else {
+                realValues = Arrays.asList(defaultValue.split(",")).stream().limit(1).collect(Collectors.toList());
+            }
+        }
+        result.setOperator(multiple ? "in" : "eq");
+        result.setValue(realValues);
+        return result;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/service/chart/build/SelectTreeBuild.java b/backend/src/main/java/io/dataease/service/chart/build/SelectTreeBuild.java
new file mode 100644
index 0000000000..c906191799
--- /dev/null
+++ b/backend/src/main/java/io/dataease/service/chart/build/SelectTreeBuild.java
@@ -0,0 +1,63 @@
+package io.dataease.service.chart.build;
+
+import io.dataease.dto.chart.FilterParamTO;
+import io.dataease.service.chart.FilterBuildTemplate;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service("textSelectTreeWidget")
+public class SelectTreeBuild extends FilterBuildTemplate {
+    @Override
+    protected FilterParamTO buildParam(Map<String, Object> component) {
+        FilterParamTO result = new FilterParamTO();
+        result.setComponent(component);
+        result.setValue(null);
+        result.setOperator("eq");
+        result.setIsTree(true);
+        Object valueObj = null;
+
+        List<String> realValues = null;
+        if(ObjectUtils.isEmpty(component.get("options"))) return result;
+        Map<String, Object> options = (Map<String, Object>)component.get("options");
+
+        valueObj = options.get("value");
+        String defaultValue = "";
+        Map<String, Object> attrs = (Map<String, Object>) options.get("attrs");
+        boolean multiple = (boolean) attrs.get("multiple");
+        if(!ObjectUtils.isEmpty(valueObj)) {
+            if(valueObj instanceof List) {
+                defaultValue = "";
+            }else {
+                defaultValue = valueObj.toString();
+            }
+        }
+        if(multiple) {
+            if (StringUtils.isBlank(defaultValue)) {
+                realValues = new ArrayList<>();
+            }else {
+                realValues = Arrays.asList(defaultValue.split(","));
+            }
+        } else {
+            if (StringUtils.isBlank(defaultValue)) {
+                realValues = new ArrayList<>();
+            }else {
+                realValues = Arrays.asList(defaultValue.split(",")).stream().limit(1).collect(Collectors.toList());
+            }
+        }
+        result.setOperator(multiple ? "in" : "eq");
+        result.setValue(realValues);
+
+        if (CollectionUtils.isNotEmpty(result.getValue())) {
+            result.setValue(result.getValue().stream().map(val -> val.replaceAll("-de-", ",")).collect(Collectors.toList()));
+        }
+        return result;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/service/chart/build/TextInputBuild.java b/backend/src/main/java/io/dataease/service/chart/build/TextInputBuild.java
new file mode 100644
index 0000000000..b8fd6d7478
--- /dev/null
+++ b/backend/src/main/java/io/dataease/service/chart/build/TextInputBuild.java
@@ -0,0 +1,47 @@
+package io.dataease.service.chart.build;
+
+import io.dataease.dto.chart.FilterParamTO;
+import io.dataease.service.chart.FilterBuildTemplate;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+@Service("textInputWidget")
+public class TextInputBuild extends FilterBuildTemplate {
+    @Override
+    protected FilterParamTO buildParam(Map<String, Object> component) {
+        FilterParamTO result = new FilterParamTO();
+        result.setComponent(component);
+        result.setValue(null);
+        result.setOperator("like");
+        Object valueObj = null;
+
+        List<String> realValues = null;
+        if(ObjectUtils.isEmpty(component.get("options"))) return result;
+        Map<String, Object> options = (Map<String, Object>)component.get("options");
+
+        valueObj = options.get("value");
+        String defaultValue = "";
+        Map<String, Object> attrs = (Map<String, Object>) options.get("attrs");
+        if(!ObjectUtils.isEmpty(valueObj)) {
+            if(valueObj instanceof List) {
+                defaultValue = "";
+            }else {
+                defaultValue = valueObj.toString();
+            }
+        }
+        if (StringUtils.isBlank(defaultValue)) {
+            realValues = new ArrayList<>();
+        }else {
+            realValues = Arrays.asList(defaultValue.split(",")).stream().limit(1).collect(Collectors.toList());
+        }
+        result.setValue(realValues);
+        return result;
+    }
+}
diff --git a/backend/src/main/java/io/dataease/service/chart/build/TimeYearBuild.java b/backend/src/main/java/io/dataease/service/chart/build/TimeYearBuild.java
new file mode 100644
index 0000000000..76581fe6d1
--- /dev/null
+++ b/backend/src/main/java/io/dataease/service/chart/build/TimeYearBuild.java
@@ -0,0 +1,73 @@
+package io.dataease.service.chart.build;
+
+import io.dataease.dto.chart.FilterParamTO;
+import io.dataease.service.chart.FilterBuildTemplate;
+import org.apache.commons.lang3.ObjectUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+import java.util.stream.Collectors;
+
+
+public class TimeYearBuild extends FilterBuildTemplate {
+    @Override
+    protected FilterParamTO buildParam(Map<String, Object> component) {
+        List<String> realVals = null;
+        Object valueObj = null;
+        String defaultValue = "";
+        Map<String, Object> options = (Map<String, Object>) component.get("options");
+        Map<String, Object> attrs = (Map<String, Object>) options.get("attrs");
+        Object aDefault = attrs.get("default");
+        Boolean isDynamic = (Boolean) attrs.getOrDefault("isDynamic", false);
+        if (ObjectUtils.isNotEmpty(aDefault) && isDynamic) {
+            Long aLong = dynamicDateFormNow(component);
+            realVals = new ArrayList<>();
+            realVals.add(aLong.toString());
+        }else {
+            if(!ObjectUtils.isEmpty(valueObj)) {
+                if(valueObj instanceof List) {
+                    defaultValue = "";
+                }else {
+                    defaultValue = valueObj.toString();
+                }
+            }
+            if (StringUtils.isBlank(defaultValue)) {
+                realVals = new ArrayList<>();
+            }else {
+                realVals = Arrays.asList(defaultValue.split(",")).stream().limit(1).collect(Collectors.toList());
+            }
+        }
+
+
+
+        return null;
+    }
+
+
+    private Long dynamicDateFormNow(Map<String, Object> component) {
+        Map<String, Object> attrs = (Map<String, Object>) ((Map<String, Object>) component.get("options")).get("attrs");
+        Object aDefault = attrs.get("default");
+        Boolean isDynamic = (Boolean) attrs.getOrDefault("isDynamic", false);
+        if (ObjectUtils.isEmpty(aDefault) || !isDynamic) return null;
+
+        Calendar now = Calendar.getInstance();
+        int nowYear = now.get(Calendar.YEAR);
+        Map<String, Object> aDefaultMap = (Map<String, Object>) aDefault;
+        if (Integer.parseInt(aDefaultMap.get("dkey").toString()) == 0){
+            now.set(nowYear, 0, 1, 0, 0, 0);
+            return now.getTimeInMillis();
+        }
+        if (Integer.parseInt(aDefaultMap.get("dkey").toString()) == 1){
+            now.set(nowYear - 1, 0, 1, 0, 0, 0);
+            return now.getTimeInMillis();
+        }
+        if (Integer.parseInt(aDefaultMap.get("dkey").toString()) == 2){
+            int dynamicPrefix = Integer.parseInt(aDefaultMap.get("dynamicPrefix").toString());
+            String dynamicSuffix = aDefaultMap.get("dynamicSuffix").toString();
+            now.set(StringUtils.equals("before", dynamicSuffix) ? (nowYear - dynamicPrefix) : (nowYear + dynamicPrefix), 0, 1, 0, 0, 0);
+            return now.getTimeInMillis();
+        }
+        return 0L;
+    }
+}

From 3dd8c45e92a27e30cf1bedbbffd5d65e5b82e155 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Thu, 28 Jul 2022 18:34:08 +0800
Subject: [PATCH 08/18] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20sql?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java  | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

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 134ac278c7..22c7467a94 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -49,9 +49,7 @@ import net.sf.jsqlparser.expression.Expression;
 import net.sf.jsqlparser.expression.Parenthesis;
 import net.sf.jsqlparser.expression.operators.conditional.AndExpression;
 import net.sf.jsqlparser.expression.operators.conditional.OrExpression;
-import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
-import net.sf.jsqlparser.expression.operators.relational.InExpression;
-import net.sf.jsqlparser.expression.operators.relational.LikeExpression;
+import net.sf.jsqlparser.expression.operators.relational.*;
 import net.sf.jsqlparser.parser.CCJSqlParserUtil;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.statement.select.PlainSelect;
@@ -2583,6 +2581,34 @@ public class DataSetTableService {
             }
 
 
+            @Override
+            public void visit(MinorThan minorThan) {
+                getBuffer().append(minorThan.getLeftExpression());
+                getBuffer().append(" < ");
+                getBuffer().append( minorThan.getRightExpression());
+            }
+
+            @Override
+            public void visit(MinorThanEquals minorThan) {
+                getBuffer().append(minorThan.getLeftExpression());
+                getBuffer().append(" <= ");
+                getBuffer().append( minorThan.getRightExpression());
+            }
+
+            @Override
+            public void visit(GreaterThanEquals minorThan) {
+                getBuffer().append(minorThan.getLeftExpression());
+                getBuffer().append(" >= ");
+                getBuffer().append( minorThan.getRightExpression());
+            }
+
+            @Override
+            public void visit(GreaterThan minorThan) {
+                getBuffer().append(minorThan.getLeftExpression());
+                getBuffer().append(" > ");
+                getBuffer().append( minorThan.getRightExpression());
+            }
+
             @Override
             public void visit(ExpressionList expressionList) {
                 for (Iterator<Expression> iter = expressionList.getExpressions().iterator(); iter.hasNext();) {

From a703eb3cd546e951a43667e477e63ead52282759 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 28 Jul 2022 20:32:28 +0800
Subject: [PATCH 09/18] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8):=20=E6=97=A5=E6=9C=9F=E8=8C=83=E5=9B=B4?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4=E5=99=A8=E5=A4=B1=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeDate.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeDate.vue b/frontend/src/components/widget/DeWidget/DeDate.vue
index d99e044123..93ef2f6c07 100644
--- a/frontend/src/components/widget/DeWidget/DeDate.vue
+++ b/frontend/src/components/widget/DeWidget/DeDate.vue
@@ -80,7 +80,7 @@ export default {
       return widget.isTimeWidget && widget.isTimeWidget()
     },
     componentType() {
-      let result = 'date'
+      let result = this.element.options.attrs.type || 'date'
       if (this.isTimeWidget && this.element.options.attrs.showTime) {
         result = 'datetime'
       }
@@ -91,7 +91,7 @@ export default {
       if (this.isTimeWidget && this.element.options.attrs.showTime && this.element.options.attrs.accuracy) {
         return result + ' ' + this.element.options.attrs.accuracy
       }
-      return result
+      return null
     }
 
   },

From 76ee64245909585ab7e18fe1da0e473c8336435f Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Thu, 28 Jul 2022 22:11:32 +0800
Subject: [PATCH 10/18] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF-=E8=BF=87?=
 =?UTF-8?q?=E6=BB=A4=E5=99=A8):=20=E6=97=B6=E9=97=B4=E8=BF=87=E6=BB=A4?=
 =?UTF-8?q?=E7=BB=84=E4=BB=B6=E8=BF=87=E6=BB=A4=E7=B2=BE=E5=BA=A6=E5=88=B0?=
 =?UTF-8?q?=E6=AF=AB=E7=A7=92=E7=9A=84=E8=A7=86=E5=9B=BE=E6=9C=89=E8=AF=AF?=
 =?UTF-8?q?=E5=B7=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../io/dataease/provider/engine/doris/DorisQueryProvider.java   | 2 +-
 .../java/io/dataease/provider/query/ck/CKQueryProvider.java     | 2 +-
 .../java/io/dataease/provider/query/db2/Db2QueryProvider.java   | 2 +-
 .../java/io/dataease/provider/query/es/EsQueryProvider.java     | 2 +-
 .../java/io/dataease/provider/query/hive/HiveQueryProvider.java | 2 +-
 .../io/dataease/provider/query/impala/ImpalaQueryProvider.java  | 2 +-
 .../io/dataease/provider/query/mongodb/MongoQueryProvider.java  | 2 +-
 .../io/dataease/provider/query/mysql/MysqlQueryProvider.java    | 2 +-
 .../io/dataease/provider/query/oracle/OracleQueryProvider.java  | 2 +-
 .../java/io/dataease/provider/query/pg/PgQueryProvider.java     | 2 +-
 .../dataease/provider/query/redshift/RedshiftQueryProvider.java | 2 +-
 .../provider/query/sqlserver/SqlserverQueryProvider.java        | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
index ad15ab3251..e5558e6f6a 100644
--- a/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/engine/doris/DorisQueryProvider.java
@@ -1074,7 +1074,7 @@ public class DorisQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(DorisConstants.WHERE_BETWEEN, startTime, endTime);
diff --git a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
index 5f2df87142..67a095281e 100644
--- a/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/ck/CKQueryProvider.java
@@ -1130,7 +1130,7 @@ public class CKQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(CKConstants.WHERE_BETWEEN, startTime, endTime);
diff --git a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
index 1b6a7b116f..9565f069c1 100644
--- a/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/db2/Db2QueryProvider.java
@@ -1124,7 +1124,7 @@ public class Db2QueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(Db2Constants.WHERE_BETWEEN, startTime, endTime);
diff --git a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
index 939fbf3bd4..8916ae8497 100644
--- a/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/es/EsQueryProvider.java
@@ -1119,7 +1119,7 @@ public class EsQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(EsSqlLConstants.WHERE_BETWEEN, startTime, endTime);
diff --git a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
index 78b289fac3..cd27e75351 100644
--- a/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/hive/HiveQueryProvider.java
@@ -1055,7 +1055,7 @@ public class HiveQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(HiveConstants.WHERE_BETWEEN, startTime, endTime);
diff --git a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
index 8671402112..9e845766b1 100644
--- a/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/impala/ImpalaQueryProvider.java
@@ -1060,7 +1060,7 @@ public class ImpalaQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(ImpalaConstants.WHERE_BETWEEN, startTime, endTime);
diff --git a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
index 1ea026b22a..684e0239f6 100644
--- a/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/mongodb/MongoQueryProvider.java
@@ -969,7 +969,7 @@ public class MongoQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(MongoConstants.WHERE_BETWEEN, startTime, endTime);
diff --git a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
index ba56a6a789..00cddc4974 100644
--- a/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/mysql/MysqlQueryProvider.java
@@ -1060,7 +1060,7 @@ public class MysqlQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(MySQLConstants.WHERE_BETWEEN, startTime, endTime);
diff --git a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
index 1f0f3e9f17..e382ae96a2 100644
--- a/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/oracle/OracleQueryProvider.java
@@ -1123,7 +1123,7 @@ public class OracleQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     String startTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(0))));
                     String endTime = simpleDateFormat.format(new Date(Long.parseLong(value.get(1))));
                     String st = String.format(OracleConstants.TO_DATE, "'" + startTime + "'", OracleConstants.DEFAULT_DATE_FORMAT);
diff --git a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
index 2c30997e58..ce507014be 100644
--- a/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/pg/PgQueryProvider.java
@@ -1086,7 +1086,7 @@ public class PgQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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);
diff --git a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
index b2d8fd468c..33491d6f46 100644
--- a/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/redshift/RedshiftQueryProvider.java
@@ -1013,7 +1013,7 @@ public class RedshiftQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == 1) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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);
diff --git a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
index 545540850d..90d47de82d 100644
--- a/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
+++ b/backend/src/main/java/io/dataease/provider/query/sqlserver/SqlserverQueryProvider.java
@@ -1118,7 +1118,7 @@ public class SqlserverQueryProvider extends QueryProvider {
                 whereValue = "'%" + value.get(0) + "%'";
             } else if (StringUtils.containsIgnoreCase(request.getOperator(), "between")) {
                 if (request.getDatasetTableField().getDeType() == DeTypeConstants.DE_TIME) {
-                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+                    SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss.SSS");
                     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(SqlServerSQLConstants.WHERE_BETWEEN, startTime, endTime);

From c07b4326e33a0d3ea007a24153defac98225deda Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 28 Jul 2022 22:15:26 +0800
Subject: [PATCH 11/18] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E8=A7=86?=
 =?UTF-8?q?=E5=9B=BE=E8=AE=A1=E7=AE=97=E5=AD=97=E6=AE=B5=E9=99=90=E5=88=B6?=
 =?UTF-8?q?=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/views/chart/view/ChartEdit.vue b/frontend/src/views/chart/view/ChartEdit.vue
index 4ec1aa87f4..82b01cae84 100644
--- a/frontend/src/views/chart/view/ChartEdit.vue
+++ b/frontend/src/views/chart/view/ChartEdit.vue
@@ -2297,6 +2297,7 @@ export default {
         }
       }
       this.dragMoveDuplicate(this.view.customFilter, e)
+      this.dragRemoveChartField(this.view.customFilter, e)
       this.calcData(true)
     },
 

From e83687c9e72b6067dbd320f8d970b79c6e7ffed5 Mon Sep 17 00:00:00 2001
From: junjun <junjie.xia@fit2cloud.com>
Date: Thu, 28 Jul 2022 22:16:37 +0800
Subject: [PATCH 12/18] =?UTF-8?q?refactor(=E8=A7=86=E5=9B=BE):=20=E8=A1=A8?=
 =?UTF-8?q?=E6=A0=BC=E9=98=88=E5=80=BCnull=E4=B8=8E=E7=A9=BA=E5=AD=97?=
 =?UTF-8?q?=E7=AC=A6=E4=B8=B2=E5=90=88=E5=B9=B6=E6=88=90=E4=B8=80=E4=B8=AA?=
 =?UTF-8?q?=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/chart/chart/table/table-info.js    | 16 +++-------------
 .../senior/dialog/TableThresholdEdit.vue         | 10 ----------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/frontend/src/views/chart/chart/table/table-info.js b/frontend/src/views/chart/chart/table/table-info.js
index cdd4392bb4..563d5cac29 100644
--- a/frontend/src/views/chart/chart/table/table-info.js
+++ b/frontend/src/views/chart/chart/table/table-info.js
@@ -541,7 +541,7 @@ function mappingColor(value, defaultColor, field, type) {
       } else if (i === field.conditions.length - 1) {
         color = defaultColor
       }
-    } else if (field.field.deType === 0) {
+    } else if (field.field.deType === 0 || field.field.deType === 5) {
       const tv = t.value
       if (t.term === 'eq') {
         if (value === tv) {
@@ -564,22 +564,12 @@ function mappingColor(value, defaultColor, field, type) {
           flag = true
         }
       } else if (t.term === 'null') {
-        if (value === null || value === undefined) {
+        if (value === null || value === undefined || value === '') {
           color = t[type]
           flag = true
         }
       } else if (t.term === 'not_null') {
-        if (value !== null && value !== undefined) {
-          color = t[type]
-          flag = true
-        }
-      } else if (t.term === 'empty') {
-        if (value === '') {
-          color = t[type]
-          flag = true
-        }
-      } else if (t.term === 'not_empty') {
-        if (value !== '') {
+        if (value !== null && value !== undefined && value !== '') {
           color = t[type]
           flag = true
         }
diff --git a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
index f168f45f92..5bd2d2f710 100644
--- a/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
+++ b/frontend/src/views/chart/components/senior/dialog/TableThresholdEdit.vue
@@ -166,16 +166,6 @@ export default {
             value: 'not_null',
             label: this.$t('chart.filter_not_null')
           }]
-        },
-        {
-          label: '',
-          options: [{
-            value: 'empty',
-            label: this.$t('chart.filter_empty')
-          }, {
-            value: 'not_empty',
-            label: this.$t('chart.filter_not_empty')
-          }]
         }
       ],
       dateOptions: [

From 769ae00303a3ef5aeab88840cd32777e2922bf4c Mon Sep 17 00:00:00 2001
From: dataeaseShu <106045316+dataeaseShu@users.noreply.github.com>
Date: Fri, 29 Jul 2022 10:34:00 +0800
Subject: [PATCH 13/18] =?UTF-8?q?fix:=20=E8=A1=A8=E6=A0=BC=E7=BF=BB?=
 =?UTF-8?q?=E9=A1=B5=E6=A0=B7=E5=BC=8F=E7=BB=9F=E4=B8=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/styles/index.scss | 35 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 18 deletions(-)

diff --git a/frontend/src/styles/index.scss b/frontend/src/styles/index.scss
index 8dc0a4483b..1c9ef598e9 100644
--- a/frontend/src/styles/index.scss
+++ b/frontend/src/styles/index.scss
@@ -934,11 +934,11 @@ div:focus {
 .pagination-cont {
   text-align: right;
   margin-top: 10px;
-  ::v-deep .el-pager li {
-    background-color: #fff;
-    border: 1px solid #bbbfc4;
-    border-radius: 4px;
-    color: #1f2329;
+  .el-pager li {
+    background-color: #fff !important;
+    border: 1px solid #bbbfc4 !important;
+    border-radius: 4px !important;
+    color: #1f2329 !important;
     box-sizing: border-box;
     line-height: 26px;
     font-family: SF Pro Text;
@@ -946,33 +946,32 @@ div:focus {
     font-weight: 400;
   }
 
-  ::v-deep .btn-prev,
-  ::v-deep .btn-next {
-    background: #fff;
-    background-color: #fff;
-    border: 1px solid #bbbfc4;
-    border-radius: 4px;
-    color: #bbbfc4;
+  .btn-prev,
+  .btn-next {
+    background-color: #fff !important;
+    border: 1px solid #bbbfc4 !important;
+    border-radius: 4px !important;
+    color: #bbbfc4 !important;
   }
 
-  ::v-deep .el-pagination__total {
+  .el-pagination__total {
     font-family: "PingFang SC";
     font-style: normal;
     font-weight: 400;
     font-size: 14px;
     line-height: 22px;
-    color: #1f2329;
+    color: #1f2329 !important;
     line-height: 28px;
   }
 
-  ::v-deep .number.active,
-  ::v-deep .el-input__inner:hover {
-    border-color: #3370ff;
+  .number.active,
+  .el-input__inner:hover {
+    border-color: #3370ff !important;
     color: #3370ff !important;
     background-color: #fff !important;
   }
 
-  ::v-deep .el-icon-more {
+  .el-icon-more {
     border: none !important;
   }
 }
\ No newline at end of file

From 611ffb9ccbff8ea6439a34b65a6c2209973208cd Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Jul 2022 10:34:53 +0800
Subject: [PATCH 14/18] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=B8=8B=E9=92=BB=E5=8C=BA=E5=9F=9F=E7=9A=84=E7=BB=B4=E5=BA=A6?=
 =?UTF-8?q?=E4=B9=9F=E5=8F=AF=E4=BB=A5=E8=AE=BE=E7=BD=AE=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/panel/LinkJumpSet/index.vue | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/frontend/src/views/panel/LinkJumpSet/index.vue b/frontend/src/views/panel/LinkJumpSet/index.vue
index 270fd24073..d9cb6eb372 100644
--- a/frontend/src/views/panel/LinkJumpSet/index.vue
+++ b/frontend/src/views/panel/LinkJumpSet/index.vue
@@ -358,8 +358,8 @@ export default {
   methods: {
     init() {
       const chartDetails = JSON.parse(this.panelViewDetailsInfo[this.viewId])
-      const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt
-      const checkJumpStr = chartDetails.type.includes('table') ? checkAllAxisStr : chartDetails.xaxis + chartDetails.xaxisExt
+      const checkAllAxisStr = chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.yaxis + chartDetails.yaxisExt + chartDetails.drillFields
+      const checkJumpStr = chartDetails.type.includes('table') ? checkAllAxisStr : chartDetails.xaxis + chartDetails.xaxisExt + chartDetails.drillFields
 
       // 获取可关联的仪表板
       groupTree({}).then(rsp => {

From 9162b96fbee80a38e77e037bb9dc105985764584 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 29 Jul 2022 11:03:02 +0800
Subject: [PATCH 15/18] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86=E5=88=97=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/io/dataease/service/dataset/PermissionService.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
index 43794ed819..e7150ac2dd 100644
--- a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
@@ -196,7 +196,7 @@ public class PermissionService {
             List<DataSetColumnPermissionsDTO> deptColumnPermissionsDTOS = new ArrayList<>();
             for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) {
                 List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {}.getType());
-                if(!userIdList.contains(userId)){
+                if(CollectionUtils.isNotEmpty(userIdList) && !userIdList.contains(userId)){
                     deptColumnPermissionsDTOS.add(columnPermissionsDTO);
                 }
             }

From 226d70a2ee22e250418d008f984ae59bfc282c17 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Jul 2022 11:28:12 +0800
Subject: [PATCH 16/18] =?UTF-8?q?style(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E4=BB=AA=E8=A1=A8=E6=9D=BF=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?loading=E6=95=88=E6=9E=9C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/panel/panel.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/frontend/src/api/panel/panel.js b/frontend/src/api/panel/panel.js
index 0827fa10b1..9d0540c325 100644
--- a/frontend/src/api/panel/panel.js
+++ b/frontend/src/api/panel/panel.js
@@ -139,6 +139,7 @@ export function get(url) {
 export function delGroup(groupId) {
   return request({
     url: '/panel/group/deleteCircle/' + groupId,
+    loading: true,
     method: 'post'
   })
 }

From a9f6d0ac9833ed46ee66569da90c492f80021c51 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Fri, 29 Jul 2022 11:44:18 +0800
Subject: [PATCH 17/18] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E9=9B=86):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=9B=86sql=E5=8F=98=E9=87=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/dataset/DataSetTableService.java     | 16 ++++++++--------
 .../service/dataset/PermissionService.java       |  2 +-
 2 files changed, 9 insertions(+), 9 deletions(-)

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 22c7467a94..234ac51990 100644
--- a/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/DataSetTableService.java
@@ -1027,20 +1027,20 @@ public class DataSetTableService {
         }
         plainSelect.setWhere(CCJSqlParserUtil.parseCondExpression(stringBuilder.toString()));
 
-
         StringBuilder builder = new StringBuilder();
         if (CollectionUtils.isNotEmpty(select.getWithItemsList())) {
             builder.append("WITH");
             builder.append(" ");
-        }
-        for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) {
-            WithItem withItem = iter.next();
-            builder.append(withItem.toString());
-            if (iter.hasNext()) {
-                builder.append(",");
+            for (Iterator<WithItem> iter = select.getWithItemsList().iterator(); iter.hasNext();) {
+                WithItem withItem = iter.next();
+                builder.append(withItem.toString());
+                if (iter.hasNext()) {
+                    builder.append(",");
+                }
             }
         }
-        builder.append(plainSelect);
+
+        builder.append( " " + plainSelect);
         return builder.toString();
     }
 
diff --git a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
index e7150ac2dd..8498a80674 100644
--- a/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
+++ b/backend/src/main/java/io/dataease/service/dataset/PermissionService.java
@@ -183,7 +183,7 @@ public class PermissionService {
             for (DataSetColumnPermissionsDTO columnPermissionsDTO : columnPermissionService.searchPermissions(dataSetColumnPermissionsDTO)) {
                 columnPermissionsDTO.getWhiteListUser();
                 List<Long> userIdList = new Gson().fromJson(columnPermissionsDTO.getWhiteListUser(), new TypeToken<List<Long>>() {}.getType());
-                if(!userIdList.contains(userId)){
+                if(CollectionUtils.isNotEmpty(userIdList) && !userIdList.contains(userId)){
                     roleColumnPermissionsDTOS.add(columnPermissionsDTO);
                 }
             }

From d69b5756f5b1aca827bab3309e00e2ce3752beb6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 29 Jul 2022 11:54:29 +0800
Subject: [PATCH 18/18] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=9B=AE=E5=BD=95=E4=B9=9F=E5=8F=AF=E4=BB=A5?=
 =?UTF-8?q?=E9=80=9A=E8=BF=87=E9=A2=84=E8=A7=88=E7=BC=96=E8=BE=91=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E8=BF=9B=E5=85=A5=E4=BB=AA=E8=A1=A8=E6=9D=BF=E7=BC=96?=
 =?UTF-8?q?=E8=BE=91=E9=A1=B5=E9=9D=A2=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/views/panel/list/PanelList.vue b/frontend/src/views/panel/list/PanelList.vue
index 0bfe88dfb4..cb13e2b738 100644
--- a/frontend/src/views/panel/list/PanelList.vue
+++ b/frontend/src/views/panel/list/PanelList.vue
@@ -374,8 +374,7 @@ export default {
     bus.$off('newPanelFromMarket', this.newPanelFromMarket)
   },
   mounted() {
-    this.$store.commit('setComponentData', [])
-    this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
+    this.clearCanvas()
     this.defaultTree(true)
     this.initCache()
     const routerParam = this.$router.currentRoute.params
@@ -845,7 +844,9 @@ export default {
       this.searchType = searchTypeInfo
     },
     editFromPanelViewShow() {
-      this.edit(this.lastActiveNodeData, this.lastActiveNode)
+      this.$store.commit('setComponentData', [])
+      this.$store.commit('setCanvasStyle', DEFAULT_COMMON_CANVAS_STYLE_STRING)
+      bus.$emit('PanelSwitchComponent', { name: 'PanelEdit' })
     },
     editPanelBashInfo(params) {
       if (params.operation === 'status') {