nvue3 1.1.11 → 1.1.13

package/components/v-paging.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script setup>
-	import { computed, ref, inject, onMounted } from 'vue';
+	import { computed, ref, inject, onMounted, isRef, isReactive } from 'vue';
 	import { onPullDownRefresh, onReachBottom } from '@dcloudio/uni-app';
 	const { back } = inject('$pages');
 	const { post } = inject('$http');
@@ -120,7 +120,7 @@
 	 */
 	const request = (refresh, option = {}) => {
 		const index = refresh ? 1 : (pageIndex.value + 1)
-
+		const loaded = Boolean(option.loaded || false);
 		post(api, Object.assign({}, params, option, { index })).then(
 			res => {
 				uni.stopPullDownRefresh();
@@ -128,13 +128,14 @@
 
 				const resData = (field ? res.data[field] : res.data) || [];
 				if (refresh) {
+					datas.value.length = 0;
 					if (resData.length > 0) datas.value = [...resData];
 					else datas.value.length = 0;
 				}
 				else if (resData.length > 0) {
 					datas.value.push(...resData);
 				}
-				emit('update', res.data, refresh);
+				emit('update', res.data, refresh, loaded);
 
 				pageState.value = 1;
 				pageIndex.value = paging.value.index;
@@ -164,7 +165,11 @@
 		request(true, { loaded: 1 });
 
 		if (!listen) return;
-		uni.$on(listen, () => { request(true, {}) });
+		uni.$off(listen);
+		uni.$on(listen, (...from) => {
+			console.log(`by paging listen(${listen})=======>`, from);
+			request(true, {})
+		});
 
 	})
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "nvue3",
-	"version": "1.1.11",
+	"version": "1.1.13",
 	"description": "for uniapp & vue3",
 	"main": "src/kernel.js",
 	"scripts": {

package/src/http.js

@@ -2,8 +2,8 @@
  * toast最少显示长时间，主要是加载api的读取中后续关闭
  */
 const tstShow = 350;
-// const isDebug = (process.env.NODE_ENV === 'development');
-const isDebug = true;
+const isDebug = (process.env.NODE_ENV === 'development');
+// const isDebug = true;
 
 const baseResp = {
 	success: 1,
@@ -18,6 +18,7 @@ const config = {
 	modal: false, //出错时显示model，否则显示toast
 	timeout: 6000,
 	mintime: 100, //两次modal或toast之间间隔最短时间，小于此时间的不显示
+	detection: 0, //检测相同API连续请求间隔，小于此时间的报错，0不检测
 	toast: {
 		'l': '加载中...',
 		'r': '读取中...',
@@ -280,8 +281,6 @@ function doSuccess(REQ, res, resolve, reject) {
 }
 
 function doFail(request, res, resolve, reject) {
-	if (!request.timer.after) request.timer.after = Date.now();
-	// console.error('uni.request Fail：', request, JSON.stringify(res));
 
 	if (res.errMsg.indexOf('Failed to connect') > 0) {
 		let info = res.errMsg.match(/([\w\.]+)\/([\d\.]+)\:(\d+)/);
@@ -312,10 +311,6 @@ function doComplete(request, res, resolve, reject) {
 	request.timer.used = request.timer.after - request.timer.before;
 	request.timer.useTime = (request.timer.used / 1000) + 's';
 
-	/**
-	 * 1727661448.089
-	 */
-
 	if (request.toast && (tstShow > 0)) {
 		if (request.timer.used > tstShow) {
 			if (request.loading) uni.hideLoading();
@@ -327,7 +322,7 @@ function doComplete(request, res, resolve, reject) {
 		}
 	}
 
-	if (isDebug) console.log(request)
+	if (isDebug || config.debug) console.log(request)
 }
 
 
@@ -342,13 +337,14 @@ function doRequest(request) {
 	}
 
 	return new Promise(async (resolve, reject) => {
-		request.timer.before = Date.now();
+		request.timer.ready = Date.now();
 		request.header.put = await processor.header(request.api, request.request, request.method);
 
 		const contType = (request.method === 'UPLOAD') ? 'multipart/form-data' : 'application/json';
 		request.header.put['content-type'] = contType;
 		delete request.header.put['referer'];
 
+		request.timer.before = Date.now();
 		uni.request({
 			url: request.api,
 			method: request.method,
@@ -357,9 +353,11 @@ function doRequest(request) {
 			data: request.request,
 			header: request.header.put,
 			success: (res) => {
+				request.timer.after = Date.now();
 				doSuccess(request, res, resolve, reject);
 			},
 			fail: (res) => {
+				request.timer.after = Date.now();
 				doFail(request, res, resolve, reject);
 			},
 			complete: (res) => {
@@ -370,155 +368,6 @@ function doRequest(request) {
 	});
 }
 
-function cropImg(file) {
-	return new Promise((resolve, reject) => {
-		uni.getImageInfo({
-			src: file.path,
-			success(info) {
-				resolve({
-					path: file.path,
-					ext: info.type.toLowerCase(),
-					width: info.width,
-					height: info.height,
-					weight: file.size
-				})
-			},
-			fail(err) {
-				// console.log(err);
-				reject(err)
-			}
-		})
-	})
-}
-
-function upServerFile(request, file) {
-	return new Promise((resolve, reject) => {
-		request.request.data = JSON.stringify(request.request.data);
-		request.request.files = JSON.stringify([file]);
-		uni.uploadFile({
-			url: request.api,
-			filePath: file.path,
-			//#ifdef MP-ALIPAY
-			fileType: file.ext,
-			//#endif
-			name: file.name,
-			timeout: request.timeout,
-			header: request.header.put,
-			formData: request.request,
-			success: (res) => {
-				resolve(res);
-			},
-			fail: (res) => {
-				reject(res);
-			}
-		});
-	})
-}
-
-function objectJson(obj) {
-	return JSON.parse(JSON.stringify(obj));
-}
-
-/**
- * 上传 uni.chooseImage()选择好的文件
- * 
- * @param {Object} choose 是uni.chooseImage({success: (res)})中的res原样
- * @param {Object} saveSpace 0:自己服务器，1:uniCloud
- */
-function doUpload_OLD(request, choose) {
-
-	return new Promise((resolve, reject) => {
-		request.timer.before = Date.now();
-		const fileCount = choose.tempFiles.length;
-		const processAll = [];
-		for (let i = 0; i < fileCount; i++) {
-			processAll.push(cropImg(choose.tempFiles[i]));
-		}
-
-		return Promise.all(processAll).then(allFile => {
-			return allFile;
-		}).then(res => {
-			// console.log(res);
-
-			//#ifdef APP-PLUS
-			//app可以批量上传
-			const files = [];
-			for (let i = 0; i < fileCount; i++) {
-				res[i].name = `file${i}`;
-				files.push({
-					name: res[i].name,
-					uri: res[i].path
-				});
-			}
-			request.request.files = JSON.stringify(res);
-			request.request.data = JSON.stringify(request.request.data);
-
-			uni.uploadFile({
-				url: request.api,
-				timeout: request.timeout,
-				header: request.header.put,
-				dataType: request.encode,
-				formData: request.request,
-				files: files,
-				success: (res) => {
-					if (isDebug) console.log(res);
-					try {
-						if (typeof res.data === 'string') res.data = JSON.parse(res.data);
-					}
-					catch (e) {
-						//TODO handle the exception
-					}
-					doSuccess(request, res, resolve, reject);
-				},
-				fail: (res) => {
-					doFail(request, res, resolve, reject);
-				},
-				complete: (res) => {
-					doComplete(request, res, resolve, reject)
-				}
-			});
-			//#endif
-
-			//#ifndef APP-PLUS
-			const processUp = [];
-			for (let i = 0; i < fileCount; i++) {
-				res[i].name = `file${i}`;
-				processUp.push(upServerFile(request, res[i]));
-			}
-
-			return Promise.all(processUp).then(
-				allFile => {
-					let resp = {};
-					const files = allFile.map((res, f) => {
-						let json = res.data;
-						try {
-							if (typeof json === 'string') json = JSON.parse(json);
-						}
-						catch (e) {
-							//TODO handle the exception
-						}
-						resp.data = json;
-						resp.header = allFile[0].header;
-						resp.errMsg = allFile[0].errMsg;
-						resp.statusCode = allFile[0].statusCode;
-						return json.data;
-					});
-					resp.files = files;
-					doSuccess(request, resp);
-				},
-				allError => {
-					if (isDebug) console.log('allError', allError);
-					doFail(request, allError[0]);
-				});
-			//#endif
-
-		});
-
-
-
-	});
-}
-
 
 function thisPost(api, data = {}) {
 	return doRequest(new _request(api, data, 'post'));
@@ -624,18 +473,14 @@ function FrequencyDetection(api) {
 	if (api[0] === '@') return null; //不检查频率
 
 	let nowTime = Date.now();
-	console.log({ api, nowTime, justPostTime });
 
-	if (api === justPostApi && nowTime - justPostTime < config.mintime) {
-		console.log({ nowTime, justPostTime, just: nowTime - justPostTime, min: config.mintime });
+	if (api === justPostApi && nowTime - justPostTime < config.detection) {
+		// console.log({ nowTime, justPostTime, just: nowTime - justPostTime, detection: config.detection });
 
 		return new Promise((resolve, reject) => {
-			reject({
-				error: 1,
-				success: 0,
-				message: '操作太频繁'
-			})
+			reject({ error: 1, success: 0, message: '操作太频繁' })
 		});
+		
 	}
 
 	justPostTime = nowTime;
@@ -655,15 +500,19 @@ export default class {
 	}
 
 	get(api, data = {}) {
-		const fd = FrequencyDetection(api);
-		if (fd) return fd;
+		if (config.detection > 0) {
+			const fd = FrequencyDetection(api);
+			if (fd) return fd;
+		}
 
 		return doRequest(new _request(api, data, 'get'));
 	}
 
 	post(api, data = {}) {
-		const fd = FrequencyDetection(api);
-		if (fd) return fd;
+		if (config.detection > 0) {
+			const fd = FrequencyDetection(api);
+			if (fd) return fd;
+		}
 
 		return doRequest(new _request(api, data, 'post'));
 	}