@alicloud/alfa-react 1.5.12 → 1.5.13-alpha.1

package/es/createApplication.js

@@ -5,8 +5,9 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _regeneratorRuntime from "@babel/runtime/regenerator";
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-import React, { useRef, useEffect, useState, useMemo } from 'react';
+import React, { useRef, useEffect, useState, useMemo, useContext } from 'react';
 import { createEventBus } from '@alicloud/alfa-core';
+import { ConsoleRegion, ConsoleResourceGroup, ConsoleContext } from '@alicloud/xconsole-context';
 import Loading from './components/Loading';
 import { normalizeName } from './utils';
 import { countRegister } from './utils/counter';
@@ -93,6 +94,8 @@ export default function createApplication(loader) {
       dynamicConfig = props.dynamicConfig,
       noCache = props.noCache,
       syncHistory = props.syncHistory,
+      syncRegion = props.syncRegion,
+      syncResourceGroup = props.syncResourceGroup,
       basename = props.basename,
       onSyncHistory = props.onSyncHistory;
     var handleExternalLink = customProps.handleExternalLink;
@@ -106,6 +109,9 @@ export default function createApplication(loader) {
     var appRef = useRef(undefined);
     var $syncHistory = useRef(syncHistory);
     var $basename = useRef(basename);
+    var _useContext = useContext(ConsoleContext),
+      regionContext = _useContext.region,
+      resourceGroupContext = _useContext.resourceGroup;
     var tagName = normalizeName(props.name);
     var _useState5 = useState(''),
       _useState6 = _slicedToArray(_useState5, 2),
@@ -129,6 +135,21 @@ 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);
+    }
     var sandbox = useMemo(function () {
       var _UA_Opt, _RISK_INFO, _um;
       var aliyunExternalsVars = [];

package/es/version.js

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

package/lib/createApplication.js

@@ -13,6 +13,7 @@ var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/de
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _react = _interopRequireWildcard(require("react"));
 var _alfaCore = require("@alicloud/alfa-core");
+var _xconsoleContext = require("@alicloud/xconsole-context");
 var _Loading = _interopRequireDefault(require("./components/Loading"));
 var _utils = require("./utils");
 var _counter = require("./utils/counter");
@@ -103,6 +104,8 @@ function createApplication(loader) {
       dynamicConfig = props.dynamicConfig,
       noCache = props.noCache,
       syncHistory = props.syncHistory,
+      syncRegion = props.syncRegion,
+      syncResourceGroup = props.syncResourceGroup,
       basename = props.basename,
       onSyncHistory = props.onSyncHistory;
     var handleExternalLink = customProps.handleExternalLink;
@@ -116,6 +119,9 @@ function createApplication(loader) {
     var appRef = (0, _react.useRef)(undefined);
     var $syncHistory = (0, _react.useRef)(syncHistory);
     var $basename = (0, _react.useRef)(basename);
+    var _useContext = (0, _react.useContext)(_xconsoleContext.ConsoleContext),
+      regionContext = _useContext.region,
+      resourceGroupContext = _useContext.resourceGroup;
     var tagName = (0, _utils.normalizeName)(props.name);
     var _useState5 = (0, _react.useState)(''),
       _useState6 = (0, _slicedToArray2.default)(_useState5, 2),
@@ -139,6 +145,21 @@ 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);
+    }
     var sandbox = (0, _react.useMemo)(function () {
       var _UA_Opt, _RISK_INFO, _um;
       var aliyunExternalsVars = [];

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.5.12",
+  "version": "1.5.13-alpha.1",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -31,13 +31,15 @@
     "typescript": "^4.0.0"
   },
   "dependencies": {
+    "@alicloud/console-base-messenger": "^1.18.1",
     "@alicloud/widget-utils-console": "^0.1.6",
+    "@alicloud/xconsole-context": "^2.4.32",
     "axios": "^1.4.0",
     "classnames": "^2.2.6",
     "crypto-js": "^4.1.1",
     "prop-types": "^15.8.1",
     "@alicloud/alfa-core": "^1.4.33",
-    "@alicloud/console-os-loader": "^1.4.33"
+    "@alicloud/console-os-loader": "^1.4.34"
   },
   "peerDependencies": {
     "react": ">=16.0.0"

package/types/createApplication.d.ts

@@ -5,11 +5,14 @@ interface IProps<C = any> extends AlfaFactoryOption {
     customProps: C & {
         consoleBase?: any;
         path?: string;
+        appConfig?: any;
         __injectHistory?: any;
         __innerStamp?: string;
         __historyState?: string;
         handleExternalLink?: (href: string) => void;
     };
+    syncRegion?: boolean;
+    syncResourceGroup?: boolean;
     syncHistory?: boolean;
     onSyncHistory?: (type: 'replace' | 'push', path: string, data: any) => void;
     basename?: string;

package/types/version.d.ts

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