@zhangfengshun/dsh-remote-ssh 1.7.0 → 1.8.1

package/CHANGELOG.md

@@ -2,6 +2,17 @@
 
 本文件的版本号与 `package.json` 的 `version` 保持一致。每个版本对应一个 Cordis Package 快照（`pkg-N`）。
 
+## [1.8.1] — 浏览按钮调用原生目录选择框
+### 修复
+- **「浏览」按钮**：本地模式下点击调用 `ctx.workspaces.pickDirectory()` 弹出操作系统原生目录选择框（默认打开用户主目录），选中后自动加载该目录的文件树并填入路径栏。原先该按钮只是按输入框路径刷新树，没有实际选择作用。远程模式无系统对话框，仍按输入路径刷新远端文件树。
+
+## [1.8.0] — 重做「添加工作区」弹窗
+### 改进
+- **统一弹窗布局**：原先本地/远程是两个独立弹窗（各自标题），现改为**单个弹窗**：顶部「📁 本地目录 / 🌐 远程目录」分段切换按钮（当前激活的高亮），下方依次为连接选择（远程时）、路径栏（浏览按钮紧挨输入框右侧）、当前路径下的文件树（仅目录、可滚动）。
+- 路径栏右侧的「浏览」按钮紧挨输入框，点击后按输入框路径加载文件树（原为「打开」）。
+- 文件树无子目录时显示占位提示。
+- 本地/远程切换不再关闭重开弹窗，在同一弹窗内即时切换。
+
 ## [1.7.0] — SSH 连接复用（大幅加速）
 ### 重大优化
 - **持久 SSH 会话池**：`ls`/`cat`/`write`/`grep`/`glob`/`mkdir`/`delete`/`move` 等文件操作不再每次新建 ssh 子进程（每次都要完整 TCP 握手 + 密钥交换 + 认证，超算/跳板机单次 2-10 秒）。改为维护一条常驻 `ssh <host> bash` 进程，所有命令复用它，用哨兵标记（sentinel）分隔输出、解析退出码。首次连接后，后续操作近乎瞬时。

package/README.md

@@ -30,7 +30,7 @@ dsh plugin --profile <name> add /absolute/path/to/dsh-remote-ssh
 ### 发布后安装
 
 ```bash
-dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@1.7.0
+dsh plugin --profile <name> add @zhangfengshun/dsh-remote-ssh@1.8.1
 ```
 
 > ⚠️ 安装后需**重启 DSH** 才生效；后续仅修改 Client 半边时刷新浏览器即可。

package/lib/client.js

