From 78eed586f6a0d15162c89878c53a301e7b142a8a Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期一, 10 十月 2022 00:07:06 +0800
Subject: [PATCH] Merge branch 'master' into positec
---
src/tabviews/custom/components/share/normalTable/index.jsx | 6 ++----
1 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 317b96d..0e98c31 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -16,6 +16,7 @@
const { Paragraph } = Typography
const CardCellComponent = asyncComponent(() => import('@/tabviews/custom/components/card/cardcellList'))
+const MkPicture = asyncComponent(() => import('@/components/mkPicture'))
const PicRadio = {
'4:3': '75%', '3:2': '66.67%', '16:9': '56.25%', '2:1': '50%', '3:1': '33.33%', '4:1': '25%',
'5:1': '20%', '6:1': '16.67%', '7:1': '14.29%', '8:1': '12.5%', '9:1': '11.11%',
@@ -253,10 +254,7 @@
<div>
{photos.map((url, i) => (
<Col key={i} span={col.span || 24}>
- <div className={'ant-mk-picture' + (scale ? ' scale' : '')} onClick={() => {
- if (!scale) return
- MKEmitter.emit('mkImageScale', url, photos)
- }} style={{paddingTop, backgroundImage: `url('${url}')`}}></div>
+ <MkPicture style={{paddingTop}} scale={scale} url={url} urls={photos}/>
</Col>
))}
</div>
--
Gitblit v1.8.0