gm-printer 10.41.2 → 10.41.3-beta.0

package/package.json

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

package/src/common/editor_edit_field.js

@@ -236,6 +236,12 @@ class EditorField extends React.Component {
     // 新分类
     const categoryStyle =
       toJS(editStore.computedTableSpecialConfig)?.categoryConfig?.style || {}
+    // 当前表格 dataKey tokens，用于判断商品分类/商品三级分类是否开启
+    const tableKeyArr = (
+      editStore.computedTableSpecialConfig?.dataKey || ''
+    ).split('_')
+    const isNewCategoryOn = tableKeyArr.includes('newCategory')
+    const isNewCategory3On = tableKeyArr.includes('newCategory3')
     // 小计样式,specialConfig可能是undefined
     const specialStyle =
       toJS(editStore.computedTableSpecialConfig)?.specialConfig?.style || {}
@@ -260,13 +266,18 @@ class EditorField extends React.Component {
         get(subtotal, 'isUpperLowerCaseSeparate')) ||
       false
     // 每页合计样式
-    const overallOrderStyle =
-      (overallOrder && overallOrder?.fields[0].style) || {}
+    // 兼容 overallOrder 无 fields 的模板（如仅存 {show:false}），链式取值避免渲染崩溃
+    const overallOrderStyle = overallOrder?.fields?.[0]?.style || {}
     // 每页合计自定义单元格
     const subtotalUpperCustomCell =
       (editStore.computedTableSpecialConfig?.subtotal &&
         get(subtotal, 'isCustomCells')) ||
       false
+    // 每页合计单元格拆分展示（与自定义单元格互斥的新配置）
+    const subtotalSplitCell =
+      (editStore.computedTableSpecialConfig?.subtotal &&
+        get(subtotal, 'isSplitCells')) ||
+      false
 
     // 打印账户总计金额
     const printAccount =
@@ -491,47 +502,48 @@ class EditorField extends React.Component {
         />
         <Gap />
 
-        {!mergeClassificationAndLabel && (showCategory || showCategorySubtotal) && (
-          <>
-            {showCategory && (
-              <Flex>
-                <Flex>{i18next.t('分类设置')}：</Flex>
-                <Fonter
-                  style={categoryStyle}
-                  onChange={this.handleCategoryStyleChange}
-                />
-                <Separator />
-                <TextAlign
-                  style={categoryStyle}
-                  onChange={this.handleCategoryStyleChange}
-                />
-              </Flex>
-            )}
-
-            {showCategorySubtotal && (
-              <>
+        {!mergeClassificationAndLabel &&
+          (showCategory || showCategorySubtotal) && (
+            <>
+              {showCategory && (
                 <Flex>
-                  <Flex>{i18next.t('小计设置')}：</Flex>
+                  <Flex>{i18next.t('分类设置')}：</Flex>
                   <Fonter
-                    style={specialStyle}
-                    onChange={this.handleSpecialStyleChange}
+                    style={categoryStyle}
+                    onChange={this.handleCategoryStyleChange}
                   />
                   <Separator />
                   <TextAlign
-                    style={specialStyle}
-                    onChange={this.handleSpecialStyleChange}
+                    style={categoryStyle}
+                    onChange={this.handleCategoryStyleChange}
                   />
                 </Flex>
-                <EditorSubtotalCheck
-                  subtotalCheckDisabled
-                  subtotalChecked={specialTrNeedUpperCase}
-                  subtotalCheckOnChange={editStore.setSpecialUpperCase}
-                  subtotalCheckText='显示大写金额'
-                />
-              </>
-            )}
-          </>
-        )}
+              )}
+
+              {showCategorySubtotal && (
+                <>
+                  <Flex>
+                    <Flex>{i18next.t('小计设置')}：</Flex>
+                    <Fonter
+                      style={specialStyle}
+                      onChange={this.handleSpecialStyleChange}
+                    />
+                    <Separator />
+                    <TextAlign
+                      style={specialStyle}
+                      onChange={this.handleSpecialStyleChange}
+                    />
+                  </Flex>
+                  <EditorSubtotalCheck
+                    subtotalCheckDisabled
+                    subtotalChecked={specialTrNeedUpperCase}
+                    subtotalCheckOnChange={editStore.setSpecialUpperCase}
+                    subtotalCheckText='显示大写金额'
+                  />
+                </>
+              )}
+            </>
+          )}
 
         {showPageSubtotal && pageSubtotalEnabled && (
           <>
@@ -570,7 +582,9 @@ class EditorField extends React.Component {
                         key={fields.id}
                         inputName='subtotalRadio'
                         checked={subtotalFields === fields.id}
-                        radioChecked={() => editStore.subtotalRadioCheck(fields)}
+                        radioChecked={() =>
+                          editStore.subtotalRadioCheck(fields)
+                        }
                       />
                     )
                   })}
@@ -626,6 +640,24 @@ class EditorField extends React.Component {
                   onChange={editStore.setSubtotalFields}
                   style={{ width: '65px', margin: '5px 0 5px 80px' }}
                 />
+                {/* 单元格拆分展示：每页合计/数值拆分为两个单元格，与开启自定义单元格互斥（默认未选） */}
+                <EditorSubtotalCheck
+                  subtotalCheckDisabled
+                  subtotalChecked={subtotalSplitCell}
+                  subtotalCheckOnChange={editStore.setSubtotalSplitCells}
+                  subtotalCheckText={i18next.t('单元格拆分展示')}
+                />
+                {/* 左侧文案修改：默认"每页合计"，允许为空，每页合计统一展示输入框内容 */}
+                <Flex style={{ margin: '5px 0 5px 62px' }} alignCenter>
+                  <EditorText
+                    label={i18next.t('左侧文案修改')}
+                    value={subtotal?.fields?.[0]?.name ?? ''}
+                    // Text 组件的 onChange 实际收到事件对象（handleChange 被 spread 覆盖），需自行取 e.target.value
+                    onChange={e =>
+                      editStore.setSubtotalLeftText(e.target.value)
+                    }
+                  />
+                </Flex>
               </>
             )}
           </>
@@ -804,6 +836,23 @@ class EditorField extends React.Component {
             </div>
           </Flex>
         )}
+        {/* 分类/三级分类设置：选中商品分类或商品三级分类时展示，控制标题行字体及位置（共用 categoryConfig） */}
+        {mergeClassificationAndLabel && (isNewCategoryOn || isNewCategory3On) && (
+          <>
+            <Flex>{i18next.t('分类/三级分类设置')}：</Flex>
+            <Flex style={{ marginLeft: 57 }}>
+              <Fonter
+                style={categoryStyle}
+                onChange={this.handleCategoryStyleChange}
+              />
+              <Separator />
+              <TextAlign
+                style={categoryStyle}
+                onChange={this.handleCategoryStyleChange}
+              />
+            </Flex>
+          </>
+        )}
         {mergeClassificationAndLabel && (
           <>
             <Flex>{i18next.t('分类/标签小计')}：</Flex>
@@ -873,6 +922,29 @@ class EditorField extends React.Component {
                   subtotalCheckText='大、小写金额分左右两边展示'
                   marginLeft
                 />
+                {/* 显示分类名称：选中时小计行展示"分类名+小计文案"，未选中只展示"小计文案"（默认选中） */}
+                <EditorSubtotalCheck
+                  subtotalCheckDisabled
+                  subtotalChecked={
+                    editStore.computedTableSpecialConfig?.specialConfig
+                      ?.showCategoryName ?? true
+                  }
+                  subtotalCheckOnChange={editStore.setShowCategoryName}
+                  subtotalCheckText={i18next.t('显示分类名称')}
+                  marginLeft
+                />
+                {/* 小计文案修改：默认"小计"，允许为空 */}
+                <Flex style={{ margin: '5px 0 5px 17px' }} alignCenter>
+                  <EditorText
+                    label={i18next.t('小计文案修改')}
+                    value={
+                      editStore.computedTableSpecialConfig?.specialConfig
+                        ?.subtotalText ?? '小计'
+                    }
+                    // Text 组件的 onChange 实际收到事件对象（handleChange 被 spread 覆盖），需自行取 e.target.value
+                    onChange={e => editStore.setSubtotalText(e.target.value)}
+                  />
+                </Flex>
               </div>
             </Flex>
 

package/src/common/editor_store.js

@@ -8,7 +8,7 @@ import {
   buildDataKey,
   getDataKeyPrefix,
   isDetailOneRowSelectKey,
-  isIndependentRolDataKey,
+  isIndependentRolDataKey
 } from './data_key_util'
 import React from 'react'
 import { createDiySummaryStoreMethods } from './diy_summary_helper'
@@ -686,7 +686,6 @@ class EditorStore {
     // 切换的时候，要把对应table的多余空数据清掉
     this.clearExtraTableData(table.dataKey)
 
-    this.setAutoFillingConfig(!this.isAutoFilling)
     // 获取td的colSpan
     const colSpanLength = getColSpanLength(table)
     set(table.subtotal, {
@@ -783,8 +782,24 @@ class EditorStore {
       if (table.overallOrder.showEachPage === undefined) {
         set(table.overallOrder, { showEachPage: true })
       }
-      table.overallOrder.fields[0].colSpan =
-        colSpanLength - (table.overallOrder.fields?.[1]?.colSpan ?? 0)
+      // 兼容存量/测试模板 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, {
@@ -922,6 +937,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) {
@@ -948,7 +1011,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'
     ])
@@ -957,12 +1023,33 @@ class EditorStore {
 
     this.config.contents[arr[2]].dataKey = newDataKey.join('_')
 
-    // 整单合计不显示
-    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
+    }
+
+    // 行数填充开启时切换 token：清掉旧 key 上的空行，并把 autoFillConfig.dataKey
+    // 同步到新 key（printerStore 按两者相等才追加填充高度），交给 Printer 重挂载后重补
+    if (this.isAutoFilling || this.config?.autoFillConfig?.checked) {
+      this.clearAllTableEmptyData()
+      this.setAutoFillingConfig(true)
+      set(this.config, {
+        autoFillConfig: {
+          ...(this.config.autoFillConfig || {}),
+          region: this.selectedRegion || this.config.autoFillConfig?.region,
+          dataKey: newDataKey.join('_'),
+          checked: true,
+          fillIndex: this.fillIndex
+        }
+      })
+    }
   }
 
   @action
@@ -1313,7 +1400,7 @@ class EditorStore {
         dataKey === 'goods'
           ? buildDataKey(prefix, 'independent_rol_sku')
           : buildDataKey(prefix, 'independent_rol_address'),
-      detail_sort_type: 0,
+      detail_sort_type: 0
     })
   }
 
@@ -1570,6 +1657,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) {
@@ -1765,6 +1888,8 @@ class EditorStore {
       }
       // 开启自定义单元格
       if (subtotalConfig?.isCustomCells) {
+        // 互斥：开启自定义单元格时关闭单元格拆分展示
+        set(subtotalConfig, { isSplitCells: false })
         // 同时还开启了自定义单元格选项
         if (subtotalConfig?.fields?.length === 2) {
           // fields添加自定义单元格
@@ -1812,6 +1937,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) {
@@ -1820,10 +1947,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 })
       }
     }
   }
