shijiplus-web-plugin 0.1.55 → 0.1.57

package/package.json

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

package/src/components/begin-end-date-picker/begin-end-date-picker.vue

@@ -78,6 +78,16 @@ export default {
       // 结束日期的占位符
       default: '结束时间'
     },
+    initialDate: {
+      // 初始时间
+      type: [Object],
+      default() {
+        return {
+          begin: null,
+          end: null
+        }
+      }
+    },
     min: {
       // 允许的最小日期，可以是对象或字符串
       default() {
@@ -150,6 +160,19 @@ export default {
       deep: true,
       immediate: true
     },
+    initialDate: {
+      // 监听format属性变化
+      handler(val) {
+        if (val.begin) {
+          this.beginChange(this.$formatDate(val.begin, this.beginFormat))
+        }
+        if (val.end) {
+          this.endChange(this.$formatDate(val.end, this.endFormat))
+        }
+      },
+      deep: true,
+      immediate: true
+    },
     begin: {
       // 监听begin属性变化
       handler(val) {

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

@@ -159,13 +159,16 @@ export default {
         // 4. Fetch data interval by interval and update progress
         let exportedCount = 0
         let exportData = []
+        let index = 0
+        let totalSteps = intervals.length
         for (const interval of intervals) {
+          index++
           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)
+          this.orderExportModalPercent = (index / totalSteps * 100).toFixed(2)
           instance.updatePercent(this.orderExportModalPercent)
           if (this.orderExportModalPercent >= 100) {
             break