gm-printer 10.34.0 → 10.35.0

package/src/printer/table_diy_overallOrder_tr.js

@@ -31,47 +31,118 @@ const DiyOverallOrder = props => {
     ).toFixed(2)
   }
 
+  if (!diyOverallOrder?.show || !printerStore?.ready) {
+    return null
+  }
+
+  const leftField = diyOverallOrder.fields?.[0]
+  if (!leftField) return null
+  const rightName = leftField.rightName || ''
+
+  // 左右显示分离
+  const isUpperLowerCaseSeparate = diyOverallOrder?.isUpperLowerCaseSeparate
+  // 大写金额在前
+  const isUpperCaseBefore = diyOverallOrder?.isUpperCaseBefore
+  // 大写金额
+  const needUpperCase = diyOverallOrder?.needUpperCase
+  // 小写金额
+  const numericValue = sumData(leftField.valueField)
+  // 大写金额
+  const upperCaseValue = needUpperCase ? coverDigit2Uppercase(numericValue) : ''
+
+  const leftText = () => {
+    if (isUpperLowerCaseSeparate) {
+      // 大写金额在前
+      if (isUpperCaseBefore) {
+        return upperCaseValue
+      }
+      // 小写金额在前
+      return numericValue
+    }
+
+    // 大写金额在前且需要大写金额
+    if (isUpperCaseBefore) {
+      return `${upperCaseValue} ${numericValue}`
+    }
+
+    if (needUpperCase) {
+      return `${numericValue} ${upperCaseValue}`
+    }
+
+    return numericValue
+  }
+
+  const rightText = () => {
+    if (isUpperLowerCaseSeparate) {
+      if (isUpperCaseBefore) {
+        return `${rightName} ${numericValue}`
+      }
+      return `${rightName} ${upperCaseValue}`
+    }
+
+    return ''
+  }
   return (
-    diyOverallOrder?.show &&
-    printerStore?.ready && (
-      <tr>
-        {_.map(diyOverallOrder.fields, (item, index) => {
-          return (
-            <td colSpan={item.colSpan ?? 99} key={index}>
-              <div style={{ ...item.style }} className='gm-flex-page'>
-                {item.name}
-                <div
-                  className={classNames('gm-flex-page', {
-                    'gm-flex-justify-between-page':
-                      diyOverallOrder?.isUpperLowerCaseSeparate,
-                    'gm-flex-grow-page':
-                      diyOverallOrder?.isUpperLowerCaseSeparate
-                  })}
-                >
-                  <span
-                    className={
-                      diyOverallOrder?.isUpperCaseBefore
-                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
-                        : ''
-                    }
-                  >
-                    {sumData(item.valueField)}
-                  </span>
-                  {diyOverallOrder?.needUpperCase && (
-                    <span>
-                      {coverDigit2Uppercase(sumData(item.valueField))
-                        ? coverDigit2Uppercase(sumData(item.valueField))
-                        : ''}
-                    </span>
-                  )}
-                </div>
-              </div>
-            </td>
-          )
-        })}
-      </tr>
-    )
+    <tr>
+      <td colSpan={99}>
+        <div style={{ ...leftField.style }} className='gm-flex-page'>
+          {leftField.name}
+          <div
+            className={classNames('gm-flex-page', {
+              'gm-flex-justify-between-page': isUpperLowerCaseSeparate,
+              'gm-flex-grow-page': isUpperLowerCaseSeparate
+            })}
+          >
+            {/* 左侧金额 */}
+            <span>{leftText()}</span>
+
+            <span>{rightText()}</span>
+          </div>
+        </div>
+      </td>
+    </tr>
   )
