npm - @visactor/vchart-extension - Versions diffs - 2.0.7-alpha.5 → 2.0.7-alpha.7 - Mend

@visactor/vchart-extension 2.0.7-alpha.5 → 2.0.7-alpha.7

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 (349) hide show

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 CHANGED Viewed

@@ -10,16 +10,16 @@ export declare function getBarRegressionLineConfig(config: Omit<BarRegressionLin
         data: (datum: any, ctx: any) => RegressionLineData[];
         line: {
             visible?: boolean;
-            style?: import("@visactor/vrender-core").ILineGraphicAttribute;
+            style?: import("@visactor/vchart").ILineGraphicAttribute;
         };
         confidenceInterval: {
             visible?: boolean;
-            style?: import("@visactor/vrender-core").IAreaGraphicAttribute;
+            style?: import("@visactor/vchart").IAreaGraphicAttribute;
         };
         label: {
             visible?: boolean;
             text: string;
-            style?: import("@visactor/vrender-core").ITextGraphicAttribute;
+            style?: import("@visactor/vchart").ITextGraphicAttribute;
         };
     };
 };

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

@@ -14,7 +14,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.appendBarRegressionLineConfig = exports.getBarRegressionLineConfig = void 0;
-const vutils_1 = require("@visactor/vutils"), vchart_1 = require("@visactor/vchart"), regression_line_1 = require("../regression-line/regression-line");
+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;
@@ -25,14 +25,14 @@ function getBarRegressionLineConfig(config) {
         zIndex: 500,
         style: {
             data: (datum, ctx) => {
-                const series = ctx.vchart.getChart().getAllSeries().filter((s => s.type === vchart_1.SeriesTypeEnum.bar)), regressionData = [];
+                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,
-                    vutils_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;
+                    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,
-                    vutils_1.regressionPolynomial)(data, (datum => groups.indexOf(null == datum ? void 0 : datum[fieldX])), (datum => null == datum ? void 0 : datum[fieldY]), {
+                    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({
@@ -72,9 +72,9 @@ function getBarRegressionLineConfig(config) {
 function appendBarRegressionLineConfig(chartSpec, spec) {
     var _a, _b;
-    spec || (spec = null !== (_a = (0, vutils_1.get)(chartSpec, regression_line_1.REGRESSION_LINE)) && void 0 !== _a ? _a : (0,
-    vutils_1.get)(null === (_b = chartSpec.series) || void 0 === _b ? void 0 : _b.find((s => s.type === vchart_1.SeriesTypeEnum.bar)), regression_line_1.REGRESSION_LINE));
-    (0, vutils_1.array)(spec).forEach((s => {
+    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" ]);
@@ -84,4 +84,4 @@ function appendBarRegressionLineConfig(chartSpec, spec) {
 }
 exports.getBarRegressionLineConfig = getBarRegressionLineConfig, exports.appendBarRegressionLineConfig = appendBarRegressionLineConfig;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

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

	@@ -1 +1 @@
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/~~vutils~~';\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"]}
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.js CHANGED Viewed

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

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

@@ -10,12 +10,12 @@ export declare function getHistogramRegressionLineConfig(type: 'kde' | 'ecdf', c
         data: (datum: any, ctx: any) => RegressionLineData[];
         line: {
             visible?: boolean;
-            style?: import("@visactor/vrender-core").ILineGraphicAttribute;
+            style?: import("@visactor/vchart").ILineGraphicAttribute;
         };
         label: {
             visible?: boolean;
             text: string;
-            style?: import("@visactor/vrender-core").ITextGraphicAttribute;
+            style?: import("@visactor/vchart").ITextGraphicAttribute;
         };
     };
 };

package/cjs/components/histogram-regression-line/index.js CHANGED Viewed

@@ -14,13 +14,13 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.appendHistogramRegressionLineConfig = exports.getHistogramRegressionLineConfig = void 0;
-const vutils_1 = require("@visactor/vutils"), vchart_1 = require("@visactor/vchart"), regression_line_1 = require("../regression-line/regression-line"), getRegressionByType = (type, data, kdeOptions) => {
+const vchart_1 = require("@visactor/vchart"), vchart_2 = require("@visactor/vchart"), regression_line_1 = require("../regression-line/regression-line"), getRegressionByType = (type, data, kdeOptions) => {
     switch (type) {
       case "kde":
-        return (0, vutils_1.kde)(data, kdeOptions);
+        return (0, vchart_1.kde)(data, kdeOptions);
       case "ecdf":
-        return (0, vutils_1.ecdf)(data);
+        return (0, vchart_1.ecdf)(data);
     }
 };
@@ -33,7 +33,7 @@ function getHistogramRegressionLineConfig(type, config) {
         zIndex: 500,
         style: {
             data: (datum, ctx) => {
-                const series = ctx.vchart.getChart().getAllSeries().filter((s => s.type === vchart_1.SeriesTypeEnum.bar)), regressionData = [];
+                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, _d, _e, _f, _g, _h;
                     const region = s.getRegion().getLayoutStartPoint(), rawData = s._rawData, data = null == rawData ? void 0 : rawData.rawData, binTransformOptions = null === (_b = null === (_a = rawData.transformsArr) || void 0 === _a ? void 0 : _a.find((t => "bin" === t.type))) || void 0 === _b ? void 0 : _b.options, fieldX = null === (_c = s.fieldX) || void 0 === _c ? void 0 : _c[0], scaleY = s.getYAxisHelper().getScale(0), viewData = s.getViewData().latestData;
@@ -41,7 +41,7 @@ function getHistogramRegressionLineConfig(type, config) {
                     const simpleData = data.map((entry => entry[binTransformOptions.field])), res = getRegressionByType(type, simpleData, "kde" === type ? {
                         bandwidth: viewData[0][null !== (_e = null === (_d = binTransformOptions.outputNames) || void 0 === _d ? void 0 : _d.x1) && void 0 !== _e ? _e : "x1"] - viewData[0][null !== (_g = null === (_f = binTransformOptions.outputNames) || void 0 === _f ? void 0 : _f.x0) && void 0 !== _g ? _g : "x0"]
                     } : null), N = Math.max(3, Math.floor(simpleData.length / 4)), lineData = res.evaluateGrid(N), yRange = scaleY.range(), y0 = yRange[0], y1 = (0,
-                    vutils_1.last)(yRange), scaleR = "kde" === type ? k => scaleY.scale(k * data.length * res.bandwidth) : e => y0 + (y1 - y0) * e;
+                    vchart_1.last)(yRange), scaleR = "kde" === type ? k => scaleY.scale(k * data.length * res.bandwidth) : e => y0 + (y1 - y0) * e;
                     regressionData.push({
                         color: null != color ? color : null === (_h = s.getOption().globalScale.getScale("color")) || void 0 === _h ? void 0 : _h.scale(s.getSeriesKeys()[0]),
                         line: lineData.map((ld => {
@@ -64,9 +64,9 @@ function getHistogramRegressionLineConfig(type, config) {
 function appendHistogramRegressionLineConfig(chartSpec, spec) {
     var _a, _b;
-    spec || (spec = null !== (_a = (0, vutils_1.get)(chartSpec, regression_line_1.REGRESSION_LINE)) && void 0 !== _a ? _a : (0,
-    vutils_1.get)(null === (_b = chartSpec.series) || void 0 === _b ? void 0 : _b.find((s => s.type === vchart_1.SeriesTypeEnum.bar)), regression_line_1.REGRESSION_LINE));
-    (0, vutils_1.array)(spec).forEach((s => {
+    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 {type: type} = s, rest = __rest(s, [ "type" ]);
@@ -76,4 +76,4 @@ function appendHistogramRegressionLineConfig(chartSpec, spec) {
 }
 exports.getHistogramRegressionLineConfig = getHistogramRegressionLineConfig, exports.appendHistogramRegressionLineConfig = appendHistogramRegressionLineConfig;
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/components/histogram-regression-line/index.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/components/histogram-regression-line/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["/*\n @description vchart 自定义组件，用于实现柱图、线图以及面积图的系列标签\n * @author zhangweixing\n /\n\nimport type { KDEEvaluator } from '@visactor/~~vutils~~';\nimport { array, get, kde, ecdf, last } from '@visactor/~~vutils~~';\nimport type { Datum, ICartesianSeries, ISpec } from '@visactor/vchart';\nimport { SeriesTypeEnum } from '@visactor/vchart';\nimport type { HistogramRegressionLineSpec } from './type';\nimport type { RegressionLineData } from '../regression-line/type';\nimport { REGRESSION_LINE } from '../regression-line/regression-line';\n\nconst getRegressionByType = (type: 'kde' \| 'ecdf', data: number[], kdeOptions?: any) => {\n switch (type) {\n case 'kde':\n return kde(data, kdeOptions);\n case 'ecdf':\n return ecdf(data);\n }\n};\n\n/\n 获取系列标签的 spec 配置\n * @param position 显示位置\n * @param config 系列标签的样式配置\n * @returns\n /\nexport function getHistogramRegressionLineConfig(\n type: 'kde' \| 'ecdf',\n config: Omit<HistogramRegressionLineSpec, 'visible' \| 'type'>\n) {\n const { line, label, color } = 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 // 直方图使用的是bar系列\n if (series && series.length) {\n series.forEach(s => {\n const region = s.getRegion().getLayoutStartPoint();\n\n const rawData = (s as any)._rawData;\n const data = rawData?.rawData;\n const binTransformOptions = rawData.transformsArr?.find((t: any) => t.type === 'bin')?.options;\n const fieldX = s.fieldX?.[0];\n const scaleY = s.getYAxisHelper().getScale(0);\n const viewData = s.getViewData().latestData;\n\n if (!data \|\| !data.length \|\| !binTransformOptions?.field \|\| !scaleY \|\| !viewData \|\| !viewData.length) {\n return;\n }\n const simpleData = data.map((entry: Datum) => entry[binTransformOptions.field]);\n const res = getRegressionByType(\n type,\n simpleData,\n type === 'kde'\n ? {\n bandwidth:\n viewData[0][binTransformOptions.outputNames?.x1 ?? 'x1'] -\n viewData[0][binTransformOptions.outputNames?.x0 ?? 'x0']\n }\n : null\n );\n const N = Math.max(3, Math.floor(simpleData.length / 4));\n const lineData = res.evaluateGrid(N);\n const yRange = scaleY.range();\n const y0 = yRange[0];\n const y1 = last(yRange);\n const scaleR =\n type === 'kde'\n ? (k: number) => {\n return scaleY.scale(k data.length * (res as KDEEvaluator).bandwidth);\n }\n : (e: number) => {\n return y0 + (y1 - y0) * e;\n };\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]: ld.x };\n return {\n x: s.dataToPositionX(d) + region.x,\n y: scaleR(ld.y) + region.y\n };\n })\n });\n });\n }\n\n return regressionData;\n },\n line,\n label\n }\n };\n}\n\nexport function appendHistogramRegressionLineConfig(\n chartSpec: ISpec,\n spec?: HistogramRegressionLineSpec \| HistogramRegressionLineSpec[]\n) {\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: HistogramRegressionLineSpec) => {\n if (s.visible !== false) {\n if (!(chartSpec as any).customMark) {\n (chartSpec as any).customMark = [];\n }\n const { type, ...rest } = s;\n (chartSpec as any).customMark.push(getHistogramRegressionLineConfig(type, rest));\n }\n });\n}\n"]}
1	+ {"version":3,"sources":["../src/components/histogram-regression-line/index.ts"],"names":[],"mappings":"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","file":"index.js","sourcesContent":["/*\n @description vchart 自定义组件，用于实现柱图、线图以及面积图的系列标签\n * @author zhangweixing\n /\n\nimport type { KDEEvaluator } from '@visactor/vchart';\nimport { array, get, kde, ecdf, last } from '@visactor/vchart';\nimport type { Datum, ICartesianSeries, ISpec } from '@visactor/vchart';\nimport { SeriesTypeEnum } from '@visactor/vchart';\nimport type { HistogramRegressionLineSpec } from './type';\nimport type { RegressionLineData } from '../regression-line/type';\nimport { REGRESSION_LINE } from '../regression-line/regression-line';\n\nconst getRegressionByType = (type: 'kde' \| 'ecdf', data: number[], kdeOptions?: any) => {\n switch (type) {\n case 'kde':\n return kde(data, kdeOptions);\n case 'ecdf':\n return ecdf(data);\n }\n};\n\n/\n 获取系列标签的 spec 配置\n * @param position 显示位置\n * @param config 系列标签的样式配置\n * @returns\n /\nexport function getHistogramRegressionLineConfig(\n type: 'kde' \| 'ecdf',\n config: Omit<HistogramRegressionLineSpec, 'visible' \| 'type'>\n) {\n const { line, label, color } = 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 // 直方图使用的是bar系列\n if (series && series.length) {\n series.forEach(s => {\n const region = s.getRegion().getLayoutStartPoint();\n\n const rawData = (s as any)._rawData;\n const data = rawData?.rawData;\n const binTransformOptions = rawData.transformsArr?.find((t: any) => t.type === 'bin')?.options;\n const fieldX = s.fieldX?.[0];\n const scaleY = s.getYAxisHelper().getScale(0);\n const viewData = s.getViewData().latestData;\n\n if (!data \|\| !data.length \|\| !binTransformOptions?.field \|\| !scaleY \|\| !viewData \|\| !viewData.length) {\n return;\n }\n const simpleData = data.map((entry: Datum) => entry[binTransformOptions.field]);\n const res = getRegressionByType(\n type,\n simpleData,\n type === 'kde'\n ? {\n bandwidth:\n viewData[0][binTransformOptions.outputNames?.x1 ?? 'x1'] -\n viewData[0][binTransformOptions.outputNames?.x0 ?? 'x0']\n }\n : null\n );\n const N = Math.max(3, Math.floor(simpleData.length / 4));\n const lineData = res.evaluateGrid(N);\n const yRange = scaleY.range();\n const y0 = yRange[0];\n const y1 = last(yRange);\n const scaleR =\n type === 'kde'\n ? (k: number) => {\n return scaleY.scale(k data.length * (res as KDEEvaluator).bandwidth);\n }\n : (e: number) => {\n return y0 + (y1 - y0) * e;\n };\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]: ld.x };\n return {\n x: s.dataToPositionX(d) + region.x,\n y: scaleR(ld.y) + region.y\n };\n })\n });\n });\n }\n\n return regressionData;\n },\n line,\n label\n }\n };\n}\n\nexport function appendHistogramRegressionLineConfig(\n chartSpec: ISpec,\n spec?: HistogramRegressionLineSpec \| HistogramRegressionLineSpec[]\n) {\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: HistogramRegressionLineSpec) => {\n if (s.visible !== false) {\n if (!(chartSpec as any).customMark) {\n (chartSpec as any).customMark = [];\n }\n const { type, ...rest } = s;\n (chartSpec as any).customMark.push(getHistogramRegressionLineConfig(type, rest));\n }\n });\n}\n"]}

package/cjs/components/histogram-regression-line/type.js CHANGED Viewed

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

package/cjs/components/map-label/index.js CHANGED Viewed

@@ -18,4 +18,4 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 Object.defineProperty(exports, "__esModule", {
     value: !0
 }), __exportStar(require("./map-label"), exports), __exportStar(require("./type"), exports);
-//# sourceMappingURL=index.js.map
+//# sourceMappingURL=index.js.map

package/cjs/components/map-label/layout.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import type { Feature } from '@visactor/vutils';
+import type { Feature } from '@visactor/vchart';
 import type { IRect, IOrientType, IPoint } from '@visactor/vchart';
 type IBound = {
     x1: number;

package/cjs/components/map-label/layout.js CHANGED Viewed

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.candidatesByOrient = exports.placeRectByOrient = exports.layoutOuter2 = exports.layoutOuter = exports.layoutByPosition = exports.bound = void 0;
-const vutils_1 = require("@visactor/vutils");
+const vchart_1 = require("@visactor/vchart");
 function overlap(a, b, sep = 0) {
     return sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2);
@@ -65,7 +65,7 @@ function layoutByPosition(pairs) {
 function layoutOuter(pairs, features, dataToPosition) {
     const _points = pairs.map((rect => rect.pointCoord)), {x1: x1, x2: x2, y1: y1, y2: y2} = (0,
-    vutils_1.getAABBFromPoints)(_points), centerPosition = dataToPosition([ (x1 + x2) / 2, (y1 + y2) / 2 ]);
+    vchart_1.getAABBFromPoints)(_points), centerPosition = dataToPosition([ (x1 + x2) / 2, (y1 + y2) / 2 ]);
     if (!centerPosition) return [];
     return layoutByPosition(pairs.map((pair => {
         const rect = pair.rect, targetPoint = isPointWithinFeatures(features, pair.pointCoord) ? dataToPosition(nearestPoint(features, [ pair.pointCoord.x, pair.pointCoord.y ], uniformDegree(lineDegree(pair.point, centerPosition)))) : pair.point;
@@ -112,7 +112,7 @@ function nearestPoint(features, origin, bearing, distance = 200) {
     const count = 5621 / distance;
     let curOrigin = origin;
     for (let i = 1; i <= count; i++) {
-        const dest = (0, vutils_1.destination)(curOrigin, distance, bearing);
+        const dest = (0, vchart_1.destination)(curOrigin, distance, bearing);
         if (!isPointWithinFeatures(features, dest)) return [ dest.x, dest.y ];
         curOrigin = [ dest.x, dest.y ];
     }
@@ -121,7 +121,7 @@ function nearestPoint(features, origin, bearing, distance = 200) {
 function isPointWithinFeatures(features, p) {
     for (let i = 0; i < features.length; i++) {
-        if ((0, vutils_1.isPointInPolygon)(p, features[i])) return !0;
+        if ((0, vchart_1.isPointInPolygon)(p, features[i])) return !0;
     }
     return !1;
 }
@@ -151,4 +151,4 @@ function candidatesByOrient(positions, anchor, rect, offset = 0) {
 exports.bound = bound, exports.layoutByPosition = layoutByPosition, exports.layoutOuter = layoutOuter,
 exports.layoutOuter2 = layoutOuter2, exports.placeRectByOrient = placeRectByOrient,
 exports.candidatesByOrient = candidatesByOrient;
-//# sourceMappingURL=layout.js.map
+//# sourceMappingURL=layout.js.map

package/cjs/components/map-label/layout.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"sources":["../src/components/map-label/layout.ts"],"names":[],"mappings":"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","file":"layout.js","sourcesContent":["import type { Feature } from '@visactor/vutils';\nimport { isPointInPolygon, destination, getAABBFromPoints } from '@visactor/vutils';\nimport type { IRect, IOrientType, IPoint } from '@visactor/vchart';\n\ntype IBound = {\n x1: number;\n x2: number;\n y1: number;\n y2: number;\n};\nexport interface IPairInfo {\n /** 矩形信息 /\n rect: IRect;\n /* 对应点的画布坐标 /\n point: IPoint;\n /* 对应点的经纬度坐标 /\n pointCoord?: IPoint;\n /* 基于锚点的可放置位置 /\n anchors?: IOrientType[];\n /* 距离锚点的位置偏移量 /\n offset?: number;\n /* 原始顺序 /\n index: number;\n}\n\nfunction overlap<T extends IBound>(a: T, b: T, sep = 0) {\n return sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2);\n}\n\nexport function bound(rect: IRect): IBound {\n return {\n x1: rect.x,\n x2: rect.x + rect.width,\n y1: rect.y,\n y2: rect.y + rect.height\n };\n}\n\nfunction toRect(bound: IBound): IRect {\n return {\n x: bound.x1,\n y: bound.y1,\n width: bound.x2 - bound.x1,\n height: bound.y2 - bound.y1\n };\n}\n\n/\n 根据可选位置进行躲避布局\n * @param pairs\n * @returns\n /\nexport function layoutByPosition(pairs: IPairInfo[]): IRect[] {\n if (!pairs \|\| pairs.length === 0) {\n return [];\n }\n\n // 只有一个无需布局\n if (pairs.length === 1) {\n return [pairs[0].rect];\n }\n\n const _pairs = pairs.map(pair => {\n return {\n ...pair,\n bound: bound(pair.rect),\n anchorCandidates: candidatesByOrient(pair.anchors ?? [], pair.point!, pair.rect, pair.offset)\n };\n });\n\n const resultBound: IBound[] = [];\n // 默认布局第一个\n resultBound.push(_pairs[0].bound);\n\n for (let i = 1; i <= _pairs.length - 1; i++) {\n const curPair = _pairs[i];\n const curBound = curPair.bound;\n // 遍历检测\n let isOverlap = resultBound.some(r => overlap(r, curBound));\n if (!curPair.anchorCandidates) {\n continue;\n }\n if (isOverlap && curPair.anchorCandidates?.length > 0) {\n for (let j = 0; j < curPair.anchorCandidates.length; j++) {\n const anchor = curPair.anchorCandidates[j];\n const newBound = {\n x1: anchor.x,\n y1: anchor.y,\n x2: anchor.x + curBound.x2 - curBound.x1,\n y2: anchor.y + curBound.y2 - curBound.y1,\n anchor\n };\n if (!resultBound.some(r => overlap(r, newBound))) {\n resultBound.push(newBound);\n isOverlap = false;\n break;\n }\n }\n if (isOverlap) {\n // 所有候选位置都放不下\n resultBound.push(curPair.bound);\n }\n } else {\n resultBound.push(curPair.bound);\n }\n }\n\n return resultBound.map(bound => toRect(bound));\n}\n\nexport function layoutOuter(\n pairs: IPairInfo[],\n features: Feature[],\n dataToPosition: (coord: number[]) => IPoint \| null\n): IRect[] {\n // 1. 计算包围圆\n const _points = pairs.map(rect => rect.pointCoord);\n const { x1, x2, y1, y2 } = getAABBFromPoints(_points);\n const geoCenter = [(x1 + x2) / 2, (y1 + y2) / 2];\n const centerPosition = dataToPosition(geoCenter);\n\n if (!centerPosition) {\n return [];\n }\n\n // 2. 遍历每个rect\n // anchor与圆心的交点方向，尝试寻找不在地图区域内部的新锚点\n const result = pairs.map(pair => {\n const rect = pair.rect;\n const targetPoint = !isPointWithinFeatures(features, pair.pointCoord!)\n ? pair.point\n : dataToPosition(\n nearestPoint(\n features,\n [pair.pointCoord!.x, pair.pointCoord!.y],\n uniformDegree(lineDegree(pair.point!, centerPosition))\n )\n );\n\n if (targetPoint) {\n rect.x = targetPoint.x;\n rect.y = targetPoint.y;\n }\n // 3. 根据finalAnchor在包围圆上的位置，调整rect的位置\n // 将圆根据圆心角划分为4个区域，对应不同的position\n\n const degree = uniformDegree(lineDegree(pair.point!, centerPosition));\n\n let position: IOrientType;\n const anchors: IOrientType[] = [];\n if (degree >= -45 && degree < 45) {\n position = 'top';\n anchors.push('left', 'right');\n } else if (degree >= 45 && degree < 135) {\n position = 'right';\n } else if (degree >= -135 && degree < -45) {\n position = 'left';\n anchors.push('left');\n } else {\n position = 'bottom';\n anchors.push('left', 'right');\n }\n pair.anchors = anchors;\n pair.offset = 20;\n pair.rect = placeRectByOrient(pair.rect, position, 0);\n return pair;\n });\n\n return layoutByPosition(result);\n}\n\nexport function layoutOuter2(\n pairs: IPairInfo[],\n features: Feature[],\n dataToPosition: (coord: number[]) => IPoint \| null\n): IRect[] {\n // 1. 计算几何中心\n let x = 0;\n let y = 0;\n for (let i = 0; i < pairs.length; i++) {\n x += pairs[i].pointCoord.x;\n y += pairs[i].pointCoord.y;\n }\n x /= pairs.length;\n y /= pairs.length;\n const centerPosition = dataToPosition([x, y]);\n if (!centerPosition) {\n return [];\n }\n\n const count = pairs.length;\n\n // 2. 按照圆心角排序\n pairs.sort((a, b) => {\n return lineDegree(centerPosition, a.point) - lineDegree(centerPosition, b.point);\n });\n\n const result = pairs.map((pair, index) => {\n let degree = (360 / count) index;\n const _degree = lineDegree(centerPosition, pair.point);\n degree = uniformDegree((degree + _degree) / 2);\n const targetPoint = !isPointWithinFeatures(features, pair.pointCoord)\n ? pair.point\n : dataToPosition(nearestPoint(features, [pair.pointCoord.x, pair.pointCoord.y], degree));\n if (targetPoint) {\n pair.rect.x = targetPoint.x;\n pair.rect.y = targetPoint.y;\n }\n // 3. 根据finalAnchor在包围圆上的位置，调整rect的位置\n // 将圆根据圆心角划分为4个区域，对应不同的position\n let position: IOrientType;\n const anchors: IOrientType[] = [];\n if (degree >= -45 && degree < 45) {\n position = 'top';\n anchors.push('left', 'right');\n } else if (degree >= 45 && degree < 135) {\n position = 'right';\n } else if (degree >= -135 && degree < -45) {\n position = 'left';\n anchors.push('left');\n } else {\n position = 'bottom';\n anchors.push('left', 'right');\n }\n\n pair.anchors = anchors;\n pair.offset = 20;\n pair.rect = placeRectByOrient(pair.rect, position, 0);\n return pair;\n });\n\n return layoutByPosition(result.sort((a, b) => a.index - b.index));\n}\n\nfunction uniformDegree(degree: number) {\n return degree > 180 ? degree - 360 : degree;\n}\n\nfunction lineDegree(start: IPoint, end: IPoint) {\n return (Math.atan2(start.y - end.y, start.x - end.x) * 180) / Math.PI + 90;\n}\n\nfunction nearestPoint(features: Feature[], origin: number[], bearing: number, distance = 200) {\n const count = 5621 / distance;\n let curOrigin = origin;\n for (let i = 1; i <= count; i++) {\n const dest = destination(curOrigin as unknown as IPoint, distance, bearing);\n if (!isPointWithinFeatures(features, dest)) {\n return [dest.x, dest.y];\n }\n curOrigin = [dest.x, dest.y];\n }\n return origin;\n}\n\nfunction isPointWithinFeatures(features: Feature[], p: IPoint) {\n for (let i = 0; i < features.length; i++) {\n const inside = isPointInPolygon(p, features[i] as any);\n if (inside) {\n return true;\n }\n }\n return false;\n}\n\n/*\n 以rect左上角为锚点的，根据position位置调整rect布局。\n * @param rect\n * @param position 在锚点的四周位置，'top' \| 'bottom' \| 'left' \| 'right'\n * @param offset rect与锚点间的距离\n * @returns\n */\nexport function placeRectByOrient(rect: IRect, position: IOrientType, offset = 0) {\n const result: IRect = { ...rect };\n if (position === 'top') {\n result.x -= rect.width / 2;\n result.y -= offset + rect.height / 2;\n } else if (position === 'bottom') {\n result.x -= rect.width / 2;\n result.y += offset - rect.height / 2;\n } else if (position === 'left') {\n result.x -= offset + rect.width;\n result.y -= rect.height / 2;\n } else if (position === 'right') {\n result.x += offset;\n result.y -= rect.height / 2;\n }\n return result;\n}\n\nexport function candidatesByOrient(\n positions: IOrientType[],\n anchor: IPoint,\n rect: Pick<IRect, 'width' \| 'height'>,\n offset = 0\n) {\n const candidates: IPoint[] = [];\n positions.forEach((p: IOrientType) => {\n const { x, y } = placeRectByOrient({ ...anchor, width: rect.width, height: rect.height }, p, offset);\n candidates.push({ x, y });\n });\n return candidates;\n}\n"]}
1	+ {"version":3,"sources":["../src/components/map-label/layout.ts"],"names":[],"mappings":"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","file":"layout.js","sourcesContent":["import type { Feature } from '@visactor/vchart';\nimport { isPointInPolygon, destination, getAABBFromPoints } from '@visactor/vchart';\nimport type { IRect, IOrientType, IPoint } from '@visactor/vchart';\n\ntype IBound = {\n x1: number;\n x2: number;\n y1: number;\n y2: number;\n};\nexport interface IPairInfo {\n /** 矩形信息 /\n rect: IRect;\n /* 对应点的画布坐标 /\n point: IPoint;\n /* 对应点的经纬度坐标 /\n pointCoord?: IPoint;\n /* 基于锚点的可放置位置 /\n anchors?: IOrientType[];\n /* 距离锚点的位置偏移量 /\n offset?: number;\n /* 原始顺序 /\n index: number;\n}\n\nfunction overlap<T extends IBound>(a: T, b: T, sep = 0) {\n return sep > Math.max(b.x1 - a.x2, a.x1 - b.x2, b.y1 - a.y2, a.y1 - b.y2);\n}\n\nexport function bound(rect: IRect): IBound {\n return {\n x1: rect.x,\n x2: rect.x + rect.width,\n y1: rect.y,\n y2: rect.y + rect.height\n };\n}\n\nfunction toRect(bound: IBound): IRect {\n return {\n x: bound.x1,\n y: bound.y1,\n width: bound.x2 - bound.x1,\n height: bound.y2 - bound.y1\n };\n}\n\n/\n 根据可选位置进行躲避布局\n * @param pairs\n * @returns\n /\nexport function layoutByPosition(pairs: IPairInfo[]): IRect[] {\n if (!pairs \|\| pairs.length === 0) {\n return [];\n }\n\n // 只有一个无需布局\n if (pairs.length === 1) {\n return [pairs[0].rect];\n }\n\n const _pairs = pairs.map(pair => {\n return {\n ...pair,\n bound: bound(pair.rect),\n anchorCandidates: candidatesByOrient(pair.anchors ?? [], pair.point!, pair.rect, pair.offset)\n };\n });\n\n const resultBound: IBound[] = [];\n // 默认布局第一个\n resultBound.push(_pairs[0].bound);\n\n for (let i = 1; i <= _pairs.length - 1; i++) {\n const curPair = _pairs[i];\n const curBound = curPair.bound;\n // 遍历检测\n let isOverlap = resultBound.some(r => overlap(r, curBound));\n if (!curPair.anchorCandidates) {\n continue;\n }\n if (isOverlap && curPair.anchorCandidates?.length > 0) {\n for (let j = 0; j < curPair.anchorCandidates.length; j++) {\n const anchor = curPair.anchorCandidates[j];\n const newBound = {\n x1: anchor.x,\n y1: anchor.y,\n x2: anchor.x + curBound.x2 - curBound.x1,\n y2: anchor.y + curBound.y2 - curBound.y1,\n anchor\n };\n if (!resultBound.some(r => overlap(r, newBound))) {\n resultBound.push(newBound);\n isOverlap = false;\n break;\n }\n }\n if (isOverlap) {\n // 所有候选位置都放不下\n resultBound.push(curPair.bound);\n }\n } else {\n resultBound.push(curPair.bound);\n }\n }\n\n return resultBound.map(bound => toRect(bound));\n}\n\nexport function layoutOuter(\n pairs: IPairInfo[],\n features: Feature[],\n dataToPosition: (coord: number[]) => IPoint \| null\n): IRect[] {\n // 1. 计算包围圆\n const _points = pairs.map(rect => rect.pointCoord);\n const { x1, x2, y1, y2 } = getAABBFromPoints(_points);\n const geoCenter = [(x1 + x2) / 2, (y1 + y2) / 2];\n const centerPosition = dataToPosition(geoCenter);\n\n if (!centerPosition) {\n return [];\n }\n\n // 2. 遍历每个rect\n // anchor与圆心的交点方向，尝试寻找不在地图区域内部的新锚点\n const result = pairs.map(pair => {\n const rect = pair.rect;\n const targetPoint = !isPointWithinFeatures(features, pair.pointCoord!)\n ? pair.point\n : dataToPosition(\n nearestPoint(\n features,\n [pair.pointCoord!.x, pair.pointCoord!.y],\n uniformDegree(lineDegree(pair.point!, centerPosition))\n )\n );\n\n if (targetPoint) {\n rect.x = targetPoint.x;\n rect.y = targetPoint.y;\n }\n // 3. 根据finalAnchor在包围圆上的位置，调整rect的位置\n // 将圆根据圆心角划分为4个区域，对应不同的position\n\n const degree = uniformDegree(lineDegree(pair.point!, centerPosition));\n\n let position: IOrientType;\n const anchors: IOrientType[] = [];\n if (degree >= -45 && degree < 45) {\n position = 'top';\n anchors.push('left', 'right');\n } else if (degree >= 45 && degree < 135) {\n position = 'right';\n } else if (degree >= -135 && degree < -45) {\n position = 'left';\n anchors.push('left');\n } else {\n position = 'bottom';\n anchors.push('left', 'right');\n }\n pair.anchors = anchors;\n pair.offset = 20;\n pair.rect = placeRectByOrient(pair.rect, position, 0);\n return pair;\n });\n\n return layoutByPosition(result);\n}\n\nexport function layoutOuter2(\n pairs: IPairInfo[],\n features: Feature[],\n dataToPosition: (coord: number[]) => IPoint \| null\n): IRect[] {\n // 1. 计算几何中心\n let x = 0;\n let y = 0;\n for (let i = 0; i < pairs.length; i++) {\n x += pairs[i].pointCoord.x;\n y += pairs[i].pointCoord.y;\n }\n x /= pairs.length;\n y /= pairs.length;\n const centerPosition = dataToPosition([x, y]);\n if (!centerPosition) {\n return [];\n }\n\n const count = pairs.length;\n\n // 2. 按照圆心角排序\n pairs.sort((a, b) => {\n return lineDegree(centerPosition, a.point) - lineDegree(centerPosition, b.point);\n });\n\n const result = pairs.map((pair, index) => {\n let degree = (360 / count) index;\n const _degree = lineDegree(centerPosition, pair.point);\n degree = uniformDegree((degree + _degree) / 2);\n const targetPoint = !isPointWithinFeatures(features, pair.pointCoord)\n ? pair.point\n : dataToPosition(nearestPoint(features, [pair.pointCoord.x, pair.pointCoord.y], degree));\n if (targetPoint) {\n pair.rect.x = targetPoint.x;\n pair.rect.y = targetPoint.y;\n }\n // 3. 根据finalAnchor在包围圆上的位置，调整rect的位置\n // 将圆根据圆心角划分为4个区域，对应不同的position\n let position: IOrientType;\n const anchors: IOrientType[] = [];\n if (degree >= -45 && degree < 45) {\n position = 'top';\n anchors.push('left', 'right');\n } else if (degree >= 45 && degree < 135) {\n position = 'right';\n } else if (degree >= -135 && degree < -45) {\n position = 'left';\n anchors.push('left');\n } else {\n position = 'bottom';\n anchors.push('left', 'right');\n }\n\n pair.anchors = anchors;\n pair.offset = 20;\n pair.rect = placeRectByOrient(pair.rect, position, 0);\n return pair;\n });\n\n return layoutByPosition(result.sort((a, b) => a.index - b.index));\n}\n\nfunction uniformDegree(degree: number) {\n return degree > 180 ? degree - 360 : degree;\n}\n\nfunction lineDegree(start: IPoint, end: IPoint) {\n return (Math.atan2(start.y - end.y, start.x - end.x) * 180) / Math.PI + 90;\n}\n\nfunction nearestPoint(features: Feature[], origin: number[], bearing: number, distance = 200) {\n const count = 5621 / distance;\n let curOrigin = origin;\n for (let i = 1; i <= count; i++) {\n const dest = destination(curOrigin as unknown as IPoint, distance, bearing);\n if (!isPointWithinFeatures(features, dest)) {\n return [dest.x, dest.y];\n }\n curOrigin = [dest.x, dest.y];\n }\n return origin;\n}\n\nfunction isPointWithinFeatures(features: Feature[], p: IPoint) {\n for (let i = 0; i < features.length; i++) {\n const inside = isPointInPolygon(p, features[i] as any);\n if (inside) {\n return true;\n }\n }\n return false;\n}\n\n/*\n 以rect左上角为锚点的，根据position位置调整rect布局。\n * @param rect\n * @param position 在锚点的四周位置，'top' \| 'bottom' \| 'left' \| 'right'\n * @param offset rect与锚点间的距离\n * @returns\n */\nexport function placeRectByOrient(rect: IRect, position: IOrientType, offset = 0) {\n const result: IRect = { ...rect };\n if (position === 'top') {\n result.x -= rect.width / 2;\n result.y -= offset + rect.height / 2;\n } else if (position === 'bottom') {\n result.x -= rect.width / 2;\n result.y += offset - rect.height / 2;\n } else if (position === 'left') {\n result.x -= offset + rect.width;\n result.y -= rect.height / 2;\n } else if (position === 'right') {\n result.x += offset;\n result.y -= rect.height / 2;\n }\n return result;\n}\n\nexport function candidatesByOrient(\n positions: IOrientType[],\n anchor: IPoint,\n rect: Pick<IRect, 'width' \| 'height'>,\n offset = 0\n) {\n const candidates: IPoint[] = [];\n positions.forEach((p: IOrientType) => {\n const { x, y } = placeRectByOrient({ ...anchor, width: rect.width, height: rect.height }, p, offset);\n candidates.push({ x, y });\n });\n return candidates;\n}\n"]}

package/cjs/components/map-label/map-label-transformer.js CHANGED Viewed

@@ -12,5 +12,4 @@ class MapLabelSpecTransformer extends vchart_1.BaseComponentSpecTransformer {
     }
 }
-exports.MapLabelSpecTransformer = MapLabelSpecTransformer;
-//# sourceMappingURL=map-label-transformer.js.map
+exports.MapLabelSpecTransformer = MapLabelSpecTransformer;

package/cjs/components/map-label/map-label.d.ts CHANGED Viewed

@@ -1,6 +1,5 @@
-import type { IGraphic, IGroup } from '@visactor/vrender-core';
-import type { Maybe } from '@visactor/vutils';
-import { MarkPoint } from '@visactor/vrender-components';
+import { type IGraphic, type IGroup, type IRect as IRectGraphic, MarkPoint } from '@visactor/vchart';
+import type { Maybe } from '@visactor/vchart';
 import { LayoutZIndex, VChart, BaseComponent } from '@visactor/vchart';
 import type { IRect, IPoint, Datum, IModelSpecInfo, PanEventParam, ICartesianSeries, IGeoSeries } from '@visactor/vchart';
 import type { IPairInfo } from './layout';
@@ -42,7 +41,7 @@ export declare class MapLabelComponent extends BaseComponent<IMapLabelSpec> {
     };
     protected _layoutMarkers(positionedRects: IRect[], contentMarks: MapLabelSceneNodeMap[]): void;
     protected _renderMarkers(): void;
-    protected _layoutLabels(rects: IPairInfo[]): IRect[];
+    protected _layoutLabels(rects: IPairInfo[]): IRectGraphic[];
     private _isRelativeModel;
     private _isRelativeSeries;
     protected _getNeedClearVRenderComponents(): IGraphic[];