Merge remote-tracking branch 'origin/dev' into dev

.github/CONTRIBUTING.md

@@ -14,10 +14,10 @@ Install pnpm: `npm install -g pnpm@9.12.1`
 
 Set the Electron mirror environment variable and install Electron:
 
-* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v34.3.2 -D`
+* macOS/Linux: `ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v34.3.3 -D`
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@v34.3.2 -D`
+    * `pnpm install electron@v34.3.3 -D`
 
 NPM mirror:
 
@@ -28,7 +28,7 @@ NPM mirror:
 
 On the desktop, go to the app folder to run:
 
-* `pnpm install electron@v34.3.2 -D`
+* `pnpm install electron@v34.3.3 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

.github/CONTRIBUTING_zh_CN.md

@@ -16,11 +16,11 @@
 
 * macOS/Linux: 
  ```
- ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v34.3.2 -D
+ ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/ pnpm install electron@v34.3.3 -D
  ```
 * Windows:
     * `SET ELECTRON_MIRROR=https://npmmirror.com/mirrors/electron/`
-    * `pnpm install electron@v34.3.2 -D`
+    * `pnpm install electron@v34.3.3 -D`
 
 NPM 镜像：
 
@@ -30,7 +30,7 @@ NPM 镜像：
 
 桌面端进入 app 文件夹运行：
 
-* `pnpm install electron@v34.3.2 -D`
+* `pnpm install electron@v34.3.3 -D`
 * `pnpm run dev`
 * `pnpm run start`
 

app/package.json

@@ -56,7 +56,7 @@
     "clean-webpack-plugin": "^4.0.0",
     "css-loader": "^6.7.1",
     "dayjs": "^1.11.5",
-    "electron": "34.3.1",
+    "electron": "34.3.3",
     "electron-builder": "26.0.9",
     "encoding": "^0.1.13",
     "esbuild-loader": "^3.0.1",

app/pnpm-lock.yaml

@@ -10,7 +10,7 @@ importers:
     dependencies:
       '@electron/remote':
         specifier: ^2.1.2
-        version: 2.1.2(electron@34.3.1)
+        version: 2.1.2(electron@34.3.3)
     devDependencies:
       '@types/node':
         specifier: ^18.13.0
@@ -34,8 +34,8 @@ importers:
         specifier: ^1.11.5
         version: 1.11.5
       electron:
-        specifier: 34.3.1
-        version: 34.3.1
+        specifier: 34.3.3
+        version: 34.3.3
       electron-builder:
         specifier: 26.0.9
         version: 26.0.9(electron-builder-squirrel-windows@25.0.5)
@@ -1155,8 +1155,8 @@ packages:
   electron-to-chromium@1.5.39:
     resolution: {integrity: sha512-4xkpSR6CjuiaNyvwiWDI85N9AxsvbPawB8xc7yzLPonYTuP19BVgYweKyUMFtHEZgIcHWMt1ks5Cqx2m+6/Grg==}
 
-  electron@34.3.1:
-    resolution: {integrity: sha512-Vsgxc4FDGg7hjduKyvTP5qfNDxZHTliZIiWD1HlR5hHXx3BFjyVv3db/uEH1GaCU0KKyeNsBXRwS4WAOMaSH5g==}
+  electron@34.3.3:
+    resolution: {integrity: sha512-7m1FiO1mwc1K/UqqnnkG7Ik/kAngDzmLfHwcl+xaWgCQ+Sts9rlEqzOh6g1GHhDqebrbs4bO/aU+NDi32fCciQ==}
     engines: {node: '>= 12.20.55'}
     hasBin: true
 
@@ -2871,9 +2871,9 @@ snapshots:
       - bluebird
       - supports-color
 
-  '@electron/remote@2.1.2(electron@34.3.1)':
+  '@electron/remote@2.1.2(electron@34.3.3)':
     dependencies:
-      electron: 34.3.1
+      electron: 34.3.3
 
   '@electron/universal@2.0.1':
     dependencies:
@@ -4051,7 +4051,7 @@ snapshots:
 
   electron-to-chromium@1.5.39: {}
 
-  electron@34.3.1:
+  electron@34.3.3:
     dependencies:
       '@electron/get': 2.0.2
       '@types/node': 20.14.5

kernel/sql/cache.go

@@ -17,6 +17,7 @@
 package sql
 
 import (
+	"strings"
 	"time"
 
 	"github.com/88250/lute/ast"
@@ -25,6 +26,7 @@ import (
 	"github.com/jinzhu/copier"
 	gcache "github.com/patrickmn/go-cache"
 	"github.com/siyuan-note/logging"
+	"github.com/siyuan-note/siyuan/kernel/search"
 )
 
 var cacheDisabled = true
@@ -57,6 +59,8 @@ func putBlockCache(block *Block) {
 		logging.LogErrorf("clone block failed: %v", err)
 		return
 	}
+	cloned.Content = strings.ReplaceAll(cloned.Content, search.SearchMarkLeft, "")
+	cloned.Content = strings.ReplaceAll(cloned.Content, search.SearchMarkRight, "")
 	blockCache.Set(cloned.ID, cloned, 1)
 }