gm-printer 10.28.7-beta.0 → 10.28.7

package/package.json

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

package/src/common/editor_title.js

@@ -7,7 +7,8 @@ import {
   DropDown,
   DropDownItem,
   DropDownItems,
-  Dialog
+  Dialog,
+  Tip
 } from '../components'
 import { doPrint } from '../printer'
 import { toJS } from 'mobx'
@@ -46,6 +47,13 @@ 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
     }
@@ -76,7 +84,12 @@ 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/printer/store.js

@@ -34,6 +34,7 @@ class PrinterStore {
 
   /** 当前页剩余空白高度 */
   @observable remainPageHeight = 0
+  @observable isSave = false
 
   data = {}
 
@@ -62,6 +63,12 @@ class PrinterStore {
     this.isMultiDigitDecimal = bool
   }
 
+  @action
+  setIsSave(bool) {
+    this.isSave = bool
+    this.config.isSave = bool
+  }
+
   @action
   init(config, data) {
     this.ready = false
@@ -255,6 +262,7 @@ class PrinterStore {
 
   @action
   computedPages() {
+    this.setIsSave(false)
     // 每次先初始化置空
     this.pages = []
     // 每页必有 页眉header, 页脚footer , 签名
@@ -264,6 +272,7 @@ class PrinterStore {
       Tip.warning(
         i18next.t('检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！')
       )
+      this.setIsSave(true)
       return
     }
 
@@ -372,6 +381,7 @@ class PrinterStore {
               if (begin === 0 && end === 0 && index === 0) {
                 index++
                 this.pages = []
+                this.setIsSave(true)
                 Tip.warning(
                   i18next.t(
                     '检测到当前页面高度不足，无法完整渲染，请重新设置页面高度！'