@finebi/finebi-cli 1.6.2 → 2.0.0

package/templates/web-app/src/services/presentation.ts

@@ -1,36 +1,36 @@
-import type {Cell,WidgetBinding} from '../finebi/types';
-import {displayCell} from './view-data';
-
-// Decimal strings stay strings/integers: formatting a large amount must not lose cents.
-export function formatMetric(cell:Cell,format?:WidgetBinding['valueFormat']):string {
-  if(!format||cell.state!=='AVAILABLE'||cell.value===null)return displayCell(cell);
-  const match=/^(-?)(\d+)(?:\.(\d+))?(?:e([+-]?\d+))?$/i.exec(cell.value);
-  if(!match)return displayCell(cell);
-  const exponent=Number(match[4]??0),fraction=match[3]??'';
-  if(Math.abs(exponent)>100)return displayCell(cell);
-  let digits=(match[2]+fraction).replace(/^0+(?=\d)/,'');
-  let scale=fraction.length-exponent;
-  if(format==='percent') {
-    scale-=2;
-    const shift=2-scale;
-    let amount=BigInt(digits);
-    if(shift>=0)amount*=10n**BigInt(shift);
-    else {const divisor=10n**BigInt(-shift);amount=(amount+divisor/2n)/divisor;}
-    digits=amount.toString();scale=2;
-  }
-  if(scale<0){digits+='0'.repeat(-scale);scale=0;}
-  digits=digits.padStart(scale+1,'0');
-  const whole=(scale?digits.slice(0,-scale):digits).replace(/\B(?=(\d{3})+(?!\d))/g,',');
-  const tail=scale?digits.slice(-scale):'';
-  const decimal=format==='percent'?tail:tail.replace(/0+$/,'');
-  const sign=match[1]&&/[1-9]/.test(digits)?'-':'';
-  return `${sign}${whole}${decimal?'.'+decimal:''}${format==='percent'?'%':''}`;
-}
-
-export function formatCategory(cell:Cell,binding:Pick<WidgetBinding,'categoryFormat'|'categoryTimeZone'>):string {
-  if(binding.categoryFormat!=='epoch-month'||!binding.categoryTimeZone||cell.state!=='AVAILABLE'||!cell.value||! /^-?\d+$/.test(cell.value))return displayCell(cell);
-  const timestamp=Number(cell.value);
-  if(!Number.isSafeInteger(timestamp)||!Number.isFinite(new Date(timestamp).getTime()))return displayCell(cell);
-  const parts=new Intl.DateTimeFormat('en',{year:'numeric',month:'2-digit',timeZone:binding.categoryTimeZone}).formatToParts(new Date(timestamp));
-  return `${parts.find(p=>p.type==='year')!.value}-${parts.find(p=>p.type==='month')!.value}`;
-}
+import type {Cell,WidgetBinding} from '../finebi/types';
+import {displayCell} from './view-data';
+
+// Decimal strings stay strings/integers: formatting a large amount must not lose cents.
+export function formatMetric(cell:Cell,format?:WidgetBinding['valueFormat']):string {
+  if(!format||cell.state!=='AVAILABLE'||cell.value===null)return displayCell(cell);
+  const match=/^(-?)(\d+)(?:\.(\d+))?(?:e([+-]?\d+))?$/i.exec(cell.value);
+  if(!match)return displayCell(cell);
+  const exponent=Number(match[4]??0),fraction=match[3]??'';
+  if(Math.abs(exponent)>100)return displayCell(cell);
+  let digits=(match[2]+fraction).replace(/^0+(?=\d)/,'');
+  let scale=fraction.length-exponent;
+  if(format==='percent') {
+    scale-=2;
+    const shift=2-scale;
+    let amount=BigInt(digits);
+    if(shift>=0)amount*=10n**BigInt(shift);
+    else {const divisor=10n**BigInt(-shift);amount=(amount+divisor/2n)/divisor;}
+    digits=amount.toString();scale=2;
+  }
+  if(scale<0){digits+='0'.repeat(-scale);scale=0;}
+  digits=digits.padStart(scale+1,'0');
+  const whole=(scale?digits.slice(0,-scale):digits).replace(/\B(?=(\d{3})+(?!\d))/g,',');
+  const tail=scale?digits.slice(-scale):'';
+  const decimal=format==='percent'?tail:tail.replace(/0+$/,'');
+  const sign=match[1]&&/[1-9]/.test(digits)?'-':'';
+  return `${sign}${whole}${decimal?'.'+decimal:''}${format==='percent'?'%':''}`;
+}
+
+export function formatCategory(cell:Cell,binding:Pick<WidgetBinding,'categoryFormat'|'categoryTimeZone'>):string {
+  if(binding.categoryFormat!=='epoch-month'||!binding.categoryTimeZone||cell.state!=='AVAILABLE'||!cell.value||! /^-?\d+$/.test(cell.value))return displayCell(cell);
+  const timestamp=Number(cell.value);
+  if(!Number.isSafeInteger(timestamp)||!Number.isFinite(new Date(timestamp).getTime()))return displayCell(cell);
+  const parts=new Intl.DateTimeFormat('en',{year:'numeric',month:'2-digit',timeZone:binding.categoryTimeZone}).formatToParts(new Date(timestamp));
+  return `${parts.find(p=>p.type==='year')!.value}-${parts.find(p=>p.type==='month')!.value}`;
+}

