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

package/es/createAlfaApp.js

@@ -33,6 +33,8 @@ function createAlfaApp(option) {
     , _extends({}, passedInOption, {
       style: props.style || passedInOption.style,
       syncHistory: props.syncHistory,
+      syncRegion: props.syncRegion,
+      syncResourceGroup: props.syncResourceGroup,
       onSyncHistory: props.onSyncHistory,
       basename: props.basename,
       sandbox: option.sandbox || props.sandbox,

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.1';
+export var version = '1.5.13-alpha.3';

package/lib/createAlfaApp.js

@@ -44,6 +44,8 @@ function createAlfaApp(option) {
     , (0, _extends2.default)({}, passedInOption, {
       style: props.style || passedInOption.style,
       syncHistory: props.syncHistory,
+      syncRegion: props.syncRegion,
+      syncResourceGroup: props.syncResourceGroup,
       onSyncHistory: props.onSyncHistory,
       basename: props.basename,
       sandbox: option.sandbox || props.sandbox,

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.1';
+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.1",
+  "version": "1.5.13-alpha.3",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",

package/types/createAlfaApp.d.ts

@@ -1,23 +1,7 @@
 /// <reference types="react" />
-import { AlfaFactoryOption, CommonProps } from './types';
-interface IProps extends CommonProps {
-    /**
-     * 是否开启路由自动同步，需配合 basename 使用
-     */
-    syncHistory?: boolean;
-    /**
-     * 同步子应用路由的回调函数
-     */
-    onSyncHistory?: (type: 'replace' | 'push', pathname: string, state: any) => void;
-    /**
-     * 子应用路由前缀
-     */
-    basename?: string;
-    history?: any;
-    /**
-     * 子应用路由
-     */
-    path?: string;
+import { AlfaFactoryOption } from './types';
+import type { IApplicationProps, IApplicationCustomProps } from './createApplication';
+interface IProps extends IApplicationProps, IApplicationCustomProps {
 }
 declare function createAlfaApp<P = any>(option: AlfaFactoryOption): (() => null) | ((props: P & IProps) => JSX.Element);
 /**

package/types/createAlfaWidget.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
-import { AlfaFactoryOption, CommonProps } from './types';
-interface IProps extends CommonProps {
+import { AlfaFactoryOption } from './types';
+import type { IApplicationCustomProps } from './createApplication';
+interface IProps extends Omit<IApplicationCustomProps, 'consoleBase' | 'path' | 'appConfig'> {
 }
 declare function createAlfaWidget<P = any>(option: AlfaFactoryOption): (() => null) | ((props: P & IProps) => JSX.Element);
 /**

package/types/createApplication.d.ts

@@ -1,26 +1,63 @@
 /// <reference types="react" />
 import { BaseLoader } from '@alicloud/alfa-core';
 import { AlfaFactoryOption } from './types';
-interface IProps<C = any> extends AlfaFactoryOption {
-    customProps: C & {
-        consoleBase?: any;
-        path?: string;
-        appConfig?: any;
-        __injectHistory?: any;
-        __innerStamp?: string;
-        __historyState?: string;
-        handleExternalLink?: (href: string) => void;
-    };
+export interface IApplicationCustomProps {
+    /**
+     * 根结点样式
+     */
+    style?: Record<string, any>;
+    /**
+     * 注入给子应用的 consoleBase 配置
+     */
+    consoleBase?: any;
+    /**
+     * 指定子应用 path
+     */
+    path?: string;
+    /**
+     * 注入给子应用的运行时配置
+     */
+    appConfig?: any;
+    __injectHistory?: any;
+    __innerStamp?: string;
+    __historyState?: string;
+    /**
+     * 处理外部链接跳转
+     * @param href
+     */
+    handleExternalLink?: (href: string) => void;
+}
+export interface IApplicationProps<C = any> extends AlfaFactoryOption {
+    customProps: C & IApplicationCustomProps;
+    /**
+     * 是否开启路由自动同步，需配合 basename 使用
+     */
+    syncHistory?: boolean;
+    /**
+     * 是否开启 region 自动同步
+     */
     syncRegion?: boolean;
+    /**
+     * 是否开启资源组自动同步
+     */
     syncResourceGroup?: boolean;
-    syncHistory?: boolean;
-    onSyncHistory?: (type: 'replace' | 'push', path: string, data: any) => void;
+    /**
+     * 同步子应用路由的回调函数
+     */
+    onSyncHistory?: (type: 'replace' | 'push', pathname: string, state: any) => void;
+    /**
+     * 分配给子应用的路由前缀
+     */
     basename?: string;
+    /**
+     * @deprecated
+     * 注入给子应用的 history 实例，不推荐使用
+     */
+    history?: any;
 }
 /**
  * container for microApp mount
  * @param loader alfa-core loader
  * @returns
  */
-export default function createApplication(loader: BaseLoader): <C = any>(props: IProps<C>) => JSX.Element;
-export {};
+export default function createApplication(loader: BaseLoader): <C = any>(props: IApplicationProps<C>) => JSX.Element;

package/types/types/index.d.ts

@@ -41,26 +41,6 @@ export interface AlfaFactoryOption extends IAppConfig {
      */
     fallbackRender?: (error?: Error) => Element;
 }
-export interface CommonProps {
-    /**
-     * @deprecated
-     */
-    sandbox?: Record<string, any>;
-    /**
-     * 处理外跳链接
-     * @param url
-     * @returns
-     */
-    handleExternalLink?: (url?: string) => void;
-    /**
-     * 根节点样式
-     */
-    style?: React.CSSProperties;
-    /**
-     * render when throw error
-     */
-    fallbackRender?: (error?: Error) => Element;
-}
 type ThenArg<T> = T extends PromiseLike<infer U> ? U : T;
 export type MicroApplication = ThenArg<ReturnType<typeof createMicroApp>>;
 export interface AlfaEnvConfigDescriptor {

package/types/version.d.ts

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