This commit is contained in:
Tron 2025-11-25 10:07:45 +08:00
parent f2aef3fc25
commit 07e0eb26d2
2 changed files with 16 additions and 16 deletions

View file

@ -1,21 +1,21 @@
import {hideMessage, showMessage} from "../../dialog/message"; import { hideMessage, showMessage } from "../../dialog/message";
import {Constants} from "../../constants"; import { Constants } from "../../constants";
/// #if !BROWSER /// #if !BROWSER
import {ipcRenderer} from "electron"; import { ipcRenderer } from "electron";
import * as fs from "fs"; import * as fs from "fs";
import * as path from "path"; import * as path from "path";
import {afterExport} from "./util"; import { afterExport } from "./util";
/// #endif /// #endif
import {confirmDialog} from "../../dialog/confirmDialog"; import { confirmDialog } from "../../dialog/confirmDialog";
import {getThemeMode, setInlineStyle} from "../../util/assets"; import { getThemeMode, setInlineStyle } from "../../util/assets";
import {fetchPost, fetchSyncPost} from "../../util/fetch"; import { fetchPost, fetchSyncPost } from "../../util/fetch";
import {Dialog} from "../../dialog"; import { Dialog } from "../../dialog";
import {replaceLocalPath} from "../../editor/rename"; import { replaceLocalPath } from "../../editor/rename";
import {getScreenWidth, isInAndroid, isInHarmony, isInIOS, setStorageVal} from "../util/compatibility"; import { getScreenWidth, isInAndroid, isInHarmony, isInIOS, setStorageVal } from "../util/compatibility";
import {getFrontend} from "../../util/functions"; import { getFrontend } from "../../util/functions";
const getPluginStyle = async () => { const getPluginStyle = async () => {
const response = await fetchSyncPost("/api/petal/loadPetals", {frontend: getFrontend()}); const response = await fetchSyncPost("/api/petal/loadPetals", { frontend: getFrontend() });
let css = ""; let css = "";
// 为加快启动速度,不进行 await // 为加快启动速度,不进行 await
response.data.forEach((item: IPluginData) => { response.data.forEach((item: IPluginData) => {
@ -103,7 +103,7 @@ export const saveExport = (option: IExportOptions) => {
btnsElement[1].addEventListener("click", () => { btnsElement[1].addEventListener("click", () => {
const removeAssets = (wordDialog.element.querySelector("#removeAssets") as HTMLInputElement).checked; const removeAssets = (wordDialog.element.querySelector("#removeAssets") as HTMLInputElement).checked;
const mergeSubdocs = (wordDialog.element.querySelector("#mergeSubdocs") as HTMLInputElement).checked; const mergeSubdocs = (wordDialog.element.querySelector("#mergeSubdocs") as HTMLInputElement).checked;
window.siyuan.storage[Constants.LOCAL_EXPORTWORD] = {removeAssets, mergeSubdocs}; window.siyuan.storage[Constants.LOCAL_EXPORTWORD] = { removeAssets, mergeSubdocs };
setStorageVal(Constants.LOCAL_EXPORTWORD, window.siyuan.storage[Constants.LOCAL_EXPORTWORD]); setStorageVal(Constants.LOCAL_EXPORTWORD, window.siyuan.storage[Constants.LOCAL_EXPORTWORD]);
getExportPath(option, removeAssets, mergeSubdocs); getExportPath(option, removeAssets, mergeSubdocs);
wordDialog.destroy(); wordDialog.destroy();
@ -637,7 +637,7 @@ ${getIconScript(servePath)}
</script> </script>
${getSnippetJS()} ${getSnippetJS()}
</body></html>`; </body></html>`;
fetchPost("/api/export/exportTempContent", {content: html}, (response) => { fetchPost("/api/export/exportTempContent", { content: html }, (response) => {
ipcRenderer.send(Constants.SIYUAN_EXPORT_NEWWINDOW, response.data.url); ipcRenderer.send(Constants.SIYUAN_EXPORT_NEWWINDOW, response.data.url);
}); });
}; };
@ -722,7 +722,7 @@ export const onExport = async (data: IWebSocketData, filePath: string, servePath
js: `document.body.style.minWidth = "${screenWidth}px";`, js: `document.body.style.minWidth = "${screenWidth}px";`,
css: `@page { size: A4; margin: 10mm 0 10mm 0; } css: `@page { size: A4; margin: 10mm 0 10mm 0; }
.protyle-wysiwyg {padding: 0; margin: 0;}` .protyle-wysiwyg {padding: 0; margin: 0;}`
} : {js: "", css: ""}; } : { js: "", css: "" };
const html = `<!DOCTYPE html> const html = `<!DOCTYPE html>
<html lang="${window.siyuan.config.appearance.lang}" data-theme-mode="${isInMobile ? "light" : getThemeMode()}" data-light-theme="${window.siyuan.config.appearance.themeLight}" data-dark-theme="${window.siyuan.config.appearance.themeDark}"> <html lang="${window.siyuan.config.appearance.lang}" data-theme-mode="${isInMobile ? "light" : getThemeMode()}" data-light-theme="${window.siyuan.config.appearance.themeLight}" data-dark-theme="${window.siyuan.config.appearance.themeDark}">
<head> <head>

View file

@ -3,7 +3,7 @@ import { Constants } from "../../constants";
import { hasClosestByClassName } from "../util/hasClosest"; import { hasClosestByClassName } from "../util/hasClosest";
import { genIconHTML } from "./util"; import { genIconHTML } from "./util";
export const mindmapRender = (element: Element, cdn = Constants.PROTYLE_CDN, markmapOptions: {zoom?: boolean; pan?: boolean} = {}) => { export const mindmapRender = (element: Element, cdn = Constants.PROTYLE_CDN, markmapOptions: { zoom?: boolean; pan?: boolean } = {}) => {
let mindmapElements: Element[] = []; let mindmapElements: Element[] = [];
if (element.getAttribute("data-subtype") === "mindmap") { if (element.getAttribute("data-subtype") === "mindmap") {
// 编辑器内代码块编辑渲染 // 编辑器内代码块编辑渲染