ls-pro-common 3.1.9 → 3.1.10

package/es/utils/index.js

@@ -42,9 +42,10 @@ export var getResourceProps = function getResourceProps(name) {
     obj = resList.find(function (o) {
       return o.resourceId === id;
     });
-  } else if (location.pathname && location.pathname.length > 2) {
+  } else if (location.pathname && location.pathname.length > 3) {
+    var url = location.pathname + location.hash;
     obj = resList.find(function (o) {
-      return o.microUrl === location.pathname;
+      return o.microUrl && o.microUrl === location.pathname || o.url === url;
     });
   }
   if (!obj) return '';
@@ -399,9 +400,14 @@ export var appPath = function appPath() {
     return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
   }
   if (path) return path;
+  //本地开发环境，判断是否hash路由，如果是hash路由，则返回./
+  if (isDev) {
+    return location.hash ? './' : '/';
+  }
+  // 生产环境，返回当前路径
   var p = location.pathname || '';
-  var idx = p.indexOf('/', 1);
-  return idx > 0 ? p.slice(0, idx + 1) : p.length > 1 ? p + '/' : './';
+  if (p === '/') return location.origin + '/';
+  return location.origin + '/' + p.split('/')[1] + '/';
 };
 /**
  * 深度复制对象

package/lib/utils/index.js

@@ -42,9 +42,10 @@ export var getResourceProps = function getResourceProps(name) {
     obj = resList.find(function (o) {
       return o.resourceId === id;
     });
-  } else if (location.pathname && location.pathname.length > 2) {
+  } else if (location.pathname && location.pathname.length > 3) {
+    var url = location.pathname + location.hash;
     obj = resList.find(function (o) {
-      return o.microUrl === location.pathname;
+      return o.microUrl && o.microUrl === location.pathname || o.url === url;
     });
   }
   if (!obj) return '';
@@ -399,9 +400,14 @@ export var appPath = function appPath() {
     return window.__INJECTED_PUBLIC_PATH_BY_QIANKUN__;
   }
   if (path) return path;
+  //本地开发环境，判断是否hash路由，如果是hash路由，则返回./
+  if (isDev) {
+    return location.hash ? './' : '/';
+  }
+  // 生产环境，返回当前路径
   var p = location.pathname || '';
-  var idx = p.indexOf('/', 1);
-  return idx > 0 ? p.slice(0, idx + 1) : p.length > 1 ? p + '/' : './';
+  if (p === '/') return location.origin + '/';
+  return location.origin + '/' + p.split('/')[1] + '/';
 };
 /**
  * 深度复制对象

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ls-pro-common",
-  "version": "3.1.9",
+  "version": "3.1.10",
   "description": "ls-pro-common",
   "license": "MIT",
   "sideEffects": [