From b77c5e22f1ff192d9b09dda8d2376ba40641451c Mon Sep 17 00:00:00 2001
From: king <18310653075@163.com>
Date: 星期四, 06 八月 2020 12:06:50 +0800
Subject: [PATCH] 2020-08-06
---
src/tabviews/zshare/dategroup/index.jsx | 15 ++++++++-------
1 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/tabviews/zshare/dategroup/index.jsx b/src/tabviews/zshare/dategroup/index.jsx
index 28efdd9..64a37cf 100644
--- a/src/tabviews/zshare/dategroup/index.jsx
+++ b/src/tabviews/zshare/dategroup/index.jsx
@@ -13,6 +13,7 @@
class DateGroup extends Component {
static propTpyes = {
card: PropTypes.object, // 鎼滅储鏉′欢
+ position: PropTypes.number, // 绱㈠紩锛岀敤浜庢帶鍒跺搴﹀拰骞寸殑灞曞紑鏂瑰悜
onGroupChange: PropTypes.func // 鎼滅储鍐呭鍒囨崲
}
@@ -22,7 +23,8 @@
yearId: Utils.getuuid(),
dateRange: '',
initDateRange: '',
- initType: ''
+ initType: '',
+ placement: this.props.position % 4 !== 3 ? 'bottomLeft' : 'bottomRight'
}
UNSAFE_componentWillMount() {
@@ -63,7 +65,6 @@
break
default:
}
-
_dateRange = [moment().subtract(_pdiffer + _val * 3, 'month').startOf('month').format('YYYY-MM-DD'),
moment().subtract(_ndiffer + _val * 3, 'month').endOf('month').format('YYYY-MM-DD')]
} else if (_type === 'year') {
@@ -162,7 +163,7 @@
render() {
const { card } = this.props
- const { active, quarterId, yearId, dateRange } = this.state
+ const { active, quarterId, yearId, dateRange, placement } = this.state
let tabs = {day: '鏃�', week: '鍛�', month: '鏈�', quarter: '瀛�', year: '骞�', customized: '鑷畾涔�'}
return (
@@ -185,9 +186,9 @@
</span>)
} else if (tab === 'quarter') {
return (
- <Tooltip key={tab} placement="bottomLeft" overlayClassName="quarter-picker-tooltip" trigger="click" title={
+ <Tooltip key={tab} placement={placement} overlayClassName={'quarter-picker-tooltip ' + placement} trigger="click" title={
<div>
- <QuarterPicker onChange={(date) => this.onChange(date, tab)}/>
+ <QuarterPicker card={card} onChange={(date) => this.onChange(date, tab)}/>
</div>
}>
<span id={quarterId} className={'ant-tag ant-tag-quarter ant-tag-checkable ' + (active === tab ? 'ant-tag-checkable-checked' : '')} >
@@ -197,9 +198,9 @@
)
} else if (tab === 'year') {
return (
- <Tooltip key={tab} placement="bottomLeft" overlayClassName="year-picker-tooltip" trigger="click" title={
+ <Tooltip key={tab} placement={placement} overlayClassName={'year-picker-tooltip ' + placement} trigger="click" title={
<div>
- <YearPicker onChange={(date) => this.onChange(date, tab)}/>
+ <YearPicker card={card} onChange={(date) => this.onChange(date, tab)}/>
</div>
}>
<span id={yearId} className={'ant-tag ant-tag-quarter ant-tag-checkable ' + (active === tab ? 'ant-tag-checkable-checked' : '')} >
--
Gitblit v1.8.0