gm-printer 10.39.4-beta.2 → 10.39.4-beta.21

package/locales/en.json

@@ -16,6 +16,9 @@
   "粗细": "",
   "高": "",
   "图片大小不能超过500Kb": "",
+  "图片大小不能超过2M": "Image size cannot exceed 2M",
+  "仅支持jpg、jpeg、png格式的图片": "Only JPG, JPEG, and PNG images are supported",
+  "支持插入2M以内的jpg、jpeg、png格式图片": "Support inserting JPG, JPEG, or PNG images within 2M",
   "配送单特殊控制": "",
   "添加字段": "",
   "编辑字段": "",

package/locales/th.json

@@ -16,6 +16,9 @@
   "粗细": "",
   "高": "",
   "图片大小不能超过500Kb": "",
+  "图片大小不能超过2M": "ขนาดรูปภาพต้องไม่เกิน 2M",
+  "仅支持jpg、jpeg、png格式的图片": "รองรับเฉพาะรูปภาพรูปแบบ jpg, jpeg, png",
+  "支持插入2M以内的jpg、jpeg、png格式图片": "รองรับการแทรกรูปภาพ jpg, jpeg, png ขนาดไม่เกิน 2M",
   "配送单特殊控制": "",
   "添加字段": "",
   "编辑字段": "",

package/locales/zh-HK.json

@@ -16,6 +16,9 @@
   "粗细": "粗細",
   "高": "高",
   "图片大小不能超过500Kb": "圖片大小不能超過500Kb",
+  "图片大小不能超过2M": "圖片大小不能超過2M",
+  "仅支持jpg、jpeg、png格式的图片": "僅支持jpg、jpeg、png格式的圖片",
+  "支持插入2M以内的jpg、jpeg、png格式图片": "支持插入2M以內的jpg、jpeg、png格式圖片",
   "添加字段": "添加字段",
   "编辑字段": "編輯字段",
   "配送单特殊控制": "配送单特殊控制",

package/package.json

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

package/src/common/common_context_menu.js

@@ -109,7 +109,7 @@ class CommonContextMenu extends React.Component {
     })
   }
 
