Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 23:20:13 +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-06-15 18:30:27 +08:00
commit e64b486ea4
2 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/config/about.ts
View file

@ -96,8 +96,12 @@ export const about = {
<div class="fn__flex-1"> <div class="fn__flex-1">
${window.siyuan.languages.about2} ${window.siyuan.languages.about2}
<div class="b3-label__text">${window.siyuan.languages.about3.replace("${port}", location.port)}</div> <div class="b3-label__text">${window.siyuan.languages.about3.replace("${port}", location.port)}</div>
<div class="b3-label__text"><code class="fn__code">${window.siyuan.config.localIPs.filter(ip => !(ip.startsWith("[") && ip.endsWith("]"))).join("</code> <code class='fn__code'>")}</code></div> ${(() => {
<div class="b3-label__text"><code class="fn__code">${window.siyuan.config.localIPs.filter(ip => (ip.startsWith("[") && ip.endsWith("]"))).join("</code> <code class='fn__code'>")}</code></div> const ipv4 = window.siyuan.config.localIPs.filter(ip => !(ip.startsWith("[") && ip.endsWith("]")));
const ipv6 = window.siyuan.config.localIPs.filter(ip => (ip.startsWith("[") && ip.endsWith("]")));
return `<div class="b3-label__text${ipv4.length > 0 ? "" : " fn__none"}"><code class="fn__code">${ipv4.join("</code> <code class='fn__code'>")}</code></div>
<div class="b3-label__text${ipv6.length > 0 ? "" : " fn__none"}"><code class="fn__code">${ipv6.join("</code> <code class='fn__code'>")}</code></div>`;
})()}
<div class="b3-label__text">${window.siyuan.languages.about18}</div> <div class="b3-label__text">${window.siyuan.languages.about18}</div>
</div> </div>
<div class="fn__space"></div> <div class="fn__space"></div>

1
kernel/model/attribute_view.go
View file

@ -1803,6 +1803,7 @@ func (tx *Transaction) doDuplicateAttrViewView(operation *Operation) (ret *TxErr
attrs := parse.IAL2Map(node.KramdownIAL) attrs := parse.IAL2Map(node.KramdownIAL)
attrs[av.NodeAttrView] = operation.ID attrs[av.NodeAttrView] = operation.ID
node.AttributeViewType = string(masterView.LayoutType)
err = setNodeAttrs(node, tree, attrs) err = setNodeAttrs(node, tree, attrs)
if err != nil { if err != nil {
logging.LogWarnf("set node [%s] attrs failed: %s", operation.BlockID, err) logging.LogWarnf("set node [%s] attrs failed: %s", operation.BlockID, err)