chore

Author: FringeY

packages/console-utils/xconsole-context/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/xconsole-context",
-  "version": "2.5.4",
+  "version": "2.6.0-alpha.0",
   "main": "lib/index.js",
   "module": "es/index.js",
   "types": "lib/index.d.ts",

packages/console-utils/xconsole-context/src/console/ConsoleConfig.ts

@@ -150,6 +150,14 @@ class ConsoleConfig {
     }
     return undefined;
   };
+
+  /**
+   * 获取应用版本灰度信息
+   * @returns
+   */
+  getVersionGrayConfig = () => {
+    return this.consoleConfig.VERSION_GRAY_CONFIG || {};
+  };
 }
 
 export default ConsoleConfig;

packages/console-utils/xconsole-context/src/rc/Gray.tsx

@@ -9,19 +9,19 @@ interface IProps {
 export const useGray = (grayId: string) => {
   if (typeof grayId === 'undefined') {
     throw new Error(
-      '[Gray] grayId is required'
-    )
+      '[Gray] grayId is required',
+    );
   }
   const { consoleConfig } = useContext(ConsoleContext);
   return consoleConfig.getGrayStatus(grayId);
-}
+};
 
 const Gray: React.FunctionComponent<IProps> = (props: IProps) => {
   const { grayId, children } = props;
   const grayStatus = useGray(grayId);
   if (grayStatus === false) return null;
   return children;
-}
+};
 
 
-export default Gray;
+export default Gray;

packages/console-utils/xconsole-context/src/region/useRegion.ts

@@ -7,6 +7,7 @@ import { reroute } from './reroute';
 import { determineRegionId } from './determineRegionId';
 import { RegionContext } from '../context/RegionContext';
 import { getActiveId } from './cookies';
+import consoleConfig from '../console';
 import type { IConsoleContextRegionProp } from '../types/index';
 
 export type TConsoleRegion = typeof ConsoleRegion;
@@ -15,6 +16,23 @@ export interface Region extends TConsoleRegion {
   loading?: boolean;
 }
 
+/**
+   * 如果要切换的地域是灰度地域，则重新加载页面
+  */
+export function shouldReload(currentRegionId, targetRegionId) {
+  const { enabled, type, grayRegions } = consoleConfig.getVersionGrayConfig();
+
+  // 如果未开启灰度逻辑不刷新
+  if (!enabled || type !== 'region') return false;
+
+  if (currentRegionId === targetRegionId) return false;
+
+  // 如果当前 region 和跳转 region 都在灰度范围内不刷新
+  if (grayRegions.indexOf(currentRegionId) > -1 && grayRegions.indexOf(targetRegionId) > -1) return false;
+
+  return true;
+}
+
 /**
  * regionBar 相关的交互
  * - 发送 regionId 和 regionList 给 regionBar
@@ -39,7 +57,9 @@ export default (props: IConsoleContextRegionProp<{regionId?: string}>): Region =
   );
   const regionContext = useContext(RegionContext);
   const consoleBase = useMemo(() => passInConsoleBase || ConsoleBaseFallback, [passInConsoleBase]);
+  // react-router match
   const matchRef = useRef(match);
+  // react-router location
   const locationRef = useRef(location);
 
   matchRef.current = match;
@@ -65,14 +85,19 @@ export default (props: IConsoleContextRegionProp<{regionId?: string}>): Region =
   ]);
 
   /**
-   * 如果是 region 路由，且 regionId 变化时重定向
+   * 如果路由参数里有 regionId，替换 regionId 值并重定向路由
    */
   const rerouteIfNeed = useCallback((regionId: string) => {
     reroute({
       history,
       match: matchRef.current,
       location: locationRef.current,
     }, regionId, historyAction);
+
+    // @ts-ignore
+    if (shouldReload(window.__XCONSOLE_CURRENT_REGION_ID__, regionId)) {
+      window.location.reload();
+    }
   }, [
     history,
     historyAction,

packages/console-utils/xconsole-context/src/types/AliyunConsoleConfig.ts

@@ -216,4 +216,18 @@ export interface IAliyunConsoleConfig {
    * portal 类型
    */
   portalType?: string;
+
+  /**
+   * region 灰度配置
+   */
+  VERSION_GRAY_CONFIG: {
+    grayRegions?: string[];
+    regionId?: string;
+    grayVersion?: string;
+    grayId?: string;
+    type?: string;
+    version?: string;
+    enabled?: boolean;
+    onlineVersion?: string;
+  };
 }