Merge branch 'yiruiwen'

Author: wlxuqu

common/demo.scss

@@ -7,16 +7,16 @@ text {
 
 /* start--演示页面使用的统一样式--start */
 .u-demo {
-	padding: 50rpx 40rpx;
+	padding: 25px 20px;
 }
 
 .u-demo-wrap {
 	border-width: 1px;
 	border-color: #ddd;
 	border-style: dashed;
 	background-color: rgb(250, 250, 250);
-	padding: 40rpx 20rpx;
-	border-radius: 6px;
+	padding: 20px 10px;
+	border-radius: 3px;
 }
 
 .u-demo-area {
@@ -25,19 +25,19 @@ text {
 
 .u-no-demo-here {
 	color: $u-tips-color;
-	font-size: 26rpx;
+	font-size: 13px;
 }
 
 .u-demo-result-line {
 	border-width: 1px;
 	border-color: #ddd;
 	border-style: dashed;
-	padding: 10rpx 40rpx;
-	margin-top: 30rpx;
+	padding: 5px 20px;
+	margin-top: 30px;
 	border-radius: 5px;
 	background-color: rgb(240, 240, 240);
 	color: $u-content-color;
-	font-size: 32rpx;
+	font-size: 16px;
 	/* #ifndef APP-NVUE */
 	word-break: break-word;
 	display: inline-block;
@@ -49,26 +49,26 @@ text {
 .u-demo-title,
 .u-config-title {
 	text-align: center;
-	font-size: 32rpx;
+	font-size: 16px;
 	font-weight: bold;
-	margin-bottom: 40rpx;
+	margin-bottom: 20px;
 }
 
 .u-config-item {
-	margin-top: 50rpx;
+	margin-top: 25px;
 }
 
 .u-config-title {
-	margin-top: 40rpx;
-	padding-bottom: 10rpx;
+	margin-top: 20px;
+	padding-bottom: 5px;
 }
 
 .u-item-title {
 	position: relative;
-	font-size: 28rpx;
+	font-size: 15px;
 	padding-left: 8px;
 	line-height: 1;
-	margin-bottom: 22rpx;
+	margin-bottom: 11px;
 }
 
 .u-item-title:after {

components/page-nav/page-nav.vue

@@ -47,14 +47,14 @@
 
 <style lang="scss" scoped>
 	.nav-wrap {
-		padding: 30rpx;
+		padding: 15px;
 		position: relative;
 	}
 	
 	.lang {
 		position: absolute;
-		top: 30rpx;
-		right: 30rpx;
+		top: 15px;
+		right: 15px;
 	}
 	
 	.nav-title {
@@ -66,33 +66,33 @@
 	}
 	
 	.nav-info {
-		margin-left: 30rpx;
+		margin-left: 15px;
 	}
 	
 	.nav-title__text {
 		/* #ifndef APP-NVUE */
 		display: flex;
 		/* #endif */
 		color: $u-main-color;
-		font-size: 50rpx;
+		font-size: 25px;
 		font-weight: bold;
 	}
 	
 	.logo {
-		width: 140rpx;
+		width: 70px;
 		/* #ifndef APP-NVUE */
 		height: auto;
 		/* #endif */
 	}
 	
 	.nav-slogan {
 		color: $u-tips-color;
-		font-size: 28rpx;
+		font-size: 14px;
 	}
 	
 	.nav-desc {
-		margin-top: 20rpx;
-		font-size: 28rpx;
+		margin-top: 10px;
+		font-size: 14px;
 		color: $u-content-color;
 	}
 </style>

manifest.json

@@ -2,7 +2,7 @@
     "name" : "uView",
     "appid" : "__UNI__60F4B81",
     "description" : "多平台快速开发的UI框架",
-    "versionName" : "1.7.3",
+    "versionName" : "1.7.4",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {

pages/componentsB/waterfall/index.vue

@@ -178,6 +178,7 @@ page {
 	font-size: 30rpx;
 	margin-top: 5px;
 	color: $u-main-color;
+	word-break: break-all;
 }
 
 .demo-tag {

pages/componentsC/numberBox/index.vue

@@ -4,7 +4,7 @@
 			<view class="u-demo-title">演示效果</view>
 			<view class="u-demo-area">
 				<u-number-box v-model="value" :bg-color="bgColor" :color="color" :min="0"
-				:step="step" :disabled="disabled" @change="change"></u-number-box>
+				:step="step" :disabled="disabled" @change="change" @focus="focus"></u-number-box>
 			</view>
 		</view>
 		<view class="u-config-wrap">
@@ -64,6 +64,9 @@ export default {
 		},
 		change(e) {
 			//console.log(e.value);
+		},
+		focus() {
+			console.log('focus');
 		}
 	}
 };

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

@@ -11,7 +11,7 @@
 							color: value == item.value ? activeColor : inactiveColor
 						}">
 							<u-icon v-if="value == item.value" name="checkbox-mark" :color="activeColor" size="32"></u-icon>
-						</u-cell-item>；
+						</u-cell-item>
 					</u-cell-group>
 				</view>
 			</scroll-view>
@@ -62,7 +62,7 @@
 			height: {
 				type: [Number, String],
 				default: 'auto'
-			}
+			},
 		},
 		data() {
 			return {

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

@@ -14,7 +14,7 @@
 					<view class="u-dropdown__menu__item__arrow" :class="{
 						'u-dropdown__menu__item__arrow--rotate': index === current
 					}">
-						<u-icon :custom-style="{display: 'flex'}" name="arrow-down" size="26" :color="index === current || highlightIndex == index ? activeColor : '#c0c4cc'"></u-icon>
+						<u-icon :custom-style="{display: 'flex'}" :name="menuIcon" :size="$u.addUnit(menuIconSize)" :color="index === current || highlightIndex == index ? activeColor : '#c0c4cc'"></u-icon>
 					</view>
 				</view>
 			</view>
@@ -98,6 +98,16 @@
 			borderRadius: {
 				type: [Number, String],
 				default: 0
+			},
+			// 菜单右侧的icon图标
+			menuIcon: {
+				type: String,
+				default: 'arrow-down'
+			},
+			// 菜单右侧图标的大小
+			menuIconSize: {
+				type: [Number, String],
+				default: 26
 			}
 		},
 		data() {

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

@@ -9,7 +9,7 @@
 			<u-icon name="minus" :size="size"></u-icon>
 		</view>
 		<input :disabled="disabledInput || disabled" :cursor-spacing="getCursorSpacing" :class="{ 'u-input-disabled': disabled }"
-		    v-model="inputVal" class="u-number-input" @blur="onBlur"
+		    v-model="inputVal" class="u-number-input" @blur="onBlur" @focus="onFocus"
 		    type="number" :style="{
 				color: color,
 				fontSize: size + 'rpx',
@@ -288,6 +288,10 @@
 				})
 				this.handleChange(val, 'blur');
 			},
+			// 输入框获得焦点事件
+			onFocus() {
+				this.$emit('focus');
+			},
 			handleChange(value, type) {
 				if (this.disabled) return;
 				// 清除定时器，避免造成混乱

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

@@ -57,7 +57,10 @@ parser.prototype.Comment = function() {
 }
 parser.prototype.Ignore = function(c) {
 	if (c == '{') this.floor++;
-	else if (c == '}' && !--this.floor) this.state = this.Space;
+	else if (c == '}' && !--this.floor) {
+		this.list = [];
+		this.state = this.Space;
+	}
 }
 parser.prototype.Name = function(c) {
 	if (cfg.blankChar[c]) {