fix: successData is optional

This commit is contained in:
TENCENT\ivinwu
2019-04-04 16:32:51 +08:00
parent 2e05d4289e
commit 69fd371857
8 changed files with 23 additions and 20 deletions

View File

@@ -1,5 +1,5 @@
<p align="center"><img src="./image/logo.png" alt="weRequest" height="160"/></p> <p align="center"><img src="./image/logo.png" alt="weRequest" height="160"/></p>
<h2 align="center">v1.2.5</h2> <h2 align="center">v1.2.6</h2>
<p align="center"><b>解决繁琐的小程序会话管理,一款自带登录态管理的网络请求组件。</b></p> <p align="center"><b>解决繁琐的小程序会话管理,一款自带登录态管理的网络请求组件。</b></p>

View File

@@ -13,7 +13,7 @@ export interface IInitOption {
sessionExpireTime?: number; sessionExpireTime?: number;
loginTrigger?: (res: string | IAnyObject | ArrayBuffer) => boolean; loginTrigger?: (res: string | IAnyObject | ArrayBuffer) => boolean;
successTrigger: (res: string | IAnyObject | ArrayBuffer) => boolean; successTrigger: (res: string | IAnyObject | ArrayBuffer) => boolean;
successData: (res: string | IAnyObject | ArrayBuffer) => string | IAnyObject | ArrayBuffer; successData?: (res: string | IAnyObject | ArrayBuffer) => string | IAnyObject | ArrayBuffer;
errorTitle?: string | ((res: string | IAnyObject | ArrayBuffer) => string); errorTitle?: string | ((res: string | IAnyObject | ArrayBuffer) => string);
errorContent?: string | ((res: string | IAnyObject | ArrayBuffer) => string); errorContent?: string | ((res: string | IAnyObject | ArrayBuffer) => string);
} }

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,6 +1,6 @@
{ {
"name": "we-request", "name": "we-request",
"version": "1.2.5", "version": "1.2.6",
"description": "本工具通过拓展小程序的wx.request让开发者通过简单的配置实现自动管理登录态等功能", "description": "本工具通过拓展小程序的wx.request让开发者通过简单的配置实现自动管理登录态等功能",
"keywords": [ "keywords": [
"登录态", "登录态",
@@ -19,7 +19,7 @@
"type": "git", "type": "git",
"url": "https://github.com/IvinWu/weRequest.git" "url": "https://github.com/IvinWu/weRequest.git"
}, },
"main": "src/index.ts", "main": "build/weRequest.js",
"typings": "build/index.d.ts", "typings": "build/index.d.ts",
"scripts": { "scripts": {
"build": "webpack", "build": "webpack",

View File

@@ -35,7 +35,7 @@ export interface IInitOption {
/* 触发请求成功的条件参数为CGI返回的数据返回接口逻辑成功的条件 */ /* 触发请求成功的条件参数为CGI返回的数据返回接口逻辑成功的条件 */
successTrigger: (res: string | IAnyObject | ArrayBuffer) => boolean; successTrigger: (res: string | IAnyObject | ArrayBuffer) => boolean;
/* 成功之后返回数据参数为CGI返回的数据返回逻辑需要使用的数据 */ /* 成功之后返回数据参数为CGI返回的数据返回逻辑需要使用的数据 */
successData: (res: string | IAnyObject | ArrayBuffer) => string | IAnyObject | ArrayBuffer; successData?: (res: string | IAnyObject | ArrayBuffer) => string | IAnyObject | ArrayBuffer;
/* 接口逻辑失败时,错误弹窗的标题 */ /* 接口逻辑失败时,错误弹窗的标题 */
errorTitle?: string | ((res: string | IAnyObject | ArrayBuffer) => string); errorTitle?: string | ((res: string | IAnyObject | ArrayBuffer) => string);
/* 接口逻辑失败时,错误弹窗的内容 */ /* 接口逻辑失败时,错误弹窗的内容 */

View File

@@ -41,7 +41,11 @@ function response(
// 接口返回成功码 // 接口返回成功码
let realData: string | IAnyObject | ArrayBuffer = ""; let realData: string | IAnyObject | ArrayBuffer = "";
try { try {
realData = config.successData(res.data); if (typeof config.successData === 'function') {
realData = config.successData(res.data);
} else {
realData = res.data;
}
} catch (e) { } catch (e) {
console.error("Function successData occur error: " + e); console.error("Function successData occur error: " + e);
} }

View File

@@ -13,9 +13,6 @@ const defaultConfig: IInitOption = {
return true return true
}, },
urlPerfix: "", urlPerfix: "",
successData(res: any) {
return res
},
doNotCheckSession: false, doNotCheckSession: false,
errorTitle: "操作失败", errorTitle: "操作失败",
errorContent(res: any) { errorContent(res: any) {