From a0ced813c5840bb996ade78e38f1a4d7fa5e500c Mon Sep 17 00:00:00 2001 From: "mula.liu" Date: Thu, 19 Nov 2026 09:32:38 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=8C=89=20nex.config.yaml=20=E6=8A=80?= =?UTF-8?q?=E6=9C=AF=E6=A0=88=E9=87=8D=E5=86=99=E5=89=8D=E7=AB=AF=20+=20?= =?UTF-8?q?=E8=A1=A8=E5=8D=95=E7=BB=9F=E4=B8=80=E4=BE=A7=E6=BB=91=20+=20?= =?UTF-8?q?=E6=AD=A3=E6=96=87=E5=AF=8C=E6=96=87=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 前端栈换成 React 19 + TS + Vite + AntD 6 + Tailwind v4 + Zustand + React Router 7 + Axios,八个视图全部迁完;旧版留在 web/legacy/ - 新增 / 修改表单统一右侧侧滑(components/FormDrawer.tsx,12 处);删除等破坏性确认仍保持弹窗 - 录入字段与「更新录入」口径对齐;长文本录入位统一富文本编辑器(内核 Tiptap 3,颜色存语义名 data-c 而非 hex,跟着主题 token 走) - 展示端用 RichText 渲染 + 两行 clamp;app/export.py 的 plain() 在出表时统一降级成纯文本,三端换行口径一致(一个块级 = 一个换行) - tests: 富文本存储契约与出表断言入契约测试;pytest 104 passed --- .dockerignore | 2 + .env | 0 .env.example | 0 .workbuddy/memory/2026-09-12.md | 0 .workbuddy/memory/2026-09-13.md | 0 .workbuddy/memory/2026-09-14.md | 0 .workbuddy/memory/2026-09-16.md | 0 .workbuddy/memory/2026-09-17.md | 0 .workbuddy/memory/2026-09-18.md | 0 .workbuddy/memory/2026-09-20.md | 0 .workbuddy/memory/2026-09-23.md | 0 .workbuddy/memory/2026-10-01.md | 0 .workbuddy/memory/2026-10-29.md | 0 .workbuddy/memory/2026-10-30.md | 0 .workbuddy/memory/2026-11-04.md | 0 .workbuddy/memory/2026-11-12.md | 22 + .workbuddy/memory/2026-11-13.md | 76 + .workbuddy/memory/MEMORY.md | 3 +- AGENTS.md | 64 + Dockerfile | 17 +- README.md | 69 +- a.jar | 5 - app/__init__.py | 0 app/ai_parser.py | 0 app/audit.py | 0 app/config.py | 0 app/constants.py | 0 app/db.py | 0 app/export.py | 31 +- app/finance.py | 0 app/main.py | 24 +- app/models.py | 0 app/routers/__init__.py | 0 app/routers/ai.py | 0 app/routers/auth.py | 0 app/routers/board.py | 0 app/routers/custom.py | 0 app/routers/export.py | 20 +- app/routers/focus.py | 0 app/routers/projects.py | 0 app/routers/rbac.py | 0 app/routers/staff.py | 0 app/routers/weekly.py | 4 +- app/schema_patch.py | 0 app/schemas.py | 0 app/security.py | 0 d.js | 480 --- docker-compose.yml | 0 info | 1 - nex.config.yaml | 65 + p.js | 480 --- pytest.ini | 0 requirements-dev.txt | 0 requirements.txt | 0 scripts/README.md | 0 scripts/import_custom_ledger.py | 0 scripts/import_excel.py | 0 scripts/import_staff.py | 0 scripts/init_db.py | 0 scripts/legacy/README.md | 0 scripts/legacy/add_entry_date.py | 0 scripts/legacy/fix_period_split.py | 0 scripts/legacy/merge_project.py | 0 scripts/legacy/migrate_custom.py | 0 scripts/legacy/shift_year.py | 0 scripts/run.sh | 46 + tests/conftest.py | 0 tests/test_ai_export.py | 0 tests/test_api_contract.py | 117 +- tests/test_auth.py | 0 tests/test_custom_finance.py | 0 tests/test_periods_projects.py | 0 tests/test_rbac.py | 0 tests/test_staff_focus_weekly.py | 0 web/index.html | 126 +- web/{ => legacy}/app.js | 1017 ++++--- web/{ => legacy}/icons.js | 5 +- web/legacy/index.html | 128 + web/{ => legacy}/livereload.js | 0 web/legacy/styles.css | 982 +++++++ web/package-lock.json | 3878 +++++++++++++++++++++++++ web/package.json | 37 + web/src/App.tsx | 52 + web/src/api/client.ts | 80 + web/src/api/endpoints.ts | 128 + web/src/components/DataState.tsx | 34 + web/src/components/FormDrawer.tsx | 45 + web/src/components/KeywordBox.tsx | 45 + web/src/components/KpiCard.tsx | 20 + web/src/components/LoginGate.tsx | 46 + web/src/components/NewPeriodModal.tsx | 53 + web/src/components/PageHead.tsx | 22 + web/src/components/PagerBar.tsx | 35 + web/src/components/PanelCard.tsx | 33 + web/src/components/PeriodPicker.tsx | 79 + web/src/components/ProfileModal.tsx | 43 + web/src/components/ResizableTable.tsx | 91 + web/src/components/RichEditor.tsx | 205 ++ web/src/components/RichText.tsx | 12 + web/src/components/Shell.tsx | 139 + web/src/components/Trunc.tsx | 14 + web/src/components/UserChip.tsx | 34 + web/src/domain/ink.ts | 34 + web/src/domain/pills.tsx | 44 + web/src/icons/Icon.tsx | 37 + web/src/icons/paths.ts | 112 + web/src/main.tsx | 17 + web/src/router.tsx | 41 + web/src/store/meta.ts | 51 + web/src/store/session.ts | 47 + web/src/store/ui.ts | 193 ++ web/src/styles/app.css | 1084 +++++++ web/src/styles/tokens.css | 262 ++ web/src/theme/antd.ts | 84 + web/src/types/domain.ts | 84 + web/src/utils/format.ts | 12 + web/src/utils/hooks.ts | 51 + web/src/utils/period.ts | 55 + web/src/utils/richtext.ts | 151 + web/src/views/BoardView.css | 60 + web/src/views/BoardView.tsx | 912 ++++++ web/src/views/CustomView.css | 34 + web/src/views/CustomView.tsx | 1055 +++++++ web/src/views/FocusView.css | 73 + web/src/views/FocusView.tsx | 392 +++ web/src/views/IntakeView.css | 50 + web/src/views/IntakeView.tsx | 834 ++++++ web/src/views/ProjectsView.css | 36 + web/src/views/ProjectsView.tsx | 839 ++++++ web/src/views/RbacView.tsx | 518 ++++ web/src/views/SettingsView.css | 4 + web/src/views/SettingsView.tsx | 209 ++ web/src/views/StaffView.css | 39 + web/src/views/StaffView.tsx | 340 +++ web/styles.css | 699 ----- web/tsconfig.json | 28 + web/vite.config.ts | 17 + 137 files changed, 15163 insertions(+), 2244 deletions(-) mode change 100644 => 100755 .dockerignore mode change 100644 => 100755 .env mode change 100644 => 100755 .env.example mode change 100644 => 100755 .workbuddy/memory/2026-09-12.md mode change 100644 => 100755 .workbuddy/memory/2026-09-13.md mode change 100644 => 100755 .workbuddy/memory/2026-09-14.md mode change 100644 => 100755 .workbuddy/memory/2026-09-16.md mode change 100644 => 100755 .workbuddy/memory/2026-09-17.md mode change 100644 => 100755 .workbuddy/memory/2026-09-18.md mode change 100644 => 100755 .workbuddy/memory/2026-09-20.md mode change 100644 => 100755 .workbuddy/memory/2026-09-23.md mode change 100644 => 100755 .workbuddy/memory/2026-10-01.md mode change 100644 => 100755 .workbuddy/memory/2026-10-29.md mode change 100644 => 100755 .workbuddy/memory/2026-10-30.md mode change 100644 => 100755 .workbuddy/memory/2026-11-04.md create mode 100755 .workbuddy/memory/2026-11-12.md create mode 100755 .workbuddy/memory/2026-11-13.md mode change 100644 => 100755 .workbuddy/memory/MEMORY.md create mode 100755 AGENTS.md mode change 100644 => 100755 Dockerfile mode change 100644 => 100755 README.md delete mode 100644 a.jar mode change 100644 => 100755 app/__init__.py mode change 100644 => 100755 app/ai_parser.py mode change 100644 => 100755 app/audit.py mode change 100644 => 100755 app/config.py mode change 100644 => 100755 app/constants.py mode change 100644 => 100755 app/db.py mode change 100644 => 100755 app/export.py mode change 100644 => 100755 app/finance.py mode change 100644 => 100755 app/main.py mode change 100644 => 100755 app/models.py mode change 100644 => 100755 app/routers/__init__.py mode change 100644 => 100755 app/routers/ai.py mode change 100644 => 100755 app/routers/auth.py mode change 100644 => 100755 app/routers/board.py mode change 100644 => 100755 app/routers/custom.py mode change 100644 => 100755 app/routers/export.py mode change 100644 => 100755 app/routers/focus.py mode change 100644 => 100755 app/routers/projects.py mode change 100644 => 100755 app/routers/rbac.py mode change 100644 => 100755 app/routers/staff.py mode change 100644 => 100755 app/routers/weekly.py mode change 100644 => 100755 app/schema_patch.py mode change 100644 => 100755 app/schemas.py mode change 100644 => 100755 app/security.py delete mode 100644 d.js mode change 100644 => 100755 docker-compose.yml delete mode 100644 info create mode 100755 nex.config.yaml delete mode 100644 p.js mode change 100644 => 100755 pytest.ini mode change 100644 => 100755 requirements-dev.txt mode change 100644 => 100755 requirements.txt mode change 100644 => 100755 scripts/README.md mode change 100644 => 100755 scripts/import_custom_ledger.py mode change 100644 => 100755 scripts/import_excel.py mode change 100644 => 100755 scripts/import_staff.py mode change 100644 => 100755 scripts/init_db.py mode change 100644 => 100755 scripts/legacy/README.md mode change 100644 => 100755 scripts/legacy/add_entry_date.py mode change 100644 => 100755 scripts/legacy/fix_period_split.py mode change 100644 => 100755 scripts/legacy/merge_project.py mode change 100644 => 100755 scripts/legacy/migrate_custom.py mode change 100644 => 100755 scripts/legacy/shift_year.py mode change 100644 => 100755 tests/conftest.py mode change 100644 => 100755 tests/test_ai_export.py mode change 100644 => 100755 tests/test_api_contract.py mode change 100644 => 100755 tests/test_auth.py mode change 100644 => 100755 tests/test_custom_finance.py mode change 100644 => 100755 tests/test_periods_projects.py mode change 100644 => 100755 tests/test_rbac.py mode change 100644 => 100755 tests/test_staff_focus_weekly.py mode change 100644 => 100755 web/index.html rename web/{ => legacy}/app.js (76%) mode change 100644 => 100755 rename web/{ => legacy}/icons.js (98%) mode change 100644 => 100755 create mode 100755 web/legacy/index.html rename web/{ => legacy}/livereload.js (100%) mode change 100644 => 100755 create mode 100755 web/legacy/styles.css create mode 100755 web/package-lock.json create mode 100755 web/package.json create mode 100755 web/src/App.tsx create mode 100755 web/src/api/client.ts create mode 100755 web/src/api/endpoints.ts create mode 100755 web/src/components/DataState.tsx create mode 100755 web/src/components/FormDrawer.tsx create mode 100755 web/src/components/KeywordBox.tsx create mode 100755 web/src/components/KpiCard.tsx create mode 100755 web/src/components/LoginGate.tsx create mode 100755 web/src/components/NewPeriodModal.tsx create mode 100755 web/src/components/PageHead.tsx create mode 100755 web/src/components/PagerBar.tsx create mode 100755 web/src/components/PanelCard.tsx create mode 100755 web/src/components/PeriodPicker.tsx create mode 100755 web/src/components/ProfileModal.tsx create mode 100755 web/src/components/ResizableTable.tsx create mode 100755 web/src/components/RichEditor.tsx create mode 100755 web/src/components/RichText.tsx create mode 100755 web/src/components/Shell.tsx create mode 100755 web/src/components/Trunc.tsx create mode 100755 web/src/components/UserChip.tsx create mode 100755 web/src/domain/ink.ts create mode 100755 web/src/domain/pills.tsx create mode 100755 web/src/icons/Icon.tsx create mode 100755 web/src/icons/paths.ts create mode 100755 web/src/main.tsx create mode 100755 web/src/router.tsx create mode 100755 web/src/store/meta.ts create mode 100755 web/src/store/session.ts create mode 100755 web/src/store/ui.ts create mode 100755 web/src/styles/app.css create mode 100755 web/src/styles/tokens.css create mode 100755 web/src/theme/antd.ts create mode 100755 web/src/types/domain.ts create mode 100755 web/src/utils/format.ts create mode 100755 web/src/utils/hooks.ts create mode 100755 web/src/utils/period.ts create mode 100755 web/src/utils/richtext.ts create mode 100755 web/src/views/BoardView.css create mode 100755 web/src/views/BoardView.tsx create mode 100755 web/src/views/CustomView.css create mode 100755 web/src/views/CustomView.tsx create mode 100755 web/src/views/FocusView.css create mode 100755 web/src/views/FocusView.tsx create mode 100755 web/src/views/IntakeView.css create mode 100755 web/src/views/IntakeView.tsx create mode 100755 web/src/views/ProjectsView.css create mode 100755 web/src/views/ProjectsView.tsx create mode 100755 web/src/views/RbacView.tsx create mode 100755 web/src/views/SettingsView.css create mode 100755 web/src/views/SettingsView.tsx create mode 100755 web/src/views/StaffView.css create mode 100755 web/src/views/StaffView.tsx delete mode 100644 web/styles.css create mode 100755 web/tsconfig.json create mode 100755 web/vite.config.ts diff --git a/.dockerignore b/.dockerignore old mode 100644 new mode 100755 index 49d482e..41861c0 --- a/.dockerignore +++ b/.dockerignore @@ -20,6 +20,8 @@ scripts/run.sh scripts/deploy.sh scripts/legacy tests +web/node_modules +web/dist requirements-dev.txt docker-compose.yml Dockerfile diff --git a/.env b/.env old mode 100644 new mode 100755 diff --git a/.env.example b/.env.example old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-09-12.md b/.workbuddy/memory/2026-09-12.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-09-13.md b/.workbuddy/memory/2026-09-13.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-09-14.md b/.workbuddy/memory/2026-09-14.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-09-16.md b/.workbuddy/memory/2026-09-16.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-09-17.md b/.workbuddy/memory/2026-09-17.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-09-18.md b/.workbuddy/memory/2026-09-18.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-09-20.md b/.workbuddy/memory/2026-09-20.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-09-23.md b/.workbuddy/memory/2026-09-23.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-10-01.md b/.workbuddy/memory/2026-10-01.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-10-29.md b/.workbuddy/memory/2026-10-29.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-10-30.md b/.workbuddy/memory/2026-10-30.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-11-04.md b/.workbuddy/memory/2026-11-04.md old mode 100644 new mode 100755 diff --git a/.workbuddy/memory/2026-11-12.md b/.workbuddy/memory/2026-11-12.md new file mode 100755 index 0000000..c9e75e4 --- /dev/null +++ b/.workbuddy/memory/2026-11-12.md @@ -0,0 +1,22 @@ +# 2026-11-12 工作日志 + +按新引入的 NEX Design System 0.1.7(`nex_design_system/` + `nex.config.yaml`)完整改造前端。**技术栈没动**(FastAPI + 零构建原生 JS + SQLite,NEX §2:已有项目以真实代码为准),改动只落在 `web/` 四个文件 + README/MEMORY 口径,后端一行未改(103 例 pytest 全绿,含前后端参数契约测试)。 + +## 改了什么 + +1. **`styles.css`(700 → 985 行):token 单一来源**。顶部 `:root` 重写成语义层(`--text/--text-2/--muted/--surface-*/--primary*/--success/--warning/--danger/--radius-*/--sp-*/--ctrl-h-*/--shadow-*/--dur-*/--z-*/--h-topbar/--sidebar-w`),断点登记注释 1180/1100/900/780/640;`.pill/.tag-mini/.arch-badge` 改成只吃 `--c` + `color-mix()` 派生(废掉成对 hex);新增 `.page-head/.dlg-title/.link-btn/.th-sort/.tabpanel/.sk*(骨架)/.sr-only/.skip-link/.is-archived/.trunc`;补 1100 抽屉式侧栏 + 折叠按钮、900 顶栏换行 + 抽屉全宽、640 单列表单 + 底部弹窗 + 40px 触控高度;`prefers-reduced-motion` / `forced-colors` 兜底;auth 页渐变局部化为 `--auth-*`。 +2. **`index.html`(117 → 129 行)**:`
` + skip-link + landmark;品牌标题 ``→`

