From 8e5e35eac41ba16f4b875bbcf07bab3878d8e2e4 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 06 七月 2024 14:34:35 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/menu/transfer/index.jsx | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
diff --git a/src/menu/transfer/index.jsx b/src/menu/transfer/index.jsx
index f4fa0e0..5e9c7d8 100644
--- a/src/menu/transfer/index.jsx
+++ b/src/menu/transfer/index.jsx
@@ -74,8 +74,6 @@
delete _config.autoMatic
- let useMSearch = false
-
if (clear) {
_config.components = []
} else {
@@ -91,9 +89,6 @@
tab.components[0].width = 24
tab.components[0].wrap.width = 24
tab.components[0].wrap.name = tab.components[0].name
- if (tab.components[0].setting.useMSearch === 'true') {
- useMSearch = true
- }
tab.components[0].action.forEach(btn => {
if (btn.OpenType === 'popview' && btn.config) {
@@ -145,14 +140,14 @@
})
}
- if (useMSearch) {
+ if (_config.components[0].search && _config.components[0].search.length > 0) {
let cell = {
uuid: Utils.getuuid(),
type: 'search',
width: 24,
subtype: 'mainsearch',
name: '鎼滅储',
- search: _config.components[0].search || [],
+ search: _config.components[0].search,
style: {borderBottomColor: '#f0f0f0', borderBottomWidth: '1px'},
wrap: {float: 'left', blacklist: [], name: '鎼滅储', width: 24}
}
--
Gitblit v1.8.0