@visactor/vrender-components 0.21.2-vstory.3 → 0.21.2

package/cjs/brush/brush.js

@@ -188,4 +188,5 @@ class Brush extends base_1.AbstractComponent {
     }
 }
 
-exports.Brush = Brush, Brush.defaultAttributes = config_1.DEFAULT_BRUSH_ATTRIBUTES;
+exports.Brush = Brush, Brush.defaultAttributes = config_1.DEFAULT_BRUSH_ATTRIBUTES;
+//# sourceMappingURL=brush.js.map

package/cjs/brush/type.js

@@ -8,5 +8,4 @@ Object.defineProperty(exports, "__esModule", {
     IOperateType.drawStart = "drawStart", IOperateType.drawEnd = "drawEnd", IOperateType.drawing = "drawing", 
     IOperateType.moving = "moving", IOperateType.moveStart = "moveStart", IOperateType.moveEnd = "moveEnd", 
     IOperateType.brushClear = "brushClear";
-}(IOperateType = exports.IOperateType || (exports.IOperateType = {}));
-//# sourceMappingURL=type.js.map
+}(IOperateType = exports.IOperateType || (exports.IOperateType = {}));

package/cjs/core/base.d.ts

@@ -6,7 +6,6 @@ export declare abstract class AbstractComponent<T extends IGroupGraphicAttribute
     attribute: Partial<T>;
     protected mode?: '2d' | '3d';
     protected skipDefault?: boolean;
-    protected _skipRenderAttributes: string[];
     constructor(attributes: T, options?: ComponentOptions);
     setAttribute(key: string, value: any, forceUpdateTag?: boolean | undefined): void;
     setAttributes(params: Partial<T>, forceUpdateTag?: boolean | undefined): void;

package/cjs/core/base.js

