gm-printer 10.39.4-beta.2 → 10.41.0

package/package.json

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

package/src/common/editor_customize_config.js

@@ -24,9 +24,6 @@ class EditorCutomizedConfig extends React.Component {
   handleFillIndex = value => {
     const { editStore } = this.props
     editStore.setFillIndex(value)
-    if (editStore.isAutoFilling) {
-      editStore.handleChangeTableData(true)
-    }
   }
 
   handleTaxFreeProductRateDisplay = e => {

package/src/common/editor_edit_field.js

@@ -19,7 +19,7 @@ import {
 } from '../common/component'
 import { get, toJS } from 'mobx'
 import PropTypes from 'prop-types'
-import { subtotalRadioList } from './util'
+import { subtotalRadioList, overallOrderRadioList } from './util'
 import { LONG_PRINT } from '../config'
 import _ from 'lodash'
 
@@ -529,7 +529,7 @@ class EditorField extends React.Component {
         {!isSomeSubtotalTr && (
           <div>
             <Flex>{i18next.t('合计栏打印金额')}：</Flex>
-            <Flex style={{ marginLeft: 57 }}>
+            <Flex style={{ marginLeft: 57 }} wrap>
               {subtotalRadioList.map(fields => {
                 // 兼容
                 let subtotalFields = subtotal?.fields?.[0].valueField
@@ -627,8 +627,14 @@ class EditorField extends React.Component {
             onChange={this.handleOverallOrderStyleChange}
           />
         </Flex>
-        <Flex style={{ marginLeft: 57 }}>
-          {subtotalRadioList.map((fields, i) => {
+        <EditorSubtotalCheck
+          subtotalCheckDisabled
+          subtotalChecked={overallOrder?.showEachPage !== false}
+          subtotalCheckOnChange={editStore.setOverallOrderShowEachPage}
+          subtotalCheckText='每页展示'
+        />
+        <Flex style={{ marginLeft: 57 }} wrap>
+          {overallOrderRadioList.map((fields, i) => {
             return (
               <Radio
                 style={{ marginLeft: 5 }}

package/src/common/editor_store.js

@@ -2,30 +2,10 @@ import i18next from '../../locales'
 import { action, computed, observable, set, toJS } from 'mobx'
 import { pageTypeMap } from '../config'
 import _ from 'lodash'
-import {
-  dispatchMsg,
-  getBlockName,
-  exchange,
-  getColSpanLength,
-  isMultiTable,
-  getDataKey,
-  getMultiNumber
-} from '../util'
+import { dispatchMsg, getBlockName, exchange, getColSpanLength } from '../util'
 import { accountRadioList } from './util'
 import React from 'react'
 import { createDiySummaryStoreMethods } from './diy_summary_helper'
-import {
-  detectColNumber,
-  fillEmptyRowIndex,
-  fillPartialLastRow,
-  getMaxSerial,
-  flattenHorizontalPackedRows,
-  packVerticalNewspaper,
-  packHorizontalRowMajor,
-  createEmptyRows,
-  createEmptyRowSkeleton,
-  resolveVerticalEmptyCount
-} from '../printer/multi_column'
 
 class EditorStore {
   @observable
@@ -221,7 +201,6 @@ class EditorStore {
               vv.columns.length +
               vv.className +
               vv.dataKey +
-              (vv.arrange || 'lateral') +
               vv.subtotal.show +
               vv.summaryConfig?.pageSummaryShow +
               vv.customerRowHeight
@@ -261,57 +240,14 @@ class EditorStore {
     tr_count = Math.floor(
       this.remainPageHeihgt / this.computedTableCustomerRowHeight
     )
-    if (tr_count <= 0) return []
 
-    const sample = (tableData || []).find(item => item && !item._isEmptyData)
-    const dataKey =
-      this.computedTableSpecialConfig?.dataKey || autoFillConfig?.dataKey
-    const colNumber = detectColNumber(dataKey, tableData)
-    return createEmptyRows(tr_count, sample, colNumber)
-  }
-
-  /** 多栏表缺失时（如双栏切三栏），从单栏/双栏源表现场打包到 mockData */
-  @action
-  ensureMockMultiTable(dataKey) {
-    if (!dataKey || !isMultiTable(dataKey)) return
-    if (!this.mockData._table) {
-      this.mockData._table = {}
-    }
-    if (this.mockData._table[dataKey]?.length) return
-
-    const isVertical = /_vertical$/.test(dataKey)
-    const sourceKey = dataKey.replace(/_vertical$/, '')
-    const colNumber = getMultiNumber(sourceKey)
-    const singleKey = sourceKey.replace(/_multi3?/, '')
-
-    let sourceRows = this.mockData._table[singleKey]
-    let sourceColNumber = 1
-    if (!sourceRows?.length && /multi3/.test(sourceKey)) {
-      const dualKey = sourceKey.replace('multi3', 'multi')
-      sourceRows = this.mockData._table[dualKey]
-      sourceColNumber = 2
-    }
-    if (!sourceRows?.length) {
-      sourceRows = this.mockData._table[sourceKey]
-      sourceColNumber = isMultiTable(sourceKey) ? colNumber : 1
-    }
-    if (!sourceRows?.length) {
-      this.mockData._table[dataKey] = []
-      return
+    const filledData = {
+      _isEmptyData: true // 表示是填充的空白数据
     }
-
-    const sourceItems = flattenHorizontalPackedRows(
-      sourceRows,
-      sourceColNumber
-    )
-    const baseRowCount = sourceItems.length
-      ? Math.max(1, Math.ceil(sourceItems.length / colNumber))
-      : 0
-    this.mockData._table[dataKey] = !baseRowCount
-      ? []
-      : isVertical
-        ? packVerticalNewspaper(sourceItems, colNumber, baseRowCount, false)
-        : packHorizontalRowMajor(sourceItems, colNumber)
+    _.map(tableData[0], (val, key) => {
+      filledData[key] = ''
+    })
+    return Array(tr_count).fill(filledData)
   }
 
   @action.bound
@@ -320,6 +256,9 @@ class EditorStore {
     if (!this.selectedRegion && !autoFillConfig?.checked) return
     const dataKey =
       this.computedTableSpecialConfig?.dataKey || autoFillConfig?.dataKey
+    // 每次都更新一下？
+    const table = this.mockData._table[dataKey]
+    // 赋值一下
     this.setAutoFillingConfig(isAutoFilling)
     this.setFillIndex(autoFillConfig?.fillIndex || false)
     set(this.config, {
@@ -332,112 +271,24 @@ class EditorStore {
       }
     })
 
-    if (dataKey && isMultiTable(dataKey)) {
-      this.ensureMockMultiTable(dataKey)
-      this.ensureMockMultiTable(getDataKey(dataKey, 'vertical'))
-    }
+    const hasHadEmptyData = _.some(table, data => data?._isEmptyData)
 
-    const syncEmptyRows = key => {
-      if (!this.mockData._table?.[key]) return
-      const list = this.mockData._table[key]
-      const hasHadEmptyData = _.some(list, data => data?._isEmptyData)
-      if (isAutoFilling && !hasHadEmptyData) {
-        list.push(...this.getFilledTableData(list))
-      }
-      if (!isAutoFilling) {
-        this.clearExtraTableData(key)
-        return
-      }
-      this.mockData._table[key] = list
-    }
-
-    const numberEmptyRows = key => {
-      const list = this.mockData._table?.[key]
-      if (!list) return
-      const table = list.filter(item => !item._isEmptyData)
-      const emptyTable = list.filter(item => item._isEmptyData)
-      // 纵向表：对半数据行 + 空行占位；左列优先交给 Printer.repack
-      if (/_vertical$/.test(key)) {
-        const sourceKey = key.replace(/_vertical$/, '')
-        const singleKey = sourceKey.replace(/_multi3?/, '')
-        const colNumber = getMultiNumber(sourceKey)
-        const sourceRows =
-          this.mockData._table[singleKey] ||
-          this.mockData._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
-        // 钉死总行：repack 后 _isEmptyData 会变少，不能再用 emptyTable.length
-        const emptyCount = resolveVerticalEmptyCount(
-          list.length,
-          baseRowCount,
-          emptyTable.length > 0
-            ? emptyTable.length
-            : this.getFilledTableData(list).length,
-          emptyTable.length > 0
-        )
-        const dataRows = baseRowCount
-          ? packVerticalNewspaper(sourceItems, colNumber, baseRowCount, false)
-          : []
-        const sample = dataRows[0] || sourceRows[0]
-        this.mockData._table[key] = dataRows.concat(
-          createEmptyRows(emptyCount, sample, colNumber)
-        )
-        return
-      }
-      const colNumber = detectColNumber(key, list)
-      const withPartial = fillPartialLastRow(table, colNumber, this.fillIndex)
-      const lastKey = getMaxSerial(withPartial, colNumber) + 1
-      const sample = table[0]
-      this.mockData._table[key] = withPartial.concat(
-        emptyTable.map((item, index) =>
-          fillEmptyRowIndex(
-            {
-              ...createEmptyRowSkeleton(sample, colNumber),
-              ...item,
-              _isEmptyData: true
-            },
-            index,
-            lastKey,
-            colNumber,
-            this.fillIndex
-          )
-        )
-      )
-    }
-
-    syncEmptyRows(dataKey)
-    if (dataKey && isMultiTable(dataKey)) {
-      const verticalKey = getDataKey(dataKey, 'vertical')
-      if (!this.mockData._table[verticalKey]) {
-        this.mockData._table[verticalKey] = []
-      }
-      syncEmptyRows(verticalKey)
+    // 开关打开，且之前数组不包含空数据，再进行填充
+
+    if (isAutoFilling && !hasHadEmptyData) {
+      table.push(...this.getFilledTableData(table))
     }
-    if (isAutoFilling) {
-      numberEmptyRows(dataKey)
-      if (dataKey && isMultiTable(dataKey)) {
-        numberEmptyRows(getDataKey(dataKey, 'vertical'))
-      }
+    if (!isAutoFilling) {
+      this.clearExtraTableData(dataKey)
+      return
     }
+    this.mockData._table[dataKey] = table
   }
 
   @action
   clearExtraTableData(dataKey) {
-    if (!this.mockData._table?.[dataKey]) return
-    this.mockData._table[dataKey] = this.mockData._table[dataKey].filter(
-      x => !x._isEmptyData
-    )
+    const newTable = this.mockData._table[dataKey].filter(x => !x._isEmptyData)
+    this.mockData._table[dataKey] = newTable
   }
 
   @action
@@ -692,44 +543,12 @@ class EditorStore {
     for (const [key, table] of Object.entries(tableData)) {
       tableData[key] = table.filter(x => !x._isEmptyData)
     }
-    // 纵向 left-fill 后商品行数 > 对半行且无 _isEmptyData，只滤空行会留下偏多行，
-    // 重挂载测高/remain 偏小，多栏切换后空行补不回来。收回到对半商品行。
-    Object.keys(tableData).forEach(key => {
-      if (!/_vertical$/.test(key) || !isMultiTable(key)) return
-      this.collapseVerticalMultiToBaseRows(key)
-    })
+    // this.setAutoFillingConfig(false)
     set(this.mockData, {
       _table: tableData
     })
   }
 
-  /** 纵向多栏收到「对半」商品行，去掉 left-fill 撑开的多余行 */
-  @action
-  collapseVerticalMultiToBaseRows(key) {
-    const sourceKey = key.replace(/_vertical$/, '')
-    const singleKey = sourceKey.replace(/_multi3?/, '')
-    const colNumber = getMultiNumber(sourceKey)
-    const sourceRows =
-      this.mockData._table[singleKey] ||
-      this.mockData._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
-    this.mockData._table[key] = baseRowCount
-      ? packVerticalNewspaper(sourceItems, colNumber, baseRowCount, false)
-      : []
-  }
-
   @action
   addConfigBlock(name, type, pos = {}, link = '') {
     let blocks
@@ -954,6 +773,10 @@ class EditorStore {
       set(table.overallOrder, {
         show: !table.overallOrder.show
       })
+      // 老模板补默认：每页展示默认勾选
+      if (table.overallOrder.showEachPage === undefined) {
+        set(table.overallOrder, { showEachPage: true })
+      }
       table.overallOrder.fields[0].colSpan =
         colSpanLength - (table.overallOrder.fields?.[1]?.colSpan ?? 0)
     } else {
@@ -961,6 +784,7 @@ class EditorStore {
       set(table, {
         overallOrder: {
           show: true,
+          showEachPage: true,
           fields: [
             {
               name: '整单合计：',
@@ -977,6 +801,19 @@ class EditorStore {
     this.config = toJS(this.config)
   }
 
+  // 整单合计「每页展示」
+  @action.bound
+  setOverallOrderShowEachPage() {
+    if (!this.selectedRegion) return
+    const arr = this.selectedRegion.split('.')
+    const table = this.config.contents[arr[2]]
+    if (!table?.overallOrder) return
+    this.overallOrderShow = !this.overallOrderShow
+    const next = !(table.overallOrder.showEachPage !== false)
+    set(table.overallOrder, { showEachPage: next })
+    this.config = toJS(this.config)
+  }
+
   @action
   setDiyOverallOrderShow(name) {
     const arr = name.split('.')
@@ -1114,34 +951,12 @@ class EditorStore {
 
     this.config.contents[arr[2]].dataKey = newDataKey.join('_')
 
-    // 双栏↔三栏等切换时，mock 可能缺对应 _table，现场兜底生成，避免整表空白
-    const joinedKey = newDataKey.join('_')
-    if (isMultiTable(joinedKey)) {
-      this.ensureMockMultiTable(joinedKey)
-      this.ensureMockMultiTable(getDataKey(joinedKey, 'vertical'))
-    }
-
     // 整单合计不显示
     if (overallOrder?.show) overallOrder.show = false
     // 每页合计不显示
     if (subtotal?.show) subtotal.show = false
     // 自定义每页合计不显示
     if (diyOverallOrder?.show) diyOverallOrder.show = false
-
-    // 分类/多栏切换：清空旧空行并同步 autoFillConfig.dataKey，Printer 重挂载后会重补
-    if (this.isAutoFilling || this.config?.autoFillConfig?.checked) {
-      this.clearAllTableEmptyData()
-      this.setAutoFillingConfig(true)
-      set(this.config, {
-        autoFillConfig: {
-          ...(this.config.autoFillConfig || {}),
-          region: this.selectedRegion || this.config.autoFillConfig?.region,
-          dataKey: joinedKey,
-          checked: true,
-          fillIndex: this.fillIndex
-        }
-      })
-    }
   }
 
   @action
@@ -1581,26 +1396,10 @@ class EditorStore {
     if (this.selectedRegion) {
       const arr = this.selectedRegion.split('.')
       if (arr.includes('table')) {
-        const table = this.config.contents[arr[2]]
         this.config.contents[arr[2]] = {
-          ...table,
+          ...this.config.contents[arr[2]],
           arrange: val
         }
-        // 只改排列并清掉旧空行；保持填充开关，交给 Printer 重挂载后
-        //「先补空 → 再重新分页」恢复空行（勿在此处用旧 remainHeight 立刻补）
-        if (this.isAutoFilling || this.config?.autoFillConfig?.checked) {
-          this.clearAllTableEmptyData()
-          this.setAutoFillingConfig(true)
-          set(this.config, {
-            autoFillConfig: {
-              ...(this.config.autoFillConfig || {}),
-              region: this.selectedRegion,
-              dataKey: table.dataKey,
-              checked: true,
-              fillIndex: this.fillIndex
-            }
-          })
-        }
       }
     }
   }
@@ -2038,6 +1837,7 @@ class EditorStore {
         set(table, {
           overallOrder: {
             show: true,
+            showEachPage: true,
             fields: [
               {
                 name: '整单合计：',

package/src/common/util.js

@@ -1,10 +1,9 @@
 import i18next from '../../locales'
 
 /**
- * 每页合计设置单选按钮
- * id的值是用来计算每页的金额总数，不要轻易随便改
+ * 每页合计金额单选
+ * id 与 data_to_key 中文 key 对齐，用于对本页行求和，不要轻易改 id
  */
-// 整单合计和每页合计栏都使用的这个
 const subtotalRadioList = [
   {
     value: i18next.t('下单金额'),
@@ -17,6 +16,61 @@ const subtotalRadioList = [
   {
     value: i18next.t('实际金额'),
     id: '实际金额'
+  },
+  {
+    value: i18next.t('变化前金额'),
+    id: '变化前金额'
+  },
+  {
+    value: i18next.t('下单金额（不含税）'),
+    id: '下单金额_不含税'
+  },
+  {
+    value: i18next.t('实收金额'),
+    id: '实收金额'
+  },
+  {
+    value: i18next.t('实收金额（不含税）'),
+    id: '实收金额_不含税'
+  }
+]
+
+/**
+ * 整单合计金额单选（比每页合计多「出库金额（不含税）」）
+ * id 与 data.common 中文 key 对齐，取订单已算金额，不重算
+ */
+const overallOrderRadioList = [
+  {
+    value: i18next.t('下单金额'),
+    id: '下单金额'
+  },
+  {
+    value: i18next.t('出库金额'),
+    id: '出库金额'
+  },
+  {
+    value: i18next.t('实际金额'),
+    id: '实际金额'
+  },
+  {
+    value: i18next.t('变化前金额'),
+    id: '变化前金额'
+  },
+  {
+    value: i18next.t('下单金额（不含税）'),
+    id: '下单金额_不含税'
+  },
+  {
+    value: i18next.t('出库金额（不含税）'),
+    id: '出库金额_不含税'
+  },
+  {
+    value: i18next.t('实收金额'),
+    id: '实收金额'
+  },
+  {
+    value: i18next.t('实收金额（不含税）'),
+    id: '实收金额_不含税'
   }
 ]
 
@@ -26,4 +80,4 @@ const accountRadioList = {
   实际金额: i18next.t('实际金额')
 }
 
-export { subtotalRadioList, accountRadioList }
+export { subtotalRadioList, overallOrderRadioList, accountRadioList }

package/src/editor_purchase/editor_special_table.js

@@ -57,8 +57,11 @@ const detailSortOptionsForMerchant = [
 @observer
 class TableDetailEditor extends React.Component {
   handleDataKeyChange = dataKey => {
-    const { editStore } = this.props
-    editStore.setPurchaseTableKey(dataKey)
+    const { editStore, addFields } = this.props
+    editStore.setPurchaseTableKey(
+      dataKey,
+      addFields.specialTableConfig
+    )
   }
 
   handlePurchaseSettingKeyChange = dataKey => {
@@ -74,7 +77,7 @@ class TableDetailEditor extends React.Component {
   }
 
   handleDetailAddField = ({ key, value }) => {
-    const { editStore, config } = this.props
+    const { editStore, config, addFields } = this.props
     if (editStore.computedDataKey === 'purchase_detail_one_row') {
       // 序号 {{列.序号}}
       const transform = str => {
@@ -86,12 +89,18 @@ class TableDetailEditor extends React.Component {
         config.purchaseSettingKey === 'goods' &&
         config.dataKey !== 'purchase_independent_rol_sku'
       ) {
-        editStore.setPurchaseTableKey('purchase_independent_rol_sku')
+        editStore.setPurchaseTableKey(
+          'purchase_independent_rol_sku',
+          addFields.specialTableConfig
+        )
       } else if (
         config.purchaseSettingKey === 'merchant' &&
         config.dataKey !== 'purchase_independent_rol_address'
       ) {
-        editStore.setPurchaseTableKey('purchase_independent_rol_address')
+        editStore.setPurchaseTableKey(
+          'purchase_independent_rol_address',
+          addFields.specialTableConfig
+        )
       }
 
       editStore.addFieldToTable({ key, value: transform(value) })
@@ -113,7 +122,7 @@ class TableDetailEditor extends React.Component {
 
   render() {
     const {
-      addFields: { detailFields },
+      addFields: { detailFields, specialTableConfig = {} },
       editStore
     } = this.props
     const {
@@ -123,18 +132,28 @@ class TableDetailEditor extends React.Component {
       specialConfig: { template_text, style }
     } = this.props.config
 
+    const title = specialTableConfig.title || i18next.t('设置采购明细')
+    const label = specialTableConfig.label || i18next.t('采购明细')
+    // 外部可整体覆盖下拉选项（dataKeyList），否则按 hideDataKeys 过滤默认列表
+    const baseDataKeyList = specialTableConfig.dataKeyList || dataKeyList
+    const hideDataKeys = specialTableConfig.hideDataKeys || []
+    const visibleDataKeyList = _.filter(
+      baseDataKeyList,
+      v => !hideDataKeys.includes(v.value)
+    )
+
     return (
       <div>
-        <Title title={i18next.t('设置采购明细')} />
+        <Title title={title} />
         <Gap />
         <Flex alignCenter className='gm-padding-top-5'>
-          <div>{i18next.t('采购明细')}：</div>
+          <div>{label}：</div>
           <Select
             className='gm-printer-edit-select'
             value={editStore.computedDataKey}
             onChange={this.handleDataKeyChange}
           >
-            {_.map(dataKeyList, v => (
+            {_.map(visibleDataKeyList, v => (
               <Option key={v.value} value={v.value}>
                 {v.text}
               </Option>

package/src/editor_purchase/store.js

@@ -13,7 +13,7 @@ class Store extends EditorStore {
 
   /* start---------设置采购明细相关--------- */
   @action.bound
-  setPurchaseTableKey(dataKey) {
+  setPurchaseTableKey(dataKey, specialTableConfig) {
     // 先移除选中项,安全第一
     this.selected = null
     this.setTableDataKey(dataKey)
@@ -38,9 +38,12 @@ class Store extends EditorStore {
         separator: '+',
         // detailsType: 'purchase_last_col',
         specialDetailsKey: '__details',
-        text: i18next.t(
-          '{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}'
-        )
+        text:
+          specialTableConfig && specialTableConfig.defaultDetailText !== undefined
+            ? specialTableConfig.defaultDetailText
+            : i18next.t(
+                '{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}'
+              )
       })
       // 通过detailsType属性区分单列-总表最后一列的数据是否换行展示
       dataKey === 'purchase_last_col'

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)
@@ -227,6 +228,7 @@ class Table extends React.Component {
           range={range}
           config={config}
           printerStore={printerStore}
+          isLastTablePage={isLastTablePage}
         />
         <DiyOverallOrder
           range={range}
@@ -327,6 +329,7 @@ class Table extends React.Component {
             range={range}
             config={config}
             printerStore={printerStore}
+            isLastTablePage={isLastTablePage}
           />
           <DiyOverallOrder
             range={range}
@@ -385,7 +388,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