fish-dock-plugin-filemgr 1.0.5 → 1.0.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fish-dock-plugin-filemgr",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "description": "FISH Dock 文件管理插件：目录浏览 + 文件预览（Markdown / 图片 / Office / 代码）+ 文件暂存中转站，兼容 FISH Dock v1.2.3 及更早官方发行版。",
   "type": "module",
   "files": [

package/plugin.json

@@ -2,7 +2,7 @@
   "schema": 1,
   "id": "jassdingk.filemgr",
   "name": "文件管理",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "hostApi": 1,
   "platforms": [
     "windows-x86_64"
@@ -27,19 +27,19 @@
   ],
   "files": {
     "bridge.js": "f38f93994e3cb2b71f2ff1810b3f68fb42f4261550f8ab01b0bfa3eecd5f94ee",
-    "package.json": "7e9124508cc113f5039ce514573a5f8f280faf9392e4677d30bb144c55351e5c",
+    "package.json": "d2b066289c54ebfb40da8591f8dbaf261c8cbd0dcb80ea03f5206c7f0aa50e35",
     "plugins/filemgr/backend.mjs": "b448aa688ff11f2abc4c5281b4714646ed6c384473d873cfe431a8e64b066d26",
     "plugins/filemgr/clip.ps1": "b0a32fca35cf2d25133338f46e20a0db20d78c5bb6b5c2aab899998bfbd6c6ab",
     "plugins/filemgr/dock.css": "e795214dd39de3b473ac0b1a7b79f6922a88c761fca4d3ea4da8fd9b60188bcf",
-    "plugins/filemgr/filemgr.css": "16c621471133d29c6942781bedf86e0a4de806865ff004b666bcad8b1929434e",
+    "plugins/filemgr/filemgr.css": "79b878b29499284935d71dfa877716232f85ed40d864437382a059fa8ced0479",
     "plugins/filemgr/FolderPicker.ps1": "4b7f86c543e06fd8f93fa5d8002997d944c8189cb0ae031bedf864ea89196427",
     "plugins/filemgr/page.css": "0801a05b5148cd091a68957beac21cc982a7818ef4707cd06fd11b20adbc7765",
     "plugins/filemgr/page.html": "3cfda31be29cd23b1e0f7f6004b6c03522c3526b78f9df4711e320962a660831",
-    "plugins/filemgr/page.js": "282f11d803ddc8bb87a0a99d8af68315f4ff7304672072da838a07a47c5cdc62",
+    "plugins/filemgr/page.js": "74a7ccae18f7857be9656f14db07c2bddbf4591fff57a7eb16722ee4128e739d",
     "plugins/filemgr/pick-files.ps1": "88bff92d9a2e5b69e9411bb372441ff0b86899b7f5b31f5ed8d154c4f6fc2f37",
     "plugins/filemgr/pick-folder.ps1": "ff031c14df32149c1c80c7ab6a21710c1a68e823e96e3068c458a60902ae3b6f",
     "plugins/filemgr/preview.mjs": "a5596e77180fe7928443244a0148b6d3ea8381a1f886ee01f9a08be038c7ee80",
-    "plugins/filemgr/sdk.mjs": "76b052b8d99ff6b6b0b149aee7479d1129bb248a959625642282184978065f38",
+    "plugins/filemgr/sdk.mjs": "91061dae337157c88e2303d1899f9149ccecd656df4675c76dd5721bc405bf07",
     "plugins/filemgr/stash.css": "fce2aaa13a86dbd7675b685c533f0bb916c7e610fc612a3ade660c67069f5662",
     "plugins/filemgr/stash.mjs": "c33cea6b845a3847950d26a10b9aba1ef68d39b1f9fc423b23055dead7638866",
     "README.md": "e9fb4ca9831b778a1d530b67518fcaf2b42cf02494b9d68deaad16bf2b947687"

package/plugins/filemgr/filemgr.css

@@ -71,6 +71,14 @@ body[data-resizing=true]{user-select:none;cursor:col-resize}
 .stash-group>.stash-tag.active>.stash-tag-count{opacity:.8}
 .stash-group>.stash-tag.active>.stash-tag-del{color:#1a1035;opacity:.75}
 .stash-group>.stash-tag.active>.stash-tag-del:hover{color:#7a1010}
+/* 拖动文件悬停到某个分组标签上：高亮该分组名，提示松手即落入此分组 */
+.stash-group>.stash-tag.drop-hover{
+  color:#1a1035;background:var(--dock-accent);border-color:var(--dock-accent);
+  box-shadow:0 0 0 2px color-mix(in srgb,var(--dock-accent) 40%,transparent);
+}
+.stash-group>.stash-tag.drop-hover>.stash-tag-dot{background:#1a1035}
+.stash-group>.stash-tag.drop-hover>.stash-tag-count{opacity:.85}
+.stash-group>.stash-tag.drop-hover>.stash-tag-del{color:#1a1035;opacity:.75}
 /* 右侧文件列表：已在暂存/分组里的文件 */
 .filelist .row.stashed .nm{color:var(--dock-accent)}
 .stash-badge{flex:none;font-size:10px;line-height:1;padding:2px 6px;border-radius:999px;

package/plugins/filemgr/page.js

@@ -1472,6 +1472,7 @@
 
       const summary = el('summary', {
         class: 'stash-tag' + (active ? ' active' : ''),
+        dataset: { group: bucket.key },   // 供拖拽命中：拖到此标签上即高亮该组名并落入该分组
         title: `${bucket.label} · ${bucket.items.length} 项（点箭头/整条折叠；点右侧漏斗图标只在看本组与全部间切换）`,
       })
       // 单击整条标签 = 折叠/展开（summary 默认行为，不拦截）。
@@ -1765,11 +1766,12 @@
   // 批量加入（框选后拖进暂存区走这一条）。
   // 后端 stash.add 本来就吃 paths 数组，所以只是把多行一次性递过去；
   // 逐个报告"加了几项/几项重复"，比只弹一个含糊的 toast 更好懂。
-  async function addManyToStash(paths) {
+  async function addManyToStash(paths, group) {
     const list = (paths || []).filter(Boolean)
     if (!list.length) return
-    const group = state.view === 'all' ? '' : state.view
-    const row = await callSoft('stash.add', { paths: list, group })
+    // 显式传入的分组（拖到某个分组标签上）优先；未指定时回退到当前视图分组。
+    const targetGroup = group === undefined ? (state.view === 'all' ? '' : state.view) : group
+    const row = await callSoft('stash.add', { paths: list, group: targetGroup })
     if (row && row.ok) {
       const added = Array.isArray(row.items) ? row.items.length : 0
       const dup = list.length - added
@@ -1800,6 +1802,7 @@
     let moved = false
     let suppressClick = false
     let ghost = null
+    let dropGroup = undefined     // 拖拽时命中的分组标签 key（undefined=未命中，回退当前视图）
 
     const rows = () => Array.from(list.querySelectorAll('.row[data-path]'))
 
@@ -1836,6 +1839,8 @@
       if (ghost) { ghost.remove(); ghost = null }
       for (const node of list.querySelectorAll('.row.drag-src')) node.classList.remove('drag-src')
       if (stashCol) stashCol.classList.remove('drop-target')
+      dropGroup = undefined
+      for (const node of document.querySelectorAll('.stash-tag.drop-hover')) node.classList.remove('drop-hover')
     }
 
     list.addEventListener('pointerdown', event => {
@@ -1920,8 +1925,14 @@
       } else if (mode === 'drag' && ghost) {
         ghost.style.left = `${event.clientX + 14}px`
         ghost.style.top = `${event.clientY + 14}px`
-        const over = stashCol && document.elementFromPoint(event.clientX, event.clientY)?.closest('#stash-col')
+        const under = document.elementFromPoint(event.clientX, event.clientY)
+        const over = stashCol && under?.closest('#stash-col')
         if (stashCol) stashCol.classList.toggle('drop-target', !!over)
+        // 命中哪个分组标签，就高亮哪个分组名并把它作为落点；未命中分组标签则回退当前视图分组。
+        const hitTag = under && under.closest('.stash-tag[data-group]')
+        dropGroup = hitTag ? hitTag.dataset.group : undefined
+        for (const node of document.querySelectorAll('.stash-tag.drop-hover')) node.classList.remove('drop-hover')
+        if (hitTag) hitTag.classList.add('drop-hover')
       }
       event.preventDefault()
     })
@@ -1930,6 +1941,7 @@
       if (mode === 'idle') return
       const was = mode
       const paths = dragPaths.slice()
+      const group = dropGroup            // 松手前记录命中的分组（reset 会清空）
       const dropped = was === 'drag' && !!(
         stashCol && document.elementFromPoint(event.clientX, event.clientY)?.closest('#stash-col')
       )
@@ -1940,7 +1952,7 @@
         setTimeout(() => { suppressClick = false }, 0)
       }
       reset()
-      if (dropped && paths.length) await addManyToStash(paths)
+      if (dropped && paths.length) await addManyToStash(paths, group)
     }
 
     list.addEventListener('pointerup', event => { finish(event) })

package/plugins/filemgr/sdk.mjs

@@ -3,7 +3,7 @@ const CATEGORIES = new Set(['credentials','roster','keys','config','exports','ba
 const DEFAULT_LIMIT = 1024 * 1024;
 export function createPlugin({ id, input = process.stdin, output = process.stdout,
   activate = async () => {}, deactivate = async () => {}, onEvent = async () => {}, commands = {},
-  onError = () => {}, maxLine = DEFAULT_LIMIT, requestTimeout = 5000 } = {}) {
+  onError = () => {}, maxLine = DEFAULT_LIMIT, requestTimeout = 12000 } = {}) {
   if (!/^[a-z0-9]+(?:-[a-z0-9]+)*\.[a-z0-9]+(?:-[a-z0-9]+)*$/.test(id ?? '')) throw new Error('插件 ID 格式无效');
   if (!Number.isSafeInteger(maxLine) || maxLine < 128 || maxLine > DEFAULT_LIMIT) throw new Error('协议帧大小无效');
   if (!Number.isSafeInteger(requestTimeout) || requestTimeout < 1 || requestTimeout > 30000) throw new Error('宿主调用时限无效');
@@ -94,7 +94,10 @@ export function createPlugin({ id, input = process.stdin, output = process.stdou
     if (!row || typeof row !== 'object' || Array.isArray(row)) throw new Error('插件协议应为 JSON 对象');
     if (!Object.hasOwn(row,'method')) {
       const waiter = pending.get(row.id);
-      if (!waiter) throw new Error('宿主响应编号不匹配');
+      // 迟到/重复的宿主响应（原请求已因超时被清理）：静默丢弃，绝不让整个插件会话崩溃。
+      // 原实现此处 throw 会经 receive() → close()+onError() 杀死插件；任何一次超过
+      // requestTimeout 的存储调用，其迟到响应都会触发。调用方早已通过超时 reject 感知失败。
+      if (!waiter) return;
       pending.delete(row.id); clearTimeout(waiter.timer);
       if (Object.hasOwn(row,'result') === Object.hasOwn(row,'error')) return waiter.reject(new Error('宿主响应结构无效'));
       if (row.error) waiter.reject(new Error('宿主存储操作失败')); else waiter.resolve(row.result);