tieshengkeji/npm-tool
1
0
Fork 0
Code Pull Requests Actions Packages Releases Activity

perf：调整分页

Browse Source
This commit is contained in:
曾文豪
2023-03-27 11:18:55 +08:00
parent d93a76cd60
commit 2165bd8a02
2 changed files with 86 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@tiesheng/npm-tool",
"version": "1.0.8",
"version": "1.0.10",
"description": "npm tool package",
"main": "index.js",
"scripts": {

166
src/https/HttpUtil.js
View File

@@ -5,42 +5,42 @@ const crypto = require("../utils/Crypto");
const GlobalConfig = require("../utils/GlobalConfig");
const codeMessage = {
200: "服务器成功返回请求的数据。",
201: "新建或修改数据成功。",
202: "一个请求已经进入后台排队（异步任务）。",
204: "删除数据成功。",
400: "发出的请求有错误，服务器没有进行新建或修改数据的操作。",
401: "用户没有权限（令牌、用户名、密码错误）。",
403: "用户得到授权，但是访问是被禁止的。",
404: "发出的请求针对的是不存在的记录，服务器没有进行操作。",
406: "请求的格式不可得。",
410: "请求的资源被永久删除，且不会再得到的。",
422: "当创建一个对象时，发生一个验证错误。",
500: "服务器发生错误，请检查服务器。",
502: "网关错误。",
503: "服务不可用，服务器暂时过载或维护。",
504: "网关超时。",
200: "服务器成功返回请求的数据。",
201: "新建或修改数据成功。",
202: "一个请求已经进入后台排队（异步任务）。",
204: "删除数据成功。",
400: "发出的请求有错误，服务器没有进行新建或修改数据的操作。",
401: "用户没有权限（令牌、用户名、密码错误）。",
403: "用户得到授权，但是访问是被禁止的。",
404: "发出的请求针对的是不存在的记录，服务器没有进行操作。",
406: "请求的格式不可得。",
410: "请求的资源被永久删除，且不会再得到的。",
422: "当创建一个对象时，发生一个验证错误。",
500: "服务器发生错误，请检查服务器。",
502: "网关错误。",
503: "服务不可用，服务器暂时过载或维护。",
504: "网关超时。",
};
/**
* 异常处理程序
*/
const errorHandler = (error) => {
const {response = {}} = error;
let res = {code: -1, message: "参数错误或服务器异常"};
if (!Common.isEmpty(res)) {
res = {code: response.status, message: codeMessage[response.status] || response.statusText};
}
return res;
const {response = {}} = error;
let res = {code: -1, message: "参数错误或服务器异常"};
if (!Common.isEmpty(res)) {
res = {code: response.status, message: codeMessage[response.status] || response.statusText};
}
return res;
};
/**
* 配置request请求时的默认参数
*/
const request = extend({
errorHandler, // 默认错误处理
credentials: "include", // 默认请求是否带上cookie,
requestType: "json", // 表单提交post请求
errorHandler, // 默认错误处理
credentials: "include", // 默认请求是否带上cookie,
requestType: "json", // 表单提交post请求
});
/**
@@ -48,26 +48,26 @@ const request = extend({
* @param options
*/
const dealParamsBody = (options) => {
// 存在分页器的时候
if (options.params?.pagination) {
options.params.pageSize = options.params.pagination.pageSize;
options.params.pageNum = options.params.pagination.current;
delete options.params['pagination'];
}
// 存在分页器的时候
if (options.params?.pagination) {
options.params.pageSize = options.params.pagination.pageSize;
options.params.pageNum = options.params.pagination.current;
delete options.params['pagination'];
}
// equals 处理
if (options.params && options.params.equals) {
let ids = [];
let equalsObj = options.params.equals;
Object.keys(equalsObj).map((key) => {
if (!Common.isEmpty(equalsObj[key])) {
ids.push(key + '=' + equalsObj[key]);
}
});
options.params.equals = ids.join(',');
}
// equals 处理
if (options.params && options.params.equals) {
let ids = [];
let equalsObj = options.params.equals;
Object.keys(equalsObj).map((key) => {
if (!Common.isEmpty(equalsObj[key])) {
ids.push(key + '=' + equalsObj[key]);
}
});
options.params.equals = ids.join(',');
}
return options;
return options;
};
/**
@@ -77,33 +77,37 @@ const dealParamsBody = (options) => {
* @returns {Promise<<any>>}
*/
async function req(url, options) {
if (GlobalConfig.getConfig().prefix) {
url = GlobalConfig.getConfig().prefix + url;
}
return new Promise((resolve, reject) => {
request(url, {
...dealParamsBody(options),
headers: {
...options.headers, token: Storage.getUserToken() || '',
},
})
.then((res) => {
if (res.code === 200) {
let data = res.data;
if (res.encrypt) {
data = crypto.decrypt(data);
data = Common.parseJSON(data, data);
}
resolve({data, recordsTotal: res.recordsTotal})
} else {
GlobalConfig.getConfig().onHttpError(res);
reject(res)
}
let {prefix} = GlobalConfig.getConfig();
if (typeof prefix === "function") {
prefix = prefix(url);
}
if (prefix) {
url = prefix + url;
}
return new Promise((resolve, reject) => {
request(url, {
...dealParamsBody(options),
headers: {
...options.headers, token: Storage.getUserToken() || '',
},
})
.catch((err) => {
reject({code: err.data.status, message: err.data.error});
});
});
.then((res) => {
if (res.code === 200) {
let data = res.data;
if (res.encrypt) {
data = crypto.decrypt(data);
data = Common.parseJSON(data, data);
}
resolve({data, recordsTotal: res.recordsTotal})
} else {
GlobalConfig.getConfig().onHttpError(res);
reject(res)
}
})
.catch((err) => {
reject({code: err.data.status, message: err.data.error});
});
});
}
/**
@@ -113,7 +117,7 @@ async function req(url, options) {
* @param options
*/
async function get(url, params = {}, options = {}) {
return req(url, {...options, method: 'GET', params});
return req(url, {...options, method: 'GET', params});
}
/**
@@ -124,14 +128,14 @@ async function get(url, params = {}, options = {}) {
*/
async function post(url, data = {}, options = {}) {
let newData = {}
if (GlobalConfig.getConfig().encryptBody) {
newData.encryptData = crypto.encrypt(JSON.stringify(data));
} else {
newData = {...data};
}
let newData = {}
if (GlobalConfig.getConfig().encryptBody) {
newData.encryptData = crypto.encrypt(JSON.stringify(data));
} else {
newData = {...data};
}
return req(url, {...options, method: 'POST', data: newData});
return req(url, {...options, method: 'POST', data: newData});
}
/**
@@ -142,13 +146,13 @@ async function post(url, data = {}, options = {}) {
* @returns {Promise<unknown>}
*/
async function form(url, data = {}, options = {}) {
return req(url, {...options, method: 'POST', data, requestType: 'form'});
return req(url, {...options, method: 'POST', data, requestType: 'form'});
}
module.exports = {
req,
get,
post,
form,
req,
get,
post,
form,
}