统一代码顺序

Author: TCOTC

app/src/config/appearance.ts

@@ -16,16 +16,16 @@ import {updateHotkeyTip} from "../protyle/util/compatibility";
 import {Menu} from "../plugin/Menu";
 import {escapeAttr} from "../util/escape";
 import {
-    buttonRow,
-    customRow,
-    findSettingRowByControlId,
-    rangeRow,
+    type SettingBindApi,
+    type SettingSection,
+    switchRow,
     numberRow,
+    rangeRow,
     selectRow,
+    buttonRow,
+    customRow,
     stackRow,
-    switchRow,
-    type SettingBindApi,
-    type SettingSection,
+    findSettingRowByControlId,
 } from "./ui/settingRows";
 import {filterSettingSections} from "./ui/search";
 import {renderSettingTabHtmlFromSections, renderSwitchRow} from "./ui/render";

app/src/config/editor.ts

@@ -1,16 +1,16 @@
 import {updateHotkeyTip} from "../protyle/util/compatibility";
 import {Constants} from "../constants";
 import {
+    type SettingBindApi,
+    type SettingSection,
+    switchRow,
+    textRow,
     textBlockRow,
-    customRow,
-    findSettingRowByControlId,
     numberRow,
     rangeRow,
     selectRow,
-    switchRow,
-    textRow,
-    type SettingBindApi,
-    type SettingSection,
+    customRow,
+    findSettingRowByControlId,
 } from "./ui/settingRows";
 import {filterSettingSections} from "./ui/search";
 import {renderSettingTabHtmlFromSections, renderSwitchRow} from "./ui/render";

app/src/config/file.ts

@@ -2,12 +2,12 @@ import {confirmDialog} from "../dialog/confirmDialog";
 import {genNotebookOption} from "../menus/onGetnotebookconf";
 import {fetchPost} from "../util/fetch";
 import {
-    findSettingRowByControlId,
-    notebookSavePathRow,
+    type SettingSection,
+    switchRow,
     numberRow,
     stackRow,
-    switchRow,
-    type SettingSection,
+    notebookSavePathRow,
+    findSettingRowByControlId,
 } from "./ui/settingRows";
 import {filterSettingSections} from "./ui/search";
 import {renderSettingTabHtmlFromSections} from "./ui/render";

app/src/config/ui/render.ts