`;`nav aria-label` + 当前项 `aria-current`;周期段控件 `role="group"` + `aria-pressed`;抽屉/弹窗/登录框补 `role="dialog" aria-modal aria-labelledby` 与 `.dlg-title`;toast 改 `role="status" aria-live="polite"`;图标按钮补 `aria-label`。 +3. **`app.js`(4191 → 4345 行)**:新增 `INK`(数据色常量,JS 模板里 hex 归零)、`VIEW_META/pageHead()`(八视图统一 h2 抬头 + 说明)、`loadingHtml()`(11 处「加载中…」文本 → 骨架)、`openLayer/closeLayer/focusableIn`(焦点进入 + Tab 锁层 + 关闭归还,三个抽屉入口都接上)、`withBusy()`、`bindTablist()`、`download(url, btn)` 忙态;弹层标题 → `h2.dlg-title id=modalTitle`;`starMark` 有语义(`role="img" aria-label`);卡片头 h4→h3、区块标题 div→h4、`ro()` 四份重复合成一份;排序表头 → `` + `.th-sort` 按钮;定制/权限页签 → tablist/tab/tabpanel;分页 → ``; } /** 页码条的交互:点页码 / 换每页条数后由调用方重绘列表 */ @@ -321,8 +450,9 @@ function rowOps(o) { // 只读角色不给行内「修改 / 归档 / 删除」 if (!canW(state.view)) return ""; + const who = o.name ? "「" + esc(o.name) + "」" : ""; const b = (attr, icon, title, cls) => - ``; + ``; if (!o.edit && !o.archive && !o.remove) return ""; return `` + (o.edit ? b(o.edit, "pencil", "修改") : "") + @@ -336,8 +466,8 @@ function updOps(kind, u) { if (!canW(kind === "custom" ? "custom" : "projects")) return ""; return ` - - + + `; } @@ -359,31 +489,31 @@ // 计收 / 下单增量在库里存的是元,页面上统一按万元填写 const toWan = (v) => (v === null || v === undefined ? "" : (Number(v) / 10000).toFixed(2)); const fields = isP - ? `
-
+
-
` - : `
` + : `
-
-
-
`; +
+
+
`; openModal( - ` + ` ` ); @@ -478,7 +608,7 @@ /** 页内搜索框:与右上角全局搜索共用 state.keyword */ function keywordInputHtml(id, placeholder, width) { - return ``; + return ``; } let keywordFocus = false; @@ -518,8 +648,7 @@ $("#modalMask").classList.add("open"); $("#modal").innerHTML = html; if (onMount) onMount(); - const f = $("#modal").querySelector("[data-autofocus]"); - if (f) f.focus(); + openLayer($("#modal")); // 焦点进入弹层,Tab 只在弹层内循环 } /** 关闭弹窗;result 省略时按「取消」处理 */ @@ -529,6 +658,7 @@ $("#modal").innerHTML = ""; const cb = modalResolve; modalResolve = null; + closeLayer($("#modal")); // 焦点回到打开弹窗的那个控件 if (cb) cb(result === undefined ? false : result); } @@ -551,19 +681,19 @@ function confirmDialog(o) { return new Promise((resolve) => { openModal( - ` + `