gm-printer 10.40.0 → 10.41.0

package/package.json

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

package/src/editor_purchase/editor_special_table.js

@@ -57,8 +57,11 @@ const detailSortOptionsForMerchant = [
 @observer
 class TableDetailEditor extends React.Component {
   handleDataKeyChange = dataKey => {
-    const { editStore } = this.props
-    editStore.setPurchaseTableKey(dataKey)
+    const { editStore, addFields } = this.props
+    editStore.setPurchaseTableKey(
+      dataKey,
+      addFields.specialTableConfig
+    )
   }
 
   handlePurchaseSettingKeyChange = dataKey => {
@@ -74,7 +77,7 @@ class TableDetailEditor extends React.Component {
   }
 
   handleDetailAddField = ({ key, value }) => {
-    const { editStore, config } = this.props
+    const { editStore, config, addFields } = this.props
     if (editStore.computedDataKey === 'purchase_detail_one_row') {
       // 序号 {{列.序号}}
       const transform = str => {
@@ -86,12 +89,18 @@ class TableDetailEditor extends React.Component {
         config.purchaseSettingKey === 'goods' &&
         config.dataKey !== 'purchase_independent_rol_sku'
       ) {
-        editStore.setPurchaseTableKey('purchase_independent_rol_sku')
+        editStore.setPurchaseTableKey(
+          'purchase_independent_rol_sku',
+          addFields.specialTableConfig
+        )
       } else if (
         config.purchaseSettingKey === 'merchant' &&
         config.dataKey !== 'purchase_independent_rol_address'
       ) {
-        editStore.setPurchaseTableKey('purchase_independent_rol_address')
+        editStore.setPurchaseTableKey(
+          'purchase_independent_rol_address',
+          addFields.specialTableConfig
+        )
       }
 
       editStore.addFieldToTable({ key, value: transform(value) })
@@ -125,9 +134,11 @@ class TableDetailEditor extends React.Component {
 
     const title = specialTableConfig.title || i18next.t('设置采购明细')
     const label = specialTableConfig.label || i18next.t('采购明细')
+    // 外部可整体覆盖下拉选项（dataKeyList），否则按 hideDataKeys 过滤默认列表
+    const baseDataKeyList = specialTableConfig.dataKeyList || dataKeyList
     const hideDataKeys = specialTableConfig.hideDataKeys || []
     const visibleDataKeyList = _.filter(
-      dataKeyList,
+      baseDataKeyList,
       v => !hideDataKeys.includes(v.value)
     )
 

package/src/editor_purchase/store.js

@@ -13,7 +13,7 @@ class Store extends EditorStore {
 
   /* start---------设置采购明细相关--------- */
   @action.bound
-  setPurchaseTableKey(dataKey) {
+  setPurchaseTableKey(dataKey, specialTableConfig) {
     // 先移除选中项,安全第一
     this.selected = null
     this.setTableDataKey(dataKey)
@@ -38,9 +38,12 @@ class Store extends EditorStore {
         separator: '+',
         // detailsType: 'purchase_last_col',
         specialDetailsKey: '__details',
-        text: i18next.t(
-          '{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}'
-        )
+        text:
+          specialTableConfig && specialTableConfig.defaultDetailText !== undefined
+            ? specialTableConfig.defaultDetailText
+            : i18next.t(
+                '{{采购数量_采购单位}}{{采购单位}}*{{商户名}}*{{商品备注}}'
+              )
       })
       // 通过detailsType属性区分单列-总表最后一列的数据是否换行展示
       dataKey === 'purchase_last_col'