shijiplus-web-plugin 0.1.13 → 0.1.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "shijiplus-web-plugin",
-  "version": "0.1.13",
+  "version": "0.1.14",
   "files": [
     "src"
   ],

package/src/components/plus-comp/plus-table/export-mixin.js

@@ -8,7 +8,8 @@ export default {
     }
   },
   methods: {
-    invokeExportExcel(searchForm, apiFunction) {
+    invokeExportExcel(searchForm, apiFunction, options = {}) {
+      const { exportDesc } = this.$merge({}, options)
       const checkExportDataTotal = (searchForm) => {
         return apiFunction({
           ...searchForm,
@@ -34,6 +35,8 @@ export default {
         }).then((res) => {
           if (res && res.data) {
             exportData.push(...res.data)
+          } else {
+            throw Error('导出失败')
           }
           this.orderExportModalPercent = (exportData.length / (this.totalCount || 1) * 100).toFixed(2)
           if (processUpdate) {
@@ -56,23 +59,77 @@ export default {
           }, 0)
           return
         }
-        const instance = this.$getComponentInstance(PlusCircleProgressModal)
-        instance.$on('on-close', (e) => {
+        const processInstance = this.$getComponentInstance(PlusCircleProgressModal)
+        processInstance.$on('on-close', (e) => {
           setTimeout(() => {
-            this.$removeVComp(instance)
+            this.$removeVComp(processInstance)
           }, 500)
         })
-        instance.show()
+        processInstance.show({ exportDesc })
         return excelExportFun(1, this.orderExportPageSize, (process) => {
-          instance.updatePercent(process)
+          processInstance.updatePercent(process)
         }).catch(() => {
           // 宏任务最后执行
           setTimeout(() => {
             this.$Message.error('导出失败', 3)
-            this.$removeVComp(instance)
+            this.$removeVComp(processInstance)
           }, 0)
         })
       })
+    },
+    exportAllData(searchForm, options = {}) {
+      let exportData = []
+      let totalCount = 0
+      const { apiFunction, exportDesc } = this.$merge({}, options)
+      const excelExportFun = (processUpdate) => {
+        return apiFunction({
+          ...searchForm
+        }).then((res) => {
+          if (res && res.data) {
+            totalCount = res.data.length
+            exportData.push(...res.data)
+          } else {
+            throw Error('导出失败')
+          }
+          let orderExportModalPercent = (exportData.length / (totalCount || 1) * 100).toFixed(2)
+          if (processUpdate) {
+            processUpdate(orderExportModalPercent)
+          }
+          if (exportData.length < totalCount) {
+            return excelExportFun(processUpdate)
+          }
+          return exportData
+        }).catch((error) => {
+          console.log('--------error---------', error)
+          throw Error('导出失败')
+        })
+      }
+      return new Promise((resolve, reject) => {
+        excelExportFun((process) => {
+          console.log('-------excelExport-----process--------', process)
+        }).then(data => {
+          resolve(data)
+        }).catch(() => {
+          // 宏任务最后执行
+          setTimeout(() => {
+            this.$Message.error('导出失败', 3)
+          }, 0)
+          reject(new Error('导出失败'))
+        })
+      })
+    },
+    createProcessInstance() {
+      const processInstance = this.$getComponentInstance(PlusCircleProgressModal)
+      processInstance.$on('on-close', (e) => {
+        setTimeout(() => {
+          this.$removeVComp(processInstance)
+        }, 500)
+      })
+      processInstance.show()
+      return processInstance
+    },
+    destroyProcessInstance(processInstance) {
+      processInstance.handlerClose()
     }
   }
 }

package/src/components/plus-comp/plus-table/plus-table.vue

@@ -24,7 +24,10 @@
         </div>
       </div>
     </div>
-    <slot name="table">
+    <div ref="headerRef">
+      <slot name="header"></slot>
+    </div>
+    <slot name="table" :pageData="pageData" :height="height">
       <Table
         :style="tableStyle"
         :columns="showColumns"
@@ -209,6 +212,9 @@ export default {
           if (this.$refs.searchAreaRef) {
             tHeight -= this.$refs.searchAreaRef.clientHeight
           }
+          if (this.$refs.headerRef) {
+            tHeight -= this.$refs.headerRef.clientHeight
+          }
           if (this.$refs.footerRef) {
             tHeight -= this.$refs.footerRef.clientHeight
           }