fix: 样式调整

yaklang · May 16, 2024 · 3f1e584 · 3f1e584
1 parent 004005f
commit 3f1e584
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 14 deletions.
diff --git a/app/renderer/src/main/src/components/layout/FuncDomain.tsx b/app/renderer/src/main/src/components/layout/FuncDomain.tsx
@@ -1268,19 +1268,9 @@ const UIOpUpdateYaklang: React.FC<UIOpUpdateProps> = React.memo((props) => {
                     <div className={styles["update-icon"]}>
                         <YaklangSvgIcon />
                     </div>
-                    {/* 等使用更新内容时，下面"当前版本"-div需要被删除 */}
-                    <div>
+                    <div style={{width: isUpdate && !isRemoteMode && role === "superAdmin" ? 150 : 180}}>
                         <div className={styles["update-title"]}>{`Yaklang ${isUpdate ? lastVersion : version}`}</div>
-                        <div>
-                            <Typography.Text
-                                style={{maxWidth: isUpdate && !isRemoteMode && role === "superAdmin" ? 145 : 180}}
-                                ellipsis={{
-                                    tooltip: true
-                                }}
-                            >
-                                <span className={styles["update-time"]}>{`当前版本: ${version}`}</span>
-                            </Typography.Text>
-                        </div>
+                        <div className={styles["update-time"]}>{`当前版本: ${version}`}</div>
                         {/* <div className={styles["upda te-time"]}>2022-09-29</div> */}
                     </div>
                 </div>
@@ -1382,7 +1372,6 @@ const MoreYaklangVersion: React.FC<MoreYaklangVersionProps> = React.memo((props)
             ipcRenderer
                 .invoke("fetch-yaklang-version-list")
                 .then((data: string) => {
-                    setLoading(false)
                     const arr = data.split("\n").filter((v) => v)
                     let devPrefix: string[] = []
                     let noPrefix: string[] = []
@@ -1398,6 +1387,9 @@ const MoreYaklangVersion: React.FC<MoreYaklangVersionProps> = React.memo((props)
                 .catch((err) => {
                     yakitNotify("error", `获取更多版本失败：${err}`)
                 })
+                .finally(() => {
+                    setLoading(false)
+                })
         }
     }, [inViewport])
 
@@ -1803,6 +1795,7 @@ const UIOpNotice: React.FC<UIOpNoticeProp> = React.memo((props) => {
     }, [isEngineLink])
 
     const onDownload = useMemoizedFn((type: "yakit" | "yaklang") => {
+        setShow(false)
         emiter.emit("activeUpdateYakitOrYaklang", type)
     })
 

diff --git a/app/renderer/src/main/src/components/layout/funcDomain.module.scss b/app/renderer/src/main/src/components/layout/funcDomain.module.scss
@@ -408,6 +408,9 @@
                 font-size: 12px;
                 line-height: 16px;
                 color: var(--yakit-header-color);
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
             }
             .update-simple-title {
                 height: 28px;
@@ -421,14 +424,17 @@
                 font-size: 11px;
                 line-height: 12px;
                 color: var(--yakit-helper-text-color);
+                overflow: hidden;
+                text-overflow: ellipsis;
+                white-space: nowrap;
             }
         }
         .header-btn {
             height: 28px;
             display: flex;
             justify-content: right;
             align-items: center;
-            gap: 16px;
+            gap: 12px;
             font-size: 12px;
             color: var(--yakit-disable-text-color);