package/templates/web-app/src/services/table-data.ts

@@ -1,47 +1,47 @@
-import type {Cell,Dataset,WidgetBinding} from '../finebi/types';
-import {displayCell} from './view-data';
-function decimal(value:string) {
-  const match=/^([+-]?)(\d*\.?\d+|\d+\.)(?:e([+-]?\d+))?$/i.exec(value);
-  if(!match)throw new Error('无效十进制值');
-  const [whole,fraction='']=match[2].split('.');
-  const digits=(whole+fraction).replace(/^0+/,'').replace(/0+$/,'');
-  const significant=(whole+fraction).replace(/^0+/,'');
-  return {sign:!digits?0:match[1]==='-'?-1:1,digits,order:BigInt(significant.length)+BigInt(match[3]||0)-BigInt(fraction.length)};
-}
-export function compareDecimal(a:string,b:string) {
-  const x=decimal(a),y=decimal(b);
-  if(x.sign!==y.sign)return x.sign<y.sign?-1:1;
-  if(x.sign===0)return 0;
-  const length=Math.max(x.digits.length,y.digits.length);
-  const left=x.digits.padEnd(length,'0'),right=y.digits.padEnd(length,'0');
-  const order=x.order!==y.order?(x.order<y.order?-1:1):left===right?0:left<right?-1:1;
-  return order===0?0:order*x.sign;
-}
-export function tableDataset(dataset:Dataset,binding:WidgetBinding):Dataset {
-  if(!binding.tableFieldIds)return dataset;
-  const indices=binding.tableFieldIds.map(id=>fieldIndex(dataset,id));
-  return {...dataset,columns:indices.map(i=>dataset.columns[i]),rows:dataset.rows.map(row=>({...row,cells:indices.map(i=>row.cells[i])}))};
-}
-export function fieldIndex(dataset:Dataset,id:string) {
-  const index=dataset.columns.findIndex(c=>c.fieldId===id);
-  if(index<0)throw new Error(`结果字段绑定缺失：${id}`);
-  return index;
-}
-type Options={search:string;sort?:{fieldId:string;direction:'asc'|'desc'};filters:Record<string,string>};
-export function tableRows(dataset:Dataset,{search,sort,filters}:Options) {
-  const columns=Object.entries(filters).map(([id,value])=>({index:fieldIndex(dataset,id),value}));
-  const rows=dataset.rows.filter(row=>row.cells.some(c=>displayCell(c).toLocaleLowerCase().includes(search.toLocaleLowerCase()))&&columns.every(({index,value})=>!value||displayCell(row.cells[index])===value));
-  if(!sort)return rows;
-  const index=fieldIndex(dataset,sort.fieldId),numeric=dataset.columns[index].type==='DECIMAL';
-  return [...rows].sort((a,b)=>{
-    const x=a.cells[index],y=b.cells[index];
-    const valid=(c:Cell)=>c.state==='AVAILABLE'&&c.value!==null;
-    if(!valid(x)||!valid(y))return valid(x)?-1:valid(y)?1:0;
-    const order=numeric?compareDecimal(x.value!,y.value!):displayCell(x).localeCompare(displayCell(y),'zh-CN');
-    return sort.direction==='asc'?order:-order;
-  });
-}
-export function tableCsv(dataset:Dataset,rows:Dataset['rows']) {
-  const escape=(value:string)=>`"${(/^[\s]*[=+\-@]/.test(value)?"'"+value:value).replace(/"/g,'""')}"`;
-  return '\uFEFF'+[[...dataset.columns.map(c=>c.name),'行类型'],...rows.map(row=>[...row.cells.map(displayCell),row.kind])].map(row=>row.map(escape).join(',')).join('\r\n');
-}
+import type {Cell,Dataset,WidgetBinding} from '../finebi/types';
+import {displayCell} from './view-data';
+function decimal(value:string) {
+  const match=/^([+-]?)(\d*\.?\d+|\d+\.)(?:e([+-]?\d+))?$/i.exec(value);
+  if(!match)throw new Error('无效十进制值');
+  const [whole,fraction='']=match[2].split('.');
+  const digits=(whole+fraction).replace(/^0+/,'').replace(/0+$/,'');
+  const significant=(whole+fraction).replace(/^0+/,'');
+  return {sign:!digits?0:match[1]==='-'?-1:1,digits,order:BigInt(significant.length)+BigInt(match[3]||0)-BigInt(fraction.length)};
+}
+export function compareDecimal(a:string,b:string) {
+  const x=decimal(a),y=decimal(b);
+  if(x.sign!==y.sign)return x.sign<y.sign?-1:1;
+  if(x.sign===0)return 0;
+  const length=Math.max(x.digits.length,y.digits.length);
+  const left=x.digits.padEnd(length,'0'),right=y.digits.padEnd(length,'0');
+  const order=x.order!==y.order?(x.order<y.order?-1:1):left===right?0:left<right?-1:1;
+  return order===0?0:order*x.sign;
+}
+export function tableDataset(dataset:Dataset,binding:WidgetBinding):Dataset {
+  if(!binding.tableFieldIds)return dataset;
+  const indices=binding.tableFieldIds.map(id=>fieldIndex(dataset,id));
+  return {...dataset,columns:indices.map(i=>dataset.columns[i]),rows:dataset.rows.map(row=>({...row,cells:indices.map(i=>row.cells[i])}))};
+}
+export function fieldIndex(dataset:Dataset,id:string) {
+  const index=dataset.columns.findIndex(c=>c.fieldId===id);
+  if(index<0)throw new Error(`结果字段绑定缺失：${id}`);
+  return index;
+}
+type Options={search:string;sort?:{fieldId:string;direction:'asc'|'desc'};filters:Record<string,string>};
+export function tableRows(dataset:Dataset,{search,sort,filters}:Options) {
+  const columns=Object.entries(filters).map(([id,value])=>({index:fieldIndex(dataset,id),value}));
+  const rows=dataset.rows.filter(row=>row.cells.some(c=>displayCell(c).toLocaleLowerCase().includes(search.toLocaleLowerCase()))&&columns.every(({index,value})=>!value||displayCell(row.cells[index])===value));
+  if(!sort)return rows;
+  const index=fieldIndex(dataset,sort.fieldId),numeric=dataset.columns[index].type==='DECIMAL';
+  return [...rows].sort((a,b)=>{
+    const x=a.cells[index],y=b.cells[index];
+    const valid=(c:Cell)=>c.state==='AVAILABLE'&&c.value!==null;
+    if(!valid(x)||!valid(y))return valid(x)?-1:valid(y)?1:0;
+    const order=numeric?compareDecimal(x.value!,y.value!):displayCell(x).localeCompare(displayCell(y),'zh-CN');
+    return sort.direction==='asc'?order:-order;
+  });
+}
+export function tableCsv(dataset:Dataset,rows:Dataset['rows']) {
+  const escape=(value:string)=>`"${(/^[\s]*[=+\-@]/.test(value)?"'"+value:value).replace(/"/g,'""')}"`;
+  return '\uFEFF'+[[...dataset.columns.map(c=>c.name),'行类型'],...rows.map(row=>[...row.cells.map(displayCell),row.kind])].map(row=>row.map(escape).join(',')).join('\r\n');
+}

