Merge pull request #600 from Hi-Windom/huge_merge

Huge merge

.github/FUNDING.yml

@@ -1 +1 @@
-custom: https://github.com/Soltus/Soltus/blob/main/src/static/sponser.md
+custom: ["https://ld246.com/sponsor","https://github.com/Soltus/Soltus/blob/main/src/static/sponser.md"]

.github/workflows/dockerimage.yml

@@ -45,7 +45,7 @@ jobs:
         uses: docker/setup-qemu-action@v2
 
       - name: Setup Docker buildx
-        uses: docker/setup-buildx-action@v2
+        uses: docker/setup-buildx-action@v3
 
       - name: Log in to Docker Hub
         uses: docker/login-action@v2
@@ -65,4 +65,4 @@ jobs:
           repository: soltus/sillot # 这是 docker hub 的不是 github 的
           readme-filepath: ./.github/README.md
           short-description: ${{ github.event.repository.description }}
-          enable-url-completion: true
+          enable-url-completion: false

.vscode/settings.json

@@ -2,5 +2,6 @@
   "vue.features.codeActions.enable": false,
   "files.associations": {
     "*.sy": "json"
-  }
+  },
+  "workbench.editor.wrapTabs": true
 }

app/appearance/langs/en_US.json

@@ -907,7 +907,7 @@
   "dataHistory": "Data History",
   "quitApp": "Quit?",
   "reset": "Reset",
-  "siyuanNote": "SiYuan",
+  "siyuanNote": "SiYuan (Sillot) ",
   "resetLayout": "Restore Default Layout",
   "tag": "Tag",
   "twoFactorCaptcha": "Two-factor authentication captcha",
@@ -1066,7 +1066,7 @@
   "theme": "Theme",
   "language": "Language",
   "about": "About",
-  "about1": "Copyright (c) 2020-present • Yunnan Liandi Technology Co., Ltd. • <a target='_blank' href='https://b3log.org/siyuan/en/privacy.html'>Privacy Policy</a> • <a target='_blank' href='https://b3log.org/siyuan/en/eula.html'>User Agreement</a>",
+  "about1": "Copyright (c) 2022-present • Hi-Windom • <a target='_blank' href='https://b3log.org/siyuan/en/privacy.html'>Privacy Policy</a> • <a target='_blank' href='https://b3log.org/siyuan/en/eula.html'>User Agreement</a>",
   "about2": "Use on browser",
   "about3": "Please use the Chrome browser and keep it in the same network as the computer, port <code class='fn__code'>${port}</code>(In addition to the random port, the first started workspace will also automatically listen to <code class='fn__code'>6806</code> as a fixed port, so that it is convenient for the browser to clip extensions or other external programs to call the kernel interface), the addresses that may be connected are as follows: ",
   "about4": "Open browser",
@@ -1223,7 +1223,7 @@
     "7": "Remove notebook [%s] path [%s] failed: %s",
     "8": "Check update failed",
     "9": "\uD83D\uDE80 A new version is available, please browse the release announcement %s",
-    "10": "Is the latest version",
+    "10": "Is the latest version %s",
     "11": "\uD83D\uDCE2 系統公告：<a target='_blank' href='%s'>%s</a>",
     "12": "Query asset failed [%s]",
     "13": "Cannot create a file starting with .",
@@ -1386,18 +1386,18 @@
     "170": "Uploading data repo chunk %v/%v",
     "171": "Uploading data repo reference %s",
     "172": "If you forget the authorization code, please find help <a href=\"https://liuyun.io/article/1686530886208\" target=\"_blank\">here</a>",
-    "173": "Please enter the access auth code",
+    "173": " Access Auth Code Please",
     "174": "Unlock access",
     "175": "Please enter the verification code",
-    "176": "SiYuan",
+    "176": "SiYuan (Sillot) ",
     "177": "Exit application",
     "178": "Access Authorization - SiYuan",
     "179": "The disk space may be insufficient. It is recommended to keep the free space of the disk where the workspace is located at more than twice the size of data",
     "180": "Search content block does not exist",
     "181": "The document has been shared to community, <a href=\"%s\" target=\"_blank\">click to view</a>",
     "182": "Sharing document, please wait...",
     "183": "Validating index document tree [%d/%d %s]",