@@ -8,7 +8,7 @@ const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@v
 
 class AbstractComponent extends vrender_core_1.Group {
     constructor(attributes, options) {
-        super(attributes), this._skipRenderAttributes = GROUP_ATTRIBUTES, (null == options ? void 0 : options.mode) && (this.mode = options.mode, 
+        super(attributes), (null == options ? void 0 : options.mode) && (this.mode = options.mode, 
         this.setMode(options.mode)), (null == options ? void 0 : options.skipDefault) && (this.skipDefault = !0), 
         this.setTheme({
             common: {
@@ -21,13 +21,13 @@ class AbstractComponent extends vrender_core_1.Group {
     setAttribute(key, value, forceUpdateTag) {
         (0, vutils_1.isPlainObject)(this.attribute[key]) && (0, vutils_1.isPlainObject)(value) && !(0, 
         vutils_1.isFunction)(this.attribute[key]) && !(0, vutils_1.isFunction)(value) ? (0, 
-        vutils_1.merge)(this.attribute[key], value) : this.attribute[key] = value, this._skipRenderAttributes.includes(key) || this.render(), 
+        vutils_1.merge)(this.attribute[key], value) : this.attribute[key] = value, GROUP_ATTRIBUTES.includes(key) || this.render(), 
         this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTag(key) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), 
         this.addUpdatePositionTag(), this.onAttributeUpdate();
     }
     setAttributes(params, forceUpdateTag) {
         const keys = Object.keys(params);
-        this._mergeAttributes(params, keys), keys.every((key => this._skipRenderAttributes.includes(key))) || this.render(), 
+        this._mergeAttributes(params, keys), keys.every((key => GROUP_ATTRIBUTES.includes(key))) || this.render(), 
         this.valid = this.isValid(), this.updateShapeAndBoundsTagSetted() || !forceUpdateTag && !this.needUpdateTags(keys) ? this.addUpdateBoundTag() : this.addUpdateShapeAndBoundsTag(), 
         this.addUpdatePositionTag(), this.onAttributeUpdate();
     }

package/cjs/core/base.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/core/base.ts"],"names":[],"mappings":"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","file":"base.js","sourcesContent":["/**\n * @description 组件基类\n */\nimport type { IGroupGraphicAttribute } from '@visactor/vrender-core';\nimport { Group, CustomEvent } from '@visactor/vrender-core';\nimport type { Dict } from '@visactor/vutils';\nimport { merge, isFunction, isPlainObject, isNil } from '@visactor/vutils';\nimport type { ComponentOptions } from '../interface';\n\nconst GROUP_ATTRIBUTES = [\n  'x',\n  'y',\n  'dx',\n  'dy',\n  'scaleX',\n  'scaleY',\n  'angle',\n  'anchor',\n  'postMatrix',\n  'visible',\n  'clip',\n  'pickable',\n  'childrenPickable',\n  'zIndex',\n  'cursor'\n];\n\nexport abstract class AbstractComponent<T extends IGroupGraphicAttribute = IGroupGraphicAttribute> extends Group {\n  declare attribute: Partial<T>;\n\n  protected mode?: '2d' | '3d';\n\n  protected skipDefault?: boolean;\n\n  protected _skipRenderAttributes: string[] = GROUP_ATTRIBUTES;\n\n  constructor(attributes: T, options?: ComponentOptions) {\n    super(attributes);\n\n    if (options?.mode) {\n      this.mode = options.mode;\n\n      this.setMode(options.mode);\n    }\n\n    if (options?.skipDefault) {\n      this.skipDefault = true;\n    }\n    // 组件需要精准 bounds，所以将这个 strokeBoundsBuffer 设置为 0，否则会影响包围盒的获取\n    this.setTheme({\n      common: {\n        strokeBoundsBuffer: 0\n      }\n    });\n    this.attribute = attributes;\n    // 这里调用渲染和事件绑定逻辑\n    this.onSetStage(() => {\n      this.render();\n      this.bindEvents();\n    });\n  }\n\n  /**\n   * @override\n   * 更新单个属性值\n   * @param key\n   * @param value\n   * @param forceUpdateTag\n   */\n  setAttribute(key: string, value: any, forceUpdateTag?: boolean | undefined): void {\n    // overwrite when previous or next attribute is function\n    if (\n      isPlainObject(this.attribute[key]) &&\n      isPlainObject(value) &&\n      !isFunction(this.attribute[key]) &&\n      !isFunction(value)\n    ) {\n      merge(this.attribute[key], value);\n    } else {\n      this.attribute[key] = value;\n    }\n\n    // HACK: 待优化\n    if (!this._skipRenderAttributes.includes(key as string)) {\n      this.render();\n    }\n\n    this.valid = this.isValid();\n    if (!this.updateShapeAndBoundsTagSetted() && (forceUpdateTag || this.needUpdateTag(key as string))) {\n      this.addUpdateShapeAndBoundsTag();\n    } else {\n      this.addUpdateBoundTag();\n    }\n    this.addUpdatePositionTag();\n    this.onAttributeUpdate();\n  }\n\n  // @ts-ignore\n  setAttributes(params: Partial<T>, forceUpdateTag?: boolean | undefined): void {\n    const keys = Object.keys(params) as (keyof T)[];\n    this._mergeAttributes(params, keys);\n\n    // HACK: 待优化\n    if (!keys.every(key => this._skipRenderAttributes.includes(key as string))) {\n      this.render();\n    }\n\n    this.valid = this.isValid();\n    // 没有设置shape&bounds的tag\n    if (!this.updateShapeAndBoundsTagSetted() && (forceUpdateTag || this.needUpdateTags(keys as string[]))) {\n      this.addUpdateShapeAndBoundsTag();\n    } else {\n      this.addUpdateBoundTag();\n    }\n    this.addUpdatePositionTag();\n    this.onAttributeUpdate();\n  }\n\n  protected _mergeAttributes(params: Partial<T>, keys?: (keyof T)[]) {\n    if (isNil(keys)) {\n      keys = Object.keys(params) as (keyof T)[];\n    }\n    for (let i = 0; i < keys.length; i++) {\n      const key = keys[i] as keyof Partial<T>;\n      // overwrite when previous or next attribute is function\n      if (isPlainObject(this.attribute[key]) && !isFunction(this.attribute[key]) && !isFunction(params[key])) {\n        merge(this.attribute[key], params[key]);\n      } else {\n        this.attribute[key] = params[key];\n      }\n    }\n  }\n\n  protected bindEvents() {\n    // please override\n  }\n\n  protected abstract render(): void;\n\n  // 图形元素 id\n  protected _getNodeId(id: string) {\n    return `${this.id ?? this._uid}-${this.name}-${id}`;\n  }\n\n  // 用于 emit 组件自己的事件\n  protected _dispatchEvent(eventName: string, details?: Dict<any>) {\n    // 封装事件\n    const changeEvent = new CustomEvent(eventName, details);\n    // FIXME: 需要在 vrender 的事件系统支持\n    // @ts-ignore\n    changeEvent.manager = this.stage?.eventSystem.manager;\n\n    this.dispatchEvent(changeEvent);\n  }\n}\n"]}
+{"version":3,"sources":["../src/core/base.ts"],"names":[],"mappings":"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","file":"base.js","sourcesContent":["/**\n * @description 组件基类\n */\nimport type { IGroupGraphicAttribute } from '@visactor/vrender-core';\nimport { Group, CustomEvent } from '@visactor/vrender-core';\nimport type { Dict } from '@visactor/vutils';\nimport { merge, isFunction, isPlainObject, isNil } from '@visactor/vutils';\nimport type { ComponentOptions } from '../interface';\n\nconst GROUP_ATTRIBUTES = [\n  'x',\n  'y',\n  'dx',\n  'dy',\n  'scaleX',\n  'scaleY',\n  'angle',\n  'anchor',\n  'postMatrix',\n  'visible',\n  'clip',\n  'pickable',\n  'childrenPickable',\n  'zIndex',\n  'cursor'\n];\n\nexport abstract class AbstractComponent<T extends IGroupGraphicAttribute = IGroupGraphicAttribute> extends Group {\n  declare attribute: Partial<T>;\n\n  protected mode?: '2d' | '3d';\n\n  protected skipDefault?: boolean;\n\n  constructor(attributes: T, options?: ComponentOptions) {\n    super(attributes);\n\n    if (options?.mode) {\n      this.mode = options.mode;\n\n      this.setMode(options.mode);\n    }\n\n    if (options?.skipDefault) {\n      this.skipDefault = true;\n    }\n    // 组件需要精准 bounds，所以将这个 strokeBoundsBuffer 设置为 0，否则会影响包围盒的获取\n    this.setTheme({\n      common: {\n        strokeBoundsBuffer: 0\n      }\n    });\n    this.attribute = attributes;\n    // 这里调用渲染和事件绑定逻辑\n    this.onSetStage(() => {\n      this.render();\n      this.bindEvents();\n    });\n  }\n\n  /**\n   * @override\n   * 更新单个属性值\n   * @param key\n   * @param value\n   * @param forceUpdateTag\n   */\n  setAttribute(key: string, value: any, forceUpdateTag?: boolean | undefined): void {\n    // overwrite when previous or next attribute is function\n    if (\n      isPlainObject(this.attribute[key]) &&\n      isPlainObject(value) &&\n      !isFunction(this.attribute[key]) &&\n      !isFunction(value)\n    ) {\n      merge(this.attribute[key], value);\n    } else {\n      this.attribute[key] = value;\n    }\n\n    // HACK: 待优化\n    if (!GROUP_ATTRIBUTES.includes(key as string)) {\n      this.render();\n    }\n\n    this.valid = this.isValid();\n    if (!this.updateShapeAndBoundsTagSetted() && (forceUpdateTag || this.needUpdateTag(key as string))) {\n      this.addUpdateShapeAndBoundsTag();\n    } else {\n      this.addUpdateBoundTag();\n    }\n    this.addUpdatePositionTag();\n    this.onAttributeUpdate();\n  }\n\n  // @ts-ignore\n  setAttributes(params: Partial<T>, forceUpdateTag?: boolean | undefined): void {\n    const keys = Object.keys(params) as (keyof T)[];\n    this._mergeAttributes(params, keys);\n\n    // HACK: 待优化\n    if (!keys.every(key => GROUP_ATTRIBUTES.includes(key as string))) {\n      this.render();\n    }\n\n    this.valid = this.isValid();\n    // 没有设置shape&bounds的tag\n    if (!this.updateShapeAndBoundsTagSetted() && (forceUpdateTag || this.needUpdateTags(keys as string[]))) {\n      this.addUpdateShapeAndBoundsTag();\n    } else {\n      this.addUpdateBoundTag();\n    }\n    this.addUpdatePositionTag();\n    this.onAttributeUpdate();\n  }\n\n  protected _mergeAttributes(params: Partial<T>, keys?: (keyof T)[]) {\n    if (isNil(keys)) {\n      keys = Object.keys(params) as (keyof T)[];\n    }\n    for (let i = 0; i < keys.length; i++) {\n      const key = keys[i] as keyof Partial<T>;\n      // overwrite when previous or next attribute is function\n      if (isPlainObject(this.attribute[key]) && !isFunction(this.attribute[key]) && !isFunction(params[key])) {\n        merge(this.attribute[key], params[key]);\n      } else {\n        this.attribute[key] = params[key];\n      }\n    }\n  }\n\n  protected bindEvents() {\n    // please override\n  }\n\n  protected abstract render(): void;\n\n  // 图形元素 id\n  protected _getNodeId(id: string) {\n    return `${this.id ?? this._uid}-${this.name}-${id}`;\n  }\n\n  // 用于 emit 组件自己的事件\n  protected _dispatchEvent(eventName: string, details?: Dict<any>) {\n    // 封装事件\n    const changeEvent = new CustomEvent(eventName, details);\n    // FIXME: 需要在 vrender 的事件系统支持\n    // @ts-ignore\n    changeEvent.manager = this.stage?.eventSystem.manager;\n\n    this.dispatchEvent(changeEvent);\n  }\n}\n"]}

package/cjs/index.d.ts

@@ -1,4 +1,4 @@
-export declare const version = "0.21.2-vstory.3";
+export declare const version = "0.21.2";
 export * from './core/base';
 export * from './core/type';
 export * from './scrollbar';
@@ -26,6 +26,4 @@ export * from './jsx';
 export * from './checkbox';
 export * from './radio';
 export * from './empty-tip';
-export * from './weather';
 export * from './util';
-export * from './label-item';

package/cjs/index.js

@@ -17,7 +17,7 @@ var __createBinding = this && this.__createBinding || (Object.create ? function(
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.version = void 0, exports.version = "0.21.2-vstory.3", __exportStar(require("./core/base"), exports), 
+}), exports.version = void 0, exports.version = "0.21.2", __exportStar(require("./core/base"), exports), 
 __exportStar(require("./core/type"), exports), __exportStar(require("./scrollbar"), exports), 
 __exportStar(require("./tag"), exports), __exportStar(require("./poptip"), exports), 
 __exportStar(require("./crosshair"), exports), __exportStar(require("./label"), exports), 
@@ -31,6 +31,5 @@ __exportStar(require("./brush"), exports), __exportStar(require("./tooltip"), ex
 __exportStar(require("./timeline"), exports), __exportStar(require("./interface"), exports), 
 __exportStar(require("./jsx"), exports), __exportStar(require("./checkbox"), exports), 
 __exportStar(require("./radio"), exports), __exportStar(require("./empty-tip"), exports), 
-__exportStar(require("./weather"), exports), __exportStar(require("./util"), exports), 
-__exportStar(require("./label-item"), exports);
+__exportStar(require("./util"), exports);
 //# sourceMappingURL=index.js.map

package/cjs/index.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,iBAAiB,CAAC;AAEzC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,wCAAsB;AACtB,2CAAyB;AACzB,8CAA4B;AAC5B,0CAAwB;AACxB,yCAAuB;AACvB,8CAA4B;AAC5B,4CAA0B;AAC1B,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,2CAAyB;AACzB,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,4CAA0B;AAC1B,6CAA2B;AAC3B,8CAA4B;AAC5B,wCAAsB;AACtB,6CAA2B;AAC3B,0CAAwB;AACxB,8CAA4B;AAC5B,4CAA0B;AAC1B,yCAAuB;AACvB,+CAA6B","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.21.2-vstory.3\";\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 './weather';\nexport * from './util';\nexport * from './label-item';\n"]}
+{"version":3,"sources":["../src/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AACa,QAAA,OAAO,GAAG,QAAQ,CAAC;AAEhC,8CAA4B;AAC5B,8CAA4B;AAC5B,8CAA4B;AAC5B,wCAAsB;AACtB,2CAAyB;AACzB,8CAA4B;AAC5B,0CAAwB;AACxB,yCAAuB;AACvB,8CAA4B;AAC5B,4CAA0B;AAC1B,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,2CAAyB;AACzB,0CAAwB;AACxB,8CAA4B;AAC5B,2CAAyB;AACzB,8CAA4B;AAC5B,2CAAyB;AACzB,0CAAwB;AACxB,4CAA0B;AAC1B,6CAA2B;AAC3B,8CAA4B;AAC5B,wCAAsB;AACtB,6CAA2B;AAC3B,0CAAwB;AACxB,8CAA4B;AAC5B,yCAAuB","file":"index.js","sourcesContent":["// 导出版本号\nexport const version = \"0.21.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/cjs/interface.d.ts

@@ -1,4 +1,4 @@
-import type { ICustomPath2D, IGraphicAttribute, IGroup, IRectGraphicAttribute, ITimeline } from '@visactor/vrender-core';
+import type { ICustomPath2D, IGraphicAttribute, IGroup, IRectGraphicAttribute } from '@visactor/vrender-core';
 export type Direction = 'horizontal' | 'vertical';
 export type OrientType = 'top' | 'right' | 'bottom' | 'left';
 export type BackgroundAttributes = {
@@ -9,5 +9,4 @@ export type IDelayType = 'debounce' | 'throttle';
 export interface ComponentOptions {
     skipDefault?: boolean;
     mode?: '2d' | '3d';
-    timeline?: ITimeline;
 }

package/cjs/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type {\n  ICustomPath2D,\n  IGraphicAttribute,\n  IGroup,\n  IRectGraphicAttribute,\n  IRichText,\n  IText,\n  ITimeline\n} from '@visactor/vrender-core';\n\nexport type Direction = 'horizontal' | 'vertical';\n\nexport type OrientType = 'top' | 'right' | 'bottom' | 'left';\n\nexport type BackgroundAttributes = {\n  /**\n   * 是否绘制背景层\n   */\n  visible: boolean;\n  /**\n   * 自定义路径\n   * @since 0.19.19\n   */\n  customShape?: (container: IGroup, attrs: Partial<IGraphicAttribute>, path: ICustomPath2D) => ICustomPath2D;\n} & Partial<IRectGraphicAttribute>;\n\nexport type IDelayType = 'debounce' | 'throttle';\n\nexport interface ComponentOptions {\n  /** skip default attributes of component */\n  skipDefault?: boolean;\n  /** the mode of component, only axis support 3d mode now */\n  mode?: '2d' | '3d';\n  /* 传递一个独立的timeline */\n  timeline?: ITimeline;\n}\n"]}
+{"version":3,"sources":["../src/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { ICustomPath2D, IGraphicAttribute, IGroup, IRectGraphicAttribute } from '@visactor/vrender-core';\n\nexport type Direction = 'horizontal' | 'vertical';\n\nexport type OrientType = 'top' | 'right' | 'bottom' | 'left';\n\nexport type BackgroundAttributes = {\n  /**\n   * 是否绘制背景层\n   */\n  visible: boolean;\n  /**\n   * 自定义路径\n   * @since 0.19.19\n   */\n  customShape?: (container: IGroup, attrs: Partial<IGraphicAttribute>, path: ICustomPath2D) => ICustomPath2D;\n} & Partial<IRectGraphicAttribute>;\n\nexport type IDelayType = 'debounce' | 'throttle';\n\nexport interface ComponentOptions {\n  /** skip default attributes of component */\n  skipDefault?: boolean;\n  /** the mode of component, only axis support 3d mode now */\n  mode?: '2d' | '3d';\n}\n"]}

package/cjs/poptip/poptip.d.ts

@@ -1,27 +1,15 @@
-import { type IGroup, type IText } from '@visactor/vrender-core';
 import { AbstractComponent } from '../core/base';
 import type { ComponentOptions } from '../interface';
 import type { PopTipAttributes } from './type';
 export declare class PopTip extends AbstractComponent<Required<PopTipAttributes>> {
     name: string;
     static defaultAttributes: Partial<PopTipAttributes>;
-    titleShape?: IText;
-    contentShape?: IText;
-    group?: IGroup;
     constructor(attributes: PopTipAttributes, options?: ComponentOptions);
     protected render(): void;
     positionList: string[];
-    getAngleAndOffset(position: string, width: number, height: number, size: [number, number], symbolType: 'arrow2Left' | string): {
+    getAngleAndOffset(position: string, width: number, height: number, size: [number, number]): {
         angle: number;
         offset: [number, number];
+        rectOffset: [number, number];
     };
-    appearAnimate(animateConfig: {
-        duration?: number;
-        easing?: string;
-        wave?: number;
-    }): void;
-    disappearAnimate(animateConfig: {
-        duration?: number;
-        easing?: string;
-    }): void;
 }

package/cjs/poptip/poptip.js

@@ -14,29 +14,18 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.PopTip = void 0;
 
-const vrender_core_1 = require("@visactor/vrender-core"), vutils_1 = require("@visactor/vutils"), base_1 = require("../core/base"), register_1 = require("./register"), _tBounds = new vutils_1.AABBBounds;
+const vutils_1 = require("@visactor/vutils"), base_1 = require("../core/base"), register_1 = require("./register"), _tBounds = new vutils_1.AABBBounds;
 
 (0, register_1.loadPoptipComponent)();
 
-const tlStr = "M -0.5 -0.5, L -0.5 0.5, L 0.5 -0.5, Z", blStr = "M -0.5 -0.5, L -0.5 0.5, L 0.5 0.5, Z", trStr = "M -0.5 -0.5, L 0.5 -0.5, L 0.5 0.5, Z", brStr = "M 0.5 -0.5, L 0.5 0.5, L -0.5 0.5, Z", conciseSymbolMap = {
-    tl: tlStr,
-    tr: trStr,
-    bl: blStr,
-    br: brStr,
-    lt: tlStr,
-    lb: blStr,
-    rt: trStr,
-    rb: brStr
-};
-
 class PopTip extends base_1.AbstractComponent {
     constructor(attributes, options) {
         super((null == options ? void 0 : options.skipDefault) ? attributes : (0, vutils_1.merge)({}, PopTip.defaultAttributes, attributes)), 
         this.name = "poptip", this.positionList = [ "top", "tl", "tr", "bottom", "bl", "br", "left", "lt", "lb", "right", "rt", "rb" ];
     }
     render() {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        const {titleStyle: titleStyle = {}, position: position, contentStyle: contentStyle = {}, panel: panel, logoSymbol: logoSymbol, logoText: logoText, logoTextStyle: logoTextStyle = {}, triangleMode: triangleMode = "default", space: space = 4, minWidth: minWidth = 0, maxWidth: maxWidth = 1 / 0, padding: padding = 4, maxWidthPercent: maxWidthPercent, visible: visible, state: state, dx: dx = 0, dy: dy = 0} = this.attribute;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
+        const {titleStyle: titleStyle = {}, position: position, contentStyle: contentStyle = {}, panel: panel = {}, space: space = 4, minWidth: minWidth = 0, maxWidth: maxWidth = 1 / 0, padding: padding = 4, maxWidthPercent: maxWidthPercent, visible: visible, state: state, dx: dx = 0, dy: dy = 0} = this.attribute;
         let {title: title = "", content: content = ""} = this.attribute;
         title = this.attribute.titleFormatMethod ? this.attribute.titleFormatMethod(title) : title, 
         content = this.attribute.contentFormatMethod ? this.attribute.contentFormatMethod(content) : content;
@@ -44,9 +33,7 @@ class PopTip extends base_1.AbstractComponent {
             x: 0,
             y: 0,
             zIndex: 1
-        }, "group");
-        this.group = group;
-        const maxLineWidth = maxWidth - parsedPadding[1] - parsedPadding[3], titleVisible = (0, 
+        }, "group"), maxLineWidth = maxWidth - parsedPadding[1] - parsedPadding[3], titleVisible = (0, 
         vutils_1.isValid)(title) && !1 !== visible, titleAttrs = Object.assign(Object.assign({
             text: (0, vutils_1.isArray)(title) ? title : [ title ],
             visible: titleVisible,
@@ -75,22 +62,11 @@ class PopTip extends base_1.AbstractComponent {
         }), contentShape = group.createOrUpdateChild("poptip-content", contentAttrs, "text");
         (0, vutils_1.isEmpty)(null == state ? void 0 : state.content) || (contentShape.states = state.content);
         const contentBounds = contentShape.AABBBounds, contentHeight = contentBounds.height(), contentWidth = contentBounds.width();
-        contentVisible && (height += contentHeight), this.titleShape = titleShape, this.contentShape = contentShape;
+        contentVisible && (height += contentHeight);
         let popTipWidth = (0, vutils_1.max)(titleWidth + parsedPadding[1] + parsedPadding[3], contentWidth + parsedPadding[1] + parsedPadding[3]);
         popTipWidth > maxWidth ? popTipWidth = maxWidth : popTipWidth < minWidth && (popTipWidth = minWidth);
         let poptipHeight = parsedPadding[0] + parsedPadding[2] + height;
-        const {visible: bgVisible, square: square} = panel, backgroundStyle = __rest(panel, [ "visible", "square" ]);
-        if (square) {
-            const maxWH = (0, vutils_1.max)(popTipWidth, poptipHeight);
-            popTipWidth = maxWH;
-            const deltaH = maxWH - poptipHeight;
-            poptipHeight = maxWH, titleShape.setAttributes({
-                dy: deltaH / 2
-            }), contentShape.setAttributes({
-                dy: deltaH / 2
-            });
-        }
-        const symbolSize = null !== (_a = backgroundStyle.size) && void 0 !== _a ? _a : 12, spaceSize = (0, 
+        const {visible: bgVisible} = panel, backgroundStyle = __rest(panel, [ "visible" ]), symbolSize = null !== (_a = backgroundStyle.size) && void 0 !== _a ? _a : 12, spaceSize = (0, 
         vutils_1.isArray)(symbolSize) ? [ symbolSize[0] + (null !== (_b = backgroundStyle.space) && void 0 !== _b ? _b : 0), symbolSize[1] + (null !== (_c = backgroundStyle.space) && void 0 !== _c ? _c : 0) ] : symbolSize + (null !== (_d = backgroundStyle.space) && void 0 !== _d ? _d : 0), lineWidth = null !== (_e = backgroundStyle.lineWidth) && void 0 !== _e ? _e : 1, range = this.stage ? [ null !== (_f = this.stage.viewWidth) && void 0 !== _f ? _f : this.stage.width, null !== (_g = this.stage.viewHeight) && void 0 !== _g ? _g : this.stage.height ] : void 0;
         if (range) {
             const b = this.AABBBounds, leftWidth = null !== (_h = this.attribute.x) && void 0 !== _h ? _h : b.x1, rightWidth = range[0] - b.x1;
@@ -107,75 +83,38 @@ class PopTip extends base_1.AbstractComponent {
         const layout = "auto" === position;
         let maxBBoxI, maxBBoxSize = -1 / 0;
         for (let i = 0; i < this.positionList.length + 1; i++) {
-            const p = layout ? this.positionList[i === this.positionList.length ? maxBBoxI : i] : position;
-            let symbolType = "arrow2Left", offsetX = ((0, vutils_1.isArray)(symbolSize) ? symbolSize[0] : symbolSize) / 4, offsetY = 0;
-            "top" === p || "bottom" === p || "left" === p || "right" === p ? symbolType = "arrow2Left" : "concise" === triangleMode && (symbolType = conciseSymbolMap[p], 
-            offsetX = [ "tl", "bl", "rt", "rb" ].includes(position) ? ((0, vutils_1.isArray)(symbolSize) ? symbolSize[0] : symbolSize) / 2 : -((0, 
-            vutils_1.isArray)(symbolSize) ? symbolSize[0] : symbolSize) / 2, offsetY = [ "tl", "tr", "lb", "rb" ].includes(position) ? -((0, 
-            vutils_1.isArray)(symbolSize) ? symbolSize[1] : symbolSize) / 2 : ((0, vutils_1.isArray)(symbolSize) ? symbolSize[1] : symbolSize) / 2);
-            const {angle: angle, offset: offset} = this.getAngleAndOffset(p, popTipWidth, poptipHeight, (0, 
-            vutils_1.isArray)(spaceSize) ? spaceSize : [ spaceSize, spaceSize - lineWidth ], symbolType);
+            const p = layout ? this.positionList[i === this.positionList.length ? maxBBoxI : i] : position, {angle: angle, offset: offset, rectOffset: rectOffset} = this.getAngleAndOffset(p, popTipWidth, poptipHeight, (0, 
+            vutils_1.isArray)(spaceSize) ? spaceSize : [ spaceSize, spaceSize - lineWidth ]);
             if ((0, vutils_1.isBoolean)(bgVisible)) {
-                const bgSymbol = group.createOrUpdateChild("poptip-symbol-panel", Object.assign(Object.assign({}, backgroundStyle), {
+                const offsetX = ((0, vutils_1.isArray)(symbolSize) ? symbolSize[0] : symbolSize) / 4, bgSymbol = group.createOrUpdateChild("poptip-symbol-panel", Object.assign(Object.assign({}, backgroundStyle), {
                     visible: bgVisible && (contentVisible || titleVisible),
                     x: offsetX,
-                    y: offsetY,
+                    y: 0,
                     strokeBoundsBuffer: -1,
                     boundsPadding: -2,
                     anchor: [ 0, 0 ],
-                    symbolType: symbolType,
+                    symbolType: "arrow2Left",
                     angle: angle,
                     dx: offset[0],
-                    dy: offset[1] - (null !== (_j = backgroundStyle.space) && void 0 !== _j ? _j : 0),
+                    dy: offset[1],
                     size: symbolSize,
-                    zIndex: 9
+                    zIndex: -9
                 }), "symbol");
-                let bgRect;
-                (0, vutils_1.isEmpty)(null == state ? void 0 : state.panel) || (bgSymbol.states = state.panel), 
-                bgRect = panel.panelSymbolType ? group.createOrUpdateChild("poptip-rect-panel", Object.assign(Object.assign({}, backgroundStyle), {
-                    visible: bgVisible && (contentVisible || titleVisible),
-                    x: 0,
-                    y: 0,
-                    symbolType: "rect",
-                    size: [ popTipWidth, poptipHeight ],
-                    zIndex: -8
-                }), "symbol") : group.createOrUpdateChild("poptip-rect-panel", Object.assign(Object.assign({}, backgroundStyle), {
+                (0, vutils_1.isEmpty)(null == state ? void 0 : state.panel) || (bgSymbol.states = state.panel);
+                const bgRect = group.createOrUpdateChild("poptip-rect-panel", Object.assign(Object.assign({}, backgroundStyle), {
                     visible: bgVisible && (contentVisible || titleVisible),
                     x: 0,
                     y: 0,
                     width: popTipWidth,
                     height: poptipHeight,
                     zIndex: -8
-                }), "rect"), (0, vutils_1.isEmpty)(null == state ? void 0 : state.panel) || (bgRect.states = state.panel);
+                }), "rect");
+                (0, vutils_1.isEmpty)(null == state ? void 0 : state.panel) || (bgRect.states = state.panel);
             }
             if (group.setAttributes({
                 x: -offset[0] + dx,
-                y: -offset[1] + dy,
-                anchor: [ offsetX, offsetY ]
-            }), logoSymbol) {
-                const {size: size = 12} = logoSymbol, sizeArray = (0, vutils_1.isArray)(size) ? size : [ size, size ];
-                "auto" === sizeArray[1] && (sizeArray[1] = poptipHeight), "auto" === sizeArray[0] && (sizeArray[0] = poptipHeight);
-                const sizeW = sizeArray[0];
-                group.createOrUpdateChild("poptip-logo", Object.assign(Object.assign({}, logoSymbol), {
-                    x: 0,
-                    y: poptipHeight / 2,
-                    visible: bgVisible && (contentVisible || titleVisible),
-                    zIndex: 10,
-                    size: sizeArray
-                }), "symbol"), group.setAttributes({
-                    x: -offset[0] + dx + sizeW / 2,
-                    y: -offset[1] + dy
-                }), logoText && group.createOrUpdateChild("poptip-logo-text", Object.assign(Object.assign({}, logoTextStyle), {
-                    x: 0,
-                    y: poptipHeight / 2,
-                    visible: bgVisible && (contentVisible || titleVisible),
-                    text: logoText,
-                    textAlign: "center",
-                    textBaseline: "middle",
-                    zIndex: 10
-                }), "text");
-            }
-            if (!layout || !range) break;
+                y: -offset[1] + dy
+            }), !layout || !range) break;
             {
                 _tBounds.setValue(0, 0, popTipWidth, poptipHeight).transformWithMatrix(group.globalTransMatrix);
                 const b = _tBounds, stageBounds = (new vutils_1.Bounds).setValue(0, 0, range[0], range[1]);
@@ -187,118 +126,94 @@ class PopTip extends base_1.AbstractComponent {
             }
         }
     }
-    getAngleAndOffset(position, width, height, size, symbolType) {
-        const sizeH = "arrow2Left" === symbolType ? size[1] / 2 : size[1];
+    getAngleAndOffset(position, width, height, size) {
+        const sizeH = size[1] / 2;
         switch (position) {
           case "tl":
             return {
-                angle: "arrow2Left" === symbolType ? vutils_1.pi / 2 * 3 : 0,
-                offset: "arrow2Left" === symbolType ? [ width / 4, height + sizeH ] : [ 0, height + sizeH ]
+                angle: vutils_1.pi / 2 * 3,
+                offset: [ width / 4, height + sizeH ],
+                rectOffset: [ -width / 4, -height - size[1] ]
             };
 
           case "top":
             return {
                 angle: vutils_1.pi / 2 * 3,
-                offset: [ width / 2, height + sizeH ]
+                offset: [ width / 2, height + sizeH ],
+                rectOffset: [ 0, -height - size[1] ]
             };
 
           case "tr":
             return {
-                angle: "arrow2Left" === symbolType ? vutils_1.pi / 2 * 3 : 0,
-                offset: "arrow2Left" === symbolType ? [ width / 4 * 3, height + sizeH ] : [ width, height + sizeH ]
+                angle: vutils_1.pi / 2 * 3,
+                offset: [ width / 4 * 3, height + sizeH ],
+                rectOffset: [ width / 4 * 3, -height - size[1] ]
             };
 
           case "rt":
             return {
                 angle: 0,
-                offset: "arrow2Left" === symbolType ? [ -sizeH, height / 5 ] : [ -sizeH, 0 ]
+                offset: [ -sizeH, height / 5 ],
+                rectOffset: [ width / 4 * 3, -height - size[1] ]
             };
 
           case "right":
             return {
                 angle: 0,
-                offset: [ -sizeH, height / 2 ]
+                offset: [ -sizeH, height / 2 ],
+                rectOffset: [ width / 4 * 3, -height - size[1] ]
             };
 
           case "rb":
             return {
                 angle: 0,
-                offset: "arrow2Left" === symbolType ? [ -sizeH, height / 5 * 4 ] : [ -sizeH, height ]
+                offset: [ -sizeH, height / 5 * 4 ],
+                rectOffset: [ width / 4 * 3, -height - size[1] ]
             };
 
           case "bl":
             return {
-                angle: "arrow2Left" === symbolType ? vutils_1.pi / 2 : 0,
-                offset: "arrow2Left" === symbolType ? [ width / 4, -sizeH ] : [ 0, -sizeH ]
+                angle: vutils_1.pi / 2,
+                offset: [ width / 4, -sizeH ],
+                rectOffset: [ -width / 4, -height - size[1] ]
             };
 
           case "bottom":
             return {
                 angle: vutils_1.pi / 2,
-                offset: [ width / 2, -sizeH ]
+                offset: [ width / 2, -sizeH ],
+                rectOffset: [ 0, -height - size[1] ]
             };
 
           case "br":
             return {
-                angle: "arrow2Left" === symbolType ? vutils_1.pi / 2 : 0,
-                offset: "arrow2Left" === symbolType ? [ width / 4 * 3, -sizeH ] : [ width, -sizeH ]
+                angle: vutils_1.pi / 2,
+                offset: [ width / 4 * 3, -sizeH ],
+                rectOffset: [ width / 4 * 3, -height - size[1] ]
             };
 
           case "lt":
             return {
-                angle: "arrow2Left" === symbolType ? vutils_1.pi : 0,
-                offset: "arrow2Left" === symbolType ? [ width + sizeH, height / 5 ] : [ width + sizeH, 0 ]
+                angle: vutils_1.pi,
+                offset: [ width + sizeH, height / 5 ],
+                rectOffset: [ -width / 4, -height - size[1] ]
             };
 
           case "left":
             return {
                 angle: vutils_1.pi,
-                offset: [ width + sizeH, height / 2 ]
+                offset: [ width + sizeH, height / 2 ],
+                rectOffset: [ 0, -height - size[1] ]
             };
 
           case "lb":
             return {
-                angle: "arrow2Left" === symbolType ? vutils_1.pi : 0,
-                offset: "arrow2Left" === symbolType ? [ width + sizeH, height / 5 * 4 ] : [ width + sizeH, height ]
+                angle: vutils_1.pi,
+                offset: [ width + sizeH, height / 5 * 4 ],
+                rectOffset: [ width / 4 * 3, -height - size[1] ]
             };
         }
     }
-    appearAnimate(animateConfig) {
-        const {duration: duration = 1e3, easing: easing = "quadOut"} = animateConfig;
-        if (this.setAttributes({
-            scaleX: 0,
-            scaleY: 0
-        }), this.animate().to({
-            scaleX: 1,
-            scaleY: 1
-        }, duration / 3 * 2, easing), this.titleShape && this.titleShape.animate().play(new vrender_core_1.InputText({
-            text: ""
-        }, {
-            text: this.titleShape.attribute.text
-        }, duration, easing)), this.contentShape && this.contentShape.animate().play(new vrender_core_1.InputText({
-            text: ""
-        }, {
-            text: this.contentShape.attribute.text
-        }, duration, easing)), animateConfig.wave) {
-            const dur = duration / 6;
-            this.group.animate().to({
-                angle: animateConfig.wave
-            }, dur, easing).to({
-                angle: -animateConfig.wave
-            }, 2 * dur, easing).to({
-                angle: animateConfig.wave
-            }, 2 * dur, easing).to({
-                angle: 0
-            }, dur, easing);
-        }
-    }
-    disappearAnimate(animateConfig) {
-        const {duration: duration = 1e3, easing: easing = "quadOut"} = animateConfig;
-        this.animate().to({
-            scaleX: 0,
-            scaleY: 0
-        }, duration, easing);
-    }
 }
 
 exports.PopTip = PopTip, PopTip.defaultAttributes = {
@@ -318,7 +233,6 @@ exports.PopTip = PopTip, PopTip.defaultAttributes = {
         textAlign: "left",
         textBaseline: "top"
     },
-    panel: {},
     maxWidthPercent: .8,
     space: 8,
     padding: 10