gm-printer 10.29.2 → 10.30.0-beta.0

package/locales/en.json

@@ -83,6 +83,8 @@
   "单列-总表下方一行": "",
   "双栏-总表下方一行两栏": "",
   "四栏-总表下方一行四栏": "",
+  "按采购明细单行": "",
+  "打印设置": "",
   "设置采购明细": "",
   "采购明细": "",
   "请输入明细字段": "",

package/locales/th.json

@@ -83,6 +83,8 @@
   "单列-总表下方一行": "",
   "双栏-总表下方一行两栏": "",
   "四栏-总表下方一行四栏": "",
+  "按采购明细单行": "",
+  "打印设置": "",
   "设置采购明细": "",
   "采购明细": "",
   "请输入明细字段": "",

package/locales/zh-HK.json

@@ -83,6 +83,8 @@
   "单列-总表下方一行": "單列-總表下方一行",
   "双栏-总表下方一行两栏": "雙欄-總表下方一行兩欄",
   "四栏-总表下方一行四栏": "四欄-總表下方一行四欄",
+  "按采购明细单行": "按採購明細單行",
+  "打印设置": "列印設定",
   "设置采购明细": "設置採購明細",
   "采购明细": "採購明細",
   "请输入明细字段": "請輸入明細字段",

package/package.json

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

package/src/common/editor_store.js

@@ -1054,6 +1054,24 @@ class EditorStore {
       const arr = this.selectedRegion.split('.')
       const table = this.config.contents[arr[2]]
 
+      const getDataKey = () => {
+        if (dataKey === 'purchase_detail_one_row') {
+          if (!table.purchaseSettingKey) {
+            this.setPurchasePrintSettingKey()
+            return dataKey
+          }
+          if (table.purchaseSettingKey === 'goods') {
+            return 'purchase_independent_rol_sku'
+          }
+          if (table.purchaseSettingKey === 'address') {
+            return 'purchase_independent_rol_address'
+          }
+        }
+        return dataKey
+      }
+
+      dataKey = getDataKey()
+
       this.selected = null // 清空点中项
       table.dataKey = dataKey
       // 改变dataKey后做副作用action
@@ -1062,6 +1080,38 @@ class EditorStore {
     }
   }
 
+  // 采购明细商品打印设置
+  @action.bound setPurchasePrintSettingKey(dataKey = 'goods') {
+    const arr = this.selectedRegion.split('.')
+    const table = this.config.contents[arr[2]]
+    table.purchaseSettingKey = dataKey
+
+    set(table, {
+      purchaseSettingKey: dataKey,
+      dataKey:
+        dataKey === 'goods'
+          ? 'purchase_independent_rol_sku'
+          : 'purchase_independent_rol_address'
+    })
+  }
+
+  // 用于 采购明细 select 的显示
+  @computed get computedDataKey() {
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+
+      const { dataKey } = table
+      if (
+        dataKey === 'purchase_independent_rol_sku' ||
+        dataKey === 'purchase_independent_rol_address'
+      ) {
+        return 'purchase_detail_one_row'
+      }
+      return dataKey
+    }
+  }
+
   @computed
   get computedTableDataKeyOfSelectedRegion() {
     if (this.selectedRegion) {

package/src/editor_purchase/editor_special_table.js

@@ -24,7 +24,13 @@ const dataKeyList = [
   },
   { value: 'purchase_one_row', text: i18next.t('单列-总表下方一行') },
   { value: 'purchase_flex_2', text: i18next.t('双栏-总表下方一行两栏') },
-  { value: 'purchase_flex_4', text: i18next.t('四栏-总表下方一行四栏') }
+  { value: 'purchase_flex_4', text: i18next.t('四栏-总表下方一行四栏') },
+  { value: 'purchase_detail_one_row', text: i18next.t('按采购明细单行') }
+]
+
+const purchasePrintSettingDataKeyList = [
+  { value: 'goods', text: i18next.t('按商品排序') },
+  { value: 'merchant', text: i18next.t('按商户排序') }
 ]
 
 @inject('editStore')
@@ -35,8 +41,30 @@ class TableDetailEditor extends React.Component {
     editStore.setPurchaseTableKey(dataKey)
   }
 
-  handleDetailAddField = value => {
+  handlePurchaseSettingKeyChange = dataKey => {
     const { editStore } = this.props
+
+    editStore.setPurchasePrintSettingKey(dataKey)
+  }
+
+  handleDetailAddField = ({ key, value }) => {
+    const { editStore, config } = this.props
+    if (editStore.computedDataKey === 'purchase_detail_one_row') {
+      // 序号 {{列.序号}}
+      const transform = str => {
+        return str
+          .replace(/{{\s*([^}]+)\s*}}/g, '{{$1}}') // 先标准化（去掉多余空格）
+          .replace(/{{([^.\s}]+)}}/g, '{{列.$1}}')
+      }
+
+      if (config.dataKey !== 'purchase_independent_rol_sku') {
+        editStore.setPurchaseTableKey('purchase_independent_rol_sku')
+      }
+
+      editStore.addFieldToTable({ key, value: transform(value) })
+
+      return
+    }
     editStore.specialTextAddField('*' + value)
   }
 
