gm-printer 10.28.8-beta → 10.28.8-beta.1

package/build/index.html

@@ -0,0 +1 @@
+<!doctype html><html><head></head><body><div id="appContainer"></div><script src="/demo.js"></script><script src="/demo.js"></script></body></html>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gm-printer",
-  "version": "10.28.8-beta",
+  "version": "10.28.8-beta.1",
   "description": "diy printer",
   "main": "src/index.js",
   "scripts": {

package/src/common/editor_store.js

@@ -503,7 +503,7 @@ class EditorStore {
     } else {
       return
     }
-
+    console.log('type')
     switch (type) {
       case '':
       case 'text':
@@ -589,6 +589,18 @@ class EditorStore {
           text: `{{uniform_social_credit_code}}`
         })
         break
+      case 'qrcode_order_id':
+        blocks.push({
+          type: 'qrcode',
+          style: {
+            left: '0px',
+            top: '5px',
+            width: '75px',
+            height: '75px'
+          },
+          text: `{{qrcode_order_id}}`
+        })
+        break
       default:
         window.alert(i18next.t('出错啦，未识别类型，此信息不应该出现'))
     }

package/src/common/editor_title.js

@@ -7,8 +7,7 @@ import {
   DropDown,
   DropDownItem,
   DropDownItems,
-  Dialog,
-  Tip
+  Dialog
 } from '../components'
 import { doPrint } from '../printer'
 import { toJS } from 'mobx'
