wangsli/hyb-oa
1
0
派生 0
代码 工单 合并请求 工作流 3 软件包 项目 发布 百科 活动

fix(ui): [UI7-2] 统一全局 Design Tokens，移除冗余字体，修复异常色值引用

浏览代码
这个提交包含在：
wangsli
2026-03-06 09:48:37 +08:00
父节点 62fd2a5398
当前提交 73b51ac068
共修改 39 个文件，包含 253 行新增和 250 行删除
下载 Patch 文件 下载 Diff 文件 展开所有文件 折叠所有文件
client/src/pages/ApprovalRulesPage.tsx
+15 -15
查看文件
@@ -157,7 +157,7 @@ export function ApprovalRulesPage() {
) : null}
<Card className="space-y-4 p-6">
<h3 className="text-base font-semibold text-slate-900">新建审批规则</h3>
<h3 className="text-base font-semibold text-zinc-900">新建审批规则</h3>
<div className="grid gap-3 md:grid-cols-2 lg:grid-cols-3">
<div className="space-y-1">
@@ -209,7 +209,7 @@ export function ApprovalRulesPage() {
<select
id="level1Role"
data-testid="approval-rules-create-level1"
className="h-11 w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm"
className="h-11 w-full rounded-lg border border-zinc-300 bg-white px-3 py-2 text-sm"
value={level1Role}
onChange={(event) => setLevel1Role(event.target.value as ApprovalRoleCode)}
>
@@ -226,7 +226,7 @@ export function ApprovalRulesPage() {
<select
id="level2Role"
data-testid="approval-rules-create-level2"
className="h-11 w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm"
className="h-11 w-full rounded-lg border border-zinc-300 bg-white px-3 py-2 text-sm"
value={level2Role}
onChange={(event) => setLevel2Role(event.target.value as ApprovalRoleCode)}
>
@@ -244,7 +244,7 @@ export function ApprovalRulesPage() {
<select
id="level3Role"
data-testid="approval-rules-create-level3"
className="h-11 w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm"
className="h-11 w-full rounded-lg border border-zinc-300 bg-white px-3 py-2 text-sm"
value={level3Role}
onChange={(event) => setLevel3Role(event.target.value as ApprovalRoleCode)}
>
@@ -282,7 +282,7 @@ export function ApprovalRulesPage() {
</Card>
<Card className="space-y-4 p-6">
<h3 className="text-base font-semibold text-slate-900">规则列表</h3>
<h3 className="text-base font-semibold text-zinc-900">规则列表</h3>
{listQuery.isLoading ? <TableSkeleton columns={6} rows={5} /> : null}
@@ -299,7 +299,7 @@ export function ApprovalRulesPage() {
) : null}
{!listQuery.isLoading && !listQuery.isError ? (
<div className="rounded-lg border border-slate-200">
<div className="rounded-lg border border-zinc-200">
<Table data-testid="approval-rules-table">
<TableHeader>
<tr>
@@ -316,18 +316,18 @@ export function ApprovalRulesPage() {
rules.map((rule) => (
<TableRow key={rule.id} data-testid="approval-rule-row">
<TableCell>
<div className="font-medium text-slate-900">{rule.name}</div>
<div className="font-mono text-xs text-slate-500">{rule.id}</div>
<div className="font-medium text-zinc-900">{rule.name}</div>
<div className="font-mono text-xs text-zinc-500">{rule.id}</div>
</TableCell>
<TableCell className="text-sm text-slate-700">
<TableCell className="text-sm text-zinc-700">
{formatAmount(rule.minAmount)} ~ {rule.maxAmount ? formatAmount(rule.maxAmount) : "∞"}
</TableCell>
<TableCell className="text-sm text-slate-700">
<TableCell className="text-sm text-zinc-700">
{[rule.level1Role, rule.level2Role, rule.level3Role].filter(Boolean).join(" -> ") || "-"}
</TableCell>
<TableCell>{rule.priority}</TableCell>
<TableCell className="text-sm">
{rule.enabled ? <span className="text-emerald-600">启用</span> : <span className="text-slate-500">停用</span>}
{rule.enabled ? <span className="text-emerald-600">启用</span> : <span className="text-zinc-500">停用</span>}
</TableCell>
<TableCell>
<div className="flex flex-wrap gap-2">
@@ -359,7 +359,7 @@ export function ApprovalRulesPage() {
))
) : (
<TableRow>
<TableCell className="py-3 text-slate-500" colSpan={6}>
<TableCell className="py-3 text-zinc-500" colSpan={6}>
暂无审批规则
</TableCell>
</TableRow>
@@ -430,7 +430,7 @@ export function ApprovalRulesPage() {
<select
id="editRuleLevel1"
data-testid="approval-rule-edit-level1"
className="h-11 w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm"
className="h-11 w-full rounded-lg border border-zinc-300 bg-white px-3 py-2 text-sm"
value={level1Role}
onChange={(event) => setLevel1Role(event.target.value as ApprovalRoleCode)}
>
@@ -447,7 +447,7 @@ export function ApprovalRulesPage() {
<select
id="editRuleLevel2"
data-testid="approval-rule-edit-level2"
className="h-11 w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm"
className="h-11 w-full rounded-lg border border-zinc-300 bg-white px-3 py-2 text-sm"
value={level2Role}
onChange={(event) => setLevel2Role(event.target.value as ApprovalRoleCode)}
>
@@ -465,7 +465,7 @@ export function ApprovalRulesPage() {
<select
id="editRuleLevel3"
data-testid="approval-rule-edit-level3"
className="h-11 w-full rounded-lg border border-slate-300 bg-white px-3 py-2 text-sm"
className="h-11 w-full rounded-lg border border-zinc-300 bg-white px-3 py-2 text-sm"
value={level3Role}
onChange={(event) => setLevel3Role(event.target.value as ApprovalRoleCode)}
>