meixioacomponent 0.3.82 → 0.3.85

package/package.json

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

package/packages/components/proPageTable/oa_pro_table.vue

@@ -655,27 +655,28 @@ export default {
       clearTimeout(this.triggerDown)
       if (init) {
         this.$props.pageProps[this.$props.pageConfig.page] = 1
-        this.module = ''
       }
 
-      let screenResult = this.returnProScreenResult()
-      this.$props.httpRequire(screenResult).then((res) => {
-        let isArray = res instanceof Array
-        if (isArray) {
-          this.setTableData(res)
-        } else {
-          const tableData = res.tableData
-          if (
-            res._class.__proto__.__proto__.constructor.name ==
-              'LinkViewClass' &&
-            !this._linkViewClassSubs
-          ) {
-            this._linkViewClassSubs = res._class
-          }
-          if (tableData) {
-            this.setTableData(tableData)
+      this.$nextTick(() => {
+        let screenResult = this.returnProScreenResult()
+        this.$props.httpRequire(screenResult).then((res) => {
+          let isArray = res instanceof Array
+          if (isArray) {
+            this.setTableData(res)
+          } else {
+            const tableData = res.tableData
+            if (
+              res._class.__proto__.__proto__.constructor.name ==
+                'LinkViewClass' &&
+              !this._linkViewClassSubs
+            ) {
+              this._linkViewClassSubs = res._class
+            }
+            if (tableData) {
+              this.setTableData(tableData)
+            }
           }
-        }
+        })
       })
     },
     // 设置表格数据
@@ -707,7 +708,6 @@ export default {
     },
     // 清空高级筛选的条件
     cleanProscreenCondition(flag = false) {
-      if (this.proScreenList.length <= 0) return
       this.proScreenList.forEach((item) => {
         item.value = null
       })
@@ -717,7 +717,6 @@ export default {
     },
     // 自定义表格的列
     setTableHeaderConfig(configList) {
-      console.log(configList)
       let leftFixedList = []
       let rightFixedList = []
       const { tableConfig } = this.$props
@@ -861,6 +860,13 @@ export default {
 
       return index == tableConfig.length - 1
     },
+    // 重置的表格查询方法
+    resetTable() {
+      this.module = ''
+      this.$nextTick(() => {
+        this.cleanProscreenCondition(true)
+      })
+    },
   },
 }
 </script>

package/src/component/test.vue

@@ -1,4 +1,4 @@
-<template>
+<!-- <template>
   <base-dialog
     ref="dialog"
     :modal="true"
@@ -166,7 +166,7 @@ export default {
     transform: translateY(-50%);
   }
 }
-</style>
+</style> -->
 
 <!-- <template>
   <base-drawer
@@ -312,9 +312,10 @@ export default {
 }
 </style> -->
 
-<!-- <template>
+<template>
   <div class="page-table-wrap" ref="pageTableWrap" v-if="show">
     <base-pro-table
+      ref="table"
       :align="`left`"
       v-model="keyWords"
       :height="pageHeight"
@@ -327,7 +328,6 @@ export default {
       :headerConfig="headerConfig"
       :totalPropsList="totalPropsList"
       :proScreenConfig="proScreenConfig"
-
     >
       <template>
         <base-icon
@@ -339,7 +339,9 @@ export default {
 
         <template slot="headerExtend">
           <el-button type="primary" size="medium">新建客户</el-button>
-          <el-button type="info" plain size="small">查重</el-button>
+          <el-button type="info" plain size="small" @click="test">
+            查重
+          </el-button>
         </template>
 
         <el-dropdown slot="suffix" trigger="click">
@@ -526,6 +528,7 @@ export default {
   components: {},
   methods: {
     async httpRequire(screenCofig) {
+      console.log(screenCofig);
       companyInfoConfig.setTable()
       try {
         // result = await test(screenCofig);
@@ -547,6 +550,9 @@ export default {
     rowClick(row) {
       console.log(row)
     },
+    test() {
+      this.$refs.table.refreshData(true)
+    },
   },
 }
 </script>
@@ -557,7 +563,7 @@ export default {
   height: 100%;
   background: inherit;
 }
-</style> -->
+</style>
 
 <!-- 普通表单 -->