@@ -47,13 +46,6 @@ class EditorTitle extends React.Component {
   handleSave = () => {
     const { editStore, isPurchase } = this.props
     const result = editStore.config
-    console.log(result, 'result')
-    if (result.isSave) {
-      Tip.warning(
-        i18next.t('检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！')
-      )
-      return
-    }
     if (!isPurchase && result.batchPrintConfig) {
       delete result.batchPrintConfig
     }
@@ -84,12 +76,7 @@ class EditorTitle extends React.Component {
 
   handleSaveAs = () => {
     const { editStore } = this.props
-    if (editStore.config.isSave) {
-      Tip.warning(
-        i18next.t('检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！')
-      )
-      return
-    }
+
     Dialog.render({
       title: i18next.t('另存为'),
       children: <DialogChildren editStore={editStore} />,

package/src/editor/context_menu.js

@@ -18,6 +18,10 @@ const blockTypeList = [
   {
     value: 'uniform_social_credit_code',
     text: i18next.t('插入苏州安全监管平台二维码')
+  },
+  {
+    value: 'qrcode_order_id',
+    text: i18next.t('插入订单二维码')
   }
 ]
 

package/src/printer/printer.js

@@ -78,10 +78,6 @@ class Printer extends React.Component {
       nextProps.isAutoFilling !== this.props.isAutoFilling ||
       nextProps.fillIndex !== this.props.printerStore.fillIndex
     ) {
-      // 连续打印计算导致死循环 所以这里做了判断 五年前的提交记录是这样写的 我跟着写 在componentDidMount里写了
-      if (nextProps.config.batchPrintConfig == 2) {
-        return
-      }
       await this.props.printerStore.setAutofillConfig(nextProps.isAutoFilling)
       await this.props.printerStore.setFillIndex(nextProps.fillIndex)
       await this.props.printerStore.setData(nextProps.data)
@@ -239,9 +235,6 @@ class Printer extends React.Component {
       <>
         {_.map(printerStore.pages, (page, i) => {
           const isLastPage = i === printerStore.pages.length - 1
-          if (page.length === 0) {
-            return null
-          }
           return (
             <Page key={i}>
               <Header config={config.header} pageIndex={i} />

package/src/printer/store.js

@@ -9,7 +9,6 @@ import {
 } from '../util'
 import _ from 'lodash'
 import Big from 'big.js'
-import { Tip } from '../components'
 
 export const TR_BASE_HEIGHT = 23
 const price = (n, f = 2) => {
@@ -34,7 +33,6 @@ class PrinterStore {
 
   /** 当前页剩余空白高度 */
   @observable remainPageHeight = 0
-  @observable isSave = false
 
   data = {}
 
@@ -63,12 +61,6 @@ class PrinterStore {
     this.isMultiDigitDecimal = bool
   }
 
-  @action
-  setIsSave(bool) {
-    this.isSave = bool
-    this.config.isSave = bool
-  }
-
   @action
   init(config, data) {
     this.ready = false
@@ -262,17 +254,12 @@ class PrinterStore {
 
   @action
   computedPages() {
-    this.setIsSave(false)
     // 每次先初始化置空
     this.pages = []
     // 每页必有 页眉header, 页脚footer , 签名
     const allPagesHaveThisHeight = this.height.header + this.height.footer
     // 退出计算! 因为页眉 + 页脚 > currentPageHeight,页面装不下其他东西
     if (allPagesHaveThisHeight > this.pageHeight) {
-      Tip.warning(
-        i18next.t('检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！')
-      )
-      this.setIsSave(true)
       return
     }
 
@@ -377,18 +364,6 @@ class PrinterStore {
                   end++
                 }
               }
-              // 第一页一点表格都放不下时，什么都不展示
-              if (begin === 0 && end === 0 && index === 0) {
-                index++
-                this.pages = []
-                this.setIsSave(true)
-                Tip.warning(
-                  i18next.t(
-                    '检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！'
-                  )
-                )
-                break
-              }
               // 第一条极端会有问题
               if (end !== 0) {
                 page.push({

package/.eslintcache

@@ -1 +0,0 @@
-[{"/Users/joke/work_code/gm-printer/src/printer/table.js":"1","/Users/joke/work_code/gm-printer/src/printer/store.js":"2","/Users/joke/work_code/gm-printer/src/printer/table_subtotal_tr.js":"3","/Users/joke/work_code/gm-printer/src/common/util.js":"4","/Users/joke/work_code/gm-printer/src/common/editor_store.js":"5","/Users/joke/work_code/gm-printer/src/common/editor_edit_field.js":"6","/Users/joke/work_code/gm-printer/src/printer/printer.js":"7"},{"size":10861,"mtime":1722841015622},{"size":18403,"mtime":1709723362583,"results":"8","hashOfConfig":"9"},{"size":6329,"mtime":1722840447954,"results":"10","hashOfConfig":"11"},{"size":648,"mtime":1722840447954,"results":"12","hashOfConfig":"11"},{"size":49196,"mtime":1722840447953,"results":"13","hashOfConfig":"11"},{"size":23532,"mtime":1722840447952,"results":"14","hashOfConfig":"11"},{"size":13809,"mtime":1743492201549,"results":"15","hashOfConfig":"16"},{"filePath":"17","messages":"18","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1akqze6",{"filePath":"19","messages":"20","errorCount":1,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"12qfxi0",{"filePath":"21","messages":"22","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"23","messages":"24","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"25","messages":"26","errorCount":1,"warningCount":5,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"27","messages":"28","errorCount":3,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},"zc0ygz","/Users/joke/work_code/gm-printer/src/printer/store.js",[],"/Users/joke/work_code/gm-printer/src/printer/table_subtotal_tr.js",["29"],"/Users/joke/work_code/gm-printer/src/common/util.js",[],"/Users/joke/work_code/gm-printer/src/common/editor_store.js",[],"/Users/joke/work_code/gm-printer/src/common/editor_edit_field.js",["30","31","32","33","34","35"],"/Users/joke/work_code/gm-printer/src/printer/printer.js",["36","37","38"],{"ruleId":"39","severity":2,"message":"40","line":49,"column":9,"nodeType":"41","endLine":49,"endColumn":16},{"ruleId":"42","severity":1,"message":"43","line":344,"column":13,"nodeType":"44","endLine":344,"endColumn":49},{"ruleId":"42","severity":1,"message":"43","line":362,"column":13,"nodeType":"44","endLine":362,"endColumn":56},{"ruleId":"42","severity":1,"message":"43","line":528,"column":15,"nodeType":"44","endLine":528,"endColumn":53},{"ruleId":"42","severity":1,"message":"43","line":595,"column":11,"nodeType":"44","endLine":595,"endColumn":53},{"ruleId":"42","severity":1,"message":"43","line":645,"column":19,"nodeType":"44","endLine":645,"endColumn":64},{"ruleId":"45","severity":2,"message":"46","line":712,"column":22,"nodeType":"47","messageId":"48","endLine":712,"endColumn":31},{"ruleId":"49","severity":2,"message":"50","line":26,"column":24,"nodeType":"41","endLine":26,"endColumn":28},{"ruleId":"49","severity":2,"message":"50","line":44,"column":24,"nodeType":"41","endLine":44,"endColumn":28},{"ruleId":"51","severity":2,"message":"52","line":82,"column":45,"nodeType":"53","messageId":"54","endLine":82,"endColumn":47},"no-unused-vars","'sumData' is assigned a value but never used.","Identifier","react/jsx-handler-names","Handler function for onChange prop key must begin with 'handle'","JSXAttribute","gmfe/i18n-check","t函数的key只能为字符串常量(Literal)，请使用单引号或双引号包裹","MemberExpression","isVariable","react/prop-types","'flag' is missing in props validation","eqeqeq","Expected '===' and instead saw '=='.","BinaryExpression","unexpected"]