meixioacomponent 0.2.67 → 0.2.70

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "meixioacomponent",
-  "version": "0.2.67",
+  "version": "0.2.70",
   "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) {
@@ -176,15 +184,19 @@ export default {
           type: "info",
           plain: true,
           click: () => {
-            this.$parent.cleanProscreenCondition();
-            this.$nextTick(() => {
-              this.$parent.refreshData();
-            });
+            this.$parent.cleanProscreenCondition(true);
           },
         },
       ];
     },
   },
+  watch: {
+    proScreenCardShow(newVal, oldVal) {
+      if (!newVal) {
+        this.showProScreenList = false;
+      }
+    },
+  },
 };
 </script>
 

package/packages/components/proPageTable/oa_pro_screen_item.vue

@@ -119,10 +119,13 @@ export default {
 
     deleteProscreen() {
       const { config } = this.$props;
-      let index = config.findIndex((configItem) => {
-        return configItem.key == this.item.key;
-      });
-      config[index].isCheck = false;
+      if (config) {
+        let index = config.findIndex((configItem) => {
+          return configItem.key == this.item.key;
+        });
+        config[index].isCheck = false;
+      }
+
       this.$emit("deleteProscreenItem");
     },
     trigerCheck(index, params) {

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"
@@ -231,6 +232,9 @@ export default {
 
       // 是否开启表格横向条纹
       borderRow: true,
+
+      // 倒计时
+      triggerDown: null,
     };
   },
   created() {
@@ -242,6 +246,7 @@ export default {
   },
   beforeDestroy() {
     componentConfig.eventBus.$off("handleTableBorder", this.handleTableBorder);
+    clearTimeout(this.triggerDown);
   },
   computed: {
     config() {
@@ -447,7 +452,8 @@ export default {
     cellMouseEnter(row, column, cell, event) {
       let content = row[`${column.property}`];
       this.tooltip.show = false;
-      if (!content) return;
+      if (typeof content == Boolean || typeof content == Object || !content)
+        return;
       const { tooltip } = this;
       let style = event.target;
       let position = style.getBoundingClientRect();
@@ -620,6 +626,7 @@ export default {
           plain: false,
           click: () => {
             this.dialogProscreenConfirm(true);
+            this.$refs.oaProTableSearch.handleProScreenList(true);
           },
         },
       ];
@@ -630,12 +637,14 @@ export default {
       if (this.$props.screenList) {
         let _screenListIndexItem =
           this.$props.screenList.list[this.$props.screenList.index];
-        result[`keyword`] = this.module;
         result[`${_screenListIndexItem.key}`] = _screenListIndexItem.value;
       }
-
+      result[`keyword`] = this.module;
       this.proScreenList.forEach((item) => {
-        result[`${item.key}`] = item.value;
+        const { key, value } = item;
+        if (typeof value == Number || typeof value == Boolean || value) {
+          result[`${key}`] = value;
+        }
       });
       result = Object.assign(result, this.$props.pageProps);
       return result;
@@ -650,24 +659,19 @@ export default {
       }
 
       let screenResult = this.returnProScreenResult();
-      this.$props.httpRequire(screenResult).then((res) => {
-        this.setTableData(res);
+      this.$props.httpRequire(screenResult).then((res, immediately = false) => {
+        this.setTableData(res, immediately);
       });
     },
     // 设置表格数据
-    setTableData(data) {
+    setTableData(data, immediately = false) {
       this.tableData = [];
-      setTimeout(() => {
-        this.tableData = data;
-        if (this.tableData.length == 0) {
-          this.defaultSvg = true;
-        }
-        this.loading = false;
-        this.computedTotalList();
-        this.$nextTick(() => {
-          this.scrollToTop();
-        });
-      }, 1000);
+      this.tableData = data;
+      if (immediately) {
+        this.tableDataCompleted();
+      } else {
+        this.setTriggerDown();
+      }
     },
 
     // 表格如果有滚动条将滚动条拉到顶部
@@ -685,11 +689,14 @@ export default {
       });
     },
     // 清空高级筛选的条件
-    cleanProscreenCondition() {
+    cleanProscreenCondition(flag = false) {
       if (this.proScreenList.length <= 0) return;
       this.proScreenList.forEach((item) => {
         item.value = null;
       });
+      if (flag) {
+        this.refreshData(true);
+      }
     },
     // 自定义表格的列
     setTableHeaderConfig(configList) {
@@ -706,7 +713,7 @@ export default {
           label: "",
           key: "noData",
           lock: false,
-          width: 80,
+          width: 30,
           show: true,
           template: false,
         });
@@ -761,10 +768,26 @@ export default {
     handleTableBorder(params) {
       this[`${params.key}`] = params.value;
     },
+
+    setTriggerDown() {
+      clearTimeout(this.triggerDown);
+      this.triggerDown = setTimeout(() => {
+        this.tableDataCompleted();
+      }, 1000);
+    },
+
+    tableDataCompleted() {
+      if (this.tableData.length == 0) {
+        this.defaultSvg = true;
+      }
+      this.loading = false;
+      this.computedTotalList();
+      this.$nextTick(() => {
+        this.scrollToTop();
+      });
+    },
   },
-  watch: {
-    fixedList(newValue, oldValue) {},
-  },
+  watch: {},
 };
 </script>