diff --git a/app/changelogs/v3.0.13/v3.0.13.md b/app/changelogs/v3.0.13/v3.0.13.md new file mode 100644 index 000000000..227618c63 --- /dev/null +++ b/app/changelogs/v3.0.13/v3.0.13.md @@ -0,0 +1,52 @@ +## Overview + +This version fixes some bugs and improves a lot of details. + +## Changelogs + +Below are the detailed changes in this version. + +### Enhancement + +* [Supports some shortcut keys on the mobile](https://github.com/siyuan-note/siyuan/issues/10342) +* [When multiple files are selected in the file tree, "Open" is added to the right-click menu](https://github.com/siyuan-note/siyuan/issues/11150) +* [Supports rendering the row number column when exporting database](https://github.com/siyuan-note/siyuan/issues/11192) +* [Add two shortcuts for block navigation](https://github.com/siyuan-note/siyuan/issues/11193) +* [Adjust PDF export footer font size](https://github.com/siyuan-note/siyuan/issues/11203) +* [Improve remove image](https://github.com/siyuan-note/siyuan/issues/11209) +* [Support convert Base64 image when clipping HTML](https://github.com/siyuan-note/siyuan/issues/11210) +* [Internationalization supports Japanese](https://github.com/siyuan-note/siyuan/pull/11212) +* [Set the maximum height of the template column edit textarea in the database table view](https://github.com/siyuan-note/siyuan/issues/11223) +* [Improve the delete operation of database table view](https://github.com/siyuan-note/siyuan/issues/11225) +* [Allow referring to the current database in a "Relation" field](https://github.com/siyuan-note/siyuan/issues/11233) +* [Support pasting of database search box in read-only mode](https://github.com/siyuan-note/siyuan/issues/11241) +* [Improve clear search button in database table view](https://github.com/siyuan-note/siyuan/issues/11244) +* [Synchronize the related entries when the database creates a two-way relation](https://github.com/siyuan-note/siyuan/issues/11250) +* [Ignore hidden files when generating asset history](https://github.com/siyuan-note/siyuan/issues/11253) + +### Bugfix + +* [Shift+↓ cannot expand the selection of the folded list](https://github.com/siyuan-note/siyuan/issues/11194) +* [Browser/Pad stuck on loading interface](https://github.com/siyuan-note/siyuan/pull/11195) +* [Notebook settings doc save path does not override global settings in some cases](https://github.com/siyuan-note/siyuan/issues/11196) +* [PDF cannot be jumped after annotation](https://github.com/siyuan-note/siyuan/issues/11197) +* [Unable to export Data containing symbolic links](https://github.com/siyuan-note/siyuan/issues/11217) +* [The interface crashes after maximizing the window on Linux desktop](https://github.com/siyuan-note/siyuan/issues/11218) +* [Double-clicking the database asset column causes the interface to freeze](https://github.com/siyuan-note/siyuan/issues/11220) +* [Marketplace - Downloaded - Package size in README is empty](https://github.com/siyuan-note/siyuan/issues/11224) +* [Clicking a hyperlink does not open the browser on mobile](https://github.com/siyuan-note/siyuan/issues/11240) +* [The file name encoding is abnormal after copying the image and pasting it](https://github.com/siyuan-note/siyuan/issues/11246) +* [After uninstalling the widget, data synchronization does not clear the widget folder](https://github.com/siyuan-note/siyuan/issues/11279) + +### Refactor + +* [Downgrade to Electron v28.3.1](https://github.com/siyuan-note/siyuan/issues/11226) + +### Development + +* [Set the default value of `item.direction`](https://github.com/siyuan-note/siyuan/pull/11214) + +## Download + +* [B3log](https://b3log.org/siyuan/en/download.html) +* [GitHub](https://github.com/siyuan-note/siyuan/releases) diff --git a/app/changelogs/v3.0.13/v3.0.13_zh_CHT.md b/app/changelogs/v3.0.13/v3.0.13_zh_CHT.md new file mode 100644 index 000000000..e7eec430b --- /dev/null +++ b/app/changelogs/v3.0.13/v3.0.13_zh_CHT.md @@ -0,0 +1,52 @@ +## 概述 + +該版本修復了一些缺陷並改進了許多細節。 + +## 變更記錄 + +以下是此版本中的詳細變更。 + +### 改進功能 + +* [支援在行動端使用一些快速鍵](https://github.com/siyuan-note/siyuan/issues/10342) +* [在文件樹中選擇多個文件時，在右鍵選單中新增 "開啟" 選項](https://github.com/siyuan-note/siyuan/issues/11150) +* [支援在匯出資料庫時渲染行號列](https://github.com/siyuan-note/siyuan/issues/11192) +* [為區塊導航新增兩個快捷鍵](https://github.com/siyuan-note/siyuan/issues/11193) +* [調整 PDF 匯出頁字大小](https://github.com/siyuan-note/siyuan/issues/11203) +* [改進刪除圖片功能](https://github.com/siyuan-note/siyuan/issues/11209) +* [支援在剪輯 HTML 時轉換 Base64 圖片](https://github.com/siyuan-note/siyuan/issues/11210) +* [國際化支援日文](https://github.com/siyuan-note/siyuan/pull/11212) +* [設定資料庫表格檢視中範本列編輯文字區的最大高度](https://github.com/siyuan-note/siyuan/issues/11223) +* [改進資料庫表格視圖的刪除操作](https://github.com/siyuan-note/siyuan/issues/11225) +* [允許在 "關聯" 欄位中引用目前資料庫](https://github.com/siyuan-note/siyuan/issues/11233) +* [資料庫搜尋框支援在唯讀模式下貼上](https://github.com/siyuan-note/siyuan/issues/11241) +* [改進資料庫表格檢視中清除搜尋按鈕](https://github.com/siyuan-note/siyuan/issues/11244) +* [當資料庫建立雙向關係時，同步相關條目](https://github.com/siyuan-note/siyuan/issues/11250) +* [在產生資源檔案歷史時忽略隱藏檔案](https://github.com/siyuan-note/siyuan/issues/11253) + +### 修復缺陷 + +* [Shift+↓ 無法擴充折疊清單的選擇](https://github.com/siyuan-note/siyuan/issues/11194) +* [瀏覽器/平板在載入介面時卡住](https://github.com/siyuan-note/siyuan/pull/11195) +* [筆記本設定文件保存路徑在某些情況下不會覆蓋全域設定](https://github.com/siyuan-note/siyuan/issues/11196) +* [PDF 註解引用無法跳轉](https://github.com/siyuan-note/siyuan/issues/11197) +* [包含符號連結時無法匯出 Data](https://github.com/siyuan-note/siyuan/issues/11217) +* [在 Linux 桌面端上最大化視窗後介面崩潰](https://github.com/siyuan-note/siyuan/issues/11218) +* [雙擊資料庫資源列會導致介面卡住](https://github.com/siyuan-note/siyuan/issues/11220) +* [市集 - 已下載 - README 中的包大小為空](https://github.com/siyuan-note/siyuan/issues/11224) +* [在行動裝置上點選超連結不會開啟瀏覽器](https://github.com/siyuan-note/siyuan/issues/11240) +* [複製圖片並貼上後檔案名稱編碼異常](https://github.com/siyuan-note/siyuan/issues/11246) +* [卸載掛件後資料同步未清空掛件資料夾](https://github.com/siyuan-note/siyuan/issues/11279) + +### 開發重構 + +* [降級至 Electron v28.3.1](https://github.com/siyuan-note/siyuan/issues/11226) + +### 開發者 + +* [為 `item.direction` 設定預設值](https://github.com/siyuan-note/siyuan/pull/11214) + +## 下載 + +* [B3log](https://b3log.org/siyuan/download.html) +* [GitHub](https://github.com/siyuan-note/siyuan/releases) diff --git a/app/changelogs/v3.0.13/v3.0.13_zh_CN.md b/app/changelogs/v3.0.13/v3.0.13_zh_CN.md new file mode 100644 index 000000000..b1b7f6a7d --- /dev/null +++ b/app/changelogs/v3.0.13/v3.0.13_zh_CN.md @@ -0,0 +1,52 @@ +## 概述 + +该版本修复了一些缺陷并改进了很多细节。 + +## 变更记录 + +以下是此版本中的详细变更。 + +### 改进功能 + +* [支持在移动端使用一些快捷键](https://github.com/siyuan-note/siyuan/issues/10342) +* [在文档树中选择多个文档时，右键菜单中添加 "打开" 选项](https://github.com/siyuan-note/siyuan/issues/11150) +* [支持在导出数据库时渲染行号列](https://github.com/siyuan-note/siyuan/issues/11192) +* [为块导航添加两个快捷键](https://github.com/siyuan-note/siyuan/issues/11193) +* [调整 PDF 导出页脚字体大小](https://github.com/siyuan-note/siyuan/issues/11203) +* [改进删除图片功能](https://github.com/siyuan-note/siyuan/issues/11209) +* [支持在剪辑 HTML 时转换 Base64 图片](https://github.com/siyuan-note/siyuan/issues/11210) +* [国际化支持日语](https://github.com/siyuan-note/siyuan/pull/11212) +* [设置数据库表格视图中模板列编辑文本区的最大高度](https://github.com/siyuan-note/siyuan/issues/11223) +* [改进数据库表格视图的删除操作](https://github.com/siyuan-note/siyuan/issues/11225) +* [允许在 "关联" 字段中引用当前数据库](https://github.com/siyuan-note/siyuan/issues/11233) +* [数据库搜索框支持在只读模式下粘贴](https://github.com/siyuan-note/siyuan/issues/11241) +* [改进数据库表格视图中清除搜索按钮](https://github.com/siyuan-note/siyuan/issues/11244) +* [当数据库创建双向关系时，同步相关条目](https://github.com/siyuan-note/siyuan/issues/11250) +* [在生成资源文件历史时忽略隐藏文件](https://github.com/siyuan-note/siyuan/issues/11253) + +### 修复缺陷 + +* [Shift+↓ 无法扩展折叠列表的选择](https://github.com/siyuan-note/siyuan/issues/11194) +* [浏览器/平板在加载界面时卡住](https://github.com/siyuan-note/siyuan/pull/11195) +* [笔记本设置文档保存路径在某些情况下不会覆盖全局设置](https://github.com/siyuan-note/siyuan/issues/11196) +* [PDF 注解引用无法跳转](https://github.com/siyuan-note/siyuan/issues/11197) +* [包含符号链接时无法导出 Data](https://github.com/siyuan-note/siyuan/issues/11217) +* [在 Linux 桌面端上最大化窗口后界面崩溃](https://github.com/siyuan-note/siyuan/issues/11218) +* [双击数据库资源列会导致界面卡住](https://github.com/siyuan-note/siyuan/issues/11220) +* [集市 - 已下载 - README 中的包大小为空](https://github.com/siyuan-note/siyuan/issues/11224) +* [在移动设备上点击超链接不会打开浏览器](https://github.com/siyuan-note/siyuan/issues/11240) +* [复制图片并粘贴后文件名编码异常](https://github.com/siyuan-note/siyuan/issues/11246) +* [卸载挂件后数据同步未清空挂件文件夹](https://github.com/siyuan-note/siyuan/issues/11279) + +### 开发重构 + +* [降级到 Electron v28.3.1](https://github.com/siyuan-note/siyuan/issues/11226) + +### 开发者 + +* [为 `item.direction` 设置默认值](https://github.com/siyuan-note/siyuan/pull/11214) + +## 下载 + +* [B3log](https://b3log.org/siyuan/download.html) +* [GitHub](https://github.com/siyuan-note/siyuan/releases) diff --git a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20220628204454-hhxohv5.sy b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20220628204454-hhxohv5.sy index 6f09d0a31..6c2b39ccd 100644 --- a/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20220628204454-hhxohv5.sy +++ b/app/guide/20210808180117-6v0mkxr/20200923234011-ieuun1p/20210808180303-h361q1i/20220628204454-hhxohv5.sy @@ -5,7 +5,8 @@ "Properties": { "id": "20220628204454-hhxohv5", "title": "Optimize typography", - "updated": "20220630211219" + "type": "doc", + "updated": "20220630211201" }, "Children": [ { @@ -188,34 +189,6 @@ "updated": "20220630211219" }, "Children": [ - { - "ID": "20220630211201-2vvo1yo", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220630211201-2vvo1yo", - "updated": "20220630211210" - }, - "Children": [ - { - "ID": "20220630211201-crqr0sj", - "Type": "NodeParagraph", - "Properties": { - "id": "20220630211201-crqr0sj", - "updated": "20220630211210" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "Tag" - } - ] - } - ] - }, { "ID": "20220630211201-xvvr6cb", "Type": "NodeListItem", @@ -233,7 +206,7 @@ "Type": "NodeParagraph", "Properties": { "id": "20220630211201-s03kxsh", - "updated": "20220630211212" + "updated": "20240506221623" }, "Children": [ { @@ -345,12 +318,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220630211201-z7c6px5", - "updated": "20220630211218" + "updated": "20240506221619" }, "Children": [ { "Type": "NodeText", - "Data": "Emphasize" + "Data": "Italic" } ] } diff --git a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20220628204444-9n0y9h2.sy b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20220628204444-9n0y9h2.sy index a823a19fe..436a5a59d 100644 --- a/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20220628204444-9n0y9h2.sy +++ b/app/guide/20210808180117-czj9bvb/20200812220555-lj3enxa/20210808180320-abz7w6k/20220628204444-9n0y9h2.sy @@ -5,7 +5,8 @@ "Properties": { "id": "20220628204444-9n0y9h2", "title": "优化排版", - "updated": "20221006214307" + "type": "doc", + "updated": "20220630211006" }, "Children": [ { @@ -223,34 +224,6 @@ "updated": "20220630211109" }, "Children": [ - { - "ID": "20220630211007-dsx48yk", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220630211007-dsx48yk", - "updated": "20220630211007" - }, - "Children": [ - { - "ID": "20220630211007-26zt41e", - "Type": "NodeParagraph", - "Properties": { - "id": "20220630211007-26zt41e", - "updated": "20220630211032" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "标签" - } - ] - } - ] - }, { "ID": "20220630211033-fnlmuvi", "Type": "NodeListItem", @@ -267,12 +240,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220630211033-b7xfx2z", - "updated": "20220630211037" + "updated": "20240506221311" }, "Children": [ { "Type": "NodeText", - "Data": "高亮" + "Data": "标记" } ] } @@ -375,12 +348,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220630211101-zcj15cy", - "updated": "20220630211108" + "updated": "20240506221332" }, "Children": [ { "Type": "NodeText", - "Data": "强调" + "Data": "倾斜" } ] } diff --git a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20220628204420-ui79vkt.sy b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20220628204420-ui79vkt.sy index 9cfb01043..1880a12d9 100644 --- a/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20220628204420-ui79vkt.sy +++ b/app/guide/20211226090932-5lcq56f/20211226115423-d5z1joq/20211226120854-dr1jfx2/20220628204420-ui79vkt.sy @@ -5,7 +5,8 @@ "Properties": { "id": "20220628204420-ui79vkt", "title": "最佳化排版", - "updated": "20230630104730" + "type": "doc", + "updated": "20240506221556" }, "Children": [ { @@ -185,37 +186,9 @@ "ListData": {}, "Properties": { "id": "20220630211154-7y2zlnx", - "updated": "20220630211154" + "updated": "20240506221556" }, "Children": [ - { - "ID": "20220630211154-yr6rvir", - "Type": "NodeListItem", - "ListData": { - "BulletChar": 42, - "Marker": "Kg==" - }, - "Properties": { - "id": "20220630211154-yr6rvir", - "updated": "20220630211154" - }, - "Children": [ - { - "ID": "20220630211154-8ptzt3a", - "Type": "NodeParagraph", - "Properties": { - "id": "20220630211154-8ptzt3a", - "updated": "20220630211154" - }, - "Children": [ - { - "Type": "NodeText", - "Data": "標籤" - } - ] - } - ] - }, { "ID": "20220630211154-gjt0dpy", "Type": "NodeListItem", @@ -225,7 +198,7 @@ }, "Properties": { "id": "20220630211154-gjt0dpy", - "updated": "20220630211154" + "updated": "20240506221556" }, "Children": [ { @@ -233,12 +206,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220630211154-p32qfcb", - "updated": "20220630211154" + "updated": "20240506221556" }, "Children": [ { "Type": "NodeText", - "Data": "高亮" + "Data": "標記" } ] } @@ -345,12 +318,12 @@ "Type": "NodeParagraph", "Properties": { "id": "20220630211154-la9aicz", - "updated": "20220630211154" + "updated": "20240506221542" }, "Children": [ { "Type": "NodeText", - "Data": "強調" + "Data": "傾斜" } ] } diff --git a/kernel/model/attribute_view.go b/kernel/model/attribute_view.go index 3970032b0..85f6b897a 100644 --- a/kernel/model/attribute_view.go +++ b/kernel/model/attribute_view.go @@ -1574,6 +1574,8 @@ func updateAttributeViewColRelation(operation *Operation) (err error) { name = srcAv.Name + " " + operation.Format } backRelKey.Name = strings.TrimSpace(name) + } else { + backRelKey.Relation.BackKeyID = "" } } @@ -3166,6 +3168,9 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID, cellID string, // 关联列得 content 是自动渲染的，所以不需要保存 val.Relation.Contents = nil + // 去重 + val.Relation.BlockIDs = gulu.Str.RemoveDuplicatedElem(val.Relation.BlockIDs) + // 计算关联变更模式 if len(oldRelationBlockIDs) == len(val.Relation.BlockIDs) { relationChangeMode = 0 diff --git a/kernel/model/repository.go b/kernel/model/repository.go index f7cf064e3..0c0947856 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -41,6 +41,7 @@ import ( "github.com/88250/lute/html" "github.com/88250/lute/parse" "github.com/88250/lute/render" + "github.com/emirpasic/gods/sets/hashset" "github.com/siyuan-note/dejavu" "github.com/siyuan-note/dejavu/cloud" "github.com/siyuan-note/dejavu/entity" @@ -1427,6 +1428,8 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult, upsertTrees++ } } + + clearWidgetsDir := hashset.New() for _, file := range mergeResult.Removes { removes = append(removes, file.Path) if strings.HasPrefix(file.Path, "/storage/riff/") { @@ -1444,6 +1447,12 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult, if strings.HasPrefix(file.Path, "/storage/petal/") { needReloadPlugin = true } + + if strings.HasPrefix(file.Path, "/widgets/") { + if parts := strings.Split(file.Path, "/"); 2 < len(parts) { + clearWidgetsDir.Add(parts[2]) + } + } } if needReloadFlashcard { @@ -1458,6 +1467,11 @@ func processSyncMergeResult(exit, byHand bool, mergeResult *dejavu.MergeResult, pushReloadPlugin() } + for _, widgetDir := range clearWidgetsDir.Values() { + widgetDirPath := filepath.Join(util.DataDir, "widgets", widgetDir.(string)) + gulu.File.RemoveEmptyDirs(widgetDirPath) + } + syncingFiles = sync.Map{} syncingStorages.Store(false)