eoss-ui 0.8.21 → 0.8.23

package/lib/main.js

@@ -5485,8 +5485,8 @@ render._withStripped = true
 // EXTERNAL MODULE: ./src/config/image.js
 var config_image = __webpack_require__(19);
 
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=8605940a&scoped=true&
-var simplicityvue_type_template_id_8605940a_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=template&id=7b9689e2&scoped=true&
+var simplicityvue_type_template_id_7b9689e2_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -6252,11 +6252,11 @@ var simplicityvue_type_template_id_8605940a_scoped_true_render = function () {
     ),
   ])
 }
-var simplicityvue_type_template_id_8605940a_scoped_true_staticRenderFns = []
-simplicityvue_type_template_id_8605940a_scoped_true_render._withStripped = true
+var simplicityvue_type_template_id_7b9689e2_scoped_true_staticRenderFns = []
+simplicityvue_type_template_id_7b9689e2_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=8605940a&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicity/index.vue?vue&type=template&id=7b9689e2&scoped=true&
 
 // CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/avatar.vue?vue&type=template&id=e722b45c&scoped=true&
 var avatarvue_type_template_id_e722b45c_scoped_true_render = function () {
@@ -11882,6 +11882,8 @@ var external_wujie_vue2_ = __webpack_require__(16);
 var external_wujie_vue2_default = /*#__PURE__*/__webpack_require__.n(external_wujie_vue2_);
 
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicity/index.vue?vue&type=script&lang=js&
+var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var simplicityvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 //
@@ -13670,7 +13672,9 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleRefresh: function handleRefresh(arg) {
-      var i = arg && arg != true && arg !== 'pageData' ? util["a" /* default */].indexOfObj(this.tabs, arg, 'appCode,code,id,url') : util["a" /* default */].indexOfObj(this.tabs, this.activeName, 'id');
+      var _this7 = this;
+
+      var i = arg && arg != true && arg !== 'pageData' && !((typeof arg === 'undefined' ? 'undefined' : _typeof(arg)) === 'object' && arg.path) ? util["a" /* default */].indexOfObj(this.tabs, arg, 'appCode,code,id,url') : util["a" /* default */].indexOfObj(this.tabs, this.activeName, 'id');
       var tab = this.tabs[i];
       if (isIE || tab.method === 'iframe') {
         if (arg && arg === 'pageData') {
@@ -13690,7 +13694,22 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
         if (arg && arg === 'pageData') {
           external_wujie_vue2_default.a.$emit('pageData', tab);
         } else {
-          window.document.querySelector('iframe[name=' + tab.appCode + ']').contentWindow.location.reload(true);
+          // window.document
+          //   .querySelector(`iframe[name=${tab.appCode}]`)
+          //   .contentWindow.location.reload(true);
+          var url = tab.url;
+          // 如果传入了路由参数，需要更新 URL
+          if (arg && (typeof arg === 'undefined' ? 'undefined' : _typeof(arg)) === 'object' && arg.path) {
+            url = this.buildWujieUrl(tab.url, arg);
+          }
+          // 1. 获取带新时间戳的 URL
+          var newUrl = util["a" /* default */].handlerUrl(url);
+          // 2. 关键：先置空，等待 Wujie 销毁实例
+          tab.url = '';
+          // 3. 使用 setTimeout 替代 $nextTick，给 Wujie 更多时间清理内存和 DOM
+          setTimeout(function () {
+            _this7.$set(_this7.tabs, i, simplicityvue_type_script_lang_js_extends({}, tab, { url: newUrl }));
+          }, 50); // 50ms 的延迟通常足以让 Wujie 完成卸载
         }
         return;
       }
@@ -13704,6 +13723,61 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
       }
     },
 
+    /**
+     * @desc:构建 Wujie 子应用 URL（处理路由参数）
+     * @param {String} baseUrl - 基础 URL
+     * @param {Object} routeInfo - 路由信息 { path, params, query }
+     * @returns {String} 拼接后的完整 URL
+     **/
+    buildWujieUrl: function buildWujieUrl(baseUrl, routeInfo) {
+      var path = routeInfo.path,
+          _routeInfo$params = routeInfo.params,
+          params = _routeInfo$params === undefined ? {} : _routeInfo$params,
+          _routeInfo$query = routeInfo.query,
+          query = _routeInfo$query === undefined ? {} : _routeInfo$query;
+
+
+      if (!path) {
+        return baseUrl;
+      }
+
+      // 1. 处理 path + params（Vue Router 风格：params 作为路径参数）
+      var fullPath = path;
+
+      // 如果 params 中有值，将其拼接到 path 后面
+      // 例如：path='/aa/bb', params={action:'action', id:'ddd', did:'33333'}
+      // 结果：'/aa/bb/action/ddd/33333'
+      var paramValues = Object.values(params).filter(function (val) {
+        return val !== undefined && val !== null;
+      });
+      if (paramValues.length > 0) {
+        // 确保 path 不以 / 结尾
+        var cleanPath = path.endsWith('/') ? path.slice(0, -1) : path;
+        fullPath = cleanPath + '/' + paramValues.join('/');
+      }
+
+      // 2. 处理 query 参数
+      var queryKeys = Object.keys(query);
+      if (queryKeys.length > 0) {
+        var queryString = queryKeys.map(function (key) {
+          return encodeURIComponent(key) + '=' + encodeURIComponent(query[key]);
+        }).join('&');
+        fullPath += '?' + queryString;
+      }
+
+      // 3. 从 baseUrl 中提取基础部分（去掉 hash 路由部分）
+      // 例如：baseUrl = 'http://example.com/app#/old/path'
+      // 提取：'http://example.com/app#'
+      var baseUrlPrefix = baseUrl;
+      var hashIndex = baseUrl.indexOf('#');
+      if (hashIndex > -1) {
+        baseUrlPrefix = baseUrl.substring(0, hashIndex + 1); // 保留 #
+      }
+
+      // 4. 拼接最终 URL
+      return baseUrlPrefix + fullPath;
+    },
+
     /**
      * @desc:删除iframe
      * @author huangbo
@@ -13880,7 +13954,7 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleQuit: function handleQuit() {
-      var _this7 = this;
+      var _this8 = this;
 
       this.$confirm('确定退出吗?', '退出系统', {
         confirmButtonText: '确定',
@@ -13896,19 +13970,19 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
           }
           break;
         }
-        if (_this7.singleLogout) {
-          for (var _i2 = 0; _i2 < _this7.singleLogout.length; _i2++) {
+        if (_this8.singleLogout) {
+          for (var _i2 = 0; _i2 < _this8.singleLogout.length; _i2++) {
             var iframe = document.createElement('iframe');
             iframe.style.display = 'none';
-            iframe.src = _this7.singleLogout[_i2];
+            iframe.src = _this8.singleLogout[_i2];
             document.body.appendChild(iframe);
           }
         }
         util["a" /* default */].ajax({ method: 'post', url: api["yb" /* logout */] }).then(function (res) {
           if (res.rCode == 0) {
             util["a" /* default */].removeStorage(['Authorization', 'token', 'ssId', 'userId', 'userName', 'auth', 'deviceUnique', 'menus', 'useCaseCodes', 'mainConfig', 'jump']);
-            if (_this7.onQuit && typeof _this7.onQuit === 'function') {
-              _this7.onQuit();
+            if (_this8.onQuit && typeof _this8.onQuit === 'function') {
+              _this8.onQuit();
             } else {
               try {
                 var loginPage = util["a" /* default */].getStorage('login') || util["a" /* default */].getStorage('loginPage');
@@ -13952,7 +14026,7 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
           }
         }).catch(function (err) {
           if (err.message && err.message !== 'canceled') {
-            _this7.$message.error(err.message);
+            _this8.$message.error(err.message);
           }
         });
       }).catch(function (e) {});
@@ -14010,13 +14084,13 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
      * @date 2024年9月7日
      **/
     handleOpened: function handleOpened(res) {
-      var _this8 = this;
+      var _this9 = this;
 
       if (res === undefined) {
         this.sysMsg = [];
       } else if (res == false && this.sysMsg.length) {
         this.sysMsgOut = setTimeout(function () {
-          _this8.sysMsg = [];
+          _this9.sysMsg = [];
         }, 3000);
       } else if (this.sysMsgOut) {
         clearTimeout(this.sysMsgOut);
@@ -14092,13 +14166,13 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
 
     //监听改变菜单
     handleListener: function handleListener() {
-      var _this9 = this;
+      var _this10 = this;
 
       util["a" /* default */].win.addEventListener('message', function (e) {
         var msg = e.data;
         if (msg.key == 'jump_Menu') {
           var res = msg.data1;
-          _this9.jumpMenu(res);
+          _this10.jumpMenu(res);
         }
       }, false);
     },
@@ -14135,18 +14209,18 @@ var simplicityvue_type_script_lang_js_events = [function (tabs, index, that) {
 
 var simplicity_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityvue_type_script_lang_js_,
-  simplicityvue_type_template_id_8605940a_scoped_true_render,
-  simplicityvue_type_template_id_8605940a_scoped_true_staticRenderFns,
+  simplicityvue_type_template_id_7b9689e2_scoped_true_render,
+  simplicityvue_type_template_id_7b9689e2_scoped_true_staticRenderFns,
   false,
   null,
-  "8605940a",
+  "7b9689e2",
   null
   
 )
 
 /* harmony default export */ var simplicity = (simplicity_component.exports);
-// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicityTop/index.vue?vue&type=template&id=bb63a666&scoped=true&
-var simplicityTopvue_type_template_id_bb63a666_scoped_true_render = function () {
+// CONCATENATED MODULE: ./node_modules/vue-loader/lib/loaders/templateLoader.js??vue-loader-options!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicityTop/index.vue?vue&type=template&id=c03e4732&scoped=true&
+var simplicityTopvue_type_template_id_c03e4732_scoped_true_render = function () {
   var _vm = this
   var _h = _vm.$createElement
   var _c = _vm._self._c || _h
@@ -14713,11 +14787,11 @@ var simplicityTopvue_type_template_id_bb63a666_scoped_true_render = function ()
     1
   )
 }
-var simplicityTopvue_type_template_id_bb63a666_scoped_true_staticRenderFns = []
-simplicityTopvue_type_template_id_bb63a666_scoped_true_render._withStripped = true
+var simplicityTopvue_type_template_id_c03e4732_scoped_true_staticRenderFns = []
+simplicityTopvue_type_template_id_c03e4732_scoped_true_render._withStripped = true
 
 
-// CONCATENATED MODULE: ./packages/main/src/simplicityTop/index.vue?vue&type=template&id=bb63a666&scoped=true&
+// CONCATENATED MODULE: ./packages/main/src/simplicityTop/index.vue?vue&type=template&id=c03e4732&scoped=true&
 
 // EXTERNAL MODULE: external "babel-runtime/regenerator"
 var regenerator_ = __webpack_require__(4);
@@ -17007,6 +17081,8 @@ var simplicityTop_router_page_component = Object(componentNormalizer["a" /* defa
 // CONCATENATED MODULE: ./node_modules/babel-loader/lib!./node_modules/vue-loader/lib??vue-loader-options!./packages/main/src/simplicityTop/index.vue?vue&type=script&lang=js&
 
 
+var simplicityTopvue_type_script_lang_js_typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; };
+
 var simplicityTopvue_type_script_lang_js_extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
 
 function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, arguments); return new Promise(function (resolve, reject) { function step(key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { return Promise.resolve(value).then(function (value) { step("next", value); }, function (err) { step("throw", err); }); } } return step("next"); }); }; }
@@ -19087,7 +19163,19 @@ var simplicityTopvue_type_script_lang_js_systemMode = util["a" /* default */].ge
           if (arg && arg === 'pageData') {
             external_wujie_vue2_default.a.$emit('pageData', tab);
           } else {
-            window.document.querySelector('iframe[name=' + tab.appCode + ']').contentWindow.location.reload(true);
+            // window.document
+            //   .querySelector(`iframe[name=${tab.appCode}]`)
+            //   .contentWindow.location.reload(true);
+            var url = tab.url;
+            // 如果传入了路由参数，需要更新 URL
+            if (arg && (typeof arg === 'undefined' ? 'undefined' : simplicityTopvue_type_script_lang_js_typeof(arg)) === 'object' && arg.path) {
+              url = this.buildWujieUrl(tab.url, arg);
+            }
+
+            tab.url = '';
+            this.$nextTick(function () {
+              tab.url = util["a" /* default */].handlerUrl(url);
+            });
           }
           return;
         }
@@ -19102,6 +19190,61 @@ var simplicityTopvue_type_script_lang_js_systemMode = util["a" /* default */].ge
       }
     },
 
+    /**
+     * @desc:构建 Wujie 子应用 URL（处理路由参数）
+     * @param {String} baseUrl - 基础 URL
+     * @param {Object} routeInfo - 路由信息 { path, params, query }
+     * @returns {String} 拼接后的完整 URL
+     **/
+    buildWujieUrl: function buildWujieUrl(baseUrl, routeInfo) {
+      var path = routeInfo.path,
+          _routeInfo$params = routeInfo.params,
+          params = _routeInfo$params === undefined ? {} : _routeInfo$params,
+          _routeInfo$query = routeInfo.query,
+          query = _routeInfo$query === undefined ? {} : _routeInfo$query;
+
+
+      if (!path) {
+        return baseUrl;
+      }
+
+      // 1. 处理 path + params（Vue Router 风格：params 作为路径参数）
+      var fullPath = path;
+
+      // 如果 params 中有值，将其拼接到 path 后面
+      // 例如：path='/aa/bb', params={action:'action', id:'ddd', did:'33333'}
+      // 结果：'/aa/bb/action/ddd/33333'
+      var paramValues = Object.values(params).filter(function (val) {
+        return val !== undefined && val !== null;
+      });
+      if (paramValues.length > 0) {
+        // 确保 path 不以 / 结尾
+        var cleanPath = path.endsWith('/') ? path.slice(0, -1) : path;
+        fullPath = cleanPath + '/' + paramValues.join('/');
+      }
+
+      // 2. 处理 query 参数
+      var queryKeys = Object.keys(query);
+      if (queryKeys.length > 0) {
+        var queryString = queryKeys.map(function (key) {
+          return encodeURIComponent(key) + '=' + encodeURIComponent(query[key]);
+        }).join('&');
+        fullPath += '?' + queryString;
+      }
+
+      // 3. 从 baseUrl 中提取基础部分（去掉 hash 路由部分）
+      // 例如：baseUrl = 'http://example.com/app#/old/path'
+      // 提取：'http://example.com/app#'
+      var baseUrlPrefix = baseUrl;
+      var hashIndex = baseUrl.indexOf('#');
+      if (hashIndex > -1) {
+        baseUrlPrefix = baseUrl.substring(0, hashIndex + 1); // 保留 #
+      }
+
+      // 4. 拼接最终 URL
+      return baseUrlPrefix + fullPath;
+    },
+
     /**
      * @desc:删除iframe
      * @author huangbo
@@ -19593,11 +19736,11 @@ var simplicityTopvue_type_script_lang_js_systemMode = util["a" /* default */].ge
 
 var simplicityTop_component = Object(componentNormalizer["a" /* default */])(
   src_simplicityTopvue_type_script_lang_js_,
-  simplicityTopvue_type_template_id_bb63a666_scoped_true_render,
-  simplicityTopvue_type_template_id_bb63a666_scoped_true_staticRenderFns,
+  simplicityTopvue_type_template_id_c03e4732_scoped_true_render,
+  simplicityTopvue_type_template_id_c03e4732_scoped_true_staticRenderFns,
   false,
   null,
-  "bb63a666",
+  "c03e4732",
   null
   
 )

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "eoss-ui",
-  "version": "0.8.21",
+  "version": "0.8.23",
   "description": "eoss内部业务组件",
   "main": "lib/eoss-ui.common.js",
   "files": [

package/packages/main/src/simplicity/index.vue

@@ -1856,7 +1856,10 @@ export default {
      **/
     handleRefresh(arg) {
       let i =
-        arg && arg != true && arg !== 'pageData'
+        arg &&
+        arg != true &&
+        arg !== 'pageData' &&
+        !(typeof arg === 'object' && arg.path)
           ? util.indexOfObj(this.tabs, arg, 'appCode,code,id,url')
           : util.indexOfObj(this.tabs, this.activeName, 'id');
       let tab = this.tabs[i];
@@ -1882,9 +1885,22 @@ export default {
         if (arg && arg === 'pageData') {
           WujieVue.$emit('pageData', tab);
         } else {
-          window.document
-            .querySelector(`iframe[name=${tab.appCode}]`)
-            .contentWindow.location.reload(true);
+          // window.document
+          //   .querySelector(`iframe[name=${tab.appCode}]`)
+          //   .contentWindow.location.reload(true);
+          let url = tab.url;
+          // 如果传入了路由参数，需要更新 URL
+          if (arg && typeof arg === 'object' && arg.path) {
+            url = this.buildWujieUrl(tab.url, arg);
+          }
+          // 1. 获取带新时间戳的 URL
+          const newUrl = util.handlerUrl(url);
+          // 2. 关键：先置空，等待 Wujie 销毁实例
+          tab.url = '';
+          // 3. 使用 setTimeout 替代 $nextTick，给 Wujie 更多时间清理内存和 DOM
+          setTimeout(() => {
+            this.$set(this.tabs, i, { ...tab, url: newUrl });
+          }, 50); // 50ms 的延迟通常足以让 Wujie 完成卸载
         }
         return;
       }
@@ -1897,6 +1913,58 @@ export default {
         }
       }
     },
+    /**
+     * @desc:构建 Wujie 子应用 URL（处理路由参数）
+     * @param {String} baseUrl - 基础 URL
+     * @param {Object} routeInfo - 路由信息 { path, params, query }
+     * @returns {String} 拼接后的完整 URL
+     **/
+    buildWujieUrl(baseUrl, routeInfo) {
+      const { path, params = {}, query = {} } = routeInfo;
+
+      if (!path) {
+        return baseUrl;
+      }
+
+      // 1. 处理 path + params（Vue Router 风格：params 作为路径参数）
+      let fullPath = path;
+
+      // 如果 params 中有值，将其拼接到 path 后面
+      // 例如：path='/aa/bb', params={action:'action', id:'ddd', did:'33333'}
+      // 结果：'/aa/bb/action/ddd/33333'
+      const paramValues = Object.values(params).filter(
+        (val) => val !== undefined && val !== null
+      );
+      if (paramValues.length > 0) {
+        // 确保 path 不以 / 结尾
+        const cleanPath = path.endsWith('/') ? path.slice(0, -1) : path;
+        fullPath = cleanPath + '/' + paramValues.join('/');
+      }
+
+      // 2. 处理 query 参数
+      const queryKeys = Object.keys(query);
+      if (queryKeys.length > 0) {
+        const queryString = queryKeys
+          .map(
+            (key) =>
+              `${encodeURIComponent(key)}=${encodeURIComponent(query[key])}`
+          )
+          .join('&');
+        fullPath += '?' + queryString;
+      }
+
+      // 3. 从 baseUrl 中提取基础部分（去掉 hash 路由部分）
+      // 例如：baseUrl = 'http://example.com/app#/old/path'
+      // 提取：'http://example.com/app#'
+      let baseUrlPrefix = baseUrl;
+      const hashIndex = baseUrl.indexOf('#');
+      if (hashIndex > -1) {
+        baseUrlPrefix = baseUrl.substring(0, hashIndex + 1); // 保留 #
+      }
+
+      // 4. 拼接最终 URL
+      return baseUrlPrefix + fullPath;
+    },
     /**
      * @desc:删除iframe
      * @author huangbo

package/packages/main/src/simplicityTop/index.vue

@@ -2126,9 +2126,19 @@ export default {
           if (arg && arg === 'pageData') {
             WujieVue.$emit('pageData', tab);
           } else {
-            window.document
-              .querySelector(`iframe[name=${tab.appCode}]`)
-              .contentWindow.location.reload(true);
+            // window.document
+            //   .querySelector(`iframe[name=${tab.appCode}]`)
+            //   .contentWindow.location.reload(true);
+            let url = tab.url;
+            // 如果传入了路由参数，需要更新 URL
+            if (arg && typeof arg === 'object' && arg.path) {
+              url = this.buildWujieUrl(tab.url, arg);
+            }
+
+            tab.url = '';
+            this.$nextTick(() => {
+              tab.url = util.handlerUrl(url);
+            });
           }
           return;
         }
@@ -2142,6 +2152,58 @@ export default {
         }
       }
     },
+    /**
+     * @desc:构建 Wujie 子应用 URL（处理路由参数）
+     * @param {String} baseUrl - 基础 URL
+     * @param {Object} routeInfo - 路由信息 { path, params, query }
+     * @returns {String} 拼接后的完整 URL
+     **/
+    buildWujieUrl(baseUrl, routeInfo) {
+      const { path, params = {}, query = {} } = routeInfo;
+
+      if (!path) {
+        return baseUrl;
+      }
+
+      // 1. 处理 path + params（Vue Router 风格：params 作为路径参数）
+      let fullPath = path;
+
+      // 如果 params 中有值，将其拼接到 path 后面
+      // 例如：path='/aa/bb', params={action:'action', id:'ddd', did:'33333'}
+      // 结果：'/aa/bb/action/ddd/33333'
+      const paramValues = Object.values(params).filter(
+        (val) => val !== undefined && val !== null
+      );
+      if (paramValues.length > 0) {
+        // 确保 path 不以 / 结尾
+        const cleanPath = path.endsWith('/') ? path.slice(0, -1) : path;
+        fullPath = cleanPath + '/' + paramValues.join('/');
+      }
+
+      // 2. 处理 query 参数
+      const queryKeys = Object.keys(query);
+      if (queryKeys.length > 0) {
+        const queryString = queryKeys
+          .map(
+            (key) =>
+              `${encodeURIComponent(key)}=${encodeURIComponent(query[key])}`
+          )
+          .join('&');
+        fullPath += '?' + queryString;
+      }
+
+      // 3. 从 baseUrl 中提取基础部分（去掉 hash 路由部分）
+      // 例如：baseUrl = 'http://example.com/app#/old/path'
+      // 提取：'http://example.com/app#'
+      let baseUrlPrefix = baseUrl;
+      const hashIndex = baseUrl.indexOf('#');
+      if (hashIndex > -1) {
+        baseUrlPrefix = baseUrl.substring(0, hashIndex + 1); // 保留 #
+      }
+
+      // 4. 拼接最终 URL
+      return baseUrlPrefix + fullPath;
+    },
     /**
      * @desc:删除iframe
      * @author huangbo