From 54813accaad65d7f05e2b314e5f9d827cdce5d67 Mon Sep 17 00:00:00 2001 From: lyun Date: Tue, 3 Nov 2026 16:31:23 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E6=95=B4=E7=90=86?= =?UTF-8?q?=E6=8C=87=E6=A0=87=E7=9B=AE=E6=A0=87=E5=B9=B6=E6=94=AF=E6=8C=81?= =?UTF-8?q?=E4=B8=AD=E6=96=87=E5=AD=97=E6=AE=B5=E5=85=AC=E5=BC=8F=E7=BC=96?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 黑片和亮片按结果展示完整公式,在同一窗口维护条件与未匹配取值。支持中文字段选择、运算符和求和,并保留原计算语义及特殊策略。 移除重复账号入口与配置说明,统一紧凑表格。保留仓库既有权限判断,不包含此前未同步的角色迁移、预览快照或运行数据。 验证:前端构建及68项相关检查通过。 --- DESIGN.md | 29 +++++ web/src/ChineseFormulaEditor.tsx | 45 ++++++++ web/src/ManagementPages.tsx | 63 ++++++---- web/src/ManagementSections.tsx | 10 +- web/src/QualityTable.tsx | 4 +- web/src/QualityTargetsPanel.tsx | 95 +++++++++++++++ web/src/QualityWorkspace.tsx | 16 +-- web/src/ResultFormulaModal.tsx | 86 ++++++++++++++ web/src/RuleSettingsEditor.tsx | 121 ++++++++++++++++++++ web/src/StructuredConfigEditors.tsx | 64 +---------- web/src/formulaLanguage.ts | 116 +++++++++++++++++++ web/src/resultFormulas.ts | 93 +++++++++++++++ web/src/ruleEditing.ts | 81 +++++++++++++ web/src/rulePresentation.ts | 51 +++++++++ web/src/rules-workspace.css | 33 ++++++ web/verification/formula_language.test.mjs | 63 ++++++++++ web/verification/result_formulas.test.mjs | 73 ++++++++++++ web/verification/rule_editing.test.mjs | 32 ++++++ web/verification/rule_presentation.test.mjs | 20 ++++ 19 files changed, 992 insertions(+), 103 deletions(-) create mode 100644 web/src/ChineseFormulaEditor.tsx create mode 100644 web/src/QualityTargetsPanel.tsx create mode 100644 web/src/ResultFormulaModal.tsx create mode 100644 web/src/RuleSettingsEditor.tsx create mode 100644 web/src/formulaLanguage.ts create mode 100644 web/src/resultFormulas.ts create mode 100644 web/src/ruleEditing.ts create mode 100644 web/src/rulePresentation.ts create mode 100644 web/src/rules-workspace.css create mode 100644 web/verification/formula_language.test.mjs create mode 100644 web/verification/result_formulas.test.mjs create mode 100644 web/verification/rule_editing.test.mjs create mode 100644 web/verification/rule_presentation.test.mjs diff --git a/DESIGN.md b/DESIGN.md index 8acd2dc..4b0beb7 100644 --- a/DESIGN.md +++ b/DESIGN.md @@ -135,3 +135,32 @@ - 实现与验证详见 docs/全系统统一加载实现与验收_20261102.md。 - 2026-11-02:趋势折线使用用户选定的 A 轻度平滑(0.15),沿横轴约束曲线;查询合格率、不良率、智能分析与导出统一。柏拉图累计线保持直线,数据点、缺失断点和计算口径不变。 + +## 2026-11-03:指标与目标(本地预览) + +- 采用用户确认的“指标说明、质量目标、计算设置”顺序,默认显示中文指标与当前生效公式。 +- 指标说明的修改公式动作定位到同一计算设置表单;名称、别名与说明独立编辑。 +- 目标默认表格查看,表单修改年度、范围和百分比;展示既有匹配优先级得出的沿用值,保持保存目标的现有接口与即时生效行为。 +- 计算设置默认从黑片计算开始,黑片、亮片各一张表,每个结果只占一行,各自从1开始编号,不分组、不重复展示完整执行顺序;完整公式包含默认值和全部条件分支,长内容使用共享悬浮全文。来源字段收进高级设置,仅用于旧数据兼容。保留原始行数组、所有公式及特殊处理。 +- 英文变量放入表单参考详情;率值1解释为100%。延续现有主题、控件、弹窗及切换过渡,不新增位移动效。 +- 本次预览使用配置只读快照,保存及失败重试在预览中模拟;未发布线上,未修改计算后端及正式配置。 + +- 用户反馈行高偏大:指标说明、质量目标、计算设置统一复用现有管理表格的紧凑样式(表头34px、内容行36px),不单独覆盖字号、行距或单元格间距;长内容通过共享悬浮全文与详情查看。 + +- 调整顺序以完整结果及其分支为单位,只发生在当前阶段内,限制合计早于分量等依赖冲突;编辑在同一窗口维护默认取值、条件和各自特殊策略,分支同时命中时上方优先。编辑与保存前检查不可用变量、重复冲突条件及指标前向引用。校验只作用于维护操作,不改写或求值正式公式;来源变量按对应阶段的服务端字段字典显示中文。 + +- 2026-11-03:用户确认“一个结果一条完整公式”,本地将黑片13条执行规则呈现为8个结果、亮片9条执行规则呈现为7个结果。相同取值的条件可用“或”展示,底层不合并求值、不改优先级;未修改直接应用须保持原22条规则、位置、数值类型和空值策略完全一致。原有表头34px、行高36px及共享悬浮全文保持。未发布线上。 + +## 2026-11-03:中文公式编辑与账号入口精简(本地) + +- 黑片、亮片及合格率公式共用中文公式编辑器,使用 `[中文字段名]` 引用;可搜索选择字段、在光标处插入、替换选中文字、插入四则运算、括号、逗号和求和。也接受直接输入中文字段名。 +- 字段列表区分来源字段和计算结果;重名字段用中文类别消歧,条件用文本字段不进入数值公式列表。合格率只提供已计算的前序指标。 +- 保存前将中文引用转换为原有引擎字段,检查结构、参数数量、嵌套与长度,不在浏览器求值,不引入新的计算语言或改变条件与空值策略。不改动时保存须保留原公式文字及全部元数据。 +- 删除左下角重复账号区域,保留右上角个人账户菜单及原有资料、密码、退出操作。 +- 沿用现有表格密度、主题、弹窗与浮层风格,未发布线上。 + +- 条件公式编辑按阅读顺序展示:先列条件分支和满足时取值,再列“以上条件均不满足时取值”;无条件结果仍显示“计算公式”。仅调整表单展示顺序,底层初始化位置、条件优先级和特殊策略不变。 + +- 计算设置移除“配置说明”折叠区和说明编辑框,仅保留隐藏字段以沿用既有保存数据;公式维护和保存入口不变。 + +- 2026-11-03:本轮指标与目标、完整结果公式、中文字段编辑、条件优先布局、重复账号与配置说明精简,已按用户授权发布为 `20261103-082040Z-rules-workspace`。分母策略的条件隐藏已撤销,线上保持始终显示;正式计算、后端与业务数据未改动。68项检查和线上桌面/窄屏验收通过。 diff --git a/web/src/ChineseFormulaEditor.tsx b/web/src/ChineseFormulaEditor.tsx new file mode 100644 index 0000000..e1d5c2a --- /dev/null +++ b/web/src/ChineseFormulaEditor.tsx @@ -0,0 +1,45 @@ +import { useLayoutEffect, useRef, useState } from 'react'; +import { Button, Input, Popover } from 'antd'; +import type { TextAreaRef } from 'antd/es/input/TextArea'; +import { PlusOutlined, SearchOutlined } from '@ant-design/icons'; +import { chineseFormula, compileChineseFormula, formulaFieldName, formulaFieldReference, insertFormulaPart, type FormulaField } from './formulaLanguage'; + +type Props = { id?: string; value?: string; onChange?: (value: string) => void; fields: FormulaField[]; disabled?: boolean; optional?: boolean; maxLength?: number; label?: string }; +export function ChineseFormulaEditor({ id, value='', onChange, fields, disabled=false, optional=false, maxLength=500, label='公式' }: Props) { + const [text,setText]=useState(()=>chineseFormula(value,fields)); + const [picker,setPicker]=useState(false), [search,setSearch]=useState(''); + const [composing,setComposing]=useState(false); + const editor=useRef(null),selection=useRef({start:0,end:0}); + const emitted=useRef(undefined),previousFields=useRef(''); + const fieldKey=JSON.stringify(fields); + useLayoutEffect(()=>{ + if(value!==emitted.current||fieldKey!==previousFields.current){setText(chineseFormula(value,fields));selection.current={start:0,end:0};} + previousFields.current=fieldKey; + // 字段集合按内容比较,父表单重绘不会打断正在输入的中文。 + // eslint-disable-next-line react-hooks/exhaustive-deps + },[value,fieldKey]); + const changed=(next:string)=>{setText(next);emitted.current=next;onChange?.(next);}; + const remember=()=>{const node=editor.current?.resizableTextArea?.textArea;if(node)selection.current={start:node.selectionStart,end:node.selectionEnd};}; + const insert=(part:string,fn=false)=>{ + const node=editor.current?.resizableTextArea?.textArea; + const range=node?{start:node.selectionStart,end:node.selectionEnd}:selection.current; + const next=insertFormulaPart(text,range.start,range.end,part,fn); + changed(next.text);selection.current={start:next.caret,end:next.caret};setPicker(false); + requestAnimationFrame(()=>{const node=editor.current?.resizableTextArea?.textArea;node?.focus();node?.setSelectionRange(next.caret,next.caret);}); + }; + const check=optional&&!text.trim()?undefined:compileChineseFormula(text,fields,maxLength).error; + const matching=fields.filter(field=>field.label.toLowerCase().includes(search.trim().toLowerCase())); + const groups=[...new Set(matching.map(field=>field.group))]; + const chooser=
+ } placeholder="查找中文字段" value={search} onChange={event=>setSearch(event.target.value)} allowClear/> +
{groups.map(group=>

{group}

{matching.filter(field=>field.group===group).map(field=>)}
)}{!matching.length&&

没有匹配的字段

}
+
; + return
+
+ {setPicker(open);if(open)setSearch('');}}> +
{['+','−','×','÷','(',')',','].map(operator=>)}
+
+ 1 ? `例如:${formulaFieldReference(fields[0],fields)} + ${formulaFieldReference(fields[1],fields)}` : '选择字段或直接输入中文公式'} onCompositionStart={()=>setComposing(true)} onCompositionEnd={()=>setComposing(false)} onChange={event=>changed(event.target.value)} onSelect={remember} onClick={remember} onKeyUp={remember} onBlur={remember}/> + {check&&!disabled&&!composing&&
{check}
} +
; +} diff --git a/web/src/ManagementPages.tsx b/web/src/ManagementPages.tsx index ffe22d3..c0ffc3d 100644 --- a/web/src/ManagementPages.tsx +++ b/web/src/ManagementPages.tsx @@ -45,7 +45,10 @@ import type { DataWorkflowStatus } from './NoCodeDataTypes'; import type { PageKey } from './QualityWorkspace'; import { readableSelectPopup } from './readableSelectPopup'; import './management-alignment.css'; -import { TargetVersionAdmin } from './AnalyticsCompletion'; +import { QualityTargetsPanel } from './QualityTargetsPanel'; +import { METRIC_KEYS, formulaOnly, ruleChangeSummary } from './rulePresentation'; +import { ruleLogicIssues } from './ruleEditing'; +import './rules-workspace.css'; import { AnalysisReportExport, NativeAnalysisReport } from './AnalysisReportExport'; import { AiMarkdown } from './AiMarkdown'; import { authorizeAnalysisSnapshot } from './analysisSnapshot'; @@ -229,13 +232,23 @@ export default function ManagementPages(props: ManagementPageProps) { ; } +function RulesWorkspace({ user, onUnauthorized, onNavigate }: Omit) { + const [section, setSection] = useState('dictionary'); + const [focusMetric, setFocusMetric] = useState<{ code: string; request: number }>(); + const editFormula = (code: string) => { setFocusMetric({ code: METRIC_KEYS[code] || code, request: Date.now() }); setSection('settings'); }; + return }, + ...(user.roles.some(role => ['SYSTEM_ADMIN', 'RULE_MAINTAINER'].includes(role)) ? [{ key: 'targets', label: '质量目标', children: }] : []), + { key: 'settings', label: '计算设置', children: }, + ]} />; +} function ManagementPageContents({ page, user, onUnauthorized, onNavigate }: ManagementPageProps) { if (page === 'sources' || page === 'imports') return ; if (page === 'tasks') return ; if (page === 'analysis') return ; if (page === 'access') return ; if (page === 'basis') return ; - if (page === 'rules') return },{ key: 'dictionary', label: '指标定义', children: },...(user.roles.some(role => ['SYSTEM_ADMIN', 'RULE_MAINTAINER'].includes(role)) ? [{ key: 'targets', label: '目标管理', children: }] : [])]} />; + if (page === 'rules') return ; if (page === 'masterData') return },{ key: 'filters', label: '查询字段', children: ['SYSTEM_ADMIN','DATA_MAINTAINER'].includes(role))} onUnauthorized={onUnauthorized} /> }]} />; if (page === 'mappings') return ; const resource: Record = { @@ -401,7 +414,7 @@ function ruleDisplayName(value: unknown): string { type PublishedConfigNames = Pick & { groupDepartments?: Record }; -function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSections }: { extraSections?: { key: string; label: string; children: React.ReactNode }[]; kind: 'rules' | 'mappings' | 'masterData'; user: AuthUser; onUnauthorized: (error: unknown) => boolean; onNavigate: (page: PageKey) => void }) { +function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSections, focusMetric }: { focusMetric?: { code: string; request: number }; extraSections?: { key: string; label: string; children: React.ReactNode }[]; kind: 'rules' | 'mappings' | 'masterData'; user: AuthUser; onUnauthorized: (error: unknown) => boolean; onNavigate: (page: PageKey) => void }) { const { message } = App.useApp(); const { active: pageActive } = usePageCache(); const [items, setItems] = useState[]>([]); @@ -427,6 +440,7 @@ function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSec const classificationUpdates=useClassificationQueue(kind==='mappings'?String(user.id):'inactive-'+kind); const [ruleSchema, setRuleSchema] = useState | null>(null); const [ruleSchemaError, setRuleSchemaError] = useState(''); + const [ruleBaseline, setRuleBaseline] = useState({}); const [publishedNames, setPublishedNames] = useState(null); const [matchMetadata,setMatchMetadata]=useState|null>(null); const [differenceItem, setDifferenceItem] = useState | null>(null); @@ -488,6 +502,7 @@ function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSec const definitionKey=JSON.stringify([kind,active?.id??fallback?.id,definition]); if (definition && typeof definition === 'object' && loadedDefinitionKey.current!==definitionKey) {loadedDefinitionKey.current=definitionKey;const serialized=JSON.stringify(definition),prior=loadedDefinition.current;setDraftDefinition(previous=>!prior||JSON.stringify(previous)===prior?JSON.parse(serialized) as ConfigDefinition:previous);loadedDefinition.current=serialized;} const metadata = items.find(row => String(row.id) === String(active?.id)) ?? fallback; + if (!drafting && isRules) setRuleBaseline(JSON.parse(JSON.stringify(definition || {})) as ConfigDefinition); if (!drafting) form.setFieldsValue({ name: testMode ? currentConfigurationName(active?.name ?? metadata?.name, metadata?.createdAt) : isRules ? ruleDisplayName(active?.name || fallback?.name || '测试计算规则') : String(active?.name || fallback?.name || '测试基础数据与对应关系'), description: isRules ? readableRuleDescription(active?.description || fallback?.description) : String(active?.description || fallback?.description || '') }); }, [workflowStatus, items, kind, isRules, testMode, ruleSchema, drafting, form]); @@ -613,6 +628,10 @@ function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSec if (actionLock.current) return; actionLock.current = true; try { await form.validateFields(); + if (isRules && ruleSchema) { + const issues = ruleLogicIssues(draftDefinition, ruleSchema); + if (issues.length) throw new Error(issues[0].message); + } const values = form.getFieldsValue(true); await workflowOperation.start(() => api.applyDataWorkflow({ kind: isRules ? 'rule' : 'mapping', name: configurationDateTime(new Date()), definition: draftDefinition, expectedCurrentReleaseId: workflowStatus?.currentReleaseId ?? null, ...(values.description?.trim() ? { description: values.description.trim() } : {}) })); } catch (value) { @@ -643,13 +662,14 @@ function ConfigManagementPage({ kind, user, onUnauthorized, onNavigate, extraSec
- {mode === 'rules' &&
} - {mode === 'rules' ? canApplyWorkflow ? : + {mode === 'rules' &&
} + {mode === 'rules' ? : mode === 'catalog' ? : mode === 'lookups' ? : } {!isRules && validateStructuredMappingDefinition(draftDefinition, publishedNames?.groupDepartments).length > 0 && {validateStructuredMappingDefinition(draftDefinition, publishedNames?.groupDepartments).slice(0,12).map((issue,index)=>
  • {issue}
  • )}} />} - {canApplyWorkflow &&
    保存后检查配置并更新报表。
    } + {isRules && ruleChangeSummary(ruleBaseline, draftDefinition).length > 0 &&
    本次变更{ruleChangeSummary(ruleBaseline, draftDefinition).join(';')}
    } + {canApplyWorkflow &&
    {isRules ? '检查规则 → 重新计算 → 更新报表' : '保存后检查配置并更新报表。'}
    } ; if (kind === 'masterData') return <>
    {editor('catalog')}; @@ -811,7 +831,7 @@ function MappingIssueResolutionPanel({ onUnauthorized, onEdit }: { onUnauthorize ; } -function MetricDictionaryPanel({ user, onUnauthorized }: { user: AuthUser; onUnauthorized: (error: unknown) => boolean }) { +function MetricDictionaryPanel({ user, onUnauthorized, onEditFormula }: { user: AuthUser; onUnauthorized: (error: unknown) => boolean; onEditFormula?: (code: string) => void }) { const { message } = App.useApp(); const { active } = usePageCache(); const [items, setItems] = useState[]>([]); @@ -853,7 +873,7 @@ function MetricDictionaryPanel({ user, onUnauthorized }: { user: AuthUser; onUna reason: values.reason.trim(), expectedRowVersion: Number(editing.rowVersion || 0), }); - message.success('术语名称、别名和说明已保存'); setEditing(null); form.resetFields(); await load(); + message.success('指标说明已保存'); setEditing(null); form.resetFields(); await load(); } catch (value) { if (value && typeof value === 'object' && 'errorFields' in value) return; if (!onUnauthorized(value)) message.error(apiMessage(value)); @@ -862,33 +882,30 @@ function MetricDictionaryPanel({ user, onUnauthorized }: { user: AuthUser; onUna }; const columns: ColumnsType> = [ - { title: '术语名称', dataIndex: 'name', key: 'name', width: 160 }, - { title: '说明', dataIndex: 'description', key: 'description', width: 200, render: value => readableValue(readableRuleDescription(value)) }, - { title: '单位', dataIndex: 'unit', key: 'unit', width: 55, render: value => value === 'RATE' ? '%' : toText(value) }, - { title: '适用范围', dataIndex: 'dimensions', key: 'dimensions', width: 130, render: value => }, - { title: '当前生效公式', key: 'formula', width: 420, render: (_, row) =>
    {currentMetricFormula(row)}
    }, - { title: '状态', dataIndex: 'enabled', key: 'enabled', width: 70, render: value => {value === true ? '启用' : value === false ? '停用' : '—'} }, - { title: '操作', key: 'actions', fixed: 'right', width: 100, render: (_, row) => {canManage && } }, + { title: '指标', dataIndex: 'name', key: 'name', width: 190 }, + { title: '当前计算公式', key: 'formula', width: 330, render: (_, row) =>
    {formulaOnly(currentMetricFormula(row))}
    }, + { title: '计算口径', dataIndex: 'description', key: 'description', width: 280, render: value => readableValue(readableRuleDescription(value)) }, + { title: '操作', key: 'actions', width: 220, render: (_, row) => {canManage && <>{onEditFormula && }} }, ]; useMaintenanceRefresh(load); - return
    -
    指标术语字典维护展示名称与别名;计算公式在上方计算规则中维护
    + return
    +
    当前生效指标
    {dictionaryError && void load()}>重试 : undefined} />} - {loading && !loaded ?
    读取术语定义…
    : loaded ? items.length ?
    String(row.code)} pagination={{ pageSize: TABLE_PAGE_SIZE, showSizeChanger: false }} scroll={{ x: 1100 }} /> : : null} - - { setEditing(null); form.resetFields(); }} onOk={() => void save()}> + {loading && !loaded ?
    读取指标说明…
    : loaded ? items.length ?
    String(row.code)} pagination={{ pageSize: TABLE_PAGE_SIZE, showSizeChanger: false }} scroll={{ x: 1100 }} /> : : null} + + { setEditing(null); form.resetFields(); }} onOk={() => void save()}> - + - setInspecting(null)}> + setInspecting(null)}> {inspecting &&
    名称
    {toText(inspecting.name)}
    别名
    {Array.isArray(inspecting.aliases) ? inspecting.aliases.map(String).join('、') : toText(inspecting.aliases)}
    说明
    {toText(readableRuleDescription(inspecting.description))}
    单位
    {inspecting.unit === 'RATE' ? '%' : toText(inspecting.unit)}
    适用维度
    当前生效公式
    {currentMetricFormula(inspecting)}
    状态
    }
    - ; + ; } function TaskTable({ items, importOnly, user, onUnauthorized, onRefresh }: { items: Record[]; importOnly: boolean; user: AuthUser; onUnauthorized: (error: unknown) => boolean; onRefresh: () => void }) { diff --git a/web/src/ManagementSections.tsx b/web/src/ManagementSections.tsx index 84d1e84..4caec9b 100644 --- a/web/src/ManagementSections.tsx +++ b/web/src/ManagementSections.tsx @@ -1,12 +1,14 @@ import { Tabs } from 'antd'; -import { useState, type ReactNode } from 'react'; +import { useEffect, useState, type ReactNode } from 'react'; import { PageCacheContext, usePageCache } from './pageCache'; -export function ManagementSections({ items, initialKey, onSelect }: { items: { key: string; label: ReactNode; children: ReactNode }[]; initialKey?: string; onSelect?: (key: string) => void }) { +export function ManagementSections({ items, initialKey, selectedKey, onSelect }: { items: { key: string; label: ReactNode; children: ReactNode }[]; initialKey?: string; selectedKey?: string; onSelect?: (key: string) => void }) { const cache = usePageCache(); const initialSelected = initialKey && items.some(item => item.key === initialKey) ? initialKey : items[0]?.key; const [selected, setSelected] = useState(initialSelected); - const activeKey = items.some(item => item.key === selected) ? selected : items[0]?.key; + const requested = selectedKey ?? selected; + const activeKey = items.some(item => item.key === requested) ? requested : items[0]?.key; const [visited, setVisited] = useState(() => new Set(activeKey ? [activeKey] : [])); - return { setSelected(key); setVisited(previous => new Set(previous).add(key)); onSelect?.(key); window.scrollTo({ top: 0 }); }} items={items.map(item => ({ ...item, children: {visited.has(item.key) ? item.children : null} }))} />; + useEffect(() => { if (activeKey) setVisited(previous => previous.has(activeKey) ? previous : new Set(previous).add(activeKey)); }, [activeKey]); + return { setSelected(key); setVisited(previous => new Set(previous).add(key)); onSelect?.(key); window.scrollTo({ top: 0 }); }} items={items.map(item => ({ ...item, children: {visited.has(item.key) || item.key === activeKey ? item.children : null} }))} />; } diff --git a/web/src/QualityTable.tsx b/web/src/QualityTable.tsx index ae00b1c..7af0a9d 100644 --- a/web/src/QualityTable.tsx +++ b/web/src/QualityTable.tsx @@ -25,6 +25,7 @@ function compactColumns(columns: ColumnsType): ColumnsType< type QualityTableProps = TableProps & { /** Offset for tables whose page is controlled outside Ant Design. */ indexOffset?: number; + showRowNumbers?: boolean; }; export function QualityTable({ @@ -32,6 +33,7 @@ export function QualityTable({ dataSource, pagination, indexOffset = 0, + showRowNumbers = true, className, size = 'small', onChange, @@ -64,7 +66,7 @@ export function QualityTable({ {...props} className={['quality-table', className].filter(Boolean).join(' ')} tableLayout={props.tableLayout ?? (compact ? 'fixed' : undefined)} - columns={[indexColumn, ...(compact ? compactColumns(columns ?? []) : columns ?? [])]} + columns={[...(showRowNumbers ? [indexColumn] : []), ...(compact ? compactColumns(columns ?? []) : columns ?? [])]} dataSource={dataSource} pagination={pagination === false ? false : { defaultPageSize: 15, pageSizeOptions: ['15', '30', '50', '100'], ...pageConfig }} onChange={handleChange} diff --git a/web/src/QualityTargetsPanel.tsx b/web/src/QualityTargetsPanel.tsx new file mode 100644 index 0000000..e6015e8 --- /dev/null +++ b/web/src/QualityTargetsPanel.tsx @@ -0,0 +1,95 @@ +import { useCallback, useEffect, useRef, useState } from 'react'; +import { Alert, App, Button, Checkbox, Empty, Form, Input, InputNumber, Modal, Popconfirm, Select, Spin } from 'antd'; +import { PlusOutlined, ReloadOutlined } from '@ant-design/icons'; +import { CompactManagementTables, QualityTable as Table } from './QualityTable'; +import { ApiError, api } from './api'; +import { METRIC_NAMES, matchingTarget, ruleObject as obj, ruleList, type RuleDefinition as Row } from './rulePresentation'; +import { readableSelectPopup } from './readableSelectPopup'; + +const DIMENSIONS=['department','group','product','projectGroup'] as const; +const dimensionName={department:'产业部',group:'业务分组',product:'产品',projectGroup:'项目组'}; +const percent=(value:unknown)=>typeof value==='number'&&Number.isFinite(value)?`${(value*100).toFixed(2)}%`:'未设置'; +const dimensions=(v:unknown)=>Object.fromEntries(DIMENSIONS.flatMap(key=>obj(v)[key]?[ [key,String(obj(v)[key])] ]:[])); +const identity=(row:Row)=>JSON.stringify([row.metric,row.year,...DIMENSIONS.map(key=>String(obj(row.dimensions)[key]||''))]); +const targetInput=(row:Row)=>Object.fromEntries(['metric','periodType','year','periodIndex','dimensions','value','unit','source','note'].filter(key=>row[key]!==undefined).map(key=>[key,row[key]])); +type TargetForm={year:number;metric:string;scope:string;department?:string;group?:string;product?:string;projectGroup?:string;value:number|null;inherit:boolean}; + +export function QualityTargetsPanel({onUnauthorized}:{onUnauthorized:(error:unknown)=>boolean}){ + const {message}=App.useApp();const [version,setVersion]=useState(null),[targets,setTargets]=useState([]),[references,setReferences]=useState({}); + const [loading,setLoading]=useState(true),[error,setError]=useState(''),[saving,setSaving]=useState(false),[editing,setEditing]=useState(null); + const [year,setYear]=useState(new Date().getFullYear()),[metric,setMetric]=useState('COMPOSITE_RATE'); + const [form]=Form.useForm();const scope=Form.useWatch('scope',form),inherit=Form.useWatch('inherit',form),department=Form.useWatch('department',form); + const saveLock=useRef(false); + const selectedYear=Form.useWatch('year',form),selectedMetric=Form.useWatch('metric',form); + const load=useCallback(async()=>{ + setLoading(true);setError(''); + try{ + const list=await api.targetVersions();const active=list.items.find(row=>String(row.status).toUpperCase()==='ACTIVE'); + if(!active){setVersion(null);setTargets([]);return;} + const [detail,names]=await Promise.all([api.targetVersion(String(active.id)),api.referenceNames()]); + setVersion(obj(detail.version||active));setTargets(ruleList(detail.targets));setReferences(names); + }catch(e){if(!onUnauthorized(e))setError(e instanceof Error?e.message:'目标读取失败');}finally{setLoading(false);} + },[onUnauthorized]); + useEffect(()=>{void load();},[load]); + const annual=targets.filter(row=>String(row.periodType).toUpperCase()==='YEAR'); + const years=[...new Set([new Date().getFullYear(),...annual.map(row=>Number(row.year))])].sort((a,b)=>a-b); + const overall=annual.find(row=>row.metric===metric&&row.year===year&&!Object.keys(dimensions(row.dimensions)).length); + const tableRows:Row[]=[]; + if(version){ + tableRows.push({...overall,metric,year,dimensions:{},key:'overall',scopeName:'总体',inherited:false,displayValue:overall?.value,exists:Boolean(overall)}); + const scoped=annual.filter(row=>row.metric===metric&&row.year===year&&Object.keys(dimensions(row.dimensions)).length); + scoped.forEach(row=>tableRows.push({...row,key:identity(row),scopeName:Object.values(dimensions(row.dimensions)).join(' / '),inherited:false,displayValue:row.value,exists:true})); + const refGroups=obj(references.groupDepartments); + const known=[...(Array.isArray(references.departments)?references.departments as string[]:[]).filter(name=>!['美洲产业部','欧洲产业部','欧洲磁钢'].includes(name)).map(name=>({department:name})),...(Array.isArray(references.groups)?references.groups as string[]:[]).map(name=>({...refGroups[name]?{department:String(refGroups[name])}:{},group:name}))]; + for(const d of known){ + const item={metric,year,dimensions:d};if(scoped.some(row=>identity(row)===identity(item)))continue; + const matched=matchingTarget(annual.filter(row=>row.metric===metric&&row.year===year),d); + const parentName=Object.values(dimensions(matched?.dimensions)).join(' / '); + tableRows.push({...item,key:identity(item),scopeName:Object.values(d).join(' / '),inherited:true,displayValue:matched?.value,inheritSource:parentName?`沿用${parentName}目标`:'沿用总体目标',exists:false}); + } + } + const open=(row?:Row)=>{ + const d=dimensions(row?.dimensions);setEditing(row||{newRecord:true}); + form.setFieldsValue({year:Number(row?.year||year),metric:String(row?.metric||metric),scope:Object.keys(d).length?'scope':'overall',...Object.fromEntries(DIMENSIONS.map(key=>[key,d[key]||undefined])),inherit:Boolean(row?.inherited),value:typeof row?.displayValue==='number'?row.displayValue*100:typeof row?.value==='number'?row.value*100:null}); + }; + const persist=async(next:Row[])=>{ + if(!version||saveLock.current)return false;saveLock.current=true;setSaving(true); + try{await api.updateCurrentTargets({targets:next.map(targetInput),expectedRowVersion:Number(version.rowVersion||0)});message.success('目标已更新');setEditing(null);await load();return true;} + catch(e){if(!onUnauthorized(e))message.error(e instanceof ApiError&&e.status===409?'目标已被其他人修改,请刷新后核对':e instanceof Error?e.message:'目标保存失败');return false;} + finally{saveLock.current=false;setSaving(false);} + }; + const save=async()=>{ + try{ + const f=await form.validateFields();const d=f.scope==='overall'?{}:dimensions(f); + if(f.scope==='scope'&&!Object.keys(d).length){message.error('请选择至少一个适用范围');return;} + const candidate={metric:f.metric,year:f.year,dimensions:d};const oldKey=editing&&!editing.newRecord&&editing.exists?identity(editing):null;const key=identity(candidate); + if(annual.some(row=>identity(row)===key&&identity(row)!==oldKey)&&!(editing?.inherited&&identity(editing)===key)){message.error('该年度、指标及范围已有目标,请编辑已有记录');return;} + let next=targets.filter(row=>!oldKey||String(row.periodType).toUpperCase()!=='YEAR'||identity(row)!==oldKey); + if(!(f.scope==='scope'&&f.inherit)){ + const prior=oldKey?annual.find(row=>identity(row)===oldKey):undefined; + next=[...next,{...prior,metric:f.metric,periodType:'YEAR',year:f.year,dimensions:d,value:Number(f.value)/100,unit:'RATE'}]; + } + if(!next.some(row=>String(row.periodType).toUpperCase()==='YEAR'&&!Object.keys(dimensions(row.dimensions)).length)){message.error('至少保留一项总体年度目标');return;} + await persist(next); + }catch{ /* 表单保留在原位置显示字段错误。 */ } + }; + const defaultTarget=matchingTarget(annual.filter(row=>row.metric===selectedMetric&&row.year===selectedYear&&(!editing||identity(row)!==identity(editing))),dimensions(form.getFieldsValue(true))); + const groupDepartments=obj(references.groupDepartments); + return
    +
    ({value,label}))}/>
    + {error&&void load()}>重试}/>} + {loading&&!version?
    读取质量目标…
    :version?
    METRIC_NAMES[String(v)]||String(v)}, + {title:'目标值',dataIndex:'displayValue',width:120,render:percent},{title:'目标来源',width:150,render:(_,row)=>row.inherited?String(row.inheritSource||'沿用总体目标'):row.exists?'单独设置':'未设置'}, + {title:'操作',width:185,render:(_,row)=>{Boolean(row.exists)&&Object.keys(dimensions(row.dimensions)).length>0&&persist(targets.filter(item=>String(item.periodType).toUpperCase()!=='YEAR'||identity(item)!==identity(row)))}>}}, + ]}/>:!loading&&!error?:null} + setEditing(null)} onOk={()=>void save()} width={640}> +
    + {scope==='scope'&&<>
    {DIMENSIONS.map(key=>{key==='department'||key==='group'?})}
    不单独设置,沿用匹配目标:{percent(defaultTarget?.value)}} + {!(scope==='scope'&&inherit)&&} +

    保存后更新目标线和达标判断,实际合格率保持不变。

    + + + ; +} diff --git a/web/src/QualityWorkspace.tsx b/web/src/QualityWorkspace.tsx index 0d859fa..d620625 100644 --- a/web/src/QualityWorkspace.tsx +++ b/web/src/QualityWorkspace.tsx @@ -41,7 +41,7 @@ export type PageKey = 'overall' | 'department' | 'group' | 'product' | 'blackPro const pageNames: Record = { overall: '总体合格率', department: '产业部', group: '产业部-业务分组', product: '产品汇总', blackProduct: '黑片汇总', brightProduct: '亮片汇总', basis: '数据与计算依据', analysis: '智能分析', sources: '数据接入', imports: '导入与校验', - rules: '计算规则', mappings: '对应关系', masterData: '基础数据', tasks: '任务与监控', access: '权限与审计', + rules: '指标与目标', mappings: '对应关系', masterData: '基础数据', tasks: '任务与监控', access: '权限与审计', }; const pageFromLocation = (): PageKey => { @@ -86,7 +86,7 @@ const navGroups = [ { label: '规则与管理', items: [ - ['rules', '计算规则', SettingOutlined], + ['rules', '指标与目标', SettingOutlined], ['mappings', '对应关系', ToolOutlined], ['masterData', '基础数据', DatabaseOutlined], ['tasks', '任务与监控', LineChartOutlined], @@ -95,10 +95,6 @@ const navGroups = [ }, ]; -function shownDepartment(value: string): string { - return value === '质量管理部' ? '质量中心' : value; -} - type QualityWorkspaceProps = { appearance: (typeof workspaceThemes)[number]; onAppearanceChange: (themeId: WorkspaceThemeId) => void; @@ -219,13 +215,7 @@ export default function QualityWorkspace({ appearance, onAppearanceChange }: Qua
    ))} -
    - -
    +
    diff --git a/web/src/ResultFormulaModal.tsx b/web/src/ResultFormulaModal.tsx new file mode 100644 index 0000000..fc55e95 --- /dev/null +++ b/web/src/ResultFormulaModal.tsx @@ -0,0 +1,86 @@ +import { useEffect, useRef, useState } from 'react'; +import { Alert, Button, Form, Input, Modal, Select } from 'antd'; +import { ArrowDownOutlined, ArrowUpOutlined, PlusOutlined } from '@ant-design/icons'; +import { readableSelectPopup } from './readableSelectPopup'; +import { blankCondition, conditionOperators, describeResultFormula, type ResultFormula } from './resultFormulas'; +import { ChineseFormulaEditor } from './ChineseFormulaEditor'; +import { compileChineseFormula, rowFormulaFields } from './formulaLanguage'; +import { ruleObject as obj, type RuleDefinition } from './rulePresentation'; + +type Props = { result: ResultFormula; existing: boolean; schema: RuleDefinition; availableTargets: string[]; onCancel: () => void; onApply: (result: ResultFormula) => string | undefined }; +const strings = (value: unknown): string[] => Array.isArray(value) ? value.map(String) : []; +const missingLabels: Record = { PROPAGATE:'任一输入缺失,结果为空', ZERO:'空值按0参与运算', IGNORE:'忽略空项,全部为空时结果为空' }; +const outcomeLabels: Record = { ONE:'取1', ZERO:'取0', NULL:'保留空白', ERROR:'停止并报错' }; + +export function ResultFormulaModal({ result, existing, schema, availableTargets, onCancel, onApply }: Props) { + const [draft, setDraft] = useState(() => structuredClone(result)); + const [error, setError] = useState(''); + const errorHost = useRef(null); + useEffect(() => { if (error) errorHost.current?.scrollIntoView({block:'nearest'}); }, [error]); + const fields = obj(obj(schema.sourceFields)[draft.stage]), labels = obj(schema.componentLabels); + const maxLength = Number(obj(schema.limits).maxFormulaLength || 500); + const formulaFields = rowFormulaFields(schema,draft.stage); + const baseIndex = draft.rules.findIndex(rule => !rule.when); + const branchIndexes = draft.rules.flatMap((rule, index) => rule.when ? [index] : []).reverse(); + const label = (key: string) => String(labels[key] || key); + const update = (index: number, patch: RuleDefinition) => setDraft(current => ({ ...current, rules: current.rules.map((rule, i) => i === index ? { ...rule, ...patch } : rule) })); + const condition = (index: number, patch: RuleDefinition) => update(index, { when: { ...obj(draft.rules[index].when), ...patch } }); + const changeTarget = (target: string) => setDraft(current => ({ ...current, target, rules: current.rules.map(rule => ({ ...rule, target })) })); + const addBranch = () => setDraft(current => ({ ...current, rules: [...current.rules, { stage: current.stage, target: current.target, formula: '', when: { field: Object.hasOwn(fields, current.stage === 'bright' ? 'applicability' : 'issueLocation') ? (current.stage === 'bright' ? 'applicability' : 'issueLocation') : Object.keys(fields)[0], operator: current.stage === 'bright' ? 'EQ' : 'CONTAINS', value: '' } }] })); + const remove = (index: number) => setDraft(current => ({ ...current, rules: current.rules.filter((_, i) => i !== index) })); + const moveBranch = (index: number, direction: number) => { + const position = branchIndexes.indexOf(index), other = branchIndexes[position + direction]; + if (other === undefined) return; + setDraft(current => { const rules = current.rules.slice(); [rules[index], rules[other]] = [rules[other], rules[index]]; return { ...current, rules }; }); + }; + const apply = () => { + if (!draft.target || !draft.rules.length) { setError('请设置计算结果及公式'); return; } + if (draft.rules.some(rule => !String(rule.formula || '').trim())) { setError('请填写完整公式'); return; } + if (draft.rules.some(rule => rule.when && !blankCondition(obj(rule.when).operator) && !String(obj(rule.when).value ?? '').trim())) { setError('请填写条件值'); return; } + const rules: RuleDefinition[] = []; + for (const rule of draft.rules) { + const formula = compileChineseFormula(rule.formula,formulaFields,maxLength); + if (formula.error) { setError(formula.error); return; } + const next: RuleDefinition = { ...rule, formula:formula.formula }; + if (rule.otherwiseFormula !== undefined) { + const otherwise = compileChineseFormula(rule.otherwiseFormula,formulaFields,maxLength); + if (otherwise.error) { setError(otherwise.error); return; } + next.otherwiseFormula = otherwise.formula; + } + rules.push(next); + } + const failure = onApply({ ...draft,rules }); if (failure) setError(failure); + }; + const formulaInput = (index: number, title: string) => update(index, { formula })} fields={formulaFields} maxLength={maxLength}/>; + const policies = (index: number) =>
    特殊情况处理
    + {(['nullPolicy','zeroDenominatorPolicy', ...(strings(schema.nullResultPolicies).length ? ['nullResultPolicy'] : [])]).map(key => ({value,label:label(value)}))} onChange={changeTarget}/>} +
    完整公式

    {describeResultFormula(draft,schema)}

    + {branchIndexes.length === 0 && baseFormula} + {(branchIndexes.length > 0) &&

    {draft.rules.some(rule=>rule.otherwiseFormula !== undefined) ? '已设置其他情况取值,最终取值以完整公式为准。' : '条件同时满足时,上方分支优先。'}

    } + {branchIndexes.map((index, position) => { const rule=draft.rules[index], when=obj(rule.when); return
    +
    条件 {position + 1}
    +
    + ({value,label:conditionOperators[value]||value}))} onChange={operator=>condition(index,{operator})}/> + {!blankCondition(when.operator) && condition(index,{value:event.target.value})}/>} +
    + {formulaInput(index,'满足条件时取值')}{policies(index)} +
    ; })} + {draft.rules.flatMap((rule,index)=>!rule.when&&index!==baseIndex?[index]:[]).map(index=>
    {formulaInput(index,'后续覆盖公式')}{policies(index)}
    )} + + {branchIndexes.length > 0 && baseFormula} + + + ; +} diff --git a/web/src/RuleSettingsEditor.tsx b/web/src/RuleSettingsEditor.tsx new file mode 100644 index 0000000..e9102e5 --- /dev/null +++ b/web/src/RuleSettingsEditor.tsx @@ -0,0 +1,121 @@ +import { useEffect, useState } from 'react'; +import { Alert, Button, Checkbox, Collapse, Dropdown, Form, Input, Modal, Select, Tabs } from 'antd'; +import { MoreOutlined, PlusOutlined } from '@ant-design/icons'; +import { CompactManagementTables, QualityTable as Table } from './QualityTable'; +import { ConfigurationWorkbookActions } from './ConfigurationWorkbookActions'; +import { ruleLogicIssues } from './ruleEditing'; +import { ChineseFormulaEditor } from './ChineseFormulaEditor'; +import { compileChineseFormula, metricFormulaFields } from './formulaLanguage'; +import { ResultFormulaModal } from './ResultFormulaModal'; +import { describeResultFormula, newResultIssue, planResultMove, replaceResultFormula, stageResultFormulas, type ResultFormula } from './resultFormulas'; +import { displayFormula, policyDescription, ruleObject as obj, ruleList, type RuleDefinition } from './rulePresentation'; + +type Props = { value: RuleDefinition; onChange: (value: RuleDefinition) => void; schema: RuleDefinition | null; schemaError: string; showWorkbookActions?: boolean; focusMetric?: { code: string; request: number }; readOnly?: boolean }; +const strings = (v: unknown): string[] => Array.isArray(v) ? v.map(String) : []; +const nullLabels: Record = { PROPAGATE:'任一输入缺失,运算结果为空', ZERO:'空值按0参与运算', IGNORE:'忽略空项,全部为空时结果为空' }; +const resultLabels = (rate: boolean): Record => ({ ONE: rate ? '按100%处理' : '取1', ZERO: rate ? '按0%处理' : '取0', NULL:'保留空白', ERROR:'停止并报错' }); + +export function RuleSettingsEditor({ value, onChange, schema, schemaError, showWorkbookActions = true, focusMetric, readOnly = false }: Props) { + const [tab, setTab] = useState('black'); + const [sourceEdit, setSourceEdit] = useState<{ stage: string; alias: string; header: string } | null>(null); + const [sourceForm] = Form.useForm<{ header: string }>(); + const [resultEdit, setResultEdit] = useState<{ result: ResultFormula; existing: boolean } | null>(null); + const [metricEdit, setMetricEdit] = useState(null); + const [metricForm] = Form.useForm<{ formula: string; useDefault: boolean; nullPolicy: string; zeroDenominatorPolicy: string; nullResultPolicy: string }>(); + const [error, setError] = useState(''); + const [orderError, setOrderError] = useState(''); + const useDefault = Form.useWatch('useDefault', metricForm); + const nextFormula = Form.useWatch('formula', metricForm); + const metricFields = schema && metricEdit ? metricFormulaFields(schema,metricEdit) : []; + const fields = obj(schema?.sourceFields), targets = obj(schema?.rowTargets), labels = obj(schema?.componentLabels), metricLabels = obj(schema?.metricLabels); + const rows = ruleList(value.rowRules), metrics = obj(value.metricRules), defaults = obj(obj(schema?.defaultDefinition).metricRules); + const sourceFields = obj(value.sourceFields); + const metricCodes = strings(schema?.metricCodes); + const limits = obj(schema?.limits); const maxLength = Number(limits.maxFormulaLength || 500); + const hasNullResult = strings(schema?.nullResultPolicies).length > 0; + const label = (key: unknown) => String(labels[String(key)] || key || ''); + const metricLabel = (key: string) => String(metricLabels[key] || key).replace('剔除本部报废', '不含本部报废'); + const openMetric = (code: string) => { + const rule = obj(metrics[code]); const effective = Object.hasOwn(metrics, code) ? rule : obj(defaults[code]); + setMetricEdit(code); setError(''); + metricForm.setFieldsValue({ formula: String(effective.formula || ''), useDefault: !Object.hasOwn(metrics, code), nullPolicy: String(effective.nullPolicy || 'PROPAGATE'), zeroDenominatorPolicy: String(effective.zeroDenominatorPolicy || 'ONE'), nullResultPolicy: String(effective.nullResultPolicy || 'NULL') }); + }; + useEffect(() => { + if (focusMetric && schema && metricCodes.includes(focusMetric.code)) { setTab('metrics'); openMetric(focusMetric.code); } + // 每次导航请求只打开一次,后续字段编辑由表单维护。 + // eslint-disable-next-line react-hooks/exhaustive-deps + }, [focusMetric?.request, Boolean(schema)]); + if (!schema) return ; + const workbook = showWorkbookActions ?
    : null; + if (value.schemaVersion !== schema.schemaVersion) return
    {workbook}
    ; + const policies = (rate: boolean) =>
    + ({ value, label: resultLabels(rate)[value] || value }))} /> + {hasNullResult &&
    ({alias,header:String(header),source:String(obj(sourceFields[selected])[alias]??header)}))} columns={[ + {title:'计算字段',dataIndex:'header',width:260},{title:'Excel 来源列',dataIndex:'source',width:320},{title:'操作',width:90,render:(_:unknown,row:{alias:string;header:string;source:string})=>}, + ]} scroll={{x:600}}/>)}; + const stagePanel = (selected: string) =>
    +
    + size="small" bordered showRowNumbers={false} rowKey="target" dataSource={stageResultFormulas(value,selected)} columns={rowColumns} pagination={false} scroll={{x:1000}}/> +
    ; + return
    {workbook} + {orderError && setOrderError('')}/>} +
    1. 读取来源字段
    2. 计算黑片 / 亮片重量
    3. 汇总计算合格率
    + size="small" bordered rowKey="code" pagination={false} scroll={{x:960}} dataSource={metricCodes.map(code=>({code,rule:Object.hasOwn(metrics,code)?obj(metrics[code]):obj(defaults[code]),custom:Object.hasOwn(metrics,code)}))} columns={[ + {title:'指标',dataIndex:'code',width:220,render:metricLabel}, + {title:'当前计算公式',width:360,render:(_:unknown,row:{rule:RuleDefinition})=>displayFormula(row.rule.formula)}, + {title:'特殊情况处理',width:340,render:(_:unknown,row:{rule:RuleDefinition})=>{policyDescription(row.rule)}}, + {title:'操作',width:90,render:(_:unknown,row:{code:string})=>}, + ]}/> }, + ]}/> +
    高级设置

    来源字段仅兼容旧数据;正常上传以“数据接入”中选定的字段对应为准。

    {sourcePanel}
    + setSourceEdit(null)} onOk={()=>void sourceForm.validateFields().then(fields=>{if(!sourceEdit)return;onChange({...value,sourceFields:{...sourceFields,[sourceEdit.stage]:{...obj(sourceFields[sourceEdit.stage]),[sourceEdit.alias]:fields.header.trim()}}});setSourceEdit(null);}).catch(()=>undefined)}> +
    公式引用名称{sourceEdit?.alias}
    +
    + {resultEdit && !rows.some(row=>row.stage===resultEdit.result.stage&&row.target===target))} onCancel={()=>setResultEdit(null)} onApply={result=>{ + const next = replaceResultFormula(value,result,result.rules); + if (ruleList(next.rowRules).length > Number(limits.maxRowRules || 100)) return '已超过允许的公式分支数量'; + const issue = newResultIssue(value,next,schema); if (issue) return issue; + onChange(next); setResultEdit(null); return undefined; + }}/>} + setMetricEdit(null)} onOk={()=>void metricForm.validateFields().then(checked=>{const fields={...metricForm.getFieldsValue(true),...checked}; + if(!metricEdit)return;const compiled=compileChineseFormula(fields.formula,metricFields,maxLength);if(!fields.useDefault&&compiled.error){setError(compiled.error);return;}const next={...metrics};if(fields.useDefault)delete next[metricEdit];else next[metricEdit]={...obj(metrics[metricEdit]),formula:compiled.formula,nullPolicy:fields.nullPolicy,zeroDenominatorPolicy:fields.zeroDenominatorPolicy,...(hasNullResult?{nullResultPolicy:fields.nullResultPolicy}:{})};if(checkedChange({...value,metricRules:next}))setMetricEdit(null); + }).catch(()=>undefined)}> +
    沿用默认公式 + +
    当前公式

    {metricEdit?displayFormula((Object.hasOwn(metrics,metricEdit)?obj(metrics[metricEdit]):obj(defaults[metricEdit])).formula):''}

    修改后

    {displayFormula(useDefault&&metricEdit?obj(defaults[metricEdit]).formula:nextFormula)}

    + {!useDefault&&} + + {error&&} +
    +
    ; +} diff --git a/web/src/StructuredConfigEditors.tsx b/web/src/StructuredConfigEditors.tsx index efdd690..c81ed64 100644 --- a/web/src/StructuredConfigEditors.tsx +++ b/web/src/StructuredConfigEditors.tsx @@ -2,7 +2,7 @@ import { newMasterDataCode } from './masterDataIdentity'; import { ConfigurationWorkbookActions } from './ConfigurationWorkbookActions'; import { matchRuleConflicts } from './classificationMaintenance'; import { useEffect, useMemo, useState } from 'react'; -import { Alert, App, AutoComplete, Button, Checkbox, Form, Input, InputNumber, Modal, Select, Switch, Tabs, Tag } from 'antd'; +import { Alert, App, AutoComplete, Button, Checkbox, Form, Input, InputNumber, Modal, Select, Switch, Tag } from 'antd'; import type { ColumnsType } from 'antd/es/table'; import { QualityTable as Table } from './QualityTable'; import { PlusOutlined } from '@ant-design/icons'; @@ -347,64 +347,4 @@ export function TechnicalDefinitionEditor({ value, onChange }: DefinitionProps) }}>应用到草稿{error && }; } -type RuleRow = Record; -const policyLabels: Record = { PROPAGATE: '任一输入为空则结果为空', ZERO: '空值按 0 参与计算', IGNORE: '全部为空则为空,其余按 0', ONE: '分母为 0 时返回 1', NULL: '分母为 0 时返回空值', ERROR: '分母为 0 时停止计算' }; -const nullResultLabels: Record = { NULL: '保留空值', ONE: '返回 1', ZERO: '返回 0', ERROR: '停止并报错' }; -const zeroPolicyLabels: Record = { ONE: '返回 1', ZERO: '返回 0', NULL: '返回空值', ERROR: '停止并报错' }; -const operatorLabels: Record = { EQ: '等于', NE: '不等于', CONTAINS: '包含', NOT_CONTAINS: '不包含', IS_BLANK: '为空', IS_NOT_BLANK: '不为空', GT: '大于', GTE: '大于等于', LT: '小于', LTE: '小于等于' }; -function stringList(value: unknown): string[] { return Array.isArray(value) ? value.map(String) : []; } - -export function RuleDefinitionEditor({ value, onChange, schema, schemaError, showWorkbookActions = true }: DefinitionProps & { schema: Record | null; schemaError: string; showWorkbookActions?: boolean }) { - const [tab, setTab] = useState('source'); const [editing, setEditing] = useState(null); const [ruleError, setRuleError] = useState(''); - const [form] = Form.useForm<{ stage: string; target: string; formula: string; nullPolicy: string; zeroDenominatorPolicy: string; nullResultPolicy: string; conditional: boolean; conditionField: string; conditionOperator: string; conditionValue: string; otherwiseFormula: string }>(); - const selectedStage = Form.useWatch('stage', form) || 'black'; const conditional = Form.useWatch('conditional', form); const conditionOperator = Form.useWatch('conditionOperator', form); - if (!schema) return ; - const configured = value.schemaVersion === schema.schemaVersion; - const workbookActions=showWorkbookActions?
    :null; - const fields = objectValue(schema.sourceFields); const targets = objectValue(schema.rowTargets); const componentLabels = objectValue(schema.componentLabels); const metricLabels = objectValue(schema.metricLabels); const baselineDescriptions = objectValue(schema.baselineMetricDescriptions); - const nullOptions = stringList(schema.nullPolicies).map(key => ({ value: key, label: policyLabels[key] || key })); const zeroOptions = stringList(schema.zeroDenominatorPolicies).map(key => ({ value: key, label: zeroPolicyLabels[key] || key })); - const nullResultOptions = stringList(schema.nullResultPolicies).map(key => ({ value: key, label: nullResultLabels[key] || key })); - const sourceFields = objectValue(value.sourceFields); const rowRules = Array.isArray(value.rowRules) ? value.rowRules.map(objectValue) : []; const metricRules = objectValue(value.metricRules); const metricCodes = stringList(schema.metricCodes); - const limits = objectValue(schema.limits); const maxFormulaLength = Number(limits.maxFormulaLength || 500); const maxRowRules = Number(limits.maxRowRules || 100); - const targetLabel = (target: unknown) => String(componentLabels[String(target)] || target || ''); const metricLabel = (metric: string) => String(metricLabels[metric] || metric); - const replaceRules = (rules: RuleRow[]) => onChange({ ...value, rowRules: rules }); - const editRow = (index: number | null) => { - const rule = index === null ? {} : rowRules[index]; const when = objectValue(rule.when); const stage = String(rule.stage || 'black'); - setEditing(index === null ? rowRules.length : index); setRuleError(''); - form.setFieldsValue({ stage, target: String(rule.target || stringList(targets[stage])[0] || ''), formula: String(rule.formula || ''), nullPolicy: String(rule.nullPolicy || 'PROPAGATE'), zeroDenominatorPolicy: String(rule.zeroDenominatorPolicy || 'ONE'), nullResultPolicy: String(rule.nullResultPolicy || 'NULL'), conditional: Boolean(rule.when), conditionField: String(when.field || Object.keys(objectValue(fields[stage]))[0] || ''), conditionOperator: String(when.operator || 'CONTAINS'), conditionValue: String(when.value ?? ''), otherwiseFormula: String(rule.otherwiseFormula || '') }); - }; - const metricVariables = ['blackGood', 'blackScrap', 'blackTotal', 'brightGood', 'brightScrap', 'brightTotal', 'headquartersScrap']; - const ruleColumns: ColumnsType = [ - { title: '顺序', dataIndex: 'index', width: 70, render: index => index + 1 }, - { title: '阶段 / 结果', key: 'target', width: 205, render: (_, row) => {row.stage === 'black' ? '黑片' : '亮片'} · {targetLabel(row.target)} }, - { title: '公式', dataIndex: 'formula', width: 290, render: formula => {String(formula)} }, - { title: '触发条件', key: 'when', width: 200, render: (_, row) => { const when = objectValue(row.when); return row.when ? `${String(objectValue(fields[String(row.stage)])[String(when.field)] || when.field)} ${operatorLabels[String(when.operator)] || when.operator} ${String(when.value ?? '')}` : '所有行'; } }, - { title: '操作', key: 'actions', width: 205, render: (_, row) => }, - ]; - if (!configured) return
    {workbookActions}
    ; - return
    {workbookActions} -

    将计算字段对应到来源表列名。未修改项沿用原列名,字段别名用于公式引用。

    ({ key: stage, label: stage === 'black' ? '黑片字段' : '亮片字段', children:
    ({ alias, header: String(header) }))} columns={[ - { title: '计算字段', dataIndex: 'header', width: 240 }, { title: '公式别名', dataIndex: 'alias', width: 200, render: alias => {alias} }, - { title: '来源表列名', key: 'source', render: (_, row) => onChange({ ...value, sourceFields: { ...sourceFields, [stage]: { ...objectValue(sourceFields[stage]), [row.alias]: event.target.value } } })} /> }, - ]} /> }))} /> }, - { key: 'rows', label: `行计算(${rowRules.length})`, children:
    按顺序执行;未覆盖的结果沿用原计算。
    ({ ...row, index }))} pagination={{pageSize:15,showSizeChanger:false}} scroll={{ x: 980 }} locale={{ emptyText: '当前全部沿用原始行计算' }} />

    修改报废等分量后,如需改变合计结果,请同时维护依赖它的合计公式。

    }, - { key: 'metrics', label: '指标公式', children:

    未开启覆盖的指标沿用原始公式。公式可引用重量变量及排在前面的指标结果。

    {metricCodes.map((metric, index) => { - const rule = objectValue(metricRules[metric]); const enabled = Object.hasOwn(metricRules, metric); - const updateMetric = (patch: Record) => onChange({ ...value, metricRules: { ...metricRules, [metric]: { ...rule, ...patch } } }); - return
    {metricLabel(metric)}{metric} { const next = { ...metricRules }; if (event.target.checked) next[metric] = { formula: '', nullPolicy: 'PROPAGATE', zeroDenominatorPolicy: 'ONE', ...(nullResultOptions.length ? { nullResultPolicy: 'NULL' } : {}) }; else delete next[metric]; onChange({ ...value, metricRules: next }); }}>使用此公式
    {Boolean(baselineDescriptions[metric]) &&

    原计算:{String(baselineDescriptions[metric])}

    }{enabled && <>
    updateMetric({ formula: event.target.value })} placeholder="填写四则运算公式" />
    updateMetric({ zeroDenominatorPolicy })} />
    {nullResultOptions.length > 0 &&
    form.setFieldsValue({ target: stringList(targets[stage])[0], conditionField: Object.keys(objectValue(fields[stage]))[0] })} />}
    仅在符合条件时执行{conditional && <>
    ({ value: operator, label: operatorLabels[operator] || operator }))} />
    {!['IS_BLANK', 'IS_NOT_BLANK'].includes(conditionOperator) && }}{ruleError && } - -
    ; -} +export { RuleSettingsEditor as RuleDefinitionEditor } from './RuleSettingsEditor'; diff --git a/web/src/formulaLanguage.ts b/web/src/formulaLanguage.ts new file mode 100644 index 0000000..d618b63 --- /dev/null +++ b/web/src/formulaLanguage.ts @@ -0,0 +1,116 @@ +import { displayFormula, ruleObject as obj, type RuleDefinition } from './rulePresentation.ts'; + +export type FormulaField = { key: string; label: string; group: string }; +const strings = (value: unknown): string[] => Array.isArray(value) ? value.map(String) : []; +export function rowFormulaFields(schema: RuleDefinition, stage: string): FormulaField[] { + return [ + ...Object.entries(obj(obj(schema.sourceFields)[stage])).filter(([key]) => !['inspectionNote','issueLocation','applicability'].includes(key)).map(([key, label]) => ({ key, label:String(label), group:'来源字段' })), + ...strings(obj(schema.rowTargets)[stage]).map(key => ({ key, label:String(obj(schema.componentLabels)[key] || key), group:'计算结果' })), + ]; +} +export function metricFormulaFields(schema: RuleDefinition, metric: string): FormulaField[] { + const inputs = ['blackGood','blackScrap','blackTotal','brightGood','brightScrap','brightTotal','headquartersScrap']; + const codes = strings(schema.metricCodes), at = codes.indexOf(metric); + return [...inputs.map(key => ({ key, label:displayFormula(key), group:'汇总重量' })), ...codes.slice(0, Math.max(0, at)).map(key => ({ key, label:String(obj(schema.metricLabels)[key] || displayFormula(key)), group:'已计算指标' }))]; +} +export function formulaFieldName(field: FormulaField, fields: FormulaField[]): string { + if (fields.filter(item => item.label === field.label).length === 1) return field.label; + const peers = fields.filter(item => item.label === field.label && item.group === field.group); + return `${field.group}·${field.label}${peers.length > 1 ? `(${peers.findIndex(item => item.key === field.key) + 1})` : ''}`; +} +export const formulaFieldReference = (field: FormulaField, fields: FormulaField[]) => `[${formulaFieldName(field,fields).replaceAll(']',']]')}]`; +function bracketAt(text: string, at: number): { name: string; end: number } { + let name = '', i = at + 1; + while (i < text.length) { + if (text[i] !== ']') { name += text[i++]; continue; } + if (text[i+1] === ']') { name += ']'; i += 2; continue; } + return { name, end:i+1 }; + } + throw new Error('字段引用缺少右方括号 ]'); +} +/** 只翻译显示标记;不改写数字、空白、运算结构或保存的原公式。 */ +export function chineseFormula(value: unknown, fields: FormulaField[]): string { + const text = String(value ?? ''), byKey = new Map(fields.map(field => [field.key,field])); + let result = '', i = 0; + while (i < text.length) { + if (text[i] === '[') { + try { const bracket=bracketAt(text,i); result += text.slice(i,bracket.end); i=bracket.end; continue; } catch { result += text.slice(i); break; } + } + const identifier = /^[A-Za-z_][A-Za-z0-9_]*/.exec(text.slice(i))?.[0]; + if (identifier) { result += byKey.has(identifier) ? formulaFieldReference(byKey.get(identifier)!,fields) : identifier === 'SUM' ? '求和' : identifier; i += identifier.length; } + else { result += text[i] === '*' ? '×' : text[i] === '/' ? '÷' : text[i]; i++; } + } + return result; +} + +type Token = { kind: 'number' | 'field' | 'function' | 'symbol'; value: string }; +/** 中文引用编译为既有引擎语法,只检查结构,不在浏览器求值。 */ +export function compileChineseFormula(input: unknown, fields: FormulaField[], maxLength = 500): { formula: string; error?: string } { + const text = String(input ?? ''), tokens: Token[] = [], parts: string[] = []; + try { + if (!text.trim()) throw new Error('请填写公式'); + const names = new Map(); + for (const field of fields) for (const name of new Set([field.label,formulaFieldName(field,fields)])) names.set(name,[...(names.get(name)||[]),field]); + const resolve = (name: string) => { + const matches = names.get(name); + if (!matches?.length) throw new Error(`找不到字段“${name}”`); + if (matches.length > 1) throw new Error(`字段“${name}”重名,请从字段列表选择`); + return matches[0].key; + }; + const aliases = new Set(fields.map(field => field.key)); + const bareNames = [...names.keys()].sort((a,b)=>b.length-a.length); + const push = (kind: Token['kind'], value: string) => { tokens.push({kind,value}); parts.push(value); }; + let i = 0; + while (i < text.length) { + const rest = text.slice(i), space = /^\s+/.exec(rest)?.[0]; + if (space) { parts.push(space); i += space.length; continue; } + if (text[i] === '[') { const bracket=bracketAt(text,i); push('field',resolve(bracket.name)); i=bracket.end; continue; } + const fn = /^(求和|SUM)(?=\s*[((])/.exec(rest)?.[0]; + if (fn) { push('function','SUM'); i += fn.length; continue; } + const knownAlias = /^[A-Za-z_][A-Za-z0-9_]*/.exec(rest)?.[0]; + if (knownAlias && aliases.has(knownAlias)) { push('field',knownAlias); i += knownAlias.length; continue; } + const name = bareNames.find(name => rest.startsWith(name)); + if (name) { push('field',resolve(name)); i += name.length; continue; } + const number = /^[\d.]+/.exec(rest)?.[0]; + if (number) { + if (!/^(?:\d+(?:\.\d*)?|\.\d+)$/.test(number)) throw new Error('数值格式无效'); + if (number.length > 50) throw new Error('数值常量不能超过50字'); + push('number',number); i += number.length; continue; + } + const identifier = /^[A-Za-z_][A-Za-z0-9_]*/.exec(rest)?.[0]; + if (identifier) { if (!aliases.has(identifier)) throw new Error(`找不到字段“${identifier}”`); push('field',identifier); i += identifier.length; continue; } + const symbols: Record = { '×':'*','÷':'/','−':'-','+':'+','-':'-','(':'(',')':')',',':',' }; + const symbol = symbols[text[i]] || text[i]; + if ('+-*/(),'.includes(symbol)) { push('symbol',symbol); i++; continue; } + throw new Error(`无法识别“${rest.split(/[\s+\-*/(),]/)[0]}”,请从列表选择字段`); + } + const formula = parts.join(''); + if (formula.length > maxLength) throw new Error(`公式过长,转换后最多${maxLength}字`); + let at = 0, depth = 0, count = 0; + const take = (value: string) => { if (tokens[at]?.value === value && tokens[at]?.kind === 'symbol') { at++; return true; } return false; }; + const open = () => { if (++depth > 32) throw new Error('括号嵌套不能超过32层'); }; + const factor = (): void => { + if (++count > 250) throw new Error('公式过于复杂'); + if (take('+') || take('-')) { factor(); return; } + if (take('(')) { open(); expression(); if (!take(')')) throw new Error('括号不匹配'); depth--; return; } + const token = tokens[at++]; + if (token?.kind === 'function') { + if (!take('(')) throw new Error('求和后需要括号'); open(); let args=0; + do { if (++args > 20) throw new Error('求和最多20个参数'); expression(); } while (take(',')); + if (!take(')')) throw new Error('求和括号不匹配'); depth--; return; + } + if (!token || !['number','field'].includes(token.kind)) throw new Error('请补全数字、字段或括号'); + }; + const term = () => { factor(); while (take('*') || take('/')) factor(); }; + const expression = () => { term(); while (take('+') || take('-')) term(); }; + expression(); + if (at !== tokens.length) throw new Error('请检查运算符、逗号及括号的位置'); + return {formula}; + } catch (error) { return {formula:text,error:error instanceof Error?error.message:'公式未填写完整'}; } +} + +export function insertFormulaPart(text: string, start: number, end: number, part: string, fn = false): { text: string; caret: number } { + const from=Math.max(0,Math.min(start,text.length)),to=Math.max(from,Math.min(end,text.length)); + const insertion=fn?`求和(${text.slice(from,to)})`:part; + return { text:text.slice(0,from)+insertion+text.slice(to),caret:from+insertion.length-(fn?1:0) }; +} diff --git a/web/src/resultFormulas.ts b/web/src/resultFormulas.ts new file mode 100644 index 0000000..b600a1d --- /dev/null +++ b/web/src/resultFormulas.ts @@ -0,0 +1,93 @@ +import { displayRowFormula, ruleLogicIssues } from './ruleEditing.ts'; +import { ruleList, ruleObject as obj, type RuleDefinition } from './rulePresentation.ts'; + +export type ResultFormula = { stage: string; target: string; indexes: number[]; rules: RuleDefinition[] }; +export const conditionOperators: Record = { EQ:'等于', NE:'不等于', CONTAINS:'包含', NOT_CONTAINS:'不包含', IS_BLANK:'为空', IS_NOT_BLANK:'不为空', GT:'大于', GTE:'大于等于', LT:'小于', LTE:'小于等于' }; +export const blankCondition = (operator: unknown) => ['IS_BLANK', 'IS_NOT_BLANK'].includes(String(operator)); + +/** 展示按结果归并;原始规则的位置、分支、策略和执行顺序均不变。 */ +export function stageResultFormulas(definition: RuleDefinition, stage: string): ResultFormula[] { + const results = new Map(); + ruleList(definition.rowRules).forEach((rule, index) => { + if (rule.stage !== stage) return; + const target = String(rule.target); + if (!results.has(target)) results.set(target, { stage, target, indexes: [], rules: [] }); + const result = results.get(target)!; + result.indexes.push(index); result.rules.push(rule); + }); + return [...results.values()]; +} + +export function describeCondition(rule: RuleDefinition, schema: RuleDefinition): string { + const when = obj(rule.when), fields = obj(obj(schema.sourceFields)[String(rule.stage)]); + return `${String(fields[String(when.field)] || when.field)}${conditionOperators[String(when.operator)] || String(when.operator)}${blankCondition(when.operator) ? '' : `“${String(when.value ?? '')}”`}`; +} + +type Expression = { text: string } | { condition: string; yes: string; no: Expression; signature: string }; +const expressionText = (expression: Expression): string => 'text' in expression ? expression.text : `若${expression.condition},取${expression.yes};否则${'text' in expression.no ? `取${expression.no.text}` : `(${expressionText(expression.no)})`}`; +const choiceExpression = (expression: Expression) => 'text' in expression ? undefined : expression; +const policyKey = (rule: RuleDefinition) => JSON.stringify([rule.nullPolicy || 'PROPAGATE', rule.zeroDenominatorPolicy || 'ONE', rule.nullResultPolicy || 'NULL']); + +export function describeResultFormula(result: ResultFormula, schema: RuleDefinition): string { + let expression: Expression = { text: '原计算结果' }; + for (const rule of result.rules) { + const previous = expressionText(expression); + // 先替换自引用,再翻译业务字段名,保留对“此前值”的含义。 + const translated = (value: unknown) => { + const raw = String(value ?? '').replace(new RegExp(`\\b${result.target}\\b`, 'g'), '__previous_result__'); + return displayRowFormula({ ...rule, formula: raw }, schema).replaceAll('__previous_result__', `(${previous})`); + }; + const yes = translated(rule.formula); + if (!rule.when) { expression = { text: yes }; continue; } + const no: Expression = rule.otherwiseFormula !== undefined ? { text: translated(rule.otherwiseFormula) } : expression; + const signature = JSON.stringify([rule.formula, policyKey(rule)]); + const condition = describeCondition(rule, schema); + // 只合并展示相同取值的“或”条件,不合并存储、求值或异常处理。 + const selfReference = new RegExp(`\\b${result.target}\\b`).test(String(rule.formula)); + const previousChoice = choiceExpression(no); + expression = rule.otherwiseFormula === undefined && !selfReference && previousChoice?.signature === signature + ? { condition: `${condition} 或 ${previousChoice.condition}`, yes, no: previousChoice.no, signature } + : { condition, yes, no, signature }; + } + return expressionText(expression); +} + +/** 更新本结果的原位置;其他结果的规则对象与相对次序保持不变。 */ +export function replaceResultFormula(definition: RuleDefinition, result: Pick, rules: RuleDefinition[]): RuleDefinition { + if (rules.some(rule => rule.stage !== result.stage || rule.target !== result.target)) throw new Error('公式分支必须属于同一个计算结果'); + const rows = ruleList(definition.rowRules); + const positions = rows.flatMap((row, index) => row.stage === result.stage && row.target === result.target ? [index] : []); + let next: RuleDefinition[]; + if (!positions.length) { + const lastStage = rows.map(row => row.stage).lastIndexOf(result.stage); + const insert = lastStage < 0 ? rows.length : lastStage + 1; + next = [...rows.slice(0, insert), ...rules, ...rows.slice(insert)]; + } else { + let position = 0; + next = rows.flatMap((row, index) => { + if (row.stage !== result.stage || row.target !== result.target) return [row]; + const replacement = position < rules.length ? [rules[position]] : []; + position++; + return index === positions.at(-1) ? [...replacement, ...rules.slice(position)] : replacement; + }); + } + return JSON.stringify(next) === JSON.stringify(rows) ? definition : { ...definition, rowRules: next }; +} + +export function newResultIssue(before: RuleDefinition, after: RuleDefinition, schema: RuleDefinition): string | undefined { + const prior = new Set(ruleLogicIssues(before, schema).map(issue => issue.key)); + return ruleLogicIssues(after, schema).find(issue => !prior.has(issue.key))?.message; +} + +/** 移动完整结果及其分支,仅交换两个相邻结果占用的位置。 */ +export function planResultMove(definition: RuleDefinition, stage: string, target: string, direction: number, schema: RuleDefinition): { definition?: RuleDefinition; reason?: string } { + const results = stageResultFormulas(definition, stage), index = results.findIndex(result => result.target === target); + const current = results[index], other = results[index + direction]; + if (!current || !other) return { reason: direction < 0 ? '已是当前阶段的第一项' : '已是当前阶段的最后一项' }; + const positions = [...current.indexes, ...other.indexes].sort((a, b) => a - b); + const replacements = direction < 0 ? [...current.rules, ...other.rules] : [...other.rules, ...current.rules]; + const next = ruleList(definition.rowRules).slice(); + positions.forEach((position, i) => { next[position] = replacements[i]; }); + const candidate = { ...definition, rowRules: next }, reason = newResultIssue(definition, candidate, schema); + return reason ? { reason } : { definition: candidate }; +} diff --git a/web/src/ruleEditing.ts b/web/src/ruleEditing.ts new file mode 100644 index 0000000..71b4e3e --- /dev/null +++ b/web/src/ruleEditing.ts @@ -0,0 +1,81 @@ +import { displayFormula, ruleList, ruleObject as obj, type RuleDefinition } from './rulePresentation.ts'; + +export type RuleIssue = { index: number; key: string; message: string }; +const strings = (value: unknown): string[] => Array.isArray(value) ? value.map(String) : []; +const identifiers = (formula: unknown): string[] => typeof formula === 'string' ? [...new Set(formula.match(/[A-Za-z_][A-Za-z0-9_]*/g) || [])] : []; +const metricInputs = ['blackGood','blackScrap','blackTotal','brightGood','brightScrap','brightTotal','headquartersScrap']; +const textFields = new Set(['issueLocation','inspectionNote','applicability']); +const conditionKey = (value: unknown) => { const when = obj(value); return JSON.stringify([when.field, when.operator, String(when.value ?? '')]); }; + +/** 仅检查显式编排与变量,不求值、不改写公式;语法和数值仍由正式规则引擎校验。 */ +export function ruleLogicIssues(definition: RuleDefinition, schema: RuleDefinition): RuleIssue[] { + const rows = ruleList(definition.rowRules), issues: RuleIssue[] = []; + const label = (key: string) => String(obj(schema.componentLabels)[key] || obj(schema.metricLabels)[key] || key); + const add = (index: number, key: string, message: string) => issues.push({ index, key, message }); + const step = (index: number) => `“${label(String(rows[index]?.target))}”`; + rows.forEach((row, index) => { + const stage = String(row.stage), target = String(row.target), stageTargets = strings(obj(schema.rowTargets)[stage]); + const source = obj(obj(schema.sourceFields)[stage]); + const allowed = new Set([...Object.keys(source).filter(key => !textFields.has(key)), ...stageTargets, 'SUM']); + if (!stageTargets.includes(target)) add(index, `target:${stage}:${target}`, `${step(index)}的计算结果不属于当前阶段`); + for (const key of ['formula', ...(row.when && row.otherwiseFormula ? ['otherwiseFormula'] : [])]) { + const formula = row[key]; + if (typeof formula !== 'string' || !formula.trim()) add(index, `empty:${stage}:${target}:${key}`, `${step(index)}的公式不能为空`); + for (const variable of identifiers(formula)) { + if (!allowed.has(variable)) add(index, `variable:${stage}:${target}:${variable}`, `${step(index)}存在不可用的公式变量:${String(source[variable] || variable)}`); + // 未单独维护的结果继续沿用原计算。已维护的分量应完成全部覆盖后再被引用。 + if (variable !== target && stageTargets.includes(variable) && rows.some((writer, i) => i > index && writer.stage === stage && writer.target === variable)) + add(index, `dependency:${stage}:${target}:${variable}`, `${step(index)}引用了“${label(variable)}”,但后面还会修改它;应先完成分量计算,再计算“${label(target)}”`); + } + } + if (row.when) { + const when = obj(row.when); + if (!Object.hasOwn(source, String(when.field))) add(index, `condition:${stage}:${target}`, `${step(index)}的条件字段不可用`); + if (!strings(schema.conditionOperators).includes(String(when.operator))) add(index, `operator:${stage}:${target}`, `${step(index)}的判断方式不可用`); + if (!['IS_BLANK','IS_NOT_BLANK'].includes(String(when.operator)) && (when.value === undefined || when.value === null || String(when.value).trim() === '')) + add(index, `condition-value:${stage}:${target}`, `${step(index)}需要填写条件值`); + if (['GT','GTE','LT','LTE'].includes(String(when.operator)) && !/^[+-]?(?:\d+(?:\.\d*)?|\.\d+)$/.test(String(when.value))) + add(index, `condition-number:${stage}:${target}`, `${step(index)}的比较条件需要填写数值`); + if (rows.some((later, i) => i > index && later.stage === stage && later.target === target && !later.when)) + add(index, `overwrite:${stage}:${target}`, `${step(index)}的条件结果会被后面的“所有记录”公式覆盖;默认值应放在条件覆盖之前`); + const duplicate = rows.findIndex((earlier, i) => i < index && earlier.stage === stage && earlier.target === target && conditionKey(earlier.when) === conditionKey(row.when) && earlier.formula !== row.formula); + if (duplicate >= 0) add(index, `duplicate:${stage}:${target}:${conditionKey(row.when)}`, `${step(duplicate)}与${step(index)}的条件相同,计算方式却不一致`); + } + }); + const metricCodes = strings(schema.metricCodes), allowed = new Set([...metricInputs, 'SUM']); + for (const code of metricCodes) { + const rule = obj(obj(definition.metricRules)[code]); + if (Object.hasOwn(obj(definition.metricRules), code)) { + if (!String(rule.formula || '').trim()) add(-1, `metric-empty:${code}`, `“${label(code)}”的公式不能为空`); + for (const variable of identifiers(rule.formula)) if (!allowed.has(variable)) add(-1, `metric-variable:${code}:${variable}`, `“${label(code)}”引用了不可用或尚未计算的变量:${label(variable)}`); + } + allowed.add(code); + } + return issues; +} + +export function neighboringRuleIndex(rows: RuleDefinition[], index: number, direction: number): number | undefined { + const row = rows[index]; if (!row) return undefined; + const positions = rows.flatMap((item, i) => item.stage === row.stage ? [i] : []); + return positions[positions.indexOf(index) + direction]; +} + +export function planRuleMove(definition: RuleDefinition, index: number, direction: number, schema: RuleDefinition): { definition?: RuleDefinition; reason?: string } { + const rows = ruleList(definition.rowRules), other = neighboringRuleIndex(rows, index, direction); + if (other === undefined) return { reason: direction < 0 ? '已是当前阶段的第一步' : '已是当前阶段的最后一步' }; + const next = rows.slice(); [next[index], next[other]] = [next[other], next[index]]; + const candidate = { ...definition, rowRules: next }; + const prior = new Set(ruleLogicIssues(definition, schema).map(issue => issue.key)); + const introduced = ruleLogicIssues(candidate, schema).find(issue => !prior.has(issue.key)); + return introduced ? { reason: introduced.message } : { definition: candidate }; +} + +export function displayRowFormula(row: RuleDefinition, schema: RuleDefinition): string { + const names = { ...obj(schema.componentLabels), ...obj(obj(schema.sourceFields)[String(row.stage)]) }; + const formula = String(row.formula ?? ''); + return formula.replace(/[A-Za-z_][A-Za-z0-9_]*/g, token => token === 'SUM' ? '求和' : String(names[token] || displayFormula(token))).replace(/\*/g, '×').replace(/\//g, '÷'); +} + +export function isDefaultAssignment(row: RuleDefinition, index: number, rows: RuleDefinition[]): boolean { + return !row.when && rows.some((later, i) => i > index && later.stage === row.stage && later.target === row.target && Boolean(later.when)); +} diff --git a/web/src/rulePresentation.ts b/web/src/rulePresentation.ts new file mode 100644 index 0000000..61cfb23 --- /dev/null +++ b/web/src/rulePresentation.ts @@ -0,0 +1,51 @@ +import { readableMetricFormula } from './publicDataDisplay.ts'; + +export type RuleDefinition = Record; +export const ruleObject = (value: unknown): RuleDefinition => value && typeof value === 'object' && !Array.isArray(value) ? value as RuleDefinition : {}; +export const ruleList = (value: unknown): RuleDefinition[] => Array.isArray(value) ? value.map(ruleObject) : []; +export const METRIC_KEYS: Record = { + BLACK_RATE: 'blackRate', BRIGHT_RATE: 'brightRate', COMPOSITE_RATE: 'compositeRate', + BRIGHT_RATE_WITHOUT_HEADQUARTERS_SCRAP: 'brightRateWithoutHeadquartersScrap', + COMPOSITE_RATE_WITHOUT_HEADQUARTERS_SCRAP: 'compositeRateWithoutHeadquartersScrap', +}; +export const METRIC_NAMES: Record = { + BLACK_RATE: '黑片合格率', BRIGHT_RATE: '亮片合格率', COMPOSITE_RATE: '综合合格率', + BRIGHT_RATE_WITHOUT_HEADQUARTERS_SCRAP: '亮片合格率(不含本部报废)', + COMPOSITE_RATE_WITHOUT_HEADQUARTERS_SCRAP: '综合合格率(不含本部报废)', +}; +export function displayFormula(value: unknown): string { + return typeof value === 'string' && value.trim() ? readableMetricFormula(value) : '未单独设置'; +} +export function formulaOnly(value: string): string { return value.split(/[;;]/)[0]; } +export function policyDescription(rule: RuleDefinition, rate = true): string { + const outcome = (key: unknown) => ({ ONE: rate ? '按100%处理' : '取1', ZERO: rate ? '按0%处理' : '取0', NULL: '保留空白', ERROR: '停止并报错' }[String(key)] || String(key)); + const missing = ({ PROPAGATE: '运算结果为空', ZERO: '按0参与运算', IGNORE: '忽略空项,全部为空时结果为空' } as Record)[String(rule.nullPolicy || 'PROPAGATE')]; + return `输入缺失:${missing};分母为0:${outcome(rule.zeroDenominatorPolicy || 'ONE')};最终为空:${outcome(rule.nullResultPolicy || 'NULL')}`; +} +export function stageRuleRows(definition: RuleDefinition, stage: string): (RuleDefinition & { index: number })[] { + return ruleList(definition.rowRules).flatMap((rule, index) => rule.stage === stage ? [{ ...rule, index }] : []); +} +export function ruleChangeSummary(before: RuleDefinition, after: RuleDefinition): string[] { + const changes: string[] = []; + for (const stage of ['black', 'bright']) { + const a = ruleObject(ruleObject(before.sourceFields)[stage]), b = ruleObject(ruleObject(after.sourceFields)[stage]); + const count = [...new Set([...Object.keys(a), ...Object.keys(b)])].filter(key => a[key] !== b[key]).length; + if (count) changes.push(`${stage === 'black' ? '黑片' : '亮片'}来源字段 ${count} 项`); + } + const a = ruleList(before.rowRules), b = ruleList(after.rowRules); + const count = Array.from({ length: Math.max(a.length, b.length) }, (_, i) => i).filter(i => JSON.stringify(a[i]) !== JSON.stringify(b[i])).length; + if (count) changes.push(`行计算 ${count} 个位置`); + const am = ruleObject(before.metricRules), bm = ruleObject(after.metricRules); + const metrics = [...new Set([...Object.keys(am), ...Object.keys(bm)])].filter(key => JSON.stringify(am[key]) !== JSON.stringify(bm[key])).length; + if (metrics) changes.push(`合格率公式 ${metrics} 项`); + return changes; +} + +// 仅呈现服务端既有优先级:匹配维度更多者优先,同维度数量时业务分组优先。 +export function matchingTarget(targets: RuleDefinition[], dimensions: RuleDefinition): RuleDefinition | undefined { + const keys = ['department', 'group', 'product', 'projectGroup']; + const filled = (value: unknown) => value !== null && value !== undefined && String(value).trim() !== '' && value !== '*'; + const candidates = targets.filter(target => keys.every(key => !filled(ruleObject(target.dimensions)[key]) || ruleObject(target.dimensions)[key] === dimensions[key])); + const count = (target: RuleDefinition) => keys.filter(key => filled(ruleObject(target.dimensions)[key])).length; + return candidates.slice().sort((a, b) => count(b) - count(a) || Number(filled(ruleObject(b.dimensions).group)) - Number(filled(ruleObject(a.dimensions).group)))[0]; +} diff --git a/web/src/rules-workspace.css b/web/src/rules-workspace.css new file mode 100644 index 0000000..5aea369 --- /dev/null +++ b/web/src/rules-workspace.css @@ -0,0 +1,33 @@ +.rule-page-toolbar,.rule-stage-toolbar{display:flex;align-items:center;justify-content:space-between;gap:16px;margin-bottom:18px;flex-wrap:wrap} +.target-filters{display:flex;align-items:center;gap:10px;flex-wrap:wrap}.target-filters>.ant-select:first-child{min-width:110px}.target-filters>.ant-select:nth-child(2){min-width:240px} +.rule-pipeline{display:flex;gap:0;list-style:none;margin:0 0 22px;padding:0;border:1px solid var(--line,#e2e7f0);border-radius:4px;overflow:hidden} +.rule-pipeline li{flex:1;padding:13px 18px;color:var(--muted-ink,#62718a);background:var(--surface-subtle,#f7f9fc);font-size:13px;text-align:center} +.rule-pipeline li+li{border-left:1px solid var(--line,#e2e7f0)}.rule-pipeline li+li::before{content:'→';margin-right:16px;color:var(--blue,#647bea)} +.rule-source-sections{display:grid;gap:24px}.rule-source-sections h3{font-size:14px;margin:0 0 12px;font-weight:600}.rule-settings .ant-tabs-content{padding-top:8px} +.rule-stage-toolbar>span{font-size:12px;color:var(--muted-ink,#62718a)} +.rule-reference{margin:18px 0;color:var(--muted-ink,#62718a);font-size:12px}.rule-reference>summary{cursor:pointer;padding:4px 0;font-size:13px}.rule-reference p{margin:6px 0}.rule-reference code{color:var(--ink,#24324b)} +.rule-change-preview{display:grid;grid-template-columns:1fr 1fr;gap:16px;padding:14px;margin:0 0 20px;background:var(--surface-subtle,#f7f9fc);border:1px solid var(--line,#e2e7f0);border-radius:4px}.rule-change-preview span{font-size:12px;color:var(--muted-ink,#62718a)}.rule-change-preview p{margin:7px 0 0;line-height:1.7;overflow-wrap:anywhere} +.rule-pending-changes{display:flex;gap:14px;flex-wrap:wrap;padding:14px 0;border-top:1px solid var(--line,#e2e7f0);font-size:13px}.rule-pending-changes strong{font-weight:600}.rule-policy-summary{font-size:12px;line-height:1.8;white-space:normal;overflow-wrap:anywhere} +.rule-form-modal .ant-collapse{margin:14px 0}.quality-targets-panel .ant-table-cell{vertical-align:middle} +@media(max-width:700px){.rule-pipeline{flex-direction:column}.rule-pipeline li+li{border-left:0;border-top:1px solid var(--line,#e2e7f0)}.rule-pipeline li+li::before{content:'↓'}.rule-change-preview{grid-template-columns:1fr}.target-filters{width:100%}.target-filters>.ant-select:nth-child(2){flex:1;min-width:170px}.rule-page-toolbar>.task-actions{width:100%;justify-content:flex-end}} + + + +.rule-settings .ant-tabs-tab-btn{color:var(--muted-ink,#62718a)}.rule-settings .ant-tabs-tab-active .ant-tabs-tab-btn{color:var(--blue,#607ae1)} + + +.rule-form-logic{grid-template-columns:1fr}.rule-order-error{margin-bottom:16px} + +.result-condition-branch{border:1px solid var(--line,#e2e7f0);border-radius:4px;padding:12px 14px;margin:12px 0} +.result-branch-heading{display:flex;align-items:center;justify-content:space-between;margin-bottom:10px}.result-branch-heading strong{font-size:13px;font-weight:600} +.result-condition-fields{display:grid;grid-template-columns:minmax(0,1.5fr) minmax(110px,.8fr) minmax(0,1fr);gap:12px} +.result-formula-modal .ant-form-item{margin-bottom:12px}.result-formula-modal .rule-change-preview{padding:10px 12px;margin-bottom:14px}.result-formula-modal .result-rule-options{margin:4px 0}.result-rule-options>summary{font-size:12px} +.result-priority-hint,.result-fallback{font-size:12px;color:var(--muted-ink,#62718a);margin:14px 0 8px}.result-fallback{display:flex;align-items:center;justify-content:space-between;gap:12px} +@media(max-width:600px){.result-condition-fields{grid-template-columns:1fr 1fr}.result-condition-fields>.ant-form-item:first-child{grid-column:1/-1}.result-condition-branch{padding:10px}.result-formula-modal .rule-change-preview p{font-size:13px}} + +.formula-input-toolbar{display:flex;align-items:center;justify-content:space-between;gap:8px;flex-wrap:wrap;margin-bottom:6px}.formula-operator-buttons{display:flex;align-items:center;gap:2px}.formula-operator-buttons .ant-btn{min-width:28px;padding-inline:6px} +.chinese-formula-editor textarea{font-family:inherit;line-height:1.7}.formula-input-error{font-size:12px;color:var(--danger,#d14343);margin-top:5px;line-height:1.5}.formula-field-chooser{width:min(310px,calc(100vw - 56px))}.formula-field-list{max-height:280px;overflow:auto;margin-top:8px}.formula-field-list h4{font-size:12px;font-weight:500;color:var(--muted-ink,#62718a);margin:10px 6px 4px}.formula-field-list .ant-btn{height:auto;min-height:30px;justify-content:flex-start;white-space:normal;text-align:left;font-size:13px;padding:5px 8px}.formula-field-list .ant-btn>span{white-space:normal;overflow-wrap:anywhere}.formula-field-list>p{font-size:12px;color:var(--muted-ink,#62718a);padding:8px} +.result-formula-modal .formula-editor-disabled{opacity:.65}.result-formula-modal .ant-alert{margin-bottom:12px} +@media(max-width:600px){.formula-input-toolbar{gap:4px}.formula-operator-buttons .ant-btn{min-width:24px;padding-inline:4px}} + +.result-formula-fallback{margin-top:16px;padding-top:14px;border-top:1px solid var(--line,#e2e7f0)} diff --git a/web/verification/formula_language.test.mjs b/web/verification/formula_language.test.mjs new file mode 100644 index 0000000..3d69612 --- /dev/null +++ b/web/verification/formula_language.test.mjs @@ -0,0 +1,63 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { chineseFormula, compileChineseFormula, formulaFieldReference, insertFormulaPart, rowFormulaFields, metricFormulaFields } from '../src/formulaLanguage.ts'; +const schema={sourceFields:{black:{platingWeight:'送电镀重量',shipmentWeight:'黑片出货重量',inspectionNote:'检验备注',issueLocation:'发料地点'},bright:{scrapWeight:'检包入废品库重量',applicability:'是否电镀来料/二等品库来料'}},rowTargets:{black:['black_good_weight','black_scrap_weight','black_total_weight'],bright:['bright_scrap_weight']},componentLabels:{black_good_weight:'黑片合格重量',black_scrap_weight:'黑片报废重量',black_total_weight:'黑片总重量',bright_scrap_weight:'亮片报废重量'},metricCodes:['blackRate','brightRate','compositeRate'],metricLabels:{blackRate:'黑片合格率',brightRate:'亮片合格率'}}; +const fields=rowFormulaFields(schema,'black'); +test('formula catalogs are stage-specific, exclude text, and forbid future metric references',()=>{ + assert.ok(fields.some(f=>f.key==='platingWeight'));assert.ok(!fields.some(f=>['inspectionNote','issueLocation','scrapWeight'].includes(f.key))); + assert.ok(rowFormulaFields(schema,'bright').some(f=>f.key==='scrapWeight')); + assert.deepEqual(metricFormulaFields(schema,'brightRate').filter(f=>f.group==='已计算指标').map(f=>f.key),['blackRate']); + assert.ok(!metricFormulaFields(schema,'blackRate').some(f=>f.key==='compositeRate')); +}); +test('existing formulas display Chinese references, including SUM and arithmetic',()=>{ + assert.equal(chineseFormula('platingWeight + shipmentWeight',fields),'[送电镀重量] + [黑片出货重量]'); + assert.equal(chineseFormula('SUM(black_good_weight, black_scrap_weight) / black_total_weight',fields),'求和([黑片合格重量], [黑片报废重量]) ÷ [黑片总重量]'); +}); +test('raw formulas round-trip exactly, including whitespace, numbers and nesting',()=>{ + for(const source of ['platingWeight + shipmentWeight','SUM(black_good_weight, black_scrap_weight) / black_total_weight',' ( -platingWeight + .50 ) * 2.00\n','0']){ + assert.deepEqual(compileChineseFormula(chineseFormula(source,fields),fields),{formula:source}); + assert.deepEqual(compileChineseFormula(source,fields),{formula:source}); + } +}); +test('users can type Chinese names with or without field brackets',()=>{ + assert.equal(compileChineseFormula('送电镀重量 + 黑片出货重量',fields).formula,'platingWeight + shipmentWeight'); + assert.equal(compileChineseFormula('求和([黑片合格重量],[黑片报废重量]) ÷ [黑片总重量]',fields).formula,'SUM(black_good_weight,black_scrap_weight) / black_total_weight'); + assert.equal(compileChineseFormula('−[送电镀重量] × 2 + 1',fields).formula,'-platingWeight * 2 + 1'); +}); +test('longest field name wins without rewriting raw alias prefixes',()=>{ + const catalog=[{key:'a',label:'重量',group:'来源字段'},{key:'ab',label:'重量合计',group:'来源字段'},{key:'goodWeight',label:'合格',group:'来源字段'},{key:'g',label:'good',group:'计算结果'}]; + assert.equal(compileChineseFormula('重量合计 - 重量',catalog).formula,'ab - a'); + assert.equal(compileChineseFormula('goodWeight + g',catalog).formula,'goodWeight + g'); +}); +test('duplicate display names require a qualified Chinese selection',()=>{ + const catalog=[{key:'source',label:'合格重量',group:'来源字段'},{key:'result',label:'合格重量',group:'计算结果'}]; + assert.match(compileChineseFormula('[合格重量]',catalog).error,/重名/); + assert.equal(chineseFormula('source + result',catalog),'[来源字段·合格重量] + [计算结果·合格重量]'); + assert.equal(compileChineseFormula('[来源字段·合格重量] + [计算结果·合格重量]',catalog).formula,'source + result'); +}); +test('field references escape closing brackets and never translate identifiers inside a label',()=>{ + const catalog=[{key:'a',label:'字段]a',group:'来源字段'}]; + const reference=formulaFieldReference(catalog[0],catalog);assert.equal(reference,'[字段]]a]'); + assert.equal(chineseFormula(reference,catalog),reference);assert.equal(compileChineseFormula(reference,catalog).formula,'a'); +}); +test('unrecognized and text fields cannot be silently dropped',()=>{ + for(const text of ['[不存在] + 1','[检验备注]','missingWeight','[送电镀重量'])assert.ok(compileChineseFormula(text,fields).error,text); + assert.match(compileChineseFormula('compositeRate',metricFormulaFields(schema,'blackRate')).error,/找不到字段/); +}); +test('syntax validation catches incomplete arithmetic and unsupported functions without evaluating',()=>{ + for(const text of ['','[送电镀重量] +','([送电镀重量]','[送电镀重量][黑片出货重量]','求和()','求和(1,)','1,2','1.2.3','2[送电镀重量]','IF(1,2,3)','1e3'])assert.ok(compileChineseFormula(text,fields).error,text); + for(const text of ['1 / 0','[送电镀重量] - -2','SUM(1,2,(3+4))'])assert.equal(compileChineseFormula(text,fields).error,undefined,text); +}); +test('editor validation mirrors engine bounds on length, nesting, function arguments and numbers',()=>{ + assert.match(compileChineseFormula('('.repeat(33)+'1'+')'.repeat(33),fields).error,/32/); + assert.match(compileChineseFormula('求和('+Array(21).fill('1').join(',')+')',fields).error,/20/); + assert.match(compileChineseFormula('1'.repeat(51),fields).error,/50/); + assert.match(compileChineseFormula('[送电镀重量] + 1',fields,10).error,/最多10/); + assert.equal(compileChineseFormula('求和('+Array(20).fill('1').join(',')+')',fields).error,undefined); +}); +test('inserting fields replaces only the selected range and returns the new caret',()=>{ + const text='[送电镀重量] + [黑片出货重量]',start=text.indexOf('[黑片出货重量]'); + assert.deepEqual(insertFormulaPart(text,start,text.length,'[黑片报废重量]'),{text:'[送电镀重量] + [黑片报废重量]',caret:start+'[黑片报废重量]'.length}); + assert.deepEqual(insertFormulaPart('1 + 2',4,5,'',true),{text:'1 + 求和(2)',caret:8}); + assert.deepEqual(insertFormulaPart('',0,0,'',true),{text:'求和()',caret:3}); +}); diff --git a/web/verification/result_formulas.test.mjs b/web/verification/result_formulas.test.mjs new file mode 100644 index 0000000..0b90338 --- /dev/null +++ b/web/verification/result_formulas.test.mjs @@ -0,0 +1,73 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { stageResultFormulas, describeResultFormula, replaceResultFormula, planResultMove, newResultIssue } from '../src/resultFormulas.ts'; +const row=(stage,target,formula,when)=>({stage,target,formula,...(when?{when}:{}),nullPolicy:'PROPAGATE',zeroDenominatorPolicy:'ONE',nullResultPolicy:'NULL'}); +const condition=value=>({field:'issueLocation',operator:'CONTAINS',value}); +const schema={sourceFields:{black:{goodWeight:'合格重量',externalScrap:'外废重量',inspectionNote:'检验备注',issueLocation:'发料地点'},bright:{goodWeight:'合格重量',scrapWeight:'检包入废品库重量',applicability:'是否电镀来料/二等品库来料'}},componentLabels:{good:'黑片合格重量',scrap:'黑片报废重量',external:'黑片外废',reuse:'利用料报废扣减',reuseGood:'利用料合格扣减',total:'黑片总重量',brightGood:'亮片合格重量',brightScrap:'亮片报废重量'},rowTargets:{black:['good','external','scrap','reuse','reuseGood','total'],bright:['brightGood','brightScrap']},conditionOperators:['EQ','CONTAINS','IS_BLANK'],metricCodes:[]}; +const base={schemaVersion:'v1',sourceFields:{black:{externalScrap:'外废重量'}},rowRules:[ + row('black','good','goodWeight'),row('black','external','externalScrap'),row('black','external','0',{field:'inspectionNote',operator:'CONTAINS',value:'过账'}),row('black','scrap','external'), + row('black','reuse','0'),row('black','reuseGood','0'),row('black','reuse','scrap',condition('利用料')),row('black','reuseGood','good',condition('利用料')),row('black','reuse','scrap',condition('废品')),row('black','reuseGood','good',condition('废品')), + row('black','total','good + scrap - reuse - reuseGood'),row('bright','brightGood','0'),row('bright','brightGood','goodWeight',{field:'applicability',operator:'EQ',value:'是'}),row('bright','brightScrap','0'),row('bright','brightScrap','scrapWeight',{field:'applicability',operator:'EQ',value:'是'}) +],metricRules:{}}; +const result=(def,stage,target)=>stageResultFormulas(def,stage).find(row=>row.target===target); +test('one result per row retains every noncontiguous original step without mutation',()=>{ + const before=JSON.stringify(base),black=stageResultFormulas(base,'black'),bright=stageResultFormulas(base,'bright'); + assert.equal(black.length,6);assert.equal(bright.length,2);assert.deepEqual(result(base,'black','reuse').indexes,[4,6,8]); + const all=[...black,...bright].flatMap(r=>r.rules.map((rule,i)=>({rule,index:r.indexes[i]}))).sort((a,b)=>a.index-b.index); + assert.deepEqual(all.map(r=>r.rule),base.rowRules);assert.equal(JSON.stringify(base),before); +}); +test('opening and applying every result is byte-identical, including omitted policies and metadata',()=>{ + const def=structuredClone(base);delete def.rowRules[0].nullPolicy;def.rowRules[0].custom='preserve';def.rowRules[2].when.custom='condition metadata'; + const text=JSON.stringify(def);let current=def; + for(const stage of ['black','bright'])for(const item of stageResultFormulas(def,stage))current=replaceResultFormula(current,item,structuredClone(item.rules)); + assert.equal(current,def);assert.equal(JSON.stringify(current),text); +}); +test('full formula includes default and conditional values for black and bright',()=>{ + assert.equal(describeResultFormula(result(base,'black','external'),schema),'若检验备注包含“过账”,取0;否则取外废重量'); + assert.equal(describeResultFormula(result(base,'black','reuse'),schema),'若发料地点包含“废品” 或 发料地点包含“利用料”,取黑片报废重量;否则取0'); + assert.equal(describeResultFormula(result(base,'bright','brightScrap'),schema),'若是否电镀来料/二等品库来料等于“是”,取检包入废品库重量;否则取0'); +}); +test('different overlapping branches preserve later-write priority and explicit otherwise formulas',()=>{ + const item=result(base,'black','reuse');item.rules=structuredClone(item.rules);item.rules[2].formula='2'; + assert.equal(describeResultFormula(item,schema),'若发料地点包含“废品”,取2;否则(若发料地点包含“利用料”,取黑片报废重量;否则取0)'); + item.rules[2].otherwiseFormula='3';assert.equal(describeResultFormula(item,schema),'若发料地点包含“废品”,取2;否则取3'); +}); +test('conditions with differing special policies are never coalesced',()=>{ + const item=structuredClone(result(base,'black','reuse'));item.rules[2].nullResultPolicy='ERROR'; + assert.match(describeResultFormula(item,schema),/否则(若/);assert.doesNotMatch(describeResultFormula(item,schema),/ 或 /); +}); +test('self references retain the previous value in the combined expression',()=>{ + const item={stage:'black',target:'reuse',indexes:[0,1],rules:[row('black','reuse','4'),row('black','reuse','reuse + 1',condition('利用料'))]}; + assert.equal(describeResultFormula(item,schema),'若发料地点包含“利用料”,取(4) + 1;否则取4'); +}); +test('editing one branch preserves every other rule and field, including interleaved results',()=>{ + const item=result(base,'black','reuse'),rules=structuredClone(item.rules);rules[2].formula='scrap + 1';const next=replaceResultFormula(base,item,rules); + assert.equal(next.rowRules[8].formula,'scrap + 1');for(let i=0;i{ + const item=result(base,'black','reuse'),rules=[...item.rules,row('black','reuse','1',condition('新条件'))];const added=replaceResultFormula(base,item,rules); + assert.equal(result(added,'black','reuse').rules.length,4);assert.deepEqual(added.rowRules.filter(r=>r.target!=='reuse'),base.rowRules.filter(r=>r.target!=='reuse')); + const removed=replaceResultFormula(added,item,rules.slice(0,1));assert.equal(result(removed,'black','reuse').rules.length,1);assert.deepEqual(removed.rowRules.filter(r=>r.target!=='reuse'),base.rowRules.filter(r=>r.target!=='reuse')); +}); +test('conditional-only legacy formulas retain their original fallback rather than acquiring a zero default',()=>{ + const item={stage:'black',target:'reuse',indexes:[0],rules:[row('black','reuse','2',condition('利用料'))]}; + assert.equal(describeResultFormula(item,schema),'若发料地点包含“利用料”,取2;否则取原计算结果'); + assert.equal(replaceResultFormula({rowRules:item.rules},item,item.rules).rowRules.length,1); +}); +test('whole-result moves retain all branches and reject totals ahead of dependencies',()=>{ + const moved=planResultMove(base,'black','good',1,schema);assert.ok(moved.definition);assert.equal(stageResultFormulas(moved.definition,'black')[0].target,'external'); + assert.deepEqual(result(moved.definition,'black','external').rules,result(base,'black','external').rules); + assert.deepEqual(planResultMove(moved.definition,'black','good',-1,schema).definition,base); + assert.match(planResultMove(base,'black','total',-1,schema).reason,/后面还会修改/); + assert.equal(planResultMove(base,'bright','brightGood',-1,schema).definition,undefined); +}); +test('new results stay in their stage and mismatched branches cannot be merged',()=>{ + const next=replaceResultFormula(base,{stage:'black',target:'added'},[row('black','added','0')]); + assert.equal(next.rowRules[11].target,'added');assert.equal(next.rowRules[12].stage,'bright'); + assert.throws(()=>replaceResultFormula(base,{stage:'black',target:'reuse'},[row('bright','reuse','0')]),/同一个/); +}); +test('invalid branch variables remain blocked by the existing rule checker',()=>{ + const item=result(base,'bright','brightScrap'),rules=structuredClone(item.rules);rules[1].formula='missingWeight';const next=replaceResultFormula(base,item,rules); + assert.match(newResultIssue(base,next,schema),/不可用的公式变量/);assert.equal(result(base,'bright','brightScrap').rules[1].formula,'scrapWeight'); +}); diff --git a/web/verification/rule_editing.test.mjs b/web/verification/rule_editing.test.mjs new file mode 100644 index 0000000..0e048c8 --- /dev/null +++ b/web/verification/rule_editing.test.mjs @@ -0,0 +1,32 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { ruleLogicIssues, planRuleMove, neighboringRuleIndex, displayRowFormula, isDefaultAssignment } from '../src/ruleEditing.ts'; +const schema={sourceFields:{black:{platingWeight:'送电镀重量',shipmentWeight:'黑片出货重量',responsibilityScrap:'责废总重量',materialScrap:'料废重量',externalScrap:'外废重量',inspectionNote:'检验备注'},bright:{goodWeight:'合格重量',scrapWeight:'检包入废品库重量',applicability:'是否电镀来料/二等品库来料'}},rowTargets:{black:['black_good_weight','black_responsibility_scrap','black_material_scrap','black_external_scrap','black_scrap_weight','black_total_weight'],bright:['bright_good_weight','bright_scrap_weight']},componentLabels:{black_good_weight:'黑片合格重量',black_scrap_weight:'黑片报废重量',black_total_weight:'黑片总重量'},conditionOperators:['EQ','CONTAINS','GT','IS_BLANK'],metricCodes:['blackRate','brightRate','compositeRate'],metricLabels:{blackRate:'黑片合格率'}}; +const base={schemaVersion:'unchanged',sourceFields:{},rowRules:[ + {stage:'black',target:'black_good_weight',formula:'platingWeight + shipmentWeight'}, + {stage:'black',target:'black_responsibility_scrap',formula:'responsibilityScrap'}, + {stage:'black',target:'black_material_scrap',formula:'materialScrap'}, + {stage:'black',target:'black_external_scrap',formula:'externalScrap'}, + {stage:'black',target:'black_external_scrap',formula:'0',when:{field:'inspectionNote',operator:'CONTAINS',value:'过账'}}, + {stage:'black',target:'black_scrap_weight',formula:'SUM(black_responsibility_scrap, black_material_scrap, black_external_scrap)'}, + {stage:'black',target:'black_total_weight',formula:'black_good_weight + black_scrap_weight'}, + {stage:'bright',target:'bright_good_weight',formula:'0'}, + {stage:'bright',target:'bright_good_weight',formula:'goodWeight',when:{field:'applicability',operator:'EQ',value:'是'}}, + {stage:'bright',target:'bright_scrap_weight',formula:'0'}, + {stage:'bright',target:'bright_scrap_weight',formula:'scrapWeight',when:{field:'applicability',operator:'EQ',value:'是'}}, +],metricRules:{blackRate:{formula:'blackGood / blackTotal'},brightRate:{formula:'brightGood / brightTotal'},compositeRate:{formula:'blackRate * brightRate'}}}; +test('baseline formulas and ordered conditional assignments remain valid without any mutation',()=>{const text=JSON.stringify(base);assert.deepEqual(ruleLogicIssues(base,schema),[]);assert.equal(JSON.stringify(base),text);}); +test('a move swaps exactly two same-stage rows, retaining every other row and metadata',()=>{ + const text=JSON.stringify(base),result=planRuleMove(base,0,1,schema);assert.ok(result.definition);assert.equal(result.definition.rowRules[0].target,'black_responsibility_scrap');assert.equal(result.definition.rowRules[1].target,'black_good_weight'); + assert.deepEqual(result.definition.rowRules.slice(2),base.rowRules.slice(2));assert.equal(JSON.stringify(base),text);assert.deepEqual(planRuleMove(result.definition,1,-1,schema).definition,base); +}); +test('moves do not cross stage boundaries',()=>{assert.equal(neighboringRuleIndex(base.rowRules,6,1),undefined);assert.equal(neighboringRuleIndex(base.rowRules,7,-1),undefined);assert.equal(planRuleMove(base,7,-1,schema).definition,undefined);}); +test('moving a conditional assignment above its default is rejected',()=>{const result=planRuleMove(base,8,-1,schema);assert.equal(result.definition,undefined);assert.match(result.reason,/默认值应放在条件覆盖之前/);}); +test('moving totals ahead of their component assignments is rejected',()=>{const result=planRuleMove(base,5,-1,schema);assert.equal(result.definition,undefined);assert.match(result.reason,/后面还会修改/);}); +test('unknown variables, text arithmetic and forward metric references are caught',()=>{ + for(const formula of ['typoWeight','inspectionNote + 1']){const def=structuredClone(base);def.rowRules[0].formula=formula;assert.ok(ruleLogicIssues(def,schema).some(issue=>issue.key.startsWith('variable:')));} + const def=structuredClone(base);def.metricRules.blackRate.formula='compositeRate';assert.ok(ruleLogicIssues(def,schema).some(issue=>issue.key.startsWith('metric-variable:'))); +}); +test('duplicate conditions with different formulas are rejected regardless of JSON property order',()=>{const def=structuredClone(base);def.rowRules.push({stage:'bright',target:'bright_scrap_weight',formula:'1',when:{value:'是',operator:'EQ',field:'applicability'}});assert.ok(ruleLogicIssues(def,schema).some(issue=>issue.key.startsWith('duplicate:')));}); +test('legacy partial overrides keep access to baseline components',()=>{const def={rowRules:[{stage:'black',target:'black_total_weight',formula:'black_good_weight + black_scrap_weight'}]};assert.deepEqual(ruleLogicIssues(def,schema),[]);}); +test('source aliases are rendered in Chinese while the original formula is retained',()=>{const row=base.rowRules[10];assert.equal(displayRowFormula(row,schema),'检包入废品库重量');assert.equal(row.formula,'scrapWeight');assert.equal(isDefaultAssignment(base.rowRules[9],9,base.rowRules),true);assert.equal(isDefaultAssignment(row,10,base.rowRules),false);}); diff --git a/web/verification/rule_presentation.test.mjs b/web/verification/rule_presentation.test.mjs new file mode 100644 index 0000000..791783d --- /dev/null +++ b/web/verification/rule_presentation.test.mjs @@ -0,0 +1,20 @@ +import test from 'node:test'; +import assert from 'node:assert/strict'; +import { displayFormula, stageRuleRows, ruleChangeSummary, matchingTarget, policyDescription } from '../src/rulePresentation.ts'; +const original={sourceFields:{black:{platingWeight:'送电镀重量'},bright:{goodWeight:'合格重量'}},rowRules:Array.from({length:22},(_,i)=>({stage:i<13?'black':'bright',target:i%3===0?'black_good_weight':i%3===1?'black_scrap_weight':'black_reuse_good',formula:String(i),when:{field:'inspectionNote',operator:'CONTAINS',value:'过账'}})),metricRules:{blackRate:{formula:'blackGood / blackTotal'}}}; +test('stage tables keep every execution index and full rule unchanged',()=>{ + const before=JSON.stringify(original);const all=[...stageRuleRows(original,'black'),...stageRuleRows(original,'bright')].sort((a,b)=>a.index-b.index); + assert.equal(all.length,22);assert.deepEqual(all.map(({index,...row})=>row),original.rowRules);assert.equal(JSON.stringify(original),before);assert.deepEqual(ruleChangeSummary(original,structuredClone(original)),[]); +}); +test('business formula translation explains percentages without mutating source rules',()=>{ + assert.equal(displayFormula('blackRate * brightRate'),'黑片合格率 × 亮片合格率');assert.match(policyDescription({zeroDenominatorPolicy:'ONE',nullResultPolicy:'NULL'}),/分母为0:按100%处理/);assert.match(policyDescription({zeroDenominatorPolicy:'ONE'},false),/分母为0:取1/); + const next=structuredClone(original);next.metricRules.blackRate.formula='(blackGood / blackTotal)';assert.deepEqual(ruleChangeSummary(original,next),['合格率公式 1 项']);assert.notEqual(original.metricRules.blackRate.formula,next.metricRules.blackRate.formula); +}); +test('target display preserves existing specificity and group tie-break precedence',()=>{ + const overall={dimensions:{},value:.955},department={dimensions:{department:'A'},value:.96},group={dimensions:{group:'G'},value:.97},specific={dimensions:{department:'A',group:'G'},value:.98};const list=[overall,department,group,specific];const before=JSON.stringify(list); + assert.equal(matchingTarget(list,{department:'A',group:'G'}),specific);assert.equal(matchingTarget(list.slice(0,3),{department:'A',group:'G'}),group);assert.equal(matchingTarget(list,{department:'A',group:'OTHER'}),department);assert.equal(matchingTarget(list,{department:'B'}),overall);assert.equal(JSON.stringify(list),before); +}); +test('stage table reflects the actual row order without business grouping',()=>{ + const definition={rowRules:[{stage:'black',target:'black_responsibility_scrap',formula:'1'},{stage:'black',target:'black_good_weight',formula:'2'},{stage:'black',target:'black_material_scrap',formula:'3'}]}; + assert.deepEqual(stageRuleRows(definition,'black').map(row=>row.target),['black_responsibility_scrap','black_good_weight','black_material_scrap']); +});