@@ -47,6 +47,13 @@ window.__ModuleLoader__.load({
       ".rssh-ok{color:var(--dsw-alias-state-success-primary)}.rssh-err{color:var(--dsw-alias-state-error-primary)}.rssh-muted{color:var(--dsw-alias-label-tertiary);font-size:12px;padding:6px 0}" +
       ".rssh-empty{padding:12px;text-align:center;color:var(--dsw-alias-label-tertiary);font-size:12px}" +
       ".rssh-flow-dialog{width:690px!important;max-width:94vw!important;min-width:460px;resize:horizontal;overflow:auto!important}" +
+      // 添加工作区弹窗：上方本地/远程分段切换 + 路径栏 + 文件树
+      ".rssh-seg{display:flex;gap:0;margin-bottom:8px;border:1px solid var(--dsw-alias-border-l2);border-radius:6px;overflow:hidden}" +
+      ".rssh-seg-btn{flex:1;padding:7px 12px;text-align:center;cursor:pointer;font-size:12px;font-weight:500;background:var(--dsw-alias-bg-layer-2);color:var(--dsw-alias-label-secondary);border:none;transition:background .15s}" +
+      ".rssh-seg-btn:hover{background:var(--dsw-alias-interactive-bg-hover)}" +
+      ".rssh-seg-btn.active{background:var(--dsw-alias-state-business-primary);color:#fff}" +
+      ".rssh-pick-tree{border:1px solid var(--dsw-alias-border-l1);border-radius:4px;max-height:240px;overflow-y:auto;margin-top:4px;background:var(--dsw-alias-bg-layer-2)}" +
+      ".rssh-pick-empty{padding:12px;text-align:center;color:var(--dsw-alias-label-tertiary);font-size:11px}" +
       // 设置面板导航：隐藏「远程连接」栏目左侧壳层硬编码的齿轮图标（本栏目 order=200 位于末尾）。
       ".VOzbGW_navList .VOzbGW_navCell:last-child .VOzbGW_navIcon{display:none}";
 
@@ -84,6 +91,7 @@ window.__ModuleLoader__.load({
       "common.save": "保存",
       "common.open": "打开",
       "common.close": "关闭",
+      "common.noEntries": "（无子目录）",
       "common.delete": "删除",
       "common.up": "⬆ 上级",
       "common.loading": "加载中…",
@@ -114,6 +122,10 @@ window.__ModuleLoader__.load({
       "flow.remoteTitle": "选择远程目录",
       "flow.localDir": "本地目录",
       "flow.remoteDir": "远程目录",
+      "flow.addWsTitle": "添加工作区",
+      "flow.localSeg": "📁 本地目录",
+      "flow.remoteSeg": "🌐 远程目录",
+      "flow.browse": "浏览",
       "flow.chooseRemote": "选择远程目录…",
       "flow.backLocal": "← 选择本地目录",
       "flow.errCreate": "创建远程工作区失败",
@@ -178,6 +190,7 @@ window.__ModuleLoader__.load({
       "common.save": "Save",
       "common.open": "Open",
       "common.close": "Close",
+      "common.noEntries": "(no subdirectories)",
       "common.delete": "Delete",
       "common.up": "⬆ Up",
       "common.loading": "Loading…",
@@ -208,6 +221,10 @@ window.__ModuleLoader__.load({
       "flow.remoteTitle": "Select Remote Directory",
       "flow.localDir": "Local directory",
       "flow.remoteDir": "Remote directory",
+      "flow.addWsTitle": "Add Workspace",
+      "flow.localSeg": "📁 Local",
+      "flow.remoteSeg": "🌐 Remote",
+      "flow.browse": "Browse",
       "flow.chooseRemote": "Choose remote directory…",
       "flow.backLocal": "← Choose local directory",
       "flow.errCreate": "Failed to create remote workspace",
@@ -773,6 +790,8 @@ window.__ModuleLoader__.load({
 
       var listFnRef = React.useRef(props.listFn);
       listFnRef.current = props.listFn;
+      var pickRef = React.useRef(props.pickNative);
+      pickRef.current = props.pickNative;
 
       function load(p) {
         setLoading(true); setErr(null);
@@ -790,21 +809,43 @@ window.__ModuleLoader__.load({
         if (up !== null) load(up);
       }
 
-      return h("div", { style: { border: "1px solid var(--dsw-alias-border-l1)", borderRadius: 6, padding: 8, marginTop: 6 } },
+      // 浏览按钮：本地模式弹原生系统目录选择框（默认打开用户主目录），远程模式按输入路径刷新文件树。
+      function browse() {
+        if (pickRef.current) {
+          setLoading(true); setErr(null);
+          pickRef.current().then(function (picked) {
+            setLoading(false);
+            if (picked) load(picked);
+          }).catch(function (e) {
+            setLoading(false);
+            setErr(String(e && e.message ? e.message : e));
+          });
+        } else {
+          load(path);
+        }
+      }
+
+      // 路径栏：输入框 + 浏览按钮（紧挨在右侧）+ 上级
+      return h("div", null,
         h("div", { className: "rssh-pathbar" },
           h("input", { className: "rssh-input", value: path, onChange: function (e) { setPath(e.target.value); }, placeholder: props.placeholder || t("picker.dir") }),
-          h("button", { className: "rssh-btn", onClick: function () { load(path); } }, t("common.open")),
+          h("button", { className: "rssh-btn", onClick: browse, disabled: loading }, t("flow.browse")),
           h("button", { className: "rssh-btn", onClick: goUp }, t("common.up"))
         ),
         loading ? h("div", { className: "rssh-muted" }, t("common.loading")) : null,
         err ? h("div", { className: "rssh-err" }, err) : null,
-        h("div", { style: { maxHeight: 180, overflow: "auto", marginTop: 4 } },
-          entries.filter(function (e) { return e.type === "directory"; }).map(function (e) {
-            return h("div", { key: e.path || e.name, className: "rssh-tree-item", onClick: function () { enterDir(e); } },
-              h("span", { className: "rssh-tree-dir" }, "📁 " + e.name));
-          })
+        // 当前路径下的文件树（仅目录可进入）
+        h("div", { className: "rssh-pick-tree" },
+          (entries.filter(function (e) { return e.type === "directory"; })).length === 0 && !loading
+            ? h("div", { className: "rssh-pick-empty" }, t("common.noEntries"))
+            : entries.filter(function (e) { return e.type === "directory"; }).map(function (e) {
+              return h("div", { key: e.path || e.name, className: "rssh-tree-item", onClick: function () { enterDir(e); } },
+                h("span", { className: "rssh-tree-dir" }, "📁 " + e.name));
+            })
         ),
-        h("button", { className: "rssh-btn", style: { marginTop: 8 }, disabled: !path, onClick: function () { props.onChoose(path); } }, t("picker.choose"))
+        h("div", { className: "rssh-actions", style: { marginTop: 8 } },
+          h("button", { className: "rssh-btn", disabled: !path || props.disabled, onClick: function () { props.onChoose(path); } }, t("picker.choose"))
+        )
       );
     }
 
@@ -834,33 +875,30 @@ window.__ModuleLoader__.load({
       }
 
       var canClose = !creating && !props.busy;
+      var isRemote = mode === "remote";
 
-      if (mode === "remote") {
-        return h(Modal, { open: true, onClose: function () { if (canClose) props.onCancel(); }, title: t("flow.remoteTitle"), closeLabel: t("common.close"), className: "rssh-flow-dialog" },
-          h("div", { style: { padding: 8 } },
-            creating || props.busy ? h("div", { className: "rssh-muted" }, t("common.processing")) : null,
-            h("div", { className: "rssh-row" },
-              h("span", { className: "rssh-label" }, t("common.profile")),
-              h("select", { className: "rssh-select", value: profileId, onChange: function (e) { setProfileId(e.target.value); } },
-                h("option", { value: "" }, t("common.selectProfile")),
-                profiles.map(function (p) { return h("option", { key: p.id, value: p.id }, p.name); })
-              )
-            ),
-            profileId ? h(DirPicker, { resetKey: profileId, placeholder: t("flow.remoteDir"), listFn: function (p) { return remoteListFn(profileId, p); }, onChoose: chooseRemote }) : null,
-            h("div", { className: "rssh-actions", style: { marginTop: 8 } },
-              h("button", { className: "rssh-btn", onClick: function () { setMode("local"); }, disabled: !!props.busy }, t("flow.backLocal"))
-            )
-          )
-        );
-      }
-
-      return h(Modal, { open: true, onClose: function () { if (canClose) props.onCancel(); }, title: t("flow.localTitle"), closeLabel: t("common.close"), className: "rssh-flow-dialog" },
+      // 统一弹窗：上方本地/远程分段切换 → 远程时显示连接选择 → 路径栏（浏览按钮紧挨右侧）→ 文件树
+      return h(Modal, { open: true, onClose: function () { if (canClose) props.onCancel(); }, title: t("flow.addWsTitle"), closeLabel: t("common.close"), className: "rssh-flow-dialog" },
         h("div", { style: { padding: 8 } },
-          props.busy ? h("div", { className: "rssh-muted" }, t("common.processing")) : null,
-          h(DirPicker, { resetKey: "local", placeholder: t("flow.localDir"), listFn: function (p) { return localListFn(props.workspaces, p); }, onChoose: chooseLocal }),
-          h("div", { className: "rssh-actions", style: { marginTop: 8 } },
-            h("button", { className: "rssh-btn", onClick: function () { setMode("remote"); }, disabled: !!props.busy }, t("flow.chooseRemote"))
-          )
+          creating || props.busy ? h("div", { className: "rssh-muted" }, t("common.processing")) : null,
+          // 分段切换：本地 / 远程
+          h("div", { className: "rssh-seg" },
+            h("button", { className: "rssh-seg-btn" + (isRemote ? "" : " active"), onClick: function () { setMode("local"); }, disabled: !!props.busy || creating }, t("flow.localSeg")),
+            h("button", { className: "rssh-seg-btn" + (isRemote ? " active" : ""), onClick: function () { setMode("remote"); }, disabled: !!props.busy || creating }, t("flow.remoteSeg"))
+          ),
+          // 远程模式：连接配置选择
+          isRemote ? h("div", { className: "rssh-row" },
+            h("span", { className: "rssh-label" }, t("common.profile")),
+            h("select", { className: "rssh-select", value: profileId, onChange: function (e) { setProfileId(e.target.value); }, disabled: creating },
+              h("option", { value: "" }, t("common.selectProfile")),
+              profiles.map(function (p) { return h("option", { key: p.id, value: p.id }, p.name); })
+            )
+          ) : null,
+          // 目录选择器：远程需选好连接后才显示
+          isRemote
+            ? (profileId ? h(DirPicker, { resetKey: profileId, placeholder: t("flow.remoteDir"), listFn: function (p) { return remoteListFn(profileId, p); }, onChoose: chooseRemote, disabled: creating })
+               : h("div", { className: "rssh-pick-empty" }, t("common.selectProfile")))
+            : h(DirPicker, { resetKey: "local", placeholder: t("flow.localDir"), listFn: function (p) { return localListFn(props.workspaces, p); }, pickNative: function () { return props.workspaces.pickDirectory(); }, onChoose: chooseLocal })
         )
       );
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhangfengshun/dsh-remote-ssh",
-  "version": "1.7.0",
+  "version": "1.8.1",
   "description": "DSH web plugin: VSCode Remote-SSH-like remote development (SSH to supercomputers/servers, remote workspace, file explorer, integrated terminal), integrated with dsh-better-sidebar and DSH settings.",
   "keywords": [
     "dsh",