✨ 脚注容器标题可以支持设置为段落块，不需要一定是标题了！

Achuan-2 · Dec 2, 2024 · e19c813 · e19c813
1 parent d038ba7
commit e19c813
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,8 @@
+## v1.2.2 / 2024.12.02
+
+- ✨ 脚注容器标题可以支持设置为段落块，不需要一定是标题了！
+
+
 ## v1.2.1 / 2024.12.02
 
 - 📝 优化模板index变量的i18n，中文默认为[注]，英文为[*]

diff --git a/src/index.ts b/src/index.ts
@@ -725,16 +725,16 @@ export default class PluginFootnote extends Plugin {
             case '1':
                 footnoteContainerTitle = this.settingUtils.get("footnoteContainerTitle").replace(/\$\{filename\}/g, currentDocTitle);
                 // 需要检测输入的title有没有#，没有会自动变为二级title
-                if (!footnoteContainerTitle.startsWith("#")) {
-                    footnoteContainerTitle = `## ${footnoteContainerTitle}`;
-                }
+                // if (!footnoteContainerTitle.startsWith("#")) {
+                //     footnoteContainerTitle = `## ${footnoteContainerTitle}`;
+                // }
                 break;
             case '2':
                 footnoteContainerTitle = this.settingUtils.get("footnoteContainerTitle2").replace(/\$\{filename\}/g, currentDocTitle);
                 // 需要检测输入的title有没有#，没有会自动变为二级title
-                if (!footnoteContainerTitle.startsWith("#")) {
-                    footnoteContainerTitle = `## ${footnoteContainerTitle}`;
-                }
+                // if (!footnoteContainerTitle.startsWith("#")) {
+                //     footnoteContainerTitle = `## ${footnoteContainerTitle}`;
+                // }
                 break;
             case '3':
                 footnoteContainerTitle = this.settingUtils.get("footnoteContainerTitle3").replace(/\$\{filename\}/g, currentDocTitle);
@@ -751,7 +751,7 @@ export default class PluginFootnote extends Plugin {
                 query_res = await sql(
                     `SELECT * FROM blocks AS b 
          WHERE root_id = '${docID}' 
-         AND b.type='h' 
+         AND b.type !='d' 
          AND b.ial like '%custom-plugin-footnote-parent="${protyle.block.id}"%' 
          ORDER BY created DESC 
          limit 1`
@@ -780,7 +780,7 @@ export default class PluginFootnote extends Plugin {
                 query_res = await sql(
                     `SELECT * FROM blocks AS b 
          WHERE root_id = '${docID}' 
-         AND b.type='h' 
+         AND b.type !='d' 
          AND b.ial like '%custom-plugin-footnote-parent="${protyle.block.id}"%' 
          ORDER BY created DESC 
          limit 1`
@@ -824,6 +824,13 @@ export default class PluginFootnote extends Plugin {
                     await setBlockAttrs(docID, {
                         "custom-plugin-footnote-parent": protyle.block.id
                     });
+
+                    // 删除默认生成的块
+                    // const defaultBlock = await sql(`SELECT * FROM blocks WHERE root_id = '${docID}' AND type != 'd'`);
+                    // console.log(defaultBlock);
+                    // if (defaultBlock.length > 0) {
+                    //     await deleteBlock(defaultBlock[0].id);
+                    // }
                 }
                 footnoteContainerID = docID;
                 break;
@@ -972,19 +979,29 @@ export default class PluginFootnote extends Plugin {
                 case '1':
                 default:
                     if (this.settingUtils.get("saveLocation") != 3) {
-                        let children = await getChildBlocks(footnoteContainerID);
+
+                        let footnoteContainerDom = (await getBlockDOM(docID)).dom;
+                        console.log(docID);
                         // 默认顺序插入
-                        if (children.length > 0) {
-                            // 在最后一个子块后面添加(使用 insertBlock 并指定 previousID)
+                        const parser = new DOMParser();
+                        // 将DOM字符串解析为DOM文档
+                        const doc = parser.parseFromString(footnoteContainerDom, 'text/html');
+
+                        // 查找所有符合条件的div元素
+                        const footnotes = doc.querySelectorAll(`div[custom-plugin-footnote-content="${protyle.block.id}"]`);
+                        console.log(footnotes);
+                        if (footnotes.length > 0) {
+                            const lastFootnote = footnotes[footnotes.length - 1];
+                            let lastFootnoteID = lastFootnote.getAttribute('data-node-id');
                             back = await insertBlock(
                                 "markdown",
                                 templates,
                                 undefined, // nextID 
-                                children[children.length - 1].id, // previousID - 放在最后一个子块后面
+                                lastFootnoteID, // previousID - 放在最后一个子块后面
                                 undefined // parentID
                             );
                         } else {
-                            // 如果没有子块,直接在标题下添加
+                            // 如果没有找到子块,直接在标题下添加
                             back = await appendBlock("markdown", templates, footnoteContainerID);
                         }
                     }

diff --git a/src/libs/setting-utils.ts b/src/libs/setting-utils.ts
@@ -131,7 +131,7 @@ export class SettingUtils {
     async save(data?: any) {
         data = data ?? this.dump();
         await this.plugin.saveData(this.file, this.dump());
-        console.debug('Save config:', data);
+        // console.debug('Save config:', data);
         return data;
     }