cloud-web-corejs 1.0.54-dev.513 → 1.0.54-dev.515

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "cloud-web-corejs",
   "private": false,
-  "version": "1.0.54-dev.513",
+  "version": "1.0.54-dev.515",
   "scripts": {
     "dev": "vue-cli-service serve",
     "lint": "eslint --ext .js,.vue src",

package/src/layout/components/Sidebar/default.vue

@@ -401,12 +401,44 @@ export default {
     jumpOutLink(route) {
       let path = route.url || route.path;
       if (route.type == 4 && path) {
-        if (path.indexOf("token={token}") >= 0) {
+        let params = this.getCustomReqUrlAndCleanUrl(path);
+        let reqUrl = params.custom_req_url;
+        if (reqUrl) {
+          this.$http({
+            url: reqUrl,
+            method: `post`,
+            data: { thirdUrl: params.newUrl },
+            isLoading: true,
+            success: (res) => {
+              path = res.objx;
+              window.open(path);
+            },
+          });
+        } else if (path.indexOf("token={token}") >= 0) {
           path = path.replace("token={token}", "token=" + getToken());
+          window.open(path);
         }
-        window.open(path);
       }
     },
+    getCustomReqUrlAndCleanUrl(url) {
+      // 直接使用正则表达式匹配
+      const match = url.match(/[?&]custom_req_url=([^&?#]+)/);
+      if (match) {
+        const customReqUrl = decodeURIComponent(match[1]);
+        // 移除匹配到的参数部分
+        const newUrl = url.replace(match[0], match[0].startsWith("?") ? "?" : "");
+
+        return {
+          custom_req_url: customReqUrl,
+          newUrl: newUrl.replace(/\?$/, "").replace(/\?&/, "?"),
+        };
+      }
+
+      return {
+        custom_req_url: "",
+        newUrl: url,
+      };
+    },
     changeModules(row, cRow) {
       if (!row.route) return;
       localStorage.setItem("currentMenuId", row.id);