package/templates/web-app/src/services/view-data.ts

@@ -1,18 +1,18 @@
-import type {Cell, Dataset, QueryResult, WidgetBinding} from '../finebi/types';
-export function selectDataset(result: QueryResult, id?: string): Dataset {
-  if (result.normalization === 'UNSUPPORTED') throw new Error('当前结果类型尚未支持，请使用 FineBI 原生查看页');
-  const dataset = id ? result.datasets.find(d => d.id === id) : result.datasets.length === 1 ? result.datasets[0] : undefined;
-  if (!dataset) throw new Error('请绑定唯一的数据模型 datasetId');
-  return dataset;
-}
-export const displayCell = (cell: Cell) => cell.state === 'RESTRICTED' ? '受限' : cell.display ?? (cell.state === 'AVAILABLE' ? cell.value : null) ?? (cell.state === 'NULL' ? '—' : '不可用');
-export function chartValues(dataset: Dataset, binding: Pick<WidgetBinding, 'categoryFieldId' | 'valueFieldId'>) {
-  const x = dataset.columns.findIndex(c => c.fieldId === binding.categoryFieldId);
-  const y = dataset.columns.findIndex(c => c.fieldId === binding.valueFieldId);
-  if (x < 0 || y < 0 || dataset.columns[y].type !== 'DECIMAL') throw new Error('图表字段绑定缺失或类型不匹配');
-  return dataset.rows.map(row => {
-    const cell = row.cells[y];
-    const n = cell.state === 'AVAILABLE' ? Number(cell.value) : NaN;
-    return {name: displayCell(row.cells[x]), value: Number.isFinite(n) ? n : null};
-  });
-}
+import type {Cell, Dataset, QueryResult, WidgetBinding} from '../finebi/types';
+export function selectDataset(result: QueryResult, id?: string): Dataset {
+  if (result.normalization === 'UNSUPPORTED') throw new Error('当前结果类型尚未支持，请使用 FineBI 原生查看页');
+  const dataset = id ? result.datasets.find(d => d.id === id) : result.datasets.length === 1 ? result.datasets[0] : undefined;
+  if (!dataset) throw new Error('请绑定唯一的数据模型 datasetId');
+  return dataset;
+}
+export const displayCell = (cell: Cell) => cell.state === 'RESTRICTED' ? '受限' : cell.display ?? (cell.state === 'AVAILABLE' ? cell.value : null) ?? (cell.state === 'NULL' ? '—' : '不可用');
+export function chartValues(dataset: Dataset, binding: Pick<WidgetBinding, 'categoryFieldId' | 'valueFieldId'>) {
+  const x = dataset.columns.findIndex(c => c.fieldId === binding.categoryFieldId);
+  const y = dataset.columns.findIndex(c => c.fieldId === binding.valueFieldId);
+  if (x < 0 || y < 0 || dataset.columns[y].type !== 'DECIMAL') throw new Error('图表字段绑定缺失或类型不匹配');
+  return dataset.rows.map(row => {
+    const cell = row.cells[y];
+    const n = cell.state === 'AVAILABLE' ? Number(cell.value) : NaN;
+    return {name: displayCell(row.cells[x]), value: Number.isFinite(n) ? n : null};
+  });
+}

