gm-printer 10.41.1 → 10.41.3-beta.0

package/src/editor_purchase/store.js

@@ -1,55 +1,71 @@
 import EditorStore from '../common/editor_store'
 import { action, observable } from 'mobx'
 import i18next from '../../locales'
+import { getDataKeySuffix, isLastColDataKey } from '../common/data_key_util'
+
+const getPurchaseDefaultDetailText = () =>
+  i18next.t('{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}')
+
+/** 创建/切换「单列-最后一列」时，明细列 text 应与 template_text 一致 */
+const resolveDetailTemplateText = (tableConfig, specialTableConfig) => {
+  const existing = tableConfig.specialConfig?.template_text
+  if (existing) return existing
+  if (specialTableConfig && specialTableConfig.defaultDetailText !== undefined) {
+    return specialTableConfig.defaultDetailText
+  }
+  return getPurchaseDefaultDetailText()
+}
+
+const syncLastColColumnText = (tableConfig) => {
+  if (!isLastColDataKey(tableConfig.dataKey)) return
+  const templateText = tableConfig.specialConfig?.template_text
+  if (!templateText) return
+  const specialCol = tableConfig.columns?.find((o) => o.isSpecialColumn)
+  if (specialCol) specialCol.text = templateText
+}
 
 class Store extends EditorStore {
   constructor({ defaultTableDataKey }) {
     super()
-    this.defaultTableDataKey = defaultTableDataKey // 修改默认dataKey
+    this.defaultTableDataKey = defaultTableDataKey
   }
 
   @observable
   customerTag = false
 
-  /* start---------设置采购明细相关--------- */
   @action.bound
-  setPurchaseTableKey(dataKey) {
-    // 先移除选中项,安全第一
+  init(config, data) {
+    super.init(config, data)
+    config?.contents?.forEach((tableConfig) => {
+      if (tableConfig?.type === 'table') syncLastColColumnText(tableConfig)
+    })
+  }
+
+  @action.bound
+  setPurchaseTableKey(dataKey, specialTableConfig) {
     this.selected = null
     this.setTableDataKey(dataKey)
 
     const arr = this.selectedRegion.split('.')
     const tableConfig = this.config.contents[arr[2]]
 
-    // 先去掉所有明细列
-    const newCols = tableConfig.columns.filter(o => !o.isSpecialColumn)
+    const newCols = tableConfig.columns.filter((o) => !o.isSpecialColumn)
     tableConfig.columns.replace(newCols)
 
-    // 单列-总表最后一列,在columns上修改
-    if (
-      dataKey === 'purchase_last_col' ||
-      dataKey === 'purchase_last_col_noLineBreak'
-    ) {
+    if (isLastColDataKey(dataKey)) {
+      const templateText = resolveDetailTemplateText(tableConfig, specialTableConfig)
       tableConfig.columns.push({
         head: i18next.t('明细'),
         headStyle: { textAlign: 'center' },
         style: { textAlign: 'left' },
         isSpecialColumn: true,
         separator: '+',
-        // detailsType: 'purchase_last_col',
         specialDetailsKey: '__details',
-        text: i18next.t(
-          '{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}'
-        )
+        text: templateText,
       })
-      // 通过detailsType属性区分单列-总表最后一列的数据是否换行展示
-      dataKey === 'purchase_last_col'
-        ? (tableConfig.columns[
-            tableConfig.columns.length - 1
-          ].detailLastColType = 'purchase_last_col')
-        : (tableConfig.columns[
-            tableConfig.columns.length - 1
-          ].detailLastColType = 'purchase_last_col_noLineBreak')
+      const suffix = getDataKeySuffix(dataKey)
+      tableConfig.columns[tableConfig.columns.length - 1].detailLastColType =
+        suffix === 'last_col' ? 'purchase_last_col' : 'purchase_last_col_noLineBreak'
     }
   }
 
@@ -59,13 +75,9 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.template_text = value
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.text = value
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.text = value
     }
   }
 
@@ -75,13 +87,9 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.style = value
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.style = value
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.style = value
     }
   }
 
