gm-printer 10.41.0 → 10.41.1

package/src/printer/table_overallOrder_tr.js

@@ -12,66 +12,54 @@ const OverallOrder = props => {
     printerStore,
     printerStore: {
       data: { common }
-    },
-    isLastTablePage
+    }
   } = props
 
-  // showEachPage 默认 true（老模板缺省视为每页展示）；false 时仅表格最后一页渲染
-  const showEachPage = overallOrder?.showEachPage !== false
-  const shouldShow =
-    overallOrder?.show &&
-    printerStore?.ready &&
-    (showEachPage || isLastTablePage)
-
-  if (!shouldShow) return null
-
   return (
-    <tr>
-      {_.map(overallOrder.fields, (item, index) => {
-        return (
-          <td colSpan={item.colSpan} key={index}>
-            <div style={{ ...item.style }} className='gm-flex-page'>
-              {item.name}
-              <div
-                className={classNames('gm-flex-page', {
-                  'gm-flex-justify-between-page':
-                    overallOrder?.isUpperLowerCaseSeparate,
-                  'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
-                })}
-              >
-                <span
-                  className={
-                    overallOrder?.isUpperCaseBefore
-                      ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
-                      : ''
-                  }
+    overallOrder?.show &&
+    printerStore?.ready && (
+      <tr>
+        {_.map(overallOrder.fields, (item, index) => {
+          return (
+            <td colSpan={item.colSpan} key={index}>
+              <div style={{ ...item.style }} className='gm-flex-page'>
+                {item.name}
+                <div
+                  className={classNames('gm-flex-page', {
+                    'gm-flex-justify-between-page':
+                      overallOrder?.isUpperLowerCaseSeparate,
+                    'gm-flex-grow-page': overallOrder?.isUpperLowerCaseSeparate
+                  })}
                 >
-                  {common?.[item.valueField] ?? ''}
-                </span>
-                {overallOrder?.needUpperCase && (
-                  <span>
-                    {common?.[item.valueField]
-                      ? coverDigit2Uppercase(common[item.valueField])
-                      : ''}
+                  <span
+                    className={
+                      overallOrder?.isUpperCaseBefore
+                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                        : ''
+                    }
+                  >
+                    {common?.[item.valueField] ?? ''}
                   </span>
-                )}
+                  {overallOrder?.needUpperCase && (
+                    <span>
+                      {common?.[item.valueField]
+                        ? coverDigit2Uppercase(common[item.valueField])
+                        : ''}
+                    </span>
+                  )}
+                </div>
               </div>
-            </div>
-          </td>
-        )
-      })}
-    </tr>
+            </td>
+          )
+        })}
+      </tr>
+    )
   )
 }
 OverallOrder.propTypes = {
   config: PropTypes.object.isRequired,
   range: PropTypes.object.isRequired,
-  printerStore: PropTypes.object,
-  isLastTablePage: PropTypes.bool
-}
-
-OverallOrder.defaultProps = {
-  isLastTablePage: true
+  printerStore: PropTypes.object
 }
 
 export default observer(OverallOrder)

package/src/util.js

@@ -233,16 +233,24 @@ const caclSingleDetailsPageHeight = (detailsHeights, curRemainPageHeight) => {
  * @param {*} arr
  */
 const getArrayMid = arr => {
+  let majority = 23
+
+  if (arr.length === 0) return majority
+
+  // 行数少时直接取最小行高，跳过多轮 Map 统计
+  if (arr.length <= 30) {
+    const min = Math.min(...arr)
+    if (min / 23 > 10) return 23
+    return min
+  }
+
   /** 数组元素出现次数的集合 */
   const mapArr = []
   const map = new Map()
-  let majority = 23
   /** 次数相同的元素集合 */
   const majorityArr = []
   const min = Math.min(...arr)
 
-  if (arr.length === 0) return majority
-
   _.forEach(arr, (val, key) => {
     if (map.has(val)) {
       map.set(val, map.get(val) + 1)