diff --git a/App.vue b/App.vue index 068cde4a..8dd912a3 100644 --- a/App.vue +++ b/App.vue @@ -16,5 +16,4 @@ \ No newline at end of file diff --git a/manifest.json b/manifest.json index 3696ed7a..10063f76 100644 --- a/manifest.json +++ b/manifest.json @@ -2,7 +2,7 @@ "name" : "uView", "appid" : "__UNI__60F4B81", "description" : "多平台快速开发的UI框架", - "versionName" : "1.7.4", + "versionName" : "1.7.8", "versionCode" : "100", "transformPx" : false, "app-plus" : { diff --git a/pages/componentsC/layout/index.vue b/pages/componentsC/layout/index.vue index 8dde7daf..8d05468d 100644 --- a/pages/componentsC/layout/index.vue +++ b/pages/componentsC/layout/index.vue @@ -3,8 +3,8 @@ 演示效果 - - + + @@ -54,6 +54,12 @@ } }, methods: { + click() { + console.log('col click'); + }, + rowClick() { + console.log('row click'); + }, spanChange(e) { switch (e) { case 0: diff --git a/uview-ui/components/u-avatar/u-avatar.vue b/uview-ui/components/u-avatar/u-avatar.vue index f92d318d..289b9b02 100644 --- a/uview-ui/components/u-avatar/u-avatar.vue +++ b/uview-ui/components/u-avatar/u-avatar.vue @@ -134,7 +134,7 @@ }, computed: { wrapStyle() { - let style = {}; + let style = {}; style.height = this.size == 'large' ? '120rpx' : this.size == 'default' ? '90rpx' : this.size == 'mini' ? '70rpx' : this.size + 'rpx'; style.width = style.height; diff --git a/uview-ui/components/u-col/u-col.vue b/uview-ui/components/u-col/u-col.vue index 82ecff98..3b6cc64e 100644 --- a/uview-ui/components/u-col/u-col.vue +++ b/uview-ui/components/u-col/u-col.vue @@ -9,7 +9,7 @@ justifyContent: uJustify, textAlign: textAlign }" - @tap.stop.prevent="click"> + @tap="click"> @@ -51,6 +51,11 @@ textAlign: { type: String, default: 'left' + }, + // 是否阻止事件传播 + stop: { + type: Boolean, + default: true } }, data() { @@ -81,7 +86,7 @@ } }, methods: { - click() { + click(e) { this.$emit('click'); } } diff --git a/uview-ui/components/u-grid-item/u-grid-item.vue b/uview-ui/components/u-grid-item/u-grid-item.vue index 3ab3fc84..0773307c 100644 --- a/uview-ui/components/u-grid-item/u-grid-item.vue +++ b/uview-ui/components/u-grid-item/u-grid-item.vue @@ -4,7 +4,7 @@ background: bgColor, width: width, }"> - + diff --git a/uview-ui/components/u-navbar/u-navbar.vue b/uview-ui/components/u-navbar/u-navbar.vue index 66be1fea..450242e9 100644 --- a/uview-ui/components/u-navbar/u-navbar.vue +++ b/uview-ui/components/u-navbar/u-navbar.vue @@ -14,7 +14,8 @@ class="u-title u-line-1" :style="{ color: titleColor, - fontSize: titleSize + 'rpx' + fontSize: titleSize + 'rpx', + fontWeight: titleBold ? 'bold' : 'normal' }"> {{ title }} @@ -115,6 +116,11 @@ type: String, default: '#606266' }, + // 标题字体是否加粗 + titleBold: { + type: Boolean, + default: false + }, // 标题的字体大小 titleSize: { type: [String, Number], diff --git a/uview-ui/components/u-parse/libs/MpHtmlParser.js b/uview-ui/components/u-parse/libs/MpHtmlParser.js index cb59bc51..aeb0fc38 100644 --- 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 20201014 + * @version 20201029 * @author JinYufeng * @listens MIT */ diff --git a/uview-ui/components/u-parse/libs/trees.vue b/uview-ui/components/u-parse/libs/trees.vue index 3a9c22a4..2b248206 100644 --- a/uview-ui/components/u-parse/libs/trees.vue +++ b/uview-ui/components/u-parse/libs/trees.vue @@ -2,7 +2,7 @@ - + + :class="'_video '+(n.attrs.class||'')" :style="n.attrs.style" :data-i="i" @tap.stop="_loadVideo" />