@alicloud/alfa-react 1.4.12 → 1.4.14

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/dist/index.js +3 -3
  2. package/es/utils/getConsoleConfig.js +6 -6
  3. package/es/version.js +1 -1
  4. package/lib/utils/getConsoleConfig.js +6 -6
  5. package/lib/version.js +1 -1
  6. package/package.json +4 -4
  7. package/types/utils/getConsoleConfig.d.ts +1 -1
  8. package/types/version.d.ts +1 -1
package/es/utils/getConsoleConfig.js CHANGED
@@ -78,13 +78,13 @@ var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig
78
78
  var _window, _window$ALIYUN_CONSOL, _configData$ALL_CHANN;
79
79
 
80
80
  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';
81
- var channelLinks = ((_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel]) || {};
82
- var channelFeatures = configData.ALL_CHANNEL_FEATURE_STATUS || {};
83
- var features = configData.ALL_FEATURE_STATUS || {};
81
+ var channelLinks = (_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel];
82
+ var channelFeatures = configData.ALL_CHANNEL_FEATURE_STATUS;
83
+ var features = configData.ALL_FEATURE_STATUS;
84
84
  return _objectSpread(_objectSpread({}, consoleConfig), {}, {
85
- CHANNEL_LINKS: channelLinks,
86
- CHANNEL_FEATURE_STATUS: processChannelFeatures(channelFeatures, channel),
87
- FEATURE_STATUS: processFeatures(features)
85
+ CHANNEL_LINKS: channelLinks || (consoleConfig === null || consoleConfig === void 0 ? void 0 : consoleConfig.CHANNEL_LINKS),
86
+ CHANNEL_FEATURE_STATUS: processChannelFeatures(channelFeatures, channel) || (consoleConfig === null || consoleConfig === void 0 ? void 0 : consoleConfig.CHANNEL_FEATURE_STATUS),
87
+ FEATURE_STATUS: processFeatures(features) || (consoleConfig === null || consoleConfig === void 0 ? void 0 : consoleConfig.FEATURE_STATUS)
88
88
  });
89
89
  };
90
90
 
package/es/version.js CHANGED
@@ -1 +1 @@
1
- export var version = '1.4.12';
1
+ export var version = '1.4.14';
package/lib/utils/getConsoleConfig.js CHANGED
@@ -89,13 +89,13 @@ var mergeConfigDataWithConsoleConfig = function mergeConfigDataWithConsoleConfig
89
89
  var _window, _window$ALIYUN_CONSOL, _configData$ALL_CHANN;
90
90
 
91
91
  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';
92
- var channelLinks = ((_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel]) || {};
93
- var channelFeatures = configData.ALL_CHANNEL_FEATURE_STATUS || {};
94
- var features = configData.ALL_FEATURE_STATUS || {};
92
+ var channelLinks = (_configData$ALL_CHANN = configData.ALL_CHANNEL_LINKS) === null || _configData$ALL_CHANN === void 0 ? void 0 : _configData$ALL_CHANN[channel];
93
+ var channelFeatures = configData.ALL_CHANNEL_FEATURE_STATUS;
94
+ var features = configData.ALL_FEATURE_STATUS;
95
95
  return _objectSpread(_objectSpread({}, consoleConfig), {}, {
96
- CHANNEL_LINKS: channelLinks,
97
- CHANNEL_FEATURE_STATUS: processChannelFeatures(channelFeatures, channel),
98
- FEATURE_STATUS: processFeatures(features)
96
+ CHANNEL_LINKS: channelLinks || (consoleConfig === null || consoleConfig === void 0 ? void 0 : consoleConfig.CHANNEL_LINKS),
97
+ CHANNEL_FEATURE_STATUS: processChannelFeatures(channelFeatures, channel) || (consoleConfig === null || consoleConfig === void 0 ? void 0 : consoleConfig.CHANNEL_FEATURE_STATUS),
98
+ FEATURE_STATUS: processFeatures(features) || (consoleConfig === null || consoleConfig === void 0 ? void 0 : consoleConfig.FEATURE_STATUS)
99
99
  });
100
100
  };
101
101
 
package/lib/version.js CHANGED
@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
4
4
  value: true
5
5
  });
6
6
  exports.version = void 0;
7
- var version = '1.4.12';
7
+ var version = '1.4.14';
8
8
  exports.version = version;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alicloud/alfa-react",
3
- "version": "1.4.12",
3
+ "version": "1.4.14",
4
4
  "description": "Alfa Framework (React Version)",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -42,8 +42,8 @@
42
42
  "typescript": "^3.0.3"
43
43
  },
44
44
  "dependencies": {
45
- "@alicloud/alfa-core": "^1.4.12",
46
- "@alicloud/console-os-loader": "^1.2.3",
45
+ "@alicloud/alfa-core": "^1.4.14",
46
+ "@alicloud/console-os-loader": "^1.4.14-alpha.1",
47
47
  "@alicloud/widget-utils-console": "^0.1.6",
48
48
  "classnames": "^2.2.6",
49
49
  "crypto-js": "^4.1.1"
@@ -51,5 +51,5 @@
51
51
  "peerDependencies": {
52
52
  "react": "^16 | ^17"
53
53
  },
54
- "gitHead": "59f3577395d4793a3bf8340f82261c31bc2b067e"
54
+ "gitHead": "7cd62d6b50d5f833bdf81e2d361134ae40a94194"
55
55
  }
package/types/utils/getConsoleConfig.d.ts CHANGED
@@ -1,6 +1,6 @@
1
1
  import { AlfaConfig } from '@alicloud/alfa-core';
2
2
  export declare const getConsoleConfig: (configData: AlfaConfig, consoleConfig: any) => Promise<{
3
- CHANNEL_LINKS: Partial<Record<string, string>>;
3
+ CHANNEL_LINKS: Partial<Record<string, string>> | undefined;
4
4
  CHANNEL_FEATURE_STATUS: Record<string, {
5
5
  status: boolean;
6
6
  attribute: {
package/types/version.d.ts CHANGED
@@ -1 +1 @@
1
- export declare const version = "1.4.12";
1
+ export declare const version = "1.4.14";