gm-printer 10.14.2-alpha.5 → 10.14.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.14.2-alpha.5",
+  "version": "10.14.3",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/printer/store.js

@@ -11,7 +11,10 @@ import _ from 'lodash'
 import Big from 'big.js'
 
 export const TR_BASE_HEIGHT = 23
-const price = (n, f = 2) => Big(n || 0).toFixed(f)
+const price = (n, f = 2) => {
+  if (isNaN(n)) return null
+  return Big(n || 0).toFixed(f)
+}
 class PrinterStore {
   @observable ready = false
 

package/src/printer/table.js

@@ -117,14 +117,17 @@ class Table extends React.Component {
               /{{(price\()?列\.([^{{]+)}}/g,
               (s, s1, s2) => {
                 if (s1) {
-                  // 有price函数插进来
-                  const mix_suffix = s2.replace(/\*/, () => `${MULTI_SUFFIX}*`)
-                  return `{{${s1}列.${mix_suffix}${colNum}}}`
+                  // 有price函数插进来， 匹配‘ _基本单位 ’类似的字符串并添加后缀，生成三栏或者双栏数据
+                  const _s = s.replace(
+                    /_[\u4e00-\u9fa5]*/g,
+                    match => `${match}${MULTI_SUFFIX}${colNum}`
+                  )
+                  return _s
                 } else {
                   return `{{列.${s2}${MULTI_SUFFIX}${colNum}}}`
                 }
               }
-            ) // {{列.xx}} => {{列.xxMULTI_SUFFIXi}}
+            )
           }
           // 多栏商品的明细取 __details_MULTI_SUFFIX
           if (val.specialDetailsKey)