@lingxiteam/assets 1.0.11-alpha.7 → 1.0.11

package/es/utils/url.js

@@ -1,9 +1,9 @@
-function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
 function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -49,41 +49,54 @@ href 当前文档的完整url
  */
 export var parseUrlExpression = function parseUrlExpression(urlStr) {
   var urlParamsContext = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
-  var _ref = window.location || {},
-    protocol = _ref.protocol,
-    _ref$href = _ref.href,
-    href = _ref$href === void 0 ? '' : _ref$href,
-    port = _ref.port,
-    pathname = _ref.pathname,
-    host = _ref.host,
-    hostname = _ref.hostname,
-    hash = _ref.hash;
-  var defaultParams = {
-    protocol: protocol,
-    href: href,
-    port: port,
-    pathname: pathname,
-    host: host,
-    hostname: hostname,
-    searchObj: getSearchObj(href),
-    search: decodeURIComponent(href.split('?').pop() || ''),
-    hash: decodeURIComponent(hash)
-  };
-  var evalVariableExpression = function evalVariableExpression(text) {
-    var params = _objectSpread(_objectSpread({}, defaultParams), urlParamsContext);
-    try {
-      return Function('context', "\n        with(context) {\n            return (function(){\n              \"use strict\";\n              return ".concat(text.slice(2, text.length - 1), ";\n              })();\n            }\n          "))(params);
-    } catch (error) {
-      console.warn("".concat(text, "\u8868\u8FBE\u5F0F\u6267\u884C\u6709\u8BEF:"), error);
-      return text;
-    }
-  };
-  var regexp = /\$\{(.+?)\}/g;
+  if (urlStr && typeof urlStr !== 'string') {
+    console.error("parseUrlExpression\u5904\u7406".concat(urlStr, "\u65F6\u89E3\u6790\u9519\u8BEF:\u8868\u8FBE\u5F0F\u9700\u4E3A\u5B57\u7B26\u4E32\u683C\u5F0F"));
+    return '';
+  }
+  var extend = urlParamsContext;
   var result = urlStr;
-  if (result) {
-    result = result.replace(regexp, function (str) {
-      return evalVariableExpression(str);
-    });
+  if (_typeof(urlParamsContext) !== 'object') {
+    console.warn("parseUrlExpression\u53C2\u6570\u9519\u8BEF:\u6269\u5C55\u53C2\u6570\u9700\u4E3A\u5BF9\u8C61");
+    extend = {};
+  }
+  try {
+    var _ref = window.location || {},
+      protocol = _ref.protocol,
+      _ref$href = _ref.href,
+      href = _ref$href === void 0 ? '' : _ref$href,
+      port = _ref.port,
+      pathname = _ref.pathname,
+      host = _ref.host,
+      hostname = _ref.hostname,
+      hash = _ref.hash;
+    var defaultParams = {
+      protocol: protocol,
+      href: href,
+      port: port,
+      pathname: pathname,
+      host: host,
+      hostname: hostname,
+      searchObj: getSearchObj(href),
+      search: decodeURIComponent(href.split('?').pop() || ''),
+      hash: decodeURIComponent(hash)
+    };
+    var evalVariableExpression = function evalVariableExpression(text) {
+      var params = _objectSpread(_objectSpread({}, defaultParams), extend);
+      try {
+        return Function('context', "\n          with(context) {\n              return (function(){\n                \"use strict\";\n                return ".concat(text.slice(2, text.length - 1), ";\n                })();\n              }\n            "))(params);
+      } catch (error) {
+        console.warn("parseUrlExpression\u5904\u7406".concat(text, "\u65F6\u89E3\u6790\u9519\u8BEF:"), error);
+        return text;
+      }
+    };
+    var regexp = /\$\{(.+?)\}/g;
+    if (result) {
+      result = result.replace(regexp, function (str) {
+        return evalVariableExpression(str);
+      });
+    }
+  } catch (e) {
+    console.error("parseUrlExpression\u6267\u884C\u9519\u8BEF:", e);
   }
-  return result;
+  return result || '';
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lingxiteam/assets",
-  "version": "1.0.11-alpha.7",
+  "version": "1.0.11",
   "description": "灵犀低代码平台移动端 - 工具类",
   "main": "lib/index.js",
   "module": "es/index.js",