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

package/src/common/editor_store.js

@@ -12,6 +12,12 @@ import {
   getMultiNumber
 } from '../util'
 import { accountRadioList } from './util'
+import {
+  buildDataKey,
+  getDataKeyPrefix,
+  isDetailOneRowSelectKey,
+  isIndependentRolDataKey
+} from './data_key_util'
 import React from 'react'
 import { createDiySummaryStoreMethods } from './diy_summary_helper'
 import {
@@ -31,6 +37,10 @@ class EditorStore {
   @observable
   tableCustomStyle = 'default'
 
+  // 插入图片增强配置(电子签章),null 时保持旧行为(500Kb/image/*)
+  // { maxSize, maxSizeLabel, accept, acceptHint, resizable }
+  imageConfig = null
+
   @observable
   emptyTableData = []
 
@@ -300,18 +310,15 @@ class EditorStore {
       return
     }
 
-    const sourceItems = flattenHorizontalPackedRows(
-      sourceRows,
-      sourceColNumber
-    )
+    const sourceItems = flattenHorizontalPackedRows(sourceRows, sourceColNumber)
     const baseRowCount = sourceItems.length
       ? Math.max(1, Math.ceil(sourceItems.length / colNumber))
       : 0
     this.mockData._table[dataKey] = !baseRowCount
       ? []
       : isVertical
-        ? packVerticalNewspaper(sourceItems, colNumber, baseRowCount, false)
-        : packHorizontalRowMajor(sourceItems, colNumber)
+      ? packVerticalNewspaper(sourceItems, colNumber, baseRowCount, false)
+      : packHorizontalRowMajor(sourceItems, colNumber)
   }
 
   @action.bound
@@ -368,8 +375,8 @@ class EditorStore {
         const sourceColNumber = isMultiTable(singleKey)
           ? getMultiNumber(singleKey)
           : isMultiTable(sourceKey)
-            ? colNumber
-            : 1
+          ? colNumber
+          : 1
         const sourceItems = flattenHorizontalPackedRows(
           sourceRows,
           sourceColNumber
@@ -710,18 +717,13 @@ class EditorStore {
     const singleKey = sourceKey.replace(/_multi3?/, '')
     const colNumber = getMultiNumber(sourceKey)
     const sourceRows =
-      this.mockData._table[singleKey] ||
-      this.mockData._table[sourceKey] ||
-      []
+      this.mockData._table[singleKey] || this.mockData._table[sourceKey] || []
     const sourceColNumber = isMultiTable(singleKey)
       ? getMultiNumber(singleKey)
       : isMultiTable(sourceKey)
-        ? colNumber
-        : 1
-    const sourceItems = flattenHorizontalPackedRows(
-      sourceRows,
-      sourceColNumber
-    )
+      ? colNumber
+      : 1
+    const sourceItems = flattenHorizontalPackedRows(sourceRows, sourceColNumber)
     const baseRowCount = sourceItems.length
       ? Math.max(1, Math.ceil(sourceItems.length / colNumber))
       : 0
@@ -731,7 +733,7 @@ class EditorStore {
   }
 
   @action
-  addConfigBlock(name, type, pos = {}, link = '') {
+  addConfigBlock(name, type, pos = {}, link = '', ratio) {
     let blocks
     const arr = name.split('.')
 
@@ -775,6 +777,8 @@ class EditorStore {
         blocks.push({
           type: 'image',
           link: link,
+          // 电子签章:记录原图宽高比,锁比例用;旧数据无此字段则不锁
+          ratio: ratio,
           style: {
             position: 'absolute',
             left: pos.left || '0px',
@@ -861,7 +865,6 @@ class EditorStore {
     // 切换的时候，要把对应table的多余空数据清掉
     this.clearExtraTableData(table.dataKey)
 
-    this.setAutoFillingConfig(!this.isAutoFilling)
     // 获取td的colSpan
     const colSpanLength = getColSpanLength(table)
     set(table.subtotal, {
@@ -954,13 +957,34 @@ class EditorStore {
       set(table.overallOrder, {
         show: !table.overallOrder.show
       })
-      table.overallOrder.fields[0].colSpan =
-        colSpanLength - (table.overallOrder.fields?.[1]?.colSpan ?? 0)
+      // 老模板补默认：每页展示默认勾选
+      if (table.overallOrder.showEachPage === undefined) {
+        set(table.overallOrder, { showEachPage: true })
+      }
+      // 兼容存量/测试模板 overallOrder 只存了 {show:false} 没有 fields，补默认结构，否则 fields[0] 取值崩溃
+      if (!table.overallOrder.fields?.length) {
+        set(table.overallOrder, {
+          fields: [
+            {
+              name: '整单合计：',
+              valueField: '出库金额',
+              style: {
+                fontWeight: 'bold'
+              },
+              colSpan: colSpanLength
+            }
+          ]
+        })
+      } else {
+        table.overallOrder.fields[0].colSpan =
+          colSpanLength - (table.overallOrder.fields?.[1]?.colSpan ?? 0)
+      }
     } else {
       // 兼容已经存在的配送单据，他们的配置存在后端的，没有overallOrder这个配置，给加上
       set(table, {
         overallOrder: {
           show: true,
+          showEachPage: true,
           fields: [
             {
               name: '整单合计：',
@@ -977,6 +1001,19 @@ class EditorStore {
     this.config = toJS(this.config)
   }
 
+  // 整单合计「每页展示」
+  @action.bound
+  setOverallOrderShowEachPage() {
+    if (!this.selectedRegion) return
+    const arr = this.selectedRegion.split('.')
+    const table = this.config.contents[arr[2]]
+    if (!table?.overallOrder) return
+    this.overallOrderShow = !this.overallOrderShow
+    const next = !(table.overallOrder.showEachPage !== false)
+    set(table.overallOrder, { showEachPage: next })
+    this.config = toJS(this.config)
+  }
+
   @action
   setDiyOverallOrderShow(name) {
     const arr = name.split('.')
@@ -1079,6 +1116,54 @@ class EditorStore {
     ) {
       newDataKey = _.without(newDataKey, 'tag', 'tagDiy')
     }
+    // 标签小计和三级分类小计互斥
+    if (
+      newDataKey.includes('category3') &&
+      (key === 'tag' || key === 'tagDiy')
+    ) {
+      newDataKey = _.without(newDataKey, 'category3')
+    } else if (
+      (newDataKey.includes('tag') || newDataKey.includes('tagDiy')) &&
+      key === 'category3'
+    ) {
+      newDataKey = _.without(newDataKey, 'tag', 'tagDiy')
+    }
+    // 标签小计和商品三级分类互斥
+    if (
+      newDataKey.includes('newCategory3') &&
+      (key === 'tag' || key === 'tagDiy')
+    ) {
+      newDataKey = _.without(newDataKey, 'newCategory3')
+    } else if (
+      (newDataKey.includes('tag') || newDataKey.includes('tagDiy')) &&
+      key === 'newCategory3'
+    ) {
+      newDataKey = _.without(newDataKey, 'tag', 'tagDiy')
+    }
+    // 商品三级分类和商品分类互斥（标题维度一级/三级二选一）
+    if (newDataKey.includes('newCategory3') && key === 'newCategory') {
+      newDataKey = _.without(newDataKey, 'newCategory3')
+    } else if (newDataKey.includes('newCategory') && key === 'newCategory3') {
+      newDataKey = _.without(newDataKey, 'newCategory')
+    }
+    // 三级分类小计和分类小计互斥（小计维度一级/三级二选一）
+    if (newDataKey.includes('category3') && key === 'category') {
+      newDataKey = _.without(newDataKey, 'category3')
+    } else if (newDataKey.includes('category') && key === 'category3') {
+      newDataKey = _.without(newDataKey, 'category')
+    }
+    // 跨层级混搭互斥：商品三级分类（三级标题）不配一级分类小计
+    if (newDataKey.includes('newCategory3') && key === 'category') {
+      newDataKey = _.without(newDataKey, 'newCategory3')
+    } else if (newDataKey.includes('category') && key === 'newCategory3') {
+      newDataKey = _.without(newDataKey, 'category')
+    }
+    // 跨层级混搭互斥：三级分类小计（三级小计）不配一级商品分类
+    if (newDataKey.includes('category3') && key === 'newCategory') {
+      newDataKey = _.without(newDataKey, 'category3')
+    } else if (newDataKey.includes('newCategory') && key === 'category3') {
+      newDataKey = _.without(newDataKey, 'newCategory')
+    }
 
     if (newDataKey.includes('categoryDiy')) {
       if (!diyCategorySubtotal?.show) {
@@ -1105,7 +1190,10 @@ class EditorStore {
       o => o === 'tag',
       o => o === 'multi3',
       o => o === 'multi',
+      // 三级 token 紧跟对应一级 token 之后，保证拼串顺序 orders → category → category3 → newCategory → newCategory3 → multi → multi3 → tag → categoryDiy → tagDiy
+      o => o === 'newCategory3',
       o => o === 'newCategory',
+      o => o === 'category3',
       o => o === 'category',
       o => o === 'orders'
     ])
@@ -1121,12 +1209,17 @@ class EditorStore {
       this.ensureMockMultiTable(getDataKey(joinedKey, 'vertical'))
     }
 
-    // 整单合计不显示
-    if (overallOrder?.show) overallOrder.show = false
-    // 每页合计不显示
-    if (subtotal?.show) subtotal.show = false
-    // 自定义每页合计不显示
-    if (diyOverallOrder?.show) diyOverallOrder.show = false
+    // 三级分类相关 token（商品三级分类/三级分类小计）是纯分组、标题能力，
+    // 与每页/整单合计可共存，切换时不再强制关闭合计开关；
+    // 其余 token（多栏/一级分类/标签等）保持历史行为：切换时强制关闭
+    if (!['newCategory3', 'category3'].includes(key)) {
+      // 整单合计不显示
+      if (overallOrder?.show) overallOrder.show = false
+      // 每页合计不显示
+      if (subtotal?.show) subtotal.show = false
+      // 自定义每页合计不显示
+      if (diyOverallOrder?.show) diyOverallOrder.show = false
+    }
 
     // 分类/多栏切换：清空旧空行并同步 autoFillConfig.dataKey，Printer 重挂载后会重补
     if (this.isAutoFilling || this.config?.autoFillConfig?.checked) {
@@ -1454,16 +1547,17 @@ class EditorStore {
       const table = this.config.contents[arr[2]]
 
       const getDataKey = () => {
-        if (dataKey === 'purchase_detail_one_row') {
+        if (isDetailOneRowSelectKey(dataKey)) {
           if (!table.purchaseSettingKey) {
             this.setPurchasePrintSettingKey()
             return dataKey
           }
+          const prefix = getDataKeyPrefix(dataKey)
           if (table.purchaseSettingKey === 'goods') {
-            return 'purchase_independent_rol_sku'
+            return buildDataKey(prefix, 'independent_rol_sku')
           }
           if (table.purchaseSettingKey === 'merchant') {
-            return 'purchase_independent_rol_address'
+            return buildDataKey(prefix, 'independent_rol_address')
           }
         }
         return dataKey
@@ -1483,14 +1577,14 @@ class EditorStore {
   @action.bound setPurchasePrintSettingKey(dataKey = 'goods') {
     const arr = this.selectedRegion.split('.')
     const table = this.config.contents[arr[2]]
+    const prefix = getDataKeyPrefix(table.dataKey)
 
     set(table, {
       purchaseSettingKey: dataKey,
       dataKey:
         dataKey === 'goods'
-          ? 'purchase_independent_rol_sku'
-          : 'purchase_independent_rol_address',
-      // 切换打印设置时，重置明细行排序为默认值（候选值列表会变化）
+          ? buildDataKey(prefix, 'independent_rol_sku')
+          : buildDataKey(prefix, 'independent_rol_address'),
       detail_sort_type: 0
     })
   }
@@ -1512,11 +1606,8 @@ class EditorStore {
       const table = this.config.contents[arr[2]]
 
       const { dataKey } = table
-      if (
-        dataKey === 'purchase_independent_rol_sku' ||
-        dataKey === 'purchase_independent_rol_address'
-      ) {
-        return 'purchase_detail_one_row'
+      if (isIndependentRolDataKey(dataKey)) {
+        return buildDataKey(getDataKeyPrefix(dataKey), 'detail_one_row')
       }
       return dataKey
     }
@@ -1587,7 +1678,7 @@ class EditorStore {
           arrange: val
         }
         // 只改排列并清掉旧空行；保持填充开关，交给 Printer 重挂载后
-        //「先补空 → 再重新分页」恢复空行（勿在此处用旧 remainHeight 立刻补）
+        // 「先补空 → 再重新分页」恢复空行（勿在此处用旧 remainHeight 立刻补）
         if (this.isAutoFilling || this.config?.autoFillConfig?.checked) {
           this.clearAllTableEmptyData()
           this.setAutoFillingConfig(true)
@@ -1767,6 +1858,42 @@ class EditorStore {
     }
   }
 
+  // 分类/标签 小计 - 显示分类名称（商品分类/商品三级分类小计行是否展示分类名，默认展示）
+  @action.bound setShowCategoryName() {
+    // 作用：触发组件的更新（小计行前缀由渲染层按 specialConfig 实时重拼，需触发预览重渲染）
+    this.overallOrderShow = !this.overallOrderShow
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
+      const tableConfig = this.config.contents[arr[2]]
+
+      set(tableConfig, {
+        specialConfig: {
+          ...tableConfig.specialConfig,
+          showCategoryName: !(
+            tableConfig.specialConfig?.showCategoryName ?? true
+          )
+        }
+      })
+    }
+  }
+
+  // 分类/标签 小计 - 小计文案修改（默认"小计"，允许为空；缺失时由数据层兜底默认值）
+  @action.bound setSubtotalText(value) {
+    // 作用：触发组件的更新（小计行前缀由渲染层按 specialConfig 实时重拼，需触发预览重渲染）
+    this.overallOrderShow = !this.overallOrderShow
+    if (this.selectedRegion) {
+      const arr = this.selectedRegion.split('.')
+      const tableConfig = this.config.contents[arr[2]]
+
+      set(tableConfig, {
+        specialConfig: {
+          ...tableConfig.specialConfig,
+          subtotalText: value
+        }
+      })
+    }
+  }
+
   @action.bound
   setSpecialUpperCase() {
     if (this.selectedRegion) {
@@ -1962,6 +2089,8 @@ class EditorStore {
       }
       // 开启自定义单元格
       if (subtotalConfig?.isCustomCells) {
+        // 互斥：开启自定义单元格时关闭单元格拆分展示
+        set(subtotalConfig, { isSplitCells: false })
         // 同时还开启了自定义单元格选项
         if (subtotalConfig?.fields?.length === 2) {
           // fields添加自定义单元格
@@ -2009,6 +2138,8 @@ class EditorStore {
   }
 
   // 每页合计自定义单元格文本输入
+  // Text 组件的 onChange 实际收到事件对象（handleChange 被 spread 覆盖），直接绑定时需防御式取 e.target.value，否则事件对象存进 fields[n].name 会导致页面崩溃
+  // ⚠️ 不能用 `value?.target?.value || value`：清空输入时 e.target.value 为空串（falsy），|| 会错把事件对象存进去（清空即崩），必须用 value?.target 判别
   @action.bound
   setSubtotalFields(value) {
     if (this.selectedRegion) {
@@ -2017,10 +2148,64 @@ class EditorStore {
       const subtotalConfig = table?.subtotal
 
       if (subtotalConfig.isCustomCells) {
+        const text = value?.target ? value.target.value : value ?? ''
         const subtotalConfig = table?.subtotal.fields
         subtotalConfig.length === 3
-          ? (subtotalConfig[2].name = value)
-          : (subtotalConfig[1].name = value)
+          ? (subtotalConfig[2].name = text)
+          : (subtotalConfig[1].name = text)
+      }
+    }
+  }
+
+  // 每页合计单元格拆分展示（"每页合计/数值"拆分为两个单元格，与开启自定义单元格互斥）
+  @action.bound
+  setSubtotalSplitCells() {
+    if (this.selectedRegion) {
+      // 作用：触发组件的更新
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const subtotalConfig = table?.subtotal
+      // 没有显示每页合计的时候不可以设置
+      if (!subtotalConfig?.show) return
+      // 多栏表格情况，计算colSpan
+      const colSpanLength = getColSpanLength(table)
+      const oldSplitCells = subtotalConfig?.isSplitCells
+
+      set(subtotalConfig, {
+        isSplitCells: !oldSplitCells
+      })
+      // 兼容已经存在后端的模板，每页合计配置没有fields，手动补上
+      if (!subtotalConfig.fields) {
+        set(subtotalConfig, {
+          fields: [
+            {
+              name: '每页合计：',
+              valueField: 'real_item_price',
+              colSpan: colSpanLength
+            }
+          ]
+        })
+      }
+      // 互斥：开启拆分展示时关闭自定义单元格（复用其关闭时的 fields 重排逻辑）
+      if (!oldSplitCells && subtotalConfig?.isCustomCells) {
+        this.setSubtotalCustomCells()
+      }
+    }
+  }
+
+  // 每页合计左侧文案修改（默认"每页合计"，允许为空，每页合计统一展示输入框内容）
+  @action.bound
+  setSubtotalLeftText(value) {
+    if (this.selectedRegion) {
+      // 作用：触发组件的更新（预览渲染不直接观察 fields[0].name，需强制重渲染）
+      this.overallOrderShow = !this.overallOrderShow
+      const arr = this.selectedRegion.split('.')
+      const table = this.config.contents[arr[2]]
+      const subtotalConfig = table?.subtotal
+
+      if (subtotalConfig?.fields?.[0]) {
+        set(subtotalConfig.fields[0], { name: value })
       }
     }
   }
@@ -2038,6 +2223,7 @@ class EditorStore {
         set(table, {
           overallOrder: {
             show: true,
+            showEachPage: true,
             fields: [
               {
                 name: '整单合计：',
@@ -2155,6 +2341,7 @@ class EditorStore {
   }
 
   // 整单合计自定义单元格文本输入
+  // Text 组件直接绑定时收到事件对象（同 setSubtotalFields）；⚠️ 不能用 `||` 兜底，清空输入时空串 falsy 会错存事件对象导致页面崩溃，用 value?.target 判别
   @action.bound
   setOverallOrderFields(value) {
     if (this.selectedRegion) {
@@ -2163,8 +2350,9 @@ class EditorStore {
       const overallOrderConfig = table?.overallOrder
 
       if (overallOrderConfig.isCustomCells) {
+        const text = value?.target ? value.target.value : value ?? ''
         const overallOrderConfigFields = table?.overallOrder.fields
-        overallOrderConfigFields[1].name = value?.target?.value || value
+        overallOrderConfigFields[1].name = text
       }
     }
   }

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/common/style.lesss

@@ -166,6 +166,18 @@
         color: white;
         background: rgb(82, 146, 247);
       }
+
+      // 电子签章:插入图片菜单项下的格式提示小字
+      .gm-printer-contextmenu-hint {
+        font-size: 10px;
+        color: #f5222d;
+        line-height: 1.4;
+        padding: 0;
+        &:hover {
+          color: #f5222d;
+          background: transparent;
+        }
+      }
     }
   }
 
@@ -244,6 +256,37 @@
         outline: 1px solid rgb(82, 146, 247);
         z-index: 11;
       }
+
+      // 电子签章:图片四角黑色加粗拖拽手柄
+      .gm-printer-resize-handle {
+        position: absolute;
+        width: 10px;
+        height: 10px;
+        background: #000;
+        border: 2px solid #fff;
+        z-index: 12;
+
+        &.gm-printer-resize-lt {
+          left: -6px;
+          top: -6px;
+          cursor: nwse-resize;
+        }
+        &.gm-printer-resize-rt {
+          right: -6px;
+          top: -6px;
+          cursor: nesw-resize;
+        }
+        &.gm-printer-resize-lb {
+          left: -6px;
+          bottom: -6px;
+          cursor: nesw-resize;
+        }
+        &.gm-printer-resize-rb {
+          right: -6px;
+          bottom: -6px;
+          cursor: nwse-resize;
+        }
+      }
     }
 
     .gm-printer-table {

package/src/common/util.js

@@ -1,10 +1,9 @@
 import i18next from '../../locales'
 
 /**
- * 每页合计设置单选按钮
- * id的值是用来计算每页的金额总数，不要轻易随便改
+ * 每页合计金额单选
+ * id 与 data_to_key 中文 key 对齐，用于对本页行求和，不要轻易改 id
  */
-// 整单合计和每页合计栏都使用的这个
 const subtotalRadioList = [
   {
     value: i18next.t('下单金额'),
@@ -17,6 +16,61 @@ const subtotalRadioList = [
   {
     value: i18next.t('实际金额'),
     id: '实际金额'
+  },
+  {
+    value: i18next.t('变化前金额'),
+    id: '变化前金额'
+  },
+  {
+    value: i18next.t('下单金额（不含税）'),
+    id: '下单金额_不含税'
+  },
+  {
+    value: i18next.t('实收金额'),
+    id: '实收金额'
+  },
+  {
+    value: i18next.t('实收金额（不含税）'),
+    id: '实收金额_不含税'
+  }
+]
+
+/**
+ * 整单合计金额单选（比每页合计多「出库金额（不含税）」）
+ * id 与 data.common 中文 key 对齐，取订单已算金额，不重算
+ */
+const overallOrderRadioList = [
+  {
+    value: i18next.t('下单金额'),
+    id: '下单金额'
+  },
+  {
+    value: i18next.t('出库金额'),
+    id: '出库金额'
+  },
+  {
+    value: i18next.t('实际金额'),
+    id: '实际金额'
+  },
+  {
+    value: i18next.t('变化前金额'),
+    id: '变化前金额'
+  },
+  {
+    value: i18next.t('下单金额（不含税）'),
+    id: '下单金额_不含税'
+  },
+  {
+    value: i18next.t('出库金额（不含税）'),
+    id: '出库金额_不含税'
+  },
+  {
+    value: i18next.t('实收金额'),
+    id: '实收金额'
+  },
+  {
+    value: i18next.t('实收金额（不含税）'),
+    id: '实收金额_不含税'
   }
 ]
 
@@ -26,4 +80,4 @@ const accountRadioList = {
   实际金额: i18next.t('实际金额')
 }
 
-export { subtotalRadioList, accountRadioList }
+export { subtotalRadioList, overallOrderRadioList, accountRadioList }

package/src/editor/context_menu.js

@@ -166,8 +166,11 @@ class ContextMenu extends React.Component {
     const isMultiActive = keyArr.includes('multi')
     const isThreeActive = keyArr.includes('multi3')
     const isCategoryActive = keyArr.includes('category')
+    // 三级分类小计（category3）/ 商品三级分类（newCategory3）token 状态
+    const isCategory3Active = keyArr.includes('category3')
     const isTagActive = keyArr.includes('tag')
     const isNewCategoryActive = keyArr.includes('newCategory')
+    const isNewCategory3Active = keyArr.includes('newCategory3')
     const isSubtotalActive = subtotal.show
     const isOverallOrder = overallOrder?.show
     const isDiyOverallOrder = diyOverallOrder?.show
@@ -208,6 +211,13 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('分类小计')}
         </div>
+        {/* 三级分类小计：按三级分类（品类）拆分汇总小计，互斥规则见 changeTableDataKey */}
+        <div
+          onClick={this.handleChangeTableDataKey.bind(this, 'category3', name)}
+          className={isCategory3Active ? 'active' : ''}
+        >
+          {i18next.t('三级分类小计')}
+        </div>
         <div
           // onClick={() =>
           //   this.handleDiySummary(
@@ -244,6 +254,13 @@ class ContextMenu extends React.Component {
         >
           {i18next.t('商品分类')}
         </div>
+        {/* 商品三级分类：按三级分类（品类）拆分并新增列表标题行，复用 categoryConfig 标题样式配置 */}
+        <div
+          onClick={this.handleCategoryConfig.bind(this, 'newCategory3', name)}
+          className={isNewCategory3Active ? 'active' : ''}
+        >
+          {i18next.t('商品三级分类')}
+        </div>
         <div
           onClick={this.handleSubtotal.bind(this, name)}
           className={isSubtotalActive ? 'active' : ''}

package/src/editor/store.js

@@ -1,6 +1,19 @@
 import EditorStore from '../common/editor_store'
 import i18next from '../../locales'
 
+// 配送单"电子签章"插入图片增强预设(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) {