@visactor/vrender-components 0.19.19 → 0.19.20-alpha.2

package/es/index.js

@@ -1,4 +1,4 @@
-export const version = "0.19.19";
+export const version = "0.19.20-alpha.2";
 
 export * from "./core/base";
 
@@ -42,6 +42,8 @@ export * from "./brush";
 
 export * from "./tooltip";
 
+export * from "./timeline";
+
 export * from "./interface";
 
 export * from "./jsx";

package/es/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,SAAS,CAAC;AAEjC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.19.19\";\n\nexport * from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './util';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":"AACA,MAAM,CAAC,MAAM,OAAO,GAAG,iBAAiB,CAAC;AAEzC,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,SAAS,CAAC;AACxB,cAAc,QAAQ,CAAC;AACvB,cAAc,aAAa,CAAC;AAC5B,cAAc,WAAW,CAAC;AAC1B,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,aAAa,CAAC;AAC5B,cAAc,UAAU,CAAC;AACzB,cAAc,SAAS,CAAC;AACxB,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,aAAa,CAAC;AAC5B,cAAc,OAAO,CAAC;AACtB,cAAc,YAAY,CAAC;AAC3B,cAAc,SAAS,CAAC;AACxB,cAAc,aAAa,CAAC;AAC5B,cAAc,QAAQ,CAAC","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.19.20-alpha.2\";\n\nexport * from './core/base';\nexport * from './core/type';\nexport * from './scrollbar';\nexport * from './tag';\nexport * from './poptip';\nexport * from './crosshair';\nexport * from './label';\nexport * from './axis';\nexport * from './axis/grid';\nexport * from './segment';\nexport * from './data-zoom';\nexport * from './marker';\nexport * from './pager';\nexport * from './legend';\nexport * from './title';\nexport * from './indicator';\nexport * from './slider';\nexport * from './link-path';\nexport * from './player';\nexport * from './brush';\nexport * from './tooltip';\nexport * from './timeline';\nexport * from './interface';\nexport * from './jsx';\nexport * from './checkbox';\nexport * from './radio';\nexport * from './empty-tip';\nexport * from './util';\n"]}

package/es/timeline/index.d.ts

@@ -0,0 +1,2 @@
+export * from './timeline';
+export * from './type';

package/es/timeline/index.js

@@ -0,0 +1,4 @@
+export * from "./timeline";
+
+export * from "./type";
+//# sourceMappingURL=index.js.map

package/es/timeline/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/timeline/index.ts"],"names":[],"mappings":"AAAA,cAAc,YAAY,CAAC;AAC3B,cAAc,QAAQ,CAAC","file":"index.js","sourcesContent":["export * from './timeline';\nexport * from './type';\n"]}

package/es/timeline/register.d.ts

@@ -0,0 +1 @@
+export declare function loadTimelineComponent(): void;

package/es/timeline/register.js

@@ -0,0 +1,6 @@
+import { registerGroup, registerSymbol, registerLine, registerText } from "@visactor/vrender-kits";
+
+export function loadTimelineComponent() {
+    registerGroup(), registerText(), registerSymbol(), registerLine();
+}
+//# sourceMappingURL=register.js.map

package/es/timeline/register.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/timeline/register.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAEnG,MAAM,UAAU,qBAAqB;IACnC,aAAa,EAAE,CAAC;IAChB,YAAY,EAAE,CAAC;IACf,cAAc,EAAE,CAAC;IACjB,YAAY,EAAE,CAAC;AACjB,CAAC","file":"register.js","sourcesContent":["import { registerGroup, registerSymbol, registerLine, registerText } from '@visactor/vrender-kits';\n\nexport function loadTimelineComponent() {\n  registerGroup();\n  registerText();\n  registerSymbol();\n  registerLine();\n}\n"]}

package/es/timeline/timeline.d.ts

