Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-23 15:34:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-11-09 15:50:36 +08:00
commit a9edf35b2c
12 changed files with 37 additions and 46 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/electron-builder-arm64.yml
View file

@ -1,8 +1,8 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
compression: "normal"
copyright: "© 2020-present Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}-arm64.${ext}"
extraMetadata:
main: "electron/main.js"

2
app/electron-builder-darwin-arm64.yml
View file

@ -2,7 +2,7 @@ productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "normal"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
copyright: "© 2020-present Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}-arm64.${ext}"
extraMetadata:
main: "electron/main.js"

2
app/electron-builder-darwin.yml
View file

@ -2,7 +2,7 @@ productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "normal"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
copyright: "© 2020-present Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}.${ext}"
extraMetadata:
main: "electron/main.js"

4
app/electron-builder-linux-arm64.yml
View file

@ -1,8 +1,8 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
compression: "normal"
copyright: "© 2020-present Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}-arm64.${ext}"
extraMetadata:
main: "electron/main.js"

4
app/electron-builder-linux.yml
View file

@ -1,8 +1,8 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
compression: "normal"
copyright: "© 2020-present Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}.${ext}"
extraMetadata:
main: "electron/main.js"

4
app/electron-builder.yml
View file

@ -1,8 +1,8 @@
productName: "SiYuan"
appId: "org.b3log.siyuan"
asar: false
compression: "store"
copyright: "© 2024 Yunnan Liandi Technology Co., Ltd."
compression: "normal"
copyright: "© 2020-present Yunnan Liandi Technology Co., Ltd."
artifactName: "siyuan-${version}-${os}.${ext}"
extraMetadata:
main: "electron/main.js"

22
app/src/protyle/render/av/row.ts
View file

@ -2,13 +2,7 @@ import {hasClosestBlock, hasClosestByClassName} from "../../util/hasClosest";
import {focusBlock} from "../../util/selection";
import {Menu} from "../../../plugin/Menu";
import {transaction} from "../../wysiwyg/transaction";
import {
genCellValue,
genCellValueByElement,
getTypeByCellElement,
renderCell,
renderCellAttr
} from "./cell";
import {genCellValue, genCellValueByElement, getTypeByCellElement, renderCell, renderCellAttr} from "./cell";
import {fetchPost} from "../../../util/fetch";
import * as dayjs from "dayjs";
import {Constants} from "../../../constants";
@ -268,6 +262,20 @@ export const setPageSize = (options: {
return;
}
const currentPageSize = options.target.dataset.size;
menu.addItem({
iconHTML: "",
label: "5",
checked: currentPageSize === "5",
click() {
updatePageSize({
currentPageSize,
newPageSize: "5",
protyle: options.protyle,
avID: options.avID,
nodeElement: options.nodeElement
});
}
});
menu.addItem({
iconHTML: "",
label: "10",

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

File diff suppressed because one or more lines are too long