gm-printer 10.34.0 → 10.35.0

package/src/common/editor_store.js

@@ -5,6 +5,7 @@ import _ from 'lodash'
 import { dispatchMsg, getBlockName, exchange, getColSpanLength } from '../util'
 import { accountRadioList } from './util'
 import React from 'react'
+import { createDiySummaryStoreMethods } from './diy_summary_helper'
 
 class EditorStore {
   @observable
@@ -785,7 +786,8 @@ class EditorStore {
               valueField: '{{列.出库金额}}',
               style: {
                 fontWeight: 'bold'
-              }
+              },
+              rightName: '自定义整单合计：'
             }
           ]
         }
@@ -804,14 +806,17 @@ class EditorStore {
   }
 
   @action
-  changeTableDataKey(name, key) {
+  changeTableDataKey(name, key, options = {}) {
     const arr = name.split('.')
+    const table = this.config.contents[arr[2]]
     const {
       dataKey,
       overallOrder,
       subtotal,
-      diyOverallOrder
-    } = this.config.contents[arr[2]]
+      diyOverallOrder,
+      diyCategorySubtotal,
+      diyTagSubtotal
+    } = table
     const keyArr = dataKey.split('_')
     let newDataKey
     // 当前有这个key则去掉
@@ -827,19 +832,54 @@ class EditorStore {
       newDataKey = _.without(newDataKey, 'multi3')
     }
     // 标签小计和分类小计互斥
-    if (newDataKey.includes('category') && key === 'tag') {
-      newDataKey = _.without(newDataKey, 'category')
-    } else if (newDataKey.includes('tag') && key === 'category') {
-      newDataKey = _.without(newDataKey, 'tag')
+    if (
+      newDataKey.includes('category') &&
+      (key === 'tag' || key === 'tagDiy')
+    ) {
+      newDataKey = _.without(newDataKey, 'category', 'categoryDiy')
+
+      if (diyCategorySubtotal?.show) {
+        set(diyCategorySubtotal, { show: false })
+        set(table, { isDiyCategorySubtotal: false })
+      }
+    } else if (
+      newDataKey.includes('tag') &&
+      (key === 'category' || key === 'categoryDiy')
+    ) {
+      newDataKey = _.without(newDataKey, 'tag', 'tagDiy')
+
+      if (diyTagSubtotal?.show) {
+        set(diyTagSubtotal, { show: false })
+        set(table, { isDiyTagSubtotal: false })
+      }
     }
     // 标签小计和商品分类互斥
-    if (newDataKey.includes('newCategory') && key === 'tag') {
+    if (
+      newDataKey.includes('newCategory') &&
+      (key === 'tag' || key === 'tagDiy')
+    ) {
       newDataKey = _.without(newDataKey, 'newCategory')
-    } else if (newDataKey.includes('tag') && key === 'newCategory') {
-      newDataKey = _.without(newDataKey, 'tag')
+    } else if (
+      (newDataKey.includes('tag') || newDataKey.includes('tagDiy')) &&
+      key === 'newCategory'
+    ) {
+      newDataKey = _.without(newDataKey, 'tag', 'tagDiy')
+    }
+
+    if (newDataKey.includes('categoryDiy')) {
+      this.setDiyCategorySubtotalShow(name, true)
+    } else {
+      this.setDiyCategorySubtotalShow(name, false)
+    }
+    if (newDataKey.includes('tagDiy')) {
+      this.setDiyTagSubtotalShow(name, true)
+    } else {
+      this.setDiyTagSubtotalShow(name, false)
     }
 
     newDataKey = _.sortBy(newDataKey, [
+      o => o === 'tagDiy',
+      o => o === 'categoryDiy',
       o => o === 'tag',
       o => o === 'multi3',
       o => o === 'multi',
@@ -849,6 +889,7 @@ class EditorStore {
     ])
 
     this.config.contents[arr[2]].dataKey = newDataKey.join('_')
+
     // 整单合计不显示
     if (overallOrder?.show) overallOrder.show = false
     // 每页合计不显示
@@ -1980,7 +2021,7 @@ class EditorStore {
 
   // 整单合计自定义单元格文本输入
   @action.bound
-  setDiyOverallOrderFields(value) {
+  setDiyOverallOrderFields(value, fieldIndex = 0) {
     if (this.selectedRegion) {
       this.overallOrderShow = !this.overallOrderShow
       const arr = this.selectedRegion.split('.')
@@ -1988,9 +2029,15 @@ class EditorStore {
       const diyOverallOrderConfig = table?.diyOverallOrder
 
       const oldValueField = diyOverallOrderConfig.fields?.[0]
-      set(oldValueField, {
-        name: value
-      })
+      if (fieldIndex === 0) {
+        set(oldValueField, {
+          name: value
+        })
+      } else if (fieldIndex === 1) {
+        set(oldValueField, {
+          rightName: value
+        })
+      }
     }
   }
 
@@ -2051,6 +2098,214 @@ class EditorStore {
       this.setAutoFillingConfig(false)
     }
   }
+
+  // ========== 自定义每页合计方法 ==========
+  @action.bound
+  setDiySubtotalShow(name) {
+    const methods = createDiySummaryStoreMethods(
+      'diySubtotal',
+      '自定义每页合计'
+    )
+    return methods.setDiySubtotalShow.call(this, name)
+  }
+
+  @action.bound
+  setDiySubtotalStyle(value) {
+    const methods = createDiySummaryStoreMethods(
+      'diySubtotal',
+      '自定义每页合计'
+    )
+    return methods.setDiySubtotalStyle.call(this, value)
+  }
+
+  @action.bound
+  setDiySubtotalUpperCase() {
+    const methods = createDiySummaryStoreMethods(
+      'diySubtotal',
+      '自定义每页合计'
+    )
+    return methods.setDiySubtotalUpperCase.call(this)
+  }
+
+  @action.bound
+  setDiySubtotalUpperCaseBefore() {
+    const methods = createDiySummaryStoreMethods(
+      'diySubtotal',
+      '自定义每页合计'
+    )
+    return methods.setDiySubtotalUpperCaseBefore.call(this)
+  }
+
+  @action.bound
+  setDiySubtotalUpperLowerCaseSeparate() {
+    const methods = createDiySummaryStoreMethods(
+      'diySubtotal',
+      '自定义每页合计'
+    )
+    return methods.setDiySubtotalUpperLowerCaseSeparate.call(this)
+  }
+
+  @action.bound
+  setDiySubtotalValueField(value) {
+    const methods = createDiySummaryStoreMethods(
+      'diySubtotal',
+      '自定义每页合计'
+    )
+    return methods.setDiySubtotalValueField.call(this, value)
+  }
+
+  @action.bound
+  setDiySubtotalFields(value, fieldIndex = 0) {
+    const methods = createDiySummaryStoreMethods(
+      'diySubtotal',
+      '自定义每页合计'
+    )
+    return methods.setDiySubtotalFields.call(this, value, fieldIndex)
+  }
+
+  // ========== 自定义分类小计方法 ==========
+  @action.bound
+  setDiyCategorySubtotalShow(name, show) {
+    const methods = createDiySummaryStoreMethods(
+      'diyCategorySubtotal',
+      '自定义分类小计'
+    )
+    methods.setDiyCategorySubtotalShow.call(this, name, show)
+
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      if (table?.diyCategorySubtotal?.show && table?.diyTagSubtotal?.show) {
+        set(table.diyTagSubtotal, { show: false })
+      }
+    }
+  }
+
+  @action.bound
+  setDiyCategorySubtotalStyle(value) {
+    const methods = createDiySummaryStoreMethods(
+      'diyCategorySubtotal',
+      '自定义分类小计'
+    )
+    return methods.setDiyCategorySubtotalStyle.call(this, value)
+  }
+
+  @action.bound
+  setDiyCategorySubtotalUpperCase() {
+    const methods = createDiySummaryStoreMethods(
+      'diyCategorySubtotal',
+      '自定义分类小计'
+    )
+    return methods.setDiyCategorySubtotalUpperCase.call(this)
+  }
+
+  @action.bound
+  setDiyCategorySubtotalUpperCaseBefore() {
+    const methods = createDiySummaryStoreMethods(
+      'diyCategorySubtotal',
+      '自定义分类小计'
+    )
+    return methods.setDiyCategorySubtotalUpperCaseBefore.call(this)
+  }
+
+  @action.bound
+  setDiyCategorySubtotalUpperLowerCaseSeparate() {
+    const methods = createDiySummaryStoreMethods(
+      'diyCategorySubtotal',
+      '自定义分类小计'
+    )
+    return methods.setDiyCategorySubtotalUpperLowerCaseSeparate.call(this)
+  }
+
+  @action.bound
+  setDiyCategorySubtotalValueField(value) {
+    const methods = createDiySummaryStoreMethods(
+      'diyCategorySubtotal',
+      '自定义分类小计'
+    )
+    return methods.setDiyCategorySubtotalValueField.call(this, value)
+  }
+
+  @action.bound
+  setDiyCategorySubtotalFields(value, fieldIndex = 0) {
+    const methods = createDiySummaryStoreMethods(
+      'diyCategorySubtotal',
+      '自定义分类小计'
+    )
+    return methods.setDiyCategorySubtotalFields.call(this, value, fieldIndex)
+  }
+
+  // ========== 自定义标签小计方法 ==========
+  @action.bound
+  setDiyTagSubtotalShow(name, show) {
+    const methods = createDiySummaryStoreMethods(
+      'diyTagSubtotal',
+      '自定义标签小计'
+    )
+    methods.setDiyTagSubtotalShow.call(this, name, show)
+
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      if (table?.diyTagSubtotal?.show && table?.diyCategorySubtotal?.show) {
+        set(table.diyCategorySubtotal, { show: false })
+      }
+    }
+  }
+
+  @action.bound
+  setDiyTagSubtotalStyle(value) {
+    const methods = createDiySummaryStoreMethods(
+      'diyTagSubtotal',
+      '自定义标签小计'
+    )
+    return methods.setDiyTagSubtotalStyle.call(this, value)
+  }
+
+  @action.bound
+  setDiyTagSubtotalUpperCase() {
+    const methods = createDiySummaryStoreMethods(
+      'diyTagSubtotal',
+      '自定义标签小计'
+    )
+    return methods.setDiyTagSubtotalUpperCase.call(this)
+  }
+
+  @action.bound
+  setDiyTagSubtotalUpperCaseBefore() {
+    const methods = createDiySummaryStoreMethods(
+      'diyTagSubtotal',
+      '自定义标签小计'
+    )
+    return methods.setDiyTagSubtotalUpperCaseBefore.call(this)
+  }
+
+  @action.bound
+  setDiyTagSubtotalUpperLowerCaseSeparate() {
+    const methods = createDiySummaryStoreMethods(
+      'diyTagSubtotal',
+      '自定义标签小计'
+    )
+    return methods.setDiyTagSubtotalUpperLowerCaseSeparate.call(this)
+  }
+
+  @action.bound
+  setDiyTagSubtotalValueField(value) {
+    const methods = createDiySummaryStoreMethods(
+      'diyTagSubtotal',
+      '自定义标签小计'
+    )
+    return methods.setDiyTagSubtotalValueField.call(this, value)
+  }
+
+  @action.bound
+  setDiyTagSubtotalFields(value, fieldIndex = 0) {
+    const methods = createDiySummaryStoreMethods(
+      'diyTagSubtotal',
+      '自定义标签小计'
+    )
+    return methods.setDiyTagSubtotalFields.call(this, value, fieldIndex)
+  }
 }
 
 export default EditorStore

package/src/editor/context_menu.js

@@ -100,6 +100,43 @@ class ContextMenu extends React.Component {
     editStore.setDiyOverallOrderShow(name)
   }
 
+  // 通用的自定义合计菜单项处理
+  handleDiySummary = (name, configKey) => {
+    const { editStore } = this.props
+    const methodName = configKey
+      .split(/(?=[A-Z])/)
+      .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+      .join('')
+
+    const method = editStore[`set${methodName}Show`]
+
+    if (configKey === 'diyCategorySubtotal') {
+      const arr = name.split('.')
+      const dataKey = editStore.config.contents[arr[2]].dataKey
+      console.log('dataKey==> handleDiySummary', dataKey)
+
+      if (!dataKey.split('_').includes('category')) {
+        editStore.changeTableDataKey(name, 'category', {
+          type: 'diyCategorySubtotal'
+        })
+      }
+    }
+    if (configKey === 'diyTagSubtotal') {
+      const arr = name.split('.')
+      const dataKey = editStore.config.contents[arr[2]].dataKey
+      console.log('dataKey==> handleDiySummary', dataKey)
+
+      if (!dataKey.split('_').includes('tag')) {
+        editStore.changeTableDataKey(name, 'tag', {
+          type: 'diyTagSubtotal'
+        })
+      }
+    }
+    if (method) {
+      method(name)
+    }
+  }
+
   renderOrderActionBtn = name => {
     if (!this.hasSubtotalBtn(name)) {
       return null
@@ -119,7 +156,10 @@ class ContextMenu extends React.Component {
       dataKey,
       subtotal,
       overallOrder,
-      diyOverallOrder
+      diySubtotal,
+      diyTagSubtotal,
+      diyOverallOrder,
+      diyCategorySubtotal
     } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
 
@@ -131,6 +171,10 @@ class ContextMenu extends React.Component {
     const isSubtotalActive = subtotal.show
     const isOverallOrder = overallOrder?.show
     const isDiyOverallOrder = diyOverallOrder?.show
+    const isDiySubtotal = diySubtotal?.show
+    const isDiyTagSubtotal = diyTagSubtotal?.show
+    const isDiyCategorySubtotal = diyCategorySubtotal?.show
+
     // 长条打印
     const isLongPrint = type === LONG_PRINT
 
@@ -154,17 +198,46 @@ class ContextMenu extends React.Component {
           </div>
         )}
         <div
-          onClick={this.handleChangeTableDataKey.bind(this, 'category', name)}
+          onClick={this.handleChangeTableDataKey.bind(
+            this,
+            'category',
+            name,
+            isCategoryActive
+          )}
           className={isCategoryActive ? 'active' : ''}
         >
           {i18next.t('分类小计')}
         </div>
+        <div
+          // onClick={() =>
+          //   this.handleDiySummary(
+          //     name,
+          //     'diyCategorySubtotal',
+          //     isDiyCategorySubtotal
+          //   )
+          // }
+          onClick={this.handleChangeTableDataKey.bind(
+            this,
+            'categoryDiy',
+            name
+          )}
+          className={isDiyCategorySubtotal ? 'active' : ''}
+        >
+          {i18next.t('自定义分类小计')}
+        </div>
         <div
           onClick={this.handleChangeTableDataKey.bind(this, 'tag', name)}
           className={isTagActive ? 'active' : ''}
         >
           {i18next.t('标签小计')}
         </div>
+        <div
+          // onClick={() => this.handleDiySummary(name, 'diyTagSubtotal')}
+          onClick={this.handleChangeTableDataKey.bind(this, 'tagDiy', name)}
+          className={isDiyTagSubtotal ? 'active' : ''}
+        >
+          {i18next.t('自定义标签小计')}
+        </div>
         <div
           onClick={this.handleCategoryConfig.bind(this, 'newCategory', name)}
           className={isNewCategoryActive ? 'active' : ''}
@@ -177,6 +250,12 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('每页合计')}
         </div>
+        <div
+          onClick={() => this.handleDiySummary(name, 'diySubtotal')}
+          className={isDiySubtotal ? 'active' : ''}
+        >
+          {i18next.t('自定义每页合计')}
+        </div>
         <div
           onClick={this.handleChangeTableData.bind(this, !isAutoFilling)}
           className={isAutoFilling ? 'active' : ''}

package/src/printer/store.js

@@ -294,7 +294,13 @@ class PrinterStore {
         tableCount++
         // 表格原始的高度和宽度信息
         const table = this.tablesInfo[`contents.table.${index}`]
-        const { subtotal, dataKey, summaryConfig, overallOrder } = content
+        const {
+          subtotal,
+          dataKey,
+          summaryConfig,
+          overallOrder,
+          diySubtotal
+        } = content
         // 如果显示每页合计,那么table高度多预留一行高度
         const subtotalTrHeight = subtotal.show ? getSumTrHeight(subtotal) : 0
         // 如果显示整单合计,那么table高度多预留一行高度
@@ -306,12 +312,20 @@ class PrinterStore {
           summaryConfig?.pageSummaryShow && !isMultiTable(dataKey) // 双栏table没有每页合计
             ? getSumTrHeight(summaryConfig)
             : 0
+
+        // 如果显示自定义每页合计,那么table高度多预留一行高度
+        const diySubtotalTrHeight = diySubtotal?.show
+          ? getOverallOrderTrHeight(diySubtotal) // 使用相同的计算方式
+          : 0
+
         // 每个表格都具有的高度
         const allTableHaveThisHeight =
           table.head.height +
           subtotalTrHeight +
           pageSummaryTrHeight +
-          overallOrderTrHeight
+          overallOrderTrHeight +
+          diySubtotalTrHeight
+
         /** 当前page页面的最小高度 */
         const currentPageMinimumHeight =
           allPagesHaveThisHeight + allTableHaveThisHeight

package/src/printer/table.js

@@ -8,7 +8,8 @@ import {
   getMultiNumber,
   getTableColumnName,
   getWidth,
-  isMultiTable
+  isMultiTable,
+  collectGroups
 } from '../util'
 import { inject, observer } from 'mobx-react'
 import classNames from 'classnames'
@@ -19,6 +20,7 @@ import SubtotalTr from './table_subtotal_tr'
 import PageSummary from './page_summary'
 import OverallOrder from './table_overallOrder_tr'
 import DiyOverallOrder from './table_diy_overallOrder_tr'
+import DiySummary from './table_diy_summary_tr'
 // import { toJS } from 'mobx'
 
 @inject('printerStore')
@@ -171,6 +173,7 @@ class Table extends React.Component {
     } = this.props
     // 数据
     dataKey = getDataKey(dataKey, arrange)
+
     const tableData = printerStore.data._table[dataKey] || []
     // 列
     const columns = this.getColumns()
@@ -234,6 +237,14 @@ class Table extends React.Component {
       return col.head
     }
 
+    const needDiyCategory = dataKey.includes('categoryDiy')
+    const diyCategoryGroups = needDiyCategory
+      ? collectGroups(tableData, range)
+      : []
+
+    const needDiyTag = config.diyTagSubtotal?.show && dataKey.includes('tagDiy')
+    const diyTagGroups = needDiyTag ? collectGroups(tableData, range) : []
+
     return (
       <table
         style={{
@@ -272,14 +283,76 @@ class Table extends React.Component {
 
         <tbody>
           {_.map(_.range(range.begin, range.end), i => {
-            const _special = tableData[i] && tableData[i]._special
-            const _specialText = tableData[i] && tableData[i]._specialText
-            const _customTr = tableData[i] && tableData[i]._customTr
+            const row = tableData[i]
+            const _special = row && row._special
+            const _specialText = row && row._specialText
+            const _customTr = row && row._customTr
+            const _diyCategorySubtotal = row && row._diyCategorySubtotal
+            const _diyTagSubtotal = row && row._diyTagSubtotal
+
+            if (_specialText) {
+              return (
+                <CategoryTr
+                  key={`category_${i}`}
+                  config={config}
+                  data={_specialText}
+                />
+              )
+            }
+            if (_special) {
+              return (
+                <SpecialTr
+                  key={`special_${i}`}
+                  config={config}
+                  data={_special}
+                />
+              )
+            }
+            // 分类小计 & 自定义分类小计
+            if (_diyCategorySubtotal) {
+              const groupInfo = diyCategoryGroups.find(
+                g => g.specialIndex === i
+              )
 
-            if (_specialText)
-              return <CategoryTr key={i} config={config} data={_specialText} />
-            if (_special)
-              return <SpecialTr key={i} config={config} data={_special} />
+              if (groupInfo && printerStore?.ready) {
+                return (
+                  <DiySummary
+                    key={`diy_category_${i}`}
+                    configKey='diyCategorySubtotal'
+                    config={config}
+                    printerStore={printerStore}
+                    pageIndex={pageIndex}
+                    range={{ begin: groupInfo.begin, end: groupInfo.end }}
+                    getTableData={(store, key, arrange) => {
+                      const all =
+                        store.data._table[getDataKey(key, arrange)] || []
+                      return all.slice(groupInfo.begin, groupInfo.end)
+                    }}
+                  />
+                )
+              }
+            }
+
+            if (_diyTagSubtotal) {
+              const groupInfo = diyTagGroups.find(g => g.specialIndex === i)
+
+              if (groupInfo && printerStore?.ready) {
+                return (
+                  <DiySummary
+                    key={`diy_tag_${i}`}
+                    configKey='diyTagSubtotal'
+                    config={config}
+                    printerStore={printerStore}
+                    range={{ begin: groupInfo.begin, end: groupInfo.end }}
+                    getTableData={(store, key, arrange) => {
+                      const all =
+                        store.data._table[getDataKey(key, arrange)] || []
+                      return all.slice(groupInfo.begin, groupInfo.end)
+                    }}
+                  />
+                )
+              }
+            }
 
             if (_customTr) {
               return <tr dangerouslySetInnerHTML={{ __html: _customTr }} />
@@ -354,6 +427,20 @@ class Table extends React.Component {
           {this.props.config.subtotal.isCommutationPlace
             ? PageSummarySubtotalTr()
             : subtotalTrPageSummary()}
+          {/* 自定义每页合计 */}
+          <DiySummary
+            key={`diy_subtotal_${pageIndex}`}
+            configKey='diySubtotal'
+            config={config}
+            printerStore={printerStore}
+            range={range}
+            pageIndex={pageIndex}
+            getTableData={(store, key, arrange, range) => {
+              const tableData =
+                store.data._table[getDataKey(key, arrange)] || []
+              return tableData.slice(range.begin, range.end)
+            }}
+          />
           <OverallOrder
             range={range}
             config={config}