dsh-long-plugins 2.2.2 → 2.2.3

package/client/client.js

@@ -3139,18 +3139,31 @@ window.__ModuleLoader__.load({
       html[data-dsh-glass="on"] [class*="ModalContent"],
       html[data-dsh-glass="on"] [class*="overlay"] [class*="content"],
       html[data-dsh-glass="on"] [class*="_content"][class*="dialog"] {
-        background-color: var(--dsw-specific-input-major, #e8edf3) !important;
+        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 76%, transparent) !important;
         color: var(--dsw-alias-label-primary) !important;
-        backdrop-filter: blur(8px) !important;
-        -webkit-backdrop-filter: blur(8px) !important;
+        backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
+        -webkit-backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
       }
-      /* DSH 提问/弹窗卡(M8wy4a_card 等)：不透明底+原生文字, 避免透明重叠、白字 */
-      html[data-dsh-glass="on"] [class*="M8wy4a_card"],
-      html[data-dsh-glass="on"] [data-chain-overlay-fallback] [class*="card"] {
-        background-color: var(--dsw-specific-input-major, #e8edf3) !important;
+      /* DSH 提问/弹窗卡(M8wy4a_card)：不透明底+原生文字, 避免透明重叠、白字。
+         注意: 不能再用 [data-chain-overlay-fallback] [class*=card](会误匹配输入框 uV2eYG_card 加 blur 造成重影) */
+      html[data-dsh-glass="on"] [class*="M8wy4a_card"] {
+        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 76%, transparent) !important;
+        color: var(--dsw-alias-label-primary) !important;
+        backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
+        -webkit-backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
+      }
+      /* 任务/todo 面板(lXshSW_root, 在 conversation.input.dock 内)：不透明底+可读文字, 不透明与会话重叠 */
+      html[data-dsh-glass="on"] [class*="lXshSW_root"],
+      html[data-dsh-glass="on"] [class*="lXshSW_body"] {
+        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 76%, transparent) !important;
+        color: var(--dsw-alias-label-primary) !important;
+        backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
+        -webkit-backdrop-filter: blur(var(--dsh-glass-blur, 16px)) !important;
+      }
+      html[data-dsh-glass="on"] [class*="lXshSW_header"] [class*="lXshSW_title"],
+      html[data-dsh-glass="on"] [class*="lXshSW_header"] [class*="lXshSW_progress"],
+      html[data-dsh-glass="on"] [class*="lXshSW_item"] {
         color: var(--dsw-alias-label-primary) !important;
-        backdrop-filter: blur(8px) !important;
-        -webkit-backdrop-filter: blur(8px) !important;
       }
       /* 轮次/历史提问预览：默认隐藏（点开才显示），并去掉头部底色，避免底部露出白条 */
       .dsh-turn-preview:not(.open){display:none !important;}
@@ -3206,20 +3219,20 @@ window.__ModuleLoader__.load({
       }
       /* 输入框下拉/悬浮菜单(如 / 命令、@ 提及)：背景给不透明随主题色，避免叠在会话磨砂卡上重叠看不清 */
       html[data-dsh-glass="on"] #root [class*="_menu"][class*="_menu"][class*="_menu"][class*="_menu"] {
-        background-color: var(--dsw-specific-input-major, #e8edf3) !important;
+        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 76%, transparent) !important;
         background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 97%, transparent) !important;
         backdrop-filter: none !important;
         -webkit-backdrop-filter: none !important;
       }
       /* 输入框旁权限/功能选择下拉(盾牌 Full access 等 Radix 风格菜单)：与 / 命令菜单同样处理 */
       html[data-dsh-glass="on"] #root [class*="uV2eYG_card"] [class*="_root_"]:has([class*="_list_"]) {
-        background-color: var(--dsw-specific-input-major, #e8edf3) !important;
+        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 76%, transparent) !important;
         background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 97%, transparent) !important;
         backdrop-filter: none !important;
         -webkit-backdrop-filter: none !important;
       }
       html[data-dsh-glass="on"] #root [class*="uV2eYG_card"] [class*="_list_"] {
