@lancc/cmark 1.1.0 → 1.2.1

package/export-file/index.html

@@ -1,33 +1,33 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <style>
-    html, body { margin: 0; padding: 0; background-color: #ffffff; overflow: hidden; }
-    .markdown-body { box-sizing: border-box; min-width: 200px; max-width: 980px; margin: 0 auto; padding: 45px; }
-    .markdown-body table { overflow: hidden!important; word-break: break-all; }
-    .markdown-body pre { overflow: hidden!important; }
-    @media (max-width: 767px) { .markdown-body { padding: 15px; } }
-  </style>
-  <link rel="stylesheet" href="./github-markdown.css">
-  <link rel="stylesheet" href="../katex.min.css">
-</head>
-<body>
-  <article class="markdown-body"></article>
-  <script>
-    window.waitAllImageLoaded = () => {
-      return new Promise(resolve => {
-        if (document.images.length === 0) return resolve()
-        const timeout = setTimeout(() => { resolve() }, 10000)
-        Promise.all(Array.from(document.images)
-          .filter(img => !img.complete)
-          .map(img => new Promise(resolve => { img.onload = img.onerror = resolve })))
-          .then(() => {
-            clearTimeout(timeout)
-            resolve()
-          })
-      })
-    }
-  </script>
-</body>
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <style>
+    html, body { margin: 0; padding: 0; background-color: #ffffff; overflow: hidden; }
+    .markdown-body { box-sizing: border-box; min-width: 200px; max-width: 980px; margin: 0 auto; padding: 45px; }
+    .markdown-body table { overflow: hidden!important; word-break: break-all; }
+    .markdown-body pre { overflow: hidden!important; }
+    @media (max-width: 767px) { .markdown-body { padding: 15px; } }
+  </style>
+  <link rel="stylesheet" href="./github-markdown.css">
+  <link rel="stylesheet" href="../katex.min.css">
+</head>
+<body>
+  <article class="markdown-body"></article>
+  <script>
+    window.waitAllImageLoaded = () => {
+      return new Promise(resolve => {
+        if (document.images.length === 0) return resolve()
+        const timeout = setTimeout(() => { resolve() }, 10000)
+        Promise.all(Array.from(document.images)
+          .filter(img => !img.complete)
+          .map(img => new Promise(resolve => { img.onload = img.onerror = resolve })))
+          .then(() => {
+            clearTimeout(timeout)
+            resolve()
+          })
+      })
+    }
+  </script>
+</body>
 </html>

package/index.html

@@ -4,10 +4,10 @@
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>CMark</title>
-    <script type="module" crossorigin src="./assets/index-Cz6qaZbV.js"></script>
-    <link rel="modulepreload" crossorigin href="./assets/markdown-DVehI1Sg.js">
-    <link rel="modulepreload" crossorigin href="./assets/mermaid-C_q9pug0.js">
-    <link rel="stylesheet" crossorigin href="./assets/index-BLONSItV.css">
+    <script type="module" crossorigin src="./assets/index-BJ-NdQc4.js"></script>
+    <link rel="modulepreload" crossorigin href="./assets/markdown-S2mWvoE-.js">
+    <link rel="modulepreload" crossorigin href="./assets/mermaid-T_6Ze_cT.js">
+    <link rel="stylesheet" crossorigin href="./assets/index-eB_q_VA3.css">
   </head>
   <body>
     <div id="root"></div>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lancc/cmark",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "CMark —— 本地 Markdown 笔记，用 git 同步",
   "keywords": [
     "markdown",

package/plugin.json

@@ -2,9 +2,15 @@
   "name": "cmark",
   "pluginName": "CMark",
   "title": "CMark",
-  "version": "1.1.0",
+  "version": "1.2.1",
   "description": "本地 Markdown 笔记，用 Git 管理版本、同步多端",
   "author": "Lancc",
+  "homepage": "https://github.com/LanccBy2016/cmark",
+  "platform": [
+    "win32",
+    "darwin",
+    "linux"
+  ],
   "main": "index.html",
   "preload": "preload.js",
   "logo": "logo.png",
@@ -21,221 +27,5 @@
         "cm"
       ]
     }
-  ],
-  "tools": {
-    "markdown_render": {
-      "description": "将 Markdown 文本渲染为图片或 PDF 文件，用于可视化展示或文档导出。\n\n支持扩展语法（可直接使用）：\n- Mermaid 图表：```mermaid 代码块\n- ECharts 图表：```echarts 代码块\n- LaTeX 数学公式：$...$（行内）、$$...$$（块级）\n- 任务列表：- [ ] / - [x]\n- 高亮标记：==text==\n- 多语言代码高亮：```js / ```python 等\n\n当需要生成包含图表、流程图、公式或代码展示的内容时优先使用此工具。\n输入内容将被直接渲染，请确保语法正确。",
-      "inputSchema": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "markdown": {
-            "type": "string",
-            "description": "Markdown 原文内容"
-          },
-          "format": {
-            "type": "string",
-            "enum": [
-              "image",
-              "pdf"
-            ],
-            "description": "输出格式：image（图片）或 pdf（文档）"
-          }
-        },
-        "required": [
-          "markdown",
-          "format"
-        ]
-      },
-      "outputSchema": {
-        "type": "object",
-        "properties": {
-          "filePath": {
-            "type": "string",
-            "description": "生成文件的本地路径"
-          }
-        },
-        "required": [
-          "filePath"
-        ]
-      }
-    },
-    "markdown_notes_search": {
-      "description": "搜索 Markdown 笔记（标题和正文），返回匹配结果摘要，不包含完整正文。",
-      "inputSchema": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "query": {
-            "type": "string",
-            "description": "搜索关键词"
-          },
-          "limit": {
-            "type": "integer",
-            "description": "返回结果数量上限",
-            "default": 10,
-            "minimum": 1,
-            "maximum": 50
-          }
-        },
-        "required": [
-          "query"
-        ]
-      },
-      "outputSchema": {
-        "type": "object",
-        "properties": {
-          "notes": {
-            "type": "array",
-            "description": "匹配的笔记摘要列表",
-            "items": {
-              "type": "object",
-              "properties": {
-                "id": {
-                  "type": "string",
-                  "description": "笔记唯一 ID"
-                },
-                "title": {
-                  "type": "string",
-                  "description": "笔记标题"
-                },
-                "snippet": {
-                  "type": "string",
-                  "description": "匹配内容摘要"
-                },
-                "matchedField": {
-                  "type": "string",
-                  "enum": [
-                    "title",
-                    "content"
-                  ],
-                  "description": "命中的字段"
-                },
-                "createAt": {
-                  "type": "integer",
-                  "description": "创建时间戳（毫秒）"
-                },
-                "updateAt": {
-                  "type": "integer",
-                  "description": "最后修改时间戳（毫秒）"
-                },
-                "wordCount": {
-                  "type": "integer",
-                  "description": "正文字数"
-                }
-              },
-              "required": [
-                "id",
-                "title",
-                "snippet",
-                "matchedField"
-              ]
-            }
-          },
-          "hasMore": {
-            "type": "boolean",
-            "description": "是否还有更多结果"
-          }
-        },
-        "required": [
-          "notes",
-          "total"
-        ]
-      }
-    },
-    "markdown_notes_get": {
-      "description": "获取笔记内容。支持获取原始 Markdown 文本或将笔记内容渲染为图片/PDF 文件。",
-      "inputSchema": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "id": {
-            "type": "string",
-            "description": "笔记唯一 ID"
-          },
-          "format": {
-            "type": "string",
-            "enum": [
-              "text",
-              "image",
-              "pdf"
-            ],
-            "default": "text",
-            "description": "输出格式：'text' 返回 Markdown 源码；'image'/'pdf' 返回渲染后的本地文件路径。"
-          }
-        },
-        "required": [
-          "id"
-        ]
-      },
-      "outputSchema": {
-        "type": "object",
-        "properties": {
-          "id": {
-            "type": "string"
-          },
-          "title": {
-            "type": "string",
-            "description": "笔记标题"
-          },
-          "updateAt": {
-            "type": "integer",
-            "description": "最后修改时间戳（毫秒）"
-          },
-          "content": {
-            "type": "string",
-            "description": "笔记的 Markdown 源码。仅在 format 为 text 时提供。"
-          },
-          "filePath": {
-            "type": "string",
-            "description": "渲染文件的绝对路径。仅在 format 为 image 或 pdf 时提供。"
-          },
-          "mimeType": {
-            "type": "string",
-            "description": "内容的标准 MIME 类型（如 text/markdown, image/png, application/pdf）"
-          }
-        },
-        "required": [
-          "id",
-          "title"
-        ]
-      }
-    },
-    "markdown_notes_create": {
-      "description": "创建一条新的 Markdown 笔记",
-      "inputSchema": {
-        "type": "object",
-        "additionalProperties": false,
-        "properties": {
-          "title": {
-            "type": "string",
-            "maxLength": 50,
-            "description": "笔记标题"
-          },
-          "content": {
-            "type": "string",
-            "description": "笔记内容（Markdown 源码）"
-          }
-        },
-        "required": [
-          "title",
-          "content"
-        ]
-      },
-      "outputSchema": {
-        "type": "object",
-        "properties": {
-          "success": {
-            "type": "boolean",
-            "description": "是否成功"
-          },
-          "message": {
-            "type": "string",
-            "description": "结果说明"
-          }
-        }
-      }
-    }
-  },
-  "homepage": "https://github.com/LanccBy2016/cmark"
+  ]
 }

