From 9622aace5bed184266faf8fdb1163870217fa528 Mon Sep 17 00:00:00 2001
From: Vanessa <lly219@gmail.com>
Date: Fri, 30 Jan 2026 00:24:22 +0800
Subject: [PATCH] :art: https://github.com/siyuan-note/siyuan/pull/16930

---
 app/src/config/about.ts          | 130 +++++++++++++++++--------------
 app/src/mobile/settings/about.ts | 124 +++++++++++++++++------------
 2 files changed, 146 insertions(+), 108 deletions(-)

diff --git a/app/src/config/about.ts b/app/src/config/about.ts
index 66886b4d2..e43e4bd7c 100644
--- a/app/src/config/about.ts
+++ b/app/src/config/about.ts
@@ -13,6 +13,7 @@ import {Dialog} from "../dialog";
 import {confirmDialog} from "../dialog/confirmDialog";
 import {setKey} from "../sync/syncGuide";
 import {useShell} from "../util/pathName";
+import {hasClosestByClassName} from "../protyle/util/hasClosest";
 
 export const about = {
     element: undefined as Element,
@@ -56,54 +57,56 @@ export const about = {
     <div class="fn__space"></div>
     <input class="b3-switch fn__flex-center" id="downloadInstallPkg" type="checkbox"${window.siyuan.config.system.downloadInstallPkg ? " checked" : ""}>
 </label>
-<label class="b3-label fn__flex">
-    <div class="fn__flex-1">
-        ${window.siyuan.languages.about11}
-        <div class="b3-label__text">${window.siyuan.languages.about12}</div>
+<div class="b3-label">
+    <label class="fn__flex config__item">
+        <div class="fn__flex-1">
+            ${window.siyuan.languages.about11}
+            <div class="b3-label__text">${window.siyuan.languages.about12}</div>
+        </div>
+        <div class="fn__space"></div>
+        <input class="b3-switch fn__flex-center" id="networkServe" type="checkbox"${window.siyuan.config.system.networkServe ? " checked" : ""}>
+    </label>
+    <label class="b3-label fn__flex">
+        <div class="fn__flex-1">
+            ${window.siyuan.languages.networkServeTLS}
+            <div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip}</div>
+            <div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip2}</div>
+        </div>
+        <div class="fn__space"></div>
+        <input class="b3-switch fn__flex-center" id="networkServeTLS" type="checkbox"${window.siyuan.config.system.networkServeTLS ? " checked" : ""}${!window.siyuan.config.system.networkServe ? " disabled" : ""}>
+    </label>
+    <div class="fn__flex b3-label config__item${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="exportCACertSection">
+        <div class="fn__flex-1">
+            ${window.siyuan.languages.exportCACert}
+            <div class="b3-label__text">${window.siyuan.languages.exportCACertTip}</div>
+        </div>
+        <div class="fn__space"></div>
+        <button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="exportCACert">
+            <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
+        </button>
     </div>
-    <div class="fn__space"></div>
-    <input class="b3-switch fn__flex-center" id="networkServe" type="checkbox"${window.siyuan.config.system.networkServe ? " checked" : ""}>
-</label>
-<label class="b3-label fn__flex">
-    <div class="fn__flex-1">
-        ${window.siyuan.languages.networkServeTLS}
-        <div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip}</div>
-        <div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip2}</div>
+    <div class="fn__flex b3-label config__item${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="exportCABundleSection">
+        <div class="fn__flex-1">
+            ${window.siyuan.languages.exportCABundle}
+            <div class="b3-label__text">${window.siyuan.languages.exportCABundleTip}</div>
+        </div>
+        <div class="fn__space"></div>
+        <button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="exportCABundle">
+            <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
+        </button>
     </div>
-    <div class="fn__space"></div>
-    <input class="b3-switch fn__flex-center" id="networkServeTLS" type="checkbox"${window.siyuan.config.system.networkServeTLS ? " checked" : ""}${!window.siyuan.config.system.networkServe ? " disabled" : ""}>
-</label>
-<div class="fn__flex b3-label config__item${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="exportCACertSection">
-    <div class="fn__flex-1">
-        ${window.siyuan.languages.exportCACert}
-        <div class="b3-label__text">${window.siyuan.languages.exportCACertTip}</div>
+    <div class="fn__flex b3-label config__item${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="importCABundleSection">
+        <div class="fn__flex-1">
+            ${window.siyuan.languages.importCABundle}
+            <div class="b3-label__text">${window.siyuan.languages.importCABundleTip}</div>
+        </div>
+        <div class="fn__space"></div>
+        <button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="importCABundle">
+            <svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.import}
+        </button>
     </div>
