Skip to content

F
fetch-api
Commit 60cae9e1 authored by rockyl's avatar rockyl
Browse files
Options

init

parent 66d1a76e
Show whitespace changes
Inline Side-by-side
Showing with 25 additions and 7 deletions
out/index.js
View file @ 60cae9e1
"use strict"; "use strict";
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) { var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
if (k2 === undefined) k2 = k; if (k2 === undefined) k2 = k;
Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } }); var desc = Object.getOwnPropertyDescriptor(m, k);
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
desc = { enumerable: true, get: function() { return m[k]; } };
}
Object.defineProperty(o, k2, desc);
}) : (function(o, m, k, k2) { }) : (function(o, m, k, k2) {
if (k2 === undefined) k2 = k; if (k2 === undefined) k2 = k;
o[k2] = m[k]; o[k2] = m[k];
...@@ -66,7 +70,7 @@ async function fetchApi(uri, { host = '', params, headers = {}, method = 'get', ...@@ -66,7 +70,7 @@ async function fetchApi(uri, { host = '', params, headers = {}, method = 'get',
break; break;
case 'form': case 'form':
options.headers['Content-Type'] = 'application/x-www-form-urlencoded'; options.headers['Content-Type'] = 'application/x-www-form-urlencoded';
options.body = querystringify_1.stringify(params); options.body = (0, querystringify_1.stringify)(params);
break; break;
case 'json': case 'json':
options.headers['Content-Type'] = 'application/json'; options.headers['Content-Type'] = 'application/json';
...@@ -76,7 +80,7 @@ async function fetchApi(uri, { host = '', params, headers = {}, method = 'get', ...@@ -76,7 +80,7 @@ async function fetchApi(uri, { host = '', params, headers = {}, method = 'get',
} }
else { else {
url += url.indexOf('?') < 0 ? '?' : ''; url += url.indexOf('?') < 0 ? '?' : '';
url += (url.endsWith('?') ? '' : '&') + querystringify_1.stringify(params); url += (url.endsWith('?') ? '' : '&') + (0, querystringify_1.stringify)(params);
} }
} }
try { try {
...@@ -84,12 +88,18 @@ async function fetchApi(uri, { host = '', params, headers = {}, method = 'get', ...@@ -84,12 +88,18 @@ async function fetchApi(uri, { host = '', params, headers = {}, method = 'get',
const response = await fetchMethod(url, options); const response = await fetchMethod(url, options);
const respText = await response.text(); const respText = await response.text();
if (response.status === 310) { if (response.status === 310) {
console.log('重定向到:' + respText);
try {
location.href = respText; location.href = respText;
} }
catch (e) {
}
}
let jsonObj = JSON.parse(respText); let jsonObj = JSON.parse(respText);
if (_options.successfullyJudge(jsonObj)) { if (_options.successfullyJudge(jsonObj)) {
return jsonObj.data; return jsonObj.data;
} }
console.log(jsonObj);
return Promise.reject(new ApiError('call api failed', jsonObj.code, errMessage || jsonObj[_options.messageField])); return Promise.reject(new ApiError('call api failed', jsonObj.code, errMessage || jsonObj[_options.messageField]));
} }
catch (e) { catch (e) {
......
out/index.js.map
View file @ 60cae9e1
{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"} {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
\ No newline at end of file \ No newline at end of file
package.json
View file @ 60cae9e1
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
}, },
"scripts": { "scripts": {
"dev": "tsc -w", "dev": "tsc -w",
"build": "tsc" "build": "tsc",
"release": "npm version patch && npm publish"
} }
} }
src/index.ts
View file @ 60cae9e1
...@@ -160,7 +160,12 @@ export async function fetchApi( ...@@ -160,7 +160,12 @@ export async function fetchApi(
if (response.status === 310) { if (response.status === 310) {
//客户端重定向,用于跨域重定向 //客户端重定向,用于跨域重定向
console.log('重定向到:' + respText)
try {
location.href = respText; location.href = respText;
} catch (e) {
}
} }
let jsonObj = JSON.parse(respText); let jsonObj = JSON.parse(respText);
...@@ -168,6 +173,8 @@ export async function fetchApi( ...@@ -168,6 +173,8 @@ export async function fetchApi(
return jsonObj.data; return jsonObj.data;
} }
console.log(jsonObj)
return Promise.reject( return Promise.reject(
new ApiError('call api failed', jsonObj.code, errMessage || jsonObj[_options.messageField]), new ApiError('call api failed', jsonObj.code, errMessage || jsonObj[_options.messageField]),
); );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment