@alicloud/alfa-react 1.5.1-alpha.2 → 1.5.1-alpha.4

package/es/components/ErrorBoundary/ErrorPanel.js

@@ -2,11 +2,11 @@ import React from 'react';
 var padding = 24;
 var containerBackground = '#fcebea';
 var containerStyle = {
+  display: 'none',
   background: containerBackground,
   padding: padding
 };
 var commonErrorStyle = {
-  display: 'none',
   lineHeight: '22px',
   color: '#d93026',
   fontSize: 14

package/es/createApplication.js

@@ -97,9 +97,11 @@ export default function createApplication(loader) {
       setReleaseVersion = _useState6[1];
     $syncHistory.current = syncHistory;
     $basename.current = basename;
-    if (customProps.__innerStamp) console.warn('Please do not use __innerStamp which used in internal.');
+
+    // if (customProps.__innerStamp) console.warn('Please do not use __innerStamp which used in internal.');
     // 更新标记，保证每次更新都会更新
     customProps.__innerStamp = (+new Date()).toString(36);
+    customProps.__historyState = history.state;
     if (customProps.path) customProps.path = addLeftSlash(customProps.path);
 
     // 受控模式锁定一些参数
@@ -174,6 +176,12 @@ export default function createApplication(loader) {
         popstateEvent.state = history.state;
         (_App = App) === null || _App === void 0 ? void 0 : (_App$context$baseFram = _App.context.baseFrame) === null || _App$context$baseFram === void 0 ? void 0 : (_App$context$baseFram2 = _App$context$baseFram.contentWindow) === null || _App$context$baseFram2 === void 0 ? void 0 : _App$context$baseFram2.dispatchEvent(popstateEvent);
       };
+
+      /**
+       * 因为要兼容历史逻辑，所以这段逻辑并不会执行
+       * react-router 的路由监听 callback 会先执行并更新子应用内部路由
+       * @returns
+       */
       var updateAppHistory = function updateAppHistory() {
         if (App) {
           var nextPath = peelPath(App.context.location);

package/es/version.js

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

package/lib/components/ErrorBoundary/ErrorPanel.js

@@ -9,11 +9,11 @@ var _react = _interopRequireDefault(require("react"));
 var padding = 24;
 var containerBackground = '#fcebea';
 var containerStyle = {
+  display: 'none',
   background: containerBackground,
   padding: padding
 };
 var commonErrorStyle = {
-  display: 'none',
   lineHeight: '22px',
   color: '#d93026',
   fontSize: 14

package/lib/createApplication.js

@@ -107,9 +107,11 @@ function createApplication(loader) {
       setReleaseVersion = _useState6[1];
     $syncHistory.current = syncHistory;
     $basename.current = basename;
-    if (customProps.__innerStamp) console.warn('Please do not use __innerStamp which used in internal.');
+
+    // if (customProps.__innerStamp) console.warn('Please do not use __innerStamp which used in internal.');
     // 更新标记，保证每次更新都会更新
     customProps.__innerStamp = (+new Date()).toString(36);
+    customProps.__historyState = history.state;
     if (customProps.path) customProps.path = addLeftSlash(customProps.path);
 
     // 受控模式锁定一些参数
@@ -184,6 +186,12 @@ function createApplication(loader) {
         popstateEvent.state = history.state;
         (_App = App) === null || _App === void 0 ? void 0 : (_App$context$baseFram = _App.context.baseFrame) === null || _App$context$baseFram === void 0 ? void 0 : (_App$context$baseFram2 = _App$context$baseFram.contentWindow) === null || _App$context$baseFram2 === void 0 ? void 0 : _App$context$baseFram2.dispatchEvent(popstateEvent);
       };
+
+      /**
+       * 因为要兼容历史逻辑，所以这段逻辑并不会执行
+       * react-router 的路由监听 callback 会先执行并更新子应用内部路由
+       * @returns
+       */
       var updateAppHistory = function updateAppHistory() {
         if (App) {
           var nextPath = peelPath(App.context.location);

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.5.1-alpha.2",
+  "version": "1.5.1-alpha.4",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -36,8 +36,8 @@
     "classnames": "^2.2.6",
     "crypto-js": "^4.1.1",
     "prop-types": "^15.8.1",
-    "@alicloud/console-os-loader": "1.4.30-alpha.0",
-    "@alicloud/alfa-core": "1.4.32"
+    "@alicloud/alfa-core": "1.4.32",
+    "@alicloud/console-os-loader": "1.4.30-alpha.0"
   },
   "peerDependencies": {
     "react": ">=16.0.0"

package/types/createApplication.d.ts

@@ -7,6 +7,7 @@ interface IProps<C = any> extends AlfaFactoryOption {
         path?: string;
         __injectHistory?: any;
         __innerStamp?: string;
+        __historyState?: string;
         handleExternalLink?: (href: string) => void;
     };
     syncHistory?: boolean;

package/types/version.d.ts

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