0ct0pu5/siyuan
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Vanessa 2024-10-20 11:42:28 +08:00
commit 7180105d6c
4 changed files with 47 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/src/menus/protyle.ts
View file

@ -1303,7 +1303,10 @@ export const imgMenu = (protyle: IProtyle, range: Range, assetElement: HTMLEleme
window.siyuan.menus.menu.append(new MenuItem({type: "separator"}).element);
openMenu(protyle.app, imgSrc, false, false);
}
window.siyuan.menus.menu.append(new MenuItem(exportAsset(imgElement.getAttribute("data-src"))).element);
const dataSrc = imgElement.getAttribute("data-src");
if (dataSrc && dataSrc.startsWith("assets/")) {
window.siyuan.menus.menu.append(new MenuItem(exportAsset(dataSrc)).element);
}
if (protyle?.app?.plugins) {
emitOpenMenu({
plugins: protyle.app.plugins,
@ -1935,7 +1938,7 @@ export const videoMenu = (protyle: IProtyle, nodeElement: Element, type: string)
}
}];
const src = videoElement.getAttribute("src");
if (src.startsWith("assets/")) {
if (src && src.startsWith("assets/")) {
subMenus.push({
type: "separator"
});
@ -1948,16 +1951,17 @@ export const videoMenu = (protyle: IProtyle, nodeElement: Element, type: string)
}
});
}
const VideoSrc = videoElement.getAttribute("src");
if (VideoSrc) {
if (src) {
subMenus.push({
id: "openBy",
label: window.siyuan.languages.openBy,
icon: "iconOpen",
submenu: openMenu(protyle.app, VideoSrc, true, false) as IMenu[]
submenu: openMenu(protyle.app, src, true, false) as IMenu[]
});
}
subMenus.push(exportAsset(src));
if (src && src.startsWith("assets/")) {
subMenus.push(exportAsset(src));
}
return subMenus;
};

10
kernel/av/filter.go
View file

@ -79,7 +79,7 @@ const (
FilterOperatorIsFalse FilterOperator = "Is false"
)
func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID string) bool {
func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID string, attrViewCache *map[string]*AttributeView) bool {
if nil == filter || (nil == filter.Value && nil == filter.RelativeDate) {
return true
}
@ -117,7 +117,13 @@ func (value *Value) Filter(filter *ViewFilter, attrView *AttributeView, rowID st
return false
}
destAv, _ := ParseAttributeView(relKey.Relation.AvID)
destAv := (*attrViewCache)[relKey.Relation.AvID]
if nil == destAv {
destAv, _ = ParseAttributeView(relKey.Relation.AvID)
if nil != destAv {
(*attrViewCache)[relKey.Relation.AvID] = destAv
}
}
if nil == destAv {
return false
}

4
kernel/av/table.go
View file

@ -256,6 +256,8 @@ func (table *Table) FilterRows(attrView *AttributeView) {
}
rows := []*TableRow{}
attrViewCache := map[string]*AttributeView{}
attrViewCache[attrView.ID] = attrView
for _, row := range table.Rows {
pass := true
for j, index := range colIndexes {
@ -275,7 +277,7 @@ func (table *Table) FilterRows(attrView *AttributeView) {
break
}
if !row.Cells[index].Value.Filter(table.Filters[j], attrView, row.ID) {
if !row.Cells[index].Value.Filter(table.Filters[j], attrView, row.ID, &attrViewCache) {
pass = false
break
}

36
kernel/model/attribute_view.go
View file

@ -488,17 +488,20 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
return
}
attrViewCache := map[string]*av.AttributeView{}
avIDs := strings.Split(avs, ",")
for _, avID := range avIDs {
attrView, err := av.ParseAttributeView(avID)
if err != nil {
logging.LogErrorf("parse attribute view [%s] failed: %s", avID, err)
unbindBlockAv(nil, avID, blockID)
return
attrView := attrViewCache[avID]
if nil == attrView {
attrView, _ = av.ParseAttributeView(avID)
if nil == attrView {
unbindBlockAv(nil, avID, blockID)
return
}
attrViewCache[avID] = attrView
}
if 1 > len(attrView.Views) {
err = av.ErrViewNotFound
unbindBlockAv(nil, avID, blockID)
return
}
@ -568,9 +571,17 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
relVal := attrView.GetValue(kv.Key.Rollup.RelationKeyID, kv.Values[0].BlockID)
if nil != relVal && nil != relVal.Relation {
destAv, _ := av.ParseAttributeView(relKey.Relation.AvID)
destAv := attrViewCache[relKey.Relation.AvID]
if nil == destAv {
destAv, _ = av.ParseAttributeView(relKey.Relation.AvID)
if nil == destAv {
break
}
attrViewCache[relKey.Relation.AvID] = destAv
}
destKey, _ := destAv.GetKey(kv.Key.Rollup.KeyID)
if nil != destAv && nil != destKey {
if nil != destKey {
for _, bID := range relVal.Relation.BlockIDs {
destVal := destAv.GetValue(kv.Key.Rollup.KeyID, bID)
if nil == destVal {
@ -596,9 +607,14 @@ func GetBlockAttributeViewKeys(blockID string) (ret []*BlockAttributeViewKeys) {
break
}
destAv, _ := av.ParseAttributeView(kv.Key.Relation.AvID)
destAv := attrViewCache[kv.Key.Relation.AvID]
if nil == destAv {
break
destAv, _ = av.ParseAttributeView(kv.Key.Relation.AvID)
if nil == destAv {
break
}
attrViewCache[kv.Key.Relation.AvID] = destAv
}
blocks := map[string]*av.Value{}