Skip to content

Commit dfb05d4

Browse files
mehaotianmehaotian
committed
- uni-ui 新增 Calendar 日历组件新增打点、范围选择，优化性能，解决已知 Bug 若干
- uni-ui 新增 Grid 宫格组件新增红点、数字角标、图片角标显示，修改传值方式，定制性更高 - uni-ui 新增 Icon 图标组件新增一批新图标，优化老图标 - uni-ui 新增 Card 卡片组件新增图文卡片模式 - uni-ui 修复 Collapse 折叠面板组件动画模式下，动态添加数据高度不正确的 Bug - uni-ui 修复 Popup 弹出层组件底部弹出示例样式错乱的 Bug - uni-ui 优化 组件示例 ui，显示更清晰
1 parent 208adb3 commit dfb05d4

File tree

47 files changed

+5159
-3013
lines changed

Some content is hidden

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

47 files changed

+5159
-3013
lines changed

‎components/uni-badge/uni-badge.vue‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
default: false
1616
},
1717
text: {
18-
type: [String, Number],
18+
type: String,
1919
default: ''
2020
},
2121
size: { // small.normal

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

Lines changed: 63 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -6,26 +6,20 @@
66
<view :class="{
77
'uni-calender__disable': canlender.month !== day.month || day.disable,
88
'uni-calender__date-current':
9-
(day.date == canlender.date || day.checked) &&
10-
canlender.month == day.month &&
11-
!day.disable,
9+
((day.date == canlender.date && !day.checked) || day.multipleBegin || day.multipleEnd) && canlender.month == day.month && !day.disable,
1210
'uni-calender__lunar': lunar,
13-
'uni-calender__active': day.isDay,
14-
'uni-calender__is-day': day.isDay
15-
}" class="uni-calender__date" @tap="
16-
selectDays(
17-
week,
18-
index,
19-
canlender.month === day.month,
20-
day.disable,
21-
canlender.lunar
22-
)
23-
">
11+
'uni-calender__active': !day.isDay,
12+
'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)">
2416
<view class="uni-calender__circle-box">
2517
{{ day.date }}
2618
<view v-if="lunar" class="uni-calender__lunar">{{ day.lunar }}</view>
2719
<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>
2821
</view>
22+
<view :class="{ 'uni-calender_check': day.checked, 'calender_check-begin': day.multipleBegin, 'calender_check-end': day.multipleEnd }" class="uni-calender_check-bg" />
2923
</view>
3024
</block>
3125
</view>
@@ -92,8 +86,9 @@
9286
color: #000;
9387
background: #fff;
9488
box-sizing: border-box;
95-
padding: 20upx 0;
96-
line-height: 1.5
89+
padding: 10upx 0;
90+
line-height: 1.5;
91+
z-index: 2
9792
}
9893
9994
.uni-calender__body-date-week .uni-calender__date .uni-calender__lunar {
@@ -110,17 +105,16 @@
110105
width: 80upx;
111106
height: 80upx;
112107
flex-shrink: 0;
113-
border-radius: 50%;
114-
transition: all .2s;
108+
border-radius: 10upx;
115109
line-height: 1.2
116110
}
117111
118112
.uni-calender__body-date-week .uni-calender__date.uni-calender__disable {
119-
color: #d4d4d4
113+
color: #f1f1f1
120114
}
121115
122116
.uni-calender__body-date-week .uni-calender__date.uni-calender__disable .uni-calender__lunar {
123-
color: #d4d4d4
117+
color: #f1f1f1
124118
}
125119
126120
.uni-calender__body-date-week .uni-calender__date.uni-calender__is-day {
@@ -140,18 +134,65 @@
140134
background: #fd2e32
141135
}
142136
137+
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current.uni-calender__active {
138+
color: #fff
139+
}
140+
141+
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current.uni-calender__active .uni-calender__circle-box {
142+
background: #000
143+
}
144+
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
148+
}
149+
143150
.uni-calender__body-date-week .uni-calender__date.uni-calender__date-current .uni-calender__lunar {
144151
color: #fff
145152
}
146153
154+
.uni-calender__body-date-week .uni-calender__date.uni-calender__multiple-box {
155+
color: #fff
156+
}
157+
158+
.uni-calender__body-date-week .uni-calender__date.uni-calender__multiple-box .uni-calender__lunar {
159+
color: #fff
160+
}
161+
147162
.uni-calender__body-date-week .uni-calender__date .uni-calender__data-circle {
148163
position: absolute;
149-
top: 10upx;
150-
right: 10upx;
164+
top: 5upx;
165+
right: 5upx;
151166
width: 10rpx;
152167
height: 10rpx;
153168
border-radius: 50%;
154169
background: #ff5a5f;
170+
border: 1px #fff solid;
155171
z-index: 2
156172
}
173+
174+
.uni-calender__body-date-week .uni-calender__date .uni-calender_check-bg {
175+
position: absolute;
176+
top: 10upx;
177+
bottom: 10upx;
178+
left: 0;
179+
right: 0;
180+
z-index: -1
181+
}
182+
183+
.uni-calender__body-date-week .uni-calender__date .uni-calender_check-bg.uni-calender_check {
184+
background: #ffd3d3
185+
}
186+
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
191+
}
192+
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
197+
}
157198
</style>

0 commit comments

Comments
 (0)