gm-printer 10.14.3 → 10.14.4-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.14.3",
+  "version": "10.14.4-alpha.0",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/editor_store.js

@@ -156,14 +156,19 @@ class EditorStore {
 
     set(this.config, {
       autoFillConfig: {
-        region: this.selectedRegion,
+        region: this.selectedRegion || autoFillConfig?.region,
         dataKey,
         checked: isAutoFilling
       }
     })
-    if (isAutoFilling) {
+
+    const hasHadEmptyData = _.some(table, data => data?._isEmptyData)
+
+    // 开关打开，且之前数组不包含空数据，再进行填充
+    if (isAutoFilling && !hasHadEmptyData) {
       table.push(...this.getFilledTableData(table))
-    } else {
+    }
+    if (!isAutoFilling) {
       this.clearExtraTableData(dataKey)
       return
     }
@@ -861,14 +866,17 @@ class EditorStore {
   // 获得表格自定义行高
   @computed
   get computedTableCustomerRowHeight() {
-    if (this.selectedRegion) {
-      const arr = this.selectedRegion.split('.')
+    const _defaultRegion = this.config?.autoFillConfig?.region
+    let resHeight = 23
+    if (this.selectedRegion || _defaultRegion) {
+      const _selectedRegion = this.selectedRegion || _defaultRegion
+      const arr = _selectedRegion.split('.')
       if (arr.includes('table')) {
         const height = this.config.contents[arr[2]].customerRowHeight
-        return height === undefined ? 23 : height
+        resHeight = height === undefined ? 23 : height
       }
     }
-    return 23
+    return resHeight
   }
 
   @action.bound

package/src/printer/printer.js

@@ -183,7 +183,11 @@ class Printer extends React.Component {
                   content?.dataKey === autoFillConfig?.dataKey
 
                 const end = isAutofillConfig
-                  ? panel.end + Math.floor(remainPageHeight / TR_BASE_HEIGHT)
+                  ? panel.end +
+                    Math.floor(
+                      remainPageHeight /
+                        printerStore.computedTableCustomerRowHeight
+                    )
                   : panel.end
                 switch (panel.type) {
                   case 'table':