From 947d0ed1a628353f42ac4c2aa817a4579cdf126d Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期日, 05 十一月 2023 11:29:04 +0800
Subject: [PATCH] Merge branch 'positec' into dms
---
src/tabviews/custom/popview/index.jsx | 20 +-------------------
1 files changed, 1 insertions(+), 19 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index 9750fc1..f7e15a4 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -190,7 +190,7 @@
delete item.style.shadowColor
}
- item.$menuname = (Tab.label || '') + '-' + (item.name || '')
+ item.$menuname = (Tab.logLabel || Tab.label || '') + '-' + (item.name || '')
if (item.type === 'tabs') {
if (
@@ -697,24 +697,6 @@
}
return cell
- }
-
- getPrinter = (item, parentId) => {
- let _item = window.GLOB.UserCacheMap.get(parentId + item.uuid)
-
- if (_item) {
- item.printer = _item.printer || ''
- item.verify.defaultPrinter = _item.printer || ''
- if (item.verify.printerTypeList && _item.printerList) {
- item.verify.printerTypeList = item.verify.printerTypeList.map(cell => {
- cell.printer = _item.printerList[cell.Value] || ''
-
- return cell
- })
- }
- }
-
- return item
}
// 鏍煎紡鍖栭粯璁よ缃�
--
Gitblit v1.8.0