@@ -91,17 +99,12 @@ class Store extends EditorStore {
     const tableConfig = this.config.contents[arr[2]]
 
     tableConfig.specialConfig.template_text += fieldText
-    // 单列-总表最后一列,在columns上修改
-    if (
-      tableConfig.dataKey === 'purchase_last_col' ||
-      tableConfig.dataKey === 'purchase_last_col_noLineBreak'
-    ) {
-      const specialCol = tableConfig.columns.find(o => o.isSpecialColumn)
-      specialCol.text += fieldText
+    if (isLastColDataKey(tableConfig.dataKey)) {
+      const specialCol = tableConfig.columns.find((o) => o.isSpecialColumn)
+      if (specialCol) specialCol.text += fieldText
     }
   }
 
-  /* end---------设置采购明细相关--------- */
   @action.bound
   switchCustomerTag(val) {
     const arr = this.selectedRegion.split('.')

package/src/printer/long_print_table/index.js

@@ -111,7 +111,8 @@ class Table extends React.Component {
       range,
       pageIndex,
       printerStore,
-      isSomeSubtotalTr
+      isSomeSubtotalTr,
+      isLastTablePage
     } = this.props
     // 数据
     dataKey = getDataKey(dataKey, arrange)
@@ -202,7 +203,8 @@ class Table extends React.Component {
                               ? printerStore.templateSpecialDetails(
                                   col,
                                   dataKey,
-                                  i
+                                  i,
+                                  config.specialConfig?.template_text
                                 )
                               : printerStore
                                   .templateTable(
@@ -227,6 +229,7 @@ class Table extends React.Component {
           range={range}
           config={config}
           printerStore={printerStore}
+          isLastTablePage={isLastTablePage}
         />
         <DiyOverallOrder
           range={range}
@@ -307,7 +310,8 @@ class Table extends React.Component {
                             ? printerStore.templateSpecialDetails(
                                 col,
                                 dataKey,
-                                i
+                                i,
+                                config.specialConfig?.template_text
                               )
                             : printerStore
                                 .templateTable(col.text, dataKey, i, pageIndex)
@@ -327,6 +331,7 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
+            isLastTablePage={isLastTablePage}
           />
           <DiyOverallOrder
             range={range}
@@ -385,7 +390,12 @@ Table.propTypes = {
   pageIndex: PropTypes.number.isRequired,
   placeholder: PropTypes.string,
   printerStore: PropTypes.object,
-  isSomeSubtotalTr: PropTypes.bool
+  isSomeSubtotalTr: PropTypes.bool,
+  isLastTablePage: PropTypes.bool
+}
+
+Table.defaultProps = {
+  isLastTablePage: true
 }
 
 export default Table

package/src/printer/printer.js

@@ -13,6 +13,20 @@ import MergePage from './merge_page'
 import { LONG_PRINT } from '../config'
 import Big from 'big.js'
 
+/** 当前 panel 是否为该表格 content 在全部分页中的最后一次出现 */
+const isLastTablePanel = (pages, pageIndex, panelIndexInPage, tableIndex) => {
+  for (let pi = pages.length - 1; pi >= 0; pi--) {
+    const page = pages[pi] || []
+    for (let pji = page.length - 1; pji >= 0; pji--) {
+      const p = page[pji]
+      if (p?.type === 'table' && p.index === tableIndex) {
+        return pi === pageIndex && pji === panelIndexInPage
+      }
+    }
+  }
+  return true
+}
+
 // Header Sign Footer 相对特殊，要单独处理
 const Header = props => (
   <Panel {...props} name='header' placeholder={i18next.t('页眉')} />
@@ -272,6 +286,12 @@ class Printer extends React.Component {
                         placeholder={`${i18next.t('区域')} ${panel.index}`}
                         pageIndex={i}
                         isSomeSubtotalTr={isSomeSubtotalTr}
+                        isLastTablePage={isLastTablePanel(
+                          printerStore.pages,
+                          i,
+                          ii,
+                          panel.index
+                        )}
                       />
                     )
 

package/src/printer/store.js

@@ -7,6 +7,7 @@ import {
   getArrayMid,
   getOverallOrderTrHeight
 } from '../util'
+import { isIndependentRolDataKey } from '../common/data_key_util'
 import _ from 'lodash'
 import Big from 'big.js'
 import { Tip } from '../components'
@@ -604,13 +605,14 @@ class PrinterStore {
    */
   templateTableRowSpan(text, dataKey, index, begin) {
     try {
-      if (
-        dataKey !== 'purchase_detail_one_row' &&
-        dataKey !== 'purchase_independent_rol_sku' &&
-        dataKey !== 'purchase_independent_rol_address' &&
-        dataKey !== 'taxRateSales' &&
-        dataKey !== 'ordinary'
-      ) {
+      // 采购 / 分拣「按明细单行」展开后才做合并单元格（后缀 independent_rol_*）
+      const canMerge =
+        isIndependentRolDataKey(dataKey) ||
+        dataKey === 'taxRateSales' ||
+        dataKey === 'ordinary' ||
+        dataKey === 'purchase_detail_one_row' ||
+        dataKey === 'sorting_detail_detail_one_row'
+      if (!canMerge) {
         return null
       }
       const list = this.data._table[dataKey] || this.data._table.orders
@@ -696,12 +698,15 @@ class PrinterStore {
     }
   }
 
-  templateSpecialDetails(col, dataKey, index) {
-    // 做好保护，出错就返回 text
+  templateSpecialDetails(col, dataKey, index, fallbackText = '') {
     const { specialDetailsKey, text, detailLastColType, separator } = col
+    const templateText = text || fallbackText
+    if (!templateText) return ''
     try {
       const row = this.data._table[dataKey][index]
-      const compiled = _.template(text, { interpolate: /{{([\s\S]+?)}}/g })
+      const compiled = _.template(templateText, {
+        interpolate: /{{([\s\S]+?)}}/g,
+      })
       let detailsList = row[specialDetailsKey] || []
 
       /** 简单处理下数据 */
@@ -724,7 +729,7 @@ class PrinterStore {
 
       return detailsList
     } catch (err) {
-      return text
+      return templateText
     }
   }
 

package/src/printer/table.js

@@ -169,7 +169,8 @@ class Table extends React.Component {
       range,
       pageIndex,
       printerStore,
-      isSomeSubtotalTr
+      isSomeSubtotalTr,
+      isLastTablePage
     } = this.props
     // 数据
     dataKey = getDataKey(dataKey, arrange)
@@ -411,7 +412,8 @@ class Table extends React.Component {
                             ? printerStore.templateSpecialDetails(
                                 col,
                                 dataKey,
-                                i
+                                i,
+                                config.specialConfig?.template_text
                               )
                             : printerStore
                                 .templateTable(col.text, dataKey, i, pageIndex)
@@ -445,6 +447,7 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
+            isLastTablePage={isLastTablePage}
           />
           <DiyOverallOrder
             range={range}
@@ -503,7 +506,12 @@ Table.propTypes = {
   pageIndex: PropTypes.number.isRequired,
   placeholder: PropTypes.string,
   printerStore: PropTypes.object,
-  isSomeSubtotalTr: PropTypes.bool
+  isSomeSubtotalTr: PropTypes.bool,
+  isLastTablePage: PropTypes.bool
+}
+
+Table.defaultProps = {
+  isLastTablePage: true
 }
 
 export default Table

package/src/printer/table_overallOrder_tr.js

@@ -12,54 +12,66 @@ const OverallOrder = props => {
     printerStore,
     printerStore: {
       data: { common }
-    }
+    },
+    isLastTablePage
   } = props
 
-  return (
+  // showEachPage 默认 true（老模板缺省视为每页展示）；false 时仅表格最后一页渲染
+  const showEachPage = overallOrder?.showEachPage !== false
+  const shouldShow =
     overallOrder?.show &&
-    printerStore?.ready && (
-      <tr>
-        {_.map(overallOrder.fields, (item, index) => {
-          return (
-            <td colSpan={item.colSpan} key={index}>
-              <div style={{ ...item.style }} className='gm-flex-page'>
-                {item.name}
-                <div
-                  className={classNames('gm-flex-page', {
-                    'gm-flex-justify-between-page':
-                      overallOrder?.isUpperLowerCaseSeparate,
-                    'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
-                  })}
+    printerStore?.ready &&
+    (showEachPage || isLastTablePage)
+
+  if (!shouldShow) return null
+
+  return (
+    <tr>
+      {_.map(overallOrder.fields, (item, index) => {
+        return (
+          <td colSpan={item.colSpan} key={index}>
+            <div style={{ ...item.style }} className='gm-flex-page'>
+              {item.name}
+              <div
+                className={classNames('gm-flex-page', {
+                  'gm-flex-justify-between-page':
+                    overallOrder?.isUpperLowerCaseSeparate,
+                  'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
+                })}
+              >
+                <span
+                  className={
+                    overallOrder?.isUpperCaseBefore
+                      ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                      : ''
+                  }
                 >
-                  <span
-                    className={
-                      overallOrder?.isUpperCaseBefore
-                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
-                        : ''
-                    }
-                  >
-                    {common?.[item.valueField] ?? ''}
+                  {common?.[item.valueField] ?? ''}
+                </span>
+                {overallOrder?.needUpperCase && (
+                  <span>
+                    {common?.[item.valueField]
+                      ? coverDigit2Uppercase(common[item.valueField])
+                      : ''}
                   </span>
-                  {overallOrder?.needUpperCase && (
-                    <span>
-                      {common?.[item.valueField]
-                        ? coverDigit2Uppercase(common[item.valueField])
-                        : ''}
-                    </span>
-                  )}
-                </div>
+                )}
               </div>
-            </td>
-          )
-        })}
-      </tr>
-    )
+            </div>
+          </td>
+        )
+      })}
+    </tr>
   )
 }
 OverallOrder.propTypes = {
   config: PropTypes.object.isRequired,
   range: PropTypes.object.isRequired,
-  printerStore: PropTypes.object
+  printerStore: PropTypes.object,
+  isLastTablePage: PropTypes.bool
+}
+
+OverallOrder.defaultProps = {
+  isLastTablePage: true
 }
 
 export default observer(OverallOrder)

package/src/printer/table_special_tr.js

@@ -25,6 +25,21 @@ const SpecialTr = ({ data, config }) => {
   } = specialConfig
   const { list, type, fixedSize } = data
 
+  // 「显示分类名称/小计文案修改」实时生效：数据行带 _prefix 原料时，按当前 specialConfig 重拼前缀
+  // 打印时配置与数据层拼前缀所用配置一致，重拼结果不变；编辑器预览改配置时实时刷新；导出（paint.js）不走本组件不受影响
+  const applySubtotalText = html => {
+    if (typeof html !== 'string' || data._prefix === undefined) {
+      return html
+    }
+    const showCategoryName = specialConfig?.showCategoryName ?? true
+    const subtotalText = specialConfig?.subtotalText ?? '小计'
+    const newPrefix = showCategoryName
+      ? `${data._categoryName ?? ''}${subtotalText}：`
+      : `${subtotalText}：`
+    // 前缀位于字符串头部，首次命中即替换；用函数替换避免 newPrefix 含 $ 序列时被特俗解释
+    return html.replace(data._prefix, () => newPrefix)
+  }
+
   let compiled
   try {
     compiled = _.template(template_text, { interpolate: /{{([\s\S]+?)}}/g })
@@ -119,7 +134,7 @@ const SpecialTr = ({ data, config }) => {
                 className='gm-flex-page gm-flex-justify-between-page'
                 style={{ 'justify-content': 'space-between' }}
                 dangerouslySetInnerHTML={{
-                  __html: htmlStr || data.text
+                  __html: applySubtotalText(htmlStr || data.text)
                 }}
               />
             </td>
@@ -145,7 +160,7 @@ const SpecialTr = ({ data, config }) => {
             colSpan={99}
             style={Object.assign({ fontWeight: 'bold' }, style)}
             dangerouslySetInnerHTML={{
-              __html: getHtml() || data.text
+              __html: applySubtotalText(getHtml() || data.text)
             }}
           />
         </tr>

package/src/printer/table_subtotal_tr.js

@@ -134,6 +134,93 @@ const SubtotalTr = props => {
         </tr>
       )
     } else {
+      // 单元格拆分展示：第一格（左侧文案+数值）拆分为两个单元格，对齐复用每页合计设置的 textAlign；
+      // 与打印账户总计金额支持共存（2026-09 交互确认）：拆分只作用于第一格，其余格按原 colSpan 渲染（与导出侧 paintSubtotal 行为一致）
+      if (get(subtotal, 'isSplitCells')) {
+        const item = fields[0]
+        // 第一格总 colSpan 拆一半给左侧文案，剩余给数值（colSpan 缺省 99 表示整行）；
+        // 宽度分配沿用原有逻辑：各格按 store 侧 fields[n].colSpan 照画，渲染端不调宽度
+        const totalColSpan = item.colSpan ?? 99
+        const leftColSpan = Math.floor(totalColSpan / 2)
+        const cellStyle = {
+          fontWeight: 'bold',
+          justifyContent: flexStyle[subtotal.style?.textAlign],
+          ...subtotal.style
+        }
+
+        return (
+          <tr>
+            <td colSpan={leftColSpan}>
+              <div style={cellStyle} className='gm-flex-page'>
+                {item.name}
+              </div>
+            </td>
+            <td colSpan={totalColSpan - leftColSpan}>
+              <div style={cellStyle} className='gm-flex-page'>
+                <div
+                  className={classNames('gm-flex-page', {
+                    'gm-flex-justify-between-page': isUpperLowerCaseSeparate,
+                    'gm-flex-grow-page': isUpperLowerCaseSeparate
+                  })}
+                >
+                  <span
+                    className={
+                      isUpperCaseBefore
+                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                        : ''
+                    }
+                  >
+                    {item.type === 'useSummarize'
+                      ? getData(item.valueField)
+                      : sumData2(list, item.valueField)}
+                  </span>
+                  {subtotal?.needUpperCase && (
+                    <span>
+                      {item.type === 'useSummarize'
+                        ? '大写：' +
+                          coverDigit2Uppercase(getData(item.valueField))
+                        : '大写：' +
+                          coverDigit2Uppercase(sumData2(list, item.valueField))}
+                    </span>
+                  )}
+                </div>
+              </div>
+            </td>
+            {/* 拆分只拆第一格；其余格（打印账户总计金额等）沿用普通多格渲染语义 */}
+            {_.map(fields.slice(1), (extra, extraIndex) => (
+              <td
+                colSpan={extra.colSpan ?? 99}
+                key={`split_extra_${extraIndex}`}
+              >
+                <div style={cellStyle} className='gm-flex-page'>
+                  {extra.name}
+                  <div
+                    className={classNames('gm-flex-page', {
+                      'gm-flex-justify-between-page': isUpperLowerCaseSeparate,
+                      'gm-flex-grow-page': isUpperLowerCaseSeparate
+                    })}
+                  >
+                    <span>
+                      {/* 账户总计金额等固定取数字段走 useSummarize；拆分场景其余格不参与当页求和 */}
+                      {extra.type === 'useSummarize'
+                        ? getData(extra.valueField)
+                        : ''}
+                    </span>
+                    {subtotal?.needUpperCase &&
+                      extra.type === 'useSummarize' && (
+                        <span>
+                          {'大写：' +
+                            coverDigit2Uppercase(getData(extra.valueField))}
+                        </span>
+                      )}
+                  </div>
+                </div>
+              </td>
+            ))}
+          </tr>
+        )
+      }
+
       return (
         <tr>
           {_.map(fields, (item, index) => {