package/templates/web-app/src/services/widget-queries.ts

@@ -1,18 +1,18 @@
-import {queryWidget} from '../finebi/client';
-import type {AppConfig,FilterState,QueryResult,WidgetBinding} from '../finebi/types';
-export type WidgetState={loading:boolean;result?:QueryResult;error?:Error;at?:string};
-export const widgetKey=(binding:WidgetBinding,index:number)=>`${index}:${binding.entryId}`;
-export async function loadWidgets(config:AppConfig,filters:FilterState,signal:AbortSignal,onState:(id:string,state:WidgetState)=>void,fetchImpl:typeof fetch=fetch) {
-  const queue=config.widgets.map((binding,index)=>({binding,key:widgetKey(binding,index)}));
-  const worker=async()=>{
-    while(queue.length&&!signal.aborted) {
-      const {binding,key}=queue.shift()!;
-      onState(key,{loading:true});
-      try {
-        const result=await queryWidget(config,binding,filters,signal,fetchImpl);
-        if(!signal.aborted)onState(key,{loading:false,result,at:new Date().toLocaleTimeString()});
-      } catch(error) {if(!signal.aborted)onState(key,{loading:false,error:error instanceof Error?error:new Error('查询失败')});}
-    }
-  };
-  await Promise.all(Array.from({length:Math.min(3,queue.length)},worker));
-}
+import {queryWidget} from '../finebi/client';
+import type {AppConfig,FilterState,QueryResult,WidgetBinding} from '../finebi/types';
+export type WidgetState={loading:boolean;result?:QueryResult;error?:Error;at?:string};
+export const widgetKey=(binding:WidgetBinding,index:number)=>`${index}:${binding.entryId}`;
+export async function loadWidgets(config:AppConfig,filters:FilterState,signal:AbortSignal,onState:(id:string,state:WidgetState)=>void,fetchImpl:typeof fetch=fetch) {
+  const queue=config.widgets.map((binding,index)=>({binding,key:widgetKey(binding,index)}));
+  const worker=async()=>{
+    while(queue.length&&!signal.aborted) {
+      const {binding,key}=queue.shift()!;
+      onState(key,{loading:true});
+      try {
+        const result=await queryWidget(config,binding,filters,signal,fetchImpl);
+        if(!signal.aborted)onState(key,{loading:false,result,at:new Date().toLocaleTimeString()});
+      } catch(error) {if(!signal.aborted)onState(key,{loading:false,error:error instanceof Error?error:new Error('查询失败')});}
+    }
+  };
+  await Promise.all(Array.from({length:Math.min(3,queue.length)},worker));
+}

