Skip to content

Commit 767c076

Browse files
mehaotianmehaotian
committed
update(uni-ui): uni-ui 同步，修复组件bug
1 parent 2f99709 commit 767c076

File tree

53 files changed

+6346
-5934
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

53 files changed

+6346
-5934
lines changed

‎components/uni-calendar/uni-calendar-item.vue‎

Lines changed: 121 additions & 92 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,46 @@
22
<view>
33
<block v-for="(weeks, week) in canlender.weeks" :key="week">
44
<view class="uni-calender__body-date-week">
5-
<block v-for="(day, index) in weeks" :key="index">
6-
<view :class="{
5+
<view v-for="(day, index) in weeks" :key="index" class="uni-calender__date" :class="{
76
'uni-calender__disable': canlender.month !== day.month || day.disable,
87
'uni-calender__date-current':
98
((day.date == canlender.date && !day.checked) || day.multipleBegin || day.multipleEnd) && canlender.month == day.month && !day.disable,
10-
'uni-calender__lunar': lunar,
9+
'uni-calender__date-lunar': lunar,
1110
'uni-calender__active': !day.isDay,
11+
}" @tap="selectDays(week, index, canlender.month === day.month, day.disable, canlender.lunar)">
12+
<view v-if="day.checked" :class="{ 'uni-calender_check': day.checked }" class="uni-calender_check-bg" :key="index">
13+
<view class="calender_check-bg" :class="{'calender_check-end': day.multipleBegin}"></view>
14+
<view class="calender_check-bg" :class="{'calender_check-begin': day.multipleEnd}"></view>
15+
</view>
16+
<view class="uni-calender__circle-box" :class="{
17+
'uni-calender__circle-box-current':
18+
((day.date == canlender.date && !day.checked) || day.multipleBegin || day.multipleEnd) && canlender.month == day.month && !day.disable,
19+
'uni-calender__multiple': day.multipleBegin || day.multipleEnd,
20+
}">
21+
<text class="uni-calender__circle-box-text" :class="{
22+
'uni-calender__disable': canlender.month !== day.month || day.disable,
1223
'uni-calender__is-day': day.isDay,
13-
'uni-calender__multiple': day.multipleBegin || day.multipleEnd,
14-
'uni-calender__multiple-box': day.checked
15-
}" class="uni-calender__date" @tap="selectDays(week, index, canlender.month === day.month, day.disable, canlender.lunar)">
16-
<view class="uni-calender__circle-box">
17-
{{ day.date }}
18-
<view v-if="lunar" class="uni-calender__lunar">{{ day.lunar }}</view>
19-
<view v-if="day.have" class="uni-calender__data-circle" />
20-
<view v-if="day.have && !lunar" class="uni-calender__lunar">{{ day.clockinfo.info }}</view>
21-
</view>
22-
<view :class="{ 'uni-calender_check': day.checked, 'calender_check-begin': day.multipleBegin, 'calender_check-end': day.multipleEnd }" class="uni-calender_check-bg" />
24+
'uni-calender__date-current':
25+
((day.date == canlender.date && !day.checked) || day.multipleBegin || day.multipleEnd) && canlender.month == day.month && !day.disable,
26+
'uni-calender__multiple-box': day.checked
27+
}">{{ day.date }}</text>
28+
<text v-if="lunar" class="uni-calender__lunar" :class="{
29+
'uni-calender__lunar-disable': canlender.month !== day.month || day.disable,
30+
'uni-calender__lunar-is-day': day.isDay,
31+
'uni-calender__lunar-date-current':
32+
((day.date == canlender.date && !day.checked) || day.multipleBegin || day.multipleEnd) && canlender.month == day.month && !day.disable,
33+
'uni-calender__lunar-multiple-box': day.checked
34+
}">{{ day.lunar }}</text>
35+
<text v-if="day.have" class="uni-calender__data-circle" />
36+
<text v-if="day.have && !lunar" class="uni-calender__lunar" :class="{
37+
'uni-calender__lunar-disable': canlender.month !== day.month || day.disable,
38+
'uni-calender__lunar-is-day': day.isDay,
39+
'uni-calender__lunar-date-current':
40+
((day.date == canlender.date && !day.checked) || day.multipleBegin || day.multipleEnd) && canlender.month == day.month && !day.disable,
41+
'uni-calender__lunar-multiple-box': day.checked
42+
}">{{ day.clockinfo.info }}</text>
2343
</view>
24-
</block>
44+
</view>
2545
</view>
2646
</block>
2747
</view>
@@ -63,136 +83,145 @@
6383
}
6484
</script>
6585

