shijiplus-web-plugin 0.1.25 → 0.1.27

package/package.json

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

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

@@ -1,3 +1,4 @@
+/* eslint-disable no-undef */
 import PlusCircleProgressModal from './plus-circle-progress-modal.vue'
 export default {
   data() {
@@ -8,74 +9,162 @@ export default {
     }
   },
   methods: {
-    invokeExportExcel(searchForm, apiFunction, options = {}) {
-      const { exportDesc } = this.$merge({}, options)
-      const checkExportDataTotal = (searchForm) => {
-        return apiFunction({
+    // Helper function to generate a list of 4-hour intervals between startDate and endDate
+    getDateRange(startDate, endDate) {
+      const intervals = []
+      let currentDate = new Date(startDate)
+      const end = new Date(endDate)
+
+      while (currentDate <= end) {
+        const nextDate = new Date(currentDate)
+        nextDate.setHours(currentDate.getHours() + 4)
+        intervals.push({
+          start: new Date(currentDate),
+          end: nextDate > end ? new Date(end) : nextDate
+        })
+        currentDate = nextDate
+      }
+      return intervals
+    },
+
+    // Helper function to delay for a while
+    delay() {
+      return new Promise(resolve => setTimeout(resolve, 100))
+    },
+
+    // Format date to 'yyyy-MM-dd HH:mm:ss'
+    formatDate(date) {
+      const pad = (num) => (num < 10 ? '0' + num : num)
+      return `${date.getFullYear()}-${pad(date.getMonth() + 1)}-${pad(date.getDate())} ${pad(date.getHours())}:${pad(date.getMinutes())}:${pad(date.getSeconds())}`
+    },
+
+    // Function to fetch data for a specific 4-hour interval
+    async fetchDataForInterval(interval, searchForm, apiFunction) {
+      const intervalStart = this.formatDate(interval.start)
+      const intervalEnd = this.formatDate(interval.end)
+
+      // Query the total count for this interval
+      const intervalSearchForm = {
+        ...searchForm,
+        startDate: intervalStart,
+        endDate: intervalEnd,
+        pageNo: 1,
+        currentPage: 1,
+        pageSize: 1,
+        timestamp: new Date().getTime()
+      }
+      await this.delay()
+      const res = await apiFunction(intervalSearchForm)
+      const intervalTotalCount = res.meta ? res.meta.totalCount : (res.data || []).length
+
+      let intervalData = []
+      if (intervalTotalCount <= this.orderExportPageSize) {
+        // Fetch all data for the interval in one request
+        await this.delay()
+        const fetchRes = await apiFunction({
           ...searchForm,
+          startDate: intervalStart,
+          endDate: intervalEnd,
           pageNo: 1,
           currentPage: 1,
-          pageSize: 1
+          pageSize: intervalTotalCount
         })
-          .then((res) => {
-            if (res && res.meta) {
-              this.totalCount = res.meta.totalCount
-            } else {
-              this.totalCount = (res.data || []).length
-            }
+        intervalData = fetchRes.data || []
+      } else {
+        // Fetch data in batches (pagination)
+        const totalPages = Math.ceil(intervalTotalCount / this.orderExportPageSize)
+        for (let page = 1; page <= totalPages; page++) {
+          await this.delay()
+          const fetchRes = await apiFunction({
+            ...searchForm,
+            startDate: intervalStart,
+            endDate: intervalEnd,
+            pageNo: page,
+            currentPage: page,
+            pageSize: this.orderExportPageSize
           })
+          intervalData.push(...(fetchRes.data || []))
+        }
       }
-      let exportData = []
-      const excelExportFun = (pageNo, pageSize, processUpdate) => {
-        return apiFunction({
-          ...searchForm,
-          currentPage: pageNo,
-          pageNo: pageNo,
-          pageSize: pageSize
-        }).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) {
-            processUpdate(this.orderExportModalPercent)
-          }
-          if (exportData.length < this.totalCount) {
-            return excelExportFun(pageNo + 1, pageSize, processUpdate)
-          }
-          return exportData
-        }).catch((error) => {
-          console.log('--------error---------', error)
-          throw Error('导出失败')
-        })
-      }
-      return checkExportDataTotal(searchForm).then((res) => {
-        if (this.totalCount === 0) {
-          // 宏任务最后执行
+      return { intervalData, intervalTotalCount }
+    },
+
+    // Main export function
+    async invokeExportExcel(searchForm, apiFunction) {
+      // 3. Initialize the progress modal
+      const instance = this.$getComponentInstance(PlusCircleProgressModal)
+      instance.$on('on-close', () => {
+        setTimeout(() => {
+          this.$removeVComp(instance)
+        }, 500)
+      })
+      try {
+        // 0. Validate the date range (limit to 1 month)
+        const startDate = new Date(searchForm.startDate || searchForm.startTime || "")
+        const endDate = new Date(searchForm.endDate || searchForm.startTime || "")
+        const oneMonthInMs = 31 * 24 * 60 * 60 * 1000 // 1 个月的毫秒数
+
+        if (endDate - startDate > oneMonthInMs) {
           setTimeout(() => {
-            this.$Message.error('暂无数据,请搜索后重试', 3)
+            this.$Message.error('导出时间范围不能超过1个月，请调整后重试', 3)
           }, 0)
           return
         }
-        const processInstance = this.$getComponentInstance(PlusCircleProgressModal)
-        processInstance.$on('on-close', (e) => {
-          setTimeout(() => {
-            this.$removeVComp(processInstance)
-          }, 500)
-        })
-        processInstance.show({ exportDesc })
-        return excelExportFun(1, this.orderExportPageSize, (process) => {
-          processInstance.updatePercent(process)
-        }).catch(() => {
-          // 宏任务最后执行
+
+        // 1. Query the total count for the entire task
+        const checkExportDataTotal = async (searchForm) => {
+          await this.delay()
+          const res = await apiFunction({
+            ...searchForm,
+            pageNo: 1,
+            currentPage: 1,
+            pageSize: 1
+          })
+          this.totalCount = res.meta ? res.meta.totalCount : (res.data || []).length
+        }
+        await checkExportDataTotal(searchForm)
+
+        if (this.totalCount === 0) {
           setTimeout(() => {
-            this.$Message.error('导出失败', 3)
-            this.$removeVComp(processInstance)
+            this.$Message.error('暂无数据,请搜索后重试', 3)
           }, 0)
-        })
-      })
+          return
+        }
+
+        // 2. Get the 4-hour intervals from startDate to endDate
+        const intervals = this.getDateRange(startDate, endDate)
+
+        instance.show()
+
+        // 4. Fetch data interval by interval and update progress
+        let exportedCount = 0
+        let exportData = []
+        for (const interval of intervals) {
+          const { intervalData, intervalTotalCount } = await this.fetchDataForInterval(interval, searchForm, apiFunction)
+          exportData.push(...intervalData)
+          exportedCount += intervalData.length
+
+          // Update progress based on total count
+          this.orderExportModalPercent = (exportedCount / this.totalCount * 100).toFixed(2)
+          instance.updatePercent(this.orderExportModalPercent)
+        }
+
+        // 5. Export the data (logic omitted here, add your export implementation)
+        // console.log('Export data:', exportData)
+
+        return exportData
+
+        // 6. Close the progress modal
+        // instance.close()
+      } catch (error) {
+        console.error('导出失败:', error)
+        setTimeout(() => {
+          this.$Message.error('导出失败', 3)
+          if (instance) {
+            this.$removeVComp(instance)
+          }
+        }, 0)
+      }
     },
     exportAllData(searchForm, options = {}) {
       let exportData = []