From b0b8d5b0fb654dacad0636b47927640874ddfe22 Mon Sep 17 00:00:00 2001
From: Tevin <tingquanren@163.com>
Date: Mon, 03 Mar 2025 13:08:02 +0800
Subject: [PATCH] 知识库文档，新增常用基类
---
bases/Fetcher.js | 42 +++++++++++++++++++++++++++++++++---------
1 files changed, 33 insertions(+), 9 deletions(-)
diff --git a/bases/Fetcher.js b/bases/Fetcher.js
index 3c48845..54a41c8 100644
--- a/bases/Fetcher.js
+++ b/bases/Fetcher.js
@@ -125,7 +125,7 @@
* @param {String} url
* @param {*} [data]
* @param {object} [options]
- * @return {Promise<any>|}
+ * @return {Promise<any>}
*/
query(type, url, data = null, options = {}) {
return new Promise((resolve, reject) => {
@@ -147,6 +147,13 @@
if (process.env.TARO_ENV === 'weapp') {
this._saveCookies(response.cookies);
}
+ // 捕获响应
+ options && options.onCapture && options.onCapture({
+ url: this._createUrlPrefix(options) + url,
+ request: data,
+ response: { ...response.data },
+ httpCode: response.statusCode,
+ });
/**
* @type {{state: {code, http, msg}, data: Object}}
* @example response.state.code
@@ -161,9 +168,16 @@
resolve(this._transformResponseData(responseData, options));
},
fail: error => {
- if (typeof options.silence === 'undefined' || !options.silence) {
- this._resolveCaughtNetErr(error);
- }
+ // 处理响应
+ this._resolveCaughtNetErr(error, options, msg => {
+ // 捕获响应
+ options && options.onCapture && options.onCapture({
+ url: this._createUrlPrefix(options) + url,
+ request: data,
+ httpCode: error && error.status,
+ httpMsg: msg + (error.message ? (' / ' + error.message) : ''),
+ });
+ });
reject(null);
},
});
@@ -215,8 +229,8 @@
if (typeof responseData.state === 'object' && typeof responseData.data === 'object') {
return responseData;
}
- // App版请求，响应体转换
- if (typeof responseData.ret !== 'undefined' && typeof responseData.data !== 'undefined') {
+ // App版请求（存在ret直接视为App请求），响应体转换
+ if (typeof responseData.ret !== 'undefined') {
// 转换数据体
let data2 = { rows: [] };
// 数组类型
@@ -230,6 +244,10 @@
if (!Tools.isEmptyObject(responseData.data)) {
data2 = responseData.data;
}
+ }
+ // 不存在
+ else if (typeof responseData.data === 'undefined') {
+ data2 = {};
}
// 转换响应码
let code = 0;
@@ -305,9 +323,11 @@
/**
* 解析捕获的网络错误
* @param err
+ * @param options
+ * @param callback
* @private
*/
- _resolveCaughtNetErr(err) {
+ _resolveCaughtNetErr(err, options, callback) {
let msg = '';
if (err && err.status) {
switch (err.status) {
@@ -345,14 +365,18 @@
} else {
msg += '解析通讯数据异常！';
}
+ callback(msg);
setTimeout(() => {
- this._message('fail', msg);
+ if (typeof options.silence === 'undefined' || !options.silence) {
+ this._message('fail', msg);
+ }
}, 20);
}
/**
* 转换响应体
* @param response
+ * @param options
* @returns {Object|{}|null}
* @private
*/
@@ -566,7 +590,7 @@
title: msg,
icon: 'none',
mask: false,
- duration: type === 'fail' ? 3000 : 2000,
+ duration: (type === 'fail' || type === 'error') ? 3000 : 2000,
});
}
--
Gitblit v1.9.1