Merge branch 'dev' into pr@dev_eslint_auto_fix

frontend/src/components/widget/DeWidget/DeDate.vue

@@ -35,6 +35,10 @@ import customInput from '@/components/widget/DeWidget/customInput'
 export default {
   mixins: [customInput],
   props: {
+    canvasId: {
+      type: String,
+      required: true
+    },
     element: {
       type: Object,
       default: null
@@ -221,6 +225,7 @@ export default {
     },
     getCondition() {
       const param = {
+        canvasId: this.canvasId,
         component: this.element,
         value: this.formatFilterValue(),
         operator: this.operator

frontend/src/components/widget/DeWidget/DeInputSearch.vue

@@ -27,6 +27,10 @@ import bus from '@/utils/bus'
 export default {
 
   props: {
+    canvasId: {
+      type: String,
+      required: true
+    },
     element: {
       type: Object,
       default: null
@@ -104,6 +108,7 @@ export default {
     },
     getCondition() {
       const param = {
+        canvasId: this.canvasId,
         component: this.element,
         value: !this.value ? [] : Array.isArray(this.value) ? this.value : [this.value],
         operator: this.operator

frontend/src/components/widget/DeWidget/DeNumberRange.vue

@@ -47,6 +47,10 @@ import bus from '@/utils/bus'
 export default {
 
   props: {
+    canvasId: {
+      type: String,
+      required: true
+    },
     element: {
       type: Object,
       default: null
@@ -230,6 +234,7 @@ export default {
     },
     getCondition() {
       const param = {
+        canvasId: this.canvasId,
         component: this.element,
         value: [this.form.min, this.form.max],
         operator: this.operator

frontend/src/components/widget/DeWidget/DeSelect.vue

@@ -52,6 +52,10 @@ export default {
   components: { ElVisualSelect },
   mixins: [customInput],
   props: {
+    canvasId: {
+      type: String,
+      required: true
+    },
     element: {
       type: Object,
       default: () => {}
@@ -311,6 +315,7 @@ export default {
     },
     getCondition() {
       const param = {
+        canvasId: this.canvasId,
         component: this.element,
         value: this.formatFilterValue(),
         operator: this.operator

frontend/src/components/widget/DeWidget/DeSelectGrid.vue

@@ -73,6 +73,10 @@ import { attrsMap, styleAttrs, textSelectGridWidget } from '@/components/widget/
 
 export default {
   props: {
+    canvasId: {
+      type: String,
+      required: true
+    },
     element: {
       type: Object,
       default: null
@@ -312,6 +316,7 @@ export default {
     },
     getCondition() {
       const param = {
+        canvasId: this.canvasId,
         component: this.element,
         value: this.formatFilterValue(),
         operator: this.operator

frontend/src/components/widget/DeWidget/DeSelectTree.vue

@@ -36,6 +36,10 @@ export default {
   components: { ElTreeSelect },
   mixins: [customInput],
   props: {
+    canvasId: {
+      type: String,
+      required: true
+    },
     element: {
       type: Object,
       default: () => {}
@@ -298,6 +302,7 @@ export default {
       const val = this.formatFilterValue()
 
       const param = {
+        canvasId: this.canvasId,
         component: this.element,
         value: val,
         operator: this.operator,

frontend/src/components/widget/DeWidget/DeTabs.vue

@@ -45,14 +45,6 @@
                 {{ $t('detabs.eidttitle') }}
               </el-dropdown-item>
 
-              <el-dropdown-item :command="beforeHandleCommand('selectView', item)">
-                {{ $t('detabs.selectview') }}
-              </el-dropdown-item>
-
-              <el-dropdown-item :command="beforeHandleCommand('selectOthers', item)">
-                {{ $t('detabs.selectOthers') }}
-              </el-dropdown-item>
-
               <el-dropdown-item
                 v-if=" element.options.tabList.length > 1"
                 :command="beforeHandleCommand('deleteCur', item)"