From ad7a675a9d15a3256f825d90bc902f1baad3b538 Mon Sep 17 00:00:00 2001 From: limengnan <420004014@qq.com> Date: Tue, 24 Jun 2025 10:24:35 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=89=8D=E7=AB=AFsrc/views/m?= =?UTF-8?q?odels=E7=9B=AE=E5=BD=95=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/models/chart/chart-attr.d.ts | 83 ++++++++++++++++++- .../src/models/chart/chart-style.d.ts | 15 ++++ .../core-frontend/src/models/chart/chart.d.ts | 7 ++ .../src/models/chart/editor.d.ts | 2 + .../core-frontend/src/models/tree/TreeNode.ts | 4 +- 5 files changed, 106 insertions(+), 5 deletions(-) diff --git a/core/core-frontend/src/models/chart/chart-attr.d.ts b/core/core-frontend/src/models/chart/chart-attr.d.ts index 2c916ef..52d924d 100644 --- a/core/core-frontend/src/models/chart/chart-attr.d.ts +++ b/core/core-frontend/src/models/chart/chart-attr.d.ts @@ -104,6 +104,18 @@ declare interface ChartBasicStyle { * 表格展示形式,平铺和树形 */ tableLayoutMode: 'grid' | 'tree' + /** + * 表格默认展开层级 + */ + defaultExpandLevel: number | 'all' + /** + * 表格指标展示位置 + */ + quotaPosition: 'col' | 'row' + /** + * 行头指标列名称 + */ + quotaColLabel: string /** * 仪表盘样式 */ @@ -170,9 +182,9 @@ declare interface ChartBasicStyle { */ barWidth: number /** - * 柱子形状:直角|圆角 + * 柱子形状:直角|圆角|顶部圆角 */ - radiusColumnBar?: 'rightAngle' | 'roundAngle' + radiusColumnBar?: 'rightAngle' | 'roundAngle' | 'topRoundAngle' /** * 圆角柱倒角 */ @@ -289,6 +301,12 @@ declare interface ChartBasicStyle { * 汇总表总计标签 */ summaryLabel: string + + seriesSummary?: Array<{ + show: boolean + field: string + summary: string + }> /** * 符号地图符号大小最小值 */ @@ -467,6 +485,10 @@ declare interface ChartTableHeaderAttr { name: string }[] } + /** + * 透视表行头冻结 + */ + rowHeaderFreeze: boolean } /** * 单元格属性 @@ -619,11 +641,18 @@ declare interface CalcTotals { */ declare interface CalcTotalCfg extends Axis { dataeaseName: string + /** + * 聚合方式 + */ aggregation: 'MIN' | 'MAX' | 'AVG' | 'SUM' | 'CUSTOM' | '' /** * 自定义汇总表达式 */ originName: string + /** + * 别名 + */ + label: string } /** @@ -879,6 +908,10 @@ declare interface ChartMiscAttr { */ fieldId: string } + /** + * 子弹图 + */ + bullet: BulletAtt } /** * 动态极值配置 @@ -1308,4 +1341,48 @@ declare interface ColumnNode { children?: Columns } -declare type Columns = Array +declare type Columns = Array + +declare interface BulletAtt { + bar: BulletAttr +} +declare interface BulletBarAtt { + /** + * 背景区间类型 + */ + showType?: 'dynamic' | 'fixed' + /** + * 自定义子弹背景区间 + */ + fixedRange?: BulletBarAtt[] + /** + * 自定义区间个数 + */ + fixedRangeNumber?: number + /** + * 自定义子弹背景区间分界值 + */ + fixedRangeValue?: number + /** + * 显示名称 + */ + name?: string + /** + * 当目标值为固定值时,显示目标值 + */ + value?: number + /** + * 子弹图形形状 + */ + symbol?: 'circle' | 'square' | 'line' | 'diamond' | 'triangle' + symbolSize?: number + fill?: string | string[] + fillOpacity?: number + radius?: number | number[] + size?: number +} +declare interface BulletAttr { + measures?: T + target?: T + ranges?: T +} diff --git a/core/core-frontend/src/models/chart/chart-style.d.ts b/core/core-frontend/src/models/chart/chart-style.d.ts index a60ec6c..b848233 100644 --- a/core/core-frontend/src/models/chart/chart-style.d.ts +++ b/core/core-frontend/src/models/chart/chart-style.d.ts @@ -122,7 +122,22 @@ declare interface ChartLegendStyle { * 字体大小 */ fontSize: number + /** + * 图例大小 + */ size: number + /** + * 子弹图显示区间背景 + */ + showRange: true + /** + * 排序方式 + */ + sort: 'none' | 'asc' | 'desc' | 'custom' + /** + * 自定义排序 + */ + customSort: string[] } /** diff --git a/core/core-frontend/src/models/chart/chart.d.ts b/core/core-frontend/src/models/chart/chart.d.ts index 90787da..bca4d0b 100644 --- a/core/core-frontend/src/models/chart/chart.d.ts +++ b/core/core-frontend/src/models/chart/chart.d.ts @@ -100,6 +100,7 @@ declare interface BaseFormatter { /** * 单位换算 */ + unitLanguage: 'ch' | 'en' unit: number /** * 单位后缀 @@ -209,3 +210,9 @@ declare interface Filter { datasetTableField: ChartViewField fieldId: string } + +declare interface PageInfo { + currentPage: number + pageSize: number + total: number +} diff --git a/core/core-frontend/src/models/chart/editor.d.ts b/core/core-frontend/src/models/chart/editor.d.ts index 308aad1..8cc1de9 100644 --- a/core/core-frontend/src/models/chart/editor.d.ts +++ b/core/core-frontend/src/models/chart/editor.d.ts @@ -31,6 +31,8 @@ declare type EditorProperty = | 'flow-map-line-selector' | 'flow-map-point-selector' | 'bubble-animate' + | 'summary-selector' + | 'bullet-graph-selector' declare type EditorPropertyInner = { [key in EditorProperty]?: string[] } diff --git a/core/core-frontend/src/models/tree/TreeNode.ts b/core/core-frontend/src/models/tree/TreeNode.ts index fd1f1a6..a62ce0b 100644 --- a/core/core-frontend/src/models/tree/TreeNode.ts +++ b/core/core-frontend/src/models/tree/TreeNode.ts @@ -1,19 +1,19 @@ export interface BusiTreeNode { id: string | number pid: string | number - appId: string | number name: string leaf?: boolean weight: number ext?: number extraFlag: number + extraFlag1: number children?: BusiTreeNode[] } export interface BusiTreeRequest { - appId?: string busiFlag?: string leaf?: boolean weight?: number sortType?: string + resourceTable?: string }