Skip to content

Commit 8659ce3

Browse files
wlxuquwlxuqu
committed
Merge branch 'yiruiwen'
2 parents 103a881 + 04da8d4 commit 8659ce3

File tree

16 files changed

+166
-77
lines changed

16 files changed

+166
-77
lines changed

‎common/demo.scss

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,16 @@ text {
77

88
/* start--演示页面使用的统一样式--start */
99
.u-demo {
10-
padding: 50rpx 40rpx;
10+
padding: 25px 20px;
1111
}
1212

1313
.u-demo-wrap {
1414
border-width: 1px;
1515
border-color: #ddd;
1616
border-style: dashed;
1717
background-color: rgb(250, 250, 250);
18-
padding: 40rpx 20rpx;
19-
border-radius: 6px;
18+
padding: 20px 10px;
19+
border-radius: 3px;
2020
}
2121

2222
.u-demo-area {
@@ -25,19 +25,19 @@ text {
2525

2626
.u-no-demo-here {
2727
color: $u-tips-color;
28-
font-size: 26rpx;
28+
font-size: 13px;
2929
}
3030

3131
.u-demo-result-line {
3232
border-width: 1px;
3333
border-color: #ddd;
3434
border-style: dashed;
35-
padding: 10rpx 40rpx;
36-
margin-top: 30rpx;
35+
padding: 5px 20px;
36+
margin-top: 30px;
3737
border-radius: 5px;
3838
background-color: rgb(240, 240, 240);
3939
color: $u-content-color;
40-
font-size: 32rpx;
40+
font-size: 16px;
4141
/* #ifndef APP-NVUE */
4242
word-break: break-word;
4343
display: inline-block;
@@ -49,26 +49,26 @@ text {
4949
.u-demo-title,
5050
.u-config-title {
5151
text-align: center;
52-
font-size: 32rpx;
52+
font-size: 16px;
5353
font-weight: bold;
54-
margin-bottom: 40rpx;
54+
margin-bottom: 20px;
5555
}
5656

5757
.u-config-item {
58-
margin-top: 50rpx;
58+
margin-top: 25px;
5959
}
6060

6161
.u-config-title {
62-
margin-top: 40rpx;
63-
padding-bottom: 10rpx;
62+
margin-top: 20px;
63+
padding-bottom: 5px;
6464
}
6565

6666
.u-item-title {
6767
position: relative;
68-
font-size: 28rpx;
68+
font-size: 15px;
6969
padding-left: 8px;
7070
line-height: 1;
71-
margin-bottom: 22rpx;
71+
margin-bottom: 11px;
7272
}
7373

7474
.u-item-title:after {

‎components/page-nav/page-nav.vue

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,14 @@
4747

4848
<style lang="scss" scoped>
4949
.nav-wrap {
50-
padding: 30rpx;
50+
padding: 15px;
5151
position: relative;
5252
}
5353
5454
.lang {
5555
position: absolute;
56-
top: 30rpx;
57-
right: 30rpx;
56+
top: 15px;
57+
right: 15px;
5858
}
5959
6060
.nav-title {
@@ -66,33 +66,33 @@
6666
}
6767
6868
.nav-info {
69-
margin-left: 30rpx;
69+
margin-left: 15px;
7070
}
7171
7272
.nav-title__text {
7373
/* #ifndef APP-NVUE */
7474
display: flex;
7575
/* #endif */
7676
color: $u-main-color;
77-
font-size: 50rpx;
77+
font-size: 25px;
7878
font-weight: bold;
7979
}
8080
8181
.logo {
82-
width: 140rpx;
82+
width: 70px;
8383
/* #ifndef APP-NVUE */
8484
height: auto;
8585
/* #endif */
8686
}
8787
8888
.nav-slogan {
8989
color: $u-tips-color;
90-
font-size: 28rpx;
90+
font-size: 14px;
9191
}
9292
9393
.nav-desc {
94-
margin-top: 20rpx;
95-
font-size: 28rpx;
94+
margin-top: 10px;
95+
font-size: 14px;
9696
color: $u-content-color;
9797
}
9898
</style>

‎manifest.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name" : "uView",
33
"appid" : "__UNI__60F4B81",
44
"description" : "多平台快速开发的UI框架",
5-
"versionName" : "1.7.3",
5+
"versionName" : "1.7.4",
66
"versionCode" : "100",
77
"transformPx" : false,
88
"app-plus" : {

‎pages/componentsB/waterfall/index.vue

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -178,6 +178,7 @@ page {
178178
font-size: 30rpx;
179179
margin-top: 5px;
180180
color: $u-main-color;
181+
word-break: break-all;
181182
}
182183
183184
.demo-tag {

‎pages/componentsC/numberBox/index.vue

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<view class="u-demo-title">演示效果</view>
55
<view class="u-demo-area">
66
<u-number-box v-model="value" :bg-color="bgColor" :color="color" :min="0"
7-
:step="step" :disabled="disabled" @change="change"></u-number-box>
7+
:step="step" :disabled="disabled" @change="change" @focus="focus"></u-number-box>
88
</view>
99
</view>
1010
<view class="u-config-wrap">
@@ -64,6 +64,9 @@ export default {
6464
},
6565
change(e) {
6666
//console.log(e.value);
67+
},
68+
focus() {
69+
console.log('focus');
6770
}
6871
}
6972
};

‎uview-ui/components/u-dropdown-item/u-dropdown-item.vue

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
color: value == item.value ? activeColor : inactiveColor
1212
}">
1313
<u-icon v-if="value == item.value" name="checkbox-mark" :color="activeColor" size="32"></u-icon>
14-
</u-cell-item>；
14+
</u-cell-item>
1515
</u-cell-group>
1616
</view>
1717
</scroll-view>
@@ -62,7 +62,7 @@
6262
height: {
6363
type: [Number, String],
6464
default: 'auto'
65-
}
65+
},
6666
},
6767
data() {
6868
return {

‎uview-ui/components/u-dropdown/u-dropdown.vue

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<view class="u-dropdown__menu__item__arrow" :class="{
1515
'u-dropdown__menu__item__arrow--rotate': index === current
1616
}">
17-
<u-icon :custom-style="{display: 'flex'}" name="arrow-down" size="26" :color="index === current || highlightIndex == index ? activeColor : '#c0c4cc'"></u-icon>
17+
<u-icon :custom-style="{display: 'flex'}" :name="menuIcon" :size="$u.addUnit(menuIconSize)" :color="index === current || highlightIndex == index ? activeColor : '#c0c4cc'"></u-icon>
1818
</view>
1919
</view>
2020
</view>
@@ -98,6 +98,16 @@
9898
borderRadius: {
9999
type: [Number, String],
100100
default: 0
101+
},
102+
// 菜单右侧的icon图标
103+
menuIcon: {
104+
type: String,
105+
default: 'arrow-down'
106+
},
107+
// 菜单右侧图标的大小
108+
menuIconSize: {
109+
type: [Number, String],
110+
default: 26
101111
}
102112
},
103113
data() {

‎uview-ui/components/u-number-box/u-number-box.vue

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<u-icon name="minus" :size="size"></u-icon>
1010
</view>
1111
<input :disabled="disabledInput || disabled" :cursor-spacing="getCursorSpacing" :class="{ 'u-input-disabled': disabled }"
12-
v-model="inputVal" class="u-number-input" @blur="onBlur"
12+
v-model="inputVal" class="u-number-input" @blur="onBlur" @focus="onFocus"
1313
type="number" :style="{
1414
color: color,
1515
fontSize: size + 'rpx',
@@ -288,6 +288,10 @@
288288
})
289289
this.handleChange(val, 'blur');
290290
},
291+
// 输入框获得焦点事件
292+
onFocus() {
293+
this.$emit('focus');
294+
},
291295
handleChange(value, type) {
292296
if (this.disabled) return;
293297
// 清除定时器，避免造成混乱

‎uview-ui/components/u-parse/libs/CssHandler.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,10 @@ parser.prototype.Comment = function() {
5757
}
5858
parser.prototype.Ignore = function(c) {
5959
if (c == '{') this.floor++;
60-
else if (c == '}' && !--this.floor) this.state = this.Space;
60+
else if (c == '}' && !--this.floor) {
61+
this.list = [];
62+
this.state = this.Space;
63+
}
6164
}
6265
parser.prototype.Name = function(c) {
6366
if (cfg.blankChar[c]) {

0 commit comments

Comments
 (0)