package/templates/web-app/tests/browser/fixtures.mjs

@@ -1,28 +1,28 @@
-// Synthetic native responses, confined to the browser acceptance page.
-export function fixtureConfig(layout, chartCount = 8) {
-  return {schemaVersion: '1', title: '合成门店经营验证', basePath: '/fixture-decision', layout,
-    dashboardId: 'fixture-dashboard', directoryEntryId: 'fixture-directory', maxRows: 1000, pageSize: 8,
-    filters: [{name: '区域', label: '区域', type: 'text'}], widgets: [
-      ...Array.from({length: 4}, (_, i) => ({entryId: `kpi${i}`, name: i === 3 ? '独立范围指标' : `合成指标 ${i + 1}`,
-        type: 'kpi', valueFieldId: 'amount', valueFormat: 'number', filterNames: i === 3 ? [] : ['区域']})),
-      ...Array.from({length: chartCount}, (_, i) => ({entryId: `chart${i}`, name: `${['趋势','对比','构成'][i % 3]} ${i + 1} · 较长标题用于检查文字换行和布局边界`,
-        type: ['line','bar','pie'][i % 3], categoryFieldId: 'region', valueFieldId: 'amount', filterNames: ['区域']})),
-      {entryId: 'table', name: '合成明细', type: 'table', filterNames: ['区域']},
-    ]};
-}
-
-export function nativeFixture(id, refer, scenario) {
-  const filtered = refer['区域']?.[0] === '华东';
-  const kpi = id.startsWith('kpi');
-  const headers = kpi ? [{dId: 'amount', text: '金额'}] : [{dId: 'region', text: '区域'}, {dId: 'amount', text: '金额'}];
-  const cell = (value, authority = true) => ({value, authority});
-  let rows = kpi ? [[cell(filtered ? '120' : '260')]]
-    : (filtered ? [['华东','120']] : [['华东','120'],['华北','80'],['华南','60']]).map(([region, amount]) => [cell(region), cell(amount)]);
-  if (!filtered && id === 'chart0') rows = [[cell('华东'),cell('120')],[cell('华北'),cell(null)],[cell('华南'),cell('-20')]];
-  if (!filtered && id === 'table') rows[1][1] = cell('hidden', false);
-  if (scenario === 'empty') rows = [];
-  const partial = scenario === 'partial' && id === 'chart0';
-  if (partial) rows[1] = [cell('华北')];
-  return {previewResult: {resultType: 'DETAIL', header: headers, items: rows, row: partial ? 30 : rows.length,
-    size: 1000, hasNext: partial}, widgetBean: {dimensions: {region: {type: 1}, amount: {type: 2}}}};
-}
+// Synthetic native responses, confined to the browser acceptance page.
+export function fixtureConfig(layout, chartCount = 8) {
+  return {schemaVersion: '1', title: '合成门店经营验证', basePath: '/fixture-decision', layout,
+    dashboardId: 'fixture-dashboard', directoryEntryId: 'fixture-directory', maxRows: 1000, pageSize: 8,
+    filters: [{name: '区域', label: '区域', type: 'text'}], widgets: [
+      ...Array.from({length: 4}, (_, i) => ({entryId: `kpi${i}`, name: i === 3 ? '独立范围指标' : `合成指标 ${i + 1}`,
+        type: 'kpi', valueFieldId: 'amount', valueFormat: 'number', filterNames: i === 3 ? [] : ['区域']})),
+      ...Array.from({length: chartCount}, (_, i) => ({entryId: `chart${i}`, name: `${['趋势','对比','构成'][i % 3]} ${i + 1} · 较长标题用于检查文字换行和布局边界`,
+        type: ['line','bar','pie'][i % 3], categoryFieldId: 'region', valueFieldId: 'amount', filterNames: ['区域']})),
+      {entryId: 'table', name: '合成明细', type: 'table', filterNames: ['区域']},
+    ]};
+}
+
+export function nativeFixture(id, refer, scenario) {
+  const filtered = refer['区域']?.[0] === '华东';
+  const kpi = id.startsWith('kpi');
+  const headers = kpi ? [{dId: 'amount', text: '金额'}] : [{dId: 'region', text: '区域'}, {dId: 'amount', text: '金额'}];
+  const cell = (value, authority = true) => ({value, authority});
+  let rows = kpi ? [[cell(filtered ? '120' : '260')]]
+    : (filtered ? [['华东','120']] : [['华东','120'],['华北','80'],['华南','60']]).map(([region, amount]) => [cell(region), cell(amount)]);
+  if (!filtered && id === 'chart0') rows = [[cell('华东'),cell('120')],[cell('华北'),cell(null)],[cell('华南'),cell('-20')]];
+  if (!filtered && id === 'table') rows[1][1] = cell('hidden', false);
+  if (scenario === 'empty') rows = [];
+  const partial = scenario === 'partial' && id === 'chart0';
+  if (partial) rows[1] = [cell('华北')];
+  return {previewResult: {resultType: 'DETAIL', header: headers, items: rows, row: partial ? 30 : rows.length,
+    size: 1000, hasNext: partial}, widgetBean: {dimensions: {region: {type: 1}, amount: {type: 2}}}};
+}