-    "184": "Powered by <a href=\"https://b3log.org/siyuan/en/?lang=en\" target=\"_blank\">SiYuan</a>",
+    "184": "Powered by <a href=\"https://b3log.org/siyuan/en/?lang=en\" target=\"_blank\">SiYuan</a> | <a href=\"https://sillot.db.sc.cn\" target=\"_blank\">Sillot</a>",
     "185": "Index verification complete",
     "186": "Locking cloud sync directory",
     "187": "Unlocking cloud sync directory",

app/appearance/langs/es_ES.json

@@ -907,7 +907,7 @@
   "dataHistory": "Historial de datos",
   "quitApp": "¿Cerrar?",
   "reset": "Reiniciar",
-  "siyuanNote": "SiYuan",
+  "siyuanNote": "SiYuan (Sillot) ",
   "resetLayout": "Restaurar el diseño por defecto",
   "tag": "Etiquetas",
   "twoFactorCaptcha": "Two-factor authentication captcha",
@@ -1066,7 +1066,7 @@
   "theme": "Tema",
   "language": "Idioma",
   "about": "Acerca de",
-  "about1": "Copyright (c) 2020-presente • Yunnan Liandi Technology Co., Ltd. • <a target='_blank' href='https://b3log.org/siyuan/en/privacy.html'>Política de privacidad</a> • <a target='_blank' href='https://b3log.org/siyuan/en/eula.html'>Acuerdo de usuario</a>",
+  "about1": "Copyright (c) 2022-presente • Hi-Windom • <a target='_blank' href='https://b3log.org/siyuan/en/privacy.html'>Política de privacidad</a> • <a target='_blank' href='https://b3log.org/siyuan/en/eula.html'>Acuerdo de usuario</a>",
   "about2": "Uso en el navegador",
   "about3": "Por favor, utilice el navegador Chrome y manténgalo en la misma red que el ordenador, puerto <code class='fn__code'>${port}</code>(Además del puerto aleatorio, el primer espacio de trabajo iniciado también escuchará automáticamente <code class='fn__code'>6806</code> como un puerto fijo, por lo que es conveniente que el navegador recorte extensiones u otros programas externos para llamar a la interfaz del kernel), las direcciones que se pueden conectar son las siguientes: ",
   "about4": "Abrir el navegador",
@@ -1223,7 +1223,7 @@
     "7": "Eliminar libreta [%s] ruta [%s] falló: %s",
     "8": "Comprobar la actualización falló",
     "9": "\uD83D\uDE80 Una nueva versión está disponible, por favor, busque el anuncio de lanzamiento %s",
-    "10": "Es la última versión",
+    "10": "Es la última versión %s",
     "11": "\uD83D\uDCE2 Anuncio del sistema: <a target='_blank' href='%s'>%s</a>",
     "12": "Fallo en la consulta de activos [%s]",
     "13": "No se puede crear un archivo que empiece por .",
@@ -1389,15 +1389,15 @@
     "173": "Por favor ingrese el codigo de autorizacion de acceso",
     "174": "Desbloquear acceso",
     "175": "Por favor ingrese el código de verificación",
-    "176": "SiYuan",
+    "176": "SiYuan (Sillot) ",
     "177": "Salir de la aplicación",
     "178": "Autorización de acceso - SiYuan",
     "179": "El espacio en disco puede ser insuficiente. Se recomienda mantener el espacio libre del disco donde se encuentra el espacio de trabajo en más del doble del tamaño de los datos",
     "180": "El bloque de contenido de búsqueda no existe",
     "181": "El documento ha sido compartido con comunidad, <a href=\"%s\" target=\"_blank\">haga clic para ver</a>",
     "182": "Compartiendo documento, por favor espere...",
     "183": "Validando el árbol del documento de índice [%d/%d %s]",
-    "184": "Con la tecnología de <a href=\"https://b3log.org/siyuan/en/?lang=en\" target=\"_blank\">SiYuan</a>",
+    "184": "Con la tecnología de <a href=\"https://b3log.org/siyuan/en/?lang=en\" target=\"_blank\">SiYuan</a> | <a href=\"https://sillot.db.sc.cn\" target=\"_blank\">Sillot</a>",
     "185": "Verificación de índice completada",
     "186": "Bloqueando el directorio de sincronización de la nube",
     "187": "Desbloqueando el directorio de sincronización en la nube",

app/appearance/langs/fr_FR.json

@@ -907,7 +907,7 @@
   "dataHistory": "Historique des données",
   "quitApp": "Quitter?",
   "reset": "Réinitialiser",
