gm-printer 10.33.8 → 10.33.10

package/package.json

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

package/src/common/common_context_menu.js

@@ -149,17 +149,6 @@ 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)
   }
@@ -251,6 +240,7 @@ class CommonContextMenu extends React.Component {
             <Hr />
           </>
         )}
+
         <div onClick={this.handleAddContent.bind(this, 0, '')}>
           {i18next.t('向上插入区域块')}
         </div>
@@ -306,7 +296,7 @@ class CommonContextMenu extends React.Component {
   }
 
   renderPanel = () => {
-    let { insertBlockList, customTableConfigs } = this.props
+    let { insertBlockList } = this.props
     const { name } = this.state
     const arr = name.split('.')
     const type = arr[0]
@@ -338,21 +328,6 @@ 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 />
@@ -435,7 +410,6 @@ 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, ...rest } = this.props
+    const { value, placeholder, style, className } = this.props
     return (
       <input
         className={classNames('gm-printer-edit-input', className)}
@@ -81,7 +81,6 @@ class Text extends React.Component {
         placeholder={placeholder}
         onChange={this.handleChange}
         style={style}
-        {...rest}
       />
     )
   }
@@ -132,6 +131,10 @@ Textarea.propTypes = {
 class TextPX extends React.Component {
   handleChange = value => {
     const { onChange } = this.props
+    // 理论上这里只会有字符串和 event 两种类型
+    if (Object.prototype.toString.call(value) === '[object Object]') {
+      value = value.target.value
+    }
     if (value === '') {
       onChange('')
     } else if (value.endsWith('%')) {

package/src/common/editor_customize_config.js

@@ -3,7 +3,6 @@ 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
@@ -26,43 +25,10 @@ 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 (dataKey === 'taxRateSales' && tableData?.length) {
-        const list = tableData.map(item => {
-          if (item._origin && !Number(item._origin?.tax_rate)) {
-            item['税率'] = value
-          }
-          return item
-        })
-        editStore.updateTableData(dataKey, list)
-      }
-    }
-  }
-
   render() {
     const {
       editStore,
-      editStore: {
-        isAutoFilling,
-        isMultiDigitDecimal,
-        fillIndex,
-        taxFreeProductRateDisplay
-      }
+      editStore: { isAutoFilling, isMultiDigitDecimal, fillIndex }
     } = this.props
     // 是table
     if (editStore.computedRegionIsTable) {
@@ -92,15 +58,6 @@ 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,10 +57,6 @@ class EditorStore {
   @observable
   isMultiDigitDecimal = false
 
-  /** 免税产品税率显示 */
-  @observable
-  taxFreeProductRateDisplay = ''
-
   defaultTableDataKey = 'orders'
 
   // 默认table的dataKey
@@ -105,23 +101,11 @@ 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
 
@@ -273,9 +257,6 @@ class EditorStore {
     this.isAutoFilling = false
     this.fillIndex = false
     this.isMultiDigitDecimal = false
-
-    this.taxFreeProductRateDisplay =
-      config?.specialControlConfig?.taxFreeProductRateDisplay || ''
   }
 
   @action
@@ -498,11 +479,6 @@ class EditorStore {
     }
   }
 
-  @action.bound
-  updateTableData(dataKey, tableData) {
-    this.mockData._table[dataKey] = tableData
-  }
-
   @action
   clearAllTableEmptyData() {
     const tableData = this.mockData._table
@@ -1040,20 +1016,17 @@ class EditorStore {
   }
 
   @action
-  addContentByDiff(name, diff, type, tableConfig = null) {
+  addContentByDiff(name, diff, type) {
     const arr = name.split('.')
-
     if (arr.length === 3 && arr[0] === 'contents') {
-      this.addContent(name, ~~arr[2] + diff, type, tableConfig)
+      this.addContent(name, ~~arr[2] + diff, type)
     } else if (arr.length === 5 && arr[3] === 'column') {
-      this.addContent(name, ~~arr[2] + diff, type, tableConfig)
-    } else {
-      console.warn('addContentByDiff: Invalid name format', name)
+      this.addContent(name, ~~arr[2] + diff, type)
     }
   }
 
   @action.bound
-  addContent(name, index, type, tableConfig = null) {
+  addContent(name, index, type) {
     const defaultTableDataKey = this.defaultTableDataKey
     const defaultTableSubtotal = this.defaultTableSubtotal
 
@@ -1063,89 +1036,27 @@ class EditorStore {
     if ((arr.length === 3 || arr.length === 5) && arr[0] === 'contents') {
       if (index >= 0 && index <= this.config.contents.length) {
         if (type === 'table') {
-          // 如果传入了自定义表格配置，使用自定义配置，否则使用默认配置
-          const finalTableConfig = tableConfig
-            ? {
-                // 先展开自定义配置，支持传入其他配置项
-                ...tableConfig,
-                // 然后设置必需的属性，确保都有值
-                type: 'table',
-                className: tableConfig.className || '',
-                specialConfig: tableConfig.specialConfig || {
-                  style: {}
+          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'
                 },
-                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
+                text: i18next.t('内容'),
+                style: {
+                  textAlign: 'center'
+                }
               }
-            })
-          }
-
-          this.config.contents.splice(index, 0, finalTableConfig)
+            ]
+          })
         } else {
           this.config.contents.splice(index, 0, {
             blocks: [],

package/src/editor/context_menu.js

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

package/src/editor/editor.js

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

package/src/printer/page_summary.js

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

package/src/printer/store.js

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

package/src/printer/table.js

@@ -224,16 +224,6 @@ 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={{
@@ -264,7 +254,7 @@ class Table extends React.Component {
                 onDrop={this.handleDrop}
                 onDragOver={this.handleDragOver}
               >
-                {headText(col)}
+                {col.head}
               </th>
             ))}
           </tr>
@@ -274,17 +264,10 @@ 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 (
@@ -325,9 +308,7 @@ 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) ===