@visactor/vchart 1.1.2 → 1.2.0-beta.2

package/cjs/component/tooltip/processor/dimension-tooltip.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.DimensionTooltipProcessor = void 0;
 
-const base_1 = require("./base"), utils_1 = require("../utils"), vutils_1 = require("@visactor/vutils"), util_1 = require("../../../event/events/dimension/util"), constants_1 = require("../handler/constants");
+const base_1 = require("./base"), utils_1 = require("../utils"), vutils_1 = require("@visactor/vutils"), util_1 = require("../../../event/events/dimension/util"), constants_1 = require("../handler/constants"), vscale_1 = require("@visactor/vscale");
 
 class DimensionTooltipProcessor extends base_1.BaseTooltipProcessor {
     constructor() {
@@ -37,6 +37,7 @@ class DimensionTooltipProcessor extends base_1.BaseTooltipProcessor {
             const dimensionAxisInfo = null !== (_c = targetDimensionInfo.filter((info => {
                 var _a;
                 const axis = info.axis;
+                if (!(0, vscale_1.isDiscrete)(axis.getScale().type)) return !1;
                 let firstSeries;
                 for (const region of null !== (_a = null == axis ? void 0 : axis.getRegions()) && void 0 !== _a ? _a : []) {
                     for (const series of region.getSeries()) if ("cartesian" === series.coordinate) {
@@ -45,7 +46,7 @@ class DimensionTooltipProcessor extends base_1.BaseTooltipProcessor {
                     }
                     if ((0, vutils_1.isValid)(firstSeries)) break;
                 }
-                return (0, vutils_1.isValid)(firstSeries) && firstSeries.getDimensionField() === firstSeries.fieldY ? "left" === axis.orient || "right" === axis.orient : "bottom" === axis.orient || "top" === axis.orient;
+                return (0, vutils_1.isValid)(firstSeries) && firstSeries.getDimensionField()[0] === firstSeries.fieldY[0] ? "left" === axis.orient || "right" === axis.orient : "bottom" === axis.orient || "top" === axis.orient;
             }))[0]) && void 0 !== _c ? _c : targetDimensionInfo[0];
             targetDimensionInfo = [ dimensionAxisInfo ];
         }

package/cjs/component/tooltip/processor/dimension-tooltip.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/processor/dimension-tooltip.ts"],"names":[],"mappings":"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","file":"dimension-tooltip.js","sourcesContent":["import type { BaseEventParams } from '../../../event/interface';\nimport type { TooltipActiveType } from '../../../typings';\nimport type { TooltipHandlerParams } from '../interface';\nimport type { DimensionTooltipInfo, MouseEventData } from './interface';\nimport { BaseTooltipProcessor } from './base';\nimport { isEmptyPos } from '../utils';\nimport { isNil, isValid } from '@visactor/vutils';\nimport type { ICartesianSeries, ISeries } from '../../../series/interface';\nimport { getCartesianDimensionInfo, getPolarDimensionInfo } from '../../../event/events/dimension/util';\nimport type { IDimensionInfo } from '../../../event/events/dimension/interface';\nimport { TooltipHandlerType } from '../handler/constants';\n\nexport class DimensionTooltipProcessor extends BaseTooltipProcessor {\n  activeType: TooltipActiveType = 'dimension';\n\n  /** 触发对应类型的 tooltip */\n  showTooltip(info: DimensionTooltipInfo, params: BaseEventParams, changePositionOnly: boolean) {\n    const newParams: TooltipHandlerParams = {\n      ...params,\n      dimensionInfo: this._preprocessDimensionInfo(info),\n      changePositionOnly\n    };\n    return this._showTooltipByHandler(info, newParams);\n  }\n\n  /** 判断是否应该触发 tooltip */\n  shouldHandleTooltip(params: BaseEventParams, mouseEventData: Partial<MouseEventData>): boolean {\n    const { tooltipInfo: info } = mouseEventData;\n    if (isNil(info)) {\n      return false;\n    }\n\n    // 自定义 handler\n    if (![TooltipHandlerType.dom, TooltipHandlerType.canvas].includes((this.component.tooltipHandler as any).type)) {\n      return true;\n    }\n\n    const helper = (params.model as ISeries)?.tooltipHelper;\n    if (isEmptyPos(params) || isNil(helper)) {\n      return true;\n    }\n\n    if (!helper.activeType.includes('dimension')) {\n      return false;\n    }\n    return true;\n  }\n\n  /** 获取触发 tooltip 需要的信息 */\n  getMouseEventData(params: BaseEventParams): MouseEventData {\n    let targetDimensionInfo: DimensionTooltipInfo | undefined;\n    let ignore: boolean | undefined;\n\n    // 处理dimension info\n    const x = (params.event as any).viewX;\n    const y = (params.event as any).viewY;\n    const chart = this.component.getChart();\n    const pos = { x, y };\n    targetDimensionInfo = [\n      ...(getCartesianDimensionInfo(chart, pos) ?? []),\n      ...(getPolarDimensionInfo(chart, pos) ?? [])\n    ];\n    if (targetDimensionInfo.length === 0) {\n      targetDimensionInfo = undefined;\n    } else if (targetDimensionInfo.length > 1) {\n      // 只保留一个轴的dimension info\n      const dimensionAxisInfo =\n        targetDimensionInfo.filter(info => {\n          const axis = info.axis;\n          let firstSeries: ICartesianSeries | undefined;\n          for (const region of axis?.getRegions() ?? []) {\n            for (const series of region.getSeries()) {\n              if (series.coordinate === 'cartesian') {\n                firstSeries = series as ICartesianSeries;\n                break;\n              }\n            }\n            if (isValid(firstSeries)) {\n              break;\n            }\n          }\n          if (isValid(firstSeries) && firstSeries.getDimensionField() === firstSeries.fieldY) {\n            return axis.orient === 'left' || axis.orient === 'right'; // 维度轴为Y轴时，选择只显示Y轴tooltip\n          }\n          return axis.orient === 'bottom' || axis.orient === 'top'; // 维度轴为X轴时，选择只显示X轴tooltip\n        })[0] ?? targetDimensionInfo[0];\n      targetDimensionInfo = [dimensionAxisInfo];\n    }\n    // 排除被声明要忽略的项\n    if (\n      [...((this.component.getOption() as any).getAllSeries() ?? [])].some(model => {\n        const ignoreTriggers = model.tooltipHelper?.ignoreTriggerSet.dimension;\n        return (params.model && ignoreTriggers?.has(params.model)) || (params.mark && ignoreTriggers?.has(params.mark));\n      })\n    ) {\n      ignore = true;\n    }\n\n    return {\n      tooltipInfo: targetDimensionInfo,\n      ignore\n    };\n  }\n\n  private _preprocessDimensionInfo(dimensionInfo?: DimensionTooltipInfo): DimensionTooltipInfo | undefined {\n    const newDimensionInfo: DimensionTooltipInfo = [];\n    dimensionInfo?.forEach(info => {\n      const di: IDimensionInfo = {\n        ...info,\n        data: info.data.filter(\n          ({ series }: any) => series.getSpec()?.tooltip?.visible !== false // 过滤掉不需要显示的维度数据\n        )\n      };\n      if (di.data.length > 0) {\n        newDimensionInfo.push(di);\n      }\n    });\n    if (newDimensionInfo.length > 0) {\n      return newDimensionInfo;\n    }\n    return undefined;\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/processor/dimension-tooltip.ts"],"names":[],"mappings":"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","file":"dimension-tooltip.js","sourcesContent":["import type { BaseEventParams } from '../../../event/interface';\nimport type { TooltipActiveType } from '../../../typings';\nimport type { TooltipHandlerParams } from '../interface';\nimport type { DimensionTooltipInfo, MouseEventData } from './interface';\nimport { BaseTooltipProcessor } from './base';\nimport { isEmptyPos } from '../utils';\nimport { isNil, isValid } from '@visactor/vutils';\nimport type { ICartesianSeries, ISeries } from '../../../series/interface';\nimport { getCartesianDimensionInfo, getPolarDimensionInfo } from '../../../event/events/dimension/util';\nimport type { IDimensionInfo } from '../../../event/events/dimension/interface';\nimport { TooltipHandlerType } from '../handler/constants';\nimport { isDiscrete } from '@visactor/vscale';\n\nexport class DimensionTooltipProcessor extends BaseTooltipProcessor {\n  activeType: TooltipActiveType = 'dimension';\n\n  /** 触发对应类型的 tooltip */\n  showTooltip(info: DimensionTooltipInfo, params: BaseEventParams, changePositionOnly: boolean) {\n    const newParams: TooltipHandlerParams = {\n      ...params,\n      dimensionInfo: this._preprocessDimensionInfo(info),\n      changePositionOnly\n    };\n    return this._showTooltipByHandler(info, newParams);\n  }\n\n  /** 判断是否应该触发 tooltip */\n  shouldHandleTooltip(params: BaseEventParams, mouseEventData: Partial<MouseEventData>): boolean {\n    const { tooltipInfo: info } = mouseEventData;\n    if (isNil(info)) {\n      return false;\n    }\n\n    // 自定义 handler\n    if (![TooltipHandlerType.dom, TooltipHandlerType.canvas].includes((this.component.tooltipHandler as any).type)) {\n      return true;\n    }\n\n    const helper = (params.model as ISeries)?.tooltipHelper;\n    if (isEmptyPos(params) || isNil(helper)) {\n      return true;\n    }\n\n    if (!helper.activeType.includes('dimension')) {\n      return false;\n    }\n    return true;\n  }\n\n  /** 获取触发 tooltip 需要的信息 */\n  getMouseEventData(params: BaseEventParams): MouseEventData {\n    let targetDimensionInfo: DimensionTooltipInfo | undefined;\n    let ignore: boolean | undefined;\n\n    // 处理dimension info\n    const x = (params.event as any).viewX;\n    const y = (params.event as any).viewY;\n    const chart = this.component.getChart();\n    const pos = { x, y };\n    targetDimensionInfo = [\n      ...(getCartesianDimensionInfo(chart, pos) ?? []),\n      ...(getPolarDimensionInfo(chart, pos) ?? [])\n    ];\n    if (targetDimensionInfo.length === 0) {\n      targetDimensionInfo = undefined;\n    } else if (targetDimensionInfo.length > 1) {\n      // 只保留一个轴的dimension info\n      const dimensionAxisInfo =\n        targetDimensionInfo.filter(info => {\n          const axis = info.axis;\n          // 优先显示离散轴 tooltip\n          if (!isDiscrete(axis.getScale().type)) {\n            return false;\n          }\n          // 下面的逻辑用来判断当前的离散轴是不是维度轴\n          let firstSeries: ICartesianSeries | undefined;\n          for (const region of axis?.getRegions() ?? []) {\n            for (const series of region.getSeries()) {\n              if (series.coordinate === 'cartesian') {\n                firstSeries = series as ICartesianSeries;\n                break;\n              }\n            }\n            if (isValid(firstSeries)) {\n              break;\n            }\n          }\n          if (isValid(firstSeries) && firstSeries.getDimensionField()[0] === firstSeries.fieldY[0]) {\n            return axis.orient === 'left' || axis.orient === 'right'; // 维度轴为Y轴时，选择只显示Y轴tooltip\n          }\n          return axis.orient === 'bottom' || axis.orient === 'top'; // 维度轴为X轴时，选择只显示X轴tooltip\n        })[0] ?? targetDimensionInfo[0];\n      targetDimensionInfo = [dimensionAxisInfo];\n    }\n    // 排除被声明要忽略的项\n    if (\n      [...((this.component.getOption() as any).getAllSeries() ?? [])].some(model => {\n        const ignoreTriggers = model.tooltipHelper?.ignoreTriggerSet.dimension;\n        return (params.model && ignoreTriggers?.has(params.model)) || (params.mark && ignoreTriggers?.has(params.mark));\n      })\n    ) {\n      ignore = true;\n    }\n\n    return {\n      tooltipInfo: targetDimensionInfo,\n      ignore\n    };\n  }\n\n  private _preprocessDimensionInfo(dimensionInfo?: DimensionTooltipInfo): DimensionTooltipInfo | undefined {\n    const newDimensionInfo: DimensionTooltipInfo = [];\n    dimensionInfo?.forEach(info => {\n      const di: IDimensionInfo = {\n        ...info,\n        data: info.data.filter(\n          ({ series }: any) => series.getSpec()?.tooltip?.visible !== false // 过滤掉不需要显示的维度数据\n        )\n      };\n      if (di.data.length > 0) {\n        newDimensionInfo.push(di);\n      }\n    });\n    if (newDimensionInfo.length > 0) {\n      return newDimensionInfo;\n    }\n    return undefined;\n  }\n}\n"]}

package/cjs/constant/event.d.ts

@@ -3,6 +3,8 @@ export declare const BASE_EVENTS: string[];
 export declare enum ChartEvent {
     initialized = "initialized",
     rendered = "rendered",
+    renderFinished = "renderFinished",
+    animationFinished = "animationFinished",
     regionSeriesDataFilterOver = "regionSeriesDataFilterOver",
     afterInitData = "afterInitData",
     afterInitEvent = "afterInitEvent",

package/cjs/constant/event.js

@@ -13,7 +13,8 @@ Object.defineProperty(exports, "VGRAMMAR_HOOK_EVENT", {
     }
 }), exports.BASE_EVENTS = [ "pointerdown", "pointerup", "pointerupoutside", "pointertap", "pointerover", "pointermove", "pointerenter", "pointerleave", "pointerout", "mousedown", "mouseup", "mouseupoutside", "rightdown", "rightup", "rightupoutside", "click", "dblclick", "mousemove", "mouseover", "mouseout", "mouseenter", "mouseleave", "wheel", "touchstart", "touchend", "touchendoutside", "touchmove", "touchcancel", "tap", "dragstart", "drag", "dragenter", "dragleave", "dragover", "dragend", "drop", "pan", "panstart", "panend", "press", "pressup", "pressend", "pinch", "pinchstart", "pinchend", "swipe" ], 
 function(ChartEvent) {
-    ChartEvent.initialized = "initialized", ChartEvent.rendered = "rendered", ChartEvent.regionSeriesDataFilterOver = "regionSeriesDataFilterOver", 
+    ChartEvent.initialized = "initialized", ChartEvent.rendered = "rendered", ChartEvent.renderFinished = "renderFinished", 
+    ChartEvent.animationFinished = "animationFinished", ChartEvent.regionSeriesDataFilterOver = "regionSeriesDataFilterOver", 
     ChartEvent.afterInitData = "afterInitData", ChartEvent.afterInitEvent = "afterInitEvent", 
     ChartEvent.afterInitMark = "afterInitMark", ChartEvent.rawDataUpdate = "rawDataUpdate", 
     ChartEvent.rawDataStatisticsUpdate = "rawDataStatisticsUpdate", ChartEvent.viewDataFilterOver = "viewDataFilterOver", 

package/cjs/constant/event.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/constant/event.ts"],"names":[],"mappings":";;;AAAA,+CAAuE;AAA9D,+GAAA,UAAU,OAAuB;AAE7B,QAAA,WAAW,GAAG;IACzB,aAAa;IACb,WAAW;IACX,kBAAkB;IAClB,YAAY;IACZ,aAAa;IACb,aAAa;IACb,cAAc;IACd,cAAc;IACd,YAAY;IACZ,WAAW;IACX,SAAS;IACT,gBAAgB;IAChB,WAAW;IACX,SAAS;IACT,gBAAgB;IAChB,OAAO;IACP,UAAU;IACV,WAAW;IACX,WAAW;IACX,UAAU;IACV,YAAY;IACZ,YAAY;IACZ,OAAO;IACP,YAAY;IACZ,UAAU;IACV,iBAAiB;IACjB,WAAW;IACX,aAAa;IACb,KAAK;IACL,WAAW;IACX,MAAM;IACN,WAAW;IACX,WAAW;IACX,UAAU;IACV,SAAS;IACT,MAAM;IAEN,KAAK;IACL,UAAU;IACV,QAAQ;IACR,OAAO;IACP,SAAS;IACT,UAAU;IACV,OAAO;IACP,YAAY;IACZ,UAAU;IACV,OAAO;CACR,CAAC;AAEF,IAAY,UAkDX;AAlDD,WAAY,UAAU;IACpB,yCAA2B,CAAA;IAC3B,mCAAqB,CAAA;IAErB,uEAAyD,CAAA;IAGzD,6CAA+B,CAAA;IAC/B,+CAAiC,CAAA;IACjC,6CAA+B,CAAA;IAE/B,6CAA+B,CAAA;IAC/B,iEAAmD,CAAA;IACnD,uDAAyC,CAAA;IACzC,+CAAiC,CAAA;IACjC,mEAAqD,CAAA;IAErD,mDAAqC,CAAA;IAErC,yDAA2C,CAAA;IAG3C,qDAAuC,CAAA;IACvC,yCAA2B,CAAA;IAE3B,+CAAiC,CAAA;IAEjC,6BAAe,CAAA;IACf,yCAA2B,CAAA;IAC3B,qCAAuB,CAAA;IAGvB,uCAAyB,CAAA;IACzB,yCAA2B,CAAA;IAC3B,qCAAuB,CAAA;IACvB,2CAA6B,CAAA;IAC7B,6CAA+B,CAAA;IAC/B,+CAAiC,CAAA;IAEjC,iDAAmC,CAAA;IAEnC,uCAAyB,CAAA;IACzB,yCAA2B,CAAA;IAC3B,mCAAqB,CAAA;IAErB,mEAAqD,CAAA;IACrD,2CAA6B,CAAA;IAC7B,iDAAmC,CAAA;IACnC,iDAAmC,CAAA;IACnC,qDAAuC,CAAA;AACzC,CAAC,EAlDW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAkDrB;AAED,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,oCAAe,CAAA;IACf,sCAAiB,CAAA;AACnB,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AAED,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,uCAAiB,CAAA;IACjB,qCAAe,CAAA;IACf,qCAAe,CAAA;IACf,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAK7B","file":"event.js","sourcesContent":["export { HOOK_EVENT as VGRAMMAR_HOOK_EVENT } from '@visactor/vgrammar';\n\nexport const BASE_EVENTS = [\n  'pointerdown',\n  'pointerup',\n  'pointerupoutside',\n  'pointertap', // pointerEvent 下的 click 事件\n  'pointerover',\n  'pointermove',\n  'pointerenter',\n  'pointerleave',\n  'pointerout',\n  'mousedown',\n  'mouseup',\n  'mouseupoutside',\n  'rightdown',\n  'rightup',\n  'rightupoutside',\n  'click',\n  'dblclick',\n  'mousemove',\n  'mouseover',\n  'mouseout',\n  'mouseenter',\n  'mouseleave',\n  'wheel',\n  'touchstart',\n  'touchend',\n  'touchendoutside',\n  'touchmove',\n  'touchcancel',\n  'tap',\n  'dragstart',\n  'drag',\n  'dragenter',\n  'dragleave',\n  'dragover',\n  'dragend',\n  'drop',\n  // 手势事件\n  'pan',\n  'panstart',\n  'panend',\n  'press',\n  'pressup',\n  'pressend',\n  'pinch',\n  'pinchstart',\n  'pinchend',\n  'swipe'\n];\n\nexport enum ChartEvent {\n  initialized = 'initialized',\n  rendered = 'rendered',\n  // region\n  regionSeriesDataFilterOver = 'regionSeriesDataFilterOver',\n  // series start\n  // series.liftCircle\n  afterInitData = 'afterInitData',\n  afterInitEvent = 'afterInitEvent',\n  afterInitMark = 'afterInitMark',\n  // series.data\n  rawDataUpdate = 'rawDataUpdate',\n  rawDataStatisticsUpdate = 'rawDataStatisticsUpdate',\n  viewDataFilterOver = 'viewDataFilterOver',\n  viewDataUpdate = 'viewDataUpdate',\n  viewDataStatisticsUpdate = 'viewDataStatisticsUpdate',\n  // dot series\n  markDeltaYUpdate = 'markDeltaYUpdate',\n  // pie series\n  viewDataLabelUpdate = 'viewDataLabelUpdate',\n  /** series end */\n  // scale\n  scaleDomainUpdate = 'scaleDomainUpdate',\n  scaleUpdate = 'scaleUpdate',\n  // datazoom\n  dataZoomChange = 'dataZoomChange',\n  // Hierarchy\n  drill = 'drill',\n  layoutStart = 'layoutStart',\n  layoutEnd = 'layoutEnd',\n\n  // player\n  playerPlay = 'playerPlay',\n  playerPause = 'playerPause',\n  playerEnd = 'playerEnd',\n  playerChange = 'playerChange',\n  playerForward = 'playerForward',\n  playerBackward = 'playerBackward',\n  // scrollBar\n  scrollBarChange = 'scrollBarChange',\n  // brush\n  brushStart = 'brushStart',\n  brushChange = 'brushChange',\n  brushEnd = 'brushEnd',\n  // legend\n  legendSelectedDataChange = 'legendSelectedDataChange',\n  legendFilter = 'legendFilter',\n  legendItemClick = 'legendItemClick',\n  legendItemHover = 'legendItemHover',\n  legendItemUnHover = 'legendItemUnHover'\n}\n\nexport enum Event_Source_Type {\n  chart = 'chart',\n  window = 'window'\n}\n\nexport enum Event_Bubble_Level {\n  vchart = 'vchart',\n  chart = 'chart',\n  model = 'model',\n  mark = 'mark'\n}\n"]}
+{"version":3,"sources":["../src/constant/event.ts"],"names":[],"mappings":";;;AAAA,+CAAuE;AAA9D,+GAAA,UAAU,OAAuB;AAE7B,QAAA,WAAW,GAAG;IACzB,aAAa;IACb,WAAW;IACX,kBAAkB;IAClB,YAAY;IACZ,aAAa;IACb,aAAa;IACb,cAAc;IACd,cAAc;IACd,YAAY;IACZ,WAAW;IACX,SAAS;IACT,gBAAgB;IAChB,WAAW;IACX,SAAS;IACT,gBAAgB;IAChB,OAAO;IACP,UAAU;IACV,WAAW;IACX,WAAW;IACX,UAAU;IACV,YAAY;IACZ,YAAY;IACZ,OAAO;IACP,YAAY;IACZ,UAAU;IACV,iBAAiB;IACjB,WAAW;IACX,aAAa;IACb,KAAK;IACL,WAAW;IACX,MAAM;IACN,WAAW;IACX,WAAW;IACX,UAAU;IACV,SAAS;IACT,MAAM;IAEN,KAAK;IACL,UAAU;IACV,QAAQ;IACR,OAAO;IACP,SAAS;IACT,UAAU;IACV,OAAO;IACP,YAAY;IACZ,UAAU;IACV,OAAO;CACR,CAAC;AAEF,IAAY,UAoDX;AApDD,WAAY,UAAU;IACpB,yCAA2B,CAAA;IAC3B,mCAAqB,CAAA;IACrB,+CAAiC,CAAA;IACjC,qDAAuC,CAAA;IAEvC,uEAAyD,CAAA;IAGzD,6CAA+B,CAAA;IAC/B,+CAAiC,CAAA;IACjC,6CAA+B,CAAA;IAE/B,6CAA+B,CAAA;IAC/B,iEAAmD,CAAA;IACnD,uDAAyC,CAAA;IACzC,+CAAiC,CAAA;IACjC,mEAAqD,CAAA;IAErD,mDAAqC,CAAA;IAErC,yDAA2C,CAAA;IAG3C,qDAAuC,CAAA;IACvC,yCAA2B,CAAA;IAE3B,+CAAiC,CAAA;IAEjC,6BAAe,CAAA;IACf,yCAA2B,CAAA;IAC3B,qCAAuB,CAAA;IAGvB,uCAAyB,CAAA;IACzB,yCAA2B,CAAA;IAC3B,qCAAuB,CAAA;IACvB,2CAA6B,CAAA;IAC7B,6CAA+B,CAAA;IAC/B,+CAAiC,CAAA;IAEjC,iDAAmC,CAAA;IAEnC,uCAAyB,CAAA;IACzB,yCAA2B,CAAA;IAC3B,mCAAqB,CAAA;IAErB,mEAAqD,CAAA;IACrD,2CAA6B,CAAA;IAC7B,iDAAmC,CAAA;IACnC,iDAAmC,CAAA;IACnC,qDAAuC,CAAA;AACzC,CAAC,EApDW,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAoDrB;AAED,IAAY,iBAGX;AAHD,WAAY,iBAAiB;IAC3B,oCAAe,CAAA;IACf,sCAAiB,CAAA;AACnB,CAAC,EAHW,iBAAiB,GAAjB,yBAAiB,KAAjB,yBAAiB,QAG5B;AAED,IAAY,kBAKX;AALD,WAAY,kBAAkB;IAC5B,uCAAiB,CAAA;IACjB,qCAAe,CAAA;IACf,qCAAe,CAAA;IACf,mCAAa,CAAA;AACf,CAAC,EALW,kBAAkB,GAAlB,0BAAkB,KAAlB,0BAAkB,QAK7B","file":"event.js","sourcesContent":["export { HOOK_EVENT as VGRAMMAR_HOOK_EVENT } from '@visactor/vgrammar';\n\nexport const BASE_EVENTS = [\n  'pointerdown',\n  'pointerup',\n  'pointerupoutside',\n  'pointertap', // pointerEvent 下的 click 事件\n  'pointerover',\n  'pointermove',\n  'pointerenter',\n  'pointerleave',\n  'pointerout',\n  'mousedown',\n  'mouseup',\n  'mouseupoutside',\n  'rightdown',\n  'rightup',\n  'rightupoutside',\n  'click',\n  'dblclick',\n  'mousemove',\n  'mouseover',\n  'mouseout',\n  'mouseenter',\n  'mouseleave',\n  'wheel',\n  'touchstart',\n  'touchend',\n  'touchendoutside',\n  'touchmove',\n  'touchcancel',\n  'tap',\n  'dragstart',\n  'drag',\n  'dragenter',\n  'dragleave',\n  'dragover',\n  'dragend',\n  'drop',\n  // 手势事件\n  'pan',\n  'panstart',\n  'panend',\n  'press',\n  'pressup',\n  'pressend',\n  'pinch',\n  'pinchstart',\n  'pinchend',\n  'swipe'\n];\n\nexport enum ChartEvent {\n  initialized = 'initialized', // 图表实例初始化完成\n  rendered = 'rendered', // 图表渲染方法被调用时触发，表明图表已经执行过渲染逻辑，只会触发一次\n  renderFinished = 'renderFinished', // 每次画布渲染完成触发的事件，不包含动画结束\n  animationFinished = 'animationFinished', // 图表动画结束时触发的事件\n  // region\n  regionSeriesDataFilterOver = 'regionSeriesDataFilterOver',\n  // series start\n  // series.liftCircle\n  afterInitData = 'afterInitData',\n  afterInitEvent = 'afterInitEvent',\n  afterInitMark = 'afterInitMark',\n  // series.data\n  rawDataUpdate = 'rawDataUpdate',\n  rawDataStatisticsUpdate = 'rawDataStatisticsUpdate',\n  viewDataFilterOver = 'viewDataFilterOver',\n  viewDataUpdate = 'viewDataUpdate',\n  viewDataStatisticsUpdate = 'viewDataStatisticsUpdate',\n  // dot series\n  markDeltaYUpdate = 'markDeltaYUpdate',\n  // pie series\n  viewDataLabelUpdate = 'viewDataLabelUpdate',\n  /** series end */\n  // scale\n  scaleDomainUpdate = 'scaleDomainUpdate',\n  scaleUpdate = 'scaleUpdate',\n  // datazoom\n  dataZoomChange = 'dataZoomChange',\n  // Hierarchy\n  drill = 'drill',\n  layoutStart = 'layoutStart',\n  layoutEnd = 'layoutEnd',\n\n  // player\n  playerPlay = 'playerPlay',\n  playerPause = 'playerPause',\n  playerEnd = 'playerEnd',\n  playerChange = 'playerChange',\n  playerForward = 'playerForward',\n  playerBackward = 'playerBackward',\n  // scrollBar\n  scrollBarChange = 'scrollBarChange',\n  // brush\n  brushStart = 'brushStart',\n  brushChange = 'brushChange',\n  brushEnd = 'brushEnd',\n  // legend\n  legendSelectedDataChange = 'legendSelectedDataChange',\n  legendFilter = 'legendFilter',\n  legendItemClick = 'legendItemClick',\n  legendItemHover = 'legendItemHover',\n  legendItemUnHover = 'legendItemUnHover'\n}\n\nexport enum Event_Source_Type {\n  chart = 'chart',\n  window = 'window'\n}\n\nexport enum Event_Bubble_Level {\n  vchart = 'vchart',\n  chart = 'chart',\n  model = 'model',\n  mark = 'mark'\n}\n"]}

package/cjs/core/index.d.ts

@@ -1,7 +1,7 @@
 import { VChart } from './vchart';
 import { Factory } from './factory';
 export { VChart, Factory };
-export declare const version = "1.1.2";
+export declare const version = "1.2.0-beta.2";
 export type { IVChart } from './interface';
 export * from '../event/interface';
 export * from '../typings/spec/common';

package/cjs/core/index.js

@@ -41,7 +41,7 @@ const region_1 = require("../region/region"), base_layout_1 = require("../layout
 
 vchart_1.VChart.useMark([ component_1.ComponentMark, group_1.GroupMark, image_1.ImageMark ]), 
 factory_1.Factory.registerRegion("region", region_1.Region), factory_1.Factory.registerLayout("base", base_layout_1.Layout), 
-exports.version = "1.1.2", __exportStar(require("../event/interface"), exports), 
+exports.version = "1.2.0-beta.2", __exportStar(require("../event/interface"), exports), 
 __exportStar(require("../typings/spec/common"), exports), __exportStar(require("../theme/interface"), exports), 
 vutils_1.Logger.getInstance(vutils_1.LoggerLevel.Error);
 //# sourceMappingURL=index.js.map

package/cjs/core/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAAuD;AAKvD,qCAAkC;AAiBzB,uFAjBA,eAAM,OAiBA;AAhBf,uCAAoC;AAgBnB,wFAhBR,iBAAO,OAgBQ;AAfxB,6CAA0C;AAC1C,uDAA+C;AAC/C,yCAA0C;AAC1C,iDAAkD;AAClD,2CAA4C;AAG5C,eAAM,CAAC,OAAO,CAAC,CAAC,yBAAa,EAAE,iBAAS,EAAE,iBAAS,CAAC,CAAC,CAAC;AAGtD,iBAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,eAAa,CAAC,CAAC;AAGhD,iBAAO,CAAC,cAAc,CAAC,MAAM,EAAE,oBAAa,CAAC,CAAC;AAKjC,QAAA,OAAO,GAAG,OAAO,CAAC;AAK/B,qDAAmC;AACnC,yDAAuC;AAEvC,qDAAmC;AAGnC,eAAM,CAAC,WAAW,CAAC,oBAAW,CAAC,KAAK,CAAC,CAAC","file":"index.js","sourcesContent":["import { Logger, LoggerLevel } from '@visactor/vutils';\n/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\nimport { Region } from '../region/region';\nimport { Layout } from '../layout/base-layout';\nimport { GroupMark } from '../mark/group';\nimport { ComponentMark } from '../mark/component';\nimport { ImageMark } from './../mark/image';\n\n// register groupMark and componentMark\nVChart.useMark([ComponentMark, GroupMark, ImageMark]);\n\n// install region module\nFactory.registerRegion('region', Region as any);\n\n// install layout module\nFactory.registerLayout('base', Layout as any);\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.1.2\";\n\n// export necessary types\nexport type { IVChart } from './interface';\n// the event types\nexport * from '../event/interface';\nexport * from '../typings/spec/common';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\nexport * from '../theme/interface';\n\n// set default logger level to Level.error\nLogger.getInstance(LoggerLevel.Error);\n"]}
+{"version":3,"sources":["../src/core/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,6CAAuD;AAKvD,qCAAkC;AAiBzB,uFAjBA,eAAM,OAiBA;AAhBf,uCAAoC;AAgBnB,wFAhBR,iBAAO,OAgBQ;AAfxB,6CAA0C;AAC1C,uDAA+C;AAC/C,yCAA0C;AAC1C,iDAAkD;AAClD,2CAA4C;AAG5C,eAAM,CAAC,OAAO,CAAC,CAAC,yBAAa,EAAE,iBAAS,EAAE,iBAAS,CAAC,CAAC,CAAC;AAGtD,iBAAO,CAAC,cAAc,CAAC,QAAQ,EAAE,eAAa,CAAC,CAAC;AAGhD,iBAAO,CAAC,cAAc,CAAC,MAAM,EAAE,oBAAa,CAAC,CAAC;AAKjC,QAAA,OAAO,GAAG,cAAc,CAAC;AAKtC,qDAAmC;AACnC,yDAAuC;AAEvC,qDAAmC;AAGnC,eAAM,CAAC,WAAW,CAAC,oBAAW,CAAC,KAAK,CAAC,CAAC","file":"index.js","sourcesContent":["import { Logger, LoggerLevel } from '@visactor/vutils';\n/**\n * @description The core module of VChart, containing the necessary interfaces for using VChart.\n */\n\nimport { VChart } from './vchart';\nimport { Factory } from './factory';\nimport { Region } from '../region/region';\nimport { Layout } from '../layout/base-layout';\nimport { GroupMark } from '../mark/group';\nimport { ComponentMark } from '../mark/component';\nimport { ImageMark } from './../mark/image';\n\n// register groupMark and componentMark\nVChart.useMark([ComponentMark, GroupMark, ImageMark]);\n\n// install region module\nFactory.registerRegion('region', Region as any);\n\n// install layout module\nFactory.registerLayout('base', Layout as any);\n\nexport { VChart, Factory };\n\n// export the version\nexport const version = \"1.2.0-beta.2\";\n\n// export necessary types\nexport type { IVChart } from './interface';\n// the event types\nexport * from '../event/interface';\nexport * from '../typings/spec/common';\nexport type { IStateSpec, StateValueType } from '../compile/mark';\nexport * from '../theme/interface';\n\n// set default logger level to Level.error\nLogger.getInstance(LoggerLevel.Error);\n"]}

package/cjs/core/vchart.d.ts

@@ -55,17 +55,21 @@ export declare class VChart implements IVChart {
     private _observer;
     private _currentThemeName;
     private _currentTheme;
+    private _onError?;
     private _context;
     constructor(spec: ISpec, options: IInitOption);
     private _setSpec;
     private _initData;
     private _initChart;
     private _releaseData;
+    private _bindVGrammarViewEvent;
     private _bindResizeEvent;
     private _unBindResizeEvent;
     private _onResize;
     private _initDataSet;
     updateCustomConfigAndRerender(modifyConfig: () => IUpdateSpecResult | undefined, morphConfig?: IMorphConfig): Promise<IVChart>;
+    updateCustomConfigAndRerenderSync(modifyConfig: () => IUpdateSpecResult | undefined, morphConfig?: IMorphConfig): IVChart;
+    protected _reCompile(updateResult: IUpdateSpecResult): void;
     renderSync(morphConfig?: IMorphConfig): IVChart;
     renderAsync(morphConfig?: IMorphConfig): Promise<IVChart>;
     release(): void;
@@ -77,6 +81,7 @@ export declare class VChart implements IVChart {
     }[]): Promise<IVChart>;
     updateDataSync(id: StringOrNumber, data: DataView | Datum[], options?: IParserOptions): IVChart;
     updateSpec(spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig): Promise<IVChart>;
+    updateSpecSync(spec: ISpec, forceMerge?: boolean, morphConfig?: IMorphConfig): IVChart;
     resize(width: number, height: number): Promise<IVChart>;
     updateViewBox(viewBox: IBoundsLike, reRender?: boolean): IVChart;
     on(eType: EventType, handler: EventCallback<EventParams>): void;
@@ -89,6 +94,7 @@ export declare class VChart implements IVChart {
     getCurrentTheme(): ITheme;
     getCurrentThemeName(): string;
     setCurrentTheme(name: string): Promise<IVChart>;
+    setCurrentThemeSync(name: string): IVChart;
     private _getTooltipComponent;
     setTooltipHandler(tooltipHandler: ITooltipHandler): void;
     getTooltipHandlerByUser(): ITooltipHandler | undefined;

package/cjs/core/vchart.js

@@ -87,7 +87,10 @@ class VChart {
         var _a, _b, _c, _d;
         this.id = (0, util_1.createID)(), this._autoSize = !0, this._option = {
             mode: common_1.RenderModeEnum["desktop-browser"],
-            animation: !0
+            animation: !0,
+            onError: msg => {
+                throw new Error(msg);
+            }
         }, this._curSize = {
             width: 0,
             height: 0
@@ -99,12 +102,14 @@ class VChart {
                 width: width,
                 height: height
             });
-        }), 100), this._option = (0, util_1.merge)(this._option, options);
+        }), 100), this._option = (0, util_1.merge)(this._option, options), this._onError = this._option.onError;
         const _e = this._option, {dom: dom, renderCanvas: renderCanvas, mode: mode, stage: stage, poptip: poptip} = _e, restOptions = __rest(_e, [ "dom", "renderCanvas", "mode", "stage", "poptip" ]);
-        dom && (this._container = (0, util_1.isString)(dom) ? null === document || void 0 === document ? void 0 : document.getElementById(dom) : dom), 
-        renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" === mode || this._container || this._canvas || this._stage ? (this._viewBox = this._option.viewBox, 
-        this._currentThemeName = theme_manager_1.ThemeManager.getCurrentThemeName(), this._setSpec(spec), 
-        this._updateCurrentTheme(), this._compiler = new compiler_1.Compiler({
+        if (dom && (this._container = (0, util_1.isString)(dom) ? null === document || void 0 === document ? void 0 : document.getElementById(dom) : dom), 
+        renderCanvas && (this._canvas = renderCanvas), stage && (this._stage = stage), "node" !== mode && !this._container && !this._canvas && !this._stage) return void this._option.onError("please specify container or renderCanvas!");
+        this._viewBox = this._option.viewBox, this._currentThemeName = theme_manager_1.ThemeManager.getCurrentThemeName(), 
+        this._setSpec(spec), this._updateCurrentTheme();
+        const specBackground = "string" == typeof spec.background ? spec.background : null;
+        this._compiler = new compiler_1.Compiler({
             dom: null !== (_a = this._container) && void 0 !== _a ? _a : "none",
             canvas: renderCanvas
         }, Object.assign(Object.assign({
@@ -112,7 +117,8 @@ class VChart {
             stage: stage,
             pluginList: !1 !== poptip ? [ "poptipForText" ] : []
         }, restOptions), {
-            background: spec.background || this._currentTheme.background || this._option.background
+            background: specBackground || this._currentTheme.background || this._option.background,
+            onError: this._onError
         })), this._eventDispatcher = new event_dispatcher_1.EventDispatcher(this, this._compiler), 
         this._event = new event_1.Event(this._eventDispatcher, mode), this._compiler.initView(), 
         null === (_b = this.getStage()) || void 0 === _b || _b.setTheme({
@@ -123,8 +129,8 @@ class VChart {
         this._curSize = {
             width: spec.width || 0,
             height: spec.height || 0
-        }, this._bindResizeEvent(), this._event.emit(constant_1.ChartEvent.initialized, {}), 
-        instance_manager_1.InstanceManager.registerInstance(this)) : (0, util_1.error)("please specify container or renderCanvas!");
+        }, this._bindResizeEvent(), this._bindVGrammarViewEvent(), this._event.emit(constant_1.ChartEvent.initialized, {}), 
+        instance_manager_1.InstanceManager.registerInstance(this);
     }
     _setSpec(spec) {
         spec && (this._spec = (0, util_1.specTransform)((0, util_1.isString)(spec) ? JSON.parse(spec) : spec));
@@ -134,12 +140,14 @@ class VChart {
         const specData = (0, util_1.array)(this._spec.data), dataViewArr = [];
         for (let i = 0; i < specData.length; i++) {
             const curSpecData = specData[i];
-            dataViewArr.push((0, initialize_1.dataToDataView)(curSpecData, this._dataSet, dataViewArr));
+            dataViewArr.push((0, initialize_1.dataToDataView)(curSpecData, this._dataSet, dataViewArr, {
+                onError: this._option.onError
+            }));
         }
         this._spec.data = dataViewArr;
     }
     _initChart(spec) {
-        if (!this._compiler) return void (0, util_1.error)("compiler is not initialized");
+        if (!this._compiler) return void this._option.onError("compiler is not initialized");
         this._initData();
         const chart = factory_1.Factory.createChart(spec.type, spec, {
             globalInstance: this,
@@ -155,14 +163,21 @@ class VChart {
             viewBox: this._viewBox,
             animation: this._option.animation,
             getTheme: () => this._currentTheme,
-            layout: this._option.layout
+            layout: this._option.layout,
+            onError: this._onError
         });
-        chart ? (this._chart = chart, this._chart.created(), this._chart.init({})) : (0, 
-        util_1.error)("init chart fail");
+        chart ? (this._chart = chart, this._chart.created(), this._chart.init({})) : this._option.onError("init chart fail");
     }
     _releaseData() {
         this._dataSet && (this._dataSet.dataViewMap = {}, this._dataSet = null);
     }
+    _bindVGrammarViewEvent() {
+        this._compiler && !this._compiler.isReleased && (this._compiler.getVGrammarView().addEventListener(constant_1.VGRAMMAR_HOOK_EVENT.ALL_ANIMATION_END, (() => {
+            this._event.emit(constant_1.ChartEvent.animationFinished, {});
+        })), this._compiler.getVGrammarView().addEventListener(constant_1.VGRAMMAR_HOOK_EVENT.AFTER_VRENDER_NEXT_RENDER, (() => {
+            this._event.emit(constant_1.ChartEvent.renderFinished, {});
+        })));
+    }
     _bindResizeEvent() {
         var _a;
         if (this._autoSize) {
@@ -187,17 +202,26 @@ class VChart {
         for (const key in factory_1.Factory.dataParser) (0, register_1.registerDataSetInstanceParser)(this._dataSet, key, factory_1.Factory.dataParser[key]);
     }
     updateCustomConfigAndRerender(modifyConfig, morphConfig) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, (function*() {
             const result = modifyConfig();
-            return (0, util_1.isValid)(result) ? (result.reMake ? (this._releaseData(), this._initDataSet(), 
-            this._chart.release(), this._chart = null, null === (_a = this._compiler) || void 0 === _a || _a.releaseGrammar()) : result.reCompile && (this.getComponents().forEach((c => c.clear())), 
-            null === (_b = this._compiler) || void 0 === _b || _b.compile({
-                chart: this._chart,
-                vChart: this
-            }, {})), yield this.renderAsync(morphConfig), this) : this;
+            return (0, util_1.isValid)(result) ? (this._reCompile(result), yield this.renderAsync(morphConfig), 
+            this) : this;
         }));
     }
+    updateCustomConfigAndRerenderSync(modifyConfig, morphConfig) {
+        const result = modifyConfig();
+        return (0, util_1.isValid)(result) ? (this._reCompile(result), this.renderSync(morphConfig), 
+        this) : this;
+    }
+    _reCompile(updateResult) {
+        var _a, _b;
+        updateResult.reMake ? (this._releaseData(), this._initDataSet(), this._chart.release(), 
+        this._chart = null, null === (_a = this._compiler) || void 0 === _a || _a.releaseGrammar()) : updateResult.reCompile && (this.getComponents().forEach((c => c.clear())), 
+        null === (_b = this._compiler) || void 0 === _b || _b.compile({
+            chart: this._chart,
+            vChart: this
+        }, {}));
+    }
     renderSync(morphConfig) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         if (!this._chart) {
@@ -308,6 +332,15 @@ class VChart {
             }), morphConfig), this) : this;
         }));
     }
+    updateSpecSync(spec, forceMerge = !1, morphConfig) {
+        return spec ? ((0, util_1.isString)(spec) && (spec = JSON.parse(spec)), forceMerge && (spec = (0, 
+        util_1.merge)({}, this._spec, spec)), this.updateCustomConfigAndRerenderSync((() => {
+            var _a, _b;
+            return spec = (0, util_1.specTransform)(spec), this._spec = spec, this._updateCurrentTheme(), 
+            null === (_b = null === (_a = this._compiler) || void 0 === _a ? void 0 : _a.getVGrammarView()) || void 0 === _b || _b.updateLayoutTag(), 
+            this._chart.updateSpec(spec, morphConfig);
+        }), morphConfig), this) : this;
+    }
     resize(width, height) {
         var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, (function*() {
@@ -367,6 +400,16 @@ class VChart {
             })), this) : this;
         }));
     }
