gm-printer 10.11.5-beta2 → 10.11.5

package/src/svg/question-circle-o.svg

@@ -0,0 +1 @@
+<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1564738751745" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="7454" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M512 814.3143524m-53.85930309 0a1.68310322 1.68310322 0 1 0 107.71860618 0 1.68310322 1.68310322 0 1 0-107.71860618 0ZM512 1011.40349551C234.8041201 1011.40349551 9.31317116 785.91254657 9.31317116 508.71666666S234.8041201 6.02983783 512 6.02983783s502.68682884 225.49094893 502.68682884 502.68682883S789.1958799 1011.40349551 512 1011.40349551zM512 78.16539777C274.58819198 78.16539777 81.4487311 271.30485865 81.4487311 508.71666666c0 237.37590183 193.13946088 430.5512689 430.5512689 430.55126891 237.37590183 0 430.5512689-193.17536708 430.5512689-430.55126891C942.5512689 271.30485865 749.37590183 78.16539777 512 78.16539777zM512 690.15070568c-19.82022354 0-35.90620206-16.08597852-35.90620206-35.90620206l0-60.7173877c0-58.74254656 44.88275257-103.62529915 84.52319965-143.22984C589.66511506 421.21325225 619.71860618 391.19566733 619.71860618 367.24623056c0-59.85563884-48.32974798-108.54444883-107.71860618-108.54444883-60.39423187 0-107.71860618 46.60625028-107.71860618 106.10282708 0 19.82022354-16.08597852 35.90620206-35.90620206 35.90620205s-35.90620206-16.08597852-35.90620207-35.90620205c0-98.09574403 80.53761122-177.91523121 179.53101031-177.91523121s179.53101031 80.89667324 179.53101031 180.35685296c0 53.75158448-40.75353933 94.46921762-80.14264301 133.85832126C580.14997152 532.27113522 547.90620206 564.51490466 547.90620206 593.49120973l0 60.71738769C547.90620206 674.02882095 531.82022354 690.15070568 512 690.15070568z" p-id="7455"></path></svg>

package/src/util.js

@@ -15,7 +15,7 @@ function getHeight(el) {
 
 function getWidth(el) {
   const styles = window.getComputedStyle(el)
-  const width = el.offsetWidth
+  const width = Math.ceil(el.offsetWidth)
   const borderLeftWidth = parseFloat(styles.borderLeftWidth)
   const borderRightWidth = parseFloat(styles.borderRightWidth)
   const paddingLeft = parseFloat(styles.paddingLeft)
@@ -178,6 +178,56 @@ const getDataKey = (dataKey, arrange) =>
     ? `${dataKey}_vertical`
     : dataKey
 
+/**
+ * @param {*} table 当前单据的高度信息
+ * @param {*} detailsData 当前所有tablelist
+ * @param {*} currentPageMinimumHeight 当前page最小高度
+ * @param {*} pageHeight page的高度
+ * @returns {ranges, detailsPageHeight} detailsPageHeight 每页高度合集
+ */
+const caclSingleDetailsPageHeight = (
+  indexEnd,
+  table,
+  detailsData,
+  heightParams
+) => {
+  let end = 0
+  let begin = 0
+  let index = 0
+  let currentDetailsMiniHeight = 0
+  const ranges = []
+  const detailsPageHeight = []
+  const { calcHeight, pageHeight, currentPageMinimumHeight } = heightParams
+
+  while (end < detailsData.length) {
+    currentDetailsMiniHeight += table.body.children[end]
+
+    const _calcHeight = !index && indexEnd === 0 ? calcHeight : pageHeight
+    // 如果当前明细高度综合大于页面高度，到此为止进行分页
+    if (currentDetailsMiniHeight + currentPageMinimumHeight > _calcHeight) {
+      detailsPageHeight.push(
+        currentDetailsMiniHeight - table.body.children[end]
+      )
+      ranges.push([begin, end])
+      end++
+      index++
+      begin = end
+      currentDetailsMiniHeight = 0
+    } else {
+      end++
+      if (end === detailsData.length) {
+        ranges.push([begin, end])
+        detailsPageHeight.push(currentDetailsMiniHeight)
+      }
+    }
+  }
+
+  return {
+    ranges,
+    detailsPageHeight
+  }
+}
+
 export {
   getHeight,
   getWidth,
@@ -193,5 +243,6 @@ export {
   coverDigit2Uppercase,
   getDataKey,
   isMultiTable,
-  getMultiNumber
+  getMultiNumber,
+  caclSingleDetailsPageHeight
 }

package/webpack.config.js

@@ -36,6 +36,24 @@ module.exports = {
             }
           }
         ]
+      },
+      {
+        test: /\/svg\/(\w|\W)+\.svg$/,
+        use: [
+          {
+            loader: '@svgr/webpack',
+            options: {
+              icon: true,
+              expandProps: 'start',
+              svgProps: {
+                fill: 'currentColor',
+                // className 冗余
+                className:
+                  "{'gm-svg-icon t-svg-icon m-svg-icon ' + (props.className || '')}"
+              }
+            }
+          }
+        ]
       }
     ]
   },
