Merge remote-tracking branch 'origin/dev' into dev

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"

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,

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
       }
     },

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) {

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) {