Skip to content

Commit b9b8071

Browse files
SmileZXLeeSmileZXLee
committed
v2.8.4-统一refresher枚举中Loading取值
1 parent 0570bec commit b9b8071

File tree

20 files changed

+41
-41
lines changed

20 files changed

+41
-41
lines changed

‎demo/z-paging-demo/components/custom-refresher/custom-refresher.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
const statusTextMap = {
2222
'default': '哎呀，用点力继续下拉！',
2323
'release-to-refresh': '拉疼我啦，松手刷新~~',
24-
'refreshing': '正在努力刷新中...',
24+
'loading': '正在努力刷新中...',
2525
'complete': '刷新成功啦~'
2626
};
2727
return statusTextMap[this.status];

‎demo/z-paging-demo/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<view :class="showUpdateTime?'zp-r-container zp-r-container-padding':'zp-r-container'">
55
<view class="zp-r-left">
66
<!-- 非加载中(继续下拉刷新、松手立即刷新状态图片) -->
7-
<image v-if="status!==R.Refreshing" :class="leftImageClass" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
7+
<image v-if="status!==R.Loading" :class="leftImageClass" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
88
<!-- 加载状态图片 -->
99
<!-- #ifndef APP-NVUE -->
1010
<image v-else :class="{'zp-line-loading-image':refreshingAnimated,'zp-r-left-image':true,'zp-r-left-image-pre-size-rpx':unit==='rpx','zp-r-left-image-pre-size-px':unit==='px'}" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
@@ -64,7 +64,7 @@
6464
return {
6565
[R.Default]: defaultText,
6666
[R.ReleaseToRefresh]: pullingText,
67-
[R.Refreshing]: refreshingText,
67+
[R.Loading]: refreshingText,
6868
[R.Complete]: completeText,
6969
[R.GoF2]: goF2Text,
7070
};
@@ -96,7 +96,7 @@
9696
if (!!this.pullingImg) return this.pullingImg;
9797
if (!!this.defaultImg) return this.defaultImg;
9898
return this.zTheme.arrow[this.ts];
99-
} else if (status === R.Refreshing) {
99+
} else if (status === R.Loading) {
100100
if (!!this.refreshingImg) return this.refreshingImg;
101101
return this.zTheme.flower[this.ts];;
102102
} else if (status === R.Complete) {

‎demo/z-paging-demo/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ export default {
398398
}
399399
// #endif
400400
// #ifdef APP-NVUE
401-
this.refresherStatus = Enum.Refresher.Refreshing;
401+
this.refresherStatus = Enum.Refresher.Loading;
402402
this.refresherRevealStackCount ++;
403403
u.delay(() => {
404404
this._getNodeClientRect('zp-n-refresh-container', false).then((node) => {

‎demo/z-paging-demo/uni_modules/z-paging/components/z-paging/js/modules/nvue.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ export default {
150150
this._nRefresherEnd();
151151
})
152152
} else {
153-
this.refresherStatus = Enum.Refresher.Refreshing;
153+
this.refresherStatus = Enum.Refresher.Loading;
154154
this._doRefresherLoad();
155155
}
156156

157157
},
158158
// 下拉刷新下拉中
159159
_nOnPullingdown(e) {
160-
if (this.refresherStatus === Enum.Refresher.Refreshing || (this.isIos && !this.nListIsDragging)) return;
160+
if (this.refresherStatus === Enum.Refresher.Loading || (this.isIos && !this.nListIsDragging)) return;
161161
this._emitTouchmove(e);
162162
let { viewHeight, pullingDistance } = e;
163163
// 更新下拉刷新状态
@@ -202,7 +202,7 @@ export default {
202202
}, this.refresherCompleteDuration);
203203
}
204204
if (stackCount > 1) {
205-
this.refresherStatus = Enum.Refresher.Refreshing;
205+
this.refresherStatus = Enum.Refresher.Loading;
206206
}
207207

208208
const duration = animate ? 200 : 0;

‎demo/z-paging-demo/uni_modules/z-paging/components/z-paging/js/modules/refresher.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export default {
279279
immediate: true
280280
},
281281
refresherStatus(newVal) {
282-
newVal === Enum.Refresher.Refreshing && this._cleanRefresherEndTimeout();
282+
newVal === Enum.Refresher.Loading && this._cleanRefresherEndTimeout();
283283
this.refresherVibrate && (newVal === Enum.Refresher.ReleaseToRefresh || newVal === Enum.Refresher.GoF2) && this._doVibrateShort();
284284
this.$emit('refresherStatusChange', newVal);
285285
this.$emit('update:refresherStatus', newVal);
@@ -561,7 +561,7 @@ export default {
561561
this._emitTouchmove({ pullingDistance: refresherThreshold, dy: this.moveDis - refresherThreshold });
562562
}, 0.1);
563563
this.moveDis = refresherThreshold;
564-
this.refresherStatus = Enum.Refresher.Refreshing;
564+
this.refresherStatus = Enum.Refresher.Loading;
565565
this._doRefresherLoad();
566566
}
567567
} else {
@@ -762,14 +762,14 @@ export default {
762762
this.wxsPropType = 'begin' + u.getTime();
763763
// #endif
764764
this.moveDis = this.finalRefresherThreshold;
765-
this.refresherStatus = Enum.Refresher.Refreshing;
765+
this.refresherStatus = Enum.Refresher.Loading;
766766
this.isTouchmoving = true;
767767
this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
768768
this._doRefresherLoad(false);
769769
},
770770
// 触发下拉刷新
771771
_doRefresherLoad(isUserPullDown = true) {
772-
this._onRefresh(false,isUserPullDown);
772+
this._onRefresh(false, isUserPullDown);
773773
this.loading = true;
774774
},
775775
// #ifndef APP-PLUS || MP-WEIXIN || MP-QQ || H5

‎demo/z-paging-demo/uni_modules/z-paging/components/z-paging/js/modules/scroller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export default {
115115
finalScrollable() {
116116
return this.scrollable && !this.usePageScroll && this.scrollEnable
117117
&& (this.refresherCompleteScrollable ? true : this.refresherStatus !== Enum.Refresher.Complete)
118-
&& (this.refresherRefreshingScrollable ? true : this.refresherStatus !== Enum.Refresher.Refreshing);
118+
&& (this.refresherRefreshingScrollable ? true : this.refresherStatus !== Enum.Refresher.Loading);
119119
}
120120
},
121121
methods: {

‎demo/z-paging-demo/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default {
1010
Refresher: {
1111
Default: 'default',
1212
ReleaseToRefresh: 'release-to-refresh',
13-
Refreshing: 'refreshing',
13+
Loading: 'loading',
1414
Complete: 'complete',
1515
GoF2: 'go-f2'
1616
},

‎demo/z-paging-vue3-demo/components/custom-refresher/custom-refresher.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
const statusTextMap = {
2626
'default': '哎呀，用点力继续下拉！',
2727
'release-to-refresh': '拉疼我啦，松手刷新~~',
28-
'refreshing': '正在努力刷新中...',
28+
'loading': '正在努力刷新中...',
2929
'complete': '刷新成功啦~'
3030
};
3131
return statusTextMap[this.status];

‎demo/z-paging-vue3-demo/uni_modules/z-paging/components/z-paging/components/z-paging-refresh.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<view :class="showUpdateTime?'zp-r-container zp-r-container-padding':'zp-r-container'">
55
<view class="zp-r-left">
66
<!-- 非加载中(继续下拉刷新、松手立即刷新状态图片) -->
7-
<image v-if="status!==R.Refreshing" :class="leftImageClass" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
7+
<image v-if="status!==R.Loading" :class="leftImageClass" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
88
<!-- 加载状态图片 -->
99
<!-- #ifndef APP-NVUE -->
1010
<image v-else :class="{'zp-line-loading-image':refreshingAnimated,'zp-r-left-image':true,'zp-r-left-image-pre-size-rpx':unit==='rpx','zp-r-left-image-pre-size-px':unit==='px'}" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
@@ -64,7 +64,7 @@
6464
return {
6565
[R.Default]: defaultText,
6666
[R.ReleaseToRefresh]: pullingText,
67-
[R.Refreshing]: refreshingText,
67+
[R.Loading]: refreshingText,
6868
[R.Complete]: completeText,
6969
[R.GoF2]: goF2Text,
7070
};
@@ -96,7 +96,7 @@
9696
if (!!this.pullingImg) return this.pullingImg;
9797
if (!!this.defaultImg) return this.defaultImg;
9898
return this.zTheme.arrow[this.ts];
99-
} else if (status === R.Refreshing) {
99+
} else if (status === R.Loading) {
100100
if (!!this.refreshingImg) return this.refreshingImg;
101101
return this.zTheme.flower[this.ts];;
102102
} else if (status === R.Complete) {

‎demo/z-paging-vue3-demo/uni_modules/z-paging/components/z-paging/js/modules/data-handle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ export default {
398398
}
399399
// #endif
400400
// #ifdef APP-NVUE
401-
this.refresherStatus = Enum.Refresher.Refreshing;
401+
this.refresherStatus = Enum.Refresher.Loading;
402402
this.refresherRevealStackCount ++;
403403
u.delay(() => {
404404
this._getNodeClientRect('zp-n-refresh-container', false).then((node) => {

‎demo/z-paging-vue3-demo/uni_modules/z-paging/components/z-paging/js/modules/nvue.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ export default {
150150
this._nRefresherEnd();
151151
})
152152
} else {
153-
this.refresherStatus = Enum.Refresher.Refreshing;
153+
this.refresherStatus = Enum.Refresher.Loading;
154154
this._doRefresherLoad();
155155
}
156156

157157
},
158158
// 下拉刷新下拉中
159159
_nOnPullingdown(e) {
160-
if (this.refresherStatus === Enum.Refresher.Refreshing || (this.isIos && !this.nListIsDragging)) return;
160+
if (this.refresherStatus === Enum.Refresher.Loading || (this.isIos && !this.nListIsDragging)) return;
161161
this._emitTouchmove(e);
162162
let { viewHeight, pullingDistance } = e;
163163
// 更新下拉刷新状态
@@ -202,7 +202,7 @@ export default {
202202
}, this.refresherCompleteDuration);
203203
}
204204
if (stackCount > 1) {
205-
this.refresherStatus = Enum.Refresher.Refreshing;
205+
this.refresherStatus = Enum.Refresher.Loading;
206206
}
207207

208208
const duration = animate ? 200 : 0;

‎demo/z-paging-vue3-demo/uni_modules/z-paging/components/z-paging/js/modules/refresher.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export default {
279279
immediate: true
280280
},
281281
refresherStatus(newVal) {
282-
newVal === Enum.Refresher.Refreshing && this._cleanRefresherEndTimeout();
282+
newVal === Enum.Refresher.Loading && this._cleanRefresherEndTimeout();
283283
this.refresherVibrate && (newVal === Enum.Refresher.ReleaseToRefresh || newVal === Enum.Refresher.GoF2) && this._doVibrateShort();
284284
this.$emit('refresherStatusChange', newVal);
285285
this.$emit('update:refresherStatus', newVal);
@@ -561,7 +561,7 @@ export default {
561561
this._emitTouchmove({ pullingDistance: refresherThreshold, dy: this.moveDis - refresherThreshold });
562562
}, 0.1);
563563
this.moveDis = refresherThreshold;
564-
this.refresherStatus = Enum.Refresher.Refreshing;
564+
this.refresherStatus = Enum.Refresher.Loading;
565565
this._doRefresherLoad();
566566
}
567567
} else {
@@ -762,14 +762,14 @@ export default {
762762
this.wxsPropType = 'begin' + u.getTime();
763763
// #endif
764764
this.moveDis = this.finalRefresherThreshold;
765-
this.refresherStatus = Enum.Refresher.Refreshing;
765+
this.refresherStatus = Enum.Refresher.Loading;
766766
this.isTouchmoving = true;
767767
this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
768768
this._doRefresherLoad(false);
769769
},
770770
// 触发下拉刷新
771771
_doRefresherLoad(isUserPullDown = true) {
772-
this._onRefresh(false,isUserPullDown);
772+
this._onRefresh(false, isUserPullDown);
773773
this.loading = true;
774774
},
775775
// #ifndef APP-PLUS || MP-WEIXIN || MP-QQ || H5

‎demo/z-paging-vue3-demo/uni_modules/z-paging/components/z-paging/js/modules/scroller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export default {
115115
finalScrollable() {
116116
return this.scrollable && !this.usePageScroll && this.scrollEnable
117117
&& (this.refresherCompleteScrollable ? true : this.refresherStatus !== Enum.Refresher.Complete)
118-
&& (this.refresherRefreshingScrollable ? true : this.refresherStatus !== Enum.Refresher.Refreshing);
118+
&& (this.refresherRefreshingScrollable ? true : this.refresherStatus !== Enum.Refresher.Loading);
119119
}
120120
},
121121
methods: {

‎demo/z-paging-vue3-demo/uni_modules/z-paging/components/z-paging/js/z-paging-enum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default {
1010
Refresher: {
1111
Default: 'default',
1212
ReleaseToRefresh: 'release-to-refresh',
13-
Refreshing: 'refreshing',
13+
Loading: 'loading',
1414
Complete: 'complete',
1515
GoF2: 'go-f2'
1616
},

‎z-paging/components/z-paging/components/z-paging-refresh.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<view :class="showUpdateTime?'zp-r-container zp-r-container-padding':'zp-r-container'">
55
<view class="zp-r-left">
66
<!-- 非加载中(继续下拉刷新、松手立即刷新状态图片) -->
7-
<image v-if="status!==R.Refreshing" :class="leftImageClass" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
7+
<image v-if="status!==R.Loading" :class="leftImageClass" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
88
<!-- 加载状态图片 -->
99
<!-- #ifndef APP-NVUE -->
1010
<image v-else :class="{'zp-line-loading-image':refreshingAnimated,'zp-r-left-image':true,'zp-r-left-image-pre-size-rpx':unit==='rpx','zp-r-left-image-pre-size-px':unit==='px'}" :style="[leftImageStyle,imgStyle]" :src="leftImageSrc" />
@@ -64,7 +64,7 @@
6464
return {
6565
[R.Default]: defaultText,
6666
[R.ReleaseToRefresh]: pullingText,
67-
[R.Refreshing]: refreshingText,
67+
[R.Loading]: refreshingText,
6868
[R.Complete]: completeText,
6969
[R.GoF2]: goF2Text,
7070
};
@@ -96,7 +96,7 @@
9696
if (!!this.pullingImg) return this.pullingImg;
9797
if (!!this.defaultImg) return this.defaultImg;
9898
return this.zTheme.arrow[this.ts];
99-
} else if (status === R.Refreshing) {
99+
} else if (status === R.Loading) {
100100
if (!!this.refreshingImg) return this.refreshingImg;
101101
return this.zTheme.flower[this.ts];;
102102
} else if (status === R.Complete) {

‎z-paging/components/z-paging/js/modules/data-handle.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ export default {
398398
}
399399
// #endif
400400
// #ifdef APP-NVUE
401-
this.refresherStatus = Enum.Refresher.Refreshing;
401+
this.refresherStatus = Enum.Refresher.Loading;
402402
this.refresherRevealStackCount ++;
403403
u.delay(() => {
404404
this._getNodeClientRect('zp-n-refresh-container', false).then((node) => {

‎z-paging/components/z-paging/js/modules/nvue.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -150,14 +150,14 @@ export default {
150150
this._nRefresherEnd();
151151
})
152152
} else {
153-
this.refresherStatus = Enum.Refresher.Refreshing;
153+
this.refresherStatus = Enum.Refresher.Loading;
154154
this._doRefresherLoad();
155155
}
156156

157157
},
158158
// 下拉刷新下拉中
159159
_nOnPullingdown(e) {
160-
if (this.refresherStatus === Enum.Refresher.Refreshing || (this.isIos && !this.nListIsDragging)) return;
160+
if (this.refresherStatus === Enum.Refresher.Loading || (this.isIos && !this.nListIsDragging)) return;
161161
this._emitTouchmove(e);
162162
let { viewHeight, pullingDistance } = e;
163163
// 更新下拉刷新状态
@@ -202,7 +202,7 @@ export default {
202202
}, this.refresherCompleteDuration);
203203
}
204204
if (stackCount > 1) {
205-
this.refresherStatus = Enum.Refresher.Refreshing;
205+
this.refresherStatus = Enum.Refresher.Loading;
206206
}
207207

208208
const duration = animate ? 200 : 0;

‎z-paging/components/z-paging/js/modules/refresher.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ export default {
279279
immediate: true
280280
},
281281
refresherStatus(newVal) {
282-
newVal === Enum.Refresher.Refreshing && this._cleanRefresherEndTimeout();
282+
newVal === Enum.Refresher.Loading && this._cleanRefresherEndTimeout();
283283
this.refresherVibrate && (newVal === Enum.Refresher.ReleaseToRefresh || newVal === Enum.Refresher.GoF2) && this._doVibrateShort();
284284
this.$emit('refresherStatusChange', newVal);
285285
this.$emit('update:refresherStatus', newVal);
@@ -561,7 +561,7 @@ export default {
561561
this._emitTouchmove({ pullingDistance: refresherThreshold, dy: this.moveDis - refresherThreshold });
562562
}, 0.1);
563563
this.moveDis = refresherThreshold;
564-
this.refresherStatus = Enum.Refresher.Refreshing;
564+
this.refresherStatus = Enum.Refresher.Loading;
565565
this._doRefresherLoad();
566566
}
567567
} else {
@@ -762,14 +762,14 @@ export default {
762762
this.wxsPropType = 'begin' + u.getTime();
763763
// #endif
764764
this.moveDis = this.finalRefresherThreshold;
765-
this.refresherStatus = Enum.Refresher.Refreshing;
765+
this.refresherStatus = Enum.Refresher.Loading;
766766
this.isTouchmoving = true;
767767
this.isTouchmovingTimeout && clearTimeout(this.isTouchmovingTimeout);
768768
this._doRefresherLoad(false);
769769
},
770770
// 触发下拉刷新
771771
_doRefresherLoad(isUserPullDown = true) {
772-
this._onRefresh(false,isUserPullDown);
772+
this._onRefresh(false, isUserPullDown);
773773
this.loading = true;
774774
},
775775
// #ifndef APP-PLUS || MP-WEIXIN || MP-QQ || H5

‎z-paging/components/z-paging/js/modules/scroller.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ export default {
115115
finalScrollable() {
116116
return this.scrollable && !this.usePageScroll && this.scrollEnable
117117
&& (this.refresherCompleteScrollable ? true : this.refresherStatus !== Enum.Refresher.Complete)
118-
&& (this.refresherRefreshingScrollable ? true : this.refresherStatus !== Enum.Refresher.Refreshing);
118+
&& (this.refresherRefreshingScrollable ? true : this.refresherStatus !== Enum.Refresher.Loading);
119119
}
120120
},
121121
methods: {

‎z-paging/components/z-paging/js/z-paging-enum.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export default {
1010
Refresher: {
1111
Default: 'default',
1212
ReleaseToRefresh: 'release-to-refresh',
13-
Refreshing: 'refreshing',
13+
Loading: 'loading',
1414
Complete: 'complete',
1515
GoF2: 'go-f2'
1616
},

0 commit comments

Comments
 (0)