-    <div class="fn__space"></div>
-    <button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="exportCACert">
-        <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
-    </button>
 </div>
-<div class="fn__flex b3-label config__item${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="exportCABundleSection">
-    <div class="fn__flex-1">
-        ${window.siyuan.languages.exportCABundle}
-        <div class="b3-label__text">${window.siyuan.languages.exportCABundleTip}</div>
-    </div>
-    <div class="fn__space"></div>
-    <button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="exportCABundle">
-        <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
-    </button>
-</div>
-<div class="fn__flex b3-label config__item${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="importCABundleSection">
-    <div class="fn__flex-1">
-        ${window.siyuan.languages.importCABundle}
-        <div class="b3-label__text">${window.siyuan.languages.importCABundleTip}</div>
-    </div>
-    <div class="fn__space"></div>
-    <button class="b3-button b3-button--outline fn__size200 fn__flex-center" id="importCABundle">
-        <svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.import}
-    </button>
-</div>
-<div class="b3-label${(window.siyuan.config.readonly || (isBrowser() && !isInIOS() && !isInAndroid() && !isIPad() && !isInHarmony())) ? " fn__none" : ""}">
+<div class="b3-label config__item${(window.siyuan.config.readonly || (isBrowser() && !isInIOS() && !isInAndroid() && !isIPad() && !isInHarmony())) ? " fn__none" : ""}">
     <div class="fn__flex">
         <div class="fn__flex-1">
             ${window.siyuan.languages.about5}
@@ -141,7 +144,7 @@ export const about = {
         <div class="b3-label__text">${window.siyuan.languages.about18}</div>
     </div>
     <div class="fn__space"></div>
-    <button data-type="open" data-url="${"http://127.0.0.1:"+ location.port}" class="b3-button b3-button--outline fn__size200 fn__flex-center">
+    <button data-type="open" data-url="${"http://127.0.0.1:" + location.port}" class="b3-button b3-button--outline fn__size200 fn__flex-center">
         <svg><use xlink:href="#iconLink"></use></svg>${window.siyuan.languages.about4}
     </button>
 </div>
@@ -419,11 +422,27 @@ ${checkUpdateHTML}
         });
         const networkServeElement = about.element.querySelector("#networkServe") as HTMLInputElement;
         const networkServeTLSElement = about.element.querySelector("#networkServeTLS") as HTMLInputElement;
