gm-printer 10.42.0 → 10.42.2-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.42.0",
+  "version": "10.42.2-beta.0",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/data_key_util.js

@@ -19,14 +19,33 @@ export function buildDataKey(prefix, suffix) {
   return `${prefix}${suffix}`
 }
 
-/** 下拉选中「按明细单行」时的 value（detail_one_row） */
+/** 下拉选中「按明细单行」时的 value（detail_one_row），可带 category/multi 等后缀 */
 export function isDetailOneRowSelectKey(dataKey) {
-  return getDataKeySuffix(dataKey) === 'detail_one_row'
+  const suffix = getDataKeySuffix(dataKey)
+  return suffix === 'detail_one_row' || suffix.startsWith('detail_one_row_')
 }
 
+/** 独立滚动明细单行（sku/address），可带 category/multi 等后缀 */
 export function isIndependentRolDataKey(dataKey) {
   const suffix = getDataKeySuffix(dataKey)
-  return suffix === 'independent_rol_sku' || suffix === 'independent_rol_address'
+  return (
+    suffix === 'independent_rol_sku' ||
+    suffix === 'independent_rol_address' ||
+    suffix.startsWith('independent_rol_sku_') ||
+    suffix.startsWith('independent_rol_address_')
+  )
+}
+
+/**
+ * 从现有 dataKey 抽出可叠加修饰后缀（category / multi）
+ * 用于切换 goods/merchant 排序时保留右键「商品分类」「双栏」状态
+ */
+export function getDataKeyModifierSuffix(dataKey) {
+  const parts = getDataKeySuffix(dataKey).split('_').filter(Boolean)
+  const modifiers = []
+  if (parts.includes('category')) modifiers.push('category')
+  if (parts.includes('multi')) modifiers.push('multi')
+  return modifiers.length ? `_${modifiers.join('_')}` : ''
 }
 
 export function isLastColDataKey(dataKey) {

package/src/common/editor_store.js

@@ -14,6 +14,7 @@ import {
 import { accountRadioList } from './util'
 import {
   buildDataKey,
+  getDataKeyModifierSuffix,
   getDataKeyPrefix,
   isDetailOneRowSelectKey,
   isIndependentRolDataKey
@@ -1573,13 +1574,16 @@ class EditorStore {
     const arr = this.selectedRegion.split('.')
     const table = this.config.contents[arr[2]]
     const prefix = getDataKeyPrefix(table.dataKey)
+    // 切换「按商品/按商户排序」时保留已开启的商品分类、双栏后缀，避免点完分类再切排序把 category 冲掉
+    const baseSuffix = dataKey === 'goods' ? 'independent_rol_sku' : 'independent_rol_address'
+    const nextDataKey = buildDataKey(
+      prefix,
+      `${baseSuffix}${getDataKeyModifierSuffix(table.dataKey)}`
+    )
 
     set(table, {
       purchaseSettingKey: dataKey,
-      dataKey:
-        dataKey === 'goods'
-          ? buildDataKey(prefix, 'independent_rol_sku')
-          : buildDataKey(prefix, 'independent_rol_address'),
+      dataKey: nextDataKey,
       detail_sort_type: 0
     })
   }
@@ -1601,7 +1605,8 @@ class EditorStore {
       const table = this.config.contents[arr[2]]
 
       const { dataKey } = table
-      if (isIndependentRolDataKey(dataKey)) {
+      // independent_rol_* / detail_one_row_*（含 category、multi 后缀）在下拉里都映射回「按采购明细单行」
+      if (isIndependentRolDataKey(dataKey) || isDetailOneRowSelectKey(dataKey)) {
         return buildDataKey(getDataKeyPrefix(dataKey), 'detail_one_row')
       }
       return dataKey

package/src/editor_purchase/editor_special_table.js

@@ -16,7 +16,9 @@ import _ from 'lodash'
 import { inject, observer } from 'mobx-react'
 import {
   buildDataKey,
+  getDataKeyModifierSuffix,
   getDataKeyPrefix,
+  getDataKeySuffix,
   isDetailOneRowSelectKey,
 } from '../common/data_key_util'
 
@@ -90,19 +92,23 @@ class TableDetailEditor extends React.Component {
           .replace(/{{([^.\s}]+)}}/g, '{{列.$1}}')
       }
       const prefix = getDataKeyPrefix(config.dataKey)
-      const rolSkuKey = buildDataKey(prefix, 'independent_rol_sku')
-      const rolAddressKey = buildDataKey(prefix, 'independent_rol_address')
+      const curSuffix = getDataKeySuffix(config.dataKey)
+      const modifier = getDataKeyModifierSuffix(config.dataKey)
+      // 已是对应 independent_rol_*（含 category/multi）则不再重设，避免冲掉商品分类
       if (
         config.purchaseSettingKey === 'goods' &&
-        config.dataKey !== rolSkuKey
+        !curSuffix.startsWith('independent_rol_sku')
       ) {
-        editStore.setPurchaseTableKey(rolSkuKey, addFields.specialTableConfig)
+        editStore.setPurchaseTableKey(
+          buildDataKey(prefix, `independent_rol_sku${modifier}`),
+          addFields.specialTableConfig
+        )
       } else if (
         config.purchaseSettingKey === 'merchant' &&
-        config.dataKey !== rolAddressKey
+        !curSuffix.startsWith('independent_rol_address')
       ) {
         editStore.setPurchaseTableKey(
-          rolAddressKey,
+          buildDataKey(prefix, `independent_rol_address${modifier}`),
           addFields.specialTableConfig
         )
       }

package/src/printer/panel.js

@@ -49,10 +49,15 @@ class Panel extends React.Component {
       diffY = -diffY
     }
 
+    // 高度不允许拖成负数：负 height 是非法 CSS，浏览器按 0 渲染，
+    // 但分页的配置兜底会取到负值，导致末页预留为负、内容溢出与固定页脚重叠
+    const height =
+      Math.max(0, parseInt(pxAdd(config.style.height, diffY), 10)) + 'px'
+
     dispatchMsg('gm-printer-panel-style-set', {
       name,
       style: {
-        height: pxAdd(config.style.height, diffY)
+        height
       }
     })
   }

package/src/printer/store.js

@@ -9,7 +9,10 @@ import {
   getArrayMid,
   getOverallOrderTrHeight
 } from '../util'
-import { isIndependentRolDataKey } from '../common/data_key_util'
+import {
+  isDetailOneRowSelectKey,
+  isIndependentRolDataKey
+} from '../common/data_key_util'
 import _ from 'lodash'
 import Big from 'big.js'
 import { Tip } from '../components'
@@ -245,7 +248,9 @@ class PrinterStore {
     const raw = this.config?.sign?.style?.height
     if (raw == null || raw === '') return 0
     const parsed = parseFloat(raw)
-    return Number.isFinite(parsed) ? parsed : 0
+    // 负高度（编辑器历史版本可拖出如 -161px）会让末页签名预留为负，
+    // 单页虚增可容纳高度，固定页脚时表格溢出与页脚重叠；非正值一律按 0
+    return parsed > 0 ? parsed : 0
   }
 
   /** 处理采购单的明细
@@ -741,13 +746,12 @@ class PrinterStore {
    */
   templateTableRowSpan(text, dataKey, index, begin) {
     try {
-      // 采购 / 分拣「按明细单行」展开后才做合并单元格（后缀 independent_rol_*）
+      // 采购 / 分拣「按明细单行」展开后才做合并单元格（后缀 independent_rol_* / detail_one_row_*，含 category）
       const canMerge =
         isIndependentRolDataKey(dataKey) ||
+        isDetailOneRowSelectKey(dataKey) ||
         dataKey === 'taxRateSales' ||
-        dataKey === 'ordinary' ||
-        dataKey === 'purchase_detail_one_row' ||
-        dataKey === 'sorting_detail_detail_one_row'
+        dataKey === 'ordinary'
       if (!canMerge) {
         return null
       }