From 9ef9085847731adfd4326c596f806d4e648834fb Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 2 Nov 2022 12:04:09 +0800
Subject: [PATCH 1/3] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E5=A4=8D=E7=94=A8=E6=9F=A5=E8=AF=A2=E6=8C=89=E9=92=AE=E5=90=8E?=
 =?UTF-8?q?=E5=85=B3=E8=81=94=E7=BB=84=E4=BB=B6=E6=98=BE=E7=A4=BA=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/store/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/frontend/src/store/index.js b/frontend/src/store/index.js
index f6a2031416..7611becedd 100644
--- a/frontend/src/store/index.js
+++ b/frontend/src/store/index.js
@@ -623,6 +623,13 @@ const data = {
     },
     addCurMultiplexingComponent(state, { component, componentId }) {
       if (componentId) {
+        if (component.type === 'custom-button' && component.serviceName === 'buttonSureWidget') {
+          const copyComponent = deepCopy(component)
+          copyComponent.options.attrs.customRange = false
+          copyComponent.options.attrs.filterIds = []
+          state.curMultiplexingComponents[componentId] = copyComponent
+          return
+        }
         state.curMultiplexingComponents[componentId] = component
       }
     },

From 585bb76b0a160beb9a38f3254d0d47ba097296d2 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 2 Nov 2022 12:14:11 +0800
Subject: [PATCH 2/3] =?UTF-8?q?style(=E8=BF=87=E6=BB=A4=E5=99=A8):=20?=
 =?UTF-8?q?=E6=95=B0=E5=AD=97=E5=8C=BA=E9=97=B4=E8=BF=87=E6=BB=A4=E5=99=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/components/widget/DeWidget/DeNumberRange.vue      | 2 +-
 .../components/widget/serviceImpl/NumberRangeServiceImpl.js    | 3 +--
 frontend/src/views/panel/filter/filterMain/FilterControl.vue   | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/widget/DeWidget/DeNumberRange.vue b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
index d3340508dd..604be92167 100644
--- a/frontend/src/components/widget/DeWidget/DeNumberRange.vue
+++ b/frontend/src/components/widget/DeWidget/DeNumberRange.vue
@@ -24,7 +24,7 @@
       <span>{{ $t('denumberrange.split_placeholder') }}</span>
       <el-form-item
         prop="max"
-        style="padding-right: 0px;width: calc(50% - 6px) !important;"
+        style="padding-right: 0px;width: calc(50% - 4px) !important;"
       >
         <el-input
           ref="de-number-range-max"
diff --git a/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js b/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js
index 6228148554..9b1c1dca25 100644
--- a/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js
+++ b/frontend/src/components/widget/serviceImpl/NumberRangeServiceImpl.js
@@ -24,8 +24,7 @@ const dialogPanel = {
 const drawPanel = {
   type: 'custom',
   style: {
-    width: 500,
-    // height: 45.5,
+    width: 300,
     height: 90,
     fontSize: 14,
     fontWeight: 500,
diff --git a/frontend/src/views/panel/filter/filterMain/FilterControl.vue b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
index 721fa8e187..d4234d9e74 100644
--- a/frontend/src/views/panel/filter/filterMain/FilterControl.vue
+++ b/frontend/src/views/panel/filter/filterMain/FilterControl.vue
@@ -239,7 +239,7 @@ export default {
   watch: {
     'childViews.datasetParams': {
       handler(newName, oldName) {
-        if (this.attrs.parameters.length > 0 && this.attrs.parameters[0].indexOf('|DE|') === -1) {
+        if (this.attrs.parameters?.length && this.attrs.parameters[0].indexOf('|DE|') === -1) {
           const parameters = []
           for (var i = 0; i < this.attrs.parameters.length; i++) {
             if (this.attrs.parameters[i].indexOf('|DE|') === -1) {

From 402030fb7027e3387426a5803381b8518ffa9936 Mon Sep 17 00:00:00 2001
From: fit2cloud-chenyw <yawen.chen@fit2cloud.com>
Date: Wed, 2 Nov 2022 12:42:46 +0800
Subject: [PATCH 3/3] =?UTF-8?q?fix(=E4=B8=AA=E4=BA=BA=E4=BF=A1=E6=81=AF):?=
 =?UTF-8?q?=20=E7=BB=91=E5=AE=9A=E5=9B=BD=E9=99=85=E9=A3=9E=E4=B9=A6?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E7=BC=BA=E5=A4=B1=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E9=86=92?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/frontend/src/views/system/user/PrivateForm.vue b/frontend/src/views/system/user/PrivateForm.vue
index b02be6b8b9..23fb58b43c 100644
--- a/frontend/src/views/system/user/PrivateForm.vue
+++ b/frontend/src/views/system/user/PrivateForm.vue
@@ -255,7 +255,7 @@ export default {
   },
   methods: {
     showError() {
-      const errKeys = ['WecomError', 'DingtalkError', 'LarkError']
+      const errKeys = ['WecomError', 'DingtalkError', 'LarkError', 'LarksuiteError']
       errKeys.forEach(key => {
         const msg = Cookies.get(key)
         if (msg) {