Merge pull request #48 from Hi-Windom/dev2301

1.1.2
Hi-Windom · Jan 11, 2023 · 1cac817 · 1cac817
2 parents d5a0ba3 + 0658b8b
commit 1cac817
Show file tree

Hide file tree

Showing 5 changed files with 86 additions and 20 deletions.
diff --git a/README.md b/README.md
@@ -28,6 +28,23 @@
 
 ## ✨ 正式开启公测
 
+### v1.1 聚合说明
+
+> 2023-01-?? released
+
+<p>
+<img src="https://img.shields.io/badge/SiYuan-2.6.2-green" alt="适配 SiYuan v2.6.2" title="建议先更新思源版本" style="cursor:pointer;height: 38px;margin: 3px auto;"/>
+<img src="https://img.shields.io/badge/winsay-1.5-green" alt="适配 Sofill- v1.5" title="建议先更新Sofill-版本" style="cursor:pointer;height: 38px;margin: 3px auto;"/>
+<img src="https://img.shields.io/badge/-%E6%9E%84%E5%BB%BA-yellow" alt="这是一个构建版本" title="建议手动删除旧版本后再下载，而不是直接更新" style="cursor:pointer;height: 38px;margin: 3px;"/> <br>
+<img src="https://img.shields.io/badge/Android-NO-red?logo=Android" title="" style="margin: 3px auto;"/>
+<img src="https://img.shields.io/badge/Windows 11-PASS-green?logo=Windows 11" title="" style="margin: 3px auto;"/>
+<img src="https://img.shields.io/badge/Docker-NO-red?logo=Docker" title="" style="margin: 3px auto;"/>
+</p>
+
+引入特性：
+
+1. [【导出助手】导出PDF支持根据一级标题分页 · Issue #12 · v1.1.2](https://github.com/Hi-Windom/lili/issues/12)
+
 ### 主题设置界面入口指南
 
 Step 1 确保在思源软件设置里关闭了【隐藏底部状态栏】

diff --git a/extension/plugin/Export_Helper/css/custom__split_byH1.css b/extension/plugin/Export_Helper/css/custom__split_byH1.css
@@ -0,0 +1,8 @@
+@media print {
+  .h1 {
+      page-break-before: always;
+  }
+}
+.h1 {
+  page-break-before: always;
+}
diff --git a/extension/plugin/Export_Helper/export.html b/extension/plugin/Export_Helper/export.html
@@ -1,26 +1,33 @@
 <!DOCTYPE html>
 <html>
+
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Document</title>
+    <style>
+        #tell {
+            margin-bottom: 2em;
+        }
+
+        #configs table {
+            min-width: 100%;
+            font-size: 1.31em;
+        }
+
+        #configs th,
+        #configs td {
+            border: 1px #000000 solid;
+            padding: 3px;
+        }
+    </style>
 </head>
+
 <body>
-  <div>
-    <p style="font-size:10.5pt"><span style="font-family:'Microsoft JhengHei'">你好</span><span
-        style="font-family:'Courier New'">，</span><span style="font-family:'Microsoft JhengHei'">我是导出助手</span></p>
-    <p style="font-size:10.5pt"><span style="font-family:'Courier New'; -aw-import:ignore">&nbsp;</span></p>
-    <p style="font-size:10.5pt"><span style="font-family:'Microsoft JhengHei'">我可以</span><span
-        style="font-family:'Courier New'">：</span></p>
-    <p style="font-size:10.5pt"><span style="font-family:'Courier New'; -aw-import:ignore">&nbsp;</span></p>
-    <ol type="1" style="margin:0pt; padding-left:0pt">
-      <li style="margin-left:17.6pt; padding-left:7.6pt; font-family:'Courier New'; font-size:10.5pt"><span
-          style="font-family:'Microsoft JhengHei'">更好地预览导出效果</span></li>
-      <li style="margin-left:17.6pt; padding-left:7.6pt; font-family:'Courier New'; font-size:10.5pt"><span
-          style="font-family:'Microsoft JhengHei'">选择不同的页脚</span></li>
-      <li style="margin-left:17.6pt; padding-left:7.6pt; font-family:'Courier New'; font-size:10.5pt"><span
-          style="font-family:'Microsoft JhengHei'">敬请期待</span></li>
-    </ol>
-  </div>
+    <div id="tell">
+        <p>以下表格显示了额外的配置，修改它们请在主题设置面板>扩展>导出助手配置界面完成</p>
+    </div>
+    <div id="configs"></div>
 </body>
-</html>
+
+</html>
diff --git a/extension/plugin/Export_Helper/renderPDF.js b/extension/plugin/Export_Helper/renderPDF.js
@@ -658,11 +658,42 @@ export const renderPDF = (id) => {
         await window.siyuan.printWin.webContents.insertCSS(css);
       event.preventDefault();
     } else {
-      window.siyuan.printWin.webContents.removeInsertedCSS(key_action_auto_folded);
+      window.siyuan.printWin.webContents.removeInsertedCSS(
+        key_action_auto_folded
+      );
       key_action_auto_folded = null;
     }
   });
-  ipcMain.on("export-pdf-lili-more", (event, data) => {
+
+  let custom__split_byH1 = localStorage.getItem(
+    "SC_lili_cp_extension_plugin__Export_Helper__custom__split_byH1"
+  );
+  if (custom__split_byH1 == "true") {
+    let file = `${window.siyuan.config.system.confDir}/appearance/themes/Sofill=/extension/plugin/Export_Helper/css/custom__split_byH1.css`;
+    let css = fs.readFileSync(file).toString();
+    window.siyuan.printWin.webContents.insertCSS(css);
+  }
+  ipcMain.on("export-pdf-lili-more", async (event, data) => {
+    const configsHTML = `
+    <table>
+	<thead>
+		<tr>
+			<th>项</th>
+			<th>值</th>
+		</tr>
+	</thead>
+	<tbody>
+		<tr>
+			<td>根据一级标题分页</td>
+			<td>${custom__split_byH1}</td>
+		</tr>
+		<tr>
+			<td></td>
+			<td></td>
+		</tr>
+	</tbody>
+</table>
+    `;
     if (!window.siyuan.printWin) {
       return;
     }
@@ -693,6 +724,9 @@ export const renderPDF = (id) => {
         `http://${host}:${port}/extension/plugin/Export_Helper/export.html`
       );
       child.once("ready-to-show", () => {
+        child.webContents.executeJavaScript(
+          `document.querySelector("#configs").innerHTML = \`${configsHTML}\`;`
+        );
         child.show();
       });
       child.on("closed", () => {

diff --git a/theme.json b/theme.json
@@ -2,7 +2,7 @@
   "name": "Sofill=",
   "author": "Soltus",
   "url": "https://github.com/Hi-Windom/lili",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "modes": [
     "light"
   ]