Skip to content

Commit ef17602

Browse files
wlxuquwlxuqu
committed
1. 优化支付宝小程序上this.$slots.$default的判断性
2. 优化dropdown可能错位的问题
1 parent f22d21a commit ef17602

File tree

10 files changed

+12
-12
lines changed

10 files changed

+12
-12
lines changed

‎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.1",
5+
"versionName" : "1.7.2",
66
"versionCode" : "100",
77
"transformPx" : false,
88
"app-plus" : {

‎pages.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
// "current": 0, //当前激活的模式(list 的索引项)
77
// "list": [{
88
// "name": "test", //模式名称
9-
// "path": "pages/componentsB/dropdown/index", //启动页面，必选
9+
// "path": "pages/componentsC/button/index", //启动页面，必选
1010
// "query": "uuid=c4bba940-f69e-11ea-a419-6bafda9d095e&__id__=1" //启动参数，在页面的onLoad函数里面得到
1111
// }]
1212
// },

‎uview-ui/components/u-back-top/u-back-top.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
zIndex: uZIndex,
77
opacity: opacity
88
}, customStyle]">
9-
<view class="u-back-top__content" v-if="!$slots.default">
9+
<view class="u-back-top__content" v-if="!$slots.default && !$slots.$default">
1010
<u-icon @click="backToTop" :name="icon" :custom-style="iconStyle"></u-icon>
1111
<view class="u-back-top__content__tips">
1212
{{tips}}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<template>
22
<view class="u-dropdown-item" v-if="active" @touchmove.stop.prevent="() => {}" @tap.stop.prevent="() => {}">
3-
<block v-if="!$slots.default">
3+
<block v-if="!$slots.default && !$slots.$default">
44
<scroll-view scroll-y="true" :style="{
55
height: $u.addUnit(height)
66
}">

‎uview-ui/components/u-line-progress/u-line-progress.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
striped ? 'u-striped' : '',
1010
striped && stripedActive ? 'u-striped-active' : ''
1111
]" class="u-active" :style="[progressStyle]">
12-
<slot v-if="$slots.default" />
12+
<slot v-if="$slots.default || $slots.$default" />
1313
<block v-else-if="showPercent">
1414
{{percent + '%'}}
1515
</block>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<view class="u-model">
66
<view v-if="showTitle" class="u-model__title u-line-1" :style="[titleStyle]">{{ title }}</view>
77
<view class="u-model__content">
8-
<view :style="[contentStyle]" v-if="$slots.default">
8+
<view :style="[contentStyle]" v-if="$slots.default || $slots.$default">
99
<slot />
1010
</view>
1111
<view v-else class="u-model__content__message" :style="[contentStyle]">{{ content }}</view>

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<view class="u-slider__button-wrap" @touchstart="onTouchStart"
1616
@touchmove="onTouchMove" @touchend="onTouchEnd"
1717
@touchcancel="onTouchEnd">
18-
<slot v-if="$slots.default"/>
18+
<slot v-if="$slots.default || $slots.$default"/>
1919
<view v-else class="u-slider__button" :style="[blockStyle, {
2020
height: blockWidth + 'rpx',
2121
width: blockWidth + 'rpx',

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -120,9 +120,9 @@
120120
},
121121
data() {
122122
return {
123-
// 由于安卓太菜了，通过css居中凸起按钮的外层元素有误差，故通过js计算将其其中
123+
// 由于安卓太菜了，通过css居中凸起按钮的外层元素有误差，故通过js计算将其居中
124124
midButtonLeft: '50%',
125-
pageUrl: '', // 当前
125+
pageUrl: '', // 当前页面URL
126126
}
127127
},
128128
created() {

‎uview-ui/libs/config/config.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
// 此版本发布于2020-09-17
2-
let version = '1.7.1';
1+
// 此版本发布于2020-09-21
2+
let version = '1.7.2';
33

44
export default {
55
v: version,

‎uview-ui/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "uview-ui",
3-
"version": "1.7.1",
3+
"version": "1.7.2",
44
"description": "uView UI，是uni-app生态优秀的UI框架，全面的组件和便捷的工具会让您信手拈来，如鱼得水",
55
"main": "index.js",
66
"keywords": ["uview", "uView", "uni-app", "uni-app ui", "uniapp", "uviewui", "uview ui", "uviewUI", "uViewui", "uViewUI", "uView UI", "uni ui", "uni UI", "uniapp ui", "ui", "UI框架", "uniapp ui框架", "uniapp UI"],

0 commit comments

Comments
 (0)