@alicloud/alfa-react 1.5.14 → 1.5.16

package/es/createApplication.js

@@ -98,6 +98,7 @@ export default function createApplication(loader) {
       syncRegion = props.syncRegion,
       syncResourceGroup = props.syncResourceGroup,
       basename = props.basename,
+      channel = props.channel,
       onSyncHistory = props.onSyncHistory;
     var handleExternalLink = customProps.handleExternalLink;
     var _useState = useState(null),
@@ -221,7 +222,8 @@ export default function createApplication(loader) {
         locale: locale,
         noCache: noCache,
         // 用户自定义 manifest 且未传入 dynamicConfig 时，默认值为 false，否则为 true
-        dynamicConfig: typeof dynamicConfig === 'boolean' ? dynamicConfig : !manifest
+        dynamicConfig: typeof dynamicConfig === 'boolean' ? dynamicConfig : !manifest,
+        channel: channel
       };
     }, []);
     useEffect(function () {

package/es/hooks/beforeLoadHook.js

@@ -13,11 +13,11 @@ function afterLoadHook(_x) {
 }
 function _afterLoadHook() {
   _afterLoadHook = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(appConfig) {
-    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides;
+    var app, logger, sandbox, dynamicConfig, channel, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides;
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          app = appConfig.app, logger = appConfig.logger, sandbox = appConfig.sandbox, dynamicConfig = appConfig.dynamicConfig;
+          app = appConfig.app, logger = appConfig.logger, sandbox = appConfig.sandbox, dynamicConfig = appConfig.dynamicConfig, channel = appConfig.channel;
           defaultConsoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
           defaultConsoleGlobal = window.ALIYUN_CONSOLE_GLOBAL || {};
           CONFIG_START_TIME = Date.now();
@@ -31,7 +31,7 @@ function _afterLoadHook() {
         case 8:
           configData = _context.sent;
           _context.next = 11;
-          return Promise.all([getConsoleConfig(configData, defaultConsoleConfig), getConsoleGlobal(configData, defaultConsoleGlobal), getI18nMessages(appConfig)]);
+          return Promise.all([getConsoleConfig(configData, defaultConsoleConfig, channel), getConsoleGlobal(configData, defaultConsoleGlobal), getI18nMessages(appConfig)]);
         case 11:
           _yield$Promise$all = _context.sent;
           _yield$Promise$all2 = _slicedToArray(_yield$Promise$all, 3);

package/es/utils/getConsoleConfig.js

@@ -65,9 +65,9 @@ var processChannelFeatures = function processChannelFeatures(allChannelFeatures,
     return newChannelFeatures;
   }, {});
 };
-var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig(configData, consoleConfig) {
+var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig(configData, consoleConfig, passInChannel) {
   var _window, _window$ALIYUN_CONSOL, _configData$ALL_CHANN;
-  var channel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.CHANNEL) || 'OFFICIAL';
+  var channel = passInChannel || ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.CHANNEL) || 'OFFICIAL';
   var channelLinks = (_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel];
   var channelFeatures = configData.ALL_CHANNEL_FEATURE_STATUS;
   var features = configData.ALL_FEATURE_STATUS;
@@ -78,18 +78,18 @@ var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig
   });
 };
 export var getConsoleConfig = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(configData, consoleConfig) {
+  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(configData, consoleConfig, channel) {
     return _regeneratorRuntime.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", mergeConfigDataWithConsoleConfig(configData, consoleConfig));
+          return _context.abrupt("return", mergeConfigDataWithConsoleConfig(configData, consoleConfig, channel));
         case 1:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function getConsoleConfig(_x, _x2) {
+  return function getConsoleConfig(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();

package/es/version.js

@@ -1 +1 @@
-export var version = '1.5.14';
+export var version = '1.5.16';

package/lib/createApplication.js

@@ -108,6 +108,7 @@ function createApplication(loader) {
       syncRegion = props.syncRegion,
       syncResourceGroup = props.syncResourceGroup,
       basename = props.basename,
+      channel = props.channel,
       onSyncHistory = props.onSyncHistory;
     var handleExternalLink = customProps.handleExternalLink;
     var _useState = (0, _react.useState)(null),
@@ -231,7 +232,8 @@ function createApplication(loader) {
         locale: locale,
         noCache: noCache,
         // 用户自定义 manifest 且未传入 dynamicConfig 时，默认值为 false，否则为 true
-        dynamicConfig: typeof dynamicConfig === 'boolean' ? dynamicConfig : !manifest
+        dynamicConfig: typeof dynamicConfig === 'boolean' ? dynamicConfig : !manifest,
+        channel: channel
       };
     }, []);
     (0, _react.useEffect)(function () {

package/lib/hooks/beforeLoadHook.js

@@ -20,11 +20,11 @@ function afterLoadHook(_x) {
 }
 function _afterLoadHook() {
   _afterLoadHook = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(appConfig) {
-    var app, logger, sandbox, dynamicConfig, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides;
+    var app, logger, sandbox, dynamicConfig, channel, defaultConsoleConfig, defaultConsoleGlobal, CONFIG_START_TIME, CONFIG_END_TIME, configData, _yield$Promise$all, _yield$Promise$all2, consoleConfig, consoleGlobal, messages, i18nMessages, overrides;
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          app = appConfig.app, logger = appConfig.logger, sandbox = appConfig.sandbox, dynamicConfig = appConfig.dynamicConfig;
+          app = appConfig.app, logger = appConfig.logger, sandbox = appConfig.sandbox, dynamicConfig = appConfig.dynamicConfig, channel = appConfig.channel;
           defaultConsoleConfig = window.ALIYUN_CONSOLE_CONFIG || {};
           defaultConsoleGlobal = window.ALIYUN_CONSOLE_GLOBAL || {};
           CONFIG_START_TIME = Date.now();
@@ -38,7 +38,7 @@ function _afterLoadHook() {
         case 8:
           configData = _context.sent;
           _context.next = 11;
-          return Promise.all([(0, _getConsoleConfig.getConsoleConfig)(configData, defaultConsoleConfig), (0, _getConsoleGlobal.getConsoleGlobal)(configData, defaultConsoleGlobal), (0, _alfaCore.getI18nMessages)(appConfig)]);
+          return Promise.all([(0, _getConsoleConfig.getConsoleConfig)(configData, defaultConsoleConfig, channel), (0, _getConsoleGlobal.getConsoleGlobal)(configData, defaultConsoleGlobal), (0, _alfaCore.getI18nMessages)(appConfig)]);
         case 11:
           _yield$Promise$all = _context.sent;
           _yield$Promise$all2 = (0, _slicedToArray2.default)(_yield$Promise$all, 3);

package/lib/utils/getConsoleConfig.js

@@ -71,9 +71,9 @@ var processChannelFeatures = function processChannelFeatures(allChannelFeatures,
     return newChannelFeatures;
   }, {});
 };
-var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig(configData, consoleConfig) {
+var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig(configData, consoleConfig, passInChannel) {
   var _window, _window$ALIYUN_CONSOL, _configData$ALL_CHANN;
-  var channel = ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.CHANNEL) || 'OFFICIAL';
+  var channel = passInChannel || ((_window = window) === null || _window === void 0 ? void 0 : (_window$ALIYUN_CONSOL = _window.ALIYUN_CONSOLE_CONFIG) === null || _window$ALIYUN_CONSOL === void 0 ? void 0 : _window$ALIYUN_CONSOL.CHANNEL) || 'OFFICIAL';
   var channelLinks = (_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel];
   var channelFeatures = configData.ALL_CHANNEL_FEATURE_STATUS;
   var features = configData.ALL_FEATURE_STATUS;
@@ -84,18 +84,18 @@ var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig
   });
 };
 var getConsoleConfig = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(configData, consoleConfig) {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(configData, consoleConfig, channel) {
     return _regenerator.default.wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          return _context.abrupt("return", mergeConfigDataWithConsoleConfig(configData, consoleConfig));
+          return _context.abrupt("return", mergeConfigDataWithConsoleConfig(configData, consoleConfig, channel));
         case 1:
         case "end":
           return _context.stop();
       }
     }, _callee);
   }));
