Merge pull request #217 from yuque/fix/fix-bug

fix: 登录页面增加关闭按钮 & 广播修复
yuque · Dec 1, 2023 · dc638cb · dc638cb
2 parents 47c0dcd + 1e1d82f
commit dc638cb
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 4 deletions.
diff --git a/src/background/core/chrome.ts b/src/background/core/chrome.ts
@@ -44,9 +44,13 @@ export default {
       tabs.query({ status: 'complete' }, res => {
         for (const tab of res) {
           if (tab.id) {
-            tabs.sendMessage(tab.id, message, res1 => {
-              resolve(res1);
-            });
+            try {
+              tabs.sendMessage(tab.id, message, res1 => {
+                resolve(res1);
+              });
+            } catch (e) {
+              // 吞掉抛错
+            }
           }
         }
       });

diff --git a/src/components/AccountLayout/Login.module.less b/src/components/AccountLayout/Login.module.less
@@ -8,6 +8,7 @@
   border-left: 1px solid @border-color;
   background: @white;
   justify-content: center;
+  position: relative;
 
   .content {
     padding: 0 70px;
@@ -48,4 +49,11 @@
       }
     }
   }
+
+  .closeWrapper {
+    position: absolute;
+    right: 16px;
+    top: 16px;
+    color: @text-color-secondary;
+  }
 }
diff --git a/src/components/AccountLayout/Login.tsx b/src/components/AccountLayout/Login.tsx
@@ -7,6 +7,9 @@ import { __i18n } from '@/isomorphic/i18n';
 import LinkHelper from '@/isomorphic/link-helper';
 import { VERSION } from '@/config';
 import YuqueLogo from '@/assets/images/yuque-logo.png';
+import { isRunningInjectPage } from '@/core/uitl';
+import LarkIcon from '../LarkIcon';
+import Typography from '../Typography';
 import styles from './Login.module.less';
 
 interface ILoginProps {
@@ -39,6 +42,15 @@ function Login(props: ILoginProps) {
 
   return (
     <div className={styles.wrapper}>
+      {isRunningInjectPage && (
+        <Typography
+          type="iconButton"
+          className={styles.closeWrapper}
+          onClick={() => backgroundBridge.sidePanel.close()}
+        >
+          <LarkIcon name="close-outline" />
+        </Typography>
+      )}
       <div className={styles.content}>
         <div className={styles.welcome}>
           <img width="60" src={YuqueLogo} alt="yuque logo" />

diff --git a/src/components/AccountLayout/index.tsx b/src/components/AccountLayout/index.tsx
@@ -110,7 +110,7 @@ function AccountLayout(props: IAccountLayoutProps) {
 
   return (
     <AccountContext.Provider value={providerValue as any}>
-      {isLogined ? (
+      {isLogined && !forceUpgradeHtml ? (
         props.children
       ) : (
         <Login onLoginSuccess={setUser} forceUpgradeHtml={forceUpgradeHtml} />