meixioacomponent 0.2.69 → 0.2.70

package/package.json

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

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

@@ -184,10 +184,7 @@ export default {
           type: "info",
           plain: true,
           click: () => {
-            this.$parent.cleanProscreenCondition();
-            this.$nextTick(() => {
-              this.$parent.refreshData();
-            });
+            this.$parent.cleanProscreenCondition(true);
           },
         },
       ];

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

@@ -232,6 +232,9 @@ export default {
 
       // 是否开启表格横向条纹
       borderRow: true,
+
+      // 倒计时
+      triggerDown: null,
     };
   },
   created() {
@@ -243,6 +246,7 @@ export default {
   },
   beforeDestroy() {
     componentConfig.eventBus.$off("handleTableBorder", this.handleTableBorder);
+    clearTimeout(this.triggerDown);
   },
   computed: {
     config() {
@@ -448,7 +452,8 @@ export default {
     cellMouseEnter(row, column, cell, event) {
       let content = row[`${column.property}`];
       this.tooltip.show = false;
-      if (!content || typeof content == Boolean) return;
+      if (typeof content == Boolean || typeof content == Object || !content)
+        return;
       const { tooltip } = this;
       let style = event.target;
       let position = style.getBoundingClientRect();
@@ -654,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();
+      }
     },
 
     // 表格如果有滚动条将滚动条拉到顶部
@@ -689,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) {
@@ -710,7 +713,7 @@ export default {
           label: "",
           key: "noData",
           lock: false,
-          width: 80,
+          width: 30,
           show: true,
           template: false,
         });
@@ -765,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>