feat: ship OA drafts/badges, role dual-track, and test-env deploy tooling.
Add approval instance drafts with menu badges, dual-track user/role read model and role bound names, form-designer outline docs, and bare-metal test deploy scripts. Ignore local test-server credential file. Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
1 parent
7af53fc344
commit
de22678c87
56 files changed
+11861
-6082
No files matched your search
@@ -0,0 +1,709 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
|
||||
<title>OA 草稿箱 · Demo</title>
|
||||
<link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&display=swap" rel="stylesheet" />
|
||||
<style>
|
||||
:root {
|
||||
--primary: #10b981;
|
||||
--primary-dark: #059669;
|
||||
--primary-bg: #ecfdf5;
|
||||
--text: #1e293b;
|
||||
--text-muted: #64748b;
|
||||
--border: #d9e8e2;
|
||||
--bg-page: #f8fafc;
|
||||
--surface: #ffffff;
|
||||
--table-head: #f8fafc;
|
||||
--row-alt: #fafafa;
|
||||
--shadow: 0 1px 3px rgba(0,0,0,.05);
|
||||
--radius: 10px;
|
||||
--warn: #d97706;
|
||||
--warn-bg: #fffbeb;
|
||||
--danger: #dc2626;
|
||||
}
|
||||
* { box-sizing: border-box; }
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: Inter, -apple-system, sans-serif;
|
||||
font-size: 14px;
|
||||
line-height: 1.5;
|
||||
color: var(--text);
|
||||
background: #eef2f0;
|
||||
padding: 24px;
|
||||
}
|
||||
.page-head {
|
||||
max-width: 1120px;
|
||||
margin: 0 auto 20px;
|
||||
}
|
||||
.page-head h1 {
|
||||
margin: 0 0 6px;
|
||||
font-size: 22px;
|
||||
font-weight: 700;
|
||||
}
|
||||
.page-head p {
|
||||
margin: 0;
|
||||
color: var(--text-muted);
|
||||
font-size: 13px;
|
||||
}
|
||||
.tabs {
|
||||
max-width: 1120px;
|
||||
margin: 0 auto 16px;
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.tab {
|
||||
border: 1px solid var(--border);
|
||||
background: #fff;
|
||||
color: var(--text-muted);
|
||||
border-radius: 999px;
|
||||
padding: 8px 16px;
|
||||
font-size: 13px;
|
||||
font-weight: 600;
|
||||
cursor: pointer;
|
||||
}
|
||||
.tab.active {
|
||||
background: var(--primary-bg);
|
||||
border-color: #a7f3d0;
|
||||
color: var(--primary-dark);
|
||||
}
|
||||
.panel {
|
||||
max-width: 1120px;
|
||||
margin: 0 auto;
|
||||
display: none;
|
||||
background: var(--surface);
|
||||
border: 1px solid var(--border);
|
||||
border-radius: var(--radius);
|
||||
box-shadow: var(--shadow);
|
||||
overflow: hidden;
|
||||
}
|
||||
.panel.show { display: block; }
|
||||
.note {
|
||||
max-width: 1120px;
|
||||
margin: 14px auto 0;
|
||||
padding: 12px 14px;
|
||||
background: #fff;
|
||||
border: 1px dashed #a7f3d0;
|
||||
border-radius: 8px;
|
||||
color: var(--text-muted);
|
||||
font-size: 13px;
|
||||
}
|
||||
.note strong { color: var(--primary-dark); }
|
||||
|
||||
/* shell */
|
||||
.shell { display: flex; min-height: 560px; }
|
||||
.sidebar {
|
||||
width: 220px;
|
||||
flex-shrink: 0;
|
||||
border-right: 1px solid var(--border);
|
||||
background: #fff;
|
||||
padding: 16px 12px;
|
||||
}
|
||||
.logo {
|
||||
font-weight: 700;
|
||||
padding: 4px 12px 16px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
margin-bottom: 12px;
|
||||
}
|
||||
.logo span { color: var(--primary); }
|
||||
.nav-group {
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
color: var(--text-muted);
|
||||
padding: 8px 12px;
|
||||
letter-spacing: .02em;
|
||||
}
|
||||
.nav-item {
|
||||
display: block;
|
||||
padding: 9px 12px;
|
||||
border-radius: 8px;
|
||||
color: var(--text);
|
||||
text-decoration: none;
|
||||
font-size: 13px;
|
||||
margin-bottom: 2px;
|
||||
}
|
||||
.nav-item:hover { background: #f1f5f9; }
|
||||
.nav-item.active {
|
||||
background: var(--primary-bg);
|
||||
color: var(--primary-dark);
|
||||
font-weight: 600;
|
||||
}
|
||||
.nav-item.new {
|
||||
position: relative;
|
||||
}
|
||||
.nav-item.new::after {
|
||||
content: 'NEW';
|
||||
position: absolute;
|
||||
right: 10px;
|
||||
top: 50%;
|
||||
transform: translateY(-50%);
|
||||
font-size: 10px;
|
||||
font-weight: 700;
|
||||
color: var(--warn);
|
||||
background: var(--warn-bg);
|
||||
border: 1px solid #fcd34d;
|
||||
border-radius: 4px;
|
||||
padding: 1px 5px;
|
||||
}
|
||||
.main { flex: 1; background: var(--bg-page); padding: 20px; min-width: 0; }
|
||||
.content-card {
|
||||
background: #fff;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: var(--radius);
|
||||
overflow: hidden;
|
||||
}
|
||||
.panel-top {
|
||||
padding: 16px 20px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
}
|
||||
.panel-top h2 {
|
||||
margin: 0;
|
||||
font-size: 16px;
|
||||
font-weight: 700;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 8px;
|
||||
}
|
||||
.panel-top h2::before {
|
||||
content: '';
|
||||
width: 3px;
|
||||
height: 16px;
|
||||
background: var(--primary);
|
||||
border-radius: 2px;
|
||||
}
|
||||
.toolbar {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 10px;
|
||||
padding: 12px 20px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
}
|
||||
.hint { color: var(--text-muted); font-size: 13px; margin-right: auto; }
|
||||
.btn {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
height: 36px;
|
||||
padding: 0 14px;
|
||||
border-radius: 8px;
|
||||
border: 1px solid var(--border);
|
||||
background: #fff;
|
||||
color: var(--text);
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
cursor: pointer;
|
||||
}
|
||||
.btn-main {
|
||||
background: var(--primary);
|
||||
border-color: var(--primary);
|
||||
color: #fff;
|
||||
}
|
||||
.btn-main:hover { background: var(--primary-dark); }
|
||||
.btn-ghost:hover { background: #f8fafc; }
|
||||
.btn-warn {
|
||||
background: #fff;
|
||||
border-color: #fcd34d;
|
||||
color: var(--warn);
|
||||
}
|
||||
.btn-danger {
|
||||
color: var(--danger);
|
||||
border-color: #fecaca;
|
||||
}
|
||||
.btn-op {
|
||||
height: 30px;
|
||||
padding: 0 10px;
|
||||
font-size: 12px;
|
||||
}
|
||||
|
||||
table { width: 100%; border-collapse: collapse; }
|
||||
th, td {
|
||||
padding: 12px 14px;
|
||||
text-align: center;
|
||||
border-bottom: 1px solid #eef2f0;
|
||||
font-size: 13px;
|
||||
}
|
||||
th {
|
||||
background: var(--table-head);
|
||||
color: var(--text-muted);
|
||||
font-weight: 600;
|
||||
font-size: 12px;
|
||||
}
|
||||
tr:nth-child(even) td { background: var(--row-alt); }
|
||||
.tag {
|
||||
display: inline-block;
|
||||
padding: 2px 8px;
|
||||
border-radius: 4px;
|
||||
font-size: 12px;
|
||||
font-weight: 600;
|
||||
}
|
||||
.tag-draft {
|
||||
background: var(--warn-bg);
|
||||
color: var(--warn);
|
||||
}
|
||||
.ops { display: flex; gap: 6px; justify-content: center; flex-wrap: wrap; }
|
||||
|
||||
/* start cards */
|
||||
.cards {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
gap: 12px;
|
||||
padding: 16px 20px 20px;
|
||||
}
|
||||
.app-card {
|
||||
display: flex;
|
||||
align-items: center;
|
||||
gap: 12px;
|
||||
padding: 14px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 10px;
|
||||
background: #fff;
|
||||
}
|
||||
.app-icon {
|
||||
width: 40px;
|
||||
height: 40px;
|
||||
border-radius: 10px;
|
||||
background: var(--primary-bg);
|
||||
color: var(--primary-dark);
|
||||
display: grid;
|
||||
place-items: center;
|
||||
font-weight: 700;
|
||||
flex-shrink: 0;
|
||||
}
|
||||
.app-body { flex: 1; min-width: 0; }
|
||||
.app-name { font-weight: 600; display: block; }
|
||||
.app-desc { color: var(--text-muted); font-size: 12px; }
|
||||
|
||||
/* dialog overlay mock */
|
||||
.dlg-wrap {
|
||||
position: relative;
|
||||
min-height: 520px;
|
||||
background: rgba(15, 23, 42, .35);
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
justify-content: center;
|
||||
padding: 28px 16px;
|
||||
}
|
||||
.dlg {
|
||||
width: min(720px, 100%);
|
||||
background: #fff;
|
||||
border-radius: 12px;
|
||||
box-shadow: 0 20px 50px rgba(0,0,0,.18);
|
||||
overflow: hidden;
|
||||
display: flex;
|
||||
flex-direction: column;
|
||||
max-height: calc(100vh - 120px);
|
||||
}
|
||||
.dlg-hd {
|
||||
padding: 16px 20px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
font-weight: 700;
|
||||
font-size: 16px;
|
||||
}
|
||||
.dlg-bd {
|
||||
padding: 18px 20px;
|
||||
overflow: auto;
|
||||
flex: 1;
|
||||
}
|
||||
.form-grid {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 14px;
|
||||
}
|
||||
.field { display: flex; flex-direction: column; gap: 6px; }
|
||||
.field.full { grid-column: 1 / -1; }
|
||||
.field label {
|
||||
font-size: 12px;
|
||||
color: var(--text-muted);
|
||||
font-weight: 600;
|
||||
}
|
||||
.field input, .field textarea, .field select {
|
||||
height: 36px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
padding: 0 10px;
|
||||
font: inherit;
|
||||
color: var(--text);
|
||||
background: #fff;
|
||||
}
|
||||
.field textarea {
|
||||
height: 72px;
|
||||
padding: 8px 10px;
|
||||
resize: none;
|
||||
}
|
||||
.flow-preview {
|
||||
margin-top: 16px;
|
||||
padding: 12px;
|
||||
border: 1px solid var(--border);
|
||||
border-radius: 8px;
|
||||
background: #fafafa;
|
||||
}
|
||||
.flow-preview .title {
|
||||
font-size: 12px;
|
||||
font-weight: 700;
|
||||
color: var(--text-muted);
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.steps {
|
||||
display: flex;
|
||||
gap: 8px;
|
||||
align-items: center;
|
||||
flex-wrap: wrap;
|
||||
}
|
||||
.step {
|
||||
padding: 6px 10px;
|
||||
border-radius: 6px;
|
||||
background: #fff;
|
||||
border: 1px solid var(--border);
|
||||
font-size: 12px;
|
||||
}
|
||||
.step.on {
|
||||
border-color: #a7f3d0;
|
||||
background: var(--primary-bg);
|
||||
color: var(--primary-dark);
|
||||
font-weight: 600;
|
||||
}
|
||||
.arrow { color: var(--text-muted); font-size: 12px; }
|
||||
.dlg-ft {
|
||||
padding: 12px 20px;
|
||||
border-top: 1px solid var(--border);
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 10px;
|
||||
background: #fff;
|
||||
}
|
||||
.change-callout {
|
||||
margin: 0 0 12px;
|
||||
padding: 10px 12px;
|
||||
background: var(--warn-bg);
|
||||
border: 1px solid #fcd34d;
|
||||
border-radius: 8px;
|
||||
color: #92400e;
|
||||
font-size: 13px;
|
||||
}
|
||||
.pager {
|
||||
display: flex;
|
||||
justify-content: flex-end;
|
||||
gap: 8px;
|
||||
padding: 12px 20px;
|
||||
border-top: 1px solid var(--border);
|
||||
color: var(--text-muted);
|
||||
font-size: 12px;
|
||||
align-items: center;
|
||||
}
|
||||
.filter {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(3, 1fr) auto;
|
||||
gap: 12px;
|
||||
padding: 14px 20px;
|
||||
border-bottom: 1px solid var(--border);
|
||||
background: #fff;
|
||||
}
|
||||
.filter .field label { font-size: 11px; }
|
||||
@media (max-width: 840px) {
|
||||
.shell { flex-direction: column; }
|
||||
.sidebar { width: 100%; }
|
||||
.cards, .form-grid, .filter { grid-template-columns: 1fr; }
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page-head">
|
||||
<h1>OA 审批 · 草稿箱 Demo</h1>
|
||||
<p>对照 Fresh Mint:侧栏新增「草稿箱」、发起弹窗增加「暂存草稿」、草稿可再编辑 / 保存 / 提交。</p>
|
||||
</div>
|
||||
|
||||
<div class="tabs">
|
||||
<button class="tab active" data-tab="menu" type="button">1. 菜单位置</button>
|
||||
<button class="tab" data-tab="start" type="button">2. 发起弹窗(暂存)</button>
|
||||
<button class="tab" data-tab="drafts" type="button">3. 草稿箱列表</button>
|
||||
<button class="tab" data-tab="edit" type="button">4. 继续编辑草稿</button>
|
||||
</div>
|
||||
|
||||
<!-- 1 menu -->
|
||||
<section class="panel show" id="panel-menu">
|
||||
<div class="shell">
|
||||
<aside class="sidebar">
|
||||
<div class="logo">中科兴皖 · <span>OA</span></div>
|
||||
<div class="nav-group">OA审批</div>
|
||||
<a class="nav-item" href="#">审批管理</a>
|
||||
<a class="nav-item" href="#">发起审批</a>
|
||||
<a class="nav-item active new" href="#">草稿箱</a>
|
||||
<a class="nav-item" href="#">待办中心</a>
|
||||
<a class="nav-item" href="#">已办中心</a>
|
||||
<a class="nav-item" href="#">我发起的</a>
|
||||
<a class="nav-item" href="#">抄送我的</a>
|
||||
</aside>
|
||||
<div class="main">
|
||||
<div class="content-card">
|
||||
<div class="panel-top"><h2>草稿箱</h2></div>
|
||||
<div class="toolbar">
|
||||
<div class="hint">仅展示当前登录人自己暂存的审批草稿</div>
|
||||
</div>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th>序号</th>
|
||||
<th>流程名称</th>
|
||||
<th>最近保存</th>
|
||||
<th>状态</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td>1</td>
|
||||
<td>请假申请</td>
|
||||
<td>2026-08-06 10:12</td>
|
||||
<td><span class="tag tag-draft">草稿</span></td>
|
||||
<td>
|
||||
<div class="ops">
|
||||
<button class="btn btn-op btn-main" type="button">编辑</button>
|
||||
<button class="btn btn-op" type="button">提交</button>
|
||||
<button class="btn btn-op btn-danger" type="button">删除</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td>2</td>
|
||||
<td>费用报销</td>
|
||||
<td>2026-08-05 18:40</td>
|
||||
<td><span class="tag tag-draft">草稿</span></td>
|
||||
<td>
|
||||
<div class="ops">
|
||||
<button class="btn btn-op btn-main" type="button">编辑</button>
|
||||
<button class="btn btn-op" type="button">提交</button>
|
||||
<button class="btn btn-op btn-danger" type="button">删除</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- 2 start dialog -->
|
||||
<section class="panel" id="panel-start">
|
||||
<div class="dlg-wrap">
|
||||
<div class="dlg">
|
||||
<div class="dlg-hd">请假申请</div>
|
||||
<div class="dlg-bd">
|
||||
<p class="change-callout">相对现状:底栏由「取消 / 提交」变为「取消 / 暂存草稿 / 提交」。</p>
|
||||
<div class="form-grid">
|
||||
<div class="field">
|
||||
<label>申请人</label>
|
||||
<input value="张三" readonly />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>所属部门</label>
|
||||
<input value="研发中心 / 前端组" readonly />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>请假类型</label>
|
||||
<select>
|
||||
<option>年假</option>
|
||||
<option>事假</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>请假天数</label>
|
||||
<input value="1.5" />
|
||||
</div>
|
||||
<div class="field full">
|
||||
<label>请假事由</label>
|
||||
<textarea>家庭事务,需请假半天办理…</textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="flow-preview">
|
||||
<div class="title">审批流预览</div>
|
||||
<div class="steps">
|
||||
<span class="step on">发起人 · 张三</span>
|
||||
<span class="arrow">→</span>
|
||||
<span class="step">直属主管 · 李四</span>
|
||||
<span class="arrow">→</span>
|
||||
<span class="step">人事确认</span>
|
||||
<span class="arrow">→</span>
|
||||
<span class="step">结束</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dlg-ft">
|
||||
<button class="btn btn-ghost" type="button">✕ 取消</button>
|
||||
<button class="btn btn-warn" type="button">💾 暂存草稿</button>
|
||||
<button class="btn btn-main" type="button">✓ 提交</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- 3 drafts list -->
|
||||
<section class="panel" id="panel-drafts">
|
||||
<div class="shell">
|
||||
<aside class="sidebar">
|
||||
<div class="logo">中科兴皖 · <span>OA</span></div>
|
||||
<div class="nav-group">OA审批</div>
|
||||
<a class="nav-item" href="#">发起审批</a>
|
||||
<a class="nav-item active" href="#">草稿箱</a>
|
||||
<a class="nav-item" href="#">待办中心</a>
|
||||
<a class="nav-item" href="#">我发起的</a>
|
||||
</aside>
|
||||
<div class="main">
|
||||
<div class="content-card">
|
||||
<div class="panel-top"><h2>草稿箱</h2></div>
|
||||
<div class="filter">
|
||||
<div class="field">
|
||||
<label>流程名称</label>
|
||||
<input placeholder="请输入流程名称" />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>保存时间</label>
|
||||
<input placeholder="开始日期 ~ 结束日期" />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>模板分组</label>
|
||||
<select><option>全部</option><option>人事</option><option>财务</option></select>
|
||||
</div>
|
||||
<div style="display:flex;align-items:flex-end;gap:8px;">
|
||||
<button class="btn btn-main" type="button">查询</button>
|
||||
<button class="btn" type="button">重置</button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="toolbar">
|
||||
<div class="hint">已选 0 项</div>
|
||||
<button class="btn btn-danger" type="button">批量删除</button>
|
||||
</div>
|
||||
<table>
|
||||
<thead>
|
||||
<tr>
|
||||
<th style="width:48px"><input type="checkbox" /></th>
|
||||
<th>序号</th>
|
||||
<th>流程名称</th>
|
||||
<th>模板版本</th>
|
||||
<th>最近保存</th>
|
||||
<th>状态</th>
|
||||
<th>操作</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<td><input type="checkbox" /></td>
|
||||
<td>1</td>
|
||||
<td>请假申请</td>
|
||||
<td>v3</td>
|
||||
<td>2026-08-06 10:12</td>
|
||||
<td><span class="tag tag-draft">草稿</span></td>
|
||||
<td>
|
||||
<div class="ops">
|
||||
<button class="btn btn-op btn-main" type="button">编辑</button>
|
||||
<button class="btn btn-op" type="button">提交审批</button>
|
||||
<button class="btn btn-op btn-danger" type="button">删除</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><input type="checkbox" /></td>
|
||||
<td>2</td>
|
||||
<td>加班申请</td>
|
||||
<td>v1</td>
|
||||
<td>2026-08-04 09:22</td>
|
||||
<td><span class="tag tag-draft">草稿</span></td>
|
||||
<td>
|
||||
<div class="ops">
|
||||
<button class="btn btn-op btn-main" type="button">编辑</button>
|
||||
<button class="btn btn-op" type="button">提交审批</button>
|
||||
<button class="btn btn-op btn-danger" type="button">删除</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
<tr>
|
||||
<td><input type="checkbox" /></td>
|
||||
<td>3</td>
|
||||
<td>费用报销</td>
|
||||
<td>v2</td>
|
||||
<td>2026-08-01 21:05</td>
|
||||
<td><span class="tag tag-draft">草稿</span></td>
|
||||
<td>
|
||||
<div class="ops">
|
||||
<button class="btn btn-op btn-main" type="button">编辑</button>
|
||||
<button class="btn btn-op" type="button">提交审批</button>
|
||||
<button class="btn btn-op btn-danger" type="button">删除</button>
|
||||
</div>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
<div class="pager">共 3 条 · 每页 20 条 · 1 / 1</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<!-- 4 edit draft -->
|
||||
<section class="panel" id="panel-edit">
|
||||
<div class="dlg-wrap">
|
||||
<div class="dlg">
|
||||
<div class="dlg-hd">编辑草稿 · 请假申请</div>
|
||||
<div class="dlg-bd">
|
||||
<p class="change-callout">从草稿箱点「编辑」打开同一套发起表单;可再次「暂存草稿」或「提交」发起正式审批。</p>
|
||||
<div class="form-grid">
|
||||
<div class="field">
|
||||
<label>申请人</label>
|
||||
<input value="张三" readonly />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>所属部门</label>
|
||||
<input value="研发中心 / 前端组" readonly />
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>请假类型</label>
|
||||
<select>
|
||||
<option selected>年假</option>
|
||||
<option>事假</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="field">
|
||||
<label>请假天数</label>
|
||||
<input value="1.5" />
|
||||
</div>
|
||||
<div class="field full">
|
||||
<label>请假事由</label>
|
||||
<textarea>家庭事务,需请假半天办理…(草稿已回填)</textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dlg-ft">
|
||||
<button class="btn btn-ghost" type="button">✕ 取消</button>
|
||||
<button class="btn btn-warn" type="button">💾 保存草稿</button>
|
||||
<button class="btn btn-main" type="button">✓ 提交审批</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</section>
|
||||
|
||||
<div class="note">
|
||||
<strong>请确认:</strong>菜单放在「发起审批」正下方、弹窗三按钮(取消 / 暂存草稿 / 提交)、草稿箱支持编辑·提交·删除 —— 是否符合你们期望?
|
||||
有偏好可点上方 Tab 对照后,在对话里告诉我要改哪里。
|
||||
</div>
|
||||
|
||||
<script>
|
||||
const tabs = document.querySelectorAll('.tab')
|
||||
const panels = {
|
||||
menu: document.getElementById('panel-menu'),
|
||||
start: document.getElementById('panel-start'),
|
||||
drafts: document.getElementById('panel-drafts'),
|
||||
edit: document.getElementById('panel-edit')
|
||||
}
|
||||
tabs.forEach((tab) => {
|
||||
tab.addEventListener('click', () => {
|
||||
tabs.forEach((t) => t.classList.remove('active'))
|
||||
tab.classList.add('active')
|
||||
Object.values(panels).forEach((p) => p.classList.remove('show'))
|
||||
panels[tab.dataset.tab].classList.add('show')
|
||||
})
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,684 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="zh-CN">
|
||||
<head>
|
||||
<meta charset="UTF-8" />
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1" />
|
||||
<title>OA 表单设计器 · 画布描边方案对比</title>
|
||||
<style>
|
||||
:root {
|
||||
--mint: #10b981;
|
||||
--mint-dark: #059669;
|
||||
--mint-bg: #ecfdf5;
|
||||
--mint-soft: rgba(16, 185, 129, 0.35);
|
||||
--mint-softer: rgba(16, 185, 129, 0.18);
|
||||
--slate-50: #f8fafc;
|
||||
--slate-100: #f1f5f9;
|
||||
--slate-200: #e2e8f0;
|
||||
--slate-400: #94a3b8;
|
||||
--slate-500: #64748b;
|
||||
--slate-700: #334155;
|
||||
--slate-900: #0f172a;
|
||||
--blue: #2e73ff;
|
||||
}
|
||||
|
||||
* { box-sizing: border-box; }
|
||||
body {
|
||||
margin: 0;
|
||||
font-family: "PingFang SC", "Helvetica Neue", Arial, sans-serif;
|
||||
color: var(--slate-900);
|
||||
background: linear-gradient(180deg, #f0fdf9 0%, var(--slate-50) 40%, #fff 100%);
|
||||
line-height: 1.5;
|
||||
}
|
||||
|
||||
.page {
|
||||
max-width: 1180px;
|
||||
margin: 0 auto;
|
||||
padding: 32px 24px 64px;
|
||||
}
|
||||
|
||||
header {
|
||||
margin-bottom: 28px;
|
||||
}
|
||||
header h1 {
|
||||
margin: 0 0 8px;
|
||||
font-size: 24px;
|
||||
font-weight: 700;
|
||||
letter-spacing: -0.02em;
|
||||
}
|
||||
header p {
|
||||
margin: 0;
|
||||
color: var(--slate-500);
|
||||
font-size: 14px;
|
||||
max-width: 720px;
|
||||
}
|
||||
.hint {
|
||||
display: inline-flex;
|
||||
align-items: center;
|
||||
gap: 6px;
|
||||
margin-top: 12px;
|
||||
padding: 6px 12px;
|
||||
border-radius: 8px;
|
||||
background: var(--mint-bg);
|
||||
color: var(--mint-dark);
|
||||
font-size: 13px;
|
||||
font-weight: 500;
|
||||
}
|
||||
|
||||
.grid {
|
||||
display: grid;
|
||||
grid-template-columns: repeat(2, 1fr);
|
||||
gap: 20px;
|
||||
}
|
||||
@media (max-width: 900px) {
|
||||
.grid { grid-template-columns: 1fr; }
|
||||
}
|
||||
|
||||
.card {
|
||||
background: #fff;
|
||||
border: 1px solid var(--slate-200);
|
||||
border-radius: 12px;
|
||||
overflow: hidden;
|
||||
box-shadow: 0 1px 2px rgba(15, 23, 42, 0.04);
|
||||
transition: box-shadow 0.2s, border-color 0.2s;
|
||||
cursor: pointer;
|
||||
}
|
||||
.card:hover {
|
||||
border-color: #a7f3d0;
|
||||
box-shadow: 0 8px 24px rgba(16, 185, 129, 0.1);
|
||||
}
|
||||
.card.selected {
|
||||
border-color: var(--mint);
|
||||
box-shadow: 0 0 0 2px rgba(16, 185, 129, 0.25);
|
||||
}
|
||||
.card-head {
|
||||
display: flex;
|
||||
align-items: flex-start;
|
||||
gap: 12px;
|
||||
padding: 14px 16px 12px;
|
||||
border-bottom: 1px solid var(--slate-100);
|
||||
background: var(--slate-50);
|
||||
}
|
||||
.badge {
|
||||
flex-shrink: 0;
|
||||
width: 28px;
|
||||
height: 28px;
|
||||
border-radius: 8px;
|
||||
background: var(--mint);
|
||||
color: #fff;
|
||||
font-size: 13px;
|
||||
font-weight: 700;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
}
|
||||
.card.baseline .badge { background: var(--slate-400); }
|
||||
.card-head h2 {
|
||||
margin: 0 0 2px;
|
||||
font-size: 15px;
|
||||
font-weight: 650;
|
||||
}
|
||||
.card-head p {
|
||||
margin: 0;
|
||||
font-size: 12px;
|
||||
color: var(--slate-500);
|
||||
}
|
||||
.tag-row {
|
||||
display: flex;
|
||||
flex-wrap: wrap;
|
||||
gap: 6px;
|
||||
margin-top: 8px;
|
||||
}
|
||||
.tag {
|
||||
font-size: 11px;
|
||||
padding: 2px 8px;
|
||||
border-radius: 999px;
|
||||
background: var(--slate-100);
|
||||
color: var(--slate-500);
|
||||
}
|
||||
.tag.rec {
|
||||
background: var(--mint-bg);
|
||||
color: var(--mint-dark);
|
||||
font-weight: 600;
|
||||
}
|
||||
.tag.warn {
|
||||
background: #fff7ed;
|
||||
color: #c2410c;
|
||||
}
|
||||
|
||||
.canvas {
|
||||
padding: 16px;
|
||||
min-height: 220px;
|
||||
background: #fafafa;
|
||||
user-select: none;
|
||||
}
|
||||
.canvas-label {
|
||||
font-size: 11px;
|
||||
color: var(--slate-400);
|
||||
margin-bottom: 10px;
|
||||
letter-spacing: 0.02em;
|
||||
}
|
||||
|
||||
/* —— 通用控件外观 —— */
|
||||
.field {
|
||||
padding: 8px 10px;
|
||||
background: #fff;
|
||||
border-radius: 4px;
|
||||
}
|
||||
.field-label {
|
||||
font-size: 12px;
|
||||
color: var(--slate-700);
|
||||
margin-bottom: 6px;
|
||||
}
|
||||
.field-ctrl {
|
||||
height: 32px;
|
||||
border: 1px solid var(--slate-200);
|
||||
border-radius: 6px;
|
||||
background: #fff;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
padding: 0 10px;
|
||||
font-size: 12px;
|
||||
color: var(--slate-400);
|
||||
}
|
||||
.layout {
|
||||
padding: 8px;
|
||||
background: rgba(255, 255, 255, 0.6);
|
||||
border-radius: 4px;
|
||||
}
|
||||
.layout-title {
|
||||
font-size: 11px;
|
||||
color: var(--slate-400);
|
||||
margin-bottom: 8px;
|
||||
padding-left: 2px;
|
||||
}
|
||||
.row {
|
||||
display: grid;
|
||||
grid-template-columns: 1fr 1fr;
|
||||
gap: 8px;
|
||||
}
|
||||
.stack > * + * { margin-top: 8px; }
|
||||
|
||||
/* DragTool 模拟:操作钮 */
|
||||
.dt {
|
||||
position: relative;
|
||||
padding: 2px;
|
||||
border-radius: 2px;
|
||||
}
|
||||
.dt-btns {
|
||||
display: none;
|
||||
position: absolute;
|
||||
right: 2px;
|
||||
bottom: 2px;
|
||||
z-index: 5;
|
||||
gap: 2px;
|
||||
}
|
||||
.dt-btns span {
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
background: var(--mint);
|
||||
color: #fff;
|
||||
font-size: 10px;
|
||||
display: flex;
|
||||
align-items: center;
|
||||
justify-content: center;
|
||||
border-radius: 2px;
|
||||
}
|
||||
.dt.active > .dt-btns,
|
||||
.dt:hover > .dt-btns { display: flex; }
|
||||
|
||||
/* ========== A 现状:始终虚线 ========== */
|
||||
.style-a .dt {
|
||||
outline: 1px dashed var(--mint);
|
||||
}
|
||||
.style-a .dt.active {
|
||||
outline: 1px solid var(--mint);
|
||||
}
|
||||
.style-a .dt:hover:not(.active) {
|
||||
outline-style: solid;
|
||||
outline-color: var(--mint-soft);
|
||||
}
|
||||
|
||||
/* ========== B 悬停才显:默认无框 ========== */
|
||||
.style-b .dt {
|
||||
outline: 1px dashed transparent;
|
||||
}
|
||||
.style-b .dt:hover {
|
||||
outline-color: var(--mint-soft);
|
||||
outline-style: solid;
|
||||
}
|
||||
.style-b .dt.active {
|
||||
outline: 1px solid var(--mint);
|
||||
}
|
||||
|
||||
/* ========== C 仅选中:最干净 ========== */
|
||||
.style-c .dt {
|
||||
outline: 1px solid transparent;
|
||||
}
|
||||
.style-c .dt.active {
|
||||
outline-color: var(--mint);
|
||||
}
|
||||
.style-c .dt:hover:not(.active) {
|
||||
background: rgba(16, 185, 129, 0.04);
|
||||
}
|
||||
|
||||
/* ========== D 淡化常驻:浅虚线 ========== */
|
||||
.style-d .dt {
|
||||
outline: 1px dashed var(--mint-softer);
|
||||
}
|
||||
.style-d .dt:hover {
|
||||
outline-color: var(--mint-soft);
|
||||
outline-style: solid;
|
||||
}
|
||||
.style-d .dt.active {
|
||||
outline: 1px solid var(--mint);
|
||||
}
|
||||
|
||||
/* ========== E 混合:布局淡框 + 字段悬停 ========== */
|
||||
.style-e .dt.leaf {
|
||||
outline: 1px dashed transparent;
|
||||
}
|
||||
.style-e .dt.leaf:hover {
|
||||
outline-color: var(--mint-soft);
|
||||
outline-style: solid;
|
||||
}
|
||||
.style-e .dt.leaf.active {
|
||||
outline: 1px solid var(--mint);
|
||||
}
|
||||
.style-e .dt.container {
|
||||
outline: 1px dashed var(--mint-softer);
|
||||
}
|
||||
.style-e .dt.container:hover {
|
||||
outline-color: var(--mint-soft);
|
||||
}
|
||||
.style-e .dt.container.active {
|
||||
outline: 1px solid var(--mint);
|
||||
}
|
||||
|
||||
/* ========== F 父级指示条:左侧色条代替四周虚线 ========== */
|
||||
.style-f .dt {
|
||||
outline: none;
|
||||
border-left: 2px solid transparent;
|
||||
padding-left: 6px;
|
||||
}
|
||||
.style-f .dt.container {
|
||||
border-left-color: var(--mint-softer);
|
||||
background: rgba(16, 185, 129, 0.03);
|
||||
}
|
||||
.style-f .dt:hover {
|
||||
border-left-color: var(--mint-soft);
|
||||
background: rgba(16, 185, 129, 0.05);
|
||||
}
|
||||
.style-f .dt.active {
|
||||
border-left-color: var(--mint);
|
||||
background: rgba(16, 185, 129, 0.08);
|
||||
box-shadow: inset 0 0 0 1px var(--mint);
|
||||
}
|
||||
|
||||
footer {
|
||||
margin-top: 28px;
|
||||
padding: 16px 18px;
|
||||
border-radius: 12px;
|
||||
background: #fff;
|
||||
border: 1px solid var(--slate-200);
|
||||
font-size: 13px;
|
||||
color: var(--slate-500);
|
||||
}
|
||||
footer strong { color: var(--slate-700); }
|
||||
#choice {
|
||||
margin-top: 8px;
|
||||
font-weight: 600;
|
||||
color: var(--mint-dark);
|
||||
min-height: 1.5em;
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
<body>
|
||||
<div class="page">
|
||||
<header>
|
||||
<h1>表单设计画布 · 描边方案对比</h1>
|
||||
<p>
|
||||
模拟「布局容器嵌套字段」场景。请在每个画布里<strong>点击选中</strong>、<strong>悬停</strong>感受差异。
|
||||
选中整张卡片表示你倾向的方案(可多选对比后口头反馈)。
|
||||
</p>
|
||||
<div class="hint">色值对齐本项目 Mint:#10b981(已替换 FormCreate 默认蓝 #2E73FF)</div>
|
||||
</header>
|
||||
|
||||
<div class="grid" id="options">
|
||||
|
||||
<!-- A -->
|
||||
<article class="card baseline" data-choice="A">
|
||||
<div class="card-head">
|
||||
<div class="badge">A</div>
|
||||
<div>
|
||||
<h2>现状:始终蓝色/绿色虚线</h2>
|
||||
<p>每个组件常驻 dashed outline,嵌套时多层叠加</p>
|
||||
<div class="tag-row">
|
||||
<span class="tag warn">噪音大</span>
|
||||
<span class="tag">层级一目了然</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="canvas style-a" data-demo>
|
||||
<div class="canvas-label">点击组件试试 · 悬停看 hover</div>
|
||||
<div class="stack">
|
||||
<div class="dt container" tabindex="0">
|
||||
<div class="layout">
|
||||
<div class="layout-title">栅格布局</div>
|
||||
<div class="row">
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">申请人</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">部门</div>
|
||||
<div class="field-ctrl">请选择</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>+</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">请假事由</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<!-- B -->
|
||||
<article class="card" data-choice="B">
|
||||
<div class="card-head">
|
||||
<div class="badge">B</div>
|
||||
<div>
|
||||
<h2>悬停显框</h2>
|
||||
<p>默认无描边;悬停出现浅色实线;选中为实线主色</p>
|
||||
<div class="tag-row">
|
||||
<span class="tag rec">推荐候选</span>
|
||||
<span class="tag">操作时才出现辅助线</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="canvas style-b" data-demo>
|
||||
<div class="canvas-label">默认干净 · 鼠标移上去才有框</div>
|
||||
<div class="stack">
|
||||
<div class="dt container" tabindex="0">
|
||||
<div class="layout">
|
||||
<div class="layout-title">栅格布局</div>
|
||||
<div class="row">
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">申请人</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">部门</div>
|
||||
<div class="field-ctrl">请选择</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>+</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">请假事由</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<!-- C -->
|
||||
<article class="card" data-choice="C">
|
||||
<div class="card-head">
|
||||
<div class="badge">C</div>
|
||||
<div>
|
||||
<h2>仅选中显框</h2>
|
||||
<p>默认完全无框;悬停仅微弱底色;只有选中才有实线</p>
|
||||
<div class="tag-row">
|
||||
<span class="tag">最干净</span>
|
||||
<span class="tag">嵌套边界稍难辨认</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="canvas style-c" data-demo>
|
||||
<div class="canvas-label">几乎像真实表单 · 点一下才高亮</div>
|
||||
<div class="stack">
|
||||
<div class="dt container" tabindex="0">
|
||||
<div class="layout">
|
||||
<div class="layout-title">栅格布局</div>
|
||||
<div class="row">
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">申请人</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">部门</div>
|
||||
<div class="field-ctrl">请选择</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>+</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">请假事由</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<!-- D -->
|
||||
<article class="card" data-choice="D">
|
||||
<div class="card-head">
|
||||
<div class="badge">D</div>
|
||||
<div>
|
||||
<h2>淡化常驻虚线</h2>
|
||||
<p>保留常驻提示,但透明度大幅降低;选中再加重</p>
|
||||
<div class="tag-row">
|
||||
<span class="tag">改动最小</span>
|
||||
<span class="tag">多层仍在,只是变淡</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="canvas style-d" data-demo>
|
||||
<div class="canvas-label">虚线还在,但不再抢眼</div>
|
||||
<div class="stack">
|
||||
<div class="dt container" tabindex="0">
|
||||
<div class="layout">
|
||||
<div class="layout-title">栅格布局</div>
|
||||
<div class="row">
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">申请人</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">部门</div>
|
||||
<div class="field-ctrl">请选择</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>+</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">请假事由</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<!-- E -->
|
||||
<article class="card" data-choice="E">
|
||||
<div class="card-head">
|
||||
<div class="badge">E</div>
|
||||
<div>
|
||||
<h2>混合:布局淡框 + 字段悬停</h2>
|
||||
<p>容器保留极淡虚线帮辨层级;普通字段默认无框</p>
|
||||
<div class="tag-row">
|
||||
<span class="tag rec">推荐候选</span>
|
||||
<span class="tag">兼顾布局与干净</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="canvas style-e" data-demo>
|
||||
<div class="canvas-label">只有「栅格」常驻淡框 · 字段悬停才出</div>
|
||||
<div class="stack">
|
||||
<div class="dt container" tabindex="0">
|
||||
<div class="layout">
|
||||
<div class="layout-title">栅格布局</div>
|
||||
<div class="row">
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">申请人</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">部门</div>
|
||||
<div class="field-ctrl">请选择</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>+</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">请假事由</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
|
||||
<!-- F -->
|
||||
<article class="card" data-choice="F">
|
||||
<div class="card-head">
|
||||
<div class="badge">F</div>
|
||||
<div>
|
||||
<h2>左侧指示条(无四周虚线)</h2>
|
||||
<p>用左边色条 + 选中内描边,彻底去掉虚线网格感</p>
|
||||
<div class="tag-row">
|
||||
<span class="tag">视觉更现代</span>
|
||||
<span class="tag">实现略多一点</span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="canvas style-f" data-demo>
|
||||
<div class="canvas-label">无虚线框 · 左侧色条表示可编辑区域</div>
|
||||
<div class="stack">
|
||||
<div class="dt container" tabindex="0">
|
||||
<div class="layout">
|
||||
<div class="layout-title">栅格布局</div>
|
||||
<div class="row">
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">申请人</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">部门</div>
|
||||
<div class="field-ctrl">请选择</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>+</span><span>×</span></div>
|
||||
</div>
|
||||
<div class="dt leaf" tabindex="0">
|
||||
<div class="field">
|
||||
<div class="field-label">请假事由</div>
|
||||
<div class="field-ctrl">请输入</div>
|
||||
</div>
|
||||
<div class="dt-btns"><span>⧉</span><span>×</span></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</article>
|
||||
</div>
|
||||
|
||||
<footer>
|
||||
<strong>怎么选?</strong>
|
||||
想尽快落地、改动小 → 看 B / D;要保留布局层级感 → 看 E;想最接近真实表单 → 看 C;想换交互隐喻 → 看 F。
|
||||
<div id="choice">请点击卡片标题区域选择倾向方案…</div>
|
||||
</footer>
|
||||
</div>
|
||||
|
||||
<script>
|
||||
// 画布内:点击选中组件(互斥)
|
||||
document.querySelectorAll('[data-demo]').forEach((canvas) => {
|
||||
canvas.addEventListener('click', (e) => {
|
||||
const dt = e.target.closest('.dt')
|
||||
if (!dt || !canvas.contains(dt)) return
|
||||
e.stopPropagation()
|
||||
canvas.querySelectorAll('.dt.active').forEach((el) => el.classList.remove('active'))
|
||||
dt.classList.add('active')
|
||||
})
|
||||
})
|
||||
|
||||
// 卡片选择(方案偏好)
|
||||
const choiceEl = document.getElementById('choice')
|
||||
const selected = new Set()
|
||||
document.querySelectorAll('.card').forEach((card) => {
|
||||
card.addEventListener('click', (e) => {
|
||||
// 若点在画布控件上,不切换卡片选中(避免冲突)
|
||||
if (e.target.closest('[data-demo] .dt')) return
|
||||
const key = card.dataset.choice
|
||||
if (selected.has(key)) {
|
||||
selected.delete(key)
|
||||
card.classList.remove('selected')
|
||||
} else {
|
||||
selected.add(key)
|
||||
card.classList.add('selected')
|
||||
}
|
||||
choiceEl.textContent = selected.size
|
||||
? '当前倾向:方案 ' + [...selected].sort().join('、')
|
||||
: '请点击卡片标题区域选择倾向方案…'
|
||||
})
|
||||
})
|
||||
</script>
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,84 @@
|
||||
-- OA 发起人填写草稿(非模板设计草稿)
|
||||
CREATE TABLE IF NOT EXISTS `oa_instance_draft` (
|
||||
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
|
||||
`app_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '应用ID',
|
||||
`app_version_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '暂存时锁定的已发布版本ID',
|
||||
`title` varchar(200) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '标题',
|
||||
`form_data_json` mediumtext COLLATE utf8mb4_unicode_ci COMMENT '表单数据 JSON',
|
||||
`initiator_select_json` text COLLATE utf8mb4_unicode_ci COMMENT '发起人自选 JSON',
|
||||
`initiator_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '发起人部门',
|
||||
`owner_user_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '草稿所属人',
|
||||
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_oid_owner` (`tenant_no`,`owner_user_id`,`del_flag`) USING BTREE,
|
||||
KEY `idx_oid_app` (`tenant_no`,`app_id`,`del_flag`) USING BTREE,
|
||||
KEY `idx_oid_update` (`tenant_no`,`owner_user_id`,`update_time`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA发起审批草稿';
|
||||
|
||||
-- 草稿箱位于「发起审批」与「待办中心」之间;仅首次插入时顺延 order_num
|
||||
UPDATE `sys_menu` AS m
|
||||
INNER JOIN (
|
||||
SELECT 1 AS ok
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM `sys_menu`
|
||||
WHERE `id` = 'OA000000000000000000000000000109' AND `del_flag` = 0
|
||||
)
|
||||
) AS guard ON 1 = 1
|
||||
SET m.`order_num` = m.`order_num` + 1
|
||||
WHERE m.`parent_id` = 'OA000000000000000000000000000001'
|
||||
AND m.`del_flag` = 0
|
||||
AND m.`order_num` IS NOT NULL
|
||||
AND m.`order_num` >= 4;
|
||||
|
||||
INSERT INTO `sys_menu` (
|
||||
`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`,
|
||||
`is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`,
|
||||
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
|
||||
) SELECT
|
||||
'OA000000000000000000000000000109', '草稿箱', 'OA000000000000000000000000000001',
|
||||
'C', 'drafts', '/oa-approval/drafts/index', 'oa:drafts',
|
||||
1, '1', '1', 'zkxw', 4, 'OA发起审批草稿箱',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM `sys_menu` WHERE `id` = 'OA000000000000000000000000000109' AND `del_flag` = 0
|
||||
);
|
||||
|
||||
-- 已拥有「发起审批」菜单的角色自动获得「草稿箱」(幂等)
|
||||
-- 注意:MySQL 5.7 下 INSERT…SELECT 中 UUID() 可能整批相同,导致主键冲突;改用按行唯一的 MD5。
|
||||
INSERT INTO `sys_role_menu` (
|
||||
`id`, `role_id`, `menu_id`, `tenant_no`, `order_num`, `remark`,
|
||||
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
|
||||
)
|
||||
SELECT
|
||||
MD5(CONCAT(rm.`role_id`, '#', 'OA000000000000000000000000000109')),
|
||||
rm.`role_id`,
|
||||
'OA000000000000000000000000000109',
|
||||
COALESCE(NULLIF(rm.`tenant_no`, ''), 'zkxw'),
|
||||
0,
|
||||
'auto from oa:start',
|
||||
NULL,
|
||||
'',
|
||||
NOW(),
|
||||
NULL,
|
||||
NOW(),
|
||||
0
|
||||
FROM `sys_role_menu` rm
|
||||
WHERE rm.`menu_id` = 'OA000000000000000000000000000103'
|
||||
AND rm.`del_flag` = 0
|
||||
AND NOT EXISTS (
|
||||
SELECT 1
|
||||
FROM `sys_role_menu` x
|
||||
WHERE x.`role_id` = rm.`role_id`
|
||||
AND x.`menu_id` = 'OA000000000000000000000000000109'
|
||||
AND x.`del_flag` = 0
|
||||
);
|
||||
@@ -1,37 +0,0 @@
|
||||
-- docs/sql/oa_receive_account.sql
|
||||
CREATE TABLE IF NOT EXISTS `oa_receive_account` (
|
||||
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
|
||||
`account_type` varchar(16) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT 'alipay/personal/corporate',
|
||||
`account_name` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '户名',
|
||||
`account_no` varchar(128) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '账号',
|
||||
`bank_name` varchar(128) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '银行',
|
||||
`bank_province` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '省',
|
||||
`bank_city` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '市',
|
||||
`bank_branch` varchar(256) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '支行',
|
||||
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_ora_tenant` (`tenant_no`,`del_flag`) USING BTREE,
|
||||
KEY `idx_ora_type` (`tenant_no`,`account_type`,`del_flag`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='OA收款账户';
|
||||
|
||||
INSERT INTO `sys_menu` (
|
||||
`id`, `menu_name`, `parent_id`, `menu_type`, `path`, `component`, `perms`,
|
||||
`is_frame`, `visible`, `status`, `tenant_no`, `order_num`, `remark`,
|
||||
`create_by`, `create_dept_id`, `create_time`, `update_by`, `update_time`, `del_flag`
|
||||
) SELECT
|
||||
'OA000000000000000000000000000108', '收款账户管理', 'OA000000000000000000000000000001',
|
||||
'C', 'receive-accounts', '/oa-approval/receive-accounts/index', 'oa:receive-accounts:list',
|
||||
1, '1', '1', 'zkxw', 10, 'OA收款账户主数据',
|
||||
NULL, '', NOW(), NULL, NOW(), 0
|
||||
FROM DUAL
|
||||
WHERE NOT EXISTS (
|
||||
SELECT 1 FROM `sys_menu` WHERE `id` = 'OA000000000000000000000000000108' AND `del_flag` = 0
|
||||
);
|
||||
@@ -1,19 +0,0 @@
|
||||
-- docs/sql/sys_post_role.sql
|
||||
-- 职位-角色关联:职位可绑定多个角色,用户经职位继承角色权限(与直接角色取并集)
|
||||
CREATE TABLE IF NOT EXISTS `sys_post_role` (
|
||||
`id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '主键ID',
|
||||
`post_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '职位ID',
|
||||
`role_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL COMMENT '角色ID',
|
||||
`tenant_no` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT 'zkxw' COMMENT '租户编号',
|
||||
`order_num` int(11) DEFAULT NULL COMMENT '排序号',
|
||||
`remark` varchar(512) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '备注',
|
||||
`create_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '创建人id',
|
||||
`create_dept_id` varchar(64) COLLATE utf8mb4_unicode_ci NOT NULL DEFAULT '' COMMENT '创建人部门ID',
|
||||
`create_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP COMMENT '创建时间',
|
||||
`update_by` varchar(64) COLLATE utf8mb4_unicode_ci DEFAULT NULL COMMENT '更新人id',
|
||||
`update_time` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP COMMENT '更新时间',
|
||||
`del_flag` tinyint(4) NOT NULL DEFAULT '0' COMMENT '删除标记:0-正常 1-已删除',
|
||||
PRIMARY KEY (`id`) USING BTREE,
|
||||
KEY `idx_spr_post` (`tenant_no`,`post_id`,`del_flag`) USING BTREE,
|
||||
KEY `idx_spr_role` (`tenant_no`,`role_id`,`del_flag`) USING BTREE
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci COMMENT='职位-角色关联';
|
||||
@@ -1,5 +0,0 @@
|
||||
-- docs/sql/sys_user_hire_probation.sql
|
||||
-- 用户表补齐入职日期、试用期月数(转正套件主数据)
|
||||
ALTER TABLE `sys_user`
|
||||
ADD COLUMN `hire_date` date DEFAULT NULL COMMENT '入职日期' AFTER `phone_no`,
|
||||
ADD COLUMN `probation_months` int(11) DEFAULT NULL COMMENT '试用期月数' AFTER `hire_date`;
|
||||
@@ -1,4 +0,0 @@
|
||||
-- docs/sql/sys_user_last_work_day.sql
|
||||
-- 用户表补齐最后工作日(离职套件主数据)
|
||||
ALTER TABLE `sys_user`
|
||||
ADD COLUMN `last_work_day` date DEFAULT NULL COMMENT '最后工作日' AFTER `probation_months`;
|
||||
@@ -0,0 +1,32 @@
|
||||
# 角色列表有效用户与关联职位 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 角色列表支持名称快捷查看,并展示有效拥有用户与关联职位。
|
||||
|
||||
**Architecture:** 后端在 `list_roles` 批量 enrichment `boundUserNames` / `boundPostNames`;前端对齐职位列表的 link 与多值换行单元格。
|
||||
|
||||
**Tech Stack:** FastAPI/SQLAlchemy、Vue 3 + Element Plus
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 后端 enrichment
|
||||
|
||||
**Files:** `backend/app/crud/role.py`, `backend/tests/test_role_list_bound_names.py`
|
||||
|
||||
- [x] 实现 `_bound_user_names_by_role_ids`、`_bound_post_names_by_role_ids`
|
||||
- [x] `list_roles` / `_row_to_dict` 输出新字段
|
||||
- [x] 空入参与 enrichment 调用的单测
|
||||
|
||||
### Task 2: 前端列表
|
||||
|
||||
**Files:** `web-admin/src/types/api.d.ts`, `web-admin/src/views/system/role/index.vue`
|
||||
|
||||
- [x] `RoleItem` 增加字段
|
||||
- [x] 角色名称 link → `handleView`
|
||||
- [x] 「拥有用户」「关联职位」两列
|
||||
|
||||
### Task 3: 验证与图谱
|
||||
|
||||
- [x] `pytest` 相关用例(4 passed)
|
||||
- [ ] `./scripts/update-graph.sh backend`(graphify 因节点数变化拒绝覆盖,可后续 `force` 重跑)
|
||||
@@ -0,0 +1,128 @@
|
||||
# OA 发起审批草稿箱 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 发起审批可暂存草稿,并新增「草稿箱」菜单支持再编辑、保存、提交与删除。
|
||||
|
||||
**Architecture:** 独立表 `oa_instance_draft` 存发起人填写草稿;提交时复用 `oa_engine.start_instance`,成功后软删草稿。前端在发起弹窗加「暂存草稿」,新建 `drafts/index.vue` 列表页。
|
||||
|
||||
**Tech Stack:** FastAPI + SQLAlchemy + MySQL;Vue 3 + Element Plus;Fresh Mint UI。
|
||||
|
||||
**Spec:** `docs/superpowers/specs/2026-08-06-oa-approval-instance-draft-design.md`
|
||||
**UI Demo:** `docs/demos/oa-approval-draft-box-demo.html`
|
||||
|
||||
---
|
||||
|
||||
## File map
|
||||
|
||||
| 文件 | 职责 |
|
||||
|------|------|
|
||||
| `docs/sql/oa_instance_draft.sql` | 建表 + `sys_menu` 草稿箱 |
|
||||
| `backend/app/models/models.py` | `OaInstanceDraft` |
|
||||
| `backend/app/crud/oa_instance_draft.py` | 草稿 CRUD |
|
||||
| `backend/app/api/oa_approval.py` | drafts 路由 |
|
||||
| `backend/tests/test_oa_instance_draft.py` | 权限/序列化/提交后软删等单测 |
|
||||
| `web-admin/src/api/oaApproval.ts` | drafts API |
|
||||
| `web-admin/src/router/modules/sqxp.ts` | 路由「草稿箱」 |
|
||||
| `web-admin/src/views/oa-approval/drafts/index.vue` | 草稿箱页 |
|
||||
| `web-admin/src/views/oa-approval/start/index.vue` | 暂存按钮 + draftId 回填 |
|
||||
| `待同步到生产的sql脚本` | 追加本 SQL 引用说明(若团队习惯) |
|
||||
|
||||
---
|
||||
|
||||
### Task 1: SQL 建表与菜单
|
||||
|
||||
**Files:**
|
||||
- Create: `docs/sql/oa_instance_draft.sql`
|
||||
|
||||
- [x] **Step 1: 编写 SQL**
|
||||
- [x] **Step 2: 本地执行 SQL(若有 DB)** — 脚本已写入 `docs/sql/oa_instance_draft.sql`,需在目标库手动执行
|
||||
- [x] **Step 3: Commit** — 待用户要求再提交
|
||||
|
||||
---
|
||||
|
||||
### Task 2: SQLAlchemy 模型
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/models/models.py`(紧挨 `OaInstance` 之前或之后)
|
||||
|
||||
- [ ] **Step 1: 增加 `OaInstanceDraft`**
|
||||
- [ ] **Step 2: Commit** `feat(backend): add OaInstanceDraft model.`
|
||||
|
||||
---
|
||||
|
||||
### Task 3: CRUD + API(TDD)
|
||||
|
||||
**Files:**
|
||||
- Create: `backend/app/crud/oa_instance_draft.py`
|
||||
- Modify: `backend/app/api/oa_approval.py`
|
||||
- Create: `backend/tests/test_oa_instance_draft.py`
|
||||
|
||||
- [ ] **Step 1: 写失败/单元测试**(`_row_to_dict` 字段、owner 校验逻辑可用纯函数;提交后 `del_flag` 行为可用 mock Session)
|
||||
|
||||
- [ ] **Step 2: 实现 CRUD**
|
||||
- `list_drafts`, `get_draft`, `create_draft`, `update_draft`, `soft_delete`, `batch_soft_delete`
|
||||
- list join `OaApp` 取 `appName`、version_no;仅 `owner_user_id`
|
||||
|
||||
- [ ] **Step 3: 挂路由**
|
||||
- GET/POST `/drafts`
|
||||
- GET/PUT/DELETE `/drafts/{id}`
|
||||
- POST `/drafts/batch-delete`
|
||||
- POST `/drafts/{id}/submit` → `start_instance` + soft delete
|
||||
|
||||
- [ ] **Step 4: pytest 通过**
|
||||
- [ ] **Step 5: Commit** `feat(backend): OA instance draft CRUD and submit API.`
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 前端 API + 路由
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/api/oaApproval.ts`
|
||||
- Modify: `web-admin/src/router/modules/sqxp.ts`(发起审批与待办之间插入 drafts)
|
||||
- Modify: `web-admin/src/types/api.d.ts`(若有 OA 类型需补)
|
||||
|
||||
- [ ] **Step 1: API 封装**
|
||||
- [ ] **Step 2: 路由 meta.title=`草稿箱`, menuCode=`oa:drafts`**
|
||||
- [ ] **Step 3: Commit**
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 草稿箱页面
|
||||
|
||||
**Files:**
|
||||
- Create: `web-admin/src/views/oa-approval/drafts/index.vue`
|
||||
|
||||
- [ ] **Step 1: 按 Demo +「我发起的」模式做列表**(筛选、表格、分页、操作列 min-width≥260、状态 Tag)
|
||||
- [ ] **Step 2: 编辑打开弹窗(可内嵌复用 start 逻辑或跳转 `start?draftId=`)——**采用 `start?draftId=`** 减少重复
|
||||
- [ ] **Step 3: 提交/删除/批量删除接线**
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 发起页暂存与回填
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/views/oa-approval/start/index.vue`
|
||||
|
||||
- [ ] **Step 1: footer 增加「暂存草稿」**(取消 / 暂存 / 提交;主色仅提交)
|
||||
- [ ] **Step 2: `route.query.draftId` 加载详情并回填;保存走 PUT**
|
||||
- [ ] **Step 3: 暂存成功提示并关弹窗**
|
||||
- [ ] **Step 4: Commit**
|
||||
|
||||
---
|
||||
|
||||
### Task 7: 收尾
|
||||
|
||||
- [ ] **Step 1:** `./scripts/update-graph.sh all`(或 backend+frontend)
|
||||
- [ ] **Step 2:** 自测清单对照 spec「测试要点」
|
||||
- [ ] **Step 3:** 确认 `App.vue` panelTitleBarTextRules 含「草稿箱」(若需要竖条)
|
||||
|
||||
---
|
||||
|
||||
## 验收
|
||||
|
||||
1. 发起弹窗可暂存,草稿箱可见。
|
||||
2. 编辑回填 → 再保存 → 提交后出现在「我发起的」,草稿消失。
|
||||
3. 他人账号看不到该草稿。
|
||||
4. 暂存不产生待办任务。
|
||||
@@ -0,0 +1,41 @@
|
||||
# OA 草稿箱/待办菜单角标 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 侧栏「草稿箱」「待办中心」展示数量角标,对齐「抄送我的」。
|
||||
|
||||
**Architecture:** 后端增加轻量 count 接口;前端扩展 `oa-menu-badge` store 与 `refreshOaMenuBadges`,在相关页操作后刷新。
|
||||
|
||||
**Tech Stack:** FastAPI / SQLAlchemy / Vue 3 / Pinia
|
||||
|
||||
**Spec:** `docs/superpowers/specs/2026-08-06-oa-drafts-pending-menu-badge-design.md`
|
||||
|
||||
---
|
||||
|
||||
### Task 1: Backend count helpers + API
|
||||
|
||||
**Files:**
|
||||
- Modify: `backend/app/services/oa_engine.py`(`count_pending_tasks`)
|
||||
- Modify: `backend/app/crud/oa_instance_draft.py`(`count_drafts`)
|
||||
- Modify: `backend/app/api/oa_approval.py`
|
||||
- Test: `backend/tests/test_oa_menu_badge_counts.py`
|
||||
|
||||
- [x] Step 1: 写失败单测(mock query.count)
|
||||
- [x] Step 2: 实现 `count_pending_tasks` / `count_drafts` + 路由
|
||||
- [x] Step 3: 跑通 pytest
|
||||
|
||||
### Task 2: Frontend badge wiring
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/store/modules/oa-menu-badge.ts`
|
||||
- Modify: `web-admin/src/utils/oa-menu-badge.ts`
|
||||
- Modify: `web-admin/src/api/oaApproval.ts`
|
||||
- Modify: `web-admin/src/views/oa-approval/drafts/index.vue`
|
||||
- Modify: `web-admin/src/views/oa-approval/pending/index.vue`
|
||||
- Modify: `web-admin/src/views/oa-approval/start/index.vue`
|
||||
- Modify: `web-admin/src/views/oa-approval/instances/detail.vue`
|
||||
- Modify: `web-admin/src/store/modules/user.ts`
|
||||
|
||||
- [x] Step 1: API + store codes + refresh 并行拉取
|
||||
- [x] Step 2: 页面操作后 refresh;logout clear
|
||||
- [x] Step 3: 更新 graphify(frontend + backend;HTML viz 过大时跳过)
|
||||
@@ -0,0 +1,21 @@
|
||||
# OA Form Designer Outline Style E Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** Reduce canvas outline noise in OA form designer using hybrid style E (soft dashed for containers, hover/active for leaves).
|
||||
|
||||
**Architecture:** CSS-only overrides in `oa-fc-host/App.vue` targeting FormCreate `_fd-drag-tool`. Containers detected via `:has(._fd-drag-tool)`.
|
||||
|
||||
**Tech Stack:** Vue 3, `@form-create/designer`, SCSS/CSS in iframe host.
|
||||
|
||||
---
|
||||
|
||||
### Task 1: Add hybrid outline CSS
|
||||
|
||||
**Files:**
|
||||
- Modify: `web-admin/src/oa-fc-host/App.vue`
|
||||
|
||||
- [x] Add leaf default transparent outline + hover solid soft mint + active solid mint
|
||||
- [x] Add container `:has(._fd-drag-tool)` soft dashed default
|
||||
- [x] Override hardcoded `#2E73FF` on `.active` outline and `._fd-drag-btn` to mint
|
||||
- [ ] Manual verify in `/#/system-manage/oa-approval/designer/:id` → 表单设计 tab
|
||||
@@ -0,0 +1,453 @@
|
||||
# 测试环境裸机部署 Implementation Plan
|
||||
|
||||
> **For agentic workers:** REQUIRED SUB-SKILL: Use superpowers:subagent-driven-development (recommended) or superpowers:executing-plans to implement this plan task-by-task. Steps use checkbox (`- [ ]`) syntax for tracking.
|
||||
|
||||
**Goal:** 在 `101.35.245.122` 的 `/root/zkxw` 以裸机方式部署 web-admin(Nginx :10001)与 backend(127.0.0.1:10002),中间件复用本机开发环境的 `47.99.164.66`。
|
||||
|
||||
**Architecture:** 本机 `pnpm build:test` + rsync 前端静态资源;本机 rsync backend 源码;测试机安装 Nginx、用已有 Python 3.12.3 建 `.venv`、`start-test.sh` 绑定本机回环。Nginx 反代 `/api` 与 `/health`,不反代 MinIO。
|
||||
|
||||
**Tech Stack:** Nginx、Python 3.12.3 + venv + uvicorn、`backend/start-test.sh`、Vue 3 web-admin(`pnpm build:test`)、rsync/ssh
|
||||
|
||||
**Spec:** `docs/superpowers/specs/2026-08-06-test-env-bare-metal-deploy-design.md`
|
||||
|
||||
---
|
||||
|
||||
## File Structure
|
||||
|
||||
| 路径 | 职责 |
|
||||
|------|------|
|
||||
| `测试环境部署/zkxw-test-10001.conf` | 新建:测试机 Nginx server 块(10001) |
|
||||
| `测试环境部署/README.md` | 改写:新拓扑、端口、安装与发版步骤 |
|
||||
| `web-admin/.env.test` | 仅更新注释中的访问入口 IP/端口 |
|
||||
| `docs/superpowers/specs/2026-08-06-test-env-bare-metal-deploy-design.md` | 已存在,实现时勿改需求;若步骤偏差仅改计划 |
|
||||
| 服务器 `/root/zkxw/**` | 运行时产物与 `.env.test`(不进 git) |
|
||||
| `测试环境机器的账号密码` | 仅本机 SSH 用,**禁止** commit / 写入计划正文 |
|
||||
|
||||
不新建 Docker compose;不在服务器装 Node。
|
||||
|
||||
---
|
||||
|
||||
### Task 1: 仓库内新增 Nginx site 片段
|
||||
|
||||
**Files:**
|
||||
- Create: `测试环境部署/zkxw-test-10001.conf`
|
||||
|
||||
- [ ] **Step 1: 创建完整 Nginx 配置文件**
|
||||
|
||||
写入以下内容(无 MinIO 反代;API/health 指向本机 10002):
|
||||
|
||||
```nginx
|
||||
# ZKXW 测试环境(裸机)— 部署到 101.35.245.122
|
||||
# 用法(按发行版二选一):
|
||||
# Ubuntu/Debian: 复制到 /etc/nginx/sites-available/zkxw-test-10001.conf
|
||||
# ln -sf ... /etc/nginx/sites-enabled/
|
||||
# RHEL/CentOS: 复制到 /etc/nginx/conf.d/zkxw-test-10001.conf
|
||||
# nginx -t && systemctl reload nginx
|
||||
|
||||
server {
|
||||
listen 10001;
|
||||
listen [::]:10001;
|
||||
server_name 101.35.245.122 localhost 127.0.0.1;
|
||||
|
||||
root /root/zkxw/web-admin/dist;
|
||||
index index.html;
|
||||
|
||||
client_max_body_size 100M;
|
||||
|
||||
access_log /var/log/nginx/zkxw_admin_10001_access.log;
|
||||
error_log /var/log/nginx/zkxw_admin_10001_error.log;
|
||||
|
||||
location = /health {
|
||||
proxy_pass http://127.0.0.1:10002/health;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_connect_timeout 10s;
|
||||
proxy_read_timeout 30s;
|
||||
}
|
||||
|
||||
location ^~ /docs {
|
||||
proxy_pass http://127.0.0.1:10002;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
location = /openapi.json {
|
||||
proxy_pass http://127.0.0.1:10002/openapi.json;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
}
|
||||
|
||||
location ^~ /api/ {
|
||||
proxy_pass http://127.0.0.1:10002;
|
||||
proxy_http_version 1.1;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
proxy_connect_timeout 10s;
|
||||
proxy_send_timeout 120s;
|
||||
proxy_read_timeout 120s;
|
||||
}
|
||||
|
||||
location / {
|
||||
try_files $uri $uri/ /index.html;
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
- [ ] **Step 2: 本地核对关键指令**
|
||||
|
||||
Run:
|
||||
|
||||
```bash
|
||||
grep -E 'listen|proxy_pass|root |minio' 测试环境部署/zkxw-test-10001.conf
|
||||
```
|
||||
|
||||
Expected: `listen 10001`;`root /root/zkxw/web-admin/dist`;`proxy_pass` 均为 `127.0.0.1:10002`;**无** `minio` 行。
|
||||
|
||||
- [ ] **Step 3: Commit(仅当用户要求提交时执行;否则跳过)**
|
||||
|
||||
```bash
|
||||
git add 测试环境部署/zkxw-test-10001.conf
|
||||
git commit -m "$(cat <<'EOF'
|
||||
docs: add nginx site for test env on port 10001
|
||||
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 2: 更新测试部署 README 与前端 env 注释
|
||||
|
||||
**Files:**
|
||||
- Modify: `测试环境部署/README.md`(全文按新拓扑重写核心章节;可保留文末修订记录并追加一行)
|
||||
- Modify: `web-admin/.env.test`(仅注释)
|
||||
|
||||
- [ ] **Step 1: 重写 `测试环境部署/README.md` 关键**
|
||||
|
||||
用下列结构覆盖/重写文档(保留必要历史可放「修订记录」)。**正文不要写入任何数据库密码或机器 root 密码。**
|
||||
|
||||
必须包含:
|
||||
|
||||
1. 拓扑表:
|
||||
|
||||
| 角色 | 地址 |
|
||||
|------|------|
|
||||
| 入口 | `http://101.35.245.122:10001` |
|
||||
| Nginx 静态 | `/root/zkxw/web-admin/dist` |
|
||||
| 后端 | `127.0.0.1:10002`(仅本机) |
|
||||
| 中间件 | 与本机 `backend/.env` 相同(`47.99.164.66`) |
|
||||
| MinIO 浏览器 | `http://47.99.164.66:20004/zkxw`(直连,Nginx 不反代) |
|
||||
|
||||
2. 机装:Python **已有 3.12.3**;**需安装 Nginx**;探测 `apt`/`yum`/`dnf` 后安装示例:
|
||||
|
||||
```bash
|
||||
# Debian/Ubuntu
|
||||
sudo apt-get update && sudo apt-get install -y nginx
|
||||
|
||||
# RHEL/CentOS/Alma(示例)
|
||||
sudo yum install -y nginx # 或 dnf install -y nginx
|
||||
sudo systemctl enable --now nginx
|
||||
```
|
||||
|
||||
3. 目录、`.env.test` 来源(从本机 `backend/.env` 复制为服务器 `.env.test`)、启动:
|
||||
|
||||
```bash
|
||||
cd /root/zkxw/backend
|
||||
python3.12 -m venv .venv
|
||||
./.venv/bin/pip install -U pip
|
||||
./.venv/bin/pip install -r requirements.txt
|
||||
HOST=127.0.0.1 PORT=10002 ./start-test.sh start
|
||||
```
|
||||
|
||||
4. Nginx 启用 `zkxw-test-10001.conf` 的命令。
|
||||
|
||||
5. 日常发版 rsync 命令(与 spec §6.2 一致)。
|
||||
|
||||
6. 验收 curl(与 spec §7 一致)。
|
||||
|
||||
7. 说明:旧 8112 / 双机拓扑已废弃,以本文件为准。
|
||||
|
||||
- [ ] **Step 2: 更新 `web-admin/.env.test` 注释**
|
||||
|
||||
将文件头注释改为类似:
|
||||
|
||||
```env
|
||||
# Web Admin 测试环境(打包:pnpm build:test)
|
||||
# 访问入口:http://101.35.245.122:10001
|
||||
# Nginx 将 /api 反代至本机 127.0.0.1:10002
|
||||
# MinIO:浏览器直连 http://47.99.164.66:20004/zkxw(不经测试机 Nginx)
|
||||
```
|
||||
|
||||
保持现有 `VITE_*` 变量值不变(`VITE_API_URL=/api`、`VITE_MINIO_BASE_URL=http://47.99.164.66:20004/zkxw` 等)。
|
||||
|
||||
- [ ] **Step 3: Commit(仅当用户要求时)**
|
||||
|
||||
```bash
|
||||
git add 测试环境部署/README.md web-admin/.env.test
|
||||
git commit -m "$(cat <<'EOF'
|
||||
docs: document bare-metal test deploy on 10001/10002
|
||||
|
||||
EOF
|
||||
)"
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Task 3: SSH 探测服务器并安装 Nginx
|
||||
|
||||
**Files:** 无仓库文件;操作目标 `101.35.245.122`
|
||||
|
||||
前置:本机可 SSH 登录(密钥或密码)。**不要**把密码写进仓库或命令历史脚本文件。
|
||||
|
||||
- [ ] **Step 1: 探测 OS、Python、端口占用**
|
||||
|
||||
```bash
|
||||
ssh root@101.35.245.122 'set -e
|
||||
uname -a
|
||||
cat /etc/os-release | head -20
|
||||
python3.12 --version || python3 --version
|
||||
which nginx || true
|
||||
ss -lntp | grep -E "10001|10002" || true
|
||||
mkdir -p /root/zkxw/web-admin/dist /root/zkxw/backend /root/zkxw/nginx
|
||||
'
|
||||
```
|
||||
|
||||
Expected: Python 显示 3.12.x;nginx 可能不存在;目录创建成功。
|
||||
|
||||
- [ ] **Step 2: 按发行版安装 Nginx 并开机自启**
|
||||
|
||||
若 `ID` 为 ubuntu/debian:
|
||||
|
||||
```bash
|
||||
ssh root@101.35.245.122 'export DEBIAN_FRONTEND=noninteractive
|
||||
apt-get update
|
||||
apt-get install -y nginx
|
||||
systemctl enable nginx
|
||||
systemctl start nginx
|
||||
nginx -v
|
||||
'
|
||||
```
|
||||
|
||||
若为 rhel/centos/almalinux/rocky:
|
||||
|
||||
```bash
|
||||
ssh root@101.35.245.122 'yum install -y nginx || dnf install -y nginx
|
||||
systemctl enable nginx
|
||||
systemctl start nginx
|
||||
nginx -v
|
||||
'
|
||||
```
|
||||
|
||||
Expected: `nginx version: nginx/...`
|
||||
|
||||
- [ ] **Step 3: 上传并启用 site**
|
||||
|
||||
```bash
|
||||
scp 测试环境部署/zkxw-test-10001.conf root@101.35.245.122:/root/zkxw/nginx/zkxw-test-10001.conf
|
||||
```
|
||||
|
||||
然后在服务器上(按 Step 1 探测结果选一条路径):
|
||||
|
||||
Debian/Ubuntu:
|
||||
|
||||
```bash
|
||||
ssh root@101.35.245.122 '
|
||||
cp /root/zkxw/nginx/zkxw-test-10001.conf /etc/nginx/sites-available/zkxw-test-10001.conf
|
||||
ln -sfn /etc/nginx/sites-available/zkxw-test-10001.conf /etc/nginx/sites-enabled/zkxw-test-10001.conf
|
||||
# 若 default 占口冲突可保留;本 site 仅 10001
|
||||
nginx -t && systemctl reload nginx
|
||||
'
|
||||
```
|
||||
|
||||
RHEL 系:
|
||||
|
||||
```bash
|
||||
ssh root@101.35.245.122 '
|
||||
cp /root/zkxw/nginx/zkxw-test-10001.conf /etc/nginx/conf.d/zkxw-test-10001.conf
|
||||
nginx -t && systemctl reload nginx
|
||||
'
|
||||
```
|
||||
|
||||
Expected: `nginx: configuration file ... test is successful`
|
||||
|
||||
- [ ] **Step 4: 提醒安全组**
|
||||
|
||||
确认云控制台入站已放行 **TCP 10001**(本步无法在代码中完成;执行者勾选确认)。
|
||||
|
||||
---
|
||||
|
||||
### Task 4: 部署 backend 并启动
|
||||
|
||||
**Files:** 服务器 `/root/zkxw/backend`;本机源 `backend/`
|
||||
|
||||
- [ ] **Step 1: rsync 源码**
|
||||
|
||||
在仓库根目录执行:
|
||||
|
||||
```bash
|
||||
rsync -avz \
|
||||
--exclude '.venv' \
|
||||
--exclude 'venv' \
|
||||
--exclude '__pycache__' \
|
||||
--exclude '*.pyc' \
|
||||
--exclude 'logs' \
|
||||
--exclude 'graphify-out' \
|
||||
--exclude '.env' \
|
||||
--exclude '.env.*' \
|
||||
backend/ root@101.35.245.122:/root/zkxw/backend/
|
||||
```
|
||||
|
||||
Expected: `start-test.sh`、`requirements.txt`、`app/` 出现在远端。
|
||||
|
||||
- [ ] **Step 2: 生成并上传 `.env.test`(不进 git)**
|
||||
|
||||
本机:
|
||||
|
||||
```bash
|
||||
cp backend/.env /tmp/zkxw-env.test
|
||||
# 确认中间件段与开发一致;勿把 /tmp/zkxw-env.test 加入 git
|
||||
scp /tmp/zkxw-env.test root@101.35.245.122:/root/zkxw/backend/.env.test
|
||||
rm -f /tmp/zkxw-env.test
|
||||
```
|
||||
|
||||
- [ ] **Step 3: 建 venv 并装依赖**
|
||||
|
||||
```bash
|
||||
ssh root@101.35.245.122 '
|
||||
set -e
|
||||
cd /root/zkxw/backend
|
||||
python3.12 -m venv .venv
|
||||
./.venv/bin/pip install -U pip
|
||||
./.venv/bin/pip install -r requirements.txt
|
||||
./.venv/bin/python -c "import uvicorn; print(uvicorn.__version__)"
|
||||
chmod +x start-test.sh
|
||||
'
|
||||
```
|
||||
|
||||
Expected: 打印 uvicorn 版本;无 pip 失败。
|
||||
|
||||
- [ ] **Step 4: 探测中间件连通性(从测试机)**
|
||||
|
||||
```bash
|
||||
ssh root@101.35.245.122 '
|
||||
set -e
|
||||
timeout 5 bash -c "echo >/dev/tcp/47.99.164.66/3306" && echo mysql_ok
|
||||
timeout 5 bash -c "echo >/dev/tcp/47.99.164.66/16379" && echo redis_ok
|
||||
timeout 5 bash -c "echo >/dev/tcp/47.99.164.66/20004" && echo minio_ok
|
||||
'
|
||||
```
|
||||
|
||||
Expected: 三行 `*_ok`。若失败:先修安全组/防火墙,**不要**继续启动(否则后端会连库失败)。
|
||||
|
||||
- [ ] **Step 5: 启动后端**
|
||||
|
||||
```bash
|
||||
ssh root@101.35.245.122 '
|
||||
cd /root/zkxw/backend
|
||||
HOST=127.0.0.1 PORT=10002 ./start-test.sh start
|
||||
HOST=127.0.0.1 PORT=10002 ./start-test.sh status
|
||||
curl -s http://127.0.0.1:10002/health
|
||||
'
|
||||
```
|
||||
|
||||
Expected: status 为 RUNNING;health 返回 JSON/成功体(非连接拒绝)。
|
||||
|
||||
---
|
||||
|
||||
### Task 5: 本机打包前端并 rsync
|
||||
|
||||
**Files:**
|
||||
- Build: `web-admin/dist/`
|
||||
- Remote: `/root/zkxw/web-admin/dist/`
|
||||
|
||||
- [ ] **Step 1: 打包**
|
||||
|
||||
```bash
|
||||
cd web-admin
|
||||
pnpm install
|
||||
pnpm build:test
|
||||
ls dist/index.html
|
||||
```
|
||||
|
||||
Expected: `dist/index.html` 存在。
|
||||
|
||||
- [ ] **Step 2: 上传**
|
||||
|
||||
```bash
|
||||
rsync -avz --delete web-admin/dist/ root@101.35.245.122:/root/zkxw/web-admin/dist/
|
||||
```
|
||||
|
||||
(在仓库根执行时路径如上;若已在 `web-admin` 目录则用 `dist/`。)
|
||||
|
||||
Expected: rsync 完成无 error。
|
||||
|
||||
---
|
||||
|
||||
### Task 6: 端到端验收
|
||||
|
||||
- [ ] **Step 1: 本机/外网验收命令**
|
||||
|
||||
```bash
|
||||
curl -s -o /dev/null -w '%{http_code}\n' http://101.35.245.122:10001/
|
||||
curl -s http://101.35.245.122:10001/health
|
||||
curl -s -o /dev/null -w '%{http_code}\n' --connect-timeout 5 http://101.35.245.122:10002/health || echo '10002_closed_ok'
|
||||
```
|
||||
|
||||
Expected:
|
||||
|
||||
- 第一行:`200`
|
||||
- 第二行:健康检查成功响应
|
||||
- 第三行:失败或超时,并打印 `10002_closed_ok`(证明未对公网开放)
|
||||
|
||||
- [ ] **Step 2: API 冒烟**
|
||||
|
||||
```bash
|
||||
curl -s -o /dev/null -w '%{http_code}\n' \
|
||||
http://101.35.245.122:10001/api/web/auth/login-rsa-public-key
|
||||
```
|
||||
|
||||
Expected: `200`(或业务约定的成功码;非 502/504)。
|
||||
|
||||
- [ ] **Step 3: 浏览器手工**
|
||||
|
||||
打开 `http://101.35.245.122:10001/`,确认页面加载;用测试账号登录(默认文档账号以环境实际为准,常见 `admin`)。附件若打不开,检查浏览器到 `47.99.164.66:20004` 是否可达。
|
||||
|
||||
- [ ] **Step 4: 更新设计/README 修订记录(可选)**
|
||||
|
||||
在 `测试环境部署/README.md` 修订记录追加:`2026-08-06 | 裸机部署 10001/10002 于 101.35.245.122`。
|
||||
|
||||
- [ ] **Step 5: Commit 仓库文档变更(仅当用户要求)**
|
||||
|
||||
将 Task 1–2 产生的仓库文件与本计划、spec 一并提交(**排除** `测试环境机器的账号密码`、任何 `.env.test`)。
|
||||
|
||||
---
|
||||
|
||||
## Spec coverage (self-review)
|
||||
|
||||
| Spec 要求 | Task |
|
||||
|-----------|------|
|
||||
| 无 Docker 应用部署 | Task 3–5(裸机) |
|
||||
| Nginx 10001 + 静态 + /api + /health | Task 1, 3 |
|
||||
| 后端 127.0.0.1:10002 | Task 4 |
|
||||
| 中间件照搬本机 .env | Task 4 Step 2 |
|
||||
| MinIO 直连不反代 | Task 1(配置无 minio)、验收说明 |
|
||||
| 安装 Nginx;Python 用 3.12.3 | Task 3, 4 |
|
||||
| 本机 build:test + rsync | Task 5 |
|
||||
| 验收清单 | Task 6 |
|
||||
| 更新 README / env 注释 / nginx 片段 | Task 1–2 |
|
||||
| 不提交密钥 | 全文约束 |
|
||||
|
||||
Placeholder scan: 无 TBD;发行版分支在 Task 3 用探测后二选一,非占位。
|
||||
|
||||
---
|
||||
|
||||
## Execution notes for agents
|
||||
|
||||
- SSH 失败时先修网络/密钥,勿把 root 密码写入 git。
|
||||
- `start-test.sh` 每次启停都带上 `HOST=127.0.0.1 PORT=10002`,避免回到默认 `0.0.0.0:8112`。
|
||||
- 依赖安装若因缺少 `python3.12-venv` 失败:Debian 上 `apt-get install -y python3.12-venv` 后再建 venv。
|
||||
@@ -0,0 +1,29 @@
|
||||
# 角色列表:有效用户与关联职位
|
||||
|
||||
**日期:** 2026-08-05
|
||||
**状态:** 已确认
|
||||
|
||||
## 目标
|
||||
|
||||
角色管理列表增强可读性:角色名称可点开查看;展示有效拥有该角色的用户,以及关联该角色的职位。
|
||||
|
||||
## 列表展示
|
||||
|
||||
| 列 | 行为 |
|
||||
|----|------|
|
||||
| 角色名称 | 主色 link,点击打开现有查看弹窗 |
|
||||
| 拥有用户 | 有效拥有(直接绑定 ∪ 职位继承),`、` 分隔,多则换行;空为 `—` |
|
||||
| 关联职位 | `sys_post_role` 关联且启用未删的职位名,同上 |
|
||||
|
||||
## API enrichment
|
||||
|
||||
`GET /web/admin/role-management` 每条角色附加:
|
||||
|
||||
- `boundUserNames: string[]` — 有效用户显示名(`nick_name` 优先,否则 `user_no`),去重保序
|
||||
- `boundPostNames: string[]` — 关联启用职位名,去重保序
|
||||
|
||||
有效用户语义与 `get_effective_role_ids` 一致:角色启用;直接 `sys_user_role`;或经启用职位 `sys_post_role` + `sys_user_post`。用户 `del_flag=0`。租户隔离与列表一致。批量查询,禁止 N+1。
|
||||
|
||||
## 非目标
|
||||
|
||||
不改查看弹窗结构、角色增删改、菜单/数据权限配置 UI。
|
||||
@@ -0,0 +1,41 @@
|
||||
# 用户角色双轨读模型(方案 B)
|
||||
|
||||
**日期:** 2026-08-05
|
||||
**状态:** 已确认,按此实现
|
||||
**前置:** [2026-08-02-post-role-permission-design.md](./2026-08-02-post-role-permission-design.md)
|
||||
|
||||
## 决策
|
||||
|
||||
| 项 | 结论 |
|
||||
|----|------|
|
||||
| 权限模型 | 长期双轨:直接绑定 ∪ 职位继承(运行时并集,已落地) |
|
||||
| 用户管理写入 UI | **不提供**直接绑角色;日常仅配职位 |
|
||||
| 直接绑定运维 | API / 脚本 / 库表,或专用授权模块(如质检金额查看) |
|
||||
| 用户详情读模型 | 区分直接 / 职位继承 / 有效三层,便于审计 |
|
||||
|
||||
## 字段约定(用户详情)
|
||||
|
||||
| 字段 | 含义 |
|
||||
|------|------|
|
||||
| `roleIds` | 仅 `sys_user_role` 直接绑定(写路径 / 运维) |
|
||||
| `postInheritedRoleIds` | 经启用职位继承的启用角色 ID |
|
||||
| `effectiveRoleIds` | 有效角色 ID = 启用直接 ∪ 职位继承(与 `get_effective_role_ids` 一致) |
|
||||
| `effectiveRoleNames` | 有效角色名称(去重保序) |
|
||||
| `postIds` | 用户职位(不变) |
|
||||
|
||||
## 写入规则
|
||||
|
||||
- 用户新增/编辑 UI **不提交** `roleIds`。
|
||||
- `update_user` 关联替换:**仅当请求体显式带 `roleIds` / `postIds` 时替换对应一侧**;只改职位不得清空直接角色。
|
||||
- 菜单权限、数据权限、登录门禁继续走有效角色并集;本变更不改运行时语义。
|
||||
|
||||
## 前端
|
||||
|
||||
- 查看弹窗:展示有效角色,并只读附「直接绑定」「职位继承」。
|
||||
- 新增/编辑:仅职位多选,无角色写入控件。
|
||||
|
||||
## 非目标
|
||||
|
||||
- 恢复用户页直接绑角色 UI
|
||||
- 角色页反向关联职位
|
||||
- 专用授权模块(如 `qc_material_amount_auth`)改为职位继承
|
||||
@@ -0,0 +1,123 @@
|
||||
# OA 发起审批草稿箱 Design
|
||||
|
||||
| 项 | 内容 |
|
||||
|----|------|
|
||||
| 日期 | 2026-08-06 |
|
||||
| 状态 | 已定稿(UI 以 `docs/demos/oa-approval-draft-box-demo.html` 为准) |
|
||||
| 范围 | 发起审批「暂存草稿」+ 侧栏「草稿箱」列表(再编辑 / 保存 / 提交 / 删除) |
|
||||
|
||||
## 背景
|
||||
|
||||
现状「发起审批」弹窗仅有「取消」「提交」,填到一半关闭即丢失。客户要求可暂存草稿,并在「发起审批」下方增加「草稿箱」菜单集中管理。
|
||||
|
||||
现有 `oa_app_version.status=draft` 仅为**模板设计草稿**,与本需求的**发起人填写草稿**无关,不得混用。
|
||||
|
||||
## 目标与非目标
|
||||
|
||||
**目标**
|
||||
|
||||
- 发起弹窗可「暂存草稿」,不进入审批流、不产生待办。
|
||||
- 侧栏「草稿箱」列出当前用户草稿;支持编辑、再次保存、提交审批、删除与批量删除。
|
||||
- 草稿仅本人可见(租户内 + 发起人 = 当前用户)。
|
||||
|
||||
**非目标**
|
||||
|
||||
- 不与「我发起的」实例混排;草稿不是 `oa_instance`。
|
||||
- 不做跨用户共享草稿、不做审批人代填。
|
||||
- 不做自动定时暂存(仅显式点击「暂存草稿 / 保存草稿」)。
|
||||
- 不改造小程序端(本期仅 web-admin)。
|
||||
|
||||
## 方案对比与结论
|
||||
|
||||
| 方案 | 做法 | 优点 | 缺点 |
|
||||
|------|------|------|------|
|
||||
| A(推荐) | 独立表 `oa_instance_draft` | 与引擎解耦;「我发起的」无需过滤 draft;语义清晰 | 多一张表与一套 CRUD |
|
||||
| B | `oa_instance.status=draft` | 少表 | 引擎/列表/关联审批处处要排除;误发起风险高 |
|
||||
| C | 仅浏览器 localStorage | 无后端 | 换设备丢失;无法做菜单级权限与审计 |
|
||||
|
||||
**选定 A。** 提交时调用现有 `start_instance`,成功后软删对应草稿。
|
||||
|
||||
## 数据模型
|
||||
|
||||
表名:`oa_instance_draft`
|
||||
|
||||
| 字段 | 说明 |
|
||||
|------|------|
|
||||
| `id` | VARCHAR(64) PK,UUID |
|
||||
| `app_id` | 审批应用 ID |
|
||||
| `app_version_id` | 暂存时锁定的已发布版本(提交时优先用最新已发布版,见下) |
|
||||
| `title` | 可选标题(可由应用名或表单字段推导,可空) |
|
||||
| `form_data_json` | 表单数据 JSON |
|
||||
| `initiator_select_json` | 发起人自选 `{nodeId:[userId,...]}` |
|
||||
| `initiator_dept_id` | 发起部门(与发起接口一致) |
|
||||
| `owner_user_id` | 草稿所属人(= 创建人) |
|
||||
| 公共字段 | `tenant_no` … `del_flag`(遵循 database-conventions) |
|
||||
|
||||
约束与行为:
|
||||
|
||||
- 同一用户对同一 `app_id` **允许多条**草稿(与 Demo 列表一致)。
|
||||
- 列表默认 `create_time DESC` 不适用时,用 **`update_time DESC`**(最近保存优先)。
|
||||
- 删除:软删 `del_flag=1`。
|
||||
- **暂存不做完整必填校验**;**提交**走与正式发起相同的校验。
|
||||
|
||||
### 版本策略
|
||||
|
||||
- 暂存:写入当时「最新已发布」`app_version_id`。
|
||||
- 编辑打开:用该草稿的 `app_id` 取**当前最新已发布**模板渲染;`form_data` / `initiator_select` 按 field 名回填(字段已删则忽略多余键)。
|
||||
- 若应用已无已发布版本:编辑/提交时提示「该审批单已下架或未发布」,禁止提交,允许删除草稿。
|
||||
|
||||
## API(`/api/admin/oa-approval`)
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/drafts` | 当前用户草稿分页;query:`keyword`(流程名)、`groupId`、`updateTimeFrom`/`updateTimeTo`、`page`/`pageSize` |
|
||||
| GET | `/drafts/{id}` | 草稿详情(含 formData、initiatorSelect、app 基础信息) |
|
||||
| POST | `/drafts` | 新建草稿(`appId` + formData + initiatorSelect + initiatorDeptId + title?) |
|
||||
| PUT | `/drafts/{id}` | 更新草稿(仅 owner) |
|
||||
| DELETE | `/drafts/{id}` | 软删单条 |
|
||||
| POST | `/drafts/batch-delete` | body: `{ ids: string[] }` 批量软删 |
|
||||
| POST | `/drafts/{id}/submit` | 校验 + `start_instance`;成功后软删草稿;返回实例信息 |
|
||||
|
||||
权限:均需登录管理端用户;读写仅限 `owner_user_id == 当前用户` 且同 `tenant_no`。菜单码:`oa:drafts`(列表/读写统一挂此码,与 `oa:start` 同级授权习惯)。
|
||||
|
||||
## 前端
|
||||
|
||||
### 菜单与路由
|
||||
|
||||
- 侧栏顺序:… → 发起审批 → **草稿箱** → 待办中心 → …
|
||||
- 路由:`/#/system-manage/oa-approval/drafts`,组件 `web-admin/src/views/oa-approval/drafts/index.vue`
|
||||
- 前端路由模块 `sqxp.ts` 与库表 `sys_menu`(SQL 脚本)同步增加菜单项。
|
||||
|
||||
### 发起页 `start/index.vue`
|
||||
|
||||
- 弹窗底栏:**取消** | **暂存草稿** | **提交**(主色仅「提交」)。
|
||||
- 「暂存草稿」:调用 POST/PUT drafts;成功提示「已存入草稿箱」并关弹窗(或保持打开——**关弹窗**,与 Demo 心智一致)。
|
||||
- 若路由带 `draftId`(从草稿箱「编辑」跳入):打开对应模板并回填,暂存走 PUT。
|
||||
|
||||
### 草稿箱页(对齐「我发起的」列表模式)
|
||||
|
||||
列:序号、流程名称、模板版本、最近保存、状态(Tag「草稿」`warning`)、操作(编辑 / 提交审批 / 删除)。
|
||||
|
||||
- **编辑**:`router.push` 到发起页并带 `draftId`(或本页弹窗复用发起表单——**推荐跳转发页 + query**,少复制逻辑;若发起页已是弹窗模式,则在草稿箱页复用同一套 dialog 逻辑亦可。实现择一:**草稿箱页内嵌与 start 相同的发起弹窗**,避免整页跳转丢上下文)。
|
||||
- **提交审批**:调用 `POST /drafts/{id}/submit`;若校验失败,打开编辑弹窗并展示错误。
|
||||
- **删除 / 批量删除**:二次确认后调用删除接口。
|
||||
|
||||
筛选:流程名称、保存时间范围、模板分组(与 Demo 一致)。
|
||||
|
||||
## 错误处理
|
||||
|
||||
- 非 owner / 已删:404 或 403,文案「草稿不存在或无权访问」。
|
||||
- 提交时应用不可用:400 + 明确文案。
|
||||
- 批量删除:跳过无权 id,返回成功数(或全部失败则报错)——采用 **全部校验通过再删**,任一无权则整批失败。
|
||||
|
||||
## 测试要点
|
||||
|
||||
- 暂存后草稿箱可见;他人不可见。
|
||||
- 更新草稿只改本人记录。
|
||||
- 提交成功产生 `oa_instance` 且草稿软删;「我发起的」出现新实例。
|
||||
- 暂存不产生 `oa_task`。
|
||||
- 无发布版本时禁止提交。
|
||||
|
||||
## UI 权威
|
||||
|
||||
`docs/demos/oa-approval-draft-box-demo.html`;视觉遵循 Fresh Mint / `docs/web-admin-ui-spec-fresh-mint.md`。
|
||||
@@ -0,0 +1,38 @@
|
||||
# OA「草稿箱 / 待办中心」菜单角标 Design
|
||||
|
||||
| 项 | 内容 |
|
||||
|----|------|
|
||||
| 日期 | 2026-08-06 |
|
||||
| 状态 | 已定稿(用户确认:对齐抄送角标,0 隐藏) |
|
||||
| 范围 | 侧栏「草稿箱」「待办中心」数量角标 |
|
||||
|
||||
## 背景
|
||||
|
||||
「抄送我的」已落地未读角标。产品要求「草稿箱」「待办中心」同样展示数量统计。
|
||||
|
||||
## 目标
|
||||
|
||||
- 侧栏 `oa:drafts`:当前用户未删除草稿总数;0 隐藏。
|
||||
- 侧栏 `oa:pending`:当前用户待审批任务数(`task_type=approval` + `status=pending`);0 隐藏。
|
||||
- 样式与刷新机制复用现有 `oa-menu-badge`(与抄送一致:`99+`、路由守卫刷新、业务操作后 `refreshOaMenuBadges()`)。
|
||||
|
||||
## 非目标
|
||||
|
||||
- 不改列表页筛选语义;角标为无筛选全量计数。
|
||||
- 不改造小程序。
|
||||
|
||||
## API
|
||||
|
||||
| 方法 | 路径 | 说明 |
|
||||
|------|------|------|
|
||||
| GET | `/drafts/count` | `{ count }`;须注册在 `/drafts/{draft_id}` 之前 |
|
||||
| GET | `/tasks/pending/count` | `{ count }` |
|
||||
|
||||
约束:租户隔离 + 归属当前用户;`del_flag=0`。
|
||||
|
||||
## 前端
|
||||
|
||||
- 扩展 `OA_MENU_CODE_DRAFTS` / `OA_MENU_CODE_PENDING`;`resolveOaMenuBadgeCode` 识别 drafts/pending。
|
||||
- `refreshOaMenuBadges` 按可见菜单并行拉取(含既有 cc)。
|
||||
- 草稿箱增删/提交、发起页存草稿/提交、待办相关审批动作、`onActivated` 刷新角标。
|
||||
- 退出登录时 `clearBadges`(补齐既有遗漏)。
|
||||
@@ -0,0 +1,35 @@
|
||||
# OA 表单设计器画布描边优化(方案 E)
|
||||
|
||||
**日期:** 2026-08-06
|
||||
**状态:** 已确认
|
||||
**范围:** `web-admin` OA 审批设计器「表单设计」Tab(`oa-fc-host` iframe)
|
||||
|
||||
## 背景
|
||||
|
||||
`@form-create/designer` 为每个画布组件包一层 `_fd-drag-tool`,默认常驻蓝色虚线 `outline`。嵌套布局时多层虚线叠加,影响操作与阅读。对比 Demo(`docs/demos/oa-form-designer-outline-styles.html`)后选定 **方案 E**。
|
||||
|
||||
## 目标行为
|
||||
|
||||
| 对象 | 识别 | 默认 | 悬停 | 选中 |
|
||||
|------|------|------|------|------|
|
||||
| 叶子字段 | `._fd-drag-tool` 且内部无子 `._fd-drag-tool` | 无描边 | 浅绿实线 | Mint 实线 `#10b981` |
|
||||
| 布局容器 | `._fd-drag-tool:has(._fd-drag-tool)` | 极淡虚线 | 略加深 | Mint 实线 `#10b981` |
|
||||
|
||||
## 方案
|
||||
|
||||
- **仅 CSS 覆盖**,落在 `web-admin/src/oa-fc-host/App.vue` 的 `<style>`。
|
||||
- 容器识别用 `:has()`;空布局暂按叶子处理,拖入子项后自动变为淡虚线容器。
|
||||
- 将库内残留的选中框 / 拖拽按钮默认蓝 `#2E73FF` 统一为 Mint。
|
||||
- **不做:** 预览态、左侧组件列表、运行时开关、改 node_modules。
|
||||
|
||||
## 验收
|
||||
|
||||
1. 打开审批设计器 →「表单设计」。
|
||||
2. 拖入普通输入:默认无虚线;悬停有浅框;点击选中为实线。
|
||||
3. 拖入栅格/布局并放入字段:外层常驻极淡虚线,内层字段默认无框。
|
||||
4. 操作按钮背景为主色绿,无默认蓝。
|
||||
|
||||
## 参考
|
||||
|
||||
- Demo:`docs/demos/oa-form-designer-outline-styles.html`(方案 E)
|
||||
- 库样式:`@form-create/designer` → `DragTool.vue`(`outline: 1px dashed var(--fc-tool-border-color)`)
|
||||
@@ -0,0 +1,180 @@
|
||||
# 测试环境裸机部署设计(101.35.245.122)
|
||||
|
||||
> 日期:2026-08-06
|
||||
> 状态:已确认设计,待写实现计划
|
||||
> 范围:在测试机部署 web-admin + backend;**不使用 Docker**;中间件复用开发环境已有实例
|
||||
|
||||
---
|
||||
|
||||
## 1. 背景与目标
|
||||
|
||||
在测试机 `101.35.245.122` 的 `/root/zkxw` 部署一套可外网访问的测试环境:
|
||||
|
||||
- 前端:本机 `pnpm build:test` 后 rsync 静态产物;Nginx 对外 **10001**
|
||||
- 后端:源码 rsync 到机器,用 `start-test.sh` 监听 **127.0.0.1:10002**
|
||||
- 中间件:与本机开发一致,连接 `47.99.164.66` 上的 MySQL / Redis / MinIO(含库名等)
|
||||
- **不**在测试机用 Docker 跑应用或中间件
|
||||
|
||||
成功标准:
|
||||
|
||||
- 浏览器打开 `http://101.35.245.122:10001` 可使用管理端
|
||||
- `/api` 经 Nginx 反代到本机后端,健康检查与登录可用
|
||||
- 外网无法直连 `10002`;附件走 MinIO 直连地址
|
||||
|
||||
---
|
||||
|
||||
## 2. 架构与流量
|
||||
|
||||
```text
|
||||
浏览器
|
||||
└─ http://101.35.245.122:10001
|
||||
└─ Nginx(测试机,需新装)
|
||||
├─ / → /root/zkxw/web-admin/dist
|
||||
├─ /api/* → http://127.0.0.1:10002
|
||||
└─ (不反代 MinIO)
|
||||
|
||||
后端(start-test.sh)
|
||||
HOST=127.0.0.1 PORT=10002
|
||||
.env.test 中间件 ≈ 本机 backend/.env
|
||||
→ MySQL 47.99.164.66:3306 / zkxw-sc
|
||||
→ Redis 47.99.164.66:16379 DB=8
|
||||
→ MinIO 47.99.164.66:20004 bucket=zkxw
|
||||
|
||||
浏览器附件
|
||||
└─ 直连 http://47.99.164.66:20004/zkxw/...
|
||||
```
|
||||
|
||||
约束:
|
||||
|
||||
- 云安全组 / 防火墙仅放行 **TCP 10001**
|
||||
- 后端绑定 `127.0.0.1`,不对公网暴露 10002
|
||||
- 前端 `VITE_API_URL=/api`;`VITE_MINIO_BASE_URL=http://47.99.164.66:20004/zkxw`
|
||||
|
||||
---
|
||||
|
||||
## 3. 服务器目录
|
||||
|
||||
```text
|
||||
/root/zkxw/
|
||||
├── web-admin/
|
||||
│ └── dist/ # 本机 build:test 产物
|
||||
├── backend/
|
||||
│ ├── app/
|
||||
│ ├── requirements.txt
|
||||
│ ├── start-test.sh
|
||||
│ ├── .env.test # 敏感,勿提交 git
|
||||
│ ├── .venv/ # 服务器用 Python 3.12.3 创建
|
||||
│ ├── backend-test.pid
|
||||
│ └── logs/
|
||||
└── nginx/
|
||||
└── zkxw-test-10001.conf # 仓库维护的 site 片段,部署到系统 nginx
|
||||
```
|
||||
|
||||
rsync 排除:`venv/`、`.venv/`、`__pycache__/`、`*.pyc`、`logs/`、`graphify-out/`;`.env*` 默认不覆盖,首次单独 scp。
|
||||
|
||||
---
|
||||
|
||||
## 4. 机装依赖(实测前提)
|
||||
|
||||
| 组件 | 状态 | 动作 |
|
||||
|------|------|------|
|
||||
| Python | 已装 **3.12.3** | 用 `python3.12 -m venv .venv`,无需再装 Python |
|
||||
| Nginx | **未安装** | 按 OS 安装、开机自启、加载 10001 site |
|
||||
| Docker | 已装但本方案不用 | 不启动 zkxw compose 应用栈 |
|
||||
|
||||
实现阶段须探测发行版(apt / yum / dnf)后写入准确安装命令。
|
||||
|
||||
---
|
||||
|
||||
## 5. 配置
|
||||
|
||||
### 5.1 backend `.env.test`
|
||||
|
||||
- 中间件字段与本机 `backend/.env` 对齐(同一 MySQL 库名、Redis DB、MinIO endpoint/bucket/密钥)
|
||||
- `API_ENCRYPT_*` 与 `web-admin/.env.test` 一致
|
||||
- 启动覆盖:`HOST=127.0.0.1 PORT=10002`(脚本默认曾为 `0.0.0.0:8112`)
|
||||
|
||||
### 5.2 web-admin `.env.test`
|
||||
|
||||
- 保持 `VITE_API_URL=/api`、`VITE_MINIO_BASE_URL=http://47.99.164.66:20004/zkxw`
|
||||
- 文档注释中的访问入口改为 `http://101.35.245.122:10001`
|
||||
|
||||
### 5.3 Nginx
|
||||
|
||||
- `listen 10001`
|
||||
- `root /root/zkxw/web-admin/dist`;SPA `try_files`
|
||||
- `location ^~ /api/` → `http://127.0.0.1:10002`(保留 URI)
|
||||
- `location = /health` → `http://127.0.0.1:10002/health`(验收固定入口)
|
||||
- **不**配置 MinIO 反代
|
||||
|
||||
---
|
||||
|
||||
## 6. 发版流程(方案:本机打包 + rsync)
|
||||
|
||||
### 6.1 首次
|
||||
|
||||
1. SSH 安装 Nginx,创建目录,放置 site,`nginx -t && reload`
|
||||
2. rsync backend 源码;`python3.12 -m venv .venv`;`pip install -r requirements.txt`
|
||||
3. scp `.env.test`;`HOST=127.0.0.1 PORT=10002 ./start-test.sh start`
|
||||
4. 本机 `pnpm build:test`;rsync `dist/` 到服务器
|
||||
5. 安全组放行 10001;按 §7 验收
|
||||
|
||||
### 6.2 日常
|
||||
|
||||
```bash
|
||||
# 前端
|
||||
cd web-admin && pnpm build:test
|
||||
rsync -avz --delete dist/ root@101.35.245.122:/root/zkxw/web-admin/dist/
|
||||
|
||||
# 后端
|
||||
rsync -avz --exclude .venv --exclude venv --exclude '__pycache__' --exclude logs \
|
||||
backend/ root@101.35.245.122:/root/zkxw/backend/
|
||||
|
||||
ssh root@101.35.245.122 \
|
||||
'cd /root/zkxw/backend && HOST=127.0.0.1 PORT=10002 ./start-test.sh restart'
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 7. 验收
|
||||
|
||||
| 检查 | 期望 |
|
||||
|------|------|
|
||||
| `curl -s -o /dev/null -w '%{http_code}' http://101.35.245.122:10001/` | 200 |
|
||||
| `curl -s http://101.35.245.122:10001/health` | 后端健康检查成功 |
|
||||
| SSH 上 `curl -s http://127.0.0.1:10002/health` | 成功 |
|
||||
| 外网直连 `http://101.35.245.122:10002/health` | 失败(超时/拒绝) |
|
||||
| 登录与附件预览 | 可用(MinIO 公网可达) |
|
||||
|
||||
---
|
||||
|
||||
## 8. 风险与回滚
|
||||
|
||||
| 风险 | 缓解 |
|
||||
|------|------|
|
||||
| 与开发共用库 `zkxw-sc`,测试写库影响开发数据 | 已知接受(选型 A);后续若需隔离再开独立库 |
|
||||
| 测试机访问不到中间件端口 | 部署前从测试机 `curl`/连通性探测 3306、16379、20004 |
|
||||
| 浏览器访问不到 MinIO | 确认 `47.99.164.66:20004` 对使用方网络开放 |
|
||||
| 误提交密钥 / 机器密码 | `.env.test` 与账号文件不进 git |
|
||||
|
||||
回滚:前端保留上一版 `dist` 备份再覆盖;后端停服务或回退代码后 `restart`。
|
||||
|
||||
---
|
||||
|
||||
## 9. 仓库交付物(实现阶段)
|
||||
|
||||
- 本设计文档(本文件)
|
||||
- Nginx site 示例:建议 `测试环境部署/zkxw-test-10001.conf`(或更新现有 nginx 说明)
|
||||
- 更新 `测试环境部署/README.md`:新 IP、端口 10001/10002、无 Docker、Python 3.12、安装 Nginx 步骤
|
||||
- 视需要微调 `web-admin/.env.test` 注释中的入口地址
|
||||
- **不**把 `测试环境机器的账号密码`、真实 `.env.test` 提交入库
|
||||
|
||||
---
|
||||
|
||||
## 10. 明确不在范围
|
||||
|
||||
- Docker Compose / 应用镜像部署
|
||||
- 在测试机新建 MySQL / Redis / MinIO
|
||||
- 服务器上安装 Node 并执行 `pnpm build`
|
||||
- 将后端 10002 对公网开放
|
||||
- Nginx 反代 MinIO
|
||||
Reference in new issue
Block a user