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

package/es/createAlfaWidget.js

@@ -11,6 +11,7 @@ import { createCWSWidget } from './widget';
 import createApplication from './createApplication';
 import beforeResolveHook from './hooks/beforeResolveHook';
 import beforeLoadHook from './hooks/beforeLoadHook';
+import { isOneConsole } from './helpers/oneConsole';
 var loader = BaseLoader.create();
 loader.beforeResolve.use(beforeResolveHook);
 loader.beforeLoad.use(beforeLoadHook);
@@ -51,6 +52,12 @@ function createAlfaWidget(option) {
     return null;
   };
   var passedInOption = option;
+
+  // 非 oneConsole 环境下设置 iframe 沙箱地址为 about:blank
+  // 避免沙箱创建失败
+  if (passedInOption.sandbox && !passedInOption.sandbox.sandBoxUrl && !isOneConsole()) {
+    passedInOption.sandbox.sandBoxUrl = 'about:blank';
+  }
   return function (props) {
     return (
       /*#__PURE__*/

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';
@@ -124,7 +125,9 @@ export default function createApplication(loader) {
     // 更新标记，保证每次更新都会更新
     customProps.__innerStamp = (+new Date()).toString(36);
     customProps.__historyState = getHistoryState();
-    if (customProps.path) customProps.path = addLeftSlash(customProps.path);
+    if (customProps.path) {
+      customProps.path = addLeftSlash(customProps.path);
+    }
 
     // 受控模式锁定一些参数
     if ($syncHistory.current) {
@@ -135,20 +138,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/helpers/oneConsole.js

@@ -0,0 +1,8 @@
+/**
+ * 是否是 oneConsole 环境
+ * @returns
+ */
+export function isOneConsole() {
+  var _ALIYUN_CONSOLE_CONFI;
+  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.portalType) === 'one';
+}

package/es/version.js

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

package/lib/createAlfaWidget.js

@@ -18,6 +18,7 @@ var _widget = require("./widget");
 var _createApplication = _interopRequireDefault(require("./createApplication"));
 var _beforeResolveHook = _interopRequireDefault(require("./hooks/beforeResolveHook"));
 var _beforeLoadHook = _interopRequireDefault(require("./hooks/beforeLoadHook"));
+var _oneConsole = require("./helpers/oneConsole");
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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; }
@@ -62,6 +63,12 @@ function createAlfaWidget(option) {
     return null;
   };
   var passedInOption = option;
+
+  // 非 oneConsole 环境下设置 iframe 沙箱地址为 about:blank
+  // 避免沙箱创建失败
+  if (passedInOption.sandbox && !passedInOption.sandbox.sandBoxUrl && !(0, _oneConsole.isOneConsole)()) {
+    passedInOption.sandbox.sandBoxUrl = 'about:blank';
+  }
   return function (props) {
     return (
       /*#__PURE__*/

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");
@@ -134,7 +135,9 @@ function createApplication(loader) {
     // 更新标记，保证每次更新都会更新
     customProps.__innerStamp = (+new Date()).toString(36);
     customProps.__historyState = getHistoryState();
-    if (customProps.path) customProps.path = addLeftSlash(customProps.path);
+    if (customProps.path) {
+      customProps.path = addLeftSlash(customProps.path);
+    }
 
     // 受控模式锁定一些参数
     if ($syncHistory.current) {
@@ -145,20 +148,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/helpers/oneConsole.js

@@ -0,0 +1,14 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isOneConsole = isOneConsole;
+/**
+ * 是否是 oneConsole 环境
+ * @returns
+ */
+function isOneConsole() {
+  var _ALIYUN_CONSOLE_CONFI;
+  return ((_ALIYUN_CONSOLE_CONFI = window.ALIYUN_CONSOLE_CONFIG) === null || _ALIYUN_CONSOLE_CONFI === void 0 ? void 0 : _ALIYUN_CONSOLE_CONFI.portalType) === 'one';
+}

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';
 exports.version = version;

package/package.json

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

package/types/helpers/oneConsole.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 是否是 oneConsole 环境
+ * @returns
+ */
+export declare function isOneConsole(): boolean;

package/types/version.d.ts

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