gm-printer 10.30.0-beta.0 → 10.30.1-beta.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. package/build/demo.js +2 -2
  2. package/package.json +1 -1
  3. package/src/common/editor_store.js +1 -1
  4. package/src/editor_purchase/editor_special_table.js +9 -2
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "gm-printer",
3
- "version": "10.30.0-beta.0",
3
+ "version": "10.30.1-beta.2",
4
4
  "description": "diy printer",
5
5
  "main": "src/index.js",
6
6
  "scripts": {
package/src/common/editor_store.js CHANGED
@@ -1063,7 +1063,7 @@ class EditorStore {
1063
1063
  if (table.purchaseSettingKey === 'goods') {
1064
1064
  return 'purchase_independent_rol_sku'
1065
1065
  }
1066
- if (table.purchaseSettingKey === 'address') {
1066
+ if (table.purchaseSettingKey === 'merchant') {
1067
1067
  return 'purchase_independent_rol_address'
1068
1068
  }
1069
1069
  }
package/src/editor_purchase/editor_special_table.js CHANGED
@@ -56,9 +56,16 @@ class TableDetailEditor extends React.Component {
56
56
  .replace(/{{\s*([^}]+)\s*}}/g, '{{$1}}') // 先标准化（去掉多余空格）
57
57
  .replace(/{{([^.\s}]+)}}/g, '{{列.$1}}')
58
58
  }
59
-
60
- if (config.dataKey !== 'purchase_independent_rol_sku') {
59
+ if (
60
+ config.purchaseSettingKey === 'goods' &&
61
+ config.dataKey !== 'purchase_independent_rol_sku'
62
+ ) {
61
63
  editStore.setPurchaseTableKey('purchase_independent_rol_sku')
64
+ } else if (
65
+ config.purchaseSettingKey === 'merchant' &&
66
+ config.dataKey !== 'purchase_independent_rol_address'
67
+ ) {
68
+ editStore.setPurchaseTableKey('purchase_independent_rol_address')
62
69
  }
63
70
 
64
71
  editStore.addFieldToTable({ key, value: transform(value) })