66-
<style>
67-
@charset "UTF-8";
68-
86+
<style scoped>
6987
.uni-calender__body-date-week {
88+
/* #ifndef APP-NVUE */
7089
display: flex;
71-
width: 100%;
72-
border-bottom: 1px #f5f5f5 solid
73-
}
74-
75-
.uni-calender__body-date-week:last-child {
76-
border: none
77-
}
78-
79-
.uni-calender__body-date-week .uni-calender__date {
90+
/* #endif */
91+
flex: 1;
92+
flex-direction: row;
93+
border-bottom-color: #F5F5F5;
94+
border-bottom-style: solid;
95+
border-bottom-width: 1px;
96+
justify-content: space-around;
97+
}
98+
99+
/* 日期的样式
100+
*/
101+
.uni-calender__date {
102+
/* #ifndef APP-NVUE */
103+
display: flex;
104+
/* #endif */
105+
flex: 1;
106+
flex-direction: column;
80107
position: relative;
81-
width: 100%;
82108
text-align: center;
83-
display: flex;
84109
justify-content: center;
85110
align-items: center;
86111
color: #000;
87-
background: #fff;
88-
box-sizing: border-box;
89-
padding: 10upx 0;
90-
line-height: 1.5;
91-
z-index: 2
112+
background-color: #fff;
113+
padding: 10rpx 0;
92114
}
93115
94-
.uni-calender__body-date-week .uni-calender__date .uni-calender__lunar {
95-
font-size: 20upx;
116+
.uni-calender__lunar {
117+
font-size: 20rpx;
96118
color: #000;
97-
line-height: 1.2
98119
}
99120
100-
.uni-calender__body-date-week .uni-calender__date .uni-calender__circle-box {
121+
.uni-calender__circle-box {
122+
/* #ifndef APP-NVUE */
101123
display: flex;
124+
z-index: 1;
125+
/* #endif */
102126
flex-direction: column;
103127
justify-content: center;
104128
align-items: center;
105-
width: 80upx;
106-
height: 80upx;
107-
flex-shrink: 0;
108-
border-radius: 10upx;
109-
line-height: 1.2
129+
width: 80rpx;
130+
height: 80rpx;
131+
border-radius: 10rpx;
110132
}
111133
112-
.uni-calender__body-date-week .uni-calender__date.uni-calender__disable {
113-
color: #f1f1f1
134+
.uni-calender__circle-box-text {
135+
font-size: 30rpx;
114136
}
115137
116-
.uni-calender__body-date-week .uni-calender__date.uni-calender__disable .uni-calender__lunar {
117-
color: #f1f1f1
138+
/* 本月禁止的样式
139+
*/
140+
.uni-calender__disable {
141+
color: #f1f1f1;
118142
}
119143
120-
.uni-calender__body-date-week .uni-calender__date.uni-calender__is-day {
121-
color: #fd2e32
144+
.uni-calender__lunar-disable {
145+
color: #f1f1f1;
122146
}
123147
124-
.uni-calender__body-date-week .uni-calender__date.uni-calender__is-day .uni-calender__lunar {
125-
color: #fd2e32
148+
.uni-calender__is-day {
149+
color: #fd2e32;
126150
}
127151
128-
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current {
129-
color: #fff;
130-
box-sizing: border-box
152+
.uni-calender__lunar-is-day {
153+
color: #fd2e32;
131154
}
132155
133-
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current .uni-calender__circle-box {
134-
background: #fd2e32
156+
/* 当前选中
157+
*/
158+
.uni-calender__date-current {
159+
color: #fff;
135160
}
136161
137-
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current.uni-calender__active {
138-
color: #fff
162+
.uni-calender__lunar-date-current {
163+
color: #fff;
139164
}
140165
141-
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current.uni-calender__active .uni-calender__circle-box {
142-
background: #000
166+
.uni-calender__circle-box-current {
167+
background-color: #fd2e32;
143168
}
144169
145-
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current.uni-calender__multiple .uni-calender__circle-box {
146-
border-radius: 50%;
147-
background: #fd2e32
170+
.uni-calender__multiple {
171+
/* #ifndef APP-NVUE */
172+
z-index: 1;
173+
/* #endif */
174+
border-radius: 50px;
175+
background-color: #fd2e32;
148176
}
149177
150-
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current .uni-calender__lunar {
151-
color: #fff
152-
}
153-
154-
.uni-calender__body-date-week .uni-calender__date.uni-calender__multiple-box {
155-
color: #fff
178+
.uni-calender__multiple-box {
179+
color: #fff;
156180
}
157181
158-
.uni-calender__body-date-week .uni-calender__date.uni-calender__multiple-box .uni-calender__lunar {
159-
color: #fff
182+
.uni-calender__lunar-multiple-box {
183+
color: #fff;
160184
}
161185
162-
.uni-calender__body-date-week .uni-calender__date .uni-calender__data-circle {
186+
.uni-calender__data-circle {
163187
position: absolute;
164-
top: 5upx;
165-
right: 5upx;
188+
top: 5rpx;
189+
right: 5rpx;
166190
width: 10rpx;
167191
height: 10rpx;
168192
border-radius: 50%;
169-
background: #ff5a5f;
170-
border: 1px #fff solid;
171-
z-index: 2
193+
background-color: #ff5a5f;
194+
border-color: #fff;
195+
border-style: solid;
196+
border-width: 1px;
197+
z-index: 2;
172198
}
173199
174-
.uni-calender__body-date-week .uni-calender__date .uni-calender_check-bg {
200+
.uni-calender_check-bg {
175201
position: absolute;
176-
top: 10upx;
177-
bottom: 10upx;
178-
left: 0;
179-
right: 0;
180-
z-index: -1
202+
top: 10rpx;
203+
bottom: 10rpx;
204+
left: 0px;
205+
right: 0px;
206+
}
207+
208+
.uni-calender_check {
209+
/* #ifndef APP-PLUS */
210+
display: flex;
211+
/* #endif */
212+
flex-direction: row;
181213
}
182214
183-
.uni-calender__body-date-week .uni-calender__date .uni-calender_check-bg.uni-calender_check {
184-
background: #ffd3d3
215+
.calender_check-bg {
216+
flex: 1;
217+
background-color: #ffd3d3;
185218
}
186219
187-
.uni-calender__body-date-week .uni-calender__date .uni-calender_check-bg.calender_check-begin {
188-
left: 20upx;
189-
border-top-left-radius: 100upx;
190-
border-bottom-left-radius: 100upx
220+
.calender_check-begin {
221+
background-color: #fff;
191222
}
192223
193-
.uni-calender__body-date-week .uni-calender__date .uni-calender_check-bg.calender_check-end {
194-
right: 20upx;
195-
border-top-right-radius: 100upx;
196-
border-bottom-right-radius: 100upx
224+
.calender_check-end {
225+
background-color: #fff;
197226
}
198227
</style>

0 commit comments

Comments
 (0)