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

This commit is contained in:
Vanessa 2023-05-22 22:01:01 +08:00
commit e5641b1d39
8 changed files with 124 additions and 11 deletions

View file

@ -1,4 +1,5 @@
{
"enablePluginTip": "Do you need to enable this plugin now? You can enable, disable or uninstall it later in [Downloaded - Plugins]",
"color": "Color",
"confirmPassword": "I have already remembered the password",
"passwordNoMatch": "The passwords entered twice do not match",

View file

@ -1,4 +1,5 @@
{
"enablePluginTip": "¿Necesita habilitar este complemento ahora? Puede habilitarlo, deshabilitarlo o desinstalarlo más tarde en [Descargado - Complemento]",
"color": "Color",
"confirmPassword": "Ya he recordado la contraseña",
"passwordNoMatch": "Las contraseñas ingresadas dos veces no coinciden",

View file

@ -1,4 +1,5 @@
{
"enablePluginTip": "Avez-vous besoin d'activer ce plugin maintenant ? Vous pouvez l'activer, le désactiver ou le désinstaller plus tard dans [Téléchargé - Plugin]",
"color": "Couleur",
"confirmPassword": "J'ai déjà retenu le mot de passe",
"passwordNoMatch": "Les mots de passe saisis deux fois ne correspondent pas",

View file

@ -1,4 +1,5 @@
{
"enablePluginTip": "現在需要啟用該插件嗎?後續可以在 [已下載 - 插件] 中進行啟用、禁用或者卸載",
"color": "顏色",
"confirmPassword": "我已經牢記密碼了",
"passwordNoMatch": "兩次輸入的密碼不一致",

View file

@ -1,4 +1,5 @@
{
"enablePluginTip": "现在需要启用该插件吗?后续可以在 [已下载 - 插件] 中进行启用、禁用或者卸载",
"color": "颜色",
"confirmPassword": "我已经牢记密码了",
"passwordNoMatch": "两次输入的密码不一致",

52
app/changelogs/v2.8.9.md Normal file
View file

@ -0,0 +1,52 @@
## Overview
This is a bug fix version, it is recommended to upgrade.
###
The last version to support these old systems is the next version v2.8.10, and later versions will no longer support Windows 7, 8 and Server 2012, please upgrade to Windows 10 and above.
## Changelogs
Below are the detailed changes in this version.
### Enhancement
* [Support block setting font size](https://github.com/siyuan-note/siyuan/issues/7973)
* [Holding `Shift` to hover a block ref to show backlinks of it](https://github.com/siyuan-note/siyuan/issues/7999)
* [Put some existing plugins on the community marketplace](https://github.com/siyuan-note/siyuan/issues/8042)
* [Remove debugging info `Need remove unused code` on the mobile](https://github.com/siyuan-note/siyuan/issues/8272)
* [Improve search result highlight and positioning](https://github.com/siyuan-note/siyuan/issues/8274)
* [Widgets search supports symlink subdirectory](https://github.com/siyuan-note/siyuan/pull/8276)
* [No more quote font optimization](https://github.com/siyuan-note/siyuan/issues/8281)
* [Support for embedding images when exporting EPUB, ODT and RTF](https://github.com/siyuan-note/siyuan/issues/8288)
* [Improve `Paste` and `Paste as plain text`](https://github.com/siyuan-note/siyuan/issues/8289)
* [Inbox support move to path and copy content](https://github.com/siyuan-note/siyuan/issues/8296)
* [Do not URL-encode hyperlink when importing Markdown](https://github.com/siyuan-note/siyuan/issues/8302)
* [Clicking on the editor does not move the cursor after editing link, block ref and file annotation](https://github.com/siyuan-note/siyuan/issues/8315)
* [Blocks below other non-folded headings are no longer moved when moving a folded heading](https://github.com/siyuan-note/siyuan/issues/8321)
* [Improve the position and size of the main window after desktop initialization](https://github.com/siyuan-note/siyuan/issues/8326)
### Abolishment
* [Remove automatic update on Linux](https://github.com/siyuan-note/siyuan/issues/8275)
### Bugfix
* [Export doc is incomplete](https://github.com/siyuan-note/siyuan/issues/8279)
* [Custom sorting not maintained after importing .sy.zip](https://github.com/siyuan-note/siyuan/issues/8283)
* [Document dynamic loading is incomplete](https://github.com/siyuan-note/siyuan/issues/8285)
* [Parse exceptions when copying and pasting hyperlink whose address contains `"`](https://github.com/siyuan-note/siyuan/issues/8290)
* [Pasting another ref before or after an existing ref should not merge](https://github.com/siyuan-note/siyuan/issues/8309)
* [The mobile cannot be opened normally In some cases](https://github.com/siyuan-note/siyuan/issues/8320)
### Document
* [Update doc of kernel API `insertBlock`](https://github.com/siyuan-note/siyuan/issues/8270)
* [Add "The latest progress" chapter to user guide](https://github.com/siyuan-note/siyuan/issues/8306)
### Development
* [Improve plugin API `loadData`](https://github.com/siyuan-note/siyuan/issues/8273)
* [Plugin API `onunload` not being called](https://github.com/siyuan-note/siyuan/issues/8277)
* [Add plugin sample template with vite and svelte](https://github.com/siyuan-note/siyuan/issues/8311)

View file

@ -0,0 +1,52 @@
## 概述
这是一个消缺版本,建议升级。
### 即将不再支持 Windows 7、8 和 Server 2012
最后一个支持这些老旧系统的版本是下个版本 v2.8.10,以后发布的版本将不再支持 Windows 7、8 和 Server 2012 如有可能请尽快升级到 Windows 10 或更高版本。
## 变更记录
以下是此版本中的详细更改。
### 改进功能
* [支持块设置字体大小](https://github.com/siyuan-note/siyuan/issues/7973)
* [按住 `Shift` 后鼠标悬浮块引用查看反链](https://github.com/siyuan-note/siyuan/issues/7999)
* [社区集市上线一些插件](https://github.com/siyuan-note/siyuan/issues/8042)
* [删除移动端调试信息 `Need remove unused code`](https://github.com/siyuan-note/siyuan/issues/8272)
* [改进搜索结果在预览区的高亮和定位](https://github.com/siyuan-note/siyuan/issues/8274)
* [挂件搜索支持符号链接](https://github.com/siyuan-note/siyuan/pull/8276)
* [不再使用 quote 字体优化](https://github.com/siyuan-note/siyuan/issues/8281)
* [支持导出 EPUB、ODT 和 RTF 时嵌入图片](https://github.com/siyuan-note/siyuan/issues/8288)
* [改进 `粘贴` 和 `粘贴为纯文本`](https://github.com/siyuan-note/siyuan/issues/8289)
* [云端收集箱支持移动到具体路径和复制内容](https://github.com/siyuan-note/siyuan/issues/8296)
* [导入 Markdown 时不再使用 URL 编码超链接地址](https://github.com/siyuan-note/siyuan/issues/8302)
* [点击编辑器时不再将光标移到链接、引用后](https://github.com/siyuan-note/siyuan/issues/8315)
* [移动折叠标题时不再移动其他非折叠标题的下方块](https://github.com/siyuan-note/siyuan/issues/8321)
* [改进桌面端初始化后主窗口的位置和大小](https://github.com/siyuan-note/siyuan/issues/8326)
### 移除功能
* [移除 Linux 端自动更新](https://github.com/siyuan-note/siyuan/issues/8275)
### 修复缺陷
* [导出文档不完整](https://github.com/siyuan-note/siyuan/issues/8279)
* [导入 .sy.zip 后自定义排序丢失](https://github.com/siyuan-note/siyuan/issues/8283)
* [文档动态加载不完整](https://github.com/siyuan-note/siyuan/issues/8285)
* [复制粘贴包含 `"` 的超链接时解析移除](https://github.com/siyuan-note/siyuan/issues/8290)
* [在已有引用前后粘贴引用后不应该合并](https://github.com/siyuan-note/siyuan/issues/8309)
* [移动端在某些情况下显示空白](https://github.com/siyuan-note/siyuan/issues/8320)
### 文档
* [更新内核 API `insertBlock`](https://github.com/siyuan-note/siyuan/issues/8270)
* [在用户指南中添加 最新进展 章节](https://github.com/siyuan-note/siyuan/issues/8306)
### 开发者
* [改进插件 API `loadData`](https://github.com/siyuan-note/siyuan/issues/8273)
* [插件 API `onunload` 未被调用](https://github.com/siyuan-note/siyuan/issues/8277)
* [发布使用 Vite 和 Svelte 的插件样例模板库](https://github.com/siyuan-note/siyuan/issues/8311)

View file

@ -134,8 +134,8 @@ const showErrorWindow = (title, content) => {
errorHTMLPath = path.join(appDir, "electron", "error.html");
}
const errWindow = new BrowserWindow({
width: screen.getPrimaryDisplay().size.width / 2,
height: screen.getPrimaryDisplay().workAreaSize.height / 2,
width: Math.floor(screen.getPrimaryDisplay().size.width / 2),
height: Math.floor(screen.getPrimaryDisplay().workAreaSize.height / 2),
frame: false,
icon: path.join(appDir, "stage", "icon-large.png"),
webPreferences: {
@ -179,25 +179,30 @@ const writeLog = (out) => {
};
const boot = () => {
let windowStateInitialized = true;
// 恢复主窗体状态
let oldWindowState = {};
try {
oldWindowState = JSON.parse(fs.readFileSync(windowStatePath, "utf8"));
if (!oldWindowState.x) {
windowStateInitialized = false;
}
} catch (e) {
fs.writeFileSync(windowStatePath, "{}");
windowStateInitialized = false;
}
let defaultWidth;
let defaultHeight;
let workArea;
try {
defaultWidth = screen.getPrimaryDisplay().size.width;
defaultHeight = screen.getPrimaryDisplay().workAreaSize.height;
defaultWidth = Math.floor(screen.getPrimaryDisplay().size.width * 0.8);
defaultHeight = Math.floor(screen.getPrimaryDisplay().workAreaSize.height * 0.8);
workArea = screen.getPrimaryDisplay().workArea;
} catch (e) {
console.error(e);
}
const windowState = Object.assign({}, {
isMaximized: true,
isMaximized: false,
fullscreen: false,
isDevToolsOpened: false,
x: 0,
@ -244,8 +249,6 @@ const boot = () => {
height: windowState.height,
minWidth: 493,
minHeight: 376,
x,
y,
fullscreenable: true,
fullscreen: windowState.fullscreen,
trafficLightPosition: {x: 8, y: 8},
@ -260,6 +263,7 @@ const boot = () => {
titleBarStyle: "hidden",
icon: path.join(appDir, "stage", "icon-large.png"),
});
windowStateInitialized? currentWindow.setPosition(x, y): currentWindow.center();
require("@electron/remote/main").enable(currentWindow.webContents);
currentWindow.webContents.userAgent = "SiYuan/" + appVer + " https://b3log.org/siyuan Electron";
@ -396,8 +400,8 @@ const showWindow = (wnd) => {
const initKernel = (workspace, port, lang) => {
return new Promise(async (resolve) => {
bootWindow = new BrowserWindow({
width: screen.getPrimaryDisplay().size.width / 2,
height: screen.getPrimaryDisplay().workAreaSize.height / 2,
width: Math.floor(screen.getPrimaryDisplay().size.width / 2),
height: Math.floor(screen.getPrimaryDisplay().workAreaSize.height / 2),
frame: false,
icon: path.join(appDir, "stage", "icon-large.png"),
transparent: "linux" !== process.platform,
@ -799,8 +803,8 @@ app.whenReady().then(() => {
if (firstOpen) {
const firstOpenWindow = new BrowserWindow({
width: screen.getPrimaryDisplay().size.width * 0.6,
height: screen.getPrimaryDisplay().workAreaSize.height * 0.8,
width: Math.floor(screen.getPrimaryDisplay().size.width * 0.6),
height: Math.floor(screen.getPrimaryDisplay().workAreaSize.height * 0.8),
frame: false,
icon: path.join(appDir, "stage", "icon-large.png"),
transparent: "linux" !== process.platform,