v2.4.7-优化代码结构

SmileZXLee · Oct 25, 2022 · 818a7fc · 818a7fc
1 parent 84e05f2
commit 818a7fc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 23 deletions.
diff --git a/z-paging/uni_modules/z-paging/components/z-paging/js/modules/nvue.js b/z-paging/uni_modules/z-paging/components/z-paging/js/modules/nvue.js
@@ -116,6 +116,9 @@ export default {
 		nSafeAreaBottomHeight() {
 			return this.safeAreaInsetBottom ? this.safeAreaBottom : 0;
 		},
+		nChatRecordRotateStyle() {
+			return this.useChatRecordMode ? { transform: this.nIsFirstPageAndNoMore ? 'rotate(0deg)' : 'rotate(180deg)' } : {};
+		},
 		finalNvueListIs() {
 			if (this.usePageScroll) return 'view';
 			const nvueListIsLowerCase = this.nvueListIs.toLowerCase();
@@ -185,7 +188,7 @@ export default {
 			}
 			const stackCount = this.refresherRevealStackCount;
 			if (height === 0 && checkStack) {
-				this.refresherRevealStackCount--;
+				this.refresherRevealStackCount --;
 				if (stackCount > 1) return;
 				this.refresherEndTimeout = setTimeout(() => {
 					this.refresherStatus = Enum.Refresher.Default;
@@ -233,10 +236,7 @@ export default {
 				this.$nextTick(()=>{
 					this._getNodeClientRect('.zp-n-list').then(node => {
 						if (node) {
-							const nodeWidth = node[0].width;
-							if (nodeWidth) {
-								this.nRefresherWidth = nodeWidth;
-							}
+							this.nRefresherWidth = node[0].width ? node[0].width : this.nRefresherWidth;
 						}
 					})
 				})

diff --git a/z-paging/uni_modules/z-paging/components/z-paging/js/modules/refresher.js b/z-paging/uni_modules/z-paging/components/z-paging/js/modules/refresher.js
@@ -344,11 +344,7 @@ export default {
 			this._startLoading(true);
 			this.refresherTriggered = true;
 			if(this.reloadWhenRefresh && isUserPullDown){
-				if (this.useChatRecordMode) {
-					this._onLoadingMore('click')
-				} else {
-					this._reload(false, false, isUserPullDown);
-				}
+				this.useChatRecordMode ? this._onLoadingMore('click') : this._reload(false, false, isUserPullDown);
 			}
 		},
 		//自定义下拉刷新被复位

diff --git a/z-paging/uni_modules/z-paging/components/z-paging/js/z-paging-main.js b/z-paging/uni_modules/z-paging/components/z-paging/js/z-paging-main.js
@@ -474,11 +474,7 @@ export default {
 			return new Promise((resolve, reject) => {
 				if (ref) {
 					weexDom.getComponentRect(ref, option => {
-						if (option && option.result) {
-							resolve([option.size]);
-						} else {
-							resolve(false);
-						}
+						resolve(option && option.result ? [option.size] : false);
 					})
 				} else {
 					resolve(false);
@@ -490,11 +486,7 @@ export default {
 			inThis = false;
 			//#endif
 			let res = inThis ? uni.createSelectorQuery().in(this) : uni.createSelectorQuery();
-			if (scrollOffset) {
-				res.select(select).scrollOffset();
-			} else {
-				res.select(select).boundingClientRect();
-			}
+			scrollOffset ? res.select(select).scrollOffset() : res.select(select).boundingClientRect();
 			return new Promise((resolve, reject) => {
 				res.exec(data => {
 					resolve((data && data != '' && data != undefined && data.length) ? data : false);

diff --git a/z-paging/uni_modules/z-paging/components/z-paging/z-paging.vue b/z-paging/uni_modules/z-paging/components/z-paging/z-paging.vue
@@ -170,7 +170,7 @@ by ZXLee
 			<view v-if="$slots.left" class="zp-page-left">
 				<slot name="left" />
 			</view>
-			<component :is="finalNvueListIs" ref="zp-n-list" :id="nvueListId" :style="[{'flex': 1,'top':isIos?'0px':'-1px'},usePageScroll?scrollViewStyle:{},useChatRecordMode ? {transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]" :alwaysScrollableVertical="true"
+			<component :is="finalNvueListIs" ref="zp-n-list" :id="nvueListId" :style="[{'flex': 1,'top':isIos?'0px':'-1px'},usePageScroll?scrollViewStyle:{},nChatRecordRotateStyle]" :alwaysScrollableVertical="true"
 				:fixFreezing="nFixFreezing" :show-scrollbar="showScrollbar&&!useChatRecordMode" :loadmoreoffset="finalLowerThreshold" :enable-back-to-top="enableBackToTop"
 				:scrollable="scrollable&&scrollEnable&&(refresherCompleteScrollable?true:refresherStatus!==R.Complete)" :bounce="nvueBounce" :column-count="nWaterfallColumnCount" :column-width="nWaterfallColumnWidth"
 				:column-gap="nWaterfallColumnGap" :left-gap="nWaterfallLeftGap" :right-gap="nWaterfallRightGap" :pagingEnabled="nvuePagingEnabled" :offset-accuracy="offsetAccuracy"
@@ -213,11 +213,11 @@ by ZXLee
 					<slot />
 				</template>
 				<!-- 全屏Loading -->
-				<component :is="nViewIs" v-if="showLoading&&$slots.loading&&!loadingFullFixed" :class="{'z-paging-content-fixed':usePageScroll}" style="flex: 1;" :style="[useChatRecordMode ? {transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]">
+				<component :is="nViewIs" v-if="showLoading&&$slots.loading&&!loadingFullFixed" :class="{'z-paging-content-fixed':usePageScroll}" style="flex: 1;" :style="[nChatRecordRotateStyle]">
 					<slot name="loading" />
 				</component>
 				<!-- 空数据图 -->
-				<component :is="nViewIs" v-if="showEmpty" :class="{'z-paging-content-fixed':usePageScroll}" :style="[{flex:emptyViewCenter?1:0},emptyViewSuperStyle,useChatRecordMode?{transform: nIsFirstPageAndNoMore?'rotate(0deg)':'rotate(180deg)'}:{}]">
+				<component :is="nViewIs" v-if="showEmpty" :class="{'z-paging-content-fixed':usePageScroll}" :style="[{flex:emptyViewCenter?1:0},emptyViewSuperStyle,nChatRecordRotateStyle]">
 					<view :class="{'zp-empty-view':true,'zp-empty-view-center':emptyViewCenter}">
 						<slot v-if="$slots.empty" name="empty" />
 						<z-paging-empty-view v-else :emptyViewImg="finalEmptyViewImg" :emptyViewText="finalEmptyViewText" :showEmptyViewReload="finalShowEmptyViewReload"