@visactor/vseed 0.5.0 → 0.5.2

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationHorizontalLine.js

@@ -1,6 +1,6 @@
 import { isArray, isNumber, isString } from "remeda";
 import { ANNOTATION_Z_INDEX } from "../../../../utils/constant.js";
-import { resolveAnnotationValue } from "./utils.js";
+import { getAnnotationLineDash, resolveAnnotationValue } from "./utils.js";
 const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
     const { advancedVSeed, vseed } = context;
     const { annotation, config } = advancedVSeed;
@@ -19,7 +19,10 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
         insideEnd: 'insideEndTop'
     };
     const markLine = annotationHorizontalLineList.flatMap((annotationHorizontalLine)=>{
-        const { yValue, dynamicFilter, text = '', textPosition = 'insideEnd', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = 'right', textBaseline = 'bottom', lineColor = theme?.lineColor ?? '#212121', lineStyle = theme?.lineStyle ?? 'dashed', lineVisible = theme?.lineStyle ?? true, lineWidth = theme?.lineWidth ?? 1, textBackgroundVisible = theme?.textBackgroundVisible ?? true, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundBorderColor = theme?.textBackgroundBorderColor ?? '#212121', textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundPadding = theme?.textBackgroundPadding ?? 2 } = annotationHorizontalLine;
+        const { yValue, dynamicFilter, text = '', textPosition = 'insideEnd', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = 'right', textBaseline = 'bottom', lineColor = theme?.lineColor ?? '#212121', lineVisible = theme?.lineStyle ?? true, lineWidth = theme?.lineWidth ?? 1, textBackgroundVisible = theme?.textBackgroundVisible ?? true, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundBorderColor = theme?.textBackgroundBorderColor ?? '#212121', textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundPadding = theme?.textBackgroundPadding ?? 2 } = annotationHorizontalLine;
+        const lineStyle = annotationHorizontalLine.lineStyle ?? theme?.lineStyle ?? 'dashed';
+        const lineDash = getAnnotationLineDash(lineStyle, annotationHorizontalLine.lineStyle ? void 0 : theme?.lineDash);
+        const textBackgroundOpacity = theme?.textBackgroundOpacity;
         const generateOneMarkLine = (y)=>({
                 y,
                 autoRange: true,
@@ -29,15 +32,7 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
                         visible: lineVisible,
                         stroke: lineColor,
                         lineWidth: lineWidth,
-                        lineDash: 'dashed' === lineStyle ? [
-                            5,
-                            2
-                        ] : 'dotted' === lineStyle ? [
-                            2,
-                            5
-                        ] : [
-                            0
-                        ]
+                        lineDash
                     }
                 },
                 label: {
@@ -45,7 +40,6 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
                     text: text,
                     position: positionMap[textPosition || 'insideEnd'],
                     style: {
-                        opacity: 0.95,
                         visible: true,
                         dy: 4,
                         stroke: textBackgroundColor,
@@ -60,7 +54,7 @@ const annotationHorizontalLine_annotationHorizontalLine = (spec, context)=>{
                         visible: textBackgroundVisible,
                         padding: textBackgroundPadding,
                         style: {
-                            opacity: 0.95,
+                            opacity: textBackgroundOpacity ?? 0.95,
                             dy: 4,
                             cornerRadius: textBackgroundBorderRadius,
                             fill: textBackgroundColor,

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationHorizontalLine.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationHorizontalLine.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationHorizontalLine.ts"],"sourcesContent":["import type { ILineChartSpec, IMarkLineSpec } from '@visactor/vchart'\nimport type { VChartSpecPipe } from 'src/types'\nimport { isArray, isNumber, isString } from 'remeda'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { resolveAnnotationValue } from './utils'\n\nexport const annotationHorizontalLine: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { annotation, config } = advancedVSeed\n\n  if (!annotation || !annotation.annotationHorizontalLine) {\n    return spec\n  }\n  const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationHorizontalLine\n  const { annotationHorizontalLine } = annotation\n  const annotationHorizontalLineList = Array.isArray(annotationHorizontalLine)\n    ? annotationHorizontalLine\n    : [annotationHorizontalLine]\n\n  const positionMap = {\n    outsideStart: 'start',\n    outsideEnd: 'end',\n    outsideMiddle: 'middle',\n    insideStart: 'insideStartTop',\n    insideMiddle: 'insideMiddleTop',\n    insideEnd: 'insideEndTop',\n  }\n\n  const markLine = annotationHorizontalLineList.flatMap((annotationHorizontalLine) => {\n    const {\n      yValue,\n      dynamicFilter,\n      text = '',\n      textPosition = 'insideEnd',\n      textColor = theme?.textColor ?? '#ffffff',\n      textFontSize = theme?.textFontSize ?? 12,\n      textFontWeight = theme?.textFontWeight ?? 400,\n      textAlign = 'right',\n      textBaseline = 'bottom',\n\n      lineColor = theme?.lineColor ?? '#212121',\n      lineStyle = theme?.lineStyle ?? 'dashed',\n      lineVisible = theme?.lineStyle ?? true,\n      lineWidth = theme?.lineWidth ?? 1,\n\n      textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n      textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n      textBackgroundBorderColor = theme?.textBackgroundBorderColor ?? '#212121',\n      textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n      textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n      textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n    } = annotationHorizontalLine\n\n    const generateOneMarkLine = (y: string | number) => {\n      return {\n        y,\n        autoRange: true,\n        zIndex: ANNOTATION_Z_INDEX,\n        line: {\n          style: {\n            visible: lineVisible,\n            stroke: lineColor,\n            lineWidth: lineWidth,\n            lineDash: lineStyle === 'dashed' ? [5, 2] : lineStyle === 'dotted' ? [2, 5] : [0],\n          },\n        },\n        label: {\n          confine: true,\n          text: text,\n          position: (positionMap as any)[textPosition || 'insideEnd'],\n          style: {\n            opacity: 0.95,\n            visible: true,\n            dy: 4,\n            stroke: textBackgroundColor,\n            lineWidth: 1,\n            textAlign: textAlign,\n            textBaseline: textBaseline,\n            fill: textColor,\n            fontSize: textFontSize,\n            fontWeight: textFontWeight,\n          },\n          labelBackground: {\n            visible: textBackgroundVisible,\n            padding: textBackgroundPadding,\n            style: {\n              opacity: 0.95,\n              dy: 4,\n              cornerRadius: textBackgroundBorderRadius,\n              fill: textBackgroundColor,\n              stroke: textBackgroundBorderColor,\n              lineWidth: textBackgroundBorderWidth,\n              fillOpacity: 1,\n            },\n          },\n        },\n        startSymbol: {\n          visible: theme?.startSymbolVisible ?? true,\n          symbolType: theme?.startSymbolType ?? 'triangleDown',\n          size: 5 + (lineWidth || 1),\n          style: {\n            dx: 3,\n            fill: lineColor,\n          },\n        },\n        endSymbol: {\n          visible: theme?.endSymbolVisible ?? false,\n          symbolType: theme?.endSymbolType ?? 'arrow',\n          size: 10 + (lineWidth || 1),\n          style: {\n            dx: -4,\n            fill: lineColor,\n          },\n        },\n      }\n    }\n\n    const finalYValue = resolveAnnotationValue({\n      dynamicFilter,\n      fallback: dynamicFilter?.fallback as string | number | undefined,\n      defaultValue: yValue,\n    })\n\n    if (isArray(finalYValue) || isString(finalYValue) || isNumber(finalYValue)) {\n      const yValueArr = Array.isArray(finalYValue) ? finalYValue : [finalYValue]\n      return yValueArr.map(generateOneMarkLine)\n    }\n\n    return []\n  }) as IMarkLineSpec[]\n  const specMarkLine = ((spec as ILineChartSpec).markLine as IMarkLineSpec[]) || []\n  const newMarkLine = [...specMarkLine, ...(markLine || [])]\n  return {\n    ...spec,\n    markLine: newMarkLine,\n  }\n}\n"],"names":["annotationHorizontalLine","spec","context","advancedVSeed","vseed","annotation","config","theme","annotationHorizontalLineList","Array","positionMap","markLine","yValue","dynamicFilter","text","textPosition","textColor","textFontSize","textFontWeight","textAlign","textBaseline","lineColor","lineStyle","lineVisible","lineWidth","textBackgroundVisible","textBackgroundColor","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundPadding","generateOneMarkLine","y","ANNOTATION_Z_INDEX","finalYValue","resolveAnnotationValue","isArray","isString","isNumber","yValueArr","specMarkLine","newMarkLine"],"mappings":"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"}
+{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationHorizontalLine.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationHorizontalLine.ts"],"sourcesContent":["import type { ILineChartSpec, IMarkLineSpec } from '@visactor/vchart'\nimport type { VChartSpecPipe } from 'src/types'\nimport { isArray, isNumber, isString } from 'remeda'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { getAnnotationLineDash, resolveAnnotationValue } from './utils'\n\nexport const annotationHorizontalLine: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { annotation, config } = advancedVSeed\n\n  if (!annotation || !annotation.annotationHorizontalLine) {\n    return spec\n  }\n  const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationHorizontalLine\n  const { annotationHorizontalLine } = annotation\n  const annotationHorizontalLineList = Array.isArray(annotationHorizontalLine)\n    ? annotationHorizontalLine\n    : [annotationHorizontalLine]\n\n  const positionMap = {\n    outsideStart: 'start',\n    outsideEnd: 'end',\n    outsideMiddle: 'middle',\n    insideStart: 'insideStartTop',\n    insideMiddle: 'insideMiddleTop',\n    insideEnd: 'insideEndTop',\n  }\n\n  const markLine = annotationHorizontalLineList.flatMap((annotationHorizontalLine) => {\n    const {\n      yValue,\n      dynamicFilter,\n      text = '',\n      textPosition = 'insideEnd',\n      textColor = theme?.textColor ?? '#ffffff',\n      textFontSize = theme?.textFontSize ?? 12,\n      textFontWeight = theme?.textFontWeight ?? 400,\n      textAlign = 'right',\n      textBaseline = 'bottom',\n\n      lineColor = theme?.lineColor ?? '#212121',\n      lineVisible = theme?.lineStyle ?? true,\n      lineWidth = theme?.lineWidth ?? 1,\n\n      textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n      textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n      textBackgroundBorderColor = theme?.textBackgroundBorderColor ?? '#212121',\n      textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n      textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n      textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n    } = annotationHorizontalLine\n    const lineStyle = annotationHorizontalLine.lineStyle ?? theme?.lineStyle ?? 'dashed'\n    const lineDash = getAnnotationLineDash(lineStyle, annotationHorizontalLine.lineStyle ? undefined : theme?.lineDash)\n    const textBackgroundOpacity = theme?.textBackgroundOpacity\n\n    const generateOneMarkLine = (y: string | number) => {\n      return {\n        y,\n        autoRange: true,\n        zIndex: ANNOTATION_Z_INDEX,\n        line: {\n          style: {\n            visible: lineVisible,\n            stroke: lineColor,\n            lineWidth: lineWidth,\n            lineDash,\n          },\n        },\n        label: {\n          confine: true,\n          text: text,\n          position: (positionMap as any)[textPosition || 'insideEnd'],\n          style: {\n            visible: true,\n            dy: 4,\n            stroke: textBackgroundColor,\n            lineWidth: 1,\n            textAlign: textAlign,\n            textBaseline: textBaseline,\n            fill: textColor,\n            fontSize: textFontSize,\n            fontWeight: textFontWeight,\n          },\n          labelBackground: {\n            visible: textBackgroundVisible,\n            padding: textBackgroundPadding,\n            style: {\n              opacity: textBackgroundOpacity ?? 0.95,\n              dy: 4,\n              cornerRadius: textBackgroundBorderRadius,\n              fill: textBackgroundColor,\n              stroke: textBackgroundBorderColor,\n              lineWidth: textBackgroundBorderWidth,\n              fillOpacity: 1,\n            },\n          },\n        },\n        startSymbol: {\n          visible: theme?.startSymbolVisible ?? true,\n          symbolType: theme?.startSymbolType ?? 'triangleDown',\n          size: 5 + (lineWidth || 1),\n          style: {\n            dx: 3,\n            fill: lineColor,\n          },\n        },\n        endSymbol: {\n          visible: theme?.endSymbolVisible ?? false,\n          symbolType: theme?.endSymbolType ?? 'arrow',\n          size: 10 + (lineWidth || 1),\n          style: {\n            dx: -4,\n            fill: lineColor,\n          },\n        },\n      }\n    }\n\n    const finalYValue = resolveAnnotationValue({\n      dynamicFilter,\n      fallback: dynamicFilter?.fallback as string | number | undefined,\n      defaultValue: yValue,\n    })\n\n    if (isArray(finalYValue) || isString(finalYValue) || isNumber(finalYValue)) {\n      const yValueArr = Array.isArray(finalYValue) ? finalYValue : [finalYValue]\n      return yValueArr.map(generateOneMarkLine)\n    }\n\n    return []\n  }) as IMarkLineSpec[]\n  const specMarkLine = ((spec as ILineChartSpec).markLine as IMarkLineSpec[]) || []\n  const newMarkLine = [...specMarkLine, ...(markLine || [])]\n  return {\n    ...spec,\n    markLine: newMarkLine,\n  }\n}\n"],"names":["annotationHorizontalLine","spec","context","advancedVSeed","vseed","annotation","config","theme","annotationHorizontalLineList","Array","positionMap","markLine","yValue","dynamicFilter","text","textPosition","textColor","textFontSize","textFontWeight","textAlign","textBaseline","lineColor","lineVisible","lineWidth","textBackgroundVisible","textBackgroundColor","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundPadding","lineStyle","lineDash","getAnnotationLineDash","undefined","textBackgroundOpacity","generateOneMarkLine","y","ANNOTATION_Z_INDEX","finalYValue","resolveAnnotationValue","isArray","isString","isNumber","yValueArr","specMarkLine","newMarkLine"],"mappings":";;;AAMO,MAAMA,oDAA2C,CAACC,MAAMC;IAC7D,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,UAAU,EAAEC,MAAM,EAAE,GAAGH;IAE/B,IAAI,CAACE,cAAc,CAACA,WAAW,wBAAwB,EACrD,OAAOJ;IAET,MAAMM,QAAQD,QAAQ,CAACF,MAAM,SAAS,CAAa,EAAE,YAAY;IACjE,MAAM,EAAEJ,wBAAwB,EAAE,GAAGK;IACrC,MAAMG,+BAA+BC,MAAM,OAAO,CAACT,4BAC/CA,2BACA;QAACA;KAAyB;IAE9B,MAAMU,cAAc;QAClB,cAAc;QACd,YAAY;QACZ,eAAe;QACf,aAAa;QACb,cAAc;QACd,WAAW;IACb;IAEA,MAAMC,WAAWH,6BAA6B,OAAO,CAAC,CAACR;QACrD,MAAM,EACJY,MAAM,EACNC,aAAa,EACbC,OAAO,EAAE,EACTC,eAAe,WAAW,EAC1BC,YAAYT,OAAO,aAAa,SAAS,EACzCU,eAAeV,OAAO,gBAAgB,EAAE,EACxCW,iBAAiBX,OAAO,kBAAkB,GAAG,EAC7CY,YAAY,OAAO,EACnBC,eAAe,QAAQ,EAEvBC,YAAYd,OAAO,aAAa,SAAS,EACzCe,cAAcf,OAAO,aAAa,IAAI,EACtCgB,YAAYhB,OAAO,aAAa,CAAC,EAEjCiB,wBAAwBjB,OAAO,yBAAyB,IAAI,EAC5DkB,sBAAsBlB,OAAO,uBAAuB,SAAS,EAC7DmB,4BAA4BnB,OAAO,6BAA6B,SAAS,EACzEoB,6BAA6BpB,OAAO,8BAA8B,CAAC,EACnEqB,4BAA4BrB,OAAO,6BAA6B,CAAC,EACjEsB,wBAAwBtB,OAAO,yBAAyB,CAAC,EAC1D,GAAGP;QACJ,MAAM8B,YAAY9B,yBAAyB,SAAS,IAAIO,OAAO,aAAa;QAC5E,MAAMwB,WAAWC,sBAAsBF,WAAW9B,yBAAyB,SAAS,GAAGiC,SAAY1B,OAAO;QAC1G,MAAM2B,wBAAwB3B,OAAO;QAErC,MAAM4B,sBAAsB,CAACC,IACpB;gBACLA;gBACA,WAAW;gBACX,QAAQC;gBACR,MAAM;oBACJ,OAAO;wBACL,SAASf;wBACT,QAAQD;wBACR,WAAWE;wBACXQ;oBACF;gBACF;gBACA,OAAO;oBACL,SAAS;oBACT,MAAMjB;oBACN,UAAWJ,WAAmB,CAACK,gBAAgB,YAAY;oBAC3D,OAAO;wBACL,SAAS;wBACT,IAAI;wBACJ,QAAQU;wBACR,WAAW;wBACX,WAAWN;wBACX,cAAcC;wBACd,MAAMJ;wBACN,UAAUC;wBACV,YAAYC;oBACd;oBACA,iBAAiB;wBACf,SAASM;wBACT,SAASK;wBACT,OAAO;4BACL,SAASK,yBAAyB;4BAClC,IAAI;4BACJ,cAAcP;4BACd,MAAMF;4BACN,QAAQC;4BACR,WAAWE;4BACX,aAAa;wBACf;oBACF;gBACF;gBACA,aAAa;oBACX,SAASrB,OAAO,sBAAsB;oBACtC,YAAYA,OAAO,mBAAmB;oBACtC,MAAM,IAAKgB,CAAAA,aAAa;oBACxB,OAAO;wBACL,IAAI;wBACJ,MAAMF;oBACR;gBACF;gBACA,WAAW;oBACT,SAASd,OAAO,oBAAoB;oBACpC,YAAYA,OAAO,iBAAiB;oBACpC,MAAM,KAAMgB,CAAAA,aAAa;oBACzB,OAAO;wBACL,IAAI;wBACJ,MAAMF;oBACR;gBACF;YACF;QAGF,MAAMiB,cAAcC,uBAAuB;YACzC1B;YACA,UAAUA,eAAe;YACzB,cAAcD;QAChB;QAEA,IAAI4B,QAAQF,gBAAgBG,SAASH,gBAAgBI,SAASJ,cAAc;YAC1E,MAAMK,YAAYlC,MAAM,OAAO,CAAC6B,eAAeA,cAAc;gBAACA;aAAY;YAC1E,OAAOK,UAAU,GAAG,CAACR;QACvB;QAEA,OAAO,EAAE;IACX;IACA,MAAMS,eAAiB3C,KAAwB,QAAQ,IAAwB,EAAE;IACjF,MAAM4C,cAAc;WAAID;WAAkBjC,YAAY,EAAE;KAAE;IAC1D,OAAO;QACL,GAAGV,IAAI;QACP,UAAU4C;IACZ;AACF"}

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointCommon.js

@@ -48,6 +48,7 @@ const generateAnnotationPointPipe = (options)=>{
         };
         const markPoint = annotationPointList.flatMap((annotationPoint)=>{
             const { selector: selectorPoint, measureId, dynamicFilter, text = '', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = defaultStyle.textAlign, textBaseline = defaultStyle.textBaseline, textBackgroundBorderColor = theme?.textBackgroundBorderColor, textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundPadding = theme?.textBackgroundPadding ?? 2, textBackgroundVisible = theme?.textBackgroundVisible ?? true, offsetX = theme?.offsetX ?? 0, offsetY = theme?.offsetY ?? 0 } = annotationPoint;
+            const textBackgroundOpacity = theme?.textBackgroundOpacity;
             const dataset = advancedVSeed.dataset.flat();
             const selectedData = selectorPoint || dynamicFilter ? findSelectedDatas({
                 dataset,
@@ -75,7 +76,7 @@ const generateAnnotationPointPipe = (options)=>{
                             visible: textBackgroundVisible,
                             padding: textBackgroundPadding,
                             style: {
-                                opacity: 0.95,
+                                opacity: textBackgroundOpacity ?? 0.95,
                                 cornerRadius: textBackgroundBorderRadius ?? 4,
                                 fill: textBackgroundColor,
                                 stroke: textBackgroundBorderColor,
@@ -86,7 +87,6 @@ const generateAnnotationPointPipe = (options)=>{
                         }
                     },
                     style: {
-                        opacity: 0.95,
                         visible: true,
                         textAlign: textAlign,
                         textBaseline: textBaseline,

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationPointCommon.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationPointCommon.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationPointCommon.ts"],"sourcesContent":["import type { ISpec, IMarkPointSpec } from '@visactor/vchart'\nimport { selector, selectorWithDynamicFilter } from '../../../../../dataSelector'\nimport { MeasureId } from 'src/dataReshape/constant'\nimport type {\n  ChartDynamicFilter,\n  Datum,\n  Selector,\n  Selectors,\n  SpecPipelineContext,\n  VChartSpecPipe,\n  VSeed,\n} from 'src/types'\nimport { isSubset } from './utils'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { isBarLikeChart } from 'src/pipeline/utils/chatType'\nexport const generateAnnotationPointPipe = (options: {\n  findSelectedDatas?: (options: {\n    dataset: Datum[]\n    selector: Selector | Selectors | undefined | null\n    measureId?: string | null\n    dynamicFilter?: ChartDynamicFilter\n    spec: ISpec\n    context: SpecPipelineContext\n  }) => Datum[]\n  generateMarkPoint?: (datum: Datum, spec: ISpec, context: SpecPipelineContext) => IMarkPointSpec[] | undefined\n}) => {\n  const findSelectedDatas =\n    options.findSelectedDatas ??\n    ((opts) => {\n      const { dataset, selector: s, measureId, dynamicFilter } = opts\n      return dataset.filter((datum) => {\n        const isSelected = dynamicFilter ? selectorWithDynamicFilter(datum, dynamicFilter, s) : selector(datum, s)\n        return isSelected && (!measureId || datum[MeasureId] === measureId)\n      })\n    })\n  const generateMarkPoint =\n    options.generateMarkPoint ??\n    ((datum: Datum) => {\n      return [\n        {\n          coordinate: (data: Datum[], context) => {\n            const targetDatum = data.find((item) => isSubset(datum, item))\n            if (context.getStack() === true) {\n              const stackedDatum = { ...datum, ...targetDatum }\n              return {\n                ...stackedDatum,\n                [context.getStackValueField()]: stackedDatum['__VCHART_STACK_END'],\n              }\n            }\n\n            return targetDatum\n          },\n        },\n      ]\n    })\n\n  return ((spec: ISpec, context: SpecPipelineContext) => {\n    const { advancedVSeed, vseed } = context\n    const { annotation, config } = advancedVSeed\n\n    if (!annotation || !annotation.annotationPoint) {\n      return spec\n    }\n\n    const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationPoint\n    const { annotationPoint } = annotation\n    const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [annotationPoint]\n    const isHorizontalBar = isBarLikeChart(advancedVSeed as VSeed)\n    const defaultStyle = isHorizontalBar\n      ? {\n          textAlign: 'right',\n          textBaseline: 'middle',\n        }\n      : {\n          textAlign: 'center',\n          textBaseline: 'top',\n        }\n\n    const markPoint = annotationPointList.flatMap((annotationPoint) => {\n      const {\n        selector: selectorPoint,\n        measureId,\n        dynamicFilter,\n        text = '',\n        textColor = theme?.textColor ?? '#ffffff',\n        textFontSize = theme?.textFontSize ?? 12,\n        textFontWeight = theme?.textFontWeight ?? 400,\n        textAlign = defaultStyle.textAlign,\n        textBaseline = defaultStyle.textBaseline,\n        textBackgroundBorderColor = theme?.textBackgroundBorderColor,\n        textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n        textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n        textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n        textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n        textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n        offsetX = theme?.offsetX ?? 0,\n        offsetY = theme?.offsetY ?? 0,\n      } = annotationPoint\n\n      const dataset = advancedVSeed.dataset.flat()\n      const selectedData =\n        selectorPoint || dynamicFilter\n          ? findSelectedDatas({\n              dataset,\n              selector: selectorPoint,\n              measureId,\n              dynamicFilter,\n              spec,\n              context,\n            })\n          : []\n      const dx = -10 - (isHorizontalBar ? (textFontSize as number) : 0) // 由于vchart tag实现问题，需要设置这个强制偏移量\n      const dy = isHorizontalBar ? 0 : (textFontSize as number)\n      const markPointStyle = {\n        zIndex: ANNOTATION_Z_INDEX,\n        regionRelative: true,\n        itemLine: {\n          visible: false,\n        },\n        itemContent: {\n          offsetY,\n          offsetX,\n          confine: true,\n          text: {\n            text: text,\n            labelBackground: {\n              visible: textBackgroundVisible,\n              padding: textBackgroundPadding,\n              style: {\n                opacity: 0.95,\n                cornerRadius: textBackgroundBorderRadius ?? 4,\n                fill: textBackgroundColor,\n                stroke: textBackgroundBorderColor,\n                lineWidth: textBackgroundBorderWidth,\n                dx,\n                dy,\n              },\n            },\n          },\n          style: {\n            opacity: 0.95,\n            visible: true,\n            textAlign: textAlign,\n            textBaseline: textBaseline,\n            fill: textColor,\n            stroke: textBackgroundColor,\n            lineWidth: 1,\n            fontSize: textFontSize,\n            fontWeight: textFontWeight,\n            dx,\n            dy,\n          },\n        },\n      } as Partial<IMarkPointSpec>\n\n      return selectedData.reduce((res: IMarkPointSpec[], datum) => {\n        const marks = generateMarkPoint(datum, spec, context)\n\n        if (marks && marks.length) {\n          marks.forEach((mark) => {\n            res.push({\n              ...markPointStyle,\n              ...mark,\n            } as IMarkPointSpec)\n          })\n        }\n\n        return res\n      }, [])\n    }) as unknown as IMarkPointSpec[]\n\n    return {\n      ...spec,\n      markPoint,\n    } as ISpec\n  }) as VChartSpecPipe\n}\n"],"names":["generateAnnotationPointPipe","options","findSelectedDatas","opts","dataset","s","measureId","dynamicFilter","datum","isSelected","selectorWithDynamicFilter","selector","MeasureId","generateMarkPoint","data","context","targetDatum","item","isSubset","stackedDatum","spec","advancedVSeed","vseed","annotation","config","theme","annotationPoint","annotationPointList","Array","isHorizontalBar","isBarLikeChart","defaultStyle","markPoint","selectorPoint","text","textColor","textFontSize","textFontWeight","textAlign","textBaseline","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundColor","textBackgroundPadding","textBackgroundVisible","offsetX","offsetY","selectedData","dx","dy","markPointStyle","ANNOTATION_Z_INDEX","res","marks","mark"],"mappings":";;;;;AAeO,MAAMA,8BAA8B,CAACC;IAW1C,MAAMC,oBACJD,QAAQ,iBAAiB,IACvB,EAAAE;QACA,MAAM,EAAEC,OAAO,EAAE,UAAUC,CAAC,EAAEC,SAAS,EAAEC,aAAa,EAAE,GAAGJ;QAC3D,OAAOC,QAAQ,MAAM,CAAC,CAACI;YACrB,MAAMC,aAAaF,gBAAgBG,0BAA0BF,OAAOD,eAAeF,KAAKM,SAASH,OAAOH;YACxG,OAAOI,cAAe,EAACH,aAAaE,KAAK,CAACI,UAAU,KAAKN,SAAQ;QACnE;IACF;IACF,MAAMO,oBACJZ,QAAQ,iBAAiB,IACvB,EAAAO,QACO;YACL;gBACE,YAAY,CAACM,MAAeC;oBAC1B,MAAMC,cAAcF,KAAK,IAAI,CAAC,CAACG,OAASC,SAASV,OAAOS;oBACxD,IAAIF,AAAuB,SAAvBA,QAAQ,QAAQ,IAAa;wBAC/B,MAAMI,eAAe;4BAAE,GAAGX,KAAK;4BAAE,GAAGQ,WAAW;wBAAC;wBAChD,OAAO;4BACL,GAAGG,YAAY;4BACf,CAACJ,QAAQ,kBAAkB,GAAG,EAAEI,YAAY,CAAC,qBAAqB;wBACpE;oBACF;oBAEA,OAAOH;gBACT;YACF;SACD,AACH;IAEF,OAAQ,CAACI,MAAaL;QACpB,MAAM,EAAEM,aAAa,EAAEC,KAAK,EAAE,GAAGP;QACjC,MAAM,EAAEQ,UAAU,EAAEC,MAAM,EAAE,GAAGH;QAE/B,IAAI,CAACE,cAAc,CAACA,WAAW,eAAe,EAC5C,OAAOH;QAGT,MAAMK,QAAQD,QAAQ,CAACF,MAAM,SAAS,CAAa,EAAE,YAAY;QACjE,MAAM,EAAEI,eAAe,EAAE,GAAGH;QAC5B,MAAMI,sBAAsBC,MAAM,OAAO,CAACF,mBAAmBA,kBAAkB;YAACA;SAAgB;QAChG,MAAMG,kBAAkBC,eAAeT;QACvC,MAAMU,eAAeF,kBACjB;YACE,WAAW;YACX,cAAc;QAChB,IACA;YACE,WAAW;YACX,cAAc;QAChB;QAEJ,MAAMG,YAAYL,oBAAoB,OAAO,CAAC,CAACD;YAC7C,MAAM,EACJ,UAAUO,aAAa,EACvB3B,SAAS,EACTC,aAAa,EACb2B,OAAO,EAAE,EACTC,YAAYV,OAAO,aAAa,SAAS,EACzCW,eAAeX,OAAO,gBAAgB,EAAE,EACxCY,iBAAiBZ,OAAO,kBAAkB,GAAG,EAC7Ca,YAAYP,aAAa,SAAS,EAClCQ,eAAeR,aAAa,YAAY,EACxCS,4BAA4Bf,OAAO,yBAAyB,EAC5DgB,6BAA6BhB,OAAO,8BAA8B,CAAC,EACnEiB,4BAA4BjB,OAAO,6BAA6B,CAAC,EACjEkB,sBAAsBlB,OAAO,uBAAuB,SAAS,EAC7DmB,wBAAwBnB,OAAO,yBAAyB,CAAC,EACzDoB,wBAAwBpB,OAAO,yBAAyB,IAAI,EAC5DqB,UAAUrB,OAAO,WAAW,CAAC,EAC7BsB,UAAUtB,OAAO,WAAW,CAAC,EAC9B,GAAGC;YAEJ,MAAMtB,UAAUiB,cAAc,OAAO,CAAC,IAAI;YAC1C,MAAM2B,eACJf,iBAAiB1B,gBACbL,kBAAkB;gBAChBE;gBACA,UAAU6B;gBACV3B;gBACAC;gBACAa;gBACAL;YACF,KACA,EAAE;YACR,MAAMkC,KAAK,MAAOpB,CAAAA,kBAAmBO,eAA0B;YAC/D,MAAMc,KAAKrB,kBAAkB,IAAKO;YAClC,MAAMe,iBAAiB;gBACrB,QAAQC;gBACR,gBAAgB;gBAChB,UAAU;oBACR,SAAS;gBACX;gBACA,aAAa;oBACXL;oBACAD;oBACA,SAAS;oBACT,MAAM;wBACJ,MAAMZ;wBACN,iBAAiB;4BACf,SAASW;4BACT,SAASD;4BACT,OAAO;gCACL,SAAS;gCACT,cAAcH,8BAA8B;gCAC5C,MAAME;gCACN,QAAQH;gCACR,WAAWE;gCACXO;gCACAC;4BACF;wBACF;oBACF;oBACA,OAAO;wBACL,SAAS;wBACT,SAAS;wBACT,WAAWZ;wBACX,cAAcC;wBACd,MAAMJ;wBACN,QAAQQ;wBACR,WAAW;wBACX,UAAUP;wBACV,YAAYC;wBACZY;wBACAC;oBACF;gBACF;YACF;YAEA,OAAOF,aAAa,MAAM,CAAC,CAACK,KAAuB7C;gBACjD,MAAM8C,QAAQzC,kBAAkBL,OAAOY,MAAML;gBAE7C,IAAIuC,SAASA,MAAM,MAAM,EACvBA,MAAM,OAAO,CAAC,CAACC;oBACbF,IAAI,IAAI,CAAC;wBACP,GAAGF,cAAc;wBACjB,GAAGI,IAAI;oBACT;gBACF;gBAGF,OAAOF;YACT,GAAG,EAAE;QACP;QAEA,OAAO;YACL,GAAGjC,IAAI;YACPY;QACF;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationPointCommon.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationPointCommon.ts"],"sourcesContent":["import type { ISpec, IMarkPointSpec } from '@visactor/vchart'\nimport { selector, selectorWithDynamicFilter } from '../../../../../dataSelector'\nimport { MeasureId } from 'src/dataReshape/constant'\nimport type {\n  ChartDynamicFilter,\n  Datum,\n  Selector,\n  Selectors,\n  SpecPipelineContext,\n  VChartSpecPipe,\n  VSeed,\n} from 'src/types'\nimport { isSubset } from './utils'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { isBarLikeChart } from 'src/pipeline/utils/chatType'\nexport const generateAnnotationPointPipe = (options: {\n  findSelectedDatas?: (options: {\n    dataset: Datum[]\n    selector: Selector | Selectors | undefined | null\n    measureId?: string | null\n    dynamicFilter?: ChartDynamicFilter\n    spec: ISpec\n    context: SpecPipelineContext\n  }) => Datum[]\n  generateMarkPoint?: (datum: Datum, spec: ISpec, context: SpecPipelineContext) => IMarkPointSpec[] | undefined\n}) => {\n  const findSelectedDatas =\n    options.findSelectedDatas ??\n    ((opts) => {\n      const { dataset, selector: s, measureId, dynamicFilter } = opts\n      return dataset.filter((datum) => {\n        const isSelected = dynamicFilter ? selectorWithDynamicFilter(datum, dynamicFilter, s) : selector(datum, s)\n        return isSelected && (!measureId || datum[MeasureId] === measureId)\n      })\n    })\n  const generateMarkPoint =\n    options.generateMarkPoint ??\n    ((datum: Datum) => {\n      return [\n        {\n          coordinate: (data: Datum[], context) => {\n            const targetDatum = data.find((item) => isSubset(datum, item))\n            if (context.getStack() === true) {\n              const stackedDatum = { ...datum, ...targetDatum }\n              return {\n                ...stackedDatum,\n                [context.getStackValueField()]: stackedDatum['__VCHART_STACK_END'],\n              }\n            }\n\n            return targetDatum\n          },\n        },\n      ]\n    })\n\n  return ((spec: ISpec, context: SpecPipelineContext) => {\n    const { advancedVSeed, vseed } = context\n    const { annotation, config } = advancedVSeed\n\n    if (!annotation || !annotation.annotationPoint) {\n      return spec\n    }\n\n    const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationPoint\n    const { annotationPoint } = annotation\n    const annotationPointList = Array.isArray(annotationPoint) ? annotationPoint : [annotationPoint]\n    const isHorizontalBar = isBarLikeChart(advancedVSeed as VSeed)\n    const defaultStyle = isHorizontalBar\n      ? {\n          textAlign: 'right',\n          textBaseline: 'middle',\n        }\n      : {\n          textAlign: 'center',\n          textBaseline: 'top',\n        }\n\n    const markPoint = annotationPointList.flatMap((annotationPoint) => {\n      const {\n        selector: selectorPoint,\n        measureId,\n        dynamicFilter,\n        text = '',\n        textColor = theme?.textColor ?? '#ffffff',\n        textFontSize = theme?.textFontSize ?? 12,\n        textFontWeight = theme?.textFontWeight ?? 400,\n        textAlign = defaultStyle.textAlign,\n        textBaseline = defaultStyle.textBaseline,\n        textBackgroundBorderColor = theme?.textBackgroundBorderColor,\n        textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n        textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n        textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n        textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n        textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n        offsetX = theme?.offsetX ?? 0,\n        offsetY = theme?.offsetY ?? 0,\n      } = annotationPoint\n      const textBackgroundOpacity = theme?.textBackgroundOpacity\n\n      const dataset = advancedVSeed.dataset.flat()\n      const selectedData =\n        selectorPoint || dynamicFilter\n          ? findSelectedDatas({\n              dataset,\n              selector: selectorPoint,\n              measureId,\n              dynamicFilter,\n              spec,\n              context,\n            })\n          : []\n      const dx = -10 - (isHorizontalBar ? (textFontSize as number) : 0) // 由于vchart tag实现问题，需要设置这个强制偏移量\n      const dy = isHorizontalBar ? 0 : (textFontSize as number)\n      const markPointStyle = {\n        zIndex: ANNOTATION_Z_INDEX,\n        regionRelative: true,\n        itemLine: {\n          visible: false,\n        },\n        itemContent: {\n          offsetY,\n          offsetX,\n          confine: true,\n          text: {\n            text: text,\n            labelBackground: {\n              visible: textBackgroundVisible,\n              padding: textBackgroundPadding,\n              style: {\n                opacity: textBackgroundOpacity ?? 0.95,\n                cornerRadius: textBackgroundBorderRadius ?? 4,\n                fill: textBackgroundColor,\n                stroke: textBackgroundBorderColor,\n                lineWidth: textBackgroundBorderWidth,\n                dx,\n                dy,\n              },\n            },\n          },\n          style: {\n            visible: true,\n            textAlign: textAlign,\n            textBaseline: textBaseline,\n            fill: textColor,\n            stroke: textBackgroundColor,\n            lineWidth: 1,\n            fontSize: textFontSize,\n            fontWeight: textFontWeight,\n            dx,\n            dy,\n          },\n        },\n      } as Partial<IMarkPointSpec>\n\n      return selectedData.reduce((res: IMarkPointSpec[], datum) => {\n        const marks = generateMarkPoint(datum, spec, context)\n\n        if (marks && marks.length) {\n          marks.forEach((mark) => {\n            res.push({\n              ...markPointStyle,\n              ...mark,\n            } as IMarkPointSpec)\n          })\n        }\n\n        return res\n      }, [])\n    }) as unknown as IMarkPointSpec[]\n\n    return {\n      ...spec,\n      markPoint,\n    } as ISpec\n  }) as VChartSpecPipe\n}\n"],"names":["generateAnnotationPointPipe","options","findSelectedDatas","opts","dataset","s","measureId","dynamicFilter","datum","isSelected","selectorWithDynamicFilter","selector","MeasureId","generateMarkPoint","data","context","targetDatum","item","isSubset","stackedDatum","spec","advancedVSeed","vseed","annotation","config","theme","annotationPoint","annotationPointList","Array","isHorizontalBar","isBarLikeChart","defaultStyle","markPoint","selectorPoint","text","textColor","textFontSize","textFontWeight","textAlign","textBaseline","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundColor","textBackgroundPadding","textBackgroundVisible","offsetX","offsetY","textBackgroundOpacity","selectedData","dx","dy","markPointStyle","ANNOTATION_Z_INDEX","res","marks","mark"],"mappings":"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"}

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationVerticalLine.js

@@ -1,6 +1,6 @@
 import { isArray, isNumber, isString } from "remeda";
 import { ANNOTATION_Z_INDEX } from "../../../../utils/constant.js";
-import { resolveAnnotationValue } from "./utils.js";
+import { getAnnotationLineDash, resolveAnnotationValue } from "./utils.js";
 const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
     const { advancedVSeed, vseed } = context;
     const { annotation, config } = advancedVSeed;
@@ -19,7 +19,10 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
         insideEnd: 'insideEndTop'
     };
     const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine)=>{
-        const { xValue, dynamicFilter, text = '', textPosition = 'insideEnd', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = 'center', textBaseline = 'top', lineColor = theme?.lineColor ?? '#212121', lineStyle = theme?.lineStyle ?? 'dashed', lineVisible = theme?.lineStyle ?? true, lineWidth = theme?.lineWidth ?? 1, textBackgroundVisible = theme?.textBackgroundVisible ?? true, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundBorderColor = theme?.textBackgroundBorderColor ?? '#212121', textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundPadding = theme?.textBackgroundPadding ?? 2 } = annotationVerticalLine;
+        const { xValue, dynamicFilter, text = '', textPosition = 'insideEnd', textColor = theme?.textColor ?? '#ffffff', textFontSize = theme?.textFontSize ?? 12, textFontWeight = theme?.textFontWeight ?? 400, textAlign = 'center', textBaseline = 'top', lineColor = theme?.lineColor ?? '#212121', lineVisible = theme?.lineStyle ?? true, lineWidth = theme?.lineWidth ?? 1, textBackgroundVisible = theme?.textBackgroundVisible ?? true, textBackgroundColor = theme?.textBackgroundColor ?? '#212121', textBackgroundBorderColor = theme?.textBackgroundBorderColor ?? '#212121', textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4, textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1, textBackgroundPadding = theme?.textBackgroundPadding ?? 2 } = annotationVerticalLine;
+        const lineStyle = annotationVerticalLine.lineStyle ?? theme?.lineStyle ?? 'dashed';
+        const lineDash = getAnnotationLineDash(lineStyle, annotationVerticalLine.lineStyle ? void 0 : theme?.lineDash);
+        const textBackgroundOpacity = theme?.textBackgroundOpacity;
         const generateOneMarkLine = (x)=>({
                 x,
                 autoRange: true,
@@ -30,15 +33,7 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
                         stroke: lineColor,
                         lineStyle: lineStyle,
                         lineWidth: lineWidth,
-                        lineDash: 'dashed' === lineStyle ? [
-                            5,
-                            2
-                        ] : 'dotted' === lineStyle ? [
-                            2,
-                            5
-                        ] : [
-                            0
-                        ]
+                        lineDash
                     }
                 },
                 label: {
@@ -46,7 +41,6 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
                     text: text,
                     position: positionMap[textPosition || 'insideEnd'],
                     style: {
-                        opacity: 0.95,
                         dx: 5,
                         visible: true,
                         stroke: textBackgroundColor,
@@ -61,13 +55,13 @@ const annotationVerticalLine_annotationVerticalLine = (spec, context)=>{
                         visible: textBackgroundVisible,
                         padding: textBackgroundPadding,
                         style: {
-                            opacity: 0.95,
+                            opacity: textBackgroundOpacity ?? 0.95,
                             dx: 5,
                             cornerRadius: textBackgroundBorderRadius,
                             fill: textBackgroundColor,
-                            fillOpacity: 1,
                             stroke: textBackgroundBorderColor,
-                            lineWidth: textBackgroundBorderWidth
+                            lineWidth: textBackgroundBorderWidth,
+                            fillOpacity: 1
                         }
                     }
                 },

package/dist/esm/pipeline/spec/chart/pipes/annotation/annotationVerticalLine.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationVerticalLine.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationVerticalLine.ts"],"sourcesContent":["import type { ILineChartSpec, IMarkLineSpec } from '@visactor/vchart'\nimport type { VChartSpecPipe } from 'src/types'\nimport { isArray, isNumber, isString } from 'remeda'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { resolveAnnotationValue } from './utils'\n\nexport const annotationVerticalLine: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { annotation, config } = advancedVSeed\n\n  if (!annotation || !annotation.annotationVerticalLine) {\n    return spec\n  }\n\n  const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationVerticalLine\n  const { annotationVerticalLine } = annotation\n  const annotationVerticalLineList = Array.isArray(annotationVerticalLine)\n    ? annotationVerticalLine\n    : [annotationVerticalLine]\n\n  const positionMap = {\n    outsideStart: 'start',\n    outsideEnd: 'end',\n    outsideMiddle: 'middle',\n    insideStart: 'insideStartTop',\n    insideMiddle: 'insideMiddleTop',\n    insideEnd: 'insideEndTop',\n  }\n  const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine) => {\n    const {\n      xValue,\n      dynamicFilter,\n      text = '',\n      textPosition = 'insideEnd',\n      textColor = theme?.textColor ?? '#ffffff',\n      textFontSize = theme?.textFontSize ?? 12,\n      textFontWeight = theme?.textFontWeight ?? 400,\n      textAlign = 'center',\n      textBaseline = 'top',\n\n      lineColor = theme?.lineColor ?? '#212121',\n      lineStyle = theme?.lineStyle ?? 'dashed',\n      lineVisible = theme?.lineStyle ?? true,\n      lineWidth = theme?.lineWidth ?? 1,\n\n      textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n      textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n      textBackgroundBorderColor = theme?.textBackgroundBorderColor ?? '#212121',\n      textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n      textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n      textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n    } = annotationVerticalLine\n\n    const generateOneMarkLine = (x: number | string) => ({\n      x,\n      autoRange: true,\n      zIndex: ANNOTATION_Z_INDEX,\n      line: {\n        style: {\n          visible: lineVisible,\n          stroke: lineColor,\n          lineStyle: lineStyle,\n          lineWidth: lineWidth,\n          lineDash: lineStyle === 'dashed' ? [5, 2] : lineStyle === 'dotted' ? [2, 5] : [0],\n        },\n      },\n      label: {\n        confine: true,\n        text: text,\n        position: (positionMap as any)[textPosition || 'insideEnd'],\n        style: {\n          opacity: 0.95,\n          dx: 5,\n          visible: true,\n          stroke: textBackgroundColor,\n          lineWidth: 1,\n          textAlign: textAlign,\n          textBaseline: textBaseline,\n          fill: textColor,\n          fontSize: textFontSize,\n          fontWeight: textFontWeight,\n        },\n        labelBackground: {\n          visible: textBackgroundVisible,\n          padding: textBackgroundPadding,\n          style: {\n            opacity: 0.95,\n            dx: 5,\n            cornerRadius: textBackgroundBorderRadius,\n            fill: textBackgroundColor,\n            fillOpacity: 1,\n            stroke: textBackgroundBorderColor,\n            lineWidth: textBackgroundBorderWidth,\n          },\n        },\n      },\n      startSymbol: {\n        visible: theme?.startSymbolVisible ?? true,\n        symbolType: theme?.startSymbolType ?? 'triangleDown',\n        size: 5 + (lineWidth || 1),\n        style: {\n          dy: -3,\n          fill: lineColor,\n        },\n      },\n      endSymbol: {\n        visible: theme?.endSymbolVisible ?? false,\n        symbolType: theme?.endSymbolType ?? 'arrow',\n        size: 10 + (lineWidth || 1),\n        style: {\n          dy: 4,\n          fill: lineColor,\n        },\n      },\n    })\n\n    const finalXValue = resolveAnnotationValue({\n      dynamicFilter,\n      fallback: dynamicFilter?.fallback as string | number | undefined,\n      defaultValue: xValue,\n    })\n\n    if (isArray(finalXValue) || isString(finalXValue) || isNumber(finalXValue)) {\n      const xValueArr = Array.isArray(finalXValue) ? finalXValue : [finalXValue]\n      return xValueArr.map(generateOneMarkLine)\n    }\n\n    return []\n  }) as IMarkLineSpec[]\n\n  const specMarkLine = ((spec as ILineChartSpec).markLine as IMarkLineSpec[]) || []\n  const newMarkLine = [...specMarkLine, ...(markLine || [])]\n\n  return {\n    ...spec,\n    markLine: newMarkLine,\n  }\n}\n"],"names":["annotationVerticalLine","spec","context","advancedVSeed","vseed","annotation","config","theme","annotationVerticalLineList","Array","positionMap","markLine","xValue","dynamicFilter","text","textPosition","textColor","textFontSize","textFontWeight","textAlign","textBaseline","lineColor","lineStyle","lineVisible","lineWidth","textBackgroundVisible","textBackgroundColor","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundPadding","generateOneMarkLine","x","ANNOTATION_Z_INDEX","finalXValue","resolveAnnotationValue","isArray","isString","isNumber","xValueArr","specMarkLine","newMarkLine"],"mappings":"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"}
+{"version":3,"file":"pipeline/spec/chart/pipes/annotation/annotationVerticalLine.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/annotationVerticalLine.ts"],"sourcesContent":["import type { ILineChartSpec, IMarkLineSpec } from '@visactor/vchart'\nimport type { VChartSpecPipe } from 'src/types'\nimport { isArray, isNumber, isString } from 'remeda'\nimport { ANNOTATION_Z_INDEX } from '../../../../utils/constant'\nimport { getAnnotationLineDash, resolveAnnotationValue } from './utils'\n\nexport const annotationVerticalLine: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { annotation, config } = advancedVSeed\n\n  if (!annotation || !annotation.annotationVerticalLine) {\n    return spec\n  }\n\n  const theme = config?.[vseed.chartType as 'column']?.annotation?.annotationVerticalLine\n  const { annotationVerticalLine } = annotation\n  const annotationVerticalLineList = Array.isArray(annotationVerticalLine)\n    ? annotationVerticalLine\n    : [annotationVerticalLine]\n\n  const positionMap = {\n    outsideStart: 'start',\n    outsideEnd: 'end',\n    outsideMiddle: 'middle',\n    insideStart: 'insideStartTop',\n    insideMiddle: 'insideMiddleTop',\n    insideEnd: 'insideEndTop',\n  }\n  const markLine = annotationVerticalLineList.flatMap((annotationVerticalLine) => {\n    const {\n      xValue,\n      dynamicFilter,\n      text = '',\n      textPosition = 'insideEnd',\n      textColor = theme?.textColor ?? '#ffffff',\n      textFontSize = theme?.textFontSize ?? 12,\n      textFontWeight = theme?.textFontWeight ?? 400,\n      textAlign = 'center',\n      textBaseline = 'top',\n\n      lineColor = theme?.lineColor ?? '#212121',\n      lineVisible = theme?.lineStyle ?? true,\n      lineWidth = theme?.lineWidth ?? 1,\n\n      textBackgroundVisible = theme?.textBackgroundVisible ?? true,\n      textBackgroundColor = theme?.textBackgroundColor ?? '#212121',\n      textBackgroundBorderColor = theme?.textBackgroundBorderColor ?? '#212121',\n      textBackgroundBorderRadius = theme?.textBackgroundBorderRadius ?? 4,\n      textBackgroundBorderWidth = theme?.textBackgroundBorderWidth ?? 1,\n      textBackgroundPadding = theme?.textBackgroundPadding ?? 2,\n    } = annotationVerticalLine\n    const lineStyle = annotationVerticalLine.lineStyle ?? theme?.lineStyle ?? 'dashed'\n    const lineDash = getAnnotationLineDash(lineStyle, annotationVerticalLine.lineStyle ? undefined : theme?.lineDash)\n    const textBackgroundOpacity = theme?.textBackgroundOpacity\n\n    const generateOneMarkLine = (x: number | string) => ({\n      x,\n      autoRange: true,\n      zIndex: ANNOTATION_Z_INDEX,\n      line: {\n        style: {\n          visible: lineVisible,\n          stroke: lineColor,\n          lineStyle: lineStyle,\n          lineWidth: lineWidth,\n          lineDash,\n        },\n      },\n      label: {\n        confine: true,\n        text: text,\n        position: (positionMap as any)[textPosition || 'insideEnd'],\n        style: {\n          dx: 5,\n          visible: true,\n          stroke: textBackgroundColor,\n          lineWidth: 1,\n          textAlign: textAlign,\n          textBaseline: textBaseline,\n          fill: textColor,\n          fontSize: textFontSize,\n          fontWeight: textFontWeight,\n        },\n        labelBackground: {\n          visible: textBackgroundVisible,\n          padding: textBackgroundPadding,\n          style: {\n            opacity: textBackgroundOpacity ?? 0.95,\n            dx: 5,\n            cornerRadius: textBackgroundBorderRadius,\n            fill: textBackgroundColor,\n            stroke: textBackgroundBorderColor,\n            lineWidth: textBackgroundBorderWidth,\n            fillOpacity: 1,\n          },\n        },\n      },\n      startSymbol: {\n        visible: theme?.startSymbolVisible ?? true,\n        symbolType: theme?.startSymbolType ?? 'triangleDown',\n        size: 5 + (lineWidth || 1),\n        style: {\n          dy: -3,\n          fill: lineColor,\n        },\n      },\n      endSymbol: {\n        visible: theme?.endSymbolVisible ?? false,\n        symbolType: theme?.endSymbolType ?? 'arrow',\n        size: 10 + (lineWidth || 1),\n        style: {\n          dy: 4,\n          fill: lineColor,\n        },\n      },\n    })\n\n    const finalXValue = resolveAnnotationValue({\n      dynamicFilter,\n      fallback: dynamicFilter?.fallback as string | number | undefined,\n      defaultValue: xValue,\n    })\n\n    if (isArray(finalXValue) || isString(finalXValue) || isNumber(finalXValue)) {\n      const xValueArr = Array.isArray(finalXValue) ? finalXValue : [finalXValue]\n      return xValueArr.map(generateOneMarkLine)\n    }\n\n    return []\n  }) as IMarkLineSpec[]\n\n  const specMarkLine = ((spec as ILineChartSpec).markLine as IMarkLineSpec[]) || []\n  const newMarkLine = [...specMarkLine, ...(markLine || [])]\n\n  return {\n    ...spec,\n    markLine: newMarkLine,\n  }\n}\n"],"names":["annotationVerticalLine","spec","context","advancedVSeed","vseed","annotation","config","theme","annotationVerticalLineList","Array","positionMap","markLine","xValue","dynamicFilter","text","textPosition","textColor","textFontSize","textFontWeight","textAlign","textBaseline","lineColor","lineVisible","lineWidth","textBackgroundVisible","textBackgroundColor","textBackgroundBorderColor","textBackgroundBorderRadius","textBackgroundBorderWidth","textBackgroundPadding","lineStyle","lineDash","getAnnotationLineDash","undefined","textBackgroundOpacity","generateOneMarkLine","x","ANNOTATION_Z_INDEX","finalXValue","resolveAnnotationValue","isArray","isString","isNumber","xValueArr","specMarkLine","newMarkLine"],"mappings":"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"}

package/dist/esm/pipeline/spec/chart/pipes/annotation/utils.d.ts

@@ -1,4 +1,6 @@
 import type { Datum, ValueDynamicFilter } from '../../../../../types';
+export type AnnotationLineStyle = 'solid' | 'dashed' | 'dotted';
+export declare const getAnnotationLineDash: (lineStyle?: AnnotationLineStyle | null, lineDash?: number[] | null) => number[];
 export declare const isSubset: (sub: Datum, obj: Datum, excludeMeasuresIds?: string[]) => boolean;
 export declare const ANNOTATION_AREA_TEXT_STYLE_BY_POSITION: {
     top: {

package/dist/esm/pipeline/spec/chart/pipes/annotation/utils.js

@@ -1,3 +1,17 @@
+const getAnnotationLineDash = (lineStyle, lineDash)=>{
+    if (Array.isArray(lineDash)) return lineDash;
+    if ('dashed' === lineStyle) return [
+        2,
+        2
+    ];
+    if ('dotted' === lineStyle) return [
+        2,
+        5
+    ];
+    return [
+        0
+    ];
+};
 const isSubset = (sub, obj, excludeMeasuresIds)=>Object.entries(sub).every(([key, value])=>{
         if (excludeMeasuresIds && excludeMeasuresIds.includes(key)) return false;
         if ('string' == typeof value) return obj[key] === value;
@@ -44,6 +58,6 @@ const resolveAnnotationValue = (options)=>{
     if (void 0 !== fallback) return fallback;
     return defaultValue;
 };
-export { ANNOTATION_AREA_TEXT_STYLE_BY_POSITION, isSubset, resolveAnnotationValue };
+export { ANNOTATION_AREA_TEXT_STYLE_BY_POSITION, getAnnotationLineDash, isSubset, resolveAnnotationValue };
 
 //# sourceMappingURL=utils.js.map

package/dist/esm/pipeline/spec/chart/pipes/annotation/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/annotation/utils.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/utils.ts"],"sourcesContent":["import type { Datum, ValueDynamicFilter } from 'src/types'\n\nexport const isSubset = (sub: Datum, obj: Datum, excludeMeasuresIds?: string[]) => {\n  return Object.entries(sub).every(([key, value]) => {\n    if (excludeMeasuresIds && excludeMeasuresIds.includes(key)) {\n      return false\n    }\n\n    if (typeof value === 'string') {\n      return obj[key] === value\n    }\n    if (typeof value === 'number') {\n      return obj[key] === value\n    }\n    return true\n  })\n}\n\nexport const ANNOTATION_AREA_TEXT_STYLE_BY_POSITION = {\n  top: {\n    textAlign: 'center',\n    textBaseline: 'top',\n  },\n  topRight: {\n    textAlign: 'right',\n    textBaseline: 'top',\n  },\n  topLeft: {\n    textAlign: 'left',\n    textBaseline: 'top',\n  },\n  bottom: {\n    textAlign: 'center',\n    textBaseline: 'bottom',\n  },\n  bottomLeft: {\n    textAlign: 'left',\n    textBaseline: 'bottom',\n  },\n  bottomRight: {\n    textAlign: 'right',\n    textBaseline: 'bottom',\n  },\n  left: {\n    textAlign: 'left',\n    textBaseline: 'middle',\n  },\n  right: {\n    textAlign: 'right',\n    textBaseline: 'middle',\n  },\n}\n\n/**\n * 解析标注线的值，优先级：dynamicFilter (success=true) > fallback > defaultValue\n */\nexport const resolveAnnotationValue = (options: {\n  dynamicFilter?: ValueDynamicFilter\n  fallback?: string | number\n  defaultValue?: any\n}): (string | number) | (string | number)[] | undefined => {\n  const { dynamicFilter, fallback, defaultValue } = options\n\n  // 优先使用 dynamicFilter\n  if (dynamicFilter?.result?.success && dynamicFilter.result.data !== undefined) {\n    return dynamicFilter.result.data\n  }\n\n  // 其次使用 fallback\n  if (fallback !== undefined) {\n    return fallback\n  }\n\n  // 最后使用原始的 defaultValue\n  return defaultValue\n}\n"],"names":["isSubset","sub","obj","excludeMeasuresIds","Object","key","value","ANNOTATION_AREA_TEXT_STYLE_BY_POSITION","resolveAnnotationValue","options","dynamicFilter","fallback","defaultValue","undefined"],"mappings":"AAEO,MAAMA,WAAW,CAACC,KAAYC,KAAYC,qBACxCC,OAAO,OAAO,CAACH,KAAK,KAAK,CAAC,CAAC,CAACI,KAAKC,MAAM;QAC5C,IAAIH,sBAAsBA,mBAAmB,QAAQ,CAACE,MACpD,OAAO;QAGT,IAAI,AAAiB,YAAjB,OAAOC,OACT,OAAOJ,GAAG,CAACG,IAAI,KAAKC;QAEtB,IAAI,AAAiB,YAAjB,OAAOA,OACT,OAAOJ,GAAG,CAACG,IAAI,KAAKC;QAEtB,OAAO;IACT;AAGK,MAAMC,yCAAyC;IACpD,KAAK;QACH,WAAW;QACX,cAAc;IAChB;IACA,UAAU;QACR,WAAW;QACX,cAAc;IAChB;IACA,SAAS;QACP,WAAW;QACX,cAAc;IAChB;IACA,QAAQ;QACN,WAAW;QACX,cAAc;IAChB;IACA,YAAY;QACV,WAAW;QACX,cAAc;IAChB;IACA,aAAa;QACX,WAAW;QACX,cAAc;IAChB;IACA,MAAM;QACJ,WAAW;QACX,cAAc;IAChB;IACA,OAAO;QACL,WAAW;QACX,cAAc;IAChB;AACF;AAKO,MAAMC,yBAAyB,CAACC;IAKrC,MAAM,EAAEC,aAAa,EAAEC,QAAQ,EAAEC,YAAY,EAAE,GAAGH;IAGlD,IAAIC,eAAe,QAAQ,WAAWA,AAA8BG,WAA9BH,cAAc,MAAM,CAAC,IAAI,EAC7D,OAAOA,cAAc,MAAM,CAAC,IAAI;IAIlC,IAAIC,AAAaE,WAAbF,UACF,OAAOA;IAIT,OAAOC;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/annotation/utils.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/annotation/utils.ts"],"sourcesContent":["import type { Datum, ValueDynamicFilter } from 'src/types'\n\nexport type AnnotationLineStyle = 'solid' | 'dashed' | 'dotted'\n\nexport const getAnnotationLineDash = (lineStyle?: AnnotationLineStyle | null, lineDash?: number[] | null) => {\n  if (Array.isArray(lineDash)) {\n    return lineDash\n  }\n\n  if (lineStyle === 'dashed') {\n    return [2, 2]\n  }\n\n  if (lineStyle === 'dotted') {\n    return [2, 5]\n  }\n\n  return [0]\n}\n\nexport const isSubset = (sub: Datum, obj: Datum, excludeMeasuresIds?: string[]) => {\n  return Object.entries(sub).every(([key, value]) => {\n    if (excludeMeasuresIds && excludeMeasuresIds.includes(key)) {\n      return false\n    }\n\n    if (typeof value === 'string') {\n      return obj[key] === value\n    }\n    if (typeof value === 'number') {\n      return obj[key] === value\n    }\n    return true\n  })\n}\n\nexport const ANNOTATION_AREA_TEXT_STYLE_BY_POSITION = {\n  top: {\n    textAlign: 'center',\n    textBaseline: 'top',\n  },\n  topRight: {\n    textAlign: 'right',\n    textBaseline: 'top',\n  },\n  topLeft: {\n    textAlign: 'left',\n    textBaseline: 'top',\n  },\n  bottom: {\n    textAlign: 'center',\n    textBaseline: 'bottom',\n  },\n  bottomLeft: {\n    textAlign: 'left',\n    textBaseline: 'bottom',\n  },\n  bottomRight: {\n    textAlign: 'right',\n    textBaseline: 'bottom',\n  },\n  left: {\n    textAlign: 'left',\n    textBaseline: 'middle',\n  },\n  right: {\n    textAlign: 'right',\n    textBaseline: 'middle',\n  },\n}\n\n/**\n * 解析标注线的值，优先级：dynamicFilter (success=true) > fallback > defaultValue\n */\nexport const resolveAnnotationValue = (options: {\n  dynamicFilter?: ValueDynamicFilter\n  fallback?: string | number\n  defaultValue?: any\n}): (string | number) | (string | number)[] | undefined => {\n  const { dynamicFilter, fallback, defaultValue } = options\n\n  // 优先使用 dynamicFilter\n  if (dynamicFilter?.result?.success && dynamicFilter.result.data !== undefined) {\n    return dynamicFilter.result.data\n  }\n\n  // 其次使用 fallback\n  if (fallback !== undefined) {\n    return fallback\n  }\n\n  // 最后使用原始的 defaultValue\n  return defaultValue\n}\n"],"names":["getAnnotationLineDash","lineStyle","lineDash","Array","isSubset","sub","obj","excludeMeasuresIds","Object","key","value","ANNOTATION_AREA_TEXT_STYLE_BY_POSITION","resolveAnnotationValue","options","dynamicFilter","fallback","defaultValue","undefined"],"mappings":"AAIO,MAAMA,wBAAwB,CAACC,WAAwCC;IAC5E,IAAIC,MAAM,OAAO,CAACD,WAChB,OAAOA;IAGT,IAAID,AAAc,aAAdA,WACF,OAAO;QAAC;QAAG;KAAE;IAGf,IAAIA,AAAc,aAAdA,WACF,OAAO;QAAC;QAAG;KAAE;IAGf,OAAO;QAAC;KAAE;AACZ;AAEO,MAAMG,WAAW,CAACC,KAAYC,KAAYC,qBACxCC,OAAO,OAAO,CAACH,KAAK,KAAK,CAAC,CAAC,CAACI,KAAKC,MAAM;QAC5C,IAAIH,sBAAsBA,mBAAmB,QAAQ,CAACE,MACpD,OAAO;QAGT,IAAI,AAAiB,YAAjB,OAAOC,OACT,OAAOJ,GAAG,CAACG,IAAI,KAAKC;QAEtB,IAAI,AAAiB,YAAjB,OAAOA,OACT,OAAOJ,GAAG,CAACG,IAAI,KAAKC;QAEtB,OAAO;IACT;AAGK,MAAMC,yCAAyC;IACpD,KAAK;QACH,WAAW;QACX,cAAc;IAChB;IACA,UAAU;QACR,WAAW;QACX,cAAc;IAChB;IACA,SAAS;QACP,WAAW;QACX,cAAc;IAChB;IACA,QAAQ;QACN,WAAW;QACX,cAAc;IAChB;IACA,YAAY;QACV,WAAW;QACX,cAAc;IAChB;IACA,aAAa;QACX,WAAW;QACX,cAAc;IAChB;IACA,MAAM;QACJ,WAAW;QACX,cAAc;IAChB;IACA,OAAO;QACL,WAAW;QACX,cAAc;IAChB;AACF;AAKO,MAAMC,yBAAyB,CAACC;IAKrC,MAAM,EAAEC,aAAa,EAAEC,QAAQ,EAAEC,YAAY,EAAE,GAAGH;IAGlD,IAAIC,eAAe,QAAQ,WAAWA,AAA8BG,WAA9BH,cAAc,MAAM,CAAC,IAAI,EAC7D,OAAOA,cAAc,MAAM,CAAC,IAAI;IAIlC,IAAIC,AAAaE,WAAbF,UACF,OAAOA;IAIT,OAAOC;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/stack/stackCornerRadius.js

@@ -1,49 +1,28 @@
-import { FoldMeasureId } from "../../../../../dataReshape/constant.js";
-const reverseStackCornerRadius = (cornerRadius)=>{
-    if (!Array.isArray(cornerRadius)) return cornerRadius;
-    const [topLeft = 0, topRight = 0, bottomRight = 0, bottomLeft = 0] = cornerRadius;
-    return [
-        bottomRight,
-        bottomLeft,
-        topLeft,
-        topRight
-    ];
-};
-const mergeStackCornerRadius = (cornerRadius)=>{
-    if (!Array.isArray(cornerRadius)) return cornerRadius;
-    const [topLeft = 0, topRight = 0, bottomRight = 0, bottomLeft = 0] = cornerRadius;
-    return [
-        Math.max(topLeft, bottomRight),
-        Math.max(topRight, bottomLeft),
-        Math.max(bottomRight, topLeft),
-        Math.max(bottomLeft, topRight)
-    ];
-};
-const getStackRangeCornerRadius = (cornerRadius, datum)=>{
-    const stackStart = datum?.['__VCHART_STACK_START'];
-    const stackEnd = datum?.['__VCHART_STACK_END'];
-    if ('number' != typeof stackStart || 'number' != typeof stackEnd) return;
-    const hasPositivePart = stackStart > 0 || stackEnd > 0;
-    const hasNegativePart = stackStart < 0 || stackEnd < 0;
-    if (hasPositivePart && hasNegativePart) return mergeStackCornerRadius(cornerRadius);
-    if (hasPositivePart) return cornerRadius;
-    if (hasNegativePart) return reverseStackCornerRadius(cornerRadius);
-    return 0;
-};
+import { createStackCornerRadius, hasMoveInAnimation } from "./stackCornerRadiusUtils.js";
+const hasBarMoveInAnimation = (spec)=>[
+        spec.animationAppear,
+        spec.animationNormal,
+        spec.animationEnter,
+        spec.animationUpdate
+    ].some(hasMoveInAnimation);
 const stackCornerRadius_stackCornerRadius = (spec, context)=>{
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
     const stackCornerRadius = advancedVSeed.config?.[chartType]?.stackCornerRadius;
     if ('dualAxis' === chartType && 'bar' !== spec.type) return spec;
+    const stackCornerRadiusCallback = createStackCornerRadius(stackCornerRadius);
+    if (!hasBarMoveInAnimation(spec)) return {
+        ...spec,
+        stackCornerRadius: stackCornerRadiusCallback
+    };
     return {
         ...spec,
-        stackCornerRadius: (_, datum)=>{
-            const stackRangeCornerRadius = getStackRangeCornerRadius(stackCornerRadius, datum);
-            if (void 0 !== stackRangeCornerRadius) return stackRangeCornerRadius;
-            const value = datum?.[datum?.[FoldMeasureId]];
-            if (value > 0) return stackCornerRadius;
-            if (value < 0) return reverseStackCornerRadius(stackCornerRadius);
-            return 0;
+        bar: {
+            ...spec.bar,
+            style: {
+                ...spec.bar?.style,
+                cornerRadius: stackCornerRadiusCallback
+            }
         }
     };
 };

package/dist/esm/pipeline/spec/chart/pipes/stack/stackCornerRadius.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/stack/stackCornerRadius.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/stack/stackCornerRadius.ts"],"sourcesContent":["import type { IBarChartSpec } from '@visactor/vchart'\nimport { FoldMeasureId } from 'src/dataReshape/constant'\nimport type { Datum, VChartSpecPipe, StackCornerRadius } from 'src/types'\n\nconst reverseStackCornerRadius = (cornerRadius: StackCornerRadius): StackCornerRadius => {\n  if (!Array.isArray(cornerRadius)) {\n    return cornerRadius\n  }\n\n  const [topLeft = 0, topRight = 0, bottomRight = 0, bottomLeft = 0] = cornerRadius\n\n  return [bottomRight, bottomLeft, topLeft, topRight]\n}\n\nconst mergeStackCornerRadius = (cornerRadius: StackCornerRadius): StackCornerRadius => {\n  if (!Array.isArray(cornerRadius)) {\n    return cornerRadius\n  }\n\n  const [topLeft = 0, topRight = 0, bottomRight = 0, bottomLeft = 0] = cornerRadius\n\n  return [\n    Math.max(topLeft, bottomRight),\n    Math.max(topRight, bottomLeft),\n    Math.max(bottomRight, topLeft),\n    Math.max(bottomLeft, topRight),\n  ]\n}\n\nconst getStackRangeCornerRadius = (\n  cornerRadius: StackCornerRadius,\n  datum: Datum,\n): StackCornerRadius | 0 | undefined => {\n  const stackStart = datum?.['__VCHART_STACK_START']\n  const stackEnd = datum?.['__VCHART_STACK_END']\n\n  if (typeof stackStart !== 'number' || typeof stackEnd !== 'number') {\n    return undefined\n  }\n\n  const hasPositivePart = stackStart > 0 || stackEnd > 0\n  const hasNegativePart = stackStart < 0 || stackEnd < 0\n\n  if (hasPositivePart && hasNegativePart) {\n    // Mixed positive/negative stack range: merge normal/reverse corners for whole-bar style.\n    return mergeStackCornerRadius(cornerRadius)\n  }\n\n  if (hasPositivePart) {\n    return cornerRadius\n  }\n\n  if (hasNegativePart) {\n    return reverseStackCornerRadius(cornerRadius)\n  }\n\n  return 0\n}\n\nexport const stackCornerRadius: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const stackCornerRadius = advancedVSeed.config?.[chartType as 'column']?.stackCornerRadius as StackCornerRadius\n\n  if (chartType === 'dualAxis' && (spec as any).type !== 'bar') {\n    return spec\n  }\n\n  return {\n    ...spec,\n    stackCornerRadius: (_: unknown, datum: Datum) => {\n      const stackRangeCornerRadius = getStackRangeCornerRadius(stackCornerRadius, datum)\n\n      if (stackRangeCornerRadius !== undefined) {\n        return stackRangeCornerRadius\n      }\n\n      const value = datum?.[datum?.[FoldMeasureId]]\n\n      if (value > 0) {\n        return stackCornerRadius\n      }\n\n      if (value < 0) {\n        return reverseStackCornerRadius(stackCornerRadius)\n      }\n\n      return 0\n    },\n  } as IBarChartSpec\n}\n"],"names":["reverseStackCornerRadius","cornerRadius","Array","topLeft","topRight","bottomRight","bottomLeft","mergeStackCornerRadius","Math","getStackRangeCornerRadius","datum","stackStart","stackEnd","hasPositivePart","hasNegativePart","stackCornerRadius","spec","context","advancedVSeed","vseed","chartType","_","stackRangeCornerRadius","undefined","value","FoldMeasureId"],"mappings":";AAIA,MAAMA,2BAA2B,CAACC;IAChC,IAAI,CAACC,MAAM,OAAO,CAACD,eACjB,OAAOA;IAGT,MAAM,CAACE,UAAU,CAAC,EAAEC,WAAW,CAAC,EAAEC,cAAc,CAAC,EAAEC,aAAa,CAAC,CAAC,GAAGL;IAErE,OAAO;QAACI;QAAaC;QAAYH;QAASC;KAAS;AACrD;AAEA,MAAMG,yBAAyB,CAACN;IAC9B,IAAI,CAACC,MAAM,OAAO,CAACD,eACjB,OAAOA;IAGT,MAAM,CAACE,UAAU,CAAC,EAAEC,WAAW,CAAC,EAAEC,cAAc,CAAC,EAAEC,aAAa,CAAC,CAAC,GAAGL;IAErE,OAAO;QACLO,KAAK,GAAG,CAACL,SAASE;QAClBG,KAAK,GAAG,CAACJ,UAAUE;QACnBE,KAAK,GAAG,CAACH,aAAaF;QACtBK,KAAK,GAAG,CAACF,YAAYF;KACtB;AACH;AAEA,MAAMK,4BAA4B,CAChCR,cACAS;IAEA,MAAMC,aAAaD,OAAO,CAAC,uBAAuB;IAClD,MAAME,WAAWF,OAAO,CAAC,qBAAqB;IAE9C,IAAI,AAAsB,YAAtB,OAAOC,cAA2B,AAAoB,YAApB,OAAOC,UAC3C;IAGF,MAAMC,kBAAkBF,aAAa,KAAKC,WAAW;IACrD,MAAME,kBAAkBH,aAAa,KAAKC,WAAW;IAErD,IAAIC,mBAAmBC,iBAErB,OAAOP,uBAAuBN;IAGhC,IAAIY,iBACF,OAAOZ;IAGT,IAAIa,iBACF,OAAOd,yBAAyBC;IAGlC,OAAO;AACT;AAEO,MAAMc,sCAAoC,CAACC,MAAMC;IACtD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,SAAS,EAAE,GAAGD;IACtB,MAAMJ,oBAAoBG,cAAc,MAAM,EAAE,CAACE,UAAsB,EAAE;IAEzE,IAAIA,AAAc,eAAdA,aAA6BJ,AAAsB,UAAtBA,KAAa,IAAI,EAChD,OAAOA;IAGT,OAAO;QACL,GAAGA,IAAI;QACP,mBAAmB,CAACK,GAAYX;YAC9B,MAAMY,yBAAyBb,0BAA0BM,mBAAmBL;YAE5E,IAAIY,AAA2BC,WAA3BD,wBACF,OAAOA;YAGT,MAAME,QAAQd,OAAO,CAACA,OAAO,CAACe,cAAc,CAAC;YAE7C,IAAID,QAAQ,GACV,OAAOT;YAGT,IAAIS,QAAQ,GACV,OAAOxB,yBAAyBe;YAGlC,OAAO;QACT;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/chart/pipes/stack/stackCornerRadius.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/stack/stackCornerRadius.ts"],"sourcesContent":["import type { IBarChartSpec } from '@visactor/vchart'\nimport type { VChartSpecPipe, StackCornerRadius } from 'src/types'\nimport { createStackCornerRadius, hasMoveInAnimation } from './stackCornerRadiusUtils'\n\nconst hasBarMoveInAnimation = (spec: IBarChartSpec): boolean => {\n  return [spec.animationAppear, spec.animationNormal, spec.animationEnter, spec.animationUpdate].some(\n    hasMoveInAnimation,\n  )\n}\n\nexport const stackCornerRadius: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const stackCornerRadius = advancedVSeed.config?.[chartType as 'column']?.stackCornerRadius as StackCornerRadius\n\n  if (chartType === 'dualAxis' && (spec as any).type !== 'bar') {\n    return spec\n  }\n\n  const stackCornerRadiusCallback = createStackCornerRadius(stackCornerRadius)\n\n  if (!hasBarMoveInAnimation(spec as IBarChartSpec)) {\n    return { ...spec, stackCornerRadius: stackCornerRadiusCallback } as IBarChartSpec\n  }\n\n  // VChart implements stackCornerRadius with a final-position clipPath, which clips moveIn.\n  return {\n    ...spec,\n    bar: {\n      ...(spec as IBarChartSpec).bar,\n      style: {\n        ...(spec as IBarChartSpec).bar?.style,\n        cornerRadius: stackCornerRadiusCallback,\n      },\n    },\n  } as IBarChartSpec\n}\n"],"names":["hasBarMoveInAnimation","spec","hasMoveInAnimation","stackCornerRadius","context","advancedVSeed","vseed","chartType","stackCornerRadiusCallback","createStackCornerRadius"],"mappings":";AAIA,MAAMA,wBAAwB,CAACC,OACtB;QAACA,KAAK,eAAe;QAAEA,KAAK,eAAe;QAAEA,KAAK,cAAc;QAAEA,KAAK,eAAe;KAAC,CAAC,IAAI,CACjGC;AAIG,MAAMC,sCAAoC,CAACF,MAAMG;IACtD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,SAAS,EAAE,GAAGD;IACtB,MAAMH,oBAAoBE,cAAc,MAAM,EAAE,CAACE,UAAsB,EAAE;IAEzE,IAAIA,AAAc,eAAdA,aAA6BN,AAAsB,UAAtBA,KAAa,IAAI,EAChD,OAAOA;IAGT,MAAMO,4BAA4BC,wBAAwBN;IAE1D,IAAI,CAACH,sBAAsBC,OACzB,OAAO;QAAE,GAAGA,IAAI;QAAE,mBAAmBO;IAA0B;IAIjE,OAAO;QACL,GAAGP,IAAI;QACP,KAAK;YACH,GAAIA,KAAuB,GAAG;YAC9B,OAAO;gBACL,GAAIA,KAAuB,GAAG,EAAE,KAAK;gBACrC,cAAcO;YAChB;QACF;IACF;AACF"}

package/dist/esm/pipeline/spec/chart/pipes/stack/stackCornerRadiusUtils.d.ts

@@ -0,0 +1,4 @@
+import type { Datum, StackCornerRadius } from '../../../../../types';
+export type StackCornerRadiusCallback = (_: unknown, datum: Datum) => StackCornerRadius | 0;
+export declare const createStackCornerRadius: (cornerRadius: StackCornerRadius) => StackCornerRadiusCallback;
+export declare const hasMoveInAnimation: (animation: unknown) => boolean;

package/dist/esm/pipeline/spec/chart/pipes/stack/stackCornerRadiusUtils.js

@@ -0,0 +1,50 @@
+import { FoldMeasureId } from "../../../../../dataReshape/constant.js";
+const reverseStackCornerRadius = (cornerRadius)=>{
+    if (!Array.isArray(cornerRadius)) return cornerRadius;
+    const [topLeft = 0, topRight = 0, bottomRight = 0, bottomLeft = 0] = cornerRadius;
+    return [
+        bottomRight,
+        bottomLeft,
+        topLeft,
+        topRight
+    ];
+};
+const mergeStackCornerRadius = (cornerRadius)=>{
+    if (!Array.isArray(cornerRadius)) return cornerRadius;
+    const [topLeft = 0, topRight = 0, bottomRight = 0, bottomLeft = 0] = cornerRadius;
+    return [
+        Math.max(topLeft, bottomRight),
+        Math.max(topRight, bottomLeft),
+        Math.max(bottomRight, topLeft),
+        Math.max(bottomLeft, topRight)
+    ];
+};
+const getStackRangeCornerRadius = (cornerRadius, datum)=>{
+    const stackStart = datum?.['__VCHART_STACK_START'];
+    const stackEnd = datum?.['__VCHART_STACK_END'];
+    if ('number' != typeof stackStart || 'number' != typeof stackEnd) return;
+    const hasPositivePart = stackStart > 0 || stackEnd > 0;
+    const hasNegativePart = stackStart < 0 || stackEnd < 0;
+    if (hasPositivePart && hasNegativePart) return mergeStackCornerRadius(cornerRadius);
+    if (hasPositivePart) return cornerRadius;
+    if (hasNegativePart) return reverseStackCornerRadius(cornerRadius);
+    return 0;
+};
+const createStackCornerRadius = (cornerRadius)=>(_, datum)=>{
+        const stackRangeCornerRadius = getStackRangeCornerRadius(cornerRadius, datum);
+        if (void 0 !== stackRangeCornerRadius) return stackRangeCornerRadius;
+        const value = datum?.[datum?.[FoldMeasureId]];
+        if (value > 0) return cornerRadius;
+        if (value < 0) return reverseStackCornerRadius(cornerRadius);
+        return 0;
+    };
+const hasMoveInAnimation = (animation)=>{
+    if (!animation) return false;
+    if (Array.isArray(animation)) return animation.some(hasMoveInAnimation);
+    if ('object' != typeof animation) return false;
+    const animationRecord = animation;
+    return 'moveIn' === animationRecord.type || Object.values(animationRecord).some(hasMoveInAnimation);
+};
+export { createStackCornerRadius, hasMoveInAnimation };
+
+//# sourceMappingURL=stackCornerRadiusUtils.js.map

package/dist/esm/pipeline/spec/chart/pipes/stack/stackCornerRadiusUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pipeline/spec/chart/pipes/stack/stackCornerRadiusUtils.js","sources":["../../../../../../../src/pipeline/spec/chart/pipes/stack/stackCornerRadiusUtils.ts"],"sourcesContent":["import { FoldMeasureId } from 'src/dataReshape/constant'\nimport type { Datum, StackCornerRadius } from 'src/types'\n\nexport type StackCornerRadiusCallback = (_: unknown, datum: Datum) => StackCornerRadius | 0\n\nconst reverseStackCornerRadius = (cornerRadius: StackCornerRadius): StackCornerRadius => {\n  if (!Array.isArray(cornerRadius)) {\n    return cornerRadius\n  }\n\n  const [topLeft = 0, topRight = 0, bottomRight = 0, bottomLeft = 0] = cornerRadius\n\n  return [bottomRight, bottomLeft, topLeft, topRight]\n}\n\nconst mergeStackCornerRadius = (cornerRadius: StackCornerRadius): StackCornerRadius => {\n  if (!Array.isArray(cornerRadius)) {\n    return cornerRadius\n  }\n\n  const [topLeft = 0, topRight = 0, bottomRight = 0, bottomLeft = 0] = cornerRadius\n\n  return [\n    Math.max(topLeft, bottomRight),\n    Math.max(topRight, bottomLeft),\n    Math.max(bottomRight, topLeft),\n    Math.max(bottomLeft, topRight),\n  ]\n}\n\nconst getStackRangeCornerRadius = (\n  cornerRadius: StackCornerRadius,\n  datum: Datum,\n): StackCornerRadius | 0 | undefined => {\n  const stackStart = datum?.['__VCHART_STACK_START']\n  const stackEnd = datum?.['__VCHART_STACK_END']\n\n  if (typeof stackStart !== 'number' || typeof stackEnd !== 'number') {\n    return undefined\n  }\n\n  const hasPositivePart = stackStart > 0 || stackEnd > 0\n  const hasNegativePart = stackStart < 0 || stackEnd < 0\n\n  if (hasPositivePart && hasNegativePart) {\n    return mergeStackCornerRadius(cornerRadius)\n  }\n\n  if (hasPositivePart) {\n    return cornerRadius\n  }\n\n  if (hasNegativePart) {\n    return reverseStackCornerRadius(cornerRadius)\n  }\n\n  return 0\n}\n\nexport const createStackCornerRadius = (cornerRadius: StackCornerRadius): StackCornerRadiusCallback => {\n  return (_: unknown, datum: Datum) => {\n    const stackRangeCornerRadius = getStackRangeCornerRadius(cornerRadius, datum)\n\n    if (stackRangeCornerRadius !== undefined) {\n      return stackRangeCornerRadius\n    }\n\n    const value = datum?.[datum?.[FoldMeasureId]]\n\n    if (value > 0) {\n      return cornerRadius\n    }\n\n    if (value < 0) {\n      return reverseStackCornerRadius(cornerRadius)\n    }\n\n    return 0\n  }\n}\n\nexport const hasMoveInAnimation = (animation: unknown): boolean => {\n  if (!animation) {\n    return false\n  }\n\n  if (Array.isArray(animation)) {\n    return animation.some(hasMoveInAnimation)\n  }\n\n  if (typeof animation !== 'object') {\n    return false\n  }\n\n  const animationRecord = animation as Record<string, unknown>\n\n  return animationRecord.type === 'moveIn' || Object.values(animationRecord).some(hasMoveInAnimation)\n}\n"],"names":["reverseStackCornerRadius","cornerRadius","Array","topLeft","topRight","bottomRight","bottomLeft","mergeStackCornerRadius","Math","getStackRangeCornerRadius","datum","stackStart","stackEnd","hasPositivePart","hasNegativePart","createStackCornerRadius","_","stackRangeCornerRadius","undefined","value","FoldMeasureId","hasMoveInAnimation","animation","animationRecord","Object"],"mappings":";AAKA,MAAMA,2BAA2B,CAACC;IAChC,IAAI,CAACC,MAAM,OAAO,CAACD,eACjB,OAAOA;IAGT,MAAM,CAACE,UAAU,CAAC,EAAEC,WAAW,CAAC,EAAEC,cAAc,CAAC,EAAEC,aAAa,CAAC,CAAC,GAAGL;IAErE,OAAO;QAACI;QAAaC;QAAYH;QAASC;KAAS;AACrD;AAEA,MAAMG,yBAAyB,CAACN;IAC9B,IAAI,CAACC,MAAM,OAAO,CAACD,eACjB,OAAOA;IAGT,MAAM,CAACE,UAAU,CAAC,EAAEC,WAAW,CAAC,EAAEC,cAAc,CAAC,EAAEC,aAAa,CAAC,CAAC,GAAGL;IAErE,OAAO;QACLO,KAAK,GAAG,CAACL,SAASE;QAClBG,KAAK,GAAG,CAACJ,UAAUE;QACnBE,KAAK,GAAG,CAACH,aAAaF;QACtBK,KAAK,GAAG,CAACF,YAAYF;KACtB;AACH;AAEA,MAAMK,4BAA4B,CAChCR,cACAS;IAEA,MAAMC,aAAaD,OAAO,CAAC,uBAAuB;IAClD,MAAME,WAAWF,OAAO,CAAC,qBAAqB;IAE9C,IAAI,AAAsB,YAAtB,OAAOC,cAA2B,AAAoB,YAApB,OAAOC,UAC3C;IAGF,MAAMC,kBAAkBF,aAAa,KAAKC,WAAW;IACrD,MAAME,kBAAkBH,aAAa,KAAKC,WAAW;IAErD,IAAIC,mBAAmBC,iBACrB,OAAOP,uBAAuBN;IAGhC,IAAIY,iBACF,OAAOZ;IAGT,IAAIa,iBACF,OAAOd,yBAAyBC;IAGlC,OAAO;AACT;AAEO,MAAMc,0BAA0B,CAACd,eAC/B,CAACe,GAAYN;QAClB,MAAMO,yBAAyBR,0BAA0BR,cAAcS;QAEvE,IAAIO,AAA2BC,WAA3BD,wBACF,OAAOA;QAGT,MAAME,QAAQT,OAAO,CAACA,OAAO,CAACU,cAAc,CAAC;QAE7C,IAAID,QAAQ,GACV,OAAOlB;QAGT,IAAIkB,QAAQ,GACV,OAAOnB,yBAAyBC;QAGlC,OAAO;IACT;AAGK,MAAMoB,qBAAqB,CAACC;IACjC,IAAI,CAACA,WACH,OAAO;IAGT,IAAIpB,MAAM,OAAO,CAACoB,YAChB,OAAOA,UAAU,IAAI,CAACD;IAGxB,IAAI,AAAqB,YAArB,OAAOC,WACT,OAAO;IAGT,MAAMC,kBAAkBD;IAExB,OAAOC,AAAyB,aAAzBA,gBAAgB,IAAI,IAAiBC,OAAO,MAAM,CAACD,iBAAiB,IAAI,CAACF;AAClF"}