@yss123/cage-admin 0.3.0 → 0.3.1

package/dist/catalog.d.ts

@@ -31,6 +31,7 @@ export declare function adminCatalog(registry: Registry, labels?: AdminLabels):
         sensitive: Record<string, string>;
     }[];
     combinators: string[];
+    approvalOperations: boolean;
     approvals: {
         name: string;
         process: string;

package/dist/catalog.js

@@ -76,6 +76,8 @@ export function adminCatalog(registry, labels = {}) {
         capabilities,
         aggregates,
         combinators: ['self', 'dept', 'deptSubtree', 'deptSet', 'all'],
+        // 功能发现只控制通用界面入口；实际催办与提醒读写仍在审批服务中逐对象授权。
+        approvalOperations: registry.extensions.some(e => e.kind === 'RUNTIME' && e.value.name === 'approval-operations'),
         approvals: registry.approvals.map(({ a, name }) => ({
             name,
             process: a.process,

package/dist/catalog.js.map

@@ -1 +1 @@
-{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"catalog.js","sourceRoot":"","sources":["../src/catalog.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yss123/cage-admin",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "组织模型声明与 /admin 系统管理",
   "type": "module",
   "main": "dist/index.js",
@@ -25,8 +25,8 @@
     "fastify": "^5.6.0",
     "zod": "^4.1.5",
     "kysely": "^0.28.5",
-    "@yss123/cage-kernel": "0.3.0",
-    "@yss123/cage-ai-protocol": "0.3.0"
+    "@yss123/cage-ai-protocol": "0.3.1",
+    "@yss123/cage-kernel": "0.3.1"
   },
   "license": "MIT",
   "repository": {

package/ui/dist/app/shell.js

@@ -6,7 +6,7 @@
 import { api, can, run, state } from '../shared/api.js';
 import { emptyState, h, icon, panel } from '../shared/dom.js';
 import { navigate } from '../shared/navigation.js';
-import { renderTasks } from '../modules/tasks/index.js';
+import { renderTasks, renderApprovalRequests, renderApprovalNotices } from '../modules/tasks/index.js';
 import { renderOrg } from '../modules/org/index.js';
 import { renderRoles } from '../modules/roles/index.js';
 import { renderAudit } from '../modules/audit/index.js';
@@ -19,6 +19,14 @@ import { renderPersonalities } from '../modules/personalities/index.js';
  * 这些条目同时决定导航显示和页面级提示，不能替代模块请求或服务端鉴权。
  */
 const pages = {
+    requests: {
+        title: '我的申请', description: '跟进本人发起的审批，查看办理时限并向当前办理人催办。',
+        glyph: 'file', category: '团队与权限', render: renderApprovalRequests, need: [],
+    },
+    notices: {
+        title: '流程提醒', description: '集中查看临期、超时与催办提醒，及时推进审批协作。',
+        glyph: 'clock', category: '团队与权限', render: renderApprovalNotices, need: [],
+    },
     personalities: {
         title: '助理性格', description: '设置助理的语气、表达习惯和默认性格，随时试聊。',
         glyph: 'users', category: '运行与记录', render: renderPersonalities, need: ['Sys.ai.personalities.manage'],
@@ -89,10 +97,11 @@ export async function render(boot) {
         root.replaceChildren(loginPage(boot));
         return;
     }
-    const hash = location.hash.replace(/^#\/?/, '') || 'tasks';
+    // 页面键和筛选参数分开解析；提醒页的筛选随 hash 保留，刷新与前进后退仍指向同一视图。
+    const hash = location.hash.replace(/^#\/?/, '').split('?')[0] || 'tasks';
     const key = (hash in pages ? hash : 'tasks');
     const page = pages[key];
-    const visible = Object.entries(pages).filter(([, item]) => !item.need.length || item.need.some(can));
+    const visible = Object.entries(pages).filter(([name, item]) => (!['requests', 'notices'].includes(name) || state.catalog?.approvalOperations) && (!item.need.length || item.need.some(can)));
     const sidebar = h('aside', { class: 'app-sidebar' }, h('a', { class: 'brand', href: '#/tasks', 'aria-label': 'Cage 系统管理首页' }, h('span', { class: 'brand-mark' }, icon('grid')), h('span', {}, 'Cage', h('small', {}, '系统管理'))), ...['团队与权限', '运行与记录'].map((category) => h('div', { class: 'nav-group' }, h('p', { class: 'nav-caption' }, category), h('nav', { 'aria-label': category }, visible
         .filter(([, item]) => item.category === category)
         .map(([name, item]) => h('a', {
@@ -116,7 +125,7 @@ export async function render(boot) {
     const content = h('div', { class: 'page-content' });
     const loading = h('div', { class: 'loading-panel', role: 'status' }, h('span', { class: 'spinner' }), '正在读取管理数据…');
     content.append(loading);
-    const main = h('main', { class: 'app-main' }, h('header', { class: 'app-topbar' }, h('div', { class: 'breadcrumb' }, h('span', {}, '工作空间'), icon('chevron'), h('span', {}, '系统管理'), icon('chevron'), h('strong', {}, page.title)), h('div', { class: 'account' }, h('span', { class: 'avatar' }, state.me.user.name.slice(0, 1)), h('span', { class: 'account-copy' }, h('strong', {}, state.me.user.name), h('small', {}, '当前登录')), logout)), h('div', { class: 'page-container' }, h('div', { class: 'page-heading' }, h('div', {}, h('span', { class: 'eyebrow' }, '管理工作台'), h('h1', {}, page.title), h('p', {}, page.description)), h('button', { class: 'refresh-button', onclick: () => navigate(key) }, icon('refresh'), '刷新数据')), content, h('footer', { class: 'page-footer' }, h('span', {}, 'Cage · 让业务有序发生'), h('span', {}, icon('shield'), '操作受角色权限与数据范围约束'))));
+    const main = h('main', { class: 'app-main' }, h('header', { class: 'app-topbar' }, h('div', { class: 'breadcrumb' }, h('span', {}, '工作空间'), icon('chevron'), h('span', {}, '系统管理'), icon('chevron'), h('strong', {}, page.title)), h('div', { class: 'account' }, h('span', { class: 'avatar' }, state.me.user.name.slice(0, 1)), h('span', { class: 'account-copy' }, h('strong', {}, state.me.user.name), h('small', {}, '当前登录')), logout)), h('div', { class: 'page-container' }, h('div', { class: 'page-heading' }, h('div', {}, h('span', { class: 'eyebrow' }, '管理工作台'), h('h1', {}, page.title), h('p', {}, page.description)), h('button', { class: 'refresh-button', onclick: () => navigate(location.hash.replace(/^#\/?/, '') || key) }, icon('refresh'), '刷新数据')), content, h('footer', { class: 'page-footer' }, h('span', {}, 'Cage · 让业务有序发生'), h('span', {}, icon('shield'), '操作受角色权限与数据范围约束'))));
     root.replaceChildren(h('div', { class: 'admin-shell' }, sidebar, main));
     if (page.need.length && !page.need.some(can)) {
         loading.remove();
@@ -127,7 +136,7 @@ export async function render(boot) {
         await page.render(content);
     }
     catch (error) {
-        content.append(h('div', { class: 'error-panel', role: 'alert' }, icon('info'), h('div', {}, h('strong', {}, '暂时无法读取数据'), h('p', {}, error instanceof TypeError ? '请检查网络与 API 服务后重新尝试。' : error.message)), h('button', { onclick: () => navigate(key) }, '重新加载')));
+        content.append(h('div', { class: 'error-panel', role: 'alert' }, icon('info'), h('div', {}, h('strong', {}, '暂时无法读取数据'), h('p', {}, error instanceof TypeError ? '请检查网络与 API 服务后重新尝试。' : error.message)), h('button', { onclick: () => navigate(location.hash.replace(/^#\/?/, '') || key) }, '重新加载')));
     }
     finally {
         loading.remove();

package/ui/dist/modules/tasks/index.js

@@ -3,3 +3,4 @@
  * 应用壳通过这里组合页面，其他模块无需依赖内部表单实现；导出本身不发请求或执行管理操作。
  */
 export { renderTasks } from './tasks-page.js';
+export { renderApprovalRequests, renderApprovalNotices } from './operations-pages.js';

package/ui/dist/modules/tasks/operations-pages.js

@@ -0,0 +1,107 @@
+/**
+ * 框架自带的申请催办和站内提醒页面，任何启用审批运营的应用都可从 /admin 直接使用。
+ * 页面仅消费通用审批 HTTP 协议，不依赖业务领域、采购字段或数据库；状态以服务端返回为准。
+ * 过滤保存在 hash 查询参数，写操作完成后刷新当前页；纯文本 DOM 渲染避免把催办原因解释成 HTML。
+ */
+import { api, run, state, toast } from '../../shared/api.js';
+import { badge, emptyState, formatTime, h, panel, table } from '../../shared/dom.js';
+import { objectName } from '../../shared/labels.js';
+import { navigate } from '../../shared/navigation.js';
+/** 显示节点总截止时间和浏览器当前时刻的提示；后端会独立判定，不把显示时差作为决定条件。 */
+export function deadlineCell(dueAt) {
+    if (!dueAt)
+        return h('small', {}, '未设时限');
+    const late = Date.parse(dueAt) <= Date.now();
+    return h('div', { class: 'stack-cell' }, badge(late ? '已超时' : '办理中', late ? 'red' : 'neutral'), h('small', {}, formatTime(dueAt)));
+}
+/** 目录显式声明未启用时提供说明并停止加载，不将不存在的接口报错伪装为无提醒。 */
+function enabled(main) {
+    if (state.catalog?.approvalOperations)
+        return true;
+    main.append(panel('流程协作', undefined, emptyState('当前应用未启用流程提醒', '启用后可在此查看站内提醒及本人申请。')));
+    return false;
+}
+/** 使用聚合中文名与完整单据标识，跨业务通用；不猜测应用自定义的详情 URL。 */
+function subject(item) {
+    return h('div', { class: 'stack-cell' }, badge(objectName(item.aggregate)), h('code', { title: item.businessKey }, item.businessKey));
+}
+/** 刷新只重读当前页面；没有后台定时器，离开页面后不会遗留轮询或自动重放催办。 */
+function refresh(page) {
+    return h('button', { class: 'small', onclick: () => navigate(page) }, '刷新');
+}
+/**
+ * 展示本人运行中的可催办申请。提交绑定实例 UUID 和当前步骤，原因必填，防止旧页面催办新轮次。
+ * 冷却期间明确给出下次时间；按钮只是提示，后端仍锁定复核。成功后显示真实接收人数并重新读取。
+ */
+export async function renderApprovalRequests(main) {
+    main.classList.add('approval-workspace');
+    if (!enabled(main))
+        return;
+    const items = await api('GET', '/api/approval/requests');
+    main.append(panel('我的申请', '查看正在审批的申请，向当前办理人发送站内催办。节点时限包含领取、委派和加签所用时间。', h('div', { class: 'table-toolbar' }, h('span', {}, `当前显示 ${items.length} 项`), refresh('requests')), table([
+        ['申请事项', item => subject(item)],
+        ['当前环节', item => h('div', { class: 'stack-cell' }, ...(item.activeSteps?.map(node => h('div', { class: 'stack-cell' }, h('strong', {}, node.title), h('small', {}, node.branchPath.map(part => `${part.parallel} · ${part.branch}`).join(' / ') || '主线审批')))
+                ?? [h('strong', {}, item.title)]))],
+        ['最近截止', item => deadlineCell(item.dueAt)],
+        ['催办', item => {
+                const cooling = !!item.nextUrgeAt && Date.parse(item.nextUrgeAt) > Date.now();
+                const reason = h('input', { 'aria-label': `${item.title}催办原因`, placeholder: '请说明需要加快处理的原因', maxlength: 1000, required: true });
+                const button = h('button', { class: 'small primary', disabled: cooling, onclick: async (event) => {
+                        reason.setCustomValidity(reason.value.trim() ? '' : '请填写催办原因');
+                        if (!reason.reportValidity())
+                            return;
+                        const result = await run(() => api('POST', `/api/approval/instances/${item.id}/urge`, { expectedStep: item.currentStep, ...(item.currentSteps ? { expectedSteps: item.currentSteps } : {}), reason: reason.value.trim() }), undefined, event.currentTarget);
+                        if (result) {
+                            toast(`已发送 ${result.recipientCount} 条站内催办提醒`);
+                            navigate('requests');
+                        }
+                    } }, cooling ? '冷却中' : '发送催办');
+                return h('div', { class: 'task-actions' }, reason, h('div', { class: 'row-actions' }, button), item.nextUrgeAt ? h('small', {}, `可再次催办：${formatTime(item.nextUrgeAt)}${cooling ? '，到时请刷新' : ''}`) : null);
+            }],
+    ], items, '当前没有可催办的运行申请')));
+}
+/**
+ * 分页展示当前仍与本人有关的流程提醒；URL view=unread 固定筛选，可深链接和浏览器前进后退。
+ * 已读写入成功才刷新；翻页沿服务端游标，即使权限过滤形成空页也保留“继续加载”。
+ * 列表读取不自动标已读，离开页面后忽略正在返回的追加页，避免旧页更新当前画面。
+ */
+export async function renderApprovalNotices(main) {
+    main.classList.add('approval-workspace');
+    if (!enabled(main))
+        return;
+    const unread = new URLSearchParams(location.hash.split('?')[1] ?? '').get('view') === 'unread';
+    const page = `notices?view=${unread ? 'unread' : 'all'}`;
+    const query = `/api/approval/notices?limit=50&unreadOnly=${unread}`;
+    const initial = await api('GET', query);
+    const rows = [...initial.items];
+    let next = initial.nextCursor;
+    const content = h('div');
+    const more = h('button', { class: 'small', onclick: async (event) => {
+            if (!next)
+                return;
+            const result = await run(() => api('GET', `${query}&after=${encodeURIComponent(next)}`), undefined, event.currentTarget);
+            if (!result || !content.isConnected)
+                return;
+            rows.push(...result.items);
+            next = result.nextCursor;
+            draw();
+        } }, '继续加载');
+    /** 仅由已完成的读请求重建表格；按钮内容与已读时间始终来自持久状态。 */
+    function draw() {
+        content.replaceChildren(table([
+            ['提醒事项', item => h('div', { class: 'stack-cell' }, badge(item.kind === 'overdue' ? '已超时' : item.kind === 'due_soon' ? '即将到期' : '申请人催办', item.kind === 'overdue' ? 'red' : 'amber'), h('strong', {}, item.title), item.reason ? h('span', {}, item.reason) : h('small', {}, '请及时查看并处理当前审批任务'))],
+            ['关联单据', item => subject(item)],
+            ['节点截止', item => item.dueAt ? formatTime(item.dueAt) : '未设时限'],
+            ['提醒时间', item => formatTime(item.createdAt)],
+            ['阅读状态', item => item.readAt ? h('div', { class: 'stack-cell' }, badge('已读', 'green'), h('small', {}, formatTime(item.readAt))) :
+                    h('button', { class: 'small', onclick: async (event) => {
+                            const result = await run(() => api('POST', `/api/approval/notices/${item.id}/read`), '已标记为已读', event.currentTarget);
+                            if (result)
+                                navigate(page);
+                        } }, '标记已读')],
+        ], rows, unread ? '当前没有可见的未读提醒' : '当前没有可见的流程提醒'));
+        more.hidden = !next;
+    }
+    draw();
+    main.append(panel('流程提醒', '临期、超时与申请人催办集中在这里。提醒只提示办理，不会自动作出审批决定。', h('div', { class: 'table-toolbar' }, h('div', { class: 'row-actions' }, h('a', { class: `approval-filter ${unread ? 'selected' : ''}`, href: '#/notices?view=unread', 'aria-current': unread ? 'page' : undefined }, '未读'), h('a', { class: `approval-filter ${!unread ? 'selected' : ''}`, href: '#/notices?view=all', 'aria-current': !unread ? 'page' : undefined }, '全部'), h('a', { class: 'approval-filter', href: '#/tasks' }, '前往待办')), refresh(page)), content, more));
+}

package/ui/dist/modules/tasks/tasks-page.js

@@ -1,36 +1,45 @@
 /**
- * 当前用户审批待办页面，读取真实任务并通过批准/拒绝接口提交决定。
+ * 当前用户审批收件箱，合并本人、可领取和等待加签任务；管理动作与决定均通过宿主会话接口提交。
  * 待办分配只说明选人，最终动作仍受业务结论命令的能力、范围和硬约束；页面不直接改变单据状态。
  */
 import { api, run, state } from '../../shared/api.js';
 import { badge, emptyState, formatTime, h, panel, table } from '../../shared/dom.js';
 import { objectName } from '../../shared/labels.js';
 import { navigate } from '../../shared/navigation.js';
+import { deadlineCell } from './operations-pages.js';
 /**
  * 加载本人待办与页面需要的对象资料，展示任务、步骤和可用操作。
  * 提交期间禁止重复动作，成功后刷新待办，失败保留可理解原因；空列表表示当前请求没有可见待办。
  */
 export async function renderTasks(main) {
+    main.classList.add('approval-workspace');
     const hasApprovals = state.catalog.approvals.length > 0;
     if (!hasApprovals) {
         main.append(panel('我的审批待办', undefined, emptyState('当前没有启用审批流程', '业务启用审批后，分配给你的任务会显示在这里。')));
         return;
     }
-    const tasks = await api('GET', '/api/approval/tasks');
+    const lists = await Promise.all([
+        api('GET', '/api/approval/tasks'), api('GET', '/api/approval/candidate-tasks'),
+        api('GET', '/api/approval/tasks?status=waiting'),
+    ]);
+    const tasks = lists.flat();
     if (!tasks.length) {
         main.append(panel('我的审批待办', undefined, emptyState('待办已处理完毕', '新的审批任务分配给你后，会显示在这里。')));
         return;
     }
-    main.append(panel('等待你处理', `共 ${tasks.length} 项待办。审批结论会继续执行业务权限与规则校验。`, table([
+    main.append(panel('审批收件箱', `待处理 ${lists[0].length} 项 · 可领取 ${lists[1].length} 项 · 等待加签 ${lists[2].length} 项`, table([
         [
             '审批事项',
-            (task) => h('div', { class: 'stack-cell' }, h('strong', {}, task.title), h('small', {}, state.catalog.approvals.find((item) => item.process === task.process)?.label || '业务审批')),
+            (task) => h('div', { class: 'stack-cell' }, h('strong', {}, task.title), task.branchPath?.length ? h('small', {}, task.branchPath.map(part => `${part.parallel} · ${part.branch}`).join(' / ')) : null, h('small', {}, state.catalog.approvals.find((item) => item.process === task.process)?.label || '业务审批')),
         ],
         [
             '关联单据',
             (task) => h('div', { class: 'stack-cell' }, badge(objectName(task.aggregate)), h('code', {}, task.businessKey.slice(0, 8))),
         ],
         ['提交时间', (task) => formatTime(task.createdAt)],
+        ['办理截止', task => deadlineCell(task.dueAt)],
+        ['处理阶段', task => badge(task.status === 'waiting' ? '等待加签' : task.assigneeId === null ? '可领取' : task.delegation === 'pending' ? '受托处理中' :
+                task.signPosition === 'before' ? '前签' : task.signPosition === 'after' ? '后签' : task.signPosition === 'parallel' ? '并行加签' : '待处理')],
         [
             '流程信息',
             (task) => h('details', {}, h('summary', {}, '查看详情'), h('pre', {}, JSON.stringify(task.vars, null, 2))),
@@ -38,29 +47,44 @@ export async function renderTasks(main) {
         [
             '处理意见与操作',
             (task) => {
+                if (task.status === 'waiting')
+                    return h('small', {}, '前置签署完成后恢复处理');
                 const comment = h('input', {
-                    placeholder: '填写审批意见（可选）',
+                    placeholder: '审批意见；领取、释放或归还时必填',
                     'aria-label': `${task.title}审批意见`,
+                    maxlength: 1000,
                 });
                 const actions = h('div', { class: 'row-actions' });
                 const submit = async (action, button) => {
+                    const management = ['claim', 'unclaim', 'resolve'].includes(action);
+                    comment.setCustomValidity(management && !comment.value.trim() ? '请填写操作原因' : '');
+                    if (!comment.reportValidity())
+                        return;
                     // 一项待办的两个结论互斥，发送期间同时禁用，避免界面重复提交相反结论。
                     for (const item of actions.querySelectorAll('button'))
                         item.disabled = true;
-                    const result = await run(() => api('POST', `/api/approval/tasks/${task.id}/${action}`, { comment: comment.value }), action === 'approve' ? '已通过审批' : '已驳回', button);
+                    const result = await run(() => api('POST', `/api/approval/tasks/${task.id}/${action}`, { ...(management ? { reason: comment.value } : { comment: comment.value }), expectedRevision: task.revision }), { approve: '已通过审批', reject: '已驳回', claim: '已领取任务', unclaim: '已释放到候选池', resolve: '已归还原审批人' }[action], button);
                     if (result)
                         navigate('tasks');
                     else
                         for (const item of actions.querySelectorAll('button'))
                             item.disabled = false;
                 };
-                actions.append(h('button', {
-                    class: 'small',
-                    onclick: (event) => submit('reject', event.currentTarget),
-                }, '驳回'), h('button', {
-                    class: 'small primary',
-                    onclick: (event) => submit('approve', event.currentTarget),
-                }, '通过审批'));
+                if (task.assigneeId === null || task.delegation === 'pending') {
+                    const action = task.assigneeId === null ? 'claim' : 'resolve';
+                    actions.append(h('button', { class: 'small primary', onclick: event => submit(action, event.currentTarget) }, action === 'claim' ? '领取任务' : '归还审批人'));
+                }
+                else {
+                    if (task.assignment === 'candidate')
+                        actions.append(h('button', { class: 'small', onclick: event => submit('unclaim', event.currentTarget) }, '释放任务'));
+                    actions.append(h('button', {
+                        class: 'small',
+                        onclick: (event) => submit('reject', event.currentTarget),
+                    }, '驳回'), h('button', {
+                        class: 'small primary',
+                        onclick: (event) => submit('approve', event.currentTarget),
+                    }, '通过审批'));
+                }
                 return h('div', { class: 'task-actions' }, comment, actions);
             },
         ],

package/ui/style.css

@@ -225,6 +225,43 @@ pre {
 .muted {
   color: var(--muted);
 }
+/* 审批提醒使用真实链接保存筛选 URL；选中态和键盘焦点都沿用系统绿色，状态不只靠文字颜色区分。 */
+.approval-filter {
+  display: inline-flex;
+  align-items: center;
+  min-height: 30px;
+  padding: 4px 12px;
+  border: 1px solid var(--line-strong);
+  border-radius: 7px;
+  color: var(--ink);
+  text-decoration: none;
+}
+.approval-filter.selected {
+  background: var(--accent-soft);
+  border-color: var(--accent);
+  color: var(--accent-dark);
+  font-weight: 600;
+}
+.approval-filter:focus-visible {
+  outline: 2px solid var(--accent);
+  outline-offset: 2px;
+}
+/* 审批页支持窄侧面板：横向溢出仅留在表格内，避免整页滚动后操作按钮落到固定侧栏下。 */
+body:has(.approval-workspace) { min-width: 0; }
+.approval-workspace { min-width: 0; }
+.approval-workspace .table-wrap { max-width: 100%; overflow-x: auto; }
+.approval-workspace .table-toolbar { flex-wrap: wrap; gap: 12px; }
+.approval-workspace table { min-width: 700px; }
+@media (max-width: 700px) {
+  body:has(.approval-workspace) .app-sidebar { position: static; width: auto; padding: 16px; }
+  body:has(.approval-workspace) .app-sidebar nav { display: flex; flex-wrap: wrap; gap: 4px; }
+  body:has(.approval-workspace) .sidebar-bottom { display: none; }
+  body:has(.approval-workspace) .app-main { margin-left: 0; }
+  body:has(.approval-workspace) .app-topbar { padding: 0 16px; }
+  body:has(.approval-workspace) .page-container { padding: 22px 16px; }
+  body:has(.approval-workspace) .page-heading,
+  body:has(.approval-workspace) .page-footer { flex-wrap: wrap; }
+}
 .eyebrow {
   display: block;
   margin-bottom: 4px;