Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-05 16:28:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2023-12-12 00:53:44 +08:00
commit adaf89c155
4 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/changelogs/v2.11.2/v2.11.2.md
View file

@ -50,7 +50,7 @@ Below are the detailed changes in this version.
* [Database table view supports paged loading](https://github.com/siyuan-note/siyuan/issues/9424)
* [Use HTML attribute `data-wrap` to set the cell wrapping style of attribute view](https://github.com/siyuan-note/siyuan/pull/9814)
* [Add a template function about date](https://github.com/siyuan-note/siyuan/pull/9815)
* [Improve database table view filter](https://github.com/siyuan-note/siyuan/issues/9820)
* [Improve database table view select column filter](https://github.com/siyuan-note/siyuan/issues/9820)
* [Add internal kernel API `/api/setting/refreshVirtualBlockRef`](https://github.com/siyuan-note/siyuan/issues/9829)
* [Allow global shortcut keys to be triggered when editing database table view cell](https://github.com/siyuan-note/siyuan/issues/9848)
* [Improve database table view UI to differentiate between bound and unbound row](https://github.com/siyuan-note/siyuan/issues/9849)

2
app/changelogs/v2.11.2/v2.11.2_zh_CHT.md
View file

@ -50,7 +50,7 @@
* [資料庫表格視圖支援分頁載入](https://github.com/siyuan-note/siyuan/issues/9424)
* [使用 HTML 屬性 `data-wrap` 來設定資料庫表格視圖單元格折行](https://github.com/siyuan-note/siyuan/pull/9814)
* [新增一個日期範本函數](https://github.com/siyuan-note/siyuan/pull/9815)
* [改進資料庫表格視圖過濾器](https://github.com/siyuan-note/siyuan/issues/9820)
* [改進資料庫表格視圖選擇列過濾器](https://github.com/siyuan-note/siyuan/issues/9820)
* [新增內部內核 API `/api/setting/refreshVirtualBlockRef`](https://github.com/siyuan-note/siyuan/issues/9829)
* [改進資料庫表格視圖介面以區別綁定和未綁定行](https://github.com/siyuan-note/siyuan/issues/9849)
* [改進資料庫表格視圖介面以區別綁定和未綁定行](https://github.com/siyuan-note/siyuan/issues/9849)

2
app/changelogs/v2.11.2/v2.11.2_zh_CN.md
View file

@ -50,7 +50,7 @@
* [数据库表格视图支持分页加载](https://github.com/siyuan-note/siyuan/issues/9424)
* [使用 HTML 属性 `data-wrap` 来设置数据库表格视图单元格折行](https://github.com/siyuan-note/siyuan/pull/9814)
* [添加一个日期模板函数](https://github.com/siyuan-note/siyuan/pull/9815)
* [改进数据库表格视图过滤器](https://github.com/siyuan-note/siyuan/issues/9820)
* [改进数据库表格视图选择列过滤器](https://github.com/siyuan-note/siyuan/issues/9820)
* [添加内部内核 API `/api/setting/refreshVirtualBlockRef`](https://github.com/siyuan-note/siyuan/issues/9829)
* [数据库表格视图中允许使用已有快捷键](https://github.com/siyuan-note/siyuan/issues/9848)
* [改进数据库表格视图界面以区别绑定和未绑定行](https://github.com/siyuan-note/siyuan/issues/9849)

2
kernel/av/table.go
View file

@ -375,7 +375,7 @@ func (value *Value) CompareOperator(other *Value, operator FilterOperator) bool
}
}
if nil != value.MSelect && nil != other.MSelect && 0 < len(value.MSelect) && 0 < len(other.MSelect) {
if nil != value.MSelect && nil != other.MSelect {
switch operator {
case FilterOperatorIsEqual, FilterOperatorContains:
contains := false