-  handleInsertBlock = (type, link) => {
+  handleInsertBlock = (type, link, ratio) => {
     const { editStore } = this.props
     const { name, block } = this.state
 
@@ -120,7 +120,8 @@ class CommonContextMenu extends React.Component {
         left: block.left + 'px',
         top: block.top + 'px'
       },
-      link
+      link,
+      ratio
     )
 
     this.setState({
@@ -160,8 +161,8 @@ class CommonContextMenu extends React.Component {
     })
   }
 
-  handleInsertImage = imgURL => {
-    this.handleInsertBlock('image', imgURL)
+  handleInsertImage = (imgURL, ratio) => {
+    this.handleInsertBlock('image', imgURL, ratio)
   }
 
   handleRemove = () => {
@@ -327,6 +328,7 @@ class CommonContextMenu extends React.Component {
               onSuccess={this.handleInsertImage}
               key={v.value}
               text={v.text}
+              imageConfig={this.props.editStore.imageConfig}
             />
           ) : (
             <div

package/src/common/component.js

@@ -391,12 +391,26 @@ Line.propTypes = {
 
 class Size extends React.Component {
   handleChange = (type, value) => {
-    const { onChange, style } = this.props
+    const { onChange, style, ratio } = this.props
 
-    onChange({
+    const next = {
       ...style,
       [type]: value
-    })
+    }
+
+    // 电子签章:有原始比例时宽高联动,不允许拉变形
+    if (ratio && value !== '' && !value.endsWith('%')) {
+      const num = parseFloat(value)
+      if (!_.isNaN(num) && num > 0) {
+        if (type === 'width') {
+          next.height = Math.round(num / ratio) + 'px'
+        } else {
+          next.width = Math.round(num * ratio) + 'px'
+        }
+      }
+    }
+
+    onChange(next)
   }
 
   render() {
@@ -420,7 +434,8 @@ class Size extends React.Component {
 
 Size.propTypes = {
   style: PropTypes.object.isRequired,
-  onChange: PropTypes.func.isRequired
+  onChange: PropTypes.func.isRequired,
+  ratio: PropTypes.number
 }
 
 class ImageUploader extends React.Component {
@@ -437,7 +452,26 @@ class ImageUploader extends React.Component {
       : event.target.files
     const file = droppedFiles[0]
 
-    if (file.size > 512 * 1024) {
+    if (!file) return
+
+    const { imageConfig } = this.props
+
+    if (imageConfig) {
+      // 增强模式(电子签章):校验类型与大小,提示文案由配置方给出
+      const acceptTypes = imageConfig.acceptTypes || [
+        'image/jpeg',
+        'image/jpg',
+        'image/png'
+      ]
+      if (!_.includes(acceptTypes, file.type)) {
+        Tip.warning(imageConfig.wrongTypeTip)
+        return
+      }
+      if (file.size > imageConfig.maxSize) {
+        Tip.warning(imageConfig.overSizeTip)
+        return
+      }
+    } else if (file.size > 512 * 1024) {
       Tip.warning(i18next.t('图片大小不能超过500Kb'))
       return
     }
@@ -463,7 +497,21 @@ class ImageUploader extends React.Component {
       .post()
       .then(json => {
         const imgURL = `${url.imgUrl}/${json.data.img_path_id}`
-        this.props.onSuccess(imgURL)
+
+        // 增强模式下加载原图尺寸,记录原始比例供锁比例使用
+        if (imageConfig) {
+          const img = document.createElement('img')
+          img.onload = () => {
+            this.props.onSuccess(imgURL, img.naturalWidth / img.naturalHeight)
+          }
+          img.onerror = () => {
+            // 拿不到尺寸时降级:只插入不锁比例
+            this.props.onSuccess(imgURL)
+          }
+          img.src = imgURL
+        } else {
+          this.props.onSuccess(imgURL)
+        }
       })
   }
 
@@ -473,16 +521,23 @@ class ImageUploader extends React.Component {
   }
 
   render() {
+    const { imageConfig } = this.props
+
     return (
       <>
         <div onClick={this.handleClick} onDrop={this.handleUpload}>
           {this.props.text}
+          {imageConfig && imageConfig.acceptHint && (
+            <div className='gm-printer-contextmenu-hint'>
+              {imageConfig.acceptHint}
+            </div>
+          )}
         </div>
         <input
           style={{ display: 'none' }}
           type='file'
           ref={this.input}
-          accept='image/*'
+          accept={(imageConfig && imageConfig.accept) || 'image/*'}
           onChange={this.handleUpload}
         />
       </>
@@ -492,7 +547,8 @@ class ImageUploader extends React.Component {
 
 ImageUploader.propTypes = {
   onSuccess: PropTypes.func.isRequired,
-  text: PropTypes.string.isRequired
+  text: PropTypes.string.isRequired,
+  imageConfig: PropTypes.object
 }
 
 class InputWithUnit extends React.Component {

package/src/common/data_key_util.js

@@ -0,0 +1,35 @@
+/**
+ * 模板 table.dataKey 前缀工具。
+ * 采购模板：purchase_*；分拣明细模板：sorting_detail_*（后缀与采购一致）。
+ */
+export const SORTING_DETAIL_PREFIX = 'sorting_detail_'
+export const PURCHASE_PREFIX = 'purchase_'
+
+export function getDataKeyPrefix(dataKey) {
+  if (dataKey?.startsWith(SORTING_DETAIL_PREFIX)) return SORTING_DETAIL_PREFIX
+  return PURCHASE_PREFIX
+}
+
+export function getDataKeySuffix(dataKey) {
+  if (!dataKey || typeof dataKey !== 'string') return ''
+  return dataKey.replace(/^(sorting_detail_|purchase_)/, '')
+}
+
+export function buildDataKey(prefix, suffix) {
+  return `${prefix}${suffix}`
+}
+
+/** 下拉选中「按明细单行」时的 value（detail_one_row） */
+export function isDetailOneRowSelectKey(dataKey) {
+  return getDataKeySuffix(dataKey) === 'detail_one_row'
+}
+
+export function isIndependentRolDataKey(dataKey) {
+  const suffix = getDataKeySuffix(dataKey)
+  return suffix === 'independent_rol_sku' || suffix === 'independent_rol_address'
+}
+
+export function isLastColDataKey(dataKey) {
+  const suffix = getDataKeySuffix(dataKey)
+  return suffix === 'last_col' || suffix === 'last_col_noLineBreak'
+}