package/preload/branch-bar.js

@@ -25,8 +25,10 @@ module.exports = function installBranchBar (win) {
   var busy = false
 
   function $(id) { return doc.getElementById(id) }
+  // 不再发 Windows 系统通知（成功失败都打扰）。这条旧版分支条已由 React 版
+  // BranchBar.tsx 取代，这里保留空实现只为不破坏内部调用点。
   function toast (text) {
-    try { win.ztools.showNotification(text) } catch (e) {}
+    void text
   }
 
   function injectCss () {
@@ -35,7 +37,7 @@ module.exports = function installBranchBar (win) {
       '.sidebar-body{padding-top:36px !important;}',
       '#' + ROOT + '{position:absolute;top:0;left:0;right:0;height:36px;z-index:6;display:flex;align-items:center;gap:4px;',
       '  padding:0 8px;box-sizing:border-box;--bfg:#1f2328;--bbd:#e2e6eb;--bsoft:#f4f6f8;--bsub:#7b838d;}',
-      '@media (prefers-color-scheme:dark){#' + ROOT + '{--bfg:#e6e9ee;--bbd:#3a4149;--bsoft:#2a2f35;--bsub:#8b939e;}}',
+      ":root[data-theme='dark'] #" + ROOT + '{--bfg:#e6edf3;--bbd:#30363d;--bsoft:#22272e;--bsub:#8b949e;}',
       '#' + ROOT + ' .zbb-branch{flex:1;min-width:0;display:flex;align-items:center;gap:5px;height:26px;padding:0 7px;',
       '  border:1px solid var(--bbd);border-radius:7px;background:transparent;color:var(--bfg);font-size:12px;cursor:pointer;',
       '  font-family:inherit;transition:background .14s,border-color .14s;}',
@@ -48,6 +50,10 @@ module.exports = function installBranchBar (win) {
       '  border:1px solid var(--bbd);border-radius:7px;background:transparent;color:var(--bfg);cursor:pointer;opacity:.8;',
       '  transition:background .14s,opacity .14s;}',
       '#' + ROOT + ' .zbb-btn:hover{background:var(--bsoft);opacity:1;}',
+      '#' + ROOT + '.is-off{opacity:.45;filter:grayscale(1);}',
+      '#' + ROOT + '.is-off > *{pointer-events:none;}',
+      '#zbb-lock{position:absolute;top:0;left:0;right:0;height:36px;z-index:7;display:none;cursor:not-allowed;}',
+      '#zbb-lock.on{display:block;}',
       '#' + ROOT + ' .zbb-btn:disabled{opacity:.35;cursor:default;}',
       '#' + ROOT + ' .zbb-btn.busy svg{animation:zbb-spin 1s linear infinite;}',
       '@keyframes zbb-spin{to{transform:rotate(360deg)}}'
@@ -65,6 +71,24 @@ module.exports = function installBranchBar (win) {
     sync: '<svg viewBox="0 0 24 24" width="14" height="14" fill="currentColor"><path d="M12 4V1L8 5l4 4V6c3.31 0 6 2.69 6 6 0 1.01-.25 1.97-.7 2.8l1.46 1.46A7.93 7.93 0 0 0 20 12c0-4.42-3.58-8-8-8zm0 14c-3.31 0-6-2.69-6-6 0-1.01.25-1.97.7-2.8L5.24 7.74A7.93 7.93 0 0 0 4 12c0 4.42 3.58 8 8 8v3l4-4-4-4v3z"/></svg>'
   }
 
+  function gitEnabled () {
+    // 优先用 preload 的配置接口（file:// 下 localStorage 可能不可用）
+    try {
+      const v = win.__CMARK_GIT && win.__CMARK_GIT.get ? win.__CMARK_GIT.get() : undefined
+      if (v === true || v === false) return v
+    } catch (e) {}
+    try { return win.localStorage.getItem('cmark-git-enabled') !== '0' } catch (e) { return true }
+  }
+
+  function applyGitGate () {
+    var root = doc.getElementById(ROOT)
+    if (!root) return
+    var on = gitEnabled()
+    root.classList.toggle('is-off', !on)
+    var lock = doc.getElementById('zbb-lock')
+    if (lock) lock.classList.toggle('on', !on)
+  }
+
   function mount () {
     if (doc.getElementById(ROOT)) return true
     var sb = doc.querySelector('.sidebar-body')
@@ -83,6 +107,12 @@ module.exports = function installBranchBar (win) {
       '<button class="zbb-btn" type="button" id="zbb-sync" title="同步（拉取然后推送）">' + ICON.sync + '</button>'
     ].join('')
     sb.insertBefore(root, sb.firstChild)
+    // Git 集成关掉时整条操作栏置灰、不可点，用覆盖层给出悬浮提示
+    var lock = doc.createElement('div')
+    lock.id = 'zbb-lock'
+    lock.title = '请在设置中开启 Git 集成'
+    sb.insertBefore(lock, root.nextSibling)
+    applyGitGate()
 
     // 左边按钮 = 打开「工作区变更记录」面板
     $('zbb-open').onclick = function () {
@@ -149,6 +179,18 @@ module.exports = function installBranchBar (win) {
     })
   }
 
+  // 供变更面板在 push/pull/sync 之后主动刷新顶部分支与脏标记，
+  // 否则要等下一次轮询（约 3 秒）才更新
+  try { win.__zbbRefresh = function () { try { refreshState(false) } catch (e) {} } } catch (e) {}
+
+  // 设置里切换 Git 集成、或窗口重新可见时，同步整条操作栏的可用状态
+  try { win.addEventListener('cmark-git-changed', applyGitGate) } catch (e) {}
+  try {
+    doc.addEventListener('visibilitychange', function () {
+      if (doc.visibilityState === 'visible') applyGitGate()
+    })
+  } catch (e) {}
+
   if (!mount()) {
     var tries = 0
     var timer = setInterval(function () {

package/preload/export-css.js

@@ -0,0 +1,59 @@
+/**
+ * 导出文档样式（浅/深两套）
+ * preload.js 与 preload/services.js 共用同一份，避免两套实现漂移
+ */
+/* 导出文档样式：浅/深两套，跟随当前主题。
+ * 之前只写了寥寥几条规则 —— 导出后标题层级、表格、代码高亮、高亮标记全丢；
+ * 深色主题下更是浅色壳配深色文字，几乎不可读。 */
+function exportDocCss(theme) {
+  const dark = theme === 'dark'
+  const c = dark
+    ? { bg: '#0d1117', fg: '#e6edf3', muted: '#8b949e', bd: '#30363d', codeBg: '#161b22',
+        th: '#161b22', markBg: '#6b5200', markFg: '#ffe08a', accent: '#58a6ff',
+        kw: '#ff7b72', str: '#a5d6ff', num: '#79c0ff', fn: '#d2a8ff', vr: '#ffa657', cm: '#8b949e', tag: '#7ee787' }
+    : { bg: '#ffffff', fg: '#1f2328', muted: '#57606a', bd: '#d0d7de', codeBg: '#f6f8fa',
+        th: '#f6f8fa', markBg: '#fff3b8', markFg: '#6b4a00', accent: '#0969da',
+        kw: '#cf222e', str: '#0a3069', num: '#0550ae', fn: '#8250df', vr: '#953800', cm: '#6e7781', tag: '#116329' }
+  return [
+    ':root{color-scheme:' + (dark ? 'dark' : 'light') + '}',
+    'body{margin:0;background:' + c.bg + ';color:' + c.fg + ';font:16px/1.75 -apple-system,"Segoe UI",system-ui,"Microsoft YaHei",sans-serif;-webkit-font-smoothing:antialiased}',
+    '.markdown-body{box-sizing:border-box;max-width:980px;margin:0 auto;padding:45px}',
+    '@media (max-width:767px){.markdown-body{padding:18px}}',
+    '.markdown-body h1,.markdown-body h2,.markdown-body h3,.markdown-body h4,.markdown-body h5,.markdown-body h6{margin:1.4em 0 .6em;font-weight:600;line-height:1.3}',
+    '.markdown-body h1{font-size:2em}.markdown-body h2{font-size:1.5em}.markdown-body h3{font-size:1.25em}',
+    '.markdown-body h4{font-size:1em}.markdown-body h5{font-size:.9em}',
+    '.markdown-body h6{font-size:.85em;color:' + c.muted + '}',
+    '.markdown-body h1,.markdown-body h2{border-bottom:1px solid ' + c.bd + ';padding-bottom:.3em}',
+    '.markdown-body p{margin:0 0 .85em}',
+    '.markdown-body ul,.markdown-body ol{margin:0 0 .85em;padding-left:1.6em}',
+    '.markdown-body li{margin:.25em 0}',
+    '.markdown-body li>input[type=checkbox]{margin-right:.4em}',
+    '.markdown-body hr{height:1px;border:0;background:' + c.bd + ';margin:1.6em 0}',
+    '.markdown-body a{color:' + c.accent + ';text-decoration:none}',
+    '.markdown-body blockquote{margin:0 0 .85em;padding:.2em 1em;color:' + c.muted + ';border-left:3px solid ' + c.bd + '}',
+    '.markdown-body code{background:' + c.codeBg + ';border-radius:4px;padding:.2em .4em;font-size:.9em;font-family:"Cascadia Code",Consolas,"Courier New",monospace}',
+    '.markdown-body pre{background:' + c.codeBg + ';border-radius:8px;padding:14px 16px;overflow:auto;line-height:1.6}',
+    '.markdown-body pre code{background:none;padding:0;font-size:.9em}',
+    '.markdown-body table{border-collapse:collapse;margin:0 0 1em;display:block;overflow:auto}',
+    '.markdown-body th,.markdown-body td{border:1px solid ' + c.bd + ';padding:6px 12px}',
+    '.markdown-body th{background:' + c.th + ';font-weight:600}',
+    '.markdown-body img{max-width:100%}',
+    '.markdown-body mark{background:' + c.markBg + ';color:' + c.markFg + ';border-radius:3px;padding:0 2px}',
+    '.markdown-body .token.comment,.markdown-body .token.prolog,.markdown-body .token.doctype,.markdown-body .token.cdata{color:' + c.cm + '}',
+    '.markdown-body .token.punctuation{color:' + c.fg + '}',
+    '.markdown-body .token.keyword,.markdown-body .token.atrule{color:' + c.kw + '}',
+    '.markdown-body .token.string,.markdown-body .token.char,.markdown-body .token.attr-name{color:' + c.str + '}',
+    '.markdown-body .token.number,.markdown-body .token.boolean,.markdown-body .token.constant,.markdown-body .token.property{color:' + c.num + '}',
+    '.markdown-body .token.function,.markdown-body .token.class-name{color:' + c.fn + '}',
+    '.markdown-body .token.variable,.markdown-body .token.regex,.markdown-body .token.important{color:' + c.vr + '}',
+    '.markdown-body .token.tag,.markdown-body .token.inserted{color:' + c.tag + '}',
+  ].join('\n')
+}
+
+function exportDocColors(theme) {
+  return theme === 'dark'
+    ? { bg: '#0d1117', fg: '#e6edf3' }
+    : { bg: '#ffffff', fg: '#1f2328' }
+}
+
+module.exports = { exportDocCss, exportDocColors }