-  "siyuanNote": "SiYuan",
+  "siyuanNote": "SiYuan (Sillot) ",
   "resetLayout": "Restaurer la mise en page par défaut",
   "tag": "Tag",
   "twoFactorCaptcha": "Vérification en 2 étapes",
@@ -1066,7 +1066,7 @@
   "theme": "Thème",
   "language": "Langue",
   "about": "À propos de",
-  "about1": "Copyright (c) 2020-présent • Yunnan Liandi Technology Co., Ltd. • <a target='_blank' href='https://b3log.org/siyuan/en/privacy.html'>Politique de confidentialité</a> • <a target='_blank' href='https://b3log.org/siyuan/en/eula.html'>Accord de l'utilisateur</a>",
+  "about1": "Copyright (c) 2022-présent • Hi-Windom • <a target='_blank' href='https://b3log.org/siyuan/en/privacy.html'>Politique de confidentialité</a> • <a target='_blank' href='https://b3log.org/siyuan/en/eula.html'>Accord de l'utilisateur</a>",
   "about2": "Utiliser sur le navigateur",
   "about3": "Veuillez utiliser le navigateur Chrome et le garder sur le même réseau que l'ordinateur, port <code class='fn__code'>${port}</code>(En plus du port aléatoire, le premier espace de travail démarré écoutera également automatiquement <code class='fn__code'>6806</code> en tant que port fixe, de sorte qu'il est pratique pour le navigateur de couper des extensions ou d'autres programmes externes pour appeler l'interface du noyau), les adresses pouvant être connectées sont les suivantes: ",
   "about4": "Ouvrir le navigateur",
@@ -1223,7 +1223,7 @@
     "7": "La suppression du carnet de notes [%s] path [%s] a échoué : %s",
     "8": "La vérification de la mise à jour a échoué",
     "9": "\uD83D\uDE80 Une nouvelle version est disponible, veuillez consulter l'annonce de la version %s",
-    "10": "C'est la dernière version",
+    "10": "C'est la dernière version %s",
     "11": "\uD83D\uDCE2 Annonce système : <a target='_blank' href='%s'>%s</a>",
     "12": "Échec de la requête asset [%s]",
     "13": "Impossible de créer un fichier commençant par .",
@@ -1389,15 +1389,15 @@
     "173": "Veuillez entrer le code d'autorisation d'accès",
     "174": "Déverrouiller l'accès",
     "175": "Veuillez entrer le code de vérification",
-    "176": "SiYuan",
+    "176": "SiYuan (Sillot) ",
     "177": "Quitter l'application",
     "178": "Autorisation d'accès - SiYuan",
     "179": "L'espace disque peut être insuffisant. Il est recommandé de conserver l'espace libre du disque où se trouve l'espace de travail à plus de deux fois la taille des données",
     "180": "Le bloc de contenu de recherche n'existe pas",
     "181": "Le document a été partagé avec communauté, <a href=\"%s\" target=\"_blank\">cliquez pour afficher</a>",
     "182": "Partage du document, veuillez patienter...",
     "183": "Validation de l'arborescence du document d'index [%d/%d %s]",
-    "184": "Propulsé par <a href=\"https://b3log.org/siyuan/en/?lang=en\" target=\"_blank\">SiYuan</a>",
+    "184": "Propulsé par <a href=\"https://b3log.org/siyuan/en/?lang=en\" target=\"_blank\">SiYuan</a> | <a href=\"https://sillot.db.sc.cn\" target=\"_blank\">Sillot</a>",
     "185": "Vérification de l'index terminée",
     "186": "Verrouillage du répertoire de synchronisation cloud",
     "187": "Déverrouillage du répertoire de synchronisation cloud",

app/appearance/langs/zh_CHT.json

@@ -907,7 +907,7 @@
   "dataHistory": "資料歷史",
   "quitApp": "是否退出？",
   "reset": "重置",
-  "siyuanNote": "思源筆記",
+  "siyuanNote": "思源筆記（汐洛）",
   "resetLayout": "恢復預設窗口",
   "tag": "標籤",
   "twoFactorCaptcha": "兩步驗證驗證碼",
@@ -1223,7 +1223,7 @@
     "7": "在筆記本 [%s] 下刪除 [%s] 失敗：%s",
     "8": "檢查更新失敗",
     "9": "\uD83D\uDE80 有新版本可用，請瀏覽發佈公告 %s",