-        background-color: var(--dsw-specific-input-major, #e8edf3) !important;
+        background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 76%, transparent) !important;
         background-color: color-mix(in srgb, var(--dsw-specific-input-major, #e8edf3) 97%, transparent) !important;
         backdrop-filter: none !important;
         -webkit-backdrop-filter: none !important;
@@ -3307,14 +3320,16 @@ window.__ModuleLoader__.load({
       )
     }
     const GlassSettingsSection = () => {
-      const [state, setState] = React.useState({ loading: true, saving: false, error: '', cfg: null, bgImage: '' })
+      const [state, setState] = React.useState({ loading: true, saving: false, error: '', cfg: null, bgImage: '', bgList: [] })
       const load = React.useCallback(async () => {
         setState((s) => ({ ...s, loading: true, error: '' }))
         try {
           const r = await fetch('/api/dsh-uploads/glass-config', { cache: 'no-store' })
           const b = await r.json()
           if (!r.ok) throw new Error(b.error || ('HTTP ' + r.status))
-          setState((s) => ({ ...s, loading: false, cfg: b.cfg, bgImage: b.bgImage || '' }))
+          let list = []
+          try { const rb = await fetch('/api/dsh-uploads/glass-backgrounds', { cache: 'no-store' }); const jb = await rb.json(); list = jb.list || [] } catch (_) {}
+          setState((s) => ({ ...s, loading: false, cfg: b.cfg, bgImage: b.bgImage || '', bgList: list }))
         } catch (e) { setState((s) => ({ ...s, loading: false, error: glassText(e) })) }
       }, [])
       React.useEffect(() => { load(); }, [load])
@@ -3370,13 +3385,12 @@ window.__ModuleLoader__.load({
         state.error ? React.createElement('div', { className: 'dsh-glass-error' }, state.error) : null,
         React.createElement('div', { className: 'dsh-glass-card' },
           React.createElement('div', { className: 'dsh-glass-row' },
-            React.createElement('label', null, '磨砂模糊强度'),
-            React.createElement('input', { type: 'range', className: 'dsh-glass-range', min: 0, max: 80, value: cfg.blur ?? 20, onChange: (e) => patch({ blur: Number(e.target.value) }) }),
-            React.createElement('span', { className: 'dsh-glass-val' }, `${Number(cfg.blur ?? 20)} px`),
-          ),
-          React.createElement('div', { className: 'dsh-glass-row' },
-            React.createElement('label', null, '共用背景图'),
+            React.createElement('label', null, '背景图'),
             React.createElement('div', { className: 'dsh-glass-bg' }, glassImageInput(state.bgImage, (v) => setState((s) => ({ ...s, bgImage: v })))),
+            state.bgList && state.bgList.length ? React.createElement('select', { className: 'dsh-glass-file', value: '', style: { marginLeft: 8 }, onChange: async (e) => {
+              const name = e.target.value; if (!name) return
+              try { const rb = await fetch('/api/dsh-uploads/glass-backgrounds?name=' + encodeURIComponent(name), { cache: 'no-store' }); const uri = await rb.text(); if (uri && uri.startsWith('data:image/')) setState((s) => ({ ...s, bgImage: uri })) } catch (_) {}
+            } }, React.createElement('option', { value: '' }, '选择旧图…'), state.bgList.map((n, i) => React.createElement('option', { key: n, value: n }, '背景图 ' + (i + 1))) ) : null,
           ),
           React.createElement('div', { className: 'dsh-glass-card' },
             React.createElement('div', { className: 'dsh-glass-zone-title' }, '背景罩'),
@@ -3403,9 +3417,18 @@ window.__ModuleLoader__.load({
             React.createElement('span', { className: 'dsh-glass-val' }, `${Number(cfg.bgBlur ?? 0)} px`),
           ),
           React.createElement('div', { className: 'dsh-glass-row' },
-            React.createElement('label', null, '背景图透明度'),
-            React.createElement('input', { type: 'range', className: 'dsh-glass-range', min: 0, max: 1, step: 0.01, value: cfg.bgOpacity ?? 1, onChange: (e) => patch({ bgOpacity: Number(e.target.value) }) }),
-            React.createElement('span', { className: 'dsh-glass-val' }, `${Math.round((Number(cfg.bgOpacity ?? 1)) * 100)}%`),
+            React.createElement('label', null, '背景透明度'),
+            React.createElement('input', { type: 'range', className: 'dsh-glass-range', min: 0, max: 100, value: Math.round((1 - (Number(cfg.bgOpacity ?? 1))) * 100), onChange: (e) => patch({ bgOpacity: 1 - Number(e.target.value) / 100 }) }),
+            React.createElement('span', { className: 'dsh-glass-val' }, `${Math.round((1 - (Number(cfg.bgOpacity ?? 1))) * 100)}%`),
+          ),
+          React.createElement('div', { className: 'dsh-glass-card' },
+            React.createElement('div', { className: 'dsh-glass-zone-title' }, '面板'),
+            React.createElement('div', { className: 'dsh-glass-row' },
+              React.createElement('label', null, '面板磨砂'),
+              React.createElement('input', { type: 'range', className: 'dsh-glass-range', min: 0, max: 80, value: cfg.blur ?? 20, onChange: (e) => patch({ blur: Number(e.target.value) }) }),
+              React.createElement('span', { className: 'dsh-glass-val' }, `${Number(cfg.blur ?? 20)} px`),
+            ),
+            React.createElement('p', { className: 'dsh-glass-note' }, '作用于弹窗/任务卡等面板的磨砂玻璃强度（0 = 关闭磨砂）。'),
           ),
           React.createElement('div', { className: 'dsh-glass-card' },
             React.createElement('div', { className: 'dsh-glass-zone-title' }, '输入框'),
@@ -3419,13 +3442,13 @@ window.__ModuleLoader__.load({
                   React.createElement('button', { type: 'button', style: { marginLeft: 8, fontSize: 12 }, onClick: () => patchInput(t, { color: '', opacity: 1 }) }, '原生'),
                 ),
                 React.createElement('div', { className: 'dsh-glass-row' },
-                  React.createElement('label', null, '不透明度'),
-                  React.createElement('input', { type: 'range', className: 'dsh-glass-range', min: 0, max: 1, step: 0.01, value: (typeof tb.opacity === 'number') ? tb.opacity : 1, onChange: (e) => patchInput(t, { opacity: Number(e.target.value) }) }),
-                  React.createElement('span', { className: 'dsh-glass-val' }, `${Math.round((typeof tb.opacity === 'number' ? tb.opacity : 1) * 100)}%`),
+                  React.createElement('label', null, '透明度'),
+                  React.createElement('input', { type: 'range', className: 'dsh-glass-range', min: 0, max: 100, value: Math.round((1 - (typeof tb.opacity === 'number' ? tb.opacity : 1)) * 100), onChange: (e) => patchInput(t, { opacity: 1 - Number(e.target.value) / 100 }) }),
+                  React.createElement('span', { className: 'dsh-glass-val' }, `${Math.round((1 - (typeof tb.opacity === 'number' ? tb.opacity : 1)) * 100)}%`),
                 ),
               )
             }),
-            React.createElement('p', { className: 'dsh-glass-note' }, '浅色主题与深色主题可分别设置。100% = 实底不透明，越低越透出背景图；"原生" = 跟随该主题的 DSH 原生色。文字颜色按背景亮度自动配深/浅，保证可读。'),
+            React.createElement('p', { className: 'dsh-glass-note' }, '浅色主题与深色主题可分别设置。0% = 全不透明，100% = 全透明；"原生" = 跟随该主题的 DSH 原生色。文字颜色按背景亮度自动配深/浅，保证可读。'),
           ),
           React.createElement('p', { className: 'dsh-glass-note' }, '提示：背景图铺满整页(可加背景图罩)；背景图模糊/透明度单独可调；会话区使用自己的罩色、罩强度与透明度；左栏/顶部透出背景图；输入框颜色/不透明度可单独设置。'),
           React.createElement('div', { className: 'dsh-glass-actions' },
@@ -3695,9 +3718,10 @@ window.__ModuleLoader__.load({
               const fg = dark ? '#f2f6fa' : '#1a2332'
               // 只匹配提问/弹窗卡(M8wy4a_card)，避免误匹配输入框 uV2eYG_card(含"card")导致 blur 重影
               document.querySelectorAll('[class*="M8wy4a_card"]').forEach((el) => {
-                el.style.setProperty('background-color', bg, 'important')
+                const rgb = bg
+                el.style.setProperty('background-color', `color-mix(in srgb, ${rgb} 76%, transparent)`, 'important')
                 el.style.setProperty('color', fg, 'important')
-                el.style.setProperty('backdrop-filter', 'blur(8px)')
+                el.style.setProperty('backdrop-filter', 'blur(var(--dsh-glass-blur, 20px))')
               })
             }
             // 主题相关的东西统一重算：背景罩 + 输入框。切主题时由 observer/mq 触发。
@@ -3733,6 +3757,8 @@ window.__ModuleLoader__.load({
               bgimg.style.backgroundSize = 'cover'
               bgimg.style.backgroundPosition = 'center'
               bgimg.style.backgroundRepeat = 'no-repeat'
+              // 背景图模糊 = 背景图模糊(bgBlur) + 磨砂模糊强度(blur)，两者叠加让背景图一起磨砂
+              // 背景图模糊 = 仅背景图模糊(bgBlur)；面板磨砂(blur)作用于弹窗/任务面板的 backdrop-filter
               const bblur = Math.max(0, Math.min(80, Number.isFinite(Number(c.bgBlur)) ? Number(c.bgBlur) : 0))
               bgimg.style.filter = bblur > 0 ? `blur(${bblur}px)` : 'none'
               const bop = Math.max(0, Math.min(1, Number.isFinite(Number(c.bgOpacity)) ? Number(c.bgOpacity) : 1))

package/dsh.plugin.json

@@ -1,7 +1,7 @@
 {
   "name": "dsh-long-plugins",
   "description": "Merged DSH web plugins: upload manager (drag-and-drop attach any file to the message), workspace output files, skill docs, account balance, Markdown-to-Word (md2docx), and polished file preview (Word & PowerPoint real preview with zoom/pan, rendered Markdown), plus an auto-repair install for DSH core patches (reverse-proxy WebSocket heartbeat, upgrade relink). | 一个插件整合 DSH Web 的常用增强：上传管理（拖放上传：拖任意文件到会话框直接附加）、工作区「输出文件」面板、技能文档浏览、账户余额显示、Markdown 转 Word（md2docx）、Word/PowerPoint 真实预览（可缩放、翻页）；并自带修复安装，自动重连 DSH 核心补丁（反代 WebSocket 心跳、升级重连）。",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "entry": {
     "name": "dsh-long-plugins",
     "inject": [

package/lib/index.js

@@ -1631,6 +1631,7 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
   };
   const glassDir = resolve(homedir(), ".dsh-long-plugins");
   const glassFile = join(glassDir, "glass.json");
+  const bgDir = join(glassDir, "backgrounds");
   async function readGlassJSON() {
     try { const raw = JSON.parse(await readFile(glassFile, "utf8")); return { ...GLASS_DEFAULTS, ...(raw && typeof raw === "object" ? raw : {}) }; }
     catch { return { ...GLASS_DEFAULTS }; }
@@ -1649,6 +1650,7 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
             inputBox: cfg.inputBox || { light: { color: "", opacity: 1 }, dark: { color: "", opacity: 1 } },
             bgTint: cfg.bgTint || { light: { color: "#1a2332", mask: 0.28 }, dark: { color: "#1a2332", mask: 0.28 } },
             bgColor: cfg.bgColor || "#1a2332", bgMask: cfg.bgMask ?? 0.28,
+            bgBlur: cfg.bgBlur ?? 0, bgOpacity: cfg.bgOpacity ?? 1,
             bgImage: cfg.bgImage ? { present: true, bytes: Math.round((cfg.bgImage.length * 3) / 4) } : { present: false },
           },
           bgImage: cfg.bgImage,
@@ -1661,6 +1663,14 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
         const next = { ...current, ...sanitizeGlass(typeof body === "object" && body !== null ? body : {}) };
         await mkdir(glassDir, { recursive: true, mode: 0o700 });
         await writeFile(glassFile, JSON.stringify(next, null, 2), "utf8");
+        // 背景图若有变更且是 data-URI, 存入 backgrounds/ 供"选择旧图"使用
+        if (next.bgImage && current.bgImage !== next.bgImage && /^data:image\//.test(next.bgImage)) {
+          try {
+            await mkdir(bgDir, { recursive: true, mode: 0o700 });
+            const name = Date.now() + ":" + Math.random().toString(36).slice(2, 8) + ".uri";
+            await writeFile(join(bgDir, name), next.bgImage, "utf8");
+          } catch (_) {}
+        }
         sendJson(res, 200, { ok: true, saved: true });
         return;
       }
@@ -1669,8 +1679,26 @@ window.addEventListener('resize',function(){ try{ if(fitMode) zoomFit(); else ap
       sendError(res, error, onError);
     }
   };
+  // 背景图历史（供设置面板"选择旧图"）：GET 列出，GET ?name= 返回对应 data-URI
+  const glassBackgrounds = async (req, res) => {
+    try {
+      requireTrusted(req);
+      const url = new URL(req.url, "http://x");
+      const name = url.searchParams.get("name");
+      if (name) {
+        if (!/^[\w.:-]+\.uri$/.test(name)) { sendError(res, new Error("bad name"), onError); return; }
+        try { const buf = await readFile(join(bgDir, name)); res.writeHead(200, { "content-type": "text/plain; charset=utf-8", "cache-control": "no-store" }); res.end(buf); return; }
+        catch { sendJson(res, 404, { error: "not found" }); return; }
+      }
+      let list = [];
+      try { list = (await readdir(bgDir)).filter((n) => n.endsWith(".uri")).sort().reverse().slice(0, 30); } catch (_) {}
+      sendJson(res, 200, { list });
+    } catch (error) {
+      sendError(res, error, onError);
+    }
+  };
 
-  return { root, maxFileBytes, totalMaxBytes, api, download, preview, workspaceList, workspaceFile, workspacePreview, workspaceBrowse, workspaceDelete, workspaceRename, workspaceSave, docxPreviewPage, docxPreviewAsset, pptxPreviewPage, xlsxPreviewPage, xlsxPreviewAsset, glassConfig };
+  return { root, maxFileBytes, totalMaxBytes, api, download, preview, workspaceList, workspaceFile, workspacePreview, workspaceBrowse, workspaceDelete, workspaceRename, workspaceSave, docxPreviewPage, docxPreviewAsset, pptxPreviewPage, xlsxPreviewPage, xlsxPreviewAsset, glassConfig, glassBackgrounds };
 }
 
 /** 人类可读文件大小。 */
@@ -2575,6 +2603,12 @@ export async function apply(ctx, config = {}) {
     handler: handlers.glassConfig,
   }), "dsh-long-plugins: glass-ui config route");
 
+  ctx.effect(() => ctx.webServer.register({
+    kind: "exact",
+    path: "/api/dsh-uploads/glass-backgrounds",
+    handler: handlers.glassBackgrounds,
+  }), "dsh-long-plugins: glass-ui backgrounds route");
+
   ctx.effect(() => ctx.webServer.register({
     kind: "exact",
     path: "/api/dsh-uploads/workspace-browse",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dsh-long-plugins",
-  "version": "2.2.2",
+  "version": "2.2.3",
   "description": "Merged DSH web plugins: upload manager (drag-and-drop attach any file to the message), workspace output files, skill docs, account balance, Markdown-to-Word (md2docx), and polished file preview (Word & PowerPoint real preview with zoom/pan, rendered Markdown), plus an auto-repair install for DSH core patches (reverse-proxy WebSocket heartbeat, upgrade relink). | 一个插件整合 DSH Web 的常用增强：上传管理（拖放上传：拖任意文件到会话框直接附加）、工作区「输出文件」面板、技能文档浏览、账户余额显示、Markdown 转 Word（md2docx）、Word/PowerPoint 真实预览（可缩放、翻页）；并自带修复安装，自动重连 DSH 核心补丁（反代 WebSocket 心跳、升级重连）。",
   "type": "module",
   "license": "MIT",