Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
Vanessa
commit
b2756904dc
5 changed files with 231 additions and 7 deletions
57
app/changelogs/v3.0.16/v3.0.16.md
Normal file
57
app/changelogs/v3.0.16/v3.0.16.md
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
## Overview
|
||||
|
||||
This version improves web page clipping, fixes some bugs and improves a lot of details.
|
||||
|
||||
## Changelogs
|
||||
|
||||
Below are the detailed changes in this version.
|
||||
|
||||
### Enhancement
|
||||
|
||||
* [Expand the judgment area for dragging split screen](https://github.com/siyuan-note/siyuan/issues/11014)
|
||||
* [Improve marketplace UI](https://github.com/siyuan-note/siyuan/issues/11216)
|
||||
* [Improve browser extension clipping for Zhihu answer](https://github.com/siyuan-note/siyuan/issues/11330)
|
||||
* [Improve the caret position after pressing Backspace in the list](https://github.com/siyuan-note/siyuan/issues/11366)
|
||||
* [Font Size and Code Tab Spaces setting changed to select on the mobile](https://github.com/siyuan-note/siyuan/issues/11415)
|
||||
* [Improve the direction of text, table columns, and horizontal overflow](https://github.com/siyuan-note/siyuan/issues/11455)
|
||||
* [Improve copying database block](https://github.com/siyuan-note/siyuan/issues/11460)
|
||||
* [Improve HTML a and img clipping](https://github.com/siyuan-note/siyuan/issues/11485)
|
||||
* [Export the binding block docs when exporting the doc where the database is located](https://github.com/siyuan-note/siyuan/issues/11486)
|
||||
* [Support database asset image copy-pasting](https://github.com/siyuan-note/siyuan/issues/11487)
|
||||
* [Improve database text, email, url and phone field content escaping](https://github.com/siyuan-note/siyuan/issues/11489)
|
||||
* [Use real theme style value replace var in preview mode](https://github.com/siyuan-note/siyuan/issues/11490)
|
||||
* [Support triggering tag selection via `#`](https://github.com/siyuan-note/siyuan/issues/11494)
|
||||
* [Improve kernel stability](https://github.com/siyuan-note/siyuan/issues/11497)
|
||||
* [Improve inline memo export](https://github.com/siyuan-note/siyuan/issues/11503)
|
||||
* [Supports configuring `Unsplit` and `Unsplit All` hotkeys](https://github.com/siyuan-note/siyuan/issues/11510)
|
||||
* [Improve keymaps searching](https://github.com/siyuan-note/siyuan/issues/11511)
|
||||
* [Refresh the read-only status of a single doc after data synchronization](https://github.com/siyuan-note/siyuan/issues/11517)
|
||||
* [Improve HTML strong clipping](https://github.com/siyuan-note/siyuan/issues/11526)
|
||||
* [Improv drag and drop in outline panel](https://github.com/siyuan-note/siyuan/issues/11529)
|
||||
* [Improve code snippet searching](https://github.com/siyuan-note/siyuan/issues/11534)
|
||||
* [The keyword search logic in-database is changed from OR to AND](https://github.com/siyuan-note/siyuan/issues/11535)
|
||||
* [Improve global search type sorting](https://github.com/siyuan-note/siyuan/issues/11537)
|
||||
* [Improve floating link tip style](https://github.com/siyuan-note/siyuan/issues/11539)
|
||||
* [Improve HTML code block clipping](https://github.com/siyuan-note/siyuan/issues/11540)
|
||||
* [Improve browser extension HTML img clipping](https://github.com/siyuan-note/siyuan/issues/11541)
|
||||
* [Briefly highlight the target block after a block reference jump](https://github.com/siyuan-note/siyuan/issues/11542)
|
||||
* [Improve Ctrl+F to open search dialog](https://github.com/siyuan-note/siyuan/issues/11543)
|
||||
* [Improve database relation field filtering](https://github.com/siyuan-note/siyuan/issues/11547)
|
||||
|
||||
### Abolishment
|
||||
|
||||
* [Opening the user guide is no longer supported on iOS](https://github.com/siyuan-note/siyuan/issues/11492)
|
||||
* [Macro definitions are no longer expanded when exporting formulas](https://github.com/siyuan-note/siyuan/issues/11500)
|
||||
* [The Microsoft Store version no longer supports in-app updates checking](https://github.com/siyuan-note/siyuan/issues/11505)
|
||||
|
||||
### Bugfix
|
||||
|
||||
* [The compressed package exported from the cloud configuration cannot be imported after being renamed](https://github.com/siyuan-note/siyuan/issues/11491)
|
||||
* [HTML block content escaping is incorrect](https://github.com/siyuan-note/siyuan/issues/11499)
|
||||
* [Inline code rendering error when creating ref doc by `F3`](https://github.com/siyuan-note/siyuan/issues/11538)
|
||||
* [The database last row misaligned after adding line number field](https://github.com/siyuan-note/siyuan/issues/11545)
|
||||
|
||||
## Download
|
||||
|
||||
* [B3log](https://b3log.org/siyuan/en/download.html)
|
||||
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
|
||||
57
app/changelogs/v3.0.16/v3.0.16_zh_CHT.md
Normal file
57
app/changelogs/v3.0.16/v3.0.16_zh_CHT.md
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
## 概述
|
||||
|
||||
這個版本改進了網頁剪藏、修復了一些缺陷並改進了許多細節。
|
||||
|
||||
## 變更記錄
|
||||
|
||||
以下是此版本中的詳細變更。
|
||||
|
||||
### 改進功能
|
||||
|
||||
* [擴大拖曳分割畫面的判斷區域](https://github.com/siyuan-note/siyuan/issues/11014)
|
||||
* [改進市集介面](https://github.com/siyuan-note/siyuan/issues/11216)
|
||||
* [改進知乎回答的瀏覽器擴充功能片段](https://github.com/siyuan-note/siyuan/issues/11330)
|
||||
* [改進在清單中按退格鍵後的遊標位置](https://github.com/siyuan-note/siyuan/issues/11366)
|
||||
* [字體大小和代碼 Tab 空格設定在行動裝置上改為選擇](https://github.com/siyuan-note/siyuan/issues/11415)
|
||||
* [改進文字、表格列和水平佈局的方向](https://github.com/siyuan-note/siyuan/issues/11455)
|
||||
* [改進複製資料庫區塊](https://github.com/siyuan-note/siyuan/issues/11460)
|
||||
* [改良 HTML a 與 img 剪藏](https://github.com/siyuan-note/siyuan/issues/11485)
|
||||
* [匯出資料庫所在文件時匯出綁定區塊文件](https://github.com/siyuan-note/siyuan/issues/11486)
|
||||
* [支援資料庫資源圖片複製貼上](https://github.com/siyuan-note/siyuan/issues/11487)
|
||||
* [改進資料庫文字、郵件、URL 和電話欄位內容的轉義](https://github.com/siyuan-note/siyuan/issues/11489)
|
||||
* [在預覽模式下使用真實主題樣式值替換變數](https://github.com/siyuan-note/siyuan/issues/11490)
|
||||
* [支援透過 `#` 觸發標籤選擇](https://github.com/siyuan-note/siyuan/issues/11494)
|
||||
* [改進內核穩定性](https://github.com/siyuan-note/siyuan/issues/11497)
|
||||
* [改為級備註導出](https://github.com/siyuan-note/siyuan/issues/11503)
|
||||
* [支援設定 `取消分割畫面` 和 `取消全部分螢幕` 快速鍵](https://github.com/siyuan-note/siyuan/issues/11510)
|
||||
* [改進快捷鍵搜尋](https://github.com/siyuan-note/siyuan/issues/11511)
|
||||
* [資料同步後刷新單一文件的唯讀狀態](https://github.com/siyuan-note/siyuan/issues/11517)
|
||||
* [改進 HTML strong 剪藏](https://github.com/siyuan-note/siyuan/issues/11526)
|
||||
* [改進大綱面板中的拖曳](https://github.com/siyuan-note/siyuan/issues/11529)
|
||||
* [改進程式碼片段搜尋](https://github.com/siyuan-note/siyuan/issues/11534)
|
||||
* [資料庫中的關鍵字搜尋邏輯從 OR 改為 AND](https://github.com/siyuan-note/siyuan/issues/11535)
|
||||
* [改進全域搜尋類型排序](https://github.com/siyuan-note/siyuan/issues/11537)
|
||||
* [改進連結懸浮提示樣式](https://github.com/siyuan-note/siyuan/issues/11539)
|
||||
* [改進 HTML 程式碼區塊剪藏](https://github.com/siyuan-note/siyuan/issues/11540)
|
||||
* [改進瀏覽器擴充 HTML img 剪藏](https://github.com/siyuan-note/siyuan/issues/11541)
|
||||
* [區塊引用跳轉後短暫高亮目標區塊](https://github.com/siyuan-note/siyuan/issues/11542)
|
||||
* [改進 Ctrl+F 開啟搜尋對話方塊](https://github.com/siyuan-note/siyuan/issues/11543)
|
||||
* [改進資料庫關聯欄位過濾](https://github.com/siyuan-note/siyuan/issues/11547)
|
||||
|
||||
### 移除功能
|
||||
|
||||
* [iOS 上不再支援開啟使用者指南](https://github.com/siyuan-note/siyuan/issues/11492)
|
||||
* [匯出公式時不再展開巨集定義](https://github.com/siyuan-note/siyuan/issues/11500)
|
||||
* [微軟商店版不再支援應用程式內更新檢查](https://github.com/siyuan-note/siyuan/issues/11505)
|
||||
|
||||
### 修復缺陷
|
||||
|
||||
* [雲端設定匯出的壓縮套件在重新命名後無法匯入](https://github.com/siyuan-note/siyuan/issues/11491)
|
||||
* [HTML 區塊內容轉義不正確](https://github.com/siyuan-note/siyuan/issues/11499)
|
||||
* [使用 `F3` 建立引用文件時行級程式碼渲染錯誤](https://github.com/siyuan-note/siyuan/issues/11538)
|
||||
* [新增行號欄位後資料庫最後一行未對齊](https://github.com/siyuan-note/siyuan/issues/11545)
|
||||
|
||||
## 下載
|
||||
|
||||
* [B3log](https://b3log.org/siyuan/download.html)
|
||||
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
|
||||
57
app/changelogs/v3.0.16/v3.0.16_zh_CN.md
Normal file
57
app/changelogs/v3.0.16/v3.0.16_zh_CN.md
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
## 概述
|
||||
|
||||
该版本改进了网页剪藏、修复了一些缺陷并改进了很多细节。
|
||||
|
||||
## 变更记录
|
||||
|
||||
以下是此版本中的详细变更。
|
||||
|
||||
### 改进功能
|
||||
|
||||
* [扩大拖拽分屏的判断区域](https://github.com/siyuan-note/siyuan/issues/11014)
|
||||
* [改进集市界面](https://github.com/siyuan-note/siyuan/issues/11216)
|
||||
* [改进知乎回答的浏览器扩展剪藏](https://github.com/siyuan-note/siyuan/issues/11330)
|
||||
* [改进在列表中按退格键后的光标位置](https://github.com/siyuan-note/siyuan/issues/11366)
|
||||
* [字体大小和代码 Tab 空格设置在移动设备上改为选择](https://github.com/siyuan-note/siyuan/issues/11415)
|
||||
* [改进文本、表格列和水平布局的方向](https://github.com/siyuan-note/siyuan/issues/11455)
|
||||
* [改进复制数据库块](https://github.com/siyuan-note/siyuan/issues/11460)
|
||||
* [改进 HTML a 和 img 剪藏](https://github.com/siyuan-note/siyuan/issues/11485)
|
||||
* [导出数据库所在文档时导出绑定块文档](https://github.com/siyuan-note/siyuan/issues/11486)
|
||||
* [支持数据库资源图片复制粘贴](https://github.com/siyuan-note/siyuan/issues/11487)
|
||||
* [改进数据库文本、邮件、URL 和电话字段内容的转义](https://github.com/siyuan-note/siyuan/issues/11489)
|
||||
* [在预览模式下使用真实主题样式值替换变量](https://github.com/siyuan-note/siyuan/issues/11490)
|
||||
* [支持通过 `#` 触发标签选择](https://github.com/siyuan-note/siyuan/issues/11494)
|
||||
* [改进内核稳定性](https://github.com/siyuan-note/siyuan/issues/11497)
|
||||
* [改进行级备注导出](https://github.com/siyuan-note/siyuan/issues/11503)
|
||||
* [支持配置 `取消分屏` 和 `取消全部分屏` 快捷键](https://github.com/siyuan-note/siyuan/issues/11510)
|
||||
* [改进快捷键搜索](https://github.com/siyuan-note/siyuan/issues/11511)
|
||||
* [数据同步后刷新单个文档的只读状态](https://github.com/siyuan-note/siyuan/issues/11517)
|
||||
* [改进 HTML strong 剪藏](https://github.com/siyuan-note/siyuan/issues/11526)
|
||||
* [改进大纲面板中的拖拽](https://github.com/siyuan-note/siyuan/issues/11529)
|
||||
* [改进代码片段搜索](https://github.com/siyuan-note/siyuan/issues/11534)
|
||||
* [数据库中的关键字搜索逻辑从 OR 改为 AND](https://github.com/siyuan-note/siyuan/issues/11535)
|
||||
* [改进全局搜索类型排序](https://github.com/siyuan-note/siyuan/issues/11537)
|
||||
* [改进链接悬浮提示样式](https://github.com/siyuan-note/siyuan/issues/11539)
|
||||
* [改进 HTML 代码块剪藏](https://github.com/siyuan-note/siyuan/issues/11540)
|
||||
* [改进浏览器扩展 HTML img 剪藏](https://github.com/siyuan-note/siyuan/issues/11541)
|
||||
* [块引用跳转后短暂高亮目标块](https://github.com/siyuan-note/siyuan/issues/11542)
|
||||
* [改进 Ctrl+F 打开搜索对话框](https://github.com/siyuan-note/siyuan/issues/11543)
|
||||
* [改进数据库关联字段过滤](https://github.com/siyuan-note/siyuan/issues/11547)
|
||||
|
||||
### 移除功能
|
||||
|
||||
* [iOS 上不再支持打开用户指南](https://github.com/siyuan-note/siyuan/issues/11492)
|
||||
* [导出公式时不再展开宏定义](https://github.com/siyuan-note/siyuan/issues/11500)
|
||||
* [微软商店版不再支持应用内更新检查](https://github.com/siyuan-note/siyuan/issues/11505)
|
||||
|
||||
### 修复缺陷
|
||||
|
||||
* [云端配置导出的压缩包在重命名后无法导入](https://github.com/siyuan-note/siyuan/issues/11491)
|
||||
* [HTML 块内容转义不正确](https://github.com/siyuan-note/siyuan/issues/11499)
|
||||
* [使用 `F3` 创建引用文档时行级代码渲染错误](https://github.com/siyuan-note/siyuan/issues/11538)
|
||||
* [添加行号字段后数据库最后一行未对齐](https://github.com/siyuan-note/siyuan/issues/11545)
|
||||
|
||||
## 下载
|
||||
|
||||
* [B3log](https://b3log.org/siyuan/download.html)
|
||||
* [GitHub](https://github.com/siyuan-note/siyuan/releases)
|
||||
|
|
@ -138,24 +138,73 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID st
|
|||
}
|
||||
}
|
||||
|
||||
if destVal.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
|
||||
return true
|
||||
switch filter.Operator {
|
||||
case FilterOperatorContains:
|
||||
if destVal.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
|
||||
return true
|
||||
}
|
||||
case FilterOperatorDoesNotContain:
|
||||
ret := destVal.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator)
|
||||
if !ret {
|
||||
return false
|
||||
}
|
||||
default:
|
||||
if destVal.filter(filter.Value.Rollup.Contents[0], filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
|
||||
switch filter.Operator {
|
||||
case FilterOperatorContains:
|
||||
return false
|
||||
case FilterOperatorDoesNotContain:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
if nil != value.Relation && KeyTypeRelation == value.Type && 0 < len(value.Relation.Contents) && nil != filter.Value && KeyTypeRelation == filter.Value.Type &&
|
||||
if nil != value.Relation && KeyTypeRelation == value.Type && nil != filter.Value && KeyTypeRelation == filter.Value.Type &&
|
||||
nil != filter.Value.Relation && 0 < len(filter.Value.Relation.BlockIDs) {
|
||||
// 单独处理关联类型的比较
|
||||
|
||||
// 处理为空和不为空
|
||||
switch filter.Operator {
|
||||
case FilterOperatorIsEmpty:
|
||||
return 0 == len(value.Relation.Contents)
|
||||
case FilterOperatorIsNotEmpty:
|
||||
return 0 != len(value.Relation.Contents)
|
||||
}
|
||||
|
||||
for _, relationValue := range value.Relation.Contents {
|
||||
filterValue := &Value{Type: KeyTypeBlock, Block: &ValueBlock{Content: filter.Value.Relation.BlockIDs[0]}}
|
||||
if relationValue.filter(filterValue, filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
|
||||
return true
|
||||
|
||||
switch filter.Operator {
|
||||
case FilterOperatorContains:
|
||||
if relationValue.filter(filterValue, filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
|
||||
return true
|
||||
}
|
||||
case FilterOperatorDoesNotContain:
|
||||
ret := relationValue.filter(filterValue, filter.RelativeDate, filter.RelativeDate2, filter.Operator)
|
||||
if !ret {
|
||||
return false
|
||||
}
|
||||
default:
|
||||
if relationValue.filter(filterValue, filter.RelativeDate, filter.RelativeDate2, filter.Operator) {
|
||||
return true
|
||||
}
|
||||
}
|
||||
}
|
||||
return false
|
||||
|
||||
switch filter.Operator {
|
||||
case FilterOperatorContains:
|
||||
return false
|
||||
case FilterOperatorDoesNotContain:
|
||||
return true
|
||||
default:
|
||||
return false
|
||||
}
|
||||
}
|
||||
return value.filter(filter.Value, filter.RelativeDate, filter.RelativeDate2, filter.Operator)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -579,6 +579,10 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
|
|||
ial = GetBlockAttrsWithoutWaitWriting(block.BlockID)
|
||||
}
|
||||
|
||||
if nil == kv.Values[0].Template {
|
||||
kv.Values[0] = av.GetAttributeViewDefaultValue(kv.Values[0].ID, kv.Key.ID, blockID, kv.Key.Type)
|
||||
}
|
||||
|
||||
var renderErr error
|
||||
kv.Values[0].Template.Content, renderErr = sql.RenderTemplateCol(ial, keyValues, kv.Key.Template)
|
||||
if nil != renderErr {
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue