提交 df0c9bfd 编写于 作者: 雪洛's avatar 雪洛

fix: 修复scroll-view子元素使用百分比尺寸时大小不正确的Bug

上级 40e34e6c
...@@ -9,7 +9,10 @@ ...@@ -9,7 +9,10 @@
:style="{'overflow-x': scrollX?'auto':'hidden','overflow-y': scrollY?'auto':'hidden'}" :style="{'overflow-x': scrollX?'auto':'hidden','overflow-y': scrollY?'auto':'hidden'}"
class="uni-scroll-view" class="uni-scroll-view"
> >
<div ref="content"> <div
ref="content"
class="uni-scroll-view-content"
>
<div <div
v-if="refresherEnabled" v-if="refresherEnabled"
ref="refresherinner" ref="refresherinner"
...@@ -68,16 +71,16 @@ ...@@ -68,16 +71,16 @@
<script> <script>
import scroller from 'uni-mixins/scroller/index' import scroller from 'uni-mixins/scroller/index'
import { import {
supportsPassive, supportsPassive,
disableScrollBounce disableScrollBounce
} from 'uni-shared' } from 'uni-shared'
const passiveOptions = supportsPassive ? { const passiveOptions = supportsPassive ? {
passive: true passive: true
} : false } : false
// const PULLING = 'pulling' // const PULLING = 'pulling'
// const REFRESHING = 'refreshing' // const REFRESHING = 'refreshing'
export default { export default {
name: 'ScrollView', name: 'ScrollView',
...@@ -529,38 +532,43 @@ uni-scroll-view[hidden] { ...@@ -529,38 +532,43 @@ uni-scroll-view[hidden] {
max-height: inherit; max-height: inherit;
} }
.uni-scroll-view-content {
width: 100%;
height: 100%;
}
.uni-scroll-view-refresher { .uni-scroll-view-refresher {
position: relative; position: relative;
overflow: hidden; overflow: hidden;
} }
.uni-scroll-view-refresh { .uni-scroll-view-refresh {
position: absolute; position: absolute;
top: 0; top: 0;
left: 0; left: 0;
right: 0; right: 0;
bottom: 0; bottom: 0;
display: flex; display: flex;
flex-direction: row; flex-direction: row;
justify-content: center; justify-content: center;
align-items: center; align-items: center;
} }
.uni-scroll-view-refresh-inner { .uni-scroll-view-refresh-inner {
display: flex; display: flex;
align-items: center; align-items: center;
justify-content: center; justify-content: center;
line-height: 0; line-height: 0;
width: 40px; width: 40px;
height: 40px; height: 40px;
border-radius: 50%; border-radius: 50%;
background-color: #fff; background-color: #fff;
box-shadow: 0 1px 6px rgba(0, 0, 0, .117647), 0 1px 4px rgba(0, 0, 0, .117647); box-shadow: 0 1px 6px rgba(0, 0, 0, .117647), 0 1px 4px rgba(0, 0, 0, .117647);
} }
.uni-scroll-view-refresh__spinner { .uni-scroll-view-refresh__spinner {
transform-origin: center center; transform-origin: center center;
animation: uni-scroll-view-refresh-rotate 2s linear infinite; animation: uni-scroll-view-refresh-rotate 2s linear infinite;
} }
.uni-scroll-view-refresh__spinner > circle { .uni-scroll-view-refresh__spinner > circle {
...@@ -568,31 +576,31 @@ uni-scroll-view[hidden] { ...@@ -568,31 +576,31 @@ uni-scroll-view[hidden] {
stroke-linecap: round; stroke-linecap: round;
animation: uni-scroll-view-refresh-dash 2s linear infinite; animation: uni-scroll-view-refresh-dash 2s linear infinite;
} }
@keyframes uni-scroll-view-refresh-rotate { @keyframes uni-scroll-view-refresh-rotate {
0% { 0% {
transform: rotate(0deg); transform: rotate(0deg);
} }
100% { 100% {
transform: rotate(360deg); transform: rotate(360deg);
} }
} }
@keyframes uni-scroll-view-refresh-dash { @keyframes uni-scroll-view-refresh-dash {
0% { 0% {
stroke-dasharray: 1, 200; stroke-dasharray: 1, 200;
stroke-dashoffset: 0; stroke-dashoffset: 0;
} }
50% { 50% {
stroke-dasharray: 89, 200; stroke-dasharray: 89, 200;
stroke-dashoffset: -35px; stroke-dashoffset: -35px;
} }
100% { 100% {
stroke-dasharray: 89, 200; stroke-dasharray: 89, 200;
stroke-dashoffset: -124px; stroke-dashoffset: -124px;
} }
} }
</style> </style>
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册