Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-01-06 16:58: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 2025-07-17 00:12:56 +08:00
commit 50e8e88aaf
6 changed files with 105 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/src/assets/scss/component/_snackbar.scss
View file

@ -3,6 +3,7 @@
position: relative;
transition: transform 256ms cubic-bezier(.45, .05, .55, .95) 0ms;
text-align: right;
justify-self: end;
font-size: var(--b3-font-size);
&--hide {

46
app/src/dialog/message.ts
View file

@ -32,10 +32,21 @@ export const initMessage = () => {
target = target.parentElement;
}
});
const tempMessageElement = document.getElementById("tempMessage");
if (tempMessageElement) {
showMessage(tempMessageElement.innerHTML);
tempMessageElement.remove();
const tempMessages = document.getElementById("tempMessages");
if (tempMessages) {
const items = tempMessages.querySelectorAll("[temp-message]");
items.forEach((item) => {
const timeoutString = item.getAttribute("data-timeout");
let timeout;
if (timeoutString) {
timeout = parseInt(timeoutString);
}
const type = item.getAttribute("data-type");
const messageId = item.getAttribute("data-message-id");
showMessage(item.innerHTML, timeout, type, messageId);
});
tempMessages.remove();
}
};
@ -43,14 +54,25 @@ export const initMessage = () => {
export const showMessage = (message: string, timeout = 6000, type = "info", messageId?: string) => {
const messagesElement = document.getElementById("message").firstElementChild;
if (!messagesElement) {
document.body.insertAdjacentHTML("beforeend", `<div style="top: 10px;
position: fixed;
z-index: 100;
background: white;
padding: 10px;
border-radius: 5px;
right: 10px;
border: 1px solid #e0e0e0;" id='tempMessage'>${message}</div>`);
let tempMessages = document.getElementById("tempMessages");
if (!tempMessages) {
document.body.insertAdjacentHTML("beforeend", "<div id='tempMessages'></div>");
tempMessages = document.getElementById("tempMessages");
}
tempMessages.insertAdjacentHTML("beforeend", `<div style="
top: 10px;
position: fixed;
z-index: 100;
background: white;
padding: 10px;
border-radius: 5px;
right: 10px;
border: 1px solid #e0e0e0;"
data-timeout='${timeout}'
data-type="${type}"
data-message-id='${messageId || ""}'
temp-message>${message}</div>`);
return;
}
const id = messageId || genUUID();

21
kernel/api/av.go
View file

@ -735,3 +735,24 @@ func setAttributeViewBlockAttr(c *gin.Context) {
model.ReloadAttrView(avID)
}
func batchSetAttributeViewBlockAttrs(c *gin.Context) {
ret := gulu.Ret.NewResult()
defer c.JSON(http.StatusOK, ret)
arg, ok := util.JsonArg(c, ret)
if !ok {
return
}
avID := arg["avID"].(string)
values := arg["values"].([]interface{})
err := model.BatchUpdateAttributeViewCells(nil, avID, values)
if err != nil {
ret.Code = -1
ret.Msg = err.Error()
return
}
model.ReloadAttrView(avID)
}

1
kernel/api/router.go
View file

@ -436,6 +436,7 @@ func ServeAPI(ginServer *gin.Engine) {
ginServer.Handle("POST", "/api/av/renderSnapshotAttributeView", model.CheckAuth, model.CheckAdminRole, renderSnapshotAttributeView)
ginServer.Handle("POST", "/api/av/getAttributeViewKeys", model.CheckAuth, getAttributeViewKeys)
ginServer.Handle("POST", "/api/av/setAttributeViewBlockAttr", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, setAttributeViewBlockAttr)
ginServer.Handle("POST", "/api/av/batchSetAttributeViewBlockAttrs", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, batchSetAttributeViewBlockAttrs)
ginServer.Handle("POST", "/api/av/searchAttributeView", model.CheckAuth, model.CheckReadonly, searchAttributeView)
ginServer.Handle("POST", "/api/av/getAttributeView", model.CheckAuth, model.CheckReadonly, getAttributeView)
ginServer.Handle("POST", "/api/av/searchAttributeViewRelationKey", model.CheckAuth, model.CheckAdminRole, model.CheckReadonly, searchAttributeViewRelationKey)

4
kernel/av/sort.go
View file

@ -397,7 +397,7 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
}
case KeyTypeRelation:
if nil != value.Relation && nil != other.Relation {
if 1 < len(value.Relation.Contents) && 1 < len(other.Relation.Contents) && KeyTypeNumber == value.Relation.Contents[0].Type && KeyTypeNumber == other.Relation.Contents[0].Type {
if 0 < len(value.Relation.Contents) && 0 < len(other.Relation.Contents) && KeyTypeNumber == value.Relation.Contents[0].Type && KeyTypeNumber == other.Relation.Contents[0].Type {
v1, ok1 := util.Convert2Float(value.Relation.Contents[0].String(false))
v2, ok2 := util.Convert2Float(other.Relation.Contents[0].String(false))
if ok1 && ok2 {
@ -435,7 +435,7 @@ func (value *Value) Compare(other *Value, attrView *AttributeView) int {
}
case KeyTypeRollup:
if nil != value.Rollup && nil != other.Rollup {
if 1 < len(value.Rollup.Contents) && 1 < len(other.Rollup.Contents) && KeyTypeNumber == value.Rollup.Contents[0].Type && KeyTypeNumber == other.Rollup.Contents[0].Type {
if 0 < len(value.Rollup.Contents) && 0 < len(other.Rollup.Contents) && KeyTypeNumber == value.Rollup.Contents[0].Type && KeyTypeNumber == other.Rollup.Contents[0].Type {
v1, ok1 := util.Convert2Float(value.Rollup.Contents[0].String(false))
v2, ok2 := util.Convert2Float(other.Rollup.Contents[0].String(false))
if ok1 && ok2 {

55
kernel/model/attribute_view.go
View file

@ -3955,12 +3955,58 @@ func updateAttributeViewCell(operation *Operation, tx *Transaction) (err error)
return
}
func BatchUpdateAttributeViewCells(tx *Transaction, avID string, values []interface{}) (err error) {
attrView, err := av.ParseAttributeView(avID)
if err != nil {
return
}
for _, value := range values {
v := value.(map[string]interface{})
keyID := v["keyID"].(string)
rowID := v["rowID"].(string)
valueData := v["value"]
_, err = updateAttributeViewValue(tx, attrView, keyID, rowID, valueData)
if err != nil {
return
}
}
if err = av.SaveAttributeView(attrView); err != nil {
return
}
relatedAvIDs := av.GetSrcAvIDs(avID)
for _, relatedAvID := range relatedAvIDs {
ReloadAttrView(relatedAvID)
}
return
}
func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID string, valueData interface{}) (val *av.Value, err error) {
attrView, err := av.ParseAttributeView(avID)
if err != nil {
return
}
val, err = updateAttributeViewValue(tx, attrView, keyID, rowID, valueData)
if nil != err {
return
}
if err = av.SaveAttributeView(attrView); err != nil {
return
}
relatedAvIDs := av.GetSrcAvIDs(avID)
for _, relatedAvID := range relatedAvIDs {
ReloadAttrView(relatedAvID)
}
return
}
func updateAttributeViewValue(tx *Transaction, attrView *av.AttributeView, keyID, rowID string, valueData interface{}) (val *av.Value, err error) {
avID := attrView.ID
var blockVal *av.Value
for _, kv := range attrView.KeyValues {
if av.KeyTypeBlock == kv.Key.Type {
@ -4203,15 +4249,6 @@ func UpdateAttributeViewCell(tx *Transaction, avID, keyID, rowID string, valueDa
}
}
}
relatedAvIDs := av.GetSrcAvIDs(avID)
for _, relatedAvID := range relatedAvIDs {
ReloadAttrView(relatedAvID)
}
if err = av.SaveAttributeView(attrView); err != nil {
return
}
return
}