@finebi/finebi-cli 1.6.0 → 1.6.2

package/templates/web-app/src/components/MonthPicker.tsx

@@ -0,0 +1,32 @@
+import {useId,useLayoutEffect,useRef,useState} from 'react';
+import './month-picker.css';
+const clamp=(n:number,min:number,max:number)=>Math.max(min,Math.min(max,n));
+const pad=(n:number)=>String(n).padStart(4,'0');
+export function MonthPicker({id,label,value,onChange}:{id:string;label:string;value:string;onChange:(value:string)=>void}) {
+  const popupId=useId(),root=useRef<HTMLDivElement>(null),trigger=useRef<HTMLButtonElement>(null),grid=useRef<HTMLDivElement>(null);
+  const now=new Date(),initialYear=value?Number(value.slice(0,4)):now.getFullYear();
+  const [open,setOpen]=useState(false),[mode,setMode]=useState<'months'|'years'>('months');
+  const [year,setYear]=useState(initialYear),[cursor,setCursor]=useState(0),[focusTick,setFocusTick]=useState(0);
+  const base=clamp(Math.floor((year-1)/12)*12+1,1,9988);
+  const focusGrid=()=>setFocusTick(n=>n+1);
+  useLayoutEffect(()=>{if(open&&focusTick)grid.current?.querySelector<HTMLButtonElement>(`[data-cell="${cursor}"]`)?.focus();},[focusTick,open,cursor,mode,year]);
+  const close=(restore=false)=>{setOpen(false);if(restore)trigger.current?.focus();};
+  const show=(focus=false)=>{setYear(initialYear);setMode('months');setCursor(value?Number(value.slice(5))-1:now.getMonth());setOpen(true);if(focus)focusGrid();};
+  const choose=(next:string)=>{onChange(next);close(true);};
+  const navigate=(delta:number)=>{setYear(y=>clamp(y+delta*(mode==='months'?1:12),1,9999));};
+  const keyDown=(e:React.KeyboardEvent)=>{
+    if(e.key==='Escape'){e.preventDefault();e.stopPropagation();close(true);return;}
+    const delta={ArrowLeft:-1,ArrowRight:1,ArrowUp:-3,ArrowDown:3}[e.key];
+    if(delta!==undefined){e.preventDefault();setCursor(c=>clamp(c+delta,0,11));focusGrid();}
+    else if(e.key==='Home'||e.key==='End'){e.preventDefault();setCursor(e.key==='Home'?0:11);focusGrid();}
+    else if(e.key==='PageUp'||e.key==='PageDown'){e.preventDefault();navigate(e.key==='PageUp'?-1:1);focusGrid();}
+  };
+  return <div ref={root} className="month-picker" onBlur={e=>{if(e.relatedTarget&&!e.currentTarget.contains(e.relatedTarget))close();}}>
+    <button id={id} ref={trigger} type="button" className={`month-trigger ${value?'has-value':''}`} aria-label={label} aria-haspopup="dialog" aria-expanded={open} aria-controls={popupId} onClick={()=>open?close():show()} onKeyDown={e=>{if(e.key==='ArrowDown'){e.preventDefault();show(true);}}}><span>{value?`${value.slice(0,4)}年${value.slice(5)}月`:'源看板默认'}</span><span aria-hidden="true">▦</span></button>
+    {open&&<><div className="month-dismiss" onPointerDown={()=>close()}/><div className="month-popover" role="dialog" aria-label={`${label}选择面板`} id={popupId} onKeyDown={e=>{if(e.key==='Escape'){e.preventDefault();e.stopPropagation();close(true);}}}>
+      <div className="month-head"><button type="button" aria-label={mode==='months'?'上一年':'上一组年份'} disabled={year===1} onClick={()=>navigate(-1)}>‹</button><button type="button" className="month-year" aria-label={mode==='months'?'选择年份':'返回月份'} onClick={()=>{setMode(mode==='months'?'years':'months');setCursor(mode==='months'?year-base:0);focusGrid();}}>{mode==='months'?`${pad(year)}年`:`${pad(base)} — ${pad(base+11)}`}</button><button type="button" aria-label={mode==='months'?'下一年':'下一组年份'} disabled={year===9999} onClick={()=>navigate(1)}>›</button></div>
+      <div ref={grid} className="month-grid" role="grid" aria-label={mode==='months'?'月份':'年份'} onKeyDown={keyDown}>{Array.from({length:4},(_,row)=><div role="row" key={row}>{Array.from({length:3},(_,column)=>{const i=row*3+column,selected=mode==='months'?value===`${pad(year)}-${String(i+1).padStart(2,'0')}`:Number(value.slice(0,4))===base+i;return <button key={i} type="button" role="gridcell" data-cell={i} tabIndex={cursor===i?0:-1} aria-selected={selected} className={selected?'selected':''} onFocus={()=>setCursor(i)} onClick={()=>{if(mode==='months')choose(`${pad(year)}-${String(i+1).padStart(2,'0')}`);else{setYear(base+i);setMode('months');setCursor(value?Number(value.slice(5))-1:0);focusGrid();}}}>{mode==='months'?`${i+1}月`:pad(base+i)}</button>;})}</div>)}</div>
+      <div className="month-actions"><button type="button" onClick={()=>choose('')}>默认条件</button><button type="button" onClick={()=>choose(`${pad(now.getFullYear())}-${String(now.getMonth()+1).padStart(2,'0')}`)}>本月</button><button type="button" onClick={()=>choose('')}>清除</button></div><p>选择后点击「应用筛选」取数</p>
+    </div></>}
+  </div>;
+}

package/templates/web-app/src/components/OptionFilter.tsx