@@ -200,25 +200,15 @@ const renderStack = (entry: SettingRowStack): string => {
 const renderRow = (row: SettingRow): string => {
     const cfg = window.siyuan.config;
     switch (row.type) {
-        case "custom":
-            return row.html();
-        case "stack":
-            return renderStack(row);
         case "switch":
             return renderSwitchRow(row.id, row.title, row.desc, getSwitchChecked(row.id));
-        case "range": {
-            const v = getAtPath(cfg, row.id);
-            const num = typeof v === "number" && !Number.isNaN(v) ? v : row.min;
-            return renderRangeRow(
-                row.id,
-                row.title,
-                row.desc,
-                row.min,
-                row.max,
-                row.step,
-                num
-            );
+        case "text": {
+            const val = getAtPath(cfg, row.id);
+            const str = typeof val === "string" ? val : "";
+            return renderTextRow(row.id, row.title, row.desc, str);
         }
+        case "textBlock":
+            return renderTextBlockRow(row.title, row.desc, row.id, row.getTextValue());
         case "number": {
             const raw = getAtPath(cfg, row.id);
             const value = typeof raw === "number" && !Number.isNaN(raw) ? raw : 0;
@@ -232,8 +222,19 @@ const renderRow = (row: SettingRow): string => {
                 row.unit
             );
         }
-        case "button":
-            return renderButtonRow(row.id, row.title, row.desc, row.label, row.icon);
+        case "range": {
+            const v = getAtPath(cfg, row.id);
+            const num = typeof v === "number" && !Number.isNaN(v) ? v : row.min;
+            return renderRangeRow(
+                row.id,
+                row.title,
+                row.desc,
+                row.min,
+                row.max,
+                row.step,
+                num
+            );
+        }
         case "select": {
             const firstVal = row.options[0]?.value;
             const numericSelect = row.options.length > 0 && typeof firstVal === "number";
@@ -255,11 +256,12 @@ const renderRow = (row: SettingRow): string => {
             }
             return renderSelectRow(row.id, row.title, row.desc, row.options, current);
         }
-        case "text": {
-            const val = getAtPath(cfg, row.id);
-            const str = typeof val === "string" ? val : "";
-            return renderTextRow(row.id, row.title, row.desc, str);
-        }
+        case "button":
+            return renderButtonRow(row.id, row.title, row.desc, row.label, row.icon);
+        case "custom":
+            return row.html();
+        case "stack":
+            return renderStack(row);
         case "notebookSavePath":
             return renderNotebookSavePathRow(
                 row.title,
@@ -268,8 +270,6 @@ const renderRow = (row: SettingRow): string => {
                 row.pathId,
                 row.getOptionsHtml()
             );
-        case "textBlock":
-            return renderTextBlockRow(row.title, row.desc, row.id, row.getTextValue());
     }
 };
 

app/src/config/ui/search.ts

@@ -30,18 +30,15 @@ export const textMatchesConfigSearch = (text: string, queryLower: string): boole
 /** 行是否命中设置面板搜索（工厂行看 `title` / `desc`；`custom` 看 `keywords`；`stack` 由各行左列与右侧控件文案推导；`select` 另含选项文案） */
 export const configRowMatchesSearchQuery = (row: SettingRow, queryLower: string): boolean => {
     switch (row.type) {
-        case "custom":
-            return row.keywords.some((k) => textMatchesConfigSearch(k, queryLower));
-        case "stack":
-            return stackExtraSearchStrings(row).some((s) => textMatchesConfigSearch(s, queryLower));
-        case "select":
-            if (
+        case "switch":
+        case "text":
+        case "textBlock":
+        case "range":
+        case "notebookSavePath":
+            return (
                 textMatchesConfigSearch(row.title, queryLower) ||
                 textMatchesConfigSearch(row.desc, queryLower)
-            ) {
-                return true;
-            }
-            return row.options.some((o) => textMatchesConfigSearch(o.label, queryLower));
+            );
         case "number":
             if (
                 textMatchesConfigSearch(row.title, queryLower) ||
@@ -53,41 +50,49 @@ export const configRowMatchesSearchQuery = (row: SettingRow, queryLower: string)
                 return true;
             }
             return false;
-        case "button":
-            return (
-                textMatchesConfigSearch(row.title, queryLower) ||
-                textMatchesConfigSearch(row.desc, queryLower) ||
-                textMatchesConfigSearch(row.label, queryLower)
-            );
-        default:
+        case "select":
             if (
                 textMatchesConfigSearch(row.title, queryLower) ||
                 textMatchesConfigSearch(row.desc, queryLower)
             ) {
                 return true;
             }
-            return false;
+            return row.options.some((o) => textMatchesConfigSearch(o.label, queryLower));
+        case "button":
+            return (
+                textMatchesConfigSearch(row.title, queryLower) ||
+                textMatchesConfigSearch(row.desc, queryLower) ||
+                textMatchesConfigSearch(row.label, queryLower)
+            );
+        case "custom":
+            return row.keywords.some((k) => textMatchesConfigSearch(k, queryLower));
+        case "stack":
+            return stackExtraSearchStrings(row).some((s) => textMatchesConfigSearch(s, queryLower));
     }
 };
 
 /** 从一行注册数据取出参与侧栏与内容区检索索引的字符串（`custom` 仅用 `keywords`；`stack` 由各行推导；其余含 `title` / `desc` 的行用二者） */
 export const collectRowStringsForSearchIndex = (row: SettingRow): string[] => {
     switch (row.type) {
-        case "custom":
-            return [...row.keywords];
-        case "stack":
-            return stackExtraSearchStrings(row);
-        case "select":
-            return [row.title, row.desc, ...row.options.map((o) => o.label)];
+        case "switch":
+        case "text":
+        case "textBlock":
+        case "range":
+        case "notebookSavePath":
+            return [row.title, row.desc];
         case "number":
             if (row.unit) {
                 return [row.title, row.desc, row.unit];
             }
             return [row.title, row.desc];
+        case "select":
+            return [row.title, row.desc, ...row.options.map((o) => o.label)];
         case "button":
             return [row.title, row.desc, row.label];
-        default:
-            return [row.title, row.desc];
+        case "custom":
+            return [...row.keywords];
+        case "stack":
+            return stackExtraSearchStrings(row);
     }
 };