@finebi/finebi-cli 1.6.1 → 1.6.2

package/skills/finebi-cli-agent/scripts/finebi-cli/templates/web-app/src/components/charts/Line.tsx

@@ -1,6 +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';
+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/skills/finebi-cli-agent/scripts/finebi-cli/templates/web-app/src/components/charts/Pie.tsx

@@ -1,6 +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';
+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/skills/finebi-cli-agent/scripts/finebi-cli/templates/web-app/src/components/month-picker.css

@@ -1 +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}
+.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/skills/finebi-cli-agent/scripts/finebi-cli/templates/web-app/src/finebi/client.ts

@@ -1,6 +1,6 @@
 import {normalize} from './normalize';
 import {encodeFilters} from './filters.js';
-import {configErrors} from './config.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';}
@@ -14,10 +14,16 @@ export async function queryWidgets(config: AppConfig, filters: FilterState = {},
   const refer = encodeFilters(config.filters,filters);
   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,...(config.directoryEntryId?{reportEntryId:config.directoryEntryId}:{})}),
+    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', '当前用户没有访问权限');
@@ -26,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,8 +49,10 @@ 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,scoped,signal,fetchImpl,[binding.entryId]))[binding.entryId];
+  return (await queryWidgets({...config,widgets:[binding]},scoped,signal,fetchImpl,[binding.entryId]))[binding.entryId];
 }

package/skills/finebi-cli-agent/scripts/finebi-cli/templates/web-app/src/finebi/config.d.ts

@@ -1 +1,3 @@
-export function configErrors(config: unknown): string[];
+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/skills/finebi-cli-agent/scripts/finebi-cli/templates/web-app/src/finebi/config.js

@@ -1,44 +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);
-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'];
-    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(!['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;
-}
+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/skills/finebi-cli-agent/scripts/finebi-cli/templates/web-app/src/finebi/date.d.ts

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

package/skills/finebi-cli-agent/scripts/finebi-cli/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/skills/finebi-cli-agent/scripts/finebi-cli/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/skills/finebi-cli-agent/scripts/finebi-cli/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);
+}