gm-printer 10.14.1 → 10.14.2-alpha.0

package/src/components/flex/style.less

@@ -19,6 +19,10 @@
   align-items: stretch;
   box-sizing: border-box;
 
+  &.gm-flex-grow {
+    flex-grow: 1;
+  }
+
   &.gm-flex-wrap {
     flex-wrap: wrap;
   }
@@ -98,4 +102,4 @@
   &.gm-flex-align-content-stretch {
     align-content: stretch;
   }
-}
+}

package/src/editor/context_menu.js

@@ -61,7 +61,6 @@ class ContextMenu extends React.Component {
 
   handleSubtotal = name => {
     const { editStore } = this.props
-
     editStore.setSubtotalShow(name)
   }
 
@@ -70,6 +69,11 @@ class ContextMenu extends React.Component {
     editStore.handleChangeTableData(isAutoFilling)
   }
 
+  handleOverallOrder = name => {
+    const { editStore } = this.props
+    editStore.setOverallOrderShow(name)
+  }
+
   renderOrderActionBtn = name => {
     if (!this.hasSubtotalBtn(name)) {
       return null
@@ -84,13 +88,18 @@ class ContextMenu extends React.Component {
       }
     } = this.props
     const arr = name.split('.')
-    const { dataKey, subtotal } = this.props.editStore.config.contents[arr[2]]
+    const {
+      dataKey,
+      subtotal,
+      overallOrder
+    } = this.props.editStore.config.contents[arr[2]]
     const keyArr = dataKey.split('_')
 
     const isMultiActive = keyArr.includes('multi')
     const isThreeActive = keyArr.includes('multi3')
     const isCategoryActive = keyArr.includes('category')
     const isSubtotalActive = subtotal.show
+    const isOverallOrder = overallOrder?.show
 
     return (
       <>
@@ -127,6 +136,12 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('行数填充')}
         </div>
+        <div
+          onClick={this.handleOverallOrder.bind(this, name)}
+          className={isOverallOrder ? 'active' : ''}
+        >
+          {i18next.t('整单合计')}
+        </div>
       </>
     )
   }
@@ -147,6 +162,7 @@ class ContextMenu extends React.Component {
           config={editStore.config}
           data={editStore.mockData}
           getremainpageHeight={editStore.setRemainPageHeight}
+          overallorder={editStore.overallOrderShow}
         />
       </CommonContextMenu>
     )

package/src/printer/printer.js

@@ -81,6 +81,9 @@ class Printer extends React.Component {
         this.props.printerStore.remainPageHeight
       )
     }
