fix: 开机自启动 bug、图片预览钉图 bug

027xiguapi · Mar 5, 2024 · 068b76c · 068b76c
1 parent f93ff16
commit 068b76c
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 13 deletions.
diff --git a/packages/desktop/electron/main/ipcMain.ts b/packages/desktop/electron/main/ipcMain.ts
@@ -9,6 +9,7 @@ import {
   shell,
   webContents,
 } from 'electron';
+import * as canvasWin from '../win/canvasWin';
 import * as clipScreenWin from '../win/clipScreenWin';
 import * as editGifWin from '../win/editGifWin';
 import * as editImageWin from '../win/editImageWin';
@@ -26,7 +27,6 @@ import * as spliceImageWin from '../win/spliceImageWin';
 import * as viewAudioWin from '../win/viewAudioWin';
 import * as viewImageWin from '../win/viewImageWin';
 import * as viewVideoWin from '../win/viewVideoWin';
-import * as canvasWin from '../win/canvasWin';
 import logger from './logger';
 import * as utils from './utils';
 
@@ -208,6 +208,9 @@ function initIpcMain() {
   ipcMain.on('vi:open-file', (e, imgUrl) => {
     shell.openExternal(imgUrl);
   });
+  ipcMain.on('vi:alwaysOnTop-win', (e, isTop) => {
+    viewImageWin.setIsAlwaysOnTopViewImageWin(isTop);
+  });
   ipcMain.handle('vi:set-always-on-top', () => {
     const isAlwaysOnTop = viewImageWin.getIsAlwaysOnTopViewImageWin();
     return viewImageWin.setIsAlwaysOnTopViewImageWin(!isAlwaysOnTop);

diff --git a/packages/desktop/electron/preload/electronAPI.ts b/packages/desktop/electron/preload/electronAPI.ts
@@ -69,6 +69,7 @@ contextBridge.exposeInMainWorld('electronAPI', {
   sendViMinimizeWin: () => ipcRenderer.send('vi:minimize-win'),
   sendViMaximizeWin: () => ipcRenderer.send('vi:maximize-win'),
   sendViUnmaximizeWin: () => ipcRenderer.send('vi:unmaximize-win'),
+  sendViAlwaysOnTopWin: (isTop: boolean) => ipcRenderer.send('vi:alwaysOnTop-win', isTop),
   sendViOpenFile: (imgUrl: string) => ipcRenderer.send('vi:open-file', imgUrl),
   invokeViSetIsAlwaysOnTop: () => ipcRenderer.invoke('vi:set-always-on-top'),
   invokeViGetImgs: (imgUrl: string) => ipcRenderer.invoke('vi:get-imgs', imgUrl),

diff --git a/packages/web/CHANGELOG.md b/packages/web/CHANGELOG.md
@@ -1,5 +1,9 @@
 # @pear-rec/web
 
+## 1.4.12
+
+fix: 开机自启动 bug、图片预览钉图 bug
+
 ## 1.4.11
 
 fix: 动图导出 bug、视频解析动图 bug

diff --git a/packages/web/src/components/common/header/index.module.scss b/packages/web/src/components/common/header/index.module.scss
@@ -11,6 +11,7 @@
       width: 100px;
       height: 100%;
       line-height: 32px;
+      white-space: nowrap;
       text-align: left;
       span {
         display: inline-block;
@@ -28,6 +29,7 @@
     }
     .center {
       flex: auto;
+      white-space: nowrap;
       text-align: center;
       -webkit-app-region: drag;
       .icon {
@@ -37,6 +39,8 @@
     }
     .right {
       width: 100px;
+      min-width: 100px;
+      white-space: nowrap;
       .icon {
         -webkit-app-region: no-drag;
       }

diff --git a/packages/web/src/components/common/header/index.tsx b/packages/web/src/components/common/header/index.tsx
@@ -28,6 +28,7 @@ const logo = './imgs/icons/png/512x512.png';
 const Header = (props) => {
   const { t } = useTranslation();
   const [isMaximize, setIsMaximize] = useState(false);
+  const [isTop, setIsTop] = useState(false);
 
   async function handleMinimizeWin() {
     props.onMinimizeWin();
@@ -42,6 +43,12 @@ const Header = (props) => {
     setIsMaximize(!isMaximize);
   }
 
+  function handleAlwaysOnTopWin() {
+    let _isTop = !isTop;
+    props.onAlwaysOnTopWin(_isTop);
+    setIsTop(_isTop);
+  }
+
   return (
     <div className={`${props.className} ${styles.header}`}>
       <div className="left" title="pear-rec">
@@ -91,9 +98,9 @@ const Header = (props) => {
           <Button
             className="alwaysOnTopWin icon"
             type="text"
-            icon={<PushpinOutlined />}
+            icon={<PushpinOutlined style={{ color: isTop ? '#08c' : '' }} />}
             title={t('nav.alwaysOnTopWin')}
-            onClick={() => props.onAlwaysOnTopWin()}
+            onClick={() => handleAlwaysOnTopWin()}
           />
           <Button
             className="openFile icon"

diff --git a/packages/web/src/components/setting/basicSetting.tsx b/packages/web/src/components/setting/basicSetting.tsx
@@ -43,6 +43,7 @@ const BasicSetting = (props) => {
 
   function handleSetOpenAtLogin(isOpen: boolean) {
     db.settings.update(setting.id, { openAtLogin: isOpen });
+    window.electronAPI?.sendSeSetOpenAtLogin(isOpen);
   }
 
   async function getOpenAtLogin() {

diff --git a/packages/web/src/components/setting/userSetting.tsx b/packages/web/src/components/setting/userSetting.tsx
@@ -48,7 +48,7 @@ const UserSetting = (props) => {
         <img alt="logo" src={logo} />
       </div>
       <div className="info">
-        <p>版本：1.3.12</p>
+        <p>版本：1.3.13</p>
         <p>{uuid}</p>
         <p>{formatTime(createdTime)}</p>
         <Button type="primary" className="resetBtn" danger onClick={handleResetClick}>

diff --git a/packages/web/src/pages/viewImage/index.tsx b/packages/web/src/pages/viewImage/index.tsx
@@ -174,17 +174,13 @@ const ViewImage = () => {
   }
 
   function handleToggleMaximizeWin(isMaximize) {
-    isMaximize ? window.electronAPI.sendViUnmaximizeWin() : window.electronAPI.sendViMaximizeWin();
+    isMaximize
+      ? window.electronAPI?.sendViUnmaximizeWin()
+      : window.electronAPI?.sendViMaximizeWin();
   }
 
-  function handleAlwaysOnTopWin() {
-    const imgUrl = imgs[initialViewIndexRef.current]?.filePath;
-    if (window.isElectron) {
-      window.electronAPI.sendViCloseWin();
-      window.electronAPI.sendPiOpenWin({ imgUrl });
-    } else {
-      window.open(`/pinImage.html?imgUrl=${imgUrl}`);
-    }
+  function handleAlwaysOnTopWin(isTop: boolean) {
+    window.electronAPI?.sendViAlwaysOnTopWin(isTop);
   }
 
   function handleOpenFile() {