1. 新增man，woman，level三个图标，修复某些图标缺失的问题

2. 修复section组件showLine参数无法隐藏左边竖条的问题
umicro · Jul 30, 2020 · 582557e · 582557e
1 parent bb453ec
commit 582557e
Show file tree

Hide file tree

Showing 17 changed files with 353 additions and 354 deletions.
diff --git a/manifest.json b/manifest.json
@@ -2,7 +2,7 @@
     "name" : "uView",
     "appid" : "__UNI__60F4B81",
     "description" : "多平台快速开发的UI框架",
-    "versionName" : "1.5.6",
+    "versionName" : "1.5.7",
     "versionCode" : "100",
     "transformPx" : false,
     "app-plus" : {
@@ -107,7 +107,7 @@
     },
     "mp-alipay" : {
         "usingComponents" : true,
-		"component2": true
+        "component2" : true
     },
     "mp-baidu" : {
         "usingComponents" : true,

diff --git a/pages/componentsA/icon/index.vue b/pages/componentsA/icon/index.vue
@@ -14,6 +14,15 @@
 		data() {
 			return {
 				iconList: [
+					{
+						name: 'level'
+					},
+					{
+						name: 'woman'
+					},
+					{
+						name: 'man'
+					},
 					{
 						name: 'arrow-left-double'
 					},

diff --git a/pages/componentsC/section/index.vue b/pages/componentsC/section/index.vue
@@ -3,7 +3,7 @@
 		<view class="u-demo-wrap">
 			<view class="u-demo-title">演示效果</view>
 			<view class="u-demo-area">
-				<u-section :title="title" :right="right" :bold="bold" :color="color"></u-section>
+				<u-section :title="title" :right="right" :bold="bold" :color="color" :show-line="false"></u-section>
 			</view>
 		</view>
 		<view class="u-config-wrap">

diff --git a/uview-ui/components/u-icon/u-icon.vue b/uview-ui/components/u-icon/u-icon.vue
@@ -168,7 +168,7 @@ export default {
 				fontSize: this.size == 'inherit' ? 'inherit' : this.$u.addUnit(this.size),
 				fontWeight: this.bold ? 'bold' : 'normal',
 				// 安卓和iOS各需要设置一个到顶部的距离，才能更好的垂直居中
-				top: this.top === '' ? (this.$u.os == 'ios' ? '2rpx' : '4rpx') : 0
+				top: this.top === '' ? (this.$u.os == 'ios' ? '2rpx' : '4rpx') : this.$u.addUnit(this.top)
 			};
 			// 非主题色值时，才当作颜色值
 			if (this.color && !this.$u.config.type.includes(this.color)) style.color = this.color;

diff --git a/uview-ui/components/u-input/u-input.vue b/uview-ui/components/u-input/u-input.vue
@@ -71,32 +71,32 @@
 <script>
 import Emitter from '../../libs/util/emitter.js';
 
-	/**
-	 * input 输入框
-	 * @description 此组件为一个输入框，默认没有边框和样式，是专门为配合表单组件u-form而设计的，利用它可以快速实现表单验证，输入内容，下拉选择等功能。
-	 * @tutorial http://uviewui.com/components/input.html
-	 * @property {String} type 模式选择，见官网说明
-	 * @property {Boolean} clearable 是否显示右侧的清除图标(默认true)
-	 * @property {} v-model 用于双向绑定输入框的值
-	 * @property {String} input-align 输入框文字的对齐方式(默认left)
-	 * @property {String} placeholder placeholder显示值(默认 '请输入内容')
-	 * @property {Boolean} disabled 是否禁用输入框(默认false)
-	 * @property {String Number} maxlength 输入框的最大可输入长度(默认140)
-	 * @property {String Number} selection-start 光标起始位置，自动聚焦时有效，需与selection-end搭配使用（默认-1）
-	 * @property {String Number} maxlength 光标结束位置，自动聚焦时有效，需与selection-start搭配使用（默认-1）
-	 * @property {String Number} cursor-spacing 指定光标与键盘的距离，单位px(默认0)
-	 * @property {String} placeholderStyle placeholder的样式，字符串形式，如"color: red;"(默认 "color: #c0c4cc;")
-	 * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type为text时生效(默认done)
-	 * @property {Object} custom-style 自定义输入框的样式，对象形式
-	 * @property {Boolean} focus 是否自动获得焦点(默认false)
-	 * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true(默认false)
-	 * @property {Boolean} password-icon type为password时，是否显示右侧的密码查看图标(默认true)
-	 * @property {Boolean} border 是否显示边框(默认false)
-	 * @property {String} border-color 输入框的边框颜色(默认#dcdfe6)
-	 * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效(默认true)
-	 * @property {String Number} height 高度，单位rpx(text类型时为70，textarea时为100)
-	 * @example <u-input v-model="value" :type="type" :border="border" />
-	 */
+/**
+ * input 输入框
+ * @description 此组件为一个输入框，默认没有边框和样式，是专门为配合表单组件u-form而设计的，利用它可以快速实现表单验证，输入内容，下拉选择等功能。
+ * @tutorial http://uviewui.com/components/input.html
+ * @property {String} type 模式选择，见官网说明
+ * @property {Boolean} clearable 是否显示右侧的清除图标(默认true)
+ * @property {} v-model 用于双向绑定输入框的值
+ * @property {String} input-align 输入框文字的对齐方式(默认left)
+ * @property {String} placeholder placeholder显示值(默认 '请输入内容')
+ * @property {Boolean} disabled 是否禁用输入框(默认false)
+ * @property {String Number} maxlength 输入框的最大可输入长度(默认140)
+ * @property {String Number} selection-start 光标起始位置，自动聚焦时有效，需与selection-end搭配使用（默认-1）
+ * @property {String Number} maxlength 光标结束位置，自动聚焦时有效，需与selection-start搭配使用（默认-1）
+ * @property {String Number} cursor-spacing 指定光标与键盘的距离，单位px(默认0)
+ * @property {String} placeholderStyle placeholder的样式，字符串形式，如"color: red;"(默认 "color: #c0c4cc;")
+ * @property {String} confirm-type 设置键盘右下角按钮的文字，仅在type为text时生效(默认done)
+ * @property {Object} custom-style 自定义输入框的样式，对象形式
+ * @property {Boolean} focus 是否自动获得焦点(默认false)
+ * @property {Boolean} fixed 如果type为textarea，且在一个"position:fixed"的区域，需要指明为true(默认false)
+ * @property {Boolean} password-icon type为password时，是否显示右侧的密码查看图标(默认true)
+ * @property {Boolean} border 是否显示边框(默认false)
+ * @property {String} border-color 输入框的边框颜色(默认#dcdfe6)
+ * @property {Boolean} auto-height 是否自动增高输入区域，type为textarea时有效(默认true)
+ * @property {String Number} height 高度，单位rpx(text类型时为70，textarea时为100)
+ * @example <u-input v-model="value" :type="type" :border="border" />
+ */
 export default {
 	name: 'u-input',
 	mixins: [Emitter],

diff --git a/uview-ui/components/u-parse/libs/MpHtmlParser.js b/uview-ui/components/u-parse/libs/MpHtmlParser.js
@@ -1,7 +1,7 @@
 /**
  * html 解析器
  * @tutorial https://github.com/jin-yufeng/Parser
- * @version 20200719
+ * @version 20200728
  * @author JinYufeng
  * @listens MIT
  */
@@ -102,9 +102,16 @@ MpHtmlParser.prototype.setText = function() {
 	}
 	if (!this.pre) {
 		// 合并空白符
-		var tmp = [];
+		var flag, tmp = [];
 		for (let i = text.length, c; c = text[--i];)
-			if (!blankChar[c] || (!blankChar[tmp[0]] && (c = ' '))) tmp.unshift(c);
+			if (!blankChar[c]) {
+				tmp.unshift(c);
+				if (!flag) flag = 1;
+			} else {
+				if (tmp[0] != ' ') tmp.unshift(' ');
+				if (c == '\n' && flag == void 0) flag = 0;
+			}
+		if (flag == 0) return;
 		text = tmp.join('');
 	}
 	this.siblings().push({
@@ -119,6 +126,7 @@ MpHtmlParser.prototype.setNode = function() {
 			attrs: this.attrs
 		},
 		close = cfg.selfClosingTags[node.name];
+	if (this.options.nodes.length) node.type = 'node';
 	this.attrs = {};
 	if (!cfg.ignoreTags[node.name]) {
 		// 处理属性
@@ -189,6 +197,7 @@ MpHtmlParser.prototype.setNode = function() {
 						attrs.height = void 0;
 					}
 				}
+				if (!attrs.controls && !attrs.autoplay) attrs.controls = 'T';
 				attrs.source = [];
 				if (attrs.src) {
 					attrs.source.push(attrs.src);
@@ -217,8 +226,7 @@ MpHtmlParser.prototype.setNode = function() {
 			if (info.length < 2) continue;
 			let key = info[0].trim().toLowerCase(),
 				value = info.slice(1).join(':').trim();
-			if (value.includes('-webkit') || value.includes('-moz') || value.includes('-ms') || value.includes('-o') || value.includes(
-					'safe'))
+			if (value[0] == '-' || value.includes('safe'))
 				style += `;${key}:${value}`;
 			else if (!styleObj[key] || value.includes('import') || !styleObj[key].includes('import'))
 				styleObj[key] = value;
@@ -359,13 +367,6 @@ MpHtmlParser.prototype.popNode = function(node) {
 	// 替换一些标签名
 	if (cfg.blockTags[node.name]) node.name = 'div';
 	else if (!cfg.trustTags[node.name]) node.name = 'span';
-	// 去除块标签前后空串
-	if (node.name == 'div' || node.name == 'p' || node.name[0] == 't') {
-		if (len > 1 && siblings[len - 2].text == ' ')
-			siblings.splice(--len - 1, 1);
-		if (childs.length && childs[childs.length - 1].text == ' ')
-			childs.pop();
-	}
 	// 处理列表
 	if (node.c && (node.name == 'ul' || node.name == 'ol')) {
 		if ((node.attrs.style || '').includes('list-style:none')) {

diff --git a/uview-ui/components/u-parse/libs/config.js b/uview-ui/components/u-parse/libs/config.js
@@ -1,8 +1,5 @@
 /* 配置文件 */
-// #ifdef MP-WEIXIN
-const canIUse = wx.canIUse('editor'); // 高基础库标识，用于兼容
-// #endif
-module.exports = {
+var cfg = {
 	// 出错占位图
 	errorImg: null,
 	// 过滤器函数
@@ -32,41 +29,15 @@ module.exports = {
 	blankChar: makeMap(' ,\xA0,\t,\r,\n,\f'),
 	boolAttrs: makeMap('allowfullscreen,autoplay,autostart,controls,ignore,loop,muted'),
 	// 块级标签，将被转为 div
-	blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,section' + (
-		// #ifdef MP-WEIXIN
-		canIUse ? '' :
-		// #endif
-		',pre')),
+	blockTags: makeMap('address,article,aside,body,caption,center,cite,footer,header,html,nav,pre,section'),
 	// 将被移除的标签
-	ignoreTags: makeMap(
-		'area,base,canvas,frame,input,link,map,meta,param,script,source,style,svg,textarea,title,track,wbr'
-		// #ifdef MP-WEIXIN
-		+ (canIUse ? ',rp' : '')
-		// #endif
-		// #ifndef APP-PLUS
-		+ ',iframe'
-		// #endif
-	),
+	ignoreTags: makeMap('area,base,canvas,frame,iframe,input,link,map,meta,param,script,source,style,svg,textarea,title,track,wbr'),
 	// 只能被 rich-text 显示的标签
-	richOnlyTags: makeMap('a,colgroup,fieldset,legend,table'
-		// #ifdef MP-WEIXIN
-		+ (canIUse ? ',bdi,bdo,caption,rt,ruby' : '')
-		// #endif
-	),
+	richOnlyTags: makeMap('a,colgroup,fieldset,legend,table'),
 	// 自闭合的标签
-	selfClosingTags: makeMap(
-		'area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'
-	),
+	selfClosingTags: makeMap('area,base,br,col,circle,ellipse,embed,frame,hr,img,input,line,link,meta,param,path,polygon,rect,source,track,use,wbr'),
 	// 信任的标签
-	trustTags: makeMap(
-		'a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video'
-		// #ifdef MP-WEIXIN
-		+ (canIUse ? ',bdi,bdo,caption,pre,rt,ruby' : '')
-		// #endif
-		// #ifdef APP-PLUS
-		+ ',embed,iframe'
-		// #endif
-	),
+	trustTags: makeMap('a,abbr,ad,audio,b,blockquote,br,code,col,colgroup,dd,del,dl,dt,div,em,fieldset,h1,h2,h3,h4,h5,h6,hr,i,img,ins,label,legend,li,ol,p,q,source,span,strong,sub,sup,table,tbody,td,tfoot,th,thead,tr,title,ul,video'),
 	// 默认的标签样式
 	userAgentStyles: {
 		address: 'font-style:italic',
@@ -91,3 +62,19 @@ function makeMap(str) {
 		map[list[i]] = true;
 	return map;
 }
+
+// #ifdef MP-WEIXIN
+if (wx.canIUse('editor')) {
+	cfg.blockTags.pre = void 0;
+	cfg.ignoreTags.rp = true;
+	Object.assign(cfg.richOnlyTags, makeMap('bdi,bdo,caption,rt,ruby'));
+	Object.assign(cfg.trustTags, makeMap('bdi,bdo,caption,pre,rt,ruby'));
+}
+// #endif
+
+// #ifdef APP-PLUS
+cfg.ignoreTags.iframe = void 0;
+Object.assign(cfg.trustTags, makeMap('embed,iframe'));
+// #endif
+
+module.exports = cfg;
diff --git a/uview-ui/components/u-parse/libs/trees.vue b/uview-ui/components/u-parse/libs/trees.vue
@@ -3,8 +3,8 @@
 		<block v-for="(n, i) in nodes" v-bind:key="i">
 			<!--图片-->
 			<view v-if="n.name=='img'" :class="'_img '+n.attrs.class" :style="n.attrs.style" :data-attrs="n.attrs" @tap="imgtap">
-				<rich-text v-if="controls[i]!=0" :nodes="[{attrs:{src:loading&&(controls[i]||0)<2?loading:(lazyLoad&&!controls[i]?placeholder:(controls[i]==3?errorImg:n.attrs.src||'')),alt:n.attrs.alt||'',width:n.attrs.width||'',style:'-webkit-touch-callout:none;max-width:100%;display:block'+(n.attrs.height?';height:'+n.attrs.height:'')},name:'img'}]" />
-				<image class="_image" :src="lazyLoad&&!controls[i]?placeholder:n.attrs.src" :lazy-load="lazyLoad"
+				<rich-text v-if="ctrl[i]!=0" :nodes="[{attrs:{src:loading&&(ctrl[i]||0)<2?loading:(lazyLoad&&!ctrl[i]?placeholder:(ctrl[i]==3?errorImg:n.attrs.src||'')),alt:n.attrs.alt||'',width:n.attrs.width||'',style:'-webkit-touch-callout:none;max-width:100%;display:block'+(n.attrs.height?';height:'+n.attrs.height:'')},name:'img'}]" />
+				<image class="_image" :src="lazyLoad&&!ctrl[i]?placeholder:n.attrs.src" :lazy-load="lazyLoad"
 				 :show-menu-by-longpress="!n.attrs.ignore" :data-i="i" :data-index="n.attrs.i" data-source="img" @load="loadImg"
 				 @error="error" />
 			</view>
@@ -14,15 +14,15 @@
 			<text v-else-if="n.name=='br'">\n</text>
 			<!--#endif-->
 			<!--视频-->
-			<view v-else-if="((n.lazyLoad&&!n.attrs.autoplay)||(n.name=='video'&&!loadVideo))&&controls[i]==undefined" :id="n.attrs.id" :class="'_video '+(n.attrs.class||'')"
+			<view v-else-if="((n.lazyLoad&&!n.attrs.autoplay)||(n.name=='video'&&!loadVideo))&&ctrl[i]==undefined" :id="n.attrs.id" :class="'_video '+(n.attrs.class||'')"
 			 :style="n.attrs.style" :data-i="i" @tap="_loadVideo" />
-			<video v-else-if="n.name=='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay||controls[i]==0"
-			 :controls="!n.attrs.autoplay||n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :poster="n.attrs.poster" :src="n.attrs.source[controls[i]||0]"
+			<video v-else-if="n.name=='video'" :id="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :autoplay="n.attrs.autoplay||ctrl[i]==0"
+			 :controls="n.attrs.controls" :loop="n.attrs.loop" :muted="n.attrs.muted" :poster="n.attrs.poster" :src="n.attrs.source[ctrl[i]||0]"
 			 :unit-id="n.attrs['unit-id']" :data-id="n.attrs.id" :data-i="i" data-source="video" @error="error" @play="play" />
 			<!--音频-->
 			<audio v-else-if="n.name=='audio'" :ref="n.attrs.id" :class="n.attrs.class" :style="n.attrs.style" :author="n.attrs.author"
-			 :autoplay="n.attrs.autoplay" :controls="!n.attrs.autoplay||n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster"
-			 :src="n.attrs.source[controls[i]||0]" :data-i="i" :data-id="n.attrs.id" data-source="audio"
+			 :autoplay="n.attrs.autoplay" :controls="n.attrs.controls" :loop="n.attrs.loop" :name="n.attrs.name" :poster="n.attrs.poster"
+			 :src="n.attrs.source[ctrl[i]||0]" :data-i="i" :data-id="n.attrs.id" data-source="audio"
 			 @error.native="error" @play.native="play" />
 			<!--链接-->
 			<view v-else-if="n.name=='a'" :id="n.attrs.id" :class="'_a '+(n.attrs.class||'')" hover-class="_hover" :style="n.attrs.style"
@@ -32,7 +32,7 @@
 			<!--广告-->
 			<!--<ad v-else-if="n.name=='ad'" :class="n.attrs.class" :style="n.attrs.style" :unit-id="n.attrs['unit-id']" :appid="n.attrs.appid" :apid="n.attrs.apid" :type="n.attrs.type" :adpid="n.attrs.adpid" data-source="ad" @error="error" />-->
 			<!--列表-->
-			<view v-else-if="n.name=='li'" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:flex'">
+			<view v-else-if="n.name=='li'" :id="n.attrs.id" :class="n.attrs.class" :style="(n.attrs.style||'')+';display:flex;flex-direction:row'">
 				<view v-if="n.type=='ol'" class="_ol-bef">{{n.num}}</view>
 				<view v-else class="_ul-bef">
 					<view v-if="n.floor%3==0" class="_ul-p1">█</view>
@@ -80,7 +80,7 @@
 		name: 'trees',
 		data() {
 			return {
-				controls: [],
+				ctrl: [],
 				placeholder: 'data:image/svg+xml;utf8,<svg xmlns="http://www.w3.org/2000/svg" width="300" height="225"/>',
 				errorImg,
 				loadVideo: typeof plus == 'undefined',
@@ -124,7 +124,7 @@
 									if (res.intersectionRatio) {
 										for (var j = this.nodes.length; j--;)
 											if (this.nodes[j].name == 'img')
-												this.$set(this.controls, j, 1);
+												this.$set(this.ctrl, j, 1);
 										this.observer.disconnect();
 									}
 								})
@@ -184,23 +184,23 @@
 			},
 			loadImg(e) {
 				var i = e.currentTarget.dataset.i;
-				if (this.lazyLoad && !this.controls[i]) {
+				if (this.lazyLoad && !this.ctrl[i]) {
 					// #ifdef QUICKAPP-WEBVIEW
-					this.$set(this.controls, i, 0);
+					this.$set(this.ctrl, i, 0);
 					this.$nextTick(function() {
 						// #endif
 						// #ifndef APP-PLUS
-						this.$set(this.controls, i, 1);
+						this.$set(this.ctrl, i, 1);
 						// #endif
 						// #ifdef QUICKAPP-WEBVIEW
 					})
 					// #endif
-				} else if (this.loading && this.controls[i] != 2) {
+				} else if (this.loading && this.ctrl[i] != 2) {
 					// #ifdef QUICKAPP-WEBVIEW
-					this.$set(this.controls, i, 0);
+					this.$set(this.ctrl, i, 0);
 					this.$nextTick(function() {
 						// #endif
-						this.$set(this.controls, i, 2);
+						this.$set(this.ctrl, i, 2);
 						// #ifdef QUICKAPP-WEBVIEW
 					})
 					// #endif
@@ -258,14 +258,14 @@
 					i = target.dataset.i;
 				if (source == 'video' || source == 'audio') {
 					// 加载其他 source
-					var index = this.controls[i] ? this.controls[i].i + 1 : 1;
+					var index = this.ctrl[i] ? this.ctrl[i].i + 1 : 1;
 					if (index < this.nodes[i].attrs.source.length)
-						this.$set(this.controls, i, index);
+						this.$set(this.ctrl, i, index);
 					if (e.detail.__args__)
 						e.detail = e.detail.__args__[0];
 				} else if (errorImg && source == 'img') {
 					this.top.imgList.setItem(target.dataset.index, errorImg);
-					this.$set(this.controls, i, 3);
+					this.$set(this.ctrl, i, 3);
 				}
 				this.top && this.top.$emit('error', {
 					source,
@@ -274,7 +274,7 @@
 				});
 			},
 			_loadVideo(e) {
-				this.$set(this.controls, e.target.dataset.i, 0);
+				this.$set(this.ctrl, e.target.dataset.i, 0);
 			}
 		}
 	}
@@ -407,12 +407,13 @@
 	}
 
 	._ul-bef {
+		display: block;
 		margin: 0 12px 0 23px;
 		line-height: normal;
 	}
 
 	._ol-bef,
-	._ul_bef {
+	._ul-bef {
 		flex: none;
 		user-select: none;
 	}

diff --git a/uview-ui/components/u-parse/u-parse.vue b/uview-ui/components/u-parse/u-parse.vue
@@ -63,7 +63,7 @@
 	 * @event {Function} imgtap 图片点击事件
 	 * @event {Function} linkpress 链接点击事件
 	 * @author JinYufeng
-	 * @version 20200719
+	 * @version 20200728
 	 * @listens MIT
 	 */
 	export default {