feat(assets): release v1.1.18 with two-sheet analysis exports and flow contract details

src/modules/assets/components/FlowAnalysisModal.tsx

@@ -1,5 +1,5 @@
 import { useCallback, useMemo, useRef, useState, type Dispatch, type SetStateAction } from 'react';
-import { ArrowLeft, Download, X } from 'lucide-react';
+import { ArrowLeft, X } from 'lucide-react';
 import type { FlowDetailItem, FlowType } from '../api';
 import type { FlowSelection } from '../model';
 import { FLOW_META } from './FlowDetailModal';
@@ -8,13 +8,15 @@ import { useDialogFocus } from './useDialogFocus';
 import { DimensionPicker, type DimensionPickerOption } from './analysis/DimensionPicker';
 import { ProgressiveRowsStatus } from './analysis/ProgressiveRowsStatus';
 import { useProgressiveRows } from './analysis/useProgressiveRows';
+import { AnalysisExportButton } from './analysis/AnalysisExportButton';
+import { downloadAnalysisWorkbook, statisticsExportRows } from '../analysis-export';
+import './analysis/asset-analysis.css';
 import './flow-analysis-modal.css';
 
 interface FlowAnalysisModalProps {
   selectedFlow: FlowSelection | null;
   selectedFlowDetails: FlowDetailItem[];
   setSelectedFlow: Dispatch<SetStateAction<FlowSelection | null>>;
-  exportFlowDetails: (rows?: FlowDetailItem[], title?: string) => void;
 }
 
 type Dimension = 'date' | 'department' | 'manager' | 'type';
@@ -54,7 +56,7 @@ export function FlowAnalysisModal(props: FlowAnalysisModalProps) {
   return <FlowAnalysisContent key={JSON.stringify(props.selectedFlow)} {...props} selectedFlow={props.selectedFlow} />;
 }
 
-function FlowAnalysisContent({ selectedFlow, selectedFlowDetails, setSelectedFlow, exportFlowDetails }: Omit<FlowAnalysisModalProps, 'selectedFlow'> & { selectedFlow: FlowSelection }) {
+function FlowAnalysisContent({ selectedFlow, selectedFlowDetails, setSelectedFlow }: Omit<FlowAnalysisModalProps, 'selectedFlow'> & { selectedFlow: FlowSelection }) {
   const [dimensions, setDimensions] = useState<Dimension[]>(['date']);
   const [mergeParents, setMergeParents] = useState(true);
   const mergeActive = mergeParents && dimensions.length > 1;
@@ -108,6 +110,14 @@ function FlowAnalysisContent({ selectedFlow, selectedFlowDetails, setSelectedFlo
     resetResult();
   };
 
+  const exportWorkbook = () => {
+    const statistics = statisticsExportRows(dimensions.map(d => DIMENSION_LABELS[d]), (detailGroup ? [detailGroup] : groups).map(group => ({ values: group.values.map((v, i) => dimensionLabel(dimensions[i], v)), count: group.rows.length })), selectedRows.length, '车次');
+    const details = selectedRows.map(item => ({ 业务日期: item.date, 类型: item.typeLabel, 车牌: item.plateNumber,
+      运维签章时间: item.eventTime, 建单时间: item.submitTime, 部门: item.department, 业务负责人: item.manager,
+      客户: item.customerName, 合同: item.contractNo, 项目名称: item.projectName }));
+    return downloadAnalysisWorkbook(statistics, details, `${FLOW_META[selectedFlow.type].label}-${rangeLabel}-${showDetails ? detailLabel : '当前筛选范围'}`);
+  };
+
   return <div className="bi-flow-modal-backdrop" onClick={event => { if (event.target === event.currentTarget) close(); }}>
     <div ref={dialog} role="dialog" aria-modal="true" aria-labelledby="bi-flow-modal-title" tabIndex={-1} className="bi-flow-modal" data-testid="asset-flow-analysis-modal">
       <header className="bi-flow-modal-header">
@@ -133,7 +143,9 @@ function FlowAnalysisContent({ selectedFlow, selectedFlowDetails, setSelectedFlo
 
         <div className="bi-flow-modal-section-heading"><div><h4>{showDetails ? '业务明细' : dimensions.length ? '组合统计' : '筛选汇总'}</h4><p>{showDetails ? `共 ${countLabel(detailRows.length)} 条业务记录` : `共 ${countLabel(groups.length)} 组 · 占比以当前筛选的 ${countLabel(filteredRows.length)} 车次为基数`}</p></div>
           {!showDetails && dimensions.length > 1 ? <label className="bi-flow-modal-merge-toggle"><input type="checkbox" checked={mergeParents} onChange={event => { setMergeParents(event.target.checked); }} />合并上级维度</label> : null}
-          {showDetails ? <button type="button" disabled={!detailRows.length} className="bi-flow-modal-export" onClick={() => exportFlowDetails(detailRows, `${FLOW_META[selectedFlow.type].label}-${detailLabel}-明细`)}><Download size={13} />导出当前明细</button> : null}
+          <div className="analysis-export-actions">
+            <AnalysisExportButton disabled={!selectedRows.length} onExport={exportWorkbook} />
+          </div>
         </div>
 
         {!showDetails ? groups.length ? <>
@@ -150,7 +162,7 @@ function FlowAnalysisContent({ selectedFlow, selectedFlowDetails, setSelectedFlo
           <ProgressiveRowsStatus {...groupProgress} unit="组" />
         </> : <div className="bi-flow-modal-empty">当前筛选范围暂无交还车数据，请调整筛选。</div>
           : detailRows.length ? <>
-            <div className="bi-flow-modal-table-wrap" data-testid="asset-flow-final-details"><table className="bi-flow-modal-table bi-flow-modal-detail-table"><thead><tr><th>车牌</th><th>业务类型</th><th>运维签章时间</th><th>建单时间</th><th>部门</th><th>业务负责人</th><th>客户</th></tr></thead><tbody>{shownDetails.map(item => <tr key={item.id}><td>{item.plateNumber || '未登记车牌'}</td><td>{FLOW_META[item.type].label}</td><td>{item.eventTime || '—'}</td><td>{item.submitTime || '—'}</td><td>{dimensionLabel('department', dimensionValue(item, 'department'))}</td><td>{item.manager || '—'}</td><td>{item.customerName || '—'}</td></tr>)}</tbody></table></div>
+            <div className="bi-flow-modal-table-wrap" data-testid="asset-flow-final-details"><table className="bi-flow-modal-table bi-flow-modal-detail-table"><thead><tr><th>车牌</th><th>业务类型</th><th>运维签章时间</th><th>建单时间</th><th>部门</th><th>业务负责人</th><th>客户</th><th>合同</th><th>项目名称</th></tr></thead><tbody>{shownDetails.map(item => <tr key={item.id}><td>{item.plateNumber || '未登记车牌'}</td><td>{FLOW_META[item.type].label}</td><td>{item.eventTime || '—'}</td><td>{item.submitTime || '—'}</td><td>{dimensionLabel('department', dimensionValue(item, 'department'))}</td><td>{item.manager || '—'}</td><td>{item.customerName || '—'}</td><td>{item.contractNo || '—'}</td><td>{item.projectName || '—'}</td></tr>)}</tbody></table></div>
             <ProgressiveRowsStatus {...detailProgress} unit="条" />
           </> : <div className="bi-flow-modal-empty">当前分组暂无业务明细，请返回统计调整条件。</div>}
       </div>