gm-printer 10.42.3 → 10.42.4-beta.1

package/package.json

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

package/src/common/editor_sort_setting.js

@@ -0,0 +1,143 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+import { observer, inject } from 'mobx-react'
+import i18next from '../../locales'
+import { Flex, Select, Option } from '../components'
+import { Title, Gap, Radio } from './component'
+
+// 排序方式常量，与宿主 sort_setting_util / 后端 parse_sort_setting 对齐
+// product_row_sort.field：'' 不排序 / tax_rate 税率 / box_num 箱号 / sort_num 行号
+const SORT_FIELD_LIST = [
+  { value: '', text: i18next.t('不排序') },
+  { value: 'tax_rate', text: i18next.t('税率') },
+  { value: 'box_num', text: i18next.t('箱号') },
+  { value: 'sort_num', text: i18next.t('行号') }
+]
+
+const SORT_DIRECTION_LIST = [
+  { value: 'asc', text: i18next.t('升序') },
+  { value: 'desc', text: i18next.t('降序') }
+]
+
+// order_sort.type：仅商户配送单模板提供（账户模板不渲染该组）
+const ORDER_SORT_LIST = [
+  { value: 'none', text: i18next.t('不排序') },
+  { value: 'asc', text: i18next.t('按订单时间升序') },
+  { value: 'desc', text: i18next.t('按订单时间降序') }
+]
+
+/**
+ * 「排序方式」配置类：归集「商品行排序」「单据内订单顺序」两组子配置
+ * 读写 editStore.config.sort_setting（mobx4 读取不存在的键不建立依赖，
+ * 宿主传入 config 前需保证 sort_setting 键存在，无配置时为 null）
+ */
+@inject('editStore')
+@observer
+class SortSettingField extends React.Component {
+  getProductRowSort() {
+    return this.props.editStore.config.sort_setting?.product_row_sort || {}
+  }
+
+  getOrderSortType() {
+    return this.props.editStore.config.sort_setting?.order_sort?.type || 'none'
+  }
+
+  setSortSetting(sortSetting) {
+    this.props.editStore.config.sort_setting = sortSetting
+  }
+
+  handleFieldChange = field => {
+    const productRowSort = { ...this.getProductRowSort(), field }
+    this.setSortSetting({
+      ...this.props.editStore.config.sort_setting,
+      product_row_sort: {
+        ...productRowSort,
+        direction: productRowSort.direction || 'asc'
+      }
+    })
+  }
+
+  handleDirectionChange = direction => {
+    this.setSortSetting({
+      ...this.props.editStore.config.sort_setting,
+      product_row_sort: { ...this.getProductRowSort(), direction }
+    })
+  }
+
+  handleOrderSortChange = type => {
+    this.setSortSetting({
+      ...this.props.editStore.config.sort_setting,
+      order_sort: { type }
+    })
+  }
+
+  render() {
+    const { showOrderSort } = this.props
+    const productRowSort = this.getProductRowSort()
+
+    return (
+      <div>
+        <Title title={i18next.t('排序方式')} />
+        <Gap height='5px' />
+        <Flex alignCenter className='gm-padding-top-5'>
+          <div>{i18next.t('商品行排序')}：</div>
+          <Select
+            className='gm-printer-edit-select'
+            value={productRowSort.field || ''}
+            onChange={this.handleFieldChange}
+          >
+            {_.map(SORT_FIELD_LIST, v => (
+              <Option key={v.value} value={v.value}>
+                {v.text}
+              </Option>
+            ))}
+          </Select>
+        </Flex>
+        <Flex alignCenter className='gm-padding-top-5'>
+          <div>{i18next.t('排序方向')}：</div>
+          <Select
+            className='gm-printer-edit-select'
+            value={productRowSort.direction || 'asc'}
+            onChange={this.handleDirectionChange}
+          >
+            {_.map(SORT_DIRECTION_LIST, v => (
+              <Option key={v.value} value={v.value}>
+                {v.text}
+              </Option>
+            ))}
+          </Select>
+        </Flex>
+        {showOrderSort && (
+          <>
+            <div className='gm-padding-top-5'>
+              {i18next.t('单据内订单顺序')}：
+            </div>
+            {_.map(ORDER_SORT_LIST, v => (
+              <Radio
+                key={v.value}
+                id={`sort_setting_order_${v.value}`}
+                value={v.text}
+                inputName='sort_setting_order_sort'
+                checked={this.getOrderSortType() === v.value}
+                radioChecked={this.handleOrderSortChange.bind(this, v.value)}
+              />
+            ))}
+          </>
+        )}
+        <Gap />
+      </div>
+    )
+  }
+}
+
+SortSettingField.propTypes = {
+  showOrderSort: PropTypes.bool,
+  editStore: PropTypes.object
+}
+
+SortSettingField.defaultProps = {
+  showOrderSort: false
+}
+
+export default SortSettingField

