@aliyun-obv/api 0.3.13 → 0.3.15

package/dist/api.es.js

@@ -1,7 +1,7 @@
 import _ from 'lodash';
-import urijs from 'urijs';
 import errorPrompt from '@alicloud/console-base-error-prompt-proxy';
 import i18n, { getMsg } from '@aliyun-obv/i18n';
+import urijs from 'urijs';
 import { Dialog, Button, Message } from '@alifd/next';
 import { slsConsoleRuntime, commonUtil, urlUtil, addStubForSearch, addRUMLog, slsConsoleUtil } from '@aliyun-obv/utils';
 import React from 'react';
@@ -60,6 +60,7 @@ var __async$9 = (__this, __arguments, generator) => {
 };
 const isTest = process.env.NODE_ENV === "test";
 const matchProxyApiReg = /common\/(getApi|postApi|putApi)/;
+const workspaceReg = /\/region\/(.+?)\/workspace\/(.+?)\//;
 class BaseFetch {
   constructor(fetchApi) {
     __publicField(this, "fetchApi");
@@ -89,9 +90,11 @@ class BaseFetch {
   }
   beforeRequest(api, params, init, options) {
     const hasBaseURL = typeof this.defaults.baseURL === "string" && this.defaults.baseURL.trim().length > 0;
-    const parseQuery = urijs(decodeURIComponent(location.search)).escapeQuerySpace(false).query(true);
-    if ((params == null ? void 0 : params.product) === "CMS" && (parseQuery == null ? void 0 : parseQuery.cmsRegion) && params.region == null) {
-      params.region = parseQuery.cmsRegion;
+    if ((params == null ? void 0 : params.product) === "CMS" && params.region == null) {
+      const re = workspaceReg.exec(window.location.pathname);
+      if (re && re[1]) {
+        params.region = re[1];
+      }
     }
     let url = api;
     let newInit = init;
@@ -220,7 +223,11 @@ function getSLSdomain() {
   if ((_a2 = window == null ? void 0 : window.__CONSOLE_OBVIZ_DOMAIN__) == null ? void 0 : _a2.getSlsDomain) {
     return window.__CONSOLE_OBVIZ_DOMAIN__.getSlsDomain();
   }
+  const { slsHost } = urijs(window.location.search).escapeQuerySpace(false).query(true);
   if (isLocal) {
+    if (slsHost != null && slsHost != "") {
+      return slsHost;
+    }
     if (window.location.hostname.includes("stg")) {
       return `http://sls-stg:${window.location.port}`;
     }
@@ -234,6 +241,9 @@ function getSLSdomain() {
     return void 0;
   }
   if (isPre) {
+    if (slsHost != null && slsHost != "") {
+      return slsHost;
+    }
     if (is4Service(window.location)) {
       return `https://pre-sls4service.console.aliyun.com`;
     }
@@ -252,11 +262,7 @@ function getObvDomain() {
   if ((_a2 = window == null ? void 0 : window.__CONSOLE_OBVIZ_DOMAIN__) == null ? void 0 : _a2.getObvDomain) {
     return window.__CONSOLE_OBVIZ_DOMAIN__.getObvDomain();
   }
-  const { slsHost } = urijs(window.location.search).escapeQuerySpace(false).query(true);
   if ((_b2 = window.ALIYUN_CONSOLE_CONFIG) == null ? void 0 : _b2.LOCAL) {
-    if (slsHost != null && slsHost != "") {
-      return slsHost;
-    }
     if (location.hostname === "localhost") {
       return `http://pre-observability:${window.location.port}`;
     }
@@ -269,9 +275,6 @@ function getObvDomain() {
     return `http://pre-observability:${window.location.port}`;
   }
   if (isPre) {
-    if (slsHost != null && slsHost != "") {
-      return slsHost;
-    }
     if (is4Service(window.location)) {
       return `https://pre-observability4service.console.aliyun.com`;
     }

package/package.json

@@ -15,5 +15,5 @@
     "styled-components": "^5.2.0"
   },
   "devDependencies": {},
-  "version": "0.3.13"
+  "version": "0.3.15"
 }