@@ -0,0 +1,30 @@
+import { AbstractComponent } from '../core/base';
+import type { TimelineAttrs } from './type';
+import type { ComponentOptions } from '../interface';
+export declare class Timeline extends AbstractComponent<Required<TimelineAttrs>> {
+    name: string;
+    private _line?;
+    private _activeLine?;
+    private _symbolGroup?;
+    private _labelGroup?;
+    private _timesPercent?;
+    static defaultAttributes: Partial<TimelineAttrs>;
+    constructor(attributes: TimelineAttrs, options?: ComponentOptions);
+    protected render(): void;
+    appearAnimate(animateConfig: {
+        duration?: number;
+        easing?: string;
+    }): void;
+    goto(flag: 1 | -1, animateConfig: {
+        duration?: number;
+        easing?: string;
+    }): void;
+    forward(animateConfig: {
+        duration?: number;
+        easing?: string;
+    }): void;
+    backward(animateConfig: {
+        duration?: number;
+        easing?: string;
+    }): void;
+}

package/es/timeline/timeline.js

@@ -0,0 +1,175 @@
+import { isArray, merge } from "@visactor/vutils";
+
+import { AbstractComponent } from "../core/base";
+
+import { loadTimelineComponent } from "./register";
+
+loadTimelineComponent();
+
+export class Timeline extends AbstractComponent {
+    constructor(attributes, options) {
+        super((null == options ? void 0 : options.skipDefault) ? attributes : merge({}, Timeline.defaultAttributes, attributes)), 
+        this.name = "timeline";
+    }
+    render() {
+        const {width: width, lineStyle: lineStyle, activeLineStyle: activeLineStyle, symbolStyle: symbolStyle, activeSymbolStyle: activeSymbolStyle, labelStyle: labelStyle, activeLabelStyle: activeLabelStyle, times: times, pointLayoutMode: pointLayoutMode, labelSpace: labelSpace, clipRange: clipRange, animation: animation} = this.attribute;
+        if (!times || !times.length) return;
+        const symbolHeight = (isArray(symbolStyle.size) ? symbolStyle.size[1] : symbolStyle.size) || 0, activeSymbolHeight = (isArray(activeSymbolStyle.size) ? activeSymbolStyle.size[1] : activeSymbolStyle.size) || 0, lineSymbolHeight = Math.max(lineStyle.lineWidth || 0, activeLineStyle.lineWidth || 0, symbolHeight, activeSymbolHeight), lineY = lineSymbolHeight / 2, lineAttr = {
+            y: lineY,
+            points: [ {
+                x: 0,
+                y: 0
+            }, {
+                x: width,
+                y: 0
+            } ]
+        };
+        this._line = this.createOrUpdateChild("line-axes", Object.assign(Object.assign({}, lineStyle), lineAttr), "line"), 
+        this._activeLine = this.createOrUpdateChild("active-line-axes", Object.assign(Object.assign(Object.assign({}, activeLineStyle), lineAttr), {
+            clipRange: clipRange
+        }), "line");
+        const activeWidth = width * clipRange, symbolGroup = this.createOrUpdateChild("symbol-group", {
+            y: lineY
+        }, "group"), symbolSpace = 1 === times.length ? width : "space-between" === pointLayoutMode ? width / (times.length - 1) : width / times.length, symbolStartX = "space-between" === pointLayoutMode ? 0 : symbolSpace / 2;
+        this._timesPercent = times.map(((_, i) => (symbolStartX + symbolSpace * i) / width)), 
+        times.forEach(((item, i) => {
+            const x = this._timesPercent[i] * width;
+            symbolGroup.createOrUpdateChild(item.label, Object.assign(Object.assign({}, symbolStyle), {
+                x: x
+            }), "symbol");
+        })), this._symbolGroup = symbolGroup;
+        const labelY = lineSymbolHeight + labelSpace, labelGroup = this.createOrUpdateChild("label-group", {
+            y: labelY
+        }, "group");
+        times.forEach(((item, i) => {
+            const x = this._timesPercent[i] * width;
+            labelGroup.createOrUpdateChild(item.label, Object.assign(Object.assign({}, labelStyle), {
+                x: x,
+                text: item.label
+            }), "text");
+        })), this._labelGroup = labelGroup;
+        const setActive = (group, activeStyle) => {
+            group.forEachChildren((label => {
+                if (label.currentStates) {
+                    const currentStates = label.currentStates;
+                    label.clearStates(), label.useStates(currentStates, !1);
+                }
+                label.states = {
+                    active: activeStyle
+                }, label.attribute.x <= activeWidth && label.useStates([ "active" ], animation);
+            }));
+        };
+        setActive(labelGroup, activeLabelStyle), setActive(symbolGroup, activeSymbolStyle);
+    }
+    appearAnimate(animateConfig) {
+        const {duration: duration = 1e3, easing: easing = "quadOut"} = animateConfig, {activeLabelStyle: activeLabelStyle, activeSymbolStyle: activeSymbolStyle} = this.attribute, percent = duration / 1e3, lineDuration = 500 * percent, activeLineDuration = 200 * percent, perSymbolDuration = 100 * percent, perSymbolNormalDuration = 90 * percent, symbolDelay = 100 * percent, symbolNormalDelay = 600 * percent;
+        if (this._line && (this._line.setAttributes({
+            clipRange: 0
+        }), this._line.animate().to({
+            clipRange: 1
+        }, lineDuration, easing)), this._activeLine && (this._activeLine.setAttributes({
+            opacity: 0
+        }), this._activeLine.animate().wait(500).to({
+            opacity: 1
+        }, activeLineDuration, easing)), this._symbolGroup) {
+            const size = this._symbolGroup.count - 1, delay = percent * (1 === size ? 0 : 400 / (size - 1)), delayNormal = percent * (1 === size ? 0 : 240 / (size - 1));
+            this._symbolGroup.forEachChildren(((symbol, i) => {
+                const originAttrs = Object.assign({}, symbol.attribute);
+                symbol.setAttributes({
+                    opacity: 0
+                }), symbol.animate().wait(symbolDelay + delay * i).to({
+                    opacity: 1
+                }, perSymbolDuration, easing), symbol.animate().wait(symbolNormalDelay + delayNormal * i).to(Object.assign({
+                    scaleX: 1.8,
+                    scaleY: 1.8
+                }, activeSymbolStyle), perSymbolNormalDuration, easing).to(Object.assign({
+                    scaleX: 1,
+                    scaleY: 1
+                }, originAttrs), perSymbolNormalDuration, easing);
+            }));
+        }
+        if (this._labelGroup) {
+            const size = this._labelGroup.count - 1, delay = percent * (1 === size ? 0 : 400 / (size - 1)), delayNormal = percent * (1 === size ? 0 : 240 / (size - 1));
+            this._labelGroup.forEachChildren(((label, i) => {
+                const originAttrs = Object.assign({}, label.attribute);
+                label.setAttributes({
+                    opacity: 0
+                }), label.animate().wait(symbolDelay + delay * i).to({
+                    opacity: 1
+                }, perSymbolDuration, easing), label.animate().wait(symbolNormalDelay + delayNormal * i).to(Object.assign({
+                    dy: 10
+                }, activeLabelStyle), perSymbolNormalDuration, easing).to(Object.assign({
+                    dy: 0
+                }, originAttrs), perSymbolNormalDuration, easing);
+            }));
+        }
+    }
+    goto(flag, animateConfig) {
+        var _a;
+        let {clipRange: clipRange} = this.attribute;
+        const {animation: animation} = this.attribute;
+        if (flag > 0) {
+            if (clipRange >= 1) return;
+            clipRange < 0 && (clipRange = 0);
+        } else {
+            if (clipRange <= 0) return;
+            clipRange > 1 && (clipRange = 1);
+        }
+        clipRange !== this.attribute.clipRange && this.setAttributes({
+            clipRange: clipRange
+        });
+        let i = 0;
+        for (;i < this._timesPercent.length && !(clipRange < this._timesPercent[i]); i++) ;
+        const nextClipRange = flag > 0 ? this._timesPercent[i] : this._timesPercent[i - 1] || 0;
+        if (animation) {
+            const {duration: duration = 1e3, easing: easing = "quadOut"} = animateConfig, actDuration = Math.abs(nextClipRange - clipRange) / (this._timesPercent[i] - (null !== (_a = this._timesPercent[i - 1]) && void 0 !== _a ? _a : 0)) * duration;
+            this.animate().to({
+                clipRange: nextClipRange
+            }, actDuration, easing);
+        } else this.setAttributes({
+            clipRange: nextClipRange
+        });
+    }
+    forward(animateConfig) {
+        this.goto(1, animateConfig);
+    }
+    backward(animateConfig) {
+        this.goto(-1, animateConfig);
+    }
+}
+
+Timeline.defaultAttributes = {
+    labelSpace: 10,
+    pointLayoutMode: "space-around",
+    animation: !0,
+    symbolStyle: {
+        fill: "black",
+        size: 12,
+        symbolType: "circle"
+    },
+    activeSymbolStyle: {
+        fill: "orange"
+    },
+    lineStyle: {
+        lineDash: [ 2, 2 ],
+        lineCap: "butt",
+        stroke: "black",
+        lineWidth: 2
+    },
+    activeLineStyle: {
+        stroke: "orange",
+        lineWidth: 4
+    },
+    labelStyle: {
+        fontSize: 12,
+        fill: "black",
+        textAlign: "center",
+        textBaseline: "top"
+    },
+    activeLabelStyle: {
+        fontSize: 14,
+        fill: "orange"
+    },
+    clipRange: 0
+};
+//# sourceMappingURL=timeline.js.map

