gm-printer 10.41.6-beta.0 → 10.41.6-beta.1

package/package.json

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

package/src/common/hoc_with_store.js

@@ -1,13 +1,22 @@
 import React from 'react'
+import PropTypes from 'prop-types'
 import { Provider } from 'mobx-react'
 import { getStyleWithDiff } from '../util'
 
 const withStore = store => WrapComponent =>
   class extends React.Component {
+    static propTypes = {
+      config: PropTypes.object,
+      mockData: PropTypes.object,
+      imageConfig: PropTypes.object
+    }
+
     constructor(props) {
       super(props)
       this.store = store
       this.store.init(props.config, props.mockData)
+      // 插入图片增强配置(电子签章):由业务侧 props 传入,不传为 null 保持旧行为
+      this.store.imageConfig = props.imageConfig || null
     }
 
     componentDidMount() {

package/src/editor/store.js

@@ -1,19 +1,20 @@
 import EditorStore from '../common/editor_store'
 import i18next from '../../locales'
 
-class Store extends EditorStore {
-  // 插入图片增强(电子签章 1056076):2M/指定格式/锁比例/四角拖拽
-  imageConfig = {
-    maxSize: 2 * 1024 * 1024,
-    maxSizeLabel: '2M',
-    accept: 'image/jpeg,image/jpg,image/png',
-    acceptTypes: ['image/jpeg', 'image/jpg', 'image/png'],
-    acceptHint: i18next.t('支持插入2M以内的jpg、jpeg、png格式图片'),
-    overSizeTip: i18next.t('图片大小不能超过2M'),
-    wrongTypeTip: i18next.t('仅支持jpg、jpeg、png格式的图片'),
-    resizable: true
-  }
+// 配送单"电子签章"插入图片增强预设(1056076):2M/指定格式/锁比例/四角拖拽
+// 由业务侧显式传入 <Editor imageConfig={imageConfigDelivery} /> 才生效,不传保持旧行为
+export const imageConfigDelivery = {
+  maxSize: 2 * 1024 * 1024,
+  maxSizeLabel: '2M',
+  accept: 'image/jpeg,image/jpg,image/png',
+  acceptTypes: ['image/jpeg', 'image/jpg', 'image/png'],
+  acceptHint: i18next.t('支持插入2M以内的jpg、jpeg、png格式图片'),
+  overSizeTip: i18next.t('图片大小不能超过2M'),
+  wrongTypeTip: i18next.t('仅支持jpg、jpeg、png格式的图片'),
+  resizable: true
+}
 
+class Store extends EditorStore {
   // 复写父类方法
   setTableDataKeyEffect(target, dataKey) {
     switch (dataKey) {

package/src/index.js

@@ -1,6 +1,7 @@
 // ‼️优先初始化语言设置(必须先初始化语言)
 import '../locales'
 import Editor, { Editor2 } from './editor'
+import { imageConfigDelivery } from './editor/store'
 
 import EditorPurchase from './editor_purchase'
 import EditorExaminingReport from './examining_report_editor'
@@ -30,6 +31,7 @@ export { setLocale } from '../locales'
 export {
   Editor,
   Editor2,
+  imageConfigDelivery,
   EditorStockIn,
   EditorStockOut,
   EditorPurchase,