mirror of
https://github.com/siyuan-note/siyuan.git
synced 2025-12-17 07:00:12 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
740fb623bf
1 changed files with 3 additions and 3 deletions
|
|
@ -258,7 +258,7 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
|
||||||
for _, asset := range value.MAsset {
|
for _, asset := range value.MAsset {
|
||||||
switch asset.Type {
|
switch asset.Type {
|
||||||
case AssetTypeFile:
|
case AssetTypeFile:
|
||||||
if filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Name) ||
|
if filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Content) ||
|
||||||
filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
|
filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
@ -272,7 +272,7 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
|
||||||
for _, asset := range value.MAsset {
|
for _, asset := range value.MAsset {
|
||||||
switch asset.Type {
|
switch asset.Type {
|
||||||
case AssetTypeFile:
|
case AssetTypeFile:
|
||||||
if !filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Name) &&
|
if !filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Content) &&
|
||||||
!filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
|
!filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
@ -287,7 +287,7 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, itemID s
|
||||||
for _, asset := range value.MAsset {
|
for _, asset := range value.MAsset {
|
||||||
switch asset.Type {
|
switch asset.Type {
|
||||||
case AssetTypeFile:
|
case AssetTypeFile:
|
||||||
if filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Name) ||
|
if filterTextContent(filter.Operator, asset.Name, filter.Value.MAsset[0].Content) ||
|
||||||
filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
|
filterTextContent(filter.Operator, asset.Content, filter.Value.MAsset[0].Content) {
|
||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue