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

app/changelogs/v2.10.14/v2.10.14.md

@@ -16,12 +16,14 @@ Below are the detailed changes in this version.
 * [Support GFScript code block highlighting](https://github.com/siyuan-note/siyuan/issues/9558)
 * [Flashcard `Open in New Tab` retains its status](https://github.com/siyuan-note/siyuan/issues/9561)
 * [Support exporting/importing S3 and WebDAV configurations](https://github.com/siyuan-note/siyuan/issues/9566)
+* [Improve copying Excel cell to table cell](https://github.com/siyuan-note/siyuan/issues/9569)
 * [Support search installed marketplace packages](https://github.com/siyuan-note/siyuan/issues/9577)
 * [Improve assets list display position and close interaction](https://github.com/siyuan-note/siyuan/issues/9579)
 * [Add label to link, ref, file annotation and so on input](https://github.com/siyuan-note/siyuan/issues/9583)
 * [Improve hiding of floating window](https://github.com/siyuan-note/siyuan/issues/9584)
 * [Set the maximum width of floating windows](https://github.com/siyuan-note/siyuan/issues/9587)
 * [Improve the effect of image title settings on image size](https://github.com/siyuan-note/siyuan/issues/9596)
+* [Automatic synchronization mode prevents old cloud data from overwriting new local data](https://github.com/siyuan-note/siyuan/issues/9601)
 
 ### Bugfix
 

app/changelogs/v2.10.14/v2.10.14_zh_CHT.md

@@ -16,12 +16,14 @@
 * [支援 GFScript 程式碼區塊高亮](https://github.com/siyuan-note/siyuan/issues/9558)
 * [閃卡 `在新頁籤中開啟` 保留複習狀態](https://github.com/siyuan-note/siyuan/issues/9561)
 * [支援匯出/匯入 S3 和 WebDAV 配置](https://github.com/siyuan-note/siyuan/issues/9566)
+* [改進複製 Excel 儲存格到表格儲存格](https://github.com/siyuan-note/siyuan/issues/9569)
 * [支援在已安裝的市集包中搜尋](https://github.com/siyuan-note/siyuan/issues/9577)
 * [改進題頭圖搜尋資源檔案顯示位置和關閉的互動](https://github.com/siyuan-note/siyuan/issues/9579)
 * [為超連結、引用和檔案註解新增輸入框識別文案](https://github.com/siyuan-note/siyuan/issues/9583)
 * [改進浮窗自動關閉](https://github.com/siyuan-note/siyuan/issues/9584)
 * [改良浮窗最大寬度](https://github.com/siyuan-note/siyuan/issues/9587)
 * [改進圖片標題設定對圖片大小的影響](https://github.com/siyuan-note/siyuan/issues/9596)
+* [自動同步模式下避免舊的雲端資料覆蓋新的本地資料](https://github.com/siyuan-note/siyuan/issues/9601)
 
 ### 修復缺陷
 

app/changelogs/v2.10.14/v2.10.14_zh_CN.md

@@ -16,12 +16,14 @@
 * [支持 GFScript 代码块高亮](https://github.com/siyuan-note/siyuan/issues/9558)
 * [闪卡 `在新页签中打开` 保留复习状态](https://github.com/siyuan-note/siyuan/issues/9561)
 * [支持导出/导入 S3 和 WebDAV 配置](https://github.com/siyuan-note/siyuan/issues/9566)
+* [改进复制 Excel 单元格到表格单元格](https://github.com/siyuan-note/siyuan/issues/9569)
 * [支持在已安装的集市包中进行搜索](https://github.com/siyuan-note/siyuan/issues/9577)
 * [改进题头图搜索资源文件显示位置和关闭的交互](https://github.com/siyuan-note/siyuan/issues/9579)
 * [为超链接、引用和文件注解添加输入框标识文案](https://github.com/siyuan-note/siyuan/issues/9583)
 * [改进浮窗自动关闭](https://github.com/siyuan-note/siyuan/issues/9584)
 * [改进浮窗最大宽度](https://github.com/siyuan-note/siyuan/issues/9587)
 * [改进图片标题设置对图片大小的影响](https://github.com/siyuan-note/siyuan/issues/9596)
+* [自动同步模式下避免旧的云端数据覆盖新的本地数据](https://github.com/siyuan-note/siyuan/issues/9601)
 
 ### 修复缺陷
 

kernel/go.mod

@@ -9,7 +9,7 @@ require (
 	github.com/88250/clipboard v0.1.5
 	github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
 	github.com/88250/gulu v1.2.3-0.20231023172823-f152fc5d93ef
-	github.com/88250/lute v1.7.6-0.20231028162145-1bc5cc6e689a
+	github.com/88250/lute v1.7.6-0.20231108015409-190efcc81cd8
 	github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c
 	github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
 	github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
@@ -49,7 +49,7 @@ require (
 	github.com/radovskyb/watcher v1.0.7
 	github.com/sashabaranov/go-openai v1.16.1
 	github.com/shirou/gopsutil/v3 v3.23.10
-	github.com/siyuan-note/dejavu v0.0.0-20231107132749-e901db17fbc0
+	github.com/siyuan-note/dejavu v0.0.0-20231108034856-670a6dc62c56
 	github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75
 	github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80
 	github.com/siyuan-note/filelock v0.0.0-20231107122348-6ed75b0b525a
@@ -77,7 +77,7 @@ require (
 	github.com/andybalholm/brotli v1.0.6 // indirect
 	github.com/andybalholm/cascadia v1.3.2 // indirect
 	github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef // indirect
-	github.com/aws/aws-sdk-go v1.47.4 // indirect
+	github.com/aws/aws-sdk-go v1.47.5 // indirect
 	github.com/bytedance/sonic v1.10.2 // indirect
 	github.com/cespare/xxhash/v2 v2.2.0 // indirect
 	github.com/chenzhuoyu/base64x v0.0.0-20230717121745-296ad89f973d // indirect

kernel/go.sum

@@ -10,8 +10,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5 h1:8HdZozCsXS
 github.com/88250/go-sqlite3 v1.14.13-0.20220714142610-fbbda1ee84f5/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
 github.com/88250/gulu v1.2.3-0.20231023172823-f152fc5d93ef h1:LVJO3aj18v63T2whGGt3gL5imkJk+7ujPfFv38X7Oi8=
 github.com/88250/gulu v1.2.3-0.20231023172823-f152fc5d93ef/go.mod h1:pTWnjt+6qUqNnP9xltswsJxgCBVu3C7eW09u48LWX0k=
-github.com/88250/lute v1.7.6-0.20231028162145-1bc5cc6e689a h1:H1WaOyTfyvjFS95XabKa1YtvBoedywqH5PJw/QLnt3Y=
-github.com/88250/lute v1.7.6-0.20231028162145-1bc5cc6e689a/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
+github.com/88250/lute v1.7.6-0.20231108015409-190efcc81cd8 h1:JTDntAVUvuBTDyT4AZJodUd64eBU6Z4xFszEokDV9hQ=
+github.com/88250/lute v1.7.6-0.20231108015409-190efcc81cd8/go.mod h1:+wUqx/1kdFDbWtxn9LYJlaCOAeol2pjSO6w+WJTVQsg=
 github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c h1:Dl/8S9iLyPMTElnWIBxmjaLiWrkI5P4a21ivwAn5pU0=
 github.com/88250/pdfcpu v0.3.14-0.20230401044135-c7369a99720c/go.mod h1:S5YT38L/GCjVjmB4PB84PymA1qfopjEhfhTNQilLpv4=
 github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=
@@ -49,8 +49,8 @@ github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de h1:FxWPpzIjnTlhP
 github.com/araddon/dateparse v0.0.0-20210429162001-6b43995a97de/go.mod h1:DCaWoUhZrYW9p1lxo/cm8EmUOOzAPSEZNGF2DK1dJgw=
 github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef h1:2JGTg6JapxP9/R33ZaagQtAM4EkkSYnIAlOG5EI8gkM=
 github.com/asaskevich/EventBus v0.0.0-20200907212545-49d423059eef/go.mod h1:JS7hed4L1fj0hXcyEejnW57/7LCetXggd+vwrRnYeII=
-github.com/aws/aws-sdk-go v1.47.4 h1:IyhNbmPt+5ldi5HNzv7ZnXiqSglDMaJiZlzj4Yq3qnk=
-github.com/aws/aws-sdk-go v1.47.4/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
+github.com/aws/aws-sdk-go v1.47.5 h1:U2JlfPmrUoz5p+2X/XwKxmaJFo2oV+LbJqx8jyEvyAY=
+github.com/aws/aws-sdk-go v1.47.5/go.mod h1:LF8svs817+Nz+DmiMQKTO3ubZ/6IaTpq3TjupRn3Eqk=
 github.com/bytedance/sonic v1.5.0/go.mod h1:ED5hyg4y6t3/9Ku1R6dU/4KyJ48DZ4jPhfY1O2AihPM=
 github.com/bytedance/sonic v1.10.0-rc/go.mod h1:ElCzW+ufi8qKqNW0FY314xriJhyJhuoJ3gFZdAHF7NM=
 github.com/bytedance/sonic v1.10.2 h1:GQebETVBxYB7JGWJtLBi07OVzWwt+8dWA00gEVW2ZFE=
@@ -352,8 +352,8 @@ github.com/shopspring/decimal v1.3.1/go.mod h1:DKyhrW/HYNuLGql+MJL6WCR6knT2jwCFR
 github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d h1:lvCTyBbr36+tqMccdGMwuEU+hjux/zL6xSmf5S9ITaA=
 github.com/shurcooL/gofontwoff v0.0.0-20181114050219-180f79e6909d/go.mod h1:05UtEgK5zq39gLST6uB0cf3NEHjETfB4Fgr3Gx5R9Vw=
 github.com/simplereach/timeutils v1.2.0/go.mod h1:VVbQDfN/FHRZa1LSqcwo4kNZ62OOyqLLGQKYB3pB0Q8=
-github.com/siyuan-note/dejavu v0.0.0-20231107132749-e901db17fbc0 h1:09aC2bgHksiFQSYNmknHKA8rVY5AzBtc3w+nC5B97gA=
-github.com/siyuan-note/dejavu v0.0.0-20231107132749-e901db17fbc0/go.mod h1:QJg/fY8KE4eeEOa0Mu2Mp8aBWpshm0qgLaHxNBCc/OM=
+github.com/siyuan-note/dejavu v0.0.0-20231108034856-670a6dc62c56 h1:qNNxfRgvt7oYCb9zkJuqKoEICfqyJ4ta4SZ4NqMTiis=
+github.com/siyuan-note/dejavu v0.0.0-20231108034856-670a6dc62c56/go.mod h1:QJg/fY8KE4eeEOa0Mu2Mp8aBWpshm0qgLaHxNBCc/OM=
 github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75 h1:Bi7/7f29LW+Fm0cHc0J1NO1cZqyJwljSWVmfOqVZgaE=
 github.com/siyuan-note/encryption v0.0.0-20220713091850-5ecd92177b75/go.mod h1:H8fyqqAbp9XreANjeSbc72zEdFfKTXYN34tc1TjZwtw=
 github.com/siyuan-note/eventbus v0.0.0-20230804030110-cf250f838c80 h1:XghjHKJd+SiL0DkGYFVC+UGUDFtnR4v9gkAbPeh9Eq8=