@vtx/utils - npm Package Compare versions

Comparing version 1.0.23 to 1.0.24

lib/downloadFile.js

@@ -10,2 +10,5 @@ "use strict";
 var _getVtxToken = _interopRequireDefault(require("./getVtxToken"));
+var _getSignature = _interopRequireDefault(require("./getSignature"));
+var _lodash = require("lodash");
+var _trim = _interopRequireDefault(require("./trim"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
@@ -62,15 +65,19 @@ /* eslint-disable @typescript-eslint/ban-ts-ignore */
  */
-var QUERY_TIMEOUT_MILLS = 30 * 1000;
+var QUERY_TIMEOUT_MILLS = 30;
 var requestToResponse = function requestToResponse(url, postData) {
-  var token = (0, _getVtxToken["default"])("token") || '';
+  var token = (0, _getVtxToken["default"])('token') || '';
+  var requestData = {};
+  if (postData.data !== undefined) {
+    requestData = Object.prototype.toString.call(postData.data) === '[object Object]' ? _qs["default"].stringify((0, _trim["default"])(postData.data)) : (0, _trim["default"])(JSON.parse(postData.data));
+  }
   var params = {
     url: url,
-    method: 'post',
-    timeout: QUERY_TIMEOUT_MILLS,
+    method: (postData === null || postData === void 0 ? void 0 : postData.method) || 'post',
+    timeout: (postData.timeout || QUERY_TIMEOUT_MILLS) * 1000,
     responseType: 'blob',
-    headers: {
+    headers: Object.assign(Object.assign({
       Authorization: token ? "Bearer ".concat(token) : '',
       'Content-Type': 'application/x-www-form-urlencoded'
-    },
-    data: _qs["default"].stringify(postData.data || {})
+    }, (0, _getSignature["default"])((0, _lodash.isObject)(postData.data) ? postData.data : {}, undefined, (0, _lodash.isObject)(postData.data) ? undefined : postData.data)), postData.extraHeader || {}),
+    data: requestData
   };
@@ -91,11 +98,22 @@ return new Promise(function (resolve, reject) {
   requestToResponse(url, option).then(function (res) {
-    if (res.headers['content-disposition']) {
-      var filename = option.fileName ? option.fileName : getFileNameFromDisposition(res.headers['content-disposition']);
-      if ('download' in document.createElement('a')) {
-        download(res.data, filename);
+    var _a, _b, _c, _d, _e, _f, _g;
+    if (option === null || option === void 0 ? void 0 : option.download) {
+      (_a = option === null || option === void 0 ? void 0 : option.download) === null || _a === void 0 ? void 0 : _a.call(option, res.data);
+      (_b = option === null || option === void 0 ? void 0 : option.success) === null || _b === void 0 ? void 0 : _b.call(option);
+    } else {
+      var disposition = (_c = res.headers['content-disposition']) === null || _c === void 0 ? void 0 : _c.toLowerCase();
+      if (disposition) {
+        var filename = option.fileName ? option.fileName : getFileNameFromDisposition(disposition);
+        if ('download' in document.createElement('a')) {
+          download(res.data, filename);
+          (_d = option === null || option === void 0 ? void 0 : option.success) === null || _d === void 0 ? void 0 : _d.call(option);
+        } else {
+          console.error('浏览器不支持');
+          (_e = option === null || option === void 0 ? void 0 : option.fail) === null || _e === void 0 ? void 0 : _e.call(option);
+        }
       } else {
-        console.error('浏览器不支持');
+        console.error('文件不存在');
+        (_f = option === null || option === void 0 ? void 0 : option.fail) === null || _f === void 0 ? void 0 : _f.call(option);
       }
-    } else {
-      console.error('文件不存在');
+      (_g = option === null || option === void 0 ? void 0 : option["finally"]) === null || _g === void 0 ? void 0 : _g.call(option);
     }
@@ -102,0 +120,0 @@ });

lib/downloadFile.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"downloadFile.js","names":["_axios","_interopRequireDefault","require","_qs","_getVtxToken","e","__esModule","downLoadByForm","reqURL","formDom","document","createElement","method","action","style","display","body","appendChild","submit","remove","downloadByATag","href","filename","a","download","click","window","URL","revokeObjectURL","content","blob","Blob","navigator","msSaveOrOpenBlob","createObjectURL","QUERY_TIMEOUT_MILLS","requestToResponse","url","postData","token","getVtxToken","params","timeout","responseType","headers","Authorization","concat","data","qs","stringify","Promise","resolve","reject","axios","then","res","err","getFileNameFromDisposition","disposition","exec","decodeURIComponent","replace","downloadByBlob","option","fileName","console","error","DownloadType","downloadFile","options","type","arguments","length","undefined","Form","_default","exports"],"sources":["downloadFile.js"],"sourcesContent":["/* eslint-disable @typescript-eslint/ban-ts-ignore */\n/**\n * 通过form或blob下载文件\n */\nimport axios from 'axios';\nimport qs from 'qs';\nimport getVtxToken from './getVtxToken';\nconst downLoadByForm = (reqURL) => {\n    const formDom = document.createElement('form'); //定义一个form表单\n    formDom.method = 'post';\n    formDom.action = reqURL;\n    formDom.style.display = 'none';\n    document.body.appendChild(formDom); //将表单放置在web中\n    formDom.submit(); //表单提交\n    formDom.remove();\n};\n/**\n * 通过a标签模拟下载\n * @param {String} href\n * @param {String} filename\n */\nconst downloadByATag = (href, filename) => {\n    const a = document.createElement('a');\n    a.download = filename;\n    a.style.display = 'none';\n    a.href = href;\n    document.body.appendChild(a);\n    a.click();\n    a.remove();\n    window.URL.revokeObjectURL(href);\n};\n/**\n * 下载，兼容IE\n * @param {any} content\n * @param {String} filename\n */\nconst download = (content, filename) => {\n    const blob = new Blob([content]);\n    // IE\n    // @ts-ignore\n    if (window.navigator && window.navigator.msSaveOrOpenBlob) {\n        // @ts-ignore\n        window.navigator.msSaveOrOpenBlob(blob, filename);\n    }\n    else {\n        downloadByATag(window.URL.createObjectURL(blob), filename);\n    }\n};\n/**\n * 发送http请求\n * @param {Object} postData api参数\n * @returns reponse\n */\nconst QUERY_TIMEOUT_MILLS = 30 * 1000;\nconst requestToResponse = (url, postData) => {\n    const token = getVtxToken(\"token\") || '';\n    const params = {\n        url: url,\n        method: 'post',\n        timeout: QUERY_TIMEOUT_MILLS,\n        responseType: 'blob',\n        headers: {\n            Authorization: token ? `Bearer ${token}` : '',\n            'Content-Type': 'application/x-www-form-urlencoded',\n        },\n        data: qs.stringify(postData.data || {}),\n    };\n    return new Promise((resolve, reject) => {\n        axios(params)\n            .then((res) => {\n            resolve(res);\n        })\n            .catch((err) => {\n            reject(err);\n        });\n    });\n};\nconst getFileNameFromDisposition = (disposition) => {\n    const filename = (/filename[^;=\\n]*=((['\"]).*?\\2|[^;\\n]*)/.exec(disposition) || [])[1];\n    return decodeURIComponent(filename === null || filename === void 0 ? void 0 : filename.replace(\"utf-8'zh_cn'\", ''));\n};\nconst downloadByBlob = (url, option) => {\n    requestToResponse(url, option).then((res) => {\n        if (res.headers['content-disposition']) {\n            const filename = option.fileName\n                ? option.fileName\n                : getFileNameFromDisposition(res.headers['content-disposition']);\n            if ('download' in document.createElement('a')) {\n                download(res.data, filename);\n            }\n            else {\n                console.error('浏览器不支持');\n            }\n        }\n        else {\n            console.error('文件不存在');\n        }\n    });\n};\nvar DownloadType;\n(function (DownloadType) {\n    DownloadType[\"Form\"] = \"form\";\n    DownloadType[\"Blob\"] = \"blob\";\n})(DownloadType || (DownloadType = {}));\nfunction downloadFile(url, options, type = DownloadType.Form) {\n    switch (type) {\n        case DownloadType.Form:\n            downLoadByForm(url);\n            break;\n        case DownloadType.Blob:\n            downloadByBlob(url, options);\n            break;\n        default:\n            break;\n    }\n}\nexport default downloadFile;\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"downloadFile.js","names":["_axios","_interopRequireDefault","require","_qs","_getVtxToken","_getSignature","_lodash","_trim","e","__esModule","downLoadByForm","reqURL","formDom","document","createElement","method","action","style","display","body","appendChild","submit","remove","downloadByATag","href","filename","a","download","click","window","URL","revokeObjectURL","content","blob","Blob","navigator","msSaveOrOpenBlob","createObjectURL","QUERY_TIMEOUT_MILLS","requestToResponse","url","postData","token","getVtxToken","requestData","data","undefined","Object","prototype","toString","call","qs","stringify","trim","JSON","parse","params","timeout","responseType","headers","assign","Authorization","concat","getSignature","isObject","extraHeader","Promise","resolve","reject","axios","then","res","err","getFileNameFromDisposition","disposition","exec","decodeURIComponent","replace","downloadByBlob","option","_a","_b","_c","_d","_e","_f","_g","success","toLowerCase","fileName","console","error","fail","DownloadType","downloadFile","options","type","arguments","length","Form","_default","exports"],"sources":["downloadFile.js"],"sourcesContent":["/* eslint-disable @typescript-eslint/ban-ts-ignore */\n/**\n * 通过form或blob下载文件\n */\nimport axios from 'axios';\nimport qs from 'qs';\nimport getVtxToken from './getVtxToken';\nimport getSignature from './getSignature';\nimport { isObject } from 'lodash';\nimport trim from './trim';\nconst downLoadByForm = (reqURL) => {\n    const formDom = document.createElement('form'); //定义一个form表单\n    formDom.method = 'post';\n    formDom.action = reqURL;\n    formDom.style.display = 'none';\n    document.body.appendChild(formDom); //将表单放置在web中\n    formDom.submit(); //表单提交\n    formDom.remove();\n};\n/**\n * 通过a标签模拟下载\n * @param {String} href\n * @param {String} filename\n */\nconst downloadByATag = (href, filename) => {\n    const a = document.createElement('a');\n    a.download = filename;\n    a.style.display = 'none';\n    a.href = href;\n    document.body.appendChild(a);\n    a.click();\n    a.remove();\n    window.URL.revokeObjectURL(href);\n};\n/**\n * 下载，兼容IE\n * @param {any} content\n * @param {String} filename\n */\nconst download = (content, filename) => {\n    const blob = new Blob([content]);\n    // IE\n    // @ts-ignore\n    if (window.navigator && window.navigator.msSaveOrOpenBlob) {\n        // @ts-ignore\n        window.navigator.msSaveOrOpenBlob(blob, filename);\n    }\n    else {\n        downloadByATag(window.URL.createObjectURL(blob), filename);\n    }\n};\n/**\n * 发送http请求\n * @param {Object} postData api参数\n * @returns reponse\n */\nconst QUERY_TIMEOUT_MILLS = 30;\nconst requestToResponse = (url, postData) => {\n    const token = getVtxToken('token') || '';\n    let requestData = {};\n    if (postData.data !== undefined) {\n        requestData =\n            Object.prototype.toString.call(postData.data) === '[object Object]'\n                ? qs.stringify(trim(postData.data))\n                : trim(JSON.parse(postData.data));\n    }\n    const params = {\n        url: url,\n        method: (postData === null || postData === void 0 ? void 0 : postData.method) || 'post',\n        timeout: (postData.timeout || QUERY_TIMEOUT_MILLS) * 1000,\n        responseType: 'blob',\n        headers: Object.assign(Object.assign({ Authorization: token ? `Bearer ${token}` : '', 'Content-Type': 'application/x-www-form-urlencoded' }, getSignature(isObject(postData.data) ? postData.data : {}, undefined, isObject(postData.data) ? undefined : postData.data)), (postData.extraHeader || {})),\n        data: requestData,\n    };\n    return new Promise((resolve, reject) => {\n        axios(params)\n            .then((res) => {\n            resolve(res);\n        })\n            .catch((err) => {\n            reject(err);\n        });\n    });\n};\nconst getFileNameFromDisposition = (disposition) => {\n    const filename = (/filename[^;=\\n]*=((['\"]).*?\\2|[^;\\n]*)/.exec(disposition) || [])[1];\n    return decodeURIComponent(filename === null || filename === void 0 ? void 0 : filename.replace(\"utf-8'zh_cn'\", ''));\n};\nconst downloadByBlob = (url, option) => {\n    requestToResponse(url, option).then((res) => {\n        var _a, _b, _c, _d, _e, _f, _g;\n        if (option === null || option === void 0 ? void 0 : option.download) {\n            (_a = option === null || option === void 0 ? void 0 : option.download) === null || _a === void 0 ? void 0 : _a.call(option, res.data);\n            (_b = option === null || option === void 0 ? void 0 : option.success) === null || _b === void 0 ? void 0 : _b.call(option);\n        }\n        else {\n            const disposition = (_c = res.headers['content-disposition']) === null || _c === void 0 ? void 0 : _c.toLowerCase();\n            if (disposition) {\n                const filename = option.fileName\n                    ? option.fileName\n                    : getFileNameFromDisposition(disposition);\n                if ('download' in document.createElement('a')) {\n                    download(res.data, filename);\n                    (_d = option === null || option === void 0 ? void 0 : option.success) === null || _d === void 0 ? void 0 : _d.call(option);\n                }\n                else {\n                    console.error('浏览器不支持');\n                    (_e = option === null || option === void 0 ? void 0 : option.fail) === null || _e === void 0 ? void 0 : _e.call(option);\n                }\n            }\n            else {\n                console.error('文件不存在');\n                (_f = option === null || option === void 0 ? void 0 : option.fail) === null || _f === void 0 ? void 0 : _f.call(option);\n            }\n            (_g = option === null || option === void 0 ? void 0 : option.finally) === null || _g === void 0 ? void 0 : _g.call(option);\n        }\n    });\n};\nvar DownloadType;\n(function (DownloadType) {\n    DownloadType[\"Form\"] = \"form\";\n    DownloadType[\"Blob\"] = \"blob\";\n})(DownloadType || (DownloadType = {}));\nfunction downloadFile(url, options, type = DownloadType.Form) {\n    switch (type) {\n        case DownloadType.Form:\n            downLoadByForm(url);\n            break;\n        case DownloadType.Blob:\n            downloadByBlob(url, options);\n            break;\n        default:\n            break;\n    }\n}\nexport default downloadFile;\n"],"mappings":"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","ignoreList":[]}

lib/request.js

@@ -136,7 +136,11 @@ "use strict";
   var params = data || body;
-  var requestData = Object.prototype.toString.call(params) === '[object Object]' ? _qs["default"].stringify((0, _trim["default"])(params)) : (0, _trim["default"])(JSON.parse(params));
-  var headers = extraHeader ? {
+  var isFormData = typeof FormData !== 'undefined' && params && typeof params.append === 'function' && typeof params.get === 'function';
+  var requestData = params;
+  if (!isFormData) {
+    requestData = Object.prototype.toString.call(params) === '[object Object]' ? _qs["default"].stringify((0, _trim["default"])(params)) : (0, _trim["default"])(JSON.parse(params));
+  }
+  var headers = (extraHeader === null || extraHeader === void 0 ? void 0 : extraHeader.msg) ? {
     operation: extraHeader.msg
   } : {};
-  headers = Object.assign(Object.assign(Object.assign({}, headers), (0, _getSignature["default"])((0, _lodash.isObject)(params) ? params : {}, undefined, (0, _lodash.isObject)(params) ? undefined : params)), options.extraHeader || {});
+  headers = Object.assign(Object.assign(Object.assign({}, headers), !isFormData ? (0, _getSignature["default"])((0, _lodash.isObject)(params) ? params : {}, undefined, (0, _lodash.isObject)(params) ? undefined : params) : {}), options.extraHeader || {});
   var extra = {
@@ -143,0 +147,0 @@ headers: headers

lib/request.js.map

@@ -1,1 +0,1 @@
-{"version":3,"file":"request.js","names":["_axios","_interopRequireDefault","require","_qs","_trim","_compactObject","_getVtxToken","_getSignature","_lodash","e","__esModule","service","axios","create","headers","THIRTY_SECOND_MILLS","defaults","timeout","_requestHandler","config","token","getVtxToken","concat","_requestErrorHandler","error","Promise","reject","interceptors","request","use","_responseHandler","response","status","data","statusText","Object","assign","Error","_responseErrorHandler","msg","console","get","url","options","arguments","length","undefined","body","tenantId","params","requestData","prototype","toString","call","compactObject","trim","sendParams","getSignature","indexOf","split","extraHeader","resolve","then","res","err","post","qs","stringify","JSON","parse","operation","isObject","extra","_default","exports"],"sources":["request.js"],"sourcesContent":["/*\n * @Description:\n * @Author: chenxinyu\n * @Date: 2021-04-15 09:15:04\n * @LastEditors: yewu\n * @LastEditTime: 2021-12-23 10:02:21\n */\nimport axios from 'axios';\nimport qs from 'qs';\nimport trim from './trim';\nimport compactObject from './compactObject';\nimport getVtxToken from './getVtxToken';\nimport getSignature from './getSignature';\nimport { isObject } from 'lodash';\nconst service = axios.create({\n    headers: {\n        'Cache-Control': 'no-cache',\n    },\n});\nconst THIRTY_SECOND_MILLS = 30 * 1000;\n// 全局设置默认超时\nservice.defaults.timeout = THIRTY_SECOND_MILLS;\n/**\n * 响应请求,请求头中添加token验证信息\n * @param {*} config\n */\nconst _requestHandler = (config) => {\n    const token = getVtxToken('token');\n    config.headers['Authorization'] = token ? `Bearer ${token}` : '';\n    return config;\n};\n/**\n * 响应请求错误处理\n * @param {*} config\n */\nconst _requestErrorHandler = (error) => {\n    return Promise.reject(error);\n};\nservice.interceptors.request.use(_requestHandler, _requestErrorHandler);\n/**\n * 数据响应处理\n * @param {*} response\n */\nconst _responseHandler = (response) => {\n    const { status, data, statusText, headers } = response;\n    if (status >= 200 && status < 300) {\n        return Object.assign(Object.assign({}, data), { headers });\n    }\n    const error = new Error(statusText);\n    throw error;\n};\n/**\n * 数据响应错误处理\n * @param {*} error\n */\nconst _responseErrorHandler = (error) => {\n    if (error.response) {\n        let msg;\n        switch (error.response.status) {\n            case 401:\n                msg = '未授权！错误码【401】';\n                break;\n            case 404:\n                msg = '接口请求不存在！错误码【404】';\n                break;\n            case 500:\n                msg = '服务异常！错误码【500】';\n                break;\n            case 502:\n                msg = 'Bad Gateway! 错误码【502】';\n                break;\n            default:\n                break;\n        }\n        msg && console.error(msg);\n    }\n};\nservice.interceptors.response.use(_responseHandler, _responseErrorHandler);\n/**\n * get请求，\n * @param {*} url\n * @param {*} options\n */\nconst get = (url, options = {}) => {\n    const { data, body, timeout } = options;\n    const tenantId = getVtxToken('tenantId');\n    if (timeout) {\n        service.defaults.timeout = timeout;\n    }\n    const params = data || body;\n    // 精简对象，去除值为'',null,undefined的字段\n    const requestData = Object.prototype.toString.call(params) === '[object Object]'\n        ? compactObject(trim(Object.assign({}, params)))\n        : {};\n    const sendParams = Object.assign(Object.assign({}, requestData), { tenantId });\n    const headers = Object.assign(Object.assign({}, getSignature(sendParams, undefined, url.indexOf('?') > -1 ? url.split('?')[1] : undefined)), (options.extraHeader || {}));\n    return new Promise((resolve, reject) => {\n        service\n            .get(url, {\n            params: sendParams,\n            headers\n        })\n            .then((res) => {\n            resolve(res);\n        })\n            .catch((err) => {\n            reject(err);\n        });\n    });\n};\n/**\n * post请求\n * @param {*} url\n * @param {*} options\n */\nconst post = (url, options = {}) => {\n    const { data, body, timeout, extraHeader } = options;\n    const params = data || body;\n    const requestData = Object.prototype.toString.call(params) === '[object Object]'\n        ? qs.stringify(trim(params))\n        : trim(JSON.parse(params));\n    let headers = extraHeader ? { operation: extraHeader.msg } : {};\n    headers = Object.assign(Object.assign(Object.assign({}, headers), getSignature(isObject(params) ? params : {}, undefined, isObject(params) ? undefined : params)), (options.extraHeader || {}));\n    const extra = {\n        headers: headers,\n    };\n    if (timeout) {\n        extra.timeout = timeout;\n    }\n    return new Promise((resolve, reject) => {\n        service\n            .post(url, requestData, extra)\n            .then((res) => {\n            resolve(res);\n        })\n            .catch((err) => {\n            reject(err);\n        });\n    });\n};\nexport default { get, post };\n"],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"request.js","names":["_axios","_interopRequireDefault","require","_qs","_trim","_compactObject","_getVtxToken","_getSignature","_lodash","e","__esModule","service","axios","create","headers","THIRTY_SECOND_MILLS","defaults","timeout","_requestHandler","config","token","getVtxToken","concat","_requestErrorHandler","error","Promise","reject","interceptors","request","use","_responseHandler","response","status","data","statusText","Object","assign","Error","_responseErrorHandler","msg","console","get","url","options","arguments","length","undefined","body","tenantId","params","requestData","prototype","toString","call","compactObject","trim","sendParams","getSignature","indexOf","split","extraHeader","resolve","then","res","err","post","isFormData","FormData","append","qs","stringify","JSON","parse","operation","isObject","extra","_default","exports"],"sources":["request.js"],"sourcesContent":["/*\n * @Description:\n * @Author: chenxinyu\n * @Date: 2021-04-15 09:15:04\n * @LastEditors: yewu\n * @LastEditTime: 2021-12-23 10:02:21\n */\nimport axios from 'axios';\nimport qs from 'qs';\nimport trim from './trim';\nimport compactObject from './compactObject';\nimport getVtxToken from './getVtxToken';\nimport getSignature from './getSignature';\nimport { isObject } from 'lodash';\nconst service = axios.create({\n    headers: {\n        'Cache-Control': 'no-cache',\n    },\n});\nconst THIRTY_SECOND_MILLS = 30 * 1000;\n// 全局设置默认超时\nservice.defaults.timeout = THIRTY_SECOND_MILLS;\n/**\n * 响应请求,请求头中添加token验证信息\n * @param {*} config\n */\nconst _requestHandler = (config) => {\n    const token = getVtxToken('token');\n    config.headers['Authorization'] = token ? `Bearer ${token}` : '';\n    return config;\n};\n/**\n * 响应请求错误处理\n * @param {*} config\n */\nconst _requestErrorHandler = (error) => {\n    return Promise.reject(error);\n};\nservice.interceptors.request.use(_requestHandler, _requestErrorHandler);\n/**\n * 数据响应处理\n * @param {*} response\n */\nconst _responseHandler = (response) => {\n    const { status, data, statusText, headers } = response;\n    if (status >= 200 && status < 300) {\n        return Object.assign(Object.assign({}, data), { headers });\n    }\n    const error = new Error(statusText);\n    throw error;\n};\n/**\n * 数据响应错误处理\n * @param {*} error\n */\nconst _responseErrorHandler = (error) => {\n    if (error.response) {\n        let msg;\n        switch (error.response.status) {\n            case 401:\n                msg = '未授权！错误码【401】';\n                break;\n            case 404:\n                msg = '接口请求不存在！错误码【404】';\n                break;\n            case 500:\n                msg = '服务异常！错误码【500】';\n                break;\n            case 502:\n                msg = 'Bad Gateway! 错误码【502】';\n                break;\n            default:\n                break;\n        }\n        msg && console.error(msg);\n    }\n};\nservice.interceptors.response.use(_responseHandler, _responseErrorHandler);\n/**\n * get请求，\n * @param {*} url\n * @param {*} options\n */\nconst get = (url, options = {}) => {\n    const { data, body, timeout } = options;\n    const tenantId = getVtxToken('tenantId');\n    if (timeout) {\n        service.defaults.timeout = timeout;\n    }\n    const params = data || body;\n    // 精简对象，去除值为'',null,undefined的字段\n    const requestData = Object.prototype.toString.call(params) === '[object Object]'\n        ? compactObject(trim(Object.assign({}, params)))\n        : {};\n    const sendParams = Object.assign(Object.assign({}, requestData), { tenantId });\n    const headers = Object.assign(Object.assign({}, getSignature(sendParams, undefined, url.indexOf('?') > -1 ? url.split('?')[1] : undefined)), (options.extraHeader || {}));\n    return new Promise((resolve, reject) => {\n        service\n            .get(url, {\n            params: sendParams,\n            headers\n        })\n            .then((res) => {\n            resolve(res);\n        })\n            .catch((err) => {\n            reject(err);\n        });\n    });\n};\n/**\n * post请求\n * @param {*} url\n * @param {*} options\n */\nconst post = (url, options = {}) => {\n    const { data, body, timeout, extraHeader } = options;\n    const params = data || body;\n    const isFormData = typeof FormData !== 'undefined' &&\n        params &&\n        typeof params.append === 'function' &&\n        typeof params.get === 'function';\n    let requestData = params;\n    if (!isFormData) {\n        requestData =\n            Object.prototype.toString.call(params) === '[object Object]'\n                ? qs.stringify(trim(params))\n                : trim(JSON.parse(params));\n    }\n    let headers = (extraHeader === null || extraHeader === void 0 ? void 0 : extraHeader.msg) ? { operation: extraHeader.msg } : {};\n    headers = Object.assign(Object.assign(Object.assign({}, headers), (!isFormData\n        ? getSignature(isObject(params) ? params : {}, undefined, isObject(params) ? undefined : params)\n        : {})), (options.extraHeader || {}));\n    const extra = {\n        headers,\n    };\n    if (timeout) {\n        extra.timeout = timeout;\n    }\n    return new Promise((resolve, reject) => {\n        service\n            .post(url, requestData, extra)\n            .then((res) => {\n            resolve(res);\n        })\n            .catch((err) => {\n            reject(err);\n        });\n    });\n};\nexport default { get, post };\n"],"mappings":"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","ignoreList":[]}

package.json

 {
   "name": "@vtx/utils",
-  "version": "1.0.23",
+  "version": "1.0.24",
   "description": "工具库",
@@ -5,0 +5,0 @@ "main": "lib/index.js",

No alert changes

Improved metrics

Total package byte prevSize

82406

9.19%

Lines of code

768

2.95%

No dependency changes