meixioacomponent 0.2.67 → 0.2.68

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.2.67",
+  "version": "0.2.68",
   "private": false,
   "author": "YuRi",
   "main": "lib/meixioacomponent.umd.min.js",

package/packages/components/proPageTable/oa_pro-table-search.vue

@@ -10,11 +10,11 @@
       <el-button
         size="medium"
         :class="{
-          'is-plain': !showProScreenList,
+          'is-plain': !proScreenCardShow,
         }"
-        :disabled="_proScreenList.length <= 0"
-        @click="handleProScreenList"
-        :type="showProScreenList ? 'selected' : 'info'"
+        :disabled="_proScreenList.length <= 0 && !proScreenCardShow"
+        @click="handleProScreenList(false)"
+        :type="proScreenCardShow ? 'selected' : 'info'"
         >{{ handleScreenText }} <i :class="handleScreenIcon"></i>
       </el-button>
       <el-button size="medium" plain type="info" @click="handleOpenProScreen">
@@ -23,7 +23,7 @@
       </el-button>
     </searchHeaderVue>
 
-    <div class="search-mid-content" v-show="showProScreenList">
+    <div class="search-mid-content" v-show="proScreenCardShow">
       <el-card class="box-card">
         <div class="box-card-title">
           <span class="tips-text">筛选条件</span>
@@ -106,11 +106,14 @@ export default {
     oa_pro_screen_itemVue,
   },
   computed: {
+    proScreenCardShow() {
+      return this._proScreenList.length > 0 && this.showProScreenList;
+    },
     handleScreenIcon() {
-      return this.showProScreenList ? "el-icon-arrow-up" : "el-icon-arrow-down";
+      return this.proScreenCardShow ? "el-icon-arrow-up" : "el-icon-arrow-down";
     },
     handleScreenText() {
-      return this.showProScreenList ? "收起筛选" : "展开筛选";
+      return this.proScreenCardShow ? "收起筛选" : "展开筛选";
     },
 
     _proScreenList() {
@@ -141,8 +144,13 @@ export default {
     handleSearch() {
       this.$parent.refreshData();
     },
-    handleProScreenList() {
-      this.showProScreenList = !this.showProScreenList;
+    handleProScreenList(flag = false) {
+      if (!flag) {
+        this.showProScreenList = !this.showProScreenList;
+      } else {
+        this.showProScreenList = true;
+      }
+
       this.computedHeight();
     },
     handleScreen(index) {
@@ -185,6 +193,13 @@ export default {
       ];
     },
   },
+  watch: {
+    proScreenCardShow(newVal, oldVal) {
+      if (!newVal) {
+        this.showProScreenList = false;
+      }
+    },
+  },
 };
 </script>
 

package/packages/components/proPageTable/oa_pro_table.vue

@@ -24,6 +24,7 @@
     <div class="oa-pro-table-search">
       <oa_pro_table_searchVue
         v-model="module"
+        ref="oaProTableSearch"
         :screenList="screenList"
         :placeholder="placeholder"
         :proScreenList="proScreenList"
@@ -447,7 +448,7 @@ export default {
     cellMouseEnter(row, column, cell, event) {
       let content = row[`${column.property}`];
       this.tooltip.show = false;
-      if (!content) return;
+      if (!content || typeof content == Boolean) return;
       const { tooltip } = this;
       let style = event.target;
       let position = style.getBoundingClientRect();
@@ -620,6 +621,7 @@ export default {
           plain: false,
           click: () => {
             this.dialogProscreenConfirm(true);
+            this.$refs.oaProTableSearch.handleProScreenList(true);
           },
         },
       ];