-  return function getConsoleConfig(_x, _x2) {
+  return function getConsoleConfig(_x, _x2, _x3) {
     return _ref.apply(this, arguments);
   };
 }();

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.5.14",
+  "version": "1.5.16",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -34,11 +34,11 @@
     "@alicloud/console-base-messenger": "^1.18.1",
     "@alicloud/widget-utils-console": "^0.1.6",
     "@alicloud/xconsole-context": "^2.4.32",
-    "axios": "^1.4.0",
+    "axios": "^0.21.4",
     "classnames": "^2.2.6",
     "crypto-js": "^4.1.1",
     "prop-types": "^15.8.1",
-    "@alicloud/alfa-core": "^1.4.33",
+    "@alicloud/alfa-core": "^1.4.34",
     "@alicloud/console-os-loader": "^1.4.34"
   },
   "peerDependencies": {

package/types/hooks/beforeLoadHook.d.ts

@@ -1,3 +1,7 @@
 import { IAppConfig } from '@alicloud/alfa-core';
-declare function afterLoadHook(appConfig: IAppConfig): Promise<IAppConfig<any>>;
+declare function afterLoadHook(appConfig: IAppConfig & {
+    channel?: string;
+}): Promise<IAppConfig<any> & {
+    channel?: string | undefined;
+}>;
 export default afterLoadHook;

package/types/types/index.d.ts

@@ -11,6 +11,10 @@ export interface AlfaReleaseConfig {
 }
 export type EnvEnum = 'prod' | 'local' | 'pre' | 'daily';
 export interface AlfaFactoryOption extends IAppConfig {
+    /**
+     * oneConsole 渠道
+     */
+    channel?: string;
     loading?: boolean | React.ReactChild;
     dependencies?: Record<string, any>;
     className?: string;

package/types/utils/getConsoleConfig.d.ts

@@ -1,5 +1,5 @@
 import { AlfaConfig } from '@alicloud/alfa-core';
-export declare const getConsoleConfig: (configData: AlfaConfig, consoleConfig: any) => Promise<{
+export declare const getConsoleConfig: (configData: AlfaConfig, consoleConfig: any, channel?: string) => Promise<{
     CHANNEL_LINKS: {
         [x: string]: string | undefined;
     };

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.5.14";
+export declare const version = "1.5.16";