-    "10": "已是最新版",
+    "10": "已是最新版 %s",
     "11": "\uD83D\uDCE2 系統公告：<a target='_blank' href='%s'>%s</a>",
     "12": "查詢資料檔失敗 [%s]",
     "13": "無法建立 . 開頭的文件",
@@ -1389,15 +1389,15 @@
     "173": "請輸入訪問授權碼",
     "174": "解鎖訪問",
     "175": "請輸入驗證碼",
-    "176": "思源筆記",
+    "176": "思源筆記（汐洛）",
     "177": "退出應用",
     "178": "訪問授權 - 思源筆記",
     "179": "磁碟空間可能不足，建議保持工作空間所在磁碟可用空間為 data 大小的 2 倍以上",
     "180": "不存在符合條件的內容塊",
     "181": "已分享文檔到社區，<a href=\"%s\" target=\"_blank\">點擊查看</a>",
     "182": "正在分享文檔，請稍等...",
     "183": "正在校驗索引文檔樹 [%d/%d %s]",
-    "184": "由<a href=\"https://b3log.org/siyuan\" target=\"_blank\">思源筆記</a>強力驅動",
+    "184": "由 <a href=\"https://b3log.org/siyuan\" target=\"_blank\">思源筆記</a><a href=\"https://sillot.db.sc.cn\" target=\"_blank\">（汐洛）</a>強力驅動",
     "185": "索引校驗完畢",
     "186": "正在鎖定雲端同步目錄",
     "187": "正在解鎖雲端同步目錄",

app/appearance/langs/zh_CN.json

@@ -1067,7 +1067,7 @@
   "language": "语言",
   "theme": "主题",
   "about": "关于",
-  "about1": "2023-现在 • 海文东 • <a target='_blank' href='https://b3log.org/siyuan/privacy.html'>隐私政策</a> • <a target='_blank' href='https://b3log.org/siyuan/eula.html'>用户协议</a><div class='fn__hr'></div><div class='fn__hr'></div><div class='ft__on-surface'>思源笔记的核心开发者是 <a href=\"https://ld246.com/member/88250\" target=\"_blank\">D</a> 和 <a href=\"https://ld246.com/member/Vanessa\" target=\"_blank\">V</a>，社区开发贡献者可在<a href=\"https://github.com/siyuan-note/bazaar/graphs/contributors\" target=\"_blank\">这里</a>看到，汐洛由<a href=\"https://github.com/Soltus\" target=\"_blank\"> Soltus </a>负责主要维护工作。</div>",
+  "about1": "2022-现在 • 海文东 • <a target='_blank' href='https://b3log.org/siyuan/privacy.html'>隐私政策</a> • <a target='_blank' href='https://b3log.org/siyuan/eula.html'>用户协议</a><div class='fn__hr'></div><div class='fn__hr'></div><div class='ft__on-surface'>思源笔记的核心开发者是 <a href=\"https://ld246.com/member/88250\" target=\"_blank\">D</a> 和 <a href=\"https://ld246.com/member/Vanessa\" target=\"_blank\">V</a>，社区开发贡献者可在<a href=\"https://github.com/siyuan-note/bazaar/graphs/contributors\" target=\"_blank\">这里</a>看到，汐洛由<a href=\"https://github.com/Soltus\" target=\"_blank\"> Soltus </a>负责主要维护工作。</div>",
   "about2": "在浏览器上使用",
   "about3": "请使用 Edge 浏览器并保持和电脑在同一个网络内，端口 <code class='fn__code'>${port}</code>（第一个启动的工作空间除了随机端口外也会自动监听 <code class='fn__code'>58131</code> 作为固定端口，以方便浏览器剪藏扩展或者其他外部程序调用内核接口），可能连通的网络地址：",
   "about4": "打开浏览器",
@@ -1225,7 +1225,7 @@
     "7": "在笔记本 [%s] 下删除 [%s] 失败：%s",
     "8": "检查更新失败",
     "9": "\uD83D\uDE80 有新版本可用，请浏览发布公告 %s",
-    "10": "已是最新版",
+    "10": "已是最新版 %s",
     "11": "\uD83D\uDCE2 系统公告：<a target='_blank' href='%s'>%s</a>",
     "12": "查询资源文件失败 [%s]",
     "13": "无法创建 . 开头的文件",
@@ -1399,7 +1399,7 @@
     "181": "已分享文档到社区，<a href=\"%s\" target=\"_blank\">点击查看</a>",
     "182": "正在分享文档，请稍等...",
     "183": "正在校验索引文档树 [%d/%d %s]",