@@ -1959,6 +2140,7 @@ class EditorStore {
   }
 
   // 整单合计自定义单元格文本输入
+  // Text 组件直接绑定时收到事件对象（同 setSubtotalFields）；⚠️ 不能用 `||` 兜底，清空输入时空串 falsy 会错存事件对象导致页面崩溃，用 value?.target 判别
   @action.bound
   setOverallOrderFields(value) {
     if (this.selectedRegion) {
@@ -1967,8 +2149,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/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/printer/table_special_tr.js

@@ -25,6 +25,21 @@ const SpecialTr = ({ data, config }) => {
   } = specialConfig
   const { list, type, fixedSize } = data
 
+  // 「显示分类名称/小计文案修改」实时生效：数据行带 _prefix 原料时，按当前 specialConfig 重拼前缀
+  // 打印时配置与数据层拼前缀所用配置一致，重拼结果不变；编辑器预览改配置时实时刷新；导出（paint.js）不走本组件不受影响
+  const applySubtotalText = html => {
+    if (typeof html !== 'string' || data._prefix === undefined) {
+      return html
+    }
+    const showCategoryName = specialConfig?.showCategoryName ?? true
+    const subtotalText = specialConfig?.subtotalText ?? '小计'
+    const newPrefix = showCategoryName
+      ? `${data._categoryName ?? ''}${subtotalText}：`
+      : `${subtotalText}：`
+    // 前缀位于字符串头部，首次命中即替换；用函数替换避免 newPrefix 含 $ 序列时被特俗解释
+    return html.replace(data._prefix, () => newPrefix)
+  }
+
   let compiled
   try {
     compiled = _.template(template_text, { interpolate: /{{([\s\S]+?)}}/g })
@@ -119,7 +134,7 @@ const SpecialTr = ({ data, config }) => {
                 className='gm-flex-page gm-flex-justify-between-page'
                 style={{ 'justify-content': 'space-between' }}
                 dangerouslySetInnerHTML={{
-                  __html: htmlStr || data.text
+                  __html: applySubtotalText(htmlStr || data.text)
                 }}
               />
             </td>
@@ -145,7 +160,7 @@ const SpecialTr = ({ data, config }) => {
             colSpan={99}
             style={Object.assign({ fontWeight: 'bold' }, style)}
             dangerouslySetInnerHTML={{
-              __html: getHtml() || data.text
+              __html: applySubtotalText(getHtml() || data.text)
             }}
           />
         </tr>