npm - @visactor/vchart-extension - Versions diffs - 2.0.7-alpha.1 → 2.0.7-alpha.10 - Mend

@visactor/vchart-extension 2.0.7-alpha.1 → 2.0.7-alpha.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (295) hide show

package/cjs/charts/sequence-scatter-kde/interface.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { IPlayerSpec } from '@visactor/vchart';
-import { Datum } from '@visactor/vchart/src/typings/common';
-import { ITextGraphicAttribute } from '@visactor/vrender-core';
+import type { IPlayerSpec } from '@visactor/vchart';
+import type { Datum } from '@visactor/vchart/src/typings/common';
+import type { ITextGraphicAttribute } from '@visactor/vchart';
 type IterationData = Datum[];
 type ISequenceScatterKDEData = {
     [Iteration: string]: IterationData;

package/cjs/charts/sequence-scatter-kde/interface.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/charts/sequence-scatter-kde/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import { IPlayerSpec } from '@visactor/vchart';\nimport { Datum } from '@visactor/vchart/src/typings/common';\nimport { ITextGraphicAttribute } from '@visactor/~~vrender-core~~';\n\ntype IterationData = Datum[];\ntype ISequenceScatterKDEData = {\n /*\n key: 迭代信息\n * value: 每个迭代的数据\n /\n [Iteration: string]: IterationData;\n\n // TODO: 支持边的绘制\n // [Iteration: string]: {\n // /\n // 节点数据\n // /\n // nodes: IterationNodesData;\n // /\n // 边数据\n // /\n // edges: IterationEdgesData;\n // };\n};\n\nexport interface ISequenceScatterKDESpec {\n /\n 图表类型\n /\n type: 'sequenceScatterKDE';\n /\n 数据\n /\n data: ISequenceScatterKDEData;\n /\n x轴字段\n /\n xField: string;\n /\n y轴字段\n /\n yField: string;\n /\n 播放器配置\n /\n player: Omit<IPlayerSpec, 'specs'>;\n /\n 文字标记（标记当前处于第几个迭代）\n /\n infoLabel: {\n visible: boolean;\n style: ITextGraphicAttribute;\n };\n /\n 背景数据\n /\n backgroundColors: {\n [Iteration: string]: any;\n };\n /\n 宽度\n /\n width: number;\n /\n 高度\n */\n height: number;\n}\n\nexport interface Point {\n x: number;\n y: number;\n label?: string;\n}\n"]}
1	+ {"version":3,"sources":["../src/charts/sequence-scatter-kde/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPlayerSpec } from '@visactor/vchart';\nimport type { Datum } from '@visactor/vchart/src/typings/common';\nimport type { ITextGraphicAttribute } from '@visactor/vchart';\n\ntype IterationData = Datum[];\ntype ISequenceScatterKDEData = {\n /*\n key: 迭代信息\n * value: 每个迭代的数据\n /\n [Iteration: string]: IterationData;\n\n // TODO: 支持边的绘制\n // [Iteration: string]: {\n // /\n // 节点数据\n // /\n // nodes: IterationNodesData;\n // /\n // 边数据\n // /\n // edges: IterationEdgesData;\n // };\n};\n\nexport interface ISequenceScatterKDESpec {\n /\n 图表类型\n /\n type: 'sequenceScatterKDE';\n /\n 数据\n /\n data: ISequenceScatterKDEData;\n /\n x轴字段\n /\n xField: string;\n /\n y轴字段\n /\n yField: string;\n /\n 播放器配置\n /\n player: Omit<IPlayerSpec, 'specs'>;\n /\n 文字标记（标记当前处于第几个迭代）\n /\n infoLabel: {\n visible: boolean;\n style: ITextGraphicAttribute;\n };\n /\n 背景数据\n /\n backgroundColors: {\n [Iteration: string]: any;\n };\n /\n 宽度\n /\n width: number;\n /\n 高度\n */\n height: number;\n}\n\nexport interface Point {\n x: number;\n y: number;\n label?: string;\n}\n"]}

package/cjs/charts/sequence-scatter-link/interface.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
-import { IPlayerSpec } from '@visactor/vchart';
-import { ITextGraphicAttribute } from '@visactor/vrender-core';
+import type { IPlayerSpec } from '@visactor/vchart';
+import type { ITextGraphicAttribute } from '@visactor/vchart';
 export type OriginalData = {
     [key: string]: {
         projection: number[][];

package/cjs/charts/sequence-scatter-link/interface.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/charts/sequence-scatter-link/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import { IPlayerSpec } from '@visactor/vchart';\nimport { ITextGraphicAttribute } from '@visactor/~~vrender-core~~';\n\n/*\n 原始数据，包括坐标、邻居、预测结果\n /\nexport type OriginalData = {\n [key: string]: {\n projection: number[][];\n intra_similarity?: number[][];\n inter_similarity?: number[][];\n prediction?: number[];\n confidence?: number[];\n };\n};\n\n/\n 训练信息，包括标签、标签颜色、标签文本\n /\nexport type TrainingInfo = {\n label_text: string[];\n label_color: number[][];\n label_index: number[];\n};\n\n/\n 轮次点数据\n /\nexport type IterationNodesData = {\n id: number; // unique identification of a point\n x: number;\n y: number;\n label: string;\n prediction: string;\n confidence: number;\n}[];\n\n/\n 轮次边数据\n /\nexport type IterationEdgesData = {\n id: number; // unique identification of an edge\n x0: number;\n y0: number;\n x1: number;\n y1: number;\n type: string;\n color: string;\n}[];\n\n/\n 边的端点，一条边数据构造两个端点，edgeId相同的端点之间将绘制一条线段\n /\nexport type Endpoint = {\n edgeId: number; // id of the edge that the endpoint belongs to\n x: number;\n y: number;\n type: string;\n color: string;\n};\n\nexport type ISequenceScatterLinkData = {\n /\n key: 迭代信息\n * value: 每个迭代的数据\n /\n [Iteration: string]: {\n /\n 节点数据\n /\n nodes: IterationNodesData;\n /\n 边数据\n /\n edges: IterationEdgesData;\n };\n};\n\nexport interface ISequenceScatterLinkSpec {\n /\n 图表类型\n /\n type: 'sequenceScatterLink';\n /\n 任务类型\n /\n taskType: string;\n /\n 数据\n /\n data: ISequenceScatterLinkData;\n /\n x轴字段\n /\n xField: string;\n /\n y轴字段\n /\n yField: string;\n /\n 播放器配置\n /\n player: Omit<IPlayerSpec, 'specs'>;\n /\n 文字标记（标记当前处于第几个迭代）\n /\n infoLabel: {\n visible: boolean;\n style: ITextGraphicAttribute;\n };\n /\n 画布范围\n */\n scope: [number, number, number, number];\n}\n"]}
1	+ {"version":3,"sources":["../src/charts/sequence-scatter-link/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPlayerSpec } from '@visactor/vchart';\nimport type { ITextGraphicAttribute } from '@visactor/vchart';\n\n/*\n 原始数据，包括坐标、邻居、预测结果\n /\nexport type OriginalData = {\n [key: string]: {\n projection: number[][];\n intra_similarity?: number[][];\n inter_similarity?: number[][];\n prediction?: number[];\n confidence?: number[];\n };\n};\n\n/\n 训练信息，包括标签、标签颜色、标签文本\n /\nexport type TrainingInfo = {\n label_text: string[];\n label_color: number[][];\n label_index: number[];\n};\n\n/\n 轮次点数据\n /\nexport type IterationNodesData = {\n id: number; // unique identification of a point\n x: number;\n y: number;\n label: string;\n prediction: string;\n confidence: number;\n}[];\n\n/\n 轮次边数据\n /\nexport type IterationEdgesData = {\n id: number; // unique identification of an edge\n x0: number;\n y0: number;\n x1: number;\n y1: number;\n type: string;\n color: string;\n}[];\n\n/\n 边的端点，一条边数据构造两个端点，edgeId相同的端点之间将绘制一条线段\n /\nexport type Endpoint = {\n edgeId: number; // id of the edge that the endpoint belongs to\n x: number;\n y: number;\n type: string;\n color: string;\n};\n\nexport type ISequenceScatterLinkData = {\n /\n key: 迭代信息\n * value: 每个迭代的数据\n /\n [Iteration: string]: {\n /\n 节点数据\n /\n nodes: IterationNodesData;\n /\n 边数据\n /\n edges: IterationEdgesData;\n };\n};\n\nexport interface ISequenceScatterLinkSpec {\n /\n 图表类型\n /\n type: 'sequenceScatterLink';\n /\n 任务类型\n /\n taskType: string;\n /\n 数据\n /\n data: ISequenceScatterLinkData;\n /\n x轴字段\n /\n xField: string;\n /\n y轴字段\n /\n yField: string;\n /\n 播放器配置\n /\n player: Omit<IPlayerSpec, 'specs'>;\n /\n 文字标记（标记当前处于第几个迭代）\n /\n infoLabel: {\n visible: boolean;\n style: ITextGraphicAttribute;\n };\n /\n 画布范围\n */\n scope: [number, number, number, number];\n}\n"]}

package/cjs/charts/sequence-scatter-pixel/interface.d.ts CHANGED Viewed

@@ -1,6 +1,6 @@
-import { IPlayerSpec } from '@visactor/vchart';
-import { Datum } from '@visactor/vchart/src/typings/common';
-import { ITextGraphicAttribute } from '@visactor/vrender-core';
+import type { IPlayerSpec } from '@visactor/vchart';
+import type { Datum } from '@visactor/vchart/src/typings/common';
+import type { ITextGraphicAttribute } from '@visactor/vchart';
 type IterationData = Datum[];
 type ISequenceScatterPixelData = {
     [Iteration: string]: IterationData;

package/cjs/charts/sequence-scatter-pixel/interface.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/charts/sequence-scatter-pixel/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import { IPlayerSpec } from '@visactor/vchart';\nimport { Datum } from '@visactor/vchart/src/typings/common';\nimport { ITextGraphicAttribute } from '@visactor/~~vrender-core~~';\n\ntype IterationData = Datum[];\ntype ISequenceScatterPixelData = {\n /*\n key: 迭代信息\n * value: 每个迭代的数据\n /\n [Iteration: string]: IterationData;\n\n // TODO: 支持边的绘制\n // [Iteration: string]: {\n // /\n // 节点数据\n // /\n // nodes: IterationNodesData;\n // /\n // 边数据\n // /\n // edges: IterationEdgesData;\n // };\n};\n\nexport interface ISequenceScatterPixelSpec {\n /\n 图表类型\n /\n type: 'sequenceScatterPixel';\n /\n 数据\n /\n data: ISequenceScatterPixelData;\n /\n x轴字段\n /\n xField: string;\n /\n y轴字段\n /\n yField: string;\n /\n 播放器配置\n /\n player: Omit<IPlayerSpec, 'specs'>;\n /\n 文字标记（标记当前处于第几个迭代）\n /\n infoLabel: {\n visible: boolean;\n style: ITextGraphicAttribute;\n };\n /\n 背景数据\n /\n backgroundColors: {\n [Iteration: string]: any;\n };\n /\n 宽度\n /\n width: number;\n /\n 高度\n */\n height: number;\n}\n\nexport interface Point {\n x: number;\n y: number;\n label?: string;\n}\n"]}
1	+ {"version":3,"sources":["../src/charts/sequence-scatter-pixel/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPlayerSpec } from '@visactor/vchart';\nimport type { Datum } from '@visactor/vchart/src/typings/common';\nimport type { ITextGraphicAttribute } from '@visactor/vchart';\n\ntype IterationData = Datum[];\ntype ISequenceScatterPixelData = {\n /*\n key: 迭代信息\n * value: 每个迭代的数据\n /\n [Iteration: string]: IterationData;\n\n // TODO: 支持边的绘制\n // [Iteration: string]: {\n // /\n // 节点数据\n // /\n // nodes: IterationNodesData;\n // /\n // 边数据\n // /\n // edges: IterationEdgesData;\n // };\n};\n\nexport interface ISequenceScatterPixelSpec {\n /\n 图表类型\n /\n type: 'sequenceScatterPixel';\n /\n 数据\n /\n data: ISequenceScatterPixelData;\n /\n x轴字段\n /\n xField: string;\n /\n y轴字段\n /\n yField: string;\n /\n 播放器配置\n /\n player: Omit<IPlayerSpec, 'specs'>;\n /\n 文字标记（标记当前处于第几个迭代）\n /\n infoLabel: {\n visible: boolean;\n style: ITextGraphicAttribute;\n };\n /\n 背景数据\n /\n backgroundColors: {\n [Iteration: string]: any;\n };\n /\n 宽度\n /\n width: number;\n /\n 高度\n */\n height: number;\n}\n\nexport interface Point {\n x: number;\n y: number;\n label?: string;\n}\n"]}

package/cjs/charts/word-cloud-3d/animation.js CHANGED Viewed

@@ -4,8 +4,8 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerWordCloud3dAnimation = exports.WordCloud3dAnimation = void 0;
-const vrender_animate_1 = require("@visactor/vrender-animate"), vchart_1 = require("@visactor/vchart"), WordCloud3dAnimation = params => ({
-    custom: vrender_animate_1.RotateBySphereAnimate,
+const vchart_1 = require("@visactor/vchart"), vchart_2 = require("@visactor/vchart"), WordCloud3dAnimation = params => ({
+    custom: vchart_1.RotateBySphereAnimate,
     customParameters: () => params,
     easing: "linear",
     loop: 1 / 0,
@@ -15,7 +15,7 @@ const vrender_animate_1 = require("@visactor/vrender-animate"), vchart_1 = requi
 exports.WordCloud3dAnimation = WordCloud3dAnimation;
 const registerWordCloud3dAnimation = () => {
-    vchart_1.Factory.registerAnimation("wordCloud3d", (params => ({
+    vchart_2.Factory.registerAnimation("wordCloud3d", (params => ({
         appear: (0, exports.WordCloud3dAnimation)(params)
     })));
 };

package/cjs/charts/word-cloud-3d/animation.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/charts/word-cloud-3d/animation.ts"],"names":[],"mappings":";;;AAAA~~,+DAAkE~~;~~AAGlE~~,6CAA2C;AAEpC,MAAM,oBAAoB,GAAG,CAAC,MAAiD,EAAwB,EAAE;IAC9G,OAAO;QACL,MAAM,EAAE,~~uCAAqB~~;QAC7B,gBAAgB,EAAE,GAAG,EAAE,CAAC,MAAM;QAC9B,MAAM,EAAE,QAAQ;QAChB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;KACf,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,MAAM,4BAA4B,GAAG,GAAG,EAAE;IAC/C,gBAAO,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,MAAmC,EAAE,EAAE,CAAC,CAAC;QACjF,MAAM,EAAE,IAAA,4BAAoB,EAAC,MAAM,CAAC;KACrC,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAJW,QAAA,4BAA4B,gCAIvC","file":"animation.js","sourcesContent":["import { RotateBySphereAnimate } from '@visactor/~~vrender-animate~~';\nimport type { IWordcloud3dAnimationParams } from './interface';\nimport type { IAnimationTypeConfig } from '@visactor/vchart';\nimport { Factory } from '@visactor/vchart';\n\nexport const WordCloud3dAnimation = (params: IWordcloud3dAnimationParams \| (() => any)): IAnimationTypeConfig => {\n return {\n custom: RotateBySphereAnimate,\n customParameters: () => params,\n easing: 'linear',\n loop: Infinity,\n duration: 6000\n };\n};\n\nexport const registerWordCloud3dAnimation = () => {\n Factory.registerAnimation('wordCloud3d', (params: IWordcloud3dAnimationParams) => ({\n appear: WordCloud3dAnimation(params)\n }));\n};\n"]}
1	+ {"version":3,"sources":["../src/charts/word-cloud-3d/animation.ts"],"names":[],"mappings":";;;AAAA,6CAAyD;AAGzD,6CAA2C;AAEpC,MAAM,oBAAoB,GAAG,CAAC,MAAiD,EAAwB,EAAE;IAC9G,OAAO;QACL,MAAM,EAAE,8BAAqB;QAC7B,gBAAgB,EAAE,GAAG,EAAE,CAAC,MAAM;QAC9B,MAAM,EAAE,QAAQ;QAChB,IAAI,EAAE,QAAQ;QACd,QAAQ,EAAE,IAAI;KACf,CAAC;AACJ,CAAC,CAAC;AARW,QAAA,oBAAoB,wBAQ/B;AAEK,MAAM,4BAA4B,GAAG,GAAG,EAAE;IAC/C,gBAAO,CAAC,iBAAiB,CAAC,aAAa,EAAE,CAAC,MAAmC,EAAE,EAAE,CAAC,CAAC;QACjF,MAAM,EAAE,IAAA,4BAAoB,EAAC,MAAM,CAAC;KACrC,CAAC,CAAC,CAAC;AACN,CAAC,CAAC;AAJW,QAAA,4BAA4B,gCAIvC","file":"animation.js","sourcesContent":["import { RotateBySphereAnimate } from '@visactor/vchart';\nimport type { IWordcloud3dAnimationParams } from './interface';\nimport type { IAnimationTypeConfig } from '@visactor/vchart';\nimport { Factory } from '@visactor/vchart';\n\nexport const WordCloud3dAnimation = (params: IWordcloud3dAnimationParams \| (() => any)): IAnimationTypeConfig => {\n return {\n custom: RotateBySphereAnimate,\n customParameters: () => params,\n easing: 'linear',\n loop: Infinity,\n duration: 6000\n };\n};\n\nexport const registerWordCloud3dAnimation = () => {\n Factory.registerAnimation('wordCloud3d', (params: IWordcloud3dAnimationParams) => ({\n appear: WordCloud3dAnimation(params)\n }));\n};\n"]}

package/cjs/components/bar-link/bar-link.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { AbstractComponent } from '@visactor/vrender-components';
+import { AbstractComponent } from '@visactor/vchart';
 import type { BarLinkAttrs } from './type';
 export declare class BarLinkComponent extends AbstractComponent<Required<BarLinkAttrs>> {
     name: string;

package/cjs/components/bar-link/bar-link.js CHANGED Viewed

@@ -4,19 +4,19 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.registerBarLink = exports.BarLinkComponent = void 0;
-const vrender_components_1 = require("@visactor/vrender-components"), vutils_1 = require("@visactor/vutils"), vchart_1 = require("@visactor/vchart"), vrender_core_1 = require("@visactor/vrender-core"), vchart_2 = require("@visactor/vchart"), constant_1 = require("./constant");
+const vchart_1 = require("@visactor/vchart"), vchart_2 = require("@visactor/vchart"), vchart_3 = require("@visactor/vchart"), vchart_4 = require("@visactor/vchart"), constant_1 = require("./constant");
-class BarLinkComponent extends vrender_components_1.AbstractComponent {
+class BarLinkComponent extends vchart_1.AbstractComponent {
     constructor() {
         super(...arguments), this.name = constant_1.BAR_LINK;
     }
     render() {
         const {data: data, linkStyle: linkStyle, areaStyle: areaStyle, styleMap: styleMap, label: label, linkType: linkType = "total"} = this.attribute;
-        (0, vutils_1.isEmpty)(data) || (this.removeAllChild(), data.forEach(((datum, index) => {
+        (0, vchart_2.isEmpty)(data) || (this.removeAllChild(), data.forEach(((datum, index) => {
             var _a, _b, _c, _d, _e;
             const {linePoints: linePoints, areaPoints: areaPoints, id: id = index, color: color, data: curData} = datum;
             if (areaPoints && !1 !== (null === (_a = null == styleMap ? void 0 : styleMap[`area-${id}`]) || void 0 === _a ? void 0 : _a.visible)) {
-                const area = (0, vrender_core_1.createArea)(Object.assign(Object.assign({
+                const area = (0, vchart_1.createArea)(Object.assign(Object.assign({
                     points: areaPoints,
                     fillOpacity: .3,
                     fill: color,
@@ -26,14 +26,14 @@ class BarLinkComponent extends vrender_components_1.AbstractComponent {
             }
             if (linePoints && !1 !== (null === (_b = null == styleMap ? void 0 : styleMap[`line-${id}`]) || void 0 === _b ? void 0 : _b.visible) && 0 !== (null === (_c = null == linkStyle ? void 0 : linkStyle.lineStyle) || void 0 === _c ? void 0 : _c.lineWidth) && 0 !== (null === (_d = null == styleMap ? void 0 : styleMap[`line-${id}`]) || void 0 === _d ? void 0 : _d.lineWidth)) {
                 const {startSymbol: startSymbol = {}, endSymbol: endSymbol = {}, lineStyle: lineStyle} = linkStyle || {}, startSymbolAttrs = (0,
-                vutils_1.cloneDeep)(startSymbol), endSymbolAttrs = (0, vutils_1.cloneDeep)(endSymbol);
+                vchart_2.cloneDeep)(startSymbol), endSymbolAttrs = (0, vchart_2.cloneDeep)(endSymbol);
                 (null == styleMap ? void 0 : styleMap[`line-${id}`]) && styleMap[`line-${id}`].stroke && (startSymbolAttrs.style = Object.assign(Object.assign({}, startSymbolAttrs.style), {
                     color: styleMap[`line-${id}`].stroke
                 }), endSymbolAttrs.style = Object.assign(Object.assign({}, endSymbolAttrs.style), {
                     color: styleMap[`line-${id}`].stroke
                 })), startSymbolAttrs.symbolType || startSymbolAttrs.originSymbolType || (startSymbolAttrs.originSymbolType = "solidArrow"),
                 endSymbolAttrs.symbolType || endSymbolAttrs.originSymbolType || (endSymbolAttrs.originSymbolType = "solidArrow");
-                const line = new vrender_components_1.Segment({
+                const line = new vchart_1.Segment({
                     points: linePoints,
                     startSymbol: Object.assign({
                         size: 8
@@ -54,11 +54,11 @@ class BarLinkComponent extends vrender_components_1.AbstractComponent {
             }
             if ((null == label ? void 0 : label.visible) && !1 !== (null === (_e = null == styleMap ? void 0 : styleMap[`label-${id}`]) || void 0 === _e ? void 0 : _e.visible)) {
                 const {style: style, formatMethod: formatMethod} = label, [startData, endData] = curData;
-                let startValue = startData[vchart_2.STACK_FIELD_END], endValue = endData[vchart_2.STACK_FIELD_END];
-                "value" === linkType && (startValue = startData[vchart_2.STACK_FIELD_END] - startData[vchart_2.STACK_FIELD_START],
-                endValue = endData[vchart_2.STACK_FIELD_END] - endData[vchart_2.STACK_FIELD_START]);
+                let startValue = startData[vchart_4.STACK_FIELD_END], endValue = endData[vchart_4.STACK_FIELD_END];
+                "value" === linkType && (startValue = startData[vchart_4.STACK_FIELD_END] - startData[vchart_4.STACK_FIELD_START],
+                endValue = endData[vchart_4.STACK_FIELD_END] - endData[vchart_4.STACK_FIELD_START]);
                 const value = endValue - startValue, percentage = (endValue - startValue) / startValue * 100, text = (0,
-                vrender_core_1.createText)(Object.assign(Object.assign({
+                vchart_1.createText)(Object.assign(Object.assign({
                     x: .5 * (linePoints[0].x + linePoints[1].x),
                     y: .5 * (linePoints[0].y + linePoints[1].y),
                     text: formatMethod ? formatMethod(value, percentage, curData) : `${value} ${percentage}`,
@@ -80,7 +80,7 @@ class BarLinkComponent extends vrender_components_1.AbstractComponent {
 exports.BarLinkComponent = BarLinkComponent;
 const registerBarLink = () => {
-    vchart_1.Factory.registerGraphicComponent(constant_1.BAR_LINK, (attrs => new BarLinkComponent(attrs)));
+    vchart_3.Factory.registerGraphicComponent(constant_1.BAR_LINK, (attrs => new BarLinkComponent(attrs)));
 };
 exports.registerBarLink = registerBarLink;

package/cjs/components/bar-link/bar-link.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/components/bar-link/bar-link.ts"],"names":[],"mappings":";;;AAIA,~~qEAA0E~~;~~AAC1E~~,6CAAsD;AACtD,6CAA2C;AAC3C,~~yDAA2G;AAC3G,~~6CAAsE;AAEtE,yCAAsC;AAEtC,MAAa,gBAAiB,SAAQ,~~sCAAyC~~;IAA/E;;QACE,SAAI,GAAG,mBAAQ,CAAC;IAoHlB,CAAC;IAlHW,MAAM;QACd,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,SAAS,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,GAAG,OAAO,EAAE,GAAG,IAAI,CAAC,SAAyB,CAAC;QAC3G,IAAI,IAAA,gBAAO,EAAC,IAAI,CAAC,EAAE;YACjB,OAAO;SACR;QACD,IAAI,CAAC,cAAc,EAAE,CAAC;QACtB,IAAI,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE;;YAC5B,MAAM,EAAE,UAAU,EAAE,UAAU,EAAE,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC;YAE3E,IAAI,UAAU,IAAI,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,EAAE,EAAE,CAAC,0CAAE,OAAO,MAAK,KAAK,EAAE;gBAE7D,MAAM,IAAI,GAAG,IAAA,~~yBAAU~~,gCACrB,MAAM,EAAE,UAAU,EAClB,WAAW,EAAE,GAAG,EAChB,IAAI,EAAE,KAAK,EACX,MAAM,EAAE,CAAC,IACN,SAAS,GACT,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,EAAE,EAAE,CAAC,EAC3B,CAAC;gBACH,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;gBAC5B,IAAI,CAAC,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAChB;YAED,IACE,UAAU;gBACV,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,EAAE,EAAE,CAAC,0CAAE,OAAO,MAAK,KAAK;gBAC3C,CAAA,MAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,SAAiB,0CAAE,SAAS,MAAK,CAAC;gBAC9C,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,EAAE,EAAE,CAAC,0CAAE,SAAS,MAAK,CAAC,EACzC;gBAEA,MAAM,EAAE,WAAW,GAAG,EAAE,EAAE,SAAS,GAAG,EAAE,EAAE,SAAS,EAAE,GAAG,SAAS,IAAI,EAAE,CAAC;gBAExE,MAAM,gBAAgB,GAAG,IAAA,kBAAS,EAAC,WAAW,CAAC,CAAC;gBAChD,MAAM,cAAc,GAAG,IAAA,kBAAS,EAAC,SAAS,CAAC,CAAC;gBAC5C,IAAI,CAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,EAAE,EAAE,CAAC,KAAI,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAM,EAAE;oBAC5D,gBAAwB,CAAC,KAAK,mCACzB,gBAAwB,CAAC,KAAK,KAClC,KAAK,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAM,GACrC,CAAC;oBACD,cAAsB,CAAC,KAAK,mCACvB,cAAsB,CAAC,KAAK,KAChC,KAAK,EAAE,QAAQ,CAAC,QAAQ,EAAE,EAAE,CAAC,CAAC,MAAM,GACrC,CAAC;iBACH;gBAED,IAAI,CAAE,gBAAwB,CAAC,UAAU,IAAI,CAAE,gBAAwB,CAAC,gBAAgB,EAAE;oBACvF,gBAAwB,CAAC,gBAAgB,GAAG,YAAY,CAAC;iBAC3D;gBACD,IAAI,CAAE,cAAsB,CAAC,UAAU,IAAI,CAAE,cAAsB,CAAC,gBAAgB,EAAE;oBACnF,cAAsB,CAAC,gBAAgB,GAAG,YAAY,CAAC;iBACzD;gBACD,MAAM,IAAI,GAAG,IAAI,~~4BAAO~~,CAAC;oBACvB,MAAM,EAAE,UAAU;oBAClB,WAAW,kBACT,IAAI,EAAE,CAAC,IACJ,gBAAgB,CACpB;oBACD,SAAS,kBACP,IAAI,EAAE,CAAC,IACJ,cAAc,CAClB;oBACD,SAAS,EAAE,8BACT,QAAQ,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC,EAChB,SAAS,EAAE,CAAC,EACZ,MAAM,EAAE,MAAM,IACX,SAAS,GACT,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,QAAQ,EAAE,EAAE,CAAC,CACH;oBAC1B,QAAQ,EAAE,IAAI;oBACd,gBAAgB,EAAE,KAAK;oBACvB,MAAM,EAAE,CAAC;iBACV,CAAC,CAAC;gBACH,IAAI,CAAC,IAAI,GAAG,eAAe,CAAC;gBAC5B,IAAI,CAAC,EAAE,GAAG,QAAQ,EAAE,EAAE,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,IAA2B,CAAC,CAAC;aACvC;YAED,IAAI,CAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,OAAO,KAAI,CAAA,MAAA,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,SAAS,EAAE,EAAE,CAAC,0CAAE,OAAO,MAAK,KAAK,EAAE;gBAClE,MAAM,EAAE,KAAK,EAAE,YAAY,EAAE,GAAG,KAAK,CAAC;gBAEtC,MAAM,CAAC,SAAS,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC;gBAErC,IAAI,UAAU,GAAG,SAAS,CAAC,wBAAe,CAAC,CAAC;gBAC5C,IAAI,QAAQ,GAAG,OAAO,CAAC,wBAAe,CAAC,CAAC;gBACxC,IAAI,QAAQ,KAAK,OAAO,EAAE;oBACxB,UAAU,GAAG,SAAS,CAAC,wBAAe,CAAC,GAAG,SAAS,CAAC,0BAAiB,CAAC,CAAC;oBACvE,QAAQ,GAAG,OAAO,CAAC,wBAAe,CAAC,GAAG,OAAO,CAAC,0BAAiB,CAAC,CAAC;iBAClE;gBAED,MAAM,KAAK,GAAG,QAAQ,GAAG,UAAU,CAAC;gBACpC,MAAM,UAAU,GAAG,CAAC,CAAC,QAAQ,GAAG,UAAU,CAAC,GAAG,UAAU,CAAC,GAAG,GAAG,CAAC;gBAEhE,MAAM,IAAI,GAAG,IAAA,~~yBAAU~~,gCACrB,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAC5C,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,GAAG,EAC5C,IAAI,EAAE,YAAY,CAAC,CAAC,CAAE,YAAY,CAAC,KAAK,EAAE,UAAU,EAAE,OAAO,CAAY,CAAC,CAAC,CAAC,GAAG,KAAK,IAAI,UAAU,EAAE,EACpG,QAAQ,EAAE,EAAE,EACZ,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,EACd,SAAS,EAAE,CAAC,EACZ,SAAS,EAAE,QAAQ,EACnB,YAAY,EAAE,QAAQ,EACtB,UAAU,EAAE,MAAM,EAClB,MAAM,EAAE,CAAC,IACN,KAAK,GACL,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,SAAS,EAAE,EAAE,CAAC,EAC5B,CAAC;gBACH,IAAI,CAAC,IAAI,GAAG,gBAAgB,CAAC;gBAC7B,IAAI,CAAC,EAAE,GAAG,SAAS,EAAE,EAAE,CAAC;gBACxB,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;aAChB;QACH,CAAC,CAAC,CAAC;IACL,CAAC;CACF;AArHD,4CAqHC;AAEM,MAAM,eAAe,GAAG,GAAG,EAAE;IAClC,gBAAO,CAAC,wBAAwB,CAC9B,mBAAQ,EACR,CAAC,KAA6B,EAAE,EAAE,CAAC,IAAI,gBAAgB,CAAC,KAAK,CAAwB,CACtF,CAAC;AACJ,CAAC,CAAC;AALW,QAAA,eAAe,mBAK1B","file":"bar-link.js","sourcesContent":["/*\n @description 堆叠柱系列的连接线组件\n * @author zhangweixing\n /\nimport { AbstractComponent, Segment } from '@visactor/~~vrender-components~~';\nimport { cloneDeep, isEmpty } from '@visactor/~~vutils~~';\nimport { Factory } from '@visactor/vchart';\nimport { ~~type IGraphic, type ILineGraphicAttribute, createArea, createText } from '@visactor/vrender-core';\nimport {~~ STACK_FIELD_END, STACK_FIELD_START } from '@visactor/vchart';\nimport type { BarLinkAttrs } from './type';\nimport { BAR_LINK } from './constant';\n\nexport class BarLinkComponent extends AbstractComponent<Required<BarLinkAttrs>> {\n name = BAR_LINK;\n\n protected render() {\n const { data, linkStyle, areaStyle, styleMap, label, linkType = 'total' } = this.attribute as BarLinkAttrs;\n if (isEmpty(data)) {\n return;\n }\n this.removeAllChild();\n data.forEach((datum, index) => {\n const { linePoints, areaPoints, id = index, color, data: curData } = datum;\n\n if (areaPoints && styleMap?.[`area-${id}`]?.visible !== false) {\n // 先绘制面\n const area = createArea({\n points: areaPoints,\n fillOpacity: 0.3,\n fill: color,\n zIndex: 0,\n ...areaStyle,\n ...styleMap?.[`area-${id}`]\n });\n area.name = 'bar-link-area';\n area.id = `area-${id}`;\n this.add(area);\n }\n\n if (\n linePoints &&\n styleMap?.[`line-${id}`]?.visible !== false &&\n (linkStyle?.lineStyle as any)?.lineWidth !== 0 &&\n styleMap?.[`line-${id}`]?.lineWidth !== 0\n ) {\n // 再绘制点\n const { startSymbol = {}, endSymbol = {}, lineStyle } = linkStyle \|\| {};\n\n const startSymbolAttrs = cloneDeep(startSymbol);\n const endSymbolAttrs = cloneDeep(endSymbol);\n if (styleMap?.[`line-${id}`] && styleMap[`line-${id}`].stroke) {\n (startSymbolAttrs as any).style = {\n ...(startSymbolAttrs as any).style,\n color: styleMap[`line-${id}`].stroke\n };\n (endSymbolAttrs as any).style = {\n ...(endSymbolAttrs as any).style,\n color: styleMap[`line-${id}`].stroke\n };\n }\n\n if (!(startSymbolAttrs as any).symbolType && !(startSymbolAttrs as any).originSymbolType) {\n (startSymbolAttrs as any).originSymbolType = 'solidArrow';\n }\n if (!(endSymbolAttrs as any).symbolType && !(endSymbolAttrs as any).originSymbolType) {\n (endSymbolAttrs as any).originSymbolType = 'solidArrow';\n }\n const line = new Segment({\n points: linePoints,\n startSymbol: {\n size: 8,\n ...startSymbolAttrs\n },\n endSymbol: {\n size: 8,\n ...endSymbolAttrs\n },\n lineStyle: {\n lineDash: [3, 3],\n lineWidth: 1,\n stroke: '#000',\n ...lineStyle,\n ...styleMap?.[`line-${id}`]\n } as ILineGraphicAttribute,\n pickable: true,\n childrenPickable: false,\n zIndex: 1\n });\n line.name = 'bar-link-line';\n line.id = `line-${id}`;\n this.add(line as unknown as IGraphic);\n }\n\n if (label?.visible && styleMap?.[`label-${id}`]?.visible !== false) {\n const { style, formatMethod } = label;\n\n const [startData, endData] = curData;\n\n let startValue = startData[STACK_FIELD_END];\n let endValue = endData[STACK_FIELD_END];\n if (linkType === 'value') {\n startValue = startData[STACK_FIELD_END] - startData[STACK_FIELD_START];\n endValue = endData[STACK_FIELD_END] - endData[STACK_FIELD_START];\n }\n\n const value = endValue - startValue;\n const percentage = ((endValue - startValue) / startValue) 100;\n\n const text = createText({\n x: (linePoints[0].x + linePoints[1].x) * 0.5,\n y: (linePoints[0].y + linePoints[1].y) * 0.5,\n text: formatMethod ? (formatMethod(value, percentage, curData) as string) : `${value} ${percentage}`,\n fontSize: 14,\n fill: '#000',\n stroke: '#fff',\n lineWidth: 1,\n textAlign: 'center',\n textBaseline: 'middle',\n background: '#fff',\n zIndex: 2,\n ...style,\n ...styleMap?.[`label-${id}`]\n });\n text.name = 'bar-link-label';\n text.id = `label-${id}`;\n this.add(text);\n }\n });\n }\n}\n\nexport const registerBarLink = () => {\n Factory.registerGraphicComponent(\n BAR_LINK,\n (attrs: Required<BarLinkAttrs>) => new BarLinkComponent(attrs) as unknown as IGraphic\n );\n};\n"]}
1	+ {"version":3,"sources":["../src/components/bar-link/bar-link.ts"],"names":[],"mappings":"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","file":"bar-link.js","sourcesContent":["/*\n @description 堆叠柱系列的连接线组件\n * @author zhangweixing\n /\nimport {\n AbstractComponent,\n Segment,\n type IGraphic,\n type ILineGraphicAttribute,\n createArea,\n createText\n} from '@visactor/vchart';\nimport { cloneDeep, isEmpty } from '@visactor/vchart';\nimport { Factory } from '@visactor/vchart';\nimport { STACK_FIELD_END, STACK_FIELD_START } from '@visactor/vchart';\nimport type { BarLinkAttrs } from './type';\nimport { BAR_LINK } from './constant';\n\nexport class BarLinkComponent extends AbstractComponent<Required<BarLinkAttrs>> {\n name = BAR_LINK;\n\n protected render() {\n const { data, linkStyle, areaStyle, styleMap, label, linkType = 'total' } = this.attribute as BarLinkAttrs;\n if (isEmpty(data)) {\n return;\n }\n this.removeAllChild();\n data.forEach((datum, index) => {\n const { linePoints, areaPoints, id = index, color, data: curData } = datum;\n\n if (areaPoints && styleMap?.[`area-${id}`]?.visible !== false) {\n // 先绘制面\n const area = createArea({\n points: areaPoints,\n fillOpacity: 0.3,\n fill: color,\n zIndex: 0,\n ...areaStyle,\n ...styleMap?.[`area-${id}`]\n });\n area.name = 'bar-link-area';\n area.id = `area-${id}`;\n this.add(area);\n }\n\n if (\n linePoints &&\n styleMap?.[`line-${id}`]?.visible !== false &&\n (linkStyle?.lineStyle as any)?.lineWidth !== 0 &&\n styleMap?.[`line-${id}`]?.lineWidth !== 0\n ) {\n // 再绘制点\n const { startSymbol = {}, endSymbol = {}, lineStyle } = linkStyle \|\| {};\n\n const startSymbolAttrs = cloneDeep(startSymbol);\n const endSymbolAttrs = cloneDeep(endSymbol);\n if (styleMap?.[`line-${id}`] && styleMap[`line-${id}`].stroke) {\n (startSymbolAttrs as any).style = {\n ...(startSymbolAttrs as any).style,\n color: styleMap[`line-${id}`].stroke\n };\n (endSymbolAttrs as any).style = {\n ...(endSymbolAttrs as any).style,\n color: styleMap[`line-${id}`].stroke\n };\n }\n\n if (!(startSymbolAttrs as any).symbolType && !(startSymbolAttrs as any).originSymbolType) {\n (startSymbolAttrs as any).originSymbolType = 'solidArrow';\n }\n if (!(endSymbolAttrs as any).symbolType && !(endSymbolAttrs as any).originSymbolType) {\n (endSymbolAttrs as any).originSymbolType = 'solidArrow';\n }\n const line = new Segment({\n points: linePoints,\n startSymbol: {\n size: 8,\n ...startSymbolAttrs\n },\n endSymbol: {\n size: 8,\n ...endSymbolAttrs\n },\n lineStyle: {\n lineDash: [3, 3],\n lineWidth: 1,\n stroke: '#000',\n ...lineStyle,\n ...styleMap?.[`line-${id}`]\n } as ILineGraphicAttribute,\n pickable: true,\n childrenPickable: false,\n zIndex: 1\n });\n line.name = 'bar-link-line';\n line.id = `line-${id}`;\n this.add(line as unknown as IGraphic);\n }\n\n if (label?.visible && styleMap?.[`label-${id}`]?.visible !== false) {\n const { style, formatMethod } = label;\n\n const [startData, endData] = curData;\n\n let startValue = startData[STACK_FIELD_END];\n let endValue = endData[STACK_FIELD_END];\n if (linkType === 'value') {\n startValue = startData[STACK_FIELD_END] - startData[STACK_FIELD_START];\n endValue = endData[STACK_FIELD_END] - endData[STACK_FIELD_START];\n }\n\n const value = endValue - startValue;\n const percentage = ((endValue - startValue) / startValue) 100;\n\n const text = createText({\n x: (linePoints[0].x + linePoints[1].x) * 0.5,\n y: (linePoints[0].y + linePoints[1].y) * 0.5,\n text: formatMethod ? (formatMethod(value, percentage, curData) as string) : `${value} ${percentage}`,\n fontSize: 14,\n fill: '#000',\n stroke: '#fff',\n lineWidth: 1,\n textAlign: 'center',\n textBaseline: 'middle',\n background: '#fff',\n zIndex: 2,\n ...style,\n ...styleMap?.[`label-${id}`]\n });\n text.name = 'bar-link-label';\n text.id = `label-${id}`;\n this.add(text);\n }\n });\n }\n}\n\nexport const registerBarLink = () => {\n Factory.registerGraphicComponent(\n BAR_LINK,\n (attrs: Required<BarLinkAttrs>) => new BarLinkComponent(attrs) as unknown as IGraphic\n );\n};\n"]}

package/cjs/components/bar-link/type.d.ts CHANGED Viewed

@@ -1,10 +1,5 @@
 import type { IAreaGraphicAttribute, IGroupGraphicAttribute, ILineGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';
-import type { SegmentAttributes } from '@visactor/vrender-components';
-import type { Dict, IPointLike } from '@visactor/vutils';
-export type Point = {
-    x: number;
-    y: number;
-};
+import type { Dict, IPointLike, SegmentAttributes } from '@visactor/vchart';
 export type BarLinkDatum = {
     areaPoints: [IPointLike, IPointLike];
     linePoints: [IPointLike, IPointLike];

package/cjs/components/bar-link/type.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/components/bar-link/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type {\n IAreaGraphicAttribute,\n IGroupGraphicAttribute,\n ILineGraphicAttribute,\n ITextGraphicAttribute\n} from '@visactor/vrender-core';\nimport type { ~~SegmentAttributes } from '@visactor/vrender-components';\nimport type {~~ Dict, IPointLike } from '@visactor/~~vutils~~';\n\nexport type ~~Point = {\n x: number;\n y: number;\n};\n\nexport type~~ BarLinkDatum = {\n /*\n 用于绘制的面积的坐标点\n /\n areaPoints: [IPointLike, IPointLike];\n /\n 用于绘制线的坐标点\n /\n linePoints: [IPointLike, IPointLike];\n\n /\n 唯一标识，如果不声明，则默认使用数据索引\n /\n id?: string;\n color?: string;\n /\n 点携带的图形数据\n /\n data: [Dict<any>, Dict<any>];\n};\n\nexport interface BarLinkAttrs extends IGroupGraphicAttribute {\n data: BarLinkDatum[];\n /\n 连接类型\n * 1. 'total' 累计值进行连接\n * 2. 'value' 本身值连接\n /\n linkType?: 'total' \| 'value';\n /\n 是否填充\n /\n doFill?: boolean;\n linkStyle?: Pick<SegmentAttributes, 'startSymbol' \| 'endSymbol' \| 'lineStyle'>;\n areaStyle?: IAreaGraphicAttribute;\n /\n 用于配置各个线的样式，key 对应线的 id，主要用于连接线的编辑场景\n * 1. 删除：{ visible: false }\n * 2. 样式编辑：{ stroke: 'red' }\n */\n styleMap?: Record<string, ILineGraphicAttribute>;\n label?: {\n visible?: boolean;\n style?: ITextGraphicAttribute;\n formatMethod?: (value: number, percent: number, data: [any, any]) => (string \| number) \| (string \| number)[];\n };\n}\n"]}
1	+ {"version":3,"sources":["../src/components/bar-link/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type {\n IAreaGraphicAttribute,\n IGroupGraphicAttribute,\n ILineGraphicAttribute,\n ITextGraphicAttribute\n} from '@visactor/vrender-core';\nimport type { Dict, IPointLike, SegmentAttributes } from '@visactor/vchart';\n\nexport type BarLinkDatum = {\n /*\n 用于绘制的面积的坐标点\n /\n areaPoints: [IPointLike, IPointLike];\n /\n 用于绘制线的坐标点\n /\n linePoints: [IPointLike, IPointLike];\n\n /\n 唯一标识，如果不声明，则默认使用数据索引\n /\n id?: string;\n color?: string;\n /\n 点携带的图形数据\n /\n data: [Dict<any>, Dict<any>];\n};\n\nexport interface BarLinkAttrs extends IGroupGraphicAttribute {\n data: BarLinkDatum[];\n /\n 连接类型\n * 1. 'total' 累计值进行连接\n * 2. 'value' 本身值连接\n /\n linkType?: 'total' \| 'value';\n /\n 是否填充\n /\n doFill?: boolean;\n linkStyle?: Pick<SegmentAttributes, 'startSymbol' \| 'endSymbol' \| 'lineStyle'>;\n areaStyle?: IAreaGraphicAttribute;\n /\n 用于配置各个线的样式，key 对应线的 id，主要用于连接线的编辑场景\n * 1. 删除：{ visible: false }\n * 2. 样式编辑：{ stroke: 'red' }\n */\n styleMap?: Record<string, ILineGraphicAttribute>;\n label?: {\n visible?: boolean;\n style?: ITextGraphicAttribute;\n formatMethod?: (value: number, percent: number, data: [any, any]) => (string \| number) \| (string \| number)[];\n };\n}\n"]}

package/cjs/components/bar-link/util.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { Dict } from '@visactor/vutils';
+import type { Dict } from '@visactor/vchart';
 import type { BarLinkAttrs, BarLinkDatum } from './type';
 import type { IMarkGraphic, ISpec } from '@visactor/vchart';
 export declare function groupBarsByFields(elements: IMarkGraphic[], groupFields: string[]): Dict<IMarkGraphic[]>;

package/cjs/components/bar-link/util.js CHANGED Viewed

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.appendBarLinkConfig = exports.getBarLinkConfig = exports.getLinkData = exports.groupBarsByFields = void 0;
-const vchart_1 = require("@visactor/vchart"), vutils_1 = require("@visactor/vutils"), constant_1 = require("./constant");
+const vchart_1 = require("@visactor/vchart"), vchart_2 = require("@visactor/vchart"), constant_1 = require("./constant");
 function groupBarsByFields(elements, groupFields) {
     const result = {};
@@ -174,7 +174,7 @@ function getBarLinkConfig(style = {}, extraStyle) {
 }
 function appendBarLinkConfig(rawSpec, barLinkSpec) {
-    rawSpec.customMark = (0, vutils_1.array)(rawSpec.customMark).filter((obj => obj.componentType !== constant_1.BAR_LINK)),
+    rawSpec.customMark = (0, vchart_2.array)(rawSpec.customMark).filter((obj => obj.componentType !== constant_1.BAR_LINK)),
     rawSpec.customMark.push(getBarLinkConfig(barLinkSpec));
 }

package/cjs/components/bar-link/util.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/components/bar-link/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import type { Dict, IPointLike } from '@visactor/vutils';\nimport type { BarLinkAttrs, BarLinkDatum } from './type';\nimport type { Datum, ICartesianSeries, IMarkGraphic, ISpec } from '@visactor/vchart';\nimport { getDatumOfGraphic, STACK_FIELD_END } from '@visactor/vchart';\nimport { array } from '@visactor/vutils';\nimport { BAR_LINK } from './constant';\n\nexport function groupBarsByFields(elements: IMarkGraphic[], groupFields: string[]) {\n const result: Dict<IMarkGraphic[]> = {};\n for (let i = 0; i < elements.length; i++) {\n const item = elements[i];\n const itemData = getDatumOfGraphic(item) as Datum;\n const groupKey = groupFields.map(field => itemData[field]).join('-');\n if (!result[groupKey]) {\n result[groupKey] = [];\n }\n result[groupKey].push(item);\n }\n return result;\n}\n\nexport function getLinkData(\n currentElement: IMarkGraphic,\n nextElement: IMarkGraphic,\n config: {\n isHorizontal: boolean;\n isXAxisInverse: boolean;\n isYAxisInverse: boolean;\n linkType: string;\n doFill: boolean;\n regionStartX: number;\n regionStartY: number;\n }\n): BarLinkDatum {\n const { isHorizontal, isXAxisInverse, isYAxisInverse, linkType, doFill, regionStartX, regionStartY } = config;\n\n const currentBarBounds = currentElement.AABBBounds;\n const nextBarBounds = nextElement.AABBBounds;\n\n let linePoints: [IPointLike, IPointLike];\n let areaPoints: [IPointLike, IPointLike];\n\n if (isHorizontal) {\n linePoints = [\n {\n x: (currentBarBounds.x1 + currentBarBounds.x2) / 2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: (nextBarBounds.x1 + nextBarBounds.x2) / 2 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n if (isXAxisInverse) {\n if (linkType === 'total') {\n linePoints = [\n {\n x: currentBarBounds.x1 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n\n if (doFill) {\n areaPoints = [\n {\n x: currentBarBounds.x1 + regionStartX,\n x1: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n x1: nextBarBounds.x2 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n } else {\n if (linkType === 'total') {\n linePoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x2 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n\n if (doFill) {\n areaPoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n x1: currentBarBounds.x1 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x2 + regionStartX,\n x1: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n }\n } else {\n linePoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: (currentBarBounds.y1 + currentBarBounds.y2) / 2 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: (nextBarBounds.y1 + nextBarBounds.y2) / 2 + regionStartY\n }\n ];\n\n if (isYAxisInverse) {\n if (linkType === 'total') {\n linePoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y2 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n if (doFill) {\n areaPoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y2 + regionStartY,\n y1: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y2 + regionStartY,\n y1: nextBarBounds.y1 + regionStartY\n }\n ];\n }\n } else {\n if (linkType === 'total') {\n linePoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y1 + regionStartY\n }\n ];\n }\n if (doFill) {\n areaPoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY,\n y1: currentBarBounds.y2 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y1 + regionStartY,\n y1: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n }\n }\n\n return {\n // points,\n areaPoints,\n linePoints,\n data: [getDatumOfGraphic(currentElement) as Datum, getDatumOfGraphic(nextElement) as Datum],\n color: currentElement.attribute.fill as string\n };\n}\n\nexport function getBarLinkConfig(\n style: Pick<BarLinkAttrs, 'areaStyle' \| 'label' \| 'linkStyle' \| 'styleMap' \| 'doFill' \| 'linkType'> = {},\n extraStyle?: any\n) {\n const { linkType = 'total', doFill, ...rest } = style;\n return {\n type: 'component',\n componentType: BAR_LINK,\n zIndex: 500, // 需要处于 region 上层\n interactive: false,\n style: {\n data: (datum: any, context: any) => {\n const { vchart } = context;\n const regions = vchart.getChart().getAllRegions();\n const linkLineData: BarLinkDatum[] = [];\n regions.forEach((region: any) => {\n // 获取所有 bar 系列\n const barSeriesArr = region\n .getSeries()\n .filter((s: ICartesianSeries) => s.type === 'bar') as ICartesianSeries[];\n const { x: regionStartX, y: regionStartY } = region.getLayoutStartPoint();\n if (barSeriesArr.length) {\n const groupFields = barSeriesArr[0].getGroupFields();\n const allBarElements: IMarkGraphic[] = [];\n barSeriesArr.forEach(barSeries => {\n const barGraphicElements = barSeries.getMarkInName('bar')?.getGraphics();\n\n barGraphicElements.forEach(barElement => {\n allBarElements.push(barElement);\n });\n });\n // 按照 xField/yField 进行分组\n const groupData = groupBarsByFields(allBarElements, groupFields);\n\n // 对同组内的图形进行排序\n Object.values(groupData).forEach((groupedValues: IMarkGraphic[]) => {\n groupedValues.sort((prev: IMarkGraphic, curr: IMarkGraphic) => {\n return (\n (getDatumOfGraphic(prev) as Datum)[STACK_FIELD_END] -\n (getDatumOfGraphic(curr) as Datum)[STACK_FIELD_END]\n );\n });\n });\n\n const barSeries = barSeriesArr[0];\n const isHorizontal = barSeries.direction === 'horizontal';\n const isYAxisInverse = barSeries.getYAxisHelper().isInverse();\n const isXAxisInverse = barSeries.getXAxisHelper().isInverse();\n\n const groupValues: IMarkGraphic[][] = Object.values(groupData);\n\n // 根据每组图形：\n // 1. 水平，每组图形的 y1 进行由小到大排序，保证图形顺序\n // 2. 垂直，每组图形的 x1 进行由小到大排序，保证图形顺序\n if (groupValues.length) {\n if (isHorizontal) {\n const firstElementPosY = groupValues[0][0].AABBBounds.y1;\n const lastElementPosY = groupValues[groupValues.length - 1][0].AABBBounds.y1;\n if (firstElementPosY < lastElementPosY) {\n groupValues.reverse();\n }\n } else {\n const firstElementPosX = groupValues[0][0].AABBBounds.x1;\n const lastElementPosX = groupValues[groupValues.length - 1][0].AABBBounds.x1;\n if (firstElementPosX > lastElementPosX) {\n groupValues.reverse();\n }\n }\n }\n\n for (let index = 0; index < groupValues.length - 1; index++) {\n const currentValues: IMarkGraphic[] = groupValues[index];\n const nextValues: IMarkGraphic[] = groupValues[index + 1];\n\n currentValues.forEach((element, elementIndex) => {\n const nextElement = nextValues[elementIndex] ?? nextValues[nextValues.length - 1];\n\n const linkData = getLinkData(element, nextElement, {\n isHorizontal,\n isXAxisInverse,\n isYAxisInverse,\n doFill,\n linkType,\n regionStartX,\n regionStartY\n });\n\n linkLineData.push(linkData);\n });\n\n if (currentValues.length < nextValues.length) {\n // 如果当前组的个数小于下一个组的个数，用当前组的最后一个元素去链接下一组剩余的图形\n // 使用当前组的最后一个元素去链接下一组剩余的图形\n const lastElementOfCurrentElement = currentValues[currentValues.length - 1];\n for (let i = currentValues.length; i < nextValues.length; i++) {\n const nextElement = nextValues[i];\n\n const linkData = getLinkData(lastElementOfCurrentElement, nextElement, {\n isHorizontal,\n isXAxisInverse,\n isYAxisInverse,\n doFill,\n linkType,\n regionStartX,\n regionStartY\n });\n\n linkLineData.push(linkData);\n }\n }\n }\n }\n });\n\n return linkLineData;\n },\n linkType,\n ...rest,\n ...extraStyle\n }\n };\n}\n\nexport function appendBarLinkConfig(\n rawSpec: ISpec,\n barLinkSpec?: Pick<BarLinkAttrs, 'areaStyle' \| 'label' \| 'linkStyle' \| 'styleMap' \| 'doFill' \| 'linkType'>\n) {\n // 判断 editorSpec 中是否有 barLink，有则添加 customMark\n (rawSpec as any).customMark = array((rawSpec as any).customMark).filter((obj: any) => obj.componentType !== BAR_LINK);\n (rawSpec as any).customMark.push(getBarLinkConfig(barLinkSpec));\n}\n"]}
1	+ {"version":3,"sources":["../src/components/bar-link/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["import type { Dict, IPointLike } from '@visactor/vchart';\nimport type { BarLinkAttrs, BarLinkDatum } from './type';\nimport type { Datum, ICartesianSeries, IMarkGraphic, ISpec } from '@visactor/vchart';\nimport { getDatumOfGraphic, STACK_FIELD_END } from '@visactor/vchart';\nimport { array } from '@visactor/vchart';\nimport { BAR_LINK } from './constant';\n\nexport function groupBarsByFields(elements: IMarkGraphic[], groupFields: string[]) {\n const result: Dict<IMarkGraphic[]> = {};\n for (let i = 0; i < elements.length; i++) {\n const item = elements[i];\n const itemData = getDatumOfGraphic(item) as Datum;\n const groupKey = groupFields.map(field => itemData[field]).join('-');\n if (!result[groupKey]) {\n result[groupKey] = [];\n }\n result[groupKey].push(item);\n }\n return result;\n}\n\nexport function getLinkData(\n currentElement: IMarkGraphic,\n nextElement: IMarkGraphic,\n config: {\n isHorizontal: boolean;\n isXAxisInverse: boolean;\n isYAxisInverse: boolean;\n linkType: string;\n doFill: boolean;\n regionStartX: number;\n regionStartY: number;\n }\n): BarLinkDatum {\n const { isHorizontal, isXAxisInverse, isYAxisInverse, linkType, doFill, regionStartX, regionStartY } = config;\n\n const currentBarBounds = currentElement.AABBBounds;\n const nextBarBounds = nextElement.AABBBounds;\n\n let linePoints: [IPointLike, IPointLike];\n let areaPoints: [IPointLike, IPointLike];\n\n if (isHorizontal) {\n linePoints = [\n {\n x: (currentBarBounds.x1 + currentBarBounds.x2) / 2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: (nextBarBounds.x1 + nextBarBounds.x2) / 2 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n if (isXAxisInverse) {\n if (linkType === 'total') {\n linePoints = [\n {\n x: currentBarBounds.x1 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n\n if (doFill) {\n areaPoints = [\n {\n x: currentBarBounds.x1 + regionStartX,\n x1: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n x1: nextBarBounds.x2 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n } else {\n if (linkType === 'total') {\n linePoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x2 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n\n if (doFill) {\n areaPoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n x1: currentBarBounds.x1 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x2 + regionStartX,\n x1: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n }\n } else {\n linePoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: (currentBarBounds.y1 + currentBarBounds.y2) / 2 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: (nextBarBounds.y1 + nextBarBounds.y2) / 2 + regionStartY\n }\n ];\n\n if (isYAxisInverse) {\n if (linkType === 'total') {\n linePoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y2 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n if (doFill) {\n areaPoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y2 + regionStartY,\n y1: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y2 + regionStartY,\n y1: nextBarBounds.y1 + regionStartY\n }\n ];\n }\n } else {\n if (linkType === 'total') {\n linePoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y1 + regionStartY\n }\n ];\n }\n if (doFill) {\n areaPoints = [\n {\n x: currentBarBounds.x2 + regionStartX,\n y: currentBarBounds.y1 + regionStartY,\n y1: currentBarBounds.y2 + regionStartY\n },\n {\n x: nextBarBounds.x1 + regionStartX,\n y: nextBarBounds.y1 + regionStartY,\n y1: nextBarBounds.y2 + regionStartY\n }\n ];\n }\n }\n }\n\n return {\n // points,\n areaPoints,\n linePoints,\n data: [getDatumOfGraphic(currentElement) as Datum, getDatumOfGraphic(nextElement) as Datum],\n color: currentElement.attribute.fill as string\n };\n}\n\nexport function getBarLinkConfig(\n style: Pick<BarLinkAttrs, 'areaStyle' \| 'label' \| 'linkStyle' \| 'styleMap' \| 'doFill' \| 'linkType'> = {},\n extraStyle?: any\n) {\n const { linkType = 'total', doFill, ...rest } = style;\n return {\n type: 'component',\n componentType: BAR_LINK,\n zIndex: 500, // 需要处于 region 上层\n interactive: false,\n style: {\n data: (datum: any, context: any) => {\n const { vchart } = context;\n const regions = vchart.getChart().getAllRegions();\n const linkLineData: BarLinkDatum[] = [];\n regions.forEach((region: any) => {\n // 获取所有 bar 系列\n const barSeriesArr = region\n .getSeries()\n .filter((s: ICartesianSeries) => s.type === 'bar') as ICartesianSeries[];\n const { x: regionStartX, y: regionStartY } = region.getLayoutStartPoint();\n if (barSeriesArr.length) {\n const groupFields = barSeriesArr[0].getGroupFields();\n const allBarElements: IMarkGraphic[] = [];\n barSeriesArr.forEach(barSeries => {\n const barGraphicElements = barSeries.getMarkInName('bar')?.getGraphics();\n\n barGraphicElements.forEach(barElement => {\n allBarElements.push(barElement);\n });\n });\n // 按照 xField/yField 进行分组\n const groupData = groupBarsByFields(allBarElements, groupFields);\n\n // 对同组内的图形进行排序\n Object.values(groupData).forEach((groupedValues: IMarkGraphic[]) => {\n groupedValues.sort((prev: IMarkGraphic, curr: IMarkGraphic) => {\n return (\n (getDatumOfGraphic(prev) as Datum)[STACK_FIELD_END] -\n (getDatumOfGraphic(curr) as Datum)[STACK_FIELD_END]\n );\n });\n });\n\n const barSeries = barSeriesArr[0];\n const isHorizontal = barSeries.direction === 'horizontal';\n const isYAxisInverse = barSeries.getYAxisHelper().isInverse();\n const isXAxisInverse = barSeries.getXAxisHelper().isInverse();\n\n const groupValues: IMarkGraphic[][] = Object.values(groupData);\n\n // 根据每组图形：\n // 1. 水平，每组图形的 y1 进行由小到大排序，保证图形顺序\n // 2. 垂直，每组图形的 x1 进行由小到大排序，保证图形顺序\n if (groupValues.length) {\n if (isHorizontal) {\n const firstElementPosY = groupValues[0][0].AABBBounds.y1;\n const lastElementPosY = groupValues[groupValues.length - 1][0].AABBBounds.y1;\n if (firstElementPosY < lastElementPosY) {\n groupValues.reverse();\n }\n } else {\n const firstElementPosX = groupValues[0][0].AABBBounds.x1;\n const lastElementPosX = groupValues[groupValues.length - 1][0].AABBBounds.x1;\n if (firstElementPosX > lastElementPosX) {\n groupValues.reverse();\n }\n }\n }\n\n for (let index = 0; index < groupValues.length - 1; index++) {\n const currentValues: IMarkGraphic[] = groupValues[index];\n const nextValues: IMarkGraphic[] = groupValues[index + 1];\n\n currentValues.forEach((element, elementIndex) => {\n const nextElement = nextValues[elementIndex] ?? nextValues[nextValues.length - 1];\n\n const linkData = getLinkData(element, nextElement, {\n isHorizontal,\n isXAxisInverse,\n isYAxisInverse,\n doFill,\n linkType,\n regionStartX,\n regionStartY\n });\n\n linkLineData.push(linkData);\n });\n\n if (currentValues.length < nextValues.length) {\n // 如果当前组的个数小于下一个组的个数，用当前组的最后一个元素去链接下一组剩余的图形\n // 使用当前组的最后一个元素去链接下一组剩余的图形\n const lastElementOfCurrentElement = currentValues[currentValues.length - 1];\n for (let i = currentValues.length; i < nextValues.length; i++) {\n const nextElement = nextValues[i];\n\n const linkData = getLinkData(lastElementOfCurrentElement, nextElement, {\n isHorizontal,\n isXAxisInverse,\n isYAxisInverse,\n doFill,\n linkType,\n regionStartX,\n regionStartY\n });\n\n linkLineData.push(linkData);\n }\n }\n }\n }\n });\n\n return linkLineData;\n },\n linkType,\n ...rest,\n ...extraStyle\n }\n };\n}\n\nexport function appendBarLinkConfig(\n rawSpec: ISpec,\n barLinkSpec?: Pick<BarLinkAttrs, 'areaStyle' \| 'label' \| 'linkStyle' \| 'styleMap' \| 'doFill' \| 'linkType'>\n) {\n // 判断 editorSpec 中是否有 barLink，有则添加 customMark\n (rawSpec as any).customMark = array((rawSpec as any).customMark).filter((obj: any) => obj.componentType !== BAR_LINK);\n (rawSpec as any).customMark.push(getBarLinkConfig(barLinkSpec));\n}\n"]}

package/cjs/components/bar-regression-line/index.d.ts ADDED Viewed

@@ -0,0 +1,26 @@
+import type { ISpec } from '@visactor/vchart';
+import type { BarRegressionLineSpec } from './type';
+import type { RegressionLineData } from '../regression-line/type';
+export declare function getBarRegressionLineConfig(config: Omit<BarRegressionLineSpec, 'visible'>): {
+    type: string;
+    componentType: string;
+    interactive: boolean;
+    zIndex: number;
+    style: {
+        data: (datum: any, ctx: any) => RegressionLineData[];
+        line: {
+            visible?: boolean;
+            style?: import("@visactor/vchart").ILineGraphicAttribute;
+        };
+        confidenceInterval: {
+            visible?: boolean;
+            style?: import("@visactor/vchart").IAreaGraphicAttribute;
+        };
+        label: {
+            visible?: boolean;
+            text: string;
+            style?: import("@visactor/vchart").ITextGraphicAttribute;
+        };
+    };
+};
+export declare function appendBarRegressionLineConfig(chartSpec: ISpec, spec?: BarRegressionLineSpec): void;

package/cjs/components/bar-regression-line/index.js ADDED Viewed

@@ -0,0 +1,87 @@
+"use strict";
+var __rest = this && this.__rest || function(s, e) {
+    var t = {};
+    for (var p in s) Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0 && (t[p] = s[p]);
+    if (null != s && "function" == typeof Object.getOwnPropertySymbols) {
+        var i = 0;
+        for (p = Object.getOwnPropertySymbols(s); i < p.length; i++) e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]) && (t[p[i]] = s[p[i]]);
+    }
+    return t;
+};
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+}), exports.appendBarRegressionLineConfig = exports.getBarRegressionLineConfig = void 0;
+const vchart_1 = require("@visactor/vchart"), vchart_2 = require("@visactor/vchart"), regression_line_1 = require("../regression-line/regression-line");
+function getBarRegressionLineConfig(config) {
+    const {color: color, line: line, confidenceInterval: confidenceInterval, label: label} = config;
+    return {
+        type: "component",
+        componentType: regression_line_1.REGRESSION_LINE,
+        interactive: !1,
+        zIndex: 500,
+        style: {
+            data: (datum, ctx) => {
+                const series = ctx.vchart.getChart().getAllSeries().filter((s => s.type === vchart_2.SeriesTypeEnum.bar)), regressionData = [];
+                return series && series.length && series.forEach((s => {
+                    var _a, _b, _c;
+                    const region = s.getRegion().getLayoutStartPoint(), start = s.getRegion().getLayoutStartPoint(), rect = s.getRegion().getLayoutRect(), yClamper = (0,
+                    vchart_1.clamper)(start.y, start.y + rect.height), data = s.getViewData().latestData, fieldX = null === (_a = s.fieldX) || void 0 === _a ? void 0 : _a[0], fieldY = null === (_b = s.fieldY) || void 0 === _b ? void 0 : _b[0], isHorizontal = "horizontal" === s.direction, groups = s.getRawDataStatisticsByField(fieldX).values;
+                    if (isHorizontal || !fieldX || !fieldY || !data || data.length <= 2 || groups.length <= 2) return;
+                    const {evaluateGrid: evaluateGrid, confidenceInterval: confidenceInterval} = (0,
+                    vchart_1.regressionPolynomial)(data, (datum => groups.indexOf(null == datum ? void 0 : datum[fieldX])), (datum => null == datum ? void 0 : datum[fieldY]), {
+                        degree: config.degree
+                    }), N = groups.length, lineData = evaluateGrid(N), confidenceData = confidenceInterval(N), halfBandWidth = s.getXAxisHelper().getBandwidth(0) / 2;
+                    regressionData.push({
+                        color: null != color ? color : null === (_c = s.getOption().globalScale.getScale("color")) || void 0 === _c ? void 0 : _c.scale(s.getSeriesKeys()[0]),
+                        line: lineData.map((ld => {
+                            const d = {
+                                [fieldX]: groups[ld.x],
+                                [fieldY]: ld.y
+                            };
+                            return {
+                                x: s.dataToPositionX(d) + region.x + halfBandWidth,
+                                y: yClamper(s.dataToPositionY(d) + region.y)
+                            };
+                        })),
+                        area: confidenceData.map((c => {
+                            const d = {
+                                [fieldX]: groups[c.x],
+                                [fieldY]: c.lower
+                            };
+                            return {
+                                x: s.dataToPositionX(d) + region.x + halfBandWidth,
+                                y: yClamper(s.dataToPositionY(d) + region.y),
+                                y1: yClamper(s.dataToPositionY({
+                                    [fieldY]: c.upper
+                                }) + region.y)
+                            };
+                        }))
+                    });
+                })), regressionData;
+            },
+            line: line,
+            confidenceInterval: confidenceInterval,
+            label: label
+        }
+    };
+}
+function appendBarRegressionLineConfig(chartSpec, spec) {
+    var _a, _b;
+    spec || (spec = null !== (_a = (0, vchart_1.get)(chartSpec, regression_line_1.REGRESSION_LINE)) && void 0 !== _a ? _a : (0,
+    vchart_1.get)(null === (_b = chartSpec.series) || void 0 === _b ? void 0 : _b.find((s => s.type === vchart_2.SeriesTypeEnum.bar)), regression_line_1.REGRESSION_LINE));
+    (0, vchart_1.array)(spec).forEach((s => {
+        if (!1 !== s.visible) {
+            chartSpec.customMark || (chartSpec.customMark = []);
+            const {visible: visible} = s, rest = __rest(s, [ "visible" ]);
+            chartSpec.customMark.push(getBarRegressionLineConfig(rest));
+        }
+    }));
+}
+exports.getBarRegressionLineConfig = getBarRegressionLineConfig, exports.appendBarRegressionLineConfig = appendBarRegressionLineConfig;
+//# sourceMappingURL=index.js.map

package/cjs/components/bar-regression-line/index.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"sources":["../src/components/bar-regression-line/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["/**\n * @description vchart 自定义组件，用于实现柱图、线图以及面积图的系列标签\n * @author zhangweixing\n */\nimport { array, clamper, get, regressionPolynomial } from '@visactor/vchart';\nimport type { Datum, ICartesianSeries, ISpec } from '@visactor/vchart';\nimport { Direction, SeriesTypeEnum } from '@visactor/vchart';\nimport type { BarRegressionLineSpec } from './type';\nimport type { RegressionLineData } from '../regression-line/type';\nimport { REGRESSION_LINE } from '../regression-line/regression-line';\n\n/**\n * 获取系列标签的 spec 配置\n * @param position 显示位置\n * @param config 系列标签的样式配置\n * @returns\n */\nexport function getBarRegressionLineConfig(config: Omit<BarRegressionLineSpec, 'visible'>) {\n const { color, line, confidenceInterval, label } = config;\n return {\n type: 'component',\n componentType: REGRESSION_LINE,\n interactive: false,\n zIndex: 500, // 高于柱子\n style: {\n data: (datum: any, ctx: any) => {\n const vchart = ctx.vchart;\n const chart = vchart.getChart();\n const series = chart.getAllSeries().filter((s: any) => s.type === SeriesTypeEnum.bar) as ICartesianSeries[];\n const regressionData: RegressionLineData[] = [];\n\n // 必须存在散点图系列\n if (series && series.length) {\n series.forEach(s => {\n const region = s.getRegion().getLayoutStartPoint();\n const start = s.getRegion().getLayoutStartPoint();\n const rect = s.getRegion().getLayoutRect();\n const yClamper = clamper(start.y, start.y + rect.height);\n\n const data = s.getViewData().latestData;\n const fieldX = s.fieldX?.[0];\n const fieldY = s.fieldY?.[0];\n const isHorizontal = s.direction === Direction.horizontal;\n const groups = s.getRawDataStatisticsByField(fieldX).values;\n\n if (isHorizontal || !fieldX || !fieldY || !data || data.length <= 2 || groups.length <= 2) {\n return;\n }\n const { evaluateGrid, confidenceInterval } = regressionPolynomial(\n data,\n (datum: Datum) => groups.indexOf(datum?.[fieldX]),\n (datum: Datum) => datum?.[fieldY],\n { degree: config.degree }\n );\n const N = groups.length;\n const lineData = evaluateGrid(N);\n const confidenceData = confidenceInterval(N);\n const halfBandWidth = s.getXAxisHelper().getBandwidth(0) / 2;\n\n regressionData.push({\n color: color ?? s.getOption().globalScale.getScale('color')?.scale(s.getSeriesKeys()[0]),\n line: lineData.map((ld: Datum) => {\n const d = { [fieldX]: groups[ld.x], [fieldY]: ld.y };\n return {\n x: s.dataToPositionX(d) + region.x + halfBandWidth,\n y: yClamper(s.dataToPositionY(d) + region.y)\n };\n }),\n area: confidenceData.map((c: Datum) => {\n const d = { [fieldX]: groups[c.x], [fieldY]: c.lower };\n return {\n x: s.dataToPositionX(d) + region.x + halfBandWidth,\n y: yClamper(s.dataToPositionY(d) + region.y),\n y1: yClamper(s.dataToPositionY({ [fieldY]: c.upper }) + region.y)\n };\n })\n });\n });\n }\n\n return regressionData;\n },\n line,\n confidenceInterval,\n label\n }\n };\n}\n\nexport function appendBarRegressionLineConfig(chartSpec: ISpec, spec?: BarRegressionLineSpec) {\n if (!spec) {\n spec =\n get(chartSpec, REGRESSION_LINE) ??\n get(\n chartSpec.series?.find(s => s.type === SeriesTypeEnum.bar),\n REGRESSION_LINE\n );\n }\n const specs = array(spec);\n\n specs.forEach((s: BarRegressionLineSpec) => {\n if (s.visible !== false) {\n if (!(chartSpec as any).customMark) {\n (chartSpec as any).customMark = [];\n }\n\n const { visible, ...rest } = s;\n (chartSpec as any).customMark.push(getBarRegressionLineConfig(rest));\n }\n });\n}\n"]}

package/cjs/components/bar-regression-line/type.d.ts ADDED Viewed

@@ -0,0 +1,8 @@
+import type { RegressionLineAttrs } from '../regression-line/type';
+export interface BarRegressionLineAttrs extends RegressionLineAttrs {
+    degree?: number;
+}
+export interface BarRegressionLineSpec extends Partial<Pick<BarRegressionLineAttrs, 'line' | 'label' | 'confidenceInterval' | 'degree'>> {
+    visible?: boolean;
+    color?: string;
+}

package/cjs/components/bar-regression-line/type.js ADDED Viewed

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+    value: !0
+});
+//# sourceMappingURL=type.js.map

package/cjs/components/bar-regression-line/type.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"sources":["../src/components/bar-regression-line/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type { RegressionLineAttrs } from '../regression-line/type';\n\nexport interface BarRegressionLineAttrs extends RegressionLineAttrs {\n /**\n * 多项式回归的阶数，仅当 type 为 polynomial 时有效\n */\n degree?: number;\n}\n\nexport interface BarRegressionLineSpec\n extends Partial<Pick<BarRegressionLineAttrs, 'line' | 'label' | 'confidenceInterval' | 'degree'>> {\n /**\n * 是否显示回归线\n */\n visible?: boolean;\n /**\n * 主色，可以不设置，默认取散点图系列颜色\n */\n color?: string;\n}\n"]}

package/cjs/components/histogram-regression-line/index.d.ts ADDED Viewed

@@ -0,0 +1,22 @@
+import type { ISpec } from '@visactor/vchart';
+import type { HistogramRegressionLineSpec } from './type';
+import type { RegressionLineData } from '../regression-line/type';
+export declare function getHistogramRegressionLineConfig(type: 'kde' | 'ecdf', config: Omit<HistogramRegressionLineSpec, 'visible' | 'type'>): {
+    type: string;
+    componentType: string;
+    interactive: boolean;
+    zIndex: number;
+    style: {
+        data: (datum: any, ctx: any) => RegressionLineData[];
+        line: {
+            visible?: boolean;
+            style?: import("@visactor/vchart").ILineGraphicAttribute;
+        };
+        label: {
+            visible?: boolean;
+            text: string;
+            style?: import("@visactor/vchart").ITextGraphicAttribute;
+        };
+    };
+};
+export declare function appendHistogramRegressionLineConfig(chartSpec: ISpec, spec?: HistogramRegressionLineSpec | HistogramRegressionLineSpec[]): void;