foggy-data-viewer 1.0.1-beta.57 → 1.0.1-beta.58

package/README.md

@@ -170,7 +170,22 @@ const amountField = {
 | initialSlice | `SliceCondition[]` | - | 初始筛选条件 |
 | filterOptionsLoader | `Function` | - | 筛选选项加载器 |
 
-`DataTableWithSearch` 在 `schema + fetchData` 服务端查询模式下默认 `localFilter=false`：列头筛选仍会提交给 `fetchData`，但返回数据不会再被前端二次过滤，避免聚合字段、派生字段、字典展示字段被简单本地比较误删。需要纯前端过滤时，可显式设置 `localFilter=true` 或 `schema.localFilter=true`。
+`DataTableWithSearch` 在 `schema + fetchData` 服务端查询模式下默认 `localFilter=false`：列头筛选仍会提交给 `fetchData`，但返回数据不会再被前端二次过滤，避免聚合字段、派生字段、字典展示字段被简单本地比较误删。需要纯前端过滤时，可显式设置 `localFilter=true` 或 `schema.localFilter=true`。
+
+### 固定 groupBy 表
+
+使用 `tableMode="groupBy"` 和固定的 `groupBy` 配置。Schema 的可见列应只包含这些分组键和标记为 `measure: true` 的 QM 度量；每个分组键必须返回。表头条件会作为 `having` 传给 `fetchData`，页面固定业务条件仍可通过 `fixedSlice` 传入。分组模式不加载或显示查询方案，也不显示跨组合计。
+
+```vue
+<DataTableWithSearch
+  :schema="groupedSchema"
+  :fetch-data="queryGroupedOrders"
+  table-mode="groupBy"
+  :group-by="[{ field: 'stationId' }, { field: 'orderMonth' }]"
+/>
+```
+
+`fetchData` 应透传 `params.groupBy`、`params.having`、`params.returnTotal` 到 Viewer 直连接口，并返回 `hasNext: boolean`。分组模式以 `returnTotal=false` 查询，分页仅提供上一页和下一页；总条数留待独立计数能力。导出可使用组件 `executeQuery({ page, pageSize })` 逐页读取，直到 `hasNext=false`，并自行实施行数上限。
 
 ### DataTableWithSearch tableInstanceId 默认查询配置
 

package/dist/components/DataTable.vue.d.ts

@@ -18,6 +18,9 @@ interface Props {
     data: Record<string, unknown>[];
     /** 总行数 */
     total: number;
+    /** 分组表不计算总数时使用简单分页 */
+    paginationMode?: 'total' | 'hasNext';
+    hasNext?: boolean;
     /** 加载状态 */
     loading: boolean;
     /** 已有数据上的后台刷新状态 */
@@ -122,6 +125,8 @@ declare const __VLS_component: import("vue").DefineComponent<Props, {
     "onCheckbox-all"?: (rows: Record<string, unknown>[]) => any;
 }>, {
     pageSize: number;
+    hasNext: boolean;
+    paginationMode: "total" | "hasNext";
     backgroundLoading: boolean;
     backgroundLoadingText: string;
     backgroundLoadingError: string | null;

package/dist/components/DataTableWithSearch.vue.d.ts

@@ -1,4 +1,4 @@
-import type { EnhancedColumnSchema, SliceRequestDef, FilterOption, TableSchema, FetchDataParams, FetchDataResult, OrderRequestDef, QueryHooks, MemberQueryRequest, MemberQueryResponse, CellCopyConfig, QueryMode, ListViewState, ListPresetConfig, TableDensity, QueryExecutionOptions, SearchHooks, TableDefaultQueryConfig, TableDefaultQueryConfigScope, TableDefaultQueryConfigLoadOptions } from '@/types';
+import type { EnhancedColumnSchema, SliceRequestDef, GroupRequestDef, FilterOption, TableSchema, FetchDataParams, FetchDataResult, OrderRequestDef, QueryHooks, MemberQueryRequest, MemberQueryResponse, CellCopyConfig, QueryMode, ListViewState, ListPresetConfig, TableDensity, QueryExecutionOptions, SearchHooks, TableDefaultQueryConfig, TableDefaultQueryConfigScope, TableDefaultQueryConfigLoadOptions } from '@/types';
 import type { QueryPanelExpose, QuerySchema } from './QueryPanel.vue';
 /**
  * DataTableWithSearch 组件
@@ -12,6 +12,10 @@ interface Props {
     schema?: TableSchema;
     /** 数据加载函数 */
     fetchData?: (params: FetchDataParams) => Promise<FetchDataResult>;
+    /** 普通明细表或固定分组表；分组模式将表头条件作为 HAVING */
+    tableMode?: 'normal' | 'groupBy';
+    /** 分组维度及聚合列，必须由业务配置固定 */
+    groupBy?: GroupRequestDef[];
     /** 执行依赖；隐式补入不展示/保存，用户主动选择时正常展示/保存。 */
     requiredFields?: string[];
     /** 执行依赖，与 requiredFields 同义，不限制用户选择。 */
@@ -26,6 +30,8 @@ interface Props {
     data?: Record<string, unknown>[];
     /** 总数据量 */
     total?: number;
+    /** 受控分组表是否还有下一页 */
+    hasNext?: boolean;
     /** 加载状态 */
     loading?: boolean;
     /** 每页大小 */
@@ -251,6 +257,7 @@ declare const __VLS_component: import("vue").DefineComponent<Props, {
     showFilters: boolean;
     showPager: boolean;
     localFilter: boolean;
+    tableMode: "normal" | "groupBy";
     searchLayout: "horizontal" | "vertical";
     showSearchActions: boolean;
     filterMergeMode: "replace" | "merge";

package/dist/components/composables/useTableQuery.d.ts

@@ -1,5 +1,5 @@
 import { ref } from 'vue';
-import type { FetchDataParams, FetchDataResult, FetchDataFn, SliceRequestDef, OrderRequestDef, QueryHooks, QueryTrigger, QueryHookName, BeforeQueryHookFn, AfterQueryHookFn, ErrorQueryHookFn, QueryExecutionOptions } from '@/types';
+import type { FetchDataParams, FetchDataResult, FetchDataFn, SliceRequestDef, OrderRequestDef, QueryHooks, QueryTrigger, QueryHookName, BeforeQueryHookFn, AfterQueryHookFn, ErrorQueryHookFn, QueryExecutionOptions, GroupRequestDef } from '@/types';
 /** 钩子名称到函数类型的映射 */
 type HookFnMap = {
     onBeforeQuery: BeforeQueryHookFn;
@@ -15,6 +15,7 @@ export interface UseTableQueryOptions {
 export interface UseTableQueryReturn {
     data: ReturnType<typeof ref<Record<string, unknown>[]>>;
     total: ReturnType<typeof ref<number>>;
+    hasNext: ReturnType<typeof ref<boolean>>;
     loading: ReturnType<typeof ref<boolean>>;
     activeTrigger: ReturnType<typeof ref<QueryTrigger | null>>;
     lastError: ReturnType<typeof ref<Error | null>>;
@@ -24,6 +25,9 @@ export interface UseTableQueryReturn {
     currentPageSize: ReturnType<typeof ref<number>>;
     currentOrderBy: ReturnType<typeof ref<OrderRequestDef[]>>;
     currentSlice: ReturnType<typeof ref<SliceRequestDef[]>>;
+    currentHaving: ReturnType<typeof ref<SliceRequestDef[]>>;
+    currentGroupBy: ReturnType<typeof ref<GroupRequestDef[]>>;
+    currentReturnTotal: ReturnType<typeof ref<boolean | undefined>>;
     currentColumns: ReturnType<typeof ref<string[]>>;
     currentTableInstanceId: ReturnType<typeof ref<string | undefined>>;
     loadData: (trigger?: QueryTrigger) => Promise<void>;
@@ -34,6 +38,9 @@ export interface UseTableQueryReturn {
     setPage: (page: number, pageSize?: number) => void;
     setSort: (orderBy: OrderRequestDef[]) => void;
     setSlice: (slice: SliceRequestDef[]) => void;
+    setHaving: (having: SliceRequestDef[]) => void;
+    setGroupBy: (groupBy: GroupRequestDef[]) => void;
+    setReturnTotal: (returnTotal?: boolean) => void;
     setColumns: (columns: string[]) => void;
     setTableInstanceId: (tableInstanceId?: string) => void;
     addHook: <N extends QueryHookName>(name: N, fn: HookFnMap[N]) => () => void;

package/dist/index.d.ts

@@ -35,4 +35,4 @@ export { prepareCustomQuery, normalizeUserSlice, resolveRelativeDate, resolveRel
 export type { RelativeDateRange, RelativeDateValue, CustomQueryExecutionOptions } from './utils/customQuery';
 export { LIST_PRESET_SHARE_SCHEMA_VERSION, buildListPresetSharePackage, serializeListPresetSharePackage, parseListPresetSharePackage, assertListPresetShareCompatible, listPresetShareToViewState } from './utils/listPresetShare';
 export type { ListPresetSharePreset, ListPresetSharePackage, ListPresetShareTargetContext } from './utils/listPresetShare';
-export type { ColumnSchema, MoneyViewerConfig, ViewerConfig, FieldExtData, EnhancedColumnSchema, TableConfig, TableSchema, CellRenderContext, CellRenderFn, GlobalColumnRenderContext, GlobalColumnMatchFn, GlobalColumnRenderFn, GlobalColumnRenderer, GlobalColumnRenderResolution, CellCopyConfig, QueryMode, ColumnCustomization, QueryMetaResponse, ViewerQueryRequest, ViewerDataResponse, SliceRequestDef, OrderRequestDef, FilterOption, FetchDataParams, FetchDataParamsWithExtensions, FetchDataResult, QueryExecutionOptions, FetchDataFn, DictItem, PaginationState, SortState, QueryHooks, QueryHookContext, QueryTrigger, QueryHookName, BeforeQueryHookFn, AfterQueryHookFn, ErrorQueryHookFn, SearchSource, SearchTrigger, SearchHookContext, SearchHookUpdate, SearchHookName, BeforeSearchHookFn, AfterSearchHookFn, ErrorSearchHookFn, SearchHooks, MaybePromise, PivotAxisField, PivotAxisPage, PivotAxisPageScope, PivotAxisRole, PivotHeaderNode, PivotHeaderRole, PivotMetric, PivotRawAxisMember, PivotRawCell, PivotRawPayload, PivotShape, PivotViewMode, PivotViewModel, ListPresetVisibility, ListPresetPlacement, ListPresetShareContextOptions, ListPresetShareContext, ListPresetConfig, TableDefaultQueryConfig, TableDefaultQueryConfigScope, TableDefaultQueryConfigLoadOptions, TableDefaultQueryConfigSource, ColumnViewSetting, QueryConditionPreset, ListViewState, ListPresetDef, FrontendMeta, FieldMeta, FieldCategory, MemberLookupMeta, UiHintsMeta, DefaultsMeta, CapabilitiesMeta, ParamsMeta, MemberQueryRequest, MemberOption, MemberQueryResponse } from './types';
+export type { ColumnSchema, MoneyViewerConfig, ViewerConfig, FieldExtData, EnhancedColumnSchema, TableConfig, TableSchema, CellRenderContext, CellRenderFn, GlobalColumnRenderContext, GlobalColumnMatchFn, GlobalColumnRenderFn, GlobalColumnRenderer, GlobalColumnRenderResolution, CellCopyConfig, QueryMode, ColumnCustomization, QueryMetaResponse, ViewerQueryRequest, ViewerDataResponse, SliceRequestDef, GroupRequestDef, OrderRequestDef, FilterOption, FetchDataParams, FetchDataParamsWithExtensions, FetchDataResult, QueryExecutionOptions, FetchDataFn, DictItem, PaginationState, SortState, QueryHooks, QueryHookContext, QueryTrigger, QueryHookName, BeforeQueryHookFn, AfterQueryHookFn, ErrorQueryHookFn, SearchSource, SearchTrigger, SearchHookContext, SearchHookUpdate, SearchHookName, BeforeSearchHookFn, AfterSearchHookFn, ErrorSearchHookFn, SearchHooks, MaybePromise, PivotAxisField, PivotAxisPage, PivotAxisPageScope, PivotAxisRole, PivotHeaderNode, PivotHeaderRole, PivotMetric, PivotRawAxisMember, PivotRawCell, PivotRawPayload, PivotShape, PivotViewMode, PivotViewModel, ListPresetVisibility, ListPresetPlacement, ListPresetShareContextOptions, ListPresetShareContext, ListPresetConfig, TableDefaultQueryConfig, TableDefaultQueryConfigScope, TableDefaultQueryConfigLoadOptions, TableDefaultQueryConfigSource, ColumnViewSetting, QueryConditionPreset, ListViewState, ListPresetDef, FrontendMeta, FieldMeta, FieldCategory, MemberLookupMeta, UiHintsMeta, DefaultsMeta, CapabilitiesMeta, ParamsMeta, MemberQueryRequest, MemberOption, MemberQueryResponse } from './types';