@@ -52,10 +80,11 @@ class TableDetailEditor extends React.Component {
 
   render() {
     const {
-      addFields: { detailFields }
+      addFields: { detailFields },
+      editStore
     } = this.props
     const {
-      dataKey,
+      purchaseSettingKey,
       specialConfig: { template_text, style }
     } = this.props.config
 
@@ -67,7 +96,7 @@ class TableDetailEditor extends React.Component {
           <div>{i18next.t('采购明细')}：</div>
           <Select
             className='gm-printer-edit-select'
-            value={dataKey}
+            value={editStore.computedDataKey}
             onChange={this.handleDataKeyChange}
           >
             {_.map(dataKeyList, v => (
@@ -77,7 +106,24 @@ class TableDetailEditor extends React.Component {
             ))}
           </Select>
         </Flex>
-        {dataKey !== 'purchase_no_detail' && (
+
+        {editStore.computedDataKey === 'purchase_detail_one_row' && (
+          <Flex alignCenter className='gm-padding-top-5'>
+            <div>{i18next.t('打印设置')}：</div>
+            <Select
+              className='gm-printer-edit-select'
+              value={purchaseSettingKey}
+              onChange={this.handlePurchaseSettingKeyChange}
+            >
+              {_.map(purchasePrintSettingDataKeyList, v => (
+                <Option key={v.value} value={v.value}>
+                  {v.text}
+                </Option>
+              ))}
+            </Select>
+          </Flex>
+        )}
+        {editStore.computedDataKey !== 'purchase_no_detail' && (
           <>
             <div className='gm-padding-top-5'>
               <div>{i18next.t('添加字段')}：</div>
@@ -86,27 +132,32 @@ class TableDetailEditor extends React.Component {
                   <FieldBtn
                     key={o.key}
                     name={o.key}
-                    onClick={this.handleDetailAddField.bind(this, o.value)}
+                    onClick={this.handleDetailAddField.bind(this, o)}
                   />
                 ))}
               </Flex>
             </div>
 
-            <div className='gm-padding-top-5'>
-              <div>{i18next.t('字段设置')}：</div>
-              <Fonter style={style} onChange={this.handleSpecialStyleChange} />
-              <Separator />
-              <TextAlign
-                style={style}
-                onChange={this.handleSpecialStyleChange}
-              />
-              <Gap />
-              <Textarea
-                onChange={this.handleSpecialTextChange}
-                value={template_text}
-                placeholder={i18next.t('请输入明细字段')}
-              />
-            </div>
+            {editStore.computedDataKey !== 'purchase_detail_one_row' && (
+              <div className='gm-padding-top-5'>
+                <div>{i18next.t('字段设置')}：</div>
+                <Fonter
+                  style={style}
+                  onChange={this.handleSpecialStyleChange}
+                />
+                <Separator />
+                <TextAlign
+                  style={style}
+                  onChange={this.handleSpecialStyleChange}
+                />
+                <Gap />
+                <Textarea
+                  onChange={this.handleSpecialTextChange}
+                  value={template_text}
+                  placeholder={i18next.t('请输入明细字段')}
+                />
+              </div>
+            )}
             <TipInfo
               text={i18next.t(
                 '说明：在字段之间自行设置间隔符号,但谨慎修改{}中的内容,避免出现数据异常'

package/src/printer/store.js

@@ -524,6 +524,53 @@ class PrinterStore {
     }
   }
 
+  /**
+   *
+   * @param text
+   * @param dataKey
+   * @param index
+   * @param begin
+   * @returns {number[]|number|*|number|null} -1 需要合并单元格; >1 合并的单元格数量; [] 表示分页需要合并的行数; null 表示不需要合并
+   */
+  templateTableRowSpan(text, dataKey, index, begin) {
+    try {
+      if (
+        dataKey !== 'purchase_detail_one_row' &&
+        dataKey !== 'purchase_independent_rol_sku' &&
+        dataKey !== 'purchase_independent_rol_address'
+      ) {
+        return null
+      }
+      const list = this.data._table[dataKey] || this.data._table.orders
+
+      const interpolate = /{{([\s\S]+?)}}/g
+      const match = interpolate.exec(text)
+      // 显示在表格上的 th 名
+      const showFiledText = match[1].split('.')[1]
+
+      if (list[index]._mergeCell.some(v => v === showFiledText)) {
+        // 新的一页，需要重新合并
+        if (index && index === begin && list[index]._origin.rowSpan === -1) {
+          // 新的一页需要还需要合并的单元格数量
+          let newPageCellRowSpan = 1
+          for (let i = index - 1; i < list.length; i--) {
+            const record = list[i]
+            if (record._origin.rowSpan > 1) {
+              newPageCellRowSpan = record._origin.rowSpan - (index - i)
+              break
+            }
+          }
+          return [newPageCellRowSpan]
+        }
+
+        return list[index]._origin?.rowSpan || 1
+      }
+      return 1
+    } catch (err) {
+      return null
+    }
+  }
+
   templateTable(text, dataKey, index, pageIndex) {
     // 做好保护，出错就返回 text
     try {

package/src/printer/table.js

@@ -19,7 +19,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 { toJS } from 'mobx'
+// import { toJS } from 'mobx'
 
 @inject('printerStore')
 @observer
@@ -280,6 +280,26 @@ class Table extends React.Component {
                   )
                 ) : (
                   _.map(columns, (col, j) => {
+                    const rowSpan = printerStore.templateTableRowSpan(
+                      col.text,
+                      dataKey,
+                      i,
+                      range.begin
+                    )
+                    // 说明该单元格不需要显示 已被合并
+                    if (rowSpan === -1) {
+                      return null
+                    }
+
+                    // 新的一页如果有需要合并单元格的则不显示数据
+                    if (
+                      range.begin &&
+                      range.begin === i &&
+                      Array.isArray(rowSpan)
+                    ) {
+                      return <td rowSpan={rowSpan[0]} />
+                    }
+
                     return (
                       <td
                         key={j}
@@ -288,6 +308,7 @@ class Table extends React.Component {
                           ...getTdStyle(j, col.style),
                           ...col.style
                         }}
+                        {...(rowSpan > 1 && { rowSpan: rowSpan })}
                         className={classNames({
                           active:
                             getTableColumnName(name, col.index) ===