Add literal contains filters across source queries and analysis context
This commit is contained in:
@@ -32,6 +32,6 @@ export function StageSourceFilters({stage,fields,query,value,onChange,onUnauthor
|
||||
const selected=value.map(rule=>rule.field);const patch=(key:string,change:Partial<SourceColumnFilter>)=>onChange(value.map(rule=>rule.field===key?{...rule,...change}:rule));
|
||||
return <div className="stage-source-filters">
|
||||
{part!=='rows'&&<Select {...readableSelectPopup} mode="multiple" maxCount={20} maxTagCount="responsive" showSearch optionFilterProp="label" allowClear aria-label="选择筛选字段" placeholder="添加筛选字段" value={selected} options={fields.map(field=>({label:field.label,value:field.key}))} onChange={keys=>onChange(keys.map(key=>value.find(rule=>rule.field===key)||{field:key,stages:[stage],operator:'in',values:[]}))}/>}
|
||||
{part!=='picker'&&value.map(rule=>{const field=fields.find(item=>item.key===rule.field);return field?<div className="stage-source-filter-row" key={rule.field}><strong>{field.label}</strong><Select {...readableSelectPopup} aria-label={`${field.label}筛选方式`} value={rule.operator} options={[{label:'等于任一值',value:'in'},{label:'不等于这些值',value:'not_in'},{label:'为空',value:'is_empty'},{label:'不为空',value:'not_empty'}]} onChange={operator=>patch(rule.field,{operator,values:[]})}/>{['in','not_in'].includes(rule.operator)?<SourceValues field={field} stage={stage} query={query} value={rule.values||[]} onChange={values=>patch(rule.field,{values})} onUnauthorized={onUnauthorized}/>:<span/>}<Button type="text" aria-label={`移除${field.label}筛选`} icon={<CloseOutlined/>} onClick={()=>onChange(value.filter(item=>item.field!==rule.field))}/></div>:<Alert key={rule.field} type="warning" message="所选来源字段当前不可用,请移除后重新选择" action={<Button onClick={()=>onChange(value.filter(item=>item.field!==rule.field))}>移除</Button>}/>;})}
|
||||
{part!=='picker'&&value.map(rule=>{const field=fields.find(item=>item.key===rule.field);return field?<div className="stage-source-filter-row" key={rule.field}><strong>{field.label}</strong><Select {...readableSelectPopup} aria-label={`${field.label}筛选方式`} value={rule.operator} options={[{label:'等于任一值',value:'in'},{label:'包含',value:'contains'},{label:'不等于这些值',value:'not_in'},{label:'为空',value:'is_empty'},{label:'不为空',value:'not_empty'}]} onChange={operator=>patch(rule.field,{operator,values:[]})}/>{rule.operator==='contains'?<Select {...readableSelectPopup} mode="tags" maxCount={50} maxLength={256} maxTagCount="responsive" allowClear aria-label={`${field.label}包含文字`} placeholder="输入关键词后按回车" value={rule.values||[]} onChange={values=>patch(rule.field,{values:values.filter(value=>value.trim().length>0)})} options={[]}/>:['in','not_in'].includes(rule.operator)?<SourceValues field={field} stage={stage} query={query} value={rule.values||[]} onChange={values=>patch(rule.field,{values})} onUnauthorized={onUnauthorized}/>:<span/>}<Button type="text" aria-label={`移除${field.label}筛选`} icon={<CloseOutlined/>} onClick={()=>onChange(value.filter(item=>item.field!==rule.field))}/></div>:<Alert key={rule.field} type="warning" message="所选来源字段当前不可用,请移除后重新选择" action={<Button onClick={()=>onChange(value.filter(item=>item.field!==rule.field))}>移除</Button>}/>;})}
|
||||
</div>;
|
||||
}
|
||||
|
||||
@@ -7,7 +7,7 @@ export type AnalysisVisualSectionKey = 'overview' | 'stage' | 'department' | 'gr
|
||||
export type AnalysisVisualDimension = 'department' | 'group' | 'product' | 'category' | 'defect';
|
||||
export type AnalysisExclusionDimension = 'department' | 'group' | 'product' | 'projectGroup';
|
||||
export type AnalysisExclusions = Partial<Record<AnalysisExclusionDimension, string[]>>;
|
||||
export interface SourceColumnFilter { field: string; stages: Array<'black' | 'bright'>; operator: 'in' | 'not_in' | 'is_empty' | 'not_empty'; values?: string[] }
|
||||
export interface SourceColumnFilter { field: string; stages: Array<'black' | 'bright'>; operator: 'in' | 'contains' | 'not_in' | 'is_empty' | 'not_empty'; values?: string[] }
|
||||
export type AnalysisVisualContextValue = string | number | boolean | Array<string | number | boolean> | Record<string, string[]> | Record<string, string> | SourceColumnFilter[] | AnalysisExclusions;
|
||||
export type AnalysisVisualContext = Record<string, AnalysisVisualContextValue>;
|
||||
|
||||
@@ -253,8 +253,8 @@ function safeContext(value: unknown): AnalysisVisualContext | null {
|
||||
|| typeof rule.field !== 'string' || !/^[A-Za-z0-9_]{1,64}$/.test(rule.field)
|
||||
|| !Array.isArray(rule.stages) || !rule.stages.length || rule.stages.length > 2 || new Set(rule.stages).size !== rule.stages.length
|
||||
|| rule.stages.some(stage => stage !== 'black' && stage !== 'bright')
|
||||
|| !['in', 'not_in', 'is_empty', 'not_empty'].includes(String(rule.operator))) return null;
|
||||
const needsValues = rule.operator === 'in' || rule.operator === 'not_in';
|
||||
|| !['in', 'contains', 'not_in', 'is_empty', 'not_empty'].includes(String(rule.operator))) return null;
|
||||
const needsValues = rule.operator === 'in' || rule.operator === 'not_in' || rule.operator === 'contains';
|
||||
if (needsValues && (!Array.isArray(rule.values) || !rule.values.length || rule.values.length > 50 || rule.values.some(value => typeof value !== 'string' || !value.trim() || value.length > 256))) return null;
|
||||
if (!needsValues && rule.values !== undefined) return null;
|
||||
filters.push({ field: rule.field, stages: [...rule.stages] as SourceColumnFilter['stages'], operator: rule.operator as SourceColumnFilter['operator'], ...(needsValues ? { values: [...rule.values as string[]] } : {}) });
|
||||
@@ -1397,7 +1397,7 @@ export function columnFilterSummary(value: unknown, labelValue: unknown): string
|
||||
if (!isRecord(rule) || typeof rule.field !== 'string' || !Array.isArray(rule.stages)) return [];
|
||||
const stage = rule.stages.map(item => item === 'black' ? '黑片' : item === 'bright' ? '亮片' : '').filter(Boolean).join('、');
|
||||
const label = typeof labels[rule.field] === 'string' ? labels[rule.field] : '来源字段';
|
||||
const operation = ({ in: '为', not_in: '排除', is_empty: '为空', not_empty: '不为空' } as Record<string, string>)[String(rule.operator)];
|
||||
const operation = ({ in: '为', contains: '包含', not_in: '排除', is_empty: '为空', not_empty: '不为空' } as Record<string, string>)[String(rule.operator)];
|
||||
if (!operation) return [];
|
||||
const values = Array.isArray(rule.values) ? rule.values.filter(item => typeof item === 'string').join('、') : '';
|
||||
return [`${stage} ${label}${operation}${values}`.trim()];
|
||||
|
||||
+1
-1
@@ -3,7 +3,7 @@ export type ViewKind = 'overall' | 'department' | 'group' | 'product' | 'project
|
||||
export type PeriodKind = 'year' | 'quarter' | 'month';
|
||||
|
||||
export interface SourceColumnField { key: string; label: string; type: string; stages: Stage[]; columns: Partial<Record<Stage,string>> }
|
||||
export interface SourceColumnFilter { field: string; stages: Stage[]; operator: 'in' | 'not_in' | 'is_empty' | 'not_empty'; values?: string[] }
|
||||
export interface SourceColumnFilter { field: string; stages: Stage[]; operator: 'in' | 'contains' | 'not_in' | 'is_empty' | 'not_empty'; values?: string[] }
|
||||
|
||||
export interface QueryParams {
|
||||
year: number;
|
||||
|
||||
@@ -1042,3 +1042,12 @@ test('adaptive trends cover every series, preserve missing values, and keep non-
|
||||
assert.equal(formatVisualValue(.9639601707533932, 'ratio'), '96.40%');
|
||||
assert.equal(formatVisualValue(3, 'kg'), '3.00 kg');
|
||||
});
|
||||
|
||||
test('contains keywords survive analysis scope and display as substring filters',()=>{
|
||||
const rule={field:'src_any',stages:['bright'],operator:'contains',values:['日立','%_']};
|
||||
const parsed=parseAnalysisVisuals([visual({scope:{columnFilters:[rule],columnLabels:{src_any:'客户'}}})]);
|
||||
assert.equal(parsed.visuals.length,1);
|
||||
assert.deepEqual(parsed.visuals[0].scope.columnFilters,[rule]);
|
||||
assert.match(columnFilterSummary([rule],{src_any:'客户'})[0],/包含.*日立/);
|
||||
assert.equal(parseAnalysisVisuals([visual({scope:{columnFilters:[{...rule,values:[]}]}})]).visuals.length,0);
|
||||
});
|
||||
|
||||
@@ -0,0 +1,30 @@
|
||||
import test from 'node:test';
|
||||
import assert from 'node:assert/strict';
|
||||
import fs from 'node:fs';
|
||||
import ts from 'typescript';
|
||||
|
||||
const source=fs.readFileSync(new URL('../src/StageSourceFilters.tsx',import.meta.url),'utf8');
|
||||
const output=ts.transpileModule(source,{compilerOptions:{module:ts.ModuleKind.CommonJS,jsx:ts.JsxEmit.ReactJSX,target:ts.ScriptTarget.ES2022}}).outputText;
|
||||
const jsx=(type,props)=>({type,props});const exports={};
|
||||
new Function('require','exports',output)(name=>{
|
||||
if(name==='react/jsx-runtime')return {jsx,jsxs:jsx};
|
||||
if(name==='antd')return {Select:'Select',Button:'Button',Alert:'Alert',Spin:'Spin'};
|
||||
if(name==='@ant-design/icons')return {CloseOutlined:'CloseOutlined'};
|
||||
if(name==='./readableSelectPopup')return {readableSelectPopup:{}};
|
||||
return {};
|
||||
},exports);
|
||||
const nodes=value=>!value||typeof value!=='object'?[]:[value,...[value.props?.children].flat(Infinity).flatMap(nodes)];
|
||||
const field={key:'customer',label:'客户名称',type:'source_value',stages:['bright'],columns:{bright:'客户名称'}};
|
||||
|
||||
test('contains is selectable and accepts bounded free keywords without a value-candidate lookup',()=>{
|
||||
let changed;
|
||||
const rule={field:'customer',stages:['bright'],operator:'contains',values:['日立']};
|
||||
const root=exports.StageSourceFilters({stage:'bright',fields:[field],query:{year:2026},value:[rule],onChange:value=>{changed=value;},onUnauthorized:()=>false});
|
||||
const all=nodes(root);const operation=all.find(x=>x.type==='Select'&&x.props['aria-label']==='客户名称筛选方式');
|
||||
assert.ok(operation.props.options.some(x=>x.value==='contains'&&x.label==='包含'));
|
||||
const keywords=all.find(x=>x.type==='Select'&&x.props['aria-label']==='客户名称包含文字');
|
||||
assert.equal(keywords.props.mode,'tags');assert.equal(keywords.props.maxCount,50);assert.equal(keywords.props.maxLength,256);assert.deepEqual(keywords.props.options,[]);
|
||||
keywords.props.onChange(['日立','%_',' ']);
|
||||
assert.deepEqual(changed,[{...rule,values:['日立','%_']}]);
|
||||
operation.props.onChange('in');assert.deepEqual(changed,[{...rule,operator:'in',values:[]}]);
|
||||
});
|
||||
@@ -30,3 +30,9 @@ test('stage query includes unclassified source rows even when an old link exclud
|
||||
assert.equal(base.includeUnassigned,false);
|
||||
}
|
||||
});
|
||||
|
||||
test('contains keywords are retained while an unfilled contains rule is inactive',()=>{
|
||||
const rule={field:'customer',stages:['bright'],operator:'contains',values:['日立','%_']};
|
||||
assert.deepEqual(activeStageFilters([rule],'bright'),[rule]);
|
||||
assert.deepEqual(activeStageFilters([{...rule,values:[]}],'bright'),[]);
|
||||
});
|
||||
|
||||
Reference in New Issue
Block a user