forked from bai/curriculum-project-hub
Compare commits
1 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 33de8901e7 |
@@ -1,12 +1,12 @@
|
|||||||
name: checker check
|
name: checker check
|
||||||
|
|
||||||
# Builds and lints the Rust implementation crates under crates/ (the rule-based
|
# Builds and lints the Rust implementation crates under crates/ (the rule-based
|
||||||
# lesson checker).
|
# checker that "stands in Lean's position" at product runtime).
|
||||||
#
|
#
|
||||||
# This is an INTERNAL gate on the implementation's own health
|
# Like spec-check, this is an INTERNAL gate on the implementation's own health
|
||||||
# (does it build, pass its tests, satisfy clippy + rustfmt?). There is no
|
# (does it build, pass its tests, satisfy clippy + rustfmt?). It is NOT a
|
||||||
# decision-to-implementation conformance gate — implementations align to the
|
# spec-to-implementation conformance gate — implementations align to the Lean
|
||||||
# ADRs by human review, not by CI. See the repo README.
|
# contract by human review, not by CI. See the repo README.
|
||||||
|
|
||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
|
|||||||
@@ -1,8 +1,8 @@
|
|||||||
name: hub check
|
name: hub check
|
||||||
|
|
||||||
# Builds, type-checks, and tests the Hub TS package under hub/.
|
# Builds, type-checks, and tests the Hub TS package under hub/.
|
||||||
# The Hub is the Feishu-group collaboration + agent runtime half.
|
# The Hub is the Feishu-group collaboration + agent runtime half
|
||||||
# This is an INTERNAL gate on the Hub's own
|
# (spec/System implementation). This is an INTERNAL gate on the Hub's own
|
||||||
# health, like checker-check is for the Rust half.
|
# health, like checker-check is for the Rust half.
|
||||||
|
|
||||||
on:
|
on:
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
name: spec check
|
||||||
|
|
||||||
|
# Builds the Lean semantic master spec under spec/.
|
||||||
|
# This is an INTERNAL well-formedness gate (does the contract type-check?),
|
||||||
|
# NOT a spec-to-implementation conformance gate — implementations align to the
|
||||||
|
# contract by human review, not by CI. See repo README.
|
||||||
|
|
||||||
|
on:
|
||||||
|
push:
|
||||||
|
pull_request:
|
||||||
|
workflow_dispatch:
|
||||||
|
|
||||||
|
jobs:
|
||||||
|
spec-check:
|
||||||
|
runs-on: ubuntu-latest
|
||||||
|
steps:
|
||||||
|
- uses: actions/checkout@v5
|
||||||
|
- uses: leanprover/lean-action@v1
|
||||||
|
with:
|
||||||
|
lake-package-directory: spec
|
||||||
@@ -1,3 +1,7 @@
|
|||||||
|
# Lean / Lake build artifacts (spec/ has its own .gitignore too)
|
||||||
|
.lake/
|
||||||
|
**/.lake/
|
||||||
|
|
||||||
# Rust / Cargo build artifacts (repo-wide cargo workspace at root)
|
# Rust / Cargo build artifacts (repo-wide cargo workspace at root)
|
||||||
/target
|
/target
|
||||||
**/*.pdf
|
**/*.pdf
|
||||||
|
|||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"sessionID": "ses_06d37cad5ffeB8d2unoGG7uv3L",
|
|
||||||
"updatedAt": "2026-07-24T06:34:59.318Z",
|
|
||||||
"sources": {
|
|
||||||
"background-task": {
|
|
||||||
"state": "idle",
|
|
||||||
"updatedAt": "2026-07-24T06:34:59.318Z"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
{
|
|
||||||
"sessionID": "ses_06dc3e1e5ffeER5ROC55lzS6xX",
|
|
||||||
"updatedAt": "2026-07-24T06:08:43.845Z",
|
|
||||||
"sources": {
|
|
||||||
"background-task": {
|
|
||||||
"state": "idle",
|
|
||||||
"updatedAt": "2026-07-24T06:08:43.845Z"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -29,7 +29,7 @@ workload brakes.
|
|||||||
|
|
||||||
The full current-state inventory, accepted behavior, and release evidence are
|
The full current-state inventory, accepted behavior, and release evidence are
|
||||||
recorded in [Initial abuse and capacity controls](../assets/initial-abuse-capacity-controls.md),
|
recorded in [Initial abuse and capacity controls](../assets/initial-abuse-capacity-controls.md),
|
||||||
with the durable decision in ADR-0022. Numerical
|
with the durable decision in ADR-0022 and `Spec.System.Capacity`. Numerical
|
||||||
ceilings remain open until production-like calibration.
|
ceilings remain open until production-like calibration.
|
||||||
|
|
||||||
The implementation frontier is:
|
The implementation frontier is:
|
||||||
|
|||||||
@@ -7,6 +7,6 @@ Blocked by: 01, 02, 03, 04, 05, 06, 07, 09, 10, 11, 12, 13, 14, 15, 16, 17, 18,
|
|||||||
## Question
|
## Question
|
||||||
|
|
||||||
After the readiness investigations and resulting fixes are resolved, can one
|
After the readiness investigations and resulting fixes are resolved, can one
|
||||||
repeatable release procedure prove build/test health, deploy a clean
|
repeatable release procedure prove build/test/spec health, deploy a clean
|
||||||
production-like environment, exercise critical tenant and agent journeys,
|
production-like environment, exercise critical tenant and agent journeys,
|
||||||
verify observability and recovery, and either roll forward or roll back safely?
|
verify observability and recovery, and either roll forward or roll back safely?
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ Blocked by: 04
|
|||||||
|
|
||||||
Separate or unify run-bound audit entries, pre-run security/permission events,
|
Separate or unify run-bound audit entries, pre-run security/permission events,
|
||||||
structured messages, and operational recovery events without weakening
|
structured messages, and operational recovery events without weakening
|
||||||
the pinned AuditEntry-to-run relation. Decide durability,
|
`Spec.System.Audit`'s pinned AuditEntry-to-run relation. Decide durability,
|
||||||
failure, retention, and query semantics; then enforce referential integrity and
|
failure, retention, and query semantics; then enforce referential integrity and
|
||||||
observable/recoverable writes instead of silently swallowing lost evidence.
|
observable/recoverable writes instead of silently swallowing lost evidence.
|
||||||
Do not merge these customer Project/Run records with ADR-0023's already-decided
|
Do not merge these customer Project/Run records with ADR-0023's already-decided
|
||||||
|
|||||||
+3
-1
@@ -40,7 +40,9 @@ an off-host recovery key, an incident and reason, and issues only an expiring
|
|||||||
Emergency Platform Grant.
|
Emergency Platform Grant.
|
||||||
|
|
||||||
The complete accepted decision and implementation divergences are in
|
The complete accepted decision and implementation divergences are in
|
||||||
[ADR-0023](../../../docs/adr/0023-platform-administrator-identity-and-audit.md),
|
[ADR-0023](../../../docs/adr/0023-platform-administrator-identity-and-audit.md).
|
||||||
|
The pinned semantic invariants are in
|
||||||
|
[`Spec.System.PlatformAdministration`](../../../spec/Spec/System/PlatformAdministration.lean),
|
||||||
and the canonical terms are in [`CONTEXT.md`](../../../CONTEXT.md).
|
and the canonical terms are in [`CONTEXT.md`](../../../CONTEXT.md).
|
||||||
|
|
||||||
Exact numeric session/invitation/step-up limits and browser mechanics remain
|
Exact numeric session/invitation/step-up limits and browser mechanics remain
|
||||||
|
|||||||
@@ -1,25 +1,29 @@
|
|||||||
# AGENTS.md —— agent 操作手册(全 repo)
|
# AGENTS.md —— agent 操作手册(全 repo)
|
||||||
|
|
||||||
本 repo 是 monorepo。先读根 `README.md` 的"宪法"4 条,那是一切工作的前提。本文件是给在这里干活的 coding agent 的纪律。
|
本 repo 是 monorepo。先读根 `README.md` 的"宪法"5 条,那是一切工作的前提。本文件是给在这里干活的 coding agent 的纪律。
|
||||||
|
|
||||||
## 这个 repo 是什么
|
## 这个 repo 是什么
|
||||||
|
|
||||||
- `docs/adr/` 是系统级决策的唯一权威来源;`CONTEXT.md` 是平台语言词汇表;代码注释把关键不变量锚到 ADR 编号,可 grep。
|
- `spec/` 是一份**人机共识的契约**(Lean 语义母本),是产品语义的上游参照。
|
||||||
|
- 其余部件(将来的 `spec/` 外文件夹)是**向 `spec/` 对齐的实现**。
|
||||||
- `hub/` 的平台层按 SaaS 形态演进:`Organization` 是 tenant root;`Project`/`Team`
|
- `hub/` 的平台层按 SaaS 形态演进:`Organization` 是 tenant root;`Project`/`Team`
|
||||||
必须归属 org,TEAM→PROJECT 授权不得跨 org(见 ADR-0020)。
|
必须归属 org,TEAM→PROJECT 授权不得跨 org(见 ADR-0020 / `Spec.System.Organization`)。
|
||||||
- org 后台 project explorer 里 `Folder` 是透明组织节点,不是权限资源;project 仍是权限边界。
|
- org 后台 project explorer 里 `Folder` 是透明组织节点,不是权限资源;project 仍是权限边界。
|
||||||
普通老师可在飞书群自助建 project 但受 org policy 控制(见 ADR-0021)。
|
普通老师可在飞书群自助建 project 但受 org policy 控制(见 ADR-0021 /
|
||||||
|
`Spec.System.ProjectWorkspace`)。
|
||||||
- 每个 org 自选 BYOK 或平台托管 model provider connection;平台托管也必须是该 org
|
- 每个 org 自选 BYOK 或平台托管 model provider connection;平台托管也必须是该 org
|
||||||
独享的 key/base URL,不得让无关 org 共用 process-global provider key(见 ADR-0021)。
|
独享的 key/base URL,不得让无关 org 共用 process-global provider key(见 ADR-0021 /
|
||||||
|
`Spec.System.Organization`)。
|
||||||
- Feishu/provider secret 使用本地版本化 master-key keyring 的信封加密;生产由 systemd
|
- Feishu/provider secret 使用本地版本化 master-key keyring 的信封加密;生产由 systemd
|
||||||
credential 注入,运行时只允许显式 org/project scope 的 fail-closed resolver,不得回退
|
credential 注入,运行时只允许显式 org/project scope 的 fail-closed resolver,不得回退
|
||||||
process-global credential;Agent child 只接收 run-scoped loopback proxy capability,
|
process-global credential;Agent child 只接收 run-scoped loopback proxy capability,
|
||||||
不接收 org provider credential(见 ADR-0024)。
|
不接收 org provider credential(见 ADR-0024 / `Spec.System.Organization`)。
|
||||||
- 生产容量按不可突破的 platform ceiling 与 org 可下调 policy 分层;有效限制取两者较低值。
|
- 生产容量按不可突破的 platform ceiling 与 org 可下调 policy 分层;有效限制取两者较低值。
|
||||||
Agent admission 必须持久、有界、跨 org 公平且显式背压(见 ADR-0022)。
|
Agent admission 必须持久、有界、跨 org 公平且显式背压(见 ADR-0022 /
|
||||||
|
`Spec.System.Capacity`)。
|
||||||
- 平台管理员只通过独立的 platform-owned 飞书应用与可撤销 Platform Session 认证,不复用
|
- 平台管理员只通过独立的 platform-owned 飞书应用与可撤销 Platform Session 认证,不复用
|
||||||
客户 `User`/org membership;平台写操作与 append-only audit 同事务,break-glass 只走
|
客户 `User`/org membership;平台写操作与 append-only audit 同事务,break-glass 只走
|
||||||
双因子的离线恢复流程(见 ADR-0023)。
|
双因子的离线恢复流程(见 ADR-0023 / `Spec.System.PlatformAdministration`)。
|
||||||
- 受控 alpha 暂采用一 Organization 一具名 systemd Silo:独立 database role/database、
|
- 受控 alpha 暂采用一 Organization 一具名 systemd Silo:独立 database role/database、
|
||||||
service identity、workspace、keyring 与 Feishu/provider connection;进程必须由
|
service identity、workspace、keyring 与 Feishu/provider connection;进程必须由
|
||||||
`HUB_SILO_ORGANIZATION_ID` fail-closed 绑定唯一 org,平台后台不开放。共享 SaaS
|
`HUB_SILO_ORGANIZATION_ID` fail-closed 绑定唯一 org,平台后台不开放。共享 SaaS
|
||||||
@@ -40,12 +44,12 @@
|
|||||||
|
|
||||||
## 纪律
|
## 纪律
|
||||||
|
|
||||||
1. **不得用预训练先验脑补本领域。** 这个领域很新,你没有相关先验。ADR 与 `CONTEXT.md` 是语义的唯一权威来源;没写的,就是没定的。
|
1. **不得用预训练先验脑补本领域。** 这个领域很新,你没有相关先验。契约里 prose doc 注释是语义的唯一权威来源;契约没写的,就是没定的。
|
||||||
|
|
||||||
2. **凡 ADR 未写明者,不得假设。** 遇到没覆盖的地方,**显式 surface 出来**让开发者决定,绝不擅自替它选一个解。
|
2. **凡契约未写明者,不得假设。** 遇到标了 `OPEN` 的地方,或契约根本没覆盖的地方,**显式 surface 出来**让开发者决定,绝不擅自替它选一个解。
|
||||||
|
|
||||||
3. **新语义决策进 ADR。** 跨部件的语义分歧点按编号顺延新增 `docs/adr/NNNN-*.md`;代码里的关键不变量用注释锚到 ADR 编号,保持可 grep。已有 ADR 正文不改写历史——推翻旧决策就写新 ADR 标记 supersede。
|
3. **改 `spec/` 必须保持其 `lake build` 通过。** 在 `spec/` 目录下跑 `lake build`。新增声明必须带 `/-- … -/` doc 注释和恰当标签(`PINNED` / `OPEN` / `ADR-NNNN`)。规范见 `spec/README.md`。不准用 `sorry` 把 build 糊绿。
|
||||||
|
|
||||||
4. **实现向 ADR 对齐;偏离必须 surface。** 没有 CI gate 替你把关 ADR↔实现的一致性(见宪法第 2 条)——这道对齐靠 review 和你巡逻 diff。发现实现与决策不一致时,报告它,不要默默让其中一边将就另一边。
|
4. **实现向契约对齐;偏离必须 surface。** 没有 CI gate 替你把关 spec↔实现的一致性(见宪法第 2 条)——这道对齐靠 review 和你巡逻 diff。发现实现与契约不一致时,报告它,不要默默让其中一边将就另一边。
|
||||||
|
|
||||||
5. **写操作谨慎。** 线上操作、git 写操作前与开发者确认(这是开发者的全局偏好)。
|
5. **写操作谨慎。** 线上操作、git 写操作前与开发者确认(这是开发者的全局偏好)。
|
||||||
|
|||||||
@@ -1,23 +1,25 @@
|
|||||||
# CLAUDE.md —— agent 操作手册(全 repo)
|
# CLAUDE.md —— agent 操作手册(全 repo)
|
||||||
|
|
||||||
本 repo 是 monorepo。先读根 `README.md` 的"宪法"4 条,那是一切工作的前提。本文件是给在这里干活的 coding agent 的纪律。
|
本 repo 是 monorepo。先读根 `README.md` 的"宪法"5 条,那是一切工作的前提。本文件是给在这里干活的 coding agent 的纪律。
|
||||||
|
|
||||||
## 这个 repo 是什么
|
## 这个 repo 是什么
|
||||||
|
|
||||||
- `docs/adr/` 是系统级决策的唯一权威来源;`CONTEXT.md` 是平台语言词汇表;代码注释把关键不变量锚到 ADR 编号,可 grep。
|
- `spec/` 是一份**人机共识的契约**(Lean 语义母本),是产品语义的上游参照。
|
||||||
|
- 其余部件(将来的 `spec/` 外文件夹)是**向 `spec/` 对齐的实现**。
|
||||||
- `hub/` 的平台层按 SaaS 形态演进:`Organization` 是 tenant root;`Project`/`Team`
|
- `hub/` 的平台层按 SaaS 形态演进:`Organization` 是 tenant root;`Project`/`Team`
|
||||||
必须归属 org,TEAM→PROJECT 授权不得跨 org(见 ADR-0020)。
|
必须归属 org,TEAM→PROJECT 授权不得跨 org(见 ADR-0020 / `Spec.System.Organization`)。
|
||||||
- org 后台 project explorer 里 `Folder` 是透明组织节点,不是权限资源;project 仍是权限边界。
|
- org 后台 project explorer 里 `Folder` 是透明组织节点,不是权限资源;project 仍是权限边界。
|
||||||
普通老师可在飞书群自助建 project 但受 org policy 控制(见 ADR-0021)。
|
普通老师可在飞书群自助建 project 但受 org policy 控制(见 ADR-0021 /
|
||||||
|
`Spec.System.ProjectWorkspace`)。
|
||||||
|
|
||||||
## 纪律
|
## 纪律
|
||||||
|
|
||||||
1. **不得用预训练先验脑补本领域。** 这个领域很新,你没有相关先验。ADR 与 `CONTEXT.md` 是语义的唯一权威来源;没写的,就是没定的。
|
1. **不得用预训练先验脑补本领域。** 这个领域很新,你没有相关先验。契约里 prose doc 注释是语义的唯一权威来源;契约没写的,就是没定的。
|
||||||
|
|
||||||
2. **凡 ADR 未写明者,不得假设。** 遇到没覆盖的地方,**显式 surface 出来**让开发者决定,绝不擅自替它选一个解。
|
2. **凡契约未写明者,不得假设。** 遇到标了 `OPEN` 的地方,或契约根本没覆盖的地方,**显式 surface 出来**让开发者决定,绝不擅自替它选一个解。
|
||||||
|
|
||||||
3. **新语义决策进 ADR。** 跨部件的语义分歧点按编号顺延新增 `docs/adr/NNNN-*.md`;代码里的关键不变量用注释锚到 ADR 编号,保持可 grep。已有 ADR 正文不改写历史——推翻旧决策就写新 ADR 标记 supersede。
|
3. **改 `spec/` 必须保持其 `lake build` 通过。** 在 `spec/` 目录下跑 `lake build`。新增声明必须带 `/-- … -/` doc 注释和恰当标签(`PINNED` / `OPEN` / `ADR-NNNN`)。规范见 `spec/README.md`。不准用 `sorry` 把 build 糊绿。
|
||||||
|
|
||||||
4. **实现向 ADR 对齐;偏离必须 surface。** 没有 CI gate 替你把关 ADR↔实现的一致性(见宪法第 2 条)——这道对齐靠 review 和你巡逻 diff。发现实现与决策不一致时,报告它,不要默默让其中一边将就另一边。
|
4. **实现向契约对齐;偏离必须 surface。** 没有 CI gate 替你把关 spec↔实现的一致性(见宪法第 2 条)——这道对齐靠 review 和你巡逻 diff。发现实现与契约不一致时,报告它,不要默默让其中一边将就另一边。
|
||||||
|
|
||||||
5. **写操作谨慎。** 线上操作、git 写操作前与开发者确认(这是开发者的全局偏好)。
|
5. **写操作谨慎。** 线上操作、git 写操作前与开发者确认(这是开发者的全局偏好)。
|
||||||
|
|||||||
@@ -99,7 +99,3 @@ _Avoid_: Cost budget, unlimited run
|
|||||||
**Emergency Workload Brake**:
|
**Emergency Workload Brake**:
|
||||||
An audited Platform Administrator control that prevents new agent work for one Organization or the whole platform and may explicitly stop active work during an incident.
|
An audited Platform Administrator control that prevents new agent work for one Organization or the whole platform and may explicitly stop active work during an incident.
|
||||||
_Avoid_: Organization deletion, service restart
|
_Avoid_: Organization deletion, service restart
|
||||||
|
|
||||||
**Member Group**:
|
|
||||||
A global, unlimited-depth, nestable authorization principal managed by the website administrator; a file-library grant on a group applies to that group and its whole descendant subtree, and a user's effective permission collects every group they belong to plus those groups' ancestors (ADR-0028). It stores no folder/project permission itself — only the user→group membership. Global: not owned by any Organization.
|
|
||||||
_Avoid_: Team (the org-scoped flat grouping), Feishu department
|
|
||||||
|
|||||||
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
教研生产的数字化解决方案。核心思路:课程像 DAW / 剪辑软件那样有一个**结构化的工程文件**;coding agent 协助编辑它;一个 rule-based checker(类编译器)校验其合法性并给出 helpful fix hint。目标是把教研从一次性的文档,沉淀成**可累积、可校验、可复用的资产**。
|
教研生产的数字化解决方案。核心思路:课程像 DAW / 剪辑软件那样有一个**结构化的工程文件**;coding agent 协助编辑它;一个 rule-based checker(类编译器)校验其合法性并给出 helpful fix hint。目标是把教研从一次性的文档,沉淀成**可累积、可校验、可复用的资产**。
|
||||||
|
|
||||||
这是一个 **monorepo**。它的组织方式本身就表达了一条原则:**`docs/adr/` 是系统级决策的唯一权威来源,代码注释把关键不变量锚到 ADR 编号,可 grep。**
|
这是一个 **monorepo**。它的组织方式本身就表达了一条原则:**`spec/` 是上游的语义母本,其余部件是向它对齐的实现。**
|
||||||
|
|
||||||
## 安装 `cph` 命令行
|
## 安装 `cph` 命令行
|
||||||
|
|
||||||
@@ -33,40 +33,47 @@ cph completions zsh > ~/.zfunc/_cph # 或 bash/fish/powershell/elvish
|
|||||||
```
|
```
|
||||||
README.md ← 本文件:总览 + 宪法(下面 5 条)
|
README.md ← 本文件:总览 + 宪法(下面 5 条)
|
||||||
CLAUDE.md ← 全局 agent 操作手册(管整个 repo)
|
CLAUDE.md ← 全局 agent 操作手册(管整个 repo)
|
||||||
docs/adr/ ← 系统级架构决策记录(跨部件,决策的唯一权威来源)
|
docs/adr/ ← 系统级架构决策记录(跨部件,被 spec 契约引用)
|
||||||
CONTEXT.md ← 平台语言词汇表(术语与禁用说法)
|
spec/ ← Lean 语义母本(自包含的 Lean 工程)。见 spec/README.md
|
||||||
Cargo.toml ← 仓库级 cargo workspace(实现部件共用,便于跨部件复用 crate)
|
Cargo.toml ← 仓库级 cargo workspace(实现部件共用,便于跨部件复用 crate)
|
||||||
crates/ ← 实现:rule-based checker(语义由 ADR 锚定)。见 crates/README.md
|
crates/ ← 实现:rule-based checker(向 spec 对齐)。见 crates/README.md
|
||||||
cph-diag / cph-model / cph-schema / cph-typst ← 可复用基础(模型/校验/typst 引擎)
|
cph-diag / cph-model / cph-schema / cph-typst ← 可复用基础(模型/校验/typst 引擎)
|
||||||
cph-check / cph-cli ← checker 本体 + `cph` 命令行
|
cph-check / cph-cli ← checker 本体 + `cph` 命令行
|
||||||
render/ ← typst 渲染包 cph-render(checker 的渲染后端,ADR-0005)
|
render/ ← typst 渲染包 cph-render(母本的渲染后端之一,ADR-0005)
|
||||||
examples/ ← 样例工程文件(如 TH-141),流水线的真实输入
|
examples/ ← 样例工程文件(如 TH-141),流水线的真实输入
|
||||||
hub/ ← SaaS Hub:飞书协作、org 管理、agent runtime 与生产部署
|
hub/ ← SaaS Hub:飞书协作、org 管理、agent runtime 与生产部署
|
||||||
(exporter/ …) ← 将来的其他部件,平级于 crates/
|
(exporter/ …) ← 将来的其他部件,平级于 spec/
|
||||||
```
|
```
|
||||||
|
|
||||||
|
`spec/` 与实现部件**物理分离、平级共存**:谁是上游、谁向谁对齐,一眼可见。
|
||||||
实现部件共用一个仓库根的 cargo workspace,使基础 crate(模型、typst 引擎)能被
|
实现部件共用一个仓库根的 cargo workspace,使基础 crate(模型、typst 引擎)能被
|
||||||
未来部件(如 exporter)复用,而非各自重造。
|
未来部件(如 exporter)复用,而非各自重造。
|
||||||
|
|
||||||
## 宪法
|
## 宪法
|
||||||
|
|
||||||
这 4 条是本仓库的协作约定,是一切工作的前提。
|
这 5 条是 `spec/` 这份语义母本的定位与约束,是本仓库一切工作的前提。
|
||||||
|
|
||||||
1. **角色 —— ADR 是决策真相。**
|
1. **角色 —— Lean 是研发侧的上游参照。**
|
||||||
跨部件的语义决策只记录在 `docs/adr/`,一份决策一份 ADR,编号顺延、正文不改写历史。代码里的关键不变量用注释锚到 ADR 编号,保持可 grep。没有第二份权威文档。
|
`spec/` 用 Lean 编写,是开发者(领域专家)与 coding agent **共用**的 spec 工具,用来沉淀产品各部件的**语义**。它**不进入产品运行时**——产品里"站在 Lean 这个位置"的那个 checker 用什么技术实现,尚未决定;但那个东西的语义,先在 `spec/` 里固定下来。
|
||||||
|
|
||||||
2. **对齐机制 —— 人肉承载,无机器兜底。**
|
2. **对齐机制 —— Lean 只做上游参照。**
|
||||||
CI 只验各部件自身良构(build / test / clippy),**没有**决策↔实现的一致性 gate。实现对齐 ADR,由"开发者 review + agent 巡逻 diff"这个人肉环节承载。发现漂移,报告它,不要默默让其中一边将就另一边。
|
不做 extract / codegen,不派生 conformance test,CI 里**没有** spec→实现的 gate。实现对齐 spec,由"开发者 review + agent 巡逻 diff"这个人肉环节承载。
|
||||||
|
(CI 里的 `spec check` 只验 spec **自身**能否 type-check,即契约内部良构,不是 spec↔实现的对齐检查。)
|
||||||
|
|
||||||
3. **形态 —— 自包含。**
|
3. **资产性 —— 由 review 纪律承载,无机器兜底。**
|
||||||
凡 ADR 未明文规定的,开发者与 agent 双方都不该假设;遇到没覆盖的地方,**显式 surface** 出来让开发者决定。
|
这份仓库给你的是"精确、自洽、机器验内部良构的语义共识",**不是**"实现正确性保证"。spec 与实现之间那道缝,是我们自愿用人来守的——清醒地守,它就是资产;放任实现漂移而不回头同步,它就退化成最贵的过期文档。
|
||||||
|
|
||||||
4. **深度判据 —— 只收录分歧点。**
|
4. **形态 —— 它是人机共识的契约。**
|
||||||
一条语义该不该写进 ADR,取决于一句话:**"不写明,开发者与 agent 会不会各自做出不同假设?"** 会 → 进 ADR;显然的东西 / 纯 plumbing / 普通 CRUD 字段 → 不进(写进去只稀释信噪比、增加维护面)。
|
契约必须**自包含**:凡契约未明文规定的,开发者与 agent 双方都不该假设。这比"文档"严格——type checker 会逼这份契约在结构上无洞。
|
||||||
深度上限是**你愿意在每次实现变更时手动回头同步的量**——写得比你能维护的更深,多出来的部分会率先过期、反过来误导实现。
|
|
||||||
|
5. **深度判据 —— 只收录分歧点。**
|
||||||
|
一条语义该不该写进 Lean,取决于一句话:**"不写明,开发者与 agent 会不会各自做出不同假设?"** 会 → 进契约;显然的东西 / 纯 plumbing / 普通 CRUD 字段 → 不进(写进去只稀释信噪比、增加维护面)。
|
||||||
|
深度上限不是 Lean 的表达力,而是**你愿意在每次实现变更时手动回头同步的量**——写得比你能维护的更深,多出来的部分会率先过期、反过来误导实现。
|
||||||
|
|
||||||
## CI
|
## CI
|
||||||
|
|
||||||
|
`.gitea/workflows/spec-check.yml` 在每次 push / PR 时于 `spec/` 下跑 `lake build`,确保契约始终 type-check 通过(从第一天起就是"绿"的)。这是良构 gate,见宪法第 2 条。
|
||||||
|
|
||||||
Rust checker 的本地与 CI 工具链由根 `rust-toolchain.toml` 固定;`.gitea/workflows/checker-check.yml`
|
Rust checker 的本地与 CI 工具链由根 `rust-toolchain.toml` 固定;`.gitea/workflows/checker-check.yml`
|
||||||
必须安装同一精确版本并执行 `cargo fmt --all --check`、Clippy `-D warnings` 与 workspace
|
必须安装同一精确版本并执行 `cargo fmt --all --check`、Clippy `-D warnings` 与 workspace
|
||||||
全测试。升级 Rust 时这两处必须在同一提交更新并通过完整 checker gate。
|
全测试。升级 Rust 时这两处必须在同一提交更新并通过完整 checker gate。
|
||||||
|
|||||||
+2
-3
@@ -1,8 +1,7 @@
|
|||||||
# crates/
|
# crates/
|
||||||
|
|
||||||
These crates implement the rule-based lesson checker whose semantics are
|
These crates implement the rule-based lesson checker that aligns to the
|
||||||
pinned by the ADRs in `docs/adr/`: it reads an engineering-file (one lesson,
|
semantic master in `spec/`: it reads an engineering-file (one lesson, ADR-0005)
|
||||||
ADR-0005)
|
|
||||||
laid out per ADR-0008 (declarative `manifest.toml` + per-element
|
laid out per ADR-0008 (declarative `manifest.toml` + per-element
|
||||||
`element.toml`), validates structure and content, and emits diagnostics.
|
`element.toml`), validates structure and content, and emits diagnostics.
|
||||||
`cph-diag` (the shared diagnostic vocabulary), `cph-model` (the ADR-0008 loader),
|
`cph-diag` (the shared diagnostic vocabulary), `cph-model` (the ADR-0008 loader),
|
||||||
|
|||||||
@@ -19,11 +19,13 @@ const DEFAULT_TARGET: &str = "student";
|
|||||||
|
|
||||||
/// Severity of the render-coverage ("element ignored under a target") diagnostic.
|
/// Severity of the render-coverage ("element ignored under a target") diagnostic.
|
||||||
///
|
///
|
||||||
/// **PINNED to `warning` by ADR-0005:** when a
|
/// **PINNED to `warning` by the contract.** Mirrors the Lean master's
|
||||||
|
/// `Spec.Courseware.renderIgnoredSeverity : Severity := .warning`
|
||||||
|
/// (`spec/Spec/Courseware/Check/Diagnostic.lean`), itself citing ADR-0005: when a
|
||||||
/// `(kind, target)` pair has no render rule the checker reports that the element
|
/// `(kind, target)` pair has no render rule the checker reports that the element
|
||||||
/// is ignored under that target and **does not block the export**. Naming the
|
/// is ignored under that target and **does not block the export**. Naming the
|
||||||
/// severity as a const makes "it is a warning, not an error" a greppable
|
/// severity as a const makes "it is a warning, not an error" a greppable,
|
||||||
/// fact rather than an inline literal.
|
/// alignable fact rather than an inline literal.
|
||||||
const RENDER_IGNORED_SEVERITY: Severity = Severity::Warning;
|
const RENDER_IGNORED_SEVERITY: Severity = Severity::Warning;
|
||||||
|
|
||||||
/// The result of running [`check`] (or the check phases of [`build`]).
|
/// The result of running [`check`] (or the check phases of [`build`]).
|
||||||
@@ -55,12 +57,12 @@ impl CheckReport {
|
|||||||
|
|
||||||
/// Whether any collected diagnostic is `Error`-severity.
|
/// Whether any collected diagnostic is `Error`-severity.
|
||||||
///
|
///
|
||||||
/// **Legality decision (ADR-0010).** `!has_errors()` decides lesson
|
/// **Legality decision (spec alignment).** `!has_errors()` is the
|
||||||
/// legality: a lesson is *legal* iff its diagnostics contain no error-level
|
/// implementation of `Spec.Courseware.Legal` (`spec/Spec/Courseware/Check/Diagnostic.lean`):
|
||||||
/// diagnostic (warnings are non-blocking — see `Severity`). There is no CI
|
/// a lesson is *legal* iff its diagnostics contain no error-level diagnostic
|
||||||
/// gate enforcing ADR↔implementation alignment (repo constitution); it is
|
/// (warnings are non-blocking — see `Severity` / ADR-0010). There is no CI
|
||||||
/// kept greppable here so a reviewer can tie the orchestrator's gate to
|
/// gate enforcing this alignment (repo constitution); it is kept greppable
|
||||||
/// the ADR.
|
/// here so a reviewer can tie the orchestrator's gate to the Lean master.
|
||||||
pub fn has_errors(&self) -> bool {
|
pub fn has_errors(&self) -> bool {
|
||||||
self.diagnostics
|
self.diagnostics
|
||||||
.iter()
|
.iter()
|
||||||
|
|||||||
+15
-10
@@ -2,7 +2,7 @@
|
|||||||
//!
|
//!
|
||||||
//! Every other crate in the workspace depends on these types to report
|
//! Every other crate in the workspace depends on these types to report
|
||||||
//! problems. The vocabulary is intentionally small and stable: a [`Severity`]
|
//! problems. The vocabulary is intentionally small and stable: a [`Severity`]
|
||||||
//! (two-valued, ADR-0010), a closed set of machine-stable [`DiagCode`]s, an
|
//! (mirroring the Lean master), a closed set of machine-stable [`DiagCode`]s, an
|
||||||
//! optional [`SourceSpan`] pointing back at the offending source, and a
|
//! optional [`SourceSpan`] pointing back at the offending source, and a
|
||||||
//! [`Diagnostic`] tying them together with a human message and a fix hint.
|
//! [`Diagnostic`] tying them together with a human message and a fix hint.
|
||||||
//!
|
//!
|
||||||
@@ -17,27 +17,32 @@ use serde::Serialize;
|
|||||||
|
|
||||||
/// Severity of a diagnostic.
|
/// Severity of a diagnostic.
|
||||||
///
|
///
|
||||||
/// **Pinned by ADR-0005 / ADR-0010: exactly two values.**
|
/// **Mirrors `Spec.Courseware.Diagnostic.Severity`** in the Lean semantic
|
||||||
|
/// master (`spec/Spec/Courseware/Check/Diagnostic.lean`), whose definition is
|
||||||
|
/// exactly:
|
||||||
///
|
///
|
||||||
/// ```text
|
/// ```text
|
||||||
/// warning | error
|
/// inductive Severity where
|
||||||
|
/// | warning
|
||||||
|
/// | error
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// This two-valued shape is a **contract decision**, not an accident: the
|
/// This two-valued shape is a **contract decision**, not an accident: the Lean
|
||||||
/// finer levels (`info` / `hint` / `note`) are deliberately undecided, so we
|
/// module pins `Severity` to exactly `warning | error` and states the finer
|
||||||
|
/// levels (`info` / `hint` / `note`) are deliberately undecided. We therefore
|
||||||
/// do **not** add an info/note level here. `error` blocks (the artifact is
|
/// do **not** add an info/note level here. `error` blocks (the artifact is
|
||||||
/// invalid); `warning` does not block (the artifact still exports, but with
|
/// invalid); `warning` does not block (the artifact still exports, but with
|
||||||
/// loss / an ignored element — e.g. ADR-0005's "missing render ⇒ warning").
|
/// loss / an ignored element — e.g. ADR-0005's "missing render ⇒ warning").
|
||||||
///
|
///
|
||||||
/// There is no CI gate enforcing ADR↔implementation alignment (see the repo
|
/// There is no CI gate enforcing this alignment (see the repo constitution);
|
||||||
/// constitution); it is maintained by review, which is why the decision is
|
/// it is maintained by review, which is why this correspondence is documented
|
||||||
/// documented here rather than only in the ADR.
|
/// here rather than only in the spec.
|
||||||
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, Copy, PartialEq, Eq, Serialize)]
|
||||||
pub enum Severity {
|
pub enum Severity {
|
||||||
/// Non-blocking: the artifact still exports, but is lossy / has an ignored
|
/// Non-blocking: the artifact still exports, but is lossy / has an ignored
|
||||||
/// element. ADR-0010 `warning`.
|
/// element. Mirrors Lean `Severity.warning`.
|
||||||
Warning,
|
Warning,
|
||||||
/// Blocking: the artifact is invalid. ADR-0010 `error`.
|
/// Blocking: the artifact is invalid. Mirrors Lean `Severity.error`.
|
||||||
Error,
|
Error,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
+38
-25
@@ -3,7 +3,9 @@
|
|||||||
//! This crate is the **loader**, not the full checker. It reads
|
//! This crate is the **loader**, not the full checker. It reads
|
||||||
//! `<root>/manifest.toml` (project / info / ordered `[[parts]]` / declared
|
//! `<root>/manifest.toml` (project / info / ordered `[[parts]]` / declared
|
||||||
//! `[targets.*]`) and each part's `<root>/<path>/element.toml`, and produces an
|
//! `[targets.*]`) and each part's `<root>/<path>/element.toml`, and produces an
|
||||||
//! ordered [`Lesson`], where the order of `parts` carries teaching semantics.
|
//! ordered [`Lesson`] — mirroring the Lean master's `Lesson = List (Element P)`
|
||||||
|
//! (`spec/Spec/Courseware/Model/Lesson.lean`), where the order of `parts` carries
|
||||||
|
//! teaching semantics.
|
||||||
//!
|
//!
|
||||||
//! Scope boundaries (deliberately staying in lane):
|
//! Scope boundaries (deliberately staying in lane):
|
||||||
//! - It validates **structure** only: manifest shape, element.toml shape, and
|
//! - It validates **structure** only: manifest shape, element.toml shape, and
|
||||||
@@ -21,7 +23,7 @@ use serde::{Deserialize, Serialize};
|
|||||||
|
|
||||||
/// An ordered, in-memory lesson loaded from an engineering file.
|
/// An ordered, in-memory lesson loaded from an engineering file.
|
||||||
///
|
///
|
||||||
/// `parts` is an ordered
|
/// Mirrors the Lean master's `Lesson = List (Element P)`: `parts` is an ordered
|
||||||
/// `Vec`, and that order is the lesson's order (ADR-0008 §"the lesson manifest
|
/// `Vec`, and that order is the lesson's order (ADR-0008 §"the lesson manifest
|
||||||
/// is declarative" — the `[[parts]]` array order is the single source of truth).
|
/// is declarative" — the `[[parts]]` array order is the single source of truth).
|
||||||
#[derive(Debug, Clone, PartialEq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Serialize)]
|
||||||
@@ -84,8 +86,9 @@ pub struct TargetConfig {
|
|||||||
/// with template `exports/<name>.typ` when no `[[steps]]` are given.
|
/// with template `exports/<name>.typ` when no `[[steps]]` are given.
|
||||||
pub steps: Vec<Step>,
|
pub steps: Vec<Step>,
|
||||||
/// The **render-coverage declaration**: which element kinds this target
|
/// The **render-coverage declaration**: which element kinds this target
|
||||||
/// renders. Realizes ADR-0011's "render
|
/// renders. Realizes `Spec.Courseware.TargetSpec.covers : KindId → Prop`
|
||||||
/// coverage is a declaration, not a payload": the declaration keeps *which
|
/// (`spec/Spec/Courseware/Export/Render.lean`) and ADR-0011's "render
|
||||||
|
/// coverage is a declaration, not a payload": the contract keeps *which
|
||||||
/// kinds a target renders* (used by the `renderIgnored` seed diagnostic),
|
/// kinds a target renders* (used by the `renderIgnored` seed diagnostic),
|
||||||
/// while the rendering "how" lives in the template/steps.
|
/// while the rendering "how" lives in the template/steps.
|
||||||
///
|
///
|
||||||
@@ -99,10 +102,13 @@ pub struct TargetConfig {
|
|||||||
|
|
||||||
/// The artifact an export target produces (ADR-0009/0011).
|
/// The artifact an export target produces (ADR-0009/0011).
|
||||||
///
|
///
|
||||||
/// **Pinned by ADR-0011** as an ADT with fields:
|
/// **Mirrors `Spec.Courseware.Artifact`** in the Lean semantic master
|
||||||
|
/// (`spec/Spec/Courseware/Export/Artifact.lean`), whose definition is exactly:
|
||||||
///
|
///
|
||||||
/// ```text
|
/// ```text
|
||||||
/// Artifact = singleFile (filepath) | fileTree (root, outputs)
|
/// inductive Artifact where
|
||||||
|
/// | singleFile (filepath : String)
|
||||||
|
/// | fileTree (root : String) (outputs : String)
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// ADR-0011 pinned the artifact as an ADT **with fields**: "what the product
|
/// ADR-0011 pinned the artifact as an ADT **with fields**: "what the product
|
||||||
@@ -114,20 +120,20 @@ pub struct TargetConfig {
|
|||||||
/// `"single-file"` → [`Artifact::SingleFile`], `"file-tree"` →
|
/// `"single-file"` → [`Artifact::SingleFile`], `"file-tree"` →
|
||||||
/// [`Artifact::FileTree`].
|
/// [`Artifact::FileTree`].
|
||||||
///
|
///
|
||||||
/// As with `cph-diag`'s `Severity`, there is no CI gate enforcing ADR↔
|
/// As with `cph-diag`'s `Severity`, there is no CI gate enforcing this
|
||||||
/// implementation alignment (see the repo constitution) — it is maintained by
|
/// alignment (see the repo constitution) — it is maintained by review, which is
|
||||||
/// review, which is why the decision is documented here.
|
/// why the correspondence is documented here.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
pub enum Artifact {
|
pub enum Artifact {
|
||||||
/// One bundled document landing at `filepath` (relative to the engineering
|
/// One bundled document landing at `filepath` (relative to the engineering
|
||||||
/// root). ADR-0011 `singleFile`. The default artifact shape.
|
/// root). Mirrors Lean `Artifact.singleFile`. The default artifact shape.
|
||||||
SingleFile {
|
SingleFile {
|
||||||
/// Where the single product is written (relative to the engineering
|
/// Where the single product is written (relative to the engineering
|
||||||
/// root), e.g. `build/student.pdf`.
|
/// root), e.g. `build/student.pdf`.
|
||||||
filepath: PathBuf,
|
filepath: PathBuf,
|
||||||
},
|
},
|
||||||
/// A set of files under `root` matching the `outputs` glob. ADR-0011
|
/// A set of files under `root` matching the `outputs` glob. Mirrors Lean
|
||||||
/// `fileTree`.
|
/// `Artifact.fileTree`.
|
||||||
FileTree {
|
FileTree {
|
||||||
/// The output directory (relative to the engineering root).
|
/// The output directory (relative to the engineering root).
|
||||||
root: PathBuf,
|
root: PathBuf,
|
||||||
@@ -150,10 +156,14 @@ impl Artifact {
|
|||||||
|
|
||||||
/// One typed build step (ADR-0011).
|
/// One typed build step (ADR-0011).
|
||||||
///
|
///
|
||||||
/// **Pinned by ADR-0011** as an ADT:
|
/// **Mirrors `Spec.Courseware.Step`** in the Lean semantic master
|
||||||
|
/// (`spec/Spec/Courseware/Export/Render.lean`), whose definition is exactly:
|
||||||
///
|
///
|
||||||
/// ```text
|
/// ```text
|
||||||
/// Step = typstCompile (template) | shell (run) | assembleMarkdown (field)
|
/// inductive Step where
|
||||||
|
/// | typstCompile (template : String)
|
||||||
|
/// | shell (run : String)
|
||||||
|
/// | assembleMarkdown (field : String)
|
||||||
/// ```
|
/// ```
|
||||||
///
|
///
|
||||||
/// A step is a *typed* operation (extensible): `TypstCompile` compiles a
|
/// A step is a *typed* operation (extensible): `TypstCompile` compiles a
|
||||||
@@ -173,20 +183,20 @@ impl Artifact {
|
|||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
pub enum Step {
|
pub enum Step {
|
||||||
/// Compile a template file (relative to the engineering root) into the
|
/// Compile a template file (relative to the engineering root) into the
|
||||||
/// artifact; the framework injects the manifest. ADR-0011
|
/// artifact; the framework injects the manifest. Mirrors Lean
|
||||||
/// `typstCompile`.
|
/// `Step.typstCompile`.
|
||||||
TypstCompile {
|
TypstCompile {
|
||||||
/// The template file to compile as main, e.g. `exports/student.typ`.
|
/// The template file to compile as main, e.g. `exports/student.typ`.
|
||||||
template: PathBuf,
|
template: PathBuf,
|
||||||
},
|
},
|
||||||
/// Run a shell command — the escape hatch. ADR-0011 `shell`.
|
/// Run a shell command — the escape hatch. Mirrors Lean `Step.shell`.
|
||||||
Shell {
|
Shell {
|
||||||
/// The command line to run.
|
/// The command line to run.
|
||||||
run: String,
|
run: String,
|
||||||
},
|
},
|
||||||
/// Assemble a single-file markdown deliverable by concatenating each
|
/// Assemble a single-file markdown deliverable by concatenating each
|
||||||
/// element's `field` markdown content file in `[[parts]]` order. ADR-0011
|
/// element's `field` markdown content file in `[[parts]]` order. Mirrors
|
||||||
/// `assembleMarkdown` (ADR-0015). Not a typst build — the
|
/// Lean `Step.assembleMarkdown` (ADR-0015). Not a typst build — the
|
||||||
/// framework owns the read/concatenate/write itself.
|
/// framework owns the read/concatenate/write itself.
|
||||||
AssembleMarkdown {
|
AssembleMarkdown {
|
||||||
/// The per-element markdown content field to assemble (e.g. `slides`,
|
/// The per-element markdown content field to assemble (e.g. `slides`,
|
||||||
@@ -216,11 +226,12 @@ pub struct Project {
|
|||||||
|
|
||||||
/// `[info]` table (passed through to render targets verbatim).
|
/// `[info]` table (passed through to render targets verbatim).
|
||||||
///
|
///
|
||||||
/// The *canonical* model whose
|
/// **Mirrors `Spec.Courseware.Info`** in the Lean semantic master
|
||||||
|
/// (`spec/Spec/Courseware/Model/Info.lean`): the *canonical* model whose
|
||||||
/// `authors` is always a list. The authoring-surface form (string-or-array
|
/// `authors` is always a list. The authoring-surface form (string-or-array
|
||||||
/// `author`) is the separate [`RawInfo`] / [`RawAuthor`], normalized into this
|
/// `author`) is the separate [`RawInfo`] / [`RawAuthor`], normalized into this
|
||||||
/// at the load boundary. No
|
/// at the load boundary — mirroring the Lean `RawInfo` / `RawAuthor` split. No
|
||||||
/// CI gate enforces ADR↔implementation alignment (repo constitution); it is kept greppable.
|
/// CI gate enforces this alignment (repo constitution); it is kept greppable.
|
||||||
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
|
||||||
pub struct Info {
|
pub struct Info {
|
||||||
/// Lesson title.
|
/// Lesson title.
|
||||||
@@ -229,6 +240,7 @@ pub struct Info {
|
|||||||
/// so this is a list, not a single name. Empty when `[info]` declares no
|
/// so this is a list, not a single name. Empty when `[info]` declares no
|
||||||
/// `author`. The on-disk `author` accepts either a bare string (one author)
|
/// `author`. The on-disk `author` accepts either a bare string (one author)
|
||||||
/// or an array of strings (see [`RawAuthor`]); both load into this `Vec`.
|
/// or an array of strings (see [`RawAuthor`]); both load into this `Vec`.
|
||||||
|
/// Mirrors Lean `Info.authors : List String`.
|
||||||
pub authors: Vec<String>,
|
pub authors: Vec<String>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -278,7 +290,8 @@ struct RawProject {
|
|||||||
name: String,
|
name: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// The authoring-surface `[info]`: the raw form that exists for
|
/// The authoring-surface `[info]` (mirrors Lean `RawInfo` in
|
||||||
|
/// `spec/Spec/Courseware/Model/Info.lean`): the raw form that exists for
|
||||||
/// fill-in convenience, normalized into the canonical [`Info`] at the load
|
/// fill-in convenience, normalized into the canonical [`Info`] at the load
|
||||||
/// boundary. Not the form the rest of the model traffics in.
|
/// boundary. Not the form the rest of the model traffics in.
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -288,7 +301,7 @@ struct RawInfo {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// On-disk `author`: either a single name (`author = "…"`) or a list
|
/// On-disk `author`: either a single name (`author = "…"`) or a list
|
||||||
/// (`author = ["…", "…"]`). A fill-in convenience whose
|
/// (`author = ["…", "…"]`). Mirrors Lean `RawAuthor`: a fill-in convenience whose
|
||||||
/// string-or-array union lives **only** at the load boundary — [`RawAuthor::into_vec`]
|
/// string-or-array union lives **only** at the load boundary — [`RawAuthor::into_vec`]
|
||||||
/// folds it into the canonical [`Info::authors`] `Vec`, after which it never appears.
|
/// folds it into the canonical [`Info::authors`] `Vec`, after which it never appears.
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
@@ -299,7 +312,7 @@ enum RawAuthor {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl RawAuthor {
|
impl RawAuthor {
|
||||||
/// Flatten to the ordered author list: a single
|
/// Flatten to the ordered author list (Lean `RawAuthor.normalize`): a single
|
||||||
/// name becomes a one-element list; a list passes through verbatim.
|
/// name becomes a one-element list; a list passes through verbatim.
|
||||||
fn into_vec(self) -> Vec<String> {
|
fn into_vec(self) -> Vec<String> {
|
||||||
match self {
|
match self {
|
||||||
|
|||||||
@@ -1,153 +0,0 @@
|
|||||||
# ADR 0028: Member Group Management And Resolution
|
|
||||||
|
|
||||||
## Status
|
|
||||||
|
|
||||||
Accepted.
|
|
||||||
|
|
||||||
## Context
|
|
||||||
|
|
||||||
ADR-0020 fixed `Organization` as the tenant root and ADR-0019 pinned the
|
|
||||||
principal-set permission model. The file library (《文件库-接口契约.md》) computes
|
|
||||||
effective permission over two principal kinds — `USER` and `GROUP` — and consumes
|
|
||||||
the group side through a single read-only port, `GroupResolver`
|
|
||||||
(`resolveMemberGroupIds(userId) → groupIds[]`, contract C2/G2).
|
|
||||||
|
|
||||||
The contract's v0.1 proposal framed the Group system as a *separate HTTP service*
|
|
||||||
owned by another team, consumed read-only. In practice the schema now carries the
|
|
||||||
group tables directly in the hub database (`MemberGroup`, `MemberGroupMembership`,
|
|
||||||
`MemberGroupClosure` — a global, unlimited-depth, closure-backed hierarchy), and
|
|
||||||
the product requirement is to build **group management in the backend admin**, not
|
|
||||||
to integrate a foreign service. Until this ADR, nothing read or wrote those tables:
|
|
||||||
the live `GroupResolver` was a transitional implementation reading flat hub `Team`
|
|
||||||
membership, and the admin "Group 管理" panel actually managed `Team`.
|
|
||||||
|
|
||||||
This ADR settles the semantics needed to make the `MemberGroup` tables the real,
|
|
||||||
in-hub group system.
|
|
||||||
|
|
||||||
## Decision
|
|
||||||
|
|
||||||
### Group system is in-hub, not a foreign service
|
|
||||||
|
|
||||||
`MemberGroup` is the platform's global member-group principal. It lives in the hub
|
|
||||||
database and is managed through the `/database` backend. The contract's "separate
|
|
||||||
service" framing was an unfrozen v0.1 proposal; the implementation aligns to the
|
|
||||||
tables that were actually built. The `GroupResolver` port stays — an external
|
|
||||||
`HUB_GROUP_SERVICE_URL` HTTP implementation remains a supported override — but the
|
|
||||||
default implementation reads the in-hub `MemberGroup` closure.
|
|
||||||
|
|
||||||
### Authority: website administrator only
|
|
||||||
|
|
||||||
Group create/delete and member add/remove are restricted to the **website
|
|
||||||
administrator**, defined (consistently with the rest of the file library, D19/C4
|
|
||||||
adaptation) as an `OWNER`/`ADMIN` of the silo Organization (`isWebsiteAdmin` in
|
|
||||||
`filelib/guards.ts`). ADR-0023's `PlatformIdentity` is the future "true" platform
|
|
||||||
control plane; the file library uniformly uses org OWNER/ADMIN today and this
|
|
||||||
feature stays consistent with that. Reading groups for the authorization selector
|
|
||||||
(`/groups/search`) is **not** admin-gated — picking a group to grant is a Manage
|
|
||||||
holder's ability, not an administrator's.
|
|
||||||
|
|
||||||
### Resolution semantics (the crux)
|
|
||||||
|
|
||||||
`resolveMemberGroupIds(user)` returns the user's **active direct groups ∪ the
|
|
||||||
active ancestors of those groups**, deduplicated (the closure's depth-0 self row
|
|
||||||
makes each direct group its own ancestor). This is the single query the permission
|
|
||||||
engine relies on; equivalently: a grant placed on group G applies to members of G
|
|
||||||
and of every descendant of G (requirement 3.2 — permission flows down the tree, so
|
|
||||||
resolution collects up the tree). It is computed **live, never cached** (contract
|
|
||||||
D4/G4): a membership change is visible on the very next protected request.
|
|
||||||
|
|
||||||
MemberGroup is global (no `organizationId`), so resolution is not org-scoped.
|
|
||||||
|
|
||||||
### Soft delete via `archivedAt`, cascading the subtree
|
|
||||||
|
|
||||||
Delete is soft: `MemberGroup.archivedAt` is a tag. Deleting a group
|
|
||||||
cascade-soft-deletes its **whole subtree** (walk `MemberGroupClosure` where
|
|
||||||
`ancestorId = G`, stamp `archivedAt` on each active descendant) — an application
|
|
||||||
operation, not a DB constraint. Closure and membership rows are **retained**;
|
|
||||||
resolution and listing filter by `archivedAt`, so an archived group and everything
|
|
||||||
under it stop contributing to permission at once.
|
|
||||||
|
|
||||||
### Closure maintenance
|
|
||||||
|
|
||||||
The closure is maintained on **create**: insert `(G, G, 0)`, then for a parent `P`
|
|
||||||
insert `(a.ancestorId, G, a.depth + 1)` for every `a` in
|
|
||||||
`closure where descendantId = P`. v1 does **not** support reparenting a group
|
|
||||||
(moving it under a new parent). The schema reserves reparent (closure rebuild plus
|
|
||||||
the cycle guard "reject a new parent inside the moved subtree"); it is a follow-on.
|
|
||||||
|
|
||||||
### Rename and description edits are in scope; reparent stays out
|
|
||||||
|
|
||||||
A group's `name` and `description` are mutable by the website administrator
|
|
||||||
(`PATCH /database/api/groups/:id`, audited as `group.update`). This is deliberately
|
|
||||||
separated from reparent: renaming touches **no** closure row and cannot create a
|
|
||||||
cycle, so it carries none of the invariant risk that keeps reparent out of v1. The
|
|
||||||
endpoint therefore **rejects** a `parentId` field outright rather than ignoring it,
|
|
||||||
so a future reparent cannot arrive silently through this route. Passing an empty
|
|
||||||
`description` clears it; omitting a field leaves it unchanged.
|
|
||||||
|
|
||||||
### Restore is deliberately asymmetric with delete
|
|
||||||
|
|
||||||
Archived groups stay visible to the administrator (`GET
|
|
||||||
/database/api/groups?includeArchived=1` returns them carrying `archivedAt`; the
|
|
||||||
console tags and greys them) and can be restored (`POST
|
|
||||||
/database/api/groups/:id/restore`, audited as `group.restore`).
|
|
||||||
|
|
||||||
Restore is **not** the mirror image of delete. Delete cascades down the whole
|
|
||||||
subtree; restore un-archives **the group plus every archived ancestor of it, and
|
|
||||||
nothing below it**:
|
|
||||||
|
|
||||||
- Restoring the ancestor chain is **mandatory**, not a convenience. An active group
|
|
||||||
whose parent is archived has no path in the tree, and the `depth` derivation
|
|
||||||
(closure row count) presumes "an active group's ancestors are active" — the
|
|
||||||
invariant that cascade-delete establishes. Restoring a node alone would break it.
|
|
||||||
- The subtree is deliberately **left archived**. A group's descendants may have been
|
|
||||||
archived for reasons of their own, and one click should not silently re-grant
|
|
||||||
permission across a whole historical branch. Descendants remain visible in their
|
|
||||||
archived state and are each restored explicitly.
|
|
||||||
|
|
||||||
Restore takes effect immediately, like every other membership change (D4/G4): the
|
|
||||||
group resumes contributing permission on the next resolution.
|
|
||||||
|
|
||||||
An archived group is **readable but not writable**. Its membership rows are never
|
|
||||||
revoked by archiving, so `listMembers` succeeds on an archived group — the console
|
|
||||||
must be able to show *who was in it* before deciding whether to restore it. Every
|
|
||||||
mutation, by contrast, still requires an active group (`requireActiveGroup` → 404):
|
|
||||||
rename, child creation, and member add/remove all reject. The group is inert for
|
|
||||||
permission purposes and frozen for editing, but not hidden and not forgotten.
|
|
||||||
|
|
||||||
### Member picker reads global users, admin-only
|
|
||||||
|
|
||||||
`GET /database/api/users/search` backs the "add member" picker: it matches `User`
|
|
||||||
by display name or Feishu open id and is gated to the website administrator, the
|
|
||||||
same authority that may add members. It widens no existing capability — adding a
|
|
||||||
member already accepts **any** global user (`resolveUser` does not require an org
|
|
||||||
membership), so the endpoint only replaces blind id entry with search. It is
|
|
||||||
deliberately **not** opened to the non-admin authorization-selector audience that
|
|
||||||
`/groups/search` serves: choosing a group to grant is a Manage-holder action,
|
|
||||||
whereas enumerating people is not. `excludeGroupId` filters out the target group's
|
|
||||||
active members so the picker cannot surface a candidate that must 409.
|
|
||||||
|
|
||||||
### Audit is written in-hub
|
|
||||||
|
|
||||||
The contract (C3 §6.3) originally deferred group actions to the foreign Group
|
|
||||||
service's own audit. With the group system in-hub, group mutations are audited
|
|
||||||
through the existing file-library sink (`filelib/audit.ts`, same-transaction
|
|
||||||
`AuditEntry`) under the silo Organization — `MemberGroup` has no `organizationId`,
|
|
||||||
so the audit row is attributed to the silo org. New actions: `group.create`,
|
|
||||||
`group.update`, `group.delete`, `group.restore`, `group.member_add`,
|
|
||||||
`group.member_remove`; new audit object type `group`.
|
|
||||||
|
|
||||||
## Consequences
|
|
||||||
|
|
||||||
- The default `GroupResolver` becomes the in-hub `MemberGroup` closure reader.
|
|
||||||
`createTeamGroupResolver` is retained but deprecated (no longer wired); existing
|
|
||||||
flat-Team group grants no longer resolve for the file library.
|
|
||||||
- Group grants take effect in real time through the existing `effectiveRole`
|
|
||||||
reducer (P6) with no change to the permission algebra — only the set of group ids
|
|
||||||
fed to it changes.
|
|
||||||
- v1 omits reparent; the closure invariants above must hold whenever reparent is
|
|
||||||
added later (rebuild descendants' ancestor rows, reject cycles).
|
|
||||||
- Group management is an admin-only surface; the authorization selector is not.
|
|
||||||
- Numeric limits (max depth, max members) and a hard-delete/restore path remain
|
|
||||||
follow-on operational decisions; they must not weaken the archived-filter,
|
|
||||||
admin-authority, or live-resolution invariants fixed here.
|
|
||||||
@@ -1,132 +0,0 @@
|
|||||||
# ADR 0029: Web Surfaces Are Static SPAs; the Hub Serves JSON Only
|
|
||||||
|
|
||||||
## Status
|
|
||||||
|
|
||||||
Accepted.
|
|
||||||
|
|
||||||
## Context
|
|
||||||
|
|
||||||
The Hub exposes three browser surfaces: the org-admin console (`/admin`), the
|
|
||||||
teacher-facing file library (`/app`), and the database admin back office
|
|
||||||
(`/database`). They arrived at different times and diverged in how HTML reached
|
|
||||||
the browser.
|
|
||||||
|
|
||||||
`/admin` and `/app` were already separated: the backend serves a prebuilt static
|
|
||||||
`index.html` and never inspects the request; all data flows through JSON
|
|
||||||
endpoints. `/database` was not. Roughly 1770 lines across four modules
|
|
||||||
(`renderDashboard`/`renderLoginPage` in `routes/databaseRoutes.ts`,
|
|
||||||
`routes/adminPanels.ts`, `routes/libraryBrowser.ts`, `routes/libraryPage.ts`)
|
|
||||||
assembled HTML template strings server-side, reading the session cookie and
|
|
||||||
querying Prisma inside the page handler, with layout expressed as inline
|
|
||||||
`style="…"` attributes and behavior as `<script>` text.
|
|
||||||
|
|
||||||
A prior migration (`12628c9`) introduced a fourth frontend project,
|
|
||||||
`hub/database-admin/`, intended to replace those pages. It was never wired up:
|
|
||||||
the concrete route `/database/dashboard` is more specific than the SPA wildcard
|
|
||||||
`/database/*`, so the server-rendered handler always won and the SPA's dashboard
|
|
||||||
was unreachable. That project's file header claimed the SPA served the dashboard
|
|
||||||
and that `/database/config` existed; neither was true. The `npm run build` script
|
|
||||||
also never built it, so the `existsSync` guard in `database/static.ts` failed on
|
|
||||||
every deploy and the shell was permanently disabled.
|
|
||||||
|
|
||||||
Duplicated visual rules were the practical cost: card padding and type sizes were
|
|
||||||
restated in each render module, and only the CSS variables in `routes/uiTheme.ts`
|
|
||||||
were genuinely shared.
|
|
||||||
|
|
||||||
## Decision
|
|
||||||
|
|
||||||
**No Hub HTTP handler renders HTML.** Every browser surface is a prebuilt static
|
|
||||||
SPA. Page handlers send a byte-identical `index.html` that does not depend on the
|
|
||||||
request; all per-user and per-request data is fetched by the client from JSON
|
|
||||||
endpoints under `/api/*` or `/database/api/*`.
|
|
||||||
|
|
||||||
**`/app` and `/database` are one frontend project, `hub/filelib-web`, built once
|
|
||||||
and mounted at two prefixes.** They share the file library browser, the session
|
|
||||||
layer, the toast host, and the design tokens; splitting them would duplicate all
|
|
||||||
of it. `hub/database-admin` is deleted — superseded before it ever served a
|
|
||||||
request.
|
|
||||||
|
|
||||||
Two configuration constraints follow from co-hosting two SvelteKit SPAs on one
|
|
||||||
Fastify instance, and are load-bearing:
|
|
||||||
|
|
||||||
- `filelib-web` sets `appDir: '_filelib'`. The SvelteKit default `_app` collides
|
|
||||||
with the root `/_app/*` asset route that `admin-web` owns
|
|
||||||
(`src/admin/static.ts`); Fastify rejects duplicate routes at startup, so the
|
|
||||||
collision is a boot failure, not a silent misroute.
|
|
||||||
- `filelib-web` sets `paths.relative: false`. The same `index.html` is served at
|
|
||||||
different URL depths (`/app`, `/database/dashboard/users`), so relative asset
|
|
||||||
paths would resolve against the wrong base.
|
|
||||||
|
|
||||||
**Client-side navigation uses real URL routes, not hash fragments or hidden
|
|
||||||
sections.** The six back-office tabs are `/database/dashboard`,
|
|
||||||
`/database/dashboard/library`, `/users`, `/groups`, `/search`, `/settings`.
|
|
||||||
Refresh preserves position and links are shareable — the previous
|
|
||||||
`location.hash` + `display:none` scheme lost both.
|
|
||||||
|
|
||||||
Concrete routes must be registered before the SPA wildcards. This is an ordering
|
|
||||||
obligation on `database/plugin.ts`, not an incidental detail: the earlier
|
|
||||||
`/database/dashboard` shadowing bug is exactly what happens when a concrete page
|
|
||||||
route outranks the fallback.
|
|
||||||
|
|
||||||
## Consequences
|
|
||||||
|
|
||||||
- Authorization is enforced only by the JSON endpoints. A client-side guard (the
|
|
||||||
`isWebsiteAdmin` check in the dashboard layout) is a navigation convenience and
|
|
||||||
carries no security weight; every endpoint keeps its own `fail closed` guard.
|
|
||||||
- `/database/api/stats` is a new endpoint carrying what `loadDashboardStats` used
|
|
||||||
to compute inline. It requires silo org `OWNER`/`ADMIN` because it aggregates
|
|
||||||
org-wide counts and the audit stream rather than a per-node permission view.
|
|
||||||
- `/database/api/me` grew `displayName` and `avatarUrl`. Anything the old page
|
|
||||||
handler read from Prisma to render chrome has to become part of a JSON payload
|
|
||||||
or it is simply unavailable: the sidebar identity strip showed a raw `userId`
|
|
||||||
until these were added. When migrating a server-rendered surface, the data the
|
|
||||||
template closed over is part of the contract being ported, not an incidental
|
|
||||||
detail of the old implementation.
|
|
||||||
- Editing a page no longer requires a Hub restart in development; `vite dev`
|
|
||||||
serves the frontend and proxies data requests to the Hub. In production the
|
|
||||||
`index.html` is cached in memory at startup, so a frontend rebuild does require
|
|
||||||
a restart.
|
|
||||||
- Deploy scripts and the silo rate-limit exemption list name `filelib-web` and
|
|
||||||
`/_filelib/*`. Adding a fourth surface means picking another `appDir` and
|
|
||||||
extending that list.
|
|
||||||
- The design system is one file, `filelib-web/src/app.css`: an `@theme` block for
|
|
||||||
tokens plus an `@layer components` block for the shared component classes
|
|
||||||
(`.btn`, `.panel`, `.input`, `.select`, `.list`, `.tag`, `.quiet`, …).
|
|
||||||
`routes/uiTheme.ts` is deleted; both halves live there now.
|
|
||||||
|
|
||||||
The first cut of this migration kept only the tokens and restated button,
|
|
||||||
input, and panel styling inline in every component. That reproduced the
|
|
||||||
duplication the old code had — the admin panels visibly regressed — so the
|
|
||||||
component layer was ported too. Components carry layout utilities; they do not
|
|
||||||
restate component styling. The one admitted exception is a data-derived value
|
|
||||||
(tree indent computed from `depth`), which cannot be a static class.
|
|
||||||
|
|
||||||
The icon set (`lib/Icon.svelte`, 13 paths) is likewise shared rather than
|
|
||||||
restated. It came from `adminPanels.ts`; Group nodes deliberately use a
|
|
||||||
two-person silhouette, not a folder glyph, because `MemberGroup` and the file
|
|
||||||
library's `FOLDER`/`PROJECT` are unrelated hierarchies (ADR-0028, ADR-0021).
|
|
||||||
|
|
||||||
- **A migrated surface is only done when its endpoint coverage matches.** Two
|
|
||||||
panels were rebuilt from a superficially similar component that predated the
|
|
||||||
migration rather than from the server module they replaced, and the mismatch
|
|
||||||
was invisible in the rendered page:
|
|
||||||
|
|
||||||
- Group management called 5 of 8 endpoints. Rename (`PATCH`),
|
|
||||||
`?includeArchived=1`, `/restore`, and `/users/search` had no entry point, so
|
|
||||||
a soft-deleted group could not be restored through the UI at all even though
|
|
||||||
the backend fully supported it.
|
|
||||||
- The library browser dropped the `授权` tab entirely — `GET/PUT/DELETE
|
|
||||||
.../grants` and `PUT .../independent-permission` had no caller. Permission
|
|
||||||
editing is the point of the back office, and it was unreachable.
|
|
||||||
|
|
||||||
Diffing the route table against the frontend's `api()` call sites catches this;
|
|
||||||
reading the new page does not.
|
|
||||||
|
|
||||||
## Deferred
|
|
||||||
|
|
||||||
- `/admin` (admin-web) stays a separate project. It has its own design language
|
|
||||||
(`saas-*` classes, `surface-*`/`primary-*` scales) and a different audience;
|
|
||||||
merging it is not motivated by shared code.
|
|
||||||
- The `search` and `settings` tabs remain placeholders, as they were server-side.
|
|
||||||
- Serving `/admin` and `/database` from a single SPA, which would remove the
|
|
||||||
`appDir` collision constraint entirely.
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
# ADR 0030: Project Grants Are Always Live; The Independent-Permission Toggle Is Removed
|
|
||||||
|
|
||||||
## Status
|
|
||||||
|
|
||||||
Accepted. Supersedes the file-library contract rule **D11 / P5** (《文件库-接口契约.md》,
|
|
||||||
since deleted; recoverable from git history) which introduced the per-project
|
|
||||||
"独立权限" (independent permission) switch.
|
|
||||||
|
|
||||||
## Context
|
|
||||||
|
|
||||||
D11 gave each PROJECT a toggle (`FileLibProjectSettings.independentPermissionsEnabled`,
|
|
||||||
default off). While off, project-level non-creator grants were **frozen** — present in
|
|
||||||
`FileLibGrant` but excluded from `effectiveRole`; ancestor-chain grants and the creator's
|
|
||||||
auto-grant were unaffected. The intent was to support two workflows: "project follows the
|
|
||||||
folder's ACL" (off) vs "project has its own ACL" (on).
|
|
||||||
|
|
||||||
In practice the toggle surprised operators twice: grants appeared to "not work" until
|
|
||||||
someone found and flipped a per-project switch buried in the 概览 tab, and the frozen state
|
|
||||||
was indistinguishable from missing grants in the UI. The product decision is that
|
|
||||||
project-level grants should simply always be live.
|
|
||||||
|
|
||||||
## Decision
|
|
||||||
|
|
||||||
- **Project-level grants always participate in `effectiveRole`.** The freeze branch in
|
|
||||||
`hub/src/database/filelib/permission.ts` is deleted; `EffectiveRoleInput` no longer
|
|
||||||
carries `independentPermissionsEnabled`.
|
|
||||||
- **The toggle surface is removed end-to-end**: `PUT /database/api/projects/:id/independent-permission`,
|
|
||||||
`grantService.setIndependentPermission`, the `independentPermission` field in the node
|
|
||||||
detail DTO, and the 概览 tab switch in `filelib-web`.
|
|
||||||
- **`FileLibProjectSettings` becomes vestigial.** The table stays (existing rows are
|
|
||||||
ignored, no data migration); new projects no longer get a default row. It may be dropped
|
|
||||||
in a future migration once nothing references it.
|
|
||||||
- Audit action vocabulary `independent_enable` / `independent_disable` is retained for
|
|
||||||
reading historical audit entries; no new entries are produced.
|
|
||||||
|
|
||||||
Behavior change for existing deployments: projects whose toggle was off now have their
|
|
||||||
project-level grants effective immediately — this is the intended effect of the decision.
|
|
||||||
|
|
||||||
## Consequences
|
|
||||||
|
|
||||||
- Permission semantics shrink to the single P6 rule: `effective = max(grants on self ∪
|
|
||||||
ancestors for user ∪ resolved groups)`, no exceptions by node kind.
|
|
||||||
- One less state dimension in tests and in the admin UI.
|
|
||||||
@@ -32,7 +32,7 @@ App ID 通常以 `cli_` 开头,可以写入交付单。App Secret 必须通过
|
|||||||
| 接收群聊中 @ 机器人的消息 | `im:message.group_at_msg:readonly` |
|
| 接收群聊中 @ 机器人的消息 | `im:message.group_at_msg:readonly` |
|
||||||
| 以应用身份发送消息 | `im:message:send_as_bot` |
|
| 以应用身份发送消息 | `im:message:send_as_bot` |
|
||||||
| 读取触发消息和线程上下文 | `im:message:readonly` |
|
| 读取触发消息和线程上下文 | `im:message:readonly` |
|
||||||
| 获取消息中的图片/文件,并向飞书上传图片或文件(含 Agent 回答中的图片发送) | `im:resource` |
|
| 获取与上传图片或文件 | `im:resource` |
|
||||||
| 添加、删除消息表情回复 | `im:message.reactions:write_only` |
|
| 添加、删除消息表情回复 | `im:message.reactions:write_only` |
|
||||||
| 获取用户基本信息 | `contact:user.base:readonly` |
|
| 获取用户基本信息 | `contact:user.base:readonly` |
|
||||||
| 获取用户基本资料 | `contact:user.basic_profile:readonly` |
|
| 获取用户基本资料 | `contact:user.basic_profile:readonly` |
|
||||||
@@ -66,9 +66,6 @@ Educraft 机器人以应用身份调用上述 API,因此这些 scope 全部放
|
|||||||
|
|
||||||
如果 API 调试台提示缺少更细粒度权限,请把错误提示和发生时间截图给部署人员。不要自行开通通讯录全量读取等超出本表的权限。
|
如果 API 调试台提示缺少更细粒度权限,请把错误提示和发生时间截图给部署人员。不要自行开通通讯录全量读取等超出本表的权限。
|
||||||
|
|
||||||
说明:`im:resource` 既用于下载用户发来的图片/文件,也用于 Agent 回复时把本地或远程图片上传为飞书 `image_key` 后嵌入消息卡片。缺少该权限时,带图回答会发送失败或降级为无图文本。已开通该 scope 的存量应用一般无需新增权限,但若权限尚未随最新版本发布,请创建新版本并审核发布。
|
|
||||||
|
|
||||||
|
|
||||||
## 4. 配置事件与卡片回调
|
## 4. 配置事件与卡片回调
|
||||||
|
|
||||||
进入“事件与回调”。
|
进入“事件与回调”。
|
||||||
|
|||||||
@@ -5,13 +5,6 @@ dist/
|
|||||||
.env.*
|
.env.*
|
||||||
!.env.example
|
!.env.example
|
||||||
.secrets/
|
.secrets/
|
||||||
.dev-keyring.json
|
|
||||||
.dev-workspaces/
|
|
||||||
.dev-skills/
|
|
||||||
.filelib-repos/
|
|
||||||
admin-web/node_modules/
|
admin-web/node_modules/
|
||||||
admin-web/build/
|
admin-web/build/
|
||||||
admin-web/.svelte-kit/
|
admin-web/.svelte-kit/
|
||||||
filelib-web/node_modules/
|
|
||||||
filelib-web/build/
|
|
||||||
filelib-web/.svelte-kit/
|
|
||||||
|
|||||||
@@ -168,16 +168,6 @@ export interface FeishuApplicationConnection {
|
|||||||
updatedAt: string;
|
updatedAt: string;
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface CapabilityConnection {
|
|
||||||
id: string;
|
|
||||||
capabilityId: string;
|
|
||||||
status: 'DRAFT' | 'ACTIVE' | 'DISABLED';
|
|
||||||
activeVersion: number | null;
|
|
||||||
keyId: string | null;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface UsageTotals {
|
export interface UsageTotals {
|
||||||
runCount: number;
|
runCount: number;
|
||||||
runsWithCost: number;
|
runsWithCost: number;
|
||||||
@@ -193,81 +183,13 @@ export interface ProjectUsageRow extends UsageTotals {
|
|||||||
folderId: string | null;
|
folderId: string | null;
|
||||||
}
|
}
|
||||||
|
|
||||||
/** Ledger slice from UsageFact (ADR-0026): separates model tokens vs external meters. */
|
|
||||||
export interface UsageBreakdownRow {
|
|
||||||
kind: string;
|
|
||||||
provider: string;
|
|
||||||
model: string | null;
|
|
||||||
capabilityId: string | null;
|
|
||||||
unit: string | null;
|
|
||||||
factCount: number;
|
|
||||||
factsWithCost: number;
|
|
||||||
factsWithoutCost: number;
|
|
||||||
inputTokens: number;
|
|
||||||
outputTokens: number;
|
|
||||||
quantity: number | null;
|
|
||||||
costUsd: number | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface UsageReport {
|
export interface UsageReport {
|
||||||
from: string | null;
|
from: string | null;
|
||||||
to: string | null;
|
to: string | null;
|
||||||
projects: ProjectUsageRow[];
|
projects: ProjectUsageRow[];
|
||||||
totals: UsageTotals;
|
totals: UsageTotals;
|
||||||
breakdown: UsageBreakdownRow[];
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export interface ProjectUsageReport extends ProjectUsageRow {
|
|
||||||
from: string | null;
|
|
||||||
to: string | null;
|
|
||||||
breakdown: UsageBreakdownRow[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface UsageFactRow {
|
|
||||||
id: string;
|
|
||||||
occurredAt: string;
|
|
||||||
kind: string;
|
|
||||||
provider: string;
|
|
||||||
model: string | null;
|
|
||||||
inputTokens: number | null;
|
|
||||||
outputTokens: number | null;
|
|
||||||
quantity: number | null;
|
|
||||||
unit: string | null;
|
|
||||||
costUsd: number | null;
|
|
||||||
costSource: string;
|
|
||||||
capabilityId: string | null;
|
|
||||||
correlationId: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SessionRunRow {
|
|
||||||
id: string;
|
|
||||||
status: string;
|
|
||||||
model: string;
|
|
||||||
provider: string;
|
|
||||||
inputTokens: number | null;
|
|
||||||
outputTokens: number | null;
|
|
||||||
costUsd: number | null;
|
|
||||||
costSource: string | null;
|
|
||||||
startedAt: string;
|
|
||||||
finishedAt: string | null;
|
|
||||||
error: string | null;
|
|
||||||
usageFacts: UsageFactRow[];
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface SessionDetail {
|
|
||||||
id: string;
|
|
||||||
provider: string;
|
|
||||||
roleId: string;
|
|
||||||
model: string;
|
|
||||||
title: string | null;
|
|
||||||
createdAt: string;
|
|
||||||
updatedAt: string;
|
|
||||||
archivedAt: string | null;
|
|
||||||
project: { id: string; name: string };
|
|
||||||
runs: SessionRunRow[];
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export type CapacityDimension =
|
export type CapacityDimension =
|
||||||
| 'requestRate'
|
| 'requestRate'
|
||||||
| 'requestBodySize'
|
| 'requestBodySize'
|
||||||
@@ -421,8 +343,6 @@ export const api = {
|
|||||||
get(`${orgBase(slug)}/projects/${projectId}/sessions${limit !== undefined ? `?limit=${limit}` : ''}`) as Promise<{
|
get(`${orgBase(slug)}/projects/${projectId}/sessions${limit !== undefined ? `?limit=${limit}` : ''}`) as Promise<{
|
||||||
sessions: SessionSummary[];
|
sessions: SessionSummary[];
|
||||||
}>,
|
}>,
|
||||||
session: (slug: string, sessionId: string) =>
|
|
||||||
get(`${orgBase(slug)}/sessions/${encodeURIComponent(sessionId)}`) as Promise<SessionDetail>,
|
|
||||||
usage: (slug: string, params?: { from?: string; to?: string; folderId?: string }) => {
|
usage: (slug: string, params?: { from?: string; to?: string; folderId?: string }) => {
|
||||||
const q = new URLSearchParams();
|
const q = new URLSearchParams();
|
||||||
if (params?.from) q.set('from', params.from);
|
if (params?.from) q.set('from', params.from);
|
||||||
@@ -431,16 +351,6 @@ export const api = {
|
|||||||
const qs = q.toString();
|
const qs = q.toString();
|
||||||
return get(`${orgBase(slug)}/usage${qs ? `?${qs}` : ''}`) as Promise<UsageReport>;
|
return get(`${orgBase(slug)}/usage${qs ? `?${qs}` : ''}`) as Promise<UsageReport>;
|
||||||
},
|
},
|
||||||
projectUsage: (slug: string, projectId: string, params?: { from?: string; to?: string }) => {
|
|
||||||
const q = new URLSearchParams();
|
|
||||||
if (params?.from) q.set('from', params.from);
|
|
||||||
if (params?.to) q.set('to', params.to);
|
|
||||||
const qs = q.toString();
|
|
||||||
return get(
|
|
||||||
`${orgBase(slug)}/projects/${encodeURIComponent(projectId)}/usage${qs ? `?${qs}` : ''}`,
|
|
||||||
) as Promise<ProjectUsageReport>;
|
|
||||||
},
|
|
||||||
|
|
||||||
|
|
||||||
providerConnections: (slug: string) =>
|
providerConnections: (slug: string) =>
|
||||||
get(`${orgBase(slug)}/provider-connections`) as Promise<{ connections: ProviderConnectionRow[] }>,
|
get(`${orgBase(slug)}/provider-connections`) as Promise<{ connections: ProviderConnectionRow[] }>,
|
||||||
@@ -471,21 +381,6 @@ export const api = {
|
|||||||
disableFeishuApplication: (slug: string) =>
|
disableFeishuApplication: (slug: string) =>
|
||||||
del(`${orgBase(slug)}/feishu-application-connection`) as Promise<FeishuApplicationConnection>,
|
del(`${orgBase(slug)}/feishu-application-connection`) as Promise<FeishuApplicationConnection>,
|
||||||
|
|
||||||
capabilityConnections: (slug: string) =>
|
|
||||||
get(`${orgBase(slug)}/capability-connections`) as Promise<{ connections: CapabilityConnection[] }>,
|
|
||||||
capabilityConnection: (slug: string, capabilityId: string) =>
|
|
||||||
get(`${orgBase(slug)}/capability-connections/${encodeURIComponent(capabilityId)}`) as Promise<{
|
|
||||||
connection: CapabilityConnection | null;
|
|
||||||
}>,
|
|
||||||
rotateCapabilityConnection: (
|
|
||||||
slug: string,
|
|
||||||
capabilityId: string,
|
|
||||||
body: { accessKeyId: string; accessKeySecret: string; endpoint: string },
|
|
||||||
) =>
|
|
||||||
put(`${orgBase(slug)}/capability-connections/${encodeURIComponent(capabilityId)}`, body) as Promise<CapabilityConnection>,
|
|
||||||
disableCapabilityConnection: (slug: string, capabilityId: string) =>
|
|
||||||
del(`${orgBase(slug)}/capability-connections/${encodeURIComponent(capabilityId)}`) as Promise<CapabilityConnection>,
|
|
||||||
|
|
||||||
capacityPolicy: (slug: string) => get(`${orgBase(slug)}/capacity-policy`) as Promise<CapacityPolicyView>,
|
capacityPolicy: (slug: string) => get(`${orgBase(slug)}/capacity-policy`) as Promise<CapacityPolicyView>,
|
||||||
setCapacityPolicy: (slug: string, body: { limits: Partial<Record<CapacityDimension, number | null>> }) =>
|
setCapacityPolicy: (slug: string, body: { limits: Partial<Record<CapacityDimension, number | null>> }) =>
|
||||||
put(`${orgBase(slug)}/capacity-policy`, body) as Promise<CapacityPolicyView>,
|
put(`${orgBase(slug)}/capacity-policy`, body) as Promise<CapacityPolicyView>,
|
||||||
|
|||||||
@@ -33,7 +33,7 @@
|
|||||||
<div class="space-y-0.5">
|
<div class="space-y-0.5">
|
||||||
{#each childProjects as p (p.id)}
|
{#each childProjects as p (p.id)}
|
||||||
<a
|
<a
|
||||||
href={`/admin/projects/${p.id}`}
|
href={`/admin/org/${slug}/projects/${p.id}`}
|
||||||
class="flex items-center gap-2.5 px-3 py-2.5 text-sm transition hover:bg-surface-100"
|
class="flex items-center gap-2.5 px-3 py-2.5 text-sm transition hover:bg-surface-100"
|
||||||
>
|
>
|
||||||
<span class="flex h-7 w-7 items-center justify-center border border-primary-200 bg-primary-50 text-primary-700">
|
<span class="flex h-7 w-7 items-center justify-center border border-primary-200 bg-primary-50 text-primary-700">
|
||||||
|
|||||||
@@ -29,52 +29,6 @@ export function fmtNum(n: number): string {
|
|||||||
return n.toLocaleString();
|
return n.toLocaleString();
|
||||||
}
|
}
|
||||||
|
|
||||||
const USAGE_KIND_LABELS: Record<string, string> = {
|
|
||||||
model_completion: '模型完成',
|
|
||||||
external_capability: '外部能力',
|
|
||||||
tool_proxy: '工具代理',
|
|
||||||
};
|
|
||||||
|
|
||||||
const METER_UNIT_LABELS: Record<string, string> = {
|
|
||||||
pages: '页',
|
|
||||||
audio_seconds: '音频秒',
|
|
||||||
invocations: '次调用',
|
|
||||||
};
|
|
||||||
|
|
||||||
export function usageKindLabel(kind: string): string {
|
|
||||||
return USAGE_KIND_LABELS[kind] ?? kind;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function meterUnitLabel(unit: string | null | undefined): string {
|
|
||||||
if (!unit) return '—';
|
|
||||||
return METER_UNIT_LABELS[unit] ?? unit;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function fmtQuantity(quantity: number | null | undefined, unit: string | null | undefined): string {
|
|
||||||
if (quantity === null || quantity === undefined) return '—';
|
|
||||||
const u = meterUnitLabel(unit);
|
|
||||||
return u === '—' ? fmtNum(quantity) : `${fmtNum(quantity)} ${u}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function fmtTokens(input: number | null | undefined, output: number | null | undefined): string {
|
|
||||||
const hasIn = input !== null && input !== undefined;
|
|
||||||
const hasOut = output !== null && output !== undefined;
|
|
||||||
if (!hasIn && !hasOut) return '—';
|
|
||||||
return `${fmtNum(input ?? 0)} / ${fmtNum(output ?? 0)}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function runStatusLabel(status: string): string {
|
|
||||||
const key = status.toUpperCase();
|
|
||||||
if (key === 'COMPLETED') return '完成';
|
|
||||||
if (key === 'FAILED') return '失败';
|
|
||||||
if (key === 'CANCELED') return '取消';
|
|
||||||
if (key === 'TIMED_OUT') return '超时';
|
|
||||||
if (key === 'RUNNING') return '运行中';
|
|
||||||
if (key === 'QUEUED') return '排队';
|
|
||||||
return status;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
export function orgRoleLabel(role: string): string {
|
export function orgRoleLabel(role: string): string {
|
||||||
const key = role.toUpperCase() as OrgRole;
|
const key = role.toUpperCase() as OrgRole;
|
||||||
return ORG_ROLE_LABELS[key] ?? role;
|
return ORG_ROLE_LABELS[key] ?? role;
|
||||||
|
|||||||
@@ -1,40 +0,0 @@
|
|||||||
import type { MeResponse, OrgMembership } from './api';
|
|
||||||
|
|
||||||
/** Alpha Silo host prefix: <slug>.educraft[.dev].… */
|
|
||||||
export function hostOrgSlug(hostname: string = typeof window !== 'undefined' ? window.location.hostname : ''): string | null {
|
|
||||||
const host = hostname.toLowerCase();
|
|
||||||
const m = host.match(/^([a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)\.educraft(?:-dev)?\./);
|
|
||||||
return m?.[1] ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export function isOrgAdmin(org: OrgMembership | null | undefined): boolean {
|
|
||||||
if (!org) return false;
|
|
||||||
const role = String(org.role ?? '').toUpperCase();
|
|
||||||
return role === 'OWNER' || role === 'ADMIN';
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Resolve the tenancy for this browser session.
|
|
||||||
* Prefers hostname slug (silo), then ?org=, then first admin membership, then first membership.
|
|
||||||
*/
|
|
||||||
export function resolveOrg(me: MeResponse | null | undefined, search: string = ''): OrgMembership | null {
|
|
||||||
if (!me || me.organizations.length === 0) return null;
|
|
||||||
const host = hostOrgSlug();
|
|
||||||
if (host) {
|
|
||||||
const byHost = me.organizations.find((o) => o.slug === host);
|
|
||||||
if (byHost) return byHost;
|
|
||||||
}
|
|
||||||
const q = new URLSearchParams(search).get('org')?.trim();
|
|
||||||
if (q) {
|
|
||||||
const byQuery = me.organizations.find((o) => o.slug === q);
|
|
||||||
if (byQuery) return byQuery;
|
|
||||||
}
|
|
||||||
const admin = me.organizations.find((o) => isOrgAdmin(o));
|
|
||||||
return admin ?? me.organizations[0] ?? null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** SPA paths no longer embed org slug (subdomain carries tenancy). */
|
|
||||||
export function adminPath(rest: string = ''): string {
|
|
||||||
const cleaned = rest.replace(/^\/+/, '');
|
|
||||||
return cleaned === '' ? '/admin' : `/admin/${cleaned}`;
|
|
||||||
}
|
|
||||||
@@ -35,9 +35,12 @@ export async function loadSession(): Promise<void> {
|
|||||||
/**
|
/**
|
||||||
* Resolve org slug for org-scoped Feishu OAuth (`GET /auth/feishu/:orgSlug`).
|
* Resolve org slug for org-scoped Feishu OAuth (`GET /auth/feishu/:orgSlug`).
|
||||||
* Unscoped `/auth/feishu` is disabled unless allowLegacyFeishuOAuth is on.
|
* Unscoped `/auth/feishu` is disabled unless allowLegacyFeishuOAuth is on.
|
||||||
* Path no longer carries tenancy: prefer hostname silo slug, then ?org=.
|
|
||||||
*/
|
*/
|
||||||
export function resolveLoginOrgSlug(): string | null {
|
export function resolveLoginOrgSlug(): string | null {
|
||||||
|
const path = window.location.pathname.split('/').filter(Boolean);
|
||||||
|
if (path[0] === 'admin' && path[1] === 'org' && path[2]) {
|
||||||
|
return decodeURIComponent(path[2]);
|
||||||
|
}
|
||||||
const q = new URLSearchParams(window.location.search).get('org');
|
const q = new URLSearchParams(window.location.search).get('org');
|
||||||
if (q && q.trim() !== '') return q.trim();
|
if (q && q.trim() !== '') return q.trim();
|
||||||
|
|
||||||
@@ -45,12 +48,6 @@ export function resolveLoginOrgSlug(): string | null {
|
|||||||
const host = window.location.hostname.toLowerCase();
|
const host = window.location.hostname.toLowerCase();
|
||||||
const m = host.match(/^([a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)\.educraft(?:-dev)?\./);
|
const m = host.match(/^([a-z0-9](?:[a-z0-9-]{0,61}[a-z0-9])?)\.educraft(?:-dev)?\./);
|
||||||
if (m?.[1]) return m[1];
|
if (m?.[1]) return m[1];
|
||||||
|
|
||||||
// Legacy path while old bookmarks still land briefly before redirect.
|
|
||||||
const path = window.location.pathname.split('/').filter(Boolean);
|
|
||||||
if (path[0] === 'admin' && path[1] === 'org' && path[2]) {
|
|
||||||
return decodeURIComponent(path[2]);
|
|
||||||
}
|
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { session, loadSession, logout, redirectToLogin } from '$lib/session';
|
import { session, loadSession, logout, redirectToLogin } from '$lib/session';
|
||||||
import type { OrgMembership } from '$lib/api';
|
import type { OrgMembership } from '$lib/api';
|
||||||
import { adminPath, isOrgAdmin, resolveOrg } from '$lib/org';
|
|
||||||
import { orgRoleLabel } from '$lib/format';
|
import { orgRoleLabel } from '$lib/format';
|
||||||
import Icon from '$lib/components/Icon.svelte';
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
import ToastHost from '$lib/components/ToastHost.svelte';
|
import ToastHost from '$lib/components/ToastHost.svelte';
|
||||||
@@ -21,7 +20,6 @@
|
|||||||
|
|
||||||
const navItems = [
|
const navItems = [
|
||||||
{ key: 'overview', label: '概览', icon: 'overview' as const },
|
{ key: 'overview', label: '概览', icon: 'overview' as const },
|
||||||
{ key: 'usage', label: '用量', icon: 'overview' as const },
|
|
||||||
{ key: 'members', label: '成员', icon: 'members' as const },
|
{ key: 'members', label: '成员', icon: 'members' as const },
|
||||||
{ key: 'teams', label: '团队', icon: 'teams' as const },
|
{ key: 'teams', label: '团队', icon: 'teams' as const },
|
||||||
{ key: 'projects', label: '项目', icon: 'projects' as const },
|
{ key: 'projects', label: '项目', icon: 'projects' as const },
|
||||||
@@ -30,52 +28,68 @@
|
|||||||
{ key: 'skills', label: '技能', icon: 'roles' as const },
|
{ key: 'skills', label: '技能', icon: 'roles' as const },
|
||||||
{ key: 'roles', label: '角色', icon: 'roles' as const },
|
{ key: 'roles', label: '角色', icon: 'roles' as const },
|
||||||
{ key: 'feishu', label: '飞书', icon: 'feishu' as const },
|
{ key: 'feishu', label: '飞书', icon: 'feishu' as const },
|
||||||
{ key: 'capabilities', label: '能力', icon: 'provider' as const },
|
|
||||||
];
|
];
|
||||||
|
|
||||||
|
function isAdmin(org: OrgMembership): boolean {
|
||||||
|
const role = String(org.role ?? '').toUpperCase();
|
||||||
|
return role === 'OWNER' || role === 'ADMIN';
|
||||||
|
}
|
||||||
|
|
||||||
|
function orgSlugFromPath(): string | null {
|
||||||
|
const parts = page.url.pathname.split('/').filter(Boolean);
|
||||||
|
if (parts[0] === 'admin' && parts[1] === 'org' && parts[2]) {
|
||||||
|
return decodeURIComponent(parts[2]);
|
||||||
|
}
|
||||||
|
return null;
|
||||||
|
}
|
||||||
|
|
||||||
|
function isOnProjectRoute(): boolean {
|
||||||
|
const parts = page.url.pathname.split('/').filter(Boolean);
|
||||||
|
return parts[0] === 'admin' && parts[1] === 'org' && parts[3] === 'projects';
|
||||||
|
}
|
||||||
|
|
||||||
function memberships(): OrgMembership[] {
|
function memberships(): OrgMembership[] {
|
||||||
return $session.me?.organizations ?? [];
|
return $session.me?.organizations ?? [];
|
||||||
}
|
}
|
||||||
|
|
||||||
function adminOrgs(): OrgMembership[] {
|
function adminOrgs(): OrgMembership[] {
|
||||||
return memberships().filter((o) => isOrgAdmin(o));
|
return memberships().filter(isAdmin);
|
||||||
}
|
}
|
||||||
|
|
||||||
function currentOrg(): OrgMembership | null {
|
function currentOrg(): OrgMembership | null {
|
||||||
return resolveOrg($session.me, page.url.search);
|
const slug = orgSlugFromPath();
|
||||||
|
if (!slug) return null;
|
||||||
|
return memberships().find((o) => o.slug === slug) ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function isOnProjectRoute(): boolean {
|
function pickHomeOrg(): OrgMembership | null {
|
||||||
const parts = page.url.pathname.split('/').filter(Boolean);
|
const admin = adminOrgs()[0];
|
||||||
// /admin/projects or /admin/projects/:id
|
if (admin) return admin;
|
||||||
return parts[0] === 'admin' && parts[1] === 'projects';
|
return memberships()[0] ?? null;
|
||||||
}
|
}
|
||||||
|
|
||||||
function activeKey(): string {
|
function activeKey(): string {
|
||||||
const parts = page.url.pathname.split('/').filter(Boolean);
|
const parts = page.url.pathname.split('/').filter(Boolean);
|
||||||
if (parts[0] !== 'admin') return '';
|
if (parts[0] !== 'admin' || parts[1] !== 'org' || !parts[2]) return '';
|
||||||
// /admin → overview; /admin/usage → usage; /admin/projects/x → projects
|
return parts[3] ?? 'overview';
|
||||||
return parts[1] ?? 'overview';
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function navHref(key: string): string {
|
function navHref(key: string): string {
|
||||||
if (key === 'overview') return adminPath();
|
const slug = currentOrg()?.slug ?? pickHomeOrg()?.slug;
|
||||||
return adminPath(key);
|
if (!slug) return '/';
|
||||||
|
if (key === 'overview') return `/admin/org/${slug}`;
|
||||||
|
return `/admin/org/${slug}/${key}`;
|
||||||
}
|
}
|
||||||
|
|
||||||
function pageTitle(): string {
|
function pageTitle(): string {
|
||||||
const key = activeKey();
|
const key = activeKey();
|
||||||
if (key === 'overview' || key === '') return '概览';
|
if (key === 'overview' || key === '') return '概览';
|
||||||
if (key === 'sessions') return '会话详情';
|
|
||||||
return navItems.find((i) => i.key === key)?.label ?? '管理后台';
|
return navItems.find((i) => i.key === key)?.label ?? '管理后台';
|
||||||
}
|
}
|
||||||
|
|
||||||
function switchOrg(nextSlug: string) {
|
function switchOrg(nextSlug: string) {
|
||||||
if (!nextSlug || nextSlug === currentOrg()?.slug) return;
|
if (!nextSlug || nextSlug === currentOrg()?.slug) return;
|
||||||
// Path is tenancy-free; keep optional ?org= for local multi-membership debugging.
|
void goto(`/admin/org/${nextSlug}`);
|
||||||
const url = new URL(page.url.href);
|
|
||||||
url.searchParams.set('org', nextSlug);
|
|
||||||
void goto(`${url.pathname}${url.search}`, { replaceState: true });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function handleLogout(e: Event) {
|
function handleLogout(e: Event) {
|
||||||
@@ -98,23 +112,33 @@
|
|||||||
$effect(() => {
|
$effect(() => {
|
||||||
if ($session.loading || !$session.me) return;
|
if ($session.loading || !$session.me) return;
|
||||||
|
|
||||||
const path = page.url.pathname;
|
const slug = orgSlugFromPath();
|
||||||
// Legacy /admin/org/:slug… is handled by admin/org/[...path] page.
|
const matched = slug ? memberships().find((o) => o.slug === slug) : null;
|
||||||
|
|
||||||
const org = currentOrg();
|
// Org admins: route to their first admin org if none matched as admin.
|
||||||
const admins = adminOrgs();
|
const admins = adminOrgs();
|
||||||
|
if (matched && isAdmin(matched)) {
|
||||||
if (org && isOrgAdmin(org)) {
|
|
||||||
redirecting = false;
|
redirecting = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
if (!matched && admins.length > 0) {
|
||||||
|
const target = `/admin/org/${admins[0].slug}`;
|
||||||
|
if (page.url.pathname !== target && !page.url.pathname.startsWith(`${target}/`)) {
|
||||||
|
redirecting = true;
|
||||||
|
void goto(target, { replaceState: true });
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Member only: allow project routes; bounce admin-only surfaces to projects.
|
// Members (non-admin): project pages are open to project MANAGE holders;
|
||||||
if (org && !isOrgAdmin(org)) {
|
// the org overview and other admin-only surfaces are not for them.
|
||||||
|
if (matched && !isAdmin(matched)) {
|
||||||
redirecting = false;
|
redirecting = false;
|
||||||
if (!isOnProjectRoute()) {
|
const parts = page.url.pathname.split('/').filter(Boolean);
|
||||||
const target = adminPath('projects');
|
const onOverview = parts.length === 3; // /admin/org/:slug
|
||||||
if (path !== target) {
|
if (onOverview) {
|
||||||
|
const target = `/admin/org/${matched.slug}/projects`;
|
||||||
|
if (page.url.pathname !== target) {
|
||||||
redirecting = true;
|
redirecting = true;
|
||||||
void goto(target, { replaceState: true });
|
void goto(target, { replaceState: true });
|
||||||
}
|
}
|
||||||
@@ -122,11 +146,12 @@
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// No org resolved but user has memberships → land on first org's projects/overview via resolveOrg next tick
|
// No matched org and no admin orgs: route a member to their first org's
|
||||||
if (!org && memberships().length > 0) {
|
// projects page so they can reach project MANAGE surfaces.
|
||||||
const home = admins[0] ?? memberships()[0]!;
|
if (!matched && memberships().length > 0) {
|
||||||
const target = isOrgAdmin(home) ? adminPath() : adminPath('projects');
|
const home = memberships()[0];
|
||||||
if (path !== target && !path.startsWith(`${target}/`)) {
|
const target = `/admin/org/${home.slug}/projects`;
|
||||||
|
if (page.url.pathname !== target && !page.url.pathname.startsWith(`${target}/`)) {
|
||||||
redirecting = true;
|
redirecting = true;
|
||||||
void goto(target, { replaceState: true });
|
void goto(target, { replaceState: true });
|
||||||
}
|
}
|
||||||
@@ -147,14 +172,14 @@
|
|||||||
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
|
d="M4 12a8 8 0 018-8V0C5.373 0 0 5.373 0 12h4zm2 5.291A7.962 7.962 0 014 12H0c0 3.042 1.135 5.824 3 7.938l3-2.647z"
|
||||||
></path>
|
></path>
|
||||||
</svg>
|
</svg>
|
||||||
<p class="text-sm">加载中…</p>
|
<p class="text-sm">{redirecting ? '正在进入组织…' : '正在加载会话…'}</p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if $session.error}
|
{:else if $session.error}
|
||||||
<div class="saas-status-panel">
|
<div class="saas-status-panel">
|
||||||
<div class="saas-status-card">
|
<div class="saas-status-card">
|
||||||
<div
|
<div
|
||||||
class="mx-auto mb-3 flex h-12 w-12 items-center justify-center border border-error-200 bg-error-50 text-error-700"
|
class="mx-auto mb-4 flex h-12 w-12 items-center justify-center border border-error-300 bg-error-100 text-error-700 font-bold"
|
||||||
>
|
>
|
||||||
!
|
!
|
||||||
</div>
|
</div>
|
||||||
@@ -167,7 +192,7 @@
|
|||||||
<div class="saas-status-panel">
|
<div class="saas-status-panel">
|
||||||
<div class="saas-status-card">
|
<div class="saas-status-card">
|
||||||
<div
|
<div
|
||||||
class="mx-auto mb-4 flex h-12 w-12 items-center justify-center border border-primary-700 bg-primary-600 text-sm font-bold text-white"
|
class="mx-auto mb-5 flex h-12 w-12 items-center justify-center border border-primary-700 bg-primary-600 text-white font-bold"
|
||||||
>
|
>
|
||||||
CPH
|
CPH
|
||||||
</div>
|
</div>
|
||||||
@@ -176,7 +201,7 @@
|
|||||||
<button class="saas-btn-primary w-full" onclick={() => redirectToLogin()}>使用飞书登录</button>
|
<button class="saas-btn-primary w-full" onclick={() => redirectToLogin()}>使用飞书登录</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if currentOrg() && isOrgAdmin(currentOrg()!)}
|
{:else if currentOrg() && isAdmin(currentOrg()!)}
|
||||||
{@const org = currentOrg()!}
|
{@const org = currentOrg()!}
|
||||||
{@const me = $session.me!}
|
{@const me = $session.me!}
|
||||||
<div class="saas-shell">
|
<div class="saas-shell">
|
||||||
@@ -201,19 +226,17 @@
|
|||||||
</div>
|
</div>
|
||||||
<div class="min-w-0">
|
<div class="min-w-0">
|
||||||
<div class="truncate text-sm font-semibold text-surface-900">组织后台</div>
|
<div class="truncate text-sm font-semibold text-surface-900">组织后台</div>
|
||||||
<div class="truncate text-xs text-surface-600">{org.name}</div>
|
<div class="truncate text-xs text-surface-600">Curriculum Hub</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if me.organizations.length > 1}
|
<div class="px-3 pb-3">
|
||||||
<div class="px-3 pb-3">
|
<div class="mb-1.5 flex items-center gap-1.5 text-xs font-medium text-surface-700">
|
||||||
<div class="mb-1.5 flex items-center gap-1.5 text-xs font-medium text-surface-700">
|
<Icon name="org" class="h-3.5 w-3.5" />
|
||||||
<Icon name="org" class="h-3.5 w-3.5" />
|
组织
|
||||||
组织
|
|
||||||
</div>
|
|
||||||
<SelectField items={orgSelectItems(me.organizations)} value={org.slug} onchange={switchOrg} />
|
|
||||||
</div>
|
</div>
|
||||||
{/if}
|
<SelectField items={orgSelectItems(me.organizations)} value={org.slug} onchange={switchOrg} />
|
||||||
|
</div>
|
||||||
|
|
||||||
<nav class="flex-1 space-y-0.5 overflow-y-auto px-2 pb-3">
|
<nav class="flex-1 space-y-0.5 overflow-y-auto px-2 pb-3">
|
||||||
<p class="px-3 pb-1 pt-2 text-[11px] font-semibold uppercase tracking-wider text-surface-600">工作台</p>
|
<p class="px-3 pb-1 pt-2 text-[11px] font-semibold uppercase tracking-wider text-surface-600">工作台</p>
|
||||||
@@ -283,13 +306,13 @@
|
|||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if currentOrg() && !isOrgAdmin(currentOrg()!) && isOnProjectRoute()}
|
{:else if currentOrg() && !isAdmin(currentOrg()!) && isOnProjectRoute()}
|
||||||
{@const org = currentOrg()!}
|
{@const org = currentOrg()!}
|
||||||
{@const me = $session.me!}
|
{@const me = $session.me!}
|
||||||
<div class="saas-shell">
|
<div class="saas-shell">
|
||||||
<div class="saas-main">
|
<div class="saas-main">
|
||||||
<header class="saas-topbar">
|
<header class="saas-topbar">
|
||||||
<a href={adminPath('projects')} class="saas-btn-ghost px-2!" aria-label="返回项目列表">
|
<a href={`/admin/org/${org.slug}/projects`} class="saas-btn-ghost px-2!" aria-label="返回项目列表">
|
||||||
<Icon name="menu" class="h-5 w-5" />
|
<Icon name="menu" class="h-5 w-5" />
|
||||||
</a>
|
</a>
|
||||||
<div class="min-w-0">
|
<div class="min-w-0">
|
||||||
@@ -318,7 +341,7 @@
|
|||||||
</main>
|
</main>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if currentOrg() && !isOrgAdmin(currentOrg()!)}
|
{:else if currentOrg() && !isAdmin(currentOrg()!)}
|
||||||
{@const denied = currentOrg()!}
|
{@const denied = currentOrg()!}
|
||||||
<div class="saas-status-panel">
|
<div class="saas-status-panel">
|
||||||
<div class="saas-status-card">
|
<div class="saas-status-card">
|
||||||
@@ -327,7 +350,7 @@
|
|||||||
组织 <strong>{denied.name}</strong>(/{denied.slug})中你的角色是
|
组织 <strong>{denied.name}</strong>(/{denied.slug})中你的角色是
|
||||||
<span class="saas-badge-neutral mx-1">{orgRoleLabel(denied.role)}</span>。普通成员仅可访问自己有授权的项目。
|
<span class="saas-badge-neutral mx-1">{orgRoleLabel(denied.role)}</span>。普通成员仅可访问自己有授权的项目。
|
||||||
</p>
|
</p>
|
||||||
<a class="saas-btn-primary" href={adminPath('projects')}>查看我的项目</a>
|
<a class="saas-btn-primary" href={`/admin/org/${denied.slug}/projects`}>查看我的项目</a>
|
||||||
{#if memberships().length > 1}
|
{#if memberships().length > 1}
|
||||||
<p class="saas-label text-left mb-1.5 mt-3">切换到其他组织</p>
|
<p class="saas-label text-left mb-1.5 mt-3">切换到其他组织</p>
|
||||||
<div class="mb-4">
|
<div class="mb-4">
|
||||||
@@ -338,14 +361,14 @@
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
{:else if memberships().length > 0}
|
{:else if memberships().length > 0}
|
||||||
{@const denied = resolveOrg($session.me) ?? memberships()[0]!}
|
{@const denied = pickHomeOrg()!}
|
||||||
<div class="saas-status-panel">
|
<div class="saas-status-panel">
|
||||||
<div class="saas-status-card">
|
<div class="saas-status-card">
|
||||||
<h2 class="mb-2 text-lg font-semibold">正在跳转…</h2>
|
<h2 class="mb-2 text-lg font-semibold">正在跳转…</h2>
|
||||||
<p class="mb-5 text-sm text-surface-700">
|
<p class="mb-5 text-sm text-surface-700">
|
||||||
即将进入 <strong>{denied.name}</strong>(/{denied.slug})的项目。
|
即将进入 <strong>{denied.name}</strong>(/{denied.slug})的项目。
|
||||||
</p>
|
</p>
|
||||||
<a class="saas-btn-primary" href={adminPath('projects')}>立即进入</a>
|
<a class="saas-btn-primary" href={`/admin/org/${denied.slug}/projects`}>立即进入</a>
|
||||||
<button class="saas-btn-ghost mt-3" onclick={handleLogout}>退出登录</button>
|
<button class="saas-btn-ghost mt-3" onclick={handleLogout}>退出登录</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -11,7 +11,7 @@
|
|||||||
return r === 'OWNER' || r === 'ADMIN';
|
return r === 'OWNER' || r === 'ADMIN';
|
||||||
});
|
});
|
||||||
const target = admin ?? me.organizations[0];
|
const target = admin ?? me.organizations[0];
|
||||||
return target ? `/admin` : null;
|
return target ? `/admin/org/${target.slug}` : null;
|
||||||
}
|
}
|
||||||
|
|
||||||
onMount(() => {
|
onMount(() => {
|
||||||
|
|||||||
@@ -1,205 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { page } from '$app/state';
|
|
||||||
import { api, type CapabilityConnection } from '$lib/api';
|
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import { fmtDate } from '$lib/format';
|
|
||||||
import { Label } from 'bits-ui';
|
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
|
|
||||||
const KNOWN_CAPABILITIES = [
|
|
||||||
{ id: 'pdf_to_md_bundle', label: 'PDF → Markdown', description: '将 PDF 转换为带图片的 Markdown bundle(阿里云文档智能,含公式 LaTeX 识别)' },
|
|
||||||
{ id: 'audio_video_to_text', label: '音视频 → 文本', description: '将音频/视频转写为文本(阿里云文档智能,按秒计费)' },
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
let connections = $state<Map<string, CapabilityConnection>>(new Map());
|
|
||||||
let loading = $state(true);
|
|
||||||
let error = $state<string | null>(null);
|
|
||||||
|
|
||||||
let editingCap = $state<string | null>(null);
|
|
||||||
let accessKeyId = $state('');
|
|
||||||
let accessKeySecret = $state('');
|
|
||||||
let endpoint = $state('docmind-api.cn-hangzhou.aliyuncs.com');
|
|
||||||
let saving = $state(false);
|
|
||||||
let disabling = $state<string | null>(null);
|
|
||||||
|
|
||||||
async function load() {
|
|
||||||
loading = true;
|
|
||||||
error = null;
|
|
||||||
try {
|
|
||||||
const res = await api.capabilityConnections(slug);
|
|
||||||
connections = new Map(res.connections.map((c) => [c.capabilityId, c]));
|
|
||||||
} catch (err) {
|
|
||||||
error = err instanceof Error ? err.message : String(err);
|
|
||||||
} finally {
|
|
||||||
loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function startEdit(capId: string) {
|
|
||||||
editingCap = capId;
|
|
||||||
accessKeyId = '';
|
|
||||||
accessKeySecret = '';
|
|
||||||
endpoint = 'docmind-api.cn-hangzhou.aliyuncs.com';
|
|
||||||
}
|
|
||||||
|
|
||||||
function cancelEdit() {
|
|
||||||
editingCap = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function save(capId: string) {
|
|
||||||
if (accessKeyId.trim() === '' || accessKeySecret.trim() === '' || endpoint.trim() === '') {
|
|
||||||
toastError('AccessKey ID、AccessKey Secret、Endpoint 均为必填');
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
saving = true;
|
|
||||||
try {
|
|
||||||
const result = await api.rotateCapabilityConnection(slug, capId, {
|
|
||||||
accessKeyId: accessKeyId.trim(),
|
|
||||||
accessKeySecret: accessKeySecret.trim(),
|
|
||||||
endpoint: endpoint.trim(),
|
|
||||||
});
|
|
||||||
connections.set(capId, result);
|
|
||||||
connections = new Map(connections);
|
|
||||||
editingCap = null;
|
|
||||||
toastSuccess('能力凭据已保存');
|
|
||||||
} catch (err) {
|
|
||||||
toastError(err instanceof Error ? err.message : String(err));
|
|
||||||
} finally {
|
|
||||||
saving = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function disable(capId: string) {
|
|
||||||
if (!confirm('停用后该能力将不可用,确定停用?')) return;
|
|
||||||
disabling = capId;
|
|
||||||
try {
|
|
||||||
const result = await api.disableCapabilityConnection(slug, capId);
|
|
||||||
connections.set(capId, result);
|
|
||||||
connections = new Map(connections);
|
|
||||||
toastSuccess('已停用能力连接');
|
|
||||||
} catch (err) {
|
|
||||||
toastError(err instanceof Error ? err.message : String(err));
|
|
||||||
} finally {
|
|
||||||
disabling = null;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function statusBadge(status: string): string {
|
|
||||||
if (status === 'ACTIVE') return 'saas-badge-primary';
|
|
||||||
if (status === 'DISABLED') return 'saas-badge-error';
|
|
||||||
return 'saas-badge-muted';
|
|
||||||
}
|
|
||||||
|
|
||||||
function statusLabel(status: string): string {
|
|
||||||
if (status === 'ACTIVE') return '已启用';
|
|
||||||
if (status === 'DISABLED') return '已停用';
|
|
||||||
return '草稿';
|
|
||||||
}
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (slug) load();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<PageHeader
|
|
||||||
title="外部能力"
|
|
||||||
description="管理文档/媒体转换服务的组织级凭据(ADR-0027)。凭据按组织隔离、版本化信封存储,缺失或校验失败即 fail-closed。"
|
|
||||||
/>
|
|
||||||
|
|
||||||
{#if loading}
|
|
||||||
<LoadingState />
|
|
||||||
{:else if error}
|
|
||||||
<ErrorBanner message={error} onretry={load} />
|
|
||||||
{:else}
|
|
||||||
<div class="space-y-6">
|
|
||||||
{#each KNOWN_CAPABILITIES as cap}
|
|
||||||
{@const conn = connections.get(cap.id)}
|
|
||||||
<div class="saas-card-pad">
|
|
||||||
<div class="mb-3 flex items-start justify-between gap-3">
|
|
||||||
<div>
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<h3 class="saas-section-title">{cap.label}</h3>
|
|
||||||
{#if conn}
|
|
||||||
<span class={statusBadge(conn.status)}>{statusLabel(conn.status)}</span>
|
|
||||||
{:else}
|
|
||||||
<span class="saas-badge-muted">未配置</span>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
<p class="saas-muted mt-1 text-sm">{cap.description}</p>
|
|
||||||
<p class="mt-0.5 font-mono text-xs text-surface-500">{cap.id}</p>
|
|
||||||
</div>
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
{#if conn?.status === 'ACTIVE'}
|
|
||||||
<button
|
|
||||||
class="saas-btn-ghost text-sm"
|
|
||||||
onclick={() => disable(cap.id)}
|
|
||||||
disabled={disabling === cap.id}
|
|
||||||
>
|
|
||||||
{disabling === cap.id ? '停用中…' : '停用'}
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
<button
|
|
||||||
class="saas-btn-primary text-sm"
|
|
||||||
onclick={() => startEdit(cap.id)}
|
|
||||||
disabled={editingCap === cap.id}
|
|
||||||
>
|
|
||||||
{conn ? '轮换凭据' : '配置凭据'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if conn}
|
|
||||||
<dl class="space-y-1.5 text-sm text-surface-700">
|
|
||||||
<div class="flex justify-between">
|
|
||||||
<dt class="text-surface-500">版本</dt>
|
|
||||||
<dd class="font-mono">{conn.activeVersion ?? '—'}</dd>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-between">
|
|
||||||
<dt class="text-surface-500">密钥 ID</dt>
|
|
||||||
<dd class="font-mono text-xs">{conn.keyId ?? '—'}</dd>
|
|
||||||
</div>
|
|
||||||
<div class="flex justify-between">
|
|
||||||
<dt class="text-surface-500">更新时间</dt>
|
|
||||||
<dd>{fmtDate(conn.updatedAt)}</dd>
|
|
||||||
</div>
|
|
||||||
</dl>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if editingCap === cap.id}
|
|
||||||
<div class="mt-4 border-t border-surface-100 pt-4">
|
|
||||||
<p class="saas-muted mb-3 text-sm">
|
|
||||||
阿里云 RAM 用户的 AccessKey。密钥仅写入新版本,旧版本归档。
|
|
||||||
</p>
|
|
||||||
<div class="grid gap-4">
|
|
||||||
<div>
|
|
||||||
<Label.Root class="saas-label" for="ak-id-{cap.id}">AccessKey ID</Label.Root>
|
|
||||||
<input id="ak-id-{cap.id}" class="saas-input font-mono text-sm" bind:value={accessKeyId} />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<Label.Root class="saas-label" for="ak-secret-{cap.id}">AccessKey Secret</Label.Root>
|
|
||||||
<input id="ak-secret-{cap.id}" class="saas-input" type="password" bind:value={accessKeySecret} />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<Label.Root class="saas-label" for="endpoint-{cap.id}">Endpoint</Label.Root>
|
|
||||||
<input id="endpoint-{cap.id}" class="saas-input font-mono text-sm" bind:value={endpoint} />
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
<div class="mt-4 flex items-center justify-end gap-3">
|
|
||||||
<button class="saas-btn-ghost" onclick={cancelEdit} disabled={saving}>取消</button>
|
|
||||||
<button class="saas-btn-primary" onclick={() => save(cap.id)} disabled={saving}>
|
|
||||||
{saving ? '保存中…' : '保存'}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* Legacy bookmarks: /admin/org/:slug[/...] → /admin[/...]
|
|
||||||
* Tenancy lives on the silo host, not the path.
|
|
||||||
*/
|
|
||||||
import { onMount } from 'svelte';
|
|
||||||
import { goto } from '$app/navigation';
|
|
||||||
import { page } from '$app/state';
|
|
||||||
|
|
||||||
onMount(() => {
|
|
||||||
const raw = page.params.path ?? '';
|
|
||||||
const segments = raw.split('/').filter(Boolean);
|
|
||||||
// Drop the old org slug (first segment) when present.
|
|
||||||
const rest = segments.length > 0 ? segments.slice(1).join('/') : '';
|
|
||||||
const target = rest === '' ? '/admin' : `/admin/${rest}`;
|
|
||||||
const q = page.url.search;
|
|
||||||
void goto(`${target}${q}`, { replaceState: true });
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="saas-status-panel">
|
|
||||||
<p class="text-sm text-surface-600">正在重定向到新地址…</p>
|
|
||||||
</div>
|
|
||||||
+4
-47
@@ -2,7 +2,6 @@
|
|||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type OrgMembership } from '$lib/api';
|
import { api, type OrgMembership } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
import { session } from '$lib/session';
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import { fmtCost, fmtNum, orgRoleLabel } from '$lib/format';
|
import { fmtCost, fmtNum, orgRoleLabel } from '$lib/format';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import StatCard from '$lib/components/StatCard.svelte';
|
import StatCard from '$lib/components/StatCard.svelte';
|
||||||
@@ -11,8 +10,7 @@
|
|||||||
import SwitchControl from '$lib/components/SwitchControl.svelte';
|
import SwitchControl from '$lib/components/SwitchControl.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const orgFromSession = $derived(resolveOrg($session.me, page.url.search));
|
let orgSlug = $derived(page.params.slug ?? '');
|
||||||
let orgSlug = $derived(orgFromSession?.slug ?? '');
|
|
||||||
let org = $derived($session.me?.organizations.find((o) => o.slug === orgSlug) as OrgMembership | undefined);
|
let org = $derived($session.me?.organizations.find((o) => o.slug === orgSlug) as OrgMembership | undefined);
|
||||||
|
|
||||||
let settings = $state<{ membersCanCreateProjects: boolean } | null>(null);
|
let settings = $state<{ membersCanCreateProjects: boolean } | null>(null);
|
||||||
@@ -96,56 +94,19 @@
|
|||||||
<div class="mb-4 flex items-end justify-between gap-3">
|
<div class="mb-4 flex items-end justify-between gap-3">
|
||||||
<div>
|
<div>
|
||||||
<h2 class="saas-section-title">用量概览</h2>
|
<h2 class="saas-section-title">用量概览</h2>
|
||||||
<p class="saas-muted">totals 含全部 UsageFact;分账明细见用量页。</p>
|
<p class="saas-muted">全组织智能体运行汇总</p>
|
||||||
</div>
|
</div>
|
||||||
<a class="saas-btn-secondary py-1.5! text-sm" href={`/admin/usage`}>完整用量报告</a>
|
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div class="mb-6 grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
<div class="mb-6 grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
||||||
<StatCard label="运行总数" value={fmtNum(usage.totals.runCount)} />
|
<StatCard label="运行总数" value={fmtNum(usage.totals.runCount)} />
|
||||||
<StatCard label="有成本运行" value={fmtNum(usage.totals.runsWithCost)} />
|
<StatCard label="有成本运行" value={fmtNum(usage.totals.runsWithCost)} />
|
||||||
<StatCard label="无成本运行" value={fmtNum(usage.totals.runsWithoutCost)} hint="未知 ≠ $0" />
|
<StatCard label="无成本运行" value={fmtNum(usage.totals.runsWithoutCost)} />
|
||||||
<StatCard label="输入 tokens" value={fmtNum(usage.totals.inputTokens)} />
|
<StatCard label="输入 tokens" value={fmtNum(usage.totals.inputTokens)} />
|
||||||
<StatCard label="输出 tokens" value={fmtNum(usage.totals.outputTokens)} />
|
<StatCard label="输出 tokens" value={fmtNum(usage.totals.outputTokens)} />
|
||||||
<StatCard label="成本 (USD)" value={fmtCost(usage.totals.costUsd)} />
|
<StatCard label="成本 (USD)" value={fmtCost(usage.totals.costUsd)} />
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if usage.breakdown.length > 0}
|
|
||||||
<div class="saas-card overflow-hidden mb-6">
|
|
||||||
<div class="border-b border-surface-200 px-5 py-3 flex items-center justify-between gap-3">
|
|
||||||
<div>
|
|
||||||
<h3 class="text-sm font-semibold text-surface-800">消费来源(Top)</h3>
|
|
||||||
<p class="saas-muted text-xs">模型完成 vs 外部能力,按成本降序前 5</p>
|
|
||||||
</div>
|
|
||||||
<a class="text-sm text-primary-700 hover:underline" href={`/admin/usage`}>查看全部分账</a>
|
|
||||||
</div>
|
|
||||||
<div class="overflow-x-auto">
|
|
||||||
<table class="data-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>类型</th>
|
|
||||||
<th>供应方</th>
|
|
||||||
<th>模型 / 能力</th>
|
|
||||||
<th>次数</th>
|
|
||||||
<th>成本</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{#each [...usage.breakdown].sort((a, b) => (b.costUsd ?? -1) - (a.costUsd ?? -1)).slice(0, 5) as row}
|
|
||||||
<tr>
|
|
||||||
<td class="text-sm">{row.kind === 'external_capability' ? '外部能力' : row.kind === 'model_completion' ? '模型完成' : row.kind}</td>
|
|
||||||
<td class="font-mono text-xs">{row.provider}</td>
|
|
||||||
<td class="font-mono text-xs">{row.capabilityId ?? row.model ?? '—'}</td>
|
|
||||||
<td class="tabular-nums">{fmtNum(row.factCount)}</td>
|
|
||||||
<td class="tabular-nums">{fmtCost(row.costUsd)}</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<div class="saas-card overflow-hidden">
|
<div class="saas-card overflow-hidden">
|
||||||
<div class="border-b border-surface-200 px-5 py-3">
|
<div class="border-b border-surface-200 px-5 py-3">
|
||||||
<h3 class="text-sm font-semibold text-surface-800">按项目用量</h3>
|
<h3 class="text-sm font-semibold text-surface-800">按项目用量</h3>
|
||||||
@@ -168,11 +129,7 @@
|
|||||||
<tbody>
|
<tbody>
|
||||||
{#each usage.projects as p}
|
{#each usage.projects as p}
|
||||||
<tr>
|
<tr>
|
||||||
<td class="font-medium">
|
<td class="font-medium">{p.projectName}</td>
|
||||||
<a class="hover:text-primary-700 hover:underline" href={`/admin/projects/${p.projectId}`}>
|
|
||||||
{p.projectName}
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
<td class="tabular-nums">{fmtNum(p.runCount)}</td>
|
<td class="tabular-nums">{fmtNum(p.runCount)}</td>
|
||||||
<td class="tabular-nums text-surface-600">{fmtNum(p.inputTokens)} / {fmtNum(p.outputTokens)}</td>
|
<td class="tabular-nums text-surface-600">{fmtNum(p.inputTokens)} / {fmtNum(p.outputTokens)}</td>
|
||||||
<td class="tabular-nums">{fmtCost(p.costUsd)}</td>
|
<td class="tabular-nums">{fmtCost(p.costUsd)}</td>
|
||||||
+1
-4
@@ -1,16 +1,13 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type CapacityDimension, type CapacityDimensionRow, type CapacityPolicyView } from '$lib/api';
|
import { api, type CapacityDimension, type CapacityDimensionRow, type CapacityPolicyView } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
import EmptyState from '$lib/components/EmptyState.svelte';
|
import EmptyState from '$lib/components/EmptyState.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
|
|
||||||
// Friendlier, user-facing labels. No spec jargon (墙钟 → 运行时长, etc.).
|
// Friendlier, user-facing labels. No spec jargon (墙钟 → 运行时长, etc.).
|
||||||
const DIMENSION_LABELS: Record<CapacityDimension, string> = {
|
const DIMENSION_LABELS: Record<CapacityDimension, string> = {
|
||||||
+1
-4
@@ -1,8 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type FeishuApplicationConnection } from '$lib/api';
|
import { api, type FeishuApplicationConnection } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import { fmtDate } from '$lib/format';
|
import { fmtDate } from '$lib/format';
|
||||||
import { Label } from 'bits-ui';
|
import { Label } from 'bits-ui';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
@@ -10,8 +8,7 @@
|
|||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
|
|
||||||
let connection = $state<FeishuApplicationConnection | null>(null);
|
let connection = $state<FeishuApplicationConnection | null>(null);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
+1
-4
@@ -1,8 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type OrgMember } from '$lib/api';
|
import { api, type OrgMember } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import { fmtDate } from '$lib/format';
|
import { fmtDate } from '$lib/format';
|
||||||
import { ORG_ROLES, ORG_ROLE_LABELS, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
import { ORG_ROLES, ORG_ROLE_LABELS, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
@@ -12,8 +10,7 @@
|
|||||||
import SelectField from '$lib/components/SelectField.svelte';
|
import SelectField from '$lib/components/SelectField.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
const roleItems = ORG_ROLES.map((r) => ({ value: r, label: ORG_ROLE_LABELS[r] }));
|
const roleItems = ORG_ROLES.map((r) => ({ value: r, label: ORG_ROLE_LABELS[r] }));
|
||||||
const permHint = Object.values(PERMISSION_ROLE_LABELS).join(' / ');
|
const permHint = Object.values(PERMISSION_ROLE_LABELS).join(' / ');
|
||||||
|
|
||||||
+4
-5
@@ -2,7 +2,6 @@
|
|||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type ExplorerData, type ExplorerFolder, type ExplorerProject, type OrgMembership } from '$lib/api';
|
import { api, type ExplorerData, type ExplorerFolder, type ExplorerProject, type OrgMembership } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
import { session } from '$lib/session';
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import FolderTree from '$lib/components/FolderTree.svelte';
|
import FolderTree from '$lib/components/FolderTree.svelte';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
@@ -14,8 +13,8 @@
|
|||||||
import { fmtDate } from '$lib/format';
|
import { fmtDate } from '$lib/format';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
const org = $derived(($session.me?.organizations.find((o) => o.slug === slug) as OrgMembership | undefined) ?? null);
|
||||||
const isAdmin = $derived(!!org && (org.role === 'OWNER' || org.role === 'ADMIN'));
|
const isAdmin = $derived(!!org && (org.role === 'OWNER' || org.role === 'ADMIN'));
|
||||||
|
|
||||||
let data = $state<ExplorerData | null>(null);
|
let data = $state<ExplorerData | null>(null);
|
||||||
@@ -88,7 +87,7 @@
|
|||||||
projectName = '';
|
projectName = '';
|
||||||
projectFolder = '';
|
projectFolder = '';
|
||||||
showProjectModal = false;
|
showProjectModal = false;
|
||||||
window.location.href = `/admin/projects/${res.id}`;
|
window.location.href = `/admin/org/${slug}/projects/${res.id}`;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toastError(err instanceof Error ? err.message : String(err));
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
}
|
}
|
||||||
@@ -208,7 +207,7 @@
|
|||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
{#each myProjects as p}
|
{#each myProjects as p}
|
||||||
<tr class="cursor-pointer" onclick={() => (window.location.href = `/admin/projects/${p.id}`)}>
|
<tr class="cursor-pointer" onclick={() => (window.location.href = `/admin/org/${slug}/projects/${p.id}`)}>
|
||||||
<td class="font-medium">{p.name}</td>
|
<td class="font-medium">{p.name}</td>
|
||||||
<td class="font-mono text-xs">{p.binding ? `群 ${p.binding.chatId}` : '—'}</td>
|
<td class="font-mono text-xs">{p.binding ? `群 ${p.binding.chatId}` : '—'}</td>
|
||||||
<td class="text-surface-700">{fmtDate(p.createdAt)}</td>
|
<td class="text-surface-700">{fmtDate(p.createdAt)}</td>
|
||||||
+5
-89
@@ -7,19 +7,8 @@
|
|||||||
type TeamRow,
|
type TeamRow,
|
||||||
type SessionSummary,
|
type SessionSummary,
|
||||||
type ExplorerData,
|
type ExplorerData,
|
||||||
type ProjectUsageReport,
|
|
||||||
} from '$lib/api';
|
} from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
import { fmtDate, permissionRoleLabel } from '$lib/format';
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import {
|
|
||||||
fmtCost,
|
|
||||||
fmtDate,
|
|
||||||
fmtNum,
|
|
||||||
fmtQuantity,
|
|
||||||
fmtTokens,
|
|
||||||
permissionRoleLabel,
|
|
||||||
usageKindLabel,
|
|
||||||
} from '$lib/format';
|
|
||||||
import { PERMISSION_ROLES, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
import { PERMISSION_ROLES, PERMISSION_ROLE_LABELS } from '$lib/constants';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
@@ -29,8 +18,7 @@
|
|||||||
import Icon from '$lib/components/Icon.svelte';
|
import Icon from '$lib/components/Icon.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
const projectId = $derived(page.params.projectId ?? '');
|
const projectId = $derived(page.params.projectId ?? '');
|
||||||
const roleItems = PERMISSION_ROLES.map((r) => ({ value: r, label: PERMISSION_ROLE_LABELS[r] }));
|
const roleItems = PERMISSION_ROLES.map((r) => ({ value: r, label: PERMISSION_ROLE_LABELS[r] }));
|
||||||
const roleChain = `${PERMISSION_ROLE_LABELS.READ} ⊂ ${PERMISSION_ROLE_LABELS.EDIT} ⊂ ${PERMISSION_ROLE_LABELS.MANAGE}`;
|
const roleChain = `${PERMISSION_ROLE_LABELS.READ} ⊂ ${PERMISSION_ROLE_LABELS.EDIT} ⊂ ${PERMISSION_ROLE_LABELS.MANAGE}`;
|
||||||
@@ -38,7 +26,6 @@
|
|||||||
let proj = $state<ProjectDetail | null>(null);
|
let proj = $state<ProjectDetail | null>(null);
|
||||||
let access = $state<TeamAccessEntry[]>([]);
|
let access = $state<TeamAccessEntry[]>([]);
|
||||||
let sessions = $state<SessionSummary[]>([]);
|
let sessions = $state<SessionSummary[]>([]);
|
||||||
let projectUsage = $state<ProjectUsageReport | null>(null);
|
|
||||||
let teams = $state<TeamRow[]>([]);
|
let teams = $state<TeamRow[]>([]);
|
||||||
let explorer = $state<ExplorerData | null>(null);
|
let explorer = $state<ExplorerData | null>(null);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
@@ -62,18 +49,14 @@
|
|||||||
// Team list is needed for grant UI whenever the actor has project MANAGE
|
// Team list is needed for grant UI whenever the actor has project MANAGE
|
||||||
// (org admin or member). Sessions/explorer stay org-admin oversight only.
|
// (org admin or member). Sessions/explorer stay org-admin oversight only.
|
||||||
const needTeams = p.actorIsOrgAdmin === true || p.actorCanManageProject === true;
|
const needTeams = p.actorIsOrgAdmin === true || p.actorCanManageProject === true;
|
||||||
const [s, t, e, u] = await Promise.all([
|
const [s, t, e] = await Promise.all([
|
||||||
p.actorIsOrgAdmin ? api.sessions(slug, projectId) : Promise.resolve({ sessions: [] as SessionSummary[] }),
|
p.actorIsOrgAdmin ? api.sessions(slug, projectId) : Promise.resolve({ sessions: [] as SessionSummary[] }),
|
||||||
needTeams ? api.teams(slug) : Promise.resolve({ teams: [] as TeamRow[] }),
|
needTeams ? api.teams(slug) : Promise.resolve({ teams: [] as TeamRow[] }),
|
||||||
p.actorIsOrgAdmin ? api.explorer(slug) : Promise.resolve(null as ExplorerData | null),
|
p.actorIsOrgAdmin ? api.explorer(slug) : Promise.resolve(null as ExplorerData | null),
|
||||||
p.actorIsOrgAdmin
|
|
||||||
? api.projectUsage(slug, projectId)
|
|
||||||
: Promise.resolve(null as ProjectUsageReport | null),
|
|
||||||
]);
|
]);
|
||||||
sessions = s.sessions;
|
sessions = s.sessions;
|
||||||
teams = t.teams;
|
teams = t.teams;
|
||||||
explorer = e;
|
explorer = e;
|
||||||
projectUsage = u;
|
|
||||||
if (p.actorIsOrgAdmin) {
|
if (p.actorIsOrgAdmin) {
|
||||||
moveFolder = p.folderId ?? '';
|
moveFolder = p.folderId ?? '';
|
||||||
}
|
}
|
||||||
@@ -112,7 +95,7 @@
|
|||||||
if (!confirm(`归档项目 ${proj?.name}?`)) return;
|
if (!confirm(`归档项目 ${proj?.name}?`)) return;
|
||||||
try {
|
try {
|
||||||
await api.archiveProject(slug, projectId);
|
await api.archiveProject(slug, projectId);
|
||||||
window.location.href = `/admin/projects`;
|
window.location.href = `/admin/org/${slug}/projects`;
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
toastError(err instanceof Error ? err.message : String(err));
|
toastError(err instanceof Error ? err.message : String(err));
|
||||||
}
|
}
|
||||||
@@ -173,7 +156,7 @@
|
|||||||
{:else if proj}
|
{:else if proj}
|
||||||
<div class="mb-2">
|
<div class="mb-2">
|
||||||
<a
|
<a
|
||||||
href={`/admin/projects`}
|
href={`/admin/org/${slug}/projects`}
|
||||||
class="inline-flex items-center gap-1 text-sm text-surface-700 hover:text-primary-600"
|
class="inline-flex items-center gap-1 text-sm text-surface-700 hover:text-primary-600"
|
||||||
>
|
>
|
||||||
<Icon name="arrow-left" class="h-4 w-4" />
|
<Icon name="arrow-left" class="h-4 w-4" />
|
||||||
@@ -286,67 +269,9 @@
|
|||||||
</div>
|
</div>
|
||||||
|
|
||||||
{#if actorIsOrgAdmin}
|
{#if actorIsOrgAdmin}
|
||||||
{#if projectUsage}
|
|
||||||
<div class="saas-card overflow-hidden mb-6">
|
|
||||||
<div class="border-b border-surface-200 px-5 py-3 flex items-center justify-between gap-3">
|
|
||||||
<div>
|
|
||||||
<h3 class="text-sm font-semibold">项目用量分账</h3>
|
|
||||||
<p class="saas-muted mt-0.5 text-xs">
|
|
||||||
{fmtNum(projectUsage.runCount)} 次运行 · 成本 {fmtCost(projectUsage.costUsd)} · tokens
|
|
||||||
{fmtTokens(projectUsage.inputTokens, projectUsage.outputTokens)}
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
<a class="text-sm text-primary-700 hover:underline" href={`/admin/usage`}>组织报告</a>
|
|
||||||
</div>
|
|
||||||
{#if projectUsage.breakdown.length === 0}
|
|
||||||
<div class="px-5 py-4 text-sm text-surface-600">尚无 UsageFact。</div>
|
|
||||||
{:else}
|
|
||||||
<div class="overflow-x-auto">
|
|
||||||
<table class="data-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>类型</th>
|
|
||||||
<th>供应方</th>
|
|
||||||
<th>模型 / 能力</th>
|
|
||||||
<th>次数</th>
|
|
||||||
<th>计量</th>
|
|
||||||
<th>成本</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{#each projectUsage.breakdown as row}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<span
|
|
||||||
class={row.kind === 'external_capability' ? 'saas-badge-primary' : 'saas-badge-success'}
|
|
||||||
>
|
|
||||||
{usageKindLabel(row.kind)}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td class="font-mono text-xs">{row.provider}</td>
|
|
||||||
<td class="font-mono text-xs">{row.capabilityId ?? row.model ?? '—'}</td>
|
|
||||||
<td class="tabular-nums">{fmtNum(row.factCount)}</td>
|
|
||||||
<td class="tabular-nums text-xs">
|
|
||||||
{#if row.unit}
|
|
||||||
{fmtQuantity(row.quantity, row.unit)}
|
|
||||||
{:else}
|
|
||||||
{fmtTokens(row.inputTokens, row.outputTokens)}
|
|
||||||
{/if}
|
|
||||||
</td>
|
|
||||||
<td class="tabular-nums">{fmtCost(row.costUsd)}</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<div class="saas-card overflow-hidden">
|
<div class="saas-card overflow-hidden">
|
||||||
<div class="border-b border-surface-200 px-5 py-3">
|
<div class="border-b border-surface-200 px-5 py-3">
|
||||||
<h3 class="text-sm font-semibold">智能体会话</h3>
|
<h3 class="text-sm font-semibold">智能体会话</h3>
|
||||||
<p class="saas-muted mt-0.5 text-xs">点进会话可查看每次 run 的 UsageFact 分账(模型 / 外部能力)。</p>
|
|
||||||
</div>
|
</div>
|
||||||
{#if sessions.length === 0}
|
{#if sessions.length === 0}
|
||||||
<EmptyState title="暂无会话" description="飞书侧触发智能体后会显示在此。" />
|
<EmptyState title="暂无会话" description="飞书侧触发智能体后会显示在此。" />
|
||||||
@@ -358,7 +283,6 @@
|
|||||||
<th>模型</th>
|
<th>模型</th>
|
||||||
<th>运行次数</th>
|
<th>运行次数</th>
|
||||||
<th>更新</th>
|
<th>更新</th>
|
||||||
<th></th>
|
|
||||||
</tr>
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody>
|
<tbody>
|
||||||
@@ -368,14 +292,6 @@
|
|||||||
<td class="font-mono text-xs">{s.model}</td>
|
<td class="font-mono text-xs">{s.model}</td>
|
||||||
<td class="tabular-nums">{s.runCount}</td>
|
<td class="tabular-nums">{s.runCount}</td>
|
||||||
<td class="text-surface-700">{fmtDate(s.updatedAt)}</td>
|
<td class="text-surface-700">{fmtDate(s.updatedAt)}</td>
|
||||||
<td class="text-right">
|
|
||||||
<a
|
|
||||||
class="text-sm text-primary-700 hover:underline"
|
|
||||||
href={`/admin/sessions/${s.id}`}
|
|
||||||
>
|
|
||||||
详情
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
</tr>
|
||||||
{/each}
|
{/each}
|
||||||
</tbody>
|
</tbody>
|
||||||
+1
-4
@@ -1,8 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type ProviderConnectionRow } from '$lib/api';
|
import { api, type ProviderConnectionRow } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import { fmtDate, providerModeLabel } from '$lib/format';
|
import { fmtDate, providerModeLabel } from '$lib/format';
|
||||||
import { Label } from 'bits-ui';
|
import { Label } from 'bits-ui';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
@@ -10,8 +8,7 @@
|
|||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
|
|
||||||
let connections = $state<ProviderConnectionRow[]>([]);
|
let connections = $state<ProviderConnectionRow[]>([]);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
+1
-4
@@ -1,8 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type AgentRoleRow, type AgentModelRow, type AgentSkillRow } from '$lib/api';
|
import { api, type AgentRoleRow, type AgentModelRow, type AgentSkillRow } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
@@ -10,8 +8,7 @@
|
|||||||
import RoleCard from '$lib/components/RoleCard.svelte';
|
import RoleCard from '$lib/components/RoleCard.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
|
|
||||||
let roles = $state<AgentRoleRow[]>([]);
|
let roles = $state<AgentRoleRow[]>([]);
|
||||||
let models = $state<AgentModelRow[]>([]);
|
let models = $state<AgentModelRow[]>([]);
|
||||||
+1
-4
@@ -1,8 +1,6 @@
|
|||||||
<script lang="ts">
|
<script lang="ts">
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type AgentSkillRow, type SkillFileEntry } from '$lib/api';
|
import { api, type AgentSkillRow, type SkillFileEntry } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
||||||
@@ -10,8 +8,7 @@
|
|||||||
import SkillEditor from '$lib/components/SkillEditor.svelte';
|
import SkillEditor from '$lib/components/SkillEditor.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
|
|
||||||
let skills = $state<AgentSkillRow[]>([]);
|
let skills = $state<AgentSkillRow[]>([]);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
+1
-4
@@ -2,8 +2,6 @@
|
|||||||
import { Collapsible } from 'bits-ui';
|
import { Collapsible } from 'bits-ui';
|
||||||
import { page } from '$app/state';
|
import { page } from '$app/state';
|
||||||
import { api, type TeamRow, type TeamMemberRow } from '$lib/api';
|
import { api, type TeamRow, type TeamMemberRow } from '$lib/api';
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import { fmtDate } from '$lib/format';
|
import { fmtDate } from '$lib/format';
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
import PageHeader from '$lib/components/PageHeader.svelte';
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
import LoadingState from '$lib/components/LoadingState.svelte';
|
||||||
@@ -11,8 +9,7 @@
|
|||||||
import EmptyState from '$lib/components/EmptyState.svelte';
|
import EmptyState from '$lib/components/EmptyState.svelte';
|
||||||
import { toastError, toastSuccess } from '$lib/toast';
|
import { toastError, toastSuccess } from '$lib/toast';
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
const slug = $derived(page.params.slug ?? '');
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
|
|
||||||
let teams = $state<TeamRow[]>([]);
|
let teams = $state<TeamRow[]>([]);
|
||||||
let loading = $state(true);
|
let loading = $state(true);
|
||||||
@@ -1,238 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { page } from '$app/state';
|
|
||||||
import { api, type SessionDetail, type SessionRunRow, type UsageFactRow } from '$lib/api';
|
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import {
|
|
||||||
fmtCost,
|
|
||||||
fmtDate,
|
|
||||||
fmtNum,
|
|
||||||
fmtQuantity,
|
|
||||||
fmtTokens,
|
|
||||||
runStatusLabel,
|
|
||||||
usageKindLabel,
|
|
||||||
} from '$lib/format';
|
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
|
||||||
import EmptyState from '$lib/components/EmptyState.svelte';
|
|
||||||
import Icon from '$lib/components/Icon.svelte';
|
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
const sessionId = $derived(page.params.sessionId ?? '');
|
|
||||||
|
|
||||||
let detail = $state<SessionDetail | null>(null);
|
|
||||||
let loading = $state(true);
|
|
||||||
let error = $state<string | null>(null);
|
|
||||||
let expandedRunId = $state<string | null>(null);
|
|
||||||
|
|
||||||
async function load() {
|
|
||||||
if (!slug || !sessionId) return;
|
|
||||||
loading = true;
|
|
||||||
error = null;
|
|
||||||
try {
|
|
||||||
detail = await api.session(slug, sessionId);
|
|
||||||
if (detail.runs.length > 0) {
|
|
||||||
expandedRunId = detail.runs[0]!.id;
|
|
||||||
}
|
|
||||||
} catch (err) {
|
|
||||||
error = err instanceof Error ? err.message : String(err);
|
|
||||||
} finally {
|
|
||||||
loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function statusClass(status: string): string {
|
|
||||||
const key = status.toUpperCase();
|
|
||||||
if (key === 'COMPLETED') return 'saas-badge-success';
|
|
||||||
if (key === 'FAILED' || key === 'TIMED_OUT' || key === 'CANCELED') return 'saas-badge-error';
|
|
||||||
return 'saas-badge-primary';
|
|
||||||
}
|
|
||||||
|
|
||||||
function factMeter(f: UsageFactRow): string {
|
|
||||||
if (f.unit) return fmtQuantity(f.quantity, f.unit);
|
|
||||||
if (f.inputTokens !== null || f.outputTokens !== null) {
|
|
||||||
return fmtTokens(f.inputTokens, f.outputTokens);
|
|
||||||
}
|
|
||||||
return '—';
|
|
||||||
}
|
|
||||||
|
|
||||||
function factSource(f: UsageFactRow): string {
|
|
||||||
if (f.capabilityId) return f.capabilityId;
|
|
||||||
if (f.model) return f.model;
|
|
||||||
return '—';
|
|
||||||
}
|
|
||||||
|
|
||||||
function runCostHint(run: SessionRunRow): string {
|
|
||||||
const factCost = run.usageFacts.reduce<number | null>((acc, f) => {
|
|
||||||
if (f.costUsd === null) return acc;
|
|
||||||
return (acc ?? 0) + f.costUsd;
|
|
||||||
}, null);
|
|
||||||
const cache = run.costUsd;
|
|
||||||
if (factCost !== null && cache !== null && Math.abs(factCost - cache) > 1e-9) {
|
|
||||||
return `运行缓存 ${fmtCost(cache)};事实合计 ${fmtCost(factCost)}(缓存可能未含外部能力)`;
|
|
||||||
}
|
|
||||||
if (factCost !== null) return `事实合计 ${fmtCost(factCost)}`;
|
|
||||||
if (cache !== null) return `运行缓存 ${fmtCost(cache)}`;
|
|
||||||
return '成本未知';
|
|
||||||
}
|
|
||||||
|
|
||||||
function toggleRun(id: string) {
|
|
||||||
expandedRunId = expandedRunId === id ? null : id;
|
|
||||||
}
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (slug && sessionId) void load();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#if loading}
|
|
||||||
<LoadingState />
|
|
||||||
{:else if error}
|
|
||||||
<ErrorBanner message={error} onretry={load} />
|
|
||||||
{:else if detail}
|
|
||||||
<div class="mb-2">
|
|
||||||
<a
|
|
||||||
class="inline-flex items-center gap-1 text-sm text-surface-700 hover:text-primary-700"
|
|
||||||
href={`/admin/projects/${detail.project.id}`}
|
|
||||||
>
|
|
||||||
<Icon name="arrow-left" class="h-4 w-4" />
|
|
||||||
返回项目 {detail.project.name}
|
|
||||||
</a>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<PageHeader
|
|
||||||
title={detail.title?.trim() || '未命名会话'}
|
|
||||||
description={`${detail.provider} · ${detail.roleId} · ${detail.model}`}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="saas-card-pad mb-6">
|
|
||||||
<dl class="grid gap-x-8 gap-y-3 text-sm sm:grid-cols-2 lg:grid-cols-3">
|
|
||||||
<div>
|
|
||||||
<dt class="text-surface-600">会话 ID</dt>
|
|
||||||
<dd class="mt-0.5 break-all font-mono text-xs">{detail.id}</dd>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<dt class="text-surface-600">项目</dt>
|
|
||||||
<dd class="mt-0.5">
|
|
||||||
<a class="text-primary-700 hover:underline" href={`/admin/projects/${detail.project.id}`}>
|
|
||||||
{detail.project.name}
|
|
||||||
</a>
|
|
||||||
</dd>
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<dt class="text-surface-600">创建 / 更新</dt>
|
|
||||||
<dd class="mt-0.5 text-surface-800">{fmtDate(detail.createdAt)} · {fmtDate(detail.updatedAt)}</dd>
|
|
||||||
</div>
|
|
||||||
{#if detail.archivedAt}
|
|
||||||
<div>
|
|
||||||
<dt class="text-surface-600">已归档</dt>
|
|
||||||
<dd class="mt-0.5">{fmtDate(detail.archivedAt)}</dd>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
<div>
|
|
||||||
<dt class="text-surface-600">运行数</dt>
|
|
||||||
<dd class="mt-0.5 tabular-nums">{fmtNum(detail.runs.length)}</dd>
|
|
||||||
</div>
|
|
||||||
</dl>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-3">
|
|
||||||
<h2 class="saas-section-title">运行与计费事实</h2>
|
|
||||||
<p class="saas-muted">每条 UsageFact 是一次可计费消费;外部能力与模型完成分开列出。</p>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if detail.runs.length === 0}
|
|
||||||
<div class="saas-card">
|
|
||||||
<EmptyState title="尚无运行" description="此会话还没有 Agent run。" />
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
<div class="space-y-3">
|
|
||||||
{#each detail.runs as run (run.id)}
|
|
||||||
{@const open = expandedRunId === run.id}
|
|
||||||
<div class="saas-card overflow-hidden">
|
|
||||||
<button
|
|
||||||
type="button"
|
|
||||||
class="flex w-full items-start justify-between gap-3 px-5 py-4 text-left hover:bg-surface-50"
|
|
||||||
onclick={() => toggleRun(run.id)}
|
|
||||||
>
|
|
||||||
<div class="min-w-0 space-y-1">
|
|
||||||
<div class="flex flex-wrap items-center gap-2">
|
|
||||||
<span class={statusClass(run.status)}>{runStatusLabel(run.status)}</span>
|
|
||||||
<span class="font-mono text-xs text-surface-700">{run.provider} / {run.model}</span>
|
|
||||||
<span class="font-mono text-[11px] text-surface-500">{run.id}</span>
|
|
||||||
</div>
|
|
||||||
<div class="text-xs text-surface-700">
|
|
||||||
{fmtDate(run.startedAt)}
|
|
||||||
{#if run.finishedAt}
|
|
||||||
→ {fmtDate(run.finishedAt)}
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
<div class="text-xs text-surface-600">{runCostHint(run)}</div>
|
|
||||||
{#if run.error}
|
|
||||||
<div class="text-xs text-error-700">{run.error}</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
<div class="shrink-0 text-right text-sm">
|
|
||||||
<div class="tabular-nums text-surface-800">{fmtTokens(run.inputTokens, run.outputTokens)}</div>
|
|
||||||
<div class="tabular-nums font-medium">{fmtCost(run.costUsd)}</div>
|
|
||||||
<div class="mt-1 text-[11px] text-surface-600">{open ? '收起事实' : `${run.usageFacts.length} 条事实`}</div>
|
|
||||||
</div>
|
|
||||||
</button>
|
|
||||||
|
|
||||||
{#if open}
|
|
||||||
<div class="border-t border-surface-200">
|
|
||||||
{#if run.usageFacts.length === 0}
|
|
||||||
<div class="px-5 py-4">
|
|
||||||
<p class="text-sm text-surface-600">此 run 没有 UsageFact(可能尚未结束或未记费)。</p>
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
<div class="overflow-x-auto">
|
|
||||||
<table class="data-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>时间</th>
|
|
||||||
<th>类型</th>
|
|
||||||
<th>供应方</th>
|
|
||||||
<th>模型 / 能力</th>
|
|
||||||
<th>计量</th>
|
|
||||||
<th>成本</th>
|
|
||||||
<th>来源</th>
|
|
||||||
<th>关联 ID</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{#each run.usageFacts as fact}
|
|
||||||
<tr>
|
|
||||||
<td class="whitespace-nowrap text-xs text-surface-700">{fmtDate(fact.occurredAt)}</td>
|
|
||||||
<td>
|
|
||||||
<span
|
|
||||||
class={fact.kind === 'external_capability'
|
|
||||||
? 'saas-badge-primary'
|
|
||||||
: 'saas-badge-success'}
|
|
||||||
>
|
|
||||||
{usageKindLabel(fact.kind)}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td class="font-mono text-xs">{fact.provider}</td>
|
|
||||||
<td class="font-mono text-xs">{factSource(fact)}</td>
|
|
||||||
<td class="tabular-nums text-xs">{factMeter(fact)}</td>
|
|
||||||
<td class="tabular-nums">{fmtCost(fact.costUsd)}</td>
|
|
||||||
<td class="font-mono text-[11px] text-surface-600">{fact.costSource}</td>
|
|
||||||
<td class="max-w-[10rem] truncate font-mono text-[11px] text-surface-500" title={fact.correlationId ?? ''}>
|
|
||||||
{fact.correlationId ?? '—'}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
{/if}
|
|
||||||
@@ -1,241 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { page } from '$app/state';
|
|
||||||
import { api, type UsageReport, type UsageBreakdownRow } from '$lib/api';
|
|
||||||
import { session } from '$lib/session';
|
|
||||||
import { resolveOrg } from '$lib/org';
|
|
||||||
import {
|
|
||||||
fmtCost,
|
|
||||||
fmtDateOnly,
|
|
||||||
fmtNum,
|
|
||||||
fmtQuantity,
|
|
||||||
fmtTokens,
|
|
||||||
usageKindLabel,
|
|
||||||
} from '$lib/format';
|
|
||||||
import PageHeader from '$lib/components/PageHeader.svelte';
|
|
||||||
import StatCard from '$lib/components/StatCard.svelte';
|
|
||||||
import LoadingState from '$lib/components/LoadingState.svelte';
|
|
||||||
import ErrorBanner from '$lib/components/ErrorBanner.svelte';
|
|
||||||
import EmptyState from '$lib/components/EmptyState.svelte';
|
|
||||||
|
|
||||||
const org = $derived(resolveOrg($session.me, page.url.search));
|
|
||||||
const slug = $derived(org?.slug ?? '');
|
|
||||||
|
|
||||||
let usage = $state<UsageReport | null>(null);
|
|
||||||
let loading = $state(true);
|
|
||||||
let error = $state<string | null>(null);
|
|
||||||
let from = $state('');
|
|
||||||
let to = $state('');
|
|
||||||
|
|
||||||
function toIsoStart(dateLocal: string): string | undefined {
|
|
||||||
if (!dateLocal) return undefined;
|
|
||||||
const d = new Date(`${dateLocal}T00:00:00`);
|
|
||||||
return Number.isNaN(d.getTime()) ? undefined : d.toISOString();
|
|
||||||
}
|
|
||||||
|
|
||||||
function toIsoEnd(dateLocal: string): string | undefined {
|
|
||||||
if (!dateLocal) return undefined;
|
|
||||||
const d = new Date(`${dateLocal}T23:59:59.999`);
|
|
||||||
return Number.isNaN(d.getTime()) ? undefined : d.toISOString();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function load() {
|
|
||||||
if (!slug) return;
|
|
||||||
loading = true;
|
|
||||||
error = null;
|
|
||||||
try {
|
|
||||||
usage = await api.usage(slug, {
|
|
||||||
...(toIsoStart(from) !== undefined ? { from: toIsoStart(from) } : {}),
|
|
||||||
...(toIsoEnd(to) !== undefined ? { to: toIsoEnd(to) } : {}),
|
|
||||||
});
|
|
||||||
} catch (err) {
|
|
||||||
error = err instanceof Error ? err.message : String(err);
|
|
||||||
} finally {
|
|
||||||
loading = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function clearRange() {
|
|
||||||
from = '';
|
|
||||||
to = '';
|
|
||||||
void load();
|
|
||||||
}
|
|
||||||
|
|
||||||
function sourceLabel(row: UsageBreakdownRow): string {
|
|
||||||
if (row.capabilityId) return row.capabilityId;
|
|
||||||
if (row.model) return row.model;
|
|
||||||
return '—';
|
|
||||||
}
|
|
||||||
|
|
||||||
function meterCell(row: UsageBreakdownRow): string {
|
|
||||||
if (row.unit) return fmtQuantity(row.quantity, row.unit);
|
|
||||||
if (row.inputTokens > 0 || row.outputTokens > 0) return fmtTokens(row.inputTokens, row.outputTokens);
|
|
||||||
return '—';
|
|
||||||
}
|
|
||||||
|
|
||||||
function meterHint(row: UsageBreakdownRow): string {
|
|
||||||
if (row.unit) return '非 token 计量';
|
|
||||||
if (row.inputTokens > 0 || row.outputTokens > 0) return 'in / out tokens';
|
|
||||||
return '无计量';
|
|
||||||
}
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (slug) void load();
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#if loading && !usage}
|
|
||||||
<LoadingState />
|
|
||||||
{:else if error && !usage}
|
|
||||||
<ErrorBanner message={error} onretry={load} />
|
|
||||||
{:else if usage}
|
|
||||||
<PageHeader
|
|
||||||
title="用量报告"
|
|
||||||
description="按 UsageFact 分账:模型完成与外部能力(PDF→MD、ASR 等)分开汇总。缺失成本计为未知,不为 0。"
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="saas-card-pad mb-6">
|
|
||||||
<div class="flex flex-wrap items-end gap-3">
|
|
||||||
<div>
|
|
||||||
<label class="saas-label" for="usage-from">从</label>
|
|
||||||
<input id="usage-from" class="saas-input" type="date" bind:value={from} />
|
|
||||||
</div>
|
|
||||||
<div>
|
|
||||||
<label class="saas-label" for="usage-to">到</label>
|
|
||||||
<input id="usage-to" class="saas-input" type="date" bind:value={to} />
|
|
||||||
</div>
|
|
||||||
<button class="saas-btn-primary py-1.5! text-sm" type="button" onclick={load} disabled={loading}>
|
|
||||||
{loading ? '加载中…' : '应用筛选'}
|
|
||||||
</button>
|
|
||||||
<button class="saas-btn-secondary py-1.5! text-sm" type="button" onclick={clearRange} disabled={loading}>
|
|
||||||
清除
|
|
||||||
</button>
|
|
||||||
{#if usage.from || usage.to}
|
|
||||||
<p class="saas-muted grow text-right text-xs">
|
|
||||||
窗口:
|
|
||||||
{usage.from ? fmtDateOnly(usage.from) : '—'}
|
|
||||||
→
|
|
||||||
{usage.to ? fmtDateOnly(usage.to) : '—'}
|
|
||||||
</p>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{#if error}
|
|
||||||
<p class="mt-3 text-sm text-error-700">{error}</p>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-6 grid gap-3 sm:grid-cols-2 lg:grid-cols-3">
|
|
||||||
<StatCard label="运行总数" value={fmtNum(usage.totals.runCount)} />
|
|
||||||
<StatCard
|
|
||||||
label="有成本 / 无成本"
|
|
||||||
value={`${fmtNum(usage.totals.runsWithCost)} / ${fmtNum(usage.totals.runsWithoutCost)}`}
|
|
||||||
hint="无成本 = 成本未知,不是 $0"
|
|
||||||
/>
|
|
||||||
<StatCard label="成本 (USD)" value={fmtCost(usage.totals.costUsd)} hint="仅汇总已知 costUsd" />
|
|
||||||
<StatCard label="输入 tokens" value={fmtNum(usage.totals.inputTokens)} hint="主要来自模型完成" />
|
|
||||||
<StatCard label="输出 tokens" value={fmtNum(usage.totals.outputTokens)} hint="主要来自模型完成" />
|
|
||||||
<StatCard
|
|
||||||
label="分账条目"
|
|
||||||
value={fmtNum(usage.breakdown.reduce((n, b) => n + b.factCount, 0))}
|
|
||||||
hint={`${fmtNum(usage.breakdown.length)} 个分项`}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="saas-card overflow-hidden mb-6">
|
|
||||||
<div class="border-b border-surface-200 px-5 py-3">
|
|
||||||
<h3 class="text-sm font-semibold text-surface-800">按来源分账</h3>
|
|
||||||
<p class="saas-muted mt-0.5 text-xs">
|
|
||||||
kind × provider × model/capability。外部能力显示页数/秒等计量,不与 tokens 混排。
|
|
||||||
</p>
|
|
||||||
</div>
|
|
||||||
{#if usage.breakdown.length === 0}
|
|
||||||
<EmptyState title="暂无用量事实" description="跑过智能体后,模型与外部能力消费会出现在此。" />
|
|
||||||
{:else}
|
|
||||||
<div class="overflow-x-auto">
|
|
||||||
<table class="data-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>类型</th>
|
|
||||||
<th>供应方</th>
|
|
||||||
<th>模型 / 能力</th>
|
|
||||||
<th>次数</th>
|
|
||||||
<th>计量</th>
|
|
||||||
<th>有成本 / 未知</th>
|
|
||||||
<th>成本</th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{#each usage.breakdown as row}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<span
|
|
||||||
class={row.kind === 'external_capability'
|
|
||||||
? 'saas-badge-primary'
|
|
||||||
: row.kind === 'model_completion'
|
|
||||||
? 'saas-badge-success'
|
|
||||||
: 'saas-badge-primary'}
|
|
||||||
>
|
|
||||||
{usageKindLabel(row.kind)}
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td class="font-mono text-xs">{row.provider}</td>
|
|
||||||
<td class="font-mono text-xs">{sourceLabel(row)}</td>
|
|
||||||
<td class="tabular-nums">{fmtNum(row.factCount)}</td>
|
|
||||||
<td class="tabular-nums">
|
|
||||||
<div>{meterCell(row)}</div>
|
|
||||||
<div class="text-[11px] text-surface-600">{meterHint(row)}</div>
|
|
||||||
</td>
|
|
||||||
<td class="tabular-nums text-surface-700">
|
|
||||||
{fmtNum(row.factsWithCost)} / {fmtNum(row.factsWithoutCost)}
|
|
||||||
</td>
|
|
||||||
<td class="tabular-nums font-medium">{fmtCost(row.costUsd)}</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="saas-card overflow-hidden">
|
|
||||||
<div class="border-b border-surface-200 px-5 py-3">
|
|
||||||
<h3 class="text-sm font-semibold text-surface-800">按项目</h3>
|
|
||||||
<p class="saas-muted mt-0.5 text-xs">项目仍是权限边界;行内成本已含该项目全部 fact 类型。</p>
|
|
||||||
</div>
|
|
||||||
{#if usage.projects.length === 0}
|
|
||||||
<EmptyState title="暂无项目" description="创建项目并触发智能体后会出现用量。" />
|
|
||||||
{:else}
|
|
||||||
<div class="overflow-x-auto">
|
|
||||||
<table class="data-table">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>项目</th>
|
|
||||||
<th>运行</th>
|
|
||||||
<th>有成本 / 未知</th>
|
|
||||||
<th>in / out tokens</th>
|
|
||||||
<th>成本</th>
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{#each usage.projects as p}
|
|
||||||
<tr>
|
|
||||||
<td class="font-medium">{p.projectName}</td>
|
|
||||||
<td class="tabular-nums">{fmtNum(p.runCount)}</td>
|
|
||||||
<td class="tabular-nums text-surface-700">
|
|
||||||
{fmtNum(p.runsWithCost)} / {fmtNum(p.runsWithoutCost)}
|
|
||||||
</td>
|
|
||||||
<td class="tabular-nums text-surface-600">{fmtTokens(p.inputTokens, p.outputTokens)}</td>
|
|
||||||
<td class="tabular-nums">{fmtCost(p.costUsd)}</td>
|
|
||||||
<td class="text-right">
|
|
||||||
<a class="text-sm text-primary-700 hover:underline" href={`/admin/projects/${p.projectId}`}>
|
|
||||||
查看项目
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
@@ -82,11 +82,10 @@ REMOTE
|
|||||||
rsync -az --delete \
|
rsync -az --delete \
|
||||||
--exclude node_modules --exclude dist --exclude .env \
|
--exclude node_modules --exclude dist --exclude .env \
|
||||||
--exclude admin-web/node_modules --exclude admin-web/build --exclude admin-web/.svelte-kit \
|
--exclude admin-web/node_modules --exclude admin-web/build --exclude admin-web/.svelte-kit \
|
||||||
--exclude filelib-web/node_modules --exclude filelib-web/build --exclude filelib-web/.svelte-kit \
|
|
||||||
-e "ssh ${SSH_OPTS[*]}" \
|
-e "ssh ${SSH_OPTS[*]}" \
|
||||||
"$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
|
"$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
|
||||||
|
|
||||||
echo "[fleet] npm ci + build (tsc + admin-web & filelib-web SPAs)"
|
echo "[fleet] npm ci + build (tsc + admin-web SPA)"
|
||||||
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" bash -s <<REMOTE
|
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" bash -s <<REMOTE
|
||||||
set -euo pipefail
|
set -euo pipefail
|
||||||
flock /var/lock/cph-hub-release-publish bash -c '
|
flock /var/lock/cph-hub-release-publish bash -c '
|
||||||
@@ -98,11 +97,9 @@ flock /var/lock/cph-hub-release-publish bash -c '
|
|||||||
cd "$HUB_DIR"
|
cd "$HUB_DIR"
|
||||||
PUPPETEER_SKIP_DOWNLOAD=1 npm ci
|
PUPPETEER_SKIP_DOWNLOAD=1 npm ci
|
||||||
npm ci --prefix admin-web
|
npm ci --prefix admin-web
|
||||||
npm ci --prefix filelib-web
|
|
||||||
npm run audit:production
|
npm run audit:production
|
||||||
npm run build
|
npm run build
|
||||||
test -f admin-web/build/index.html
|
test -f admin-web/build/index.html
|
||||||
test -f filelib-web/build/index.html
|
|
||||||
touch "$RELEASE_DIR/.complete"
|
touch "$RELEASE_DIR/.complete"
|
||||||
'
|
'
|
||||||
REMOTE
|
REMOTE
|
||||||
|
|||||||
@@ -60,11 +60,10 @@ if [ "$release_ready" = false ]; then
|
|||||||
-e "ssh ${SSH_OPTS[*]}" \
|
-e "ssh ${SSH_OPTS[*]}" \
|
||||||
"$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
|
"$REPO_ROOT/hub/" "$DEPLOY_USER@$HOST:$HUB_DIR/"
|
||||||
|
|
||||||
# 2. Install deps (hub + both SPAs), audit hub prod, build tsc + SPAs, mark complete.
|
# 2. Install deps (hub + admin-web), audit hub prod, build tsc + SPA, mark complete.
|
||||||
# `npm run build` → tsc then admin:build + filelib:build → admin-web/build and
|
# `npm run build` → tsc then admin:build → admin-web/build for registerStaticSpa.
|
||||||
# filelib-web/build for registerStaticSpa / registerDatabaseSpa.
|
|
||||||
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" \
|
ssh "${SSH_OPTS[@]}" "$DEPLOY_USER@$HOST" \
|
||||||
"cd '$HUB_DIR' && PUPPETEER_SKIP_DOWNLOAD=1 npm ci && npm ci --prefix admin-web && npm ci --prefix filelib-web && npm run audit:production && npm run build && touch '$RELEASE_DIR/.complete'"
|
"cd '$HUB_DIR' && PUPPETEER_SKIP_DOWNLOAD=1 npm ci && npm ci --prefix admin-web && npm run audit:production && npm run build && touch '$RELEASE_DIR/.complete'"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 3. Ensure the service is installed (idempotent), then restart.
|
# 3. Ensure the service is installed (idempotent), then restart.
|
||||||
|
|||||||
Generated
-1758
File diff suppressed because it is too large
Load Diff
@@ -1,24 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "filelib-web",
|
|
||||||
"private": true,
|
|
||||||
"version": "0.1.0",
|
|
||||||
"type": "module",
|
|
||||||
"scripts": {
|
|
||||||
"dev": "vite dev",
|
|
||||||
"build": "vite build",
|
|
||||||
"preview": "vite preview",
|
|
||||||
"prepare": "svelte-kit sync || echo ''",
|
|
||||||
"check": "svelte-kit sync && svelte-check --tsconfig ./tsconfig.json"
|
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@sveltejs/adapter-static": "^3.0.10",
|
|
||||||
"@sveltejs/kit": "^2.63.0",
|
|
||||||
"@sveltejs/vite-plugin-svelte": "^7.1.2",
|
|
||||||
"@tailwindcss/vite": "^4.3.2",
|
|
||||||
"svelte": "^5.56.1",
|
|
||||||
"svelte-check": "^4.6.0",
|
|
||||||
"tailwindcss": "^4.3.2",
|
|
||||||
"typescript": "^5.7.0",
|
|
||||||
"vite": "^8.0.16"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,263 +0,0 @@
|
|||||||
@import "tailwindcss";
|
|
||||||
|
|
||||||
/* 全局 UI 主题令牌(与 hub 端 uiTheme.ts 同源) */
|
|
||||||
@theme {
|
|
||||||
--color-bg: #fcfcfb;
|
|
||||||
--color-panel: #ffffff;
|
|
||||||
--color-sidebar: #f7f7f5;
|
|
||||||
--color-ink: #1a1a18;
|
|
||||||
--color-ink-2: #6b6a66;
|
|
||||||
--color-ink-3: #9c9b96;
|
|
||||||
--color-line: #ecece8;
|
|
||||||
--color-line-soft: #f1f1ee;
|
|
||||||
--color-hover: #f4f4f1;
|
|
||||||
--color-selected: #ebebe7;
|
|
||||||
--color-accent: #1a1a18;
|
|
||||||
--color-accent-hover: #333330;
|
|
||||||
--color-danger: #a13a33;
|
|
||||||
--color-guide: #e9e9e5;
|
|
||||||
--color-diff-add-bg: #f3f6f2;
|
|
||||||
--color-diff-add-text: #4a6741;
|
|
||||||
--color-diff-del-bg: #f8f2f1;
|
|
||||||
--color-diff-del-text: #a13a33;
|
|
||||||
}
|
|
||||||
|
|
||||||
html,
|
|
||||||
body {
|
|
||||||
height: 100%;
|
|
||||||
}
|
|
||||||
|
|
||||||
body {
|
|
||||||
background: var(--color-bg);
|
|
||||||
color: var(--color-ink);
|
|
||||||
font-family:
|
|
||||||
"Inter",
|
|
||||||
-apple-system,
|
|
||||||
"Segoe UI",
|
|
||||||
"PingFang SC",
|
|
||||||
"Microsoft YaHei",
|
|
||||||
sans-serif;
|
|
||||||
font-size: 14px;
|
|
||||||
line-height: 1.65;
|
|
||||||
-webkit-font-smoothing: antialiased;
|
|
||||||
}
|
|
||||||
|
|
||||||
.font-mono {
|
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 共享组件层(ADR-0029)。
|
|
||||||
*
|
|
||||||
* 从已删除的 hub/src/database/routes/uiTheme.ts 原样搬来。组件只带布局工具类,
|
|
||||||
* 不重述这里的组件样式 —— 第一版迁移只搬了上面的 @theme 令牌,把按钮/输入框/
|
|
||||||
* 面板样式在每个组件里内联重写了一遍,后台随即明显退化。 */
|
|
||||||
@layer components {
|
|
||||||
.btn {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 5px;
|
|
||||||
padding: 6px 14px;
|
|
||||||
border-radius: 8px;
|
|
||||||
border: 1px solid var(--color-line);
|
|
||||||
background: var(--color-panel);
|
|
||||||
color: var(--color-ink);
|
|
||||||
font-size: 12.5px;
|
|
||||||
font-weight: 500;
|
|
||||||
cursor: pointer;
|
|
||||||
transition: all 120ms ease;
|
|
||||||
white-space: nowrap;
|
|
||||||
}
|
|
||||||
.btn:hover {
|
|
||||||
background: var(--color-hover);
|
|
||||||
}
|
|
||||||
.btn-sm {
|
|
||||||
padding: 4px 9px;
|
|
||||||
font-size: 11.5px;
|
|
||||||
}
|
|
||||||
.btn-primary {
|
|
||||||
background: var(--color-accent);
|
|
||||||
border-color: var(--color-accent);
|
|
||||||
color: #fff;
|
|
||||||
}
|
|
||||||
.btn-primary:hover {
|
|
||||||
background: var(--color-accent-hover);
|
|
||||||
border-color: var(--color-accent-hover);
|
|
||||||
}
|
|
||||||
.btn-danger {
|
|
||||||
border-color: transparent;
|
|
||||||
background: transparent;
|
|
||||||
color: var(--color-danger);
|
|
||||||
}
|
|
||||||
.btn-danger:hover {
|
|
||||||
background: color-mix(in srgb, var(--color-danger) 7%, transparent);
|
|
||||||
}
|
|
||||||
|
|
||||||
.panel {
|
|
||||||
background: var(--color-panel);
|
|
||||||
border: 1px solid var(--color-line-soft);
|
|
||||||
border-radius: 10px;
|
|
||||||
padding: 20px 22px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.tag {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 3px;
|
|
||||||
font-size: 10.5px;
|
|
||||||
font-weight: 500;
|
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
|
||||||
padding: 2px 8px;
|
|
||||||
border-radius: 999px;
|
|
||||||
border: 1px solid var(--color-line-soft);
|
|
||||||
color: var(--color-ink-3);
|
|
||||||
background: var(--color-panel);
|
|
||||||
}
|
|
||||||
|
|
||||||
.input,
|
|
||||||
.select,
|
|
||||||
.textarea {
|
|
||||||
width: 100%;
|
|
||||||
padding: 7px 11px;
|
|
||||||
border-radius: 8px;
|
|
||||||
border: 1px solid var(--color-line);
|
|
||||||
background: var(--color-panel);
|
|
||||||
font-size: 13px;
|
|
||||||
color: var(--color-ink);
|
|
||||||
font-family: inherit;
|
|
||||||
outline: none;
|
|
||||||
transition: border-color 120ms ease;
|
|
||||||
}
|
|
||||||
.input:focus,
|
|
||||||
.select:focus,
|
|
||||||
.textarea:focus {
|
|
||||||
border-color: var(--color-accent);
|
|
||||||
}
|
|
||||||
.textarea {
|
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
|
||||||
font-size: 12.5px;
|
|
||||||
line-height: 1.75;
|
|
||||||
resize: vertical;
|
|
||||||
}
|
|
||||||
.form-label {
|
|
||||||
display: block;
|
|
||||||
font-size: 11.5px;
|
|
||||||
color: var(--color-ink-3);
|
|
||||||
margin-bottom: 4px;
|
|
||||||
}
|
|
||||||
.form-row {
|
|
||||||
margin-bottom: 12px;
|
|
||||||
}
|
|
||||||
|
|
||||||
table.list {
|
|
||||||
width: 100%;
|
|
||||||
border-collapse: collapse;
|
|
||||||
font-size: 13px;
|
|
||||||
}
|
|
||||||
table.list th {
|
|
||||||
text-align: left;
|
|
||||||
font-size: 11.5px;
|
|
||||||
font-weight: 500;
|
|
||||||
color: var(--color-ink-3);
|
|
||||||
padding: 4px 0;
|
|
||||||
}
|
|
||||||
table.list td {
|
|
||||||
padding: 8px 0;
|
|
||||||
border-top: 1px solid var(--color-line-soft);
|
|
||||||
}
|
|
||||||
table.list tr:first-child td {
|
|
||||||
border-top: none;
|
|
||||||
}
|
|
||||||
|
|
||||||
.quiet {
|
|
||||||
color: var(--color-ink-3);
|
|
||||||
font-size: 12.5px;
|
|
||||||
}
|
|
||||||
.section-title {
|
|
||||||
font-size: 13px;
|
|
||||||
font-weight: 600;
|
|
||||||
}
|
|
||||||
.section-note {
|
|
||||||
font-size: 11.5px;
|
|
||||||
color: var(--color-ink-3);
|
|
||||||
}
|
|
||||||
.file-meta {
|
|
||||||
font-size: 11px;
|
|
||||||
color: var(--color-ink-3);
|
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
|
||||||
}
|
|
||||||
.link-danger {
|
|
||||||
color: var(--color-danger);
|
|
||||||
font-size: 12.5px;
|
|
||||||
background: none;
|
|
||||||
border: none;
|
|
||||||
cursor: pointer;
|
|
||||||
padding: 0;
|
|
||||||
}
|
|
||||||
.link-danger:hover {
|
|
||||||
text-decoration: underline;
|
|
||||||
}
|
|
||||||
|
|
||||||
/* 开关。真 checkbox 藏在下面 —— 保留键盘可达与 :checked 语义,不做 div 假开关。 */
|
|
||||||
.switch {
|
|
||||||
display: inline-flex;
|
|
||||||
align-items: center;
|
|
||||||
gap: 8px;
|
|
||||||
cursor: pointer;
|
|
||||||
user-select: none;
|
|
||||||
}
|
|
||||||
.switch > input {
|
|
||||||
position: absolute;
|
|
||||||
opacity: 0;
|
|
||||||
width: 0;
|
|
||||||
height: 0;
|
|
||||||
}
|
|
||||||
.switch > span {
|
|
||||||
position: relative;
|
|
||||||
flex-shrink: 0;
|
|
||||||
width: 30px;
|
|
||||||
height: 17px;
|
|
||||||
border-radius: 999px;
|
|
||||||
background: var(--color-line);
|
|
||||||
transition: background 0.16s;
|
|
||||||
}
|
|
||||||
.switch > span::after {
|
|
||||||
content: "";
|
|
||||||
position: absolute;
|
|
||||||
top: 2px;
|
|
||||||
left: 2px;
|
|
||||||
width: 13px;
|
|
||||||
height: 13px;
|
|
||||||
border-radius: 50%;
|
|
||||||
background: #fff;
|
|
||||||
transition: transform 0.16s;
|
|
||||||
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.25);
|
|
||||||
}
|
|
||||||
.switch > input:checked + span {
|
|
||||||
background: var(--color-accent);
|
|
||||||
}
|
|
||||||
.switch > input:checked + span::after {
|
|
||||||
transform: translateX(13px);
|
|
||||||
}
|
|
||||||
.switch > input:focus-visible + span {
|
|
||||||
outline: 2px solid var(--color-accent);
|
|
||||||
outline-offset: 2px;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* diff 渲染 */
|
|
||||||
pre.diff {
|
|
||||||
white-space: pre-wrap;
|
|
||||||
font-family: ui-monospace, SFMono-Regular, Menlo, Consolas, monospace;
|
|
||||||
font-size: 12.5px;
|
|
||||||
line-height: 1.75;
|
|
||||||
}
|
|
||||||
pre.diff .add {
|
|
||||||
display: block;
|
|
||||||
color: var(--color-diff-add-text);
|
|
||||||
background: var(--color-diff-add-bg);
|
|
||||||
}
|
|
||||||
pre.diff .del {
|
|
||||||
display: block;
|
|
||||||
color: var(--color-diff-del-text);
|
|
||||||
background: var(--color-diff-del-bg);
|
|
||||||
}
|
|
||||||
Vendored
-12
@@ -1,12 +0,0 @@
|
|||||||
// See https://svelte.dev/docs/kit/types#app
|
|
||||||
declare global {
|
|
||||||
namespace App {
|
|
||||||
// interface Error {}
|
|
||||||
// interface Locals {}
|
|
||||||
// interface PageData {}
|
|
||||||
// interface PageState {}
|
|
||||||
// interface Platform {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export {};
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<!doctype html>
|
|
||||||
<html lang="zh-CN">
|
|
||||||
<head>
|
|
||||||
<meta charset="utf-8" />
|
|
||||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
|
||||||
<link rel="preconnect" href="https://fonts.googleapis.com" />
|
|
||||||
<link
|
|
||||||
href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600&display=swap"
|
|
||||||
rel="stylesheet"
|
|
||||||
/>
|
|
||||||
%sveltekit.head%
|
|
||||||
</head>
|
|
||||||
<body data-sveltekit-preload-data="hover" style="height: 100%">
|
|
||||||
<div style="display: contents; height: 100%">%sveltekit.body%</div>
|
|
||||||
</body>
|
|
||||||
</html>
|
|
||||||
@@ -1,31 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/** 头像:有 avatarUrl 用图,否则显示首字母色块。 */
|
|
||||||
let {
|
|
||||||
displayName,
|
|
||||||
userId,
|
|
||||||
avatarUrl = null,
|
|
||||||
size = 28,
|
|
||||||
}: {
|
|
||||||
displayName?: string | null;
|
|
||||||
userId?: string | null;
|
|
||||||
avatarUrl?: string | null;
|
|
||||||
size?: number;
|
|
||||||
} = $props();
|
|
||||||
|
|
||||||
const initial = $derived((displayName || userId || "?").slice(0, 1).toUpperCase());
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#if avatarUrl}
|
|
||||||
<img
|
|
||||||
src={avatarUrl}
|
|
||||||
alt=""
|
|
||||||
class="shrink-0 rounded-full object-cover"
|
|
||||||
style="width:{size}px;height:{size}px"
|
|
||||||
/>
|
|
||||||
{:else}
|
|
||||||
<span
|
|
||||||
class="inline-flex shrink-0 items-center justify-center rounded-full bg-accent font-semibold text-white"
|
|
||||||
style="width:{size}px;height:{size}px;font-size:{Math.round(size * 0.42)}px"
|
|
||||||
aria-hidden="true">{initial}</span
|
|
||||||
>
|
|
||||||
{/if}
|
|
||||||
@@ -1,166 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { api, ApiError } from "./api.js";
|
|
||||||
import { toastOk, toastErr, toast } from "./stores.js";
|
|
||||||
import type { FileContent, VersionInfo, Role } from "./types.js";
|
|
||||||
import Modal from "./Modal.svelte";
|
|
||||||
import Icon from "./Icon.svelte";
|
|
||||||
|
|
||||||
let { projectId, path, role, onchanged, onclose }: { projectId: string; path: string; role: Role; onchanged: () => void; onclose?: () => void } = $props();
|
|
||||||
|
|
||||||
let file = $state<FileContent | null>(null);
|
|
||||||
let draft = $state("");
|
|
||||||
let loadError = $state<string | null>(null);
|
|
||||||
let conflict = $state<{ currentVersion: string; diff: string } | null>(null);
|
|
||||||
let showHistory = $state(false);
|
|
||||||
let history = $state<VersionInfo[]>([]);
|
|
||||||
|
|
||||||
const canEdit = $derived(role !== "VIEW");
|
|
||||||
|
|
||||||
async function load(): Promise<void> {
|
|
||||||
try {
|
|
||||||
file = await api<FileContent>(`/database/api/projects/${projectId}/file?path=${encodeURIComponent(path)}`);
|
|
||||||
draft = file.encoding === "utf8" ? file.content : "";
|
|
||||||
loadError = null;
|
|
||||||
conflict = null;
|
|
||||||
} catch (e) {
|
|
||||||
loadError = e instanceof Error ? e.message : String(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
void projectId;
|
|
||||||
void path;
|
|
||||||
void load();
|
|
||||||
});
|
|
||||||
|
|
||||||
async function save(): Promise<void> {
|
|
||||||
if (file === null) return;
|
|
||||||
try {
|
|
||||||
const r = await api<{ version: string }>(`/database/api/projects/${projectId}/file/commits`, {
|
|
||||||
method: "POST",
|
|
||||||
body: { path: file.path, baseVersion: file.version, content: draft },
|
|
||||||
});
|
|
||||||
toastOk("已提交 " + r.version);
|
|
||||||
await load();
|
|
||||||
onchanged();
|
|
||||||
} catch (e) {
|
|
||||||
if (e instanceof ApiError && e.status === 409 && typeof e.details?.["currentVersion"] === "string") {
|
|
||||||
await showConflict(e.details["currentVersion"]);
|
|
||||||
} else {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function showConflict(currentVersion: string): Promise<void> {
|
|
||||||
if (file === null) return;
|
|
||||||
try {
|
|
||||||
const r = await api<{ diff: string }>(
|
|
||||||
`/database/api/projects/${projectId}/file/diff?path=${encodeURIComponent(file.path)}&from=${encodeURIComponent(file.version)}&to=${encodeURIComponent(currentVersion)}`,
|
|
||||||
);
|
|
||||||
conflict = { currentVersion, diff: r.diff };
|
|
||||||
file = { ...file, version: currentVersion };
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function acceptLatest(): Promise<void> {
|
|
||||||
conflict = null;
|
|
||||||
await load();
|
|
||||||
toast("已载入最新内容,请在此基础上合并", "info");
|
|
||||||
}
|
|
||||||
|
|
||||||
async function remove(): Promise<void> {
|
|
||||||
if (file === null || !confirm("删除文件 " + file.path + "?")) return;
|
|
||||||
try {
|
|
||||||
await api(`/database/api/projects/${projectId}/file?path=${encodeURIComponent(file.path)}`, {
|
|
||||||
method: "DELETE",
|
|
||||||
body: { baseVersion: file.version },
|
|
||||||
});
|
|
||||||
toastOk("已删除");
|
|
||||||
file = null;
|
|
||||||
onchanged();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function openHistory(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const r = await api<{ history: VersionInfo[] }>(`/database/api/projects/${projectId}/file/history?path=${encodeURIComponent(path)}`);
|
|
||||||
history = r.history;
|
|
||||||
showHistory = true;
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function renderDiff(diff: string): string {
|
|
||||||
return diff
|
|
||||||
.replace(/&/g, "&").replace(/</g, "<").replace(/>/g, ">")
|
|
||||||
.replace(/^\+(.*)$/gm, '<span class="add">+$1</span>')
|
|
||||||
.replace(/^-(.*)$/gm, '<span class="del">-$1</span>');
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#if loadError}
|
|
||||||
<div class="panel text-xs text-danger">{loadError}</div>
|
|
||||||
{:else if file}
|
|
||||||
<div class="panel">
|
|
||||||
<div class="mb-2.5 flex items-center justify-between">
|
|
||||||
<span class="file-meta">{file.path} @ {file.version}</span>
|
|
||||||
<div class="flex items-center gap-1.5">
|
|
||||||
<a class="btn" href="/database/api/projects/{projectId}/file/raw?path={encodeURIComponent(file.path)}" download>下载</a>
|
|
||||||
<button class="btn" onclick={openHistory}><Icon name="clock" size={13} /> 历史</button>
|
|
||||||
{#if canEdit}
|
|
||||||
<button class="btn btn-danger" onclick={remove}><Icon name="trash" size={13} /> 删除文件</button>
|
|
||||||
{/if}
|
|
||||||
{#if onclose}
|
|
||||||
<button class="btn !px-2.5" onclick={onclose} title="关闭预览" aria-label="关闭预览">✕</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if file.encoding === "base64"}
|
|
||||||
<div class="quiet">二进制文件({file.size} B),不支持在线编辑</div>
|
|
||||||
{:else}
|
|
||||||
<textarea rows="14" class="textarea !leading-7" bind:value={draft} readonly={!canEdit}></textarea>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if canEdit && file.encoding !== "base64"}
|
|
||||||
<div class="mt-3 flex justify-end">
|
|
||||||
<button class="btn btn-primary" onclick={save}>提交修改</button>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if conflict}
|
|
||||||
<div class="mt-3.5 rounded-xl border border-[#E8E2C8] bg-[#FCFBF4] p-4">
|
|
||||||
<div class="mb-2 text-[13px] font-semibold text-[#6E6329]">冲突:他人已提交 {conflict.currentVersion},差异如下(你的基版 → 最新版)</div>
|
|
||||||
<pre class="diff rounded-lg border border-line-soft bg-panel p-3">{@html renderDiff(conflict.diff)}</pre>
|
|
||||||
<div class="mt-2 text-[11.5px] text-[#8A8059]">请人工合并后,以最新内容为全文重新提交(基版将更新为 {conflict.currentVersion})</div>
|
|
||||||
<div class="mt-2 flex justify-end">
|
|
||||||
<button class="btn" onclick={acceptLatest}>载入最新内容</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
<div class="panel quiet">加载中…</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if showHistory}
|
|
||||||
<Modal title="版本历史" onclose={() => (showHistory = false)}>
|
|
||||||
<div class="max-h-80 overflow-y-auto">
|
|
||||||
{#each history as v (v.version)}
|
|
||||||
<div class="border-t border-line-soft py-2 text-xs first:border-t-0">
|
|
||||||
<span class="font-mono text-accent">{v.version}</span> {v.message}
|
|
||||||
<div class="text-ink-3">{new Date(v.committedAt).toLocaleString("zh-CN")}{v.author ? " · " + v.author : ""}</div>
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
<div class="mt-3 flex justify-end">
|
|
||||||
<button class="btn" onclick={() => (showHistory = false)}>关闭</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { api } from "./api.js";
|
|
||||||
import { toastOk, toastErr } from "./stores.js";
|
|
||||||
import { selectedFilePath, filesVersion } from "./browser.js";
|
|
||||||
import type { FileEntry, NodeDetail } from "./types.js";
|
|
||||||
import Modal from "./Modal.svelte";
|
|
||||||
import Icon from "./Icon.svelte";
|
|
||||||
|
|
||||||
let { node }: { node: NodeDetail } = $props();
|
|
||||||
|
|
||||||
let files = $state<FileEntry[] | null>(null);
|
|
||||||
let loadError = $state<string | null>(null);
|
|
||||||
let showNewFile = $state(false);
|
|
||||||
let newPath = $state("");
|
|
||||||
let newContent = $state("");
|
|
||||||
// bind:this 的目标要用 $state,否则 svelte 5 warn 不会正确更新。
|
|
||||||
let uploadInput = $state<HTMLInputElement | null>(null);
|
|
||||||
|
|
||||||
const canEdit = $derived(node.role !== "VIEW");
|
|
||||||
|
|
||||||
async function loadFiles(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const r = await api<{ files: FileEntry[] }>(`/database/api/projects/${node.id}/files`);
|
|
||||||
files = r.files;
|
|
||||||
loadError = null;
|
|
||||||
} catch (e) {
|
|
||||||
loadError = e instanceof Error ? e.message : String(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
void node.id;
|
|
||||||
void $filesVersion;
|
|
||||||
void loadFiles();
|
|
||||||
});
|
|
||||||
|
|
||||||
async function submitNewFile(): Promise<void> {
|
|
||||||
const path = newPath.trim();
|
|
||||||
if (path === "") return;
|
|
||||||
try {
|
|
||||||
await api(`/database/api/projects/${node.id}/file`, {
|
|
||||||
method: "PUT",
|
|
||||||
body: { path, content: newContent },
|
|
||||||
});
|
|
||||||
toastOk("已创建");
|
|
||||||
showNewFile = false;
|
|
||||||
newPath = ""; newContent = "";
|
|
||||||
await loadFiles();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function u8ToBase64(bytes: Uint8Array): string {
|
|
||||||
let bin = "";
|
|
||||||
const CHUNK = 0x8000;
|
|
||||||
for (let i = 0; i < bytes.length; i += CHUNK) {
|
|
||||||
bin += String.fromCharCode.apply(null, Array.from(bytes.subarray(i, i + CHUNK)) as unknown as number[]);
|
|
||||||
}
|
|
||||||
return btoa(bin);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function doUpload(e: Event): Promise<void> {
|
|
||||||
const input = e.target as HTMLInputElement;
|
|
||||||
const file = input.files?.[0];
|
|
||||||
input.value = "";
|
|
||||||
if (!file) return;
|
|
||||||
if (file.size > 10 * 1024 * 1024) {
|
|
||||||
toastErr("文件超过 10MB 上限");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const targetPath = prompt("保存到路径(可含目录):", "材料/" + file.name);
|
|
||||||
if (!targetPath) return;
|
|
||||||
const bytes = new Uint8Array(await file.arrayBuffer());
|
|
||||||
const isBinary = bytes.includes(0);
|
|
||||||
const body = isBinary
|
|
||||||
? { path: targetPath, content: u8ToBase64(bytes), encoding: "base64" }
|
|
||||||
: { path: targetPath, content: new TextDecoder("utf-8").decode(bytes), encoding: "utf8" };
|
|
||||||
try {
|
|
||||||
await api(`/database/api/projects/${node.id}/file`, { method: "PUT", body });
|
|
||||||
toastOk("已上传 " + file.name);
|
|
||||||
await loadFiles();
|
|
||||||
} catch (err) {
|
|
||||||
toastErr(err instanceof Error ? err.message : String(err));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="panel">
|
|
||||||
<div class="mb-1.5 flex items-center justify-between">
|
|
||||||
<div class="section-title">项目文件({files?.length ?? 0})</div>
|
|
||||||
{#if canEdit}
|
|
||||||
<div class="flex gap-1.5">
|
|
||||||
<button class="btn" onclick={() => (showNewFile = true)}><Icon name="plus" size={13} /> 新建文件</button>
|
|
||||||
<button class="btn btn-primary" onclick={() => uploadInput?.click()}>上传文件</button>
|
|
||||||
<input bind:this={uploadInput} type="file" class="hidden" onchange={doUpload} />
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if files === null && loadError === null}
|
|
||||||
<div class="quiet py-5 text-center">加载中…</div>
|
|
||||||
{:else if loadError}
|
|
||||||
<div class="py-5 text-center text-xs text-danger">{loadError}</div>
|
|
||||||
{:else if files && files.length === 0}
|
|
||||||
<div class="quiet py-5 text-center">空仓库 · 可新建或上传文件</div>
|
|
||||||
{:else if files}
|
|
||||||
<table class="list">
|
|
||||||
<tbody>
|
|
||||||
{#each files as f (f.path)}
|
|
||||||
<tr
|
|
||||||
class="cursor-pointer {$selectedFilePath === f.path ? 'bg-selected' : 'hover:bg-hover'}"
|
|
||||||
onclick={() => selectedFilePath.set(f.path)}
|
|
||||||
>
|
|
||||||
<td class="font-mono text-[12.5px] text-ink">{f.path}</td>
|
|
||||||
<td class="file-meta text-right">{f.size} B</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if showNewFile}
|
|
||||||
<Modal title="新建文件" onclose={() => (showNewFile = false)}>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="nf-path">路径</label>
|
|
||||||
<input id="nf-path" class="input font-mono" bind:value={newPath} placeholder="docs/intro.md" />
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="nf-content">内容</label>
|
|
||||||
<textarea id="nf-content" rows="8" class="textarea" bind:value={newContent} placeholder="内容…"></textarea>
|
|
||||||
</div>
|
|
||||||
<div class="mt-4 flex justify-end gap-2">
|
|
||||||
<button class="btn" onclick={() => (showNewFile = false)}>取消</button>
|
|
||||||
<button class="btn btn-primary" onclick={submitNewFile}>创建</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
@@ -1,381 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* 节点授权面板(表格化改版)。迁自已删除的 routes/libraryBrowser.ts
|
|
||||||
* `renderGrantsTab`(ADR-0029)。
|
|
||||||
*
|
|
||||||
* 布局:顶部工具条(左:授权成员搜索框;右:「+ 添加授权」弹窗入口);
|
|
||||||
* 下方一行一条授权 —— 成员(名称+id,点击跳用户管理/Group 管理)、
|
|
||||||
* 类型(个人/Group)、权限(下拉可改)、加入时间、操作(删除)。
|
|
||||||
*
|
|
||||||
* 语义(契约 8.1 / ADR-0021 / ADR-0028):
|
|
||||||
* - 创建者授权(isCreatorGrant)不可收回、不可改;
|
|
||||||
* - MANAGE 仅创建者可授,前端不做矩阵拦截 —— 后端 fail closed,报错原样 toast;
|
|
||||||
* - GROUP 主体走 in-hub MemberGroup,/groups/search 搜索选(MANAGE 即可);
|
|
||||||
* USER 主体用 /users/search(仅网站管理员),老师端无此权限时回落手输 id。
|
|
||||||
*/
|
|
||||||
import { api } from "./api.js";
|
|
||||||
import { toastOk, toastErr } from "./stores.js";
|
|
||||||
import { ROLE_LABEL } from "./labels.js";
|
|
||||||
import type { Grant, MemberGroupSearchResult, NodeDetail, Role, UserSearchResult } from "./types.js";
|
|
||||||
import Icon from "./Icon.svelte";
|
|
||||||
import Modal from "./Modal.svelte";
|
|
||||||
import Avatar from "./Avatar.svelte";
|
|
||||||
|
|
||||||
let { node }: { node: NodeDetail } = $props();
|
|
||||||
|
|
||||||
const ROLES: readonly Role[] = ["VIEW", "EDIT", "MANAGE"];
|
|
||||||
|
|
||||||
interface PrincipalOption {
|
|
||||||
readonly id: string;
|
|
||||||
readonly label: string;
|
|
||||||
readonly sub: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
let grants = $state<Grant[] | null>(null);
|
|
||||||
let error = $state<string | null>(null);
|
|
||||||
let searchText = $state("");
|
|
||||||
|
|
||||||
// 添加授权弹窗
|
|
||||||
let showAdd = $state(false);
|
|
||||||
let principalType = $state<"USER" | "GROUP">("USER");
|
|
||||||
let principalQuery = $state("");
|
|
||||||
let principalOptions = $state<readonly PrincipalOption[] | null>(null);
|
|
||||||
let selectedPrincipal = $state<{ readonly id: string; readonly label: string } | null>(null);
|
|
||||||
let manualId = $state("");
|
|
||||||
let searchUnavailable = $state(false);
|
|
||||||
let role = $state<Role>("VIEW");
|
|
||||||
let saving = $state(false);
|
|
||||||
let searchSeq = 0;
|
|
||||||
let searchTimer: ReturnType<typeof setTimeout> | undefined;
|
|
||||||
|
|
||||||
const canManage = $derived(node.role === "MANAGE");
|
|
||||||
const errText = (e: unknown): string => (e instanceof Error ? e.message : String(e));
|
|
||||||
|
|
||||||
/** 工具条搜索:按名称 / id / 类型过滤当前授权行(纯前端过滤,数据已全量在手)。 */
|
|
||||||
const shown = $derived.by((): Grant[] | null => {
|
|
||||||
if (grants === null) return null;
|
|
||||||
const q = searchText.trim().toLowerCase();
|
|
||||||
if (q === "") return grants;
|
|
||||||
return grants.filter(
|
|
||||||
(g) =>
|
|
||||||
g.principalId.toLowerCase().includes(q) ||
|
|
||||||
(g.principalName ?? "").toLowerCase().includes(q) ||
|
|
||||||
(g.principalOpenId ?? "").toLowerCase().includes(q) ||
|
|
||||||
(g.principalType === "USER" ? "个人" : "group").includes(q),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
void node.id;
|
|
||||||
void load();
|
|
||||||
});
|
|
||||||
|
|
||||||
async function load(): Promise<void> {
|
|
||||||
grants = null;
|
|
||||||
error = null;
|
|
||||||
try {
|
|
||||||
const r = await api<{ grants: Grant[] }>(`/database/api/nodes/${node.id}/grants`);
|
|
||||||
grants = r.grants;
|
|
||||||
} catch (e) {
|
|
||||||
error = errText(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 成员单元格跳转:USER → 用户管理(带过滤词);GROUP → Group 管理(选中该组)。 */
|
|
||||||
function principalHref(g: Grant): string {
|
|
||||||
return g.principalType === "USER"
|
|
||||||
? `/database/dashboard/users?q=${encodeURIComponent(g.principalId)}`
|
|
||||||
: `/database/dashboard/groups?select=${encodeURIComponent(g.principalId)}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function fmtDate(iso: string): string {
|
|
||||||
try {
|
|
||||||
return new Date(iso).toLocaleString("zh-CN", { dateStyle: "medium", timeStyle: "short" });
|
|
||||||
} catch {
|
|
||||||
return iso;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------ 添加授权弹窗 */
|
|
||||||
|
|
||||||
function openAdd(): void {
|
|
||||||
showAdd = true;
|
|
||||||
principalType = "USER";
|
|
||||||
principalQuery = "";
|
|
||||||
principalOptions = null;
|
|
||||||
selectedPrincipal = null;
|
|
||||||
manualId = "";
|
|
||||||
searchUnavailable = false;
|
|
||||||
role = "VIEW";
|
|
||||||
void searchPrincipals("");
|
|
||||||
}
|
|
||||||
|
|
||||||
function onTypeChange(): void {
|
|
||||||
principalQuery = "";
|
|
||||||
principalOptions = null;
|
|
||||||
selectedPrincipal = null;
|
|
||||||
manualId = "";
|
|
||||||
searchUnavailable = false;
|
|
||||||
void searchPrincipals("");
|
|
||||||
}
|
|
||||||
|
|
||||||
function onQueryInput(): void {
|
|
||||||
selectedPrincipal = null;
|
|
||||||
if (searchTimer !== undefined) clearTimeout(searchTimer);
|
|
||||||
const q = principalQuery.trim();
|
|
||||||
searchTimer = setTimeout(() => void searchPrincipals(q), 250);
|
|
||||||
}
|
|
||||||
|
|
||||||
async function searchPrincipals(q: string): Promise<void> {
|
|
||||||
// seq 防乱序:慢响应不覆盖新查询的结果。
|
|
||||||
const seq = ++searchSeq;
|
|
||||||
try {
|
|
||||||
if (principalType === "USER") {
|
|
||||||
const r = await api<{ users: UserSearchResult[] }>(
|
|
||||||
`/database/api/users/search?q=${encodeURIComponent(q)}`,
|
|
||||||
);
|
|
||||||
if (seq !== searchSeq) return;
|
|
||||||
principalOptions = r.users.map((u) => ({
|
|
||||||
id: u.userId,
|
|
||||||
label: u.displayName === "" ? u.userId : u.displayName,
|
|
||||||
sub: u.feishuOpenId,
|
|
||||||
}));
|
|
||||||
} else {
|
|
||||||
const r = await api<{ groups: MemberGroupSearchResult[] }>(
|
|
||||||
`/database/api/groups/search?q=${encodeURIComponent(q)}`,
|
|
||||||
);
|
|
||||||
if (seq !== searchSeq) return;
|
|
||||||
principalOptions = r.groups.map((g) => ({ id: g.id, label: g.name, sub: g.breadcrumb }));
|
|
||||||
}
|
|
||||||
searchUnavailable = false;
|
|
||||||
} catch {
|
|
||||||
if (seq !== searchSeq) return;
|
|
||||||
// 老师端 MANAGE 持有者没有 users/search 权限(403)——回落为手输 id。
|
|
||||||
principalOptions = null;
|
|
||||||
searchUnavailable = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function pick(option: PrincipalOption): void {
|
|
||||||
selectedPrincipal = { id: option.id, label: option.label };
|
|
||||||
principalQuery = option.label;
|
|
||||||
principalOptions = null;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function addGrant(): Promise<void> {
|
|
||||||
const principalId = selectedPrincipal?.id ?? manualId.trim();
|
|
||||||
if (principalId === "") {
|
|
||||||
toastErr("请选择或填写授权主体");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
saving = true;
|
|
||||||
try {
|
|
||||||
// PUT /grants 是 upsert 语义(putGrants):同主体已有授权则改级别,否则新建。
|
|
||||||
await api(`/database/api/nodes/${node.id}/grants`, {
|
|
||||||
method: "PUT",
|
|
||||||
body: { grants: [{ principalType, principalId, role }] },
|
|
||||||
});
|
|
||||||
toastOk("已授予");
|
|
||||||
showAdd = false;
|
|
||||||
await load();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
} finally {
|
|
||||||
saving = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 权限下拉改级别:复用 PUT upsert;被 8.1 矩阵拒绝时 toast 并 reload 回显真实态。 */
|
|
||||||
async function changeRole(g: Grant, next: Role): Promise<void> {
|
|
||||||
if (next === g.role) return;
|
|
||||||
try {
|
|
||||||
await api(`/database/api/nodes/${node.id}/grants`, {
|
|
||||||
method: "PUT",
|
|
||||||
body: { grants: [{ principalType: g.principalType, principalId: g.principalId, role: next }] },
|
|
||||||
});
|
|
||||||
toastOk("权限已更新");
|
|
||||||
await load();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
await load();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function revoke(g: Grant): Promise<void> {
|
|
||||||
if (!confirm(`删除「${g.principalName ?? g.principalId}」的${ROLE_LABEL[g.role]}授权?`)) return;
|
|
||||||
try {
|
|
||||||
await api(`/database/api/nodes/${node.id}/grants/${encodeURIComponent(g.id)}`, {
|
|
||||||
method: "DELETE",
|
|
||||||
});
|
|
||||||
toastOk("已删除");
|
|
||||||
await load();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="panel">
|
|
||||||
<!-- 工具条:左侧授权成员搜索框,右侧添加授权入口 -->
|
|
||||||
<div class="mb-3 flex items-center gap-2">
|
|
||||||
<div class="relative min-w-0 flex-1">
|
|
||||||
<span class="pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 text-ink-3">
|
|
||||||
<Icon name="search" size={14} />
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
class="input w-full !pl-8"
|
|
||||||
placeholder="搜索授权成员(名称 / id / 类型)"
|
|
||||||
bind:value={searchText}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
{#if canManage}
|
|
||||||
<button class="btn btn-primary shrink-0" onclick={openAdd}>
|
|
||||||
<Icon name="plus" size={13} /> 添加授权
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if error !== null}
|
|
||||||
<div class="py-2 text-[12.5px] text-danger">{error}</div>
|
|
||||||
{:else if shown === null}
|
|
||||||
<div class="quiet py-[18px] text-center">加载中…</div>
|
|
||||||
{:else}
|
|
||||||
<!-- 内容不可断行(头像名/id/日期/下拉)可能超宽:溢出时横向滚动,
|
|
||||||
而不是把表格挤变形或顶出 panel 右边界(文件预览打开时主区变窄)。 -->
|
|
||||||
<div class="overflow-x-auto">
|
|
||||||
<table class="list">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th class="whitespace-nowrap pr-4">成员</th>
|
|
||||||
<th class="whitespace-nowrap pr-4">userId</th>
|
|
||||||
<th class="whitespace-nowrap pr-4">飞书 ID</th>
|
|
||||||
<th class="whitespace-nowrap pr-4">类型</th>
|
|
||||||
<th class="whitespace-nowrap pr-4">权限</th>
|
|
||||||
<th class="whitespace-nowrap pr-4">加入时间</th>
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{#if shown.length === 0}
|
|
||||||
<tr>
|
|
||||||
<td colspan="7" class="quiet !py-[18px] text-center">
|
|
||||||
{searchText.trim() === "" ? "暂无授权" : `无匹配「${searchText.trim()}」的授权`}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{:else}
|
|
||||||
{#each shown as g (g.id)}
|
|
||||||
<tr>
|
|
||||||
<td class="whitespace-nowrap pr-4">
|
|
||||||
<a class="inline-flex items-center gap-2 text-ink hover:text-accent" href={principalHref(g)}>
|
|
||||||
<Avatar displayName={g.principalName} userId={g.principalId} size={26} />
|
|
||||||
<span class="flex items-center gap-1.5 text-[13px]">
|
|
||||||
{g.principalName ?? g.principalId}
|
|
||||||
{#if g.isCreatorGrant}<span class="quiet">(创建者)</span>{/if}
|
|
||||||
</span>
|
|
||||||
</a>
|
|
||||||
</td>
|
|
||||||
<td class="file-meta max-w-[230px] truncate pr-4 font-mono" title={g.principalType === "USER" ? g.principalId : ""}>
|
|
||||||
{g.principalType === "USER" ? g.principalId : "—"}
|
|
||||||
</td>
|
|
||||||
<td class="file-meta max-w-[230px] truncate pr-4 font-mono" title={g.principalOpenId ?? ""}>
|
|
||||||
{g.principalOpenId ?? "—"}
|
|
||||||
</td>
|
|
||||||
<td class="whitespace-nowrap pr-4"><span class="tag">{g.principalType === "USER" ? "个人" : "Group"}</span></td>
|
|
||||||
<td class="whitespace-nowrap pr-4">
|
|
||||||
<!-- 创建者授权不可动(契约 8.1);非 MANAGE 持有者只读。 -->
|
|
||||||
{#if !g.isCreatorGrant && canManage}
|
|
||||||
<select
|
|
||||||
class="select !w-[110px]"
|
|
||||||
value={g.role}
|
|
||||||
onchange={(e) => void changeRole(g, e.currentTarget.value as Role)}
|
|
||||||
>
|
|
||||||
{#each ROLES as r (r)}
|
|
||||||
<option value={r}>{ROLE_LABEL[r]}</option>
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
{:else}
|
|
||||||
<span class="file-meta">{ROLE_LABEL[g.role]}</span>
|
|
||||||
{/if}
|
|
||||||
</td>
|
|
||||||
<td class="file-meta whitespace-nowrap pr-4">{fmtDate(g.createdAt)}</td>
|
|
||||||
<td class="whitespace-nowrap pr-2 text-right">
|
|
||||||
{#if !g.isCreatorGrant && canManage}
|
|
||||||
<button class="link-danger inline-flex items-center gap-1" onclick={() => void revoke(g)}>
|
|
||||||
<Icon name="trash" size={12} /> 删除
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
{/if}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if showAdd}
|
|
||||||
<Modal title="添加授权" onclose={() => (showAdd = false)}>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="grant-type">类型</label>
|
|
||||||
<select id="grant-type" class="select" bind:value={principalType} onchange={onTypeChange}>
|
|
||||||
<option value="USER">个人</option>
|
|
||||||
<option value="GROUP">Group</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="grant-principal">{principalType === "USER" ? "用户" : "Group"}</label>
|
|
||||||
<input
|
|
||||||
id="grant-principal"
|
|
||||||
class="input"
|
|
||||||
placeholder={principalType === "USER" ? "搜索显示名 / openId" : "搜索组名"}
|
|
||||||
bind:value={principalQuery}
|
|
||||||
oninput={onQueryInput}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
{#if selectedPrincipal !== null}
|
|
||||||
<div class="form-row">
|
|
||||||
<span class="form-label">已选</span>
|
|
||||||
<span class="quiet self-center text-[12.5px]">
|
|
||||||
{selectedPrincipal.label}<span class="font-mono">({selectedPrincipal.id})</span>
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
{#if principalOptions !== null && principalOptions.length > 0}
|
|
||||||
<div class="mb-3 max-h-[180px] overflow-y-auto rounded-lg border border-line-soft">
|
|
||||||
{#each principalOptions as o (o.id)}
|
|
||||||
<button class="block w-full px-3 py-2 text-left hover:bg-hover" onclick={() => pick(o)}>
|
|
||||||
<span class="block text-[13px] text-ink">{o.label}</span>
|
|
||||||
<span class="block font-mono text-[11px] text-ink-3">{o.sub}</span>
|
|
||||||
</button>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{:else if searchUnavailable}
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="grant-manual-id">主体 id</label>
|
|
||||||
<input
|
|
||||||
id="grant-manual-id"
|
|
||||||
class="input font-mono"
|
|
||||||
placeholder="无搜索权限,请直接填写 id"
|
|
||||||
bind:value={manualId}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
{:else if principalOptions !== null}
|
|
||||||
<div class="quiet mb-3 py-2 text-center text-[12px]">无匹配结果</div>
|
|
||||||
{/if}
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="grant-role">权限</label>
|
|
||||||
<select id="grant-role" class="select" bind:value={role}>
|
|
||||||
{#each ROLES as r (r)}
|
|
||||||
<option value={r}>{ROLE_LABEL[r]}</option>
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="mt-4 flex justify-end gap-2">
|
|
||||||
<button class="btn" onclick={() => (showAdd = false)}>取消</button>
|
|
||||||
<button class="btn btn-primary disabled:opacity-50" onclick={addGrant} disabled={saving}>
|
|
||||||
{saving ? "授予中…" : "添加"}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
@@ -1,769 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* Group 管理面板。从已删除的 routes/adminPanels.ts `renderGroupsPanel`(747 行)
|
|
||||||
* 迁来(ADR-0029),功能与视觉逐条对齐:折叠树 / 组名过滤(命中项保留祖先链)/
|
|
||||||
* 归档组展示与恢复 / 右键菜单 / 面包屑 / 统计条 / 成员表(头像·openId·加入时间)。
|
|
||||||
*/
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { page } from "$app/state";
|
|
||||||
import { api } from "./api.js";
|
|
||||||
import { toastErr, toastOk } from "./stores.js";
|
|
||||||
import type { MemberGroupNode, MemberGroupMember, UserSearchResult } from "./types.js";
|
|
||||||
import Modal from "./Modal.svelte";
|
|
||||||
import Icon from "./Icon.svelte";
|
|
||||||
import Avatar from "./Avatar.svelte";
|
|
||||||
|
|
||||||
// 后端返回扁平列表(ADR-0028);前端按 parentId/depth 拼成有序树。
|
|
||||||
let groups = $state<MemberGroupNode[]>([]);
|
|
||||||
let loaded = $state(false);
|
|
||||||
let listError = $state<string | null>(null);
|
|
||||||
let selectedId = $state<string | null>(null);
|
|
||||||
|
|
||||||
// 折叠的组 id(默认全展开)。用数组而非 Set:$state 的深层代理只跟踪普通对象/
|
|
||||||
// 数组,Set 的变更不会触发重渲染。
|
|
||||||
let collapsedIds = $state<string[]>([]);
|
|
||||||
const isCollapsed = (id: string): boolean => collapsedIds.includes(id);
|
|
||||||
const toggleCollapsed = (id: string): void => {
|
|
||||||
collapsedIds = isCollapsed(id) ? collapsedIds.filter((x) => x !== id) : [...collapsedIds, id];
|
|
||||||
};
|
|
||||||
|
|
||||||
let filterText = $state("");
|
|
||||||
let showArchived = $state(false);
|
|
||||||
|
|
||||||
let members = $state<MemberGroupMember[]>([]);
|
|
||||||
let membersLoaded = $state(false);
|
|
||||||
let membersError = $state<string | null>(null);
|
|
||||||
let memberFilter = $state("");
|
|
||||||
|
|
||||||
const selected = $derived(groups.find((g) => g.id === selectedId) ?? null);
|
|
||||||
const isArchived = $derived(selected?.archivedAt != null);
|
|
||||||
|
|
||||||
interface Row {
|
|
||||||
readonly g: MemberGroupNode;
|
|
||||||
readonly hasKids: boolean;
|
|
||||||
/** 过滤态下:自身是否命中(祖先链上的非命中项半透明显示)。 */
|
|
||||||
readonly hit: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 扁平列表 → 先根遍历顺序;折叠的子树整段跳过。过滤时命中项的祖先链保留。 */
|
|
||||||
const rows = $derived.by((): Row[] => {
|
|
||||||
const byParent = new Map<string | null, MemberGroupNode[]>();
|
|
||||||
const byId = new Map<string, MemberGroupNode>();
|
|
||||||
for (const g of groups) {
|
|
||||||
byId.set(g.id, g);
|
|
||||||
const arr = byParent.get(g.parentId) ?? [];
|
|
||||||
arr.push(g);
|
|
||||||
byParent.set(g.parentId, arr);
|
|
||||||
}
|
|
||||||
for (const arr of byParent.values()) arr.sort((a, b) => a.name.localeCompare(b.name, "zh-CN"));
|
|
||||||
|
|
||||||
// 过滤:命中集 = 名字命中的组 ∪ 其全部祖先(否则命中的深层组无路径可展示)。
|
|
||||||
const q = filterText.trim().toLowerCase();
|
|
||||||
let keep: Set<string> | null = null;
|
|
||||||
if (q !== "") {
|
|
||||||
keep = new Set<string>();
|
|
||||||
for (const g of groups) {
|
|
||||||
if (!g.name.toLowerCase().includes(q)) continue;
|
|
||||||
let cur: MemberGroupNode | undefined = g;
|
|
||||||
while (cur !== undefined) {
|
|
||||||
keep.add(cur.id);
|
|
||||||
cur = cur.parentId === null ? undefined : byId.get(cur.parentId);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const out: Row[] = [];
|
|
||||||
const walk = (parentId: string | null): void => {
|
|
||||||
for (const g of byParent.get(parentId) ?? []) {
|
|
||||||
if (keep !== null && !keep.has(g.id)) continue;
|
|
||||||
const kids = (byParent.get(g.id) ?? []).filter((k) => keep === null || keep.has(k.id));
|
|
||||||
out.push({ g, hasKids: kids.length > 0, hit: q === "" || g.name.toLowerCase().includes(q) });
|
|
||||||
// 过滤态下强制展开(否则命中项被折叠的祖先藏住)。
|
|
||||||
if (keep !== null || !isCollapsed(g.id)) walk(g.id);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
walk(null);
|
|
||||||
// 兜底:父不在列表的孤儿(级联软删理论上不产生)也列出,避免"看不见"。
|
|
||||||
const seen = new Set(out.map((r) => r.g.id));
|
|
||||||
for (const g of groups) {
|
|
||||||
if (seen.has(g.id)) continue;
|
|
||||||
if (keep !== null && !keep.has(g.id)) continue;
|
|
||||||
out.push({ g, hasKids: false, hit: true });
|
|
||||||
}
|
|
||||||
return out;
|
|
||||||
});
|
|
||||||
|
|
||||||
const treeFoot = $derived.by(() => {
|
|
||||||
const active = groups.filter((g) => g.archivedAt === null);
|
|
||||||
const archivedN = groups.length - active.length;
|
|
||||||
const totalMembers = active.reduce((n, g) => n + g.memberCount, 0);
|
|
||||||
return (
|
|
||||||
`${active.length} 个活跃组 · ${totalMembers} 条成员关系` +
|
|
||||||
(archivedN > 0 ? ` · ${archivedN} 个已删除` : "")
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
/** 面包屑:祖先链(根在前,自身在末)。 */
|
|
||||||
const chain = $derived.by((): MemberGroupNode[] => {
|
|
||||||
if (selected === null) return [];
|
|
||||||
const byId = new Map(groups.map((g) => [g.id, g]));
|
|
||||||
const out: MemberGroupNode[] = [];
|
|
||||||
for (let cur: MemberGroupNode | undefined = selected; cur !== undefined; ) {
|
|
||||||
out.unshift(cur);
|
|
||||||
cur = cur.parentId === null ? undefined : byId.get(cur.parentId);
|
|
||||||
}
|
|
||||||
return out;
|
|
||||||
});
|
|
||||||
|
|
||||||
const childCount = $derived(groups.filter((g) => g.parentId === selectedId).length);
|
|
||||||
|
|
||||||
const shownMembers = $derived.by(() => {
|
|
||||||
const q = memberFilter.trim().toLowerCase();
|
|
||||||
if (q === "") return members;
|
|
||||||
return members.filter(
|
|
||||||
(m) =>
|
|
||||||
m.displayName.toLowerCase().includes(q) ||
|
|
||||||
m.userId.toLowerCase().includes(q) ||
|
|
||||||
m.feishuOpenId.toLowerCase().includes(q),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
function fmtDate(iso: string): string {
|
|
||||||
try {
|
|
||||||
return new Date(iso).toLocaleString("zh-CN", { dateStyle: "medium", timeStyle: "short" });
|
|
||||||
} catch {
|
|
||||||
return iso;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const errText = (e: unknown): string => (e instanceof Error ? e.message : String(e));
|
|
||||||
|
|
||||||
async function loadGroups(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const r = await api<{ groups: MemberGroupNode[] }>(
|
|
||||||
`/database/api/groups${showArchived ? "?includeArchived=1" : ""}`,
|
|
||||||
);
|
|
||||||
groups = r.groups;
|
|
||||||
listError = null;
|
|
||||||
loaded = true;
|
|
||||||
if (selectedId !== null && !groups.some((g) => g.id === selectedId)) {
|
|
||||||
selectedId = null;
|
|
||||||
members = [];
|
|
||||||
membersLoaded = false;
|
|
||||||
}
|
|
||||||
} catch (e) {
|
|
||||||
listError = errText(e);
|
|
||||||
loaded = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function loadMembers(): Promise<void> {
|
|
||||||
if (selectedId === null) return;
|
|
||||||
membersLoaded = false;
|
|
||||||
membersError = null;
|
|
||||||
try {
|
|
||||||
const r = await api<{ members: MemberGroupMember[] }>(
|
|
||||||
`/database/api/groups/${encodeURIComponent(selectedId)}/members`,
|
|
||||||
);
|
|
||||||
members = r.members;
|
|
||||||
membersLoaded = true;
|
|
||||||
} catch (e) {
|
|
||||||
membersError = errText(e);
|
|
||||||
membersLoaded = true;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
await loadGroups();
|
|
||||||
// 授权面板「成员」单元格跳转:?select=<groupId> 直接选中该组。
|
|
||||||
// 组不在列表(已归档且未开归档展示)时不动作,停留默认态。
|
|
||||||
const target = page.url.searchParams.get("select");
|
|
||||||
if (target !== null && groups.some((g) => g.id === target)) select(target);
|
|
||||||
});
|
|
||||||
|
|
||||||
function select(id: string): void {
|
|
||||||
selectedId = id;
|
|
||||||
memberFilter = "";
|
|
||||||
void loadMembers();
|
|
||||||
}
|
|
||||||
|
|
||||||
async function toggleArchived(): Promise<void> {
|
|
||||||
showArchived = !showArchived;
|
|
||||||
await loadGroups();
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------------- 右键菜单 ---------------- */
|
|
||||||
|
|
||||||
interface MenuItem {
|
|
||||||
readonly label?: string;
|
|
||||||
readonly ic?: import("./Icon.svelte").IconName;
|
|
||||||
readonly danger?: boolean;
|
|
||||||
readonly sep?: boolean;
|
|
||||||
readonly fn?: () => void;
|
|
||||||
}
|
|
||||||
|
|
||||||
let menu = $state<{ x: number; y: number; items: MenuItem[] } | null>(null);
|
|
||||||
|
|
||||||
function openMenu(e: MouseEvent, target: MemberGroupNode | null): void {
|
|
||||||
e.preventDefault();
|
|
||||||
// 已归档组:只给「恢复」—— 归档态下不允许建子组/加成员/改名(后端亦 404 兜底)。
|
|
||||||
const items: MenuItem[] =
|
|
||||||
target === null
|
|
||||||
? [{ label: "新建根 Group", ic: "plus", fn: () => openCreate(null) }]
|
|
||||||
: target.archivedAt !== null
|
|
||||||
? [
|
|
||||||
{ label: "查看成员(只读)", ic: "users", fn: () => select(target.id) },
|
|
||||||
{ label: "恢复此 Group", ic: "restore", fn: () => void restoreGroup(target) },
|
|
||||||
{ sep: true },
|
|
||||||
{ label: "新建根 Group", ic: "layers", fn: () => openCreate(null) },
|
|
||||||
]
|
|
||||||
: [
|
|
||||||
{ label: "新建子 Group", ic: "plus", fn: () => openCreate(target) },
|
|
||||||
{ label: "添加成员", ic: "user", fn: () => { select(target.id); openAddMember(); } },
|
|
||||||
{ label: "重命名 / 改描述", ic: "pencil", fn: () => openRename(target) },
|
|
||||||
{ sep: true },
|
|
||||||
{ label: "新建根 Group", ic: "layers", fn: () => openCreate(null) },
|
|
||||||
{ label: "删除(级联子树)", ic: "trash", danger: true, fn: () => void deleteGroup(target) },
|
|
||||||
];
|
|
||||||
// 贴边翻转,避免菜单溢出视口(菜单宽 184、每项约 34)。
|
|
||||||
const w = 184;
|
|
||||||
const h = items.reduce((n, it) => n + (it.sep === true ? 9 : 34), 10);
|
|
||||||
menu = {
|
|
||||||
x: Math.min(e.clientX, window.innerWidth - w - 8),
|
|
||||||
y: Math.min(e.clientY, window.innerHeight - h - 8),
|
|
||||||
items,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
/* ---------------- 弹窗 ---------------- */
|
|
||||||
|
|
||||||
let showCreate = $state(false);
|
|
||||||
let createParent = $state<MemberGroupNode | null>(null);
|
|
||||||
let newName = $state("");
|
|
||||||
let newDesc = $state("");
|
|
||||||
|
|
||||||
let showRename = $state(false);
|
|
||||||
let renameTarget = $state<MemberGroupNode | null>(null);
|
|
||||||
let editName = $state("");
|
|
||||||
let editDesc = $state("");
|
|
||||||
|
|
||||||
let showAdd = $state(false);
|
|
||||||
let addQuery = $state("");
|
|
||||||
let addResults = $state<UserSearchResult[]>([]);
|
|
||||||
let addSearching = $state(false);
|
|
||||||
|
|
||||||
function openCreate(parent: MemberGroupNode | null): void {
|
|
||||||
createParent = parent;
|
|
||||||
newName = "";
|
|
||||||
newDesc = "";
|
|
||||||
showCreate = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function createGroup(): Promise<void> {
|
|
||||||
const name = newName.trim();
|
|
||||||
if (name === "") {
|
|
||||||
toastErr("名称必填");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const parentId = createParent?.id ?? null;
|
|
||||||
try {
|
|
||||||
await api("/database/api/groups", {
|
|
||||||
method: "POST",
|
|
||||||
body: { name, parentId, ...(newDesc.trim() !== "" ? { description: newDesc.trim() } : {}) },
|
|
||||||
});
|
|
||||||
showCreate = false;
|
|
||||||
// 建完自动展开父节点,否则新子组藏在折叠的父下面看不见。
|
|
||||||
if (parentId !== null) collapsedIds = collapsedIds.filter((x) => x !== parentId);
|
|
||||||
toastOk("已创建成员组");
|
|
||||||
await loadGroups();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function openRename(g: MemberGroupNode): void {
|
|
||||||
renameTarget = g;
|
|
||||||
editName = g.name;
|
|
||||||
editDesc = g.description ?? "";
|
|
||||||
showRename = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveRename(): Promise<void> {
|
|
||||||
if (renameTarget === null) return;
|
|
||||||
const name = editName.trim();
|
|
||||||
if (name === "") {
|
|
||||||
toastErr("名称必填");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
// description 总是回传(含空串)—— 空串即清除描述(ADR-0028 决策6)。
|
|
||||||
await api(`/database/api/groups/${encodeURIComponent(renameTarget.id)}`, {
|
|
||||||
method: "PATCH",
|
|
||||||
body: { name, description: editDesc.trim() },
|
|
||||||
});
|
|
||||||
showRename = false;
|
|
||||||
toastOk("已保存");
|
|
||||||
await loadGroups();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function deleteGroup(g: MemberGroupNode): Promise<void> {
|
|
||||||
if (
|
|
||||||
!confirm(
|
|
||||||
`删除「${g.name}」?\n\n软删除:整棵子树一并标记删除,相关授权立即失效,` +
|
|
||||||
"但数据保留 —— 可在左侧打开「显示已删除的组」后恢复。",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return;
|
|
||||||
try {
|
|
||||||
const r = await api<{ archivedCount: number }>(
|
|
||||||
`/database/api/groups/${encodeURIComponent(g.id)}`,
|
|
||||||
{ method: "DELETE" },
|
|
||||||
);
|
|
||||||
if (selectedId === g.id && !showArchived) {
|
|
||||||
selectedId = null;
|
|
||||||
members = [];
|
|
||||||
membersLoaded = false;
|
|
||||||
}
|
|
||||||
toastOk(`已删除 ${r.archivedCount} 个组(软删除,可恢复)`);
|
|
||||||
await loadGroups();
|
|
||||||
if (selectedId === g.id) await loadMembers();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function restoreGroup(g: MemberGroupNode): Promise<void> {
|
|
||||||
// 恢复语义与删除不对称(ADR-0028 决策7):只回该组 + 已归档祖先链,子树仍归档。
|
|
||||||
if (
|
|
||||||
!confirm(
|
|
||||||
`恢复「${g.name}」?\n\n其已删除的上级会一并恢复(否则它在树上无路径);` +
|
|
||||||
"子组保持删除状态,需各自恢复。恢复后该组的授权立即重新生效。",
|
|
||||||
)
|
|
||||||
)
|
|
||||||
return;
|
|
||||||
try {
|
|
||||||
const r = await api<{ restoredCount: number }>(
|
|
||||||
`/database/api/groups/${encodeURIComponent(g.id)}/restore`,
|
|
||||||
{ method: "POST" },
|
|
||||||
);
|
|
||||||
toastOk(`已恢复 ${r.restoredCount} 个组`);
|
|
||||||
await loadGroups();
|
|
||||||
if (selectedId === g.id) await loadMembers();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
function openAddMember(): void {
|
|
||||||
addQuery = "";
|
|
||||||
addResults = [];
|
|
||||||
showAdd = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 成员选择器:搜全局用户,excludeGroupId 过滤掉本组已有成员。 */
|
|
||||||
async function searchUsers(): Promise<void> {
|
|
||||||
if (selectedId === null) return;
|
|
||||||
addSearching = true;
|
|
||||||
try {
|
|
||||||
const r = await api<{ users: UserSearchResult[] }>(
|
|
||||||
`/database/api/users/search?q=${encodeURIComponent(addQuery.trim())}` +
|
|
||||||
`&excludeGroupId=${encodeURIComponent(selectedId)}`,
|
|
||||||
);
|
|
||||||
addResults = r.users;
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
} finally {
|
|
||||||
addSearching = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function addMember(userId: string): Promise<void> {
|
|
||||||
if (selectedId === null) return;
|
|
||||||
try {
|
|
||||||
await api(`/database/api/groups/${encodeURIComponent(selectedId)}/members`, {
|
|
||||||
method: "POST",
|
|
||||||
body: { userId },
|
|
||||||
});
|
|
||||||
toastOk("已添加成员");
|
|
||||||
addResults = addResults.filter((u) => u.userId !== userId);
|
|
||||||
await Promise.all([loadMembers(), loadGroups()]);
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function removeMember(m: MemberGroupMember): Promise<void> {
|
|
||||||
if (selectedId === null) return;
|
|
||||||
if (!confirm(`将「${m.displayName || m.userId}」移出本组?其经由本组获得的授权立即失效。`)) return;
|
|
||||||
try {
|
|
||||||
await api(
|
|
||||||
`/database/api/groups/${encodeURIComponent(selectedId)}/members/${encodeURIComponent(m.userId)}`,
|
|
||||||
{ method: "DELETE" },
|
|
||||||
);
|
|
||||||
toastOk("已移除成员");
|
|
||||||
await Promise.all([loadMembers(), loadGroups()]);
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(errText(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<svelte:window
|
|
||||||
onclick={() => (menu = null)}
|
|
||||||
onkeydown={(e) => {
|
|
||||||
if (e.key === "Escape") menu = null;
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
|
|
||||||
<div class="flex h-full min-h-0 items-stretch gap-3.5">
|
|
||||||
<!-- 左:组树 -->
|
|
||||||
<div class="panel flex w-[326px] shrink-0 flex-col !p-3.5" style="min-height:0">
|
|
||||||
<div class="mb-2.5 flex items-center gap-2">
|
|
||||||
<span class="flex text-accent"><Icon name="layers" size={17} /></span>
|
|
||||||
<div class="section-title flex-1">Group 树</div>
|
|
||||||
<button class="btn btn-sm" onclick={() => openCreate(null)}>
|
|
||||||
<Icon name="plus" size={13} /> 根组
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="relative mb-2">
|
|
||||||
<span class="pointer-events-none absolute left-[9px] top-1/2 flex -translate-y-1/2 text-ink-3">
|
|
||||||
<Icon name="search" size={13} />
|
|
||||||
</span>
|
|
||||||
<input class="input !pl-7 !text-[12.5px]" placeholder="过滤组名…" bind:value={filterText} />
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<label class="switch mb-2.5 text-[11.5px] text-ink-3">
|
|
||||||
<input type="checkbox" checked={showArchived} onchange={toggleArchived} />
|
|
||||||
<span></span>
|
|
||||||
显示已删除的组
|
|
||||||
</label>
|
|
||||||
|
|
||||||
<!-- 树空白处右键 = 建根组 -->
|
|
||||||
<div
|
|
||||||
class="-mx-1.5 min-h-0 flex-1 overflow-y-auto"
|
|
||||||
role="tree"
|
|
||||||
tabindex="-1"
|
|
||||||
oncontextmenu={(e) => {
|
|
||||||
if ((e.target as HTMLElement).closest("[data-node]") !== null) return;
|
|
||||||
openMenu(e, null);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{#if !loaded}
|
|
||||||
<div class="quiet px-3 py-6 text-center">加载中…</div>
|
|
||||||
{:else if listError !== null}
|
|
||||||
<div class="px-3 py-6 text-center text-xs text-danger">{listError}</div>
|
|
||||||
{:else if groups.length === 0}
|
|
||||||
<div class="quiet flex flex-col items-center gap-2 px-3 py-[22px] text-center">
|
|
||||||
<span class="flex text-line"><Icon name="layers" size={30} /></span>
|
|
||||||
暂无成员组 · 点上方「根组」开始
|
|
||||||
</div>
|
|
||||||
{:else if rows.length === 0}
|
|
||||||
<div class="quiet px-3 py-[22px] text-center">无匹配的组</div>
|
|
||||||
{:else}
|
|
||||||
{#each rows as { g, hasKids, hit } (g.id)}
|
|
||||||
{@const arch = g.archivedAt !== null}
|
|
||||||
<div
|
|
||||||
data-node
|
|
||||||
class="flex cursor-pointer select-none items-center gap-1.5 rounded-lg py-1.5 pr-2 text-[13px]"
|
|
||||||
class:bg-selected={selectedId === g.id}
|
|
||||||
class:opacity-50={!hit}
|
|
||||||
style="padding-left: {8 + g.depth * 15}px"
|
|
||||||
role="treeitem"
|
|
||||||
aria-selected={selectedId === g.id}
|
|
||||||
tabindex="-1"
|
|
||||||
onclick={() => select(g.id)}
|
|
||||||
onkeydown={(e) => {
|
|
||||||
if (e.key === "Enter" || e.key === " ") {
|
|
||||||
e.preventDefault();
|
|
||||||
select(g.id);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
oncontextmenu={(e) => openMenu(e, g)}
|
|
||||||
>
|
|
||||||
{#if hasKids}
|
|
||||||
<span
|
|
||||||
class="flex w-[15px] shrink-0 justify-center text-ink-3 transition-transform"
|
|
||||||
class:rotate-90={!(isCollapsed(g.id) && filterText.trim() === "")}
|
|
||||||
role="button"
|
|
||||||
tabindex="-1"
|
|
||||||
aria-label="折叠 / 展开"
|
|
||||||
onclick={(e) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
toggleCollapsed(g.id);
|
|
||||||
}}
|
|
||||||
onkeydown={(e) => {
|
|
||||||
if (e.key === "Enter") toggleCollapsed(g.id);
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
<Icon name="chevron" size={13} />
|
|
||||||
</span>
|
|
||||||
{:else}
|
|
||||||
<span class="inline-block w-[15px] shrink-0"></span>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<span class="flex" class:text-accent={selectedId === g.id && !arch} class:text-ink-3={arch || selectedId !== g.id}>
|
|
||||||
<Icon name={arch ? "archive" : "group"} size={15} />
|
|
||||||
</span>
|
|
||||||
<span class="flex-1 truncate" class:text-ink-3={arch} class:line-through={arch}>{g.name}</span>
|
|
||||||
<span class="tag shrink-0" class:opacity-70={arch}>
|
|
||||||
<Icon name="user" size={10} />{g.memberCount}
|
|
||||||
</span>
|
|
||||||
{#if arch}
|
|
||||||
<span class="tag shrink-0 !text-[10px] opacity-85">已删除</span>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="section-note mt-2 border-t border-line-soft pt-2">{loaded ? treeFoot : ""}</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 右:成员表 -->
|
|
||||||
<div class="panel flex min-h-0 min-w-0 flex-1 flex-col !p-0">
|
|
||||||
{#if selected === null}
|
|
||||||
<div class="quiet m-auto flex flex-col items-center gap-2.5 p-7 text-center">
|
|
||||||
<span class="flex text-line"><Icon name="users" size={40} /></span>
|
|
||||||
从左侧选择一个 Group 查看成员
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
{#if isArchived}
|
|
||||||
<!-- 归档横幅:软删除是"打标",数据仍在,只是不再贡献权限。 -->
|
|
||||||
<div
|
|
||||||
class="flex shrink-0 items-center gap-2.5 border-b border-line-soft bg-hover px-[18px] py-2.5 text-[12.5px]"
|
|
||||||
>
|
|
||||||
<span class="flex text-ink-3"><Icon name="archive" size={15} /></span>
|
|
||||||
<span class="flex-1">
|
|
||||||
此 Group 已删除于 {fmtDate(selected.archivedAt ?? "")} · 成员只读,不再授予任何权限
|
|
||||||
</span>
|
|
||||||
<button class="btn !text-xs" onclick={() => void restoreGroup(selected)}>
|
|
||||||
<Icon name="restore" size={13} /> 恢复
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
<div class="shrink-0 border-b border-line-soft px-[18px] pb-3 pt-4">
|
|
||||||
<div class="mb-1.5 text-xs">
|
|
||||||
{#each chain as c, i (c.id)}
|
|
||||||
{#if i > 0}<span class="mx-[5px] text-ink-3">/</span>{/if}
|
|
||||||
<span class={i === chain.length - 1 ? "font-medium text-ink" : "text-ink-3"}>{c.name}</span>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex items-center gap-2.5">
|
|
||||||
<span class="flex" class:text-ink-3={isArchived} class:text-accent={!isArchived}>
|
|
||||||
<Icon name={isArchived ? "archive" : "group"} size={20} />
|
|
||||||
</span>
|
|
||||||
<div class="min-w-0 flex-1">
|
|
||||||
<div class="text-base font-semibold" class:text-ink-3={isArchived}>{selected.name}</div>
|
|
||||||
{#if selected.description !== null && selected.description !== ""}
|
|
||||||
<div class="section-note mt-0.5">{selected.description}</div>
|
|
||||||
{:else}
|
|
||||||
<div class="section-note mt-0.5 opacity-60">无描述</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
<!-- 归档态不给改名/加成员入口(后端 requireActiveGroup 亦 404 兜底)。 -->
|
|
||||||
{#if !isArchived}
|
|
||||||
<button class="btn !text-xs" onclick={() => openRename(selected)}>
|
|
||||||
<Icon name="pencil" size={13} /> 编辑
|
|
||||||
</button>
|
|
||||||
<button class="btn btn-primary !text-xs" onclick={openAddMember}>
|
|
||||||
<Icon name="plus" size={13} /> 添加成员
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mt-3 flex gap-4 text-xs text-ink-3">
|
|
||||||
<span class="inline-flex items-center gap-1"><Icon name="user" size={12} />{members.length} 名成员</span>
|
|
||||||
<span class="inline-flex items-center gap-1"><Icon name="layers" size={12} />层级 {selected.depth}</span>
|
|
||||||
<span class="inline-flex items-center gap-1"><Icon name="group" size={12} />{childCount} 个子组</span>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex shrink-0 items-center gap-2.5 px-[18px] py-2.5">
|
|
||||||
<div class="relative max-w-[280px] flex-1">
|
|
||||||
<span class="pointer-events-none absolute left-[9px] top-1/2 flex -translate-y-1/2 text-ink-3">
|
|
||||||
<Icon name="search" size={13} />
|
|
||||||
</span>
|
|
||||||
<input class="input !pl-7 !text-[12.5px]" placeholder="搜索成员…" bind:value={memberFilter} />
|
|
||||||
</div>
|
|
||||||
<span class="file-meta">
|
|
||||||
{memberFilter.trim() === "" ? "" : `${shownMembers.length} / ${members.length}`}
|
|
||||||
</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="min-h-0 flex-1 overflow-y-auto px-[18px] pb-[18px]">
|
|
||||||
{#if !membersLoaded}
|
|
||||||
<div class="quiet px-3 py-9 text-center">加载中…</div>
|
|
||||||
{:else if membersError !== null}
|
|
||||||
<div class="px-3 py-9 text-center text-xs text-danger">{membersError}</div>
|
|
||||||
{:else if members.length === 0}
|
|
||||||
<div class="quiet flex flex-col items-center gap-2.5 px-3 py-9 text-center">
|
|
||||||
<span class="flex text-line"><Icon name="users" size={34} /></span>
|
|
||||||
{isArchived ? "此组无成员记录" : "此组暂无成员 · 点右上「添加成员」"}
|
|
||||||
</div>
|
|
||||||
{:else if shownMembers.length === 0}
|
|
||||||
<div class="quiet px-3 py-[30px] text-center">无匹配成员</div>
|
|
||||||
{:else}
|
|
||||||
<table class="list">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>成员</th>
|
|
||||||
<th>userId</th>
|
|
||||||
<th>飞书 openId</th>
|
|
||||||
<th>加入时间</th>
|
|
||||||
{#if !isArchived}<th class="!text-right">操作</th>{/if}
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{#each shownMembers as m (m.userId)}
|
|
||||||
<tr>
|
|
||||||
<td>
|
|
||||||
<span class="inline-flex items-center gap-2.5">
|
|
||||||
<Avatar displayName={m.displayName} userId={m.userId} avatarUrl={m.avatarUrl} size={28} />
|
|
||||||
<span class="font-medium">{m.displayName || "(未命名)"}</span>
|
|
||||||
</span>
|
|
||||||
</td>
|
|
||||||
<td class="file-meta">{m.userId}</td>
|
|
||||||
<td class="file-meta">{m.feishuOpenId || "—"}</td>
|
|
||||||
<td class="file-meta">{fmtDate(m.joinedAt)}</td>
|
|
||||||
{#if !isArchived}
|
|
||||||
<td class="text-right">
|
|
||||||
<button class="link-danger inline-flex items-center gap-1" onclick={() => void removeMember(m)}>
|
|
||||||
<Icon name="minus" size={12} /> 移除
|
|
||||||
</button>
|
|
||||||
</td>
|
|
||||||
{/if}
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 右键菜单 -->
|
|
||||||
{#if menu !== null}
|
|
||||||
<div
|
|
||||||
class="fixed z-[60] min-w-[184px] rounded-[10px] border border-line bg-panel p-[5px] text-[13px] shadow-[0_4px_20px_rgba(26,26,24,.07)]"
|
|
||||||
style="left:{menu.x}px;top:{menu.y}px"
|
|
||||||
role="menu"
|
|
||||||
tabindex="-1"
|
|
||||||
>
|
|
||||||
{#each menu.items as it, i (i)}
|
|
||||||
{#if it.sep === true}
|
|
||||||
<div class="mx-1.5 my-1 h-px bg-line-soft"></div>
|
|
||||||
{:else}
|
|
||||||
<div
|
|
||||||
class="flex cursor-pointer items-center gap-2 rounded-md px-[11px] py-[7px] hover:bg-hover"
|
|
||||||
class:text-danger={it.danger === true}
|
|
||||||
role="menuitem"
|
|
||||||
tabindex="-1"
|
|
||||||
onclick={(e) => {
|
|
||||||
e.stopPropagation();
|
|
||||||
menu = null;
|
|
||||||
it.fn?.();
|
|
||||||
}}
|
|
||||||
onkeydown={(e) => {
|
|
||||||
if (e.key === "Enter") {
|
|
||||||
menu = null;
|
|
||||||
it.fn?.();
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
>
|
|
||||||
{#if it.ic !== undefined}<span class="flex opacity-75"><Icon name={it.ic} size={14} /></span>{/if}
|
|
||||||
{it.label}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if showCreate}
|
|
||||||
<Modal
|
|
||||||
title={createParent === null ? "新建根 Group" : `在「${createParent.name}」下新建子 Group`}
|
|
||||||
onclose={() => (showCreate = false)}
|
|
||||||
>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="gc-name">名称</label>
|
|
||||||
<input id="gc-name" class="input" bind:value={newName} placeholder="例如:物理教研组" />
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="gc-desc">描述(可选)</label>
|
|
||||||
<input id="gc-desc" class="input" bind:value={newDesc} placeholder="一句话说明" />
|
|
||||||
</div>
|
|
||||||
<div class="mt-4 flex justify-end gap-2">
|
|
||||||
<button class="btn" onclick={() => (showCreate = false)}>取消</button>
|
|
||||||
<button class="btn btn-primary" onclick={createGroup}>创建</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if showRename && renameTarget !== null}
|
|
||||||
<Modal title="重命名 / 改描述" onclose={() => (showRename = false)}>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="gr-name">名称</label>
|
|
||||||
<input id="gr-name" class="input" bind:value={editName} />
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="gr-desc">描述</label>
|
|
||||||
<input id="gr-desc" class="input" bind:value={editDesc} placeholder="留空则清除描述" />
|
|
||||||
</div>
|
|
||||||
<div class="mt-4 flex justify-end gap-2">
|
|
||||||
<button class="btn" onclick={() => (showRename = false)}>取消</button>
|
|
||||||
<button class="btn btn-primary" onclick={saveRename}>保存</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if showAdd && selected !== null}
|
|
||||||
<Modal title={`向「${selected.name}」添加成员`} onclose={() => (showAdd = false)}>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="ga-q">搜索用户(姓名 / userId / 飞书 openId)</label>
|
|
||||||
<div class="flex gap-2">
|
|
||||||
<input
|
|
||||||
id="ga-q"
|
|
||||||
class="input"
|
|
||||||
bind:value={addQuery}
|
|
||||||
placeholder="留空列出全部候选"
|
|
||||||
onkeydown={(e) => {
|
|
||||||
if (e.key === "Enter") void searchUsers();
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<button class="btn" onclick={searchUsers}><Icon name="search" size={13} /> 搜索</button>
|
|
||||||
</div>
|
|
||||||
<div class="section-note mt-1.5">已在本组的成员不会出现在结果里。</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="max-h-[280px] overflow-y-auto">
|
|
||||||
{#if addSearching}
|
|
||||||
<div class="quiet px-3 py-6 text-center">搜索中…</div>
|
|
||||||
{:else if addResults.length === 0}
|
|
||||||
<div class="quiet px-3 py-6 text-center">无候选用户 · 先点「搜索」</div>
|
|
||||||
{:else}
|
|
||||||
{#each addResults as u (u.userId)}
|
|
||||||
<div class="flex items-center gap-2.5 border-b border-line-soft py-2 last:border-b-0">
|
|
||||||
<Avatar displayName={u.displayName} userId={u.userId} avatarUrl={u.avatarUrl} size={26} />
|
|
||||||
<div class="min-w-0 flex-1">
|
|
||||||
<div class="truncate text-[13px] font-medium">{u.displayName || "(未命名)"}</div>
|
|
||||||
<div class="file-meta truncate">{u.feishuOpenId || u.userId}</div>
|
|
||||||
</div>
|
|
||||||
<button class="btn btn-sm" onclick={() => void addMember(u.userId)}>
|
|
||||||
<Icon name="plus" size={12} /> 添加
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mt-4 flex justify-end gap-2">
|
|
||||||
<button class="btn" onclick={() => (showAdd = false)}>关闭</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
@@ -1,41 +0,0 @@
|
|||||||
<script lang="ts" module>
|
|
||||||
// 从已删除的 routes/adminPanels.ts 的 GROUP_ICONS 原样搬来(ADR-0029)。
|
|
||||||
export const ICONS = {
|
|
||||||
// Group 节点 = 人的集合。**不用文件夹图标** —— Group 不是目录,与文件库的
|
|
||||||
// FOLDER/PROJECT 是两套体系,图标上也不应混淆。两人剪影。
|
|
||||||
group:
|
|
||||||
"M16 19v-1.5a3.5 3.5 0 0 0-3.5-3.5h-5A3.5 3.5 0 0 0 4 17.5V19M10 11.5a3.25 3.25 0 1 0 0-6.5 3.25 3.25 0 0 0 0 6.5ZM20 19v-1.5a3.5 3.5 0 0 0-2.6-3.38M15.4 5.22a3.25 3.25 0 0 1 0 6.06",
|
|
||||||
users:
|
|
||||||
"M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm14 10v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75",
|
|
||||||
user: "M20 21v-2a4 4 0 0 0-4-4H8a4 4 0 0 0-4 4v2M12 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Z",
|
|
||||||
plus: "M12 5v14M5 12h14",
|
|
||||||
pencil: "M17 3a2.8 2.8 0 0 1 4 4L7.5 20.5 2 22l1.5-5.5L17 3Z",
|
|
||||||
trash: "M3 6h18M8 6V4h8v2m-9 0 1 14h8l1-14",
|
|
||||||
search: "m21 21-4.3-4.3M11 18a7 7 0 1 0 0-14 7 7 0 0 0 0 14Z",
|
|
||||||
chevron: "m9 18 6-6-6-6",
|
|
||||||
layers: "m12 2 9 5-9 5-9-5 9-5Zm9 11-9 5-9-5m18 5-9 5-9-5",
|
|
||||||
clock: "M12 22a10 10 0 1 0 0-20 10 10 0 0 0 0 20Zm0-14v6l4 2",
|
|
||||||
minus: "M5 12h14",
|
|
||||||
// 已归档(软删)标记用;与"删除"区分 —— 数据仍在,只是打了 archivedAt。
|
|
||||||
archive: "M3 8h18v11a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V8Zm1-5h16l1 5H3l1-5Zm5 9h6",
|
|
||||||
restore: "M3 12a9 9 0 1 0 3-6.7M3 4v4.5h4.5",
|
|
||||||
} as const;
|
|
||||||
|
|
||||||
export type IconName = keyof typeof ICONS;
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<script lang="ts">
|
|
||||||
let { name, size = 16 }: { name: IconName; size?: number } = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<svg
|
|
||||||
style="width:{size}px;height:{size}px"
|
|
||||||
class="shrink-0"
|
|
||||||
viewBox="0 0 24 24"
|
|
||||||
fill="none"
|
|
||||||
stroke="currentColor"
|
|
||||||
stroke-width="1.8"
|
|
||||||
stroke-linecap="round"
|
|
||||||
stroke-linejoin="round"
|
|
||||||
aria-hidden="true"
|
|
||||||
><path d={ICONS[name]} /></svg>
|
|
||||||
@@ -1,147 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* 文件库浏览器(树 + 详情 + 文件编辑栏)。
|
|
||||||
*
|
|
||||||
* 两处复用:老师端 /app(showUserFooter=true,侧栏底部带身份与退出)
|
|
||||||
* 与管理后台 /database/dashboard/library(false —— 外层壳已有身份区)。
|
|
||||||
*/
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { api } from "./api.js";
|
|
||||||
import { me, toastErr, toastOk } from "./stores.js";
|
|
||||||
import { logout } from "./session.js";
|
|
||||||
import { treeVersion, bumpTree, currentNode, selectedFilePath, clearSelectedFile, bumpFiles } from "./browser.js";
|
|
||||||
import type { NodeChild } from "./types.js";
|
|
||||||
import TreeNode from "./TreeNode.svelte";
|
|
||||||
import NodeDetailPanel from "./NodeDetailPanel.svelte";
|
|
||||||
import FileEditor from "./FileEditor.svelte";
|
|
||||||
import Modal from "./Modal.svelte";
|
|
||||||
|
|
||||||
let { showUserFooter = false }: { showUserFooter?: boolean } = $props();
|
|
||||||
|
|
||||||
let roots = $state<NodeChild[] | null>(null);
|
|
||||||
let treeError = $state<string | null>(null);
|
|
||||||
let showCreateRoot = $state(false);
|
|
||||||
let newName = $state("");
|
|
||||||
let newKind = $state<"FOLDER" | "PROJECT">("FOLDER");
|
|
||||||
let newDesc = $state("");
|
|
||||||
|
|
||||||
async function loadRoots(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const r = await api<{ nodes: NodeChild[] }>("/database/api/nodes");
|
|
||||||
roots = r.nodes;
|
|
||||||
treeError = null;
|
|
||||||
} catch (e) {
|
|
||||||
treeError = e instanceof Error ? e.message : String(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMount(loadRoots);
|
|
||||||
$effect(() => {
|
|
||||||
void $treeVersion;
|
|
||||||
void loadRoots();
|
|
||||||
});
|
|
||||||
|
|
||||||
async function createRoot(): Promise<void> {
|
|
||||||
const name = newName.trim();
|
|
||||||
if (name === "") return;
|
|
||||||
try {
|
|
||||||
await api("/database/api/nodes", {
|
|
||||||
method: "POST",
|
|
||||||
body: {
|
|
||||||
parentId: null,
|
|
||||||
kind: newKind,
|
|
||||||
name,
|
|
||||||
...(newDesc.trim() !== "" ? { description: newDesc.trim() } : {}),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
toastOk("已创建");
|
|
||||||
showCreateRoot = false;
|
|
||||||
newName = ""; newKind = "FOLDER"; newDesc = "";
|
|
||||||
bumpTree();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
const initial = $derived(($me?.userId ?? "U").slice(0, 1).toUpperCase());
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="flex min-h-0 flex-1">
|
|
||||||
<!-- 侧栏 -->
|
|
||||||
<aside class="flex w-[300px] shrink-0 flex-col border-r border-line-soft bg-sidebar">
|
|
||||||
<div class="flex items-center justify-between border-b border-line-soft px-4 py-3.5">
|
|
||||||
<span class="text-[15px] font-semibold text-ink">文件库</span>
|
|
||||||
{#if $me?.isWebsiteAdmin}
|
|
||||||
<button class="btn btn-sm" onclick={() => (showCreateRoot = true)}>
|
|
||||||
+ 根目录
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="flex-1 overflow-y-auto px-2 py-2 text-[13px]">
|
|
||||||
{#if treeError}
|
|
||||||
<div class="px-3 py-6 text-center text-xs text-danger">{treeError}</div>
|
|
||||||
{:else if roots === null}
|
|
||||||
<div class="px-3 py-6 text-center text-xs text-ink-3">加载中…</div>
|
|
||||||
{:else if roots.length === 0}
|
|
||||||
<div class="px-3 py-6 text-center text-xs text-ink-3">
|
|
||||||
{$me?.isWebsiteAdmin ? "空文件库 · 点上方「+ 根目录」开始" : "文件库为空,请联系管理员创建根目录"}
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
{#each roots as node (node.id)}
|
|
||||||
<TreeNode {node} depth={0} />
|
|
||||||
{/each}
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if showUserFooter}
|
|
||||||
<div class="flex items-center gap-2 border-t border-line-soft px-4 py-3 text-[12.5px]">
|
|
||||||
<div class="flex h-6 w-6 shrink-0 items-center justify-center rounded-full bg-accent text-[11px] font-semibold text-white">{initial}</div>
|
|
||||||
<span class="flex-1 truncate text-ink">{$me?.userId ?? ""}</span>
|
|
||||||
<button class="rounded-lg border border-line-soft px-2.5 py-1 text-[11.5px] text-ink-3 transition hover:bg-hover hover:text-ink" onclick={logout} title="退出登录">退出</button>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</aside>
|
|
||||||
|
|
||||||
<!-- 主区 -->
|
|
||||||
<main class="flex-1 overflow-y-auto">
|
|
||||||
<NodeDetailPanel />
|
|
||||||
</main>
|
|
||||||
|
|
||||||
<!-- 右侧:文件预览/编辑栏(选中文件时出现) -->
|
|
||||||
{#if $selectedFilePath && $currentNode?.kind === "PROJECT"}
|
|
||||||
<section class="flex w-[46%] min-w-[420px] shrink-0 flex-col overflow-y-auto border-l border-line-soft bg-bg p-4">
|
|
||||||
<FileEditor
|
|
||||||
projectId={$currentNode.id}
|
|
||||||
path={$selectedFilePath}
|
|
||||||
role={$currentNode.role}
|
|
||||||
onchanged={bumpFiles}
|
|
||||||
onclose={clearSelectedFile}
|
|
||||||
/>
|
|
||||||
</section>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if showCreateRoot}
|
|
||||||
<Modal title="新建根目录" onclose={() => (showCreateRoot = false)}>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="root-name">名称</label>
|
|
||||||
<input id="root-name" class="input" bind:value={newName} placeholder="例如:物理教研" />
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="root-kind">类型</label>
|
|
||||||
<select id="root-kind" class="select" bind:value={newKind}>
|
|
||||||
<option value="FOLDER">文件夹</option>
|
|
||||||
<option value="PROJECT">项目(课程资源库)</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="root-desc">简介(可选)</label>
|
|
||||||
<textarea id="root-desc" rows="3" class="textarea" bind:value={newDesc} placeholder="简要说明用途…"></textarea>
|
|
||||||
</div>
|
|
||||||
<div class="mt-4 flex justify-end gap-2">
|
|
||||||
<button class="btn" onclick={() => (showCreateRoot = false)}>取消</button>
|
|
||||||
<button class="btn btn-primary" onclick={createRoot}>创建</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { loadConfig, type AppConfig } from "./config.js";
|
|
||||||
|
|
||||||
let info = $state<AppConfig | null>(null);
|
|
||||||
let loadFailed = $state(false);
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
try {
|
|
||||||
info = await loadConfig();
|
|
||||||
} catch {
|
|
||||||
loadFailed = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="flex min-h-full items-center justify-center p-6">
|
|
||||||
<div class="w-full max-w-[380px] rounded-2xl border border-line-soft bg-panel p-9 shadow-[0_4px_20px_rgba(26,26,24,.07)]">
|
|
||||||
<div class="text-center text-[26px] font-semibold tracking-wide text-ink">文件库</div>
|
|
||||||
<p class="mt-2.5 mb-8 text-center text-[13px] text-ink-3">课程资源与教研文件,一处安放,随处可查</p>
|
|
||||||
|
|
||||||
{#if info}
|
|
||||||
<a
|
|
||||||
href="/auth/feishu/{encodeURIComponent(info.orgSlug)}"
|
|
||||||
data-sveltekit-reload
|
|
||||||
class="flex w-full items-center justify-center rounded-lg bg-accent px-4 py-3 text-sm font-medium text-white transition hover:bg-accent-hover"
|
|
||||||
>使用飞书登录</a>
|
|
||||||
|
|
||||||
{#if info.devLoginEnabled}
|
|
||||||
<div class="my-5 flex items-center gap-2.5 text-[11px] text-ink-3">
|
|
||||||
<span class="flex-1 border-t border-line-soft"></span>开发模式
|
|
||||||
<span class="flex-1 border-t border-line-soft"></span>
|
|
||||||
</div>
|
|
||||||
<a href="/app/dev-login-teacher" data-sveltekit-reload class="flex w-full items-center justify-center rounded-lg border border-line bg-panel px-4 py-2 text-[12.5px] font-medium text-ink transition hover:bg-hover">⚡ 一键登录(老师)</a>
|
|
||||||
<p class="mt-2.5 text-center text-[11px] text-ink-3">仅开发环境可见 · 跳过飞书 OAuth</p>
|
|
||||||
{/if}
|
|
||||||
{:else if loadFailed}
|
|
||||||
<p class="text-center text-[12.5px] text-danger">无法加载登录配置,请稍后重试</p>
|
|
||||||
{:else}
|
|
||||||
<p class="text-center text-[12.5px] text-ink-3">加载中…</p>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@@ -1,16 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import type { Snippet } from "svelte";
|
|
||||||
|
|
||||||
let { title, onclose, children }: { title: string; onclose: () => void; children: Snippet } = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div
|
|
||||||
class="fixed inset-0 z-40 flex items-center justify-center bg-black/30 p-4"
|
|
||||||
role="presentation"
|
|
||||||
onclick={(e) => { if (e.target === e.currentTarget) onclose(); }}
|
|
||||||
>
|
|
||||||
<div class="w-full max-w-[440px] rounded-2xl border border-line-soft bg-panel p-6 shadow-[0_4px_20px_rgba(26,26,24,.07)]">
|
|
||||||
<div class="mb-4 text-[15px] font-semibold">{title}</div>
|
|
||||||
{@render children()}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@@ -1,164 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { api } from "./api.js";
|
|
||||||
import { currentNode, breadcrumb, bumpTree, clearSelectedFile } from "./browser.js";
|
|
||||||
import { toastOk, toastErr } from "./stores.js";
|
|
||||||
import { ROLE_LABEL } from "./labels.js";
|
|
||||||
import OverviewPanel from "./OverviewPanel.svelte";
|
|
||||||
import FilesPanel from "./FilesPanel.svelte";
|
|
||||||
import GrantsPanel from "./GrantsPanel.svelte";
|
|
||||||
import Modal from "./Modal.svelte";
|
|
||||||
import Icon from "./Icon.svelte";
|
|
||||||
|
|
||||||
type Tab = "detail" | "files" | "grants";
|
|
||||||
let tab = $state<Tab>("detail");
|
|
||||||
let showCreateChild = $state(false);
|
|
||||||
let newName = $state("");
|
|
||||||
let newKind = $state<"FOLDER" | "PROJECT">("FOLDER");
|
|
||||||
let newDesc = $state("");
|
|
||||||
|
|
||||||
const node = $derived($currentNode);
|
|
||||||
const crumbs = $derived($breadcrumb);
|
|
||||||
const canManage = $derived(node?.role === "MANAGE");
|
|
||||||
const canEdit = $derived(canManage || node?.role === "EDIT");
|
|
||||||
|
|
||||||
// 与旧 libraryBrowser 的 tab 组装一致:概览恒有;文件仅 PROJECT;授权仅 MANAGE
|
|
||||||
// (FOLDER 也有授权 —— 它虽是透明组织节点,授权仍挂在节点上,ADR-0021)。
|
|
||||||
const tabs = $derived.by((): ReadonlyArray<readonly [Tab, string]> => {
|
|
||||||
const out: Array<readonly [Tab, string]> = [["detail", "概览"]];
|
|
||||||
if (node?.kind === "PROJECT") out.push(["files", "文件"]);
|
|
||||||
if (canManage) out.push(["grants", "授权"]);
|
|
||||||
return out;
|
|
||||||
});
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
void node?.id;
|
|
||||||
tab = "detail";
|
|
||||||
clearSelectedFile();
|
|
||||||
});
|
|
||||||
|
|
||||||
async function createChild(): Promise<void> {
|
|
||||||
const name = newName.trim();
|
|
||||||
if (name === "" || node === null) return;
|
|
||||||
try {
|
|
||||||
await api("/database/api/nodes", {
|
|
||||||
method: "POST",
|
|
||||||
body: {
|
|
||||||
parentId: node.id,
|
|
||||||
kind: newKind,
|
|
||||||
name,
|
|
||||||
...(newDesc.trim() !== "" ? { description: newDesc.trim() } : {}),
|
|
||||||
},
|
|
||||||
});
|
|
||||||
toastOk("已创建");
|
|
||||||
showCreateChild = false;
|
|
||||||
newName = ""; newKind = "FOLDER"; newDesc = "";
|
|
||||||
bumpTree();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function renameNode(): Promise<void> {
|
|
||||||
if (node === null) return;
|
|
||||||
const name = prompt("新名称", node.name);
|
|
||||||
if (name === null) return;
|
|
||||||
try {
|
|
||||||
await api(`/database/api/nodes/${node.id}`, { method: "PATCH", body: { name } });
|
|
||||||
toastOk("已重命名");
|
|
||||||
bumpTree();
|
|
||||||
currentNode.update((n) => (n ? { ...n, name } : n));
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function deleteNode(): Promise<void> {
|
|
||||||
if (node === null || !confirm(`确认删除「${node.name}」?软删除后不可见。`)) return;
|
|
||||||
try {
|
|
||||||
await api(`/database/api/nodes/${node.id}`, { method: "DELETE" });
|
|
||||||
toastOk("已删除");
|
|
||||||
currentNode.set(null);
|
|
||||||
bumpTree();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
{#if node === null}
|
|
||||||
<div class="flex h-full items-center justify-center text-[13px] text-ink-3">从左侧选择一个文件夹或项目</div>
|
|
||||||
{:else}
|
|
||||||
<div class="mx-auto max-w-[1400px] px-9 py-9">
|
|
||||||
<div class="mb-2 text-[12.5px] text-ink-3">
|
|
||||||
{#each crumbs as c, i (i)}
|
|
||||||
{#if i > 0}<span class="mx-1 text-line">/</span>{/if}
|
|
||||||
<span>{c.name ?? "…"}</span>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-5 flex items-center justify-between">
|
|
||||||
<div class="flex items-center gap-2 text-[17px] font-semibold text-ink">
|
|
||||||
{node.name}
|
|
||||||
<span class="tag">{node.kind === "PROJECT" ? "项目" : "文件夹"}</span>
|
|
||||||
<span class="tag !border-line !text-ink-2">{ROLE_LABEL[node.role]}</span>
|
|
||||||
</div>
|
|
||||||
<div class="flex gap-1.5">
|
|
||||||
{#if canEdit && node.kind === "FOLDER"}
|
|
||||||
<button class="btn" onclick={() => (showCreateChild = true)}>
|
|
||||||
<Icon name="plus" size={13} /> 新建子节点
|
|
||||||
</button>
|
|
||||||
{/if}
|
|
||||||
{#if canManage}
|
|
||||||
<button class="btn" onclick={renameNode}><Icon name="pencil" size={13} /> 重命名</button>
|
|
||||||
<button class="btn btn-danger" onclick={deleteNode}><Icon name="trash" size={13} /> 删除</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="mb-[18px] flex gap-0.5 border-b border-line-soft">
|
|
||||||
{#each tabs as [id, label] (id)}
|
|
||||||
<button
|
|
||||||
class="-mb-px border-b-2 px-3.5 py-2 text-[13px] transition {tab === id
|
|
||||||
? 'border-accent font-semibold text-ink'
|
|
||||||
: 'border-transparent text-ink-3 hover:text-ink'}"
|
|
||||||
onclick={() => (tab = id)}
|
|
||||||
>{label}</button>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if tab === "grants"}
|
|
||||||
<GrantsPanel {node} />
|
|
||||||
{:else if tab === "files" && node.kind === "PROJECT"}
|
|
||||||
<FilesPanel {node} />
|
|
||||||
{:else}
|
|
||||||
<OverviewPanel {node} />
|
|
||||||
{#if node.kind === "FOLDER"}
|
|
||||||
<div class="quiet mt-3.5">文件夹是透明组织节点,点左侧树展开以浏览子内容。</div>
|
|
||||||
{/if}
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
|
|
||||||
{#if showCreateChild && node}
|
|
||||||
<Modal title="新建子节点" onclose={() => (showCreateChild = false)}>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="child-name">名称</label>
|
|
||||||
<input id="child-name" class="input" bind:value={newName} placeholder="例如:物理必修一" />
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="child-kind">类型</label>
|
|
||||||
<select id="child-kind" class="select" bind:value={newKind}>
|
|
||||||
<option value="FOLDER">文件夹</option>
|
|
||||||
<option value="PROJECT">项目(课程资源库)</option>
|
|
||||||
</select>
|
|
||||||
</div>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="child-desc">简介(可选)</label>
|
|
||||||
<textarea id="child-desc" rows="3" class="textarea" bind:value={newDesc} placeholder="简要说明用途…"></textarea>
|
|
||||||
</div>
|
|
||||||
<div class="mt-4 flex justify-end gap-2">
|
|
||||||
<button class="btn" onclick={() => (showCreateChild = false)}>取消</button>
|
|
||||||
<button class="btn btn-primary" onclick={createChild}>创建</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
@@ -1,129 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { api } from "./api.js";
|
|
||||||
import { toastOk, toastErr } from "./stores.js";
|
|
||||||
import { currentNode } from "./browser.js";
|
|
||||||
import { ROLE_LABEL } from "./labels.js";
|
|
||||||
import type { ExportJob, NodeDetail } from "./types.js";
|
|
||||||
import Modal from "./Modal.svelte";
|
|
||||||
|
|
||||||
let { node }: { node: NodeDetail } = $props();
|
|
||||||
|
|
||||||
let showEditDesc = $state(false);
|
|
||||||
let descDraft = $state("");
|
|
||||||
let exportJob = $state<ExportJob | null>(null);
|
|
||||||
|
|
||||||
const canEdit = $derived(node.role === "MANAGE" || node.role === "EDIT");
|
|
||||||
const roleLabel = $derived(ROLE_LABEL[node.role]);
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
void node.id;
|
|
||||||
exportJob = null;
|
|
||||||
});
|
|
||||||
|
|
||||||
function openEditDesc(): void {
|
|
||||||
descDraft = node.description ?? "";
|
|
||||||
showEditDesc = true;
|
|
||||||
}
|
|
||||||
|
|
||||||
async function saveDesc(): Promise<void> {
|
|
||||||
const description = descDraft.trim();
|
|
||||||
try {
|
|
||||||
await api(`/database/api/nodes/${node.id}`, {
|
|
||||||
method: "PATCH",
|
|
||||||
body: { description: description === "" ? null : description },
|
|
||||||
});
|
|
||||||
toastOk("简介已保存");
|
|
||||||
showEditDesc = false;
|
|
||||||
const next = description === "" ? null : description;
|
|
||||||
currentNode.update((n) => (n && n.id === node.id ? { ...n, description: next } : n));
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function submitExport(): Promise<void> {
|
|
||||||
try {
|
|
||||||
const r = await api<{ jobId: string; status: string }>(`/database/api/projects/${node.id}/exports`, {
|
|
||||||
method: "POST",
|
|
||||||
body: { target: "manifest" },
|
|
||||||
});
|
|
||||||
toastOk("导出已提交");
|
|
||||||
void pollExport(r.jobId);
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function pollExport(jobId: string): Promise<void> {
|
|
||||||
for (;;) {
|
|
||||||
await new Promise((r) => setTimeout(r, 800));
|
|
||||||
try {
|
|
||||||
const job = await api<ExportJob>(`/database/api/exports/${jobId}`);
|
|
||||||
exportJob = job;
|
|
||||||
if (job.status === "DONE" || job.status === "FAILED") break;
|
|
||||||
} catch {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="panel">
|
|
||||||
<div class="mb-4">
|
|
||||||
<div class="mb-1.5 text-[11.5px] text-ink-3">简介</div>
|
|
||||||
<div class="text-[13.5px] leading-7 text-ink">
|
|
||||||
{#if node.description}
|
|
||||||
{node.description}
|
|
||||||
{:else}
|
|
||||||
<span class="italic text-ink-3">暂无简介</span>
|
|
||||||
{/if}
|
|
||||||
{#if canEdit}
|
|
||||||
<button class="btn ml-2.5 !px-2.5 !py-0.5 align-middle !text-[11.5px]" onclick={openEditDesc}>编辑</button>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="my-4 border-t border-line-soft"></div>
|
|
||||||
|
|
||||||
<div class="flex flex-col gap-1.5 text-[13px] text-ink-2">
|
|
||||||
<div>类型 <b class="font-semibold text-ink">{node.kind === "PROJECT" ? "项目" : "文件夹"}</b></div>
|
|
||||||
<div>我的角色 <b class="font-semibold text-ink">{roleLabel}</b></div>
|
|
||||||
<div>创建时间 <b class="font-semibold text-ink">{new Date(node.createdAt).toLocaleString("zh-CN")}</b></div>
|
|
||||||
<div>更新时间 <b class="font-semibold text-ink">{new Date(node.updatedAt).toLocaleString("zh-CN")}</b></div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<!-- 导出只对 PROJECT 有意义(FOLDER 是透明组织节点,ADR-0021)。 -->
|
|
||||||
{#if node.kind === "PROJECT"}
|
|
||||||
<div class="my-4 border-t border-line-soft"></div>
|
|
||||||
|
|
||||||
<div class="section-title mb-2">导出</div>
|
|
||||||
<div class="flex items-center gap-2">
|
|
||||||
<select class="select !w-auto"><option value="manifest">manifest(stub)</option></select>
|
|
||||||
<button class="btn" onclick={submitExport}>开始导出</button>
|
|
||||||
{#if exportJob}
|
|
||||||
<span class="file-meta">
|
|
||||||
{#if exportJob.status === "DONE"}
|
|
||||||
完成 · <a class="text-accent underline" href="/database/api/exports/{exportJob.id}/download">下载</a>
|
|
||||||
{:else if exportJob.status === "FAILED"}
|
|
||||||
失败:{exportJob.error ?? ""}
|
|
||||||
{:else}
|
|
||||||
{exportJob.status}…
|
|
||||||
{/if}
|
|
||||||
</span>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if showEditDesc}
|
|
||||||
<Modal title="编辑简介" onclose={() => (showEditDesc = false)}>
|
|
||||||
<div class="form-row">
|
|
||||||
<label class="form-label" for="desc-draft">简要说明这个项目的内容</label>
|
|
||||||
<textarea id="desc-draft" rows="5" class="input !leading-7" bind:value={descDraft} placeholder="例如:高中物理必修一第三章,表面张力相关内容……"></textarea>
|
|
||||||
</div>
|
|
||||||
<div class="mt-4 flex justify-end gap-2">
|
|
||||||
<button class="btn" onclick={() => (showEditDesc = false)}>取消</button>
|
|
||||||
<button class="btn btn-primary" onclick={saveDesc}>保存</button>
|
|
||||||
</div>
|
|
||||||
</Modal>
|
|
||||||
{/if}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { toasts } from "./stores.js";
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="fixed bottom-4 right-4 z-50 flex flex-col gap-2">
|
|
||||||
{#each $toasts as t (t.id)}
|
|
||||||
<div class="max-w-[340px] rounded-lg px-4 py-2 text-sm text-white {t.kind === 'err' ? 'bg-[#7E2C26]' : 'bg-[#333230]'}">
|
|
||||||
{t.message}
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import TreeNode from "./TreeNode.svelte";
|
|
||||||
import { api } from "./api.js";
|
|
||||||
import { expanded, currentNode, breadcrumb, toggleExpanded, treeVersion } from "./browser.js";
|
|
||||||
import { toastErr } from "./stores.js";
|
|
||||||
import { ROLE_LABEL } from "./labels.js";
|
|
||||||
import type { BreadcrumbEntry, NodeChild, NodeDetail } from "./types.js";
|
|
||||||
|
|
||||||
let { node, depth }: { node: NodeChild; depth: number } = $props();
|
|
||||||
|
|
||||||
let children = $state<NodeChild[] | null>(null);
|
|
||||||
const isOpen = $derived($expanded.has(node.id));
|
|
||||||
const isSelected = $derived($currentNode?.id === node.id);
|
|
||||||
|
|
||||||
// 树刷新信号(增/删/移/重命名)→ 失效子节点缓存,展开状态下随之重载
|
|
||||||
$effect(() => {
|
|
||||||
void $treeVersion;
|
|
||||||
children = null;
|
|
||||||
});
|
|
||||||
|
|
||||||
$effect(() => {
|
|
||||||
if (isOpen && node.kind === "FOLDER" && children === null) {
|
|
||||||
api<{ nodes: NodeChild[] }>(`/database/api/nodes?parentId=${encodeURIComponent(node.id)}`)
|
|
||||||
.then((r) => (children = r.nodes))
|
|
||||||
.catch((e) => toastErr(e instanceof Error ? e.message : String(e)));
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
async function select(): Promise<void> {
|
|
||||||
if (node.kind === "FOLDER") toggleExpanded(node.id);
|
|
||||||
try {
|
|
||||||
const [detail, crumb] = await Promise.all([
|
|
||||||
api<{ node: NodeDetail }>(`/database/api/nodes/${node.id}`),
|
|
||||||
api<{ breadcrumb: BreadcrumbEntry[] }>(`/database/api/nodes/${node.id}/breadcrumb`),
|
|
||||||
]);
|
|
||||||
currentNode.set(detail.node);
|
|
||||||
breadcrumb.set(crumb.breadcrumb);
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div>
|
|
||||||
<div
|
|
||||||
class="tree-item flex cursor-pointer items-center gap-1 rounded-lg px-1.5 py-1.5 select-none {isSelected ? 'bg-selected' : 'hover:bg-hover'}"
|
|
||||||
role="button"
|
|
||||||
tabindex="0"
|
|
||||||
onclick={select}
|
|
||||||
onkeydown={(e) => e.key === "Enter" && select()}
|
|
||||||
>
|
|
||||||
<span class="flex h-4 w-4 shrink-0 items-center justify-center text-ink-3">
|
|
||||||
{#if node.kind === "FOLDER"}
|
|
||||||
<svg width="9" height="9" viewBox="0 0 24 24" fill="currentColor">
|
|
||||||
{#if isOpen}<path d="M6 9l6 6 6-6z" />{:else}<path d="M9 6l6 6-6 6z" />{/if}
|
|
||||||
</svg>
|
|
||||||
{/if}
|
|
||||||
</span>
|
|
||||||
<span class="flex h-4 w-4 shrink-0 items-center justify-center {node.kind === 'PROJECT' ? 'text-ink' : 'text-ink-3'}">
|
|
||||||
{#if node.kind === "PROJECT"}
|
|
||||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d="M20 7l-8-4-8 4m16 0l-8 4m8-4v10l-8 4m0-10L4 7m8 4v10M4 7v10l8 4" /></svg>
|
|
||||||
{:else}
|
|
||||||
<svg width="16" height="16" viewBox="0 0 24 24" fill="currentColor"><path d="M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" /></svg>
|
|
||||||
{/if}
|
|
||||||
</span>
|
|
||||||
<span class="truncate">{node.name}</span>
|
|
||||||
{#if node.role !== "MANAGE"}
|
|
||||||
<span class="ml-auto pr-1 text-[10px] text-ink-3">{ROLE_LABEL[node.role]}</span>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if node.kind === "FOLDER" && isOpen}
|
|
||||||
<div class="ml-[15px] border-l border-guide pl-1">
|
|
||||||
{#if children === null}
|
|
||||||
<div class="px-3 py-1.5 text-xs text-ink-3">…</div>
|
|
||||||
{:else}
|
|
||||||
{#each children as child (child.id)}
|
|
||||||
<TreeNode node={child} depth={depth + 1} />
|
|
||||||
{/each}
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
/** 与 /database/api/* 的约定一致;401 时清空会话(回到登录视图)。 */
|
|
||||||
|
|
||||||
import { me } from "./stores.js";
|
|
||||||
|
|
||||||
export class ApiError extends Error {
|
|
||||||
constructor(
|
|
||||||
readonly status: number,
|
|
||||||
readonly code: string,
|
|
||||||
message: string,
|
|
||||||
readonly details?: Record<string, unknown>,
|
|
||||||
) {
|
|
||||||
super(message);
|
|
||||||
this.name = "ApiError";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
export class UnauthenticatedError extends Error {
|
|
||||||
constructor() {
|
|
||||||
super("unauthenticated");
|
|
||||||
this.name = "UnauthenticatedError";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
interface RequestOpts {
|
|
||||||
readonly method?: string;
|
|
||||||
readonly body?: unknown;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function api<T = unknown>(path: string, opts: RequestOpts = {}): Promise<T> {
|
|
||||||
const res = await fetch(path, {
|
|
||||||
credentials: "same-origin",
|
|
||||||
method: opts.method ?? "GET",
|
|
||||||
...(opts.body !== undefined
|
|
||||||
? { headers: { "Content-Type": "application/json" }, body: JSON.stringify(opts.body) }
|
|
||||||
: {}),
|
|
||||||
});
|
|
||||||
if (res.status === 401) {
|
|
||||||
me.set(null);
|
|
||||||
throw new UnauthenticatedError();
|
|
||||||
}
|
|
||||||
if (res.status === 204) return null as T;
|
|
||||||
const text = await res.text();
|
|
||||||
const data = text === "" ? null : (JSON.parse(text) as unknown);
|
|
||||||
if (!res.ok) {
|
|
||||||
const err = (data as { error?: { code?: string; message?: string } } | null)?.error ?? {};
|
|
||||||
throw new ApiError(res.status, err.code ?? "unknown", err.message ?? res.statusText, err as Record<string, unknown>);
|
|
||||||
}
|
|
||||||
return data as T;
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
import { writable } from "svelte/store";
|
|
||||||
import type { BreadcrumbEntry, NodeDetail } from "./types.js";
|
|
||||||
|
|
||||||
/** 树展开集合 / 当前选中节点 / 面包屑 / 树刷新计数。 */
|
|
||||||
export const expanded = writable<Set<string>>(new Set());
|
|
||||||
export const currentNode = writable<NodeDetail | null>(null);
|
|
||||||
export const breadcrumb = writable<BreadcrumbEntry[]>([]);
|
|
||||||
export const treeVersion = writable(0);
|
|
||||||
|
|
||||||
/** 右侧预览栏:当前选中文件路径(项目内);切换节点时清空。 */
|
|
||||||
export const selectedFilePath = writable<string | null>(null);
|
|
||||||
/** 文件列表刷新计数(编辑器保存/删除后 bump,列表随之重载)。 */
|
|
||||||
export const filesVersion = writable(0);
|
|
||||||
|
|
||||||
export function bumpTree(): void {
|
|
||||||
treeVersion.update((v) => v + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function bumpFiles(): void {
|
|
||||||
filesVersion.update((v) => v + 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function clearSelectedFile(): void {
|
|
||||||
selectedFilePath.set(null);
|
|
||||||
}
|
|
||||||
|
|
||||||
export function toggleExpanded(id: string): void {
|
|
||||||
expanded.update((set) => {
|
|
||||||
const next = new Set(set);
|
|
||||||
if (next.has(id)) next.delete(id);
|
|
||||||
else next.add(id);
|
|
||||||
return next;
|
|
||||||
});
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
/**
|
|
||||||
* 前端 bootstrap:silo org slug(拼飞书 OAuth 链接用)+ dev 一键登录开关。
|
|
||||||
*
|
|
||||||
* 打 `/database/config` 而非 `/database/api/login-info`:后者由 teacherApp.ts 在
|
|
||||||
* silo org 查找成功之后才注册,org 缺失时整条链路不存在;前者在
|
|
||||||
* databaseRoutes.ts 顶部无条件注册。两者形状相同(见 src/database/README.md)。
|
|
||||||
*
|
|
||||||
* 免鉴权 —— org slug 本就出现在 OAuth URL 里,不构成敏感信息。
|
|
||||||
*/
|
|
||||||
import { api } from "./api.js";
|
|
||||||
|
|
||||||
export interface AppConfig {
|
|
||||||
readonly orgSlug: string;
|
|
||||||
readonly devLoginEnabled: boolean;
|
|
||||||
}
|
|
||||||
|
|
||||||
let cached: AppConfig | null = null;
|
|
||||||
|
|
||||||
export async function loadConfig(): Promise<AppConfig> {
|
|
||||||
if (cached !== null) return cached;
|
|
||||||
cached = await api<AppConfig>("/database/config");
|
|
||||||
return cached;
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
/** 展示层文案(与 API 枚举值解耦;传参仍用英文枚举)。 */
|
|
||||||
|
|
||||||
import type { Role } from "./types.js";
|
|
||||||
|
|
||||||
/** 文件库权限级(契约 8.1 MANAGE>EDIT>VIEW)的中文展示名。 */
|
|
||||||
export const ROLE_LABEL: Record<Role, string> = {
|
|
||||||
VIEW: "只读",
|
|
||||||
EDIT: "可编辑",
|
|
||||||
MANAGE: "可管理",
|
|
||||||
};
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/**
|
|
||||||
* 会话装载:GET /database/api/me 一次,结果进 `me` store。
|
|
||||||
* 老师端与管理后台共用 —— 两处的区别只是拿到 me 之后怎么用
|
|
||||||
* (老师端未登录显示登录视图;管理后台未登录跳 /database/admin,
|
|
||||||
* 非 isWebsiteAdmin 显示无权提示)。
|
|
||||||
*/
|
|
||||||
import { get } from "svelte/store";
|
|
||||||
import { api, UnauthenticatedError } from "./api.js";
|
|
||||||
import { me, authChecked } from "./stores.js";
|
|
||||||
import type { MeResponse } from "./types.js";
|
|
||||||
|
|
||||||
/** 幂等:已检查过就不再打请求(路由间切换不重复拉取)。 */
|
|
||||||
export async function loadSession(force = false): Promise<void> {
|
|
||||||
if (get(authChecked) && !force) return;
|
|
||||||
|
|
||||||
try {
|
|
||||||
me.set(await api<MeResponse>("/database/api/me"));
|
|
||||||
} catch (e) {
|
|
||||||
if (!(e instanceof UnauthenticatedError)) console.error(e);
|
|
||||||
me.set(null);
|
|
||||||
} finally {
|
|
||||||
authChecked.set(true);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 退出登录:清后端 cookie 再清前端 store。 */
|
|
||||||
export async function logout(): Promise<void> {
|
|
||||||
try {
|
|
||||||
await fetch("/auth/logout", { method: "POST", credentials: "same-origin" });
|
|
||||||
} catch {
|
|
||||||
/* 网络失败也照样清前端状态 */
|
|
||||||
}
|
|
||||||
me.set(null);
|
|
||||||
}
|
|
||||||
@@ -1,26 +0,0 @@
|
|||||||
import { writable } from "svelte/store";
|
|
||||||
import type { MeResponse } from "./types.js";
|
|
||||||
|
|
||||||
/** 当前登录身份;null = 未登录(显示登录视图)。 */
|
|
||||||
export const me = writable<MeResponse | null>(null);
|
|
||||||
export const authChecked = writable(false);
|
|
||||||
|
|
||||||
export interface ToastItem {
|
|
||||||
readonly id: number;
|
|
||||||
readonly message: string;
|
|
||||||
readonly kind: "info" | "err";
|
|
||||||
}
|
|
||||||
|
|
||||||
let nextToastId = 1;
|
|
||||||
export const toasts = writable<ToastItem[]>([]);
|
|
||||||
|
|
||||||
export function toast(message: string, kind: ToastItem["kind"] = "info"): void {
|
|
||||||
const id = nextToastId++;
|
|
||||||
toasts.update((list) => [...list, { id, message, kind }]);
|
|
||||||
setTimeout(() => {
|
|
||||||
toasts.update((list) => list.filter((t) => t.id !== id));
|
|
||||||
}, 3600);
|
|
||||||
}
|
|
||||||
|
|
||||||
export const toastOk = (m: string): void => toast(m, "info");
|
|
||||||
export const toastErr = (m: string): void => toast(m, "err");
|
|
||||||
@@ -1,158 +0,0 @@
|
|||||||
/** 与后端 /database/api/* 响应形状对齐。 */
|
|
||||||
|
|
||||||
export type NodeKind = "FOLDER" | "PROJECT";
|
|
||||||
export type Role = "VIEW" | "EDIT" | "MANAGE";
|
|
||||||
|
|
||||||
export interface NodeChild {
|
|
||||||
readonly id: string;
|
|
||||||
readonly parentId: string | null;
|
|
||||||
readonly kind: NodeKind;
|
|
||||||
readonly name: string;
|
|
||||||
readonly role: Role;
|
|
||||||
readonly createdAt: string;
|
|
||||||
readonly updatedAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface BreadcrumbEntry {
|
|
||||||
readonly depth: number;
|
|
||||||
readonly id: string | null;
|
|
||||||
readonly name: string | null;
|
|
||||||
readonly kind: NodeKind;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface NodeDetail {
|
|
||||||
readonly id: string;
|
|
||||||
readonly parentId: string | null;
|
|
||||||
readonly kind: NodeKind;
|
|
||||||
readonly name: string;
|
|
||||||
readonly description: string | null;
|
|
||||||
readonly role: Role;
|
|
||||||
readonly provisionStatus: "PROVISIONING" | "READY" | "FAILED";
|
|
||||||
readonly createdAt: string;
|
|
||||||
readonly updatedAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface MeResponse {
|
|
||||||
readonly userId: string;
|
|
||||||
readonly isWebsiteAdmin: boolean;
|
|
||||||
/** 侧栏身份区显示用;后端取不到 User 行时回落为 userId。 */
|
|
||||||
readonly displayName: string;
|
|
||||||
readonly avatarUrl: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface FileEntry {
|
|
||||||
readonly path: string;
|
|
||||||
readonly size: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export type FileContentEncoding = "utf8" | "base64";
|
|
||||||
|
|
||||||
export interface FileContent {
|
|
||||||
readonly path: string;
|
|
||||||
readonly version: string;
|
|
||||||
readonly encoding: FileContentEncoding;
|
|
||||||
readonly content: string;
|
|
||||||
readonly size: number;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface VersionInfo {
|
|
||||||
readonly version: string;
|
|
||||||
readonly message: string;
|
|
||||||
readonly author?: string;
|
|
||||||
readonly committedAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface ExportJob {
|
|
||||||
readonly id: string;
|
|
||||||
readonly nodeId: string;
|
|
||||||
readonly target: string;
|
|
||||||
readonly status: "QUEUED" | "RUNNING" | "DONE" | "FAILED";
|
|
||||||
readonly error: string | null;
|
|
||||||
readonly createdAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface GroupSearchResult {
|
|
||||||
readonly id: string;
|
|
||||||
readonly name: string;
|
|
||||||
readonly breadcrumb: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 成员组(ADR-0028);后端返回扁平列表,前端按 parentId/depth 拼树。 */
|
|
||||||
export interface MemberGroupNode {
|
|
||||||
readonly id: string;
|
|
||||||
readonly parentId: string | null;
|
|
||||||
readonly name: string;
|
|
||||||
readonly description: string | null;
|
|
||||||
readonly depth: number;
|
|
||||||
readonly memberCount: number;
|
|
||||||
/** 软删标记(ADR-0028 决策4)。null = 活跃;非 null = 已归档,不贡献任何权限。
|
|
||||||
* 仅在 ?includeArchived=1 时可能非 null。ISO 串(后端 JSON 序列化后不再是 Date)。 */
|
|
||||||
readonly archivedAt: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
export interface MemberGroupMember {
|
|
||||||
readonly userId: string;
|
|
||||||
readonly displayName: string;
|
|
||||||
readonly feishuOpenId: string;
|
|
||||||
readonly avatarUrl: string | null;
|
|
||||||
/** 加入本组时间;ISO 串。 */
|
|
||||||
readonly joinedAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 节点授权(GET /database/api/nodes/:id/grants)。 */
|
|
||||||
export interface Grant {
|
|
||||||
readonly id: string;
|
|
||||||
readonly principalType: "USER" | "GROUP";
|
|
||||||
readonly principalId: string;
|
|
||||||
/** 主体显示名(用户 displayName / 组 name);主体已删为 null,展示回落 principalId。 */
|
|
||||||
readonly principalName: string | null;
|
|
||||||
/** USER 主体的飞书 openId;GROUP 或主体已删为 null。 */
|
|
||||||
readonly principalOpenId: string | null;
|
|
||||||
readonly role: Role;
|
|
||||||
/** 创建者授权不可收回、不可改(契约 8.1)。 */
|
|
||||||
readonly isCreatorGrant: boolean;
|
|
||||||
readonly createdAt: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** Group 选择器候选(GET /database/api/groups/search)。 */
|
|
||||||
export interface MemberGroupSearchResult {
|
|
||||||
readonly id: string;
|
|
||||||
readonly name: string;
|
|
||||||
/** 祖先链(根在前,自身在末),用 " / " 连接。 */
|
|
||||||
readonly breadcrumb: string;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 成员选择器候选(GET /database/api/users/search)。 */
|
|
||||||
export interface UserSearchResult {
|
|
||||||
readonly userId: string;
|
|
||||||
readonly displayName: string;
|
|
||||||
readonly feishuOpenId: string;
|
|
||||||
readonly avatarUrl: string | null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** 管理后台概览统计(GET /database/api/stats)。 */
|
|
||||||
export interface DashboardStats {
|
|
||||||
readonly folders: number;
|
|
||||||
readonly projects: number;
|
|
||||||
readonly files: number;
|
|
||||||
readonly grants: number;
|
|
||||||
readonly recent: ReadonlyArray<{
|
|
||||||
readonly action: string;
|
|
||||||
readonly actor: string;
|
|
||||||
readonly label: string;
|
|
||||||
/** ISO 串;后端 JSON 序列化后不再是 Date。 */
|
|
||||||
readonly when: string;
|
|
||||||
}>;
|
|
||||||
}
|
|
||||||
|
|
||||||
/** org 成员(GET /api/org/:slug/members);用户管理面板消费。 */
|
|
||||||
export type OrgRole = "OWNER" | "ADMIN" | "MEMBER";
|
|
||||||
|
|
||||||
export interface OrgMember {
|
|
||||||
readonly userId: string;
|
|
||||||
readonly feishuOpenId: string;
|
|
||||||
readonly displayName: string;
|
|
||||||
readonly avatarUrl: string | null;
|
|
||||||
readonly role: OrgRole;
|
|
||||||
readonly createdAt: string;
|
|
||||||
}
|
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import "../app.css";
|
|
||||||
import Toasts from "$lib/Toasts.svelte";
|
|
||||||
|
|
||||||
let { children } = $props();
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="h-full">
|
|
||||||
{@render children()}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<Toasts />
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
/**
|
|
||||||
* 纯 SPA:关掉 SSR 与预渲染,构建产物只有一个 fallback index.html
|
|
||||||
* (adapter-static + fallback,见 svelte.config.js),由 hub 后端在
|
|
||||||
* /app 与 /database/* 两个前缀下原样送出。
|
|
||||||
*/
|
|
||||||
export const ssr = false;
|
|
||||||
export const prerender = false;
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { goto } from "$app/navigation";
|
|
||||||
|
|
||||||
// 根路径不承载界面:老师端在 /app,管理后台在 /database。
|
|
||||||
onMount(() => {
|
|
||||||
void goto("/app", { replaceState: true });
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="flex h-full items-center justify-center text-[13px] text-ink-3">跳转中…</div>
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/** 老师端。未登录显示登录卡片;登录后直接是文件库浏览器。 */
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { me, authChecked } from "$lib/stores.js";
|
|
||||||
import { loadSession } from "$lib/session.js";
|
|
||||||
import LoginView from "$lib/LoginView.svelte";
|
|
||||||
import LibraryView from "$lib/LibraryView.svelte";
|
|
||||||
|
|
||||||
onMount(loadSession);
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<svelte:head><title>文件库</title></svelte:head>
|
|
||||||
|
|
||||||
{#if !$authChecked}
|
|
||||||
<div class="flex h-full items-center justify-center text-ink-3">加载中…</div>
|
|
||||||
{:else if $me}
|
|
||||||
<div class="flex h-full flex-col">
|
|
||||||
<LibraryView showUserFooter />
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
<LoginView />
|
|
||||||
{/if}
|
|
||||||
@@ -1,11 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { goto } from "$app/navigation";
|
|
||||||
|
|
||||||
// /database 本身不承载界面(与旧后端 /database/admin → dashboard 的跳转一致)。
|
|
||||||
onMount(() => {
|
|
||||||
void goto("/database/dashboard", { replaceState: true });
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="flex h-full items-center justify-center text-[13px] text-ink-3">跳转中…</div>
|
|
||||||
@@ -1,63 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* 管理后台登录页(迁自后端 renderLoginPage)。
|
|
||||||
* 已登录直接跳 dashboard —— 与旧后端路由 /database/admin 的行为一致。
|
|
||||||
*/
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { goto } from "$app/navigation";
|
|
||||||
import { me, authChecked } from "$lib/stores.js";
|
|
||||||
import { loadSession } from "$lib/session.js";
|
|
||||||
import { loadConfig, type AppConfig } from "$lib/config.js";
|
|
||||||
|
|
||||||
let info = $state<AppConfig | null>(null);
|
|
||||||
let loadFailed = $state(false);
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
await loadSession();
|
|
||||||
if ($me !== null) {
|
|
||||||
void goto("/database/dashboard", { replaceState: true });
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
try {
|
|
||||||
info = await loadConfig();
|
|
||||||
} catch {
|
|
||||||
loadFailed = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<svelte:head><title>Database Admin · 登录</title></svelte:head>
|
|
||||||
|
|
||||||
<div class="flex min-h-full items-center justify-center p-6">
|
|
||||||
<div class="w-full max-w-[380px] rounded-2xl border border-line-soft bg-panel p-9 shadow-[0_4px_20px_rgba(26,26,24,.07)]">
|
|
||||||
<div class="text-center text-[26px] font-semibold text-ink">Database Admin</div>
|
|
||||||
<p class="mt-2.5 mb-8 text-center text-[13px] text-ink-3">使用飞书登录以管理数据库</p>
|
|
||||||
|
|
||||||
{#if !$authChecked}
|
|
||||||
<p class="text-center text-[12.5px] text-ink-3">加载中…</p>
|
|
||||||
{:else if info}
|
|
||||||
<a
|
|
||||||
href="/auth/feishu/{encodeURIComponent(info.orgSlug)}"
|
|
||||||
data-sveltekit-reload
|
|
||||||
class="flex w-full items-center justify-center rounded-lg bg-accent px-4 py-3 text-sm font-medium text-white transition hover:bg-accent-hover"
|
|
||||||
>使用飞书登录</a>
|
|
||||||
|
|
||||||
{#if info.devLoginEnabled}
|
|
||||||
<div class="my-5 flex items-center gap-2.5 text-[11px] text-ink-3">
|
|
||||||
<span class="flex-1 border-t border-line-soft"></span>开发模式
|
|
||||||
<span class="flex-1 border-t border-line-soft"></span>
|
|
||||||
</div>
|
|
||||||
<a
|
|
||||||
href="/database/dev-login"
|
|
||||||
data-sveltekit-reload
|
|
||||||
class="flex w-full items-center justify-center rounded-lg border border-line bg-panel px-4 py-2 text-[12.5px] font-medium text-ink transition hover:bg-hover"
|
|
||||||
>⚡ 一键登录管理员</a>
|
|
||||||
<p class="mt-2.5 text-center text-[11px] text-ink-3">仅开发环境可见 · 跳过飞书 OAuth</p>
|
|
||||||
{/if}
|
|
||||||
{:else if loadFailed}
|
|
||||||
<p class="text-center text-[12.5px] text-danger">无法加载登录配置,请稍后重试</p>
|
|
||||||
{:else}
|
|
||||||
<p class="text-center text-[12.5px] text-ink-3">加载中…</p>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
@@ -1,99 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* 管理后台外壳(迁自后端 renderDashboard 的侧栏 + 身份区)。
|
|
||||||
*
|
|
||||||
* 与旧实现的区别:六个 tab 是真 URL 路由(/database/dashboard/library 等),
|
|
||||||
* 不再是 location.hash + display:none 切换 —— 刷新不丢位置,链接可分享。
|
|
||||||
*
|
|
||||||
* 权限门:未登录跳 /database/admin;登录但非 OWNER/ADMIN(isWebsiteAdmin)
|
|
||||||
* 显示无权提示。语义与 ADR-0028 一致 —— 管理面板要求 silo org 的 OWNER/ADMIN。
|
|
||||||
*/
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { goto } from "$app/navigation";
|
|
||||||
import { page } from "$app/state";
|
|
||||||
import { me, authChecked } from "$lib/stores.js";
|
|
||||||
import { loadSession, logout } from "$lib/session.js";
|
|
||||||
import Avatar from "$lib/Avatar.svelte";
|
|
||||||
|
|
||||||
let { children } = $props();
|
|
||||||
|
|
||||||
const NAV = [
|
|
||||||
{ seg: "", label: "概览", icon: "M4 13h6V4H4v9Zm0 7h6v-5H4v5Zm10 0h6V11h-6v9Zm0-16v5h6V4h-6Z" },
|
|
||||||
{ seg: "library", label: "文件库", icon: "M3 7a2 2 0 0 1 2-2h4l2 2h8a2 2 0 0 1 2 2v9a2 2 0 0 1-2 2H5a2 2 0 0 1-2-2V7Z" },
|
|
||||||
{ seg: "users", label: "用户管理", icon: "M16 21v-2a4 4 0 0 0-4-4H6a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm13 10v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75" },
|
|
||||||
{ seg: "groups", label: "Group 管理", icon: "M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2M9 11a4 4 0 1 0 0-8 4 4 0 0 0 0 8Zm14 10v-2a4 4 0 0 0-3-3.87M16 3.13a4 4 0 0 1 0 7.75M23 21v-2a4 4 0 0 0-3-3.87" },
|
|
||||||
{ seg: "search", label: "查询", icon: "m21 21-4.3-4.3M11 18a7 7 0 1 0 0-14 7 7 0 0 0 0 14Z" },
|
|
||||||
{ seg: "settings", label: "设置", icon: "M12 15a3 3 0 1 0 0-6 3 3 0 0 0 0 6Zm7-3 2 1-2 3-2-1a7 7 0 0 1-2 1l-1 2h-4l-1-2a7 7 0 0 1-2-1l-2 1-2-3 2-1a7 7 0 0 1 0-2l-2-1 2-3 2 1a7 7 0 0 1 2 1l1-2h4l1 2a7 7 0 0 1 0 2l2-1 2 3-2 1a7 7 0 0 1 0 2Z" },
|
|
||||||
] as const;
|
|
||||||
|
|
||||||
const BASE = "/database/dashboard";
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
await loadSession();
|
|
||||||
if ($me === null) void goto("/database/admin", { replaceState: true });
|
|
||||||
});
|
|
||||||
|
|
||||||
function href(seg: string): string {
|
|
||||||
return seg === "" ? BASE : `${BASE}/${seg}`;
|
|
||||||
}
|
|
||||||
|
|
||||||
function isActive(seg: string): boolean {
|
|
||||||
const path = page.url.pathname.replace(/\/$/, "");
|
|
||||||
return seg === "" ? path === BASE : path === `${BASE}/${seg}`;
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<svelte:head><title>Database Admin</title></svelte:head>
|
|
||||||
|
|
||||||
{#if !$authChecked}
|
|
||||||
<div class="flex h-full items-center justify-center text-[13px] text-ink-3">加载中…</div>
|
|
||||||
{:else if $me === null}
|
|
||||||
<div class="flex h-full items-center justify-center text-[13px] text-ink-3">跳转到登录页…</div>
|
|
||||||
{:else if !$me.isWebsiteAdmin}
|
|
||||||
<div class="flex min-h-full items-center justify-center p-6">
|
|
||||||
<div class="w-full max-w-[420px] rounded-2xl border border-line-soft bg-panel p-9 text-center shadow-[0_4px_20px_rgba(26,26,24,.07)]">
|
|
||||||
<h2 class="mb-2 text-lg font-semibold text-ink">无权访问管理后台</h2>
|
|
||||||
<p class="mb-6 text-[13px] text-ink-3">
|
|
||||||
当前账号不是本组织的所有者或管理员。普通老师请到文件库使用。
|
|
||||||
</p>
|
|
||||||
<a href="/app" class="btn btn-primary justify-center">前往文件库</a>
|
|
||||||
<button class="btn mt-3 w-full justify-center" onclick={logout}>退出登录</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
<div class="flex h-full">
|
|
||||||
<aside class="flex w-[240px] shrink-0 flex-col border-r border-line-soft bg-sidebar">
|
|
||||||
<div class="border-b border-line-soft px-4 py-4">
|
|
||||||
<span class="text-[15px] font-semibold text-ink">Database Admin</span>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<nav class="flex flex-1 flex-col gap-0.5 p-2.5">
|
|
||||||
{#each NAV as item (item.seg)}
|
|
||||||
{@const active = isActive(item.seg)}
|
|
||||||
<a
|
|
||||||
href={href(item.seg)}
|
|
||||||
class="flex items-center gap-2.5 rounded-[10px] px-3.5 py-2 text-[13px] transition"
|
|
||||||
class:bg-selected={active}
|
|
||||||
class:text-ink={active}
|
|
||||||
class:font-semibold={active}
|
|
||||||
class:text-ink-3={!active}
|
|
||||||
class:hover:bg-hover={!active}
|
|
||||||
>
|
|
||||||
<svg class="h-4 w-4 shrink-0" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.8" stroke-linecap="round" stroke-linejoin="round"><path d={item.icon} /></svg>
|
|
||||||
{item.label}
|
|
||||||
</a>
|
|
||||||
{/each}
|
|
||||||
</nav>
|
|
||||||
|
|
||||||
<div class="m-2.5 flex items-center gap-2.5 border-t border-line-soft px-3 py-2.5">
|
|
||||||
<Avatar displayName={$me.displayName} userId={$me.userId} avatarUrl={$me.avatarUrl} size={26} />
|
|
||||||
<p class="min-w-0 flex-1 truncate text-[12.5px] text-ink" title={$me.userId}>{$me.displayName}</p>
|
|
||||||
<button class="btn !px-2.5 !py-[3px] !text-[11px]" onclick={logout}>退出</button>
|
|
||||||
</div>
|
|
||||||
</aside>
|
|
||||||
|
|
||||||
<div class="flex min-w-0 flex-1 flex-col">
|
|
||||||
{@render children()}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/** 概览(迁自后端 renderDashboard 的统计卡片 + 最近活动)。数据走 GET /database/api/stats。 */
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { api } from "$lib/api.js";
|
|
||||||
import type { DashboardStats } from "$lib/types.js";
|
|
||||||
|
|
||||||
let stats = $state<DashboardStats | null>(null);
|
|
||||||
let error = $state<string | null>(null);
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
try {
|
|
||||||
stats = await api<DashboardStats>("/database/api/stats");
|
|
||||||
} catch (e) {
|
|
||||||
error = e instanceof Error ? e.message : String(e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
const cards = $derived([
|
|
||||||
{ label: "文件夹", value: stats?.folders },
|
|
||||||
{ label: "项目", value: stats?.projects },
|
|
||||||
{ label: "文件", value: stats?.files },
|
|
||||||
{ label: "活跃授权", value: stats?.grants },
|
|
||||||
]);
|
|
||||||
|
|
||||||
function fmtWhen(iso: string): string {
|
|
||||||
try {
|
|
||||||
return new Date(iso).toLocaleString("zh-CN");
|
|
||||||
} catch {
|
|
||||||
return iso;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<section class="flex-1 overflow-y-auto p-7">
|
|
||||||
<h1 class="mb-1 text-lg font-semibold text-ink">概览</h1>
|
|
||||||
<p class="mb-5 text-[11.5px] text-ink-3">文件库实时数据</p>
|
|
||||||
|
|
||||||
{#if error}
|
|
||||||
<div class="panel text-[12.5px] text-danger">{error}</div>
|
|
||||||
{:else}
|
|
||||||
<div class="grid grid-cols-4 gap-4">
|
|
||||||
{#each cards as card (card.label)}
|
|
||||||
<div class="panel !px-5 !py-[18px]">
|
|
||||||
<p class="text-[12.5px] text-ink-3">{card.label}</p>
|
|
||||||
<p class="mt-1.5 text-[28px] font-semibold text-ink">{card.value ?? "—"}</p>
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="panel mt-[18px]">
|
|
||||||
<h2 class="mb-2 text-[13.5px] font-semibold text-ink">最近活动</h2>
|
|
||||||
{#if stats === null}
|
|
||||||
<div class="quiet py-6 text-center">加载中…</div>
|
|
||||||
{:else if stats.recent.length === 0}
|
|
||||||
<div class="quiet py-[26px] text-center">暂无文件库活动 · 到「文件库」里创建第一个文件夹吧</div>
|
|
||||||
{:else}
|
|
||||||
{#each stats.recent as row (row.action + row.when + row.label)}
|
|
||||||
<div class="flex items-center gap-3 border-t border-line-soft py-2.5 text-[13px]">
|
|
||||||
<span class="tag shrink-0">{row.action}</span>
|
|
||||||
<span class="truncate text-ink">{row.label}</span>
|
|
||||||
<span class="ml-auto shrink-0 text-[11.5px] text-ink-3">{row.actor} · {fmtWhen(row.when)}</span>
|
|
||||||
</div>
|
|
||||||
{/each}
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
{/if}
|
|
||||||
</section>
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/** Group 管理 tab —— MemberGroup 嵌套树(ADR-0028)。
|
|
||||||
* 外框 padding/overflow 对齐旧 `#tab-groups`(padding:20px;overflow:hidden):
|
|
||||||
* 两栏各自内部滚动,外层不滚。 */
|
|
||||||
import GroupAdmin from "$lib/GroupAdmin.svelte";
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="min-h-0 flex-1 overflow-hidden p-5">
|
|
||||||
<GroupAdmin />
|
|
||||||
</div>
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/** 文件库 tab —— 与老师端 /app 同一个浏览器组件,区别只在侧栏身份区由外壳提供。 */
|
|
||||||
import LibraryView from "$lib/LibraryView.svelte";
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<div class="flex min-h-0 flex-1 flex-col">
|
|
||||||
<LibraryView />
|
|
||||||
</div>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<section class="flex-1 overflow-y-auto p-7">
|
|
||||||
<h1 class="mb-1 text-lg font-semibold text-ink">查询</h1>
|
|
||||||
<p class="text-[12.5px] text-ink-3">查询功能建设中</p>
|
|
||||||
</section>
|
|
||||||
@@ -1,4 +0,0 @@
|
|||||||
<section class="flex-1 overflow-y-auto p-7">
|
|
||||||
<h1 class="mb-1 text-lg font-semibold text-ink">设置</h1>
|
|
||||||
<p class="text-[12.5px] text-ink-3">设置功能建设中</p>
|
|
||||||
</section>
|
|
||||||
@@ -1,200 +0,0 @@
|
|||||||
<script lang="ts">
|
|
||||||
/**
|
|
||||||
* 用户管理(迁自后端 adminPanels.ts renderUsersPanel)。
|
|
||||||
*
|
|
||||||
* 用户 = silo org 的成员,走平台层 /api/org/:slug/members(见 src/admin/routes/membersRoutes.ts)。
|
|
||||||
* 与 Group 管理是两套体系:MemberGroup 是全局主体、不归属 org(ADR-0028),
|
|
||||||
* 这里管的是 org 成员与其角色。
|
|
||||||
*/
|
|
||||||
import { onMount } from "svelte";
|
|
||||||
import { page } from "$app/state";
|
|
||||||
import { api } from "$lib/api.js";
|
|
||||||
import { loadConfig } from "$lib/config.js";
|
|
||||||
import { toastOk, toastErr } from "$lib/stores.js";
|
|
||||||
import type { OrgMember, OrgRole } from "$lib/types.js";
|
|
||||||
import Icon from "$lib/Icon.svelte";
|
|
||||||
|
|
||||||
const ROLE_LABEL: Record<OrgRole, string> = {
|
|
||||||
OWNER: "所有者",
|
|
||||||
ADMIN: "管理员",
|
|
||||||
MEMBER: "普通老师",
|
|
||||||
};
|
|
||||||
const ROLES: readonly OrgRole[] = ["OWNER", "ADMIN", "MEMBER"];
|
|
||||||
|
|
||||||
let orgSlug = $state<string | null>(null);
|
|
||||||
let members = $state<OrgMember[] | null>(null);
|
|
||||||
let error = $state<string | null>(null);
|
|
||||||
|
|
||||||
// 列表过滤;授权面板跳转会带 ?q=<userId>,以此为初始过滤词。
|
|
||||||
let filterText = $state(page.url.searchParams.get("q") ?? "");
|
|
||||||
|
|
||||||
let newOpenId = $state("");
|
|
||||||
let newName = $state("");
|
|
||||||
let newRole = $state<OrgRole>("MEMBER");
|
|
||||||
let adding = $state(false);
|
|
||||||
|
|
||||||
const base = $derived(orgSlug === null ? null : `/api/org/${encodeURIComponent(orgSlug)}`);
|
|
||||||
|
|
||||||
/** 按显示名 / userId / openId 过滤(纯前端;成员全量在手)。 */
|
|
||||||
const shown = $derived.by((): OrgMember[] | null => {
|
|
||||||
if (members === null) return null;
|
|
||||||
const q = filterText.trim().toLowerCase();
|
|
||||||
if (q === "") return members;
|
|
||||||
return members.filter(
|
|
||||||
(m) =>
|
|
||||||
m.displayName.toLowerCase().includes(q) ||
|
|
||||||
m.userId.toLowerCase().includes(q) ||
|
|
||||||
m.feishuOpenId.toLowerCase().includes(q),
|
|
||||||
);
|
|
||||||
});
|
|
||||||
|
|
||||||
async function load(): Promise<void> {
|
|
||||||
if (base === null) return;
|
|
||||||
try {
|
|
||||||
const r = await api<{ members: OrgMember[] }>(`${base}/members`);
|
|
||||||
members = r.members;
|
|
||||||
error = null;
|
|
||||||
} catch (e) {
|
|
||||||
error = e instanceof Error ? e.message : String(e);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
onMount(async () => {
|
|
||||||
try {
|
|
||||||
orgSlug = (await loadConfig()).orgSlug;
|
|
||||||
await load();
|
|
||||||
} catch (e) {
|
|
||||||
error = e instanceof Error ? e.message : String(e);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
async function addMember(): Promise<void> {
|
|
||||||
const feishuOpenId = newOpenId.trim();
|
|
||||||
if (feishuOpenId === "") {
|
|
||||||
toastErr("请填写用户 openId");
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
if (base === null) return;
|
|
||||||
adding = true;
|
|
||||||
try {
|
|
||||||
const displayName = newName.trim();
|
|
||||||
await api(`${base}/members`, {
|
|
||||||
method: "POST",
|
|
||||||
body: { feishuOpenId, role: newRole, ...(displayName !== "" ? { displayName } : {}) },
|
|
||||||
});
|
|
||||||
newOpenId = "";
|
|
||||||
newName = "";
|
|
||||||
toastOk("已添加");
|
|
||||||
await load();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
} finally {
|
|
||||||
adding = false;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function setRole(userId: string, role: string): Promise<void> {
|
|
||||||
if (base === null) return;
|
|
||||||
try {
|
|
||||||
await api(`${base}/members/${encodeURIComponent(userId)}`, { method: "PATCH", body: { role } });
|
|
||||||
toastOk("角色已更新");
|
|
||||||
await load();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
await load();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async function revoke(userId: string, displayName: string): Promise<void> {
|
|
||||||
if (base === null) return;
|
|
||||||
if (!confirm(`移除成员「${displayName || userId}」?`)) return;
|
|
||||||
try {
|
|
||||||
await api(`${base}/members/${encodeURIComponent(userId)}/revoke`, { method: "POST" });
|
|
||||||
toastOk("已移除");
|
|
||||||
await load();
|
|
||||||
} catch (e) {
|
|
||||||
toastErr(e instanceof Error ? e.message : String(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
</script>
|
|
||||||
|
|
||||||
<section class="flex-1 overflow-y-auto p-7">
|
|
||||||
<h1 class="mb-4 text-lg font-semibold text-ink">用户管理</h1>
|
|
||||||
|
|
||||||
<div class="max-w-[880px]">
|
|
||||||
<div class="panel mb-3.5">
|
|
||||||
<div class="section-title mb-2.5">添加成员</div>
|
|
||||||
<div class="flex flex-wrap items-center gap-2">
|
|
||||||
<input class="input min-w-0 flex-[2]" placeholder="用户 openId(飞书 ou_ 开头)" bind:value={newOpenId} />
|
|
||||||
<input class="input min-w-0 flex-1" placeholder="显示名(可选)" bind:value={newName} />
|
|
||||||
<select class="select !w-[130px]" bind:value={newRole}>
|
|
||||||
{#each ROLES as role (role)}
|
|
||||||
<option value={role}>{ROLE_LABEL[role]}</option>
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
<button class="btn btn-primary disabled:opacity-50" onclick={addMember} disabled={adding}>
|
|
||||||
{adding ? "添加中…" : "添加"}
|
|
||||||
</button>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
<div class="panel">
|
|
||||||
<div class="mb-2.5 flex items-center justify-between gap-2">
|
|
||||||
<div class="section-title">成员列表</div>
|
|
||||||
<div class="relative w-[260px] shrink-0">
|
|
||||||
<span class="pointer-events-none absolute left-2.5 top-1/2 -translate-y-1/2 text-ink-3">
|
|
||||||
<Icon name="search" size={13} />
|
|
||||||
</span>
|
|
||||||
<input
|
|
||||||
class="input w-full !py-[5px] !pl-8 !text-[12.5px]"
|
|
||||||
placeholder="过滤:名称 / userId / openId"
|
|
||||||
bind:value={filterText}
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
|
|
||||||
{#if error}
|
|
||||||
<div class="py-3 text-[12.5px] text-danger">{error}</div>
|
|
||||||
{:else if shown === null}
|
|
||||||
<div class="quiet py-[18px] text-center">加载中…</div>
|
|
||||||
{:else if shown.length === 0}
|
|
||||||
<div class="quiet py-[18px] text-center">
|
|
||||||
{filterText.trim() === "" ? "暂无成员" : `无匹配「${filterText.trim()}」的成员`}
|
|
||||||
</div>
|
|
||||||
{:else}
|
|
||||||
<table class="list">
|
|
||||||
<thead>
|
|
||||||
<tr>
|
|
||||||
<th>成员</th>
|
|
||||||
<th>userId</th>
|
|
||||||
<th>角色</th>
|
|
||||||
<th></th>
|
|
||||||
</tr>
|
|
||||||
</thead>
|
|
||||||
<tbody>
|
|
||||||
{#each shown as m (m.userId)}
|
|
||||||
<tr>
|
|
||||||
<td class="text-ink">{m.displayName || m.userId}</td>
|
|
||||||
<td class="file-meta">{m.userId}</td>
|
|
||||||
<td>
|
|
||||||
<select
|
|
||||||
class="select !w-[110px] !px-2 !py-[3px] !text-xs"
|
|
||||||
value={m.role}
|
|
||||||
onchange={(e) => setRole(m.userId, e.currentTarget.value)}
|
|
||||||
>
|
|
||||||
{#each ROLES as role (role)}
|
|
||||||
<option value={role}>{ROLE_LABEL[role]}</option>
|
|
||||||
{/each}
|
|
||||||
</select>
|
|
||||||
</td>
|
|
||||||
<td class="text-right">
|
|
||||||
<button class="link-danger" onclick={() => revoke(m.userId, m.displayName)}>移除</button>
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
{/each}
|
|
||||||
</tbody>
|
|
||||||
</table>
|
|
||||||
{/if}
|
|
||||||
</div>
|
|
||||||
</div>
|
|
||||||
</section>
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
import adapter from '@sveltejs/adapter-static';
|
|
||||||
import { vitePreprocess } from '@sveltejs/vite-plugin-svelte';
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 老师端 /app 与管理后台 /database/* 共用这一份 SPA 构建产物,由 hub 后端静态托管
|
|
||||||
* (见 hub/src/database/static.ts)。服务端不渲染任何页面,只提供 /database/api/*。
|
|
||||||
*
|
|
||||||
* 两个关键配置:
|
|
||||||
*
|
|
||||||
* - `appDir: '_filelib'` —— 默认 `_app` 会与 admin-web 在同一个 Fastify 实例上注册的
|
|
||||||
* 根 `/_app/*` 资源路由撞车(见 hub/src/admin/static.ts),Fastify 重复路由会直接
|
|
||||||
* 在启动时抛错。改名后两套 SPA 的资源路径互不干扰。
|
|
||||||
*
|
|
||||||
* - `paths.relative: false` —— 同一份 index.html 会在不同深度的 URL 下被送出
|
|
||||||
* (`/app`、`/database/dashboard/users`),相对资源路径会解析错。必须用绝对路径。
|
|
||||||
*/
|
|
||||||
const config = {
|
|
||||||
preprocess: vitePreprocess(),
|
|
||||||
kit: {
|
|
||||||
adapter: adapter({
|
|
||||||
pages: 'build',
|
|
||||||
assets: 'build',
|
|
||||||
fallback: 'index.html',
|
|
||||||
precompress: false,
|
|
||||||
strict: false,
|
|
||||||
}),
|
|
||||||
appDir: '_filelib',
|
|
||||||
paths: {
|
|
||||||
base: '',
|
|
||||||
relative: false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
export default config;
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
{
|
|
||||||
"extends": "./.svelte-kit/tsconfig.json",
|
|
||||||
"compilerOptions": {
|
|
||||||
"target": "ES2022",
|
|
||||||
"module": "ESNext",
|
|
||||||
"moduleResolution": "bundler",
|
|
||||||
"strict": true,
|
|
||||||
"noUncheckedIndexedAccess": true,
|
|
||||||
"exactOptionalPropertyTypes": true,
|
|
||||||
"verbatimModuleSyntax": true,
|
|
||||||
"skipLibCheck": true,
|
|
||||||
"isolatedModules": true,
|
|
||||||
"resolveJsonModule": true,
|
|
||||||
"useDefineForClassFields": true,
|
|
||||||
"lib": ["ES2022", "DOM", "DOM.Iterable"]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,27 +0,0 @@
|
|||||||
import { sveltekit } from "@sveltejs/kit/vite";
|
|
||||||
import tailwindcss from "@tailwindcss/vite";
|
|
||||||
import { defineConfig } from "vite";
|
|
||||||
|
|
||||||
// 老师端 /app + 管理后台 /database/* 的唯一前端工程;构建产物由 hub 后端静态托管。
|
|
||||||
// 开发时 vite dev(:5173)把 API/认证/一键登录请求代理到后端(:8788);
|
|
||||||
// 页面路由全部由 SvelteKit 客户端路由处理,后端不参与。
|
|
||||||
const backend = "http://127.0.0.1:8788";
|
|
||||||
|
|
||||||
export default defineConfig({
|
|
||||||
plugins: [tailwindcss(), sveltekit()],
|
|
||||||
server: {
|
|
||||||
port: 5173,
|
|
||||||
proxy: {
|
|
||||||
"/database/api": backend,
|
|
||||||
// 免鉴权 bootstrap(org slug + dev 开关);登录页和用户管理页都靠它。
|
|
||||||
"/database/config": backend,
|
|
||||||
"/auth": backend,
|
|
||||||
// 后端拥有的 DEV 一键登录端点(签 cookie 后 302);不代理会被 SPA 回退吃掉。
|
|
||||||
"/database/dev-login": backend,
|
|
||||||
"/app/dev-login": backend,
|
|
||||||
"/app/dev-login-teacher": backend,
|
|
||||||
// 平台层 org 成员 API(用户管理面板)。
|
|
||||||
"/api/org": backend,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
});
|
|
||||||
Generated
+12
-207
@@ -1,19 +1,18 @@
|
|||||||
{
|
{
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.36",
|
"version": "0.0.31",
|
||||||
"lockfileVersion": 3,
|
"lockfileVersion": 3,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.36",
|
"version": "0.0.31",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@alicloud/credentials": "^2.4.5",
|
"@alicloud/credentials": "^2.4.5",
|
||||||
"@alicloud/docmind-api20220711": "^1.4.15",
|
"@alicloud/docmind-api20220711": "^1.4.15",
|
||||||
"@alicloud/tea-util": "^1.4.11",
|
"@alicloud/tea-util": "^1.4.11",
|
||||||
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
||||||
"@fastify/cookie": "^11.0.2",
|
"@fastify/cookie": "^11.0.2",
|
||||||
"@fastify/static": "^10.1.2",
|
|
||||||
"@larksuiteoapi/node-sdk": "^1.70.0",
|
"@larksuiteoapi/node-sdk": "^1.70.0",
|
||||||
"@prisma/client": "^6.19.3",
|
"@prisma/client": "^6.19.3",
|
||||||
"ai": "^7.0.16",
|
"ai": "^7.0.16",
|
||||||
@@ -903,22 +902,6 @@
|
|||||||
"node": ">=18"
|
"node": ">=18"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@fastify/accept-negotiator": {
|
|
||||||
"version": "2.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/@fastify/accept-negotiator/-/accept-negotiator-2.0.1.tgz",
|
|
||||||
"integrity": "sha512-/c/TW2bO/v9JeEgoD/g1G5GxGeCF1Hafdf79WPmUlgYiBXummY0oX3VVq4yFkKKVBKDNlaDUYoab7g38RpPqCQ==",
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"type": "github",
|
|
||||||
"url": "https://github.com/sponsors/fastify"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/fastify"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/@fastify/ajv-compiler": {
|
"node_modules/@fastify/ajv-compiler": {
|
||||||
"version": "4.0.5",
|
"version": "4.0.5",
|
||||||
"resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-4.0.5.tgz",
|
"resolved": "https://registry.npmjs.org/@fastify/ajv-compiler/-/ajv-compiler-4.0.5.tgz",
|
||||||
@@ -1050,83 +1033,6 @@
|
|||||||
"ipaddr.js": "^2.1.0"
|
"ipaddr.js": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@fastify/send": {
|
|
||||||
"version": "4.1.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/@fastify/send/-/send-4.1.0.tgz",
|
|
||||||
"integrity": "sha512-TMYeQLCBSy2TOFmV95hQWkiTYgC/SEx7vMdV+wnZVX4tt8VBLKzmH8vV9OzJehV0+XBfg+WxPMt5wp+JBUKsVw==",
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"type": "github",
|
|
||||||
"url": "https://github.com/sponsors/fastify"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/fastify"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@lukeed/ms": "^2.0.2",
|
|
||||||
"escape-html": "~1.0.3",
|
|
||||||
"fast-decode-uri-component": "^1.0.1",
|
|
||||||
"http-errors": "^2.0.0",
|
|
||||||
"mime": "^3"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@fastify/static": {
|
|
||||||
"version": "10.1.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@fastify/static/-/static-10.1.2.tgz",
|
|
||||||
"integrity": "sha512-G/g18cG9tLutT/OVyN1AIsHIl9L1UwmJ+S3dkyhVpplIx0nEMicd7RGQ+uJLyhKKF4a3tTcQydccn3Mop1fX+Q==",
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"type": "github",
|
|
||||||
"url": "https://github.com/sponsors/fastify"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/fastify"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"@fastify/accept-negotiator": "^2.0.0",
|
|
||||||
"@fastify/error": "^4.0.0",
|
|
||||||
"@fastify/send": "^4.0.0",
|
|
||||||
"content-disposition": "^2.0.1",
|
|
||||||
"fastify-plugin": "^6.0.0",
|
|
||||||
"fastq": "^1.17.1",
|
|
||||||
"glob": "^13.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@fastify/static/node_modules/content-disposition": {
|
|
||||||
"version": "2.0.1",
|
|
||||||
"resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-2.0.1.tgz",
|
|
||||||
"integrity": "sha512-e+H0ZXHSWYrENhQzw1LPuP4oF5MzVKmDU6d3hxlvaPEYLLg62MxtQNPRx4SYSuYJSBUgnQIG4HIN2tEtNv7Dog==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=18"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/express"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@fastify/static/node_modules/fastify-plugin": {
|
|
||||||
"version": "6.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/fastify-plugin/-/fastify-plugin-6.0.0.tgz",
|
|
||||||
"integrity": "sha512-fZOty7z3O7vOliF6d8bHE3wiEh1KcNnKEQensSgTk9C1DvN6nRLS++XVd86v33Hw/8u9Un8A1zDrQ8ujcQDHEg==",
|
|
||||||
"funding": [
|
|
||||||
{
|
|
||||||
"type": "github",
|
|
||||||
"url": "https://github.com/sponsors/fastify"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"type": "opencollective",
|
|
||||||
"url": "https://opencollective.com/fastify"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"license": "MIT"
|
|
||||||
},
|
|
||||||
"node_modules/@hono/node-server": {
|
"node_modules/@hono/node-server": {
|
||||||
"version": "1.19.14",
|
"version": "1.19.14",
|
||||||
"resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz",
|
"resolved": "https://registry.npmjs.org/@hono/node-server/-/node-server-1.19.14.tgz",
|
||||||
@@ -1162,15 +1068,6 @@
|
|||||||
"ws": "^8.19.0"
|
"ws": "^8.19.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/@lukeed/ms": {
|
|
||||||
"version": "2.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/@lukeed/ms/-/ms-2.0.2.tgz",
|
|
||||||
"integrity": "sha512-9I2Zn6+NJLfaGoz9jN3lpwDgAYvfGeNYdbAIjJOqzs4Tpc+VU3Jqq4IofSUBKajiDS8k9fZIg18/z13mpk1bsA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=8"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/@modelcontextprotocol/sdk": {
|
"node_modules/@modelcontextprotocol/sdk": {
|
||||||
"version": "1.29.0",
|
"version": "1.29.0",
|
||||||
"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz",
|
"resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.29.0.tgz",
|
||||||
@@ -2037,15 +1934,6 @@
|
|||||||
"proxy-from-env": "^2.1.0"
|
"proxy-from-env": "^2.1.0"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/balanced-match": {
|
|
||||||
"version": "4.0.4",
|
|
||||||
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
|
|
||||||
"integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/body-parser": {
|
"node_modules/body-parser": {
|
||||||
"version": "2.3.0",
|
"version": "2.3.0",
|
||||||
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.3.0.tgz",
|
"resolved": "https://registry.npmjs.org/body-parser/-/body-parser-2.3.0.tgz",
|
||||||
@@ -2085,18 +1973,6 @@
|
|||||||
"url": "https://opencollective.com/express"
|
"url": "https://opencollective.com/express"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/brace-expansion": {
|
|
||||||
"version": "5.0.7",
|
|
||||||
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.7.tgz",
|
|
||||||
"integrity": "sha512-7oFy703dxfY3/NLxC1fh2SUCQ0H9rmAY+5EpDVfXjUTTs+HEwR2nYaqLv+GWcTsumwxPfiz6CzCNkwXwBUwqCA==",
|
|
||||||
"license": "MIT",
|
|
||||||
"dependencies": {
|
|
||||||
"balanced-match": "^4.0.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/bytes": {
|
"node_modules/bytes": {
|
||||||
"version": "3.1.2",
|
"version": "3.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
|
||||||
@@ -2378,6 +2254,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
|
||||||
"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
|
"integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
@@ -2570,7 +2447,8 @@
|
|||||||
"version": "1.0.3",
|
"version": "1.0.3",
|
||||||
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
|
"resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
|
||||||
"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
|
"integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==",
|
||||||
"license": "MIT"
|
"license": "MIT",
|
||||||
|
"peer": true
|
||||||
},
|
},
|
||||||
"node_modules/estree-walker": {
|
"node_modules/estree-walker": {
|
||||||
"version": "3.0.3",
|
"version": "3.0.3",
|
||||||
@@ -3069,23 +2947,6 @@
|
|||||||
"giget": "dist/cli.mjs"
|
"giget": "dist/cli.mjs"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/glob": {
|
|
||||||
"version": "13.0.6",
|
|
||||||
"resolved": "https://registry.npmjs.org/glob/-/glob-13.0.6.tgz",
|
|
||||||
"integrity": "sha512-Wjlyrolmm8uDpm/ogGyXZXb1Z+Ca2B8NbJwqBVg0axK9GbBeoS7yGV6vjXnYdGm6X53iehEuxxbyiKp8QmN4Vw==",
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"dependencies": {
|
|
||||||
"minimatch": "^10.2.2",
|
|
||||||
"minipass": "^7.1.3",
|
|
||||||
"path-scurry": "^2.0.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/gopd": {
|
"node_modules/gopd": {
|
||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
|
||||||
@@ -3152,6 +3013,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz",
|
||||||
"integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
|
"integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"depd": "~2.0.0",
|
"depd": "~2.0.0",
|
||||||
"inherits": "~2.0.4",
|
"inherits": "~2.0.4",
|
||||||
@@ -3234,7 +3096,8 @@
|
|||||||
"version": "2.0.4",
|
"version": "2.0.4",
|
||||||
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
"resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
|
||||||
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
|
"integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
|
||||||
"license": "ISC"
|
"license": "ISC",
|
||||||
|
"peer": true
|
||||||
},
|
},
|
||||||
"node_modules/ini": {
|
"node_modules/ini": {
|
||||||
"version": "1.3.8",
|
"version": "1.3.8",
|
||||||
@@ -3683,15 +3546,6 @@
|
|||||||
"integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
|
"integrity": "sha512-mNAgZ1GmyNhD7AuqnTG3/VQ26o760+ZYBPKjPvugO8+nLbYfX6TVpJPseBvopbdY+qpZ/lKUnmEc1LeZYS3QAA==",
|
||||||
"license": "Apache-2.0"
|
"license": "Apache-2.0"
|
||||||
},
|
},
|
||||||
"node_modules/lru-cache": {
|
|
||||||
"version": "11.5.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.5.2.tgz",
|
|
||||||
"integrity": "sha512-4pfM1Ff0x50o0tQwb5ucw/RzNyD0/YJME6IVcStalZuMWxdt3sR3huStTtxz4PUmvZfRguvDejasvQ2kifR11g==",
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"engines": {
|
|
||||||
"node": "20 || >=22"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/magic-string": {
|
"node_modules/magic-string": {
|
||||||
"version": "0.30.21",
|
"version": "0.30.21",
|
||||||
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
|
"resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz",
|
||||||
@@ -3734,18 +3588,6 @@
|
|||||||
"url": "https://github.com/sponsors/sindresorhus"
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/mime": {
|
|
||||||
"version": "3.0.0",
|
|
||||||
"resolved": "https://registry.npmjs.org/mime/-/mime-3.0.0.tgz",
|
|
||||||
"integrity": "sha512-jSCU7/VB1loIWBZe14aEYHU/+1UMEHoaO7qxCOVJOw9GgH72VAWppxNcjU+x9a2k3GSIBXNKxXQFqRvvZ7vr3A==",
|
|
||||||
"license": "MIT",
|
|
||||||
"bin": {
|
|
||||||
"mime": "cli.js"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": ">=10.0.0"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/mime-db": {
|
"node_modules/mime-db": {
|
||||||
"version": "1.52.0",
|
"version": "1.52.0",
|
||||||
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
|
"resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
|
||||||
@@ -3767,30 +3609,6 @@
|
|||||||
"node": ">= 0.6"
|
"node": ">= 0.6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/minimatch": {
|
|
||||||
"version": "10.2.5",
|
|
||||||
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.5.tgz",
|
|
||||||
"integrity": "sha512-MULkVLfKGYDFYejP07QOurDLLQpcjk7Fw+7jXS2R2czRQzR56yHRveU5NDJEOviH+hETZKSkIk5c+T23GjFUMg==",
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"dependencies": {
|
|
||||||
"brace-expansion": "^5.0.5"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/minipass": {
|
|
||||||
"version": "7.1.3",
|
|
||||||
"resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.3.tgz",
|
|
||||||
"integrity": "sha512-tEBHqDnIoM/1rXME1zgka9g6Q2lcoCkxHLuc7ODJ5BxbP5d4c2Z5cGgtXAku59200Cx7diuHTOYfSBD8n6mm8A==",
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"engines": {
|
|
||||||
"node": ">=16 || 14 >=14.17"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/moment": {
|
"node_modules/moment": {
|
||||||
"version": "2.30.1",
|
"version": "2.30.1",
|
||||||
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
|
"resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
|
||||||
@@ -3974,22 +3792,6 @@
|
|||||||
"node": ">=8"
|
"node": ">=8"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"node_modules/path-scurry": {
|
|
||||||
"version": "2.0.2",
|
|
||||||
"resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.2.tgz",
|
|
||||||
"integrity": "sha512-3O/iVVsJAPsOnpwWIeD+d6z/7PmqApyQePUtCndjatj/9I5LylHvt5qluFaBT3I5h3r1ejfR056c+FCv+NnNXg==",
|
|
||||||
"license": "BlueOak-1.0.0",
|
|
||||||
"dependencies": {
|
|
||||||
"lru-cache": "^11.0.0",
|
|
||||||
"minipass": "^7.1.2"
|
|
||||||
},
|
|
||||||
"engines": {
|
|
||||||
"node": "18 || 20 || >=22"
|
|
||||||
},
|
|
||||||
"funding": {
|
|
||||||
"url": "https://github.com/sponsors/isaacs"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"node_modules/path-to-regexp": {
|
"node_modules/path-to-regexp": {
|
||||||
"version": "8.4.2",
|
"version": "8.4.2",
|
||||||
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
|
"resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.4.2.tgz",
|
||||||
@@ -4568,7 +4370,8 @@
|
|||||||
"version": "1.2.0",
|
"version": "1.2.0",
|
||||||
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
|
"resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
|
||||||
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
|
"integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==",
|
||||||
"license": "ISC"
|
"license": "ISC",
|
||||||
|
"peer": true
|
||||||
},
|
},
|
||||||
"node_modules/shebang-command": {
|
"node_modules/shebang-command": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
@@ -4767,6 +4570,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz",
|
||||||
"integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
|
"integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">= 0.8"
|
"node": ">= 0.8"
|
||||||
}
|
}
|
||||||
@@ -4854,6 +4658,7 @@
|
|||||||
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz",
|
||||||
"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
|
"integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==",
|
||||||
"license": "MIT",
|
"license": "MIT",
|
||||||
|
"peer": true,
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=0.6"
|
"node": ">=0.6"
|
||||||
}
|
}
|
||||||
|
|||||||
+4
-7
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@paradigm/hub",
|
"name": "@paradigm/hub",
|
||||||
"version": "0.0.36",
|
"version": "0.0.31",
|
||||||
"private": true,
|
"private": true,
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"engines": {
|
"engines": {
|
||||||
@@ -12,7 +12,6 @@
|
|||||||
"@alicloud/tea-util": "^1.4.11",
|
"@alicloud/tea-util": "^1.4.11",
|
||||||
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
"@anthropic-ai/claude-agent-sdk": "^0.3.202",
|
||||||
"@fastify/cookie": "^11.0.2",
|
"@fastify/cookie": "^11.0.2",
|
||||||
"@fastify/static": "^10.1.2",
|
|
||||||
"@larksuiteoapi/node-sdk": "^1.70.0",
|
"@larksuiteoapi/node-sdk": "^1.70.0",
|
||||||
"@prisma/client": "^6.19.3",
|
"@prisma/client": "^6.19.3",
|
||||||
"ai": "^7.0.16",
|
"ai": "^7.0.16",
|
||||||
@@ -31,10 +30,10 @@
|
|||||||
"axios": "1.18.1"
|
"axios": "1.18.1"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"description": "Curriculum Project Hub — org-scoped Feishu collaboration and confined Agent runtime. Semantics pinned by docs/adr/ (ADR-0001 through ADR-0027).",
|
"description": "Curriculum Project Hub — org-scoped Feishu collaboration and confined Agent runtime. Aligns to spec/System through ADR-0024.",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "npm run prisma:migrate && tsx watch src/server.ts",
|
"dev": "npm run prisma:migrate && tsx watch src/server.ts",
|
||||||
"build": "tsc -p tsconfig.json && npm run admin:build && npm run filelib:build",
|
"build": "tsc -p tsconfig.json && npm run admin:build",
|
||||||
"start": "npm run prisma:migrate && node dist/server.js",
|
"start": "npm run prisma:migrate && node dist/server.js",
|
||||||
"check": "tsc -p tsconfig.json --noEmit",
|
"check": "tsc -p tsconfig.json --noEmit",
|
||||||
"audit:production": "npm audit --omit=dev --audit-level=high",
|
"audit:production": "npm audit --omit=dev --audit-level=high",
|
||||||
@@ -49,8 +48,6 @@
|
|||||||
"test": "vitest run",
|
"test": "vitest run",
|
||||||
"test:watch": "vitest",
|
"test:watch": "vitest",
|
||||||
"admin:dev": "npm run dev --prefix admin-web",
|
"admin:dev": "npm run dev --prefix admin-web",
|
||||||
"admin:build": "npm run build --prefix admin-web",
|
"admin:build": "npm run build --prefix admin-web"
|
||||||
"filelib:dev": "npm run dev --prefix filelib-web",
|
|
||||||
"filelib:build": "npm run build --prefix filelib-web"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
-- ADR-0023 rejected the legacy `PlatformRoleAssignment` / `PlatformRole`{ADMIN,TEACHER}
|
-- ADR-0023 rejected the legacy `PlatformRoleAssignment` / `PlatformRole`{ADMIN,TEACHER}
|
||||||
-- model: the platform administration control plane is a separate identity/session/
|
-- model: the platform administration control plane is a separate identity/session/
|
||||||
-- audit surface, intentionally not built
|
-- audit surface (see `Spec.System.PlatformAdministration`), intentionally not built
|
||||||
-- in alpha (ADR-0025, `hub/deploy/README.md`). The legacy table has no runtime
|
-- in alpha (ADR-0025, `hub/deploy/README.md`). The legacy table has no runtime
|
||||||
-- reader — no guard, route, or service queries it for an authorization decision —
|
-- reader — no guard, route, or service queries it for an authorization decision —
|
||||||
-- and ADR-0023 requires it to be migrated/replaced before the platform panel ships.
|
-- and ADR-0023 requires it to be migrated/replaced before the platform panel ships.
|
||||||
|
|||||||
@@ -1,92 +0,0 @@
|
|||||||
-- File library (文件库) — 语义锚定:仓库根《文件库-接口契约.md》、.omo/文件库-开工计划.md (D11–D19)。
|
|
||||||
-- 本地无 PG 时手写;有 PG 后可用 `prisma migrate diff` 核对与 schema 的一致性。
|
|
||||||
|
|
||||||
-- CreateEnum
|
|
||||||
CREATE TYPE "FileLibNodeKind" AS ENUM ('FOLDER', 'PROJECT');
|
|
||||||
CREATE TYPE "FileLibProvisionStatus" AS ENUM ('PROVISIONING', 'READY', 'FAILED');
|
|
||||||
CREATE TYPE "FileLibRole" AS ENUM ('VIEW', 'EDIT', 'MANAGE');
|
|
||||||
CREATE TYPE "FileLibPrincipalType" AS ENUM ('USER', 'GROUP');
|
|
||||||
CREATE TYPE "FileLibExportStatus" AS ENUM ('QUEUED', 'RUNNING', 'DONE', 'FAILED');
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "FileLibNode" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"organizationId" TEXT NOT NULL,
|
|
||||||
"parentId" TEXT,
|
|
||||||
"kind" "FileLibNodeKind" NOT NULL,
|
|
||||||
"name" TEXT NOT NULL,
|
|
||||||
"nameLower" TEXT NOT NULL,
|
|
||||||
"pathIds" TEXT NOT NULL,
|
|
||||||
"creatorId" TEXT NOT NULL,
|
|
||||||
"provisionStatus" "FileLibProvisionStatus" NOT NULL DEFAULT 'READY',
|
|
||||||
"storageDir" TEXT,
|
|
||||||
"deletedAt" TIMESTAMP(3),
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "FileLibNode_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE "FileLibGrant" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"organizationId" TEXT NOT NULL,
|
|
||||||
"nodeId" TEXT NOT NULL,
|
|
||||||
"principalType" "FileLibPrincipalType" NOT NULL,
|
|
||||||
"principalId" TEXT NOT NULL,
|
|
||||||
"role" "FileLibRole" NOT NULL,
|
|
||||||
"isCreatorGrant" BOOLEAN NOT NULL DEFAULT false,
|
|
||||||
"createdByUserId" TEXT,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"revokedAt" TIMESTAMP(3),
|
|
||||||
|
|
||||||
CONSTRAINT "FileLibGrant_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE "FileLibProjectSettings" (
|
|
||||||
"nodeId" TEXT NOT NULL,
|
|
||||||
"independentPermissionsEnabled" BOOLEAN NOT NULL DEFAULT false,
|
|
||||||
|
|
||||||
CONSTRAINT "FileLibProjectSettings_pkey" PRIMARY KEY ("nodeId")
|
|
||||||
);
|
|
||||||
|
|
||||||
CREATE TABLE "FileLibExportJob" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"organizationId" TEXT NOT NULL,
|
|
||||||
"nodeId" TEXT NOT NULL,
|
|
||||||
"target" TEXT NOT NULL,
|
|
||||||
"params" JSONB NOT NULL,
|
|
||||||
"status" "FileLibExportStatus" NOT NULL DEFAULT 'QUEUED',
|
|
||||||
"downloadUrl" TEXT,
|
|
||||||
"error" TEXT,
|
|
||||||
"createdByUserId" TEXT NOT NULL,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "FileLibExportJob_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateIndex (schema-declared)
|
|
||||||
CREATE INDEX "FileLibNode_organizationId_parentId_deletedAt_idx" ON "FileLibNode"("organizationId", "parentId", "deletedAt");
|
|
||||||
CREATE INDEX "FileLibNode_organizationId_pathIds_idx" ON "FileLibNode"("organizationId", "pathIds");
|
|
||||||
CREATE INDEX "FileLibNode_creatorId_idx" ON "FileLibNode"("creatorId");
|
|
||||||
CREATE INDEX "FileLibGrant_organizationId_revokedAt_idx" ON "FileLibGrant"("organizationId", "revokedAt");
|
|
||||||
CREATE INDEX "FileLibGrant_principalType_principalId_revokedAt_idx" ON "FileLibGrant"("principalType", "principalId", "revokedAt");
|
|
||||||
CREATE INDEX "FileLibGrant_nodeId_revokedAt_idx" ON "FileLibGrant"("nodeId", "revokedAt");
|
|
||||||
CREATE INDEX "FileLibExportJob_organizationId_status_idx" ON "FileLibExportJob"("organizationId", "status");
|
|
||||||
|
|
||||||
-- D14:活跃兄弟节点大小写不敏感唯一。root 的 parentId 为 NULL,用 COALESCE 归入同一键空间。
|
|
||||||
CREATE UNIQUE INDEX "FileLibNode_active_sibling_name_key"
|
|
||||||
ON "FileLibNode"("organizationId", COALESCE("parentId", ''), "nameLower")
|
|
||||||
WHERE "deletedAt" IS NULL;
|
|
||||||
|
|
||||||
-- 契约 2.3:同一节点上同一 principal 至多一条活跃授权(Postgres 原生 UNIQUE 无法约束 NULL revokedAt)。
|
|
||||||
CREATE UNIQUE INDEX "FileLibGrant_active_unique"
|
|
||||||
ON "FileLibGrant"("nodeId", "principalType", "principalId")
|
|
||||||
WHERE "revokedAt" IS NULL;
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "FileLibNode" ADD CONSTRAINT "FileLibNode_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "Organization"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
ALTER TABLE "FileLibNode" ADD CONSTRAINT "FileLibNode_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "FileLibNode"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
|
||||||
ALTER TABLE "FileLibGrant" ADD CONSTRAINT "FileLibGrant_nodeId_fkey" FOREIGN KEY ("nodeId") REFERENCES "FileLibNode"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
ALTER TABLE "FileLibProjectSettings" ADD CONSTRAINT "FileLibProjectSettings_nodeId_fkey" FOREIGN KEY ("nodeId") REFERENCES "FileLibNode"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
ALTER TABLE "FileLibExportJob" ADD CONSTRAINT "FileLibExportJob_nodeId_fkey" FOREIGN KEY ("nodeId") REFERENCES "FileLibNode"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
-- Global, unlimited-depth member group hierarchy (requirement 3.1-3.3).
|
|
||||||
-- Managed only by the platform super administrator; deliberately NOT
|
|
||||||
-- org-scoped. Stores membership + nesting only, never permission data.
|
|
||||||
-- Deletion is soft (archivedAt / revokedAt markers); a group delete
|
|
||||||
-- cascade-soft-deletes its whole subtree as an application operation.
|
|
||||||
-- The permission side (GROUP principal, FOLDER resource, grant inheritance)
|
|
||||||
-- is intentionally deferred to a later migration.
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "MemberGroup" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"parentId" TEXT,
|
|
||||||
"name" TEXT NOT NULL,
|
|
||||||
"description" TEXT,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"updatedAt" TIMESTAMP(3) NOT NULL,
|
|
||||||
"archivedAt" TIMESTAMP(3),
|
|
||||||
|
|
||||||
CONSTRAINT "MemberGroup_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "MemberGroupMembership" (
|
|
||||||
"id" TEXT NOT NULL,
|
|
||||||
"groupId" TEXT NOT NULL,
|
|
||||||
"userId" TEXT NOT NULL,
|
|
||||||
"createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
|
|
||||||
"revokedAt" TIMESTAMP(3),
|
|
||||||
|
|
||||||
CONSTRAINT "MemberGroupMembership_pkey" PRIMARY KEY ("id")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateTable
|
|
||||||
CREATE TABLE "MemberGroupClosure" (
|
|
||||||
"ancestorId" TEXT NOT NULL,
|
|
||||||
"descendantId" TEXT NOT NULL,
|
|
||||||
"depth" INTEGER NOT NULL,
|
|
||||||
|
|
||||||
CONSTRAINT "MemberGroupClosure_pkey" PRIMARY KEY ("ancestorId", "descendantId")
|
|
||||||
);
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "MemberGroup_parentId_archivedAt_idx" ON "MemberGroup"("parentId", "archivedAt");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "MemberGroupMembership_userId_revokedAt_idx" ON "MemberGroupMembership"("userId", "revokedAt");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "MemberGroupMembership_groupId_revokedAt_idx" ON "MemberGroupMembership"("groupId", "revokedAt");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE UNIQUE INDEX "MemberGroupMembership_groupId_userId_revokedAt_key" ON "MemberGroupMembership"("groupId", "userId", "revokedAt");
|
|
||||||
|
|
||||||
-- CreateIndex
|
|
||||||
CREATE INDEX "MemberGroupClosure_descendantId_idx" ON "MemberGroupClosure"("descendantId");
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "MemberGroup" ADD CONSTRAINT "MemberGroup_parentId_fkey" FOREIGN KEY ("parentId") REFERENCES "MemberGroup"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "MemberGroupMembership" ADD CONSTRAINT "MemberGroupMembership_groupId_fkey" FOREIGN KEY ("groupId") REFERENCES "MemberGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "MemberGroupMembership" ADD CONSTRAINT "MemberGroupMembership_userId_fkey" FOREIGN KEY ("userId") REFERENCES "User"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "MemberGroupClosure" ADD CONSTRAINT "MemberGroupClosure_ancestorId_fkey" FOREIGN KEY ("ancestorId") REFERENCES "MemberGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
|
|
||||||
-- AddForeignKey
|
|
||||||
ALTER TABLE "MemberGroupClosure" ADD CONSTRAINT "MemberGroupClosure_descendantId_fkey" FOREIGN KEY ("descendantId") REFERENCES "MemberGroup"("id") ON DELETE CASCADE ON UPDATE CASCADE;
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
-- 为 FileLibNode 加简介字段,老师在创建/概览页填写。
|
|
||||||
ALTER TABLE "FileLibNode" ADD COLUMN "description" TEXT;
|
|
||||||
+4
-191
@@ -1,6 +1,6 @@
|
|||||||
// Prisma schema for Curriculum Project Hub.
|
// Prisma schema for Curriculum Project Hub.
|
||||||
//
|
//
|
||||||
// Aligns to ADR-0001..0004, 0017. Key divergences from the
|
// Aligns to spec/System (ADR-0001..0004, 0017). Key divergences from the
|
||||||
// legacy teaching-material-host-service schema, each deliberate:
|
// legacy teaching-material-host-service schema, each deliberate:
|
||||||
//
|
//
|
||||||
// - AgentSession is provider/model-bound. Provider runtime cursors such as
|
// - AgentSession is provider/model-bound. Provider runtime cursors such as
|
||||||
@@ -11,8 +11,8 @@
|
|||||||
// - ProjectGroupBinding is project→chat only (ADR-0001 1:1); legacy mixed
|
// - ProjectGroupBinding is project→chat only (ADR-0001 1:1); legacy mixed
|
||||||
// user/chat targets into one binding table.
|
// user/chat targets into one binding table.
|
||||||
// - PermissionGrant + PermissionSettings land (ADR-0004), missing in legacy.
|
// - PermissionGrant + PermissionSettings land (ADR-0004), missing in legacy.
|
||||||
// - AgentRunStatus adds WAITING_FOR_USER + TIMED_OUT (the run-state set is
|
// - AgentRunStatus adds WAITING_FOR_USER + TIMED_OUT (spec RunState; enum
|
||||||
// open — add states without a schema migration war).
|
// completeness OPEN — add states without a schema migration war).
|
||||||
|
|
||||||
generator client {
|
generator client {
|
||||||
provider = "prisma-client-js"
|
provider = "prisma-client-js"
|
||||||
@@ -50,7 +50,6 @@ model Organization {
|
|||||||
projectGroupBindings ProjectGroupBinding[]
|
projectGroupBindings ProjectGroupBinding[]
|
||||||
auditEntries AuditEntry[] @relation("organizationAudit")
|
auditEntries AuditEntry[] @relation("organizationAudit")
|
||||||
projectSearchDocuments ProjectSearchDocument[]
|
projectSearchDocuments ProjectSearchDocument[]
|
||||||
fileLibNodes FileLibNode[]
|
|
||||||
|
|
||||||
@@index([status])
|
@@index([status])
|
||||||
}
|
}
|
||||||
@@ -62,7 +61,7 @@ enum OrganizationStatus {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Org-scoped membership role. Distinct from project PermissionRole and from
|
/// Org-scoped membership role. Distinct from project PermissionRole and from
|
||||||
/// the platform administrator surface (ADR-0023),
|
/// the platform administrator surface (ADR-0023 / Spec.System.PlatformAdministration),
|
||||||
/// which is a separate control plane not modeled in alpha (ADR-0025).
|
/// which is a separate control plane not modeled in alpha (ADR-0025).
|
||||||
model OrganizationMembership {
|
model OrganizationMembership {
|
||||||
id String @id @default(cuid())
|
id String @id @default(cuid())
|
||||||
@@ -194,7 +193,6 @@ model User {
|
|||||||
heldLocks ProjectAgentLock[] @relation("lockHolder")
|
heldLocks ProjectAgentLock[] @relation("lockHolder")
|
||||||
feishuBindings ProjectGroupBinding[] @relation("bindingCreator")
|
feishuBindings ProjectGroupBinding[] @relation("bindingCreator")
|
||||||
teamMemberships TeamMembership[]
|
teamMemberships TeamMembership[]
|
||||||
memberGroupMemberships MemberGroupMembership[]
|
|
||||||
externalPrincipalMemberships ExternalPrincipalMembership[]
|
externalPrincipalMemberships ExternalPrincipalMembership[]
|
||||||
permissionGrants PermissionGrant[] @relation("grantCreator")
|
permissionGrants PermissionGrant[] @relation("grantCreator")
|
||||||
roleTriggerGrants RoleTriggerGrant[] @relation("roleGrantCreator")
|
roleTriggerGrants RoleTriggerGrant[] @relation("roleGrantCreator")
|
||||||
@@ -395,67 +393,6 @@ model TeamExternalBinding {
|
|||||||
@@index([teamId, revokedAt])
|
@@index([teamId, revokedAt])
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Member groups (global, nestable authorization principal) ------------
|
|
||||||
|
|
||||||
/// Global, unlimited-depth member group. Managed only by the platform super administrator (ADR-0023);
|
|
||||||
/// Deletion is soft: `archivedAt` is a marker.
|
|
||||||
/// Deleting a group cascade-soft-deletes its whole subtree — an application
|
|
||||||
/// operation (walk the subtree, stamp archivedAt), not a DB constraint.
|
|
||||||
model MemberGroup {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
parentId String?
|
|
||||||
name String
|
|
||||||
description String?
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
archivedAt DateTime?
|
|
||||||
|
|
||||||
parent MemberGroup? @relation("groupTree", fields: [parentId], references: [id], onDelete: Restrict)
|
|
||||||
children MemberGroup[] @relation("groupTree")
|
|
||||||
memberships MemberGroupMembership[]
|
|
||||||
asAncestor MemberGroupClosure[] @relation("ancestor")
|
|
||||||
asDescendant MemberGroupClosure[] @relation("descendant")
|
|
||||||
|
|
||||||
@@index([parentId, archivedAt])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// User↔group many-to-many; a user may belong to multiple groups. Soft delete
|
|
||||||
/// via `revokedAt` (same pattern as TeamMembership) allows re-adding a removed
|
|
||||||
/// member. `userId, revokedAt` index is the resolution hot path: fetch a user's direct groups.
|
|
||||||
model MemberGroupMembership {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
groupId String
|
|
||||||
userId String
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
revokedAt DateTime?
|
|
||||||
|
|
||||||
group MemberGroup @relation(fields: [groupId], references: [id], onDelete: Cascade)
|
|
||||||
user User @relation(fields: [userId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@unique([groupId, userId, revokedAt])
|
|
||||||
@@index([userId, revokedAt])
|
|
||||||
@@index([groupId, revokedAt])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Transitive closure of the MemberGroup tree. Every group has a depth=0
|
|
||||||
/// self row. Turns ancestor/descendant resolution into one indexed join
|
|
||||||
/// instead of a recursive CTE; maintained only on create / reparent (rare
|
|
||||||
/// super-admin ops, so the write cost is amortized against hot reads). On soft
|
|
||||||
/// delete the closure rows are retained; resolution filters by
|
|
||||||
/// MemberGroup.archivedAt. Reparent must reject a new parent inside the moved
|
|
||||||
/// subtree (cycle guard).
|
|
||||||
model MemberGroupClosure {
|
|
||||||
ancestorId String
|
|
||||||
descendantId String
|
|
||||||
depth Int
|
|
||||||
|
|
||||||
ancestor MemberGroup @relation("ancestor", fields: [ancestorId], references: [id], onDelete: Cascade)
|
|
||||||
descendant MemberGroup @relation("descendant", fields: [descendantId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@id([ancestorId, descendantId])
|
|
||||||
@@index([descendantId])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Locally synchronized Feishu external principal membership.
|
/// Locally synchronized Feishu external principal membership.
|
||||||
model ExternalDirectoryConnection {
|
model ExternalDirectoryConnection {
|
||||||
id String @id @default(cuid())
|
id String @id @default(cuid())
|
||||||
@@ -986,127 +923,3 @@ model CapabilityCredentialVersion {
|
|||||||
@@index([keyId])
|
@@index([keyId])
|
||||||
@@index([createdByUserId])
|
@@index([createdByUserId])
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- File library (文件库) -------------------------------------------------
|
|
||||||
//
|
|
||||||
// 独立模块,语义由仓库根《文件库-接口契约.md》(C/D 编号)与 .omo/文件库-开工计划.md
|
|
||||||
// (D11–D19)锚定。与上面的 Folder/Project(hub 自己的 explorer,ADR-0021)是两套
|
|
||||||
// 体系,不复用、不互相引用。
|
|
||||||
|
|
||||||
/// 文件库目录树节点:文件夹(容器)或项目(叶子,关联 git 仓库)。
|
|
||||||
/// parentId 是树的权威关系;pathIds 是 id 编码的物化路径(派生),随 create/move
|
|
||||||
/// 在事务内维护(计划 D12;name 不入路径,rename 不重写后代)。
|
|
||||||
model FileLibNode {
|
|
||||||
id String @id
|
|
||||||
organizationId String
|
|
||||||
parentId String?
|
|
||||||
kind FileLibNodeKind
|
|
||||||
name String
|
|
||||||
/// D14:NFC+trim 的小写形式;活跃兄弟节点大小写不敏感唯一(部分唯一索引在迁移 SQL)。
|
|
||||||
nameLower String
|
|
||||||
/// id 编码物化路径,形如 "/rootId/childId/selfId"。祖先展开与前缀查询都用它。
|
|
||||||
pathIds String
|
|
||||||
/// D11:创建者不可变,自动持有 isCreatorGrant=true 的 MANAGE grant。
|
|
||||||
/// 故意不建 FK:这是不可变历史事实,不随 User 生命周期变化。
|
|
||||||
creatorId String
|
|
||||||
/// 老师可填写的简介,创建/概览页展示,通俗易懂地说明这个节点的用途。
|
|
||||||
description String?
|
|
||||||
/// 项目 provisioning 状态机(DB/git 双写协调,Metis 风险#1);文件夹恒 READY。
|
|
||||||
provisionStatus FileLibProvisionStatus @default(READY)
|
|
||||||
/// 项目仓库目录(绝对路径);文件夹为 null。
|
|
||||||
storageDir String?
|
|
||||||
deletedAt DateTime?
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
|
|
||||||
organization Organization @relation(fields: [organizationId], references: [id], onDelete: Cascade)
|
|
||||||
parent FileLibNode? @relation("fileLibTree", fields: [parentId], references: [id], onDelete: Restrict)
|
|
||||||
children FileLibNode[] @relation("fileLibTree")
|
|
||||||
grants FileLibGrant[]
|
|
||||||
projectSettings FileLibProjectSettings?
|
|
||||||
exportJobs FileLibExportJob[]
|
|
||||||
|
|
||||||
@@index([organizationId, parentId, deletedAt])
|
|
||||||
@@index([organizationId, pathIds])
|
|
||||||
@@index([creatorId])
|
|
||||||
}
|
|
||||||
|
|
||||||
enum FileLibNodeKind {
|
|
||||||
FOLDER
|
|
||||||
PROJECT
|
|
||||||
}
|
|
||||||
|
|
||||||
enum FileLibProvisionStatus {
|
|
||||||
PROVISIONING
|
|
||||||
READY
|
|
||||||
FAILED
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 文件库权限级别:MANAGE > EDIT > VIEW(契约 2.2,只取最高、无降权)。
|
|
||||||
enum FileLibRole {
|
|
||||||
VIEW
|
|
||||||
EDIT
|
|
||||||
MANAGE
|
|
||||||
}
|
|
||||||
|
|
||||||
enum FileLibPrincipalType {
|
|
||||||
USER
|
|
||||||
GROUP
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 契约 2.3:grant 直接挂在节点上,最终权限 = max(个人, 递归 Group, 祖先继承)。
|
|
||||||
/// 活跃授权唯一性由迁移里的部分唯一索引保证(revokedAt IS NULL)。
|
|
||||||
model FileLibGrant {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
organizationId String
|
|
||||||
nodeId String
|
|
||||||
principalType FileLibPrincipalType
|
|
||||||
principalId String
|
|
||||||
role FileLibRole
|
|
||||||
/// D11:创建者自动 grant;独立权限开关关闭时,项目级 grant 里只有它仍生效。
|
|
||||||
isCreatorGrant Boolean @default(false)
|
|
||||||
createdByUserId String?
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
revokedAt DateTime?
|
|
||||||
|
|
||||||
node FileLibNode @relation(fields: [nodeId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@index([organizationId, revokedAt])
|
|
||||||
@@index([principalType, principalId, revokedAt])
|
|
||||||
@@index([nodeId, revokedAt])
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 契约 P5/D11:项目独立权限开关。默认关闭(仅继承);关闭时项目级非创建者
|
|
||||||
/// grant 冻结不删除,重新开启即恢复。
|
|
||||||
model FileLibProjectSettings {
|
|
||||||
nodeId String @id
|
|
||||||
independentPermissionsEnabled Boolean @default(false)
|
|
||||||
|
|
||||||
node FileLibNode @relation(fields: [nodeId], references: [id], onDelete: Cascade)
|
|
||||||
}
|
|
||||||
|
|
||||||
enum FileLibExportStatus {
|
|
||||||
QUEUED
|
|
||||||
RUNNING
|
|
||||||
DONE
|
|
||||||
FAILED
|
|
||||||
}
|
|
||||||
|
|
||||||
/// 契约 D10:导出为异步任务。外部导出工具参数 OPEN-6,adapter 就位前先建模型。
|
|
||||||
model FileLibExportJob {
|
|
||||||
id String @id @default(cuid())
|
|
||||||
organizationId String
|
|
||||||
nodeId String
|
|
||||||
target String
|
|
||||||
params Json
|
|
||||||
status FileLibExportStatus @default(QUEUED)
|
|
||||||
downloadUrl String?
|
|
||||||
error String?
|
|
||||||
createdByUserId String
|
|
||||||
createdAt DateTime @default(now())
|
|
||||||
updatedAt DateTime @updatedAt
|
|
||||||
|
|
||||||
node FileLibNode @relation(fields: [nodeId], references: [id], onDelete: Cascade)
|
|
||||||
|
|
||||||
@@index([organizationId, status])
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,63 +0,0 @@
|
|||||||
---
|
|
||||||
name: pdf-to-md
|
|
||||||
description: >
|
|
||||||
Convert PDF documents to Markdown bundles using the convert_pdf_to_md tool.
|
|
||||||
Handles PDFs from Feishu messages, local workspace files, and produces
|
|
||||||
high-quality Markdown with LaTeX formulas and extracted images.
|
|
||||||
---
|
|
||||||
|
|
||||||
# PDF to Markdown Conversion
|
|
||||||
|
|
||||||
## When to use
|
|
||||||
|
|
||||||
Use this skill when the user asks to convert a PDF to Markdown, extract text
|
|
||||||
from a PDF, or turn a PDF document into an editable format.
|
|
||||||
|
|
||||||
## How it works
|
|
||||||
|
|
||||||
The `convert_pdf_to_md` tool (provided by the `cph_hub` MCP server) calls
|
|
||||||
Alibaba Cloud Document Mind to parse the PDF. It:
|
|
||||||
|
|
||||||
- Extracts text in reading order (handles multi-column, scanned, and
|
|
||||||
multi-language documents)
|
|
||||||
- Converts mathematical formulas to **LaTeX** (`$...$` inline, `$$...$$` block)
|
|
||||||
- Extracts tables as Markdown tables
|
|
||||||
- Downloads embedded images into the output directory
|
|
||||||
- Writes a single `document.md` file plus image files
|
|
||||||
|
|
||||||
## Workflow
|
|
||||||
|
|
||||||
### PDF from a Feishu message
|
|
||||||
|
|
||||||
1. Use `feishu_read_context` to find the `file_key` of the PDF attachment.
|
|
||||||
2. Use `feishu_download_resource` to download it into the workspace.
|
|
||||||
3. Use `convert_pdf_to_md` with the downloaded file path and an output directory.
|
|
||||||
|
|
||||||
### PDF already in the workspace
|
|
||||||
|
|
||||||
1. Use `convert_pdf_to_md` directly with the file path and an output directory.
|
|
||||||
|
|
||||||
## Important rules
|
|
||||||
|
|
||||||
- **Always** use `convert_pdf_to_md` for PDF→Markdown. Do NOT attempt to parse
|
|
||||||
PDFs yourself with Read, Bash, Python, or any other method. The tool provides
|
|
||||||
accurate formula, table, and image extraction that manual methods cannot
|
|
||||||
match.
|
|
||||||
- If `convert_pdf_to_md` fails because no capability connection is configured,
|
|
||||||
tell the user to ask their organization admin to configure the Aliyun
|
|
||||||
docmind credential in the admin web UI (组织后台 → 能力).
|
|
||||||
- The output directory will be created if it does not exist.
|
|
||||||
- After conversion, use `send_file` to send the generated markdown back to the
|
|
||||||
user if they requested it.
|
|
||||||
|
|
||||||
## Output
|
|
||||||
|
|
||||||
The tool returns a list of generated files:
|
|
||||||
- `document.md` — the main markdown file
|
|
||||||
- `*.jpg` / `*.png` — extracted images, referenced from the markdown
|
|
||||||
|
|
||||||
## Cost
|
|
||||||
|
|
||||||
The conversion is billed per page (0.04 CNY/page ≈ $0.0056/page for the
|
|
||||||
enhanced formula mode). The cost is automatically recorded on the run's
|
|
||||||
usage ledger.
|
|
||||||
@@ -432,16 +432,16 @@ async function resolvePostLoginRedirect(
|
|||||||
select: { organization: { select: { slug: true, name: true } } },
|
select: { organization: { select: { slug: true, name: true } } },
|
||||||
});
|
});
|
||||||
if (intended === null) return "/admin?error=not_an_active_org_member";
|
if (intended === null) return "/admin?error=not_an_active_org_member";
|
||||||
const orgRoot = "/admin";
|
const orgRoot = `/admin/org/${intended.organization.slug}`;
|
||||||
// Default / missing returnTo sanitizes to "/admin". Always land in the org
|
// Default / missing returnTo sanitizes to "/admin". Always land in the org
|
||||||
// admin SPA (not the legacy static "close this tab" complete page).
|
// admin SPA (not the legacy static "close this tab" complete page).
|
||||||
if (returnTo === "/admin") {
|
if (returnTo === "/admin") {
|
||||||
return orgRoot;
|
return orgRoot;
|
||||||
}
|
}
|
||||||
return normalizeAdminReturnTo(returnTo) ?? orgRoot;
|
return returnTo === orgRoot || returnTo.startsWith(`${orgRoot}/`) ? returnTo : orgRoot;
|
||||||
}
|
}
|
||||||
if (returnTo !== "/admin" && returnTo.startsWith("/admin")) {
|
if (returnTo !== "/admin" && returnTo.startsWith("/admin")) {
|
||||||
return normalizeAdminReturnTo(returnTo) ?? "/admin";
|
return returnTo;
|
||||||
}
|
}
|
||||||
const membership = await prisma.organizationMembership.findFirst({
|
const membership = await prisma.organizationMembership.findFirst({
|
||||||
where: {
|
where: {
|
||||||
@@ -454,7 +454,7 @@ async function resolvePostLoginRedirect(
|
|||||||
orderBy: { createdAt: "asc" },
|
orderBy: { createdAt: "asc" },
|
||||||
});
|
});
|
||||||
if (membership !== null) {
|
if (membership !== null) {
|
||||||
return "/admin";
|
return `/admin/org/${membership.organization.slug}`;
|
||||||
}
|
}
|
||||||
// Member-only or no org: still land on a shell page (SPA will explain).
|
// Member-only or no org: still land on a shell page (SPA will explain).
|
||||||
const any = await prisma.organizationMembership.findFirst({
|
const any = await prisma.organizationMembership.findFirst({
|
||||||
@@ -463,7 +463,7 @@ async function resolvePostLoginRedirect(
|
|||||||
orderBy: { createdAt: "asc" },
|
orderBy: { createdAt: "asc" },
|
||||||
});
|
});
|
||||||
if (any !== null) {
|
if (any !== null) {
|
||||||
return "/admin/projects";
|
return `/admin/org/${any.organization.slug}`;
|
||||||
}
|
}
|
||||||
return "/admin/login?error=no_organization";
|
return "/admin/login?error=no_organization";
|
||||||
}
|
}
|
||||||
@@ -489,18 +489,7 @@ export function sanitizeReturnTo(raw: string): string {
|
|||||||
if (!raw.startsWith("/admin")) {
|
if (!raw.startsWith("/admin")) {
|
||||||
return "/admin";
|
return "/admin";
|
||||||
}
|
}
|
||||||
return normalizeAdminReturnTo(raw) ?? "/admin";
|
return raw;
|
||||||
}
|
|
||||||
|
|
||||||
/** Map legacy `/admin/org/:slug[...]` bookmarks onto slugless `/admin[...]` paths. */
|
|
||||||
export function normalizeAdminReturnTo(path: string): string | null {
|
|
||||||
if (!path.startsWith("/admin")) return null;
|
|
||||||
const legacy = path.match(/^\/admin\/org\/[^/]+(\/.*)?$/);
|
|
||||||
if (legacy) {
|
|
||||||
const rest = legacy[1] ?? "";
|
|
||||||
return rest === "" ? "/admin" : `/admin${rest}`;
|
|
||||||
}
|
|
||||||
return path;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
function trimTrailingSlash(url: string): string {
|
function trimTrailingSlash(url: string): string {
|
||||||
|
|||||||
@@ -1,131 +0,0 @@
|
|||||||
/**
|
|
||||||
* ADR-0027: Admin routes for organization-scoped capability connections.
|
|
||||||
* GET /api/org/:orgSlug/capability-connections — list all
|
|
||||||
* GET /api/org/:orgSlug/capability-connections/:capId — read one
|
|
||||||
* PUT /api/org/:orgSlug/capability-connections/:capId — rotate/create
|
|
||||||
* DELETE /api/org/:orgSlug/capability-connections/:capId — disable
|
|
||||||
*/
|
|
||||||
import type { PrismaClient } from "@prisma/client";
|
|
||||||
import type { FastifyInstance } from "fastify";
|
|
||||||
import { CapabilityConnectionService } from "../../capability/capabilityConnectionService.js";
|
|
||||||
import { CapabilityReadinessError, type CapabilityReadinessProbe } from "../../capability/capabilityReadiness.js";
|
|
||||||
import type { LocalSecretEnvelope } from "../../security/secretEnvelope.js";
|
|
||||||
import { requireOrgRole, type GuardDeps } from "../auth/guards.js";
|
|
||||||
import { handleRouteError } from "../errors.js";
|
|
||||||
|
|
||||||
export interface CapabilityConnectionRouteConfig {
|
|
||||||
readonly prisma: PrismaClient;
|
|
||||||
readonly sessionSecret: string;
|
|
||||||
readonly secretEnvelope: LocalSecretEnvelope;
|
|
||||||
readonly readinessProbe?: CapabilityReadinessProbe;
|
|
||||||
}
|
|
||||||
|
|
||||||
export async function registerCapabilityConnectionRoutes(
|
|
||||||
app: FastifyInstance,
|
|
||||||
config: CapabilityConnectionRouteConfig,
|
|
||||||
): Promise<void> {
|
|
||||||
const guardDeps: GuardDeps = { prisma: config.prisma, sessionSecret: config.sessionSecret };
|
|
||||||
const connections = new CapabilityConnectionService(
|
|
||||||
config.prisma,
|
|
||||||
config.secretEnvelope,
|
|
||||||
config.readinessProbe,
|
|
||||||
);
|
|
||||||
|
|
||||||
app.get("/api/org/:orgSlug/capability-connections", async (request, reply) => {
|
|
||||||
try {
|
|
||||||
const { orgSlug } = request.params as { orgSlug: string };
|
|
||||||
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
|
||||||
if (auth === null) return;
|
|
||||||
return { connections: await connections.list(auth.organization.id) };
|
|
||||||
} catch (error) {
|
|
||||||
request.log.error({ requestId: request.id, operation: "capability_connection.list" }, "list failed");
|
|
||||||
return handleRouteError(reply, error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.get("/api/org/:orgSlug/capability-connections/:capabilityId", async (request, reply) => {
|
|
||||||
try {
|
|
||||||
const { orgSlug, capabilityId } = request.params as { orgSlug: string; capabilityId: string };
|
|
||||||
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
|
||||||
if (auth === null) return;
|
|
||||||
return { connection: await connections.read(auth.organization.id, capabilityId) };
|
|
||||||
} catch (error) {
|
|
||||||
request.log.error({ requestId: request.id, operation: "capability_connection.read" }, "read failed");
|
|
||||||
return handleRouteError(reply, error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.put("/api/org/:orgSlug/capability-connections/:capabilityId", async (request, reply) => {
|
|
||||||
try {
|
|
||||||
const { orgSlug, capabilityId } = request.params as { orgSlug: string; capabilityId: string };
|
|
||||||
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
|
||||||
if (auth === null) return;
|
|
||||||
const body = parseBody(request.body);
|
|
||||||
const result = await connections.rotate({
|
|
||||||
organizationId: auth.organization.id,
|
|
||||||
capabilityId,
|
|
||||||
actorUserId: auth.user.id,
|
|
||||||
...body,
|
|
||||||
});
|
|
||||||
request.log.info({
|
|
||||||
organizationId: auth.organization.id,
|
|
||||||
capabilityId,
|
|
||||||
connectionId: result.id,
|
|
||||||
status: result.status,
|
|
||||||
secretVersion: result.activeVersion,
|
|
||||||
}, result.created ? "Capability Connection created" : "Capability Connection rotated");
|
|
||||||
const { created, ...metadata } = result;
|
|
||||||
return reply.status(created ? 201 : 200).send(metadata);
|
|
||||||
} catch (error) {
|
|
||||||
const facts = error instanceof CapabilityReadinessError
|
|
||||||
? {
|
|
||||||
errorCode: error.code,
|
|
||||||
failureCategory: error.category,
|
|
||||||
...(error.upstreamStatus !== undefined ? { upstreamStatus: error.upstreamStatus } : {}),
|
|
||||||
}
|
|
||||||
: { errorCode: "capability_connection_write_failed" };
|
|
||||||
request.log.error({ requestId: request.id, operation: "capability_connection.rotate", ...facts }, "rotate failed");
|
|
||||||
return handleRouteError(reply, error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
app.delete("/api/org/:orgSlug/capability-connections/:capabilityId", async (request, reply) => {
|
|
||||||
try {
|
|
||||||
const { orgSlug, capabilityId } = request.params as { orgSlug: string; capabilityId: string };
|
|
||||||
const auth = await requireOrgRole(request, reply, guardDeps, { orgSlug });
|
|
||||||
if (auth === null) return;
|
|
||||||
const result = await connections.disable({
|
|
||||||
organizationId: auth.organization.id,
|
|
||||||
capabilityId,
|
|
||||||
actorUserId: auth.user.id,
|
|
||||||
});
|
|
||||||
request.log.info({
|
|
||||||
organizationId: auth.organization.id,
|
|
||||||
capabilityId,
|
|
||||||
connectionId: result.id,
|
|
||||||
status: result.status,
|
|
||||||
}, "Capability Connection disabled");
|
|
||||||
return reply.send(result);
|
|
||||||
} catch (error) {
|
|
||||||
request.log.error({ requestId: request.id, operation: "capability_connection.disable" }, "disable failed");
|
|
||||||
return handleRouteError(reply, error);
|
|
||||||
}
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
function parseBody(value: unknown): { readonly accessKeyId: string; readonly accessKeySecret: string; readonly endpoint: string } {
|
|
||||||
if (typeof value !== "object" || value === null || Array.isArray(value)) {
|
|
||||||
throw new Error("invalid capability credential body");
|
|
||||||
}
|
|
||||||
const body = value as Record<string, unknown>;
|
|
||||||
for (const name of ["accessKeyId", "accessKeySecret", "endpoint"] as const) {
|
|
||||||
if (typeof body[name] !== "string" || (body[name] as string).trim() === "") {
|
|
||||||
throw new Error(`${name} is required`);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return {
|
|
||||||
accessKeyId: body["accessKeyId"] as string,
|
|
||||||
accessKeySecret: body["accessKeySecret"] as string,
|
|
||||||
endpoint: body["endpoint"] as string,
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -22,8 +22,6 @@ import type { LocalSecretEnvelope } from "../../security/secretEnvelope.js";
|
|||||||
import type { ProviderReadinessProbe } from "../../connections/providerReadiness.js";
|
import type { ProviderReadinessProbe } from "../../connections/providerReadiness.js";
|
||||||
import type { FeishuReadinessProbe } from "../../connections/feishuReadiness.js";
|
import type { FeishuReadinessProbe } from "../../connections/feishuReadiness.js";
|
||||||
import { registerFeishuApplicationConnectionRoutes } from "./feishuApplicationConnectionRoutes.js";
|
import { registerFeishuApplicationConnectionRoutes } from "./feishuApplicationConnectionRoutes.js";
|
||||||
import { registerCapabilityConnectionRoutes } from "./capabilityConnectionRoutes.js";
|
|
||||||
import type { CapabilityReadinessProbe } from "../../capability/capabilityReadiness.js";
|
|
||||||
|
|
||||||
export interface OrgRouteConfig {
|
export interface OrgRouteConfig {
|
||||||
readonly prisma: PrismaClient;
|
readonly prisma: PrismaClient;
|
||||||
@@ -32,7 +30,6 @@ export interface OrgRouteConfig {
|
|||||||
readonly secretEnvelope: LocalSecretEnvelope;
|
readonly secretEnvelope: LocalSecretEnvelope;
|
||||||
readonly providerReadinessProbe?: ProviderReadinessProbe;
|
readonly providerReadinessProbe?: ProviderReadinessProbe;
|
||||||
readonly feishuConnectionReadinessProbe?: FeishuReadinessProbe;
|
readonly feishuConnectionReadinessProbe?: FeishuReadinessProbe;
|
||||||
readonly capabilityReadinessProbe?: CapabilityReadinessProbe;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
export async function registerOrgRoutes(app: FastifyInstance, config: OrgRouteConfig): Promise<void> {
|
export async function registerOrgRoutes(app: FastifyInstance, config: OrgRouteConfig): Promise<void> {
|
||||||
@@ -141,12 +138,4 @@ export async function registerOrgRoutes(app: FastifyInstance, config: OrgRouteCo
|
|||||||
? { readinessProbe: config.feishuConnectionReadinessProbe }
|
? { readinessProbe: config.feishuConnectionReadinessProbe }
|
||||||
: {}),
|
: {}),
|
||||||
});
|
});
|
||||||
await registerCapabilityConnectionRoutes(app, {
|
|
||||||
prisma: config.prisma,
|
|
||||||
sessionSecret: config.sessionSecret,
|
|
||||||
secretEnvelope: config.secretEnvelope,
|
|
||||||
...(config.capabilityReadinessProbe !== undefined
|
|
||||||
? { readinessProbe: config.capabilityReadinessProbe }
|
|
||||||
: {}),
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ export const CPH_HUB_MCP_TOOL_IDS = [
|
|||||||
"feishu_read_context",
|
"feishu_read_context",
|
||||||
"feishu_download_resource",
|
"feishu_download_resource",
|
||||||
"request_approval",
|
"request_approval",
|
||||||
"convert_pdf_to_md",
|
|
||||||
] as const;
|
] as const;
|
||||||
|
|
||||||
export type CphHubMcpToolId = (typeof CPH_HUB_MCP_TOOL_IDS)[number];
|
export type CphHubMcpToolId = (typeof CPH_HUB_MCP_TOOL_IDS)[number];
|
||||||
@@ -51,12 +50,10 @@ const ROLE_TOOL_TO_CPH_HUB_MCP_TOOL = new Map<string, CphHubMcpToolId>([
|
|||||||
["feishu_read_context", "feishu_read_context"],
|
["feishu_read_context", "feishu_read_context"],
|
||||||
["feishu_download_resource", "feishu_download_resource"],
|
["feishu_download_resource", "feishu_download_resource"],
|
||||||
["request_approval", "request_approval"],
|
["request_approval", "request_approval"],
|
||||||
["convert_pdf_to_md", "convert_pdf_to_md"],
|
|
||||||
["mcp__cph_hub__send_file", "send_file"],
|
["mcp__cph_hub__send_file", "send_file"],
|
||||||
["mcp__cph_hub__feishu_read_context", "feishu_read_context"],
|
["mcp__cph_hub__feishu_read_context", "feishu_read_context"],
|
||||||
["mcp__cph_hub__feishu_download_resource", "feishu_download_resource"],
|
["mcp__cph_hub__feishu_download_resource", "feishu_download_resource"],
|
||||||
["mcp__cph_hub__request_approval", "request_approval"],
|
["mcp__cph_hub__request_approval", "request_approval"],
|
||||||
["mcp__cph_hub__convert_pdf_to_md", "convert_pdf_to_md"],
|
|
||||||
]);
|
]);
|
||||||
|
|
||||||
const SUPPORTED_ROLE_TOOLS = new Set([
|
const SUPPORTED_ROLE_TOOLS = new Set([
|
||||||
|
|||||||
@@ -24,10 +24,10 @@
|
|||||||
* denied by default and re-opened only for the workspace plus named system
|
* denied by default and re-opened only for the workspace plus named system
|
||||||
* runtimes, and `failIfUnavailable` hard-fails if the sandbox can't start. The
|
* runtimes, and `failIfUnavailable` hard-fails if the sandbox can't start. The
|
||||||
* subprocess gets a minimal environment and SDK credential protection removes
|
* subprocess gets a minimal environment and SDK credential protection removes
|
||||||
* provider secrets from Bash. This upholds the workspace-bounded file-op
|
* provider secrets from Bash. This upholds `AgentFileOp.Authorized`
|
||||||
* invariant (ADR-0018) without re-implementing the
|
* (ADR-0018 / `Spec.System.AgentSurface`) without re-implementing the
|
||||||
* `workspace.ts` `confine()` path validator as a tool wrapper — the OS sandbox
|
* `workspace.ts` `confine()` path validator as a tool wrapper — the OS sandbox
|
||||||
* is the mechanism, the ADR pins the invariant.
|
* is the mechanism, the contract pins the invariant.
|
||||||
*/
|
*/
|
||||||
import { query, type HookCallback, type McpServerConfig, type SDKMessage, type SDKAssistantMessage, type SDKUserMessage, type SDKResultMessage, type SDKPartialAssistantMessage, type SDKSystemMessage } from "@anthropic-ai/claude-agent-sdk";
|
import { query, type HookCallback, type McpServerConfig, type SDKMessage, type SDKAssistantMessage, type SDKUserMessage, type SDKResultMessage, type SDKPartialAssistantMessage, type SDKSystemMessage } from "@anthropic-ai/claude-agent-sdk";
|
||||||
import type { PrismaClient } from "@prisma/client";
|
import type { PrismaClient } from "@prisma/client";
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user