Andreas/siyuan
1
0
Fork 0
mirror of https://github.com/siyuan-note/siyuan.git synced 2025-12-17 07:00:12 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

Browse source
This commit is contained in:
Vanessa 2025-10-20 00:10:24 +08:00
commit a3f2da83d1
16 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
app/appearance/langs/ar_SA.json
View file

@ -1,4 +1,5 @@
{ {
"print": "طباعة",
"clickArrow": "انقر على السهم", "clickArrow": "انقر على السهم",
"foldAll": "طي الكل", "foldAll": "طي الكل",
"expandSameLevelHeading": "توسيع العناوين من نفس المستوى", "expandSameLevelHeading": "توسيع العناوين من نفس المستوى",

1
app/appearance/langs/de_DE.json
View file

@ -1,4 +1,5 @@
{ {
"print": "Drucken",
"clickArrow": "Klicken Sie auf den Pfeil", "clickArrow": "Klicken Sie auf den Pfeil",
"foldAll": "Alle einklappen", "foldAll": "Alle einklappen",
"expandSameLevelHeading": "Überschriften auf gleicher Ebene ausklappen", "expandSameLevelHeading": "Überschriften auf gleicher Ebene ausklappen",

1
app/appearance/langs/en_US.json
View file

@ -1,4 +1,5 @@
{ {
"print": "Print",
"clickArrow": "Click arrow", "clickArrow": "Click arrow",
"foldAll": "Fold all", "foldAll": "Fold all",
"expandSameLevelHeading": "Expand same level heading", "expandSameLevelHeading": "Expand same level heading",

1
app/appearance/langs/es_ES.json
View file

@ -1,4 +1,5 @@
{ {
"print": "Imprimir",
"clickArrow": "Haz clic en la flecha", "clickArrow": "Haz clic en la flecha",
"foldAll": "Colapsar todo", "foldAll": "Colapsar todo",
"expandSameLevelHeading": "Expandir títulos del mismo nivel", "expandSameLevelHeading": "Expandir títulos del mismo nivel",

1
app/appearance/langs/fr_FR.json
View file

@ -1,4 +1,5 @@
{ {
"print": "Imprimer",
"clickArrow": "Cliquez sur la flèche", "clickArrow": "Cliquez sur la flèche",
"foldAll": "Tout replier", "foldAll": "Tout replier",
"expandSameLevelHeading": "Développer les titres du même niveau", "expandSameLevelHeading": "Développer les titres du même niveau",

1
app/appearance/langs/he_IL.json
View file

@ -1,4 +1,5 @@
{ {
"print": "הדפס",
"clickArrow": "לחץ על החץ", "clickArrow": "לחץ על החץ",
"foldAll": "קפל הכל", "foldAll": "קפל הכל",
"expandSameLevelHeading": "הרחב כותרות באותו רמה", "expandSameLevelHeading": "הרחב כותרות באותו רמה",

1
app/appearance/langs/it_IT.json
View file

@ -1,4 +1,5 @@
{ {
"print": "Stampa",
"clickArrow": "Clicca sulla freccia", "clickArrow": "Clicca sulla freccia",
"foldAll": "Comprimi tutto", "foldAll": "Comprimi tutto",
"expandSameLevelHeading": "Espandi intestazioni dello stesso livello", "expandSameLevelHeading": "Espandi intestazioni dello stesso livello",

1
app/appearance/langs/ja_JP.json
View file

@ -1,4 +1,5 @@
{ {
"print": "印刷",
"clickArrow": "矢印をクリック", "clickArrow": "矢印をクリック",
"foldAll": "すべて折りたたむ", "foldAll": "すべて折りたたむ",
"expandSameLevelHeading": "同じレベルの見出しを展開", "expandSameLevelHeading": "同じレベルの見出しを展開",

1
app/appearance/langs/pl_PL.json
View file

@ -1,4 +1,5 @@
{ {
"print": "Drukuj",
"clickArrow": "Kliknij strzałkę", "clickArrow": "Kliknij strzałkę",
"foldAll": "Zwiń wszystko", "foldAll": "Zwiń wszystko",
"expandSameLevelHeading": "Rozwiń nagłówki na tym samym poziomie", "expandSameLevelHeading": "Rozwiń nagłówki na tym samym poziomie",

1
app/appearance/langs/pt_BR.json
View file

@ -1,4 +1,5 @@
{ {
"print": "Imprimir",
"clickArrow": "Clique na seta", "clickArrow": "Clique na seta",
"foldAll": "Recolher tudo", "foldAll": "Recolher tudo",
"expandSameLevelHeading": "Expandir títulos do mesmo nível", "expandSameLevelHeading": "Expandir títulos do mesmo nível",

1
app/appearance/langs/ru_RU.json
View file

@ -1,4 +1,5 @@
{ {
"print": "Печать",
"clickArrow": "Нажмите стрелку", "clickArrow": "Нажмите стрелку",
"foldAll": "Свернуть всё", "foldAll": "Свернуть всё",
"expandSameLevelHeading": "Развернуть заголовки того же уровня", "expandSameLevelHeading": "Развернуть заголовки того же уровня",

1
app/appearance/langs/zh_CHT.json
View file

@ -1,4 +1,5 @@
{ {
"print": "列印",
"clickArrow": "點擊箭頭", "clickArrow": "點擊箭頭",
"foldAll": "全部摺疊", "foldAll": "全部摺疊",
"expandSameLevelHeading": "展開同級標題", "expandSameLevelHeading": "展開同級標題",

1
app/appearance/langs/zh_CN.json
View file

@ -1,4 +1,5 @@
{ {
"print": "打印",
"clickArrow": "点击箭头", "clickArrow": "点击箭头",
"foldAll": "全部折叠", "foldAll": "全部折叠",
"expandSameLevelHeading": "展开同级标题", "expandSameLevelHeading": "展开同级标题",

2
app/src/menus/commonMenuItem.ts
View file

@ -767,7 +767,7 @@ export const exportMd = (id: string) => {
merge: localData.mergeSubdocs, merge: localData.mergeSubdocs,
}, async response => { }, async response => {
const html = await onExport(response, undefined, {type: "pdf", id}); const html = await onExport(response, undefined, {type: "pdf", id});
window.JSAndroid.exportPDF(html); window.JSAndroid.print(html);
}); });
} }
}, },

2
app/src/protyle/export/index.ts
View file

@ -649,6 +649,7 @@ export const onExport = async (data: IWebSocketData, filePath: string, exportOpt
if (!isDefault) { if (!isDefault) {
themeStyle = `<link rel="stylesheet" type="text/css" id="themeStyle" href="${servePath}appearance/themes/${themeName}/theme.css?${Constants.SIYUAN_VERSION}"/>`; themeStyle = `<link rel="stylesheet" type="text/css" id="themeStyle" href="${servePath}appearance/themes/${themeName}/theme.css?${Constants.SIYUAN_VERSION}"/>`;
} }
const screenWidth = window.JSAndroid.getScreenWidthPx();
const html = `<!DOCTYPE html> const html = `<!DOCTYPE html>
<html lang="${window.siyuan.config.appearance.lang}" data-theme-mode="${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="${getThemeMode()}" data-light-theme="${window.siyuan.config.appearance.themeLight}" data-dark-theme="${window.siyuan.config.appearance.themeDark}">
<head> <head>
@ -678,6 +679,7 @@ style="max-width: 800px;margin: 0 auto;" id="preview">${data.data.content}</div>
<script src="${servePath}/stage/build/export/protyle-method.js?v=${Constants.SIYUAN_VERSION}"></script> <script src="${servePath}/stage/build/export/protyle-method.js?v=${Constants.SIYUAN_VERSION}"></script>
<script src="${servePath}/stage/protyle/js/lute/lute.min.js?v=${Constants.SIYUAN_VERSION}"></script> <script src="${servePath}/stage/protyle/js/lute/lute.min.js?v=${Constants.SIYUAN_VERSION}"></script>
<script> <script>
document.body.style.minWidth = ${screenWidth} + "px";
window.siyuan = { window.siyuan = {
config: { config: {
appearance: { mode: ${mode}, codeBlockThemeDark: "${window.siyuan.config.appearance.codeBlockThemeDark}", codeBlockThemeLight: "${window.siyuan.config.appearance.codeBlockThemeLight}" }, appearance: { mode: ${mode}, codeBlockThemeDark: "${window.siyuan.config.appearance.codeBlockThemeDark}", codeBlockThemeLight: "${window.siyuan.config.appearance.codeBlockThemeLight}" },

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

@ -245,7 +245,8 @@ interface Window {
readHTMLClipboard(): string readHTMLClipboard(): string
getBlockURL(): string getBlockURL(): string
hideKeyboard(): void hideKeyboard(): void
exportPDF(html: string): void print(html: string): void
getScreenWidthPx(): number
}; };
JSHarmony: { JSHarmony: {
openExternal(url: string): void openExternal(url: string): void