nvue3 1.1.33 → 1.1.38

package/README.md

@@ -1,6 +1,5 @@
 
 
-
 # main.js
 ```
 import App from './App';

package/package.json

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

package/src/http.js

@@ -2,6 +2,7 @@ const tstShow = 350; //如果请求太快，toast会一闪而过，这里限制
 const nextPost = []; //页面不紧急的消息暂存在这里，下一次请求时顺带捎上_append
 const failBox = []; //保存错误消息，若服务器不可达，则临时存在这里
 const isDebug = (process.env.NODE_ENV === 'development');
+const noReject = (import.meta.env.VITE_REJECT === 'false'); //recect由resolve执行
 
 const baseResp = {
 	success: 1,
@@ -83,6 +84,7 @@ const _request = class {
 			}
 			else {
 				this.silent = true;
+				this.silence = true;
 			}
 		}
 		else {
@@ -101,6 +103,7 @@ const _request = class {
 	code = 0;
 	message = '';
 	toast = '';
+	silence = false; // 静默，不显示loading
 	silent = false; // 直接返回
 	loading = false;
 	encode = 'json';
@@ -163,7 +166,7 @@ function failMessage(RFM, resolve, reject) {
 	}
 	if (typeof reject !== 'function') reject = () => {};
 
-	if (RFM.silent) { //请求者要求直接返回，这里不做任何处理
+	if (RFM.silent) { //请求者要求直接返回，后面不做任何处理
 		RFM.loading = false;
 		uni.hideLoading();
 		reject(RFM.response);
@@ -385,12 +388,12 @@ function doComplete(request, res, resolve, reject) {
 
 function postFailBox() {
 	if (failBox.length === 0) return;
-	return doRequest(new _request(`!${api}`, failBox, 'post'));
+	return doRequest(new _request(import.meta.env.VITE_ERROR_URI, failBox, 'post'));
 }
 
 async function doRequest(request) {
 
-	if (request.toast) {
+	if (request.toast && !request.silence) {
 		request.loading = true;
 		uni.showLoading({
 			title: request.toast,
@@ -403,8 +406,8 @@ async function doRequest(request) {
 		await processor.preprocessing(request);
 		// 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.header.put['content-type'] = contType;
 		request.timer.before = Date.now();
 
 		uni.request({
@@ -416,14 +419,14 @@ async function doRequest(request) {
 			header: request.header.put,
 			success: (res) => {
 				request.timer.after = Date.now();
-				doSuccess(request, res, resolve, reject);
+				doSuccess(request, res, resolve, noReject ? resolve : reject);
 			},
 			fail: (res) => {
 				request.timer.after = Date.now();
-				doFail(request, res, resolve, reject);
+				doFail(request, res, resolve, noReject ? resolve : reject);
 			},
 			complete: (res) => {
-				doComplete(request, res, resolve, reject);
+				doComplete(request, res);
 			}
 		});