@@ -45,7 +63,7 @@ module.exports = {
   devServer: {
     compress: true,
     host: '0.0.0.0',
-    port: 8081,
+    port: 5678,
     inline: false,
     disableHostCheck: true,
     proxy: {

package/global.d.ts

@@ -1,67 +0,0 @@
-declare module 'gm-printer' {
-  import { CSSProperties } from 'react'
-  interface EditorProps {
-    config: any
-    mockData: any
-    onSave: (config: any, isSaveAs?: boolean) => void
-    showEditor: boolean
-    addFields: any
-  }
-  interface PrinterProps {
-    data: any
-    config: any
-    className?: string
-    style?: CSSProperties
-    selected?: string
-    selectedRegion?: string
-    onReady?: () => void
-  }
-  interface BatchPrinterProps {
-    list: any[]
-    onReady?: () => void
-  }
-  // function Editor<P extends EditorProps>(props: P): React.ComponentType<P>
-  class Editor<T extends EditorProps> extends React.Component<T, any> {}
-  class EditorStockIn<T extends EditorProps> extends React.Component<T, any> {}
-  class EditorStockOut<T extends EditorProps> extends React.Component<T, any> {}
-  class EditorPurchase<T extends EditorProps> extends React.Component<T, any> {}
-  class EditorSettle<T extends EditorProps> extends React.Component<T, any> {}
-  class EditorCannibalize<T extends EditorProps> extends React.Component<T, any> {}
-  class EditorStatement<T extends EditorProps> extends React.Component<
-    T,
-    any
-  > {}
-  class EditorAccoutStatement<T extends EditorProps> extends React.Component<
-    T,
-    any
-  > {}
-  class EditorBoxLabel<T extends EditorProps> extends React.Component<T, any> {}
-  class Printer<T extends PrinterProps> extends React.Component<T, any> {}
-  class BatchPrinter<T extends BatchPrinterProps> extends React.Component<T, any> {}
-  const MULTI_SUFFIX: string
-  function getCSS(): string
-  function insertCSS(cssString: string, target?: HTMLElement | ShadowRoot): void
-  function doPrint(
-    obj: { data: any; config: any },
-    isTest?: boolean
-  ): (obj: { data: any; config: any }) => Promise<any>
-  function doBatchPrint(list: any [], isTest?: boolean): (list: []) => Promise<any>
-  export {
-    Editor,
-    EditorStockIn,
-    EditorStockOut,
-    EditorPurchase,
-    EditorSettle,
-    EditorCannibalize,
-    EditorStatement,
-    EditorAccoutStatement,
-    EditorBoxLabel,
-    Printer,
-    BatchPrinter,
-    MULTI_SUFFIX,
-    insertCSS,
-    getCSS,
-    doPrint,
-    doBatchPrint
-  }
-}

package/src/editor_cannibalize/index.js

@@ -1,4 +0,0 @@
-import withShadowDom from '../common/hoc_with_shadow_dom'
-import Editor from './editor'
-
-export default withShadowDom(Editor)

package/src/editor_cannibalize/store.js

@@ -1,29 +0,0 @@
-import EditorStore from '../common/editor_store'
-import { action } from 'mobx'
-import _ from 'lodash'
-
-class Store extends EditorStore {
-  @action
-  changeTableDataKeyStockout(name, key) {
-    const arr = name.split('.')
-    const { dataKey } = this.config.contents[arr[2]]
-    const keyArr = dataKey.split('_')
-    let newDataKey
-    // 当前有这个key则去掉
-    if (keyArr.includes(key)) {
-      newDataKey = _.without(keyArr, key)
-    } else {
-      newDataKey = _.concat(keyArr, key)
-    }
-    newDataKey = _.sortBy(newDataKey, [
-      o => o === 'money',
-      o => o === 'quantity',
-      o => o === 'multi',
-      o => o === 'orders'
-    ])
-
-    this.config.contents[arr[2]].dataKey = newDataKey.join('_')
-  }
-}
-
-export default new Store()