+        const networkServeContainElement = hasClosestByClassName(networkServeElement, "b3-label") as HTMLElement;
         networkServeElement.addEventListener("change", () => {
             networkServeTLSElement.disabled = !networkServeElement.checked;
             if (!networkServeElement.checked) {
                 networkServeTLSElement.checked = false;
             }
+            Array.from(networkServeContainElement.children).forEach((item: HTMLElement, index) => {
+                if (index === 1) {
+                    if (networkServeElement.checked) {
+                        item.classList.remove("fn__none");
+                    } else {
+                        item.classList.add("fn__none");
+                    }
+                } else if (index > 1) {
+                    if (networkServeTLSElement.checked) {
+                        item.classList.remove("fn__none");
+                    } else {
+                        item.classList.add("fn__none");
+                    }
+                }
+            });
             fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => {
                 exportLayout({
                     errorExit: true,
@@ -432,20 +451,15 @@ ${checkUpdateHTML}
             });
         });
         networkServeTLSElement.addEventListener("change", () => {
-            const exportCACertSection = about.element.querySelector("#exportCACertSection");
-            const exportCABundleSection = about.element.querySelector("#exportCABundleSection");
-            const importCABundleSection = about.element.querySelector("#importCABundleSection");
-            if (exportCACertSection && exportCABundleSection && importCABundleSection) {
-                if (networkServeTLSElement.checked) {
-                    exportCACertSection.classList.remove("fn__none");
-                    exportCABundleSection.classList.remove("fn__none");
-                    importCABundleSection.classList.remove("fn__none");
-                } else {
-                    exportCACertSection.classList.add("fn__none");
-                    exportCABundleSection.classList.add("fn__none");
-                    importCABundleSection.classList.add("fn__none");
+            Array.from(networkServeContainElement.children).forEach((item: HTMLElement, index) => {
+                if (index > 1) {
+                    if (networkServeTLSElement.checked) {
+                        item.classList.remove("fn__none");
+                    } else {
+                        item.classList.add("fn__none");
+                    }
                 }
-            }
+            });
             fetchPost("/api/system/setNetworkServeTLS", {networkServeTLS: networkServeTLSElement.checked}, () => {
                 exportLayout({
                     errorExit: true,
diff --git a/app/src/mobile/settings/about.ts b/app/src/mobile/settings/about.ts
index 837b86d20..498a4018e 100644
--- a/app/src/mobile/settings/about.ts
+++ b/app/src/mobile/settings/about.ts
@@ -10,52 +10,55 @@ import {pathPosix} from "../../util/pathName";
 import {openModel} from "../menu/model";
 import {setKey} from "../../sync/syncGuide";
 import {isBrowser} from "../../util/functions";
+import {hasClosestByClassName} from "../../protyle/util/hasClosest";
 
 export const initAbout = () => {
     openModel({
         title: window.siyuan.languages.about,
         icon: "iconInfo",
         html: `<div>
-<label class="b3-label fn__flex${window.siyuan.config.readonly ? " fn__none" : ""}">
-    <div class="fn__flex-1">
-        ${window.siyuan.languages.about11}
-        <div class="b3-label__text">${window.siyuan.languages.about12}</div>
+<div class="b3-label${window.siyuan.config.readonly ? " fn__none" : ""}">
+    <label class="fn__flex">
+        <div class="fn__flex-1">
+            ${window.siyuan.languages.about11}
+            <div class="b3-label__text">${window.siyuan.languages.about12}</div>
+        </div>
+        <div class="fn__space"></div>
+        <input class="b3-switch fn__flex-center" id="networkServe" type="checkbox"${window.siyuan.config.system.networkServe ? " checked" : ""}>
+    </label>
+    <label class="b3-label fn__flex${window.siyuan.config.system.networkServe ? "" : " fn__none"}${(window.siyuan.config.system.networkServeTLS && window.siyuan.config.system.networkServe) ? "" : " b3-label--noborder"}">
+        <div class="fn__flex-1">
+            ${window.siyuan.languages.networkServeTLS}
+            <div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip}</div>
+            <div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip2}</div>
+        </div>
+        <div class="fn__space"></div>
+        <input class="b3-switch fn__flex-center" id="networkServeTLS" type="checkbox"${window.siyuan.config.system.networkServeTLS ? " checked" : ""}${!window.siyuan.config.system.networkServe ? " disabled" : ""}>
+    </label>
+    <div class="b3-label${(window.siyuan.config.system.networkServeTLS && window.siyuan.config.system.networkServe) ? "" : " fn__none"}">
+        ${window.siyuan.languages.exportCACert}
+        <div class="fn__hr"></div>
+        <button class="b3-button b3-button--outline fn__block" id="exportCACert">
+            <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
+        </button>
+        <div class="b3-label__text">${window.siyuan.languages.exportCACertTip}</div>
     </div>
-    <div class="fn__space"></div>
-    <input class="b3-switch fn__flex-center" id="networkServe" type="checkbox"${window.siyuan.config.system.networkServe ? " checked" : ""}>
-</label>
-<label class="b3-label fn__flex${window.siyuan.config.readonly ? " fn__none" : ""}">
-    <div class="fn__flex-1">
-        ${window.siyuan.languages.networkServeTLS}
-        <div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip}</div>
-        <div class="b3-label__text">${window.siyuan.languages.networkServeTLSTip2}</div>
+    <div class="b3-label${(window.siyuan.config.system.networkServeTLS && window.siyuan.config.system.networkServe) ? "" : " fn__none"}">
+        ${window.siyuan.languages.exportCABundle}
+        <div class="fn__hr"></div>
+        <button class="b3-button b3-button--outline fn__block" id="exportCABundle">
+            <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
+        </button>
+        <div class="b3-label__text">${window.siyuan.languages.exportCABundleTip}</div>
+    </div>
+    <div class="b3-label${(window.siyuan.config.system.networkServeTLS && window.siyuan.config.system.networkServe) ? "" : " fn__none"}">
+        ${window.siyuan.languages.importCABundle}
+        <div class="fn__hr"></div>
+        <button class="b3-button b3-button--outline fn__block" id="importCABundle">
+            <svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.import}
+        </button>
+        <div class="b3-label__text">${window.siyuan.languages.importCABundleTip}</div>
     </div>
-    <div class="fn__space"></div>
-    <input class="b3-switch fn__flex-center" id="networkServeTLS" type="checkbox"${window.siyuan.config.system.networkServeTLS ? " checked" : ""}${!window.siyuan.config.system.networkServe ? " disabled" : ""}>
-</label>
-<div class="b3-label${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="exportCACertSection">
-    ${window.siyuan.languages.exportCACert}
-    <div class="fn__hr"></div>
-    <button class="b3-button b3-button--outline fn__block" id="exportCACert">
-        <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
-    </button>
-    <div class="b3-label__text">${window.siyuan.languages.exportCACertTip}</div>
-</div>
-<div class="b3-label${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="exportCABundleSection">
-    ${window.siyuan.languages.exportCABundle}
-    <div class="fn__hr"></div>
-    <button class="b3-button b3-button--outline fn__block" id="exportCABundle">
-        <svg><use xlink:href="#iconUpload"></use></svg>${window.siyuan.languages.export}
-    </button>
-    <div class="b3-label__text">${window.siyuan.languages.exportCABundleTip}</div>
-</div>
-<div class="b3-label${window.siyuan.config.system.networkServeTLS ? "" : " fn__none"}" id="importCABundleSection">
-    ${window.siyuan.languages.importCABundle}
-    <div class="fn__hr"></div>
-    <button class="b3-button b3-button--outline fn__block" id="importCABundle">
-        <svg><use xlink:href="#iconDownload"></use></svg>${window.siyuan.languages.import}
-    </button>
-    <div class="b3-label__text">${window.siyuan.languages.importCABundleTip}</div>
 </div>
 <div class="b3-label">
         ${window.siyuan.languages.about2}
@@ -485,29 +488,50 @@ export const initAbout = () => {
             });
             const networkServeElement = modelMainElement.querySelector("#networkServe") as HTMLInputElement;
             const networkServeTLSElement = modelMainElement.querySelector("#networkServeTLS") as HTMLInputElement;
+            const networkServeContainElement = hasClosestByClassName(networkServeElement, "b3-label") as HTMLElement;
             networkServeElement.addEventListener("change", () => {
                 networkServeTLSElement.disabled = !networkServeElement.checked;
                 if (!networkServeElement.checked) {
                     networkServeTLSElement.checked = false;
                 }
+                Array.from(networkServeContainElement.children).forEach((item: HTMLElement, index) => {
+                    if (index === 1) {
+                        if (networkServeElement.checked) {
+                            item.classList.remove("fn__none");
+                        } else {
+                            item.classList.add("fn__none");
+                        }
+                    } else if (index > 1) {
+                        if (networkServeTLSElement.checked) {
+                            item.classList.remove("fn__none");
+                        } else {
+                            item.classList.add("fn__none");
+                        }
+                    }
+                });
+                if (networkServeTLSElement.checked) {
+                    networkServeTLSElement.parentElement.classList.remove("b3-label--noborder");
+                } else {
+                    networkServeTLSElement.parentElement.classList.add("b3-label--noborder");
+                }
                 fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => {
                     exitSiYuan();
                 });
             });
             networkServeTLSElement.addEventListener("change", () => {
-                const exportCACertSection = modelMainElement.querySelector("#exportCACertSection");
-                const exportCABundleSection = modelMainElement.querySelector("#exportCABundleSection");
-                const importCABundleSection = modelMainElement.querySelector("#importCABundleSection");
-                if (exportCACertSection && exportCABundleSection && importCABundleSection) {
-                    if (networkServeTLSElement.checked) {
-                        exportCACertSection.classList.remove("fn__none");
-                        exportCABundleSection.classList.remove("fn__none");
-                        importCABundleSection.classList.remove("fn__none");
-                    } else {
-                        exportCACertSection.classList.add("fn__none");
-                        exportCABundleSection.classList.add("fn__none");
-                        importCABundleSection.classList.add("fn__none");
+                Array.from(networkServeContainElement.children).forEach((item: HTMLElement, index) => {
+                    if (index > 1) {
+                        if (networkServeTLSElement.checked) {
+                            item.classList.remove("fn__none");
+                        } else {
+                            item.classList.add("fn__none");
+                        }
                     }
+                });
+                if (networkServeTLSElement.checked) {
+                    networkServeTLSElement.parentElement.classList.remove("b3-label--noborder");
+                } else {
+                    networkServeTLSElement.parentElement.classList.add("b3-label--noborder");
                 }
                 fetchPost("/api/system/setNetworkServeTLS", {networkServeTLS: networkServeTLSElement.checked}, () => {
                     exitSiYuan();