feat: update fastlogin

Author: FringeY

package.json

@@ -29,11 +29,15 @@
     "eslint-plugin-prettier": "^3.1.3",
     "eslint-plugin-react": "^7.19.0",
     "eslint-plugin-react-hooks": "^2.5.0",
-    "lerna": "^2.11.0",
+    "lerna": "^3.22.1",
     "prettier": "^2.0.5",
     "typescript": "^3.9.3"
   },
   "dependencies": {
     "@alicloud/console-base-rc-messenger-region": "^1.1.2"
+  },
+  "resolutions": {
+    "@types/react": "^16.0.0",
+    "@types/react-dom": "^16.0.0"
   }
 }

packages/console-utils/fastlogin/src/index.ts

@@ -51,13 +51,14 @@ const open = async (options: IFastLoginOptions) => {
 
 const render = async (options: IFastLoginOptions) => {
   const fastLogin = await loadFastLoginScripts(options);
-  const { height = 700, width = 500 } = options
+  const { height = 782, width = 512 } = options
   return new Promise<ILoginCallbackProps>((resolve, reject) => {
     fastLogin('render', [{
       target: options.target,
       // @ts-ignore
       type: "one_login", // one_login, password, qr
       custom: {
+        pageChangeMode: "none",
         footerComs: ['third-party']
       },
       loginCallback: (result) => {

packages/console-utils/fastlogin/stories/index.stories.tsx

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import ReactDOM from 'react-dom';
 import { storiesOf } from '@storybook/react';
-import { open, unmount } from '../src';
+import { open, render, unmount } from '../src';
 
 window.React = React;
 window.ReactDOM = ReactDOM;
@@ -10,7 +10,7 @@ storiesOf('FastLogin', module)
   .add('FastLogin', () => {
     const onClick = async () => {
       try {
-        const result = await open({ target: document.querySelector('test')});
+        const result = await render({ target: document.querySelector('test'), env: 'prepub', height: 518, width: 782 });
         console.log(result)
         unmount({env: 'prepub'});
       } catch {

packages/console-utils/xconsole-service/src/interceptors/fastloginInterceptor/login.tsx

@@ -37,7 +37,7 @@ export const LoginContent: React.FC<any> = (props) => {
       if (ref.current || document.querySelector('#loginContent')) {
         (async () => {
           try {
-            const result = await render({ target: ref.current || document.querySelector('#loginContent'), height: 560, width: 501 });
+            const result = await render({ target: ref.current || document.querySelector('#loginContent'), height: 518, width: 782 });
             if (result.success) {
               await refreshToken();
             }
@@ -51,10 +51,10 @@ export const LoginContent: React.FC<any> = (props) => {
   }, [ref.current]);
 
   return (
-    <Dialog visible footer={<div/>} onClose={() => {props.onError()}}>
-      <div style={{height: 630, width: 500, paddingTop: 20, overflow: 'hidden'}}>
+    <Dialog visible footer={false} onClose={() => {props.onError()}}>
+      <div style={{height: 578, width: 782, paddingTop: 20, overflow: 'hidden'}}>
         <div ref={ref} id="loginContent" ></div>
-        <div style={{textAlign: 'center', width: 500, paddingTop: 20, fontSize: 13}}>
+        <div style={{textAlign: 'center', width: 782, fontSize: 13}}>
           <span >{messages['login_prefix']}</span>
           <a href="#" onClick={() => { window.location.reload()}}>{messages['login_action']}</a>
           <span >{messages['login_suffix']}</span>

packages/console-utils/xconsole-service/tsconfig.json

@@ -15,6 +15,6 @@
     "./src/*",
   ],
   "exclude": [
-    // "node_modules"
+    "node_modules"
   ]
 }