diff --git a/common/changes/@visactor/openinula-vchart/sequence-chart-extension_2026-10-13.json b/common/changes/@visactor/openinula-vchart/sequence-chart-extension_2026-10-13.json new file mode 100644 index 0000000000..60cd1b7a5a --- /dev/null +++ b/common/changes/@visactor/openinula-vchart/sequence-chart-extension_2026-10-13.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/openinula-vchart", + "comment": "fix: SequenceChart 使用扩展包注册和类型", + "type": "patch" + } + ], + "packageName": "@visactor/openinula-vchart" +} diff --git a/common/changes/@visactor/react-vchart/sequence-chart-extension_2026-10-13.json b/common/changes/@visactor/react-vchart/sequence-chart-extension_2026-10-13.json new file mode 100644 index 0000000000..38382dae24 --- /dev/null +++ b/common/changes/@visactor/react-vchart/sequence-chart-extension_2026-10-13.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/react-vchart", + "comment": "fix: SequenceChart 使用扩展包注册和类型", + "type": "patch" + } + ], + "packageName": "@visactor/react-vchart" +} diff --git a/common/changes/@visactor/taro-vchart/sequence-chart-extension_2026-10-13.json b/common/changes/@visactor/taro-vchart/sequence-chart-extension_2026-10-13.json new file mode 100644 index 0000000000..574dec39e3 --- /dev/null +++ b/common/changes/@visactor/taro-vchart/sequence-chart-extension_2026-10-13.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/taro-vchart", + "comment": "fix: SequenceChart 使用扩展包注册和类型", + "type": "patch" + } + ], + "packageName": "@visactor/taro-vchart" +} diff --git a/common/changes/@visactor/vchart-extension/move-dot-link-series_2026-10-14.json b/common/changes/@visactor/vchart-extension/move-dot-link-series_2026-10-14.json new file mode 100644 index 0000000000..38b24068d4 --- /dev/null +++ b/common/changes/@visactor/vchart-extension/move-dot-link-series_2026-10-14.json @@ -0,0 +1,4 @@ +{ + "changes": [{ "packageName": "@visactor/vchart-extension", "comment": "feat: 将 dot、link 系列及其类型和注册入口从 VChart 主包迁移至扩展包", "type": "minor" }], + "packageName": "@visactor/vchart-extension" +} diff --git a/common/changes/@visactor/vchart-extension/sequence-chart-extension_2026-10-13.json b/common/changes/@visactor/vchart-extension/sequence-chart-extension_2026-10-13.json new file mode 100644 index 0000000000..1a25b0955f --- /dev/null +++ b/common/changes/@visactor/vchart-extension/sequence-chart-extension_2026-10-13.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vchart-extension", + "comment": "feat: 提供 sequence 时序图及 registerSequenceChart，保留原有时序图配置与布局", + "type": "minor" + } + ], + "packageName": "@visactor/vchart-extension" +} diff --git a/common/changes/@visactor/vchart-types/clean-migrated-declarations_2026-10-14.json b/common/changes/@visactor/vchart-types/clean-migrated-declarations_2026-10-14.json new file mode 100644 index 0000000000..4a248bb48f --- /dev/null +++ b/common/changes/@visactor/vchart-types/clean-migrated-declarations_2026-10-14.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vchart-types", + "comment": "重新生成当前主包声明，移除已迁至扩展包的时序图、dot/link 系列及其他历史遗留声明。", + "type": "patch" + } + ], + "packageName": "@visactor/vchart-types" +} diff --git a/common/changes/@visactor/vchart/clean-type-output_2026-10-14.json b/common/changes/@visactor/vchart/clean-type-output_2026-10-14.json new file mode 100644 index 0000000000..ce9ca503c5 --- /dev/null +++ b/common/changes/@visactor/vchart/clean-type-output_2026-10-14.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vchart", + "comment": "类型构建先清理输出并禁用此次增量缓存，避免旧声明残留或重复构建缺失文件。", + "type": "patch" + } + ], + "packageName": "@visactor/vchart" +} diff --git a/common/changes/@visactor/vchart/move-dot-link-series_2026-10-14.json b/common/changes/@visactor/vchart/move-dot-link-series_2026-10-14.json new file mode 100644 index 0000000000..b3337d6138 --- /dev/null +++ b/common/changes/@visactor/vchart/move-dot-link-series_2026-10-14.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vchart", + "comment": "将 dot、link 系列及其类型、注册方法迁移至 @visactor/vchart-extension，主包不再导出或自动注册这些系列。", + "type": "minor" + } + ], + "packageName": "@visactor/vchart" +} diff --git a/common/changes/@visactor/vchart/sequence-chart-extension_2026-10-13.json b/common/changes/@visactor/vchart/sequence-chart-extension_2026-10-13.json new file mode 100644 index 0000000000..891dcab021 --- /dev/null +++ b/common/changes/@visactor/vchart/sequence-chart-extension_2026-10-13.json @@ -0,0 +1,10 @@ +{ + "changes": [ + { + "packageName": "@visactor/vchart", + "comment": "refactor: 将 sequence 时序图迁移至 vchart-extension，原 spec 保持不变，需从扩展包导入并调用 registerSequenceChart", + "type": "major" + } + ], + "packageName": "@visactor/vchart" +} diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml index 9618d5b2cc..9d903193ba 100644 --- a/common/config/rush/pnpm-lock.yaml +++ b/common/config/rush/pnpm-lock.yaml @@ -202,6 +202,9 @@ importers: '@visactor/vchart': specifier: workspace:2.1.7 version: link:../vchart + '@visactor/vchart-extension': + specifier: workspace:2.1.7 + version: link:../vchart-extension '@visactor/vrender-core': specifier: 1.1.11 version: 1.1.11 @@ -713,6 +716,21 @@ importers: specifier: ~1.0.27 version: 1.0.27 devDependencies: + '@visactor/vscale': + specifier: ~1.0.27 + version: 1.0.27 + react-device-detect: + specifier: ^2.2.2 + version: 2.2.3(react-dom@18.3.1(react@18.3.1))(react@18.3.1) + ts-jest: + specifier: ^26.0.0 + version: 26.5.6(jest@26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@20.14.10)(typescript@4.9.5)))(typescript@4.9.5) + jest-electron: + specifier: ^0.1.12 + version: 0.1.12(jest@26.6.3(canvas@2.11.2(encoding@0.1.13))(ts-node@10.9.0(@types/node@20.14.10)(typescript@4.9.5))) + '@types/jest': + specifier: ^26.0.0 + version: 26.0.24 '@internal/bundler': specifier: workspace:* version: link:../../tools/bundler diff --git a/docs/assets/demos/chart-history/pages/chart1765/actor/chart.ts b/docs/assets/demos/chart-history/pages/chart1765/actor/chart.ts index 8c5fd493a6..f1a58b802b 100644 --- a/docs/assets/demos/chart-history/pages/chart1765/actor/chart.ts +++ b/docs/assets/demos/chart-history/pages/chart1765/actor/chart.ts @@ -1,8 +1,10 @@ +import { registerSequenceChart } from '@visactor/vchart-extension'; import type { BaseActor, Player, VChartActor } from '@internal/story-player'; // eslint-disable-next-line no-duplicate-imports import { ActorType } from '@internal/story-player'; export const pageChart1765ActorChart = (player: Player, actorMap: Record) => { + registerSequenceChart(); actorMap.pageChart1765ActorChart = player.createActor(ActorType.vchart, { name: 'chart', defaultStyle: { diff --git a/docs/assets/examples/en/sequence-chart/NBA-player-event.md b/docs/assets/examples/en/sequence-chart/NBA-player-event.md index d5c0ca2d75..4dc3e059f5 100644 --- a/docs/assets/examples/en/sequence-chart/NBA-player-event.md +++ b/docs/assets/examples/en/sequence-chart/NBA-player-event.md @@ -10,9 +10,13 @@ option: sequenceChart # NBA Athlete Timing Chart +`dot` and `link` series have also moved to `@visactor/vchart-extension`. The core package no longer exports or automatically registers `DotSeries`, `LinkSeries`, `registerDotSeries`, or `registerLinkSeries`; import `IDotSeriesSpec` and `ILinkSeriesSpec` from the extension package as well. `registerSequenceChart({ VChart })` and `registerSequenceAnalysis({ VChart })` register their required series. For standalone use in a `common` chart, import and call `registerDotSeries()` and `registerLinkSeries()` from the extension package. + NBA player timing chart tracks each player's dribble time. Users can quickly see game times, changes made by coaches, and lineups. This use case only configures the dot or link series, not the column series. If you need to show pure timing data, you can refer to this use case. +The sequence chart is provided by `@visactor/vchart-extension`. Install the extension package with the same version as VChart and call `registerSequenceChart({ VChart })` before creating a chart. Existing `type: 'sequence'` and series configuration remain unchanged. + ## Key option The entire sequence diagram is divided from top to bottom: timeline components, dot series & link series @@ -47,6 +51,11 @@ The data of the link series depends on the event series ## Demo source ```javascript livedemo +// import VChart from '@visactor/vchart'; +// import { registerSequenceChart } from '@visactor/vchart-extension'; +// registerSequenceChart({ VChart }); +VChartExtension.registerSequenceChart({ VChart }); + const spec = { type: 'sequence', color: ['#64b5fc', '#ff8f62'], diff --git a/docs/assets/examples/en/sequence-chart/social-media-event.md b/docs/assets/examples/en/sequence-chart/social-media-event.md index 6a2b5b4bf3..bad5ba0bbd 100644 --- a/docs/assets/examples/en/sequence-chart/social-media-event.md +++ b/docs/assets/examples/en/sequence-chart/social-media-event.md @@ -9,9 +9,13 @@ cover: https://lf9-dp-fe-cms-tos.byteorg.com/obj/bit-cloud/vchart/preview/sequen # Social Media Timing Chart +`dot` and `link` series have also moved to `@visactor/vchart-extension`. The core package no longer exports or automatically registers `DotSeries`, `LinkSeries`, `registerDotSeries`, or `registerLinkSeries`; import `IDotSeriesSpec` and `ILinkSeriesSpec` from the extension package as well. `registerSequenceChart({ VChart })` and `registerSequenceAnalysis({ VChart })` register their required series. For standalone use in a `common` chart, import and call `registerDotSeries()` and `registerLinkSeries()` from the extension package. + The high complexity of time-series data makes it difficult for analysts to manually explore and find patterns, leading to an increasing need for visualization techniques to aid analysis in order to extract and communicate insights from event sequence datasets. For social media information, it is often necessary to show the different behaviors of different users at different times in the form of nodes and edges in the evolution of linear time, and in order to better discover the user's behavior preferences, it is also necessary to use histograms. The form of behavioral statistics is displayed. Time series diagrams based on linear time maps can show data in this scenario. +The sequence chart is provided by `@visactor/vchart-extension`. Install the extension package with the same version as VChart and call `registerSequenceChart({ VChart })` before creating a chart. Existing `type: 'sequence'` and series configuration remain unchanged. + ## Key option The whole sequence diagram is divided from top to bottom: thumbnail axis component, timeline component, several bar series, dot series & link series, scroll bar component @@ -71,6 +75,11 @@ Scroll bar component configuration: ## Demo source ```javascript livedemo +// import VChart from '@visactor/vchart'; +// import { registerSequenceChart } from '@visactor/vchart-extension'; +// registerSequenceChart({ VChart }); +VChartExtension.registerSequenceChart({ VChart }); + const spec = { type: 'sequence', appendPadding: { diff --git a/docs/assets/examples/zh/sequence-chart/NBA-player-event.md b/docs/assets/examples/zh/sequence-chart/NBA-player-event.md index 8019851545..e771c7b23a 100644 --- a/docs/assets/examples/zh/sequence-chart/NBA-player-event.md +++ b/docs/assets/examples/zh/sequence-chart/NBA-player-event.md @@ -10,9 +10,13 @@ option: sequenceChart # NBA 运动员时序图 +`dot`、`link` 系列也已整体移至 `@visactor/vchart-extension`，主包不再导出或自动注册 `DotSeries`、`LinkSeries`、`registerDotSeries`、`registerLinkSeries`，对应的 `IDotSeriesSpec`、`ILinkSeriesSpec` 类型也从扩展包导入。`registerSequenceChart({ VChart })` 和 `registerSequenceAnalysis({ VChart })` 会注册各自需要的系列；在 `common` 图表中单独使用时，需要从扩展包导入并调用 `registerDotSeries()`、`registerLinkSeries()`。 + NBA 运动员时序图跟踪每个运动员的运球时间. 用户可以快速了解比赛时间、教练所做的改变以及参赛阵容. 该用例仅配置 dot 或 link 系列, 而不包柱系列. 如果需要展示纯粹的时序数据, 可以参考该用例. +时序图由 `@visactor/vchart-extension` 提供。先安装与 VChart 版本一致的扩展包，并在创建图表前调用 `registerSequenceChart({ VChart })`。原有 `type: 'sequence'` 和 series 配置保持不变。 + ## 关键配置 整个时序图从上到下分为: 时间轴组件、dot 和 link 系列(dot series & link series) @@ -47,6 +51,11 @@ link 系列（link series）的数据依赖于事件（event series）系列 ## 代码演示 ```javascript livedemo +// import VChart from '@visactor/vchart'; +// import { registerSequenceChart } from '@visactor/vchart-extension'; +// registerSequenceChart({ VChart }); +VChartExtension.registerSequenceChart({ VChart }); + const spec = { type: 'sequence', color: ['#64b5fc', '#ff8f62'], diff --git a/docs/assets/examples/zh/sequence-chart/social-media-event.md b/docs/assets/examples/zh/sequence-chart/social-media-event.md index c46cb55628..3eab5eecf0 100644 --- a/docs/assets/examples/zh/sequence-chart/social-media-event.md +++ b/docs/assets/examples/zh/sequence-chart/social-media-event.md @@ -10,9 +10,13 @@ option: sequenceChart # 社交媒体时序图 +`dot`、`link` 系列也已整体移至 `@visactor/vchart-extension`，主包不再导出或自动注册 `DotSeries`、`LinkSeries`、`registerDotSeries`、`registerLinkSeries`，对应的 `IDotSeriesSpec`、`ILinkSeriesSpec` 类型也从扩展包导入。`registerSequenceChart({ VChart })` 和 `registerSequenceAnalysis({ VChart })` 会注册各自需要的系列；在 `common` 图表中单独使用时，需要从扩展包导入并调用 `registerDotSeries()`、`registerLinkSeries()`。 + 时序数据的高复杂性使得分析人员很难手动探索和寻找模式, 导致越来越多地需要可视化技术来辅助分析, 以便从事件序列数据集中提取和交流见解。 对于社交媒体信息而言, 往往需要在线性时间的演进中, 以节点和边的形式展示不同用户不同时间的不同行为, 并且为了更好地从中发现用户的行为偏好, 还需要以柱状图的形式展示行为统计信息. 基于线性时间映射的时序图可以展示这种场景下的数据。 +时序图由 `@visactor/vchart-extension` 提供。先安装与 VChart 版本一致的扩展包，并在创建图表前调用 `registerSequenceChart({ VChart })`。原有 `type: 'sequence'` 和 series 配置保持不变。 + ## 关键配置 整个时序图从上到下分为: 缩略轴组件、时间轴组件、若干个柱系列(bar series)、dot 和 link 系列(dot series & link series)、滚动条组件 @@ -72,6 +76,11 @@ link 系列（link series）的数据依赖于事件（event series）系列 ## 代码演示 ```javascript livedemo +// import VChart from '@visactor/vchart'; +// import { registerSequenceChart } from '@visactor/vchart-extension'; +// registerSequenceChart({ VChart }); +VChartExtension.registerSequenceChart({ VChart }); + const spec = { type: 'sequence', appendPadding: { diff --git a/docs/assets/guide/en/tutorial_docs/Chart_Extensions/about_extensions.md b/docs/assets/guide/en/tutorial_docs/Chart_Extensions/about_extensions.md index 0336ed1049..34179fb64b 100644 --- a/docs/assets/guide/en/tutorial_docs/Chart_Extensions/about_extensions.md +++ b/docs/assets/guide/en/tutorial_docs/Chart_Extensions/about_extensions.md @@ -44,3 +44,7 @@ You can directly get the source code of VChart-extension from GitHub: 1. You can clone the source code directly from GitHub. 2. You can also choose the corresponding version from the [release](https://github.com/VisActor/VChart/releases) page of VChart, click on the Source code under the Assets section, download it to your local machine, and extract it for use. + +## Sequence chart + +The [sequence chart](/vchart/guide/tutorial_docs/Chart_Types/Sequence) is now provided by the extension package. It combines events, links and statistics on a shared time axis. Import and call `registerSequenceChart({ VChart })` from the extension package before use; existing specs remain unchanged. diff --git a/docs/assets/guide/en/tutorial_docs/Chart_Extensions/sequence_analysis.md b/docs/assets/guide/en/tutorial_docs/Chart_Extensions/sequence_analysis.md index 222561f0d9..3e99868cf8 100644 --- a/docs/assets/guide/en/tutorial_docs/Chart_Extensions/sequence_analysis.md +++ b/docs/assets/guide/en/tutorial_docs/Chart_Extensions/sequence_analysis.md @@ -1,8 +1,10 @@ # Extension Chart: Sequence Analysis +`dot` and `link` series have also moved to `@visactor/vchart-extension`. The core package no longer exports or automatically registers `DotSeries`, `LinkSeries`, `registerDotSeries`, or `registerLinkSeries`; import `IDotSeriesSpec` and `ILinkSeriesSpec` from the extension package as well. `registerSequenceChart({ VChart })` and `registerSequenceAnalysis({ VChart })` register their required series. For standalone use in a `common` chart, import and call `registerDotSeries()` and `registerLinkSeries()` from the extension package. + Sequence Analysis places each user's events on a horizontal row, aligns events by time, step or medium, and draws their relationships. It supports behavior paths, relationships across users and repeated patterns. -The chart comes from `@visactor/vchart-extension` with type `sequenceAnalysis`. It is distinct from the built-in sequence chart and the sequenceScatterLink extension for training-process analysis. +The chart comes from `@visactor/vchart-extension` with type `sequenceAnalysis`. It is distinct from the `sequence` extension chart and the sequenceScatterLink extension for training-process analysis. ![Sequence Analysis](/vchart/preview/sequence-analysis-step.png) diff --git a/docs/assets/guide/en/tutorial_docs/Chart_Types/Sequence.md b/docs/assets/guide/en/tutorial_docs/Chart_Types/Sequence.md index 1f1480e2a5..a5dc150f8a 100644 --- a/docs/assets/guide/en/tutorial_docs/Chart_Types/Sequence.md +++ b/docs/assets/guide/en/tutorial_docs/Chart_Types/Sequence.md @@ -1,7 +1,25 @@ # Sequence Chart +`dot` and `link` series have also moved to `@visactor/vchart-extension`. The core package no longer exports or automatically registers `DotSeries`, `LinkSeries`, `registerDotSeries`, or `registerLinkSeries`; import `IDotSeriesSpec` and `ILinkSeriesSpec` from the extension package as well. `registerSequenceChart({ VChart })` and `registerSequenceAnalysis({ VChart })` register their required series. For standalone use in a `common` chart, import and call `registerDotSeries()` and `registerLinkSeries()` from the extension package. + [\[Configuration Guide\]](../../../option/sequenceChart) +## Registration and migration + +The sequence chart is provided by `@visactor/vchart-extension`. Install the extension package with the same version as VChart and call `registerSequenceChart({ VChart })` before creating a chart. Existing `type: 'sequence'` and series configuration remain unchanged. + +```ts +import VChart from '@visactor/vchart'; +import { registerSequenceChart } from '@visactor/vchart-extension'; +import type { ISequenceChartSpec } from '@visactor/vchart-extension'; + +registerSequenceChart({ VChart }); +// const spec: ISequenceChartSpec = { type: 'sequence', ... }; +// new VChart(spec, { dom: 'chart' }).renderSync(); +``` + +Import `ISequenceChartSpec` and `registerSequenceChart` from the extension package instead of the core package. React/Taro/Openinula `SequenceChart` components register it automatically; register it explicitly when using a generic `VChart` component. This chart displays events and statistics over time and is separate from the `type: 'sequenceAnalysis'` extension. + ## Introduction In social media, behavior monitoring, and other scenarios, it is often necessary to display different behaviors of different users at different times in the form of nodes and edges in linear time evolution. In order to better discover users' behavior preferences, it is also necessary to display behavior statistical information in the form of bar charts. The sequence chart based on linear time mapping can display data in this scenario. @@ -30,6 +48,8 @@ Sequence charts typically also include the following components: ## Quick Start ```javascript livedemo +VChartExtension.registerSequenceChart({ VChart }); + const spec = { type: 'sequence', color: ['#64b5fc', '#ff8f62'], @@ -1279,6 +1299,8 @@ data: [ As mentioned above, events or event relationships will come with some additional information, ```javascript livedemo +VChartExtension.registerSequenceChart({ VChart }); + const spec = { type: 'sequence', appendPadding: { diff --git a/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/lynx.md b/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/lynx.md index d0667f513c..c342fa8326 100644 --- a/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/lynx.md +++ b/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/lynx.md @@ -212,7 +212,7 @@ The `` component and the `` component are almost ident | `` | Cartesian Charts | `registerLabel` | | `` | Cartesian Charts | `registerLabel` | | `` | Cartesian Charts | `registerLabel` | -| `` | Cartesian Charts | `registerLabel` | +| `` | Extension chart | `registerLabel` | | `` | Cartesian Charts | `registerLabel`, `registerTotalLabel` | | `` | Polar Charts | `registerLabel` | | `` | Polar Charts | `registerLabel` | @@ -232,6 +232,8 @@ The `` component and the `` component are almost ident | `` | General Charts | None | | `` | General Charts | `registerIndicator` | +`SequenceChart` registers itself through `registerSequenceChart` from the extension package; component usage is unchanged. When using VChart directly, import and call the registration function from `@visactor/vchart-extension`. + For Cartesian charts, the default registered components are as follows: - `registerCartesianLinearAxis` diff --git a/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/react.md b/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/react.md index e0e25ed1f3..28c931b576 100644 --- a/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/react.md +++ b/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/react.md @@ -472,7 +472,7 @@ interface VChartSimpleProps extends EventsProps { | `` | Cartesian Charts | `registerLabel` | | `` | Cartesian Charts | `registerLabel` | | `` | Cartesian Charts | `registerLabel` | -| `` | Cartesian Charts | `registerLabel` | +| `` | Extension chart | `registerLabel` | | `` | Cartesian Charts | `registerLabel`, `registerTotalLabel` | | `` | Polar Charts | `registerLabel` | | `` | Polar Charts | `registerLabel` | @@ -492,6 +492,8 @@ interface VChartSimpleProps extends EventsProps { | `` | General Charts | None | | `` | General Charts | `registerIndicator` | +`SequenceChart` registers itself through `registerSequenceChart` from the extension package; component usage is unchanged. When using VChart directly, import and call the registration function from `@visactor/vchart-extension`. + For Cartesian charts, the default registered components are as follows: - `registerCartesianLinearAxis` diff --git a/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/taro.md b/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/taro.md index 1849687716..b8152ade56 100644 --- a/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/taro.md +++ b/docs/assets/guide/en/tutorial_docs/Cross-terminal_and_Developer_Ecology/taro.md @@ -324,7 +324,7 @@ The `` component and the `` component are almost ident | `` | Cartesian Charts | `registerLabel` | | `` | Cartesian Charts | `registerLabel` | | `` | Cartesian Charts | `registerLabel` | -| `` | Cartesian Charts | `registerLabel` | +| `` | Extension chart | `registerLabel` | | `` | Cartesian Charts | `registerLabel`, `registerTotalLabel`| | `` | Polar Charts | `registerLabel` | | `` | Polar Charts | `registerLabel` | @@ -344,6 +344,8 @@ The `` component and the `` component are almost ident | `` | General Charts | None | | `` | General Charts | `registerIndicator` | +`SequenceChart` registers itself through `registerSequenceChart` from the extension package; component usage is unchanged. When using VChart directly, import and call the registration function from `@visactor/vchart-extension`. + For Cartesian charts, the default registered components are as follows: - `registerCartesianLinearAxis` diff --git a/docs/assets/guide/en/tutorial_docs/Load_on_Demand.md b/docs/assets/guide/en/tutorial_docs/Load_on_Demand.md index 06289c72c5..8046b61c1b 100644 --- a/docs/assets/guide/en/tutorial_docs/Load_on_Demand.md +++ b/docs/assets/guide/en/tutorial_docs/Load_on_Demand.md @@ -1,5 +1,15 @@ # VChart Load-on-Demand Tutorial +The `dot` and `link` series, their types and registration functions have moved to `@visactor/vchart-extension`. The core package no longer exports or registers them. Register standalone series as below; `registerSequenceChart` and `registerSequenceAnalysis` register their required series automatically. + +```ts +import { registerDotSeries, registerLinkSeries } from '@visactor/vchart-extension'; +import type { IDotSeriesSpec, ILinkSeriesSpec } from '@visactor/vchart-extension'; + +registerDotSeries(); +registerLinkSeries(); +``` + ## Quick Start `@visactor/vchart` provides all the charts and components of VChart by default. If you don't want to import all components, you can also import the relevant components as needed. Here is an example of how to use it: @@ -188,7 +198,7 @@ interface VChartSimpleProps extends EventsProps { | `` | Cartesian Coordinate | `registerLabel` | | `` | Cartesian Coordinate | `registerLabel` | | `` | Cartesian Coordinate | `registerLabel` | -| `` | Cartesian Coordinate | `registerLabel` | +| `` | Extension chart | `registerLabel` | | `` | Cartesian Coordinate | `registerLabel`, `registerTotalLabel` | | `` | Polar Coordinate | `registerLabel` | | `` | Polar Coordinate | `registerLabel` | @@ -208,6 +218,8 @@ interface VChartSimpleProps extends EventsProps { | `` | General | None | | `` | General | `registerIndicator` | +`SequenceChart` registers itself through `registerSequenceChart` from the extension package; component usage is unchanged. When using VChart directly, import and call the registration function from `@visactor/vchart-extension`. + For Cartesian coordinate charts, the default registered components are as follows: - `registerCartesianLinearAxis` @@ -287,7 +299,7 @@ The `` component and the `` component are used in almo | `` | Cartesian Charts | `registerLabel` | | `` | Cartesian Charts | `registerLabel` | | `` | Cartesian Charts | `registerLabel` | -| `` | Cartesian Charts | `registerLabel` | +| `` | Extension chart | `registerLabel` | | `` | Cartesian Charts | `registerLabel`, `registerTotalLabel` | | `` | Polar Charts | `registerLabel` | | `` | Polar Charts | `registerLabel` | @@ -496,11 +508,11 @@ export default defineNuxtConfig({ Dot in Sequence - registerDotSeries + registerDotSeries (@visactor/vchart-extension) Link in Sequence - registerLinkSeries + registerLinkSeries (@visactor/vchart-extension) Funnel diff --git a/docs/assets/guide/en/tutorial_docs/Theme/Theme.md b/docs/assets/guide/en/tutorial_docs/Theme/Theme.md index 39333a55a9..d848d26b21 100644 --- a/docs/assets/guide/en/tutorial_docs/Theme/Theme.md +++ b/docs/assets/guide/en/tutorial_docs/Theme/Theme.md @@ -184,6 +184,8 @@ Contains 1 configuration: Its type `ISeriesTheme` is defined as: + The `dot` and `link` series themes have moved with their implementations to `@visactor/vchart-extension`. Import `IDotSeriesTheme` and `ILinkSeriesTheme` from that package; custom themes still use `series.dot` and `series.link`. + ```typescript interface ISeriesTheme { [SeriesTypeEnum.bar]?: IBarSeriesTheme; @@ -197,8 +199,6 @@ Contains 1 configuration: [SeriesTypeEnum.rose]?: IRoseSeriesTheme; [SeriesTypeEnum.map]?: IMapSeriesTheme; [SeriesTypeEnum.circularProgress]?: ICircularProgressSeriesTheme; - [SeriesTypeEnum.link]?: ILinkSeriesTheme; - [SeriesTypeEnum.dot]?: IDotSeriesTheme; [SeriesTypeEnum.wordCloud]?: IWordCloudSeriesTheme; [SeriesTypeEnum.wordCloud3d]?: IWordCloud3dSeriesTheme; [SeriesTypeEnum.funnel]?: IFunnelSeriesTheme; diff --git a/docs/assets/guide/zh/tutorial_docs/Chart_Extensions/about_extensions.md b/docs/assets/guide/zh/tutorial_docs/Chart_Extensions/about_extensions.md index 5a0f691acd..2d73614689 100644 --- a/docs/assets/guide/zh/tutorial_docs/Chart_Extensions/about_extensions.md +++ b/docs/assets/guide/zh/tutorial_docs/Chart_Extensions/about_extensions.md @@ -44,3 +44,7 @@ $ yarn add @visactor/vchart-extension 1. 你可以直接从 GitHub clone 源码。 2. 你也可以从 VChart 的 [release](https://github.com/VisActor/VChart/releases) 页面选择对应的版本，点击页面下方 Assets 中的 Source code，将其下载至本地解压后使用。 + +## 时序图 + +[时序图（sequence）](/vchart/guide/tutorial_docs/Chart_Types/Sequence) 已迁移到扩展包，支持在同一时间轴上组合事件点、关联线和统计系列。使用前从扩展包导入并调用 `registerSequenceChart({ VChart })`；原有 spec 配置不变。 diff --git a/docs/assets/guide/zh/tutorial_docs/Chart_Extensions/sequence_analysis.md b/docs/assets/guide/zh/tutorial_docs/Chart_Extensions/sequence_analysis.md index aefea58b9d..1d476f4774 100644 --- a/docs/assets/guide/zh/tutorial_docs/Chart_Extensions/sequence_analysis.md +++ b/docs/assets/guide/zh/tutorial_docs/Chart_Extensions/sequence_analysis.md @@ -1,8 +1,10 @@ # 扩展图表：时序分析图 +`dot`、`link` 系列也已整体移至 `@visactor/vchart-extension`，主包不再导出或自动注册 `DotSeries`、`LinkSeries`、`registerDotSeries`、`registerLinkSeries`，对应的 `IDotSeriesSpec`、`ILinkSeriesSpec` 类型也从扩展包导入。`registerSequenceChart({ VChart })` 和 `registerSequenceAnalysis({ VChart })` 会注册各自需要的系列；在 `common` 图表中单独使用时，需要从扩展包导入并调用 `registerDotSeries()`、`registerLinkSeries()`。 + 时序分析图（Sequence Analysis）把每个用户的事件放在同一条水平线上，通过时间、步骤或介质分类对齐事件，再用连接线表达事件之间的关系。适合展示行为路径、跨用户事件关联和重复模式。 -它由 `@visactor/vchart-extension` 提供，类型为 `sequenceAnalysis`，与内置 `sequence` 和用于训练过程分析的 `sequenceScatterLink` 是不同图表。 +它由 `@visactor/vchart-extension` 提供，类型为 `sequenceAnalysis`，与扩展时序图 `sequence` 和用于训练过程分析的 `sequenceScatterLink` 是不同图表。 ![时序分析图](/vchart/preview/sequence-analysis-step.png) diff --git a/docs/assets/guide/zh/tutorial_docs/Chart_Types/Sequence.md b/docs/assets/guide/zh/tutorial_docs/Chart_Types/Sequence.md index 1143089215..99cfa193c7 100644 --- a/docs/assets/guide/zh/tutorial_docs/Chart_Types/Sequence.md +++ b/docs/assets/guide/zh/tutorial_docs/Chart_Types/Sequence.md @@ -1,7 +1,25 @@ # 时序图 +`dot`、`link` 系列也已整体移至 `@visactor/vchart-extension`，主包不再导出或自动注册 `DotSeries`、`LinkSeries`、`registerDotSeries`、`registerLinkSeries`，对应的 `IDotSeriesSpec`、`ILinkSeriesSpec` 类型也从扩展包导入。`registerSequenceChart({ VChart })` 和 `registerSequenceAnalysis({ VChart })` 会注册各自需要的系列；在 `common` 图表中单独使用时，需要从扩展包导入并调用 `registerDotSeries()`、`registerLinkSeries()`。 + [\[配置项\]](../../../option/sequenceChart) +## 注册与迁移 + +时序图由 `@visactor/vchart-extension` 提供。先安装与 VChart 版本一致的扩展包，并在创建图表前调用 `registerSequenceChart({ VChart })`。原有 `type: 'sequence'` 和 series 配置保持不变。 + +```ts +import VChart from '@visactor/vchart'; +import { registerSequenceChart } from '@visactor/vchart-extension'; +import type { ISequenceChartSpec } from '@visactor/vchart-extension'; + +registerSequenceChart({ VChart }); +// const spec: ISequenceChartSpec = { type: 'sequence', ... }; +// new VChart(spec, { dom: 'chart' }).renderSync(); +``` + +`ISequenceChartSpec` 和 `registerSequenceChart` 的导入来源由核心包改为扩展包。React/Taro/Openinula 的 `SequenceChart` 组件已封装注册逻辑；使用通用 `VChart` 组件时仍需先注册。此图展示时间轴上的事件及统计，与 `type: 'sequenceAnalysis'` 的时序分析图是两种独立的扩展图表。 + ## 简介 在社交媒体、行为监测等场景中，往往需要在线性时间的演进中, 以节点和边的形式展示不同用户不同时间的不同行为, 并且为了更好地从中发现用户的行为偏好, 还需要以柱状图的形式展示行为统计信息。基于线性时间映射的时序图可以展示这种场景下的数据。 @@ -30,6 +48,8 @@ ## 快速上手 ```javascript livedemo +VChartExtension.registerSequenceChart({ VChart }); + const spec = { type: 'sequence', color: ['#64b5fc', '#ff8f62'], @@ -1291,6 +1311,8 @@ data: [ 下面的例子展示了包含 tooltip 配置的社交媒体时序图: ```javascript livedemo +VChartExtension.registerSequenceChart({ VChart }); + const spec = { type: 'sequence', appendPadding: { diff --git a/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/lynx.md b/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/lynx.md index fe1d29ebfa..fb15842e78 100644 --- a/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/lynx.md +++ b/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/lynx.md @@ -212,7 +212,7 @@ Card({ | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | -| `` | 直角坐标系图表 | `registerLabel` | +| `` | 扩展图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel`, `registerTotalLabel` | | `` | 极坐标系图表 | `registerLabel` | | `` | 极坐标系图表 | `registerLabel` | @@ -232,6 +232,8 @@ Card({ | `` | 通用图表 | 无 | | `` | 通用图表 | `registerIndicator` | +`SequenceChart` 由组件内部调用扩展包的 `registerSequenceChart` 注册，组件用法不变；直接使用 VChart 核心包时需自行从 `@visactor/vchart-extension` 导入并注册。 + 其中，直角坐标系图表默认注册组件如下： - `registerCartesianLinearAxis` diff --git a/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/react.md b/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/react.md index 31650d1929..2b5c7bbb49 100644 --- a/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/react.md +++ b/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/react.md @@ -479,7 +479,7 @@ interface VChartSimpleProps extends EventsProps { | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | -| `` | 直角坐标系图表 | `registerLabel` | +| `` | 扩展图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel`, `registerTotalLabel` | | `` | 极坐标系图表 | `registerLabel` | | `` | 极坐标系图表 | `registerLabel` | @@ -499,6 +499,8 @@ interface VChartSimpleProps extends EventsProps { | `` | 通用图表 | 无 | | `` | 通用图表 | `registerIndicator` | +`SequenceChart` 由组件内部调用扩展包的 `registerSequenceChart` 注册，组件用法不变；直接使用 VChart 核心包时需自行从 `@visactor/vchart-extension` 导入并注册。 + 其中，直角坐标系图表默认注册组件如下： - `registerCartesianLinearAxis` diff --git a/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/taro.md b/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/taro.md index 911c4a900f..c4aefee228 100644 --- a/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/taro.md +++ b/docs/assets/guide/zh/tutorial_docs/Cross-terminal_and_Developer_Ecology/taro.md @@ -323,7 +323,7 @@ taro-VChart 本身代码都支持按需加载，当需要 VChart 按需加载的 | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | -| `` | 直角坐标系图表 | `registerLabel` | +| `` | 扩展图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel`, `registerTotalLabel` | | `` | 极坐标系图表 | `registerLabel` | | `` | 极坐标系图表 | `registerLabel` | @@ -343,6 +343,8 @@ taro-VChart 本身代码都支持按需加载，当需要 VChart 按需加载的 | `` | 通用图表 | 无 | | `` | 通用图表 | `registerIndicator` | +`SequenceChart` 由组件内部调用扩展包的 `registerSequenceChart` 注册，组件用法不变；直接使用 VChart 核心包时需自行从 `@visactor/vchart-extension` 导入并注册。 + 其中，直角坐标系图表默认注册组件如下： - `registerCartesianLinearAxis` diff --git a/docs/assets/guide/zh/tutorial_docs/Load_on_Demand.md b/docs/assets/guide/zh/tutorial_docs/Load_on_Demand.md index 859f2b857c..fa0a0bead3 100644 --- a/docs/assets/guide/zh/tutorial_docs/Load_on_Demand.md +++ b/docs/assets/guide/zh/tutorial_docs/Load_on_Demand.md @@ -1,5 +1,15 @@ # VChart 按需加载教程 +`dot`、`link` 系列的实现、类型和注册方法已迁至 `@visactor/vchart-extension`，主包不再导出或自动注册。单独使用时按以下方式注册；`registerSequenceChart` 和 `registerSequenceAnalysis` 会自动注册所需系列。 + +```ts +import { registerDotSeries, registerLinkSeries } from '@visactor/vchart-extension'; +import type { IDotSeriesSpec, ILinkSeriesSpec } from '@visactor/vchart-extension'; + +registerDotSeries(); +registerLinkSeries(); +``` + ## 快速上手 `@visactor/vchart` 默认提供的是 VChart 所有的图表和组件，如果你不想引入所有组件，也可以按需引入相关的组件。使用示例如下： @@ -183,7 +193,7 @@ interface VChartSimpleProps extends EventsProps { | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | -| `` | 直角坐标系图表 | `registerLabel` | +| `` | 扩展图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel`, `registerTotalLabel` | | `` | 极坐标系图表 | `registerLabel` | | `` | 极坐标系图表 | `registerLabel` | @@ -203,6 +213,8 @@ interface VChartSimpleProps extends EventsProps { | `` | 通用图表 | 无 | | `` | 通用图表 | `registerIndicator` | +`SequenceChart` 由组件内部调用扩展包的 `registerSequenceChart` 注册，组件用法不变；直接使用 VChart 核心包时需自行从 `@visactor/vchart-extension` 导入并注册。 + 其中，直角坐标系图表默认注册组件如下： - `registerCartesianLinearAxis` @@ -282,7 +294,7 @@ taro-VChart 本身代码都支持按需加载，当需要 VChart 按需加载的 | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel` | -| `` | 直角坐标系图表 | `registerLabel` | +| `` | 扩展图表 | `registerLabel` | | `` | 直角坐标系图表 | `registerLabel`, `registerTotalLabel` | | `` | 极坐标系图表 | `registerLabel` | | `` | 极坐标系图表 | `registerLabel` | @@ -490,11 +502,11 @@ export default defineNuxtConfig({ 时序图点系列 - registerDotSeries + registerDotSeries（@visactor/vchart-extension） 时序图连线系列 - registerLinkSeries + registerLinkSeries（@visactor/vchart-extension） 漏斗图系列 diff --git a/docs/assets/guide/zh/tutorial_docs/Theme/Theme.md b/docs/assets/guide/zh/tutorial_docs/Theme/Theme.md index 0bc851331e..b2ea2e1efa 100644 --- a/docs/assets/guide/zh/tutorial_docs/Theme/Theme.md +++ b/docs/assets/guide/zh/tutorial_docs/Theme/Theme.md @@ -184,6 +184,8 @@ interface ITheme { 其类型`ISeriesTheme`的定义如下： + `dot`、`link` 系列主题随系列实现迁至 `@visactor/vchart-extension`，对应的 `IDotSeriesTheme`、`ILinkSeriesTheme` 类型从扩展包导入；自定义主题仍使用 `series.dot`、`series.link` 配置。 + ```typescript interface ISeriesTheme { [SeriesTypeEnum.bar]?: IBarSeriesTheme; @@ -197,8 +199,6 @@ interface ITheme { [SeriesTypeEnum.rose]?: IRoseSeriesTheme; [SeriesTypeEnum.map]?: IMapSeriesTheme; [SeriesTypeEnum.circularProgress]?: ICircularProgressSeriesTheme; - [SeriesTypeEnum.link]?: ILinkSeriesTheme; - [SeriesTypeEnum.dot]?: IDotSeriesTheme; [SeriesTypeEnum.wordCloud]?: IWordCloudSeriesTheme; [SeriesTypeEnum.wordCloud3d]?: IWordCloud3dSeriesTheme; [SeriesTypeEnum.funnel]?: IFunnelSeriesTheme; diff --git a/docs/assets/option/en/chart/sequence.md b/docs/assets/option/en/chart/sequence.md index efc8b254b5..f3fc4981f2 100644 --- a/docs/assets/option/en/chart/sequence.md +++ b/docs/assets/option/en/chart/sequence.md @@ -4,6 +4,10 @@ Sequence Chart +The sequence chart is provided by `@visactor/vchart-extension`. Install the extension package with the same version as VChart and call `registerSequenceChart({ VChart })` before creating a chart. Existing `type: 'sequence'` and series configuration remain unchanged. + +Import `ISequenceChartSpec` from the extension package as well. [Registration and migration](/vchart/guide/tutorial_docs/Chart_Types/Sequence). + {{ use: common-chart-spec( prefix = '#', chartType = 'sequence' diff --git a/docs/assets/option/zh/chart/sequence.md b/docs/assets/option/zh/chart/sequence.md index 1d2bc343f5..44016b12f7 100644 --- a/docs/assets/option/zh/chart/sequence.md +++ b/docs/assets/option/zh/chart/sequence.md @@ -4,6 +4,10 @@ 时序图 +时序图由 `@visactor/vchart-extension` 提供。先安装与 VChart 版本一致的扩展包，并在创建图表前调用 `registerSequenceChart({ VChart })`。原有 `type: 'sequence'` 和 series 配置保持不变。 + +类型 `ISequenceChartSpec` 也从扩展包导入。[注册与迁移教程](/vchart/guide/tutorial_docs/Chart_Types/Sequence)。 + {{ use: common-chart-spec( prefix = '#', chartType = 'sequence' diff --git a/packages/openinula-vchart/package.json b/packages/openinula-vchart/package.json index 34c5aa0fdc..d0ccc00750 100644 --- a/packages/openinula-vchart/package.json +++ b/packages/openinula-vchart/package.json @@ -29,6 +29,7 @@ }, "dependencies": { "@visactor/vchart": "workspace:2.1.7", + "@visactor/vchart-extension": "workspace:2.1.7", "@visactor/vutils": "~1.0.27", "@visactor/vrender-core": "1.1.11", "@visactor/vrender-kits": "1.1.11", diff --git a/packages/openinula-vchart/src/charts/SequenceChart.tsx b/packages/openinula-vchart/src/charts/SequenceChart.tsx index bf151a9521..ac85943b7e 100644 --- a/packages/openinula-vchart/src/charts/SequenceChart.tsx +++ b/packages/openinula-vchart/src/charts/SequenceChart.tsx @@ -1,8 +1,11 @@ import React from 'openinula'; -import type { ISequenceChartSpec } from '@visactor/vchart'; +import type { ISequenceChartSpec } from '@visactor/vchart-extension'; +import { registerSequenceChart } from '@visactor/vchart-extension'; import { default as VChart } from '@visactor/vchart'; import { BaseChartProps, createChart } from './BaseChart'; +registerSequenceChart({ VChart }); + export interface SequenceChartProps extends Omit, Omit {} diff --git a/packages/openinula-vchart/src/index.ts b/packages/openinula-vchart/src/index.ts index 84cfa18ce4..f62c472ad9 100644 --- a/packages/openinula-vchart/src/index.ts +++ b/packages/openinula-vchart/src/index.ts @@ -33,7 +33,6 @@ export type { IRoseChartSpec, IScatterChartSpec, ISankeyChartSpec, - ISequenceChartSpec, ISunburstChartSpec, ITreemapChartSpec, IWaterfallChartSpec, @@ -48,3 +47,5 @@ export type { ISpec, IVChart } from '@visactor/vchart'; + +export type { ISequenceChartSpec } from '@visactor/vchart-extension'; diff --git a/packages/openinula-vchart/src/series/Dot.tsx b/packages/openinula-vchart/src/series/Dot.tsx index 1735ae9273..88292b959f 100644 --- a/packages/openinula-vchart/src/series/Dot.tsx +++ b/packages/openinula-vchart/src/series/Dot.tsx @@ -1,5 +1,8 @@ import { BaseSeriesProps, createSeries } from './BaseSeries'; -import type { IDotSeriesSpec } from '@visactor/vchart'; +import type { IDotSeriesSpec } from '@visactor/vchart-extension'; +import { registerDotSeries } from '@visactor/vchart-extension'; + +registerDotSeries(); export type DotProps = BaseSeriesProps & Omit; diff --git a/packages/openinula-vchart/src/series/Link.tsx b/packages/openinula-vchart/src/series/Link.tsx index eaac0f2192..7fff5eacb0 100644 --- a/packages/openinula-vchart/src/series/Link.tsx +++ b/packages/openinula-vchart/src/series/Link.tsx @@ -1,5 +1,8 @@ import { BaseSeriesProps, createSeries } from './BaseSeries'; -import type { ILinkSeriesSpec } from '@visactor/vchart'; +import type { ILinkSeriesSpec } from '@visactor/vchart-extension'; +import { registerLinkSeries } from '@visactor/vchart-extension'; + +registerLinkSeries(); export type LinkProps = BaseSeriesProps & Omit; diff --git a/packages/openinula-vchart/src/series/Series.tsx b/packages/openinula-vchart/src/series/Series.tsx index b1e80acec0..1e1c1bd54f 100644 --- a/packages/openinula-vchart/src/series/Series.tsx +++ b/packages/openinula-vchart/src/series/Series.tsx @@ -1,14 +1,13 @@ +import type { IDotSeriesSpec, ILinkSeriesSpec } from '@visactor/vchart-extension'; import { BaseSeriesProps, createSeries } from './BaseSeries'; import type { IBarSeriesSpec, IAreaSeriesSpec, IBoxPlotSeriesSpec, ICircularProgressSeriesSpec, - IDotSeriesSpec, IFunnelSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, - ILinkSeriesSpec, IMapSeriesSpec, IPieSeriesSpec, IRadarSeriesSpec, diff --git a/packages/react-vchart/src/charts/SequenceChart.tsx b/packages/react-vchart/src/charts/SequenceChart.tsx index 6bceb36e82..59fe333a2f 100644 --- a/packages/react-vchart/src/charts/SequenceChart.tsx +++ b/packages/react-vchart/src/charts/SequenceChart.tsx @@ -1,6 +1,8 @@ import type React from 'react'; -import type { ISequenceChartSpec, IVChartConstructor } from '@visactor/vchart'; -import { VChart, registerSequenceChart } from '@visactor/vchart'; +import type { IVChartConstructor } from '@visactor/vchart'; +import type { ISequenceChartSpec } from '@visactor/vchart-extension'; +import { registerSequenceChart } from '@visactor/vchart-extension'; +import { VChart } from '@visactor/vchart'; import { registers } from './registers/cartesian'; import type { BaseChartProps } from './BaseChart'; import { createChart } from './BaseChart'; diff --git a/packages/react-vchart/src/index.ts b/packages/react-vchart/src/index.ts index d706d14552..5da67130ec 100644 --- a/packages/react-vchart/src/index.ts +++ b/packages/react-vchart/src/index.ts @@ -30,7 +30,6 @@ export type { IRoseChartSpec, IScatterChartSpec, ISankeyChartSpec, - ISequenceChartSpec, ISunburstChartSpec, ITreemapChartSpec, IWaterfallChartSpec, @@ -53,3 +52,5 @@ export type { IRangeColumn3dChartSpec, IWordCloud3dChartSpec } from '@visactor/vchart-extension'; + +export type { ISequenceChartSpec } from '@visactor/vchart-extension'; diff --git a/packages/react-vchart/src/register.ts b/packages/react-vchart/src/register.ts index 211294e39a..51a275dd68 100644 --- a/packages/react-vchart/src/register.ts +++ b/packages/react-vchart/src/register.ts @@ -66,7 +66,6 @@ export { registerRoseChart, registerSankeyChart, registerScatterChart, - registerSequenceChart, registerSunburstChart, registerTreemapChart, registerWaterfallChart, @@ -80,3 +79,5 @@ export { // Plugins export { registerChartResizeZoomPlugin } from '@visactor/vchart'; + +export { registerSequenceChart } from '@visactor/vchart-extension'; diff --git a/packages/react-vchart/src/series/Dot.tsx b/packages/react-vchart/src/series/Dot.tsx index 31e6801452..2bb1183ef6 100644 --- a/packages/react-vchart/src/series/Dot.tsx +++ b/packages/react-vchart/src/series/Dot.tsx @@ -1,6 +1,6 @@ import { BaseSeriesProps, createSeries } from './BaseSeries'; -import type { IDotSeriesSpec } from '@visactor/vchart'; -import { registerDotSeries } from '@visactor/vchart'; +import type { IDotSeriesSpec } from '@visactor/vchart-extension'; +import { registerDotSeries } from '@visactor/vchart-extension'; export type DotProps = BaseSeriesProps & Omit; diff --git a/packages/react-vchart/src/series/Link.tsx b/packages/react-vchart/src/series/Link.tsx index 6fbbc1b00c..193015f66e 100644 --- a/packages/react-vchart/src/series/Link.tsx +++ b/packages/react-vchart/src/series/Link.tsx @@ -1,6 +1,6 @@ import { BaseSeriesProps, createSeries } from './BaseSeries'; -import type { ILinkSeriesSpec } from '@visactor/vchart'; -import { registerLinkSeries } from '@visactor/vchart'; +import type { ILinkSeriesSpec } from '@visactor/vchart-extension'; +import { registerLinkSeries } from '@visactor/vchart-extension'; export type LinkProps = BaseSeriesProps & Omit; diff --git a/packages/react-vchart/src/series/Series.tsx b/packages/react-vchart/src/series/Series.tsx index b1e80acec0..1e1c1bd54f 100644 --- a/packages/react-vchart/src/series/Series.tsx +++ b/packages/react-vchart/src/series/Series.tsx @@ -1,14 +1,13 @@ +import type { IDotSeriesSpec, ILinkSeriesSpec } from '@visactor/vchart-extension'; import { BaseSeriesProps, createSeries } from './BaseSeries'; import type { IBarSeriesSpec, IAreaSeriesSpec, IBoxPlotSeriesSpec, ICircularProgressSeriesSpec, - IDotSeriesSpec, IFunnelSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, - ILinkSeriesSpec, IMapSeriesSpec, IPieSeriesSpec, IRadarSeriesSpec, diff --git a/packages/taro-vchart/src/charts/SequenceChart.tsx b/packages/taro-vchart/src/charts/SequenceChart.tsx index 39f0114f45..b6ccf0aec2 100644 --- a/packages/taro-vchart/src/charts/SequenceChart.tsx +++ b/packages/taro-vchart/src/charts/SequenceChart.tsx @@ -1,6 +1,8 @@ import React from 'react'; -import type { ISequenceChartSpec, IVChartConstructor } from '@visactor/vchart'; -import { VChart, registerSequenceChart } from '@visactor/vchart'; +import type { IVChartConstructor } from '@visactor/vchart'; +import type { ISequenceChartSpec } from '@visactor/vchart-extension'; +import { registerSequenceChart } from '@visactor/vchart-extension'; +import { VChart } from '@visactor/vchart'; import { createChart } from './generate-charts'; import { registers } from './registers/cartesian'; diff --git a/packages/vchart-extension/__tests__/README.md b/packages/vchart-extension/__tests__/README.md new file mode 100644 index 0000000000..658dc2a3d9 --- /dev/null +++ b/packages/vchart-extension/__tests__/README.md @@ -0,0 +1,15 @@ +# 扩展包测试 + +扩展模块的单元测试、浏览器示例和视觉用例均在本包维护。主包测试不加载扩展包；本包通过 `@visactor/vchart` 及其声明的子路径引用主包。 + +## 单元测试 + +在本包目录执行 `npm test -- --runInBand`。测试复用主包的 Electron / ts-jest 配置及源码映射，依赖方向为扩展包到主包。 + +## 视觉回归 + +在仓库根目录执行 `node packages/vchart-extension/scripts/visual-test.mjs`；支持 `--list`、`--check`、`--case`、`--dir`、`--baseline` 和 `--self-compare`。默认与官方 develop 比较。 + +复用主包通用测试框架，在本包入口注入扩展构建步骤、用例目录及页面。两侧分别构建对应版本的主包和扩展包，扩展通过外部依赖共享 VChart 实例。报告位于 `.vchart-visual/extension/runs/`，不与主包运行锁或基线缓存混用。 + +时序图迁移保留了数据更新、曲线连线和 dataZoom 过滤共 3 个视觉用例。提交前分别运行主包和扩展包全量用例。 diff --git a/packages/vchart/__tests__/data/data-sequence-comment.ts b/packages/vchart-extension/__tests__/data/data-sequence-comment.ts similarity index 100% rename from packages/vchart/__tests__/data/data-sequence-comment.ts rename to packages/vchart-extension/__tests__/data/data-sequence-comment.ts diff --git a/packages/vchart/__tests__/data/data-sequence-im.ts b/packages/vchart-extension/__tests__/data/data-sequence-im.ts similarity index 100% rename from packages/vchart/__tests__/data/data-sequence-im.ts rename to packages/vchart-extension/__tests__/data/data-sequence-im.ts diff --git a/packages/vchart/__tests__/runtime/browser/test-page/sequence-2.ts b/packages/vchart-extension/__tests__/runtime/browser/test-page/sequence-2.ts similarity index 99% rename from packages/vchart/__tests__/runtime/browser/test-page/sequence-2.ts rename to packages/vchart-extension/__tests__/runtime/browser/test-page/sequence-2.ts index ab00a0c4ae..2aa48ee87b 100644 --- a/packages/vchart/__tests__/runtime/browser/test-page/sequence-2.ts +++ b/packages/vchart-extension/__tests__/runtime/browser/test-page/sequence-2.ts @@ -1,5 +1,8 @@ import { isMobile } from 'react-device-detect'; -import { default as VChart } from '../../../../src/index'; +import { default as VChart } from '@visactor/vchart'; +import { registerSequenceChart } from '../../../../src/charts/sequence'; + +registerSequenceChart({ VChart }); const run = () => { const barStyle = { diff --git a/packages/vchart/__tests__/runtime/browser/test-page/sequence.ts b/packages/vchart-extension/__tests__/runtime/browser/test-page/sequence.ts similarity index 97% rename from packages/vchart/__tests__/runtime/browser/test-page/sequence.ts rename to packages/vchart-extension/__tests__/runtime/browser/test-page/sequence.ts index b2a1e6a1ef..e775193357 100644 --- a/packages/vchart/__tests__/runtime/browser/test-page/sequence.ts +++ b/packages/vchart-extension/__tests__/runtime/browser/test-page/sequence.ts @@ -1,10 +1,10 @@ import { isMobile } from 'react-device-detect'; -import { default as VChart } from '../../../../src/index'; +import { default as VChart } from '@visactor/vchart'; +import { registerSequenceChart } from '../../../../src/charts/sequence'; + +registerSequenceChart({ VChart }); import { DataSet, DataView, csvParser } from '@visactor/vdataset'; -import { dataRegister } from '../../../data/data-sequence-register'; import { dataIm } from '../../../data/data-sequence-im'; -import { dataEventDot } from '../../../data/data-sequence-event-dot'; -import { dataEventLink } from '../../../data/data-sequence-event-link'; import { dataComment } from '../../../data/data-sequence-comment'; const run = () => { const dataSet = new DataSet(); diff --git a/packages/vchart-extension/__tests__/unit/component/data-zoom/sequence-analysis.test.ts b/packages/vchart-extension/__tests__/unit/component/data-zoom/sequence-analysis.test.ts new file mode 100644 index 0000000000..8ca7b29442 --- /dev/null +++ b/packages/vchart-extension/__tests__/unit/component/data-zoom/sequence-analysis.test.ts @@ -0,0 +1,90 @@ +import VChart, { type DataZoom, type ICommonChartSpec } from '@visactor/vchart'; +import { registerDotSeries, type IDotSeriesSpec } from '../../../../src/series/dot'; +import { registerLinkSeries, type ILinkSeriesSpec } from '../../../../src/series/link'; +import { createDiv, removeDom } from '../../../util/dom'; + +registerDotSeries(); +registerLinkSeries(); + +describe('sequence dataZoom integration', () => { + it.each([ + ['from', 'x'], + ['source', 'x'], + ['from', 'y'], + ['source', 'y'] + ])('filters real links with fromField = %s on the %s axis', (fromField, dimension) => { + const dom = createDiv(); + const dot: IDotSeriesSpec = { + type: 'dot', + name: 'events', + dataId: 'events', + xField: 'time', + yField: 'user', + titleField: 'user', + leftAppendPadding: 0, + title: { visible: false }, + subTitle: { visible: false }, + symbol: { visible: false } + }; + const spec: Omit & { series: (IDotSeriesSpec | ILinkSeriesSpec)[] } = { + type: 'common', + width: 600, + height: 400, + data: [ + { + id: 'events', + values: [ + { user: 20, dots: [{ node_name: 'a', time: 10 }] }, + { user: 50, dots: [{ node_name: 'b', time: 30 }] }, + { user: 30, dots: [{ node_name: 'c', time: 50 }] } + ] + }, + { id: 'links', values: ['a', 'b', 'c'].map(node => ({ [fromField]: node, target: 'c' })) } + ], + series: [ + { + type: 'link', + dataId: 'links', + dotSeriesIndex: 1, + dotSeriesSpec: dot, + fromField, + toField: 'target', + leftAppendPadding: 0 + }, + dot + ], + axes: [ + { type: 'linear', orient: 'bottom', min: 0, max: 60, nice: false }, + { type: 'linear', orient: 'left', min: 0, max: 60, nice: false } + ], + dataZoom: [ + { + orient: dimension === 'x' ? 'bottom' : 'left', + ...(dimension === 'x' ? { xAxisIndex: 0 } : { yAxisIndex: 1 }), + filterMode: 'filter', + start: 0, + end: 1 + } + ] + }; + const chart = new VChart(spec, { dom, animation: false }); + try { + chart.renderSync(); + const link = chart + .getChart() + .getAllSeries() + .find(series => series.type === 'link'); + const starts = () => link.getViewData().latestData.map((datum: Record) => datum[fromField]); + expect(starts()).toEqual(['a', 'b', 'c']); + const zoom = chart.getChart().getComponentsByKey('dataZoom')[0] as DataZoom; + // 竖直轴的选区从上到下排列，对应数值从大到小。 + zoom.setStartAndEnd(dimension === 'x' ? 10 : 40, dimension === 'x' ? 40 : 10, ['value', 'value']); + expect(starts()).toEqual(dimension === 'x' ? ['a', 'b'] : ['a', 'c']); + zoom.setStartAndEnd(0, 1); + expect(starts()).toEqual(['a', 'b', 'c']); + } finally { + chart.release(); + removeDom(dom); + } + }); +}); diff --git a/packages/vchart/__tests__/unit/extension/pictogram-size.test.ts b/packages/vchart-extension/__tests__/unit/extension/pictogram-size.test.ts similarity index 94% rename from packages/vchart/__tests__/unit/extension/pictogram-size.test.ts rename to packages/vchart-extension/__tests__/unit/extension/pictogram-size.test.ts index b33bea8c6a..7bd2f5862b 100644 --- a/packages/vchart/__tests__/unit/extension/pictogram-size.test.ts +++ b/packages/vchart-extension/__tests__/unit/extension/pictogram-size.test.ts @@ -1,11 +1,11 @@ -import { Bounds, Matrix } from '../../../src'; -import { PictogramSeries } from '../../../../vchart-extension/src/charts/pictogram/series/pictogram'; +import { Bounds, Matrix } from '@visactor/vchart'; +import { PictogramSeries } from '../../../src/charts/pictogram/series/pictogram'; import { SVG_VIEWPORT_RECT_KEY, clearSVGSource, getSVGSource, registerSVGSource -} from '../../../../vchart-extension/src/charts/pictogram/series/svg-source'; +} from '../../../src/charts/pictogram/series/svg-source'; const createBounds = (x1: number, y1: number, x2: number, y2: number) => new Bounds().setValue(x1, y1, x2, y2); diff --git a/packages/vchart/__tests__/unit/extension/pictogram-text-anchor.test.ts b/packages/vchart-extension/__tests__/unit/extension/pictogram-text-anchor.test.ts similarity index 87% rename from packages/vchart/__tests__/unit/extension/pictogram-text-anchor.test.ts rename to packages/vchart-extension/__tests__/unit/extension/pictogram-text-anchor.test.ts index 8410300314..662af169d4 100644 --- a/packages/vchart/__tests__/unit/extension/pictogram-text-anchor.test.ts +++ b/packages/vchart-extension/__tests__/unit/extension/pictogram-text-anchor.test.ts @@ -1,19 +1,12 @@ -import VChart, { createText } from '../../../src'; -import type { ITextGraphicAttribute } from '../../../src'; -import { registerBrowserEnv } from '../../../src/env'; +import VChart, { createText } from '@visactor/vchart'; +import type { ITextGraphicAttribute } from '@visactor/vchart'; +import { registerBrowserEnv } from '@visactor/vchart'; import { createDiv, removeDom } from '../../util/dom'; -import { - graphicAttributeTransform, - pictogram -} from '../../../../vchart-extension/src/charts/pictogram/series/transform'; -import { registerPictogramChart } from '../../../../vchart-extension/src/charts/pictogram/pictogram'; -import type { IPictogramChartSpec } from '../../../../vchart-extension/src/charts/pictogram/interface'; -import type { SVGParsedElementExtend } from '../../../../vchart-extension/src/charts/pictogram/series/pictogram'; -import { - clearSVGSource, - getSVGSource, - registerSVGSource -} from '../../../../vchart-extension/src/charts/pictogram/series/svg-source'; +import { graphicAttributeTransform, pictogram } from '../../../src/charts/pictogram/series/transform'; +import { registerPictogramChart } from '../../../src/charts/pictogram/pictogram'; +import type { IPictogramChartSpec } from '../../../src/charts/pictogram/interface'; +import type { SVGParsedElementExtend } from '../../../src/charts/pictogram/series/pictogram'; +import { clearSVGSource, getSVGSource, registerSVGSource } from '../../../src/charts/pictogram/series/svg-source'; const registerTextSVG = (body: string) => registerSVGSource('anchor-test', `${body}`); diff --git a/packages/vchart/__tests__/unit/series/link-curve.test.ts b/packages/vchart-extension/__tests__/unit/series/link-curve.test.ts similarity index 89% rename from packages/vchart/__tests__/unit/series/link-curve.test.ts rename to packages/vchart-extension/__tests__/unit/series/link-curve.test.ts index 30953c06a9..f7bd2fcf2a 100644 --- a/packages/vchart/__tests__/unit/series/link-curve.test.ts +++ b/packages/vchart-extension/__tests__/unit/series/link-curve.test.ts @@ -1,8 +1,13 @@ -import VChart, { type ICommonChartSpec, type ILinkSeriesSpec } from '../../../src'; -import { LinkType } from '../../../src/series/link/interface'; +import VChart, { type ICommonChartSpec } from '@visactor/vchart'; +import { LinkType, type ILinkSeriesSpec, registerLinkSeries } from '../../../src/series/link'; +import { type IDotSeriesSpec, registerDotSeries } from '../../../src/series/dot'; + +registerDotSeries(); +registerLinkSeries(); +type ILinkChartSpec = Omit & { series: (IDotSeriesSpec | ILinkSeriesSpec)[] }; import { createDiv, removeDom } from '../../util/dom'; -const makeSpec = (link?: ILinkSeriesSpec['link']): ICommonChartSpec => { +const makeSpec = (link?: ILinkSeriesSpec['link']): ILinkChartSpec => { const dot = { type: 'dot' as const, name: 'events', diff --git a/packages/vchart/__tests__/unit/series/sequence-analysis-review.test.ts b/packages/vchart-extension/__tests__/unit/series/sequence-analysis-review.test.ts similarity index 80% rename from packages/vchart/__tests__/unit/series/sequence-analysis-review.test.ts rename to packages/vchart-extension/__tests__/unit/series/sequence-analysis-review.test.ts index 35e1fdca82..3381c3cb3b 100644 --- a/packages/vchart/__tests__/unit/series/sequence-analysis-review.test.ts +++ b/packages/vchart-extension/__tests__/unit/series/sequence-analysis-review.test.ts @@ -1,15 +1,14 @@ import { DataSet, DataView, dataViewParser } from '@visactor/vdataset'; import { DotSeries } from '../../../src/series/dot/dot'; import { LinkSeries, registerLinkSeries } from '../../../src/series/link/link'; -import { registerSequenceChart } from '../../../src/chart/sequence/sequence'; -import { Factory } from '../../../src/core/factory'; -import { factoryRegistry } from '../../../src/core/factory-registry'; -import { linkDotInfo } from '../../../src/data/transforms/link-dot-info'; +import { registerSequenceChart } from '../../../src/charts/sequence'; +import { Factory } from '@visactor/vchart'; +import { linkDotInfo } from '../../../src/series/link/transform'; // eslint-disable-next-line max-len -import { SequenceAnalysisChartSpecTransformer } from '../../../../vchart-extension/src/charts/sequence-analysis/sequence-analysis-transformer'; +import { SequenceAnalysisChartSpecTransformer } from '../../../src/charts/sequence-analysis/sequence-analysis-transformer'; // eslint-disable-next-line max-len -import type { ISequenceAnalysisSpec } from '../../../../vchart-extension/src/charts/sequence-analysis/interface'; +import type { ISequenceAnalysisSpec } from '../../../src/charts/sequence-analysis/interface'; const events = (time: number) => [ { @@ -86,23 +85,21 @@ describe('sequence analysis review regressions', () => { }); it.each([registerLinkSeries, registerSequenceChart])('registers curve and image marks on demand (%#)', register => { - const marks = { ...factoryRegistry.marks }; - const graphics = { ...factoryRegistry.graphicComponents }; + const registerMark = jest.spyOn(Factory, 'registerMark'); + const registerGraphic = jest.spyOn(Factory, 'registerGraphicComponent'); try { - delete factoryRegistry.marks.path; - delete factoryRegistry.marks.image; - delete factoryRegistry.graphicComponents.path; - delete factoryRegistry.graphicComponents.image; register(); for (const type of ['path', 'image']) { + expect(registerMark).toHaveBeenCalledWith(type, expect.any(Function)); + expect(registerGraphic).toHaveBeenCalledWith(type, expect.any(Function)); const mark = Factory.createMark(type, type, {} as any); expect(mark?.type).toBe(type); expect(Factory.createGraphicComponent(type, {}).type).toBe(type); mark.release(); } } finally { - Object.assign(factoryRegistry.marks, marks); - Object.assign(factoryRegistry.graphicComponents, graphics); + registerMark.mockRestore(); + registerGraphic.mockRestore(); } }); diff --git a/packages/vchart-extension/__tests__/unit/series/sequence-extension.test.ts b/packages/vchart-extension/__tests__/unit/series/sequence-extension.test.ts new file mode 100644 index 0000000000..be801f9864 --- /dev/null +++ b/packages/vchart-extension/__tests__/unit/series/sequence-extension.test.ts @@ -0,0 +1,95 @@ +import { BaseChart, Factory } from '@visactor/vchart'; +import { DotSeries } from '../../../src/series/dot'; +import { LinkSeries } from '../../../src/series/link'; +import { SequenceChart, SequenceChartSpecTransformer, registerSequenceChart } from '../../../src/charts/sequence'; +import { registerSequenceAnalysis } from '../../../src/charts/sequence-analysis/sequence-analysis'; + +describe('sequence chart extension migration', () => { + it('registers the series, axes, grid layout and scrollbar needed by legacy specs', () => { + const registerSeries = jest.spyOn(Factory, 'registerSeries'); + const registerComponent = jest.spyOn(Factory, 'registerComponent'); + const registerLayout = jest.spyOn(Factory, 'registerLayout'); + try { + registerSequenceChart(); + // 检查本次入口实际执行注册，避免主包或其他用例的预注册掩盖遗漏。 + for (const type of ['dot', 'link', 'bar', 'line', 'area']) { + expect(registerSeries).toHaveBeenCalledWith(type, Factory.getSeriesInType(type)); + } + for (const type of ['cartesianAxis-band', 'cartesianAxis-linear', 'cartesianAxis-time', 'scrollBar']) { + expect(registerComponent.mock.calls.some(([key]) => key === type)).toBe(true); + expect(Factory.getComponentInKey(type)).toBeDefined(); + } + expect(registerLayout).toHaveBeenCalledWith('grid', Factory.getLayoutInKey('grid')); + expect(Factory.getChart('sequence')).toBe(SequenceChart); + } finally { + registerSeries.mockRestore(); + registerComponent.mockRestore(); + registerLayout.mockRestore(); + } + }); + + it('registers dot and link through the sequence-analysis entry itself', () => { + const registerSeries = jest.spyOn(Factory, 'registerSeries'); + try { + registerSequenceAnalysis(); + expect(registerSeries).toHaveBeenCalledWith('dot', DotSeries); + expect(registerSeries).toHaveBeenCalledWith('link', LinkSeries); + expect(Factory.getSeriesInType('dot')).toBe(DotSeries); + expect(Factory.getSeriesInType('link')).toBe(LinkSeries); + } finally { + registerSeries.mockRestore(); + } + }); + + it('preserves legacy series regions, the shared time axis and generated scrollbar', () => { + const spec: any = { + type: 'sequence', + appendPadding: { left: 80, right: 20 }, + axes: [{ type: 'time', orient: 'top' }], + data: [{ id: 'events', values: Array.from({ length: 10 }, (_, i) => ({ user: `u${i}`, dots: [] })) }], + series: [ + { type: 'bar', xField: 'time', yField: 'count', height: 80 }, + { type: 'link', dotSeriesIndex: 2, fromField: 'from', toField: 'to' }, + { + type: 'dot', + dataId: 'events', + xField: 'time', + yField: 'user', + height: 120, + clipHeight: 120, + title: { style: {} }, + subTitle: { style: {} } + } + ] + }; + new SequenceChartSpecTransformer({ + type: 'sequence', + getCompiler: () => ({ getStage: () => ({ viewWidth: 800, viewHeight: 600 }) }) + } as any).transformSpec(spec); + expect(spec.layout.type).toBe('grid'); + expect(spec.series[0].regionIndex).not.toBe(spec.series[2].regionIndex); + expect(spec.series[1]).toMatchObject({ regionIndex: spec.series[2].regionIndex, clipHeight: 120 }); + expect(spec.axes[0].type).toBe('time'); + expect(spec.axes[0].regionIndex).toEqual( + expect.arrayContaining([spec.series[0].regionIndex, spec.series[2].regionIndex]) + ); + expect(spec.scrollBar[0]).toMatchObject({ orient: 'right', end: 0.4, regionIndex: spec.series[2].regionIndex }); + }); + + it('binds link to the selected dot spec and uses the standard series lifecycle', () => { + const dot = { type: 'dot', xField: 'time', yField: 'user' }; + const link = { type: 'link', dotSeriesIndex: 1 }; + const createSeries = jest.spyOn(BaseChart.prototype as any, '_createSeries').mockImplementation(() => undefined); + try { + const chart = Object.create(SequenceChart.prototype); + chart._spec = { series: [link, dot] }; + const info = { spec: link, specIndex: 0 }; + const constructor = Factory.getSeriesInType('link'); + chart._createSeries(constructor, info); + expect((link as any).dotSeriesSpec).toBe(dot); + expect(createSeries).toHaveBeenCalledWith(constructor, info); + } finally { + createSeries.mockRestore(); + } + }); +}); diff --git a/packages/vchart-extension/__tests__/util/dom.ts b/packages/vchart-extension/__tests__/util/dom.ts new file mode 100644 index 0000000000..b3ff56bad5 --- /dev/null +++ b/packages/vchart-extension/__tests__/util/dom.ts @@ -0,0 +1,9 @@ +export function createDiv(container: HTMLElement = document.body): HTMLElement { + const div = document.createElement('div'); + container.appendChild(div); + return div; +} + +export function removeDom(dom: HTMLElement) { + dom.parentNode?.removeChild(dom); +} diff --git a/packages/vchart/__tests__/visual/cases/api/update/sequence-curve-link.mjs b/packages/vchart-extension/__tests__/visual/cases/api/update/sequence-curve-link.mjs similarity index 99% rename from packages/vchart/__tests__/visual/cases/api/update/sequence-curve-link.mjs rename to packages/vchart-extension/__tests__/visual/cases/api/update/sequence-curve-link.mjs index fe80745d9e..b475fe663e 100644 --- a/packages/vchart/__tests__/visual/cases/api/update/sequence-curve-link.mjs +++ b/packages/vchart-extension/__tests__/visual/cases/api/update/sequence-curve-link.mjs @@ -9,6 +9,7 @@ import lineCase from './sequence-link-data.mjs'; * 覆盖边界：不覆盖扩展图表时间轴派生组件；旧 develop 不支持曲线，基线语义校验会明确失败。 */ export default { + register: lineCase.register, createSpec() { // 复用逐用户事件数据，增加两条相同端点的连接。 const spec = lineCase.createSpec(); diff --git a/packages/vchart/__tests__/visual/cases/api/update/sequence-link-data.mjs b/packages/vchart-extension/__tests__/visual/cases/api/update/sequence-link-data.mjs similarity index 96% rename from packages/vchart/__tests__/visual/cases/api/update/sequence-link-data.mjs rename to packages/vchart-extension/__tests__/visual/cases/api/update/sequence-link-data.mjs index 4c4ebce713..0d9e28378a 100644 --- a/packages/vchart/__tests__/visual/cases/api/update/sequence-link-data.mjs +++ b/packages/vchart-extension/__tests__/visual/cases/api/update/sequence-link-data.mjs @@ -7,6 +7,9 @@ * 覆盖边界：不覆盖曲线、头像、扩展 transformer 和按需注册，另有单元测试。 */ export default { + register({ VChart, VChartExtension }) { + VChartExtension.registerSequenceAnalysis({ VChart: VChart.default }); + }, createSpec() { // 固定轴范围以便直接对照更新前后的连接位置。 const dot = { diff --git a/packages/vchart/__tests__/visual/cases/components/datazoom/sequence-preview-filter.mjs b/packages/vchart-extension/__tests__/visual/cases/components/datazoom/sequence-preview-filter.mjs similarity index 97% rename from packages/vchart/__tests__/visual/cases/components/datazoom/sequence-preview-filter.mjs rename to packages/vchart-extension/__tests__/visual/cases/components/datazoom/sequence-preview-filter.mjs index 7b41fbe265..9b2c3c1bb7 100644 --- a/packages/vchart/__tests__/visual/cases/components/datazoom/sequence-preview-filter.mjs +++ b/packages/vchart-extension/__tests__/visual/cases/components/datazoom/sequence-preview-filter.mjs @@ -7,6 +7,9 @@ * 覆盖边界：不覆盖曲线和头像，更新与系列顺序由单元测试覆盖。 */ export default { + register({ VChart, VChartExtension }) { + VChartExtension.registerSequenceAnalysis({ VChart: VChart.default }); + }, createSpec() { // 使用虚构用户和固定时刻复现分类 ID 被当作数值的问题。 const dot = { diff --git a/packages/vchart-extension/__tests__/visual/cases/index.mjs b/packages/vchart-extension/__tests__/visual/cases/index.mjs new file mode 100644 index 0000000000..0e9b5744cc --- /dev/null +++ b/packages/vchart-extension/__tests__/visual/cases/index.mjs @@ -0,0 +1,21 @@ +export const cases = [ + { + id: 'sequence-preview-filter', + purpose: '时序图缩略图不累加用户 ID，连线随 dataZoom 时间选区过滤', + file: './components/datazoom/sequence-preview-filter.mjs' + }, + { + id: 'sequence-link-data', + purpose: 'dot 嵌套原始数据与更新后的连接端点', + file: './api/update/sequence-link-data.mjs' + }, + { + id: 'sequence-curve-link', + purpose: '曲线连接在配置与数据更新后保持路径稳定并应用公开 link 配置', + file: './api/update/sequence-curve-link.mjs' + } +]; + +export async function loadCase(item) { + return (await import(item.file)).default; +} diff --git a/packages/vchart-extension/__tests__/visual/page.html b/packages/vchart-extension/__tests__/visual/page.html new file mode 100644 index 0000000000..c1156119b7 --- /dev/null +++ b/packages/vchart-extension/__tests__/visual/page.html @@ -0,0 +1,72 @@ + + + + + + + VChart visual regression + + + +
+ + + diff --git a/packages/vchart-extension/jest.config.js b/packages/vchart-extension/jest.config.js new file mode 100644 index 0000000000..6d624aee5d --- /dev/null +++ b/packages/vchart-extension/jest.config.js @@ -0,0 +1,9 @@ +const path = require('path'); +const core = require('../vchart/jest.config'); + +module.exports = { + ...core, + rootDir: __dirname, + globals: { 'ts-jest': { ...core.globals['ts-jest'], tsconfig: path.join(__dirname, 'tsconfig.test.json') } }, + setupFiles: [path.resolve(__dirname, '../vchart/setup-mock.js')] +}; diff --git a/packages/vchart-extension/package.json b/packages/vchart-extension/package.json index dec7e569db..8a226907ef 100644 --- a/packages/vchart-extension/package.json +++ b/packages/vchart-extension/package.json @@ -23,7 +23,9 @@ "build:umd": "bundle --clean -f umd", "build:es": "bundle --clean -f es", "build:cjs": "bundle --clean -f cjs", - "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser" + "start": "ts-node __tests__/runtime/browser/scripts/initVite.ts && vite serve __tests__/runtime/browser", + "test": "jest", + "test:visual": "node scripts/visual-test.mjs" }, "dependencies": { "@visactor/vrender-core": "1.1.11", @@ -59,7 +61,12 @@ "rollup-plugin-gzip": "3.1.0", "rollup-plugin-bundle-size": "1.0.3", "rollup-plugin-sizes": "1.0.5", - "rollup": "3.20.5" + "rollup": "3.20.5", + "@types/jest": "^26.0.0", + "jest-electron": "^0.1.12", + "ts-jest": "^26.0.0", + "react-device-detect": "^2.2.2", + "@visactor/vscale": "~1.0.27" }, "publishConfig": { "access": "public", diff --git a/packages/vchart-extension/scripts/visual-test.mjs b/packages/vchart-extension/scripts/visual-test.mjs new file mode 100644 index 0000000000..496acdde65 --- /dev/null +++ b/packages/vchart-extension/scripts/visual-test.mjs @@ -0,0 +1,14 @@ +import fs from 'node:fs/promises'; +import { main } from '../../vchart/scripts/visual-test.mjs'; +import { build } from './visual/build.mjs'; + +main({ + suitePath: 'packages/vchart-extension/__tests__/visual', + outputDirectory: '.vchart-visual/extension', + command: 'node packages/vchart-extension/scripts/visual-test.mjs', + buildBundle: build, + buildKey: await fs.readFile(new URL('./visual/build.mjs', import.meta.url), 'utf8') +}).catch(error => { + console.error(`${error.code ?? 'EXECUTION_FAILED'}: ${error.message}`); + process.exitCode = 2; +}); diff --git a/packages/vchart-extension/scripts/visual/build.mjs b/packages/vchart-extension/scripts/visual/build.mjs new file mode 100644 index 0000000000..b98d7c497b --- /dev/null +++ b/packages/vchart-extension/scripts/visual/build.mjs @@ -0,0 +1,64 @@ +import fs from 'node:fs/promises'; +import path from 'node:path'; +import { build as buildCore } from '../../../vchart/scripts/visual/build.mjs'; + +const buildEnv = { NODE_ENV: 'production', BUNDLE_ANALYZE: '', IGNORE_ENTRIES: 'true' }; + +export async function build(root, destination, runtime, log) { + await buildCore(root, destination, runtime, log); + // 使用同一侧源码构建时序扩展；VChart 保持外部依赖，共享 Factory 和主题注册表。 + // 基线迁移前由 sequenceAnalysis 注册核心系列，迁移后注册扩展系列。 + const extensionDirectory = path.join(path.dirname(destination), `${path.basename(destination, '.js')}-extension`); + await fs.mkdir(extensionDirectory, { recursive: true }); + // 主包 UMD 不生成声明文件，扩展编译直接读取同一侧主包源码的类型，避免使用陈旧 esm。 + const extensionTsconfig = path.join(extensionDirectory, 'tsconfig.json'); + const coreTsconfig = JSON.parse(await fs.readFile(path.join(root, 'packages/vchart/tsconfig.json'), 'utf8')); + const paths = Object.fromEntries( + Object.entries(coreTsconfig.compilerOptions.paths ?? {}).map(([key, values]) => [ + key, + values.map(value => path.resolve(root, 'packages/vchart', value)) + ]) + ); + paths['@visactor/vchart'] = [path.join(root, 'packages/vchart/src/index.ts')]; + await fs.writeFile( + extensionTsconfig, + JSON.stringify({ + extends: path.join(root, 'packages/vchart-extension/tsconfig.json'), + compilerOptions: { rootDir: path.join(root, 'packages'), paths }, + include: [path.join(root, 'packages/vchart-extension/src/charts/sequence-analysis/sequence-analysis.ts')], + references: [] + }) + ); + const extensionConfig = path.join(extensionDirectory, 'bundler.config.cjs'); + await fs.writeFile( + extensionConfig, + `module.exports = ${JSON.stringify({ + name: 'VChartExtension', + tsconfig: extensionTsconfig, + input: { umd: 'charts/sequence-analysis/sequence-analysis.ts' }, + outputDir: { umd: path.join(extensionDirectory, 'build') }, + umdOutputFilename: 'index', + noEmitOnError: false, + external: ['@visactor/vchart'], + globals: { '@visactor/vchart': 'VChart' }, + envs: { __DEV__: 'false' } + })};` + ); + await runtime.run( + process.execPath, + [ + path.join(root, 'common/scripts/install-run-rushx.js'), + 'build:umd', + '--config', + extensionConfig, + '--minify=false' + ], + path.join(root, 'packages/vchart-extension'), + log, + { code: 'BUILD_FAILED', env: buildEnv } + ); + await fs.appendFile( + destination, + Buffer.concat([Buffer.from('\n;\n'), await fs.readFile(path.join(extensionDirectory, 'build/index.js'))]) + ); +} diff --git a/packages/vchart-extension/src/charts/sequence-analysis/sequence-analysis.ts b/packages/vchart-extension/src/charts/sequence-analysis/sequence-analysis.ts index f97a587b41..3179c24581 100644 --- a/packages/vchart-extension/src/charts/sequence-analysis/sequence-analysis.ts +++ b/packages/vchart-extension/src/charts/sequence-analysis/sequence-analysis.ts @@ -1,3 +1,5 @@ +import { registerDotSeries } from '../../series/dot'; +import { registerLinkSeries } from '../../series/link'; import type { ISequenceAnalysisSpec } from './interface'; import { VChart, BaseChart, CommonChart } from '@visactor/vchart'; import { SequenceAnalysisChartSpecTransformer } from './sequence-analysis-transformer'; @@ -34,6 +36,8 @@ export class SequenceAnalysis extends BaseChart { + registerDotSeries(); + registerLinkSeries(); const vchartConstructor = option?.VChart || VChart; if (vchartConstructor) { vchartConstructor.useChart([SequenceAnalysis, CommonChart]); diff --git a/packages/vchart/src/chart/sequence/index.ts b/packages/vchart-extension/src/charts/sequence/index.ts similarity index 100% rename from packages/vchart/src/chart/sequence/index.ts rename to packages/vchart-extension/src/charts/sequence/index.ts diff --git a/packages/vchart/src/chart/sequence/interface.ts b/packages/vchart-extension/src/charts/sequence/interface.ts similarity index 56% rename from packages/vchart/src/chart/sequence/interface.ts rename to packages/vchart-extension/src/charts/sequence/interface.ts index 79f60d6cdd..5312d7c923 100644 --- a/packages/vchart/src/chart/sequence/interface.ts +++ b/packages/vchart-extension/src/charts/sequence/interface.ts @@ -1,11 +1,14 @@ -import type { IChartSpec, ISeriesSpec } from '../../typings/spec/common'; -import type { ICartesianAxisSpec } from '../../component/axis/cartesian/interface'; -import type { IDataZoomSpec } from '../../component/data-zoom/data-zoom/interface'; -import type { IScrollBarSpec } from '../../component/data-zoom/scroll-bar/interface'; -import type { ICartesianCrosshairSpec } from '../../component/crosshair/interface'; -import type { ILayoutSpec } from '../../layout/interface'; -import type { RegionSpec } from '../../region/interface'; -import type { IPadding } from '../../typings'; +import type { + IChartSpec, + ISeriesSpec, + ICartesianAxisSpec, + IDataZoomSpec, + IScrollBarSpec, + ICartesianCrosshairSpec, + ILayoutSpec, + RegionSpec, + IPadding +} from '@visactor/vchart'; export interface ISequenceChartSpec extends IChartSpec { type: 'sequence'; diff --git a/packages/vchart/src/chart/sequence/sequence-transformer.ts b/packages/vchart-extension/src/charts/sequence/sequence-transformer.ts similarity index 96% rename from packages/vchart/src/chart/sequence/sequence-transformer.ts rename to packages/vchart-extension/src/charts/sequence/sequence-transformer.ts index 95ddc9b519..ce173410f3 100644 --- a/packages/vchart/src/chart/sequence/sequence-transformer.ts +++ b/packages/vchart-extension/src/charts/sequence/sequence-transformer.ts @@ -1,13 +1,13 @@ import { array } from '@visactor/vutils'; import { DataView } from '@visactor/vdataset'; -import { BaseChartSpecTransformer } from '../base'; +import { + BaseChartSpecTransformer, + SeriesTypeEnum, + normalizeLayoutPaddingSpec, + SCROLL_BAR_DEFAULT_SIZE +} from '@visactor/vchart'; +import type { Datum, RegionSpec, ICartesianAxisSpec, IScrollBarSpec, IGridLayoutSpec } from '@visactor/vchart'; import type { ISequenceChartSpec, ISequenceSeriesSpec } from './interface'; -import type { Datum, RegionSpec } from '../../typings'; -import type { ICartesianAxisSpec, IScrollBarSpec } from '../../component'; -import { SeriesTypeEnum } from '../../series'; -import { normalizeLayoutPaddingSpec } from '../../util'; -import type { IGridLayoutSpec } from '../../layout'; -import { SCROLL_BAR_DEFAULT_SIZE } from '../../constant/scroll-bar'; export class SequenceChartSpecTransformer< T extends ISequenceChartSpec = ISequenceChartSpec diff --git a/packages/vchart-extension/src/charts/sequence/sequence.ts b/packages/vchart-extension/src/charts/sequence/sequence.ts new file mode 100644 index 0000000000..e7c56e79e5 --- /dev/null +++ b/packages/vchart-extension/src/charts/sequence/sequence.ts @@ -0,0 +1,52 @@ +import { registerDotSeries } from '../../series/dot'; +import { registerLinkSeries } from '../../series/link'; +import { + VChart, + BaseChart, + SeriesTypeEnum, + registerBarSeries, + registerLineSeries, + registerAreaSeries, + registerCartesianBandAxis, + registerCartesianLinearAxis, + registerCartesianTimeAxis, + registerGridLayout, + registerScrollBar, + registerMarkTooltipProcessor, + registerDimensionTooltipProcessor +} from '@visactor/vchart'; +import type { ISeriesConstructor, IModelSpecInfo } from '@visactor/vchart'; +import type { ISequenceChartSpec } from './interface'; +import { SequenceChartSpecTransformer } from './sequence-transformer'; + +export class SequenceChart extends BaseChart { + static readonly type: string = 'sequence'; + static readonly transformerConstructor = SequenceChartSpecTransformer; + readonly transformerConstructor = SequenceChartSpecTransformer; + readonly type: string = 'sequence'; + + protected _createSeries(constructor: ISeriesConstructor, specInfo: IModelSpecInfo) { + if (specInfo.spec.type === SeriesTypeEnum.link) { + specInfo.spec.dotSeriesSpec = this._spec.series[specInfo.spec.dotSeriesIndex]; + } + super._createSeries(constructor, specInfo); + } +} + +export const registerSequenceChart = (option?: { VChart?: typeof VChart }) => { + registerDimensionTooltipProcessor(); + registerMarkTooltipProcessor(); + registerDotSeries(); + registerLinkSeries(); + registerBarSeries(); + registerLineSeries(); + registerAreaSeries(); + registerCartesianBandAxis(); + registerCartesianLinearAxis(); + registerCartesianTimeAxis(); + registerGridLayout(); + registerScrollBar(); + + const vchartConstructor = option?.VChart || VChart; + vchartConstructor.useChart([SequenceChart]); +}; diff --git a/packages/vchart-extension/src/index.ts b/packages/vchart-extension/src/index.ts index bd3d92f18a..4afb5c8463 100644 --- a/packages/vchart-extension/src/index.ts +++ b/packages/vchart-extension/src/index.ts @@ -5,6 +5,7 @@ export * from './charts/sequence-scatter-link/sequence-scatter-link'; export * from './charts/sequence-scatter-kde/sequence-scatter-kde'; export * from './charts/sequence-scatter-pixel/sequence-scatter-pixel'; export * from './charts/sequence-analysis/sequence-analysis'; +export * from './charts/sequence'; export * from './charts/bar-3d'; export * from './charts/funnel-3d'; @@ -30,3 +31,6 @@ export * from './components/scatter-regression-line'; export * from './components/bar-regression-line'; export * from './components/histogram-regression-line'; export * from './components/extension-mark-sync-state'; + +export * from './series/dot'; +export * from './series/link'; diff --git a/packages/vchart/src/series/dot/config.ts b/packages/vchart-extension/src/series/dot/config.ts similarity index 100% rename from packages/vchart/src/series/dot/config.ts rename to packages/vchart-extension/src/series/dot/config.ts diff --git a/packages/vchart/src/series/dot/constant.ts b/packages/vchart-extension/src/series/dot/constant.ts similarity index 76% rename from packages/vchart/src/series/dot/constant.ts rename to packages/vchart-extension/src/series/dot/constant.ts index 6d2fad6cfd..73805b43b8 100644 --- a/packages/vchart/src/series/dot/constant.ts +++ b/packages/vchart-extension/src/series/dot/constant.ts @@ -1,7 +1,4 @@ -import { MarkTypeEnum } from '../../mark/interface/type'; -import { baseSeriesMark } from '../base/constant'; -import type { SeriesMarkMap } from '../interface/common'; -import { SeriesMarkNameEnum } from '../interface/type'; +import { MarkTypeEnum, baseSeriesMark, SeriesMarkNameEnum, type SeriesMarkMap } from '@visactor/vchart'; export const dotSeriesMark: SeriesMarkMap = { ...baseSeriesMark, diff --git a/packages/vchart/src/series/dot/dot.ts b/packages/vchart-extension/src/series/dot/dot.ts similarity index 91% rename from packages/vchart/src/series/dot/dot.ts rename to packages/vchart-extension/src/series/dot/dot.ts index 0cc6ceb61d..27d84cb60a 100644 --- a/packages/vchart/src/series/dot/dot.ts +++ b/packages/vchart-extension/src/series/dot/dot.ts @@ -1,31 +1,40 @@ -/* eslint-disable no-duplicate-imports */ -import { DEFAULT_DATA_SERIES_FIELD } from '../../constant/data'; -import { CartesianSeries } from '../cartesian/cartesian'; -import type { Datum } from '../../typings'; -import { mergeSpec } from '@visactor/vutils-extension'; +import { + DEFAULT_DATA_SERIES_FIELD, + CartesianSeries, + mergeSpec, + SeriesTypeEnum, + registerDataSetInstanceParser, + registerDataSetInstanceTransform, + copyDataView, + objFlat, + ColorOrdinalScale, + registerSymbolMark, + registerTextMark, + registerRuleMark, + registerRectMark, + Factory, + TransformLevel, + AttributeLevel, + type Datum, + type IGroupMark, + type IMark, + type IRectMark, + type IRuleMark, + type ISymbolMark, + type ITextMark, + type IModelEvaluateOption, + type FunctionType, + type IFillMarkSpec, + type VisualType, + type SeriesMarkMap +} from '@visactor/vchart'; import { isValid } from '@visactor/vutils'; -import type { IGroupMark, IMark, IRectMark, IRuleMark, ISymbolMark, ITextMark } from '../../mark/interface'; -import { SeriesTypeEnum } from '../interface/type'; import { dataViewParser } from '@visactor/vdataset'; -import { registerDataSetInstanceParser, registerDataSetInstanceTransform } from '../../data/register'; -import type { IModelEvaluateOption } from '../../model/interface'; import { DotSeriesTooltipHelper } from './tooltip-helper'; -import type { FunctionType, IFillMarkSpec, VisualType } from '../../typings/visual'; import type { IDotSeriesSpec } from './interface'; -import { copyDataView } from '../../data/transforms/copy-data-view'; -import { objFlat } from '../../data/transforms/obj-flat'; import { DEFAULT_GRID_BACKGROUND } from './config'; -import { ColorOrdinalScale } from '../../scale/color-ordinal-scale'; -import type { SeriesMarkMap } from '../interface'; -import { registerSymbolMark } from '../../mark/symbol'; -import { registerTextMark } from '../../mark/text'; -import { registerRuleMark } from '../../mark/rule'; -import { registerRectMark } from '../../mark/rect'; import { dotSeriesMark } from './constant'; -import { Factory } from '../../core/factory'; -import { TransformLevel } from '../../data/initialize'; -import { AttributeLevel } from '../../constant/attribute'; -import { dot } from '../../theme/builtin/common/series/dot'; +import { dot } from './theme'; const DOT_SERIES_COMPILE_ONLY_KEYS: Record<'highLightSeriesGroup' | 'titleField' | 'subTitleField', true> = { highLightSeriesGroup: true, diff --git a/packages/vchart-types/types/component/map-label/index.d.ts b/packages/vchart-extension/src/series/dot/index.ts similarity index 50% rename from packages/vchart-types/types/component/map-label/index.d.ts rename to packages/vchart-extension/src/series/dot/index.ts index 30dcd3a1ae..710cde6fde 100644 --- a/packages/vchart-types/types/component/map-label/index.d.ts +++ b/packages/vchart-extension/src/series/dot/index.ts @@ -1,2 +1,2 @@ -export * from './component'; +export * from './dot'; export * from './interface'; diff --git a/packages/vchart/src/series/dot/interface.ts b/packages/vchart-extension/src/series/dot/interface.ts similarity index 86% rename from packages/vchart/src/series/dot/interface.ts rename to packages/vchart-extension/src/series/dot/interface.ts index 8e6baccd7b..dcb8e3122d 100644 --- a/packages/vchart/src/series/dot/interface.ts +++ b/packages/vchart-extension/src/series/dot/interface.ts @@ -1,7 +1,15 @@ -import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface'; -import type { IFormatMethod, IMarkSpec, IMarkTheme } from '../../typings/spec/common'; -import type { ISymbolMarkSpec, IRuleMarkSpec, ITextMarkSpec, ConvertToMarkStyleSpec } from '../../typings/visual'; -import type { SeriesMarkNameEnum } from '../interface/type'; +import type { + ICartesianSeriesSpec, + ICartesianSeriesTheme, + IFormatMethod, + IMarkSpec, + IMarkTheme, + ISymbolMarkSpec, + IRuleMarkSpec, + ITextMarkSpec, + ConvertToMarkStyleSpec, + SeriesMarkNameEnum +} from '@visactor/vchart'; interface ISequenceLabel { visible?: boolean; diff --git a/packages/vchart/src/theme/builtin/common/series/dot.ts b/packages/vchart-extension/src/series/dot/theme.ts similarity index 88% rename from packages/vchart/src/theme/builtin/common/series/dot.ts rename to packages/vchart-extension/src/series/dot/theme.ts index 5ca0e456b5..e027a4ee7e 100644 --- a/packages/vchart/src/theme/builtin/common/series/dot.ts +++ b/packages/vchart-extension/src/series/dot/theme.ts @@ -1,4 +1,4 @@ -import type { IDotSeriesTheme } from '../../../../series/dot/interface'; +import type { IDotSeriesTheme } from './interface'; export const dot: IDotSeriesTheme = { dot: { diff --git a/packages/vchart/src/series/dot/tooltip-helper.ts b/packages/vchart-extension/src/series/dot/tooltip-helper.ts similarity index 82% rename from packages/vchart/src/series/dot/tooltip-helper.ts rename to packages/vchart-extension/src/series/dot/tooltip-helper.ts index e6466b825a..30af0bc943 100644 --- a/packages/vchart/src/series/dot/tooltip-helper.ts +++ b/packages/vchart-extension/src/series/dot/tooltip-helper.ts @@ -1,18 +1,18 @@ -import type { ISeriesTooltipHelper } from '../interface'; -import { BaseSeriesTooltipHelper } from '../base/tooltip-helper'; -import type { - Datum, - ITooltipActual, - ITooltipLineActual, - ITooltipLinePattern, - MaybeArray, - TooltipActiveType, - TooltipData, - TooltipPatternProperty -} from '../../typings'; +import { + type ISeriesTooltipHelper, + type Datum, + type ITooltipActual, + type ITooltipLineActual, + type ITooltipLinePattern, + type MaybeArray, + type TooltipActiveType, + type TooltipData, + type TooltipPatternProperty, + type ITooltipSpec, + type TooltipHandlerParams, + BaseSeriesTooltipHelper +} from '@visactor/vchart'; import { TimeUtil } from '@visactor/vutils'; -import type { ITooltipSpec } from '../../component/tooltip/interface/spec'; -import type { TooltipHandlerParams } from '../../component/tooltip/interface/common'; export class DotSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper { protected enableByType(activeType: TooltipActiveType): boolean { diff --git a/packages/vchart/src/series/link/constant.ts b/packages/vchart-extension/src/series/link/constant.ts similarity index 63% rename from packages/vchart/src/series/link/constant.ts rename to packages/vchart-extension/src/series/link/constant.ts index 749d9bee3d..be55e68e95 100644 --- a/packages/vchart/src/series/link/constant.ts +++ b/packages/vchart-extension/src/series/link/constant.ts @@ -1,7 +1,4 @@ -import { MarkTypeEnum } from '../../mark/interface/type'; -import { baseSeriesMark } from '../base/constant'; -import type { SeriesMarkMap } from '../interface/common'; -import { SeriesMarkNameEnum } from '../interface/type'; +import { PREFIX, MarkTypeEnum, baseSeriesMark, SeriesMarkNameEnum, type SeriesMarkMap } from '@visactor/vchart'; export const linkSeriesMark: SeriesMarkMap = { ...baseSeriesMark, @@ -10,3 +7,6 @@ export const linkSeriesMark: SeriesMarkMap = { [SeriesMarkNameEnum.arrow]: { name: SeriesMarkNameEnum.arrow, type: MarkTypeEnum.symbol }, [SeriesMarkNameEnum.imageLabel]: { name: SeriesMarkNameEnum.imageLabel, type: MarkTypeEnum.image } }; + +// 当前数据集中相同端点连接的曲线序号，由 linkDotInfo 转换生成。 +export const DEFAULT_LINK_CURVE_INDEX = `${PREFIX}_LINK_CURVE_INDEX`; diff --git a/packages/vchart-extension/src/series/link/index.ts b/packages/vchart-extension/src/series/link/index.ts new file mode 100644 index 0000000000..6c961b38c6 --- /dev/null +++ b/packages/vchart-extension/src/series/link/index.ts @@ -0,0 +1,2 @@ +export * from './link'; +export * from './interface'; diff --git a/packages/vchart/src/series/link/interface.ts b/packages/vchart-extension/src/series/link/interface.ts similarity index 87% rename from packages/vchart/src/series/link/interface.ts rename to packages/vchart-extension/src/series/link/interface.ts index 98c073832e..f37b886555 100644 --- a/packages/vchart/src/series/link/interface.ts +++ b/packages/vchart-extension/src/series/link/interface.ts @@ -1,7 +1,13 @@ -import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface'; -import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common'; -import type { IImageMarkSpec, ILineMarkSpec, ISymbolMarkSpec } from '../../typings/visual'; -import type { SeriesMarkNameEnum } from '../interface/type'; +import type { + ICartesianSeriesSpec, + ICartesianSeriesTheme, + IMarkSpec, + IMarkTheme, + IImageMarkSpec, + ILineMarkSpec, + ISymbolMarkSpec, + SeriesMarkNameEnum +} from '@visactor/vchart'; import type { DataView } from '@visactor/vdataset'; import type { IDotSeriesSpec } from '../dot/interface'; diff --git a/packages/vchart/src/series/link/link.ts b/packages/vchart-extension/src/series/link/link.ts similarity index 91% rename from packages/vchart/src/series/link/link.ts rename to packages/vchart-extension/src/series/link/link.ts index f50159587b..a7d1084d28 100644 --- a/packages/vchart/src/series/link/link.ts +++ b/packages/vchart-extension/src/series/link/link.ts @@ -1,27 +1,34 @@ -/* eslint-disable no-duplicate-imports */ -import { DEFAULT_DATA_SERIES_FIELD, DEFAULT_LINK_CURVE_INDEX } from '../../constant/data'; -import { CartesianSeries } from '../cartesian/cartesian'; -import type { Datum } from '../../typings'; +import { + DEFAULT_DATA_SERIES_FIELD, + CartesianSeries, + SeriesTypeEnum, + registerDataSetInstanceTransform, + registerRuleMark, + registerSymbolMark, + registerPathMark, + registerImageMark, + MarkTypeEnum, + Factory, + TransformLevel, + registerCartesianLinearAxis, + registerCartesianBandAxis, + AttributeLevel, + type Datum, + type IGroupMark, + type IImageMark, + type IMark, + type IPathMark, + type IRuleMark, + type ISymbolMark, + type SeriesMarkMap +} from '@visactor/vchart'; import { array, isValid } from '@visactor/vutils'; -import type { IGroupMark, IImageMark, IMark, IPathMark, IRuleMark, ISymbolMark } from '../../mark/interface'; -import { SeriesTypeEnum } from '../interface/type'; -import { registerDataSetInstanceTransform } from '../../data/register'; import type { IDotSeriesSpec } from '../dot/interface'; import { LinkSeriesTooltipHelper } from './tooltip-helper'; import { LinkType, type ILinkSeriesSpec } from './interface'; -import type { SeriesMarkMap } from '../interface'; -import { registerRuleMark } from '../../mark/rule'; -import { registerSymbolMark } from '../../mark/symbol'; -import { registerPathMark } from '../../mark/path'; -import { registerImageMark } from '../../mark/image'; -import { MarkTypeEnum } from '../../mark/interface/type'; -import { linkSeriesMark } from './constant'; -import { linkDotInfo } from '../../data/transforms/link-dot-info'; -import { Factory } from '../../core/factory'; -import { TransformLevel } from '../../data/initialize'; -import { registerCartesianLinearAxis, registerCartesianBandAxis } from '../../component/axis/cartesian'; -import { AttributeLevel } from '../../constant/attribute'; -import { link } from '../../theme/builtin/common/series/link'; +import { linkSeriesMark, DEFAULT_LINK_CURVE_INDEX } from './constant'; +import { linkDotInfo } from './transform'; +import { link } from './theme'; export class LinkSeries extends CartesianSeries { static readonly type: string = SeriesTypeEnum.link; diff --git a/packages/vchart/src/theme/builtin/common/series/link.ts b/packages/vchart-extension/src/series/link/theme.ts similarity index 55% rename from packages/vchart/src/theme/builtin/common/series/link.ts rename to packages/vchart-extension/src/series/link/theme.ts index a9c439afcb..f62a520bf0 100644 --- a/packages/vchart/src/theme/builtin/common/series/link.ts +++ b/packages/vchart-extension/src/series/link/theme.ts @@ -1,4 +1,4 @@ -import type { ILinkSeriesTheme } from '../../../../series/link/interface'; +import type { ILinkSeriesTheme } from './interface'; export const link: ILinkSeriesTheme = { arrow: { diff --git a/packages/vchart/src/series/link/tooltip-helper.ts b/packages/vchart-extension/src/series/link/tooltip-helper.ts similarity index 82% rename from packages/vchart/src/series/link/tooltip-helper.ts rename to packages/vchart-extension/src/series/link/tooltip-helper.ts index 922b9cf98b..b7a1004956 100644 --- a/packages/vchart/src/series/link/tooltip-helper.ts +++ b/packages/vchart-extension/src/series/link/tooltip-helper.ts @@ -1,6 +1,9 @@ -import type { ISeriesTooltipHelper } from '../interface'; -import { BaseSeriesTooltipHelper } from '../base/tooltip-helper'; -import type { ITooltipLinePattern, TooltipActiveType } from '../../typings'; +import { + type ISeriesTooltipHelper, + type ITooltipLinePattern, + type TooltipActiveType, + BaseSeriesTooltipHelper +} from '@visactor/vchart'; import { TimeUtil } from '@visactor/vutils'; export class LinkSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper { diff --git a/packages/vchart/src/data/transforms/link-dot-info.ts b/packages/vchart-extension/src/series/link/transform.ts similarity index 93% rename from packages/vchart/src/data/transforms/link-dot-info.ts rename to packages/vchart-extension/src/series/link/transform.ts index 7ed358642a..336aafd140 100644 --- a/packages/vchart/src/data/transforms/link-dot-info.ts +++ b/packages/vchart-extension/src/series/link/transform.ts @@ -1,5 +1,6 @@ -import { DEFAULT_LINK_CURVE_INDEX } from '../../constant/data'; -import type { Datum } from '../../typings'; +import { DEFAULT_LINK_CURVE_INDEX } from './constant'; +import type { Datum } from '@visactor/vchart'; +import type { DataView } from '@visactor/vdataset'; export interface ILinkDotInfoOpt { infoKey: string; diff --git a/packages/vchart-extension/tsconfig.test.json b/packages/vchart-extension/tsconfig.test.json new file mode 100644 index 0000000000..c06073a20f --- /dev/null +++ b/packages/vchart-extension/tsconfig.test.json @@ -0,0 +1,25 @@ +{ + "extends": "./tsconfig.json", + "compilerOptions": { + "paths": { + "@visactor/vchart": ["../vchart/src/index.ts"], + "eventemitter3": ["../vchart/node_modules/eventemitter3"], + "@visactor/vrender": ["../vchart/node_modules/@visactor/vrender/es/index"], + "@visactor/vrender/*": ["../vchart/node_modules/@visactor/vrender/es/*"], + "@visactor/vrender-core": ["../vchart/node_modules/@visactor/vrender-core/es/index"], + "@visactor/vrender-core/event/constant": [ + "../vchart/node_modules/@visactor/vrender-core/es/event/public-constant" + ], + "@visactor/vrender-core/*": ["../vchart/node_modules/@visactor/vrender-core/es/*"], + "@visactor/vrender-animate": ["../vchart/node_modules/@visactor/vrender-animate/es/index"], + "@visactor/vrender-animate/*": ["../vchart/node_modules/@visactor/vrender-animate/es/*"], + "@visactor/vrender-components": ["../vchart/node_modules/@visactor/vrender-components/es/index"], + "@visactor/vrender-components/*": ["../vchart/node_modules/@visactor/vrender-components/es/*"], + "@visactor/vrender-kits": ["../vchart/node_modules/@visactor/vrender-kits/es/index"], + "@visactor/vrender-kits/*": ["../vchart/node_modules/@visactor/vrender-kits/es/*"], + "@visactor/vutils-extension": ["../vutils-extension/src"], + "src/*": ["../vchart/src/*"] + } + }, + "references": [] +} diff --git a/packages/vchart-types/README.md b/packages/vchart-types/README.md index 44d685f6d9..773a14903e 100644 --- a/packages/vchart-types/README.md +++ b/packages/vchart-types/README.md @@ -5,6 +5,7 @@ Provide the pure TypeScript type declarations of [VChart](https://github.com/VisActor/VChart). ## Usage + You can refer to the following statement to import types as needed: ```typescript @@ -26,5 +27,11 @@ import type { xxx } from '@visactor/vchart-types/types/xxx'; Such as: ```typescript -import type { IBarSeriesSpec } from '@visactor/vchart-types/types/series/bar/interface' +import type { IBarSeriesSpec } from '@visactor/vchart-types/types/series/bar/interface'; ``` + +## 更新类型声明 + +在 `packages/vchart` 目录执行 `npm run build:types`，从当前源码重新生成此包的 `types` 目录。该命令先清空旧输出，并关闭此次声明构建的增量缓存，保证源码删除后不残留旧声明，连续构建也能完整生成类型文件。 + +`sequence` 图表及 `dot`、`link` 系列已迁至 `@visactor/vchart-extension`。对应的 `ISequenceChartSpec`、`IDotSeriesSpec`、`ILinkSeriesSpec` 等类型请从扩展包导入。 diff --git a/packages/vchart-types/types/animation/animate-manager.d.ts b/packages/vchart-types/types/animation/animate-manager.d.ts deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/packages/vchart-types/types/chart/bar/3d/bar-3d-transformer.d.ts b/packages/vchart-types/types/chart/bar/3d/bar-3d-transformer.d.ts deleted file mode 100644 index c2673e7339..0000000000 --- a/packages/vchart-types/types/chart/bar/3d/bar-3d-transformer.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { AdaptiveSpec } from '../../../typings'; -import type { IBar3dChartSpec } from '../interface'; -import { BarChartSpecTransformer } from '../bar-transformer'; -export declare class Bar3dChartSpecTransformer extends BarChartSpecTransformer> { - protected _getDefaultSeriesSpec(spec: AdaptiveSpec): any; -} diff --git a/packages/vchart-types/types/chart/bar/3d/bar-3d.d.ts b/packages/vchart-types/types/chart/bar/3d/bar-3d.d.ts deleted file mode 100644 index a2471e1ca3..0000000000 --- a/packages/vchart-types/types/chart/bar/3d/bar-3d.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { IBar3dChartSpec } from '../interface'; -import { BarChart } from '../bar'; -import type { AdaptiveSpec } from '../../../typings'; -import { Bar3dChartSpecTransformer } from './bar-3d-transformer'; -export declare class Bar3dChart extends BarChart> { - static readonly type: string; - static readonly seriesType: string; - static readonly transformerConstructor: typeof Bar3dChartSpecTransformer; - readonly transformerConstructor: typeof Bar3dChartSpecTransformer; - readonly type: string; - readonly seriesType: string; -} -export declare const registerBar3dChart: () => void; diff --git a/packages/vchart-types/types/chart/bar/3d/index.d.ts b/packages/vchart-types/types/chart/bar/3d/index.d.ts deleted file mode 100644 index cc6609a9c3..0000000000 --- a/packages/vchart-types/types/chart/bar/3d/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './bar-3d'; -export * from './bar-3d-transformer'; diff --git a/packages/vchart-types/types/chart/bar/bar-3d.d.ts b/packages/vchart-types/types/chart/bar/bar-3d.d.ts deleted file mode 100644 index e99226312a..0000000000 --- a/packages/vchart-types/types/chart/bar/bar-3d.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { BarChart } from './bar'; -export declare class Bar3dChart extends BarChart { - static readonly type: string; - static readonly view: string; - readonly type: string; - readonly seriesType: string; - protected _getDefaultSeriesSpec(spec: any): any; -} -export declare const registerBar3dChart: () => void; diff --git a/packages/vchart-types/types/chart/base-chart.d.ts b/packages/vchart-types/types/chart/base-chart.d.ts deleted file mode 100644 index ffb6d574da..0000000000 --- a/packages/vchart-types/types/chart/base-chart.d.ts +++ /dev/null @@ -1,148 +0,0 @@ -import { ChartData } from './chart-meta/data'; -import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues, ILayoutRect, ILayoutOrientPadding } from '../typings'; -import type { ILayoutItem, LayoutCallBack } from '../layout/interface'; -import type { ILayoutModelState, IModel, IModelOption, IUpdateSpecResult } from '../model/interface'; -import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption } from './interface'; -import type { ISeries } from '../series/interface'; -import type { IRegion } from '../region/interface'; -import type { IComponent } from '../component/interface'; -import { type IMark } from '../mark/interface'; -import type { IEvent } from '../event/interface'; -import type { DataView } from '@visactor/vdataset'; -import type { DataSet } from '@visactor/vdataset/es/data-set'; -import { Stack } from './stack'; -import type { IParserOptions } from '@visactor/vdataset/es/parser'; -import type { IBoundsLike } from '@visactor/vutils'; -import type { IRunningConfig as IMorphConfig, IView } from '@visactor/vgrammar-core'; -import { CompilableBase } from '../compile/compilable-base'; -import type { IGlobalScale } from '../scale/interface'; -import type { IRectMark } from '../mark/rect'; -export declare class BaseChart extends CompilableBase implements IChart { - readonly type: string; - readonly id: number; - protected _spec: any; - getSpec(): any; - setSpec(s: any): void; - getOption(): IChartOption; - protected _regions: IRegion[]; - protected _series: ISeries[]; - protected _components: IComponent[]; - protected _layoutFunc: LayoutCallBack; - protected _layoutRect: IRect; - getLayoutRect(): IRect; - protected _viewRect: ILayoutRect; - getViewRect(): ILayoutRect; - protected _viewBox: IBoundsLike; - protected _layoutTag: boolean; - getLayoutTag(): boolean; - setLayoutTag(tag: boolean, morphConfig?: IMorphConfig, reLayout?: boolean): boolean; - protected _modelOption: IModelOption; - protected _globalScale: IGlobalScale; - protected _idMap: Map; - protected _event: IEvent; - getEvent(): IEvent; - protected _dataSet: DataSet; - protected _chartData: ChartData; - get chartData(): ChartData; - protected _option: IChartOption; - readonly state: ILayoutModelState; - protected _stack: Stack; - protected _canStack: boolean; - padding: IPadding; - protected _paddingSpec: ILayoutOrientPadding; - protected _canvasRect: ILayoutRect; - protected _backgroundMark: IRectMark; - constructor(spec: any, option: IChartOption); - created(): void; - transformSpec(spec: any): void; - init(): void; - reDataFlow(): void; - onResize(width: number, height: number): void; - updateViewBox(viewBox: IBoundsLike, reLayout: boolean): void; - private _createBackground; - private _createRegion; - protected _createSeries(seriesSpec: ISeriesSpec[]): void; - getAllSeries: () => ISeries[]; - getSeriesById(id: number): ISeries | undefined; - private _createComponent; - private _createComponents; - getAllComponents(): IComponent[]; - getAllModels(): IModel[]; - getModelInFilter(filter: string | { - type: string; - index: number; - } | ((model: IModel) => boolean)): IModel; - private _createLayout; - setLayout(layout: LayoutCallBack): void; - private _initLayoutFunc; - layout(params: ILayoutParams): void; - onLayoutStart(option: IChartLayoutOption): void; - onLayoutEnd(option: IChartLayoutOption): void; - onEvaluateEnd(option: IChartEvaluateOption): void; - getLayoutElements(): ILayoutItem[]; - getRegionsInIndex: (index?: number[]) => IRegion[]; - getAllRegions: () => IRegion[]; - getRegionsInIds: (ids: number[]) => IRegion[]; - getRegionsInQuerier: (region?: MaybeArray) => IRegion[]; - getRegionsInUserId: (userId: StringOrNumber) => IRegion | undefined; - getRegionsInUserIdOrIndex: (user_ids?: StringOrNumber[], index?: number[]) => IRegion[]; - getComponents: () => IComponent[]; - getSeriesInIndex: (index?: number[]) => ISeries[]; - getSeriesInIds: (ids?: number[]) => ISeries[]; - getSeriesInUserId: (userId: StringOrNumber) => ISeries | undefined; - getSeriesInUserIdOrIndex: (user_ids?: StringOrNumber[], index?: number[]) => ISeries[]; - getComponentByIndex: (key: string, index: number) => IComponent; - getComponentsByKey: (key: string) => IComponent[]; - getComponentByUserId: (userId: StringOrNumber) => IComponent; - getModelById(id: number): IModel | undefined; - getModelByUserId(userId: StringOrNumber): IModel | undefined; - getAllMarks(): IMark[]; - getMarkById(id: number): IMark | undefined; - updateData(id: StringOrNumber, data: unknown, updateGlobalScale?: boolean, options?: IParserOptions): void; - updateFullData(data: IDataValues | IDataValues[], updateGlobalScale?: boolean): void; - onRender(option: IChartRenderOption): void; - setCanvasRect(width: number, height: number): void; - getCanvasRect(): Omit; - getSeriesData(id: StringOrNumber | undefined, index: number | undefined): DataView | undefined; - private _transformSpecScale; - private _createGlobalScale; - updateGlobalScaleDomain(): void; - updateGlobalScale(result: IUpdateSpecResult): void; - updateGlobalScaleTheme(): void; - updateSpec(spec: any): { - change: boolean; - reMake: boolean; - reRender: boolean; - reSize: boolean; - reCompile: boolean; - }; - updateChartConfig(result: IUpdateSpecResult, oldSpec: IChartSpec): void; - updateDataSpec(result: IUpdateSpecResult): void; - updateRegionSpec(result: IUpdateSpecResult): void; - updateComponentSpec(result: IUpdateSpecResult): void; - updateSeriesSpec(result: IUpdateSpecResult): void; - getCanvas(): HTMLCanvasElement; - protected isValidSeries(seriesType: string): boolean; - protected _getDefaultSeriesSpec(spec: any): any; - private _updateLayoutRect; - setCurrentTheme(): void; - clear(): void; - compile(): void; - afterCompile(): void; - compileLayout(): void; - compileBackground(): void; - compileRegions(): void; - compileSeries(): void; - compileComponents(): void; - release(): void; - onLayout(srView: IView): void; - updateState(state: Record, 'style'>>, filter?: (series: ISeries, mark: IMark, stateKey: string) => boolean): void; - setSelected(datum: MaybeArray | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void; - setHovered(datum: MaybeArray | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void; - private _initEvent; - protected _enableMarkAnimation(states: string | string[]): void; - protected _disableMarkAnimation(states: string | string[]): void; - protected _setStateInDatum(stateKey: string, checkReverse: boolean, datum: MaybeArray | null, filter?: (series: ISeries, mark: IMark) => boolean, region?: IRegionQuerier): void; - setDimensionIndex(value: StringOrNumber, opt: DimensionIndexOption): void; - getColorScheme(): import("..").IThemeColorScheme; -} diff --git a/packages/vchart-types/types/chart/cartesian/cartesian.d.ts b/packages/vchart-types/types/chart/cartesian/cartesian.d.ts deleted file mode 100644 index b2adfccd95..0000000000 --- a/packages/vchart-types/types/chart/cartesian/cartesian.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { BaseChart } from '../base-chart'; -export declare class CartesianChart extends BaseChart { - readonly seriesType: string; - protected isValidSeries(type: string): boolean; - protected needAxes(): boolean; - protected _getDefaultSeriesSpec(spec: any): any; - transformSpec(spec: any): void; -} diff --git a/packages/vchart-types/types/chart/common/interface.d.ts b/packages/vchart-types/types/chart/common/interface.d.ts index 1e3785224b..d319b98545 100644 --- a/packages/vchart-types/types/chart/common/interface.d.ts +++ b/packages/vchart-types/types/chart/common/interface.d.ts @@ -4,10 +4,8 @@ import type { IChartSpec } from '../../typings/spec/common'; import type { IBarSeriesSpec } from '../../series/bar/interface'; import type { IRangeColumnChartSpec } from '../range-column/interface'; import type { IRangeAreaChartSpec } from '../range-area/interface'; -import type { IDotSeriesSpec } from '../../series/dot/interface'; import type { IMapSeriesSpec } from '../../series/map/interface'; import type { IPieSeriesSpec } from '../../series/pie/interface'; -import type { ILinkSeriesSpec } from '../../series/link/interface'; import type { IRadarSeriesSpec } from '../../series/radar/interface'; import type { IRoseSeriesSpec } from '../../series/rose/interface'; import type { IScatterSeriesSpec } from '../../series/scatter/interface'; @@ -33,7 +31,7 @@ import type { IMarkPointSpec } from '../../component/marker/mark-point/interface export interface ICommonChartSpec extends Omit { type: 'common'; seriesField?: string; - series?: (IAreaSeriesSpec | ILineSeriesSpec | IBarSeriesSpec | IRangeColumnChartSpec | IRangeAreaChartSpec | IDotSeriesSpec | IMapSeriesSpec | IPieSeriesSpec | ILinkSeriesSpec | IRadarSeriesSpec | IRoseSeriesSpec | IScatterSeriesSpec | ICircularProgressSeriesSpec | ILinearProgressSeriesSpec | IWordCloudSeriesSpec | IFunnelSeriesSpec | IBoxPlotSeriesSpec | IGaugeSeriesSpec | ISankeySeriesSpec | ITreemapSeriesSpec | ISunburstSeriesSpec | ICirclePackingSeriesSpec | IWaterfallSeriesSpec | IHeatmapSeriesSpec | IGaugePointerSeriesSpec | ICorrelationSeriesSpec)[]; + series?: (IAreaSeriesSpec | ILineSeriesSpec | IBarSeriesSpec | IRangeColumnChartSpec | IRangeAreaChartSpec | IMapSeriesSpec | IPieSeriesSpec | IRadarSeriesSpec | IRoseSeriesSpec | IScatterSeriesSpec | ICircularProgressSeriesSpec | ILinearProgressSeriesSpec | IWordCloudSeriesSpec | IFunnelSeriesSpec | IBoxPlotSeriesSpec | IGaugeSeriesSpec | ISankeySeriesSpec | ITreemapSeriesSpec | ISunburstSeriesSpec | ICirclePackingSeriesSpec | IWaterfallSeriesSpec | IHeatmapSeriesSpec | IGaugePointerSeriesSpec | ICorrelationSeriesSpec)[]; axes?: ICartesianAxisSpec[] | IPolarAxisSpec[]; crosshair?: ICartesianCrosshairSpec | ICartesianCrosshairSpec[] | IPolarCrosshairSpec | IPolarCrosshairSpec[]; markLine?: IMarkLineSpec | IMarkLineSpec[]; diff --git a/packages/vchart-types/types/chart/funnel/3d/funnel-3d.d.ts b/packages/vchart-types/types/chart/funnel/3d/funnel-3d.d.ts deleted file mode 100644 index e27225ee98..0000000000 --- a/packages/vchart-types/types/chart/funnel/3d/funnel-3d.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { IFunnel3dChartSpec } from '../interface'; -import type { AdaptiveSpec } from '../../../typings'; -import { FunnelChartSpecTransformer } from '../funnel-transformer'; -import { BaseChart } from '../../base'; -export declare class Funnel3dChart extends BaseChart> { - static readonly type: string; - static readonly seriesType: string; - static readonly transformerConstructor: typeof FunnelChartSpecTransformer; - readonly transformerConstructor: typeof FunnelChartSpecTransformer; - readonly type: string; - readonly seriesType: string; -} -export declare const registerFunnel3dChart: () => void; diff --git a/packages/vchart-types/types/chart/funnel/3d/index.d.ts b/packages/vchart-types/types/chart/funnel/3d/index.d.ts deleted file mode 100644 index fc5665ec69..0000000000 --- a/packages/vchart-types/types/chart/funnel/3d/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './funnel-3d'; diff --git a/packages/vchart-types/types/chart/funnel/base.d.ts b/packages/vchart-types/types/chart/funnel/base.d.ts deleted file mode 100644 index 78508153bb..0000000000 --- a/packages/vchart-types/types/chart/funnel/base.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { IFunnelSeriesSpec } from '../../series/funnel/interface'; -import type { IFunnelChartSpec } from './interface'; -import { BaseChart } from '../base-chart'; -export declare class BaseFunnelChart extends BaseChart { - seriesType: string; - protected needAxes(): boolean; - protected _getDefaultSeriesSpec(spec: IFunnelChartSpec): IFunnelSeriesSpec; - transformSpec(spec: IFunnelChartSpec): void; -} diff --git a/packages/vchart-types/types/chart/funnel/funnel-3d.d.ts b/packages/vchart-types/types/chart/funnel/funnel-3d.d.ts deleted file mode 100644 index 0b71b947c4..0000000000 --- a/packages/vchart-types/types/chart/funnel/funnel-3d.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { BaseFunnelChart } from './base'; -export declare class Funnel3dChart extends BaseFunnelChart { - static readonly type: string; - static readonly view: string; - readonly type: string; - readonly seriesType: string; -} -export declare const registerFunnel3dChart: () => void; diff --git a/packages/vchart-types/types/chart/histogram/3d/histogram-3d.d.ts b/packages/vchart-types/types/chart/histogram/3d/histogram-3d.d.ts deleted file mode 100644 index 6fcf4dc758..0000000000 --- a/packages/vchart-types/types/chart/histogram/3d/histogram-3d.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { BaseHistogramChart } from '../base/base'; -import type { IHistogram3dChartSpec } from '../interface'; -import type { AdaptiveSpec } from '../../../typings'; -import { HistogramChartSpecTransformer } from '../histogram-transformer'; -export declare class Histogram3dChart extends BaseHistogramChart> { - static readonly type: string; - static readonly seriesType: string; - static readonly transformerConstructor: typeof HistogramChartSpecTransformer; - readonly transformerConstructor: typeof HistogramChartSpecTransformer; - readonly type: string; - readonly seriesType: string; -} -export declare const registerHistogram3dChart: () => void; diff --git a/packages/vchart-types/types/chart/histogram/3d/index.d.ts b/packages/vchart-types/types/chart/histogram/3d/index.d.ts deleted file mode 100644 index 253b3de4c0..0000000000 --- a/packages/vchart-types/types/chart/histogram/3d/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './histogram-3d'; diff --git a/packages/vchart-types/types/chart/histogram/base.d.ts b/packages/vchart-types/types/chart/histogram/base.d.ts deleted file mode 100644 index 0c5f07a526..0000000000 --- a/packages/vchart-types/types/chart/histogram/base.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { CartesianChart } from '../cartesian/cartesian'; -export declare class BaseHistogramChart extends CartesianChart { - protected _canStack: boolean; - transformSpec(spec: any): void; - protected _getDefaultSeriesSpec(spec: any): any; -} diff --git a/packages/vchart-types/types/chart/histogram/histogram-3d.d.ts b/packages/vchart-types/types/chart/histogram/histogram-3d.d.ts deleted file mode 100644 index cd2ae00c9a..0000000000 --- a/packages/vchart-types/types/chart/histogram/histogram-3d.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { BaseHistogramChart } from './base'; -export declare class Histogram3dChart extends BaseHistogramChart { - static readonly type: string; - static readonly view: string; - readonly type: string; - readonly seriesType: string; -} -export declare const registerHistogram3dChart: () => void; diff --git a/packages/vchart-types/types/chart/index.d.ts b/packages/vchart-types/types/chart/index.d.ts index 9493fbd6de..c7c8def817 100644 --- a/packages/vchart-types/types/chart/index.d.ts +++ b/packages/vchart-types/types/chart/index.d.ts @@ -38,8 +38,6 @@ import type { ISankeyChartSpec } from './sankey'; import { SankeyChart, registerSankeyChart } from './sankey'; import type { IScatterChartSpec } from './scatter'; import { ScatterChart, registerScatterChart } from './scatter'; -import type { ISequenceChartSpec } from './sequence'; -import { SequenceChart, registerSequenceChart } from './sequence'; import type { ISunburstChartSpec } from './sunburst'; import { SunburstChart, registerSunburstChart } from './sunburst'; import type { ITreemapChartSpec } from './treemap'; @@ -63,7 +61,7 @@ import type { IChart } from './interface/chart'; import { BaseWordCloudChart } from './word-cloud/base/base'; import { BaseWordCloudChartSpecTransformer } from './word-cloud/base/word-cloud-base-transformer'; import { BaseHistogramChart } from './histogram/base/base'; -export { AreaChart, BarChart, BarChartSpecTransformer, BoxPlotChart, CirclePackingChart, CommonChart, FunnelChartSpecTransformer, FunnelChart, GaugeChart, HeatmapChart, HistogramChartSpecTransformer, BaseHistogramChart, HistogramChart, LineChart, MapChart, BasePieChartSpecTransformer, BasePieChart, PieChart, CircularProgressChart, LinearProgressChart, RadarChart, RangeColumnChart, RangeAreaChart, RoseChart, SankeyChart, ScatterChart, SunburstChart, SequenceChart, WaterfallChart, CorrelationChart, LiquidChart, BaseWordCloudChartSpecTransformer, BaseWordCloudChart, WordCloudChart, TreemapChart, VennChart, BaseChart, MosaicChart }; -export { registerLineChart, registerAreaChart, registerBarChart, registerBoxplotChart, registerCirclePackingChart, registerCircularProgressChart, registerCommonChart, registerFunnelChart, registerGaugeChart, registerHeatmapChart, registerHistogramChart, registerLinearProgressChart, registerMapChart, registerPieChart, registerRadarChart, registerRangeAreaChart, registerRangeColumnChart, registerRoseChart, registerSankeyChart, registerScatterChart, registerSequenceChart, registerSunburstChart, registerTreemapChart, registerWaterfallChart, registerWordCloudChart, registerCorrelationChart, registerLiquidChart, registerWordCloudShapeChart, registerVennChart, registerMosaicChart }; -export type { IChart, IAreaChartSpec, IBarChartSpec, IBoxPlotChartSpec, ICirclePackingChartSpec, ICommonChartSpec, IFunnelChartSpec, IGaugeChartSpec, IHeatmapChartSpec, IHistogramChartSpec, ILineChartSpec, IMapChartSpec, IPieChartSpec, ICircularProgressChartSpec, ILinearProgressChartSpec, IRadarChartSpec, IRangeColumnChartSpec, IRangeAreaChartSpec, IRoseChartSpec, IScatterChartSpec, ISankeyChartSpec, ISequenceChartSpec, ISunburstChartSpec, ITreemapChartSpec, IWaterfallChartSpec, ICorrelationChartSpec, ILiquidChartSpec, IWordCloudChartSpec, IPolarChartSpec, ICartesianChartSpec, IVennChartSpec, IMosaicChartSpec }; +export { AreaChart, BarChart, BarChartSpecTransformer, BoxPlotChart, CirclePackingChart, CommonChart, FunnelChartSpecTransformer, FunnelChart, GaugeChart, HeatmapChart, HistogramChartSpecTransformer, BaseHistogramChart, HistogramChart, LineChart, MapChart, BasePieChartSpecTransformer, BasePieChart, PieChart, CircularProgressChart, LinearProgressChart, RadarChart, RangeColumnChart, RangeAreaChart, RoseChart, SankeyChart, ScatterChart, SunburstChart, WaterfallChart, CorrelationChart, LiquidChart, BaseWordCloudChartSpecTransformer, BaseWordCloudChart, WordCloudChart, TreemapChart, VennChart, BaseChart, MosaicChart }; +export { registerLineChart, registerAreaChart, registerBarChart, registerBoxplotChart, registerCirclePackingChart, registerCircularProgressChart, registerCommonChart, registerFunnelChart, registerGaugeChart, registerHeatmapChart, registerHistogramChart, registerLinearProgressChart, registerMapChart, registerPieChart, registerRadarChart, registerRangeAreaChart, registerRangeColumnChart, registerRoseChart, registerSankeyChart, registerScatterChart, registerSunburstChart, registerTreemapChart, registerWaterfallChart, registerWordCloudChart, registerCorrelationChart, registerLiquidChart, registerWordCloudShapeChart, registerVennChart, registerMosaicChart }; +export type { IChart, IAreaChartSpec, IBarChartSpec, IBoxPlotChartSpec, ICirclePackingChartSpec, ICommonChartSpec, IFunnelChartSpec, IGaugeChartSpec, IHeatmapChartSpec, IHistogramChartSpec, ILineChartSpec, IMapChartSpec, IPieChartSpec, ICircularProgressChartSpec, ILinearProgressChartSpec, IRadarChartSpec, IRangeColumnChartSpec, IRangeAreaChartSpec, IRoseChartSpec, IScatterChartSpec, ISankeyChartSpec, ISunburstChartSpec, ITreemapChartSpec, IWaterfallChartSpec, ICorrelationChartSpec, ILiquidChartSpec, IWordCloudChartSpec, IPolarChartSpec, ICartesianChartSpec, IVennChartSpec, IMosaicChartSpec }; export { setDefaultCrosshairForCartesianChart } from './util'; diff --git a/packages/vchart-types/types/chart/interface/type.d.ts b/packages/vchart-types/types/chart/interface/type.d.ts index 7d71a5c5d5..7a0827551a 100644 --- a/packages/vchart-types/types/chart/interface/type.d.ts +++ b/packages/vchart-types/types/chart/interface/type.d.ts @@ -12,7 +12,6 @@ export declare const enum ChartTypeEnum { radar = "radar", rose = "rose", scatter = "scatter", - sequence = "sequence", circularProgress = "circularProgress", linearProgress = "linearProgress", wordCloud = "wordCloud", diff --git a/packages/vchart-types/types/chart/pictogram/index.d.ts b/packages/vchart-types/types/chart/pictogram/index.d.ts deleted file mode 100644 index eea3bd2c6d..0000000000 --- a/packages/vchart-types/types/chart/pictogram/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './pictogram'; -export * from './interface'; -export * from './pictogram-transformer'; diff --git a/packages/vchart-types/types/chart/pictogram/interface.d.ts b/packages/vchart-types/types/chart/pictogram/interface.d.ts deleted file mode 100644 index ce3f1a0aa9..0000000000 --- a/packages/vchart-types/types/chart/pictogram/interface.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { IPictogramSeriesSpec } from '../../series/pictogram/interface'; -import type { IChartExtendsSeriesSpec, IChartSpec } from '../../typings/spec/common'; -export interface IPictogramChartSpec extends IChartSpec, IChartExtendsSeriesSpec { - type: 'pictogram'; - series?: IPictogramSeriesSpec[]; -} diff --git a/packages/vchart-types/types/chart/pictogram/pictogram-transformer.d.ts b/packages/vchart-types/types/chart/pictogram/pictogram-transformer.d.ts deleted file mode 100644 index 54133c6429..0000000000 --- a/packages/vchart-types/types/chart/pictogram/pictogram-transformer.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { IPictogramSeriesSpec } from '../../series/pictogram/interface'; -import { BaseChartSpecTransformer } from '../base'; -import type { IPictogramChartSpec } from './interface'; -export declare class PictogramChartSpecTransformer extends BaseChartSpecTransformer { - protected _isValidSeries(type: string): boolean; - protected _getDefaultSeriesSpec(spec: IPictogramChartSpec): IPictogramSeriesSpec; - transformSpec(spec: T): void; -} diff --git a/packages/vchart-types/types/chart/pictogram/pictogram.d.ts b/packages/vchart-types/types/chart/pictogram/pictogram.d.ts deleted file mode 100644 index 7b6e75a577..0000000000 --- a/packages/vchart-types/types/chart/pictogram/pictogram.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import { BaseChart } from '../base/base-chart'; -import type { IPictogramChartSpec } from './interface'; -import { PictogramChartSpecTransformer } from './pictogram-transformer'; -export declare class PictogramChart extends BaseChart { - static readonly type: string; - static readonly seriesType: string; - static readonly transformerConstructor: typeof PictogramChartSpecTransformer; - readonly transformerConstructor: typeof PictogramChartSpecTransformer; - readonly type: string; - readonly seriesType: string; -} -export declare const registerPictogramChart: () => void; diff --git a/packages/vchart-types/types/chart/pie/3d/index.d.ts b/packages/vchart-types/types/chart/pie/3d/index.d.ts deleted file mode 100644 index d3715d89e7..0000000000 --- a/packages/vchart-types/types/chart/pie/3d/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './pie-3d'; diff --git a/packages/vchart-types/types/chart/pie/3d/pie-3d.d.ts b/packages/vchart-types/types/chart/pie/3d/pie-3d.d.ts deleted file mode 100644 index 785913346c..0000000000 --- a/packages/vchart-types/types/chart/pie/3d/pie-3d.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { BasePieChart } from '../base/base'; -import type { IPie3dChartSpec } from '../interface'; -import type { AdaptiveSpec } from '../../../typings'; -import { BasePieChartSpecTransformer } from '../base'; -export declare class Pie3dChartSpecTransformer extends BasePieChartSpecTransformer> { - transformSpec(spec: any): void; -} -export declare class Pie3dChart extends BasePieChart> { - static readonly type: string; - static readonly seriesType: string; - static readonly transformerConstructor: typeof Pie3dChartSpecTransformer; - readonly transformerConstructor: typeof Pie3dChartSpecTransformer; - readonly type: string; - readonly seriesType: string; -} -export declare const registerPie3dChart: () => void; diff --git a/packages/vchart-types/types/chart/pie/base.d.ts b/packages/vchart-types/types/chart/pie/base.d.ts deleted file mode 100644 index ecba00581a..0000000000 --- a/packages/vchart-types/types/chart/pie/base.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { PolarChart } from '../polar/polar'; -export declare class BasePieChart extends PolarChart { - protected needAxes(): boolean; - protected _getDefaultSeriesSpec(spec: any): any; -} diff --git a/packages/vchart-types/types/chart/pie/pie-3d.d.ts b/packages/vchart-types/types/chart/pie/pie-3d.d.ts deleted file mode 100644 index 74f7730d89..0000000000 --- a/packages/vchart-types/types/chart/pie/pie-3d.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { BasePieChart } from './base'; -export declare class Pie3dChart extends BasePieChart { - static readonly type: string; - static readonly view: string; - readonly type: string; - readonly seriesType: string; - transformSpec(spec: any): void; -} -export declare const registerPie3dChart: () => void; diff --git a/packages/vchart-types/types/chart/polar/polar.d.ts b/packages/vchart-types/types/chart/polar/polar.d.ts deleted file mode 100644 index 3da967089a..0000000000 --- a/packages/vchart-types/types/chart/polar/polar.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { IIndicatorSpec } from '../../component/indicator/interface'; -import { BaseChart } from '../base-chart'; -export declare class PolarChart extends BaseChart { - readonly seriesType: string; - protected isValidSeries(type: string): boolean; - protected _getDefaultSeriesSpec(spec: any): any; - protected getIndicatorSpec(spec: any): IIndicatorSpec[]; - transformSpec(spec: any): void; -} diff --git a/packages/vchart-types/types/chart/polar/progress-like.d.ts b/packages/vchart-types/types/chart/polar/progress-like.d.ts deleted file mode 100644 index 7a6cc2a612..0000000000 --- a/packages/vchart-types/types/chart/polar/progress-like.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { IPolarAxisSpec } from '../../component/axis/polar/interface'; -import { PolarChart } from './polar'; -export declare class ProgressLikeChart extends PolarChart { - protected needAxes(): boolean; - protected _getDefaultSeriesSpec(spec: any): any; - protected _transformProgressAxisSpec(spec: any, angleAxisDefaultSpec: IPolarAxisSpec, radiusAxisDefaultSpec: IPolarAxisSpec, angleAxisAppendSpec?: Partial, radiusAxisAppendSpec?: Partial): void; -} diff --git a/packages/vchart-types/types/chart/polar/rose-like.d.ts b/packages/vchart-types/types/chart/polar/rose-like.d.ts deleted file mode 100644 index 595144285f..0000000000 --- a/packages/vchart-types/types/chart/polar/rose-like.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { PolarChart } from './polar'; -export declare class RoseLikeChart extends PolarChart { - protected _canStack: boolean; - protected needAxes(): boolean; - protected _getDefaultSeriesSpec(spec: any): any; - transformSpec(spec: any): void; -} diff --git a/packages/vchart-types/types/chart/range-column/3d/index.d.ts b/packages/vchart-types/types/chart/range-column/3d/index.d.ts deleted file mode 100644 index 63db50702f..0000000000 --- a/packages/vchart-types/types/chart/range-column/3d/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './range-column-3d'; -export * from './range-column-3d-transformer'; diff --git a/packages/vchart-types/types/chart/range-column/3d/range-column-3d-transformer.d.ts b/packages/vchart-types/types/chart/range-column/3d/range-column-3d-transformer.d.ts deleted file mode 100644 index f6f30b3b36..0000000000 --- a/packages/vchart-types/types/chart/range-column/3d/range-column-3d-transformer.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { CartesianChartSpecTransformer } from '../../cartesian'; -import type { IRangeColumn3dChartSpec } from '../interface'; -export declare class RangeColumn3dChartSpecTransformer extends CartesianChartSpecTransformer { - protected _getDefaultSeriesSpec(spec: any): any; -} diff --git a/packages/vchart-types/types/chart/range-column/3d/range-column-3d.d.ts b/packages/vchart-types/types/chart/range-column/3d/range-column-3d.d.ts deleted file mode 100644 index b53ca45504..0000000000 --- a/packages/vchart-types/types/chart/range-column/3d/range-column-3d.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { IRangeColumn3dChartSpec } from '../interface'; -import { RangeColumn3dChartSpecTransformer } from './range-column-3d-transformer'; -import { BaseChart } from '../../base'; -export declare class RangeColumn3dChart extends BaseChart { - static readonly type: string; - static readonly seriesType: string; - static readonly transformerConstructor: typeof RangeColumn3dChartSpecTransformer; - readonly transformerConstructor: typeof RangeColumn3dChartSpecTransformer; - readonly type: string; - readonly seriesType: string; -} -export declare const registerRangeColumn3dChart: () => void; diff --git a/packages/vchart-types/types/chart/range-column/range-column-3d.d.ts b/packages/vchart-types/types/chart/range-column/range-column-3d.d.ts deleted file mode 100644 index 627ceff062..0000000000 --- a/packages/vchart-types/types/chart/range-column/range-column-3d.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { CartesianChart } from '../cartesian/cartesian'; -export declare class RangeColumn3dChart extends CartesianChart { - static readonly type: string; - static readonly view: string; - readonly type: string; - readonly seriesType: string; - protected _getDefaultSeriesSpec(spec: any): any; -} -export declare const registerRangeColumn3dChart: () => void; diff --git a/packages/vchart-types/types/chart/sequence/index.d.ts b/packages/vchart-types/types/chart/sequence/index.d.ts deleted file mode 100644 index 16f0dacbab..0000000000 --- a/packages/vchart-types/types/chart/sequence/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './sequence'; -export * from './interface'; -export * from './sequence-transformer'; diff --git a/packages/vchart-types/types/chart/sequence/interface.d.ts b/packages/vchart-types/types/chart/sequence/interface.d.ts deleted file mode 100644 index 8a2742695f..0000000000 --- a/packages/vchart-types/types/chart/sequence/interface.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { IChartSpec, ISeriesSpec } from '../../typings/spec/common'; -import type { ICartesianAxisSpec } from '../../component/axis/cartesian/interface'; -import type { IDataZoomSpec } from '../../component/data-zoom/data-zoom/interface'; -import type { IScrollBarSpec } from '../../component/data-zoom/scroll-bar/interface'; -import type { ICartesianCrosshairSpec } from '../../component/crosshair/interface'; -import type { ILayoutSpec } from '../../layout/interface'; -import type { RegionSpec } from '../../region/interface'; -import type { IPadding } from '../../typings'; -export interface ISequenceChartSpec extends IChartSpec { - type: 'sequence'; - appendPadding?: IPadding; - axes?: ICartesianAxisSpec[]; - dataZooms?: IDataZoomSpec[]; - scrollBars?: IScrollBarSpec[]; - crosshair?: ICartesianCrosshairSpec | ICartesianCrosshairSpec[]; - layout?: ILayoutSpec; - region?: RegionSpec[]; -} -export interface ISequenceSeriesSpec extends ISeriesSpec { - height?: number; - padding?: number; - dataDot?: any; - dotSeriesIndex?: number; - dotSeriesSpec?: ISeriesSpec; -} diff --git a/packages/vchart-types/types/chart/sequence/sequence-transformer.d.ts b/packages/vchart-types/types/chart/sequence/sequence-transformer.d.ts deleted file mode 100644 index 7bbba21efc..0000000000 --- a/packages/vchart-types/types/chart/sequence/sequence-transformer.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import { BaseChartSpecTransformer } from '../base'; -import type { ISequenceChartSpec } from './interface'; -import type { RegionSpec } from '../../typings'; -export declare class SequenceChartSpecTransformer extends BaseChartSpecTransformer { - private _getSeriesDataLength; - addAttrToComponentSpec(componentSpec: any, attr: string, value: any): any; - addPaddingRow(rowHeight: any[], rowNum: number, size: number): void; - addOrientAxes(region: RegionSpec[], elements: any[], rowNum: number, spec: T): void; - transformSpec(spec: T): void; -} diff --git a/packages/vchart-types/types/chart/sequence/sequence.d.ts b/packages/vchart-types/types/chart/sequence/sequence.d.ts deleted file mode 100644 index 9e04d0b05c..0000000000 --- a/packages/vchart-types/types/chart/sequence/sequence.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import { BaseChart } from '../base/base-chart'; -import type { ISequenceChartSpec } from './interface'; -import type { ISeriesConstructor } from '../../series/interface'; -import type { IModelSpecInfo } from '../../model/interface'; -import { SequenceChartSpecTransformer } from './sequence-transformer'; -export declare class SequenceChart extends BaseChart { - static readonly type: string; - static readonly transformerConstructor: typeof SequenceChartSpecTransformer; - readonly transformerConstructor: typeof SequenceChartSpecTransformer; - readonly type: string; - protected _createSeries(constructor: ISeriesConstructor, specInfo: IModelSpecInfo): void; -} -export declare const registerSequenceChart: () => void; diff --git a/packages/vchart-types/types/chart/word-cloud/3d/index.d.ts b/packages/vchart-types/types/chart/word-cloud/3d/index.d.ts deleted file mode 100644 index a9b00035e1..0000000000 --- a/packages/vchart-types/types/chart/word-cloud/3d/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './word-cloud-3d'; -export * from './word-cloud-3d-transformer'; diff --git a/packages/vchart-types/types/chart/word-cloud/3d/word-cloud-3d-transformer.d.ts b/packages/vchart-types/types/chart/word-cloud/3d/word-cloud-3d-transformer.d.ts deleted file mode 100644 index 6640d45c61..0000000000 --- a/packages/vchart-types/types/chart/word-cloud/3d/word-cloud-3d-transformer.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { AdaptiveSpec } from '../../../typings'; -import { BaseWordCloudChartSpecTransformer } from '../base/word-cloud-base-transformer'; -import type { IWordCloud3dChartSpec } from '../interface'; -export declare class WordCloud3dChartSpecTransformer extends BaseWordCloudChartSpecTransformer> { - protected _getDefaultSeriesSpec(spec: IWordCloud3dChartSpec): any; -} diff --git a/packages/vchart-types/types/chart/word-cloud/3d/word-cloud-3d.d.ts b/packages/vchart-types/types/chart/word-cloud/3d/word-cloud-3d.d.ts deleted file mode 100644 index 4158a999fa..0000000000 --- a/packages/vchart-types/types/chart/word-cloud/3d/word-cloud-3d.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -import type { IWordCloud3dChartSpec } from '../interface'; -import { BaseWordCloudChart } from '../base/base'; -import type { AdaptiveSpec } from '../../../typings'; -import { WordCloud3dChartSpecTransformer } from './word-cloud-3d-transformer'; -export declare class WordCloud3dChart extends BaseWordCloudChart> { - static readonly type: string; - static readonly seriesType: string; - static readonly transformerConstructor: typeof WordCloud3dChartSpecTransformer; - readonly transformerConstructor: typeof WordCloud3dChartSpecTransformer; - readonly type: string; - readonly seriesType: string; -} -export declare const registerWordCloud3dChart: () => void; -export declare const registerWordCloudShape3dChart: () => void; diff --git a/packages/vchart-types/types/chart/word-cloud/base.d.ts b/packages/vchart-types/types/chart/word-cloud/base.d.ts deleted file mode 100644 index 93a4da1e94..0000000000 --- a/packages/vchart-types/types/chart/word-cloud/base.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import { BaseChart } from '../base-chart'; -export declare class BaseWordCloudChart extends BaseChart { - readonly type: string; - readonly seriesType: string; - transformSpec(spec: any): void; -} diff --git a/packages/vchart-types/types/chart/word-cloud/word-cloud-3d.d.ts b/packages/vchart-types/types/chart/word-cloud/word-cloud-3d.d.ts deleted file mode 100644 index 57871aea32..0000000000 --- a/packages/vchart-types/types/chart/word-cloud/word-cloud-3d.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { IWordCloud3dChartSpec } from './interface'; -import { BaseWordCloudChart } from './base'; -export declare class WordCloud3dChart extends BaseWordCloudChart { - static readonly type: string; - static readonly view: string; - readonly type: string; - readonly seriesType: string; - protected _getDefaultSeriesSpec(spec: IWordCloud3dChartSpec): any; -} -export declare const registerWordCloud3dChart: () => void; -export declare const registerWordCloudShape3dChart: () => void; diff --git a/packages/vchart-types/types/chart/word-cloud/word-cloud-transformer.d.ts b/packages/vchart-types/types/chart/word-cloud/word-cloud-transformer.d.ts deleted file mode 100644 index 18a6d8a19a..0000000000 --- a/packages/vchart-types/types/chart/word-cloud/word-cloud-transformer.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { BaseWordCloudChartSpecTransformer } from './base'; -import type { IWordCloudChartSpec } from './interface'; -export declare class WordCloudChartSpecTransformer extends BaseWordCloudChartSpecTransformer { - protected _getDefaultSeriesSpec(spec: IWordCloudChartSpec): any; -} diff --git a/packages/vchart-types/types/compile/mark/compilable-mark.d.ts b/packages/vchart-types/types/compile/mark/compilable-mark.d.ts deleted file mode 100644 index f41f40269a..0000000000 --- a/packages/vchart-types/types/compile/mark/compilable-mark.d.ts +++ /dev/null @@ -1,88 +0,0 @@ -import type { IElement, IGroupMark, IMark, IMarkConfig, MarkAnimationSpec, MarkFunctionCallback, Nil, TransformSpec } from '@visactor/vgrammar-core'; -import type { DataView } from '@visactor/vdataset'; -import { GrammarItem } from '../grammar-item'; -import type { Maybe, Datum, StringOrNumber } from '../../typings'; -import type { IMarkStateStyle, MarkType } from '../../mark/interface'; -import type { IModel } from '../../model/interface'; -import { MarkStateManager } from './mark-state-manager'; -import type { ICompilableMark, IMarkDataInitOption, ICompilableMarkOption, StateValueType, IMarkCompileOption, IAttributeOpt, IMarkData } from './interface'; -import { GrammarType } from '../interface/compilable-item'; -import type { IEvent } from '../../event/interface'; -export declare abstract class CompilableMark extends GrammarItem implements ICompilableMark { - readonly grammarType = GrammarType.mark; - readonly type: MarkType; - readonly name: string; - readonly key: ICompilableMark['key']; - protected _markConfig: IMarkConfig; - getMarkConfig(): IMarkConfig; - setMarkConfig(config: IMarkConfig): void; - protected _visible: boolean; - getVisible(): boolean; - setVisible(visible: boolean): void; - protected _userId: StringOrNumber; - getUserId(): StringOrNumber; - setUserId(userId: StringOrNumber): void; - readonly model: IModel; - protected _data: IMarkData; - getDataView(): DataView | undefined; - setDataView(d?: DataView, productId?: string): void; - getData(): IMarkData; - setData(d?: IMarkData): void; - stateStyle: IMarkStateStyle; - state: MarkStateManager; - protected _unCompileChannel: { - [key in string]: boolean; - }; - hasState(state: string): boolean; - getState(state: string): unknown; - protected _event: IEvent; - protected _animationConfig: Partial; - getAnimationConfig(): Partial; - setAnimationConfig(config: Partial): void; - private _skipBeforeLayouted; - setSkipBeforeLayouted(skip: boolean): void; - getSkipBeforeLayouted(): boolean; - protected _groupKey?: string; - getGroupKey(): string; - setGroupKey(groupKey: string): void; - protected _stateSort?: (stateA: string, stateB: string) => number; - setStateSortCallback(stateSort: (stateA: string, stateB: string) => number): void; - protected _option: ICompilableMarkOption; - constructor(option: ICompilableMarkOption, name: string, model: IModel); - protected _product: Maybe; - getProduct: () => Maybe; - protected _transform: TransformSpec[] | Nil; - setTransform(transform: TransformSpec[] | Nil): void; - protected initMarkData(option: IMarkDataInitOption): void; - protected stateKeyToSignalName(key: string): string; - getAttribute(key: any, datum: any, state: StateValueType, opt?: IAttributeOpt): void; - protected _compileProduct(option?: IMarkCompileOption): void; - protected _initProduct(group?: string | IGroupMark): void; - generateProductId(): string; - compileData(): void; - updateStaticEncode(): void; - protected _separateStyle(): { - enterStyles: Record; - updateStyles: Record; - }; - compileEncode(): void; - compileState(): void; - compileAnimation(): void; - compileContext(extraContext?: any): void; - compileSignal(): void; - protected _computeAttribute(key: string, state: StateValueType): (datum: Datum, opt: IAttributeOpt) => any; - protected compileCommonAttributeCallback(key: string, state: string): MarkFunctionCallback; - protected compileTransform(): void; - protected _lookupGrammar(id: string): IMark; - updateState(newState: Record, noRender?: boolean): void; - updateLayoutState(noRender?: boolean, recursion?: boolean): void; - updateMarkState(key: string): void; - getMarks(): ICompilableMark[]; - runAnimationByState(state?: string): import("@visactor/vgrammar-core").IAnimateArranger; - stopAnimationByState(state?: string): import("@visactor/vgrammar-core").IAnimate; - pauseAnimationByState(state?: string): import("@visactor/vgrammar-core").IAnimate; - resumeAnimationByState(state?: string): import("@visactor/vgrammar-core").IAnimate; - getProductElements(): IElement[]; - clear(): void; - release(): void; -} diff --git a/packages/vchart-types/types/compile/mark/mark-data.d.ts b/packages/vchart-types/types/compile/mark/mark-data.d.ts deleted file mode 100644 index 2637c1c109..0000000000 --- a/packages/vchart-types/types/compile/mark/mark-data.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import { CompilableData } from '../data/compilable-data'; -import type { ICompilableMark, IMarkData, IMarkDataInitOption } from './interface'; -export declare class MarkData extends CompilableData implements IMarkData { - protected _mark: ICompilableMark; - constructor(option: IMarkDataInitOption); - setCompiledProductId(name: string): void; - generateProductId(): string; - protected _compileProduct(): void; -} diff --git a/packages/vchart-types/types/compile/signal/compilable-signal.d.ts b/packages/vchart-types/types/compile/signal/compilable-signal.d.ts deleted file mode 100644 index dcc57b0f1b..0000000000 --- a/packages/vchart-types/types/compile/signal/compilable-signal.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { ISignal, SignalFunctionType } from '@visactor/vgrammar-core'; -import { GrammarItem } from '../grammar-item'; -import type { Maybe } from '../../typings'; -import type { GrammarItemInitOption } from '../interface'; -import { GrammarType } from '../interface/compilable-item'; -import type { ICompilableSignal } from './interface'; -export declare class CompilableSignal extends GrammarItem implements ICompilableSignal { - readonly grammarType = GrammarType.signal; - protected _product: Maybe>; - getProduct: () => Maybe>; - readonly name: string; - protected _value: Maybe; - getValue(): T; - protected _updateFunc: Maybe>; - getUpdateFunc(): SignalFunctionType; - constructor(option: GrammarItemInitOption, name: string, value?: T, updateFunc?: SignalFunctionType); - updateSignal(value?: T, updateFunc?: SignalFunctionType): void; - protected _compileProduct(): void; - generateProductId(): string; - protected _lookupGrammar(id: string): ISignal; -} diff --git a/packages/vchart-types/types/compile/signal/index.d.ts b/packages/vchart-types/types/compile/signal/index.d.ts deleted file mode 100644 index 7da3caa09c..0000000000 --- a/packages/vchart-types/types/compile/signal/index.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export * from './compilable-signal'; -export * from './interface'; -export * from './signal-manager'; -export * from './state-manager'; diff --git a/packages/vchart-types/types/compile/signal/interface.d.ts b/packages/vchart-types/types/compile/signal/interface.d.ts deleted file mode 100644 index b64ab6339f..0000000000 --- a/packages/vchart-types/types/compile/signal/interface.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { SignalFunctionType } from '@visactor/vgrammar-core'; -import type { Maybe } from '../../typings'; -import type { IGrammarItem, ICompilableInitOption } from '../interface'; -export interface IStateManagerOption extends ICompilableInitOption { - stateKeyToSignalName?: (key: string) => string; -} -export type StateValueMap = Record; -export interface ICompilableSignal extends IGrammarItem { - updateSignal: (value?: T, updateFunc?: SignalFunctionType) => void; - getValue: () => Maybe; - getUpdateFunc: () => Maybe>; -} diff --git a/packages/vchart-types/types/compile/signal/signal-manager.d.ts b/packages/vchart-types/types/compile/signal/signal-manager.d.ts deleted file mode 100644 index 8aaba3cc1b..0000000000 --- a/packages/vchart-types/types/compile/signal/signal-manager.d.ts +++ /dev/null @@ -1,11 +0,0 @@ -import type { SignalFunctionType } from '@visactor/vgrammar-core'; -import { CompilableSignal } from './compilable-signal'; -import { CompilableBase } from '../compilable-base'; -export declare class SignalManager extends CompilableBase { - protected _signalMap: Record>; - getSignalMap(): Record>; - getSignal(name: string): CompilableSignal; - updateSignal(name: string, value: any, updateFunc?: SignalFunctionType): void; - compile(): void; - release(): void; -} diff --git a/packages/vchart-types/types/compile/signal/state-manager.d.ts b/packages/vchart-types/types/compile/signal/state-manager.d.ts deleted file mode 100644 index 0cf450cda8..0000000000 --- a/packages/vchart-types/types/compile/signal/state-manager.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { IStateManagerOption, StateValueMap } from './interface'; -import { SignalManager } from './signal-manager'; -export declare class StateManager extends SignalManager { - protected _stateMap: StateValueMap; - getStateMap(): StateValueMap; - protected _getDefaultStateMap(): StateValueMap; - protected stateKeyToSignalName: (key: string) => string; - constructor(option: IStateManagerOption); - initStateMap(state?: StateValueMap): void; - compile(stateMap?: StateValueMap): void; - updateState(newState: Partial, noRender?: boolean): void; -} diff --git a/packages/vchart-types/types/component/axis/cartesian/config.d.ts b/packages/vchart-types/types/component/axis/cartesian/config.d.ts deleted file mode 100644 index a330e112ba..0000000000 --- a/packages/vchart-types/types/component/axis/cartesian/config.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare const DEFAULT_BAND_INNER_PADDING = 0.1; -export declare const DEFAULT_BAND_OUTER_PADDING = 0.3; -export declare const DEFAULT_BAND_POSITION = 0.5; diff --git a/packages/vchart-types/types/component/axis/cartesian/linear-axis.d.ts b/packages/vchart-types/types/component/axis/cartesian/linear-axis.d.ts index f7ea45ca39..a2f06f1ccf 100644 --- a/packages/vchart-types/types/component/axis/cartesian/linear-axis.d.ts +++ b/packages/vchart-types/types/component/axis/cartesian/linear-axis.d.ts @@ -20,6 +20,7 @@ export declare class CartesianLinearAxis string; - timeUTCFormat: (specifier: string, timeText: StringOrNumber) => string; - timeParse: (specifier: string, timeText: string | string) => Date; -} diff --git a/packages/vchart-types/types/component/axis/interface.d.ts b/packages/vchart-types/types/component/axis/interface.d.ts deleted file mode 100644 index e33627a3c3..0000000000 --- a/packages/vchart-types/types/component/axis/interface.d.ts +++ /dev/null @@ -1,137 +0,0 @@ -import type { Datum, IPadding, IPolarOrientType, IRectMarkSpec, IRuleMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings'; -import type { ICartesianAxisSpec } from './cartesian/interface'; -import type { IComponent } from '../interface'; -import type { IBaseScale } from '@visactor/vscale'; -import type { IAnimationSpec } from '../../animation/spec'; -import type { AxisItem, AxisItemStateStyle } from '@visactor/vrender-components'; -import type { IComponentSpec } from '../base/interface'; -import type { ITextGraphicAttribute } from '@visactor/vrender-core'; -export interface StatisticsDomain { - domain: any[]; - index: { - [key in StringOrNumber]: number; - }; -} -export interface IAxis extends IComponent { - valueToPosition: (value: any) => number; - getScale: () => IBaseScale; - getScales: () => IBaseScale[]; - getOrient: () => ICartesianAxisSpec['orient'] | IPolarOrientType; - visible: boolean; - getStatisticsDomain: () => StatisticsDomain; -} -export interface IAxisItem { - visible?: boolean; - style?: Omit; -} -export interface IAxisItemTheme { - visible?: boolean; - style?: Omit; -} -export type AxisAnimationPreset = 'groupFadeIn' | 'fadeIn' | 'grow'; -export interface ICommonAxisSpec extends Omit, IAnimationSpec { - type?: AxisType; - visible?: boolean; - inverse?: boolean; - tick?: ITick; - subTick?: ISubTick; - animation?: boolean; - select?: boolean; - hover?: boolean; - sampling?: boolean; -} -export interface ILinearAxisSpec { - min?: number; - max?: number; - range?: { - min?: number; - max?: number; - }; - nice?: boolean; - niceType?: 'tickCountFirst' | 'accurateFirst'; - zero?: boolean; - expand?: { - min?: number; - max?: number; - }; - tooltipFilterRange?: number | [number, number] | ((params: { scale: IBaseScale }) => number | [number, number]); -} -export interface IBandAxisSpec { - bandPadding?: number | number[]; - paddingInner?: number | number[]; - paddingOuter?: number | number[]; - domain?: StringOrNumber[]; - bandPosition?: number; -} -export interface IGrid extends IAxisItem { - alternateColor?: string | string[]; - alignWithLabel?: boolean; - style?: IRuleMarkSpec | StyleCallback; - zIndex?: number; -} -export type ITickCallbackOption = { - axisLength?: number; - labelStyle?: ITextGraphicAttribute; -}; -export interface ITick extends IAxisItem { - tickSize?: number; - inside?: boolean; - alignWithLabel?: boolean; - tickStep?: number; - tickCount?: number | ((option: ITickCallbackOption) => number); - forceTickCount?: number; - tickMode?: 'average' | 'd3'; - noDecimals?: boolean; - style?: IRuleMarkSpec | StyleCallback; - state?: AxisItemStateStyle; - dataFilter?: (data: AxisItem[]) => AxisItem[]; -} -export interface ISubTick extends IAxisItem { - tickCount?: number; - inside?: boolean; - tickSize?: number; - state?: AxisItemStateStyle; -} -export interface ILabel extends IAxisItem { - formatMethod?: (text: string | string[], datum?: Datum) => string | string[]; - space?: number; - inside?: boolean; - minGap?: number; - style?: ITextMarkSpec | StyleCallback; - state?: AxisItemStateStyle; - dataFilter?: (data: AxisItem[], layer: number) => AxisItem[]; -} -export interface IDomainLine extends IAxisItem { - state?: AxisItemStateStyle; -} -export interface ITitle extends IAxisItem { - position?: 'start' | 'middle' | 'end'; - space?: number; - padding?: IPadding | number | number[]; - background?: IAxisItem & { - state?: AxisItemStateStyle>; - }; - shape?: IAxisItem & { - space?: number; - state?: AxisItemStateStyle>; - }; - text?: string | string[]; - angle?: number; - state?: AxisItemStateStyle>; -} -export type StyleCallback = (value: any, index: number, datum: Datum, data: Datum[]) => T; -export type AxisType = 'linear' | 'ordinal' | 'band' | 'point' | 'time' | 'log' | 'symlog'; -export interface IAxisCommonTheme { - grid?: IGrid; - subGrid?: IGrid; - domainLine?: IDomainLine; - label?: ILabel; - title?: ITitle; - tick?: ITick; - subTick?: ISubTick; -} -export interface IBandAxisTheme extends IAxisCommonTheme { - bandPadding?: number | number[]; - paddingInner?: number | number[]; - paddingOuter?: number | number[]; -} diff --git a/packages/vchart-types/types/component/axis/polar/config.d.ts b/packages/vchart-types/types/component/axis/polar/config.d.ts deleted file mode 100644 index c2ca9871c1..0000000000 --- a/packages/vchart-types/types/component/axis/polar/config.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare const DEFAULT_BAND_INNER_PADDING = 0; -export declare const DEFAULT_BAND_OUTER_PADDING = 0; -export declare const DEFAULT_BAND_POSITION = 0; diff --git a/packages/vchart-types/types/component/crosshair/interface/cartesian.d.ts b/packages/vchart-types/types/component/crosshair/interface/cartesian.d.ts deleted file mode 100644 index fbba4e8f16..0000000000 --- a/packages/vchart-types/types/component/crosshair/interface/cartesian.d.ts +++ /dev/null @@ -1,33 +0,0 @@ -import type { StringOrNumber } from '../../../typings'; -import type { IAxis } from '../../axis/interface'; -export interface ICrosshairLabelInfo { - visible: boolean; - text: StringOrNumber; - dx: number; - dy: number; - defaultFormatter?: (value: StringOrNumber) => StringOrNumber; -} -export interface ICrosshairInfoX { - height: number; - leftPos: number; - rightPos: number; - topPos: number; - x: number; - bottom: ICrosshairLabelInfo; - top: ICrosshairLabelInfo; - visible: boolean; - _isCache?: boolean; - axis: IAxis; -} -export interface ICrosshairInfoY { - width: number; - leftPos: number; - topPos: number; - bottomPos: number; - y: number; - left: ICrosshairLabelInfo; - right: ICrosshairLabelInfo; - visible: boolean; - _isCache?: boolean; - axis: IAxis; -} diff --git a/packages/vchart-types/types/component/crosshair/interface/polar.d.ts b/packages/vchart-types/types/component/crosshair/interface/polar.d.ts deleted file mode 100644 index fb8bb1da18..0000000000 --- a/packages/vchart-types/types/component/crosshair/interface/polar.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { IPoint, StringOrNumber } from '../../../typings'; -import type { IPolarAxis } from '../../axis/polar/interface'; -export interface IPolarCrosshairInfo { - x: number; - y: number; - center: IPoint; - radius: number; - distance: number; - startAngle: number; - endAngle: number; - innerRadius: number; - visible: boolean; - sides: number; - angle: number; - point: IPoint; - _isCache?: boolean; - label?: IPolarCrosshairLabelInfo; - axis?: IPolarAxis; -} -export interface IPolarCrosshairLabelInfo { - visible: boolean; - text: StringOrNumber; - offset: number; - defaultFormatter?: (value: StringOrNumber) => StringOrNumber; -} diff --git a/packages/vchart-types/types/component/crosshair/util.d.ts b/packages/vchart-types/types/component/crosshair/util.d.ts deleted file mode 100644 index 03d3578d39..0000000000 --- a/packages/vchart-types/types/component/crosshair/util.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { Tag } from '@visactor/vrender-components'; -import type { IBoundsLike } from '@visactor/vutils'; -import type { Datum } from '../../typings'; -import type { ICrosshairTheme } from './interface'; -import type { ITheme } from '../../theme'; -export declare function limitTagInBounds(shape: Tag, bounds: IBoundsLike): void; -export declare function getDatumByValue(data: Datum[], value: number, startField: string, endField?: string): Datum | null; -export declare const getCartesianCrosshairTheme: (chartTheme: ITheme, chartSpec: any) => ICrosshairTheme; -export declare const getPolarCrosshairTheme: (chartTheme: ITheme, chartSpec: any) => ICrosshairTheme; diff --git a/packages/vchart-types/types/component/data-zoom/constant.d.ts b/packages/vchart-types/types/component/data-zoom/constant.d.ts deleted file mode 100644 index 84aa77e74e..0000000000 --- a/packages/vchart-types/types/component/data-zoom/constant.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare const enum IFilterMode { - filter = "filter", - axis = "axis" -} diff --git a/packages/vchart-types/types/component/data-zoom/data-filter-base-component.d.ts b/packages/vchart-types/types/component/data-zoom/data-filter-base-component.d.ts index 09c9401cc5..177173b6cd 100644 --- a/packages/vchart-types/types/component/data-zoom/data-filter-base-component.d.ts +++ b/packages/vchart-types/types/component/data-zoom/data-filter-base-component.d.ts @@ -30,6 +30,7 @@ export declare abstract class DataFilterBaseComponent; protected _startValue: number | string; diff --git a/packages/vchart-types/types/component/data-zoom/interface.d.ts b/packages/vchart-types/types/component/data-zoom/interface.d.ts index 495eee32e4..44c4307af9 100644 --- a/packages/vchart-types/types/component/data-zoom/interface.d.ts +++ b/packages/vchart-types/types/component/data-zoom/interface.d.ts @@ -11,6 +11,8 @@ export interface IDataFilterComponentSpec extends Omit void; diff --git a/packages/vchart-types/types/component/map-label/component.d.ts b/packages/vchart-types/types/component/map-label/component.d.ts deleted file mode 100644 index 93e7bfdfea..0000000000 --- a/packages/vchart-types/types/component/map-label/component.d.ts +++ /dev/null @@ -1,55 +0,0 @@ -import type { IRect } from '../../typings/space'; -import { BaseComponent } from '../base/base-component'; -import { ComponentTypeEnum } from '../interface/type'; -import { LayoutZIndex } from '../../constant/layout'; -import type { IMapLabelSpec, MapLabelSceneNodeMap } from './interface'; -import type { ICartesianSeries, IGeoSeries } from '../../series/interface'; -import type { IPoint, Datum } from '../../typings'; -import type { IPairInfo } from './layout'; -import { MarkPoint } from '@visactor/vrender-components'; -import type { IGraphic } from '@visactor/vrender-core'; -import type { Maybe } from '@visactor/vutils'; -import type { PanEventParam, ZoomEventParam } from '../../event/interface'; -import type { IModelSpecInfo } from '../../model/interface'; -export declare class MapLabelComponent extends BaseComponent { - static type: ComponentTypeEnum; - type: ComponentTypeEnum; - name: string; - static specKey: string; - specKey: string; - layoutType: 'none'; - layoutZIndex: LayoutZIndex; - protected nameField: string; - protected valueField?: string; - protected _series: ICartesianSeries | IGeoSeries; - protected _map: any[]; - protected _longitudeField: string; - protected _latitudeField: string; - protected _markerComponents: MarkPoint[]; - private _activeDatum; - static getSpecInfo(chartSpec: any): Maybe; - setAttrFromSpec(): void; - created(): void; - initRelatedInfo(): void; - initData(): void; - initEvent(): void; - handlePan(e: PanEventParam): void; - handleZoom(e: ZoomEventParam): void; - private _updateDatum; - dataToPosition(datum: any): IPoint; - updateLayoutAttribute(): void; - protected _updateMarkerLayoutAttribute(): void; - protected _evaluateMarker(data: Datum, index: number): { - pairInfo: IPairInfo; - contentMarks: Partial>>>; - }; - protected _layoutMarkers(positionedRects: IRect[], contentMarks: MapLabelSceneNodeMap[]): void; - protected _renderMarkers(): void; - protected _layoutLabels(rects: IPairInfo[]): IRect[]; - private _isRelativeModel; - private _isRelativeSeries; - onRender(ctx: any): void; - changeRegions(): void; - protected _getNeedClearVRenderComponents(): IGraphic[]; -} -export declare const registerMapLabel: () => void; diff --git a/packages/vchart-types/types/component/map-label/interface.d.ts b/packages/vchart-types/types/component/map-label/interface.d.ts deleted file mode 100644 index e6b868a2e6..0000000000 --- a/packages/vchart-types/types/component/map-label/interface.d.ts +++ /dev/null @@ -1,40 +0,0 @@ -import type { IGraphic } from '@visactor/vrender-core'; -import type { IPadding, IOrientType, StringOrNumber } from '../../typings'; -import type { IPathMarkSpec, IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec } from '../../typings/visual'; -import type { IModelSpec } from '../../model/interface'; -export type LabelPosition = IOrientType | 'outer'; -export interface IMapLabelSpec extends IMapLabelTheme, Pick { - seriesId: StringOrNumber; - nameField?: string; - valueField?: string; - trigger?: 'hover' | 'click' | 'none'; -} -export type IMapLabelNodes = 'nameLabel' | 'valueLabel' | 'icon' | 'labelBackground' | 'container'; -export type MapLabelSceneNodeMap = Partial>; -export interface IMapLabelTheme { - visible?: boolean; - offset?: number; - space?: number; - position?: LabelPosition; - nameLabel?: { - visible?: boolean; - style?: ITextMarkSpec; - }; - valueLabel?: { - visible?: boolean; - style?: ITextMarkSpec; - }; - icon?: { - visible?: boolean; - style?: ISymbolMarkSpec; - }; - background?: { - visible?: boolean; - padding?: IPadding; - style?: IRectMarkSpec; - }; - leader?: { - visible?: boolean; - style?: IPathMarkSpec; - }; -} diff --git a/packages/vchart-types/types/component/map-label/layout.d.ts b/packages/vchart-types/types/component/map-label/layout.d.ts deleted file mode 100644 index 6de5294fdb..0000000000 --- a/packages/vchart-types/types/component/map-label/layout.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { Feature } from '@visactor/vutils'; -import type { IRect, IOrientType, IPoint } from '../../typings'; -type IBound = { - x1: number; - x2: number; - y1: number; - y2: number; -}; -export interface IPairInfo { - rect: IRect; - point: IPoint; - pointCoord?: IPoint; - anchors?: IOrientType[]; - offset?: number; - index: number; -} -export declare function bound(rect: IRect): IBound; -export declare function layoutByPosition(pairs: IPairInfo[]): IRect[]; -export declare function layoutOuter(pairs: IPairInfo[], features: Feature[], dataToPosition: (coord: number[]) => IPoint | null): IRect[]; -export declare function layoutOuter2(pairs: IPairInfo[], features: Feature[], dataToPosition: (coord: number[]) => IPoint | null): IRect[]; -export declare function placeRectByOrient(rect: IRect, position: IOrientType, offset?: number): IRect; -export declare function candidatesByOrient(positions: IOrientType[], anchor: IPoint, rect: Pick, offset?: number): IPoint[]; -export {}; diff --git a/packages/vchart-types/types/component/marker/mark-area/mark-area.d.ts b/packages/vchart-types/types/component/marker/mark-area/mark-area.d.ts deleted file mode 100644 index 2f66bc26c1..0000000000 --- a/packages/vchart-types/types/component/marker/mark-area/mark-area.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { IMarkArea, IMarkAreaSpec } from './interface'; -import { ComponentTypeEnum } from '../../interface/type'; -import { MarkArea as MarkAreaComponent } from '@visactor/vrender-components'; -import type { Maybe } from '@visactor/vutils'; -import { BaseMarker } from '../base-marker'; -import type { IGroup } from '@visactor/vrender-core'; -import type { IModelSpecInfo } from '../../../model/interface'; -export declare class MarkArea extends BaseMarker implements IMarkArea { - static type: ComponentTypeEnum; - type: ComponentTypeEnum; - name: string; - static specKey: string; - specKey: string; - layoutZIndex: number; - protected _markerComponent: MarkAreaComponent; - static getSpecInfo(chartSpec: any): Maybe; - protected _createMarkerComponent(): IGroup; - protected _markerLayout(): void; - protected _initDataView(): void; -} -export declare const registerMarkArea: () => void; diff --git a/packages/vchart-types/types/component/marker/mark-line/mark-line.d.ts b/packages/vchart-types/types/component/marker/mark-line/mark-line.d.ts deleted file mode 100644 index b70894ba55..0000000000 --- a/packages/vchart-types/types/component/marker/mark-line/mark-line.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import type { IMarkLine, IMarkLineSpec } from './interface'; -import { ComponentTypeEnum } from '../../interface/type'; -import { MarkLine as MarkLineComponent } from '@visactor/vrender-components'; -import type { Maybe } from '@visactor/vutils'; -import { BaseMarker } from '../base-marker'; -import type { IGroup } from '@visactor/vrender-core'; -import type { IModelSpecInfo } from '../../../model/interface'; -export declare class MarkLine extends BaseMarker implements IMarkLine { - static type: ComponentTypeEnum; - type: ComponentTypeEnum; - name: string; - static specKey: string; - specKey: string; - layoutZIndex: number; - protected _markerComponent: MarkLineComponent; - private _isXYLayout; - static getSpecInfo(chartSpec: any): Maybe; - protected _createMarkerComponent(): IGroup; - protected _markerLayout(): void; - protected _initDataView(): void; -} -export declare const registerMarkLine: () => void; diff --git a/packages/vchart-types/types/component/marker/mark-point/mark-point.d.ts b/packages/vchart-types/types/component/marker/mark-point/mark-point.d.ts deleted file mode 100644 index f6248584c2..0000000000 --- a/packages/vchart-types/types/component/marker/mark-point/mark-point.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -import type { IMarkPoint, IMarkPointSpec } from './interface'; -import { ComponentTypeEnum } from '../../interface/type'; -import { MarkPoint as MarkPointComponent } from '@visactor/vrender-components'; -import type { Maybe } from '@visactor/vutils'; -import { BaseMarker } from '../base-marker'; -import type { IGroup } from '@visactor/vrender-core'; -import type { IModelSpecInfo } from '../../../model/interface'; -export declare class MarkPoint extends BaseMarker implements IMarkPoint { - static type: ComponentTypeEnum; - type: ComponentTypeEnum; - name: string; - static specKey: string; - specKey: string; - layoutZIndex: number; - protected _markerComponent: MarkPointComponent; - static getSpecInfo(chartSpec: any): Maybe; - protected _createMarkerComponent(): IGroup; - protected _markerLayout(): void; - protected _initDataView(): void; -} -export declare const registerMarkPoint: () => void; diff --git a/packages/vchart-types/types/component/tooltip/handler/base.d.ts b/packages/vchart-types/types/component/tooltip/handler/base.d.ts deleted file mode 100644 index 15a1e56811..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/base.d.ts +++ /dev/null @@ -1,64 +0,0 @@ -import type { Options } from './constants'; -import type { Maybe, ILayoutPoint } from '../../../typings'; -import type { TooltipData, IToolTipActual, TooltipActiveType, ITooltipHandler, ITooltipPattern, ITooltipPositionActual } from '../../../typings/tooltip'; -import type { Tooltip } from '../tooltip'; -import type { ITooltipSpec, TooltipHandlerParams } from '../interface'; -import { TooltipResult } from '../interface/common'; -import type { IGroup } from '@visactor/vrender-core'; -import type { Compiler } from '../../../compile/compiler'; -import type { IContainerSize, TooltipAttributes } from '@visactor/vrender-components'; -import type { IChartOption } from '../../../chart/interface'; -type ChangeTooltipFunc = (visible: boolean, params: TooltipHandlerParams, changePositionOnly?: boolean, activeType?: TooltipActiveType, data?: TooltipData) => TooltipResult; -type ChangeTooltipPositionFunc = (changePositionOnly: boolean, data: TooltipData, params: TooltipHandlerParams) => TooltipResult; -export declare abstract class BaseTooltipHandler implements ITooltipHandler { - readonly type: string; - protected _visible: boolean; - protected _option: Options; - protected _chartOption: IChartOption; - protected _id: string; - get id(): string; - protected _env: "desktop-browser" | "mobile-browser" | "node" | "worker" | "miniApp" | "wx" | "desktop-miniApp" | "lynx"; - get env(): "desktop-browser" | "mobile-browser" | "node" | "worker" | "miniApp" | "wx" | "desktop-miniApp" | "lynx"; - protected _component: Tooltip; - protected _attributes?: TooltipAttributes | null; - protected _chartContainer: Maybe; - protected _compiler: Compiler; - protected _cacheViewSpec: ITooltipSpec | undefined; - protected _cacheActualTooltip: IToolTipActual | undefined; - protected _isTooltipPaused: boolean; - protected _isPointerEscaped: boolean; - protected _cachePointerTimer: number; - protected _cachePointerPosition: ILayoutPoint; - protected _cacheTooltipPosition: ILayoutPoint; - protected _cacheTooltipSize: IContainerSize; - protected _container: Maybe; - protected _isReleased: boolean; - constructor(tooltipId: string, component: Tooltip); - showTooltip: (activeType: TooltipActiveType, data: TooltipData, params: TooltipHandlerParams) => TooltipResult; - protected changeTooltip: ChangeTooltipFunc; - protected _changeTooltip: ChangeTooltipFunc; - protected changeTooltipPosition: ChangeTooltipPositionFunc; - protected _changeTooltipPosition: ChangeTooltipPositionFunc; - hideTooltip(params: TooltipHandlerParams): TooltipResult; - release(): void; - protected _clearAllCache(): void; - protected _clearCacheOfContent(): void; - protected _clearCacheOfPosition(): void; - protected abstract _updateTooltip(visible: boolean, params: TooltipHandlerParams, domData?: IToolTipActual): void; - protected abstract _removeTooltip(): void; - protected _throttle(callback: any): (...args: unknown[]) => unknown; - protected _getDefaultOption(): Options; - protected _getActualTooltipContent: (pattern: ITooltipPattern, data: TooltipData, params: TooltipHandlerParams) => IToolTipActual; - protected _getActualTooltipPosition: (actualTooltip: IToolTipActual, params: TooltipHandlerParams, tooltipBoxSize: IContainerSize | undefined) => ITooltipPositionActual; - protected _getTooltipBoxSize(actualTooltip: IToolTipActual, changePositionOnly: boolean): IContainerSize | undefined; - protected _getPointerPositionRelativeToTooltipParent(params: TooltipHandlerParams): { - x: any; - y: any; - }; - protected _isPointerMovingToTooltip(params: TooltipHandlerParams): boolean; - protected _getParentElement(spec: ITooltipSpec): HTMLElement; - getTooltipContainer(): IGroup | HTMLElement; - protected _initFromSpec(): void; - reInit(): void; -} -export {}; diff --git a/packages/vchart-types/types/component/tooltip/handler/canvas/canvas-tooltip-handler.d.ts b/packages/vchart-types/types/component/tooltip/handler/canvas/canvas-tooltip-handler.d.ts deleted file mode 100644 index d6c6644095..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/canvas/canvas-tooltip-handler.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { IToolTipActual } from '../../../../typings/tooltip'; -import type { TooltipHandlerParams } from '../../interface'; -import { BaseTooltipHandler } from '../base'; -import { Tooltip as TooltipComponent } from '@visactor/vrender-components'; -import type { Tooltip } from '../../tooltip'; -export declare class CanvasTooltipHandler extends BaseTooltipHandler { - type: string; - private _layer; - protected _el?: HTMLCanvasElement; - protected _tooltipCanvasId?: string; - protected _tooltipComponent: TooltipComponent; - constructor(tooltipId: string, component: Tooltip); - private _initTooltipComponent; - private _getLayer; - protected _removeTooltip(): void; - protected _updateTooltip(visible: boolean, params: TooltipHandlerParams, actualTooltip: IToolTipActual): void; - isTooltipShown(): boolean; - release(): void; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/canvas/index.d.ts b/packages/vchart-types/types/component/tooltip/handler/canvas/index.d.ts deleted file mode 100644 index f79fd19eb9..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/canvas/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './canvas-tooltip-handler'; diff --git a/packages/vchart-types/types/component/tooltip/handler/constants.d.ts b/packages/vchart-types/types/component/tooltip/handler/constants.d.ts deleted file mode 100644 index cc3d1631e1..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/constants.d.ts +++ /dev/null @@ -1,17 +0,0 @@ -import type { IToolTipLineActual } from '../../../typings'; -import { escapeHTML } from './utils/common'; -export declare const TOOLTIP_EL_CLASS_NAME = "vchart-tooltip-element"; -export declare const TOOLTIP_CONTAINER_EL_CLASS_NAME = "vchart-tooltip-container"; -export declare const TOOLTIP_MAX_LINE_COUNT = 20; -export declare const TOOLTIP_EMPTY_STRING = ""; -export declare const TOOLTIP_OTHERS_LINE: IToolTipLineActual; -export declare const DEFAULT_OPTIONS: { - offsetX: number; - offsetY: number; - sanitize: typeof escapeHTML; -}; -export type Options = typeof DEFAULT_OPTIONS; -export declare class TooltipHandlerType { - static dom: string; - static canvas: string; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/dom-tooltip-handler.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/dom-tooltip-handler.d.ts deleted file mode 100644 index 365ab9cae2..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/dom-tooltip-handler.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { IToolTipActual } from '../../../../typings/tooltip'; -import type { ITooltipSpec, TooltipHandlerParams } from '../../interface'; -import { BaseTooltipHandler } from '../base'; -import type { IDomTooltipStyle } from './interface'; -import { TooltipModel } from './model/tooltip-model'; -import type { Tooltip } from '../../tooltip'; -import type { Maybe } from '@visactor/vutils'; -export declare class DomTooltipHandler extends BaseTooltipHandler { - type: string; - protected _tooltipContainer: HTMLElement; - protected _domStyle: IDomTooltipStyle; - protected _tooltipActual?: IToolTipActual; - protected _container: Maybe; - protected model: TooltipModel; - getVisibility(): boolean; - setVisibility(_value: boolean): void; - constructor(tooltipId: string, component: Tooltip); - initEl(): void; - protected _removeTooltip(): void; - protected _updateTooltip(visible: boolean, params: TooltipHandlerParams, actualTooltip: IToolTipActual): void; - protected _initStyle(): void; - protected _getParentElement(spec: ITooltipSpec): HTMLElement; - isTooltipShown(): boolean; - reInit(): void; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/index.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/index.d.ts deleted file mode 100644 index fabd8b2219..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dom-tooltip-handler'; diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/interface.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/interface.d.ts deleted file mode 100644 index 9dbd0e60e3..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/interface.d.ts +++ /dev/null @@ -1,57 +0,0 @@ -import type { FontWeight, TextAlign } from '../../../../typings/visual'; -export interface IDomTooltipStyle { - panel: IPadding & IBorder & { - width?: string; - height?: string; - minHeight?: string; - backgroundColor?: string; - boxShadow?: string; - pointerEvents?: 'auto' | 'none'; - transitionDuration?: string; - transitionProperty?: string; - transitionTimingFunction?: string; - }; - title: ILabelStyle; - content: IMargin; - shapeColumn: TooltipColumnStyle; - keyColumn: TooltipColumnStyle; - valueColumn: TooltipColumnStyle; -} -export type TooltipColumnStyle = IMargin & { - width?: string; - common?: T; - items?: T[]; -}; -export interface ILabelStyle extends IMargin { - fontFamily?: string; - fontSize?: string; - color?: string; - textAlign?: TextAlign; - lineHeight?: string; - fontWeight?: FontWeight; - whiteSpace?: string; - wordBreak?: string; - maxWidth?: string; - width?: string; -} -export interface IShapeStyle extends IMargin { - width?: string; - height?: string; -} -export interface IMargin { - marginLeft?: string; - marginRight?: string; - marginTop?: string; - marginBottom?: string; -} -export interface IPadding { - paddingTop?: string; - paddingRight?: string; - paddingBottom?: string; - paddingLeft?: string; -} -export interface IBorder { - borderColor?: string; - borderWidth?: string; - borderRadius?: string; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/base-tooltip-model.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/base-tooltip-model.d.ts deleted file mode 100644 index 0f74bd7898..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/base-tooltip-model.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { Maybe } from '@visactor/vutils'; -import type { IToolTipLineActual } from '../../../../../typings'; -import type { ITooltipModelOption } from './interface'; -export declare class BaseTooltipModel { - static type: string; - static isInstance(obj: any): obj is BaseTooltipModel; - readonly type: string; - readonly parent: BaseTooltipModel | HTMLElement; - readonly childIndex: number; - protected _option: ITooltipModelOption; - setOption(option: ITooltipModelOption): void; - protected _renderContentCache: IToolTipLineActual[] | null; - children: Record; - product: Maybe; - getParentEl(): HTMLElement; - constructor(parent: BaseTooltipModel | HTMLElement, option: ITooltipModelOption, childIndex?: number); - init(classList?: string[], id?: string): void; - initAll(): void; - setStyle(style?: Partial): void; - setContent(content?: any): void; - setVisibility(visibility: boolean): void; - getVisibility(): boolean; - release(): void; - protected createElement(tag: keyof HTMLElementTagNameMap, classList?: string[], style?: Partial, id?: string): HTMLElement; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/content-column-model.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/content-column-model.d.ts deleted file mode 100644 index 111d5a874a..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/content-column-model.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { BaseTooltipModel } from './base-tooltip-model'; -import type { ITooltipModelOption } from './interface'; -import type { IShapeSvgOption } from './shape-model'; -import type { IToolTipLineActual } from '../../../../../typings'; -export type ContentColumnType = 'shape-box' | 'key-box' | 'value-box'; -export declare class ContentColumnModel extends BaseTooltipModel { - readonly className: ContentColumnType; - constructor(parent: BaseTooltipModel | HTMLElement, option: ITooltipModelOption, className: ContentColumnType, childIndex?: number); - init(): void; - setStyle(): void; - setContent(): void; - protected _getContentColumnStyle(): import("../interface").TooltipColumnStyle | { - display?: string; - marginLeft?: string; - marginRight?: string; - marginTop?: string; - marginBottom?: string; - width?: string; - common?: import("../interface").IShapeStyle; - items?: import("../interface").IShapeStyle[]; - }; - protected _getShapeSvgOption(line: IToolTipLineActual, index: number): IShapeSvgOption; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/content-model.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/content-model.d.ts deleted file mode 100644 index 3b03e4478c..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/content-model.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { BaseTooltipModel } from './base-tooltip-model'; -import { ContentColumnModel } from './content-column-model'; -import type { Maybe } from '@visactor/vutils'; -export declare class ContentModel extends BaseTooltipModel { - shapeBox: Maybe; - keyBox: Maybe; - valueBox: Maybe; - init(): void; - private _initShapeBox; - private _initKeyBox; - private _initValueBox; - setStyle(style?: Partial): void; - setContent(): void; - release(): void; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/interface.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/interface.d.ts deleted file mode 100644 index 2e98a4f08a..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/interface.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { TooltipAttributes } from '@visactor/vrender-components'; -import type { IToolTipActual, Maybe } from '../../../../../typings'; -import type { IDomTooltipStyle } from '../interface'; -export interface ITooltipModelOption { - valueToHtml: (value: any) => string; - getTooltipStyle: () => IDomTooltipStyle; - getTooltipActual: () => Maybe; - getTooltipAttributes: () => Maybe; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/shape-model.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/shape-model.d.ts deleted file mode 100644 index 7ea60dca6f..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/shape-model.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { IGradientColor } from '@visactor/vrender-core'; -import type { ShapeType } from '../../../../../typings'; -import { BaseTooltipModel } from './base-tooltip-model'; -export interface IShapeSvgOption { - hasShape?: boolean; - symbolType?: ShapeType | string; - size?: string; - fill?: string | IGradientColor; - stroke?: string; - lineWidth?: number; - hollow?: boolean; - marginTop?: string; - index?: number; -} -export declare class ShapeModel extends BaseTooltipModel { - svg: SVGElement; - private _svgHtmlCache; - init(classList?: string[], id?: string, tag?: keyof HTMLElementTagNameMap): void; - setStyle(style?: Partial, option?: IShapeSvgOption): void; - setContent(option: IShapeSvgOption): void; - setSvg(option?: IShapeSvgOption): void; - release(): void; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/style-constants.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/style-constants.d.ts deleted file mode 100644 index 6e6ee3f33d..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/style-constants.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -export declare const defaultH2Style: Partial; -export declare const defaultContainerStyle: Partial; -export declare const defaultContentContainerStyle: Partial; -export declare const defaultContentColumnStyle: Partial; -export declare const defaultKeyStyle: Partial; -export declare const defaultAdaptiveKeyStyle: Partial; -export declare const defaultValueStyle: Partial; -export declare const defaultShapeStyle: Partial; diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/text-model.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/text-model.d.ts deleted file mode 100644 index 94f5be25bc..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/text-model.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { BaseTooltipModel } from './base-tooltip-model'; -export declare class TextModel extends BaseTooltipModel { - init(classList?: string[], id?: string, tag?: keyof HTMLElementTagNameMap): void; - setContent(content?: any, multiLine?: boolean): void; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/title-model.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/title-model.d.ts deleted file mode 100644 index 377c179459..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/title-model.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { Maybe } from '@visactor/vutils'; -import { BaseTooltipModel } from './base-tooltip-model'; -import { ShapeModel } from './shape-model'; -import { TextModel } from './text-model'; -export declare class TitleModel extends BaseTooltipModel { - shape: Maybe; - textSpan: Maybe; - init(): void; - private _initShape; - private _releaseShape; - private _initTextSpan; - setStyle(style?: Partial): void; - setContent(): void; - release(): void; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/model/tooltip-model.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/model/tooltip-model.d.ts deleted file mode 100644 index 9d09eef557..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/model/tooltip-model.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { BaseTooltipModel } from './base-tooltip-model'; -import { ContentModel } from './content-model'; -import type { ITooltipModelOption } from './interface'; -import { TitleModel } from './title-model'; -export declare class TooltipModel extends BaseTooltipModel { - title: TitleModel | null; - content: ContentModel | null; - private _classList; - private _id; - constructor(parent: BaseTooltipModel | HTMLElement, option: ITooltipModelOption, classList: string[], id: string); - setVisibility(visibility: boolean): void; - init(): void; - private _initPanel; - private _initTitle; - private _releaseTitle; - private _initContent; - private _releaseContent; - setStyle(): void; - setContent(): void; - release(): void; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/dom/util.d.ts b/packages/vchart-types/types/component/tooltip/handler/dom/util.d.ts deleted file mode 100644 index ede69939fa..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/dom/util.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { Maybe } from '@visactor/vutils'; -import type { IDomTooltipStyle } from './interface'; -import type { TooltipAttributes } from '@visactor/vrender-components'; -export declare const getPixelPropertyStr: (num?: number | number[], defaultStr?: string) => string; -export declare const pixelPropertyStrToNumber: (str: string) => number | number[]; -export declare function getDomStyles(attributes?: Maybe): IDomTooltipStyle; diff --git a/packages/vchart-types/types/component/tooltip/handler/index.d.ts b/packages/vchart-types/types/component/tooltip/handler/index.d.ts deleted file mode 100644 index 77e7bd2130..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './dom'; -export * from './canvas'; diff --git a/packages/vchart-types/types/component/tooltip/handler/interface/index.d.ts b/packages/vchart-types/types/component/tooltip/handler/interface/index.d.ts deleted file mode 100644 index 54fcd8052f..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/interface/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './style'; diff --git a/packages/vchart-types/types/component/tooltip/handler/interface/style.d.ts b/packages/vchart-types/types/component/tooltip/handler/interface/style.d.ts deleted file mode 100644 index e2c17069be..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/interface/style.d.ts +++ /dev/null @@ -1,8 +0,0 @@ -import type { ITextAttribute, IFillStyle, RichTextWordBreak } from '@visactor/vrender-core'; -export interface ITooltipTextStyle extends Partial { - spacing?: number; - multiLine?: boolean; - maxWidth?: number; - wordBreak?: RichTextWordBreak; - autoWidth?: boolean; -} diff --git a/packages/vchart-types/types/component/tooltip/handler/utils/attribute.d.ts b/packages/vchart-types/types/component/tooltip/handler/utils/attribute.d.ts deleted file mode 100644 index 6631f791b3..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/utils/attribute.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { TooltipAttributes, TooltipPanelAttrs } from '@visactor/vrender-components'; -import type { IToolTipActual } from '../../../../typings'; -import type { ITooltipTextStyle } from '../interface'; -import type { ITooltipSpec } from '../../interface/spec'; -import type { ITooltipTextTheme, ITooltipTheme } from '../../interface/theme'; -import type { ITheme } from '../../../../theme'; -export declare function getTextAttributes(style?: ITooltipTextTheme, globalTheme?: ITheme, defaultAttributes?: Partial): ITooltipTextStyle; -export declare const getPanelAttributes: (style: ITooltipTheme['panel']) => TooltipPanelAttrs; -export declare const getTooltipAttributes: (actualTooltip: IToolTipActual, spec: ITooltipSpec, globalTheme: ITheme) => TooltipAttributes; diff --git a/packages/vchart-types/types/component/tooltip/handler/utils/common.d.ts b/packages/vchart-types/types/component/tooltip/handler/utils/common.d.ts deleted file mode 100644 index ff64d35b3a..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/utils/common.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -import type { Datum } from '@visactor/vgrammar-core'; -import type { MaybeArray, TooltipContentProperty, TooltipData, TooltipPatternProperty } from '../../../../typings'; -import type { TooltipHandlerParams } from '../../interface'; -import type { ITooltipTextStyle } from '../interface/style'; -import type { TooltipRichTextAttrs } from '@visactor/vrender-components'; -export declare function escapeHTML(value: any): string; -export declare const getTooltipContentValue: (field?: TooltipContentProperty, datum?: any, params?: TooltipHandlerParams) => T; -export declare const getTooltipPatternValue: (field?: MaybeArray>, data?: TooltipData, params?: TooltipHandlerParams) => MaybeArray> extends TooltipPatternProperty[] ? MaybeArray : T; -export declare function getFirstDatumFromTooltipData(data: TooltipData): Datum; -export declare function pickFirstValidValue(isValid: (element?: T) => any, ...elements: T[]): T | undefined; -export declare function convertToColorString(color: any, defaultColor?: string): string; -export declare const getScale: (element: HTMLElement, boundingClientRect?: DOMRect) => number; -interface ITooltipTextInfo { - width: number; - height: number; - text: MaybeArray | MaybeArray | TooltipRichTextAttrs; -} -export declare const measureTooltipText: (text: string | TooltipRichTextAttrs, style: ITooltipTextStyle) => ITooltipTextInfo; -export {}; diff --git a/packages/vchart-types/types/component/tooltip/handler/utils/compose.d.ts b/packages/vchart-types/types/component/tooltip/handler/utils/compose.d.ts deleted file mode 100644 index 62800a2ce2..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/utils/compose.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { TooltipActualTitleContent } from '../../tooltip'; -import type { IToolTipLinePattern, ITooltipPattern, TooltipData, IToolTipLineActual } from '../../../../typings/tooltip'; -import type { TooltipHandlerParams } from '../../interface'; -export declare const getShowContent: (pattern: ITooltipPattern, data: TooltipData, params: TooltipHandlerParams) => TooltipActualTitleContent | null; -export declare const getOneLineData: (datum: any, config: IToolTipLinePattern, params: TooltipHandlerParams) => IToolTipLineActual; diff --git a/packages/vchart-types/types/component/tooltip/handler/utils/get-spec.d.ts b/packages/vchart-types/types/component/tooltip/handler/utils/get-spec.d.ts deleted file mode 100644 index 82862ebb36..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/utils/get-spec.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { ITooltipSpec } from '../../interface'; -import type { TooltipActiveType } from '../../../../typings'; -import type { ISeries } from '../../../../series/interface'; -import type { IDimensionInfo } from '../../../../event/events/dimension/interface'; -export declare const getTooltipSpecForShow: (activeType: TooltipActiveType, globalSpec: ITooltipSpec, series?: ISeries, dimensionInfo?: IDimensionInfo[]) => ITooltipSpec; diff --git a/packages/vchart-types/types/component/tooltip/handler/utils/index.d.ts b/packages/vchart-types/types/component/tooltip/handler/utils/index.d.ts deleted file mode 100644 index f1084d8835..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/utils/index.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -export * from './common'; -export * from './compose'; -export * from './pattern'; -export * from './get-spec'; -export * from './position'; -export * from './attribute'; diff --git a/packages/vchart-types/types/component/tooltip/handler/utils/pattern.d.ts b/packages/vchart-types/types/component/tooltip/handler/utils/pattern.d.ts deleted file mode 100644 index 9b5bb34061..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/utils/pattern.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { IDimensionInfo } from '../../../../event/events/dimension/interface'; -import type { ISeries } from '../../../../series/interface'; -import type { ITooltipPattern, TooltipActiveType } from '../../../../typings'; -export declare const makeDefaultPattern: (series: ISeries, activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]) => ITooltipPattern | null; diff --git a/packages/vchart-types/types/component/tooltip/handler/utils/position.d.ts b/packages/vchart-types/types/component/tooltip/handler/utils/position.d.ts deleted file mode 100644 index 480d1d58a1..0000000000 --- a/packages/vchart-types/types/component/tooltip/handler/utils/position.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { TooltipFixedPosition } from '../../../../typings/tooltip/position'; -export declare const getActualTooltipPositionValue: (position: number | ((event: MouseEvent) => number), event: MouseEvent) => number; -export type TooltipHorizontalPositionType = 'left' | 'right' | 'middle'; -export type TooltipVerticalPositionType = 'top' | 'bottom' | 'middle'; -export declare const positionType: Record; -export declare const getHorizontalPositionType: (position: TooltipFixedPosition, defaultCase?: TooltipHorizontalPositionType) => TooltipHorizontalPositionType; -export declare const getVerticalPositionType: (position: TooltipFixedPosition, defaultCase?: TooltipVerticalPositionType) => TooltipVerticalPositionType; diff --git a/packages/vchart-types/types/component/tooltip/utils/compose.d.ts b/packages/vchart-types/types/component/tooltip/utils/compose.d.ts deleted file mode 100644 index 8acef88b2e..0000000000 --- a/packages/vchart-types/types/component/tooltip/utils/compose.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { ITooltipLinePattern, ITooltipPattern, TooltipData, ITooltipLineActual, TooltipActualTitleContent } from '../../../typings/tooltip'; -import type { TooltipHandlerParams } from '../interface/common'; -export declare const getShowContent: (pattern: ITooltipPattern, data: TooltipData, params: TooltipHandlerParams) => TooltipActualTitleContent | null; -export declare const getOneLineData: (datum: any, config: ITooltipLinePattern, params: TooltipHandlerParams) => ITooltipLineActual; diff --git a/packages/vchart-types/types/component/tooltip/utils/pattern.d.ts b/packages/vchart-types/types/component/tooltip/utils/pattern.d.ts deleted file mode 100644 index 4a521420b0..0000000000 --- a/packages/vchart-types/types/component/tooltip/utils/pattern.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { IDimensionInfo } from '../../../event/events/dimension/interface'; -import type { ISeries } from '../../../series/interface'; -import type { ITooltipPattern, TooltipActiveType } from '../../../typings'; -export declare const makeDefaultPattern: (series: ISeries, activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]) => ITooltipPattern | null; diff --git a/packages/vchart-types/types/constant/index.d.ts b/packages/vchart-types/types/constant/index.d.ts deleted file mode 100644 index 8085800516..0000000000 --- a/packages/vchart-types/types/constant/index.d.ts +++ /dev/null @@ -1,113 +0,0 @@ -export declare const DEFAULT_MEASURE_CANVAS_ID: string; -export declare const DEFAULT_DATA_INDEX: string; -export declare const DEFAULT_DATA_KEY: string; -export declare const DEFAULT_DATA_SERIES_FIELD: string; -export declare const DEFAULT_SERIES_STYLE_NAME: string; -export declare enum AttributeLevel { - Default = 0, - Theme = 1, - Chart = 2, - Base_Series = 3, - Series = 4, - Mark = 5, - User_Chart = 6, - User_Series = 7, - User_Mark = 8, - User_SeriesStyle = 9, - Built_In = 99 -} -export declare const STACK_FIELD_KEY: string; -export declare const STACK_FIELD_START: string; -export declare const STACK_FIELD_END: string; -export declare const STACK_FIELD_START_PERCENT: string; -export declare const STACK_FIELD_END_PERCENT: string; -export declare const STACK_FIELD_START_OffsetSilhouette: string; -export declare const STACK_FIELD_END_OffsetSilhouette: string; -export declare const STACK_FIELD_TOTAL: string; -export declare const STACK_FIELD_TOTAL_PERCENT: string; -export declare const STACK_FIELD_TOTAL_TOP: string; -export declare const SEGMENT_FIELD_START: string; -export declare const SEGMENT_FIELD_END: string; -export declare enum LayoutZIndex { - Axis_Grid = 50, - CrossHair_Grid = 100, - Region = 450, - Mark = 300, - Node = 400, - Axis = 100, - MarkLine = 500, - MarkArea = 100, - MarkPoint = 500, - DataZoom = 500, - ScrollBar = 500, - Player = 500, - Legend = 500, - CrossHair = 500, - Indicator = 500, - Title = 500, - Label = 500, - Brush = 500, - CustomMark = 500, - Interaction = 700 -} -export declare enum LayoutLevel { - Indicator = 10, - Region = 20, - Axis = 30, - DataZoom = 40, - Player = 40, - ScrollBar = 40, - Legend = 50, - Title = 70, - CustomMark = 70 -} -export declare const GradientType: string[]; -export declare const DEFAULT_LINEAR_GRADIENT_CONFIG: { - x0: number; - y0: number; - x1: number; - y1: number; -}; -export declare const DEFAULT_RADIAL_GRADIENT_CONFIG: { - x0: number; - y0: number; - x1: number; - y1: number; - r0: number; - r1: number; -}; -export declare const DEFAULT_CONICAL_GRADIENT_CONFIG: { - x: number; - y: number; - startAngle: number; - endAngle: number; -}; -export declare const DEFAULT_GRADIENT_CONFIG: { - linear: { - x0: number; - y0: number; - x1: number; - y1: number; - }; - radial: { - x0: number; - y0: number; - x1: number; - y1: number; - r0: number; - r1: number; - }; - conical: { - x: number; - y: number; - startAngle: number; - endAngle: number; - }; -}; -export * from './base'; -export * from './label'; -export * from './polar'; -export * from './layout'; -export * from './event'; -export * from './waterfall'; -export * from './correlation'; diff --git a/packages/vchart-types/types/core/index.d.ts b/packages/vchart-types/types/core/index.d.ts index c43fcad6a1..e205da6420 100644 --- a/packages/vchart-types/types/core/index.d.ts +++ b/packages/vchart-types/types/core/index.d.ts @@ -33,3 +33,7 @@ export { registerDataSetInstanceParser, registerDataSetInstanceTransform } from export { lookup } from '../data/transforms/lookup'; export { warn } from '../util/debug'; export { measureText } from '../util/text'; +export { ColorOrdinalScale } from '../scale/color-ordinal-scale'; +export { copyDataView } from '../data/transforms/copy-data-view'; +export { objFlat } from '../data/transforms/obj-flat'; +export { mergeSpec } from '@visactor/vutils-extension'; diff --git a/packages/vchart-types/types/data/transforms/link-dot-info.d.ts b/packages/vchart-types/types/data/transforms/link-dot-info.d.ts deleted file mode 100644 index c8d8277129..0000000000 --- a/packages/vchart-types/types/data/transforms/link-dot-info.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { Datum } from '../../typings'; -export interface ILinkDotInfoOpt { - infoKey: string; - fields: () => { - fromField: string; - toField: string; - xField: string | string[]; - yField: string | string[]; - }; - linkData: () => Datum[]; - dotData: () => Datum[]; -} -export declare const linkDotInfo: (data: Array, op: ILinkDotInfoOpt) => Datum[]; diff --git a/packages/vchart-types/types/index.d.ts b/packages/vchart-types/types/index.d.ts index d9aaac31da..9e0efa5f3b 100644 --- a/packages/vchart-types/types/index.d.ts +++ b/packages/vchart-types/types/index.d.ts @@ -24,6 +24,7 @@ export * from './util/mark'; export * from './util/region'; export * from './util/scale'; export * from './constant/data'; +export { SCROLL_BAR_DEFAULT_SIZE } from './constant/scroll-bar'; export * from './component/base'; export * from './compile/data/compilable-data'; export * from './animation'; diff --git a/packages/vchart-types/types/interaction/dimension-trigger.d.ts b/packages/vchart-types/types/interaction/dimension-trigger.d.ts deleted file mode 100644 index 2e284d6e99..0000000000 --- a/packages/vchart-types/types/interaction/dimension-trigger.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -import type { IElement } from '@visactor/vgrammar-core'; -import type { DimensionEventParams } from '../event/events/dimension/interface'; -import type { IMark } from '../mark/interface'; -import type { IEvent } from '../event/interface'; -import type { IHoverSpec, IInteraction, ISelectSpec, ITrigger, ITriggerOption } from './interface'; -import { MarkSet } from '../mark/mark-set'; -export declare class DimensionTrigger implements ITrigger { - readonly event: IEvent; - protected readonly interaction: IInteraction; - protected _option: ITriggerOption; - protected _marks: MarkSet; - protected _markReverse: MarkSet; - private _hover; - get hover(): IHoverSpec; - private _select; - get select(): ISelectSpec; - constructor(option: ITriggerOption); - setStateKeys(fields: string[]): void; - registerMark(mark: IMark): void; - init(): void; - release(): void; - protected initEvent(): void; - protected releaseEvent(): void; - private initConfig; - protected getEventElement(params: DimensionEventParams, reverse?: boolean): IElement[]; - private onHover; -} diff --git a/packages/vchart-types/types/interaction/interface.d.ts b/packages/vchart-types/types/interaction/interface.d.ts deleted file mode 100644 index 7e4b15d05c..0000000000 --- a/packages/vchart-types/types/interaction/interface.d.ts +++ /dev/null @@ -1,73 +0,0 @@ -import type { ElementActiveByLegendSpec, ElementActiveSpec, ElementHighlightByGroupSpec, ElementHighlightByKeySpec, ElementHighlightByLegendSpec, ElementHighlightByNameSpec, ElementHighlightSpec, ElementSelectSpec, IElement, IInteraction as IVGrammarInteraction } from '@visactor/vgrammar-core'; -import type { IMark } from '../mark/interface'; -import type { RenderMode } from '../typings/spec/common'; -import type { BaseEventParams, IEventDispatcher, EventType } from '../event/interface'; -import type { IModel } from '../model/interface'; -import type { StateValue } from '../compile/mark/interface'; -import type { StringOrNumber } from '../typings/common'; -export interface IInteraction { - registerMark: (state: StateValue, mark: IMark) => void; - filterEventMark: (params: BaseEventParams, state: StateValue) => boolean; - getStateMark: (state: StateValue) => IMark[] | null; - getEventElement: (stateValue: StateValue) => IElement[]; - getEventElementData: (stateValue: StateValue) => any[]; - addEventElement: (stateValue: StateValue, element: IElement) => void; - removeEventElement: (stateValue: StateValue, elements: IElement) => void; - exchangeEventElement: (stateValue: StateValue, elements: IElement) => void; - clearEventElement: (stateValue: StateValue, clearReverse: boolean) => void; - reverseEventElement: (stateValue: StateValue) => void; - clearAllEventElement: () => void; - setDisableActiveEffect: (disable: boolean) => void; - addVgrammarInteraction: (state: StateValue, i: IVGrammarInteraction) => void; - startInteraction: (state: StateValue, element: IElement) => void; - resetInteraction: (state: StateValue, element: IElement) => void; - resetAllInteraction: () => void; -} -export interface ITrigger { - init: () => void; - setStateKeys: (fields: string[]) => void; - registerMark: (mark: IMark) => void; - release: () => void; - hover?: IHoverSpec; - select?: ISelectSpec; -} -export interface ITriggerOption { - mode: RenderMode; - interaction: IInteraction; - eventDispatcher: IEventDispatcher; - model: IModel; -} -export interface IBaseInteractionSpec { - markIds?: StringOrNumber[]; - markNames?: StringOrNumber[]; -} -type Trigger = EventType | EventType[]; -export interface IHoverSpec extends IBaseInteractionSpec { - enable?: boolean; - trigger?: Trigger; - triggerOff?: Trigger; -} -export interface ISelectSpec extends IBaseInteractionSpec { - enable?: boolean; - mode?: 'single' | 'multiple'; - trigger?: Trigger; - triggerOff?: Trigger | number; -} -export type IElementActiveSpec = IBaseInteractionSpec & Pick; -export type IElementSelectSpec = IBaseInteractionSpec & Pick; -export type IElementHighlightSpec = IBaseInteractionSpec & Pick; -export type IElementHighlightByKeySpec = IBaseInteractionSpec & Pick; -export type IElementHighlightByGroup = IBaseInteractionSpec & Pick; -export type IElementActiveByLegend = IBaseInteractionSpec & Pick; -export type IElementHighlightByLegend = IBaseInteractionSpec & Pick; -export type IElementHighlightByName = IBaseInteractionSpec & Pick; -export interface ICustomInteraction extends IBaseInteractionSpec { - type: string; -} -export type IInteractionItemSpec = IElementActiveSpec | IElementSelectSpec | IElementHighlightSpec | IElementHighlightByKeySpec | IElementHighlightByGroup | IElementActiveByLegend | IElementHighlightByLegend | IElementHighlightByName; -export interface IInteractionSpec { - hover?: IHoverSpec | boolean; - select?: ISelectSpec | boolean; - interactions?: IInteractionItemSpec[]; -} -export {}; diff --git a/packages/vchart-types/types/interaction/trigger.d.ts b/packages/vchart-types/types/interaction/trigger.d.ts deleted file mode 100644 index 3fa417a12d..0000000000 --- a/packages/vchart-types/types/interaction/trigger.d.ts +++ /dev/null @@ -1,39 +0,0 @@ -import type { IMark } from '../mark/interface'; -import type { BaseEventParams, IEvent } from '../event/interface'; -import type { IHoverSpec, IInteraction, ISelectSpec, ITrigger, ITriggerOption, ITriggerSpec } from './interface'; -import { MarkSet } from '../mark/mark-set'; -export declare class Trigger implements ITrigger { - readonly event: IEvent; - protected readonly interaction: IInteraction; - protected _spec: ITriggerSpec; - protected _option: ITriggerOption; - protected _hover: IHoverSpec; - get hover(): IHoverSpec; - protected _select: ISelectSpec; - get select(): ISelectSpec; - protected _fields: string[] | null; - protected _marks: MarkSet; - protected _markReverse: MarkSet; - private _isHovered?; - constructor(spec: ITriggerSpec, option: ITriggerOption); - setStateKeys(fields: string[]): void; - registerMark(mark: IMark): void; - init(): void; - release(): void; - protected initEvent(): void; - protected releaseEvent(): void; - private initConfig; - private onHover; - private onUnHover; - private onSelect; - private onUnSelect; - protected hoverItem(params: BaseEventParams): void; - protected unhoverItem(): void; - protected handleSingleEventHover(params: BaseEventParams): void; - protected selectItems(datums: any[]): void; - protected clearSelectedItems(): void; - protected unselectItems(params: BaseEventParams): void; - protected handleSingleEventSelect(params: BaseEventParams): void; - protected filterEventMark(params: BaseEventParams): boolean; - protected isDatumEqual(datumA: any, datumB: any): boolean; -} diff --git a/packages/vchart-types/types/layout/layout3d/index.d.ts b/packages/vchart-types/types/layout/layout3d/index.d.ts deleted file mode 100644 index 250367ddab..0000000000 --- a/packages/vchart-types/types/layout/layout3d/index.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import type { IChart } from '../../chart/interface/chart'; -import type { IBoundsLike } from '@visactor/vutils'; -import type { IRect } from '../../typings/space'; -import type { IBaseLayout, ILayoutItem } from '../interface'; -import type { IOffset } from '../base-layout'; -import { Layout } from '../base-layout'; -export declare class Layout3d extends Layout implements IBaseLayout { - static type: string; - layoutItems(_chart: IChart, items: ILayoutItem[], chartLayoutRect: IRect, chartViewBox: IBoundsLike): void; - protected layoutZAxisItems(zItems: ILayoutItem[], zRect: IRect): void; - getItemComputeLayoutRect(item: ILayoutItem, extraOffset?: IOffset): { - width: number; - height: number; - }; - protected _checkAutoIndent(items: ILayoutItem[]): { - top: number; - left: number; - bottom: number; - right: number; - }; -} -export declare const registerLayout3d: () => void; diff --git a/packages/vchart-types/types/mark/arc-3d.d.ts b/packages/vchart-types/types/mark/arc-3d.d.ts deleted file mode 100644 index b007d07190..0000000000 --- a/packages/vchart-types/types/mark/arc-3d.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { IArc3dMarkSpec } from '../typings'; -import { BaseArcMark } from './arc'; -import type { IArc3dMark } from './interface'; -import { MarkTypeEnum } from './interface/type'; -export declare class Arc3dMark extends BaseArcMark implements IArc3dMark { - static readonly type = MarkTypeEnum.arc3d; - readonly type: MarkTypeEnum; - protected _support3d?: boolean; -} -export declare const registerArc3dMark: () => void; diff --git a/packages/vchart-types/types/mark/index.d.ts b/packages/vchart-types/types/mark/index.d.ts index 2891d346ff..88e913600f 100644 --- a/packages/vchart-types/types/mark/index.d.ts +++ b/packages/vchart-types/types/mark/index.d.ts @@ -19,7 +19,7 @@ import { BasePolygonMark } from './polygon/base-polygon'; import { MarkTypeEnum } from './interface/type'; export type { IBoxPlotMarkSpec, ILineMarkSpec, ISymbolMarkSpec, IGroupMarkSpec, IRuleMarkSpec, ITextMarkSpec, IAreaMarkSpec, IRectMarkSpec, IPathMarkSpec, IArcMarkSpec, ICommonSpec, IPolygonMarkSpec, ILinkPathMarkSpec, IRippleMarkSpec, ICellMarkSpec, ILiquidMarkSpec, ConvertToMarkStyleSpec } from '../typings/visual'; export type { IMarkRaw, IMark, IMarkStyle } from './interface/common'; -export type { ITextMark, ILabelMark, IRectMark, IRuleMark, IImageMark, IGroupMark, IGlyphMark } from './interface/mark'; +export type { ITextMark, ILabelMark, IRectMark, IRuleMark, IImageMark, IGroupMark, IGlyphMark, ISymbolMark, IPathMark } from './interface/mark'; export { MarkTypeEnum, LineMark, SymbolMark, GroupMark, RuleMark, TextMark, AreaMark, RectMark, PathMark, GlyphMark, BaseArcMark, ArcMark, ComponentMark, BasePolygonMark, PolygonMark, RippleMark, ImageMark, BaseMark }; export { registerLineMark, registerSymbolMark, registerGroupMark, registerRuleMark, registerTextMark, registerAreaMark, registerRectMark, registerPathMark, registerArcMark, registerPolygonMark, registerGlyphMark, registerRippleMark, registerImageMark, registerComponentMark, registerMarkMapTransform, registerMarkFilterTransform }; export declare const registerAllMarks: () => void; diff --git a/packages/vchart-types/types/mark/polygon/pyramid-3d.d.ts b/packages/vchart-types/types/mark/polygon/pyramid-3d.d.ts deleted file mode 100644 index 5b734b916e..0000000000 --- a/packages/vchart-types/types/mark/polygon/pyramid-3d.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { IPyramid3dMarkSpec } from '../../typings/visual'; -import { MarkTypeEnum } from '../interface/type'; -import { BasePolygonMark } from './base-polygon'; -import type { IPyramid3dMark } from '../interface/mark'; -export declare class Pyramid3dMark extends BasePolygonMark implements IPyramid3dMark { - static readonly type = MarkTypeEnum.pyramid3d; - readonly type = MarkTypeEnum.pyramid3d; -} -export declare const registerPyramid3dMark: () => void; diff --git a/packages/vchart-types/types/mark/progress-arc.d.ts b/packages/vchart-types/types/mark/progress-arc.d.ts deleted file mode 100644 index a75963c3a4..0000000000 --- a/packages/vchart-types/types/mark/progress-arc.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -import type { StateValueType } from '../typings/spec'; -import type { ConvertToMarkStyleSpec, IProgressArcMarkSpec } from '../typings/visual'; -import type { IMarkRaw, IMarkStateStyle, IMarkStyle } from './interface'; -import { MarkTypeEnum } from './interface/type'; -import { BaseArcMark } from './arc'; -export type IProgressArcMark = IMarkRaw; -export declare class ProgressArcMark extends BaseArcMark implements IProgressArcMark { - static readonly type = MarkTypeEnum.arc; - static readonly constructorType = MarkTypeEnum.progressArc; - protected _cacheStateStyle: IMarkStateStyle; - protected _getDefaultStyle(): IMarkStyle; - protected _filterStyle(style: Partial>, state: StateValueType, level: number, stateStyle?: IMarkStateStyle): Partial> | Partial>; -} -export declare const registerProgressArcMark: () => void; diff --git a/packages/vchart-types/types/mark/rect-3d.d.ts b/packages/vchart-types/types/mark/rect-3d.d.ts deleted file mode 100644 index ac9113bf37..0000000000 --- a/packages/vchart-types/types/mark/rect-3d.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { IRect3dMarkSpec } from '../typings/visual'; -import { BaseMark } from './base/base-mark'; -import type { IMarkStyle, IRect3dMark } from './interface'; -import { MarkTypeEnum } from './interface/type'; -export declare class Rect3dMark extends BaseMark implements IRect3dMark { - static readonly type = MarkTypeEnum.rect3d; - readonly type = MarkTypeEnum.rect3d; - protected _getDefaultStyle(): IMarkStyle; -} -export declare const registerRect3dMark: () => void; diff --git a/packages/vchart-types/types/model/layout-item.d.ts b/packages/vchart-types/types/model/layout-item.d.ts deleted file mode 100644 index 7d0619ed76..0000000000 --- a/packages/vchart-types/types/model/layout-item.d.ts +++ /dev/null @@ -1,59 +0,0 @@ -import type { IRect, IPoint } from '../typings'; -import type { IBoundsLike } from '@visactor/vutils'; -import type { ILayoutItem, ILayoutItemSpec, ILayoutPoint, ILayoutRect, ILayoutRectLevel } from './interface'; -import { CompilableBase } from '../compile/compilable-base'; -export declare class LayoutItem extends CompilableBase implements ILayoutItem { - protected _spec: T; - getSpec(): T; - layoutClip: boolean; - protected _autoIndent: boolean; - getAutoIndent(): boolean; - private _layoutStartPoint; - getLayoutStartPoint(): ILayoutPoint; - private _layoutRect; - protected _minWidth: number | null; - protected _maxWidth: number | null; - protected _minHeight: number | null; - protected _maxHeight: number | null; - protected _layoutRectLevelMap: ILayoutRectLevel; - protected _lastComputeRect: ILayoutRect; - protected _lastComputeOutBounds: IBoundsLike; - getLastComputeOutBounds(): IBoundsLike; - protected _forceLayoutTag: boolean; - getLayoutRect: () => ILayoutRect; - layoutType: ILayoutItem['layoutType']; - layoutBindRegionID: ILayoutItem['layoutBindRegionID']; - _layoutOrient: ILayoutItem['layoutOrient']; - get layoutOrient(): ILayoutItem['layoutOrient']; - set layoutOrient(v: ILayoutItem['layoutOrient']); - layoutPaddingLeft: ILayoutItem['layoutPaddingLeft']; - layoutPaddingTop: ILayoutItem['layoutPaddingTop']; - layoutPaddingRight: ILayoutItem['layoutPaddingRight']; - layoutPaddingBottom: ILayoutItem['layoutPaddingBottom']; - layoutOffsetX: ILayoutItem['layoutOffsetX']; - layoutOffsetY: ILayoutItem['layoutOffsetY']; - layoutLevel: ILayoutItem['layoutLevel']; - layoutZIndex: ILayoutItem['layoutZIndex']; - chartLayoutRect: ILayoutRect; - getVisible(): boolean; - private _setLayoutAttributeFromSpec; - setAttrFromSpec(spec: ILayoutItemSpec, chartViewRect: ILayoutRect): void; - onLayoutStart(layoutRect: IRect, viewRect: ILayoutRect, _ctx: any): void; - private _getAbsoluteSpecValue; - absoluteLayoutInRect(layoutRect: IRect): void; - setLayoutStartPosition({ x, y }: Partial): void; - setLayoutRect({ width, height }: Partial, levelMap?: Partial): void; - mergeLayoutRect({ width, height }: ILayoutRect): ILayoutRect; - getOrientPosAttribute(): "x" | "y"; - getOrientSizeAttribute(): "width" | "height"; - protected changeBoundsBySetting(bounds: IBoundsLike): IBoundsLike; - protected _setRectInSpec(rect: ILayoutRect): { - width: number; - height: number; - }; - computeBoundsInRect(rect: ILayoutRect): ILayoutRect; - protected _boundsInRect(rect: ILayoutRect, fullSpace: ILayoutRect): IBoundsLike; - updateLayoutAttribute(): void; - compile(): void; - getGraphicBounds(): IBoundsLike; -} diff --git a/packages/vchart-types/types/model/tooltip-helper.d.ts b/packages/vchart-types/types/model/tooltip-helper.d.ts deleted file mode 100644 index d4ac9104a3..0000000000 --- a/packages/vchart-types/types/model/tooltip-helper.d.ts +++ /dev/null @@ -1,29 +0,0 @@ -import type { ITooltipSpec } from '../component/tooltip/interface'; -import type { TooltipActiveType } from '../typings'; -import type { IModel } from './interface'; -import type { IMark } from '../mark/interface'; -export type TooltipTrigger = IModel | IMark; -export interface ITooltipHelper { - spec: ITooltipSpec | undefined; - activeType: TooltipActiveType[]; - activeTriggerSet: { - mark?: Set; - group?: Set; - }; - ignoreTriggerSet: { - mark?: Set; - }; - updateTooltipSpec: () => void; -} -export declare abstract class BaseTooltipHelper implements ITooltipHelper { - spec: ITooltipSpec | undefined; - activeType: TooltipActiveType[]; - activeTriggerSet: { - mark: Set; - group: Set; - }; - ignoreTriggerSet: { - mark: Set; - }; - abstract updateTooltipSpec(): void; -} diff --git a/packages/vchart-types/types/plugin/chart/media-query/interface/spec.d.ts b/packages/vchart-types/types/plugin/chart/media-query/interface/spec.d.ts deleted file mode 100644 index 776dbc1218..0000000000 --- a/packages/vchart-types/types/plugin/chart/media-query/interface/spec.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { ComponentTypeEnum } from '../../../../component/interface'; -import type { IChartSpec, IVChart } from '../../../../core'; -import type { IModelSpecInfo } from '../../../../model/interface'; -import type { SeriesTypeEnum } from '../../../../series'; -import type { IMediaInfo } from './common'; -export type IMediaQuerySpec = IMediaQueryItem[]; -export interface IMediaQueryItem { - query: IMediaQueryCondition; - action: IMediaQueryAction | IMediaQueryAction[]; -} -export interface IMediaQueryCondition { - minWidth?: number; - maxWidth?: number; - minHeight?: number; - maxHeight?: number; - onResize?: (info: IMediaInfo, vchart: IVChart) => boolean; -} -export interface IMediaQueryAction = any> { - spec: Partial | ((filteredModelInfo: IModelSpecInfo[], action: IMediaQueryAction, query: IMediaQueryCondition) => Partial); - filterType?: MediaQueryActionFilterType; - filter?: MediaQueryActionFilter | Array>; - forceAppend?: boolean; -} -export type MediaQueryActionFilterType = 'region' | 'series' | 'chart' | `${SeriesTypeEnum}` | `${ComponentTypeEnum}` | keyof IChartSpec; -export type MediaQueryActionFilter = any> = Partial | ((modelInfo: IModelSpecInfo, action: IMediaQueryAction, query: IMediaQueryCondition) => boolean); diff --git a/packages/vchart-types/types/plugin/components/axis-sync-plugin/axis-sync.d.ts b/packages/vchart-types/types/plugin/components/axis-sync-plugin/axis-sync.d.ts deleted file mode 100644 index ebabe16e21..0000000000 --- a/packages/vchart-types/types/plugin/components/axis-sync-plugin/axis-sync.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { IComponentPlugin, IComponentPluginService } from '../interface'; -import type { CartesianAxis, ILinearAxisSync } from '../../../component/axis/cartesian'; -import { BasePlugin } from '../../base/base-plugin'; -export declare class AxisSyncPlugin extends BasePlugin implements IComponentPlugin { - static readonly pluginType: 'component'; - static readonly type: string; - readonly type: string; - constructor(); - protected _checkEnableSync(axis: CartesianAxis): ILinearAxisSync | false; - private _getTargetAxis; - onInit(service: IComponentPluginService, axis: CartesianAxis): void; - onDidCompile(service: IComponentPluginService, axis: CartesianAxis): void; -} diff --git a/packages/vchart-types/types/plugin/components/axis-sync-plugin/index.d.ts b/packages/vchart-types/types/plugin/components/axis-sync-plugin/index.d.ts deleted file mode 100644 index 460cc6e434..0000000000 --- a/packages/vchart-types/types/plugin/components/axis-sync-plugin/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './axis-sync'; diff --git a/packages/vchart-types/types/plugin/components/axis-sync-plugin/tick-align-transform.d.ts b/packages/vchart-types/types/plugin/components/axis-sync-plugin/tick-align-transform.d.ts deleted file mode 100644 index 7984917528..0000000000 --- a/packages/vchart-types/types/plugin/components/axis-sync-plugin/tick-align-transform.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import type { Datum } from '../../../typings'; -import type { CartesianAxis } from '../../../component'; -export interface ITickAlignOpt { - targetAxis: () => CartesianAxis; - currentAxis: () => CartesianAxis; -} -export declare const tickAlign: (data: Array, op: ITickAlignOpt) => Datum[]; diff --git a/packages/vchart-types/types/plugin/components/axis-sync-plugin/zero-align-transform.d.ts b/packages/vchart-types/types/plugin/components/axis-sync-plugin/zero-align-transform.d.ts deleted file mode 100644 index 55dab76914..0000000000 --- a/packages/vchart-types/types/plugin/components/axis-sync-plugin/zero-align-transform.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { CartesianAxis } from '../../../component'; -import type { LinearAxisMixin } from '../../../component/axis/mixin/linear-axis-mixin'; -type ScaleInfo = { - total: number; - negative: number; - positive: number; - includeZero: boolean; - extendable_min: boolean; - extendable_max: boolean; - domain: number[]; -}; -export declare function isValidAlignDomain(domain: number[]): boolean; -export declare function getScaleInfo(axis: LinearAxisMixin, domain: number[]): ScaleInfo; -export declare const zeroAlign: (targetAxis: CartesianAxis, currentAxis: CartesianAxis) => void; -export {}; diff --git a/packages/vchart-types/types/plugin/components/basic-plugin.d.ts b/packages/vchart-types/types/plugin/components/basic-plugin.d.ts deleted file mode 100644 index aca3cf7fdf..0000000000 --- a/packages/vchart-types/types/plugin/components/basic-plugin.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { IComponentPlugin, IComponentPluginService } from './interface'; -export declare class BasicComponentPlugin implements IComponentPlugin { - readonly id: number; - readonly name: string; - protected service?: IComponentPluginService; - static Name: string; - constructor(name?: string); - onAdd(service: IComponentPluginService): void; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/canvas/canvas-tooltip-handler.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/canvas/canvas-tooltip-handler.d.ts deleted file mode 100644 index f3ad8c2968..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/canvas/canvas-tooltip-handler.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { BaseTooltipHandler } from '../base'; -import { Tooltip as TooltipComponent } from '@visactor/vrender-components'; -import type { TooltipHandlerParams } from '../../../../component/tooltip'; -import type { IComponentPluginService } from '../../interface'; -export declare class CanvasTooltipHandler extends BaseTooltipHandler { - static readonly type: string; - readonly type: string; - private _layer; - protected _el?: HTMLCanvasElement; - protected _tooltipCanvasId?: string; - protected _tooltipComponent: TooltipComponent; - constructor(); - onAdd(service: IComponentPluginService): void; - private _initTooltipComponent; - private _getLayer; - protected _removeTooltip(): void; - protected _updateTooltip(visible: boolean, params: TooltipHandlerParams): void; - isTooltipShown(): boolean; - release(): void; -} -export declare const registerCanvasTooltipHandler: () => void; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/canvas/index.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/canvas/index.d.ts deleted file mode 100644 index f79fd19eb9..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/canvas/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './canvas-tooltip-handler'; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/constant.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/constant.d.ts deleted file mode 100644 index b249018c0d..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/constant.d.ts +++ /dev/null @@ -1 +0,0 @@ -export declare const DEFAULT_TOOLTIP_Z_INDEX = "99999999999999"; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/dom-tooltip-handler.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/dom-tooltip-handler.d.ts deleted file mode 100644 index 7be03d0193..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/dom-tooltip-handler.d.ts +++ /dev/null @@ -1,31 +0,0 @@ -import type { ITooltipActual, ITooltipPositionActual } from '../../../../typings/tooltip'; -import { BaseTooltipHandler } from '../base'; -import type { IDomTooltipStyle } from './interface'; -import { TooltipModel } from './model/tooltip-model'; -import { type Maybe } from '@visactor/vutils'; -import type { ITooltipSpec, TooltipHandlerParams } from '../../../../component/tooltip'; -import type { IComponentPluginService } from '../../interface'; -import type { ILayoutPoint } from '../../../../typings'; -export declare class DomTooltipHandler extends BaseTooltipHandler { - static readonly type: string; - readonly type: string; - protected _tooltipContainer: HTMLElement; - protected _domStyle: IDomTooltipStyle; - protected _tooltipActual?: ITooltipActual; - protected _container: Maybe; - protected _cacheCustomTooltipPosition: ILayoutPoint; - protected model: TooltipModel; - getVisibility(): boolean; - setVisibility(_value: boolean): void; - constructor(); - onAdd(service: IComponentPluginService): void; - initEl(): void; - protected _removeTooltip(): void; - protected _updateTooltip(visible: boolean, params: TooltipHandlerParams): void; - protected _initStyle(): void; - protected _getParentElement(spec: ITooltipSpec): HTMLElement; - isTooltipShown(): boolean; - reInit(): void; - protected _updatePosition({ x, y }: ITooltipPositionActual): void; -} -export declare const registerDomTooltipHandler: () => void; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/index.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/index.d.ts deleted file mode 100644 index fabd8b2219..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './dom-tooltip-handler'; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/interface.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/interface.d.ts deleted file mode 100644 index ec15af7a41..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/interface.d.ts +++ /dev/null @@ -1,58 +0,0 @@ -import type { FontWeight, TextAlign } from '../../../../typings/visual'; -export interface IDomTooltipStyle { - panel: IPadding & IBorder & { - width?: string; - height?: string; - minHeight?: string; - backgroundColor?: string; - boxShadow?: string; - pointerEvents?: 'auto' | 'none'; - transitionDuration?: string; - transitionProperty?: string; - transitionTimingFunction?: string; - }; - title: ILabelStyle; - content: IMargin; - shapeColumn: TooltipColumnStyle; - keyColumn: TooltipColumnStyle; - valueColumn: TooltipColumnStyle; - align?: 'left' | 'right'; -} -export type TooltipColumnStyle = IMargin & { - width?: string; - common?: T; - items?: T[]; -}; -export interface ILabelStyle extends IMargin { - fontFamily?: string; - fontSize?: string; - color?: string; - textAlign?: TextAlign; - lineHeight?: string; - fontWeight?: FontWeight; - whiteSpace?: string; - wordBreak?: string; - maxWidth?: string; - width?: string; -} -export interface IShapeStyle extends IMargin { - width?: string; - height?: string; -} -export interface IMargin { - marginLeft?: string; - marginRight?: string; - marginTop?: string; - marginBottom?: string; -} -export interface IPadding { - paddingTop?: string; - paddingRight?: string; - paddingBottom?: string; - paddingLeft?: string; -} -export interface IBorder { - borderColor?: string; - borderWidth?: string; - borderRadius?: string; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/base-tooltip-model.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/base-tooltip-model.d.ts deleted file mode 100644 index 8f8c0f8a44..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/base-tooltip-model.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { Maybe } from '@visactor/vutils'; -import type { ITooltipLineActual } from '../../../../../typings'; -import type { ITooltipModelOption } from './interface'; -export declare class BaseTooltipModel { - static type: string; - static isInstance(obj: any): obj is BaseTooltipModel; - readonly type: string; - readonly parent: BaseTooltipModel | HTMLElement; - readonly childIndex: number; - protected _option: ITooltipModelOption; - setOption(option: ITooltipModelOption): void; - protected _renderContentCache: ITooltipLineActual[] | null; - children: Record; - product: Maybe; - getParentEl(): HTMLElement; - constructor(parent: BaseTooltipModel | HTMLElement, option: ITooltipModelOption, childIndex?: number); - init(classList?: string[], id?: string): void; - initAll(): void; - setStyle(style?: Partial): void; - setContent(content?: any): void; - setVisibility(visibility: boolean): void; - getVisibility(): boolean; - release(): void; - protected createElement(tag: keyof HTMLElementTagNameMap, classList?: string[], style?: Partial, id?: string): HTMLElement; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/content-column-model.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/content-column-model.d.ts deleted file mode 100644 index 6a2eca0fad..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/content-column-model.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import { BaseTooltipModel } from './base-tooltip-model'; -import type { ITooltipModelOption } from './interface'; -import type { IShapeSvgOption } from './shape-model'; -import type { ITooltipLineActual } from '../../../../../typings'; -export type ContentColumnType = 'shape-box' | 'key-box' | 'value-box'; -export declare class ContentColumnModel extends BaseTooltipModel { - readonly className: ContentColumnType; - constructor(parent: BaseTooltipModel | HTMLElement, option: ITooltipModelOption, className: ContentColumnType, childIndex?: number); - init(): void; - setStyle(): void; - setContent(): void; - protected _getContentColumnStyle(): import("../interface").TooltipColumnStyle | { - display?: string; - marginLeft?: string; - marginRight?: string; - marginTop?: string; - marginBottom?: string; - width?: string; - common?: import("../interface").IShapeStyle; - items?: import("../interface").IShapeStyle[]; - }; - protected _getShapeSvgOption(line: ITooltipLineActual, index: number): IShapeSvgOption; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/content-model.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/content-model.d.ts deleted file mode 100644 index e228fa674c..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/content-model.d.ts +++ /dev/null @@ -1,14 +0,0 @@ -import { BaseTooltipModel } from './base-tooltip-model'; -import { ContentColumnModel } from './content-column-model'; -import type { Maybe } from '@visactor/vutils'; -export declare class ContentModel extends BaseTooltipModel { - shapeBox: Maybe; - keyBox: Maybe; - valueBox: Maybe; - init(): void; - private _initBox; - setStyle(style?: Partial): void; - setContent(): void; - protected _getContentContainerStyle(): Partial; - release(): void; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/interface.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/interface.d.ts deleted file mode 100644 index 27804e1d57..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/interface.d.ts +++ /dev/null @@ -1,10 +0,0 @@ -import type { ITooltipActual, Maybe } from '../../../../../typings'; -import type { IDomTooltipStyle } from '../interface'; -import type { ITooltipAttributes } from '../../interface'; -export interface ITooltipModelOption { - valueToHtml: (value: any) => string; - getTooltipStyle: () => IDomTooltipStyle; - getTooltipActual: () => Maybe; - getTooltipAttributes: () => Maybe; - getContainer: () => HTMLElement; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/shape-model.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/shape-model.d.ts deleted file mode 100644 index 7ea60dca6f..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/shape-model.d.ts +++ /dev/null @@ -1,23 +0,0 @@ -import type { IGradientColor } from '@visactor/vrender-core'; -import type { ShapeType } from '../../../../../typings'; -import { BaseTooltipModel } from './base-tooltip-model'; -export interface IShapeSvgOption { - hasShape?: boolean; - symbolType?: ShapeType | string; - size?: string; - fill?: string | IGradientColor; - stroke?: string; - lineWidth?: number; - hollow?: boolean; - marginTop?: string; - index?: number; -} -export declare class ShapeModel extends BaseTooltipModel { - svg: SVGElement; - private _svgHtmlCache; - init(classList?: string[], id?: string, tag?: keyof HTMLElementTagNameMap): void; - setStyle(style?: Partial, option?: IShapeSvgOption): void; - setContent(option: IShapeSvgOption): void; - setSvg(option?: IShapeSvgOption): void; - release(): void; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/style-constants.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/style-constants.d.ts deleted file mode 100644 index dbe602fbf4..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/style-constants.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -export declare const defaultH2Style: Partial; -export declare const defaultContainerStyle: Partial; -export declare const defaultContentColumnStyle: Partial; -export declare const defaultKeyStyle: Partial; -export declare const defaultAdaptiveKeyStyle: Partial; -export declare const defaultValueStyle: Partial; -export declare const defaultShapeStyle: Partial; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/text-model.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/text-model.d.ts deleted file mode 100644 index 94f5be25bc..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/text-model.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { BaseTooltipModel } from './base-tooltip-model'; -export declare class TextModel extends BaseTooltipModel { - init(classList?: string[], id?: string, tag?: keyof HTMLElementTagNameMap): void; - setContent(content?: any, multiLine?: boolean): void; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/title-model.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/title-model.d.ts deleted file mode 100644 index 377c179459..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/title-model.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { Maybe } from '@visactor/vutils'; -import { BaseTooltipModel } from './base-tooltip-model'; -import { ShapeModel } from './shape-model'; -import { TextModel } from './text-model'; -export declare class TitleModel extends BaseTooltipModel { - shape: Maybe; - textSpan: Maybe; - init(): void; - private _initShape; - private _releaseShape; - private _initTextSpan; - setStyle(style?: Partial): void; - setContent(): void; - release(): void; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/tooltip-model.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/tooltip-model.d.ts deleted file mode 100644 index ebcfd68c86..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/model/tooltip-model.d.ts +++ /dev/null @@ -1,21 +0,0 @@ -import { BaseTooltipModel } from './base-tooltip-model'; -import { ContentModel } from './content-model'; -import type { ITooltipModelOption } from './interface'; -import { TitleModel } from './title-model'; -export declare class TooltipModel extends BaseTooltipModel { - title: TitleModel | null; - content: ContentModel | null; - private _classList; - private _id; - constructor(option: ITooltipModelOption, classList: string[], id: string); - setVisibility(visibility: boolean): void; - init(): void; - private _initPanel; - private _initTitle; - private _releaseTitle; - private _initContent; - private _releaseContent; - setStyle(): void; - setContent(): void; - release(): void; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/common.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/common.d.ts deleted file mode 100644 index 0f7e468c3b..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/common.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export declare const getPixelPropertyStr: (num?: number | number[], defaultStr?: string) => string; -export declare const pixelPropertyStrToNumber: (str: string) => number | number[]; -export declare const getScrollbarWidth: (container?: HTMLElement) => number; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/index.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/index.d.ts deleted file mode 100644 index bb63a3ab99..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './common'; -export * from './style'; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/style.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/style.d.ts deleted file mode 100644 index 13942c4cb7..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/dom/utils/style.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { Maybe } from '@visactor/vutils'; -import type { ITooltipAttributes } from '../../interface'; -import type { IDomTooltipStyle } from '../interface'; -export declare function getDomStyles(attributes?: Maybe): IDomTooltipStyle; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/interface/common.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/interface/common.d.ts deleted file mode 100644 index 425695506e..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/interface/common.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { ITooltipHandler } from '../../../../typings'; -export interface ITooltipHandlerConstructor { - new (): ITooltipHandler; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/interface/style.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/interface/style.d.ts deleted file mode 100644 index df131fbc1c..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/interface/style.d.ts +++ /dev/null @@ -1,13 +0,0 @@ -import type { TooltipAttributes } from '@visactor/vrender-components'; -import type { ITextAttribute, IFillStyle } from '@visactor/vrender-core'; -export interface ITooltipTextStyle extends Partial { - spacing?: number; - multiLine?: boolean; - maxWidth?: number; - autoWidth?: boolean; -} -export interface ITooltipAttributes extends TooltipAttributes { - panelDomHeight?: number; - maxContentHeight?: number; - align?: 'left' | 'right'; -} diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/utils/compose.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/utils/compose.d.ts deleted file mode 100644 index ebd85cbe03..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/utils/compose.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { ITooltipLinePattern, ITooltipPattern, TooltipData, ITooltipLineActual } from '../../../../typings/tooltip'; -import type { TooltipActualTitleContent, TooltipHandlerParams } from '../../../../component/tooltip'; -export declare const getShowContent: (pattern: ITooltipPattern, data: TooltipData, params: TooltipHandlerParams) => TooltipActualTitleContent | null; -export declare const getOneLineData: (datum: any, config: ITooltipLinePattern, params: TooltipHandlerParams) => ITooltipLineActual; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/utils/get-spec.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/utils/get-spec.d.ts deleted file mode 100644 index 08ff8de7dc..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/utils/get-spec.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { TooltipActiveType } from '../../../../typings'; -import type { ISeries } from '../../../../series/interface'; -import type { IDimensionInfo } from '../../../../event/events/dimension/interface'; -import type { ITooltipSpec } from '../../../../component/tooltip'; -export declare const getTooltipSpecForShow: (activeType: TooltipActiveType, globalSpec: ITooltipSpec, series?: ISeries, dimensionInfo?: IDimensionInfo[]) => ITooltipSpec; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/utils/index.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/utils/index.d.ts deleted file mode 100644 index 7b746d5a77..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/utils/index.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -export * from './common'; -export * from './position'; -export * from './attribute'; diff --git a/packages/vchart-types/types/plugin/components/tooltip-handler/utils/pattern.d.ts b/packages/vchart-types/types/plugin/components/tooltip-handler/utils/pattern.d.ts deleted file mode 100644 index 9b5bb34061..0000000000 --- a/packages/vchart-types/types/plugin/components/tooltip-handler/utils/pattern.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { IDimensionInfo } from '../../../../event/events/dimension/interface'; -import type { ISeries } from '../../../../series/interface'; -import type { ITooltipPattern, TooltipActiveType } from '../../../../typings'; -export declare const makeDefaultPattern: (series: ISeries, activeType: TooltipActiveType, dimensionInfo?: IDimensionInfo[]) => ITooltipPattern | null; diff --git a/packages/vchart-types/types/plugin/index.d.ts b/packages/vchart-types/types/plugin/index.d.ts deleted file mode 100644 index 914da9ab7f..0000000000 --- a/packages/vchart-types/types/plugin/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './chart'; -export * from './components'; diff --git a/packages/vchart-types/types/series/bar/bar-3d-transformer.d.ts b/packages/vchart-types/types/series/bar/bar-3d-transformer.d.ts deleted file mode 100644 index 71f74ca8e1..0000000000 --- a/packages/vchart-types/types/series/bar/bar-3d-transformer.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { IBar3dSeriesSpec, IBar3dSeriesTheme } from './interface'; -import { BarSeriesSpecTransformer } from './bar-transformer'; -export declare class Bar3dSeriesSpecTransformer extends BarSeriesSpecTransformer { - protected _transformLabelSpec(spec: T): void; -} diff --git a/packages/vchart-types/types/series/bar/bar-3d.d.ts b/packages/vchart-types/types/series/bar/bar-3d.d.ts deleted file mode 100644 index 7434d0f18a..0000000000 --- a/packages/vchart-types/types/series/bar/bar-3d.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { MarkTypeEnum } from '../../mark/interface/type'; -import type { SeriesMarkMap } from '../interface'; -import { SeriesTypeEnum, SeriesMarkNameEnum } from '../interface/type'; -import { BarSeries } from './bar'; -import type { IBar3dSeriesSpec } from './interface'; -import type { AdaptiveSpec } from '../../typings'; -export declare class Bar3dSeries extends BarSeries> { - static readonly type: string; - type: SeriesTypeEnum; - static readonly mark: SeriesMarkMap; - protected _barMarkName: SeriesMarkNameEnum; - protected _barMarkType: MarkTypeEnum; - static readonly transformerConstructor: any; - readonly transformerConstructor: any; -} -export declare const registerBar3dSeries: () => void; diff --git a/packages/vchart-types/types/series/base/series-data.d.ts b/packages/vchart-types/types/series/base/series-data.d.ts deleted file mode 100644 index 5446fcfd36..0000000000 --- a/packages/vchart-types/types/series/base/series-data.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import { CompilableData } from '../../compile/data/compilable-data'; -export declare class SeriesData extends CompilableData { - protected _compileProduct(): void; - generateProductId(): string; -} diff --git a/packages/vchart-types/types/series/dot/config.d.ts b/packages/vchart-types/types/series/dot/config.d.ts deleted file mode 100644 index fa7153d77e..0000000000 --- a/packages/vchart-types/types/series/dot/config.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -export declare const DEFAULT_GRID_BACKGROUND: { - fill: string; - fillOpacity: number; -}; diff --git a/packages/vchart-types/types/series/dot/constant.d.ts b/packages/vchart-types/types/series/dot/constant.d.ts deleted file mode 100644 index 3dbf5dd26f..0000000000 --- a/packages/vchart-types/types/series/dot/constant.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { SeriesMarkMap } from '../interface/common'; -export declare const dotSeriesMark: SeriesMarkMap; diff --git a/packages/vchart-types/types/series/dot/dot.d.ts b/packages/vchart-types/types/series/dot/dot.d.ts deleted file mode 100644 index f417ab5778..0000000000 --- a/packages/vchart-types/types/series/dot/dot.d.ts +++ /dev/null @@ -1,86 +0,0 @@ -import { CartesianSeries } from '../cartesian/cartesian'; -import type { Datum } from '../../typings'; -import type { IMark } from '../../mark/interface'; -import { SeriesTypeEnum } from '../interface/type'; -import type { IModelEvaluateOption } from '../../model/interface'; -import type { IFillMarkSpec, VisualType } from '../../typings/visual'; -import type { IDotSeriesSpec } from './interface'; -import type { SeriesMarkMap } from '../interface'; -export declare class DotSeries extends CartesianSeries { - static readonly type: string; - type: SeriesTypeEnum; - static readonly mark: SeriesMarkMap; - static readonly builtInTheme: { - dot: import("./interface").IDotSeriesTheme; - }; - private _xDimensionStatisticsDomain; - protected _seriesGroupField?: string; - getSeriesGroupField(): string; - setSeriesGroupField(field: string): void; - protected _titleField?: string; - getTitleField(): string; - setTitleField(field: string): void; - protected _subTitleField?: string; - getSubTitleField(): string; - setSubTitleField(field: string): void; - protected _dotTypeField?: string; - getDotTypeField(): string; - setDotTypeField(field: string): void; - protected _highLightSeriesGroup?: string; - getHighLightSeriesGroup(): string; - setHighLightSeriesGroup(field: string): void; - protected _gridBackground?: IFillMarkSpec; - setGridBackground(gridBackground: IFillMarkSpec): void; - protected _getSpecUpdatePolicy(): { - compileOnlyKeys: { - highLightSeriesGroup: true; - titleField: true; - subTitleField: true; - }; - compileOnlySubKeys: { - grid: Record<"background", true>; - }; - dataRelatedKeys?: Record; - seriesOnlyKeys?: Record; - }; - initData(): void; - getStatisticFields(): { - key: string; - operations: Array<'max' | 'min' | 'values'>; - customize: any[]; - }[]; - setAttrFromSpec(): void; - private _clipMark; - private _containerMark; - private _gridBackgroundMark; - private _gridMark; - private _dotMark; - private _titleMark; - private _subTitleMark; - private _symbolMark; - initMark(): void; - initMarkStyle(): void; - dataToGridBackgroundPositionY(datum: Datum): number; - dataToGridBackgroundPositionY1(datum: Datum): number; - dataToOpacity(datum: Datum): number; - dataToGridBackgroundOpacity(datum: Datum): VisualType; - onLayoutEnd(): void; - getDefaultColorDomain(): any; - getColorAttribute(): { - scale: any; - field: string; - }; - protected getDotColorScale(): any; - getDotColorAttribute(): { - scale: any; - field: string; - }; - protected initTooltip(): void; - onEvaluateEnd(ctx: IModelEvaluateOption): void; - protected onMarkTreePositionUpdate(marks: IMark[]): void; - getDotData(): import("../../compile/data").ICompilableData; - protected _getDataIdKey(): any; - getStackValueField(): string; - getActiveMarks(): IMark[]; -} -export declare const registerDotSeries: () => void; diff --git a/packages/vchart-types/types/series/dot/interface.d.ts b/packages/vchart-types/types/series/dot/interface.d.ts deleted file mode 100644 index bf1deece3f..0000000000 --- a/packages/vchart-types/types/series/dot/interface.d.ts +++ /dev/null @@ -1,40 +0,0 @@ -import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface'; -import type { IFormatMethod, IMarkSpec, IMarkTheme } from '../../typings/spec/common'; -import type { ISymbolMarkSpec, IRuleMarkSpec, ITextMarkSpec, ConvertToMarkStyleSpec } from '../../typings/visual'; -import type { SeriesMarkNameEnum } from '../interface/type'; -interface ISequenceLabel { - visible?: boolean; - formatMethod?: IFormatMethod<[text: string | string[], datum?: any]>; - style?: Omit, 'visible'>; -} -interface ISequenceGrid { - visible?: boolean; - background?: { - fill?: string; - fillOpacity?: number; - }; - style?: Omit, 'visible'>; -} -export interface IDotSeriesSpec extends ICartesianSeriesSpec { - type: 'dot'; - seriesGroupField?: string; - dotTypeField?: string; - titleField?: string; - subTitleField?: string; - highLightSeriesGroup?: string; - name: string; - [SeriesMarkNameEnum.dot]?: IMarkSpec; - [SeriesMarkNameEnum.title]?: ISequenceLabel; - [SeriesMarkNameEnum.symbol]?: IMarkSpec; - [SeriesMarkNameEnum.subTitle]?: ISequenceLabel; - [SeriesMarkNameEnum.grid]?: ISequenceGrid; - leftAppendPadding?: number; - clipHeight?: number; -} -export interface IDotSeriesTheme extends ICartesianSeriesTheme { - [SeriesMarkNameEnum.dot]?: Partial>; - [SeriesMarkNameEnum.symbol]?: Partial>; - [SeriesMarkNameEnum.title]?: ISequenceLabel; - [SeriesMarkNameEnum.subTitle]?: ISequenceLabel; -} -export {}; diff --git a/packages/vchart-types/types/series/dot/tooltip-helper.d.ts b/packages/vchart-types/types/series/dot/tooltip-helper.d.ts deleted file mode 100644 index d38dec37af..0000000000 --- a/packages/vchart-types/types/series/dot/tooltip-helper.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { ISeriesTooltipHelper } from '../interface'; -import { BaseSeriesTooltipHelper } from '../base/tooltip-helper'; -import type { Datum, ITooltipActual, ITooltipLinePattern, MaybeArray, TooltipActiveType, TooltipData, TooltipPatternProperty } from '../../typings'; -import type { ITooltipSpec } from '../../component/tooltip/interface/spec'; -import type { TooltipHandlerParams } from '../../component/tooltip/interface/common'; -export declare class DotSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper { - protected enableByType(activeType: TooltipActiveType): boolean; - protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern; - shapeTypeCallback: () => string; - protected getDefaultContentList(): MaybeArray>>; - getTooltipData(activeType: TooltipActiveType, chartTooltipSpec?: ITooltipSpec, data?: TooltipData, datum?: Datum[], params?: TooltipHandlerParams): ITooltipActual | null; -} diff --git a/packages/vchart-types/types/series/funnel/3d/funnel-3d-transformer.d.ts b/packages/vchart-types/types/series/funnel/3d/funnel-3d-transformer.d.ts deleted file mode 100644 index 00a66f0b42..0000000000 --- a/packages/vchart-types/types/series/funnel/3d/funnel-3d-transformer.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { AdaptiveSpec } from '../../../typings'; -import type { IFunnel3dSeriesSpec, IFunnel3dSeriesTheme } from '../interface'; -import { FunnelSeriesSpecTransformer } from '../funnel-transformer'; -export declare class Funnel3dSeriesSpecTransformer extends FunnelSeriesSpecTransformer, K> { - protected _transformLabelSpec(spec: AdaptiveSpec): void; -} diff --git a/packages/vchart-types/types/series/funnel/3d/funnel-3d.d.ts b/packages/vchart-types/types/series/funnel/3d/funnel-3d.d.ts deleted file mode 100644 index 90c8e10357..0000000000 --- a/packages/vchart-types/types/series/funnel/3d/funnel-3d.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import { MarkTypeEnum } from '../../../mark/interface/type'; -import type { SeriesMarkMap } from '../../interface'; -import { SeriesTypeEnum, SeriesMarkNameEnum } from '../../interface/type'; -import { FunnelSeries } from '../funnel'; -import type { IFunnel3dSeriesSpec } from '../interface'; -import type { AdaptiveSpec } from '../../../typings'; -import type { ILabelMark } from '../../../mark/interface'; -export declare class Funnel3dSeries extends FunnelSeries> { - static readonly type: string; - type: SeriesTypeEnum; - protected _funnelMarkName: SeriesMarkNameEnum; - protected _funnelMarkType: MarkTypeEnum; - protected _transformMarkName: SeriesMarkNameEnum; - protected _transformMarkType: MarkTypeEnum; - static readonly mark: SeriesMarkMap; - static readonly transformerConstructor: any; - readonly transformerConstructor: any; - initMark(): void; - initMarkStyle(): void; - initLabelMarkStyle(labelMark?: ILabelMark): void; -} -export declare const registerFunnel3dSeries: () => void; diff --git a/packages/vchart-types/types/series/funnel/3d/index.d.ts b/packages/vchart-types/types/series/funnel/3d/index.d.ts deleted file mode 100644 index 6bf181b3f1..0000000000 --- a/packages/vchart-types/types/series/funnel/3d/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './funnel-3d'; -export * from './funnel-3d-transformer'; diff --git a/packages/vchart-types/types/series/funnel/funnel-3d.d.ts b/packages/vchart-types/types/series/funnel/funnel-3d.d.ts deleted file mode 100644 index ffef13131b..0000000000 --- a/packages/vchart-types/types/series/funnel/funnel-3d.d.ts +++ /dev/null @@ -1,22 +0,0 @@ -import type { Maybe } from '@visactor/vutils'; -import { MarkTypeEnum } from '../../mark/interface/type'; -import type { SeriesMarkMap } from '../interface'; -import { SeriesTypeEnum, SeriesMarkNameEnum } from '../interface/type'; -import { FunnelSeries } from './funnel'; -import type { IFunnel3dSeriesSpec, IFunnel3dSeriesTheme } from './interface'; -import type { AdaptiveSpec } from '../../typings'; -import type { ILabelMark } from '../../mark/label'; -export declare class Funnel3dSeries extends FunnelSeries> { - static readonly type: string; - type: SeriesTypeEnum; - protected _funnelMarkName: SeriesMarkNameEnum; - protected _funnelMarkType: MarkTypeEnum; - protected _transformMarkName: SeriesMarkNameEnum; - protected _transformMarkType: MarkTypeEnum; - static readonly mark: SeriesMarkMap; - protected _theme: Maybe; - initMark(): void; - initMarkStyle(): void; - initLabelMarkStyle(labelMark?: ILabelMark): void; -} -export declare const registerFunnel3dSeries: () => void; diff --git a/packages/vchart-types/types/series/index.d.ts b/packages/vchart-types/types/series/index.d.ts index e3522e4066..a58283851f 100644 --- a/packages/vchart-types/types/series/index.d.ts +++ b/packages/vchart-types/types/series/index.d.ts @@ -24,10 +24,6 @@ import { RadarSeries, registerRadarSeries } from './radar/radar'; import type { IRadarSeriesSpec } from './radar/interface'; import { AreaSeries, registerAreaSeries } from './area/area'; import type { IAreaSeriesSpec } from './area/interface'; -import { DotSeries, registerDotSeries } from './dot/dot'; -import type { IDotSeriesSpec } from './dot/interface'; -import { LinkSeries, registerLinkSeries } from './link/link'; -import type { ILinkSeriesSpec } from './link/interface'; import { CircularProgressSeries, registerCircularProgressSeries } from './progress/circular/circular'; import type { ICircularProgressSeriesSpec } from './progress/circular/interface'; import { LinearProgressSeries, registerLinearProgressSeries } from './progress/linear/linear'; @@ -77,8 +73,8 @@ import { BaseSeriesTooltipHelper } from './base/tooltip-helper'; import { BaseSeriesSpecTransformer } from './base/base-series-transformer'; import { GeoSeries } from './geo/geo'; export { PositionEnum, barPresetAnimation, barGrowIn, barGrowOut, piePresetAnimation, pieEnter, pieExit, pieDisappear, baseSeriesMark }; -export { GeoSeries, BaseSeriesSpecTransformer, BaseSeriesTooltipHelper, WaterfallSeries, BarSeries, BarSeriesSpecTransformer, BoxPlotSeries, LineSeries, RadarSeries, RangeAreaSeries, RangeColumnSeriesSpecTransformer, RangeColumnSeries, MapSeries, PieSeriesSpecTransformer, BasePieSeries, PieSeries, SankeySeries, ScatterSeries, SunburstSeries, RoseLikeSeries, RoseSeries, AreaSeries, DotSeries, LinearProgressSeries, LinkSeries, CirclePackingSeries, CircularProgressSeries, BaseWordCloudSeries, WordCloudSeries, FunnelSeriesSpecTransformer, FunnelSeries, TreemapSeries, GaugePointerSeries, GaugeSeries, HeatmapSeries, BaseSeries, CartesianSeries, PolarSeries, ProgressLikeSeries, CorrelationSeries, LiquidSeries, VennSeries, MosaicSeries }; -export { registerAreaSeries, registerBarSeries, registerBarAnimation, registerBoxplotSeries, registerCirclePackingSeries, registerCircularProgressSeries, registerDotSeries, registerFunnelSeries, registerGaugePointerSeries, registerGaugeSeries, registerHeatmapSeries, registerLineSeries, registerLinearProgressSeries, registerLinkSeries, registerMapSeries, registerPieSeries, registerRadarSeries, registerRangeAreaSeries, registerRangeColumnSeries, registerRoseSeries, registerSankeySeries, registerScatterSeries, registerSunBurstSeries, registerTreemapSeries, registerWaterfallSeries, registerWordCloudSeries, registerLiquidSeries, registerVennSeries, registerMosaicSeries }; -export type { ICartesianSeriesTheme, IPolarSeriesTheme, IArcLabelSpec, IBarAnimationParams, BarAppearPreset, ISeries, ICartesianSeries, IPolarSeries, IGeoSeries, IRoseLikeSeriesSpec, IAreaSeriesSpec, IBarSeriesSpec, IBoxPlotSeriesSpec, ICartesianSeriesSpec, ICirclePackingSeriesSpec, ICircularProgressSeriesSpec, IDotSeriesSpec, IFunnelSeriesSpec, IGaugePointerSeriesSpec, IGaugeSeriesSpec, IHeatmapSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, ILinkSeriesSpec, IMapSeriesSpec, IPieAnimationParams, PieAppearPreset, IPieSeriesSpec, IPolarSeriesSpec, IProgressLikeSeriesSpec, IRadarSeriesSpec, IRangeAreaSeriesSpec, IRangeColumnSeriesTheme, IRangeColumnSeriesSpec, IRoseSeriesSpec, ISankeySeriesSpec, IScatterSeriesSpec, ISunburstSeriesSpec, ITreemapSeriesSpec, IWaterfallSeriesSpec, IWordCloudSeriesBaseSpec, IWordCloudSeriesSpec, ICorrelationSeriesSpec, ILiquidSeriesSpec, IVennSeriesSpec, IMosaicSeriesSpec }; +export { GeoSeries, BaseSeriesSpecTransformer, BaseSeriesTooltipHelper, WaterfallSeries, BarSeries, BarSeriesSpecTransformer, BoxPlotSeries, LineSeries, RadarSeries, RangeAreaSeries, RangeColumnSeriesSpecTransformer, RangeColumnSeries, MapSeries, PieSeriesSpecTransformer, BasePieSeries, PieSeries, SankeySeries, ScatterSeries, SunburstSeries, RoseLikeSeries, RoseSeries, AreaSeries, LinearProgressSeries, CirclePackingSeries, CircularProgressSeries, BaseWordCloudSeries, WordCloudSeries, FunnelSeriesSpecTransformer, FunnelSeries, TreemapSeries, GaugePointerSeries, GaugeSeries, HeatmapSeries, BaseSeries, CartesianSeries, PolarSeries, ProgressLikeSeries, CorrelationSeries, LiquidSeries, VennSeries, MosaicSeries }; +export { registerAreaSeries, registerBarSeries, registerBarAnimation, registerBoxplotSeries, registerCirclePackingSeries, registerCircularProgressSeries, registerFunnelSeries, registerGaugePointerSeries, registerGaugeSeries, registerHeatmapSeries, registerLineSeries, registerLinearProgressSeries, registerMapSeries, registerPieSeries, registerRadarSeries, registerRangeAreaSeries, registerRangeColumnSeries, registerRoseSeries, registerSankeySeries, registerScatterSeries, registerSunBurstSeries, registerTreemapSeries, registerWaterfallSeries, registerWordCloudSeries, registerLiquidSeries, registerVennSeries, registerMosaicSeries }; +export type { ICartesianSeriesTheme, IPolarSeriesTheme, IArcLabelSpec, IBarAnimationParams, BarAppearPreset, ISeries, ICartesianSeries, IPolarSeries, IGeoSeries, IRoseLikeSeriesSpec, IAreaSeriesSpec, IBarSeriesSpec, IBoxPlotSeriesSpec, ICartesianSeriesSpec, ICirclePackingSeriesSpec, ICircularProgressSeriesSpec, IFunnelSeriesSpec, IGaugePointerSeriesSpec, IGaugeSeriesSpec, IHeatmapSeriesSpec, ILineSeriesSpec, ILinearProgressSeriesSpec, IMapSeriesSpec, IPieAnimationParams, PieAppearPreset, IPieSeriesSpec, IPolarSeriesSpec, IProgressLikeSeriesSpec, IRadarSeriesSpec, IRangeAreaSeriesSpec, IRangeColumnSeriesTheme, IRangeColumnSeriesSpec, IRoseSeriesSpec, ISankeySeriesSpec, IScatterSeriesSpec, ISunburstSeriesSpec, ITreemapSeriesSpec, IWaterfallSeriesSpec, IWordCloudSeriesBaseSpec, IWordCloudSeriesSpec, ICorrelationSeriesSpec, ILiquidSeriesSpec, IVennSeriesSpec, IMosaicSeriesSpec }; export * from './interface'; export * from './util/utils'; diff --git a/packages/vchart-types/types/series/interface/theme.d.ts b/packages/vchart-types/types/series/interface/theme.d.ts index ffe520ec25..1864e4e68a 100644 --- a/packages/vchart-types/types/series/interface/theme.d.ts +++ b/packages/vchart-types/types/series/interface/theme.d.ts @@ -9,8 +9,6 @@ import type { IPieSeriesTheme } from '../pie/interface'; import type { IRoseSeriesTheme } from '../rose/interface'; import type { IMapSeriesTheme } from '../map/interface'; import type { ICircularProgressSeriesTheme } from '../progress/circular/interface'; -import type { ILinkSeriesTheme } from '../link/interface'; -import type { IDotSeriesTheme } from '../dot/interface'; import type { IWordCloudSeriesTheme } from '../word-cloud/interface'; import type { IFunnelSeriesTheme } from '../funnel/interface'; import type { ILinearProgressSeriesTheme } from '../progress/linear/interface'; @@ -68,8 +66,6 @@ export interface ISeriesTheme { [SeriesTypeEnum.map]?: IMapSeriesTheme; [SeriesTypeEnum.circularProgress]?: ICircularProgressSeriesTheme; [SeriesTypeForThemeEnum.circularProgress_stack]?: ICircularProgressSeriesTheme; - [SeriesTypeEnum.link]?: ILinkSeriesTheme; - [SeriesTypeEnum.dot]?: IDotSeriesTheme; [SeriesTypeEnum.wordCloud]?: IWordCloudSeriesTheme; [SeriesTypeEnum.funnel]?: IFunnelSeriesTheme; [SeriesTypeEnum.treemap]?: ITreemapSeriesTheme; diff --git a/packages/vchart-types/types/series/interface/type.d.ts b/packages/vchart-types/types/series/interface/type.d.ts index 27e2ded937..6822187a14 100644 --- a/packages/vchart-types/types/series/interface/type.d.ts +++ b/packages/vchart-types/types/series/interface/type.d.ts @@ -8,6 +8,7 @@ export declare enum SeriesTypeEnum { dot = "dot", geo = "geo", link = "link", + curveLink = "curveLink", map = "map", pie = "pie", radar = "radar", @@ -61,6 +62,8 @@ export declare const enum SeriesMarkNameEnum { cell = "cell", cellBackground = "cellBackground", link = "link", + curveLink = "curveLink", + imageLabel = "imageLabel", arrow = "arrow", pie = "pie", labelLine = "labelLine", diff --git a/packages/vchart-types/types/series/link/constant.d.ts b/packages/vchart-types/types/series/link/constant.d.ts deleted file mode 100644 index 6ddab7eb80..0000000000 --- a/packages/vchart-types/types/series/link/constant.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { SeriesMarkMap } from '../interface/common'; -export declare const linkSeriesMark: SeriesMarkMap; diff --git a/packages/vchart-types/types/series/link/interface.d.ts b/packages/vchart-types/types/series/link/interface.d.ts deleted file mode 100644 index 6f4f9a3145..0000000000 --- a/packages/vchart-types/types/series/link/interface.d.ts +++ /dev/null @@ -1,25 +0,0 @@ -import type { ICartesianSeriesSpec, ICartesianSeriesTheme } from '../cartesian/interface'; -import type { IMarkSpec, IMarkTheme } from '../../typings/spec/common'; -import type { ILineMarkSpec, ISymbolMarkSpec } from '../../typings/visual'; -import type { SeriesMarkNameEnum } from '../interface/type'; -import type { DataView } from '@visactor/vdataset'; -import type { IDotSeriesSpec } from '../dot/interface'; -export interface ILinkSeriesSpec extends ICartesianSeriesSpec, ILinkSeriesSpecFromDot { - type: 'link'; - fromField: string; - toField: string; - dotSeriesIndex: number; - dotTypeField?: string; - [SeriesMarkNameEnum.link]?: IMarkSpec; -} -type ILinkSeriesSpecFromDot = { - dataDot?: DataView; - dotSeriesSpec?: IDotSeriesSpec; - leftAppendPadding?: number; - clipHeight?: number; -}; -export interface ILinkSeriesTheme extends ICartesianSeriesTheme { - [SeriesMarkNameEnum.link]?: Partial>; - [SeriesMarkNameEnum.arrow]?: Partial>; -} -export {}; diff --git a/packages/vchart-types/types/series/link/link.d.ts b/packages/vchart-types/types/series/link/link.d.ts deleted file mode 100644 index 80fe5e8395..0000000000 --- a/packages/vchart-types/types/series/link/link.d.ts +++ /dev/null @@ -1,59 +0,0 @@ -import { CartesianSeries } from '../cartesian/cartesian'; -import type { Datum } from '../../typings'; -import type { IMark } from '../../mark/interface'; -import { SeriesTypeEnum } from '../interface/type'; -import type { IDotSeriesSpec } from '../dot/interface'; -import type { ILinkSeriesSpec } from './interface'; -import type { SeriesMarkMap } from '../interface'; -export declare class LinkSeries extends CartesianSeries { - static readonly type: string; - type: SeriesTypeEnum; - static readonly mark: SeriesMarkMap; - static readonly builtInTheme: { - link: import("./interface").ILinkSeriesTheme; - }; - protected _fromField?: string; - getFromField(): string; - setFromField(field: string): void; - protected _toField?: string; - getToField(): string; - setToField(field: string): void; - protected _dotTypeField?: string; - getDotTypeField(): string; - setDotTypeField(field: string): void; - protected _dotSeriesSpec?: IDotSeriesSpec; - getDotSeriesSpec(): IDotSeriesSpec; - setDotSeriesSpec(spec: IDotSeriesSpec): void; - protected _getDotData(): any; - initData(): void; - setAttrFromSpec(): void; - private _clipMark; - private _containerMark; - private _linkMark; - private _arrowMark; - initMark(): void; - initMarkStyle(): void; - afterInitMark(): void; - dataToPositionXFrom(datum: Datum): number; - dataToPositionYFrom(datum: Datum): number; - dataToPositionXTo(datum: Datum): number; - dataToPositionYTo(datum: Datum): number; - dataToPositionArrowYTo(datum: Datum, arrowSize: number): number; - dataToOpacity(datum: Datum): number; - isPositionYFromHigher(datum: Datum): boolean; - isPositionXOuterRange(datum: Datum, field: string): boolean; - getDefaultColorDomain(): any; - getColorAttribute(): { - scale: any; - field: string; - }; - getInteractionTriggers(): { - trigger: Partial; - marks: IMark[]; - }[]; - protected initTooltip(): void; - protected onMarkTreePositionUpdate(marks: IMark[]): void; - getDotInfoData(): import("../../compile/data").ICompilableData; - getActiveMarks(): IMark[]; -} -export declare const registerLinkSeries: () => void; diff --git a/packages/vchart-types/types/series/link/tooltip-helper.d.ts b/packages/vchart-types/types/series/link/tooltip-helper.d.ts deleted file mode 100644 index a86590fd7b..0000000000 --- a/packages/vchart-types/types/series/link/tooltip-helper.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { ISeriesTooltipHelper } from '../interface'; -import { BaseSeriesTooltipHelper } from '../base/tooltip-helper'; -import type { ITooltipLinePattern, TooltipActiveType } from '../../typings'; -export declare class LinkSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper { - protected enableByType(activeType: TooltipActiveType): boolean; - protected getDefaultTitlePattern(activeType: TooltipActiveType): ITooltipLinePattern; - shapeTypeCallback: () => string; - protected getDefaultContentList(): ITooltipLinePattern[]; -} diff --git a/packages/vchart-types/types/series/pictogram/constant.d.ts b/packages/vchart-types/types/series/pictogram/constant.d.ts deleted file mode 100644 index 34f1e35a0f..0000000000 --- a/packages/vchart-types/types/series/pictogram/constant.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { SeriesMarkMap } from '../interface/common'; -export declare const PictogramSeriesMark: SeriesMarkMap; diff --git a/packages/vchart-types/types/series/pictogram/interface.d.ts b/packages/vchart-types/types/series/pictogram/interface.d.ts deleted file mode 100644 index 049dca9335..0000000000 --- a/packages/vchart-types/types/series/pictogram/interface.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import type { IPathMarkSpec } from '../../typings/visual'; -import type { IMarkSpec, IMarkTheme, ISeriesSpec } from '../../typings/spec/common'; -import type { IAnimationSpec } from '../../animation/spec'; -export interface IPictogramSeriesSpec extends ISeriesSpec, IAnimationSpec<'pictogram', 'fadeIn'> { - type: 'pictogram'; - svg: string; - nameField?: string; - valueField?: string; - pictogram?: IMarkSpec>; - defaultFillColor?: string; -} -export interface IPictogramThemeSpec { - defaultFillColor?: string; - pictogram?: Partial>>; -} diff --git a/packages/vchart-types/types/series/pictogram/pictogram-transformer.d.ts b/packages/vchart-types/types/series/pictogram/pictogram-transformer.d.ts deleted file mode 100644 index dbcee5b0bd..0000000000 --- a/packages/vchart-types/types/series/pictogram/pictogram-transformer.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { ISeriesSpec } from '../../typings'; -import { BaseSeriesSpecTransformer } from '../base'; -export declare class PictogramSeriesSpecTransformer extends BaseSeriesSpecTransformer { - protected _getDefaultSpecFromChart(chartSpec: any): any; -} diff --git a/packages/vchart-types/types/series/pictogram/pictogram.d.ts b/packages/vchart-types/types/series/pictogram/pictogram.d.ts deleted file mode 100644 index 82626e1245..0000000000 --- a/packages/vchart-types/types/series/pictogram/pictogram.d.ts +++ /dev/null @@ -1,80 +0,0 @@ -import type { SVGParsedElement, SVGParserResult } from '@visactor/vdataset'; -import type { PanEventParam, ZoomEventParam } from '../../core'; -import { GeoSeries } from '../geo/geo'; -import type { ISeriesSeriesInfo, SeriesMarkMap } from '../interface'; -import { SeriesTypeEnum } from '../interface'; -import type { IPictogramSeriesSpec } from './interface'; -import type { GroupMark } from '../../mark'; -import { PictogramSeriesSpecTransformer } from './pictogram-transformer'; -import type { IMatrix } from '@visactor/vutils'; -import type { Datum } from '../../typings'; -import type { Group } from '@visactor/vrender-core'; -import type { IHoverSpec, ISelectSpec } from '../../interaction/interface'; -import { STATE_VALUE_ENUM } from '../../compile/mark'; -import type { EventType } from '@visactor/vgrammar-core'; -import type { IMark } from '../../mark/interface'; -import type { IPoint } from '../../typings/coordinate'; -export interface SVGParsedElementExtend extends SVGParsedElement { - _finalAttributes: Record; - _uniqueId: string; -} -export declare class PictogramSeries extends GeoSeries { - static readonly type: string; - type: SeriesTypeEnum; - static readonly mark: SeriesMarkMap; - static readonly transformerConstructor: typeof PictogramSeriesSpecTransformer; - svg: string; - protected _pictogramMark: GroupMark; - protected _parsedSvgResult: SVGParserResult; - private _labelMark; - private _idToMark; - setAttrFromSpec(): void; - getDatumCenter(datum: SVGParsedElementExtend): [number, number]; - getDatumName(datum: SVGParsedElementExtend): string; - getMarksWithoutRoot(): IMark[]; - protected _buildMarkAttributeContext(): void; - protected _defaultHoverConfig(selector: string[], finalHoverSpec: IHoverSpec): { - seriesId: number; - regionId: number; - selector: string[]; - type: string; - trigger: EventType; - triggerOff: EventType; - blurState: STATE_VALUE_ENUM; - highlightState: STATE_VALUE_ENUM; - }; - protected _defaultSelectConfig(selector: string[], finalSelectSpec: ISelectSpec): { - type: string; - seriesId: number; - regionId: number; - selector: string[]; - trigger: EventType; - triggerOff: EventType; - reverseState: STATE_VALUE_ENUM; - state: STATE_VALUE_ENUM; - isMultiple: boolean; - }; - initMark(): void; - private _initLabelMark; - initLabelMarkStyle(): void; - initMarkStyle(): void; - protected _validElement(element: SVGParsedElement): string; - protected initTooltip(): void; - dataToPosition(datum: Datum, global?: boolean): IPoint; - coordToPosition(point: IPoint): IPoint | undefined; - getRootMatrix(): IMatrix; - getPictogramRootGraphic(): Group; - initData(): void; - mapViewDataUpdate(): void; - onLayoutEnd(ctx: any): void; - updateSVGSize(): void; - protected initEvent(): void; - handleZoom(e: ZoomEventParam): void; - handlePan(e: PanEventParam): void; - getMarkData(datum: Datum): any; - getMeasureField(): string[]; - getDimensionField(): string[]; - protected _getSeriesInfo(field: string, keys: string[]): ISeriesSeriesInfo[]; - release(): void; -} -export declare const registerPictogramSeries: () => void; diff --git a/packages/vchart-types/types/series/pictogram/svg-source.d.ts b/packages/vchart-types/types/series/pictogram/svg-source.d.ts deleted file mode 100644 index 93808a42c0..0000000000 --- a/packages/vchart-types/types/series/pictogram/svg-source.d.ts +++ /dev/null @@ -1,7 +0,0 @@ -import { DataView } from '@visactor/vdataset'; -import type { ISVGSourceOption } from '@visactor/vdataset'; -export declare const svgSourceMap: Map; -export declare function registerSVGSource(key: string, source: ISVGSourceOption): void; -export declare function unregisterSVGSource(key: string): void; -export declare function getSVGSource(type: string): DataView; -export declare function clearSVGSource(): void; diff --git a/packages/vchart-types/types/series/pictogram/tooltip-helper.d.ts b/packages/vchart-types/types/series/pictogram/tooltip-helper.d.ts deleted file mode 100644 index 967eb81092..0000000000 --- a/packages/vchart-types/types/series/pictogram/tooltip-helper.d.ts +++ /dev/null @@ -1,9 +0,0 @@ -import type { ISeriesTooltipHelper } from '../interface'; -import { BaseSeriesTooltipHelper } from '../base/tooltip-helper'; -import type { TooltipHandlerParams } from '../../component'; -import type { Datum } from '../../typings'; -export declare class PictogramSeriesTooltipHelper extends BaseSeriesTooltipHelper implements ISeriesTooltipHelper { - dimensionTooltipTitleCallback: (datum: any) => any; - markTooltipValueCallback: (datum: Datum, params?: TooltipHandlerParams) => any; - markTooltipKeyCallback: (datum: Datum) => any; -} diff --git a/packages/vchart-types/types/series/pie/3d/index.d.ts b/packages/vchart-types/types/series/pie/3d/index.d.ts deleted file mode 100644 index b7be84dcfd..0000000000 --- a/packages/vchart-types/types/series/pie/3d/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './pie-3d'; -export * from './pie-3d-transformer'; diff --git a/packages/vchart-types/types/series/pie/3d/pie-3d-transformer.d.ts b/packages/vchart-types/types/series/pie/3d/pie-3d-transformer.d.ts deleted file mode 100644 index 79f7d4babe..0000000000 --- a/packages/vchart-types/types/series/pie/3d/pie-3d-transformer.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { IPie3dSeriesSpec, IPie3dSeriesTheme } from '../interface'; -import { PieSeriesSpecTransformer } from '../pie-transformer'; -export declare class Pie3dSeriesSpecTransformer extends PieSeriesSpecTransformer { - protected _transformLabelSpec(spec: T): void; -} diff --git a/packages/vchart-types/types/series/pie/3d/pie-3d.d.ts b/packages/vchart-types/types/series/pie/3d/pie-3d.d.ts deleted file mode 100644 index 5d55b69766..0000000000 --- a/packages/vchart-types/types/series/pie/3d/pie-3d.d.ts +++ /dev/null @@ -1,20 +0,0 @@ -import { MarkTypeEnum } from '../../../mark/interface/type'; -import type { IArcSeries, SeriesMarkMap } from '../../interface'; -import { SeriesMarkNameEnum, SeriesTypeEnum } from '../../interface/type'; -import type { IPie3dSeriesSpec } from '../interface'; -import { BasePieSeries } from '../pie'; -import type { ITextMark } from '../../../mark/interface'; -export declare class Pie3dSeries extends BasePieSeries implements IArcSeries { - static readonly type: string; - type: SeriesTypeEnum; - protected _pieMarkName: SeriesMarkNameEnum; - protected _pieMarkType: MarkTypeEnum; - static readonly mark: SeriesMarkMap; - static readonly transformerConstructor: any; - readonly transformerConstructor: any; - protected _angle3d: number; - setAttrFromSpec(): void; - initMarkStyle(): void; - initLabelMarkStyle(textMark: ITextMark, spec?: any): void; -} -export declare const registerPie3dSeries: () => void; diff --git a/packages/vchart-types/types/series/pie/pie-3d.d.ts b/packages/vchart-types/types/series/pie/pie-3d.d.ts deleted file mode 100644 index b74aba2dc3..0000000000 --- a/packages/vchart-types/types/series/pie/pie-3d.d.ts +++ /dev/null @@ -1,16 +0,0 @@ -import { MarkTypeEnum } from '../../mark/interface/type'; -import type { IArcSeries, SeriesMarkMap } from '../interface'; -import { SeriesMarkNameEnum, SeriesTypeEnum } from '../interface/type'; -import type { IPie3dSeriesSpec } from './interface'; -import { BasePieSeries } from './pie'; -export declare class Pie3dSeries extends BasePieSeries implements IArcSeries { - static readonly type: string; - type: SeriesTypeEnum; - protected _pieMarkName: SeriesMarkNameEnum; - protected _pieMarkType: MarkTypeEnum; - static readonly mark: SeriesMarkMap; - protected _angle3d: number; - setAttrFromSpec(): void; - initMarkStyle(): void; -} -export declare const registerPie3dSeries: () => void; diff --git a/packages/vchart-types/types/series/range-column/3d/index.d.ts b/packages/vchart-types/types/series/range-column/3d/index.d.ts deleted file mode 100644 index 63db50702f..0000000000 --- a/packages/vchart-types/types/series/range-column/3d/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export * from './range-column-3d'; -export * from './range-column-3d-transformer'; diff --git a/packages/vchart-types/types/series/range-column/3d/range-column-3d-transformer.d.ts b/packages/vchart-types/types/series/range-column/3d/range-column-3d-transformer.d.ts deleted file mode 100644 index 1a718c065e..0000000000 --- a/packages/vchart-types/types/series/range-column/3d/range-column-3d-transformer.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { IRangeColumn3dSeriesSpec, IRangeColumnSeriesTheme } from '../interface'; -import { RangeColumnSeriesSpecTransformer } from '../range-column-transformer'; -export declare class RangeColumn3dSeriesSpecTransformer extends RangeColumnSeriesSpecTransformer { - protected _transformLabelSpec(spec: T): void; -} diff --git a/packages/vchart-types/types/series/range-column/3d/range-column-3d.d.ts b/packages/vchart-types/types/series/range-column/3d/range-column-3d.d.ts deleted file mode 100644 index 34d59bc8d7..0000000000 --- a/packages/vchart-types/types/series/range-column/3d/range-column-3d.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { MarkTypeEnum } from '../../../mark/interface/type'; -import type { SeriesMarkMap } from '../../interface'; -import { SeriesTypeEnum } from '../../interface/type'; -import { RangeColumnSeries } from '../range-column'; -import type { AdaptiveSpec } from '../../../typings'; -import type { IRangeColumn3dSeriesSpec } from '../interface'; -export declare const DefaultBandWidth = 6; -export declare class RangeColumn3dSeries extends RangeColumnSeries> { - static readonly type: string; - type: SeriesTypeEnum; - protected _barMarkType: MarkTypeEnum; - protected _barName: string; - static readonly mark: SeriesMarkMap; -} -export declare const registerRangeColumn3dSeries: () => void; diff --git a/packages/vchart-types/types/series/range-column/range-column-3d.d.ts b/packages/vchart-types/types/series/range-column/range-column-3d.d.ts deleted file mode 100644 index bb07e09be7..0000000000 --- a/packages/vchart-types/types/series/range-column/range-column-3d.d.ts +++ /dev/null @@ -1,15 +0,0 @@ -import { MarkTypeEnum } from '../../mark/interface/type'; -import type { SeriesMarkMap } from '../interface'; -import { SeriesTypeEnum } from '../interface/type'; -import { RangeColumnSeries } from './range-column'; -import type { AdaptiveSpec } from '../../typings'; -import type { IRangeColumn3dSeriesSpec } from './interface'; -export declare const DefaultBandWidth = 6; -export declare class RangeColumn3dSeries extends RangeColumnSeries> { - static readonly type: string; - type: SeriesTypeEnum; - protected _barMarkType: MarkTypeEnum; - protected _barName: string; - static readonly mark: SeriesMarkMap; -} -export declare const registerRangeColumn3dSeries: () => void; diff --git a/packages/vchart-types/types/series/waterfall/waterfall.d.ts b/packages/vchart-types/types/series/waterfall/waterfall.d.ts index 261eb13e93..6fc990d986 100644 --- a/packages/vchart-types/types/series/waterfall/waterfall.d.ts +++ b/packages/vchart-types/types/series/waterfall/waterfall.d.ts @@ -50,7 +50,7 @@ export declare class WaterfallSeries extends BaseWordCloudSeries { - static readonly type: string; - type: SeriesTypeEnum; - protected _wordCloudTransformOption(): { - postProjection: "StereographicProjection"; - depth_3d: number; - constructor: Function; - toString(): string; - toLocaleString(): string; - valueOf(): Object; - hasOwnProperty(v: PropertyKey): boolean; - isPrototypeOf(v: Object): boolean; - propertyIsEnumerable(v: PropertyKey): boolean; - }; - protected _wordCloudShapeTransformOption(): { - postProjection: "StereographicProjection"; - depth_3d: number; - constructor: Function; - toString(): string; - toLocaleString(): string; - valueOf(): Object; - hasOwnProperty(v: PropertyKey): boolean; - isPrototypeOf(v: Object): boolean; - propertyIsEnumerable(v: PropertyKey): boolean; - }; - initMark(): void; - initMarkStyle(): void; - initAnimation(): void; -} -export declare const registerWordCloud3dSeries: () => void; -export declare const registerWordCloudShape3dSeries: () => void; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/band-axis.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/band-axis.d.ts deleted file mode 100644 index ee9e930adf..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/band-axis.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IBandAxisTheme } from '../../../../../component/axis'; -export declare const axisBand: IBandAxisTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/cartesian-axis.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/cartesian-axis.d.ts deleted file mode 100644 index 9d5110d72b..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/cartesian-axis.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { ICartesianAxisCommonTheme } from '../../../../../component/axis/cartesian/interface'; -export declare const axisX: ICartesianAxisCommonTheme; -export declare const axisY: ICartesianAxisCommonTheme; -export declare const axisZ: ICartesianAxisCommonTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/common-axis.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/common-axis.d.ts deleted file mode 100644 index bef9af77a4..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/common-axis.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IAxisCommonTheme } from '../../../../../component/axis'; -export declare const commonAxis: IAxisCommonTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/linear-axis.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/linear-axis.d.ts deleted file mode 100644 index 318ee34d4a..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/linear-axis.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IAxisCommonTheme } from '../../../../../component/axis'; -export declare const axisLinear: IAxisCommonTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/polar-axis.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/polar-axis.d.ts deleted file mode 100644 index b1bfcb63a8..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/axis/polar-axis.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { IPolarAxisCommonTheme } from '../../../../../component/axis/polar/interface/theme'; -export declare const axisRadius: IPolarAxisCommonTheme; -export declare const axisAngle: IPolarAxisCommonTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/crosshair.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/crosshair.d.ts deleted file mode 100644 index e6173d969f..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/crosshair.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ICrosshairTheme } from '../../../../component/crosshair/interface'; -export declare const crosshair: ICrosshairTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/data-zoom.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/data-zoom.d.ts deleted file mode 100644 index eeefddb430..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/data-zoom.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IDataZoomTheme } from '../../../../component/data-zoom'; -export declare const dataZoom: IDataZoomTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/index.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/index.d.ts deleted file mode 100644 index 625a284ffb..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IComponentTheme } from '../../../../component/interface'; -export declare const component: IComponentTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/indicator.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/indicator.d.ts deleted file mode 100644 index 76e750152f..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/indicator.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IIndicatorTheme } from '../../../../component/indicator/interface'; -export declare const indicator: IIndicatorTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/color-legend.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/color-legend.d.ts deleted file mode 100644 index 252f2f47b4..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/color-legend.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IColorLegendTheme } from '../../../../../component/legend'; -export declare const colorLegend: IColorLegendTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/continuous.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/continuous.d.ts deleted file mode 100644 index a1f4dba80a..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/continuous.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IContinuousLegendTheme } from '../../../../../component/legend'; -export declare const DEFAULT_CONTINUOUS_LEGEND_THEME: IContinuousLegendTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/discrete-legend.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/discrete-legend.d.ts deleted file mode 100644 index 94d0510768..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/discrete-legend.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IDiscreteLegendTheme } from '../../../../../component/legend'; -export declare const discreteLegend: IDiscreteLegendTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/size-legend.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/size-legend.d.ts deleted file mode 100644 index ea50113110..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/legend/size-legend.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ISizeLegendTheme } from '../../../../../component/legend'; -export declare const sizeLegend: ISizeLegendTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/map-label.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/map-label.d.ts deleted file mode 100644 index 1697d03512..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/map-label.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IMapLabelTheme } from '../../../../component/map-label'; -export declare const mapLabel: IMapLabelTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-area.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-area.d.ts deleted file mode 100644 index abf00ef437..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-area.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IMarkAreaTheme } from '../../../../component/marker/mark-area/interface'; -export declare const markArea: IMarkAreaTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-line.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-line.d.ts deleted file mode 100644 index 313746af9b..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-line.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IMarkLineTheme } from '../../../../component/marker/mark-line/interface'; -export declare const markLine: IMarkLineTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-point.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-point.d.ts deleted file mode 100644 index 8fd63890a8..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/mark-point.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IMarkPointTheme } from '../../../../component/marker/mark-point/interface'; -export declare const markPoint: IMarkPointTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/player.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/player.d.ts deleted file mode 100644 index 067bcb2952..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/player.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IPlayerTheme } from '../../../../component/player'; -export declare const player: IPlayerTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/poptip.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/poptip.d.ts deleted file mode 100644 index 3f7b90518d..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/poptip.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IPoptipTheme } from '../../../../component/poptip/interface'; -export declare const poptip: IPoptipTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/title.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/title.d.ts deleted file mode 100644 index 1f37abed05..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/title.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ITitleTheme } from '../../../../component/title/interface'; -export declare const title: ITitleTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/tooltip.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/tooltip.d.ts deleted file mode 100644 index 7ccd0e0309..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/tooltip.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ITooltipTheme } from '../../../../component/tooltip/interface'; -export declare const tooltip: ITooltipTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/component/total-label.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/component/total-label.d.ts deleted file mode 100644 index 8eb3f49f90..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/component/total-label.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ITotalLabelTheme } from '../../../../component/label'; -export declare const totalLabel: ITotalLabelTheme; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/constants.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/constants.d.ts deleted file mode 100644 index 66d300eca2..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/constants.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IThemeConstants } from '../../interface'; -export declare const THEME_CONSTANTS: IThemeConstants; diff --git a/packages/vchart-types/types/theme/builtin/common-mobile/mark.d.ts b/packages/vchart-types/types/theme/builtin/common-mobile/mark.d.ts deleted file mode 100644 index b2cc1bebce..0000000000 --- a/packages/vchart-types/types/theme/builtin/common-mobile/mark.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType } from '../../interface'; -export declare const markByType: IGlobalMarkThemeByType; -export declare const markByName: IGlobalMarkThemeByName; diff --git a/packages/vchart-types/types/theme/builtin/common/component/map-label.d.ts b/packages/vchart-types/types/theme/builtin/common/component/map-label.d.ts deleted file mode 100644 index 1697d03512..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/component/map-label.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IMapLabelTheme } from '../../../../component/map-label'; -export declare const mapLabel: IMapLabelTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/constants.d.ts b/packages/vchart-types/types/theme/builtin/common/constants.d.ts deleted file mode 100644 index 66d300eca2..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/constants.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IThemeConstants } from '../../interface'; -export declare const THEME_CONSTANTS: IThemeConstants; diff --git a/packages/vchart-types/types/theme/builtin/common/legacy/index.d.ts b/packages/vchart-types/types/theme/builtin/common/legacy/index.d.ts deleted file mode 100644 index a0482efaf7..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/legacy/index.d.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './legend'; diff --git a/packages/vchart-types/types/theme/builtin/common/legacy/legend/color-legend.d.ts b/packages/vchart-types/types/theme/builtin/common/legacy/legend/color-legend.d.ts deleted file mode 100644 index 252f2f47b4..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/legacy/legend/color-legend.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IColorLegendTheme } from '../../../../../component/legend'; -export declare const colorLegend: IColorLegendTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/legacy/legend/continuous.d.ts b/packages/vchart-types/types/theme/builtin/common/legacy/legend/continuous.d.ts deleted file mode 100644 index a1f4dba80a..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/legacy/legend/continuous.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IContinuousLegendTheme } from '../../../../../component/legend'; -export declare const DEFAULT_CONTINUOUS_LEGEND_THEME: IContinuousLegendTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/legacy/legend/index.d.ts b/packages/vchart-types/types/theme/builtin/common/legacy/legend/index.d.ts deleted file mode 100644 index 9288b3a606..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/legacy/legend/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -export { colorLegend as legacyColorLegendTheme } from './color-legend'; -export { sizeLegend as legacySizeLegendTheme } from './size-legend'; diff --git a/packages/vchart-types/types/theme/builtin/common/legacy/legend/size-legend.d.ts b/packages/vchart-types/types/theme/builtin/common/legacy/legend/size-legend.d.ts deleted file mode 100644 index ea50113110..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/legacy/legend/size-legend.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ISizeLegendTheme } from '../../../../../component/legend'; -export declare const sizeLegend: ISizeLegendTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/series/bar3d.d.ts b/packages/vchart-types/types/theme/builtin/common/series/bar3d.d.ts deleted file mode 100644 index 3addfacac4..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/series/bar3d.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IBar3dSeriesTheme } from '../../../../series/bar/interface'; -export declare const bar3d: IBar3dSeriesTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/series/dot.d.ts b/packages/vchart-types/types/theme/builtin/common/series/dot.d.ts deleted file mode 100644 index 4a9ff8f561..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/series/dot.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IDotSeriesTheme } from '../../../../series/dot/interface'; -export declare const dot: IDotSeriesTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/series/funnel3d.d.ts b/packages/vchart-types/types/theme/builtin/common/series/funnel3d.d.ts deleted file mode 100644 index 737eb6719b..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/series/funnel3d.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IFunnel3dSeriesTheme } from '../../../../series/funnel/interface'; -export declare const funnel3d: IFunnel3dSeriesTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/series/link.d.ts b/packages/vchart-types/types/theme/builtin/common/series/link.d.ts deleted file mode 100644 index 7dfedc5610..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/series/link.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ILinkSeriesTheme } from '../../../../series/link/interface'; -export declare const link: ILinkSeriesTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/series/pie3d.d.ts b/packages/vchart-types/types/theme/builtin/common/series/pie3d.d.ts deleted file mode 100644 index 6550a4abc9..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/series/pie3d.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IPie3dSeriesTheme } from '../../../../series/pie/interface'; -export declare const pie3d: IPie3dSeriesTheme; diff --git a/packages/vchart-types/types/theme/builtin/common/series/word-cloud3d.d.ts b/packages/vchart-types/types/theme/builtin/common/series/word-cloud3d.d.ts deleted file mode 100644 index 40b95d1295..0000000000 --- a/packages/vchart-types/types/theme/builtin/common/series/word-cloud3d.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { IWordCloud3dSeriesTheme } from '../../../../series/word-cloud/interface'; -export declare const wordCloud3d: IWordCloud3dSeriesTheme; diff --git a/packages/vchart-types/types/theme/builtin/dark-mobile/index.d.ts b/packages/vchart-types/types/theme/builtin/dark-mobile/index.d.ts deleted file mode 100644 index 2df013410d..0000000000 --- a/packages/vchart-types/types/theme/builtin/dark-mobile/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ITheme } from '../../interface'; -export declare const darkMobileTheme: ITheme; diff --git a/packages/vchart-types/types/theme/builtin/light-mobile/index.d.ts b/packages/vchart-types/types/theme/builtin/light-mobile/index.d.ts deleted file mode 100644 index ab1064b1e9..0000000000 --- a/packages/vchart-types/types/theme/builtin/light-mobile/index.d.ts +++ /dev/null @@ -1,2 +0,0 @@ -import type { ITheme } from '../../interface'; -export declare const lightMobileTheme: ITheme; diff --git a/packages/vchart-types/types/theme/util.d.ts b/packages/vchart-types/types/theme/util.d.ts deleted file mode 100644 index 1adc889706..0000000000 --- a/packages/vchart-types/types/theme/util.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -import type { ITheme } from './interface'; -import type { IThemeColorScheme } from './color-scheme/interface'; -import type { IModelOption } from '../model/interface'; -export declare const mergeThemeAndGet: (path: string, currentThemeName?: string, optionTheme?: string | ITheme, specTheme?: string | ITheme, colorScheme?: IThemeColorScheme) => any; -export declare const getThemeFromOption: (path: string, option: Partial) => any; diff --git a/packages/vchart-types/types/typings/spec/chart.d.ts b/packages/vchart-types/types/typings/spec/chart.d.ts index 2d0edadfcb..02fb054eae 100644 --- a/packages/vchart-types/types/typings/spec/chart.d.ts +++ b/packages/vchart-types/types/typings/spec/chart.d.ts @@ -18,7 +18,6 @@ import type { IRangeColumnChartSpec } from '../../chart/range-column/interface'; import type { IRoseChartSpec } from '../../chart/rose/interface'; import type { ISankeyChartSpec } from '../../chart/sankey/interface'; import type { IScatterChartSpec } from '../../chart/scatter/interface'; -import type { ISequenceChartSpec } from '../../chart/sequence/interface'; import type { ISunburstChartSpec } from '../../chart/sunburst/interface'; import type { ITreemapChartSpec } from '../../chart/treemap/interface'; import type { IWaterfallChartSpec } from '../../chart/waterfall/interface'; @@ -39,7 +38,6 @@ export interface ChartSpecMap { readonly radar: IRadarChartSpec; readonly rose: IRoseChartSpec; readonly scatter: IScatterChartSpec; - readonly sequence: ISequenceChartSpec; readonly circleProgress: ICircularProgressChartSpec; readonly linearProgress: ILinearProgressChartSpec; readonly wordCloud: IWordCloudChartSpec; diff --git a/packages/vchart-types/types/util/spec/background.d.ts b/packages/vchart-types/types/util/spec/background.d.ts deleted file mode 100644 index ddcd17ca40..0000000000 --- a/packages/vchart-types/types/util/spec/background.d.ts +++ /dev/null @@ -1,4 +0,0 @@ -import type { IBackgroundSpec, IBackgroundStyleSpec } from '../../typings'; -export declare function convertBackgroundSpec(bg: IBackgroundSpec): Omit & { - background?: IBackgroundStyleSpec['image']; -}; diff --git a/packages/vchart-types/types/util/spec/clone-deep.d.ts b/packages/vchart-types/types/util/spec/clone-deep.d.ts deleted file mode 100644 index 91f10f8693..0000000000 --- a/packages/vchart-types/types/util/spec/clone-deep.d.ts +++ /dev/null @@ -1 +0,0 @@ -export declare function cloneDeepSpec(spec: any, excludeKeys?: string[]): any; diff --git a/packages/vchart-types/types/util/spec/common.d.ts b/packages/vchart-types/types/util/spec/common.d.ts deleted file mode 100644 index 10c5cb406d..0000000000 --- a/packages/vchart-types/types/util/spec/common.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import { DataView } from '@visactor/vdataset'; -export declare function isDataView(obj: any): obj is DataView; -export declare function isHTMLElement(obj: any): obj is Element; diff --git a/packages/vchart-types/types/util/spec/merge-spec.d.ts b/packages/vchart-types/types/util/spec/merge-spec.d.ts deleted file mode 100644 index f90f469a0f..0000000000 --- a/packages/vchart-types/types/util/spec/merge-spec.d.ts +++ /dev/null @@ -1,5 +0,0 @@ -export declare function mergeSpec(target: any, ...sources: any[]): any; -export declare function mergeSpecWithFilter(target: any, filter: string | { - type: string; - index: number; -}, spec: any, forceMerge: boolean): void; diff --git a/packages/vchart-types/types/util/spec/merge-theme.d.ts b/packages/vchart-types/types/util/spec/merge-theme.d.ts deleted file mode 100644 index ee10c6dc25..0000000000 --- a/packages/vchart-types/types/util/spec/merge-theme.d.ts +++ /dev/null @@ -1,6 +0,0 @@ -import type { Maybe } from '@visactor/vutils'; -import type { IGlobalMarkThemeByName, IGlobalMarkThemeByType, ITheme } from '../../theme'; -import type { IThemeColorScheme } from '../../theme/color-scheme/interface'; -export declare function mergeTheme(target: Maybe, ...sources: Maybe[]): Maybe; -export declare function transformColorSchemeToMerge(colorScheme?: Maybe): Maybe; -export declare function transformSeriesThemeToMerge(seriesTheme: any, seriesType: string, markByType: IGlobalMarkThemeByType, markByName: IGlobalMarkThemeByName): any; diff --git a/packages/vchart-types/types/util/spec/preprocess.d.ts b/packages/vchart-types/types/util/spec/preprocess.d.ts deleted file mode 100644 index 016f0c3304..0000000000 --- a/packages/vchart-types/types/util/spec/preprocess.d.ts +++ /dev/null @@ -1,3 +0,0 @@ -import type { IThemeColorScheme } from '../../theme/color-scheme/interface'; -import type { ISeriesSpec } from '../../typings'; -export declare function preprocessTheme(obj: any, colorScheme?: IThemeColorScheme, seriesSpec?: ISeriesSpec): any; diff --git a/packages/vchart/__tests__/unit/component/data-zoom/sequence-analysis.test.ts b/packages/vchart/__tests__/unit/component/data-zoom/sequence-analysis.test.ts index cb569e3dfc..d6d0cb8168 100644 --- a/packages/vchart/__tests__/unit/component/data-zoom/sequence-analysis.test.ts +++ b/packages/vchart/__tests__/unit/component/data-zoom/sequence-analysis.test.ts @@ -2,7 +2,6 @@ import { DataSet, DataView } from '@visactor/vdataset'; import { BandScale, LinearScale, type IBandLikeScale } from '@visactor/vscale'; import { DataZoom } from '../../../../src/component/data-zoom/data-zoom/data-zoom'; import { dataFilterWithNewDomain } from '../../../../src/component/data-zoom/util'; -import { linkDotInfo } from '../../../../src/data/transforms/link-dot-info'; describe('sequence analysis DataZoom', () => { it('keeps nested dot domains and link filter fields without summing numeric-looking user IDs', () => { @@ -100,17 +99,12 @@ describe('sequence analysis DataZoom', () => { ['from', 'y'], ['source', 'y'] ])('filters links with fromField = %s on the %s axis', (fromField, dimension) => { - const links = ['a', 'b', 'c'].map(node => ({ [fromField]: node, target: 'c' })); - const data = linkDotInfo([], { - infoKey: 'dots', - fields: () => ({ fromField, toField: 'target', xField: 'time', yField: 'user' }), - linkData: () => links, - dotData: () => [ - { user: 20, dots: [{ node_name: 'a', time: 10 }] }, - { user: 50, dots: [{ node_name: 'b', time: 30 }] }, - { user: 30, dots: [{ node_name: 'c', time: 50 }] } - ] - }); + // 主包只消费系列提供的字段；扩展包负责验证原始连线到这些字段的转换及图表过滤。 + const data = [ + { [fromField]: 'a', [`${fromField}_xField`]: 10, [`${fromField}_yField`]: 20 }, + { [fromField]: 'b', [`${fromField}_xField`]: 30, [`${fromField}_yField`]: 50 }, + { [fromField]: 'c', [`${fromField}_xField`]: 50, [`${fromField}_yField`]: 30 } + ]; const series = { id: 1, type: 'link', diff --git a/packages/vchart/__tests__/unit/series/core-registration.test.ts b/packages/vchart/__tests__/unit/series/core-registration.test.ts new file mode 100644 index 0000000000..56c5ff2be9 --- /dev/null +++ b/packages/vchart/__tests__/unit/series/core-registration.test.ts @@ -0,0 +1,28 @@ +import { factoryRegistry } from '../../../src/core/factory-registry'; + +describe('core registration boundary', () => { + it('keeps sequence and dot/link opt-in in the full core bundle', () => { + const savedCharts = { ...factoryRegistry.charts }; + const savedSeries = { ...factoryRegistry.series }; + try { + delete factoryRegistry.charts.sequence; + delete factoryRegistry.series.dot; + delete factoryRegistry.series.link; + // Electron 测试共享全局 Factory；重新加载主包，验证它自身的导出和注册副作用。 + jest.isolateModules(() => { + const core = require('../../../src'); + for (const name of ['DotSeries', 'LinkSeries', 'registerDotSeries', 'registerLinkSeries']) { + expect(core).not.toHaveProperty(name); + } + expect(core.Factory.getChart('sequence')).toBeUndefined(); + expect(core.Factory.getSeriesInType('dot')).toBeUndefined(); + expect(core.Factory.getSeriesInType('link')).toBeUndefined(); + }); + } finally { + Object.keys(factoryRegistry.charts).forEach(key => delete factoryRegistry.charts[key]); + Object.keys(factoryRegistry.series).forEach(key => delete factoryRegistry.series[key]); + Object.assign(factoryRegistry.charts, savedCharts); + Object.assign(factoryRegistry.series, savedSeries); + } + }); +}); diff --git a/packages/vchart/__tests__/visual/README.md b/packages/vchart/__tests__/visual/README.md index de6870db2b..143b05f3f2 100644 --- a/packages/vchart/__tests__/visual/README.md +++ b/packages/vchart/__tests__/visual/README.md @@ -2,7 +2,7 @@ 工具结构见 [设计说明](./DESIGN.md)，用例选择与新增见 [用例指南](./cases/README.md)，平台实测范围见 [验收摘要](./cases/ACCEPTANCE.md)。 -使用同一批精简用例，在本机分别运行当前工作区与官方 `VisActor/VChart` 的 develop 构建，生成截图和差异报告。无需内网 BugServer 或访问凭证。图片差异表示需要检查，不等同于缺陷；两侧共同存在的错误仍需其他测试发现。 +使用同一批精简用例，在本机分别运行当前工作区与官方 `VisActor/VChart` 的 develop 构建，生成截图和差异报告。无需内网 BugServer 或访问凭证。本套件只构建、加载主包，并运行主包用例。图片差异表示需要检查，不等同于缺陷；两侧共同存在的错误仍需其他测试发现。 ## 准备 diff --git a/packages/vchart/__tests__/visual/cases/index.mjs b/packages/vchart/__tests__/visual/cases/index.mjs index 97ebb70209..5acdf7b01a 100644 --- a/packages/vchart/__tests__/visual/cases/index.mjs +++ b/packages/vchart/__tests__/visual/cases/index.mjs @@ -8,21 +8,6 @@ export const cases = [ { id: 'band-axis-update-spec', purpose: '分类轴 updateSpec 应用新的主题与标签样式', file: './components/axis/band-axis-update-spec.mjs' }, { id: 'legend-piecewise-domain', purpose: '多节点连续色域图例的完整范围', file: './components/legend/legend-piecewise-domain.mjs' }, { id: 'brush-link-data-key', purpose: '不同变量面板按观测标识联动框选', file: './interaction/brush-link-data-key.mjs' }, - { - id: 'sequence-preview-filter', - purpose: '时序图缩略图不累加用户 ID，连线随 dataZoom 时间选区过滤', - file: './components/datazoom/sequence-preview-filter.mjs' - }, - { - id: 'sequence-link-data', - purpose: 'dot 嵌套原始数据与更新后的连接端点', - file: './api/update/sequence-link-data.mjs' - }, - { - id: 'sequence-curve-link', - purpose: '曲线连接在配置与数据更新后保持路径稳定并应用公开 link 配置', - file: './api/update/sequence-curve-link.mjs' - }, { id: 'bar-stack', purpose: '正负值、堆叠与零基准线（bar）', diff --git a/packages/vchart/__tests__/visual/page.html b/packages/vchart/__tests__/visual/page.html index f8bb17e6fe..19977213ca 100644 --- a/packages/vchart/__tests__/visual/page.html +++ b/packages/vchart/__tests__/visual/page.html @@ -41,7 +41,7 @@ if (!selected || !['baseline', 'current'].includes(phase)) throw new Error('Invalid visual test input'); await new Promise((resolve, reject) => { const script = document.createElement('script'); - script.src = `/${phase}.js`; + script.src = phase === 'baseline' ? '/baseline.js' : '/current.js'; script.onload = resolve; script.onerror = () => reject(new Error('VChart bundle load failed')); document.head.append(script); diff --git a/packages/vchart/__tests__/visual/report.mjs b/packages/vchart/__tests__/visual/report.mjs index e3f01fdacc..865e9ab63e 100644 --- a/packages/vchart/__tests__/visual/report.mjs +++ b/packages/vchart/__tests__/visual/report.mjs @@ -96,6 +96,7 @@ export async function saveReport(runDir, summary) { issues.push({ phase, category: 'execution', code: 'RUN_INCOMPLETE', message: '阶段异常结束，保留已完成用例' }); } // 预检失败时尚未解析基线，复现仍应保留用户请求的 SHA 或自比较模式。 + const command = summary.command ?? 'node packages/vchart/scripts/visual-test.mjs'; const baselineSha = summary.baseline?.sha ?? summary.request?.baseline; const baselineArg = summary.baseline?.repository === 'working-tree' || summary.request?.['self-compare'] @@ -176,7 +177,7 @@ export async function saveReport(runDir, summary) { images, attachments, errors, - rerun: `node packages/vchart/scripts/visual-test.mjs ${baselineArg} --case ${quote(item.id)}`.replace(' ', ' ') + rerun: `${command} ${baselineArg} --case ${quote(item.id)}`.replace(' ', ' ') }); } const counts = Object.fromEntries( @@ -211,7 +212,7 @@ export async function saveReport(runDir, summary) { logs, rerun: selection ? [ - 'node packages/vchart/scripts/visual-test.mjs', + command, baselineArg, selection.mode === 'all' ? '' diff --git a/packages/vchart/jest.config.js b/packages/vchart/jest.config.js index 390522fe4c..1f7dd2aaea 100644 --- a/packages/vchart/jest.config.js +++ b/packages/vchart/jest.config.js @@ -69,7 +69,7 @@ module.exports = { ], moduleNameMapper: { 'd3-color': path.resolve(__dirname, './node_modules/d3-color/dist/d3-color.min.js'), - 'd3-array': path.resolve(process.cwd(), './node_modules/d3-array/dist/d3-array.min.js'), + 'd3-array': path.resolve(__dirname, './node_modules/d3-array/dist/d3-array.min.js'), 'd3-geo': path.resolve(__dirname, './node_modules/d3-geo/dist/d3-geo.min.js'), 'd3-dsv': path.resolve(__dirname, './node_modules/d3-dsv/dist/d3-dsv.min.js'), 'd3-hexbin': path.resolve(__dirname, './node_modules/d3-hexbin/build/d3-hexbin.min.js'), diff --git a/packages/vchart/package.json b/packages/vchart/package.json index 7baa51d023..84e4e38fb4 100644 --- a/packages/vchart/package.json +++ b/packages/vchart/package.json @@ -22,7 +22,7 @@ "build": "cross-env DEBUG='Bundler*' bundle --clean && npm run build:schema && npm run build:types && npm run build:es5", "build:es5": "rimraf lib && rollup -c --bundleConfigAsCjs", "build:schema": "schema src/typings/spec/chart.ts ISpec --useTypeOfKeyword --ignoreErrors --required > ../vchart-schema/vchart.json", - "build:types": "tsc --declaration --emitDeclarationOnly --outDir ../vchart-types/types", + "build:types": "rimraf ../vchart-types/types && tsc --declaration --emitDeclarationOnly --composite false --incremental false --outDir ../vchart-types/types", "build:spec-types": "rimraf ./spec-types && tsc -p ./tsconfig.spec.json --declaration --emitDeclarationOnly --outDir ./spec-types", "build:umd": "cross-env DEBUG='Bundler*' IGNORE_ENTRIES='true' bundle -f umd", "build:cjs": "cross-env DEBUG='Bundler*' IGNORE_ENTRIES='true' bundle --clean -f cjs --ignorePostTasks --ignoreUmdEntries", diff --git a/packages/vchart/scripts/visual-test.mjs b/packages/vchart/scripts/visual-test.mjs index bbb36778cf..84ea7ad9ee 100644 --- a/packages/vchart/scripts/visual-test.mjs +++ b/packages/vchart/scripts/visual-test.mjs @@ -48,17 +48,20 @@ export function parseOptions(args) { return values; } /** 入口只管理参数、预检模式和运行生命周期。 */ -async function main() { +export async function main(configuration = {}) { + const { suitePath = 'packages/vchart/__tests__/visual', command = 'node packages/vchart/scripts/visual-test.mjs' } = + configuration; const options = parseOptions(process.argv.slice(2)); const root = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..'); if (options.help) { console.log( - 'node packages/vchart/scripts/visual-test.mjs [--baseline <40位SHA> | --self-compare] [--dir <目录> | --case ]\n默认运行全部本地用例；--dir 递归运行 cases 内的一个目录（例如 components/label）。\n--list 列举用例；--check 本机环境检查；--help 帮助\n默认：官方 VisActor/VChart develop。退出码：0 通过，1 视觉差异，2 执行错误。' + command + + ' [--baseline <40位SHA> | --self-compare] [--dir <目录> | --case ]\n默认运行全部本地用例；--dir 递归运行 cases 内的一个目录（例如 components/label）。\n--list 列举用例；--check 本机环境检查；--help 帮助\n默认：官方 VisActor/VChart develop。退出码：0 通过，1 视觉差异，2 执行错误。' ); return; } if (options.list || options.check) { - const cases = await loadCases(path.join(root, 'packages/vchart/__tests__/visual')); + const cases = await loadCases(path.join(root, suitePath)); if (options.list) { console.log( cases.map(item => `${item.id}\t${item.purpose}\t${item.file}\t${item.sourceExample ?? ''}`).join('\n') @@ -77,7 +80,7 @@ async function main() { } return; } - process.exitCode = await runVisual(root, options); + process.exitCode = await runVisual(root, options, configuration); } if (process.argv[1] && path.resolve(process.argv[1]) === fileURLToPath(import.meta.url)) main().catch(error => { diff --git a/packages/vchart/scripts/visual-test.test.mjs b/packages/vchart/scripts/visual-test.test.mjs index ae1085f3bf..f4a304ad23 100644 --- a/packages/vchart/scripts/visual-test.test.mjs +++ b/packages/vchart/scripts/visual-test.test.mjs @@ -143,6 +143,14 @@ test( assert.ok((await fs.readFile(path.join(dir, 'index.html'), 'utf8')).includes(expected)); assert.ok((await fs.readFile(path.join(dir, 'agent-summary.md'), 'utf8')).includes(expected)); await fs.access(path.join(dir, report.cases[0].source.frozenPath)); + const custom = await saveReport(dir, { + ...summary(), + selection, + command: 'node custom-visual.mjs', + baseline: { repository: 'working-tree' } + }); + assert.equal(custom.rerun, `node custom-visual.mjs --self-compare${flag ? ` ${flag}` : ''}`); + assert.equal(custom.cases[0].rerun, "node custom-visual.mjs --self-compare --case 'bar-stack'"); } for (const override of [ { selectedIds: ['unknown'] }, diff --git a/packages/vchart/scripts/visual/build.mjs b/packages/vchart/scripts/visual/build.mjs index 2516294e38..5dbc280d40 100644 --- a/packages/vchart/scripts/visual/build.mjs +++ b/packages/vchart/scripts/visual/build.mjs @@ -116,7 +116,15 @@ export async function publishCache(cache, key, bundle) { } } /** 基线缓存只取决于构建输入；报告修改不使缓存失效。 */ -export async function baselineBuild(root, runDir, sha, runtime, report, timed) { +export async function baselineBuild( + root, + runDir, + sha, + runtime, + report, + timed, + { buildBundle = build, buildKey = '', outputDirectory = '.vchart-visual' } = {} +) { const log = path.join(runDir, 'build.log'); const key = digest( JSON.stringify({ @@ -127,10 +135,11 @@ export async function baselineBuild(root, runDir, sha, runtime, report, timed) { arch: process.arch, recipe: digest(await fs.readFile(fileURLToPath(import.meta.url))), buildEnv, + buildKey, tools: git(root, ['show', `${sha}:rush.json`]) }) ); - const cache = path.join(root, '.vchart-visual/baseline-cache'); + const cache = path.join(root, outputDirectory, 'baseline-cache'); const cached = await readCache(cache, key); if (cached) { await fs.writeFile(path.join(runDir, 'baseline.js'), cached); @@ -155,6 +164,6 @@ export async function baselineBuild(root, runDir, sha, runtime, report, timed) { env: { NODE_ENV: 'development' } }) ); - await timed('baselineCompileMs', () => build(worktree, path.join(runDir, 'baseline.js'), runtime, log)); + await timed('baselineCompileMs', () => buildBundle(worktree, path.join(runDir, 'baseline.js'), runtime, log)); await publishCache(cache, key, await fs.readFile(path.join(runDir, 'baseline.js'))); } diff --git a/packages/vchart/scripts/visual/runner.mjs b/packages/vchart/scripts/visual/runner.mjs index 95dda728dc..322af24657 100644 --- a/packages/vchart/scripts/visual/runner.mjs +++ b/packages/vchart/scripts/visual/runner.mjs @@ -156,10 +156,15 @@ export async function acquireLock(output, owner) { }; } /** 编排一次完整对比；所有准备失败和清理失败尽可能进入统一报告。 */ -export async function runVisual(root, options) { +export async function runVisual(root, options, configuration = {}) { + const { + suitePath = 'packages/vchart/__tests__/visual', + outputDirectory = '.vchart-visual', + buildBundle = build + } = configuration; const runtime = createRuntime(); const detach = runtime.listenSignals(); - const output = path.join(root, '.vchart-visual'); + const output = path.join(root, outputDirectory); const runId = `${Date.now()}-${randomUUID().slice(0, 8)}`; const runDir = path.join(output, 'runs', runId); const report = { @@ -168,6 +173,7 @@ export async function runVisual(root, options) { status: 'error', startedAt: new Date().toISOString(), request: options, + command: configuration.command, environment: { node: process.version, platform: process.platform, arch: process.arch }, timings: {}, cases: [], @@ -196,7 +202,11 @@ export async function runVisual(root, options) { }); releaseLock = await acquireLock(output, { runId, pid: process.pid, startedAt: report.startedAt, runDir }); const suite = path.join(runDir, 'suite'); - const source = path.join(root, 'packages/vchart/__tests__/visual'); + const source = path.join(root, suitePath); + await fs.mkdir(suite, { recursive: true }); + for (const file of ['settings.mjs', 'playwright.config.mjs', 'visual.spec.mjs', 'reporter.mjs', 'page.html']) { + await fs.copyFile(path.join(root, 'packages/vchart/__tests__/visual', file), path.join(suite, file)); + } await fileManifest(source); await fs.cp(source, suite, { recursive: true }); report.frozenFiles = await fileManifest(suite); @@ -226,7 +236,7 @@ export async function runVisual(root, options) { purpose, sourceExample, source: { - path: `packages/vchart/__tests__/visual/cases/${file.slice(2)}`, + path: `${suitePath}/cases/${file.slice(2)}`, line: 1, frozenPath: `suite/cases/${file.slice(2)}` } @@ -248,13 +258,13 @@ export async function runVisual(root, options) { }; report.stage = 'localBuild'; console.log('构建当前工作区…'); - await timed('localBuildMs', () => build(root, path.join(runDir, 'current.js'), runtime, log)); + await timed('localBuildMs', () => buildBundle(root, path.join(runDir, 'current.js'), runtime, log)); const after = await workingTree(root); if (after.head !== report.local.head || after.digest !== report.local.digest) throw fault('WORKSPACE_CHANGED', '构建期间工作区或 HEAD 发生变化，请重跑'); report.stage = 'baselineBuild'; if (options['self-compare']) await fs.copyFile(path.join(runDir, 'current.js'), path.join(runDir, 'baseline.js')); - else await timed('baselineBuildMs', () => baselineBuild(root, runDir, sha, runtime, report, timed)); + else await timed('baselineBuildMs', () => baselineBuild(root, runDir, sha, runtime, report, timed, configuration)); report.bundles = { baseline: digest(await fs.readFile(path.join(runDir, 'baseline.js'))), current: digest(await fs.readFile(path.join(runDir, 'current.js'))) diff --git a/packages/vchart/src/chart/common/interface.ts b/packages/vchart/src/chart/common/interface.ts index a6605648aa..41a7ba3f55 100644 --- a/packages/vchart/src/chart/common/interface.ts +++ b/packages/vchart/src/chart/common/interface.ts @@ -4,10 +4,8 @@ import type { IChartSpec } from '../../typings/spec/common'; import type { IBarSeriesSpec } from '../../series/bar/interface'; import type { IRangeColumnChartSpec } from '../range-column/interface'; import type { IRangeAreaChartSpec } from '../range-area/interface'; -import type { IDotSeriesSpec } from '../../series/dot/interface'; import type { IMapSeriesSpec } from '../../series/map/interface'; import type { IPieSeriesSpec } from '../../series/pie/interface'; -import type { ILinkSeriesSpec } from '../../series/link/interface'; import type { IRadarSeriesSpec } from '../../series/radar/interface'; import type { IRoseSeriesSpec } from '../../series/rose/interface'; import type { IScatterSeriesSpec } from '../../series/scatter/interface'; @@ -43,10 +41,8 @@ export interface ICommonChartSpec extends Omit { | IBarSeriesSpec | IRangeColumnChartSpec | IRangeAreaChartSpec - | IDotSeriesSpec | IMapSeriesSpec | IPieSeriesSpec - | ILinkSeriesSpec | IRadarSeriesSpec | IRoseSeriesSpec | IScatterSeriesSpec diff --git a/packages/vchart/src/chart/index.ts b/packages/vchart/src/chart/index.ts index 4eca053d91..b17e618132 100644 --- a/packages/vchart/src/chart/index.ts +++ b/packages/vchart/src/chart/index.ts @@ -42,8 +42,6 @@ import type { ISankeyChartSpec } from './sankey'; import { SankeyChart, registerSankeyChart } from './sankey'; import type { IScatterChartSpec } from './scatter'; import { ScatterChart, registerScatterChart } from './scatter'; -import type { ISequenceChartSpec } from './sequence'; -import { SequenceChart, registerSequenceChart } from './sequence'; import type { ISunburstChartSpec } from './sunburst'; import { SunburstChart, registerSunburstChart } from './sunburst'; import type { ITreemapChartSpec } from './treemap'; @@ -96,7 +94,6 @@ export { SankeyChart, ScatterChart, SunburstChart, - SequenceChart, WaterfallChart, CorrelationChart, LiquidChart, @@ -130,7 +127,6 @@ export { registerRoseChart, registerSankeyChart, registerScatterChart, - registerSequenceChart, registerSunburstChart, registerTreemapChart, registerWaterfallChart, @@ -164,7 +160,6 @@ export type { IRoseChartSpec, IScatterChartSpec, ISankeyChartSpec, - ISequenceChartSpec, ISunburstChartSpec, ITreemapChartSpec, IWaterfallChartSpec, diff --git a/packages/vchart/src/chart/interface/type.ts b/packages/vchart/src/chart/interface/type.ts index a3fd13774e..5dd1973d95 100644 --- a/packages/vchart/src/chart/interface/type.ts +++ b/packages/vchart/src/chart/interface/type.ts @@ -13,7 +13,6 @@ export const enum ChartTypeEnum { radar = 'radar', rose = 'rose', scatter = 'scatter', - sequence = 'sequence', circularProgress = 'circularProgress', linearProgress = 'linearProgress', wordCloud = 'wordCloud', diff --git a/packages/vchart/src/chart/sequence/sequence.ts b/packages/vchart/src/chart/sequence/sequence.ts deleted file mode 100644 index fd0916b914..0000000000 --- a/packages/vchart/src/chart/sequence/sequence.ts +++ /dev/null @@ -1,71 +0,0 @@ -import { registerLinkSeries } from '../../series/link/link'; -import { registerDotSeries } from '../../series/dot/dot'; -import { BaseChart } from '../base/base-chart'; -import type { ISequenceChartSpec } from './interface'; -import type { IRegion } from '../../region/interface'; -import { Factory } from '../../core/factory'; -import { SeriesTypeEnum } from '../../series/interface/type'; -import { ChartTypeEnum } from '../interface/type'; -import type { ISeriesConstructor, ISeriesOption } from '../../series/interface'; -import type { IModelSpecInfo } from '../../model/interface'; -import { SequenceChartSpecTransformer } from './sequence-transformer'; -import { registerCartesianLinearAxis, registerCartesianBandAxis } from '../../component/axis/cartesian'; -import { registerMarkTooltipProcessor } from '../../component/tooltip/processor/mark-tooltip'; -import { registerDimensionTooltipProcessor } from '../../component/tooltip/processor/dimension-tooltip'; - -export class SequenceChart extends BaseChart { - static readonly type: string = ChartTypeEnum.sequence; - static readonly transformerConstructor = SequenceChartSpecTransformer; - readonly transformerConstructor = SequenceChartSpecTransformer; - readonly type: string = ChartTypeEnum.sequence; - - /** - * @override - * @description 主要是将link series关联的dot data放到link series中 - */ - protected _createSeries(constructor: ISeriesConstructor, specInfo: IModelSpecInfo) { - if (!constructor) { - return; - } - - const { spec, ...others } = specInfo; - - if (spec.type === SeriesTypeEnum.link) { - spec.dotSeriesSpec = this._spec.series[spec.dotSeriesIndex]; - } - - let region: IRegion | undefined; - if (spec.regionId) { - region = this.getRegionsInUserId(spec.regionId); - } - if (!region) { - region = this.getRegionsInIndex(spec.regionIndex ? [spec.regionIndex] : undefined)[0]; - } - if (!region) { - return; - } - const series = new constructor(spec, { - ...this._modelOption, - ...others, - region, - specKey: 'series', - globalScale: this._globalScale - } as ISeriesOption); - - if (series) { - series.created(); - this._series.push(series); - region.addSeries(series); - } - } -} - -export const registerSequenceChart = () => { - registerDimensionTooltipProcessor(); - registerMarkTooltipProcessor(); - registerDotSeries(); - registerLinkSeries(); - registerCartesianBandAxis(); - registerCartesianLinearAxis(); - Factory.registerChart(SequenceChart.type, SequenceChart); -}; diff --git a/packages/vchart/src/component/data-zoom/data-filter-base-component.ts b/packages/vchart/src/component/data-zoom/data-filter-base-component.ts index ee568f8197..fa82a39206 100644 --- a/packages/vchart/src/component/data-zoom/data-filter-base-component.ts +++ b/packages/vchart/src/component/data-zoom/data-filter-base-component.ts @@ -1,5 +1,4 @@ import type { ICartesianSeries, IPolarSeries, ISeries } from '../../series/interface'; -import type { ILinkSeriesSpec } from '../../series/link/interface'; import { eachSeries } from '../../util/model'; import { BaseComponent } from '../base/base-component'; import type { IEffect, IModelInitOption } from '../../model/interface'; @@ -228,10 +227,10 @@ export abstract class DataFilterBaseComponent