-    "184": "由<a href=\"https://b3log.org/siyuan\" target=\"_blank\">思源笔记（汐洛）</a>强力驱动",
+    "184": "由 <a href=\"https://b3log.org/siyuan\" target=\"_blank\">思源笔记</a><a href=\"https://sillot.db.sc.cn\" target=\"_blank\">（汐洛）</a>强力驱动",
     "185": "索引校验完毕",
     "186": "正在锁定云端同步目录",
     "187": "正在解锁云端同步目录",

app/electron/error.html

@@ -147,7 +147,7 @@ <h2 id="title"></h2>
     <div class="feedback">
         <span>🧡 <a href="https://github.com/siyuan-note/siyuan/issues" target="_blank">SiYuan Issues</a></span>
         <span>💜 <a href="https://github.com/Hi-Windom/Sillot/issues" target="_blank">Sillot Issues</a></span>
-        <span><div id="openAppLogFolder" onclick="javascript:ipcRenderer.send('siyuan-open-folder', 'openAppLogFolder');" style="color: #1f5ab3;">📁 App Log Folder</div></span>
+        <span><div id="openAppLogFolder" onclick="javascript:ipcRenderer.send('siyuan-open-file', 'openAppLog');" style="color: #1f5ab3;">📁 App Log</div></span>
         <span><div id="openWorkspacesLogFolder" onclick="javascript:ipcRenderer.send('siyuan-open-folder', 'openWorkspacesLogFolder');" style="color: #1f5ab3;">🗂️ Workspaces Log Folder</div></span>
     </div>
     <div class="fn__flex-1"></div>

app/electron/main.js

@@ -786,9 +786,6 @@ app.whenReady().then(() => {
     };
 
     ipcMain.on("siyuan-open-folder", (event, filePath) => {
-        if (filePath === "openAppLogFolder") {
-          filePath = path.join(confDir, "app.log");
-        }
         if (filePath === "openWorkspacesLogFolder") {
           let ws = JSON.parse(fs.readFileSync(path.join(confDir, "workspace.json")).toString());
           ws.forEach((workspacePath) => {
@@ -798,6 +795,19 @@ app.whenReady().then(() => {
         }
         shell.showItemInFolder(filePath);
     });
+    ipcMain.on("siyuan-open-file", (event, filePath) => {
+      if (filePath === "openAppLog") {
+        filePath = path.join(confDir, "app.log");
+      }
+      shell.openPath(filePath, (error) => {
+        if (error) {
+          // 如果有错误，返回错误信息
+          console.error(`无法打开: ${filePath}. 错误信息: ${error.message}`);
+        } else {
+          // 如果成功，返回空字符串
+        }
+      });
+    });
     ipcMain.on("siyuan-first-quit", () => {
         app.exit();
     });

app/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sillot",
-  "version": "0.27.26",
+  "version": "0.27.29",
   "syv": "3.0.5",
   "sypv": "3.0.4",
   "description": "Build Your Eternal Digital Garden",
@@ -111,7 +111,7 @@
     "csstype": "^3.1.3",
     "date-fns": "^3.6.0",
     "ejs": "^3.1.9",
-    "electron": "30.0.0-alpha.7",
+    "electron": "30.0.0-beta.2",
     "electron-builder": "^24.13.3",
     "electron-reloader": "^1.2.3",
     "encoding": "^0.1.13",

app/scripts/genAppIndex.tpl.js

@@ -22,6 +22,7 @@ const T = `<!DOCTYPE html>
 <%- ndom.SiYuan.dockBottom %>
 <%- ndom.SiYuan.status %>
 <%- ndom.Sillot.SillotDrawer %>
+<%- ndom.Sillot.SillotOverlay %>
 <%- ndom.SiYuan.commonMenu %>
 <%- ndom.SiYuan.message %>
 <%- ndom.ReactApp.app1 %>

app/scripts/genAppWindow.tpl.js

@@ -20,6 +20,7 @@ const T = `<!DOCTYPE html>
 <%- ndom.SiYuan.status %>
 <%- ndom.SiYuan.commonMenu %>
 <%- ndom.SiYuan.message %>
+<%- ndom.Sillot.SillotOverlay %>
 <%- ndom.ReactApp.app1 %>
 <%- ndom.ReactApp.app3 %>
 <%- ndom.ReactApp.app5 %>