gm-printer 10.41.3-beta.0 → 10.41.4
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.
- package/build/demo.js +1 -1
- package/package.json +1 -1
- package/src/printer/store.js +9 -7
package/package.json
CHANGED
package/src/printer/store.js
CHANGED
|
@@ -232,10 +232,10 @@ class PrinterStore {
|
|
|
232
232
|
count = details.length + detailsMulti.length + count
|
|
233
233
|
})
|
|
234
234
|
|
|
235
|
-
/** 明细data */
|
|
236
|
-
const detailsData = tableData[end]?.__details
|
|
237
|
-
// 双栏明细data
|
|
238
|
-
const detailsDataMulti = tableData[end]?.__details_MULTI_SUFFIX
|
|
235
|
+
/** 明细data(左栏),兜底空数组避免另一侧缺省时切片报错 */
|
|
236
|
+
const detailsData = tableData[end]?.__details || []
|
|
237
|
+
// 双栏明细data(右栏)
|
|
238
|
+
const detailsDataMulti = tableData[end]?.__details_MULTI_SUFFIX || []
|
|
239
239
|
// 采购单如果使用双栏,取明细最多的那个数据
|
|
240
240
|
const data =
|
|
241
241
|
detailsData?.length > (detailsDataMulti?.length || 0)
|
|
@@ -258,10 +258,12 @@ class PrinterStore {
|
|
|
258
258
|
_.filter(ranges, i => i[0] !== i[1] || (!i[0] && !i[1])), // 过滤掉 {[0,3],[3,3]}这周情况
|
|
259
259
|
range => {
|
|
260
260
|
const _tableData = Object.assign({}, tableData[end])
|
|
261
|
-
|
|
261
|
+
// 左右两栏各用各的明细切片(slice 超出长度自动截断,明细少的一侧在第一片即展示完),
|
|
262
|
+
// 修复:此前两栏都塞明细多的一侧数据,导致明细少的一侧(如双栏右栏)明细被替换、自身明细丢失
|
|
263
|
+
_tableData.__details = detailsData.slice(...range)
|
|
262
264
|
// 双栏中的数据也要做处理
|
|
263
265
|
if (isMultiTable(dataKey)) {
|
|
264
|
-
_tableData.__details_MULTI_SUFFIX =
|
|
266
|
+
_tableData.__details_MULTI_SUFFIX = detailsDataMulti.slice(...range)
|
|
265
267
|
}
|
|
266
268
|
|
|
267
269
|
return _tableData
|
|
@@ -705,7 +707,7 @@ class PrinterStore {
|
|
|
705
707
|
try {
|
|
706
708
|
const row = this.data._table[dataKey][index]
|
|
707
709
|
const compiled = _.template(templateText, {
|
|
708
|
-
interpolate: /{{([\s\S]+?)}}/g
|
|
710
|
+
interpolate: /{{([\s\S]+?)}}/g
|
|
709
711
|
})
|
|
710
712
|
let detailsList = row[specialDetailsKey] || []
|
|
711
713
|
|