gm-printer 10.11.5 → 10.13.1-alpha.1

package/.eslintcache

@@ -1 +1 @@
-[{"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js":"1","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js":"2","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js":"3","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js":"4","/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js":"5","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js":"6","/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js":"7","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js":"8"},{"size":8814,"mtime":1633276961204,"results":"9","hashOfConfig":"10"},{"size":11105,"mtime":1632648482981,"results":"11","hashOfConfig":"10"},{"size":4066,"mtime":1621236648877,"results":"12","hashOfConfig":"10"},{"size":3192,"mtime":1621238473815,"results":"13","hashOfConfig":"10"},{"size":616,"mtime":1621235314060,"results":"14","hashOfConfig":"10"},{"size":9693,"mtime":1621242097206,"results":"15","hashOfConfig":"10"},{"size":5968,"mtime":1632644668974,"results":"16","hashOfConfig":"10"},{"size":8724,"mtime":1631266134763,"results":"17","hashOfConfig":"10"},{"filePath":"18","messages":"19","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"175njjo",{"filePath":"20","messages":"21","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"22","messages":"23","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"24","messages":"25","errorCount":17,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"26","messages":"27","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"28","messages":"29","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"30","messages":"31","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"32","messages":"33","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js",["34","35","36","37","38","39","40","41","42","43","44","45","46","47","48","49","50"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js",[],{"ruleId":"51","severity":2,"message":"52","line":7,"column":10,"nodeType":"53","endLine":7,"endColumn":38},{"ruleId":"54","severity":2,"message":"55","line":38,"column":34,"nodeType":"53","endLine":38,"endColumn":43},{"ruleId":"54","severity":2,"message":"56","line":38,"column":44,"nodeType":"53","endLine":38,"endColumn":50},{"ruleId":"54","severity":2,"message":"57","line":38,"column":51,"nodeType":"53","endLine":38,"endColumn":59},{"ruleId":"54","severity":2,"message":"55","line":44,"column":13,"nodeType":"58","endLine":44,"endColumn":22},{"ruleId":"54","severity":2,"message":"59","line":46,"column":15,"nodeType":"53","endLine":46,"endColumn":33},{"ruleId":"54","severity":2,"message":"55","line":50,"column":13,"nodeType":"58","endLine":50,"endColumn":22},{"ruleId":"54","severity":2,"message":"60","line":52,"column":15,"nodeType":"53","endLine":52,"endColumn":30},{"ruleId":"54","severity":2,"message":"55","line":62,"column":46,"nodeType":"53","endLine":62,"endColumn":55},{"ruleId":"54","severity":2,"message":"56","line":62,"column":56,"nodeType":"53","endLine":62,"endColumn":62},{"ruleId":"54","severity":2,"message":"57","line":62,"column":63,"nodeType":"53","endLine":62,"endColumn":71},{"ruleId":"54","severity":2,"message":"55","line":94,"column":13,"nodeType":"58","endLine":94,"endColumn":22},{"ruleId":"54","severity":2,"message":"61","line":94,"column":24,"nodeType":"58","endLine":94,"endColumn":32},{"ruleId":"54","severity":2,"message":"62","line":101,"column":26,"nodeType":"53","endLine":101,"endColumn":44},{"ruleId":"54","severity":2,"message":"63","line":102,"column":31,"nodeType":"53","endLine":102,"endColumn":39},{"ruleId":"54","severity":2,"message":"64","line":103,"column":37,"nodeType":"53","endLine":103,"endColumn":51},{"ruleId":"54","severity":2,"message":"56","line":104,"column":29,"nodeType":"53","endLine":104,"endColumn":35},"no-unused-vars","'noSubtotalBtnTableDataKeySet' is defined but never used.","Identifier","react/prop-types","'editStore' is missing in props validation","'editStore.config' is missing in props validation","'editStore.config.contents' is missing in props validation","Property","'editStore.changeTableDataKey' is missing in props validation","'editStore.setSubtotalShow' is missing in props validation","'mockData' is missing in props validation","'editStore.computedPrinterKey' is missing in props validation","'editStore.selected' is missing in props validation","'editStore.selectedRegion' is missing in props validation"]
+[{"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js":"1","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js":"2","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js":"3","/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js":"4","/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js":"5","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js":"6","/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js":"7","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js":"8","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store copy.js":"9","/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js":"10","/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js":"11"},{"size":8814,"mtime":1633276961204,"results":"12","hashOfConfig":"13"},{"size":11087,"mtime":1634195458602,"results":"14","hashOfConfig":"15"},{"size":4066,"mtime":1621236648877,"results":"16","hashOfConfig":"13"},{"size":3192,"mtime":1621238473815,"results":"17","hashOfConfig":"13"},{"size":616,"mtime":1621235314060,"results":"18","hashOfConfig":"13"},{"size":9693,"mtime":1621242097206,"results":"19","hashOfConfig":"13"},{"size":5968,"mtime":1634191487398,"results":"20","hashOfConfig":"15"},{"size":8724,"mtime":1631266134763,"results":"21","hashOfConfig":"13"},{"size":11087,"mtime":1634191487394,"results":"22","hashOfConfig":"15"},{"size":3119,"mtime":1634191808754,"results":"23","hashOfConfig":"15"},{"size":1186,"mtime":1634193250064,"results":"24","hashOfConfig":"15"},{"filePath":"25","messages":"26","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"175njjo",{"filePath":"27","messages":"28","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"1j0d8vf",{"filePath":"29","messages":"30","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"31","messages":"32","errorCount":17,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0,"source":null},{"filePath":"33","messages":"34","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"35","messages":"36","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"37","messages":"38","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"39","messages":"40","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"41","messages":"42","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"43","messages":"44","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},{"filePath":"45","messages":"46","errorCount":0,"warningCount":0,"fixableErrorCount":0,"fixableWarningCount":0},"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/table.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/editor.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/editor/context_menu.js",["47","48","49","50","51","52","53","54","55","56","57","58","59","60","61","62","63"],"/Users/yancheng/gm/gm-open-source/gm-printer/src/components/tooltip/index.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/common_context_menu.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/util.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/printer.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/store copy.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/printer/do_print.js",[],"/Users/yancheng/gm/gm-open-source/gm-printer/src/common/editor_special_field.js",[],{"ruleId":"64","severity":2,"message":"65","line":7,"column":10,"nodeType":"66","endLine":7,"endColumn":38},{"ruleId":"67","severity":2,"message":"68","line":38,"column":34,"nodeType":"66","endLine":38,"endColumn":43},{"ruleId":"67","severity":2,"message":"69","line":38,"column":44,"nodeType":"66","endLine":38,"endColumn":50},{"ruleId":"67","severity":2,"message":"70","line":38,"column":51,"nodeType":"66","endLine":38,"endColumn":59},{"ruleId":"67","severity":2,"message":"68","line":44,"column":13,"nodeType":"71","endLine":44,"endColumn":22},{"ruleId":"67","severity":2,"message":"72","line":46,"column":15,"nodeType":"66","endLine":46,"endColumn":33},{"ruleId":"67","severity":2,"message":"68","line":50,"column":13,"nodeType":"71","endLine":50,"endColumn":22},{"ruleId":"67","severity":2,"message":"73","line":52,"column":15,"nodeType":"66","endLine":52,"endColumn":30},{"ruleId":"67","severity":2,"message":"68","line":62,"column":46,"nodeType":"66","endLine":62,"endColumn":55},{"ruleId":"67","severity":2,"message":"69","line":62,"column":56,"nodeType":"66","endLine":62,"endColumn":62},{"ruleId":"67","severity":2,"message":"70","line":62,"column":63,"nodeType":"66","endLine":62,"endColumn":71},{"ruleId":"67","severity":2,"message":"68","line":94,"column":13,"nodeType":"71","endLine":94,"endColumn":22},{"ruleId":"67","severity":2,"message":"74","line":94,"column":24,"nodeType":"71","endLine":94,"endColumn":32},{"ruleId":"67","severity":2,"message":"75","line":101,"column":26,"nodeType":"66","endLine":101,"endColumn":44},{"ruleId":"67","severity":2,"message":"76","line":102,"column":31,"nodeType":"66","endLine":102,"endColumn":39},{"ruleId":"67","severity":2,"message":"77","line":103,"column":37,"nodeType":"66","endLine":103,"endColumn":51},{"ruleId":"67","severity":2,"message":"69","line":104,"column":29,"nodeType":"66","endLine":104,"endColumn":35},"no-unused-vars","'noSubtotalBtnTableDataKeySet' is defined but never used.","Identifier","react/prop-types","'editStore' is missing in props validation","'editStore.config' is missing in props validation","'editStore.config.contents' is missing in props validation","Property","'editStore.changeTableDataKey' is missing in props validation","'editStore.setSubtotalShow' is missing in props validation","'mockData' is missing in props validation","'editStore.computedPrinterKey' is missing in props validation","'editStore.selected' is missing in props validation","'editStore.selectedRegion' is missing in props validation"]

package/locales/en.json

@@ -16,6 +16,7 @@
   "粗细": "",
   "高": "",
   "图片大小不能超过500Kb": "",
+  "配送单特殊控制": "",
   "添加字段": "",
   "编辑字段": "",
   "请输入填充内容": "",

package/locales/th.json

@@ -16,6 +16,7 @@
   "粗细": "",
   "高": "",
   "图片大小不能超过500Kb": "",
+  "配送单特殊控制": "",
   "添加字段": "",
   "编辑字段": "",
   "请输入填充内容": "",

package/locales/zh-HK.json

@@ -18,6 +18,7 @@
   "图片大小不能超过500Kb": "圖片大小不能超過500Kb",
   "添加字段": "添加字段",
   "编辑字段": "編輯字段",
+  "配送单特殊控制": "配送单特殊控制",
   "请输入填充内容": "請輸入填充內容",
   "请输入链接": "請輸入鏈接",
   "说明：谨慎修改{}中的内容,避免出现数据异常": "説明：請勿修改{}中的內容,避免出現數據異常",

package/package.json

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

package/src/common/component.js

@@ -602,6 +602,37 @@ Title.propTypes = {
   text: PropTypes.object
 }
 
+const Radio = ({ id, value, radioChecked, checked }) => (
+  <div>
+    <input
+      type='radio'
+      value={value}
+      id={id}
+      name='radio'
+      onChange={radioChecked}
+      checked={checked}
+      style={{ margin: '5px 10px 0 0' }}
+    />
+    <label htmlFor={id}>{value}</label>
+    <Gap />
+  </div>
+)
+
+Radio.propTypes = {
+  id: PropTypes.string,
+  value: PropTypes.string,
+  radioChecked: PropTypes.func,
+  checked: PropTypes.string
+}
+
+const RadioGap = ({ width = '100%', height = '15px' }) => (
+  <div style={{ width, height }} />
+)
+RadioGap.propTypes = {
+  width: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
+  height: PropTypes.oneOfType([PropTypes.string, PropTypes.number])
+}
+
 const Gap = ({ width = '100%', height = '3px' }) => (
   <div style={{ width, height }} />
 )
@@ -649,7 +680,9 @@ export {
   Hr,
   SubTitle,
   Title,
+  Radio,
   Gap,
+  RadioGap,
   FieldBtn,
   TipInfo
 }

package/src/common/editor_special_field.js

@@ -0,0 +1,43 @@
+import i18next from '../../locales'
+import React from 'react'
+import PropTypes from 'prop-types'
+import { Gap, RadioGap, Title, Radio } from './component'
+import { observer, inject } from 'mobx-react'
+
+@inject('editStore')
+@observer
+class SpecialField extends React.Component {
+  render() {
+    const { addFields, mockData, editStore } = this.props
+    const specialFields = addFields.specialFields
+    const tableData = mockData?._table
+
+    return (
+      <div>
+        <Title title={i18next.t('配送单特殊控制')} />
+        <RadioGap />
+        {specialFields &&
+          specialFields.map(fields => (
+            <Radio
+              id={fields.id}
+              value={fields.value}
+              key={fields.id}
+              checked={editStore.config.specialConfig === fields.id}
+              radioChecked={() => editStore.radioChecked(fields, tableData)}
+            />
+          ))}
+        <Gap />
+      </div>
+    )
+  }
+}
+
+SpecialField.propTypes = {
+  fields: PropTypes.object.isRequired,
+  handleAddField: PropTypes.func,
+  addFields: PropTypes.object.isRequired,
+  editStore: PropTypes.object,
+  mockData: PropTypes.object.isRequired
+}
+
+export default SpecialField

package/src/common/editor_store.js

@@ -550,6 +550,11 @@ class EditorStore {
     }
   }
 
+  @action.bound
+  radioChecked(fields) {
+    this.config.specialConfig = fields.id
+  }
+
   @action
   removeField() {
     if (!this.selected) {

package/src/editor/editor.js

@@ -7,6 +7,7 @@ import editStore from './store'
 import { observer, inject } from 'mobx-react'
 import EditorTitle from '../common/editor_title'
 import EditorSelect from '../common/editor_select'
+import SpecialField from '../common/editor_special_field'
 import EditorField from '../common/editor_edit_field'
 import EditorAddField from '../common/editor_add_field'
 import EditorPageSummary from '../common/editor_page_summary'
@@ -38,7 +39,7 @@ export const noSubtotalBtnTableDataKeySet = new Set(
 @observer
 class Editor extends React.Component {
   render() {
-    const { onSave, showEditor, addFields, showNewDate } = this.props
+    const { onSave, showEditor, addFields, showNewDate, mockData } = this.props
 
     return (
       <div className='gm-printer-edit'>
@@ -75,12 +76,14 @@ class Editor extends React.Component {
             <Gap height='10px' />
             <EditorSelect />
             <Gap height='5px' />
+            <SpecialField addFields={addFields} mockData={mockData} />
+            <Gap height='5px' />
             <EditorField
               tableDataKeyList={tableDataKeyList}
               showNewDate={showNewDate}
             />
             <Gap height='5px' />
-            <EditorAddField addFields={addFields} />
+            <EditorAddField addFields={addFields} mockData={mockData} />
             <Gap height='5px' />
             <EditorPageSummary summaryFields={addFields.summaryFields} />
 

package/src/index.js

@@ -10,7 +10,14 @@ import EditorAccoutStatement from './editor_account_statement'
 import EditorBoxLabel from './editor_box_label'
 import EditorSaleMenus from './editor_salemenus'
 import EditorAccount from './editor_account'
-import { BatchPrinter, doBatchPrint, doPrint, Printer, getCSS } from './printer'
+import {
+  BatchPrinter,
+  doBatchPrint,
+  doPrint,
+  Printer,
+  getCSS,
+  getPrintContainerHTML
+} from './printer'
 import { MULTI_SUFFIX } from './config'
 
 export * from './util'
@@ -32,5 +39,6 @@ export {
   doPrint,
   doBatchPrint,
   getCSS,
-  MULTI_SUFFIX
+  MULTI_SUFFIX,
+  getPrintContainerHTML
 }

package/src/printer/do_print.js

@@ -8,9 +8,13 @@ import { afterImgAndSvgLoaded } from '../util'
 
 const printerId = '_gm-printer_' + Math.random()
 let $printer = window.document.getElementById(printerId)
-
-function init(isTest) {
-  isZoom() &&
+/**
+ * @param {boolean} isTest 是否test
+ * @param {boolean} isTipZoom zoom的时候是否提示
+ */
+function init({ isTest, isTipZoom = true } = {}) {
+  isTipZoom &&
+    isZoom() &&
     window.alert(
       '检测您的浏览器使用了缩放,为了避免影响打印布局,请重置缩放到100%后再进行打印'
     )
@@ -68,7 +72,7 @@ function toDoPrint({ data, config }) {
   })
 }
 
-function toDoPrintBatch(list) {
+function toDoPrintBatch(list, isPrint = true) {
   return new window.Promise(resolve => {
     const $app = $printer.contentWindow.document.getElementById('appContainer')
 
@@ -78,7 +82,7 @@ function toDoPrintBatch(list) {
         list={list}
         onReady={() => {
           afterImgAndSvgLoaded(() => {
-            $printer.contentWindow.print()
+            isPrint && $printer.contentWindow.print()
             resolve()
           }, $app)
         }}
@@ -89,15 +93,32 @@ function toDoPrintBatch(list) {
 }
 
 function doPrint({ data, config }, isTest) {
-  init(isTest)
+  init({ isTest })
 
   return toDoPrint({ data, config })
 }
 
-function doBatchPrint(list, isTest) {
-  init(isTest)
+// function doBatchPrint(list, isTest, { isPrint, isTipZoom }) {
+//   init({ isTest, isTipZoom })
+
+//   return toDoPrintBatch(list, isPrint)
+// }
 
-  return toDoPrintBatch(list)
+function doBatchPrint(
+  list,
+  isTest,
+  extraCofnig = { isPrint: true, isTipZoom: true }
+) {
+  init({ isTest, isTipZoom: extraCofnig.isTipZoom })
+
+  return toDoPrintBatch(list, extraCofnig.isPrint)
 }
 
-export { doPrint, doBatchPrint }
+/**
+ * @description: 获取打印的html
+ */
+function getPrintContainerHTML() {
+  return $printer.contentWindow.document.getElementsByTagName('html')[0]
+    .innerHTML
+}
+export { doPrint, doBatchPrint, getPrintContainerHTML }

package/src/printer/index.js

@@ -1,6 +1,13 @@
 import Printer from './printer'
 import BatchPrinter from './batch_printer'
-import { doPrint, doBatchPrint } from './do_print'
+import { doPrint, doBatchPrint, getPrintContainerHTML } from './do_print'
 import getCSS from './get_css'
 
-export { doPrint, doBatchPrint, Printer, BatchPrinter, getCSS }
+export {
+  doPrint,
+  doBatchPrint,
+  Printer,
+  BatchPrinter,
+  getCSS,
+  getPrintContainerHTML
+}