diff --git a/DESIGN.md b/DESIGN.md index 69e6252..82b8ef9 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -86,3 +86,14 @@ - 图表移除反向缩放与字体补偿,趋势图和柏拉图使用正常坐标尺寸;页面高度直接对应浏览器视口。 - 顶部栏、筛选栏及管理页签共享冻结起点,桌面 53px、手机 40px;管理页签每级追加 47px,保留表格左右冻结列。 - 本地已检查 1920×1080、1536×864、1366×768、390×844 视口、六个查询页、六主题、图表点击和完整字段的冻结列。实际 Windows 硬件尚未验收,使用隔离演示数据预览,未发布。 + +## 2026-11-01:黑片与亮片更多筛选(本地) + +- 黑片与亮片查询页将项目组、添加来源筛选字段及其条件行统一收入“更多筛选”,默认收起,主行保留期间、产业部、业务分组和产品。 +- 复用其他查询页的展开/收起样式、已选条件数量及清除入口;收起保留筛选,仍按原方式点击查询生效。 +- 本地实测两页展开收起、条件保留及实际查询参数、清除后查询;类型检查与阶段查询回归通过,未发布。 + +## 2026-11-01:侧栏内容字号(本地) + +- 侧栏菜单从 13px 调到 14px,分组标题与账户主文字从 12px 调到 13px,菜单图标从 16px 调到 18px;侧栏宽度和主内容字号不变。 +- 已检查六种主题、长菜单名称和折叠状态,无文字换行或图标裁切,未发布。 diff --git a/web/src/StageProductPage.tsx b/web/src/StageProductPage.tsx index c8dbd93..20a5acd 100644 --- a/web/src/StageProductPage.tsx +++ b/web/src/StageProductPage.tsx @@ -2,7 +2,7 @@ import { SmoothTableFrame, useRetainedResult } from './QueryResultMotion'; import { queryScrapWeight } from './queryMetricValues'; import { useCallback, useEffect, useMemo, useRef, useState } from 'react'; import { Alert, App, Button, Empty, Input, Modal, Segmented, Select, Spin } from 'antd'; -import { DownloadOutlined, ReloadOutlined, SearchOutlined } from '@ant-design/icons'; +import { DownOutlined, DownloadOutlined, ReloadOutlined, SearchOutlined, UpOutlined } from '@ant-design/icons'; import { api, decodeQueryValueList, encodeQueryValueList } from './api'; import { MetricTable, MetricCard, DefectBreakdown, DefectParetoPanel, SectionHeading, RecordsDrawer, TrendChart, fullYearTrend, queryFromLocation } from './QueryPage'; import { StageSourceFilters } from './StageSourceFilters'; @@ -24,6 +24,7 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU const [year,setYear]=useState(initial.year||defaults.year);const [month,setMonth]=useState(initial.month||defaults.month);const [quarter,setQuarter]=useState(initial.quarter||previousCompleteQuarter().quarter); const [department,setDepartment]=useState(()=>decodeQueryValueList(initial.department));const [group,setGroup]=useState(()=>decodeQueryValueList(initial.group));const [product,setProduct]=useState(()=>decodeQueryValueList(initial.product));const [projectGroup,setProjectGroup]=useState(()=>decodeQueryValueList(initial.projectGroup)); const [sourceFilters,setSourceFilters]=useState(initial.columnFilters||[]);const [search,setSearch]=useState(initial.productSearch||'');const includeUnassigned=true; + const [moreFiltersOpen,setMoreFiltersOpen]=useState(false); const [options,setOptions]=useState(null);const [catalog,setCatalog]=useState<{releaseId:string;sourceFields:SourceColumnField[]}|null>(null);const [supportError,setSupportError]=useState('');const [supportLoading,setSupportLoading]=useState(true); const [applied,setApplied]=useState(null);const [revision,setRevision]=useState(0);const [response,setResponse]=useState<{key:string;value:MetricsResponse}|null>(null);const [loading,setLoading]=useState(false);const [failure,setFailure]=useState<{key:string;message:string}|null>(null); const [defectDisplay,setDefectDisplay]=useState<'weight'|'rate'>('weight'); @@ -62,7 +63,9 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU const dirty=!!applied&&JSON.stringify(draft)!==JSON.stringify(applied);const submit=()=>{automaticPeriod.current=false;setApplied(draft);setRevision(v=>v+1);}; const groups=(options?.groups||[]).filter(name=>!department.length||department.includes(options?.groupDepartments?.[name]||'')); const paths=options?.organizationPaths||[];const products=department.length||group.length?[...new Set(paths.filter(path=>(!department.length||department.includes(path.department||''))&&(!group.length||group.includes(path.group||''))).map(path=>path.product).filter((v):v is string=>!!v))]:options?.products||[]; - const select=(name:string,value:string[],choices:string[],change:(v:string[])=>void)=>; + const moreFilterCount=(projectGroup.length?1:0)+sourceFilters.length; + const moreFilterSummary=[projectGroup.length?`项目组:${projectGroup.map(v=>v==='__UNASSIGNED__'?'未分类':v).join('、')}`:'',...sourceFilters.map(rule=>fields.find(field=>field.key===rule.field)?.label||rule.field)].filter(Boolean).join(';'); const displayed = useRetainedResult(current && applied ? { data: current, query: applied } : null); const displayedQuery = displayed?.query || applied; const sortedRows=useMemo(()=>sortStageRowsByTotalWeight(displayed?.data.rows||[],stage),[displayed?.data,stage]); @@ -80,10 +83,15 @@ export default function StageProductPage({stage,onUnauthorized}:{stage:Stage;onU {select('产业部',department,options?.departments||[],values=>{setDepartment(values);setGroup([]);setProduct([]);})} {select('业务分组',group,groups,values=>{setGroup(values);setProduct([]);})} {select('产品',product,products,setProduct)} - {options?.projectGroupStatus==='READY'&&select('项目组',projectGroup,options.projectGroups||[],setProjectGroup)} - {catalog&&} +
+ + {moreFilterCount>0&&} +
- {catalog&&} + {moreFiltersOpen&&
+ {options?.projectGroupStatus==='READY'&&select('项目组',projectGroup,options.projectGroups||[],setProjectGroup,true)} + {catalog&&} +
} {dirty&&
筛选条件已修改,点击“查询”更新统计结果
} {error&&setRevision(v=>v+1)}>重试}/>} diff --git a/web/src/styles.css b/web/src/styles.css index c2f4008..c306067 100644 --- a/web/src/styles.css +++ b/web/src/styles.css @@ -29,7 +29,7 @@ body { color: var(--ink); background: #f4f6fb; font-size: var(--font-body); } button, input, textarea, select { font: inherit; } button { color: inherit; } .app-shell { min-height: var(--viewport-height); } -.sidebar { position: fixed; inset: 0 auto 0 0; z-index: 15; display: flex; width: var(--sidebar); flex-direction: column; padding: 16px 12px 10px; background: #f8f9fc; border-right: 1px solid var(--line); } +.sidebar { --font-body: 14px; --font-control: 13px; position: fixed; inset: 0 auto 0 0; z-index: 15; display: flex; width: var(--sidebar); flex-direction: column; padding: 16px 12px 10px; background: #f8f9fc; border-right: 1px solid var(--line); } .brand { display: flex; align-items: center; gap: 8px; min-height: 34px; padding: 0 7px; border: 0; background: transparent; text-align: left; font-size: var(--font-dialog-title); font-weight: 700; cursor: pointer; white-space: nowrap; } .brand-mark { display: inline-flex; align-items: center; gap: 2px; width: 22px; height: 23px; transform: skew(-17deg); } .brand-mark i { display: block; width: 4px; height: 17px; background: var(--blue); } @@ -40,7 +40,7 @@ button { color: inherit; } .nav-group { margin-top: 12px; } .nav-group-label { padding: 7px 9px 6px; color: var(--ink); font-size: var(--font-control); font-weight: 650; } .nav-item { display: flex; width: 100%; min-height: 36px; align-items: center; gap: 10px; padding: 7px 9px; border: 0; background: transparent; text-align: left; cursor: pointer; font-size: var(--font-body); } -.nav-item .anticon { width: 16px; color: var(--ink); font-size: var(--font-dialog-title); } +.nav-item .anticon { width: 18px; flex: 0 0 18px; color: var(--ink); font-size: 18px; } .nav-item:hover { background: #eef2fb; } .nav-item.active { color: var(--blue-dark); background: #e3ebff; font-weight: 650; } .nav-item.active .anticon { color: var(--blue); }