@@ -0,0 +1,7 @@
+import Select from 'antd/es/select';
+import type {FilterBinding,FilterValue} from '../finebi/types';
+
+export default function OptionFilter({id,binding,value,onChange}:{id:string;binding:FilterBinding;value:FilterValue;onChange:(value:FilterValue)=>void}) {
+  const type=binding.type??'select',text=typeof value==='string'?value:'';
+  return <Select id={id} aria-label={binding.label} size="large" className="filter-select" mode={type==='multi-select'?'multiple':undefined} allowClear showSearch={{optionFilterProp:'label'}} maxTagCount="responsive" placeholder={`选择${binding.label}，支持搜索`} options={binding.options} disabled={value===null} value={type==='multi-select'?(Array.isArray(value)?value:[]):text||undefined} onChange={selected=>onChange(selected??'')} notFoundContent={`没有匹配的${binding.label}`}/>;
+}

package/templates/web-app/src/components/RangeFilter.tsx

@@ -0,0 +1,9 @@
+import generatePicker from 'antd/es/date-picker/generatePicker';
+import {calendarConfig, calendarValue} from './calendar';
+
+const CalendarPicker=generatePicker<Date>(calendarConfig);
+type Interval={start:string;end:string};
+export default function RangeFilter({id,month,value,onChange}:{id:string;month:boolean;value:Interval;onChange:(value:Interval)=>void}) {
+  const update=(_dates:unknown,strings:[string,string]|null)=>onChange({start:strings?.[0]||'',end:strings?.[1]||''});
+  return <CalendarPicker.RangePicker size="large" className="filter-date-range" id={{start:id+'-start',end:id+'-end'}} picker={month?'month':'date'} format={month?'YYYY-MM':'YYYY-MM-DD'} placeholder={month?['开始月份','结束月份']:['开始日期','结束日期']} allowEmpty={[true,true]} allowClear value={[calendarValue(value.start),calendarValue(value.end)]} minDate={calendarValue('0001-01-01')!} maxDate={calendarValue('9999-12-31')!} onCalendarChange={update} onChange={update} onKeyDown={e=>{if(e.key==='Enter')e.preventDefault();}}/>;
+}

package/templates/web-app/src/components/Widget.tsx

@@ -1,28 +1,40 @@
-import {Component, type ReactNode} from 'react';
-import type {QueryResult, WidgetBinding} from '../finebi/types';
-import {displayCell, selectDataset} from '../services/view-data';
-import {Chart} from './Chart';
-import {DataTable} from './DataTable';
-class Boundary extends Component<{children: ReactNode}, {error: string}> {
-  state = {error: ''};
-  static getDerivedStateFromError(error: Error) {return {error: error.message};}
-  render() {return this.state.error ? <p role="alert">{this.state.error}</p> : this.props.children;}
-}
-function Content({result, binding, pageSize}: {result: QueryResult; binding: WidgetBinding; pageSize: number}) {
-  const data = selectDataset(result, binding.datasetId);
-  if (!data.rows.length) return <p className="empty">当前查询没有数据</p>;
-  if (binding.type === 'table') return <DataTable dataset={data} pageSize={pageSize}/>;
-  if (binding.type === 'kpi') {
-    const index = data.columns.findIndex(c => c.fieldId === binding.valueFieldId);
-    if (data.rows.length !== 1 || index < 0) throw new Error('KPI 需要单行指标结果，不能自动累加图表行');
-    return <div className="kpi">{displayCell(data.rows[0].cells[index])}</div>;
-  }
-  return <Chart dataset={data} binding={binding}/>;
-}
-export function Widget({result, binding, pageSize}: {result: QueryResult; binding: WidgetBinding; pageSize: number}) {
-  return <section className={`panel ${binding.type==='table'?'wide':''}`}><h2>{binding.name}</h2>
-    {result.range.total.value !== null && <p className="muted">查询总行数 {result.range.total.value} · 本次返回 {result.datasets[0]?.returnedRowCount ?? 0}</p>}
-    {result.warnings.length > 0 && <p className="notice" role="status">{result.warnings.includes('NEXT_PAGE_UNSUPPORTED') ? '接口仍标记有后续数据；当前仅展示本次返回结果，本地分页不代表服务端续页。' : '部分结果未能完整转换。'}<small>{result.warnings.join(' · ')}</small></p>}
-    <Boundary><Content result={result} binding={binding} pageSize={pageSize}/></Boundary>
-  </section>;
-}
+import {Component, lazy, Suspense, type ReactNode} from 'react';
+import type {QueryResult, WidgetBinding} from '../finebi/types';
+import {displayCell, selectDataset} from '../services/view-data';
+import {DataTable} from './DataTable';
+import type {WidgetState} from '../services/widget-queries';
+import {formatMetric} from '../services/presentation';
+const charts={bar:lazy(()=>import('./charts/Bar')),line:lazy(()=>import('./charts/Line')),pie:lazy(()=>import('./charts/Pie'))};
+export class Boundary extends Component<{children: ReactNode;onRetry?:()=>void}, {error: string}> {
+  state = {error: ''};
+  static getDerivedStateFromError(error: Error) {return {error: error.message};}
+  render() {return this.state.error ? <div role="alert"><p>{this.state.error}</p>{this.props.onRetry&&<button onClick={this.props.onRetry}>重试组件</button>}</div> : this.props.children;}
+}
+function Content({result, binding, pageSize}: {result: QueryResult; binding: WidgetBinding; pageSize: number}) {
+  const data = selectDataset(result, binding.datasetId);
+  if (!data.rows.length) return <p className="empty">当前查询没有数据</p>;
+  if (binding.type === 'table') return <DataTable dataset={data} pageSize={pageSize} binding={binding}/>;
+  if (binding.type === 'kpi') {
+    const index = data.columns.findIndex(c => c.fieldId === binding.valueFieldId);
+    if (data.rows.length !== 1 || index < 0) throw new Error('KPI 需要单行指标结果，不能自动累加图表行');
+    return <div className="kpi" title={displayCell(data.rows[0].cells[index])}>{formatMetric(data.rows[0].cells[index],binding.valueFormat)}</div>;
+  }
+  const Chart=charts[binding.type];
+  return <Suspense fallback={<p role="status">正在加载图表…</p>}><Chart dataset={data} binding={binding}/></Suspense>;
+}
+export function Widget({state,binding,pageSize,onRetry,compact=false}: {state:WidgetState; binding:WidgetBinding;pageSize:number;onRetry:()=>void;compact?:boolean}) {
+  const result=state.result;
+  const selected=result?.datasets.find(d=>binding.datasetId?d.id===binding.datasetId:result.datasets.length===1);
+  return <section className={`panel widget-${binding.type} ${binding.type==='table'?'wide':''}`}><div className="panel-heading"><h2>{binding.name}</h2><span className={`component-status ${state.error?'failed':''}`}>{state.loading?'加载中':state.error?'查询失败':state.at?`更新于 ${state.at}`:'等待查询'}</span></div>
+    {binding.description&&<p className="muted">{binding.description}</p>}
+    {!compact&&binding.filterNames&&<p className="filter-scope">控件覆盖：{binding.filterNames.length?binding.filterNames.join('、'):'沿用源组件条件'}</p>}
+    {state.loading&&<p className="empty" role="status">正在获取实时数据…</p>}
+    {state.error&&<div className="component-error" role="alert"><p>{'code' in state.error?String(state.error.code)+' · ':''}{state.error.message}</p><button onClick={onRetry}>重试组件</button></div>}
+    {result&&<>
+    {compact?<details className="query-details"><summary>查询范围{selected?` · ${selected.returnedRowCount} 行`:''}</summary><p>{result.range.mode} · {result.normalization} · 后续数据：{String(result.range.hasNext)}</p><p>筛选作用：{binding.filterNames?.join('、')||'沿用源组件条件'}</p></details>:<p className="result-range">{result.range.mode} · 本次{selected?` ${selected.returnedRowCount} 行`:'多个模型，需显式选择'}{result.range.total.value!==null?` · 查询总行数 ${result.range.total.value}`:''} · hasNext={String(result.range.hasNext)} · {result.normalization}</p>}
+    {result.range.axes&&<p className="result-range">交叉表当前视图 · 横向还有数据：{result.range.axes.horizontal.hasNext===null?'未知':result.range.axes.horizontal.hasNext?'是':'否'} · 纵向还有数据：{result.range.axes.vertical.hasNext===null?'未知':result.range.axes.vertical.hasNext?'是':'否'}</p>}
+    {(result.warnings.length>0||result.normalization!=='COMPLETE'||result.range.hasNext===true)&&<div className="notice" role="status">{result.range.hasNext||result.warnings.includes('NEXT_PAGE_UNSUPPORTED')?'当前仅展示首屏返回结果，本地分页不代表服务端续页。':'部分源图形未转换，当前展示已返回的数据模型。'}{compact?<details><summary>查看适配说明</summary><small>{result.normalization} · {result.warnings.join(' · ')}</small></details>:<small>{result.normalization} · {result.warnings.join(' · ')}</small>}</div>}
+    <Boundary key={state.at} onRetry={onRetry}><Content result={result} binding={binding} pageSize={pageSize}/></Boundary>
+    </>}
+  </section>;
+}

