Merge pull request #891 from Hi-Windom/v0.35

V0.35
Hi-Windom · Jul 20, 2024 · 27f54f1 · 27f54f1
2 parents 54deb61 + 80e9888
commit 27f54f1
Show file tree

Hide file tree

Showing 27 changed files with 438 additions and 5,735 deletions.
diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml
diff --git a/.vscode/Sillot.code-workspace b/.vscode/Sillot.code-workspace
@@ -20,6 +20,11 @@
       "name": "汐洛 VSC 扩展🤍/.vscode/extensions/Sillot 🗂️",
       "url": "https://github.com/Hi-Windom/Sillot/.vscode/extensions/Sillot"
     },
+    {
+        "path": "../../Sillot-ASP", // 汐洛 Android Studio 插件
+        "name": "汐洛 AS 插件🤍/../Sillot-ASP 🗂️",
+        "url": "https://github.com/Soltus/Sillot-ASP"
+      },
     {
       "path": "../docs/starlight", // 列出子文件夹，在父文件夹的 setting.json 添加隐藏（排除）
       "name": "汐洛宝典🤍/docs/starlight 🗂️",

diff --git a/.vscode/extensions/Sillot/package.json b/.vscode/extensions/Sillot/package.json
@@ -2,7 +2,7 @@
   "name": "sillot",
   "displayName": "汐洛 Sillot",
   "description": "汐洛彖夲肜矩阵（Sillot T☳Converbenk Matrix）为智慧新彖务服务。此插件为汐洛官方插件，提供多功能一体化集成。",
-  "version": "0.35.24071614",
+  "version": "0.35.24072019",
   "preview": true,
   "repository": "https://github.com/Hi-Windom/Sillot",
   "publisher": "Hi-Windom",

diff --git a/app/package.json b/app/package.json
@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.35.24071614",
+  "version": "0.35.24072019",
   "syv": "3.1.2",
   "sypv": "[3.0.16, 3.0.17, 3.1.0, 3.1.1]",
   "description": "Build Your Eternal Digital Garden",
@@ -140,7 +140,7 @@
     "rollup-plugin-postcss": "^4.0.2",
     "rxjs": "^7.8.1",
     "safer-buffer": "^2.1.2",
-    "sass": "^1.77.6",
+    "sass": "catalog:",
     "sass-loader": "^14.1.1",
     "socket.io": "^4.7.5",
     "sofill": "catalog:",

diff --git a/app/src/config/util/about.ts b/app/src/config/util/about.ts
@@ -1,46 +1,46 @@
-import {Dialog} from "../../dialog";
-import {isMobile} from "../../util/functions";
-import {fetchPost} from "../../util/fetch";
-import {Constants} from "../../constants";
-
-export const setAccessAuthCode = () => {
-    window.sout.tracker("invoked");
-    const dialog = new Dialog({
-        title: window.siyuan.languages.about5,
-        content: `<div class="b3-dialog__content">
-    <input class="b3-text-field fn__block" placeholder="${window.siyuan.languages.about5}" value="${window.siyuan.config.accessAuthCode}">
-    <div class="b3-label__text">${window.siyuan.languages.about6}</div>
-</div>
-<div class="b3-dialog__action">
-    <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
-    <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
-</div>`,
-        width: isMobile() ? "92vw" : "520px",
-    });
-    const inputElement = dialog.element.querySelector("input") as HTMLInputElement;
-    const btnsElement = dialog.element.querySelectorAll(".b3-button");
-    dialog.element.setAttribute("data-key", Constants.DIALOG_ACCESSAUTHCODE);
-    dialog.bindInput(inputElement, () => {
-        (btnsElement[1] as HTMLButtonElement).click();
-    });
-    inputElement.select();
-    btnsElement[0].addEventListener("click", () => {
-        dialog.destroy();
-    });
-    btnsElement[1].addEventListener("click", () => {
-        fetchPost("/api/system/setAccessAuthCode", {accessAuthCode: inputElement.value});
-				if (window.JSAndroid) { window.JSAndroid.setMMKV("accessAuthCode", inputElement.value)}
-    });
-};
-
-export const getCloudURL = (key: string) => {
-    window.sout.tracker("invoked");
-    const origin = window.siyuan.config.cloudRegion === 0 ? "https://ld246.com" : "https://liuyun.io";
-    return `${origin}/${key}`;
-};
-
-export const getIndexURL = (key: string) => {
-    window.sout.tracker("invoked");
-    const lang = "zh_CN" === window.siyuan.config.lang ? "" : "/en";
-    return "https://b3log.org/siyuan" + `${lang}/${key}`;
-};
+import {Dialog} from "../../dialog";
+import {isMobile} from "../../util/functions";
+import {fetchPost} from "../../util/fetch";
+import {Constants} from "../../constants";
+
+export const setAccessAuthCode = () => {
+    window.sout.tracker("invoked");
+    const dialog = new Dialog({
+        title: window.siyuan.languages.about5,
+        content: `<div class="b3-dialog__content">
+    <input class="b3-text-field fn__block" placeholder="${window.siyuan.languages.about5}" value="${window.siyuan.config.accessAuthCode}">
+    <div class="b3-label__text">${window.siyuan.languages.about6}</div>
+</div>
+<div class="b3-dialog__action">
+    <button class="b3-button b3-button--cancel">${window.siyuan.languages.cancel}</button><div class="fn__space"></div>
+    <button class="b3-button b3-button--text">${window.siyuan.languages.confirm}</button>
+</div>`,
+        width: isMobile() ? "92vw" : "520px",
+    });
+    const inputElement = dialog.element.querySelector("input") as HTMLInputElement;
+    const btnsElement = dialog.element.querySelectorAll(".b3-button");
+    dialog.element.setAttribute("data-key", Constants.DIALOG_ACCESSAUTHCODE);
+    dialog.bindInput(inputElement, () => {
+        (btnsElement[1] as HTMLButtonElement).click();
+    });
+    inputElement.select();
+    btnsElement[0].addEventListener("click", () => {
+        dialog.destroy();
+    });
+    btnsElement[1].addEventListener("click", () => {
+        fetchPost("/api/system/setAccessAuthCode", {accessAuthCode: inputElement.value});
+				if (window.JSAndroid) { window.JSAndroid.setKV("accessAuthCode", inputElement.value)}
+    });
+};
+
+export const getCloudURL = (key: string) => {
+    window.sout.tracker("invoked");
+    const origin = window.siyuan.config.cloudRegion === 0 ? "https://ld246.com" : "https://liuyun.io";
+    return `${origin}/${key}`;
+};
+
+export const getIndexURL = (key: string) => {
+    window.sout.tracker("invoked");
+    const lang = "zh_CN" === window.siyuan.config.lang ? "" : "/en";
+    return "https://b3log.org/siyuan" + `${lang}/${key}`;
+};
diff --git a/app/stage/auth.html b/app/stage/auth.html
@@ -513,7 +513,7 @@ <h1 style="color: var(--b3-theme-primary);filter: invert(1) drop-shadow(2px 1px
             return response.json()
         }).then((response) => {
             if (0 === response.code) {
-                window.JSAndroid?.setMMKV("AppCheckInState","unlockScreen")
+                window.JSAndroid?.setKV("AppCheckInState","unlockScreen")
                 const url = new URL(window.location)
                 window.location.href = url.searchParams.get("to") || "/"
                 return
@@ -601,7 +601,7 @@ <h1 style="color: var(--b3-theme-primary);filter: invert(1) drop-shadow(2px 1px
             Biometric.style.display = 'none';
             BiometricTip.style.display = 'none';
         } else {
-            window.JSAndroid?.setMMKV("AppCheckInState","lockScreen")
+            window.JSAndroid?.setKV("AppCheckInState","lockScreen")
         }
 
         // 用于授权页保持连接，避免非常驻内存内核自动退出 https://github.com/siyuan-note/insider/issues/1099

diff --git a/docs/starlight/astro.config.mjs b/docs/starlight/astro.config.mjs
@@ -13,6 +13,7 @@ export default defineConfig({
             errorOnRelativeLinks: false,
         }),
     ],
+    vite: {},
     integrations: [
         // [src/content/docs/] 将由 starlight 负责样式，[src/pages/] 则不受影响，在自定义页面中使用 Starlight 布局，请使用 <StarlightPage /> 组件包装页面内容。
         // REF https://starlight.astro.build/zh-cn/guides/pages/

diff --git a/docs/starlight/package.json b/docs/starlight/package.json
@@ -1,7 +1,7 @@
 {
   "name": "starlight",
   "type": "module",
-  "version": "0.35.24071614",
+  "version": "0.35.24072019",
   "scripts": {
     "test": "echo 'Test your sister day by day'",
     "dev": "astro dev",
@@ -21,8 +21,8 @@
     "@lorenzo_lewis/starlight-utils": "^0.1.1",
     "@types/node": "catalog:",
     "@vercel/speed-insights": "^1.0.12",
-    "astro": "^4.11.0",
-    "sass": "^1.77.6",
+    "astro": "catalog:",
+    "sass": "catalog:",
     "starlight-links-validator": "^0.9.0",
     "typescript": "catalog:"
   },