From d1e443953eae3c5bdb0b443b4f5c3b7ced9236d7 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期五, 03 十一月 2023 01:38:44 +0800
Subject: [PATCH] Merge branch 'positec' into bms
---
src/tabviews/custom/popview/index.jsx | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/tabviews/custom/popview/index.jsx b/src/tabviews/custom/popview/index.jsx
index d9fb7ac..b2a01d8 100644
--- a/src/tabviews/custom/popview/index.jsx
+++ b/src/tabviews/custom/popview/index.jsx
@@ -136,7 +136,7 @@
if (param.$searchkey) {
component.search = component.search.map(item => {
- if (['text', 'select', 'link'].includes(item.type) && param.$searchkey === item.field) {
+ if (['text', 'select', 'link', 'checkcard'].includes(item.type) && param.$searchkey === item.field) {
item.initval = param.$searchval
}
@@ -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 (
--
Gitblit v1.8.0