@alicloud/alfa-react 1.5.13-alpha.2 → 1.5.13-alpha.3

package/es/createApplication.js

@@ -8,6 +8,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 import React, { useRef, useEffect, useState, useMemo, useContext } from 'react';
 import { createEventBus } from '@alicloud/alfa-core';
 import { ConsoleRegion, ConsoleResourceGroup, ConsoleContext } from '@alicloud/xconsole-context';
+import { forApp } from '@alicloud/console-base-messenger';
 import Loading from './components/Loading';
 import { normalizeName } from './utils';
 import { countRegister } from './utils/counter';
@@ -135,20 +136,37 @@ export default function createApplication(loader) {
       // 禁止注入 history
       customProps.__injectHistory = null;
     }
-    customProps.consoleBase = _objectSpread(_objectSpread(_objectSpread({}, ConsoleRegion), ConsoleResourceGroup), customProps.consoleBase);
 
     /**
      * 同步主应用的 Region
-     */
-    if (syncRegion) {
-      customProps.consoleBase = _objectSpread(_objectSpread({}, customProps.consoleBase), regionContext);
-    }
-
-    /**
      * 同步更新主应用的 ResourceGroup
      */
-    if (syncResourceGroup) {
-      customProps.consoleBase = _objectSpread(_objectSpread({}, customProps.consoleBase), resourceGroupContext);
+    if (syncRegion || syncResourceGroup) {
+      var region;
+      var resourceGroup;
+      if (syncRegion) {
+        // regionContext 为默认值时，不覆盖
+        if (regionContext === ConsoleRegion) {
+          region = undefined;
+        } else {
+          region = regionContext;
+        }
+      } else {
+        region = ConsoleRegion;
+      }
+      if (syncResourceGroup) {
+        // resourceGroupContext 为默认值时，不覆盖
+        if (resourceGroupContext === ConsoleResourceGroup) {
+          resourceGroup = undefined;
+        } else {
+          resourceGroup = resourceGroupContext;
+        }
+      } else {
+        resourceGroup = ConsoleResourceGroup;
+      }
+      customProps.consoleBase = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, customProps.consoleBase), forApp), region), resourceGroup);
+    } else {
+      customProps.consoleBase = _objectSpread(_objectSpread(_objectSpread({}, ConsoleRegion), ConsoleResourceGroup), customProps.consoleBase);
     }
     var sandbox = useMemo(function () {
       var _UA_Opt, _RISK_INFO, _um;

package/es/version.js

@@ -1 +1 @@
-export var version = '1.5.13-alpha.2';
+export var version = '1.5.13-alpha.3';

package/lib/createApplication.js

@@ -14,6 +14,7 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 var _react = _interopRequireWildcard(require("react"));
 var _alfaCore = require("@alicloud/alfa-core");
 var _xconsoleContext = require("@alicloud/xconsole-context");
+var _consoleBaseMessenger = require("@alicloud/console-base-messenger");
 var _Loading = _interopRequireDefault(require("./components/Loading"));
 var _utils = require("./utils");
 var _counter = require("./utils/counter");
@@ -145,20 +146,37 @@ function createApplication(loader) {
       // 禁止注入 history
       customProps.__injectHistory = null;
     }
-    customProps.consoleBase = _objectSpread(_objectSpread(_objectSpread({}, _xconsoleContext.ConsoleRegion), _xconsoleContext.ConsoleResourceGroup), customProps.consoleBase);
 
     /**
      * 同步主应用的 Region
-     */
-    if (syncRegion) {
-      customProps.consoleBase = _objectSpread(_objectSpread({}, customProps.consoleBase), regionContext);
-    }
-
-    /**
      * 同步更新主应用的 ResourceGroup
      */
-    if (syncResourceGroup) {
-      customProps.consoleBase = _objectSpread(_objectSpread({}, customProps.consoleBase), resourceGroupContext);
+    if (syncRegion || syncResourceGroup) {
+      var region;
+      var resourceGroup;
+      if (syncRegion) {
+        // regionContext 为默认值时，不覆盖
+        if (regionContext === _xconsoleContext.ConsoleRegion) {
+          region = undefined;
+        } else {
+          region = regionContext;
+        }
+      } else {
+        region = _xconsoleContext.ConsoleRegion;
+      }
+      if (syncResourceGroup) {
+        // resourceGroupContext 为默认值时，不覆盖
+        if (resourceGroupContext === _xconsoleContext.ConsoleResourceGroup) {
+          resourceGroup = undefined;
+        } else {
+          resourceGroup = resourceGroupContext;
+        }
+      } else {
+        resourceGroup = _xconsoleContext.ConsoleResourceGroup;
+      }
+      customProps.consoleBase = _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, customProps.consoleBase), _consoleBaseMessenger.forApp), region), resourceGroup);
+    } else {
+      customProps.consoleBase = _objectSpread(_objectSpread(_objectSpread({}, _xconsoleContext.ConsoleRegion), _xconsoleContext.ConsoleResourceGroup), customProps.consoleBase);
     }
     var sandbox = (0, _react.useMemo)(function () {
       var _UA_Opt, _RISK_INFO, _um;

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = '1.5.13-alpha.2';
+var version = '1.5.13-alpha.3';
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.5.13-alpha.2",
+  "version": "1.5.13-alpha.3",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.5.13-alpha.2";
+export declare const version = "1.5.13-alpha.3";