fast-vue-multi-pages-vite 1.2.1 → 1.2.2

package/dist/index.d.ts

@@ -560,7 +560,7 @@ declare class FastVueMultiWindow {
   /**
    * 获取实际访问的浏览器地址
    */
-  static getRealWindowUrl(): string;
+  static getRealWindowUrls(): string[];
   /**
    * 设置当前window对象里实际的url地址
    * @param url

package/dist/index.js

@@ -1606,10 +1606,11 @@ var FastVueMultiWindow = class FastVueMultiWindow {
 	/**
 	* 获取实际访问的浏览器地址
 	*/
-	static getRealWindowUrl() {
-		let url = window.location.href;
-		if (window["__LOCATION_HREF"]) url = window["__LOCATION_HREF"];
-		return url;
+	static getRealWindowUrls() {
+		let urls = [];
+		if (window["__LOCATION_HREF"]) urls.push(window["__LOCATION_HREF"]);
+		urls.push(window.location.href);
+		return urls;
 	}
 	/**
 	* 设置当前window对象里实际的url地址
@@ -1623,13 +1624,24 @@ var FastVueMultiWindow = class FastVueMultiWindow {
 	* @param paramName 参数名
 	*/
 	static getWindowUrlParam(paramName) {
-		return FastVueMultiHttp.Base.getUrlParam(FastVueMultiWindow.getRealWindowUrl(), paramName);
+		let urls = FastVueMultiWindow.getRealWindowUrls();
+		for (let url of urls) {
+			let value = FastVueMultiHttp.Base.getUrlParam(url, paramName);
+			if (value !== null && value !== void 0) return value;
+		}
+		return null;
 	}
 	/**
 	* 获取地址栏携带的参数对象信息
 	*/
 	static getWindowUrlInfo() {
-		return FastVueMultiHttp.Base.getUrlParamInfo(FastVueMultiWindow.getRealWindowUrl());
+		let info = {};
+		let urls = FastVueMultiWindow.getRealWindowUrls();
+		for (let url of urls) {
+			let value = FastVueMultiHttp.Base.getUrlParamInfo(url);
+			if (value !== null && value !== void 0) for (let valueKey in value) info[valueKey] = value[valueKey];
+		}
+		return info;
 	}
 	/**
 	* 设置当前页面是否使用了vue-router

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fast-vue-multi-pages-vite",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "author": "janesen",
   "description": "Vite-快速搭建VUE项目工具类的基本库，主要用于多个页面独立生成html",
   "main": "./dist/index.js",