package/templates/web-app/src/components/calendar-locales.ts

@@ -0,0 +1,3 @@
+// Keep this list aligned with the languages configured by the application.
+export {zhCN} from 'date-fns/locale/zh-CN';
+export {enUS} from 'date-fns/locale/en-US';

package/templates/web-app/src/components/calendar.ts

@@ -1,14 +1,14 @@
-import dateFnsConfig from '@rc-component/picker/generate/dateFns';
-import {isDateValue} from '../finebi/date.js';
-
-// Keep the picker on the same 0001–9999 calendar range as the filter contract.
-export const calendarConfig = dateFnsConfig;
-export function calendarValue(value:string):Date|null {
-  const fullDate = value.length===7 ? value+'-01' : value;
-  if (!isDateValue(fullDate)) return null;
-  const [year,month,day] = fullDate.split('-').map(Number);
-  const date = new Date(0);
-  date.setHours(0,0,0,0);
-  date.setFullYear(year,month-1,day);
-  return date;
-}
+import dateFnsConfig from '@rc-component/picker/generate/dateFns';
+import {isDateValue} from '../finebi/date.js';
+
+// Keep the picker on the same 0001–9999 calendar range as the filter contract.
+export const calendarConfig = dateFnsConfig;
+export function calendarValue(value:string):Date|null {
+  const fullDate = value.length===7 ? value+'-01' : value;
+  if (!isDateValue(fullDate)) return null;
+  const [year,month,day] = fullDate.split('-').map(Number);
+  const date = new Date(0);
+  date.setHours(0,0,0,0);
+  date.setFullYear(year,month-1,day);
+  return date;
+}

package/templates/web-app/src/components/charts/Bar.tsx

@@ -0,0 +1,6 @@
+import {use} from 'echarts/core';
+import {BarChart} from 'echarts/charts';
+import {GridComponent} from 'echarts/components';
+
+use([BarChart, GridComponent]);
+export {Chart as default} from '../Chart';

package/templates/web-app/src/components/charts/Line.tsx

@@ -0,0 +1,6 @@
+import {use} from 'echarts/core';
+import {LineChart} from 'echarts/charts';
+import {GridComponent} from 'echarts/components';
+
+use([LineChart, GridComponent]);
+export {Chart as default} from '../Chart';

package/templates/web-app/src/components/charts/Pie.tsx

@@ -0,0 +1,6 @@
+import {use} from 'echarts/core';
+import {PieChart} from 'echarts/charts';
+import {LegendComponent} from 'echarts/components';
+
+use([PieChart, LegendComponent]);
+export {Chart as default} from '../Chart';

package/templates/web-app/src/components/month-picker.css

