File tree 6 files changed +21
-48
lines changed 6 files changed +21
-48
lines changed Original file line number Diff line number Diff line change @@ -223,7 +223,6 @@ exports[`Skeleton Skeleton theme demo works fine 1`] = `
223
223
class = " demo-section__content"
224
224
>
225
225
<t-skeleton
226
- loading = " {{true}}"
227
226
theme = " avatar"
228
227
/>
229
228
</wx-view >
@@ -238,7 +237,6 @@ exports[`Skeleton Skeleton theme demo works fine 1`] = `
238
237
class = " demo-section__content"
239
238
>
240
239
<t-skeleton
241
- loading = " {{true}}"
242
240
theme = " image"
243
241
/>
244
242
</wx-view >
@@ -253,7 +251,6 @@ exports[`Skeleton Skeleton theme demo works fine 1`] = `
253
251
class = " demo-section__content"
254
252
>
255
253
<t-skeleton
256
- loading = " {{true}}"
257
254
theme = " text"
258
255
/>
259
256
</wx-view >
@@ -268,7 +265,6 @@ exports[`Skeleton Skeleton theme demo works fine 1`] = `
268
265
class = " demo-section__content"
269
266
>
270
267
<t-skeleton
271
- loading = " {{true}}"
272
268
theme = " paragraph"
273
269
/>
274
270
</wx-view >
Original file line number Diff line number Diff line change @@ -26,7 +26,7 @@ describe('skeleton', () => {
26
26
describe ( 'Props' , ( ) => {
27
27
it ( `: style && customStyle` , async ( ) => {
28
28
const id = simulate . load ( {
29
- template : `<t-skeleton class="skeleton" style="{{style}}" customStyle="{{customStyle}}" loading="{{true}}" ></t-skeleton>` ,
29
+ template : `<t-skeleton class="skeleton" style="{{style}}" customStyle="{{customStyle}}"></t-skeleton>` ,
30
30
usingComponents : {
31
31
't-skeleton' : skeleton ,
32
32
} ,
Original file line number Diff line number Diff line change 1
- Page ( {
2
- data : {
3
- themeList : [
4
- {
5
- title : '头像骨架屏' ,
6
- value : 'avatar' ,
7
- loading : true ,
8
- } ,
9
- {
10
- title : '图片骨架屏' ,
11
- value : 'image' ,
12
- loading : true ,
13
- } ,
14
- {
15
- title : '文本骨架屏' ,
16
- value : 'text' ,
17
- loading : true ,
18
- } ,
19
- {
20
- title : '段落骨架屏' ,
21
- value : 'paragraph' ,
22
- loading : true ,
23
- } ,
24
- ] ,
25
- } ,
26
- } ) ;
1
+ Page ( { } ) ;
Original file line number Diff line number Diff line change @@ -4,22 +4,18 @@ Component({
4
4
{
5
5
title : '头像骨架屏' ,
6
6
value : 'avatar' ,
7
- loading : true ,
8
7
} ,
9
8
{
10
9
title : '图片骨架屏' ,
11
10
value : 'image' ,
12
- loading : true ,
13
11
} ,
14
12
{
15
13
title : '文本骨架屏' ,
16
14
value : 'text' ,
17
- loading : true ,
18
15
} ,
19
16
{
20
17
title : '段落骨架屏' ,
21
18
value : 'paragraph' ,
22
- loading : true ,
23
19
} ,
24
20
] ,
25
21
} ,
Original file line number Diff line number Diff line change 1
1
<view wx:for="{{themeList}}" wx:for-item="themeItem" wx:key="index">
2
2
<view class="demo-section__desc">{{themeItem.title}}</view>
3
3
<view class="demo-section__content">
4
- <t-skeleton theme="{{themeItem.value}}" loading="{{themeItem.loading}}" ></t-skeleton>
4
+ <t-skeleton theme="{{themeItem.value}}"></t-skeleton>
5
5
</view>
6
6
</view>
Original file line number Diff line number Diff line change @@ -37,24 +37,15 @@ export default class Skeleton extends SuperComponent {
37
37
rowCol ( ) {
38
38
this . init ( ) ;
39
39
} ,
40
- 'loading,delay' ( loading : boolean , delay : number ) {
41
- if ( ! loading || delay === 0 ) {
42
- this . setData ( {
43
- isShow : loading ,
44
- } ) ;
45
- return ;
46
- }
47
- setTimeout ( ( ) => {
48
- this . setData ( {
49
- isShow : loading ,
50
- } ) ;
51
- } , delay ) ;
40
+ 'loading, delay' ( ) {
41
+ this . isShowSkeleton ( ) ;
52
42
} ,
53
43
} ;
54
44
55
45
lifetimes = {
56
46
attached ( ) {
57
47
this . init ( ) ;
48
+ this . isShowSkeleton ( ) ;
58
49
} ,
59
50
} ;
60
51
@@ -134,5 +125,20 @@ export default class Skeleton extends SuperComponent {
134
125
} ) ;
135
126
return style ;
136
127
} ,
128
+
129
+ isShowSkeleton ( ) {
130
+ const { loading, delay } = this . properties ;
131
+ if ( ! loading || delay === 0 ) {
132
+ this . setData ( {
133
+ isShow : loading ,
134
+ } ) ;
135
+ return ;
136
+ }
137
+ setTimeout ( ( ) => {
138
+ this . setData ( {
139
+ isShow : loading ,
140
+ } ) ;
141
+ } , delay ) ;
142
+ } ,
137
143
} ;
138
144
}
You can’t perform that action at this time.
0 commit comments