@indfnd/utils 0.1.26 → 0.1.28

package/dist/ind-utils.es.js

@@ -96,8 +96,8 @@ const INDEX_DESC_KEY = "indexDesc";
 function getIndexDescCache() {
   return getLocalStorage(INDEX_DESC_KEY);
 }
-function setIndexDescCache(data) {
-  setLocalStorage(INDEX_DESC_KEY, data);
+function setIndexDescCache(data2) {
+  setLocalStorage(INDEX_DESC_KEY, data2);
 }
 function clearIndexDescCache() {
   removeLocalStorage(INDEX_DESC_KEY);
@@ -106,8 +106,8 @@ const PERMISSION_KEY = "ibp-sc-permission";
 function getPermissionCache() {
   return getSessionStorage(PERMISSION_KEY);
 }
-function setPermissionCache(data) {
-  setSessionStorage(PERMISSION_KEY, data);
+function setPermissionCache(data2) {
+  setSessionStorage(PERMISSION_KEY, data2);
 }
 function clearPermissionCache() {
   removeSessionStorage(PERMISSION_KEY);
@@ -116,8 +116,8 @@ const USER_INFO_KEY = "lambo-userInfo";
 function getUserInfoCache() {
   return getLocalStorage(USER_INFO_KEY);
 }
-function setUserInfoCache(data) {
-  setLocalStorage(USER_INFO_KEY, data);
+function setUserInfoCache(data2) {
+  setLocalStorage(USER_INFO_KEY, data2);
 }
 function clearUserInfoCache() {
   removeLocalStorage(USER_INFO_KEY);
@@ -366,10 +366,10 @@ InterceptorManager$1.prototype.forEach = function forEach2(fn) {
 var InterceptorManager_1 = InterceptorManager$1;
 var utils$d = utils$g;
 var normalizeHeaderName$1 = function normalizeHeaderName(headers, normalizedName) {
-  utils$d.forEach(headers, function processHeader(value, name2) {
-    if (name2 !== normalizedName && name2.toUpperCase() === normalizedName.toUpperCase()) {
+  utils$d.forEach(headers, function processHeader(value, name) {
+    if (name !== normalizedName && name.toUpperCase() === normalizedName.toUpperCase()) {
       headers[normalizedName] = value;
-      delete headers[name2];
+      delete headers[name];
     }
   });
 };
@@ -392,7 +392,8 @@ var enhanceError$2 = function enhanceError(error, config2, code, request2, respo
       columnNumber: this.columnNumber,
       stack: this.stack,
       config: this.config,
-      code: this.code
+      code: this.code,
+      status: this.response && this.response.status ? this.response.status : null
     };
   };
   return error;
@@ -420,9 +421,9 @@ var settle$1 = function settle(resolve, reject, response) {
 var utils$c = utils$g;
 var cookies$1 = utils$c.isStandardBrowserEnv() ? function standardBrowserEnv() {
   return {
-    write: function write(name2, value, expires, path, domain, secure) {
+    write: function write(name, value, expires, path, domain, secure) {
       var cookie = [];
-      cookie.push(name2 + "=" + encodeURIComponent(value));
+      cookie.push(name + "=" + encodeURIComponent(value));
       if (utils$c.isNumber(expires)) {
         cookie.push("expires=" + new Date(expires).toGMTString());
       }
@@ -437,12 +438,12 @@ var cookies$1 = utils$c.isStandardBrowserEnv() ? function standardBrowserEnv() {
       }
       document.cookie = cookie.join("; ");
     },
-    read: function read(name2) {
-      var match = document.cookie.match(new RegExp("(^|;\\s*)(" + name2 + ")=([^;]*)"));
+    read: function read(name) {
+      var match = document.cookie.match(new RegExp("(^|;\\s*)(" + name + ")=([^;]*)"));
       return match ? decodeURIComponent(match[3]) : null;
     },
-    remove: function remove(name2) {
-      this.write(name2, "", Date.now() - 864e5);
+    remove: function remove(name) {
+      this.write(name, "", Date.now() - 864e5);
     }
   };
 }() : function nonStandardBrowserEnv() {
@@ -548,6 +549,14 @@ var isURLSameOrigin$1 = utils$a.isStandardBrowserEnv() ? function standardBrowse
     return true;
   };
 }();
+function Cancel$3(message) {
+  this.message = message;
+}
+Cancel$3.prototype.toString = function toString() {
+  return "Cancel" + (this.message ? ": " + this.message : "");
+};
+Cancel$3.prototype.__CANCEL__ = true;
+var Cancel_1 = Cancel$3;
 var utils$9 = utils$g;
 var settle2 = settle$1;
 var cookies = cookies$1;
@@ -556,11 +565,22 @@ var buildFullPath2 = buildFullPath$1;
 var parseHeaders2 = parseHeaders$1;
 var isURLSameOrigin = isURLSameOrigin$1;
 var createError2 = createError$2;
+var defaults$6 = defaults_1;
+var Cancel$2 = Cancel_1;
 var xhr = function xhrAdapter(config2) {
   return new Promise(function dispatchXhrRequest(resolve, reject) {
     var requestData = config2.data;
     var requestHeaders = config2.headers;
     var responseType = config2.responseType;
+    var onCanceled;
+    function done() {
+      if (config2.cancelToken) {
+        config2.cancelToken.unsubscribe(onCanceled);
+      }
+      if (config2.signal) {
+        config2.signal.removeEventListener("abort", onCanceled);
+      }
+    }
     if (utils$9.isFormData(requestData)) {
       delete requestHeaders["Content-Type"];
     }
@@ -587,7 +607,13 @@ var xhr = function xhrAdapter(config2) {
         config: config2,
         request: request2
       };
-      settle2(resolve, reject, response);
+      settle2(function _resolve(value) {
+        resolve(value);
+        done();
+      }, function _reject(err) {
+        reject(err);
+        done();
+      }, response);
       request2 = null;
     }
     if ("onloadend" in request2) {
@@ -615,14 +641,15 @@ var xhr = function xhrAdapter(config2) {
       request2 = null;
     };
     request2.ontimeout = function handleTimeout() {
-      var timeoutErrorMessage = "timeout of " + config2.timeout + "ms exceeded";
+      var timeoutErrorMessage = config2.timeout ? "timeout of " + config2.timeout + "ms exceeded" : "timeout exceeded";
+      var transitional2 = config2.transitional || defaults$6.transitional;
       if (config2.timeoutErrorMessage) {
         timeoutErrorMessage = config2.timeoutErrorMessage;
       }
       reject(createError2(
         timeoutErrorMessage,
         config2,
-        config2.transitional && config2.transitional.clarifyTimeoutError ? "ETIMEDOUT" : "ECONNABORTED",
+        transitional2.clarifyTimeoutError ? "ETIMEDOUT" : "ECONNABORTED",
         request2
       ));
       request2 = null;
@@ -654,15 +681,19 @@ var xhr = function xhrAdapter(config2) {
     if (typeof config2.onUploadProgress === "function" && request2.upload) {
       request2.upload.addEventListener("progress", config2.onUploadProgress);
     }
-    if (config2.cancelToken) {
-      config2.cancelToken.promise.then(function onCanceled(cancel) {
+    if (config2.cancelToken || config2.signal) {
+      onCanceled = function(cancel) {
         if (!request2) {
           return;
         }
+        reject(!cancel || cancel && cancel.type ? new Cancel$2("canceled") : cancel);
         request2.abort();
-        reject(cancel);
         request2 = null;
-      });
+      };
+      config2.cancelToken && config2.cancelToken.subscribe(onCanceled);
+      if (config2.signal) {
+        config2.signal.aborted ? onCanceled() : config2.signal.addEventListener("abort", onCanceled);
+      }
     }
     if (!requestData) {
       requestData = null;
@@ -710,33 +741,33 @@ var defaults$5 = {
     clarifyTimeoutError: false
   },
   adapter: getDefaultAdapter(),
-  transformRequest: [function transformRequest(data, headers) {
+  transformRequest: [function transformRequest(data2, headers) {
     normalizeHeaderName2(headers, "Accept");
     normalizeHeaderName2(headers, "Content-Type");
-    if (utils$8.isFormData(data) || utils$8.isArrayBuffer(data) || utils$8.isBuffer(data) || utils$8.isStream(data) || utils$8.isFile(data) || utils$8.isBlob(data)) {
-      return data;
+    if (utils$8.isFormData(data2) || utils$8.isArrayBuffer(data2) || utils$8.isBuffer(data2) || utils$8.isStream(data2) || utils$8.isFile(data2) || utils$8.isBlob(data2)) {
+      return data2;
     }
-    if (utils$8.isArrayBufferView(data)) {
-      return data.buffer;
+    if (utils$8.isArrayBufferView(data2)) {
+      return data2.buffer;
     }
-    if (utils$8.isURLSearchParams(data)) {
+    if (utils$8.isURLSearchParams(data2)) {
       setContentTypeIfUnset(headers, "application/x-www-form-urlencoded;charset=utf-8");
-      return data.toString();
+      return data2.toString();
     }
-    if (utils$8.isObject(data) || headers && headers["Content-Type"] === "application/json") {
+    if (utils$8.isObject(data2) || headers && headers["Content-Type"] === "application/json") {
       setContentTypeIfUnset(headers, "application/json");
-      return stringifySafely(data);
+      return stringifySafely(data2);
     }
-    return data;
+    return data2;
   }],
-  transformResponse: [function transformResponse(data) {
-    var transitional2 = this.transitional;
+  transformResponse: [function transformResponse(data2) {
+    var transitional2 = this.transitional || defaults$5.transitional;
     var silentJSONParsing = transitional2 && transitional2.silentJSONParsing;
     var forcedJSONParsing = transitional2 && transitional2.forcedJSONParsing;
     var strictJSONParsing = !silentJSONParsing && this.responseType === "json";
-    if (strictJSONParsing || forcedJSONParsing && utils$8.isString(data) && data.length) {
+    if (strictJSONParsing || forcedJSONParsing && utils$8.isString(data2) && data2.length) {
       try {
-        return JSON.parse(data);
+        return JSON.parse(data2);
       } catch (e) {
         if (strictJSONParsing) {
           if (e.name === "SyntaxError") {
@@ -746,7 +777,7 @@ var defaults$5 = {
         }
       }
     }
-    return data;
+    return data2;
   }],
   timeout: 0,
   xsrfCookieName: "XSRF-TOKEN",
@@ -755,11 +786,11 @@ var defaults$5 = {
   maxBodyLength: -1,
   validateStatus: function validateStatus(status) {
     return status >= 200 && status < 300;
-  }
-};
-defaults$5.headers = {
-  common: {
-    "Accept": "application/json, text/plain, */*"
+  },
+  headers: {
+    common: {
+      "Accept": "application/json, text/plain, */*"
+    }
   }
 };
 utils$8.forEach(["delete", "get", "head"], function forEachMethodNoData(method) {
@@ -771,12 +802,12 @@ utils$8.forEach(["post", "put", "patch"], function forEachMethodWithData(method)
 var defaults_1 = defaults$5;
 var utils$7 = utils$g;
 var defaults$4 = defaults_1;
-var transformData$1 = function transformData(data, headers, fns) {
+var transformData$1 = function transformData(data2, headers, fns) {
   var context = this || defaults$4;
   utils$7.forEach(fns, function transform(fn) {
-    data = fn.call(context, data, headers);
+    data2 = fn.call(context, data2, headers);
   });
-  return data;
+  return data2;
 };
 var isCancel$1 = function isCancel(value) {
   return !!(value && value.__CANCEL__);
@@ -785,10 +816,14 @@ var utils$6 = utils$g;
 var transformData2 = transformData$1;
 var isCancel2 = isCancel$1;
 var defaults$3 = defaults_1;
+var Cancel$1 = Cancel_1;
 function throwIfCancellationRequested(config2) {
   if (config2.cancelToken) {
     config2.cancelToken.throwIfRequested();
   }
+  if (config2.signal && config2.signal.aborted) {
+    throw new Cancel$1("canceled");
+  }
 }
 var dispatchRequest$1 = function dispatchRequest(config2) {
   throwIfCancellationRequested(config2);
@@ -839,34 +874,6 @@ var utils$5 = utils$g;
 var mergeConfig$2 = function mergeConfig(config1, config2) {
   config2 = config2 || {};
   var config3 = {};
-  var valueFromConfig2Keys = ["url", "method", "data"];
-  var mergeDeepPropertiesKeys = ["headers", "auth", "proxy", "params"];
-  var defaultToConfig2Keys = [
-    "baseURL",
-    "transformRequest",
-    "transformResponse",
-    "paramsSerializer",
-    "timeout",
-    "timeoutMessage",
-    "withCredentials",
-    "adapter",
-    "responseType",
-    "xsrfCookieName",
-    "xsrfHeaderName",
-    "onUploadProgress",
-    "onDownloadProgress",
-    "decompress",
-    "maxContentLength",
-    "maxBodyLength",
-    "maxRedirects",
-    "transport",
-    "httpAgent",
-    "httpsAgent",
-    "cancelToken",
-    "socketPath",
-    "responseEncoding"
-  ];
-  var directMergeKeys = ["validateStatus"];
   function getMergedValue(target, source2) {
     if (utils$5.isPlainObject(target) && utils$5.isPlainObject(source2)) {
       return utils$5.merge(target, source2);
@@ -879,141 +886,69 @@ var mergeConfig$2 = function mergeConfig(config1, config2) {
   }
   function mergeDeepProperties(prop) {
     if (!utils$5.isUndefined(config2[prop])) {
-      config3[prop] = getMergedValue(config1[prop], config2[prop]);
+      return getMergedValue(config1[prop], config2[prop]);
     } else if (!utils$5.isUndefined(config1[prop])) {
-      config3[prop] = getMergedValue(void 0, config1[prop]);
+      return getMergedValue(void 0, config1[prop]);
     }
   }
-  utils$5.forEach(valueFromConfig2Keys, function valueFromConfig2(prop) {
+  function valueFromConfig2(prop) {
     if (!utils$5.isUndefined(config2[prop])) {
-      config3[prop] = getMergedValue(void 0, config2[prop]);
+      return getMergedValue(void 0, config2[prop]);
     }
-  });
-  utils$5.forEach(mergeDeepPropertiesKeys, mergeDeepProperties);
-  utils$5.forEach(defaultToConfig2Keys, function defaultToConfig2(prop) {
+  }
+  function defaultToConfig2(prop) {
     if (!utils$5.isUndefined(config2[prop])) {
-      config3[prop] = getMergedValue(void 0, config2[prop]);
+      return getMergedValue(void 0, config2[prop]);
     } else if (!utils$5.isUndefined(config1[prop])) {
-      config3[prop] = getMergedValue(void 0, config1[prop]);
+      return getMergedValue(void 0, config1[prop]);
     }
-  });
-  utils$5.forEach(directMergeKeys, function merge3(prop) {
+  }
+  function mergeDirectKeys(prop) {
     if (prop in config2) {
-      config3[prop] = getMergedValue(config1[prop], config2[prop]);
+      return getMergedValue(config1[prop], config2[prop]);
     } else if (prop in config1) {
-      config3[prop] = getMergedValue(void 0, config1[prop]);
-    }
-  });
-  var axiosKeys = valueFromConfig2Keys.concat(mergeDeepPropertiesKeys).concat(defaultToConfig2Keys).concat(directMergeKeys);
-  var otherKeys = Object.keys(config1).concat(Object.keys(config2)).filter(function filterAxiosKeys(key) {
-    return axiosKeys.indexOf(key) === -1;
+      return getMergedValue(void 0, config1[prop]);
+    }
+  }
+  var mergeMap = {
+    "url": valueFromConfig2,
+    "method": valueFromConfig2,
+    "data": valueFromConfig2,
+    "baseURL": defaultToConfig2,
+    "transformRequest": defaultToConfig2,
+    "transformResponse": defaultToConfig2,
+    "paramsSerializer": defaultToConfig2,
+    "timeout": defaultToConfig2,
+    "timeoutMessage": defaultToConfig2,
+    "withCredentials": defaultToConfig2,
+    "adapter": defaultToConfig2,
+    "responseType": defaultToConfig2,
+    "xsrfCookieName": defaultToConfig2,
+    "xsrfHeaderName": defaultToConfig2,
+    "onUploadProgress": defaultToConfig2,
+    "onDownloadProgress": defaultToConfig2,
+    "decompress": defaultToConfig2,
+    "maxContentLength": defaultToConfig2,
+    "maxBodyLength": defaultToConfig2,
+    "transport": defaultToConfig2,
+    "httpAgent": defaultToConfig2,
+    "httpsAgent": defaultToConfig2,
+    "cancelToken": defaultToConfig2,
+    "socketPath": defaultToConfig2,
+    "responseEncoding": defaultToConfig2,
+    "validateStatus": mergeDirectKeys
+  };
+  utils$5.forEach(Object.keys(config1).concat(Object.keys(config2)), function computeConfigValue(prop) {
+    var merge3 = mergeMap[prop] || mergeDeepProperties;
+    var configValue = merge3(prop);
+    utils$5.isUndefined(configValue) && merge3 !== mergeDirectKeys || (config3[prop] = configValue);
   });
-  utils$5.forEach(otherKeys, mergeDeepProperties);
   return config3;
 };
-const name = "axios";
-const version = "0.21.4";
-const description = "Promise based HTTP client for the browser and node.js";
-const main = "index.js";
-const scripts = {
-  test: "grunt test",
-  start: "node ./sandbox/server.js",
-  build: "NODE_ENV=production grunt build",
-  preversion: "npm test",
-  version: "npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json",
-  postversion: "git push && git push --tags",
-  examples: "node ./examples/server.js",
-  coveralls: "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-  fix: "eslint --fix lib/**/*.js"
-};
-const repository = {
-  type: "git",
-  url: "https://github.com/axios/axios.git"
-};
-const keywords = [
-  "xhr",
-  "http",
-  "ajax",
-  "promise",
-  "node"
-];
-const author = "Matt Zabriskie";
-const license = "MIT";
-const bugs = {
-  url: "https://github.com/axios/axios/issues"
-};
-const homepage = "https://axios-http.com";
-const devDependencies = {
-  coveralls: "^3.0.0",
-  "es6-promise": "^4.2.4",
-  grunt: "^1.3.0",
-  "grunt-banner": "^0.6.0",
-  "grunt-cli": "^1.2.0",
-  "grunt-contrib-clean": "^1.1.0",
-  "grunt-contrib-watch": "^1.0.0",
-  "grunt-eslint": "^23.0.0",
-  "grunt-karma": "^4.0.0",
-  "grunt-mocha-test": "^0.13.3",
-  "grunt-ts": "^6.0.0-beta.19",
-  "grunt-webpack": "^4.0.2",
-  "istanbul-instrumenter-loader": "^1.0.0",
-  "jasmine-core": "^2.4.1",
-  karma: "^6.3.2",
-  "karma-chrome-launcher": "^3.1.0",
-  "karma-firefox-launcher": "^2.1.0",
-  "karma-jasmine": "^1.1.1",
-  "karma-jasmine-ajax": "^0.1.13",
-  "karma-safari-launcher": "^1.0.0",
-  "karma-sauce-launcher": "^4.3.6",
-  "karma-sinon": "^1.0.5",
-  "karma-sourcemap-loader": "^0.3.8",
-  "karma-webpack": "^4.0.2",
-  "load-grunt-tasks": "^3.5.2",
-  minimist: "^1.2.0",
-  mocha: "^8.2.1",
-  sinon: "^4.5.0",
-  "terser-webpack-plugin": "^4.2.3",
-  typescript: "^4.0.5",
-  "url-search-params": "^0.10.0",
-  webpack: "^4.44.2",
-  "webpack-dev-server": "^3.11.0"
-};
-const browser = {
-  "./lib/adapters/http.js": "./lib/adapters/xhr.js"
-};
-const jsdelivr = "dist/axios.min.js";
-const unpkg = "dist/axios.min.js";
-const typings = "./index.d.ts";
-const dependencies = {
-  "follow-redirects": "^1.14.0"
-};
-const bundlesize = [
-  {
-    path: "./dist/axios.min.js",
-    threshold: "5kB"
-  }
-];
-var require$$0$1 = {
-  name,
-  version,
-  description,
-  main,
-  scripts,
-  repository,
-  keywords,
-  author,
-  license,
-  bugs,
-  homepage,
-  devDependencies,
-  browser,
-  jsdelivr,
-  unpkg,
-  typings,
-  dependencies,
-  bundlesize
-};
-var pkg = require$$0$1;
+var data = {
+  "version": "0.24.0"
+};
+var VERSION = data.version;
 var validators$1 = {};
 ["object", "boolean", "number", "function", "string", "symbol"].forEach(function(type, i) {
   validators$1[type] = function validator2(thing) {
@@ -1021,34 +956,20 @@ var validators$1 = {};
   };
 });
 var deprecatedWarnings = {};
-var currentVerArr = pkg.version.split(".");
-function isOlderVersion(version2, thanVersion) {
-  var pkgVersionArr = thanVersion ? thanVersion.split(".") : currentVerArr;
-  var destVer = version2.split(".");
-  for (var i = 0; i < 3; i++) {
-    if (pkgVersionArr[i] > destVer[i]) {
-      return true;
-    } else if (pkgVersionArr[i] < destVer[i]) {
-      return false;
-    }
-  }
-  return false;
-}
-validators$1.transitional = function transitional(validator2, version2, message) {
-  var isDeprecated = version2 && isOlderVersion(version2);
+validators$1.transitional = function transitional(validator2, version, message) {
   function formatMessage(opt, desc) {
-    return "[Axios v" + pkg.version + "] Transitional option '" + opt + "'" + desc + (message ? ". " + message : "");
+    return "[Axios v" + VERSION + "] Transitional option '" + opt + "'" + desc + (message ? ". " + message : "");
   }
   return function(value, opt, opts) {
     if (validator2 === false) {
-      throw new Error(formatMessage(opt, " has been removed in " + version2));
+      throw new Error(formatMessage(opt, " has been removed" + (version ? " in " + version : "")));
     }
-    if (isDeprecated && !deprecatedWarnings[opt]) {
+    if (version && !deprecatedWarnings[opt]) {
       deprecatedWarnings[opt] = true;
       console.warn(
         formatMessage(
           opt,
-          " has been deprecated since v" + version2 + " and will be removed in the near future"
+          " has been deprecated since v" + version + " and will be removed in the near future"
         )
       );
     }
@@ -1078,7 +999,6 @@ function assertOptions(options, schema, allowUnknown) {
   }
 }
 var validator$1 = {
-  isOlderVersion,
   assertOptions,
   validators: validators$1
 };
@@ -1114,9 +1034,9 @@ Axios$1.prototype.request = function request(config2) {
   var transitional2 = config2.transitional;
   if (transitional2 !== void 0) {
     validator.assertOptions(transitional2, {
-      silentJSONParsing: validators.transitional(validators.boolean, "1.0.0"),
-      forcedJSONParsing: validators.transitional(validators.boolean, "1.0.0"),
-      clarifyTimeoutError: validators.transitional(validators.boolean, "1.0.0")
+      silentJSONParsing: validators.transitional(validators.boolean),
+      forcedJSONParsing: validators.transitional(validators.boolean),
+      clarifyTimeoutError: validators.transitional(validators.boolean)
     }, false);
   }
   var requestInterceptorChain = [];
@@ -1178,23 +1098,15 @@ utils$4.forEach(["delete", "get", "head", "options"], function forEachMethodNoDa
   };
 });
 utils$4.forEach(["post", "put", "patch"], function forEachMethodWithData2(method) {
-  Axios$1.prototype[method] = function(url, data, config2) {
+  Axios$1.prototype[method] = function(url, data2, config2) {
     return this.request(mergeConfig$1(config2 || {}, {
       method,
       url,
-      data
+      data: data2
     }));
   };
 });
 var Axios_1 = Axios$1;
-function Cancel$1(message) {
-  this.message = message;
-}
-Cancel$1.prototype.toString = function toString() {
-  return "Cancel" + (this.message ? ": " + this.message : "");
-};
-Cancel$1.prototype.__CANCEL__ = true;
-var Cancel_1 = Cancel$1;
 var Cancel = Cancel_1;
 function CancelToken(executor) {
   if (typeof executor !== "function") {
@@ -1205,6 +1117,27 @@ function CancelToken(executor) {
     resolvePromise = resolve;
   });
   var token = this;
+  this.promise.then(function(cancel) {
+    if (!token._listeners)
+      return;
+    var i;
+    var l = token._listeners.length;
+    for (i = 0; i < l; i++) {
+      token._listeners[i](cancel);
+    }
+    token._listeners = null;
+  });
+  this.promise.then = function(onfulfilled) {
+    var _resolve;
+    var promise = new Promise(function(resolve) {
+      token.subscribe(resolve);
+      _resolve = resolve;
+    }).then(onfulfilled);
+    promise.cancel = function reject() {
+      token.unsubscribe(_resolve);
+    };
+    return promise;
+  };
   executor(function cancel(message) {
     if (token.reason) {
       return;
@@ -1218,6 +1151,26 @@ CancelToken.prototype.throwIfRequested = function throwIfRequested() {
     throw this.reason;
   }
 };
+CancelToken.prototype.subscribe = function subscribe(listener) {
+  if (this.reason) {
+    listener(this.reason);
+    return;
+  }
+  if (this._listeners) {
+    this._listeners.push(listener);
+  } else {
+    this._listeners = [listener];
+  }
+};
+CancelToken.prototype.unsubscribe = function unsubscribe(listener) {
+  if (!this._listeners) {
+    return;
+  }
+  var index = this._listeners.indexOf(listener);
+  if (index !== -1) {
+    this._listeners.splice(index, 1);
+  }
+};
 CancelToken.source = function source() {
   var cancel;
   var token = new CancelToken(function executor(c) {
@@ -1247,16 +1200,17 @@ function createInstance(defaultConfig) {
   var instance2 = bind$2(Axios.prototype.request, context);
   utils$3.extend(instance2, Axios.prototype, context);
   utils$3.extend(instance2, context);
+  instance2.create = function create(instanceConfig) {
+    return createInstance(mergeConfig2(defaultConfig, instanceConfig));
+  };
   return instance2;
 }
 var axios$1 = createInstance(defaults$2);
 axios$1.Axios = Axios;
-axios$1.create = function create(instanceConfig) {
-  return createInstance(mergeConfig2(axios$1.defaults, instanceConfig));
-};
 axios$1.Cancel = Cancel_1;
 axios$1.CancelToken = CancelToken_1;
 axios$1.isCancel = isCancel$1;
+axios$1.VERSION = data.version;
 axios$1.all = function all(promises) {
   return Promise.all(promises);
 };
@@ -1525,26 +1479,26 @@ if (getProto) {
     INTRINSICS["%Error.prototype%"] = errorProto;
   }
 }
-var doEval = function doEval2(name2) {
+var doEval = function doEval2(name) {
   var value;
-  if (name2 === "%AsyncFunction%") {
+  if (name === "%AsyncFunction%") {
     value = getEvalledConstructor("async function () {}");
-  } else if (name2 === "%GeneratorFunction%") {
+  } else if (name === "%GeneratorFunction%") {
     value = getEvalledConstructor("function* () {}");
-  } else if (name2 === "%AsyncGeneratorFunction%") {
+  } else if (name === "%AsyncGeneratorFunction%") {
     value = getEvalledConstructor("async function* () {}");
-  } else if (name2 === "%AsyncGenerator%") {
+  } else if (name === "%AsyncGenerator%") {
     var fn = doEval2("%AsyncGeneratorFunction%");
     if (fn) {
       value = fn.prototype;
     }
-  } else if (name2 === "%AsyncIteratorPrototype%") {
+  } else if (name === "%AsyncIteratorPrototype%") {
     var gen = doEval2("%AsyncGenerator%");
     if (gen && getProto) {
       value = getProto(gen.prototype);
     }
   }
-  INTRINSICS[name2] = value;
+  INTRINSICS[name] = value;
   return value;
 };
 var LEGACY_ALIASES = {
@@ -1623,8 +1577,8 @@ var stringToPath = function stringToPath2(string) {
   });
   return result;
 };
-var getBaseIntrinsic = function getBaseIntrinsic2(name2, allowMissing) {
-  var intrinsicName = name2;
+var getBaseIntrinsic = function getBaseIntrinsic2(name, allowMissing) {
+  var intrinsicName = name;
   var alias;
   if (hasOwn$1(LEGACY_ALIASES, intrinsicName)) {
     alias = LEGACY_ALIASES[intrinsicName];
@@ -1636,7 +1590,7 @@ var getBaseIntrinsic = function getBaseIntrinsic2(name2, allowMissing) {
       value = doEval(intrinsicName);
     }
     if (typeof value === "undefined" && !allowMissing) {
-      throw new $TypeError$3("intrinsic " + name2 + " exists, but is not available. Please file an issue!");
+      throw new $TypeError$3("intrinsic " + name + " exists, but is not available. Please file an issue!");
     }
     return {
       alias,
@@ -1644,19 +1598,19 @@ var getBaseIntrinsic = function getBaseIntrinsic2(name2, allowMissing) {
       value
     };
   }
-  throw new $SyntaxError$1("intrinsic " + name2 + " does not exist!");
+  throw new $SyntaxError$1("intrinsic " + name + " does not exist!");
 };
-var getIntrinsic = function GetIntrinsic(name2, allowMissing) {
-  if (typeof name2 !== "string" || name2.length === 0) {
+var getIntrinsic = function GetIntrinsic(name, allowMissing) {
+  if (typeof name !== "string" || name.length === 0) {
     throw new $TypeError$3("intrinsic name must be a non-empty string");
   }
   if (arguments.length > 1 && typeof allowMissing !== "boolean") {
     throw new $TypeError$3('"allowMissing" argument must be a boolean');
   }
-  if ($exec(/^%?[^%]*%?$/, name2) === null) {
+  if ($exec(/^%?[^%]*%?$/, name) === null) {
     throw new $SyntaxError$1("`%` may not be present anywhere but at the beginning and end of the intrinsic name");
   }
-  var parts = stringToPath(name2);
+  var parts = stringToPath(name);
   var intrinsicBaseName = parts.length > 0 ? parts[0] : "";
   var intrinsic = getBaseIntrinsic("%" + intrinsicBaseName + "%", allowMissing);
   var intrinsicRealName = intrinsic.name;
@@ -1684,7 +1638,7 @@ var getIntrinsic = function GetIntrinsic(name2, allowMissing) {
     } else if (value != null) {
       if (!(part in value)) {
         if (!allowMissing) {
-          throw new $TypeError$3("base intrinsic for " + name2 + " exists, but the property is not available.");
+          throw new $TypeError$3("base intrinsic for " + name + " exists, but the property is not available.");
         }
         return void 0;
       }
@@ -1866,9 +1820,9 @@ var setFunctionLength = function setFunctionLength2(fn, length) {
 var GetIntrinsic$1 = getIntrinsic;
 var callBind = callBind$1.exports;
 var $indexOf = callBind(GetIntrinsic$1("String.prototype.indexOf"));
-var callBound$1 = function callBoundIntrinsic(name2, allowMissing) {
-  var intrinsic = GetIntrinsic$1(name2, !!allowMissing);
-  if (typeof intrinsic === "function" && $indexOf(name2, ".prototype.") > -1) {
+var callBound$1 = function callBoundIntrinsic(name, allowMissing) {
+  var intrinsic = GetIntrinsic$1(name, !!allowMissing);
+  if (typeof intrinsic === "function" && $indexOf(name, ".prototype.") > -1) {
     return callBind(intrinsic);
   }
   return intrinsic;
@@ -2005,9 +1959,9 @@ var objectInspect = function inspect_(obj, options, depth, seen) {
     return inspect_(value, opts, depth + 1, seen);
   }
   if (typeof obj === "function" && !isRegExp$2(obj)) {
-    var name2 = nameOf(obj);
+    var name = nameOf(obj);
     var keys = arrObjKeys(obj, inspect2);
-    return "[Function" + (name2 ? ": " + name2 : " (anonymous)") + "]" + (keys.length > 0 ? " { " + $join.call(keys, ", ") + " }" : "");
+    return "[Function" + (name ? ": " + name : " (anonymous)") + "]" + (keys.length > 0 ? " { " + $join.call(keys, ", ") + " }" : "");
   }
   if (isSymbol(obj)) {
     var symString = hasShammedSymbols ? $replace.call(String(obj), /^(Symbol\(.*\))_[^)]*$/, "$1") : symToString.call(obj);
@@ -3320,23 +3274,23 @@ function requestInterceptors(config2) {
 }
 function responseInterceptors(response) {
   var _a;
-  let data = response.data;
+  let data2 = response.data;
   const contentType = getContentType(response.headers);
   if (contentType !== CONTENT_TYPE.json) {
-    return data;
+    return data2;
   }
   if (typeof response.data === "string") {
-    data = JSON.parse(response.data);
+    data2 = JSON.parse(response.data);
   }
-  const code = data.code;
+  const code = data2.code;
   switch (code) {
     case SUCCESS_CODE: {
-      if (sessionStorage.getItem("isFromIM") == "1" && ((_a = data == null ? void 0 : data.extInfo) == null ? void 0 : _a.handleTask)) {
+      if (sessionStorage.getItem("isFromIM") == "1" && ((_a = data2 == null ? void 0 : data2.extInfo) == null ? void 0 : _a.handleTask)) {
         if (typeof window.native != "undefined") {
           window.native.goHome();
         }
       }
-      return data;
+      return data2;
     }
     case NO_SESSION_CODE: {
       _debounce(function() {
@@ -3345,17 +3299,17 @@ function responseInterceptors(response) {
       break;
     }
     default: {
-      let msg = data.message || data.msg || config.errorMessage;
+      let msg = data2.message || data2.msg || config.errorMessage;
       window.apiErrorHandler && window.apiErrorHandler(msg);
     }
   }
-  return Promise.reject(data);
+  return Promise.reject(data2);
 }
 function inspectorError(error) {
   var _a;
   if ((error == null ? void 0 : error.code) === "ECONNABORTED") {
     window.apiErrorHandler && window.apiErrorHandler("\u8BF7\u6C42\u8D85\u65F6\uFF0C\u8BF7\u7A0D\u540E\u518D\u8BD5");
-  } else if (((_a = error == null ? void 0 : error.response) == null ? void 0 : _a.status) !== 200) {
+  } else if (((_a = error == null ? void 0 : error.response) == null ? void 0 : _a.status) !== 200 && (error == null ? void 0 : error.message) !== "canceled") {
     window.apiErrorHandler && window.apiErrorHandler("\u8BF7\u6C42\u51FA\u9519\u4E86");
   }
   return Promise.reject(error);
@@ -3363,11 +3317,80 @@ function inspectorError(error) {
 const instance = axios.create({ timeout: 5 * 60 * 1e3 });
 instance.interceptors.request.use(requestInterceptors, inspectorError);
 instance.interceptors.response.use(responseInterceptors, inspectorError);
-instance.formPost = function(url, data, config2) {
+instance.formPost = function(url, data2, config2) {
   const headers = (config2 == null ? void 0 : config2.headers) || {};
   setContentType(headers, CONTENT_TYPE.form);
-  return instance.post(url, data, __spreadProps(__spreadValues({}, config2), { headers }));
+  return instance.post(url, data2, __spreadProps(__spreadValues({}, config2), { headers }));
+};
+const wrapApi = (api) => {
+  let currentController = null;
+  const wrappedFunction = function(...args) {
+    return __async(this, null, function* () {
+      if (currentController) {
+        console.log("currentController.abort trigger, now cancel before request");
+        currentController.abort();
+        currentController = null;
+      }
+      const controller = new AbortController();
+      currentController = controller;
+      const newArgs = [...args];
+      const lastIndex = newArgs.length - 1;
+      try {
+        if (newArgs.length > 0 && typeof newArgs[lastIndex] === "object" && !Array.isArray(newArgs[lastIndex])) {
+          const config2 = newArgs[lastIndex];
+          if (config2.signal) {
+            const combinedController = new AbortController();
+            const originalSignal = config2.signal;
+            originalSignal.addEventListener("abort", () => {
+              combinedController.abort(originalSignal.reason);
+            });
+            controller.signal.addEventListener("abort", () => {
+              combinedController.abort(controller.signal.reason);
+            });
+            newArgs[lastIndex] = __spreadProps(__spreadValues({}, config2), {
+              signal: combinedController.signal
+            });
+          } else {
+            newArgs[lastIndex] = __spreadProps(__spreadValues({}, config2), {
+              signal: controller.signal
+            });
+          }
+        } else {
+          newArgs.push({ signal: controller.signal });
+        }
+        const result = yield api(...newArgs);
+        currentController = null;
+        return result;
+      } catch (error) {
+        if (error.name === "AbortError" || axios.isCancel(error)) {
+          throw Object.assign(new Error("Request cancelled"), {
+            name: "AbortError",
+            cancelled: true,
+            originalError: error
+          });
+        }
+        throw error;
+      } finally {
+        if (currentController === controller) {
+          currentController = null;
+        }
+      }
+    });
+  };
+  wrappedFunction.cancel = (reason) => {
+    if (currentController) {
+      currentController.abort(reason);
+      currentController = null;
+    }
+  };
+  wrappedFunction.isPending = () => {
+    return currentController !== null;
+  };
+  return wrappedFunction;
 };
+instance.getSingleton = wrapApi(instance.get);
+instance.postSingleton = wrapApi(instance.post);
+instance.formPostSingleton = wrapApi(instance.formPost);
 var md5$1 = { exports: {} };
 var crypt = { exports: {} };
 (function() {
@@ -4346,7 +4369,7 @@ var lodash = { exports: {} };
 (function(module, exports) {
   (function() {
     var undefined$12;
-    var VERSION = "4.17.21";
+    var VERSION2 = "4.17.21";
     var LARGE_ARRAY_SIZE = 200;
     var CORE_ERROR_TEXT = "Unsupported core-js use. Try https://npms.io/search?q=ponyfill.", FUNC_ERROR_TEXT = "Expected a function", INVALID_TEMPL_VAR_ERROR_TEXT = "Invalid `variable` option passed into `_.template`";
     var HASH_UNDEFINED = "__lodash_hash_undefined__";
@@ -4941,9 +4964,9 @@ var lodash = { exports: {} };
       return reHasUnicodeWord.test(string);
     }
     function iteratorToArray(iterator) {
-      var data, result = [];
-      while (!(data = iterator.next()).done) {
-        result.push(data.value);
+      var data2, result = [];
+      while (!(data2 = iterator.next()).done) {
+        result.push(data2.value);
       }
       return result;
     }
@@ -5152,7 +5175,7 @@ var lodash = { exports: {} };
             index += dir;
             var iterIndex = -1, value = array[index];
             while (++iterIndex < iterLength) {
-              var data = iteratees[iterIndex], iteratee2 = data.iteratee, type = data.type, computed = iteratee2(value);
+              var data2 = iteratees[iterIndex], iteratee2 = data2.iteratee, type = data2.type, computed = iteratee2(value);
               if (type == LAZY_MAP_FLAG) {
                 value = computed;
               } else if (!computed) {
@@ -5187,21 +5210,21 @@ var lodash = { exports: {} };
         return result2;
       }
       function hashGet(key) {
-        var data = this.__data__;
+        var data2 = this.__data__;
         if (nativeCreate) {
-          var result2 = data[key];
+          var result2 = data2[key];
           return result2 === HASH_UNDEFINED ? undefined$12 : result2;
         }
-        return hasOwnProperty2.call(data, key) ? data[key] : undefined$12;
+        return hasOwnProperty2.call(data2, key) ? data2[key] : undefined$12;
       }
       function hashHas(key) {
-        var data = this.__data__;
-        return nativeCreate ? data[key] !== undefined$12 : hasOwnProperty2.call(data, key);
+        var data2 = this.__data__;
+        return nativeCreate ? data2[key] !== undefined$12 : hasOwnProperty2.call(data2, key);
       }
       function hashSet(key, value) {
-        var data = this.__data__;
+        var data2 = this.__data__;
         this.size += this.has(key) ? 0 : 1;
-        data[key] = nativeCreate && value === undefined$12 ? HASH_UNDEFINED : value;
+        data2[key] = nativeCreate && value === undefined$12 ? HASH_UNDEFINED : value;
         return this;
       }
       Hash.prototype.clear = hashClear;
@@ -5222,33 +5245,33 @@ var lodash = { exports: {} };
         this.size = 0;
       }
       function listCacheDelete(key) {
-        var data = this.__data__, index = assocIndexOf(data, key);
+        var data2 = this.__data__, index = assocIndexOf(data2, key);
         if (index < 0) {
           return false;
         }
-        var lastIndex = data.length - 1;
+        var lastIndex = data2.length - 1;
         if (index == lastIndex) {
-          data.pop();
+          data2.pop();
         } else {
-          splice.call(data, index, 1);
+          splice.call(data2, index, 1);
         }
         --this.size;
         return true;
       }
       function listCacheGet(key) {
-        var data = this.__data__, index = assocIndexOf(data, key);
-        return index < 0 ? undefined$12 : data[index][1];
+        var data2 = this.__data__, index = assocIndexOf(data2, key);
+        return index < 0 ? undefined$12 : data2[index][1];
       }
       function listCacheHas(key) {
         return assocIndexOf(this.__data__, key) > -1;
       }
       function listCacheSet(key, value) {
-        var data = this.__data__, index = assocIndexOf(data, key);
+        var data2 = this.__data__, index = assocIndexOf(data2, key);
         if (index < 0) {
           ++this.size;
-          data.push([key, value]);
+          data2.push([key, value]);
         } else {
-          data[index][1] = value;
+          data2[index][1] = value;
         }
         return this;
       }
@@ -5285,9 +5308,9 @@ var lodash = { exports: {} };
         return getMapData(this, key).has(key);
       }
       function mapCacheSet(key, value) {
-        var data = getMapData(this, key), size2 = data.size;
-        data.set(key, value);
-        this.size += data.size == size2 ? 0 : 1;
+        var data2 = getMapData(this, key), size2 = data2.size;
+        data2.set(key, value);
+        this.size += data2.size == size2 ? 0 : 1;
         return this;
       }
       MapCache.prototype.clear = mapCacheClear;
@@ -5312,16 +5335,16 @@ var lodash = { exports: {} };
       SetCache.prototype.add = SetCache.prototype.push = setCacheAdd;
       SetCache.prototype.has = setCacheHas;
       function Stack(entries) {
-        var data = this.__data__ = new ListCache(entries);
-        this.size = data.size;
+        var data2 = this.__data__ = new ListCache(entries);
+        this.size = data2.size;
       }
       function stackClear() {
         this.__data__ = new ListCache();
         this.size = 0;
       }
       function stackDelete(key) {
-        var data = this.__data__, result2 = data["delete"](key);
-        this.size = data.size;
+        var data2 = this.__data__, result2 = data2["delete"](key);
+        this.size = data2.size;
         return result2;
       }
       function stackGet(key) {
@@ -5331,18 +5354,18 @@ var lodash = { exports: {} };
         return this.__data__.has(key);
       }
       function stackSet(key, value) {
-        var data = this.__data__;
-        if (data instanceof ListCache) {
-          var pairs = data.__data__;
+        var data2 = this.__data__;
+        if (data2 instanceof ListCache) {
+          var pairs = data2.__data__;
           if (!Map2 || pairs.length < LARGE_ARRAY_SIZE - 1) {
             pairs.push([key, value]);
-            this.size = ++data.size;
+            this.size = ++data2.size;
             return this;
           }
-          data = this.__data__ = new MapCache(pairs);
+          data2 = this.__data__ = new MapCache(pairs);
         }
-        data.set(key, value);
-        this.size = data.size;
+        data2.set(key, value);
+        this.size = data2.size;
         return this;
       }
       Stack.prototype.clear = stackClear;
@@ -5761,15 +5784,15 @@ var lodash = { exports: {} };
         }
         object = Object2(object);
         while (index--) {
-          var data = matchData[index];
-          if (noCustomizer && data[2] ? data[1] !== object[data[0]] : !(data[0] in object)) {
+          var data2 = matchData[index];
+          if (noCustomizer && data2[2] ? data2[1] !== object[data2[0]] : !(data2[0] in object)) {
             return false;
           }
         }
         while (++index < length) {
-          data = matchData[index];
-          var key = data[0], objValue = object[key], srcValue = data[1];
-          if (noCustomizer && data[2]) {
+          data2 = matchData[index];
+          var key = data2[0], objValue = object[key], srcValue = data2[1];
+          if (noCustomizer && data2[2]) {
             if (objValue === undefined$12 && !(key in object)) {
               return false;
             }
@@ -6072,8 +6095,8 @@ var lodash = { exports: {} };
         }
         return object;
       }
-      var baseSetData = !metaMap ? identity : function(func, data) {
-        metaMap.set(func, data);
+      var baseSetData = !metaMap ? identity : function(func, data2) {
+        metaMap.set(func, data2);
         return func;
       };
       var baseSetToString = !defineProperty ? identity : function(func, string) {
@@ -6577,9 +6600,9 @@ var lodash = { exports: {} };
           index = wrapper ? index : length;
           while (++index < length) {
             func = funcs[index];
-            var funcName = getFuncName(func), data = funcName == "wrapper" ? getData(func) : undefined$12;
-            if (data && isLaziable(data[0]) && data[1] == (WRAP_ARY_FLAG | WRAP_CURRY_FLAG | WRAP_PARTIAL_FLAG | WRAP_REARG_FLAG) && !data[4].length && data[9] == 1) {
-              wrapper = wrapper[getFuncName(data[0])].apply(wrapper, data[3]);
+            var funcName = getFuncName(func), data2 = funcName == "wrapper" ? getData(func) : undefined$12;
+            if (data2 && isLaziable(data2[0]) && data2[1] == (WRAP_ARY_FLAG | WRAP_CURRY_FLAG | WRAP_PARTIAL_FLAG | WRAP_REARG_FLAG) && !data2[4].length && data2[9] == 1) {
+              wrapper = wrapper[getFuncName(data2[0])].apply(wrapper, data2[3]);
             } else {
               wrapper = func.length == 1 && isLaziable(func) ? wrapper[funcName]() : wrapper.thru(func);
             }
@@ -6806,7 +6829,7 @@ var lodash = { exports: {} };
           var partialsRight = partials, holdersRight = holders;
           partials = holders = undefined$12;
         }
-        var data = isBindKey ? undefined$12 : getData(func);
+        var data2 = isBindKey ? undefined$12 : getData(func);
         var newData = [
           func,
           bitmask,
@@ -6819,8 +6842,8 @@ var lodash = { exports: {} };
           ary2,
           arity
         ];
-        if (data) {
-          mergeData(newData, data);
+        if (data2) {
+          mergeData(newData, data2);
         }
         func = newData[0];
         bitmask = newData[1];
@@ -6840,7 +6863,7 @@ var lodash = { exports: {} };
         } else {
           result2 = createHybrid.apply(undefined$12, newData);
         }
-        var setter = data ? baseSetData : setData;
+        var setter = data2 ? baseSetData : setData;
         return setWrapToString(setter(result2, newData), func, bitmask);
       }
       function customDefaultsAssignIn(objValue, srcValue, key, object) {
@@ -7007,9 +7030,9 @@ var lodash = { exports: {} };
       function getFuncName(func) {
         var result2 = func.name + "", array = realNames[result2], length = hasOwnProperty2.call(realNames, result2) ? array.length : 0;
         while (length--) {
-          var data = array[length], otherFunc = data.func;
+          var data2 = array[length], otherFunc = data2.func;
           if (otherFunc == null || otherFunc == func) {
-            return data.name;
+            return data2.name;
           }
         }
         return result2;
@@ -7024,8 +7047,8 @@ var lodash = { exports: {} };
         return arguments.length ? result2(arguments[0], arguments[1]) : result2;
       }
       function getMapData(map2, key) {
-        var data = map2.__data__;
-        return isKeyable(key) ? data[typeof key == "string" ? "string" : "hash"] : data.map;
+        var data2 = map2.__data__;
+        return isKeyable(key) ? data2[typeof key == "string" ? "string" : "hash"] : data2.map;
       }
       function getMatchData(object) {
         var result2 = keys(object), length = result2.length;
@@ -7097,8 +7120,8 @@ var lodash = { exports: {} };
       function getView(start, end, transforms) {
         var index = -1, length = transforms.length;
         while (++index < length) {
-          var data = transforms[index], size2 = data.size;
-          switch (data.type) {
+          var data2 = transforms[index], size2 = data2.size;
+          switch (data2.type) {
             case "drop":
               start += size2;
               break;
@@ -7229,8 +7252,8 @@ var lodash = { exports: {} };
         if (func === other) {
           return true;
         }
-        var data = getData(other);
-        return !!data && func === data[0];
+        var data2 = getData(other);
+        return !!data2 && func === data2[0];
       }
       function isMasked(func) {
         return !!maskSrcKey && maskSrcKey in func;
@@ -7261,41 +7284,41 @@ var lodash = { exports: {} };
         var cache = result2.cache;
         return result2;
       }
-      function mergeData(data, source2) {
-        var bitmask = data[1], srcBitmask = source2[1], newBitmask = bitmask | srcBitmask, isCommon = newBitmask < (WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG | WRAP_ARY_FLAG);
-        var isCombo = srcBitmask == WRAP_ARY_FLAG && bitmask == WRAP_CURRY_FLAG || srcBitmask == WRAP_ARY_FLAG && bitmask == WRAP_REARG_FLAG && data[7].length <= source2[8] || srcBitmask == (WRAP_ARY_FLAG | WRAP_REARG_FLAG) && source2[7].length <= source2[8] && bitmask == WRAP_CURRY_FLAG;
+      function mergeData(data2, source2) {
+        var bitmask = data2[1], srcBitmask = source2[1], newBitmask = bitmask | srcBitmask, isCommon = newBitmask < (WRAP_BIND_FLAG | WRAP_BIND_KEY_FLAG | WRAP_ARY_FLAG);
+        var isCombo = srcBitmask == WRAP_ARY_FLAG && bitmask == WRAP_CURRY_FLAG || srcBitmask == WRAP_ARY_FLAG && bitmask == WRAP_REARG_FLAG && data2[7].length <= source2[8] || srcBitmask == (WRAP_ARY_FLAG | WRAP_REARG_FLAG) && source2[7].length <= source2[8] && bitmask == WRAP_CURRY_FLAG;
         if (!(isCommon || isCombo)) {
-          return data;
+          return data2;
         }
         if (srcBitmask & WRAP_BIND_FLAG) {
-          data[2] = source2[2];
+          data2[2] = source2[2];
           newBitmask |= bitmask & WRAP_BIND_FLAG ? 0 : WRAP_CURRY_BOUND_FLAG;
         }
         var value = source2[3];
         if (value) {
-          var partials = data[3];
-          data[3] = partials ? composeArgs(partials, value, source2[4]) : value;
-          data[4] = partials ? replaceHolders(data[3], PLACEHOLDER) : source2[4];
+          var partials = data2[3];
+          data2[3] = partials ? composeArgs(partials, value, source2[4]) : value;
+          data2[4] = partials ? replaceHolders(data2[3], PLACEHOLDER) : source2[4];
         }
         value = source2[5];
         if (value) {
-          partials = data[5];
-          data[5] = partials ? composeArgsRight(partials, value, source2[6]) : value;
-          data[6] = partials ? replaceHolders(data[5], PLACEHOLDER) : source2[6];
+          partials = data2[5];
+          data2[5] = partials ? composeArgsRight(partials, value, source2[6]) : value;
+          data2[6] = partials ? replaceHolders(data2[5], PLACEHOLDER) : source2[6];
         }
         value = source2[7];
         if (value) {
-          data[7] = value;
+          data2[7] = value;
         }
         if (srcBitmask & WRAP_ARY_FLAG) {
-          data[8] = data[8] == null ? source2[8] : nativeMin(data[8], source2[8]);
+          data2[8] = data2[8] == null ? source2[8] : nativeMin(data2[8], source2[8]);
         }
-        if (data[9] == null) {
-          data[9] = source2[9];
+        if (data2[9] == null) {
+          data2[9] = source2[9];
         }
-        data[0] = source2[0];
-        data[1] = newBitmask;
-        return data;
+        data2[0] = source2[0];
+        data2[1] = newBitmask;
+        return data2;
       }
       function nativeKeysIn(object) {
         var result2 = [];
@@ -8561,7 +8584,7 @@ var lodash = { exports: {} };
         copyObject(source2, keys(source2), object, customizer);
       });
       var at = flatRest(baseAt);
-      function create2(prototype, properties) {
+      function create(prototype, properties) {
         var result2 = baseCreate(prototype);
         return properties == null ? result2 : baseAssign(result2, properties);
       }
@@ -9308,7 +9331,7 @@ var lodash = { exports: {} };
       lodash2.conforms = conforms;
       lodash2.constant = constant;
       lodash2.countBy = countBy;
-      lodash2.create = create2;
+      lodash2.create = create;
       lodash2.curry = curry;
       lodash2.curryRight = curryRight;
       lodash2.debounce = debounce;
@@ -9603,7 +9626,7 @@ var lodash = { exports: {} };
         });
         return source2;
       }(), { "chain": false });
-      lodash2.VERSION = VERSION;
+      lodash2.VERSION = VERSION2;
       arrayEach(["bind", "bindKey", "curry", "curryRight", "partial", "partialRight"], function(methodName) {
         lodash2[methodName].placeholder = lodash2;
       });
@@ -10671,7 +10694,7 @@ function renderHeaderTooltip({
   }
   return text;
 }
-function renderColumnTree(data, columnGroup, option = {}) {
+function renderColumnTree(data2, columnGroup, option = {}) {
   var _b;
   const _a = columnGroup, {
     key,
@@ -10700,7 +10723,7 @@ function renderColumnTree(data, columnGroup, option = {}) {
   ]);
   const { keyPropName = "key", titlePropName = "title", keyPrefix = "", parents = [] } = option;
   if (keyProp) {
-    let columnUniqData = ((_b = _.uniqBy(data, columnGroup.keyProp)) == null ? void 0 : _b.filter((item) => !isNil(item[columnGroup.keyProp]))) || [];
+    let columnUniqData = ((_b = _.uniqBy(data2, columnGroup.keyProp)) == null ? void 0 : _b.filter((item) => !isNil(item[columnGroup.keyProp]))) || [];
     if (sortProp) {
       const unSortData = columnUniqData.filter((item) => isNil(item[sortProp]));
       const sortData = columnUniqData.filter((item) => !isNil(item[sortProp]));
@@ -10711,7 +10734,7 @@ function renderColumnTree(data, columnGroup, option = {}) {
       if (children && children.length) {
         const prefix = `${keyPrefix}${keyProp}${VALUE_SEP}${item[keyProp]}${GROUP_SEP}`;
         const columnChildren = children.map((child) => {
-          let nextData = isLimitChildren ? data.filter((temp) => temp[keyProp] === item[keyProp]) : data;
+          let nextData = isLimitChildren ? data2.filter((temp) => temp[keyProp] === item[keyProp]) : data2;
           return renderColumnTree(nextData, child, __spreadProps(__spreadValues({}, option), {
             keyPrefix: prefix,
             parents: [...parents, item]
@@ -10750,7 +10773,7 @@ function renderColumnTree(data, columnGroup, option = {}) {
   if (children && children.length) {
     const prefix = `${keyPrefix}${key || ""}`;
     const columnChildren = children.map((child) => {
-      return renderColumnTree(data, child, __spreadProps(__spreadValues({}, option), { keyPrefix: prefix }));
+      return renderColumnTree(data2, child, __spreadProps(__spreadValues({}, option), { keyPrefix: prefix }));
     });
     return __spreadProps(__spreadValues({}, args), {
       [titlePropName]: title,
@@ -10775,7 +10798,7 @@ function getLeafColumns(columns = []) {
     }
   }, []);
 }
-function renderRowData(data, keys) {
+function renderRowData(data2, keys) {
   var _a;
   if (!keys.length)
     return;
@@ -10783,13 +10806,13 @@ function renderRowData(data, keys) {
   keys = keys.slice(1);
   if (key.includes(VALUE_SEP) && keys.length) {
     const [keyProp, keyValue] = key.split(VALUE_SEP);
-    const matchData = _.filter(data, { [keyProp]: keyValue });
+    const matchData = _.filter(data2, { [keyProp]: keyValue });
     return renderRowData(matchData, keys);
   }
   if (keys.length) {
     console.error("\u600E\u4E48\u4F1A\u4E0D\u662F\u6700\u540E\u4E00\u5C42\u5206\u7EC4\u5462\uFF0C\u8BF7\u8054\u7CFB\u5F00\u53D1\u4EBA\u5458\u67E5\u770B\uFF01");
   }
-  const value = (_a = data == null ? void 0 : data[0]) == null ? void 0 : _a[key];
+  const value = (_a = data2 == null ? void 0 : data2[0]) == null ? void 0 : _a[key];
   return value;
 }
 function getRowKeyValue(item, rowKey) {
@@ -10829,19 +10852,19 @@ function renderSumColumns({ sumColumnDefs }) {
   }
   return columns;
 }
-function row2column(data = [], columnGroups = [], rowKey, option = {}) {
+function row2column(data2 = [], columnGroups = [], rowKey, option = {}) {
   var _a;
   const columns = [];
   if (option.sumColumnDefs && option.sumColumnDefs.length) {
     columns.push(...renderSumColumns(option));
   }
-  const groupColumns = _.flatten(columnGroups.map((group) => renderColumnTree(data, group, option))) || [];
+  const groupColumns = _.flatten(columnGroups.map((group) => renderColumnTree(data2, group, option))) || [];
   columns.push(...groupColumns);
   const leafColumns = getLeafColumns(columns);
-  const rowKeyUniqData = ((_a = _.uniqBy(data, (item) => getRowKeyValue(item, rowKey))) == null ? void 0 : _a.filter(
+  const rowKeyUniqData = ((_a = _.uniqBy(data2, (item) => getRowKeyValue(item, rowKey))) == null ? void 0 : _a.filter(
     (item) => !isNil(getRowKeyValue(item, rowKey))
   )) || [];
-  const groupData = _.groupBy(data, (item) => getRowKeyValue(item, rowKey));
+  const groupData = _.groupBy(data2, (item) => getRowKeyValue(item, rowKey));
   const rltData = rowKeyUniqData.map((item) => {
     const rowKeyValue = getRowKeyValue(item, rowKey);
     const rowGroupData = groupData[rowKeyValue] || [];
@@ -10901,9 +10924,9 @@ function flattenRowData(rowData = {}, leafColumns = [], option = {}) {
   });
   return rlt;
 }
-function flattenRow2ColumnData(data = [], columns = [], option = {}) {
+function flattenRow2ColumnData(data2 = [], columns = [], option = {}) {
   const leafColumns = getLeafColumns(columns);
-  return data.reduce(
+  return data2.reduce(
     (rlt, rowData) => [...rlt, ...flattenRowData(rowData, leafColumns, option)],
     []
   );
@@ -11047,8 +11070,8 @@ const DICT_KEY = "ind-dict_";
 function getDictCache(dictId) {
   return getSessionStorage(`${DICT_KEY}${dictId}`);
 }
-function setDictCache(dictId, data) {
-  setSessionStorage(`${DICT_KEY}${dictId}`, data);
+function setDictCache(dictId, data2) {
+  setSessionStorage(`${DICT_KEY}${dictId}`, data2);
 }
 const CONTEXT$5 = config.authServerContext;
 function getDictsMapApi(dictId) {
@@ -11064,9 +11087,9 @@ function getDictApi(dictId) {
       return dictValue;
     }
     try {
-      const { data } = yield instance.get(`${CONTEXT$5}/dict/getDicts`, { params: { dictId } });
-      setDictCache(dictId, data);
-      return data;
+      const { data: data2 } = yield instance.get(`${CONTEXT$5}/dict/getDicts`, { params: { dictId } });
+      setDictCache(dictId, data2);
+      return data2;
     } catch (error) {
       console.error(`getDict error dictId=${dictId}`, error);
     }
@@ -11243,8 +11266,8 @@ function loginApi({ userName, password, validCodeId, validCodeInput }) {
   let nodeRSA = new window.NodeRSA(publicKey, "pkcs8-public");
   let rsaPaswword = nodeRSA.encrypt(password, "base64");
   let upw = Base64.encode(rsaPaswword);
-  const data = { usn: userName, upw, validCodeId, validCodeInput };
-  return instance.formPost(CONTEXT$2 + "/sso/auth/login", data);
+  const data2 = { usn: userName, upw, validCodeId, validCodeInput };
+  return instance.formPost(CONTEXT$2 + "/sso/auth/login", data2);
 }
 function getUserInfoApi() {
   return instance.get(`${CONTEXT$2}/manage/user/getCurrentInfo`);
@@ -11252,8 +11275,8 @@ function getUserInfoApi() {
 function getGlobalPolicyApi() {
   return instance.get(`${CONTEXT$2}/anon/user/getGlobalPolicy`);
 }
-function updatePasswordApi(data) {
-  return instance.post(`${CONTEXT$2}/manage/user/updatePassword`, data);
+function updatePasswordApi(data2) {
+  return instance.post(`${CONTEXT$2}/manage/user/updatePassword`, data2);
 }
 function getCaptchaURL(validCodeId) {
   return `${CONTEXT$2}/anon/user/getCaptcha/` + validCodeId;
@@ -11291,4 +11314,4 @@ const UC_CONTEXT = config.ucExtServerContext;
 function listUserTreeApi(params) {
   return instance.get(`${UC_CONTEXT}/tree/uc-user/listUserTree`, { params });
 }
-export { Base64ForLogin, CONTENT_TYPE, IS_OR_NOT_ENUM, IS_OR_NOT_ENUM_KEY, IS_OR_NOT_ENUM_LIST, MIME_TYPE, UC_ENUM, addMenuCollectApi, instance as axios, base64ToBlob, blobToBase64, checkIdCard, checkPhone, checkTel, checkVehicleNo, clearIndexDescCache, clearPermissionCache, clearSessionStorage, clearUserInfoCache, config, cryptor, deleteMenuCollectApi, deleteMenuHistoryApi, exportJsonToExcel, flattenRow2ColumnData, formatDate, formatDateChinese, formatDecimal, formatHalfYear, formatQuarter, getAppListApi, getCaptchaURL, getContentType, getDictApi, getDictMapApi, getDictsMapApi, getExcelColumnIdx, getGlobalPolicyApi, getHalfYear, getHalfYearBeginMonth, getHalfYearEndMonth, getHalfYearNum, getIndexDescCache, getItem, getLocalStorage, getMaxTabNumValueApi, getMenuCollectApi, getMenuHistoryApi, getOssFileApi, getOssFileUrl, getPermissionApi, getPermissionCache, getPreviewUrlApi, getPriceInfo, getQuarter, getQuarterBeginMonth, getQuarterEndMonth, getQuarterNum, getSessionStorage, getToken, getType, getUrlParams, getUserInfoApi, getUserInfoCache, guid, importJsonFromExcel, isArguments, isArray, isArrayLike, isBoolean, isDate, isDecimal, isElement, isEmpty, isEqual, isEqualWith, isError, isEven, isFinite$1 as isFinite, isFunction, isInteger, isNegative, isNil, isNull, isNumber, isNumberEqual, isObject, isObjectLike, isOdd, isPlainObject, isPositive, isPromise, isPrototype, isRegExp2 as isRegExp, isString, isType, isUndefined, listComTreeApi, listIndexDescApi, listItemTreeApi, listUserTreeApi, loginApi, logoutApi, menuHistoryApi, numToChineseNumerals, numToDX, off, on, preventDefault, putOssFileApi, putOssFileUrl, quarter2Chinese, removeLocalStorage, removeMenuCollectApi, removeSessionStorage, renderColumnEnums, renderEnumData, renderEnumList, renderFieldEnums, responseInterceptors, round, row2column, setConfig, setContentType, setIndexDescCache, setLocalStorage, setPermissionCache, setSessionStorage, setToken, setUserInfoCache, stopPropagation, str2Date, toChies, toFixed, toThousands, updatePasswordApi, useConfig, uuid };
+export { Base64ForLogin, CONTENT_TYPE, IS_OR_NOT_ENUM, IS_OR_NOT_ENUM_KEY, IS_OR_NOT_ENUM_LIST, MIME_TYPE, UC_ENUM, addMenuCollectApi, instance as axios, base64ToBlob, blobToBase64, checkIdCard, checkPhone, checkTel, checkVehicleNo, clearIndexDescCache, clearPermissionCache, clearSessionStorage, clearUserInfoCache, config, cryptor, deleteMenuCollectApi, deleteMenuHistoryApi, exportJsonToExcel, flattenRow2ColumnData, formatDate, formatDateChinese, formatDecimal, formatHalfYear, formatQuarter, getAppListApi, getCaptchaURL, getContentType, getDictApi, getDictMapApi, getDictsMapApi, getExcelColumnIdx, getGlobalPolicyApi, getHalfYear, getHalfYearBeginMonth, getHalfYearEndMonth, getHalfYearNum, getIndexDescCache, getItem, getLocalStorage, getMaxTabNumValueApi, getMenuCollectApi, getMenuHistoryApi, getOssFileApi, getOssFileUrl, getPermissionApi, getPermissionCache, getPreviewUrlApi, getPriceInfo, getQuarter, getQuarterBeginMonth, getQuarterEndMonth, getQuarterNum, getSessionStorage, getToken, getType, getUrlParams, getUserInfoApi, getUserInfoCache, guid, importJsonFromExcel, isArguments, isArray, isArrayLike, isBoolean, isDate, isDecimal, isElement, isEmpty, isEqual, isEqualWith, isError, isEven, isFinite$1 as isFinite, isFunction, isInteger, isNegative, isNil, isNull, isNumber, isNumberEqual, isObject, isObjectLike, isOdd, isPlainObject, isPositive, isPromise, isPrototype, isRegExp2 as isRegExp, isString, isType, isUndefined, listComTreeApi, listIndexDescApi, listItemTreeApi, listUserTreeApi, loginApi, logoutApi, menuHistoryApi, numToChineseNumerals, numToDX, off, on, preventDefault, putOssFileApi, putOssFileUrl, quarter2Chinese, removeLocalStorage, removeMenuCollectApi, removeSessionStorage, renderColumnEnums, renderEnumData, renderEnumList, renderFieldEnums, responseInterceptors, round, row2column, setConfig, setContentType, setIndexDescCache, setLocalStorage, setPermissionCache, setSessionStorage, setToken, setUserInfoCache, stopPropagation, str2Date, toChies, toFixed, toThousands, updatePasswordApi, useConfig, uuid, wrapApi };