@@ -0,0 +1 @@
+.month-picker{position:relative;--month-accent:#197a58;--month-soft:#eaf6ef}.month-trigger{display:flex;justify-content:space-between;align-items:center;width:100%;height:46px;padding:0 14px;border:1px solid #dce4df;border-radius:10px;text-align:left;color:#87978f;background:#fff}.month-trigger.has-value{color:#204c3c}.month-trigger:focus-visible,.month-popover button:focus-visible{outline:3px solid #a1d6bc;outline-offset:2px}.month-trigger[aria-expanded=true]{border-color:var(--month-accent)}.month-dismiss{position:fixed;inset:0;z-index:20}.month-popover{position:absolute;right:0;top:calc(100% + 8px);z-index:21;width:min(310px,calc(100vw - 48px));padding:15px;border:1px solid #dce8e1;border-radius:15px;background:#fff;box-shadow:0 14px 45px #153f2926;color:#264c3d;max-height:65vh;overflow:auto}.month-head{display:flex;align-items:center;justify-content:space-between;margin-bottom:12px}.month-popover button{border:0;background:transparent;border-radius:8px;padding:8px 12px}.month-head>button{font-size:19px}.month-head .month-year{font-size:14px;font-weight:700}.month-grid>[role=row]{display:grid;grid-template-columns:repeat(3,1fr);gap:6px;margin:6px 0}.month-grid button{height:41px}.month-popover button:hover{background:var(--month-soft)}.month-grid button.selected{background:var(--month-accent);color:#fff}.month-actions{display:flex;justify-content:space-between;gap:4px;border-top:1px solid #e9efeb;margin-top:13px;padding-top:10px}.month-actions button{font-size:12px;color:var(--month-accent);padding:7px}.month-popover p{font-size:11px;color:#87978f;margin:9px 0 0;text-align:center}

package/templates/web-app/src/finebi/client.ts

@@ -1,24 +1,29 @@
 import {normalize} from './normalize';
-import {encodeFilters, validateFilterBindings} from './filters.js';
-import type {AppConfig, QueryResult, FilterState} from './types';
+import {encodeFilters} from './filters.js';
+import {configErrors, sameDimensionIds} from './config.js';
+import type {AppConfig, QueryResult, FilterState, WidgetBinding} from './types';
 export class FineBIError extends Error {
   constructor(public code: string, message: string) {super(message); this.name = 'FineBIError';}
 }
 export function validateConfig(config: AppConfig) {
-  if (config.schemaVersion !== '1') throw new Error('不支持的配置版本');
-  if (!/^\/(?!\/)[\w/-]+$/.test(config.basePath)) throw new Error('basePath 必须是同源绝对路径');
-  if (!config.dashboardId || !config.widgets?.length) throw new Error('请先在 app-config.json 绑定仪表板和组件');
-  if (!Number.isSafeInteger(config.maxRows) || config.maxRows < 1 || config.maxRows > 10000) throw new Error('maxRows 必须在 1–10000 范围内');
-  validateFilterBindings(config.filters);
+  const errors=configErrors(config);
+  if(errors.length)throw new Error(errors.join(' '));
 }
-export async function queryWidgets(config: AppConfig, filters: FilterState = {}, signal?: AbortSignal, fetchImpl: typeof fetch = fetch): Promise<Record<string, QueryResult>> {
+export async function queryWidgets(config: AppConfig, filters: FilterState = {}, signal?: AbortSignal, fetchImpl: typeof fetch = fetch, widgetIds?:string[]): Promise<Record<string, QueryResult>> {
   validateConfig(config);
   const refer = encodeFilters(config.filters,filters);
-  const ids = [...new Set(config.widgets.map(w => w.entryId))];
+  const ids = [...new Set(widgetIds ?? config.widgets.map(w => w.entryId))];
+  if(!ids.length||ids.some(id=>!config.widgets.some(w=>w.entryId===id)))throw new Error('组件不在配置范围内');
+  const dimensionSelections:Record<string,string[]> = Object.create(null);
+  for(const id of ids) {
+    const bindings=config.widgets.filter(w=>w.entryId===id);
+    if(bindings.some(w=>!sameDimensionIds(w.dimensionIds,bindings[0].dimensionIds)))throw new Error('同一组件有不同字段选择，请按展示绑定分别查询');
+    if(bindings[0].dimensionIds!==undefined)dimensionSelections[id]=bindings[0].dimensionIds;
+  }
   const response = await fetchImpl(`${config.basePath.replace(/\/$/, '')}/v5/api/dashboard/report/${encodeURIComponent(config.dashboardId)}/widgets/query`, {
     method: 'POST', credentials: 'include', signal, redirect: 'manual',
     headers: {'Content-Type': 'application/json', 'X-Requested-With': 'XMLHttpRequest'},
-    body: JSON.stringify({widgetIds: ids, includeWidgetBean: true, pageLimit: config.maxRows, refer}),
+    body: JSON.stringify({widgetIds: ids, includeWidgetBean: true, pageLimit: config.maxRows, refer,...(config.directoryEntryId?{reportEntryId:config.directoryEntryId}:{}),...(Object.keys(dimensionSelections).length?{dimensionSelections}:{})}),
   });
   if (response.status === 401 || response.type === 'opaqueredirect' || response.status >= 300 && response.status < 400) throw new FineBIError('AUTH_REQUIRED', '登录已失效，请登录 FineBI 后重试');
   if (response.status === 403) throw new FineBIError('PERMISSION_DENIED', '当前用户没有访问权限');
@@ -27,7 +32,15 @@ export async function queryWidgets(config: AppConfig, filters: FilterState = {},
   const code = body.errorCode ?? body.code;
   if (['TIME_OUT','JWT_EXPIRED','LOGIN_INFO_NOT_AVAILABLE','CANNOT_GET_TOKEN','AUTH_REQUIRED'].includes(code)) throw new FineBIError('AUTH_REQUIRED', '登录已失效，请登录 FineBI 后重试');
   if (code === 'PERMISSION_DENIED') throw new FineBIError('PERMISSION_DENIED', '当前用户没有数据或字段权限');
-  if (!response.ok || body.success !== true) throw new FineBIError('QUERY_FAILED', 'FineBI 查询失败，请检查组件、控件绑定及访问权限');
+  const developmentAuthErrors: Record<string,string> = {
+    AUTH_PLUGIN_REQUIRED:'请更新 FineBI 服务端插件以启用浏览器授权',
+    AUTH_HTTPS_REQUIRED:'浏览器授权需要 HTTPS FineBI 地址',
+    AUTH_PROTOCOL_ERROR:'认证响应不符合预期，请检查 FineBI 地址和版本',
+    AUTH_UNAVAILABLE:'授权服务暂不可用，请稍后重试',
+    AUTH_STORAGE_FAILED:'无法保存本地会话，请检查 .env.local 文件权限',
+  };
+  if (developmentAuthErrors[code]) throw new FineBIError(code, `${developmentAuthErrors[code]}；详情见开发终端`);
+  if (!response.ok || body.success !== true) throw new FineBIError(typeof code==='string'?code:'QUERY_FAILED', 'FineBI 查询失败，请检查组件、控件绑定、平台版本及访问权限');
   const results: Record<string, QueryResult> = {};
   for (const id of ids) {
     if (!body.data?.[id]?.previewResult) throw new FineBIError('INVALID_RESPONSE', `接口未返回组件 ${id}，不能视为空数据`);
@@ -35,3 +48,11 @@ export async function queryWidgets(config: AppConfig, filters: FilterState = {},
   }
   return results;
 }
+export async function queryWidget(config:AppConfig,binding:WidgetBinding,filters:FilterState={},signal?:AbortSignal,fetchImpl:typeof fetch=fetch):Promise<QueryResult> {
+  validateConfig(config);
+  if(!config.widgets.includes(binding))throw new Error('展示绑定不在配置范围内');
+  // Validate all draft names before projecting the verified component scope.
+  encodeFilters(config.filters,filters);
+  const scoped=binding.filterNames ? Object.fromEntries(Object.entries(filters).filter(([name])=>binding.filterNames!.includes(name))) : filters;
+  return (await queryWidgets({...config,widgets:[binding]},scoped,signal,fetchImpl,[binding.entryId]))[binding.entryId];
+}

package/templates/web-app/src/finebi/config.d.ts

@@ -0,0 +1,3 @@
+export function configErrors(config: unknown): string[];
+export function sameDimensionIds(left: string[] | undefined, right: string[] | undefined): boolean;
+export function validateDimensionSelections(widgets: {entryId: string; dimensionIds?: string[]}[], widgetIds: string[], selections: unknown): void;

package/templates/web-app/src/finebi/config.js

@@ -0,0 +1,58 @@
+import {validateFilterBindings} from './filters.js';
+const nonempty=value=>typeof value==='string'&&value.trim().length>0;
+const record=value=>value!==null&&typeof value==='object'&&!Array.isArray(value);
+const validDimensionIds=value=>Array.isArray(value)&&value.every(nonempty)&&new Set(value).size===value.length;
+export function sameDimensionIds(left,right) {
+  if(left===undefined||right===undefined)return left===right;
+  return validDimensionIds(left)&&validDimensionIds(right)&&left.length===right.length&&left.every(id=>right.includes(id));
+}
+export function validateDimensionSelections(widgets,widgetIds,selections) {
+  if(selections!==undefined&&(!record(selections)||Object.keys(selections).some(id=>!widgetIds.includes(id))))throw new Error('Invalid dimension selections');
+  for(const id of widgetIds) {
+    const selected=selections&&Object.hasOwn(selections,id)?selections[id]:undefined;
+    if(selected!==undefined&&!validDimensionIds(selected))throw new Error('Invalid dimensionIds');
+    if(!widgets.some(w=>w.entryId===id&&sameDimensionIds(w.dimensionIds,selected)))throw new Error('Unconfigured dimension selection');
+  }
+}
+export function configErrors(config) {
+  if(!record(config))return ['configuration must be a JSON object.'];
+  const errors=[];
+  const allowed=['schemaVersion','title','basePath','layout','dashboardId','directoryEntryId','maxRows','pageSize','widgets','filters','templateVersion','description','insights','dataNotes'];
+  for(const key of Object.keys(config))if(!allowed.includes(key))errors.push(`unsupported config field: ${key}.`);
+  if(config.schemaVersion!=='1')errors.push('schemaVersion must be "1".');
+  if(!nonempty(config.title))errors.push('title is required.');
+  if(!nonempty(config.basePath)||!/^\/(?!\/)[\w/-]+$/.test(config.basePath))errors.push('basePath must be a same-origin path.');
+  if(!['overview','workbench','cockpit','retail'].includes(config.layout))errors.push('layout must be overview, workbench, cockpit or retail.');
+  if(!nonempty(config.dashboardId))errors.push('project is not bound: dashboardId must be configured.');
+  if('directoryEntryId' in config&&!nonempty(config.directoryEntryId))errors.push('directoryEntryId must be a non-empty string.');
+  if(!Number.isSafeInteger(config.maxRows)||config.maxRows<1||config.maxRows>10000)errors.push('maxRows must be an integer from 1 to 10000.');
+  if(!Number.isSafeInteger(config.pageSize)||config.pageSize<1||config.pageSize>100)errors.push('pageSize must be an integer from 1 to 100.');
+  if('description' in config&&!nonempty(config.description))errors.push('description must be a non-empty string.');
+  if('insights' in config&&typeof config.insights!=='boolean')errors.push('insights must be boolean.');
+  if('dataNotes' in config&&(!Array.isArray(config.dataNotes)||config.dataNotes.some(v=>!nonempty(v))))errors.push('dataNotes must be text array.');
+  try{validateFilterBindings(config.filters);}catch(error){errors.push(error.message);}
+  if(!Array.isArray(config.widgets)||!config.widgets.length)return [...errors,'widgets must be a non-empty array.'];
+  for(const [i,w] of config.widgets.entries()) {
+    if(!record(w)){errors.push(`widgets[${i}] must be an object.`);continue;}
+    const fields=['entryId','name','type','datasetId','categoryFieldId','valueFieldId','series','description','filterNames','tableFieldIds','localFilterFieldIds','valueFormat','categoryFormat','categoryTimeZone','dimensionIds'];
+    for(const field of Object.keys(w))if(!fields.includes(field))errors.push(`widgets[${i}].${field} is unsupported.`);
+    for(const field of ['entryId','name'])if(!nonempty(w[field]))errors.push(`widgets[${i}].${field} is required.`);
+    if('dimensionIds' in w&&!validDimensionIds(w.dimensionIds))errors.push(`widgets[${i}].dimensionIds must be unique non-empty strings.`);
+    if(!['table','kpi','bar','line','pie'].includes(w.type))errors.push(`widgets[${i}].type is unsupported.`);
+    if('valueFormat' in w&&(w.type!=='kpi'||!['number','percent'].includes(w.valueFormat)))errors.push(`widgets[${i}].valueFormat requires a KPI and number or percent.`);
+    if('categoryFormat' in w||'categoryTimeZone' in w) {
+      if(!['line','bar'].includes(w.type)||w.categoryFormat!=='epoch-month'||!nonempty(w.categoryTimeZone))errors.push(`widgets[${i}].categoryFormat requires a line/bar, epoch-month and an explicit categoryTimeZone.`);
+      else try{new Intl.DateTimeFormat('en',{timeZone:w.categoryTimeZone});}catch{errors.push(`widgets[${i}].categoryTimeZone is invalid.`);}
+    }
+    for(const field of ['datasetId','categoryFieldId','valueFieldId','description'])if(field in w&&!nonempty(w[field]))errors.push(`widgets[${i}].${field} must be non-empty.`);
+    if(w.type!=='table'&&!nonempty(w.valueFieldId)&&!w.series)errors.push(`widgets[${i}].valueFieldId is required.`);
+    if(!['table','kpi'].includes(w.type)&&!nonempty(w.categoryFieldId))errors.push(`widgets[${i}].categoryFieldId is required.`);
+    if('series' in w&&(!['line','bar'].includes(w.type)||!Array.isArray(w.series)||!w.series.length||w.series.some(s=>!record(s)||Object.keys(s).some(k=>!['fieldId','label'].includes(k))||!nonempty(s.fieldId)||!nonempty(s.label))||new Set(w.series.map(s=>s?.fieldId)).size!==w.series.length))errors.push(`widgets[${i}].series is invalid.`);
+    for(const field of ['filterNames','tableFieldIds','localFilterFieldIds'])if(field in w) {
+      if(!Array.isArray(w[field])||w[field].some(v=>!nonempty(v))||new Set(w[field]).size!==w[field].length)errors.push(`widgets[${i}].${field} must be unique strings.`);
+      else if(field==='filterNames'&&w[field].some(name=>!Array.isArray(config.filters)||!config.filters.some(f=>f?.name===name)))errors.push(`widgets[${i}].filterNames references an unknown filter.`);
+      else if(field!=='filterNames'&&(w.type!=='table'||!w[field].length))errors.push(`widgets[${i}].${field} is only for tables and must be non-empty.`);
+    }
+  }
+  return errors;
+}

package/templates/web-app/src/finebi/date.d.ts

@@ -1 +1 @@
-export function isDateValue(value: unknown): boolean;
+export function isDateValue(value: unknown): boolean;

package/templates/web-app/src/finebi/date.js

@@ -1,5 +1,5 @@
-export function isDateValue(value) {
-  if (typeof value !== 'string' || !/^(?!0000)\d{4}-\d{2}-\d{2}$/.test(value)) return false;
-  const date = new Date(`${value}T00:00:00.000Z`);
-  return Number.isFinite(date.getTime()) && date.toISOString().slice(0, 10) === value;
-}
+export function isDateValue(value) {
+  if (typeof value !== 'string' || !/^(?!0000)\d{4}-\d{2}-\d{2}$/.test(value)) return false;
+  const date = new Date(`${value}T00:00:00.000Z`);
+  return Number.isFinite(date.getTime()) && date.toISOString().slice(0, 10) === value;
+}

package/templates/web-app/src/finebi/filters.d.ts

@@ -1,4 +1,4 @@
-import type {FilterBinding, FilterState} from './types';
-export function validateFilterBindings(bindings: unknown): void;
-export function encodeFilters(bindings: FilterBinding[], state?: FilterState): Record<string,string[]>;
-export function validateRefer(bindings: FilterBinding[], refer?: unknown): void;
+import type {FilterBinding, FilterState} from './types';
+export function validateFilterBindings(bindings: unknown): void;
+export function encodeFilters(bindings: FilterBinding[], state?: FilterState): Record<string,string[]>;
+export function validateRefer(bindings: FilterBinding[], refer?: unknown): void;

package/templates/web-app/src/finebi/filters.js

@@ -1,106 +1,106 @@
-import {isDateValue} from './date.js';
-
-const types = new Set(['text','select','multi-select','number','date','date-range','year','month','month-range','quarter','time-label']);
-const choices = new Set(['select','multi-select','time-label']);
-const nullable = new Set(['text','select','multi-select','number']);
-const record = value => value !== null && typeof value === 'object' && !Array.isArray(value);
-const nonempty = value => typeof value === 'string' && value.trim().length > 0;
-const literal = value => typeof value === 'string' && value !== '' && value !== 'null' && !value.includes(',');
-const kind = binding => binding.type ?? 'select';
-const range = binding => ['date-range','month-range'].includes(kind(binding));
-const keys = binding => range(binding) ? [binding.name+'_s',binding.name+'_e'] : [binding.name];
-const fail = message => {throw new Error(`无效筛选：${message}`);};
-
-// Shared by app inspect, browser requests and the development proxy.
-export function validateFilterBindings(bindings) {
-  if (!Array.isArray(bindings)) fail('filters 必须为数组');
-  const names = new Set(), wireKeys = new Set();
-  for (const binding of bindings) {
-    if (!record(binding)) fail('配置必须为对象');
-    for (const key of Object.keys(binding)) if (!['name','label','type','options','allowNull'].includes(key)) fail(`不支持的配置字段 ${key}`);
-    if (!nonempty(binding.name) || !nonempty(binding.label)) fail('name 和 label 必须为非空文本');
-    if (names.has(binding.name)) fail(`重复名称 ${binding.name}`);
-    names.add(binding.name);
-    if (!types.has(kind(binding))) fail(`不支持的类型 ${binding.type}`);
-    if ('allowNull' in binding && (typeof binding.allowNull !== 'boolean' || !nullable.has(kind(binding)))) fail(`${binding.name} 不支持此 allowNull 配置`);
-    for (const key of keys(binding)) {
-      if (wireKeys.has(key)) fail(`请求键冲突 ${key}`);
-      wireKeys.add(key);
-    }
-    if (!choices.has(kind(binding))) {
-      if ('options' in binding) fail(`${binding.name} 不配置 options`);
-      continue;
-    }
-    if (!Array.isArray(binding.options)) fail(`${binding.name} 必须配置 options`);
-    const values = new Set();
-    for (const option of binding.options) {
-      if (!record(option) || Object.keys(option).some(key => !['label','value'].includes(key)) || !nonempty(option.label)
-          || !(kind(binding)==='time-label' ? nonempty(option.value) : literal(option.value))) fail(`${binding.name} 含无法编码的选项（空串、逗号或保留字 null）`);
-      if (values.has(option.value)) fail(`${binding.name} 含重复选项`);
-      values.add(option.value);
-    }
-  }
-}
-
-function temporal(type, value) {
-  if (typeof value !== 'string') return false;
-  if (type === 'date' || type === 'date-range') return isDateValue(value);
-  if (type === 'year') return /^\d{4}$/.test(value) && value !== '0000';
-  if (type === 'quarter') return /^\d{4}-[1-4]$/.test(value) && !value.startsWith('0000-');
-  return /^\d{4}-(0[1-9]|1[0-2])$/.test(value) && !value.startsWith('0000-');
-}
-
-export function encodeFilters(bindings, state = {}) {
-  validateFilterBindings(bindings);
-  if (!record(state)) fail('状态必须为对象');
-  const result = Object.create(null);
-  for (const [name, value] of Object.entries(state)) {
-    const binding = bindings.find(item => item.name === name);
-    if (!binding) fail(`未知名称 ${name}`);
-    const type = kind(binding);
-    // Empty UI values mean saved conditions, never an unrestricted query.
-    if (value === undefined || value === '') continue;
-    if (value === null) {
-      if (!binding.allowNull) fail(`${name} 不支持筛选空值`);
-      result[name] = ['null'];
-    } else if (range(binding)) {
-      if (!record(value) || Object.keys(value).some(key => !['start','end'].includes(key))
-          || typeof value.start !== 'string' || typeof value.end !== 'string') fail(`${name} 需要 start/end`);
-      const {start,end} = value;
-      if (start && !temporal(type,start) || end && !temporal(type,end) || start && end && start > end) fail(`${name} 区间无效或起始晚于结束`);
-      if (start) result[name+'_s'] = [start];
-      if (end) result[name+'_e'] = [end];
-    } else if (type === 'multi-select') {
-      if (!Array.isArray(value) || value.some(v => !literal(v) || !binding.options.some(o => o.value === v)) || new Set(value).size !== value.length) fail(`${name} 多选值无效`);
-      if (value.length) result[name] = [value.join(',')];
-    } else {
-      const valid = type === 'text' ? literal(value)
-        : type === 'number' ? typeof value === 'string' && /^-?\d+(\.\d+)?$/.test(value)
-        : choices.has(type) ? typeof value === 'string' && binding.options.some(o => o.value === value)
-        : temporal(type,value);
-      if (!valid) fail(`${name} 值格式不正确`);
-      result[name] = [value];
-    }
-  }
-  return {...result};
-}
-
-export function validateRefer(bindings, refer = {}) {
-  validateFilterBindings(bindings);
-  if (!record(refer)) fail('refer 必须为对象');
-  const known = new Set(bindings.flatMap(keys));
-  for (const [name,value] of Object.entries(refer)) {
-    if (!known.has(name) || !Array.isArray(value) || value.length !== 1 || typeof value[0] !== 'string' || !value[0]) fail(`非法请求键或值 ${name}`);
-  }
-  const state = Object.create(null);
-  for (const binding of bindings) {
-    if (range(binding)) {
-      const start = refer[binding.name+'_s']?.[0] ?? '', end = refer[binding.name+'_e']?.[0] ?? '';
-      if (start || end) state[binding.name] = {start,end};
-    } else if (Object.hasOwn(refer,binding.name)) {
-      const value = refer[binding.name][0];
-      state[binding.name] = value === 'null' && nullable.has(kind(binding)) ? null : kind(binding) === 'multi-select' ? value.split(',') : value;
-    }
-  }
-  encodeFilters(bindings,state);
-}
+import {isDateValue} from './date.js';
+
+const types = new Set(['text','select','multi-select','number','date','date-range','year','month','month-range','quarter','time-label']);
+const choices = new Set(['select','multi-select','time-label']);
+const nullable = new Set(['text','select','multi-select','number']);
+const record = value => value !== null && typeof value === 'object' && !Array.isArray(value);
+const nonempty = value => typeof value === 'string' && value.trim().length > 0;
+const literal = value => typeof value === 'string' && value !== '' && value !== 'null' && !value.includes(',');
+const kind = binding => binding.type ?? 'select';
+const range = binding => ['date-range','month-range'].includes(kind(binding));
+const keys = binding => range(binding) ? [binding.name+'_s',binding.name+'_e'] : [binding.name];
+const fail = message => {throw new Error(`无效筛选：${message}`);};
+
+// Shared by app inspect, browser requests and the development proxy.
+export function validateFilterBindings(bindings) {
+  if (!Array.isArray(bindings)) fail('filters 必须为数组');
+  const names = new Set(), wireKeys = new Set();
+  for (const binding of bindings) {
+    if (!record(binding)) fail('配置必须为对象');
+    for (const key of Object.keys(binding)) if (!['name','label','type','options','allowNull'].includes(key)) fail(`不支持的配置字段 ${key}`);
+    if (!nonempty(binding.name) || !nonempty(binding.label)) fail('name 和 label 必须为非空文本');
+    if (names.has(binding.name)) fail(`重复名称 ${binding.name}`);
+    names.add(binding.name);
+    if (!types.has(kind(binding))) fail(`不支持的类型 ${binding.type}`);
+    if ('allowNull' in binding && (typeof binding.allowNull !== 'boolean' || !nullable.has(kind(binding)))) fail(`${binding.name} 不支持此 allowNull 配置`);
+    for (const key of keys(binding)) {
+      if (wireKeys.has(key)) fail(`请求键冲突 ${key}`);
+      wireKeys.add(key);
+    }
+    if (!choices.has(kind(binding))) {
+      if ('options' in binding) fail(`${binding.name} 不配置 options`);
+      continue;
+    }
+    if (!Array.isArray(binding.options)) fail(`${binding.name} 必须配置 options`);
+    const values = new Set();
+    for (const option of binding.options) {
+      if (!record(option) || Object.keys(option).some(key => !['label','value'].includes(key)) || !nonempty(option.label)
+          || !(kind(binding)==='time-label' ? nonempty(option.value) : literal(option.value))) fail(`${binding.name} 含无法编码的选项（空串、逗号或保留字 null）`);
+      if (values.has(option.value)) fail(`${binding.name} 含重复选项`);
+      values.add(option.value);
+    }
+  }
+}
+
+function temporal(type, value) {
+  if (typeof value !== 'string') return false;
+  if (type === 'date' || type === 'date-range') return isDateValue(value);
+  if (type === 'year') return /^\d{4}$/.test(value) && value !== '0000';
+  if (type === 'quarter') return /^\d{4}-[1-4]$/.test(value) && !value.startsWith('0000-');
+  return /^\d{4}-(0[1-9]|1[0-2])$/.test(value) && !value.startsWith('0000-');
+}
+
+export function encodeFilters(bindings, state = {}) {
+  validateFilterBindings(bindings);
+  if (!record(state)) fail('状态必须为对象');
+  const result = Object.create(null);
+  for (const [name, value] of Object.entries(state)) {
+    const binding = bindings.find(item => item.name === name);
+    if (!binding) fail(`未知名称 ${name}`);
+    const type = kind(binding);
+    // Empty UI values mean saved conditions, never an unrestricted query.
+    if (value === undefined || value === '') continue;
+    if (value === null) {
+      if (!binding.allowNull) fail(`${name} 不支持筛选空值`);
+      result[name] = ['null'];
+    } else if (range(binding)) {
+      if (!record(value) || Object.keys(value).some(key => !['start','end'].includes(key))
+          || typeof value.start !== 'string' || typeof value.end !== 'string') fail(`${name} 需要 start/end`);
+      const {start,end} = value;
+      if (start && !temporal(type,start) || end && !temporal(type,end) || start && end && start > end) fail(`${name} 区间无效或起始晚于结束`);
+      if (start) result[name+'_s'] = [start];
+      if (end) result[name+'_e'] = [end];
+    } else if (type === 'multi-select') {
+      if (!Array.isArray(value) || value.some(v => !literal(v) || !binding.options.some(o => o.value === v)) || new Set(value).size !== value.length) fail(`${name} 多选值无效`);
+      if (value.length) result[name] = [value.join(',')];
+    } else {
+      const valid = type === 'text' ? literal(value)
+        : type === 'number' ? typeof value === 'string' && /^-?\d+(\.\d+)?$/.test(value)
+        : choices.has(type) ? typeof value === 'string' && binding.options.some(o => o.value === value)
+        : temporal(type,value);
+      if (!valid) fail(`${name} 值格式不正确`);
+      result[name] = [value];
+    }
+  }
+  return {...result};
+}
+
+export function validateRefer(bindings, refer = {}) {
+  validateFilterBindings(bindings);
+  if (!record(refer)) fail('refer 必须为对象');
+  const known = new Set(bindings.flatMap(keys));
+  for (const [name,value] of Object.entries(refer)) {
+    if (!known.has(name) || !Array.isArray(value) || value.length !== 1 || typeof value[0] !== 'string' || !value[0]) fail(`非法请求键或值 ${name}`);
+  }
+  const state = Object.create(null);
+  for (const binding of bindings) {
+    if (range(binding)) {
+      const start = refer[binding.name+'_s']?.[0] ?? '', end = refer[binding.name+'_e']?.[0] ?? '';
+      if (start || end) state[binding.name] = {start,end};
+    } else if (Object.hasOwn(refer,binding.name)) {
+      const value = refer[binding.name][0];
+      state[binding.name] = value === 'null' && nullable.has(kind(binding)) ? null : kind(binding) === 'multi-select' ? value.split(',') : value;
+    }
+  }
+  encodeFilters(bindings,state);
+}