package/src/common/editor_store.js

@@ -238,7 +238,7 @@ class EditorStore {
           }
         }).join('/')
       } else {
-        return v.style ? v.style.height : ''
+        return v && v.style ? v.style.height : ''
       }
     }).join('_')
   }
@@ -1575,7 +1575,8 @@ class EditorStore {
     const table = this.config.contents[arr[2]]
     const prefix = getDataKeyPrefix(table.dataKey)
     // 切换「按商品/按商户排序」时保留已开启的商品分类、双栏后缀，避免点完分类再切排序把 category 冲掉
-    const baseSuffix = dataKey === 'goods' ? 'independent_rol_sku' : 'independent_rol_address'
+    const baseSuffix =
+      dataKey === 'goods' ? 'independent_rol_sku' : 'independent_rol_address'
     const nextDataKey = buildDataKey(
       prefix,
       `${baseSuffix}${getDataKeyModifierSuffix(table.dataKey)}`
@@ -1606,7 +1607,10 @@ class EditorStore {
 
       const { dataKey } = table
       // independent_rol_* / detail_one_row_*（含 category、multi 后缀）在下拉里都映射回「按采购明细单行」
-      if (isIndependentRolDataKey(dataKey) || isDetailOneRowSelectKey(dataKey)) {
+      if (
+        isIndependentRolDataKey(dataKey) ||
+        isDetailOneRowSelectKey(dataKey)
+      ) {
         return buildDataKey(getDataKeyPrefix(dataKey), 'detail_one_row')
       }
       return dataKey

package/src/editor/editor.js

@@ -9,6 +9,7 @@ import EditorTitle from '../common/editor_title'
 import EditorSelect from '../common/editor_select'
 import SpecialField from '../common/editor_special_field'
 import SpecialOtherField from '../common/editor_special_other_field'
+import SortSettingField from '../common/editor_sort_setting'
 import EditorField from '../common/editor_edit_field'
 import EditorAddField from '../common/editor_add_field'
 import EditorPageSummary from '../common/editor_page_summary'
@@ -88,6 +89,8 @@ class Editor extends React.Component {
             <Gap height='5px' />
             <SpecialField addFields={addFields} mockData={mockData} />
             <SpecialOtherField addFields={addFields} mockData={mockData} />
+            <Gap height='5px' />
+            <SortSettingField showOrderSort />
             <EditorCutomizedConfig />
             <Gap height='5px' />
             <EditorField

package/src/editor_account/editor.js

@@ -7,6 +7,7 @@ import editStore from './store'
 import { observer, inject } from 'mobx-react'
 import EditorTitle from '../common/editor_title'
 import EditorSelect from '../common/editor_select'
+import SortSettingField from '../common/editor_sort_setting'
 import EditorField from '../common/editor_edit_field'
 import EditorAddField from '../common/editor_add_field'
 import EditorCutomizedConfig from '../common/editor_customize_config'
@@ -55,6 +56,7 @@ class Editor extends React.Component {
             <Gap height='10px' />
             <EditorSelect />
             <Gap height='5px' />
+            <SortSettingField />
             <EditorCutomizedConfig />
             <Gap height='5px' />
             <EditorField showNewDate={showNewDate} />

package/src/printer/multi_column.js

@@ -5,6 +5,7 @@ export const INDEX_KEY = '序号'
 
 const SPECIAL_ROW_KEYS = [
   '_special',
+  '_specialText',
   '_diyCategorySubtotal',
   '_diyTagSubtotal',
   '_customTr'
@@ -105,7 +106,8 @@ export const flattenHorizontalPackedRows = (rows, colNumber) => {
 export const flattenVerticalSegment = (rows, colNumber) => {
   const columns = Array.from({ length: colNumber }, () => [])
   rows.forEach(row => {
-    if (isSpecialTableRow(row)) return
+    // _isEmptyData 行的序号可能被填充过，必须显式跳过，否则会被当真实商品吸收
+    if (isSpecialTableRow(row) || row._isEmptyData) return
     splitPackedRow(row, colNumber).forEach((item, col) => {
       if (isRealItem(item)) {
         columns[col].push(stripMultiSuffixFields(item))
@@ -115,6 +117,37 @@ export const flattenVerticalSegment = (rows, colNumber) => {
   return columns.reduce((list, col) => list.concat(col), [])
 }
 
+/** 按特殊行（分类小计/标题等）把整表切成若干「组」：相邻非特殊行的 run */
+export const splitRowsIntoGroups = rows => {
+  const groups = []
+  let start = -1
+  for (let i = 0; i <= (rows || []).length; i++) {
+    const isBoundary = i === rows.length || isSpecialTableRow(rows[i])
+    if (!isBoundary && start < 0) {
+      start = i
+    }
+    if (isBoundary) {
+      if (start >= 0) {
+        groups.push({ begin: start, end: i })
+      }
+      start = -1
+    }
+  }
+  return groups
+}
+
+/**
+ * 源表（单栏/横向多栏）按特殊行分组后逐组拍平 → 每组一个商品队列。
+ * 源表不会被 repack 改写，队列是纯函数，重复执行结果不变（幂等）。
+ */
+export const buildSourceGroupQueues = (rows, colNumber) =>
+  splitRowsIntoGroups(rows).map(group =>
+    flattenHorizontalPackedRows(
+      (rows || []).slice(group.begin, group.end),
+      colNumber
+    )
+  )
+
 const assignItemToRow = (row, item, suffix) => {
   const clean = stripMultiSuffixFields(item) || {}
   Object.keys(clean).forEach(key => {
@@ -441,39 +474,34 @@ export const renumberSegmentSerialsColumnMajor = (
 
 /**
  * 按分页区间把纵向多栏数据改成「每页先左后右」。
- * - 商品按序号灌满当前段左列再排右列（含空行的整段行数）
- * - 每一行都是新建对象，清除旧右列残留
- * - fillIndex 时整段按列重编序号，有数据/无数据同一套规则
+ * - 按特殊行（分类小计等）把整表切成若干组，每组一个商品队列：
+ *   商品只从本组队列取数，永不跨组 —— 奇数商品的组余数留在本组末段空格，
+ *   不会挤占下一组（修复分类合并错位）
+ * - 每组队列优先用外部传入的源表顺序（groupQueues；源表不被 repack 改写，
+ *   重复执行幂等）；缺失时按「各页段贡献」从当前行拼接（重排的不动点，
+ *   同样幂等，但首趟不做每页重排）
+ * - 特殊行钉在原地；非特殊行都是新建对象，清除旧右列残留
+ * - fillIndex 时整段按列重编序号，有数据/无数据同一套规则，序号跨段跨组连续
  */
 export const repackVerticalTableByPageRanges = (
   rows,
   colNumber,
   pageRanges,
   fillIndex = false,
-  sourceItems
+  groupQueues = null
 ) => {
   if (!rows?.length || !pageRanges?.length || colNumber < 2) return rows
-  const items = (sourceItems && sourceItems.length
-    ? sourceItems
-    : flattenVerticalSegment(rows, colNumber)
-  ).map(stripMultiSuffixFields)
 
-  if (!items.length && !fillIndex) return rows
-
-  // 全新数组，避免与旧行对象共享引用
-  const result = new Array(rows.length)
-  for (let k = 0; k < rows.length; k++) {
-    result[k] = rows[k]
-  }
+  const groups = splitRowsIntoGroups(rows)
+  // 全新数组，避免与旧行对象共享引用；特殊行沿用原引用（钉原地）
+  const result = rows.slice()
 
-  let consumed = 0
-  let nextSerial = 1
-  pageRanges.forEach(({ begin, end }) => {
+  // 页 range 与组边界取交集得到页段，并记录所属组
+  const segments = pageRanges.reduce((list, { begin, end }) => {
     const packEnd = Math.min(end, rows.length)
     let i = begin
     while (i < packEnd) {
       if (isSpecialTableRow(rows[i])) {
-        result[i] = rows[i]
         i++
         continue
       }
@@ -481,32 +509,60 @@ export const repackVerticalTableByPageRanges = (
       while (j < packEnd && !isSpecialTableRow(rows[j])) {
         j++
       }
-
-      const rowCount = j - i
-      if (rowCount <= 0) {
-        i = j
-        continue
+      if (j > i) {
+        list.push({
+          begin: i,
+          end: j,
+          groupIndex: groups.findIndex(g => i >= g.begin && i < g.end)
+        })
       }
+      i = j
+    }
+    return list
+  }, [])
+
+  const externalQueues = groupQueues || []
+  const queues = groups.map((_, gi) => {
+    const external = externalQueues[gi]
+    if (external && external.length) {
+      return external
+    }
+    return segments
+      .filter(s => s.groupIndex === gi)
+      .reduce(
+        (list, s) =>
+          list.concat(
+            flattenVerticalSegment(rows.slice(s.begin, s.end), colNumber)
+          ),
+        []
+      )
+  })
 
-      const capacity = rowCount * colNumber
-      const chunk = items.slice(consumed, consumed + capacity)
-      const packed = packVerticalNewspaper(chunk, colNumber, rowCount, false)
-      packed.forEach((row, offset) => {
-        result[i + offset] = row
-      })
-      consumed += chunk.length
-
-      if (fillIndex) {
-        nextSerial = renumberSegmentSerialsColumnMajor(
-          result,
-          i,
-          j,
-          colNumber,
-          nextSerial
-        )
-      }
+  if (!queues.some(q => q.length) && !fillIndex) return rows
 
-      i = j
+  const consumed = groups.map(() => 0)
+  let nextSerial = 1
+  segments.forEach(({ begin, end, groupIndex }) => {
+    const rowCount = end - begin
+    const queue = queues[groupIndex]
+    const chunk = queue.slice(
+      consumed[groupIndex],
+      consumed[groupIndex] + rowCount * colNumber
+    )
+    consumed[groupIndex] += chunk.length
+    packVerticalNewspaper(chunk, colNumber, rowCount, false).forEach(
+      (row, offset) => {
+        result[begin + offset] = row
+      }
+    )
+    if (fillIndex) {
+      nextSerial = renumberSegmentSerialsColumnMajor(
+        result,
+        begin,
+        end,
+        colNumber,
+        nextSerial
+      )
     }
   })
   return result

package/src/printer/store.js

@@ -29,7 +29,9 @@ import {
   packHorizontalRowMajor,
   createEmptyRows,
   createEmptyRowSkeleton,
-  resolveVerticalEmptyCount
+  isSpecialTableRow,
+  splitRowsIntoGroups,
+  buildSourceGroupQueues
 } from './multi_column'
 
 export const TR_BASE_HEIGHT = 23
@@ -669,13 +671,28 @@ class PrinterStore {
       // 无商品时仍可能需要给空行按列编序号
       if (!sourceItems.length && !this.fillIndex) return
 
+      // 源表按特殊行分组 → 每组一个商品队列：商品永不跨分类小计行
+      const groupQueues = buildSourceGroupQueues(sourceRows, sourceColNumber)
+      const verticalGroups = splitRowsIntoGroups(verticalRows)
+      const lastGroup = verticalGroups[verticalGroups.length - 1]
+      const lastGroupAllEmpty =
+        lastGroup &&
+        verticalRows
+          .slice(lastGroup.begin, lastGroup.end)
+          .every(row => row?._isEmptyData)
+      // 组数对齐（允许纵向表多一个纯空行尾组=行数填充产物）才用源表队列；
+      // 否则退回「按页段贡献」兜底：最坏不做每页重排，绝不会跨组串货
+      const aligned =
+        groupQueues.length === verticalGroups.length ||
+        (groupQueues.length === verticalGroups.length - 1 && lastGroupAllEmpty)
+
       const pageRanges = this.getTablePageRanges(contentIndex, verticalRows)
       this.data._table[verticalKey] = repackVerticalTableByPageRanges(
         verticalRows,
         colNumber,
         pageRanges,
         this.fillIndex,
-        sourceItems
+        aligned ? groupQueues : null
       )
       this.dataRevision += 1
     })
@@ -981,44 +998,16 @@ class PrinterStore {
     const emptyCount =
       emptyTable.length > 0 ? emptyTable.length : toFillEmptyCount
 
-    // 纵向多栏：源商品按对半行落位 + 追加空行；左列优先由 repack 按「数据行+空行」整段完成
+    // 纵向多栏：保留真实行（含分类小计等特殊行），仅追加空行补页；
+    // 每页先左后右、按组落位由随后的 repackVerticalMultiByPages 完成
     if (/_vertical$/.test(dataKey)) {
       const sourceKey = dataKey.replace(/_vertical$/, '')
-      const singleKey = sourceKey.replace(/_multi3?/, '')
       const colNumber = getMultiNumber(sourceKey)
-      // 横向源表缺失时先生成（双栏→三栏常见）
-      if (!this.data._table[sourceKey]?.length) {
-        this.ensureMultiTableData(sourceKey)
-      }
-      const sourceRows =
-        this.data._table[singleKey] || this.data._table[sourceKey] || []
-      const sourceColNumber = isMultiTable(singleKey)
-        ? getMultiNumber(singleKey)
-        : isMultiTable(sourceKey)
-        ? colNumber
-        : 1
-      const sourceItems = flattenHorizontalPackedRows(
-        sourceRows,
-        sourceColNumber
-      )
-      const baseRowCount = sourceItems.length
-        ? Math.max(1, Math.ceil(sourceItems.length / colNumber))
-        : 0
-      // 钉死总行：left-first repack 后 _isEmptyData 变少，不能用 emptyTable.length 回推
-      const emptyCount = resolveVerticalEmptyCount(
-        tableData.length,
-        baseRowCount,
-        emptyTable.length > 0
-          ? emptyTable.length
-          : this.getFilledTableData(table).length,
-        emptyTable.length > 0
+      const sample =
+        table.find(row => row && !isSpecialTableRow(row)) || tableData[0]
+      this.data._table[dataKey] = table.concat(
+        createEmptyRows(emptyCount, sample, colNumber)
       )
-      const dataRows = baseRowCount
-        ? packVerticalNewspaper(sourceItems, colNumber, baseRowCount, false)
-        : []
-      const sample = dataRows[0] || sourceRows[0]
-      const emptyRows = createEmptyRows(emptyCount, sample, colNumber)
-      this.data._table[dataKey] = dataRows.concat(emptyRows)
       return
     }