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

V0.35
Hi-Windom · Jun 3, 2024 · a22ed90 · a22ed90
2 parents 3498512 + 21ec845
commit a22ed90
Show file tree

Hide file tree

Showing 19 changed files with 1,051 additions and 981 deletions.
diff --git a/.github/docs/Sillot-Gibbet/README.md b/.github/docs/Sillot-Gibbet/README.md
@@ -45,7 +45,7 @@
 汐洛绞架始终坚持精品路线，从不在任何一个细节上妥协。专注于为目标用户提供最好的使用体验，这是实现极致优雅的必由之路。汐洛绞架尊重非目标用户的声音，但并不关心。
 
 <p align="center">
-<img alt="framework" src="../screenshots/sillot/booting1.png">
+<img alt="booting-demo" src="../../../screenshots/sillot/booting1.png">
 </p>
 
 ## 开发者友好
@@ -69,7 +69,3 @@ go install github.com/ofabry/go-callvis
 注意事项：
 
 1. tpl 模板直接合并冲突没有作用，汐洛绞架是通过 JS 生成的 tpl ，因此需要修改 genTPLData.js 等 JS 文件
-
-<p align="center">
-<img alt="split" src="./split.png">
-</p>
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.2400",
+  "version": "0.35.2600",
   "preview": true,
   "repository": "https://github.com/Hi-Windom/Sillot",
   "publisher": "Hi-Windom",

diff --git a/app/electron-builder-linux-arm64.yml b/app/electron-builder-linux-arm64.yml
@@ -15,8 +15,15 @@ extraFiles:
     to: "LICENSE"
 
 linux:
-  icon: "src/assets/icon.png"
+  icon: "src/assets/icon.icns"
   category: "Utility"
+  executableName: "siyuan"
+  desktop: {
+    "Name": "SiYuan",
+    "Comment": "Refactor your thinking",
+    "Type": "Application",
+    "Categories": "Utility;"
+  }
   extraResources:
     - from: "kernel-linux-arm64"
       to: "kernel"
@@ -25,6 +32,8 @@ linux:
       arch: "arm64"
     - target: "AppImage"
       arch: "arm64"
+    - target: "deb"
+      arch: "arm64"
 
 extraResources:
   - from: "changelogs"

diff --git a/app/electron-builder-linux.yml b/app/electron-builder-linux.yml
@@ -15,14 +15,22 @@ extraFiles:
     to: "LICENSE"
 
 linux:
-  icon: "src/assets/icon.png"
+  icon: "src/assets/icon.icns"
   category: "Utility"
+  executableName: "siyuan"
+  desktop: {
+    "Name": "SiYuan",
+    "Comment": "Refactor your thinking",
+    "Type": "Application",
+    "Categories": "Utility;"
+  }
   extraResources:
     - from: "kernel-linux"
       to: "kernel"
   target:
     - target: "tar.gz"
     - target: "AppImage"
+    - target: "deb"
 
 extraResources:
   - from: "changelogs"

diff --git a/app/package.json b/app/package.json
@@ -1,10 +1,9 @@
 {
   "name": "sillot",
-  "version": "0.35.2400",
+  "version": "0.35.2600",
   "syv": "3.0.17",
   "sypv": "[3.0.16]",
   "description": "Build Your Eternal Digital Garden",
-  "author": "Hi-Windom",
   "homepage": "https://sillot.db.sc.cn",
   "repository": "https://github.com/Hi-Windom/Sillot",
   "main": "./electron/main.js",
@@ -56,6 +55,11 @@
     "note-taking",
     "notebook"
   ],
+  "author": {
+    "name": "Hi-Windom",
+    "email": "[email protected]",
+    "url": "https://ld246.com/member/soltus"
+  },
   "maintainers": [
     {
       "name": "Liang Ding",

diff --git a/app/src/assets/icon.svg b/app/src/assets/icon.svg
diff --git a/app/src/assets/icon256.png b/app/src/assets/icon256.png
diff --git a/app/src/mobile/settings/about.ts b/app/src/mobile/settings/about.ts
@@ -376,9 +376,6 @@ ${
                 fetchPost("/api/import/importData", formData);
             });
             const networkServeElement = modelMainElement.querySelector("#networkServe") as HTMLInputElement;
-            if(networkServeElement.checked){
-                window.JSAndroid?.showWifi();
-            }
             networkServeElement.addEventListener("change", () => {
                 fetchPost("/api/system/setNetworkServe", {networkServe: networkServeElement.checked}, () => {
                     if(networkServeElement.checked){

diff --git a/app/src/protyle/util/editorCommonEvent.ts b/app/src/protyle/util/editorCommonEvent.ts
@@ -891,7 +891,7 @@ export const dropEvent = (protyle: IProtyle, editorElement: HTMLElement) => {
                             // 行内拖拽
                             const doOperations: IOperation[] = [];
                             const undoOperations: IOperation[] = [];
-                            const undoPreviousId = blockElement.querySelector(`[data-id="${selectedIds[0]}"]`).previousElementSibling.getAttribute("data-id") || "";
+                            const undoPreviousId = blockElement.querySelector(`.av__row[data-id="${selectedIds[0]}"]`).previousElementSibling.getAttribute("data-id") || "";
                             selectedIds.reverse().forEach(item => {
                                 if (previousID !== item && undoPreviousId !== previousID) {
                                     doOperations.push({