Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-18 13:08:06 +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-08-08 11:48:54 +08:00
commit 851bc1750f
7 changed files with 3664 additions and 2878 deletions
Download patch file Download diff file Expand all files Collapse all files

6512
app/pnpm-lock.yaml generated
View file

File diff suppressed because it is too large Load diff

6
app/src/protyle/export/index.ts
View file

@ -85,7 +85,7 @@ const getSnippetCSS = () => {
let snippetCSS = "";
document.querySelectorAll("style").forEach((item) => {
if (item.id.startsWith("snippet")) {
snippetCSS += item.innerHTML;
snippetCSS += item.outerHTML;
}
});
return snippetCSS;
@ -182,8 +182,8 @@ const renderPDF = async (id: string) => {
}
${await setInlineStyle(false)}
${await getPluginStyle()}
${getSnippetCSS()}
</style>
${getSnippetCSS()}
</head>
<body style="-webkit-print-color-adjust: exact;">
<div id="action">
@ -676,8 +676,8 @@ const onExport = async (data: IWebSocketData, filePath: string, exportOption: IE
body {font-family: var(--b3-font-family);background-color: var(--b3-theme-background);color: var(--b3-theme-on-background)}
${await setInlineStyle(false)}
${await getPluginStyle()}
${getSnippetCSS()}
</style>
${getSnippetCSS()}
</head>
<body>
<div class="${["htmlmd", "word"].includes(exportOption.type) ? "b3-typography" : "protyle-wysiwyg" + (window.siyuan.config.editor.displayBookmarkIcon ? " protyle-wysiwyg--attr" : "")}"

11
app/src/protyle/render/av/gallery/item.ts
View file

@ -1,10 +1,5 @@
import {showMessage} from "../../../../dialog/message";
import {
genCellValue,
getTypeByCellElement,
renderCell,
renderCellAttr
} from "../cell";
import {genCellValue, getTypeByCellElement, renderCell, renderCellAttr} from "../cell";
import {fetchPost} from "../../../../util/fetch";
import {setPage} from "../row";
import {Constants} from "../../../../constants";
@ -70,7 +65,9 @@ ${fieldType === "block" ? ' data-detached="true"' : ""}>${renderCell(genCellValu
previousID: options.previousId,
}, (response) => {
if (!response.data.values) {
showMessage(window.siyuan.languages.insertRowTip);
if (!response.data.ignore) {
showMessage(window.siyuan.languages.insertRowTip);
}
} else {
let popCellElement: HTMLElement;
const updateIds = Object.keys(response.data.values);

2
app/stage/protyle/js/lute/lute.min.js vendored
View file

File diff suppressed because one or more lines are too long

2
kernel/go.mod
View file

@ -8,7 +8,7 @@ require (
github.com/88250/epub v0.0.0-20230830085737-c19055cd1f48
github.com/88250/go-humanize v0.0.0-20240424102817-4f78fac47ea7
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689
github.com/88250/lute v1.7.7-0.20250807124540-34d5657af502
github.com/88250/lute v1.7.7-0.20250808015309-0caef78d0016
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1
github.com/ClarkThan/ahocorasick v0.0.0-20231011042242-30d1ef1347f4
github.com/ConradIrwin/font v0.2.1

4
kernel/go.sum
View file

@ -14,8 +14,8 @@ github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950 h1:Pa5hMiBceT
github.com/88250/go-sqlite3 v1.14.13-0.20231214121541-e7f54c482950/go.mod h1:NyWgC/yNuGj7Q9rpYnZvas74GogHl5/Z4A/KQRfk6bU=
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689 h1:39y5g7vnFAIcXhTN3IXPk7h2xBhC4a9hBTykDhHJqRY=
github.com/88250/gulu v1.2.3-0.20250227144607-7f4570b0d689/go.mod h1:c8uVw25vW2W4dhJ/j4iYsX5H1hc19spim266jO5x2hU=
github.com/88250/lute v1.7.7-0.20250807124540-34d5657af502 h1:X+iJTlJmDXzCE/VLUpmMzaapSujR+Hha/xNPCH3L668=
github.com/88250/lute v1.7.7-0.20250807124540-34d5657af502/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/lute v1.7.7-0.20250808015309-0caef78d0016 h1:MnQe9wMqlpbKCCdiRAx2JHjaTXKpS/+Ra2AuXP7a7hI=
github.com/88250/lute v1.7.7-0.20250808015309-0caef78d0016/go.mod h1:WYyUw//5yVw9BJnoVjx7rI/3szsISxNZCYGOqTIrV0o=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46 h1:Bq1JsDfVbHKUxNL/B2JXd8cC/1h6aFjrlXpGycnh0Hk=
github.com/88250/pdfcpu v0.3.14-0.20250424122812-f10e8d9d8d46/go.mod h1:fVfOloBzs2+W2VJCCbq60XIxc3yJHAZ0Gahv1oO0gyI=
github.com/88250/vitess-sqlparser v0.0.0-20210205111146-56a2ded2aba1 h1:48T899JQDwyyRu9yXHePYlPdHtpJfrJEUGBMH3SMBWY=

5
kernel/model/attribute_view.go
View file

@ -81,6 +81,11 @@ func GetAttrViewAddingBlockDefaultValues(avID, viewID, groupID, previousBlockID,
func getAttrViewAddingBlockDefaultValues(attrView *av.AttributeView, view, groupView *av.View, previousBlockID, addingBlockID string) (ret map[string]*av.Value) {
ret = map[string]*av.Value{}
if 1 > len(view.Filters) && nil == view.Group {
// 没有过滤条件也没有分组条件时忽略
return
}
nearItem := getNearItem(attrView, view, groupView, previousBlockID)
filterKeyIDs := map[string]bool{}
for _, f := range view.Filters {