@noah-libjs/request 0.0.8 → 0.0.9

package/dist/helper.d.ts

@@ -1,7 +1,7 @@
 import { ICommonOption } from "@noah-libjs/utils";
 import { FormInstance } from "antd";
 export type T_FETCH_OPTIONS = ((f?: FormInstance) => (Promise<ICommonOption[]> | ICommonOption[])) | {
-    url: string;
+    url: string | (() => string);
     labelKey?: string;
     valueKey?: string;
     method?: 'get' | 'post';

package/dist/index.js

@@ -1,3 +1,4 @@
+import _slicedToArray from "@babel/runtime/helpers/slicedToArray";
 import _classCallCheck from "@babel/runtime/helpers/classCallCheck";
 import _createClass from "@babel/runtime/helpers/createClass";
 import _possibleConstructorReturn from "@babel/runtime/helpers/possibleConstructorReturn";
@@ -8,7 +9,7 @@ function _callSuper(t, o, e) { return o = _getPrototypeOf(o), _possibleConstruct
 function _isNativeReflectConstruct() { try { var t = !Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); } catch (t) {} return (_isNativeReflectConstruct = function _isNativeReflectConstruct() { return !!t; })(); }
 import axios, { Axios } from 'axios';
 import utils from 'axios/lib/utils';
-import { MyLog, EventEmitter, isFunction, safe_async_call, expect_array, cache_fetch, get } from '@noah-libjs/utils';
+import { MyLog, EventEmitter, getSearchParamsAll, isFunction, safe_async_call, expect_array, isString, cache_fetch, get } from '@noah-libjs/utils';
 import bind from 'axios/lib/helpers/bind';
 var codeMessage = {
   200: '服务器成功返回请求的数据。',
@@ -134,9 +135,18 @@ var Request = /*#__PURE__*/function (_EventEmitter) {
         return onRejected(e);
       };
       ins.interceptors.request.use(function (config) {
+        var _a;
+        var args = getSearchParamsAll();
+        var headers = (_a = config.headers) !== null && _a !== void 0 ? _a : config.headers = {};
+        Object.entries(args).forEach(function (_ref) {
+          var _ref2 = _slicedToArray(_ref, 2),
+            k = _ref2[0],
+            v = _ref2[1];
+          headers["X-Arg-".concat(k)] = encodeURI(v);
+        });
         _this2.emit('request', config);
         // TODO: remove
-        config.headers.Authorization = config.headers.Authorization || _this2.token || '';
+        headers.Authorization = headers.Authorization || _this2.token || '';
         // params.pathname = location.pathname
         return onRequest(config);
       });
@@ -221,11 +231,11 @@ var Request = /*#__PURE__*/function (_EventEmitter) {
     key: "getMsg",
     value: function getMsg(res) {
       if (!res) return '';
-      var _ref = res === null || res === void 0 ? void 0 : res.config,
-        _ref$showMsg = _ref.showMsg,
-        showMsg = _ref$showMsg === void 0 ? true : _ref$showMsg,
-        successText = _ref.successText,
-        errText = _ref.errText;
+      var _ref3 = res === null || res === void 0 ? void 0 : res.config,
+        _ref3$showMsg = _ref3.showMsg,
+        showMsg = _ref3$showMsg === void 0 ? true : _ref3$showMsg,
+        successText = _ref3.successText,
+        errText = _ref3.errText;
       var remoteMsg = showMsg ? Request.getRemoteMessage(res) : '';
       var isSuccessful = Request.checkRTCode(res);
       var configMsg = isSuccessful ? successText : errText;
@@ -319,7 +329,7 @@ typeof SuppressedError === "function" ? SuppressedError : function (error, suppr
 };
 function safe_fetch_options(cb, f) {
   return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
-    var arr, _cb$method, method, _cb$valueKey, valueKey, _cb$labelKey, labelKey, url;
+    var arr, _cb$method, method, _cb$valueKey, valueKey, _cb$labelKey, labelKey, url, _url;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -334,10 +344,11 @@ function safe_fetch_options(cb, f) {
           return _context.abrupt("return", expect_array(arr));
         case 7:
           _cb$method = cb.method, method = _cb$method === void 0 ? 'get' : _cb$method, _cb$valueKey = cb.valueKey, valueKey = _cb$valueKey === void 0 ? 'value' : _cb$valueKey, _cb$labelKey = cb.labelKey, labelKey = _cb$labelKey === void 0 ? 'label' : _cb$labelKey, url = cb.url;
-          return _context.abrupt("return", cache_fetch(url, function () {
+          _url = isString(url) ? url : url();
+          return _context.abrupt("return", cache_fetch(_url, function () {
             return request.ins({
               method: method,
-              url: url
+              url: _url
             });
           }).then(function (res) {
             return expect_array(res.data).map(function (_) {
@@ -347,7 +358,7 @@ function safe_fetch_options(cb, f) {
               };
             });
           }));
-        case 9:
+        case 10:
         case "end":
           return _context.stop();
       }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@noah-libjs/request",
-    "version": "0.0.8",
+    "version": "0.0.9",
     "description": "",
     "scripts": {
         "test": "echo \"Error: no test specified\" && exit 1",
@@ -21,7 +21,7 @@
         "access": "public"
     },
     "dependencies": {
-        "@noah-libjs/utils": "0.0.8",
+        "@noah-libjs/utils": "0.0.9",
         "axios": "^0.26.1",
         "store": "2.x"
     },
@@ -32,5 +32,5 @@
     "keywords": [],
     "author": "",
     "license": "MIT",
-    "gitHead": "a50958bb900a9e145a8a722b69c639cac93d2094"
+    "gitHead": "bb49d078600e65d77b842887c63be3b254faf999"
 }