From 8acfcd6e349ef2d1b797a7483940a2f3f2dfcfe6 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期六, 03 二月 2024 17:49:25 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/share/normalTable/index.jsx | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/tabviews/custom/components/share/normalTable/index.jsx b/src/tabviews/custom/components/share/normalTable/index.jsx
index 840b824..5f6859a 100644
--- a/src/tabviews/custom/components/share/normalTable/index.jsx
+++ b/src/tabviews/custom/components/share/normalTable/index.jsx
@@ -268,7 +268,7 @@
<div>
{photos.map((url, i) => (
<Col key={i} span={col.span || 24}>
- <MkPicture style={{paddingTop, backgroundSize: col.backgroundSize || 'cover'}} scale={scale} url={url} urls={photos}/>
+ <MkPicture lostTip={col.lostTip !== 'false'} style={{paddingTop, backgroundSize: col.backgroundSize || 'cover'}} scale={scale} url={url} urls={photos}/>
</Col>
))}
</div>
@@ -499,10 +499,6 @@
} else if (_format && !Math.floor(Math.random() * radio)) {
item.blur = true
}
-
- if (item.marks && item.marks.length === 0) {
- item.marks = ''
- }
if (item.field) {
orderfields[item.uuid] = item.field
@@ -568,6 +564,10 @@
if (!pageOptions.includes(size)) {
pageOptions.push(size)
pageOptions = pageOptions.sort((a, b) => a - b)
+ }
+
+ if (setting.maxPageSize) {
+ pageOptions = pageOptions.filter(item => item <= setting.maxPageSize)
}
let allColumns = null
@@ -838,6 +838,8 @@
onSelectChange = (selectedRowKeys, e) => {
const { setting, MenuID, data } = this.props
+ if (this.state.pickup) return
+
let index = ''
let _activeIndex = null
if (selectedRowKeys.length > 0) {
--
Gitblit v1.8.0