From 91e232bb0b910f3670bdbccd65cc218d55e1eda9 Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期二, 06 十二月 2022 16:08:20 +0800
Subject: [PATCH] Merge branch 'develop'
---
src/tabviews/custom/components/carousel/data-card/index.jsx | 89 +++++++++++++++++++++++++-------------------
1 files changed, 51 insertions(+), 38 deletions(-)
diff --git a/src/tabviews/custom/components/carousel/data-card/index.jsx b/src/tabviews/custom/components/carousel/data-card/index.jsx
index 27b0c7e..8829c61 100644
--- a/src/tabviews/custom/components/carousel/data-card/index.jsx
+++ b/src/tabviews/custom/components/carousel/data-card/index.jsx
@@ -12,6 +12,7 @@
import './index.scss'
const CardItem = asyncComponent(() => import('../cardItem'))
+const NormalHeader = asyncComponent(() => import('@/tabviews/custom/components/share/normalheader'))
class DataCard extends Component {
static propTpyes = {
@@ -76,8 +77,6 @@
_cols.set(item.field, item)
})
- _card.style.height = _config.style.height
-
if (_card.setting.click) {
_card.style.cursor = 'pointer'
}
@@ -88,6 +87,13 @@
}
return item
})
+
+ if (!_config.wrap.height) { // 鍏煎
+ _config.wrap.height = _config.style.height || '300px'
+ delete _config.style.height
+ }
+
+ _card.style.height = _config.wrap.height
_config.wrap.speed = (_config.wrap.speed || 3) * 1000
@@ -150,7 +156,7 @@
this.setState({sync: false, data: _data}, () => {
this.openModal()
})
- } else if (config.setting.syncRefresh && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
+ } else if (config.setting.useMSearch && nextProps.mainSearch && !is(fromJS(this.props.mainSearch), fromJS(nextProps.mainSearch))) {
this.setState({}, () => {
this.loadData()
})
@@ -173,12 +179,13 @@
if (config.wrap.display !== 'modal' || !data || data.length === 0) return
- let tip = localStorage.getItem('modal' + config.uuid)
+ let code = config.wrap.code || ('modal' + config.uuid)
+ let tip = localStorage.getItem(code)
if (!data[0].$$uuid || tip === data[0].$$uuid + data.length) return
if (config.wrap.modalContent === 'update') {
- localStorage.setItem('modal' + config.uuid, data[0].$$uuid + data.length)
+ localStorage.setItem(code, data[0].$$uuid + data.length)
Api.getAppVersion(true)
}
@@ -305,10 +312,11 @@
onTipChange = (e) => {
const { config, data } = this.state
+ let code = config.wrap.code || ('modal' + config.uuid)
if (e.target.checked) {
- localStorage.setItem('modal' + config.uuid, data[0].$$uuid + data.length)
+ localStorage.setItem(code, data[0].$$uuid + data.length)
} else {
- localStorage.removeItem('modal' + config.uuid)
+ localStorage.removeItem(code)
}
}
@@ -327,23 +335,26 @@
footer={null}
destroyOnClose
>
- {data && data.length > 0 ? <div className="custom-data-carousel-box" style={config.style}>
- {data.length > 1 && config.wrap.autoplay === 'false' ? <div className="prev" onClick={() => this.node && this.node.prev()}><LeftOutlined /></div> : null}
- {data.length > 1 && config.wrap.autoplay === 'false' ? <div className="next" onClick={() => this.node && this.node.next()}><RightOutlined /></div> : null}
- <Carousel
- autoplay={config.wrap.autoplay !== 'false'}
- dots={config.wrap.dots !== 'false'}
- dotPosition={config.wrap.dotPosition || 'bottom'}
- effect={config.wrap.effect || 'scrollx'}
- autoplaySpeed={config.wrap.speed}
- ref={ref => this.node = ref}
- >
- {data.map((item, index) => (
- <div key={index}>
- <CardItem card={card} cards={config} data={item}/>
- </div>
- ))}
- </Carousel>
+ {visible ? <div className="custom-data-carousel-box" style={config.style}>
+ <NormalHeader config={config}/>
+ <div className="carousel-wrap" style={{height: config.wrap.height}}>
+ {data.length > 1 && config.wrap.autoplay === 'false' ? <div className="prev" onClick={() => this.node && this.node.prev()}><LeftOutlined /></div> : null}
+ {data.length > 1 && config.wrap.autoplay === 'false' ? <div className="next" onClick={() => this.node && this.node.next()}><RightOutlined /></div> : null}
+ <Carousel
+ autoplay={config.wrap.autoplay !== 'false'}
+ dots={config.wrap.dots !== 'false'}
+ dotPosition={config.wrap.dotPosition || 'bottom'}
+ effect={config.wrap.effect || 'scrollx'}
+ autoplaySpeed={config.wrap.speed}
+ ref={ref => this.node = ref}
+ >
+ {data.map((item, index) => (
+ <div key={index}>
+ <CardItem card={card} cards={config} data={item}/>
+ </div>
+ ))}
+ </Carousel>
+ </div>
</div> : null}
{config.wrap.modalContent !== 'update' ? <div className="mk-footer">
<Checkbox defaultChecked={false} onChange={this.onTipChange}>涓嶅湪鎻愰啋</Checkbox>
@@ -362,20 +373,22 @@
<Spin />
</div> : null
}
- {data && data.length > 0 ? <Carousel
- autoplay={config.wrap.autoplay !== 'false'}
- dots={config.wrap.dots !== 'false'}
- dotPosition={config.wrap.dotPosition || 'bottom'}
- effect={config.wrap.effect || 'scrollx'}
- autoplaySpeed={config.wrap.speed}
- >
- {data.map((item, index) => (
- <div key={index}>
- <CardItem card={card} cards={config} data={item}/>
- </div>
- ))}
- </Carousel> : null}
- {!data || data.length === 0 ? <Empty description={false}/> : null}
+ <NormalHeader config={config}/>
+ <div className="carousel-wrap" style={{height: config.wrap.height}}>
+ {data && data.length > 0 ? <Carousel
+ autoplay={config.wrap.autoplay !== 'false'}
+ dots={config.wrap.dots !== 'false'}
+ dotPosition={config.wrap.dotPosition || 'bottom'}
+ effect={config.wrap.effect || 'scrollx'}
+ autoplaySpeed={config.wrap.speed}
+ >
+ {data.map((item, index) => (
+ <div key={index}>
+ <CardItem card={card} cards={config} data={item}/>
+ </div>
+ ))}
+ </Carousel> : <Empty description={false}/>}
+ </div>
</div>
)
}
--
Gitblit v1.8.0