Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2026-02-09 16:54:21 +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 2023-06-12 12:42:42 +08:00
commit 5560fd03c8
10 changed files with 34 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/src/layout/topBar.ts
View file

@ -240,19 +240,22 @@ export const initBar = (app: App) => {
if (!window.siyuan.config.sync.enabled || (0 === window.siyuan.config.sync.provider && needSubscribe(""))) {
html = response.data.stat;
} else {
html = window.siyuan.languages._kernel[82].replace("%s", dayjs(response.data.synced).format("YYYY-MM-DD HH:mm")) + "\n\n"
response.data.kernels.forEach((item: {
os: string;
ver: string;
hostname: string;
id: string;
}) => {
html += `${item.os}-${item.ver} ${item.hostname} ${item.id}\n`
})
html = window.siyuan.languages._kernel[82].replace("%s", dayjs(response.data.synced).format("YYYY-MM-DD HH:mm")) + "\n"
html += " " + response.data.stat;
if (response.data.kernels.length > 0) {
html += "\n"
html += window.siyuan.languages.currentKernel + "\n"
html += " " + response.data.kernel + "/" + window.siyuan.config.system.kernelVersion + " (" + window.siyuan.config.system.os + "/" + window.siyuan.config.system.name + ")\n"
html += window.siyuan.languages.otherOnlineKernels + "\n"
response.data.kernels.forEach((item: {
os: string;
ver: string;
hostname: string;
id: string;
}) => {
html += ` ${item.id}/${item.ver} (${item.os}/${item.hostname}) \n`
})
}
html += response.data.stat;
}
barSyncElement.setAttribute("aria-label", escapeAttr(html));
})

1
app/src/types/index.d.ts vendored
View file

@ -555,6 +555,7 @@ interface IConfig {
port: string
scheme: string
}
name: string
kernelVersion: string
isInsider: boolean
appDir: string