+  // return (
+  //   diyOverallOrder?.show &&
+  //   printerStore?.ready && (
+  //     <tr>
+  //       {_.map(diyOverallOrder.fields, (item, index) => {
+  //         return (
+  //           <td colSpan={item.colSpan ?? 99} key={index}>
+  //             <div style={{ ...item.style }} className='gm-flex-page'>
+  //               {item.name}
+  //               <div
+  //                 className={classNames('gm-flex-page', {
+  //                   'gm-flex-justify-between-page':
+  //                     diyOverallOrder?.isUpperLowerCaseSeparate,
+  //                   'gm-flex-grow-page':
+  //                     diyOverallOrder?.isUpperLowerCaseSeparate
+  //                 })}
+  //               >
+  //                 <span
+  //                   className={
+  //                     diyOverallOrder?.isUpperCaseBefore
+  //                       ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+  //                       : ''
+  //                   }
+  //                 >
+  //                   {sumData(item.valueField)}
+  //                 </span>
+  //                 {diyOverallOrder?.needUpperCase && (
+  //                   <span>
+  //                     {coverDigit2Uppercase(sumData(item.valueField))
+  //                       ? coverDigit2Uppercase(sumData(item.valueField))
+  //                       : ''}
+  //                   </span>
+  //                 )}
+  //               </div>
+  //             </div>
+  //           </td>
+  //         )
+  //       })}
+  //     </tr>
+  //   )
+  // )
 }
 DiyOverallOrder.propTypes = {
   config: PropTypes.object.isRequired,

package/src/printer/table_diy_summary_tr.js

@@ -0,0 +1,127 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+import { coverDigit2Uppercase, getDataKey } from '../util'
+import { observer } from 'mobx-react'
+import classNames from 'classnames'
+import Big from 'big.js'
+
+/**
+ * 通用的自定义合计组件
+ * @param {string} configKey - 配置键名
+ * @param {Function} getTableData - 获取表格数据的函数，用于区分整单合计和每页合计
+ */
+const DiySummary = props => {
+  const {
+    configKey,
+    config: { dataKey, arrange },
+    printerStore,
+    range,
+    pageIndex,
+    getTableData
+  } = props
+
+  const diyConfig = props.config[configKey]
+
+  // 根据 configKey 决定如何获取数据
+  const tableData = getTableData
+    ? getTableData(printerStore, dataKey, arrange, range)
+    : printerStore.data._table[getDataKey(dataKey, arrange)] || []
+
+  // 计算合计
+  const sumData = field => {
+    return _.reduce(
+      tableData,
+      (a, b, i) => {
+        let result = a
+        const bRes = printerStore
+          .templateTable(field, dataKey, range ? range.begin + i : i, pageIndex)
+          .replace(/\(\)/g, '')
+        result = a.plus(+bRes || 0)
+        return result
+      },
+      Big(0)
+    ).toFixed(2)
+  }
+
+  if (!diyConfig?.show || !printerStore?.ready) {
+    return null
+  }
+
+  const leftField = diyConfig.fields?.[0]
+  if (!leftField) {
+    return null
+  }
+
+  const rightName = leftField.rightName || ''
+  const isUpperLowerCaseSeparate = diyConfig?.isUpperLowerCaseSeparate
+  const isUpperCaseBefore = diyConfig?.isUpperCaseBefore
+  const needUpperCase = diyConfig?.needUpperCase
+  const numericValue = sumData(leftField.valueField)
+  const upperCaseValue = needUpperCase ? coverDigit2Uppercase(numericValue) : ''
+
+  const leftText = () => {
+    if (isUpperLowerCaseSeparate) {
+      // 大写金额在前
+      if (isUpperCaseBefore) {
+        return upperCaseValue
+      }
+      // 小写金额在前
+      return numericValue
+    }
+
+    // 大写金额在前且需要大写金额
+    if (isUpperCaseBefore) {
+      return `${upperCaseValue} ${numericValue}`
+    }
+
+    if (needUpperCase) {
+      return `${numericValue} ${upperCaseValue}`
+    }
+
+    return numericValue
+  }
+
+  const rightText = () => {
+    if (isUpperLowerCaseSeparate) {
+      if (isUpperCaseBefore) {
+        return `${rightName} ${numericValue}`
+      }
+      return `${rightName} ${upperCaseValue}`
+    }
+
+    return ''
+  }
+
+  return (
+    <tr>
+      <td colSpan={99}>
+        <div style={{ ...leftField.style }} className='gm-flex-page'>
+          {leftField.name}
+          <div
+            className={classNames('gm-flex-page', {
+              'gm-flex-justify-between-page': isUpperLowerCaseSeparate,
+              'gm-flex-grow-page': isUpperLowerCaseSeparate
+            })}
+          >
+            {/* 左侧金额 */}
+            <span>{leftText()}</span>
+
+            <span>{rightText()}</span>
+          </div>
+        </div>
+      </td>
+    </tr>
+  )
+}
+
+DiySummary.propTypes = {
+  configKey: PropTypes.string.isRequired,
+  config: PropTypes.object.isRequired,
+  printerStore: PropTypes.object,
+  range: PropTypes.object,
+  pageIndex: PropTypes.number,
+  getTableData: PropTypes.func
+}
+
+export default observer(DiySummary)

package/src/util.js

@@ -293,7 +293,49 @@ const getColSpanLength = table => {
     : table.columns.length
 }
 
+/**
+ * 收集分类小计的组
+ * @param {*} tableData
+ * @param {*} range
+ * @param {*} key
+ * @returns
+ */
+const collectGroups = (tableData, range, key = '_collect') => {
+  const groups = []
+  let currentGroup = []
+  let currentStart = range.begin
+
+  for (let idx = range.begin; idx < range.end; idx++) {
+    const row = tableData[idx]
+    const isSpecial = row && row[key]
+
+    if (isSpecial) {
+      if (currentGroup.length) {
+        groups.push({
+          groupKey: extractCategoryName(row[key]?.text),
+          begin: currentStart,
+          end: idx,
+          specialIndex: idx
+        })
+        currentGroup = []
+      }
+      currentStart = idx + 1
+    } else if (row && Object.keys(row).length) {
+      currentGroup.push(row)
+    }
+  }
+
+  return groups
+
+  function extractCategoryName(text) {
+    if (!text) return ''
+    const match = text.match(/^(.*?)[：:]/)
+    return match ? match[1] : ''
+  }
+}
+
 export {
+  collectGroups,
   getHeight,
   getWidth,
   pxAdd,