package/templates/web-app/tests/browser/index.html

@@ -1,16 +1,16 @@
-<!doctype html>
-<html lang="zh-CN">
-<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>FineBI 模板浏览器验收</title></head>
-<body>
-  <section id="browser-checks" aria-label="浏览器验收">
-    <h1>模板浏览器验收 · 合成数据</h1>
-    <p>复用实际页面组件，不连接 FineBI。调整浏览器视口后重新运行；真实身份、业务口径与视觉质量需另外核对。</p>
-    <label>测试布局 <select id="test-layout"><option>overview</option><option>workbench</option><option>cockpit</option><option selected>retail</option></select></label>
-    <button id="test-run">运行浏览器检查</button>
-    <strong id="test-result" role="status">未运行</strong>
-    <ol id="test-checks"></ol>
-  </section>
-  <div id="root"></div>
-  <script type="module" src="./main.tsx"></script>
-</body>
-</html>
+<!doctype html>
+<html lang="zh-CN">
+<head><meta charset="UTF-8"><meta name="viewport" content="width=device-width, initial-scale=1.0"><title>FineBI 模板浏览器验收</title></head>
+<body>
+  <section id="browser-checks" aria-label="浏览器验收">
+    <h1>模板浏览器验收 · 合成数据</h1>
+    <p>复用实际页面组件，不连接 FineBI。调整浏览器视口后重新运行；真实身份、业务口径与视觉质量需另外核对。</p>
+    <label>测试布局 <select id="test-layout"><option>overview</option><option>workbench</option><option>cockpit</option><option selected>retail</option></select></label>
+    <button id="test-run">运行浏览器检查</button>
+    <strong id="test-result" role="status">未运行</strong>
+    <ol id="test-checks"></ol>
+  </section>
+  <div id="root"></div>
+  <script type="module" src="./main.tsx"></script>
+</body>
+</html>