+    setCurrentThemeSync(name) {
+        return theme_manager_1.ThemeManager.themeExist(name) ? (this.updateCustomConfigAndRerenderSync((() => {
+            var _a;
+            return this._currentThemeName = name, this._updateCurrentTheme(), null === (_a = this._chart) || void 0 === _a || _a.setCurrentTheme(this._currentTheme, !0), 
+            {
+                change: !0,
+                reMake: !1
+            };
+        })), this) : this;
+    }
     _getTooltipComponent() {
         var _a;
         return null === (_a = this._chart) || void 0 === _a ? void 0 : _a.getAllComponents().find((c => c.type === interface_1.ComponentTypeEnum.tooltip));
@@ -432,26 +475,28 @@ class VChart {
             if (this._chart && stage) {
                 stage.render();
                 const canvas = this._chart.getCanvas();
-                return yield (0, image_1.getCanvasDataURL)(canvas);
+                return yield (0, image_1.getCanvasDataURL)(canvas, {
+                    onError: this._onError
+                });
             }
-            return console.error(new ReferenceError("render is not defined")), null;
+            return this._option.onError(new ReferenceError("render is not defined")), null;
         }));
     }
     exportImg(name) {
         return __awaiter(this, void 0, void 0, (function*() {
-            if (!(0, util_1.isTrueBrowser)(this._option.mode)) return void console.error(new TypeError("non-browser environment can not export img"));
+            if (!(0, util_1.isTrueBrowser)(this._option.mode)) return void this._option.onError(new TypeError("non-browser environment can not export img"));
             const dataURL = yield this.getDataURL();
-            dataURL ? (0, image_1.URLToImage)(name, dataURL) : console.error(new ReferenceError("render is not defined"));
+            dataURL ? (0, image_1.URLToImage)(name, dataURL) : this._option.onError(new ReferenceError("render is not defined"));
         }));
     }
     getImageBuffer() {
-        if ("node" !== this._option.mode) return void console.error(new TypeError("getImageBuffer() now only support node environment."));
+        if ("node" !== this._option.mode) return void this._option.onError(new TypeError("getImageBuffer() now only support node environment."));
         const stage = this.getStage();
         if (stage) {
             stage.render();
             return stage.window.getImageBuffer();
         }
-        return console.error(new ReferenceError("render is not defined")), null;
+        return this._option.onError(new ReferenceError("render is not defined")), null;
     }
     setLayout(layout) {
         var _a;