release: 发布 v0.5.1
新增能力:内置 4 套红头、3 套正式文档和 3 套标书主题,支持主题推荐页边距、页面装饰、页眉页脚和页码;增加结构化公文、项目报告及标书 Front Matter,内置 Fandol 中文字体、两份教程和 14 份主题示例。 桌面工作流:重组更多菜单,增加新建、保存、另存为快捷键和未保存确认;另存为后跟随新路径,主题示例自动切换主题,Desktop 发行包完整携带教程、示例与字体。 问题修复:修正红头标题居中与正式文档字体;围栏代码按正文宽度自动换行,长内容安全断行,至少两行即可在当前页分页,并统一保留 8px 左侧内容留白;Docker Web 镜像正确打包 samples。 兼容与部署:未声明主题推荐设置时继续使用 16mm 默认页边距;Web 隐藏不适用的另存为。正式镜像 yixiong/md-to-pdf:v0.5.1 内容 ID 为 sha256:72f519a69bfd6cb2f6df30c2be938e58ceb6f20e4748a32551874de3d436b276,Compose 健康运行。 验证结果:最终修复前 65 个测试文件、286 项测试通过,最终代码块与主题定向测试 27 项通过;全项目类型检查、生产构建和 git diff --check 通过。容器检出 14 套主题、17 份 Markdown,代码块回归 PDF 为 2 页且无越界。NSIS SHA-256 为 676CCE73D782B0B15AC6BC68F253CFBC4740383583E4DAA98F746EDF9999C5CC,ZIP SHA-256 为 82BF6ADF1200604F145CC86FA3ED193955CF6741EBEE3DF8953483515CFF621F。
This commit is contained in:
@@ -14,10 +14,11 @@ preload、进程内应用服务、原生 Markdown 打开与保存、同目录图
|
||||
窗口每次获得焦点时会检查源文件是否被其他程序修改。检测到变化后提示
|
||||
重新加载,避免阅读或导出磁盘旧版本。
|
||||
|
||||
“打开 Markdown”是顶部独立主操作;新建文档、保存 Markdown 和打开
|
||||
自定义主题目录收纳在“更多”菜单中。新建文档未保存时显示“未命名文档”,
|
||||
“打开 Markdown”是顶部独立主操作;新建、保存、另存为、教程、主题示例
|
||||
和自定义主题目录统一收纳在“更多”分区菜单中。新建文档未保存时显示“未命名文档”,
|
||||
首次保存默认使用一级标题作为文件名;没有一级标题时使用首行文本,并会
|
||||
自动清理 Windows 非法文件名字符。新文档无需先保存即可直接导出 PDF。
|
||||
自动清理 Windows 非法文件名字符。“另存为”完成后当前窗口会追踪新文件,
|
||||
行为与常见办公软件一致。新文档无需先保存即可直接导出 PDF。
|
||||
|
||||
## 开发
|
||||
|
||||
@@ -45,8 +46,8 @@ Markdown ECharts、Core、Renderer、Application、Preview Engine 和 Web,
|
||||
然后才复制 `apps/web/dist`。不得绕过该链路直接调用 electron-builder。
|
||||
|
||||
版本化目录包、NSIS `Setup.exe` 和 ZIP 输出到
|
||||
`apps/desktop/out/v0.5.0/`。该目录被 Git 忽略。公司内部分发以
|
||||
`md-to-pdf-0.5.0-x86_64-Setup.exe` 为正式安装包,ZIP 作为免安装
|
||||
`apps/desktop/out/v0.5.1/`。该目录被 Git 忽略。公司内部分发以
|
||||
`md-to-pdf-0.5.1-x86_64-Setup.exe` 为正式安装包,ZIP 作为免安装
|
||||
辅助包;当前未配置代码签名,Windows 首次运行可能显示“未知发布者”
|
||||
提示。
|
||||
|
||||
|
||||
@@ -30,6 +30,11 @@ module.exports = {
|
||||
to: "themes",
|
||||
filter: ["**/*"]
|
||||
},
|
||||
{
|
||||
from: "../../samples",
|
||||
to: "samples",
|
||||
filter: ["**/*"]
|
||||
},
|
||||
{
|
||||
from: windowsIcon,
|
||||
to: "app.ico"
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@md-to-pdf/desktop",
|
||||
"version": "0.5.0",
|
||||
"version": "0.5.1",
|
||||
"private": true,
|
||||
"productName": "Markdown PDF 导出器",
|
||||
"description": "Markdown PDF 导出器桌面端",
|
||||
|
||||
@@ -3,6 +3,7 @@ import type { PagedDocumentPayload } from "@md-to-pdf/core";
|
||||
import type { MarkdownRenderRequest } from "@md-to-pdf/application";
|
||||
import {
|
||||
DESKTOP_CONSUME_PENDING_MARKDOWN,
|
||||
DESKTOP_CREATE_NEW_WINDOW,
|
||||
DESKTOP_DISCARD_PENDING_MARKDOWN,
|
||||
DESKTOP_GET_THEME_CSS,
|
||||
DESKTOP_GENERATE_PDF,
|
||||
@@ -13,9 +14,12 @@ import {
|
||||
DESKTOP_OPEN_THEME_DIRECTORY,
|
||||
DESKTOP_REFRESH_THEMES,
|
||||
DESKTOP_RENDER_MARKDOWN,
|
||||
DESKTOP_RESOLVE_WINDOW_CLOSE,
|
||||
DESKTOP_SAVE_MARKDOWN,
|
||||
DESKTOP_SAVE_MARKDOWN_AS,
|
||||
DESKTOP_SET_DOCUMENT_DIRTY,
|
||||
DESKTOP_START_NEW_MARKDOWN,
|
||||
DESKTOP_WINDOW_CLOSE_REQUESTED,
|
||||
DESKTOP_SAVE_PDF
|
||||
} from "./channels.js";
|
||||
|
||||
@@ -38,12 +42,30 @@ contextBridge.exposeInMainWorld("mdToPdfDesktop", {
|
||||
},
|
||||
startNewMarkdown: () =>
|
||||
ipcRenderer.invoke(DESKTOP_START_NEW_MARKDOWN),
|
||||
createNewWindow: () =>
|
||||
ipcRenderer.invoke(DESKTOP_CREATE_NEW_WINDOW),
|
||||
resolveWindowClose: (close: boolean) =>
|
||||
ipcRenderer.invoke(DESKTOP_RESOLVE_WINDOW_CLOSE, close),
|
||||
onWindowCloseRequested: (listener: () => void) => {
|
||||
const handleCloseRequested = () => listener();
|
||||
ipcRenderer.on(
|
||||
DESKTOP_WINDOW_CLOSE_REQUESTED,
|
||||
handleCloseRequested
|
||||
);
|
||||
return () =>
|
||||
ipcRenderer.removeListener(
|
||||
DESKTOP_WINDOW_CLOSE_REQUESTED,
|
||||
handleCloseRequested
|
||||
);
|
||||
},
|
||||
setDocumentDirty: (dirty: boolean) =>
|
||||
ipcRenderer.invoke(DESKTOP_SET_DOCUMENT_DIRTY, dirty),
|
||||
openDocumentLink: (href: string) =>
|
||||
ipcRenderer.invoke(DESKTOP_OPEN_DOCUMENT_LINK, href),
|
||||
saveMarkdown: (fileName: string, markdown: string) =>
|
||||
ipcRenderer.invoke(DESKTOP_SAVE_MARKDOWN, fileName, markdown),
|
||||
saveMarkdownAs: (fileName: string, markdown: string) =>
|
||||
ipcRenderer.invoke(DESKTOP_SAVE_MARKDOWN_AS, fileName, markdown),
|
||||
openThemeDirectory: () =>
|
||||
ipcRenderer.invoke(DESKTOP_OPEN_THEME_DIRECTORY),
|
||||
refreshThemes: () => ipcRenderer.invoke(DESKTOP_REFRESH_THEMES),
|
||||
|
||||
@@ -14,8 +14,16 @@ export const DESKTOP_OPEN_DOCUMENT_LINK =
|
||||
"md-to-pdf:desktop:open-document-link";
|
||||
export const DESKTOP_START_NEW_MARKDOWN =
|
||||
"md-to-pdf:desktop:start-new-markdown";
|
||||
export const DESKTOP_CREATE_NEW_WINDOW =
|
||||
"md-to-pdf:desktop:create-new-window";
|
||||
export const DESKTOP_WINDOW_CLOSE_REQUESTED =
|
||||
"md-to-pdf:desktop:window-close-requested";
|
||||
export const DESKTOP_RESOLVE_WINDOW_CLOSE =
|
||||
"md-to-pdf:desktop:resolve-window-close";
|
||||
export const DESKTOP_SAVE_MARKDOWN =
|
||||
"md-to-pdf:desktop:save-markdown";
|
||||
export const DESKTOP_SAVE_MARKDOWN_AS =
|
||||
"md-to-pdf:desktop:save-markdown-as";
|
||||
export const DESKTOP_OPEN_THEME_DIRECTORY =
|
||||
"md-to-pdf:desktop:open-theme-directory";
|
||||
export const DESKTOP_REFRESH_THEMES =
|
||||
|
||||
@@ -21,6 +21,7 @@ import {
|
||||
} from "@md-to-pdf/application";
|
||||
import {
|
||||
DESKTOP_CONSUME_PENDING_MARKDOWN,
|
||||
DESKTOP_CREATE_NEW_WINDOW,
|
||||
DESKTOP_DISCARD_PENDING_MARKDOWN,
|
||||
DESKTOP_GENERATE_PDF,
|
||||
DESKTOP_GET_THEME_CSS,
|
||||
@@ -31,10 +32,13 @@ import {
|
||||
DESKTOP_OPEN_THEME_DIRECTORY,
|
||||
DESKTOP_REFRESH_THEMES,
|
||||
DESKTOP_RENDER_MARKDOWN,
|
||||
DESKTOP_RESOLVE_WINDOW_CLOSE,
|
||||
DESKTOP_SAVE_MARKDOWN,
|
||||
DESKTOP_SAVE_MARKDOWN_AS,
|
||||
DESKTOP_SAVE_PDF,
|
||||
DESKTOP_SET_DOCUMENT_DIRTY,
|
||||
DESKTOP_START_NEW_MARKDOWN
|
||||
DESKTOP_START_NEW_MARKDOWN,
|
||||
DESKTOP_WINDOW_CLOSE_REQUESTED
|
||||
} from "./channels.js";
|
||||
import {
|
||||
parseMarkdownRenderRequest,
|
||||
@@ -55,6 +59,7 @@ import {
|
||||
saveWindowState,
|
||||
type WindowState
|
||||
} from "./window-state.js";
|
||||
import { getWindowCloseDecision } from "./window-close-policy.js";
|
||||
|
||||
const DEFAULT_WINDOW_SIZE = { width: 1440, height: 960 };
|
||||
const MINIMUM_WINDOW_SIZE = { width: 1024, height: 720 };
|
||||
@@ -72,6 +77,7 @@ interface WindowSession {
|
||||
window: BrowserWindow;
|
||||
dirty: boolean;
|
||||
allowClose: boolean;
|
||||
closeRequestPending: boolean;
|
||||
currentFilePath: string | undefined;
|
||||
documentKey: string | undefined;
|
||||
documentRoot: string | undefined;
|
||||
@@ -159,7 +165,10 @@ export class DesktopApplicationController {
|
||||
return this.#createWindow(pendingSnapshot);
|
||||
}
|
||||
|
||||
async #createWindow(pendingSnapshot?: MarkdownFileSnapshot) {
|
||||
async #createWindow(
|
||||
pendingSnapshot?: MarkdownFileSnapshot,
|
||||
startBlank = false
|
||||
) {
|
||||
const isPrimary = !this.#primarySession;
|
||||
const restoredWindowState = isPrimary
|
||||
? this.#latestWindowState ?? this.#savedWindowState
|
||||
@@ -190,6 +199,7 @@ export class DesktopApplicationController {
|
||||
window,
|
||||
dirty: false,
|
||||
allowClose: false,
|
||||
closeRequestPending: false,
|
||||
currentFilePath: undefined,
|
||||
documentKey: undefined,
|
||||
documentRoot: undefined,
|
||||
@@ -219,7 +229,11 @@ export class DesktopApplicationController {
|
||||
}
|
||||
window.show();
|
||||
});
|
||||
await window.loadURL(this.#applicationUrl);
|
||||
const targetUrl = new URL(this.#applicationUrl);
|
||||
if (startBlank) {
|
||||
targetUrl.searchParams.set("new", "1");
|
||||
}
|
||||
await window.loadURL(targetUrl.href);
|
||||
return window;
|
||||
}
|
||||
|
||||
@@ -325,11 +339,17 @@ export class DesktopApplicationController {
|
||||
void this.#checkForExternalChange(session);
|
||||
});
|
||||
window.on("close", (event) => {
|
||||
if (!session.dirty || session.allowClose) {
|
||||
const decision = getWindowCloseDecision(session);
|
||||
if (decision === "allow") {
|
||||
return;
|
||||
}
|
||||
event.preventDefault();
|
||||
void this.#confirmDirtyWindowClose(session);
|
||||
if (decision === "request") {
|
||||
session.closeRequestPending = true;
|
||||
session.window.webContents.send(
|
||||
DESKTOP_WINDOW_CLOSE_REQUESTED
|
||||
);
|
||||
}
|
||||
});
|
||||
window.on("closed", () => {
|
||||
const wasPrimary = this.#primarySession === session;
|
||||
@@ -358,28 +378,6 @@ export class DesktopApplicationController {
|
||||
this.#captureWindowState();
|
||||
}
|
||||
|
||||
async #confirmDirtyWindowClose(session: WindowSession) {
|
||||
if (session.window.isDestroyed()) {
|
||||
return;
|
||||
}
|
||||
const result = await dialog.showMessageBox(session.window, {
|
||||
type: "warning",
|
||||
title: "关闭未保存文档",
|
||||
message: "当前文档有未保存修改,确定要关闭窗口吗?",
|
||||
detail: "关闭后,尚未保存的修改将会丢失。",
|
||||
buttons: ["取消", "仍然关闭"],
|
||||
defaultId: 0,
|
||||
cancelId: 0,
|
||||
noLink: true
|
||||
});
|
||||
session.suppressFocusCheckUntil =
|
||||
Date.now() + FOCUS_CHECK_SUPPRESSION_MS;
|
||||
if (result.response === 1 && !session.window.isDestroyed()) {
|
||||
session.allowClose = true;
|
||||
session.window.close();
|
||||
}
|
||||
}
|
||||
|
||||
async #checkForExternalChange(session: WindowSession) {
|
||||
if (
|
||||
session.focusCheckRunning ||
|
||||
@@ -630,6 +628,28 @@ export class DesktopApplicationController {
|
||||
this.#clearDocument(this.#getSession(event));
|
||||
});
|
||||
|
||||
ipcMain.handle(DESKTOP_CREATE_NEW_WINDOW, async (event) => {
|
||||
this.#getSession(event);
|
||||
await this.#createWindow(undefined, true);
|
||||
});
|
||||
|
||||
ipcMain.handle(
|
||||
DESKTOP_RESOLVE_WINDOW_CLOSE,
|
||||
async (event, unsafeClose: unknown) => {
|
||||
if (typeof unsafeClose !== "boolean") {
|
||||
throw new Error("窗口关闭决策无效");
|
||||
}
|
||||
const session = this.#getSession(event);
|
||||
session.closeRequestPending = false;
|
||||
session.suppressFocusCheckUntil =
|
||||
Date.now() + FOCUS_CHECK_SUPPRESSION_MS;
|
||||
if (unsafeClose && !session.window.isDestroyed()) {
|
||||
session.allowClose = true;
|
||||
session.window.close();
|
||||
}
|
||||
}
|
||||
);
|
||||
|
||||
ipcMain.handle(
|
||||
DESKTOP_SET_DOCUMENT_DIRTY,
|
||||
async (event, unsafeDirty: unknown) => {
|
||||
@@ -640,13 +660,12 @@ export class DesktopApplicationController {
|
||||
}
|
||||
);
|
||||
|
||||
ipcMain.handle(
|
||||
DESKTOP_SAVE_MARKDOWN,
|
||||
async (
|
||||
event,
|
||||
unsafeFileName: unknown,
|
||||
unsafeMarkdown: unknown
|
||||
) => {
|
||||
const saveMarkdown = async (
|
||||
event: IpcMainInvokeEvent,
|
||||
unsafeFileName: unknown,
|
||||
unsafeMarkdown: unknown,
|
||||
forceSaveAs: boolean
|
||||
) => {
|
||||
const session = this.#getSession(event);
|
||||
if (
|
||||
typeof unsafeFileName !== "string" ||
|
||||
@@ -659,18 +678,20 @@ export class DesktopApplicationController {
|
||||
}
|
||||
|
||||
let targetPath = session.currentFilePath;
|
||||
if (!targetPath) {
|
||||
if (forceSaveAs || !targetPath) {
|
||||
const suggestedName = /\.(?:md|markdown)$/iu.test(
|
||||
path.basename(unsafeFileName)
|
||||
)
|
||||
? path.basename(unsafeFileName)
|
||||
: `${path.basename(unsafeFileName)}.md`;
|
||||
const selection = await dialog.showSaveDialog(session.window, {
|
||||
title: "保存 Markdown",
|
||||
defaultPath: path.join(
|
||||
app.getPath("documents"),
|
||||
suggestedName
|
||||
),
|
||||
title: forceSaveAs
|
||||
? "另存为 Markdown"
|
||||
: "保存 Markdown",
|
||||
defaultPath:
|
||||
forceSaveAs && session.currentFilePath
|
||||
? session.currentFilePath
|
||||
: path.join(app.getPath("documents"), suggestedName),
|
||||
filters: [
|
||||
{
|
||||
name: "Markdown 文件",
|
||||
@@ -724,7 +745,27 @@ export class DesktopApplicationController {
|
||||
}
|
||||
this.#commitSnapshot(session, snapshot);
|
||||
return { fileName: snapshot.document.fileName };
|
||||
}
|
||||
};
|
||||
|
||||
ipcMain.handle(
|
||||
DESKTOP_SAVE_MARKDOWN,
|
||||
(event, unsafeFileName: unknown, unsafeMarkdown: unknown) =>
|
||||
saveMarkdown(
|
||||
event,
|
||||
unsafeFileName,
|
||||
unsafeMarkdown,
|
||||
false
|
||||
)
|
||||
);
|
||||
ipcMain.handle(
|
||||
DESKTOP_SAVE_MARKDOWN_AS,
|
||||
(event, unsafeFileName: unknown, unsafeMarkdown: unknown) =>
|
||||
saveMarkdown(
|
||||
event,
|
||||
unsafeFileName,
|
||||
unsafeMarkdown,
|
||||
true
|
||||
)
|
||||
);
|
||||
|
||||
ipcMain.handle(DESKTOP_OPEN_THEME_DIRECTORY, async (event) => {
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
export interface WindowCloseState {
|
||||
dirty: boolean;
|
||||
allowClose: boolean;
|
||||
closeRequestPending: boolean;
|
||||
}
|
||||
|
||||
export type WindowCloseDecision = "allow" | "request" | "wait";
|
||||
|
||||
export function getWindowCloseDecision(
|
||||
state: WindowCloseState
|
||||
): WindowCloseDecision {
|
||||
if (!state.dirty || state.allowClose) {
|
||||
return "allow";
|
||||
}
|
||||
return state.closeRequestPending ? "wait" : "request";
|
||||
}
|
||||
@@ -47,4 +47,33 @@ describe("桌面发行构建链", () => {
|
||||
"npm run package -w @md-to-pdf/desktop"
|
||||
);
|
||||
});
|
||||
|
||||
it("将内置主题示例作为独立资源复制到发行目录", () => {
|
||||
const builderConfig = readFileSync(
|
||||
`${desktopRoot}/electron-builder.config.cjs`,
|
||||
"utf8"
|
||||
);
|
||||
|
||||
expect(builderConfig).toContain('from: "../../samples"');
|
||||
expect(builderConfig).toContain('to: "samples"');
|
||||
});
|
||||
|
||||
it("在 Docker Web 构建前复制样例并保留到运行镜像", () => {
|
||||
const dockerfile = readFileSync(
|
||||
`${projectRoot}/deploy/Dockerfile`,
|
||||
"utf8"
|
||||
);
|
||||
const samplesBuildCopyIndex = dockerfile.indexOf(
|
||||
"COPY samples ./samples"
|
||||
);
|
||||
const webBuildIndex = dockerfile.indexOf(
|
||||
"npm run build -w @md-to-pdf/web"
|
||||
);
|
||||
|
||||
expect(samplesBuildCopyIndex).toBeGreaterThan(-1);
|
||||
expect(webBuildIndex).toBeGreaterThan(samplesBuildCopyIndex);
|
||||
expect(dockerfile).toContain(
|
||||
"COPY --chown=pwuser:pwuser --from=build /app/samples ./samples"
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
@@ -0,0 +1,38 @@
|
||||
import { describe, expect, it } from "vitest";
|
||||
import { getWindowCloseDecision } from "../src/window-close-policy.js";
|
||||
|
||||
describe("桌面窗口关闭策略", () => {
|
||||
it("干净文档或已授权窗口可以直接关闭", () => {
|
||||
expect(
|
||||
getWindowCloseDecision({
|
||||
dirty: false,
|
||||
allowClose: false,
|
||||
closeRequestPending: false
|
||||
})
|
||||
).toBe("allow");
|
||||
expect(
|
||||
getWindowCloseDecision({
|
||||
dirty: true,
|
||||
allowClose: true,
|
||||
closeRequestPending: false
|
||||
})
|
||||
).toBe("allow");
|
||||
});
|
||||
|
||||
it("未保存文档只发出一次关闭确认请求", () => {
|
||||
expect(
|
||||
getWindowCloseDecision({
|
||||
dirty: true,
|
||||
allowClose: false,
|
||||
closeRequestPending: false
|
||||
})
|
||||
).toBe("request");
|
||||
expect(
|
||||
getWindowCloseDecision({
|
||||
dirty: true,
|
||||
allowClose: false,
|
||||
closeRequestPending: true
|
||||
})
|
||||
).toBe("wait");
|
||||
});
|
||||
});
|
||||
Reference in New Issue
Block a user