gm-printer 10.33.7 → 10.34.0

package/package.json

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

package/src/common/common_context_menu.js

@@ -149,6 +149,17 @@ class CommonContextMenu extends React.Component {
     })
   }
 
+  handleAddContentWithConfig = (diff, type, tableConfig) => {
+    const { editStore } = this.props
+    const { name } = this.state
+
+    editStore.addContentByDiff(name, diff, type, tableConfig)
+
+    this.setState({
+      name: null
+    })
+  }
+
   handleInsertImage = imgURL => {
     this.handleInsertBlock('image', imgURL)
   }
@@ -240,7 +251,6 @@ class CommonContextMenu extends React.Component {
             <Hr />
           </>
         )}
-
         <div onClick={this.handleAddContent.bind(this, 0, '')}>
           {i18next.t('向上插入区域块')}
         </div>
@@ -296,7 +306,7 @@ class CommonContextMenu extends React.Component {
   }
 
   renderPanel = () => {
-    let { insertBlockList } = this.props
+    let { insertBlockList, customTableConfigs } = this.props
     const { name } = this.state
     const arr = name.split('.')
     const type = arr[0]
@@ -328,6 +338,21 @@ class CommonContextMenu extends React.Component {
           )
         })}
 
+        {customTableConfigs &&
+          customTableConfigs.map(customConfig => (
+            <div
+              key={customConfig.label}
+              onClick={this.handleAddContentWithConfig.bind(
+                this,
+                1,
+                'table',
+                customConfig.tableConfig
+              )}
+            >
+              {customConfig.label}
+            </div>
+          ))}
+
         {arr[0] === 'contents' && (
           <>
             <Hr />
@@ -410,6 +435,7 @@ CommonContextMenu.propTypes = {
   editStore: PropTypes.object,
   insertBlockList: PropTypes.array.isRequired,
   renderTableAction: PropTypes.func,
+  customTableConfigs: PropTypes.array,
   children: PropTypes.element.isRequired
 }
 

package/src/common/component.js

@@ -72,7 +72,7 @@ class Text extends React.Component {
   }
 
   render() {
-    const { value, placeholder, style, className } = this.props
+    const { value, placeholder, style, className, ...rest } = this.props
     return (
       <input
         className={classNames('gm-printer-edit-input', className)}
@@ -81,6 +81,7 @@ class Text extends React.Component {
         placeholder={placeholder}
         onChange={this.handleChange}
         style={style}
+        {...rest}
       />
     )
   }

package/src/common/editor_customize_config.js

@@ -3,6 +3,7 @@ import { inject, observer } from 'mobx-react'
 import PropTypes from 'prop-types'
 import React from 'react'
 import { Flex, Switch } from '../components'
+import { Text } from './component'
 
 @inject('editStore')
 @observer
@@ -25,10 +26,47 @@ class EditorCutomizedConfig extends React.Component {
     editStore.setFillIndex(value)
   }
 
+  handleTaxFreeProductRateDisplay = e => {
+    const value = e.target.value
+
+    const { editStore } = this.props
+    // 限制10位以内，如果超过则截断
+    const trimmedValue = value.length > 10 ? value.slice(0, 10) : value
+    editStore.setTaxFreeProductRateDisplay(trimmedValue)
+
+    // 如果选中了表格，同时更新表格配置
+    if (editStore.selectedRegion && editStore.computedRegionIsTable) {
+      const arr = editStore.selectedRegion.split('.')
+      const tableConfig = editStore.config.contents[arr[2]]
+
+      const dataKey = tableConfig.dataKey
+      const tableData = editStore.mockData._table[dataKey]
+
+      if (tableData?.length) {
+        const list = tableData.map(item => {
+          if (item._origin && Number(item._origin?.tax_rate) === 0) {
+            if (String(value).length > 0) {
+              item['税率'] = value
+            } else {
+              item['税率'] = '0.00%'
+            }
+          }
+          return item
+        })
+        editStore.updateTableData(dataKey, list)
+      }
+    }
+  }
+
   render() {
     const {
       editStore,
-      editStore: { isAutoFilling, isMultiDigitDecimal, fillIndex }
+      editStore: {
+        isAutoFilling,
+        isMultiDigitDecimal,
+        fillIndex,
+        taxFreeProductRateDisplay
+      }
     } = this.props
     // 是table
     if (editStore.computedRegionIsTable) {
@@ -58,6 +96,15 @@ class EditorCutomizedConfig extends React.Component {
               onChange={this.handleMultiDigitDecimal}
             />
           </Flex>
+          <Flex alignCenter className='gm-padding-top-5'>
+            <div>{i18next.t('免税产品税率显示')}：</div>
+            <Text
+              value={taxFreeProductRateDisplay || ''}
+              onChange={this.handleTaxFreeProductRateDisplay}
+              placeholder={i18next.t('请输入')}
+              maxLength={10}
+            />
+          </Flex>
         </>
       )
     } else {

package/src/common/editor_store.js

@@ -57,6 +57,10 @@ class EditorStore {
   @observable
   isMultiDigitDecimal = false
 
+  /** 免税产品税率显示 */
+  @observable
+  taxFreeProductRateDisplay = ''
+
   defaultTableDataKey = 'orders'
 
   // 默认table的dataKey
@@ -101,11 +105,23 @@ class EditorStore {
     this.isMultiDigitDecimal = bool
     set(this.config, {
       specialControlConfig: {
+        ...this.config.specialControlConfig,
         multiDigitDecimal: bool
       }
     })
   }
 
+  @action
+  setTaxFreeProductRateDisplay(value) {
+    this.taxFreeProductRateDisplay = value
+    set(this.config, {
+      specialControlConfig: {
+        ...this.config.specialControlConfig,
+        taxFreeProductRateDisplay: value
+      }
+    })
+  }
+
   @observable
   overallOrderShow = false
 
@@ -257,6 +273,9 @@ class EditorStore {
     this.isAutoFilling = false
     this.fillIndex = false
     this.isMultiDigitDecimal = false
+
+    this.taxFreeProductRateDisplay =
+      config?.specialControlConfig?.taxFreeProductRateDisplay || ''
   }
 
   @action
@@ -479,6 +498,11 @@ class EditorStore {
     }
   }
 
+  @action.bound
+  updateTableData(dataKey, tableData) {
+    this.mockData._table[dataKey] = tableData
+  }
+
   @action
   clearAllTableEmptyData() {
     const tableData = this.mockData._table
@@ -1016,17 +1040,20 @@ class EditorStore {
   }
 
   @action
-  addContentByDiff(name, diff, type) {
+  addContentByDiff(name, diff, type, tableConfig = null) {
     const arr = name.split('.')
+
     if (arr.length === 3 && arr[0] === 'contents') {
-      this.addContent(name, ~~arr[2] + diff, type)
+      this.addContent(name, ~~arr[2] + diff, type, tableConfig)
     } else if (arr.length === 5 && arr[3] === 'column') {
-      this.addContent(name, ~~arr[2] + diff, type)
+      this.addContent(name, ~~arr[2] + diff, type, tableConfig)
+    } else {
+      console.warn('addContentByDiff: Invalid name format', name)
     }
   }
 
   @action.bound
-  addContent(name, index, type) {
+  addContent(name, index, type, tableConfig = null) {
     const defaultTableDataKey = this.defaultTableDataKey
     const defaultTableSubtotal = this.defaultTableSubtotal
 
@@ -1036,27 +1063,89 @@ class EditorStore {
     if ((arr.length === 3 || arr.length === 5) && arr[0] === 'contents') {
       if (index >= 0 && index <= this.config.contents.length) {
         if (type === 'table') {
-          this.config.contents.splice(index, 0, {
-            type: 'table',
-            className: '',
-            specialConfig: { style: {} },
-            dataKey: defaultTableDataKey, // 默认
-            subtotal: defaultTableSubtotal, // 默认的每页合计配置
-            customerTag: false, // 特殊标记，用于提供用户干预功能标记
-            columns: [
-              {
-                head: i18next.t('表头'),
-                headStyle: {
-                  textAlign: 'center',
-                  minWidth: '30px'
+          // 如果传入了自定义表格配置，使用自定义配置，否则使用默认配置
+          const finalTableConfig = tableConfig
+            ? {
+                // 先展开自定义配置，支持传入其他配置项
+                ...tableConfig,
+                // 然后设置必需的属性，确保都有值
+                type: 'table',
+                className: tableConfig.className || '',
+                specialConfig: tableConfig.specialConfig || {
+                  style: {}
                 },
-                text: i18next.t('内容'),
-                style: {
-                  textAlign: 'center'
-                }
+                dataKey: tableConfig.dataKey || defaultTableDataKey,
+                subtotal:
+                  tableConfig.subtotal !== undefined
+                    ? tableConfig.subtotal
+                    : defaultTableSubtotal,
+                customerTag:
+                  tableConfig.customerTag !== undefined
+                    ? tableConfig.customerTag
+                    : false,
+                columns: tableConfig.columns || [
+                  {
+                    head: i18next.t('表头'),
+                    headStyle: {
+                      textAlign: 'center',
+                      minWidth: '30px'
+                    },
+                    text: i18next.t('内容'),
+                    style: {
+                      textAlign: 'center'
+                    }
+                  }
+                ]
               }
-            ]
-          })
+            : {
+                type: 'table',
+                className: '',
+                specialConfig: { style: {} },
+                dataKey: defaultTableDataKey, // 默认
+                subtotal: defaultTableSubtotal, // 默认的每页合计配置
+                customerTag: false, // 特殊标记，用于提供用户干预功能标记
+                columns: [
+                  {
+                    head: i18next.t('表头'),
+                    headStyle: {
+                      textAlign: 'center',
+                      minWidth: '30px'
+                    },
+                    text: i18next.t('内容'),
+                    style: {
+                      textAlign: 'center'
+                    }
+                  }
+                ]
+              }
+
+          // 确保数据源存在，如果不存在则初始化为空数组
+          const dataKey = finalTableConfig.dataKey
+          if (!this.mockData._table) {
+            this.mockData._table = {}
+          }
+          if (!this.mockData._table[dataKey]) {
+            this.mockData._table[dataKey] = []
+          }
+
+          // 如果 dataKey 是 taxRateSales，并且有 head 为 custom_filed 的列，修改其 text
+          if (
+            finalTableConfig.dataKey === 'taxRateSales' &&
+            finalTableConfig.columns &&
+            this.mockData._table[dataKey] &&
+            this.mockData._table[dataKey].length > 0
+          ) {
+            const firstRowData = this.mockData._table[dataKey][0]
+
+            finalTableConfig.columns.forEach(column => {
+              if (column.head === 'custom_filed' && firstRowData.custom_filed) {
+                // 将 text 设置为第一行的 custom_filed 值
+                column.text = firstRowData.custom_filed
+              }
+            })
+          }
+
+          this.config.contents.splice(index, 0, finalTableConfig)
         } else {
           this.config.contents.splice(index, 0, {
             blocks: [],

package/src/editor/context_menu.js

@@ -44,6 +44,12 @@ class ContextMenu extends React.Component {
       // 多位小数
       editStore.setMultiDigitDecimal(specialControlConfig?.multiDigitDecimal)
     }
+    if (specialControlConfig?.taxFreeProductRateDisplay !== undefined) {
+      // 免税产品税率显示
+      editStore.setTaxFreeProductRateDisplay(
+        specialControlConfig?.taxFreeProductRateDisplay || ''
+      )
+    }
   }
 
   /**
@@ -196,11 +202,12 @@ class ContextMenu extends React.Component {
   }
 
   render() {
-    const { editStore } = this.props
+    const { editStore, customTableConfigs } = this.props
     return (
       <CommonContextMenu
         renderTableAction={this.renderOrderActionBtn}
         insertBlockList={blockTypeList}
+        customTableConfigs={customTableConfigs}
       >
         <Printer
           key={editStore.computedPrinterKey}
@@ -220,6 +227,7 @@ class ContextMenu extends React.Component {
 }
 ContextMenu.propTypes = {
   editStore: PropTypes.object,
-  mockData: PropTypes.object
+  mockData: PropTypes.object,
+  customTableConfigs: PropTypes.array
 }
 export default ContextMenu

package/src/editor/editor.js

@@ -47,7 +47,8 @@ class Editor extends React.Component {
       addFields,
       showNewDate,
       mockData,
-      mergeClassificationAndLabel
+      mergeClassificationAndLabel,
+      customTableConfigs
     } = this.props
 
     return (
@@ -106,7 +107,7 @@ class Editor extends React.Component {
         )}
 
         <div className='gm-printer-edit-wrap'>
-          <ContextMenu />
+          <ContextMenu customTableConfigs={customTableConfigs} />
         </div>
       </div>
     )
@@ -120,7 +121,8 @@ Editor.propTypes = {
   mockData: PropTypes.object.isRequired,
   addFields: PropTypes.object.isRequired,
   showNewDate: PropTypes.bool,
-  mergeClassificationAndLabel: PropTypes.bool
+  mergeClassificationAndLabel: PropTypes.bool,
+  customTableConfigs: PropTypes.array
 }
 
 Editor.defaultProps = {

package/src/printer/page_summary.js

@@ -15,9 +15,10 @@ const regExp = text => {
  * 每列统计
  * @param key
  * @param dataList
+ * @param summaryFieldsResultToNumber 需要转换为数字的汇总字段
  * @returns {*|string}
  */
-const sumCol = (key, dataList) => {
+const sumCol = (key, dataList, summaryFieldsResultToNumber = []) => {
   let result
   try {
     result = dataList
@@ -26,6 +27,10 @@ const sumCol = (key, dataList) => {
         return acc
       }, Big(0))
       .toFixed(2)
+
+    if (summaryFieldsResultToNumber.includes(key)) {
+      result = Number(result)
+    }
   } catch (e) {
     result = ''
   }
@@ -53,6 +58,14 @@ const PageSummary = props => {
     const tableData = printerStore.data._table[_dataKey] || []
     const currentPageTableData = tableData.slice(range.begin, range.end)
 
+    // 需要转换为数字的汇总字段
+    let summaryFieldsResultToNumber =
+      printerStore.config?.summaryFieldsResultToNumber
+    if (summaryFieldsResultToNumber) {
+      summaryFieldsResultToNumber = summaryFieldsResultToNumber.map(item =>
+        regExp(item)
+      )
+    }
     return (
       <tr>
         {_.map(columns, (col, index) => {
@@ -66,7 +79,7 @@ const PageSummary = props => {
               summaryConfig.summaryColumns
                 .map(text => regExp(text))
                 .includes(key) && key
-                ? sumCol(key, currentPageTableData)
+                ? sumCol(key, currentPageTableData, summaryFieldsResultToNumber)
                 : ' '
           }
 

package/src/printer/store.js

@@ -537,7 +537,8 @@ class PrinterStore {
       if (
         dataKey !== 'purchase_detail_one_row' &&
         dataKey !== 'purchase_independent_rol_sku' &&
-        dataKey !== 'purchase_independent_rol_address'
+        dataKey !== 'purchase_independent_rol_address' &&
+        dataKey !== 'taxRateSales'
       ) {
         return null
       }
@@ -545,6 +546,7 @@ class PrinterStore {
 
       const interpolate = /{{([\s\S]+?)}}/g
       const match = interpolate.exec(text)
+      if (!match) return null
       // 显示在表格上的 th 名
       const showFiledText = match[1].split('.')[1]
 
@@ -555,7 +557,7 @@ class PrinterStore {
           let newPageCellRowSpan = 1
           for (let i = index - 1; i < list.length; i--) {
             const record = list[i]
-            if (record._origin.rowSpan > 1) {
+            if (record && record._origin && record._origin.rowSpan > 1) {
               newPageCellRowSpan = record._origin.rowSpan - (index - i)
               break
             }

package/src/printer/table.js

@@ -224,6 +224,16 @@ class Table extends React.Component {
       }
       return tdStyle
     }
+
+    const headText = col => {
+      if (dataKey === 'taxRateSales') {
+        return col.head === 'custom_field'
+          ? tableData?.[0]?.custom_field || ''
+          : col.headAlias
+      }
+      return col.head
+    }
+
     return (
       <table
         style={{
@@ -254,7 +264,7 @@ class Table extends React.Component {
                 onDrop={this.handleDrop}
                 onDragOver={this.handleDragOver}
               >
-                {col.head}
+                {headText(col)}
               </th>
             ))}
           </tr>
@@ -264,10 +274,17 @@ class Table extends React.Component {
           {_.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
+
             if (_specialText)
               return <CategoryTr key={i} config={config} data={_specialText} />
             if (_special)
               return <SpecialTr key={i} config={config} data={_special} />
+
+            if (_customTr) {
+              return <tr dangerouslySetInnerHTML={{ __html: _customTr }} />
+            }
+
             // 如果项为空对象展现一个占满一行的td
             const isItemNone = !_.keys(tableData[i]).length
             return (
@@ -308,7 +325,9 @@ class Table extends React.Component {
                           ...getTdStyle(j, col.style),
                           ...col.style
                         }}
-                        {...(rowSpan > 1 && { rowSpan: rowSpan })}
+                        {...(rowSpan > 1 && {
+                          rowSpan: rowSpan
+                        })}
                         className={classNames({
                           active:
                             getTableColumnName(name, col.index) ===