package/es/timeline/timeline.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/timeline/timeline.ts"],"names":[],"mappings":"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","file":"timeline.js","sourcesContent":["import { isArray, merge } from '@visactor/vutils';\nimport { AbstractComponent } from '../core/base';\nimport { loadTimelineComponent } from './register';\nimport type { TimelineAttrs } from './type';\nimport type { ComponentOptions } from '../interface';\nimport type { IGraphicAttribute, IGroup, ILine, IText } from '@visactor/vrender-core';\nimport type { ISymbol } from '@visactor/vrender-core';\n\nloadTimelineComponent();\n\nexport class Timeline extends AbstractComponent<Required<TimelineAttrs>> {\n  name = 'timeline';\n\n  private _line?: ILine;\n  private _activeLine?: ILine;\n  private _symbolGroup?: IGroup;\n  private _labelGroup?: IGroup;\n  private _timesPercent?: number[];\n\n  static defaultAttributes: Partial<TimelineAttrs> = {\n    labelSpace: 10,\n    pointLayoutMode: 'space-around',\n    animation: true,\n    symbolStyle: {\n      fill: 'black',\n      size: 12,\n      symbolType: 'circle'\n    },\n    activeSymbolStyle: {\n      fill: 'orange'\n    },\n    lineStyle: {\n      lineDash: [2, 2],\n      lineCap: 'butt',\n      stroke: 'black',\n      lineWidth: 2\n    },\n    activeLineStyle: {\n      stroke: 'orange',\n      lineWidth: 4\n    },\n    labelStyle: {\n      fontSize: 12,\n      fill: 'black',\n      textAlign: 'center',\n      textBaseline: 'top'\n    },\n    activeLabelStyle: {\n      fontSize: 14,\n      fill: 'orange'\n    },\n    clipRange: 0\n  };\n\n  constructor(attributes: TimelineAttrs, options?: ComponentOptions) {\n    super(options?.skipDefault ? attributes : merge({}, Timeline.defaultAttributes, attributes));\n  }\n\n  protected render(): void {\n    const {\n      width,\n      lineStyle,\n      activeLineStyle,\n      symbolStyle,\n      activeSymbolStyle,\n      labelStyle,\n      activeLabelStyle,\n      times,\n      pointLayoutMode,\n      labelSpace,\n      clipRange,\n      animation\n    } = this.attribute;\n\n    if (!(times && times.length)) {\n      return;\n    }\n\n    // 计算线段中心的y位置，考虑线宽和symbol宽度\n    const symbolHeight = (isArray(symbolStyle.size) ? symbolStyle.size[1] : symbolStyle.size) || 0;\n    const activeSymbolHeight =\n      (isArray(activeSymbolStyle.size) ? activeSymbolStyle.size[1] : activeSymbolStyle.size) || 0;\n    const lineSymbolHeight = Math.max(\n      lineStyle.lineWidth || 0,\n      activeLineStyle.lineWidth || 0,\n      symbolHeight,\n      activeSymbolHeight\n    );\n    const lineY = lineSymbolHeight / 2;\n    const lineAttr = {\n      y: lineY,\n      points: [\n        { x: 0, y: 0 },\n        { x: width, y: 0 }\n      ]\n    };\n    this._line = this.createOrUpdateChild(\n      'line-axes',\n      {\n        ...lineStyle,\n        ...lineAttr\n      },\n      'line'\n    ) as ILine;\n    this._activeLine = this.createOrUpdateChild(\n      'active-line-axes',\n      {\n        ...activeLineStyle,\n        ...lineAttr,\n        clipRange\n      },\n      'line'\n    ) as ILine;\n\n    const activeWidth = width * clipRange;\n\n    const symbolGroup = this.createOrUpdateChild(\n      'symbol-group',\n      {\n        y: lineY\n      },\n      'group'\n    ) as IGroup;\n    const symbolSpace =\n      times.length === 1\n        ? width\n        : pointLayoutMode === 'space-between'\n        ? width / (times.length - 1)\n        : width / times.length;\n    const symbolStartX = pointLayoutMode === 'space-between' ? 0 : symbolSpace / 2;\n    this._timesPercent = times.map((_, i) => (symbolStartX + symbolSpace * i) / width);\n\n    times.forEach((item, i) => {\n      const x = this._timesPercent[i] * width;\n      symbolGroup.createOrUpdateChild(\n        item.label,\n        {\n          ...symbolStyle,\n          x\n        },\n        'symbol'\n      );\n    });\n    this._symbolGroup = symbolGroup;\n\n    const labelY = lineSymbolHeight + labelSpace;\n    const labelGroup = this.createOrUpdateChild(\n      'label-group',\n      {\n        y: labelY\n      },\n      'group'\n    ) as IGroup;\n\n    times.forEach((item, i) => {\n      const x = this._timesPercent[i] * width;\n      labelGroup.createOrUpdateChild(\n        item.label,\n        {\n          ...labelStyle,\n          x,\n          text: item.label\n        },\n        'text'\n      );\n    });\n    this._labelGroup = labelGroup;\n\n    const setActive = (group: IGroup, activeStyle: Partial<IGraphicAttribute>) => {\n      group.forEachChildren((label: IText) => {\n        if (label.currentStates) {\n          const currentStates = label.currentStates;\n          label.clearStates();\n          label.useStates(currentStates, false);\n        }\n        label.states = {\n          active: activeStyle\n        };\n        if (label.attribute.x <= activeWidth) {\n          label.useStates(['active'], animation);\n        }\n      });\n    };\n\n    setActive(labelGroup, activeLabelStyle);\n    setActive(symbolGroup, activeSymbolStyle);\n  }\n\n  appearAnimate(animateConfig: { duration?: number; easing?: string }) {\n    // 基准时间，line[0, 500], point[100, 600] 100 onebyone, pointNormal[600, 1000] 90+90 onebyone, activeLine[500, 700]\n    // line和activeLine的clipRange\n    const { duration = 1000, easing = 'quadOut' } = animateConfig;\n    const { activeLabelStyle, activeSymbolStyle } = this.attribute;\n    const percent = duration / 1000;\n    const lineDuration = percent * 500;\n    const activeLineDuration = percent * 200;\n    const perSymbolDuration = percent * 100;\n    const perSymbolNormalDuration = percent * 90;\n    const symbolDelay = percent * 100;\n    const symbolNormalDelay = percent * 600;\n    if (this._line) {\n      this._line.setAttributes({ clipRange: 0 });\n      this._line.animate().to({ clipRange: 1 }, lineDuration, easing as any);\n    }\n    if (this._activeLine) {\n      this._activeLine.setAttributes({ opacity: 0 });\n      this._activeLine\n        .animate()\n        .wait(500)\n        .to({ opacity: 1 }, activeLineDuration, easing as any);\n    }\n    if (this._symbolGroup) {\n      const size = this._symbolGroup.count - 1;\n      const delay = percent * (size === 1 ? 0 : (500 - 100) / (size - 1));\n      const delayNormal = percent * (size === 1 ? 0 : (400 - 160) / (size - 1));\n      this._symbolGroup.forEachChildren((symbol: ISymbol, i) => {\n        const originAttrs = { ...symbol.attribute };\n        symbol.setAttributes({ opacity: 0 });\n        symbol\n          .animate()\n          .wait(symbolDelay + delay * i)\n          .to({ opacity: 1 }, perSymbolDuration, easing as any);\n        symbol\n          .animate()\n          .wait(symbolNormalDelay + delayNormal * i)\n          .to({ scaleX: 1.8, scaleY: 1.8, ...activeSymbolStyle }, perSymbolNormalDuration, easing as any)\n          .to({ scaleX: 1, scaleY: 1, ...originAttrs }, perSymbolNormalDuration, easing as any);\n      });\n    }\n    if (this._labelGroup) {\n      const size = this._labelGroup.count - 1;\n      const delay = percent * (size === 1 ? 0 : (500 - 100) / (size - 1));\n      const delayNormal = percent * (size === 1 ? 0 : (400 - 160) / (size - 1));\n      this._labelGroup.forEachChildren((label: IText, i) => {\n        const originAttrs = { ...label.attribute };\n        label.setAttributes({ opacity: 0 });\n        label\n          .animate()\n          .wait(symbolDelay + delay * i)\n          .to({ opacity: 1 }, perSymbolDuration, easing as any);\n        label\n          .animate()\n          .wait(symbolNormalDelay + delayNormal * i)\n          .to({ dy: 10, ...activeLabelStyle }, perSymbolNormalDuration, easing as any)\n          .to({ dy: 0, ...originAttrs }, perSymbolNormalDuration, easing as any);\n      });\n    }\n  }\n\n  goto(flag: 1 | -1, animateConfig: { duration?: number; easing?: string }) {\n    let { clipRange } = this.attribute;\n    const { animation } = this.attribute;\n\n    // 合法性判断\n    if (flag > 0) {\n      if (clipRange >= 1) {\n        return;\n      } else if (clipRange < 0) {\n        clipRange = 0;\n      }\n    } else {\n      if (clipRange <= 0) {\n        return;\n      } else if (clipRange > 1) {\n        clipRange = 1;\n      }\n    }\n\n    if (clipRange !== this.attribute.clipRange) {\n      this.setAttributes({ clipRange });\n    }\n\n    // 判断区间\n    let i = 0;\n    for (; i < this._timesPercent.length; i++) {\n      if (clipRange < this._timesPercent[i]) {\n        break;\n      }\n    }\n\n    const nextClipRange = flag > 0 ? this._timesPercent[i] : this._timesPercent[i - 1] || 0;\n    if (animation) {\n      const { duration = 1000, easing = 'quadOut' } = animateConfig;\n      const actDuration =\n        (Math.abs(nextClipRange - clipRange) / (this._timesPercent[i] - (this._timesPercent[i - 1] ?? 0))) * duration;\n      this.animate().to({ clipRange: nextClipRange }, actDuration, easing as any);\n    } else {\n      this.setAttributes({ clipRange: nextClipRange });\n    }\n  }\n\n  forward(animateConfig: { duration?: number; easing?: string }) {\n    this.goto(1, animateConfig);\n  }\n\n  backward(animateConfig: { duration?: number; easing?: string }) {\n    this.goto(-1, animateConfig);\n  }\n}\n"]}

package/es/timeline/type.d.ts

@@ -0,0 +1,18 @@
+import type { IGroupGraphicAttribute, ILineGraphicAttribute, ISymbolGraphicAttribute, ITextGraphicAttribute } from '@visactor/vrender-core';
+export interface TimelineAttrs extends IGroupGraphicAttribute {
+    width: number;
+    times: {
+        label: string;
+        desc?: string;
+    }[];
+    labelSpace?: number;
+    symbolStyle?: Partial<ISymbolGraphicAttribute>;
+    activeSymbolStyle?: Partial<ISymbolGraphicAttribute>;
+    lineStyle?: Partial<ILineGraphicAttribute>;
+    activeLineStyle?: Partial<ILineGraphicAttribute>;
+    labelStyle?: Partial<ITextGraphicAttribute>;
+    activeLabelStyle?: Partial<ITextGraphicAttribute>;
+    pointLayoutMode?: 'space-around' | 'space-between';
+    clipRange?: number;
+    animation?: boolean;
+}

package/es/timeline/type.js

@@ -0,0 +1,2 @@
+export { };
+//# sourceMappingURL=type.js.map

package/es/timeline/type.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/timeline/type.ts"],"names":[],"mappings":"","file":"type.js","sourcesContent":["import type {\n  IGroupGraphicAttribute,\n  ILineGraphicAttribute,\n  ISymbolGraphicAttribute,\n  ITextGraphicAttribute\n} from '@visactor/vrender-core';\nimport { ILineAttribute, ISymbolAttribute } from '@visactor/vrender-core';\n\nexport interface TimelineAttrs extends IGroupGraphicAttribute {\n  width: number;\n  // height?: number;\n  times: { label: string; desc?: string }[];\n  labelSpace?: number;\n  symbolStyle?: Partial<ISymbolGraphicAttribute>;\n  activeSymbolStyle?: Partial<ISymbolGraphicAttribute>;\n  lineStyle?: Partial<ILineGraphicAttribute>;\n  activeLineStyle?: Partial<ILineGraphicAttribute>;\n  labelStyle?: Partial<ITextGraphicAttribute>;\n  activeLabelStyle?: Partial<ITextGraphicAttribute>;\n  pointLayoutMode?: 'space-around' | 'space-between';\n  // 当前进度\n  clipRange?: number;\n  animation?: boolean;\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@visactor/vrender-components",
-  "version": "0.19.19",
+  "version": "0.19.20-alpha.2",
   "description": "components library for dp visualization",
   "sideEffects": false,
   "main": "cjs/index.js",
@@ -12,8 +12,8 @@
     "dist"
   ],
   "dependencies": {
-    "@visactor/vrender-core": "0.19.19",
-    "@visactor/vrender-kits": "0.19.19",
+    "@visactor/vrender-core": "0.19.20-alpha.2",
+    "@visactor/vrender-kits": "0.19.20-alpha.2",
     "@visactor/vutils": "~0.18.10",
     "@visactor/vscale": "~0.18.9"
   },