Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/dev' into dev
Browse files Browse the repository at this point in the history
  • Loading branch information
Vanessa219 committed Oct 1, 2023
2 parents 6490070 + 7029264 commit c321223
Show file tree
Hide file tree
Showing 4 changed files with 154 additions and 1 deletion.
51 changes: 51 additions & 0 deletions app/changelogs/v2.10.8/v2.10.8.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
## Overview

This version fixes some bugs, and it is recommended to upgrade.

Advertisement: Currently, `PRO Features` are in the early bird price stage, welcome to [learn more](https://b3log.org/siyuan/en/pricing.html).

Note: The annual `Subscription` includes `Pro features`. If you are an annual subscriber, you do not need to buy PRO Features separately.

## Changelogs

Below are the detailed changes in this version.

### Enhancement

* [Chinese-friendly embed block command on macOS](https://github.com/siyuan-note/siyuan/issues/9216)
* [Improve error tip when renaming tags/bookmarks containing Markdown markers](https://github.com/siyuan-note/siyuan/issues/9248)
* [Improve transformation with sub-headings](https://github.com/siyuan-note/siyuan/issues/9264)
* [Improve ESC interaction after adding custom attribute in the attribute panel](https://github.com/siyuan-note/siyuan/issues/9282)
* [Add PageUp & PageDown in search panel](https://github.com/siyuan-note/siyuan/issues/9284)
* [Support make flashcard on the doc tree](https://github.com/siyuan-note/siyuan/issues/9288)
* [Remove `scroll` attribute when converting the document to a heading](https://github.com/siyuan-note/siyuan/issues/9297)
* [Improve remove thematic break on the mobile](https://github.com/siyuan-note/siyuan/issues/9302)
* [Apply result optimized by FSRS optimizer](https://github.com/siyuan-note/siyuan/issues/9309)
* [Create doc in search using save location configuration](https://github.com/siyuan-note/siyuan/issues/9316)
* [Improve handling of copy block ref when including images](https://github.com/siyuan-note/siyuan/issues/9317)
* [Hide tooltips when the cursor moves out of the application](https://github.com/siyuan-note/siyuan/issues/9318)
* [iOS 17.0.2 cannot pop up the keyboard menu](https://github.com/siyuan-note/siyuan/issues/9320)
* [Improve pasted text position in code block](https://github.com/siyuan-note/siyuan/issues/9323)
* [Remove animation when opening editor](https://github.com/siyuan-note/siyuan/issues/9324)

### Bugfix

* [Cut and copy operate on the entire block when text is selected](https://github.com/siyuan-note/siyuan/issues/9283)
* [The image does not display after pasting some PDF rectangular annotations](https://github.com/siyuan-note/siyuan/issues/9321)
* [The subdoc creation path is unstable when a parent doc with the same name exists](https://github.com/siyuan-note/siyuan/issues/9322)
* [Missing line breaks when exporting RTF](https://github.com/siyuan-note/siyuan/issues/9325)

### Development

* [Try catch plugin `onunload`](https://github.com/siyuan-note/siyuan/issues/9240)
* [Improve the placement point for dragging blocks into the database](https://github.com/siyuan-note/siyuan/issues/9273)
* [Improve attribute view menu style](https://github.com/siyuan-note/siyuan/issues/9281)
* [Database values no longer correspond to block attributes](https://github.com/siyuan-note/siyuan/issues/9293)
* [New a row in the database no longer require to create a relevant doc](https://github.com/siyuan-note/siyuan/issues/9294)
* [Documents created via the database are no longer automatically hidden](https://github.com/siyuan-note/siyuan/issues/9298)
* [Rendering exception after inserting into database across documents](https://github.com/siyuan-note/siyuan/issues/9299)
* [Refactor code language and ts types](https://github.com/siyuan-note/siyuan/pull/9300)
* [Upgrade Electron](https://github.com/siyuan-note/siyuan/issues/9301)
* [Attribute view column line wrapping issues](https://github.com/siyuan-note/siyuan/issues/9303)
* [Database asset column supports search insertion](https://github.com/siyuan-note/siyuan/issues/9313)
* [Attribute Panel - Database sort attributes by view column order](https://github.com/siyuan-note/siyuan/issues/9319)
51 changes: 51 additions & 0 deletions app/changelogs/v2.10.8/v2.10.8_zh_CHT.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
## 概述

此版本修復了一些缺陷,建議升級。

廣告: 目前 `功能特性` 正處於早鳥價階段,歡迎[了解](https://b3log.org/siyuan/pricing.html)

註:`年付訂閱` 包含 `功能特性`,如果你是訂閱會員,則無需單獨購買功能特性。

## 變更記錄

以下是此版本中的詳細變更。

### 改進功能

* [macOS 端嵌入區塊輸入中文最佳化](https://github.com/siyuan-note/siyuan/issues/9216)
* [改進重命名標籤/書籤時包含 Markdown 標記符的錯誤提示](https://github.com/siyuan-note/siyuan/issues/9248)
* [改良標題帶子標題轉換](https://github.com/siyuan-note/siyuan/issues/9264)
* [改進在屬性面板中新增自訂屬性後按下 ESC 的互動](https://github.com/siyuan-note/siyuan/issues/9282)
* [搜尋框支援 PageUp 和 PageDown 切換分頁](https://github.com/siyuan-note/siyuan/issues/9284)
* [文件樹上支援製作閃卡](https://github.com/siyuan-note/siyuan/issues/9288)
* [文件轉換標題時移除 `scroll` 屬性](https://github.com/siyuan-note/siyuan/issues/9297)
* [改進行動端刪除分隔線操作](https://github.com/siyuan-note/siyuan/issues/9302)
* [支援設定 FSRS 最佳化器最佳化的結果參數](https://github.com/siyuan-note/siyuan/issues/9309)
* [在搜尋時建立文件遵循文件存放路徑配置](https://github.com/siyuan-note/siyuan/issues/9316)
* [改進包含圖片時的複製區塊引用處理](https://github.com/siyuan-note/siyuan/issues/9317)
* [當遊標移出應用時隱藏提示圖層](https://github.com/siyuan-note/siyuan/issues/9318)
* [iOS 17.0.2 無法召喚鍵盤選單](https://github.com/siyuan-note/siyuan/issues/9320)
* [改進程式碼區塊貼上內容位置](https://github.com/siyuan-note/siyuan/issues/9323)
* [移除開啟文件時的動畫](https://github.com/siyuan-note/siyuan/issues/9324)

### 修復缺陷

* [選擇部分文字時剪下和複製整個區塊](https://github.com/siyuan-note/siyuan/issues/9283)
* [貼上 PDF 長方形標準後圖片不顯示](https://github.com/siyuan-note/siyuan/issues/9321)
* [存在同名父親文件時建立子文件路徑不穩定](https://github.com/siyuan-note/siyuan/issues/9322)
* [匯出 RTF 時缺少換行](https://github.com/siyuan-note/siyuan/issues/9325)

### 開發者

* [擷取外掛程式 `onunload` 異常](https://github.com/siyuan-note/siyuan/issues/9240)
* [改進拖曳區塊到資料庫的放置點](https://github.com/siyuan-note/siyuan/issues/9273)
* [改進屬性視圖選單樣式](https://github.com/siyuan-note/siyuan/issues/9281)
* [資料庫值不再對應區塊屬性](https://github.com/siyuan-note/siyuan/issues/9293)
* [資料庫建立行不再需要建立子文件](https://github.com/siyuan-note/siyuan/issues/9294)
* [透過資料庫建立的文件不再自動隱藏](https://github.com/siyuan-note/siyuan/issues/9298)
* [跨文件插入資料庫後渲染異常](https://github.com/siyuan-note/siyuan/issues/9299)
* [重構程式語言與 ts 類型](https://github.com/siyuan-note/siyuan/pull/9300)
* [升級 Electron](https://github.com/siyuan-note/siyuan/issues/9301)
* [屬性視圖列換行問題](https://github.com/siyuan-note/siyuan/issues/9303)
* [資料庫資源檔案列支援搜尋插入](https://github.com/siyuan-note/siyuan/issues/9313)
* [屬性面板 - 資料庫 遵循視圖列排序](https://github.com/siyuan-note/siyuan/issues/9319)
51 changes: 51 additions & 0 deletions app/changelogs/v2.10.8/v2.10.8_zh_CN.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
## 概述

该版本修复了一些缺陷,建议升级。

广告: 目前 `功能特性` 正处于早鸟价阶段,欢迎[了解](https://b3log.org/siyuan/pricing.html)

注:`年付订阅` 包含 `功能特性`,如果你是订阅会员,则无需单独购买功能特性。

## 变更记录

以下是此版本中的详细变更。

### 改进功能

* [macOS 端嵌入块输入中文优化](https://github.com/siyuan-note/siyuan/issues/9216)
* [改进重命名标签/书签时包含 Markdown 标记符的报错提示](https://github.com/siyuan-note/siyuan/issues/9248)
* [改进标题带子标题转换](https://github.com/siyuan-note/siyuan/issues/9264)
* [改进在属性面板中添加自定义属性后按下 ESC 的交互](https://github.com/siyuan-note/siyuan/issues/9282)
* [搜索框支持 PageUp 和 PageDown 切换分页](https://github.com/siyuan-note/siyuan/issues/9284)
* [文档树上支持制作闪卡](https://github.com/siyuan-note/siyuan/issues/9288)
* [文档转换标题时移除 `scroll` 属性](https://github.com/siyuan-note/siyuan/issues/9297)
* [改进移动端删除分隔线操作](https://github.com/siyuan-note/siyuan/issues/9302)
* [支持配置 FSRS 优化器优化的结果参数](https://github.com/siyuan-note/siyuan/issues/9309)
* [在搜索时创建文档遵循文档存放路径配置](https://github.com/siyuan-note/siyuan/issues/9316)
* [改进包含图片时的复制块引用处理](https://github.com/siyuan-note/siyuan/issues/9317)
* [当光标移出应用时隐藏提示层](https://github.com/siyuan-note/siyuan/issues/9318)
* [iOS 17.0.2 无法唤出键盘菜单](https://github.com/siyuan-note/siyuan/issues/9320)
* [改进代码块粘贴内容位置](https://github.com/siyuan-note/siyuan/issues/9323)
* [移除打开文档时的动画](https://github.com/siyuan-note/siyuan/issues/9324)

### 修复缺陷

* [选择部分文本时剪切和复制整个块](https://github.com/siyuan-note/siyuan/issues/9283)
* [粘贴 PDF 矩形标准后图片不显示](https://github.com/siyuan-note/siyuan/issues/9321)
* [存在同名父文档时创建子文档路径不稳定](https://github.com/siyuan-note/siyuan/issues/9322)
* [导出 RTF 时缺少换行](https://github.com/siyuan-note/siyuan/issues/9325)

### 开发者

* [捕获插件 `onunload` 异常](https://github.com/siyuan-note/siyuan/issues/9240)
* [改进拖拽块到数据库的放置点](https://github.com/siyuan-note/siyuan/issues/9273)
* [改进属性视图菜单样式](https://github.com/siyuan-note/siyuan/issues/9281)
* [数据库值不再对应块属性](https://github.com/siyuan-note/siyuan/issues/9293)
* [数据库创建行不再需要创建子文档](https://github.com/siyuan-note/siyuan/issues/9294)
* [通过数据库创建的文档不再自动隐藏](https://github.com/siyuan-note/siyuan/issues/9298)
* [跨文档插入数据库后渲染异常](https://github.com/siyuan-note/siyuan/issues/9299)
* [重构代码语言和 ts 类型](https://github.com/siyuan-note/siyuan/pull/9300)
* [升级 Electron](https://github.com/siyuan-note/siyuan/issues/9301)
* [属性视图列换行问题](https://github.com/siyuan-note/siyuan/issues/9303)
* [数据库资源文件列支持搜索插入](https://github.com/siyuan-note/siyuan/issues/9313)
* [属性面板 - 数据库 遵循视图列排序](https://github.com/siyuan-note/siyuan/issues/9319)
2 changes: 1 addition & 1 deletion kernel/model/export.go
Original file line number Diff line number Diff line change
Expand Up @@ -1116,7 +1116,7 @@ func ExportPandocConvertZip(id, pandocTo, ext string) (name, zipPath string) {
docPaths = append(docPaths, docFile.path)
}

zipPath = exportPandocConvertZip(boxID, baseFolderName, docPaths, "gfm+footnotes", pandocTo, ext)
zipPath = exportPandocConvertZip(boxID, baseFolderName, docPaths, "gfm+footnotes+hard_line_breaks", pandocTo, ext)
name = strings.TrimSuffix(filepath.Base(block.Path), ".sy")
return
}
Expand Down

0 comments on commit c321223

Please sign in to comment.