From b35950b95770eaac7c808fc3c422155d669c0d95 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 12 Jun 2023 12:04:28 +0800 Subject: [PATCH 1/7] :art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521 --- kernel/api/sync.go | 1 + kernel/model/repository.go | 2 +- kernel/model/sync.go | 6 +++--- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/kernel/api/sync.go b/kernel/api/sync.go index ba5c44733..5bd16e1a9 100644 --- a/kernel/api/sync.go +++ b/kernel/api/sync.go @@ -39,6 +39,7 @@ func getSyncInfo(c *gin.Context) { "synced": model.Conf.Sync.Synced, "stat": stat, "kernels": model.GetOnlineKernels(), + "kernel": model.KernelID, } } diff --git a/kernel/model/repository.go b/kernel/model/repository.go index 8006de932..9ea0670c9 100644 --- a/kernel/model/repository.go +++ b/kernel/model/repository.go @@ -1175,7 +1175,7 @@ func syncRepo(exit, byHand bool) (err error) { Conf.Save() autoSyncErrCount = 0 logging.LogInfof("synced data repo [kernel=%s, provider=%d, ufc=%d, dfc=%d, ucc=%d, dcc=%d, ub=%s, db=%s] in [%.2fs]", - kernelID, Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds()) + KernelID, Conf.Sync.Provider, trafficStat.UploadFileCount, trafficStat.DownloadFileCount, trafficStat.UploadChunkCount, trafficStat.DownloadChunkCount, humanize.Bytes(uint64(trafficStat.UploadBytes)), humanize.Bytes(uint64(trafficStat.DownloadBytes)), elapsed.Seconds()) processSyncMergeResult(exit, byHand, start, mergeResult) return diff --git a/kernel/model/sync.go b/kernel/model/sync.go index f3626c5c7..5f9f4c86c 100644 --- a/kernel/model/sync.go +++ b/kernel/model/sync.go @@ -623,7 +623,7 @@ func GetOnlineKernels() (ret []*OnlineKernel) { tmp := onlineKernels onlineKernelsLock.Unlock() for _, kernel := range tmp { - if kernel.ID == kernelID { + if kernel.ID == KernelID { continue } @@ -740,14 +740,14 @@ func connectSyncWebSocket() { }() } -var kernelID = gulu.Rand.String(7) +var KernelID = gulu.Rand.String(7) func dialSyncWebSocket() (c *websocket.Conn, err error) { //endpoint := "ws://127.0.0.1:64388" + "/apis/siyuan/dejavu/ws" endpoint := util.AliyunWebSocketServer + "/apis/siyuan/dejavu/ws" header := http.Header{ "x-siyuan-uid": []string{Conf.User.UserId}, - "x-siyuan-kernel": []string{kernelID}, + "x-siyuan-kernel": []string{KernelID}, "x-siyuan-ver": []string{util.Ver}, "x-siyuan-os": []string{runtime.GOOS}, "x-siyuan-hostname": []string{util.GetDeviceName()}, From b4a93ea79920596256b693e7f4808f66b45789ab Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 12 Jun 2023 12:05:46 +0800 Subject: [PATCH 2/7] :art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521 --- app/src/layout/topBar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index 92efbc3c8..da52791b9 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -240,7 +240,7 @@ 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" + html = window.siyuan.languages._kernel[82].replace("%s", dayjs(response.data.synced).format("YYYY-MM-DD HH:mm")) + " " + response.data.kernel + "\n\n" response.data.kernels.forEach((item: { os: string; ver: string; From 9fc86593f4d033d49c7abf9d735e01279d73c0d0 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 12 Jun 2023 12:09:13 +0800 Subject: [PATCH 3/7] :art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521 --- app/src/layout/topBar.ts | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index da52791b9..203ec796f 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -240,19 +240,19 @@ 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")) + " " + response.data.kernel + "\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` - }) - if (response.data.kernels.length > 0) { - html += "\n" - } + html = window.siyuan.languages._kernel[82].replace("%s", dayjs(response.data.synced).format("YYYY-MM-DD HH:mm")) + " " + response.data.kernel + "\n" html += response.data.stat; + if (response.data.kernels.length > 0) { + response.data.kernels.forEach((item: { + os: string; + ver: string; + hostname: string; + id: string; + }) => { + html += "\n\n" + html += `${item.os}-${item.ver} ${item.hostname} ${item.id}\n` + }) + } } barSyncElement.setAttribute("aria-label", escapeAttr(html)); }) From a64b95f98ecb07df5d2e98922f3fdb7febb47b07 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 12 Jun 2023 12:09:27 +0800 Subject: [PATCH 4/7] :art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521 --- app/src/layout/topBar.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index 203ec796f..83d58707b 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -243,13 +243,13 @@ export const initBar = (app: App) => { html = window.siyuan.languages._kernel[82].replace("%s", dayjs(response.data.synced).format("YYYY-MM-DD HH:mm")) + " " + response.data.kernel + "\n" html += response.data.stat; if (response.data.kernels.length > 0) { + html += "\n\n" response.data.kernels.forEach((item: { os: string; ver: string; hostname: string; id: string; }) => { - html += "\n\n" html += `${item.os}-${item.ver} ${item.hostname} ${item.id}\n` }) } From 85f3bfa51f04a93e771d7f043d55bc4ede6c1a02 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 12 Jun 2023 12:23:14 +0800 Subject: [PATCH 5/7] :art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521 --- app/appearance/langs/en_US.json | 2 ++ app/appearance/langs/es_ES.json | 2 ++ app/appearance/langs/fr_FR.json | 2 ++ app/appearance/langs/zh_CHT.json | 2 ++ app/appearance/langs/zh_CN.json | 2 ++ app/src/layout/topBar.ts | 8 +++++--- app/src/types/index.d.ts | 1 + 7 files changed, 16 insertions(+), 3 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 0516f85e2..3b3a635a3 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1,4 +1,6 @@ { + "currentKernel": "Current kernel", + "otherOnlineKernels": "Other online kernels", "syncPerception": "⚗\uFE0F Sync perception", "syncPerceptionTip": "After enabling, it will automatically receive and send data sync signals, so that data sync can be performed for all online devices as much as possible in real time (this feature is currently in the experimental stage)", "hide": "Hide", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 52665c6c6..c2471c7ba 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1,4 +1,6 @@ { + "currentKernel": "Núcleo actual", + "otherOnlineKernels": "Otros núcleos en línea", "syncPerception": "⚗\uFE0F Percepción de sincronización", "syncPerceptionTip": "Después de habilitarlo, automáticamente recibirá y enviará señales de sincronización de datos, de modo que la sincronización de datos se pueda realizar para todos los dispositivos en línea tanto como sea posible en tiempo real (esta función se encuentra actualmente en etapa experimental)", "hide": "Ocultar", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index d0c904507..d97cdca95 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1,4 +1,6 @@ { + "currentKernel": "Noyau actuel", + "otherOnlineKernels": "Autres noyaux en ligne", "syncPerception": "⚗\uFE0F Perception de la synchronisation", "syncPerceptionTip": "Après l'activation, il recevra et enverra automatiquement des signaux de synchronisation des données, afin que la synchronisation des données puisse être effectuée pour tous les appareils en ligne autant que possible en temps réel (cette fonctionnalité est actuellement en phase expérimentale)", "hide": "Masquer", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 6285f140e..34b2c23dc 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1,4 +1,6 @@ { + "currentKernel": "當前內核", + "otherOnlineKernels": "其他聯機內核", "syncPerception": "⚗\uFE0F 同步感知", "syncPerceptionTip": "啟用後將自動接收和發送數據同步信號,這樣可以盡量實時地為所有在線設備進行數據同步(該特性目前處於實驗階段)", "hide": "隱藏", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index 1bd1de0f7..a64601e37 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1,4 +1,6 @@ { + "currentKernel": "当前内核", + "otherOnlineKernels": "其他联机内核", "syncPerception": "⚗\uFE0F 同步感知", "syncPerceptionTip": "启用后将自动接收和发送数据同步信号,这样可以尽量实时地为所有在线设备进行数据同步(该特性目前处于实验阶段)", "hide": "隐藏", diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index 83d58707b..336e3eb34 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -240,17 +240,19 @@ 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")) + " " + response.data.kernel + "\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\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.os}-${item.ver} ${item.hostname} ${item.id}\n` + html += ` ${item.id}/${item.ver} (${item.os}/${item.hostname}) \n` }) } } diff --git a/app/src/types/index.d.ts b/app/src/types/index.d.ts index d56ad65ed..54e6321fd 100644 --- a/app/src/types/index.d.ts +++ b/app/src/types/index.d.ts @@ -555,6 +555,7 @@ interface IConfig { port: string scheme: string } + name: string kernelVersion: string isInsider: boolean appDir: string From ce7ee61d4702e6dde06921acca824ab1ffffb9ef Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 12 Jun 2023 12:25:48 +0800 Subject: [PATCH 6/7] :art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521 --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 3b3a635a3..37e632713 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1114,7 +1114,7 @@ "147": "Created a new data snapshot, took %.2fs", "148": "Checked the data snapshot and found no changes, took %.2fs", "149": "Data snapshot has been synchronized, took %.2fs", - "150": "Uploaded/Downloaded files %d/%d\nUploaded/Downloaded chunks %d/%d\nSent/Received bytes %s/%s", + "150": " Uploaded/Downloaded files %d/%d\n Uploaded/Downloaded chunks %d/%d\n Sent/Received bytes %s/%s", "151": "Do not include symbols \\ / : * ? " ' < > |", "152": "Uploaded files %d, chunks %d, sent bytes %s", "153": "Downloaded files %d, chunks %d, received bytes %s", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index c2471c7ba..6b3691878 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1114,7 +1114,7 @@ "147": "Creó una nueva instantánea de datos, tomó %.2fs", "148": "Se ha comprobado la instantánea de los datos y no se encontro ningún cambio, tomó %.2fs", "149": "La instantánea de datos ha sido sincronizada, ha tomado %.2fs", - "150": "Archivos cargados/descargados %d/%d\nFragmentos cargados/descargados %d/%d\nBytes enviados/recibidos %s/%s", + "150": " Archivos cargados/descargados %d/%d\n Fragmentos cargados/descargados %d/%d\n Bytes enviados/recibidos %s/%s", "151": "No incluir símbolos \\ / : * ? " ' < > |", "152": "Archivos cargados %d, fragmentos %d, bytes enviados %s", "153": "Archivos descargados %d, fragmentos %d, bytes recibidos %s", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index d97cdca95..27563d676 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1114,7 +1114,7 @@ "147": "Créé un nouvel instantané de données, a pris %.2fs", "148": "Vérifié l'instantané des données et n'a trouvé aucun changement, a pris %.2fs", "149": "L'instantané des données a été synchronisé, a pris %.2fs", - "150": "Fichiers chargés/téléchargés %d/%d\nMorceaux chargés/téléchargés %d/%d\nOctets envoyés/reçus %s/%s", + "150": " Fichiers chargés/téléchargés %d/%d\n Morceaux chargés/téléchargés %d/%d\n Octets envoyés/reçus %s/%s", "151": "Ne pas inclure les symboles \\ / : * ? " ' < > |", "152": "Fichiers téléchargés %d, morceaux %d, octets envoyés %s", "153": "Fichiers chargés %d, morceaux %d, octets reçus %s", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 34b2c23dc..70b5af3cd 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1114,7 +1114,7 @@ "147": "創建了一個新的數據快照,耗時 %.2fs", "148": "檢查數據快照,沒有發現任何變化,耗時 %.2fs", "149": "已經同步數據快照,耗時 %.2fs", - "150": "上傳/下載文件數 %d/%d\n上傳/下載分塊數 %d/%d\n發送/接收字節數 %s/%s", + "150": " 上傳/下載文件數 %d/%d\n 上傳/下載分塊數 %d/%d\n 發送/接收字節數 %s/%s", "151": "請勿包含符號 \\ / : * ? " ' < > |", "152": "上傳文件數 %d 上傳分塊數 %d 發送字節數 %s", "153": "下載文件數 %d 下載分塊數 %d 接收字節數 %s", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index a64601e37..f3b7306e8 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1116,7 +1116,7 @@ "147": "创建了一个新的数据快照,耗时 %.2fs", "148": "检查数据快照,没有发现任何变化,耗时 %.2fs", "149": "已经同步数据快照,耗时 %.2fs", - "150": "上传/下载文件数 %d/%d\n上传/下载分块数 %d/%d\n发送/接收字节数 %s/%s", + "150": " 上传/下载文件数 %d/%d\n 上传/下载分块数 %d/%d\n 发送/接收字节数 %s/%s", "151": "请勿包含符号 \\ / : * ? " ' < > |", "152": "上传文件数 %d 上传分块数 %d 发送字节数 %s", "153": "下载文件数 %d 下载分块数 %d 接收字节数 %s", From 308b82db791fc88e5b315aeb443e0c3b3e3ef137 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Mon, 12 Jun 2023 12:30:23 +0800 Subject: [PATCH 7/7] :art: Improve the mouse hove data sync button information on the desktop and browser https://github.com/siyuan-note/siyuan/issues/8521 --- app/appearance/langs/en_US.json | 2 +- app/appearance/langs/es_ES.json | 2 +- app/appearance/langs/fr_FR.json | 2 +- app/appearance/langs/zh_CHT.json | 2 +- app/appearance/langs/zh_CN.json | 2 +- app/src/layout/topBar.ts | 3 ++- 6 files changed, 7 insertions(+), 6 deletions(-) diff --git a/app/appearance/langs/en_US.json b/app/appearance/langs/en_US.json index 37e632713..680ca10f8 100644 --- a/app/appearance/langs/en_US.json +++ b/app/appearance/langs/en_US.json @@ -1114,7 +1114,7 @@ "147": "Created a new data snapshot, took %.2fs", "148": "Checked the data snapshot and found no changes, took %.2fs", "149": "Data snapshot has been synchronized, took %.2fs", - "150": " Uploaded/Downloaded files %d/%d\n Uploaded/Downloaded chunks %d/%d\n Sent/Received bytes %s/%s", + "150": "uploaded/downloaded files %d/%d\n uploaded/downloaded chunks %d/%d\n sent/received bytes %s/%s", "151": "Do not include symbols \\ / : * ? " ' < > |", "152": "Uploaded files %d, chunks %d, sent bytes %s", "153": "Downloaded files %d, chunks %d, received bytes %s", diff --git a/app/appearance/langs/es_ES.json b/app/appearance/langs/es_ES.json index 6b3691878..23f30c232 100644 --- a/app/appearance/langs/es_ES.json +++ b/app/appearance/langs/es_ES.json @@ -1114,7 +1114,7 @@ "147": "Creó una nueva instantánea de datos, tomó %.2fs", "148": "Se ha comprobado la instantánea de los datos y no se encontro ningún cambio, tomó %.2fs", "149": "La instantánea de datos ha sido sincronizada, ha tomado %.2fs", - "150": " Archivos cargados/descargados %d/%d\n Fragmentos cargados/descargados %d/%d\n Bytes enviados/recibidos %s/%s", + "150": "archivos cargados/descargados %d/%d\n fragmentos cargados/descargados %d/%d\n bytes enviados/recibidos %s/%s", "151": "No incluir símbolos \\ / : * ? " ' < > |", "152": "Archivos cargados %d, fragmentos %d, bytes enviados %s", "153": "Archivos descargados %d, fragmentos %d, bytes recibidos %s", diff --git a/app/appearance/langs/fr_FR.json b/app/appearance/langs/fr_FR.json index 27563d676..e03c1e8cf 100644 --- a/app/appearance/langs/fr_FR.json +++ b/app/appearance/langs/fr_FR.json @@ -1114,7 +1114,7 @@ "147": "Créé un nouvel instantané de données, a pris %.2fs", "148": "Vérifié l'instantané des données et n'a trouvé aucun changement, a pris %.2fs", "149": "L'instantané des données a été synchronisé, a pris %.2fs", - "150": " Fichiers chargés/téléchargés %d/%d\n Morceaux chargés/téléchargés %d/%d\n Octets envoyés/reçus %s/%s", + "150": "fichiers chargés/téléchargés %d/%d\n morceaux chargés/téléchargés %d/%d\n octets envoyés/reçus %s/%s", "151": "Ne pas inclure les symboles \\ / : * ? " ' < > |", "152": "Fichiers téléchargés %d, morceaux %d, octets envoyés %s", "153": "Fichiers chargés %d, morceaux %d, octets reçus %s", diff --git a/app/appearance/langs/zh_CHT.json b/app/appearance/langs/zh_CHT.json index 70b5af3cd..ac6d8a231 100644 --- a/app/appearance/langs/zh_CHT.json +++ b/app/appearance/langs/zh_CHT.json @@ -1114,7 +1114,7 @@ "147": "創建了一個新的數據快照,耗時 %.2fs", "148": "檢查數據快照,沒有發現任何變化,耗時 %.2fs", "149": "已經同步數據快照,耗時 %.2fs", - "150": " 上傳/下載文件數 %d/%d\n 上傳/下載分塊數 %d/%d\n 發送/接收字節數 %s/%s", + "150": "上傳/下載文件數 %d/%d\n 上傳/下載分塊數 %d/%d\n 發送/接收字節數 %s/%s", "151": "請勿包含符號 \\ / : * ? " ' < > |", "152": "上傳文件數 %d 上傳分塊數 %d 發送字節數 %s", "153": "下載文件數 %d 下載分塊數 %d 接收字節數 %s", diff --git a/app/appearance/langs/zh_CN.json b/app/appearance/langs/zh_CN.json index f3b7306e8..80c65ac7c 100644 --- a/app/appearance/langs/zh_CN.json +++ b/app/appearance/langs/zh_CN.json @@ -1116,7 +1116,7 @@ "147": "创建了一个新的数据快照,耗时 %.2fs", "148": "检查数据快照,没有发现任何变化,耗时 %.2fs", "149": "已经同步数据快照,耗时 %.2fs", - "150": " 上传/下载文件数 %d/%d\n 上传/下载分块数 %d/%d\n 发送/接收字节数 %s/%s", + "150": "上传/下载文件数 %d/%d\n 上传/下载分块数 %d/%d\n 发送/接收字节数 %s/%s", "151": "请勿包含符号 \\ / : * ? " ' < > |", "152": "上传文件数 %d 上传分块数 %d 发送字节数 %s", "153": "下载文件数 %d 下载分块数 %d 接收字节数 %s", diff --git a/app/src/layout/topBar.ts b/app/src/layout/topBar.ts index 336e3eb34..305d5f66c 100644 --- a/app/src/layout/topBar.ts +++ b/app/src/layout/topBar.ts @@ -241,8 +241,9 @@ export const initBar = (app: App) => { html = response.data.stat; } else { html = window.siyuan.languages._kernel[82].replace("%s", dayjs(response.data.synced).format("YYYY-MM-DD HH:mm")) + "\n" - html += response.data.stat; + 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"