+    if (nextProps.overallorder !== this.props.overallorder) {
+      this.props.printerStore.setOverallOrder(nextProps.config)
+    }
   }
 
   componentDidMount() {
@@ -324,7 +327,8 @@ Printer.propTypes = {
   config: PropTypes.object.isRequired,
   onReady: PropTypes.func,
   isSomeSubtotalTr: PropTypes.bool,
-  getremainpageHeight: PropTypes.func
+  getremainpageHeight: PropTypes.func,
+  overallorder: PropTypes.bool
 }
 
 Printer.defaultProps = {

package/src/printer/store.js

@@ -4,7 +4,8 @@ import {
   getSumTrHeight,
   isMultiTable,
   caclSingleDetailsPageHeight,
-  getArrayMid
+  getArrayMid,
+  getOverallOrderTrHeight
 } from '../util'
 import _ from 'lodash'
 import Big from 'big.js'
@@ -169,6 +170,11 @@ class PrinterStore {
     }
   }
 
+  @action
+  setOverallOrder(config) {
+    this.config = config || {}
+  }
+
   @action
   computedData(dataKey, table, end, currentRemainTableHeight) {
     /** 当前数据 */
@@ -240,9 +246,13 @@ class PrinterStore {
         tableCount++
         // 表格原始的高度和宽度信息
         const table = this.tablesInfo[`contents.table.${index}`]
-        const { subtotal, dataKey, summaryConfig } = content
+        const { subtotal, dataKey, summaryConfig, overallOrder } = content
         // 如果显示每页合计,那么table高度多预留一行高度
         const subtotalTrHeight = subtotal.show ? getSumTrHeight(subtotal) : 0
+        // 如果显示整单合计,那么table高度多预留一行高度
+        const overallOrderTrHeight = overallOrder?.show
+          ? getOverallOrderTrHeight(overallOrder)
+          : 0
         // 如果每页合计(新的),那么table高度多预留一行高度
         const pageSummaryTrHeight =
           summaryConfig?.pageSummaryShow && !isMultiTable(dataKey) // 双栏table没有每页合计
@@ -250,7 +260,10 @@ class PrinterStore {
             : 0
         // 每个表格都具有的高度
         const allTableHaveThisHeight =
-          table.head.height + subtotalTrHeight + pageSummaryTrHeight
+          table.head.height +
+          subtotalTrHeight +
+          pageSummaryTrHeight +
+          overallOrderTrHeight
         /** 当前page页面的最小高度 */
         const currentPageMinimumHeight =
           allPagesHaveThisHeight + allTableHaveThisHeight

package/src/printer/style.lesss

@@ -166,3 +166,6 @@
   flex-grow: 1;
   justify-content: space-between;
 }
+.gm-printer-subtotal-isUpperCaseBefore-inter{
+  order:2;
+}

package/src/printer/table.js

@@ -16,6 +16,7 @@ import { MULTI_SUFFIX } from '../config'
 import SpecialTr from './table_special_tr'
 import SubtotalTr from './table_subtotal_tr'
 import PageSummary from './page_summary'
+import OverallOrder from './table_overallOrder_tr'
 
 @inject('printerStore')
 @observer
@@ -290,6 +291,11 @@ class Table extends React.Component {
           {this.props.config.subtotal.isCommutationPlace
             ? PageSummarySubtotalTr()
             : subtotalTrPageSummary()}
+          <OverallOrder
+            range={range}
+            config={config}
+            printerStore={printerStore}
+          />
         </tbody>
       </table>
     )

package/src/printer/table_overallOrder_tr.js

@@ -0,0 +1,63 @@
+import React from 'react'
+import PropTypes from 'prop-types'
+import _ from 'lodash'
+// import Big from 'big.js'
+import { coverDigit2Uppercase } from '../util'
+import { observer } from 'mobx-react'
+import { Flex } from '../components'
+
+const OverallOrder = props => {
+  const {
+    config: { overallOrder },
+    // range,
+    printerStore,
+    printerStore: {
+      data: { common }
+    }
+  } = props
+
+  return (
+    overallOrder?.show &&
+    printerStore?.ready && (
+      <tr>
+        {_.map(overallOrder.fields, (item, index) => {
+          return (
+            <td colSpan={item.colSpan} key={index}>
+              <Flex style={{ ...item.style, display: 'flex' }}>
+                {item.name}
+                <Flex
+                  justifyBetween={overallOrder?.isUpperLowerCaseSeparate}
+                  flexGrow={overallOrder?.isUpperLowerCaseSeparate}
+                >
+                  <span
+                    className={
+                      overallOrder?.isUpperCaseBefore
+                        ? 'gm-printer-subtotal-isUpperCaseBefore-inter'
+                        : ''
+                    }
+                  >
+                    {common?.[item.valueField] ?? ''}
+                  </span>
+                  {overallOrder?.needUpperCase && (
+                    <span>
+                      {common?.[item.valueField]
+                        ? coverDigit2Uppercase(common[item.valueField])
+                        : ''}
+                    </span>
+                  )}
+                </Flex>
+              </Flex>
+            </td>
+          )
+        })}
+      </tr>
+    )
+  )
+}
+OverallOrder.propTypes = {
+  config: PropTypes.object.isRequired,
+  range: PropTypes.object.isRequired,
+  printerStore: PropTypes.object
+}
+
+export default observer(OverallOrder)

package/src/printer/table_subtotal_tr.js

@@ -36,7 +36,6 @@ const SubtotalTr = props => {
     printerStore,
     isSomeSubtotalTr
   } = props
-
   const tableData = printerStore.data._table[getDataKey(dataKey, arrange)] || []
   // 计算合计
   const sumData = (list, field) => {

package/src/util.js

@@ -108,6 +108,14 @@ function getSumTrHeight(SumTr) {
   return (parseInt(fontSize) - 12) * 1.5 + 26
 }
 
+function getOverallOrderTrHeight(overallOrder) {
+  const { fields = [] } = overallOrder
+  const fontSize = fields?.[0]?.style?.fontSize || '12px'
+
+  // 12px => 26, 14px => 29, 16px => 33, ...
+  return (parseInt(fontSize) - 12) * 1.5 + 26
+}
+
 // eslint-disable-next-line
 const coverDigit2Uppercase = n => {
   if (_.isNil(n) || _.isNaN(n)) {
@@ -274,6 +282,17 @@ const getArrayMid = arr => {
   return majority
 }
 
+/**
+ * 获取整单合计colSpan合并的个数
+ * @param {*} table
+ * @returns number
+ */
+const getColSpanLength = table => {
+  return /multi/.test(table.dataKey)
+    ? getMultiNumber(table.dataKey) * table.columns.length
+    : table.columns.length
+}
+
 export {
   getHeight,
   getWidth,
@@ -291,5 +310,7 @@ export {
   isMultiTable,
   getMultiNumber,
   caclSingleDetailsPageHeight,
-  getArrayMid
+  getArrayMid,
+  getColSpanLength,
+  getOverallOrderTrHeight
 }