From 5478a1f1d6a9dca0d8c3c4301b28cb6a67f58993 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 24 十一月 2022 16:38:40 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/share/normalTable/index.jsx | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 09611a8..34e9aad 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -255,7 +255,7 @@
<div>
{photos.map((url, i) => (
<Col key={i} span={col.span || 24}>
- <MkPicture style={{paddingTop}} scale={scale} url={url} urls={photos}/>
+ <MkPicture style={{paddingTop, backgroundSize: col.backgroundSize || 'cover'}} scale={scale} url={url} urls={photos}/>
</Col>
))}
</div>
@@ -691,11 +691,7 @@
tabmenu.param = __param
- if (['linkage_navigation', 'linkage', 'menu_board'].includes(window.GLOB.navBar)) {
- MKEmitter.emit('modifyTabs', tabmenu, 'replace')
- } else {
- MKEmitter.emit('modifyTabs', tabmenu, 'plus', true)
- }
+ MKEmitter.emit('modifyTabs', tabmenu, true)
} else if (item.linkurl) {
let src = item.linkurl
--
Gitblit v1.8.0