Merge branch 'dev' into pr@dev@refactor_filter_default_value

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

@@ -4,6 +4,7 @@
     v-if="options!== null && options.attrs!==null"
     :type="options.attrs.type"
     :round="options.attrs.round"
+    :size="size"
   >
     {{ options.value }}
   </el-button>
@@ -20,7 +21,8 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

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

@@ -9,8 +9,9 @@
     :end-placeholder="$t(element.options.attrs.endPlaceholder)"
     :placeholder="$t(element.options.attrs.placeholder)"
     :append-to-body="inScreen"
-    style="min-height: 36px;"
     value-format="timestamp"
+    :size="size"
+    :editable="false"
     @change="dateChange"
   />
 </template>
@@ -33,7 +34,8 @@ export default {
       type: Boolean,
       required: false,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

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

@@ -8,6 +8,7 @@
     @input="valueChange"
     @keypress.enter.native="search"
     @dblclick="setEdit"
+    :size="size"
   >
 
     <el-button slot="append" icon="el-icon-search" @click="search" />
@@ -26,7 +27,8 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

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

@@ -2,8 +2,9 @@
   <el-quarter
     v-if="options!== null && options.attrs!==null"
     v-model="options.value"
-
     :placeholder="options.attrs.placeholder"
+    :size="size"
+    :editable="false"
   />
 </template>
 
@@ -18,7 +19,8 @@ export default {
     inDraw: {
       type: Boolean,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

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

@@ -9,6 +9,7 @@
     :multiple="element.options.attrs.multiple"
     :placeholder="$t(element.options.attrs.placeholder)"
     :popper-append-to-body="inScreen"
+    :size="size"
     @change="changeValue"
     @focus="setOptionWidth"
   >
@@ -42,7 +43,8 @@ export default {
       type: Boolean,
       required: false,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {

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

@@ -35,7 +35,7 @@
         </span>
 
         <div v-if="activeTabName === item.name" class="de-tab-content">
-          <user-view v-if="item.content && item.content.propValue && item.content.propValue.viewId" :ref="item.name" :element="item.content" :out-style="outStyle" />
+          <user-view v-if="item.content && item.content.propValue && item.content.propValue.viewId" :ref="item.name" :in-tab="true" :is-edit="isEdit" :active="active" :element="item.content" :out-style="outStyle" />
         </div>
 
       </el-tab-pane>
@@ -94,6 +94,7 @@ import ViewSelect from '@/views/panel/ViewSelect'
 import { uuid } from 'vue-uuid'
 import bus from '@/utils/bus'
 import componentList from '@/components/canvas/custom-component/component-list'
+import { mapState } from 'vuex'
 
 export default {
   name: 'DeTabls',
@@ -107,6 +108,10 @@ export default {
       type: Boolean,
       default: true
     },
+    active: {
+      type: Boolean,
+      default: false
+    },
     outStyle: {
       type: Object,
       required: false,
@@ -129,11 +134,24 @@ export default {
       tabList: []
     }
   },
+  watch: {
+    curComponent: {
+      handler(newVal, oldVla) {
+        console.log(newVal)
+      },
+      deep: true
+    }
+  },
   created() {
     bus.$on('add-new-tab', this.addNewTab)
     this.tabList = this.element.options && this.element.options.tabList
     this.activeTabName = this.tabList[0].name
   },
+  computed: {
+    ...mapState([
+      'curComponent'
+    ])
+  },
   methods: {
     beforeHandleCommond(item, param) {
       return {

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

@@ -1,6 +1,6 @@
 <template>
 
-  <el-select v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" :popper-append-to-body="inScreen" @change="changeValue">
+  <el-select :size="size" v-if="options!== null && options.attrs!==null" v-model="values" :multiple="options.attrs.multiple" :placeholder="options.attrs.placeholder" :popper-append-to-body="inScreen" @change="changeValue">
     <el-option
       v-for="item in options.attrs.datas"
       :key="item[options.attrs.key]"
@@ -28,7 +28,8 @@ export default {
       type: Boolean,
       required: false,
       default: true
-    }
+    },
+    size: String
   },
   data() {
     return {