@visactor/vchart 1.3.0-beta.8 → 1.3.0

package/esm/component/legend/discrete/util.js

@@ -8,16 +8,16 @@ var __rest = this && this.__rest || function(s, e) {
     return t;
 };
 
-import { isEmpty, isValid, merge } from "@visactor/vutils";
+import { isEmpty, isValid } from "@visactor/vutils";
 
-import { isPercent } from "../../../util";
+import { isPercent, mergeSpec } from "../../../util";
 
 import { transformComponentStyle, transformToGraphic } from "../../../util/style";
 
 import { transformLegendTitleAttributes } from "../util";
 
 export function getLegendAttributes(spec, rect) {
-    const _a = merge({}, spec), {title: title = {}, item: item = {}, pager: pager = {}, background: background = {}, type: type, id: id, visible: visible, orient: orient, position: position, data: data, filter: filter, regionId: regionId, regionIndex: regionIndex, seriesIndex: seriesIndex, seriesId: seriesId, padding: padding} = _a, attrs = __rest(_a, [ "title", "item", "pager", "background", "type", "id", "visible", "orient", "position", "data", "filter", "regionId", "regionIndex", "seriesIndex", "seriesId", "padding" ]);
+    const _a = mergeSpec({}, spec), {title: title = {}, item: item = {}, pager: pager = {}, background: background = {}, type: type, id: id, visible: visible, orient: orient, position: position, data: data, filter: filter, regionId: regionId, regionIndex: regionIndex, seriesIndex: seriesIndex, seriesId: seriesId, padding: padding} = _a, attrs = __rest(_a, [ "title", "item", "pager", "background", "type", "id", "visible", "orient", "position", "data", "filter", "regionId", "regionIndex", "seriesIndex", "seriesId", "padding" ]);
     return title.visible && (attrs.title = transformLegendTitleAttributes(title)), isEmpty(item.focusIconStyle) || transformToGraphic(item.focusIconStyle), 
     item.shape = transformComponentStyle(item.shape), item.label = transformComponentStyle(item.label), 
     item.value = transformComponentStyle(item.value), item.background = transformComponentStyle(item.background), 
@@ -25,7 +25,7 @@ export function getLegendAttributes(spec, rect) {
     isPercent(item.width) && (item.width = Number(item.width.substring(0, item.width.length - 1)) * rect.width / 100), 
     isPercent(item.height) && (item.height = Number(item.height.substring(0, item.height.length - 1)) * rect.width / 100), 
     attrs.item = item, isEmpty(pager.textStyle) || transformToGraphic(pager.textStyle), 
-    transformComponentStyle(pager.handler), attrs.pager = pager, background.visible && !isEmpty(background.style) && (merge(attrs, background.style), 
+    transformComponentStyle(pager.handler), attrs.pager = pager, background.visible && !isEmpty(background.style) && (mergeSpec(attrs, background.style), 
     isValid(background.padding) && (attrs.padding = background.padding)), attrs;
 }
 //# sourceMappingURL=util.js.map

package/esm/component/legend/discrete/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/legend/discrete/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["/* eslint-disable @typescript-eslint/no-unused-vars */\nimport { isEmpty, isValid, merge } from '@visactor/vutils';\nimport type { ILayoutRect } from '../../../model/interface';\nimport { isPercent } from '../../../util';\nimport { transformComponentStyle, transformToGraphic } from '../../../util/style';\nimport { transformLegendTitleAttributes } from '../util';\nimport type { IDiscreteLegendSpec } from './interface';\n\nexport function getLegendAttributes(spec: IDiscreteLegendSpec, rect: ILayoutRect) {\n  const {\n    // 需要进行样式转换的属性\n    title = {},\n    item = {},\n    pager = {},\n    background = {},\n\n    // 以下不属于 legend 需要的属性，单独拿出来以免污染传递给组件的属性\n    type,\n    id,\n    visible,\n    orient,\n    position,\n    data,\n    filter,\n    regionId,\n    regionIndex,\n    seriesIndex,\n    seriesId,\n    padding, // vchart 布局模块已经处理了\n\n    ...restSpec\n  } = merge({}, spec);\n\n  const attrs: any = restSpec;\n\n  // transform title\n  if (title.visible) {\n    attrs.title = transformLegendTitleAttributes(title);\n  }\n\n  // transform item\n  if (!isEmpty(item.focusIconStyle)) {\n    transformToGraphic(item.focusIconStyle);\n  }\n  item.shape = transformComponentStyle(item.shape);\n  item.label = transformComponentStyle(item.label);\n  item.value = transformComponentStyle(item.value);\n  item.background = transformComponentStyle(item.background);\n\n  if (isPercent(item.maxWidth)) {\n    item.maxWidth = (Number(item.maxWidth.substring(0, item.maxWidth.length - 1)) * rect.width) / 100;\n  }\n  if (isPercent(item.width)) {\n    item.width = (Number(item.width.substring(0, item.width.length - 1)) * rect.width) / 100;\n  }\n  if (isPercent(item.height)) {\n    item.height = (Number(item.height.substring(0, item.height.length - 1)) * rect.width) / 100;\n  }\n  attrs.item = item;\n\n  // transform pager\n  if (!isEmpty(pager.textStyle)) {\n    transformToGraphic(pager.textStyle);\n  }\n  transformComponentStyle(pager.handler);\n  attrs.pager = pager;\n\n  if (background.visible && !isEmpty(background.style)) {\n    merge(attrs, background.style);\n    if (isValid(background.padding)) {\n      attrs.padding = background.padding;\n    }\n  }\n\n  return attrs;\n}\n"]}
+{"version":3,"sources":["../src/component/legend/discrete/util.ts"],"names":[],"mappings":"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","file":"util.js","sourcesContent":["/* eslint-disable @typescript-eslint/no-unused-vars */\nimport { isEmpty, isValid } from '@visactor/vutils';\nimport type { ILayoutRect } from '../../../model/interface';\nimport { isPercent, mergeSpec } from '../../../util';\nimport { transformComponentStyle, transformToGraphic } from '../../../util/style';\nimport { transformLegendTitleAttributes } from '../util';\nimport type { IDiscreteLegendSpec } from './interface';\n\nexport function getLegendAttributes(spec: IDiscreteLegendSpec, rect: ILayoutRect) {\n  const {\n    // 需要进行样式转换的属性\n    title = {},\n    item = {},\n    pager = {},\n    background = {},\n\n    // 以下不属于 legend 需要的属性，单独拿出来以免污染传递给组件的属性\n    type,\n    id,\n    visible,\n    orient,\n    position,\n    data,\n    filter,\n    regionId,\n    regionIndex,\n    seriesIndex,\n    seriesId,\n    padding, // vchart 布局模块已经处理了\n\n    ...restSpec\n  } = mergeSpec({}, spec);\n\n  const attrs: any = restSpec;\n\n  // transform title\n  if (title.visible) {\n    attrs.title = transformLegendTitleAttributes(title);\n  }\n\n  // transform item\n  if (!isEmpty(item.focusIconStyle)) {\n    transformToGraphic(item.focusIconStyle);\n  }\n  item.shape = transformComponentStyle(item.shape);\n  item.label = transformComponentStyle(item.label);\n  item.value = transformComponentStyle(item.value);\n  item.background = transformComponentStyle(item.background);\n\n  if (isPercent(item.maxWidth)) {\n    item.maxWidth = (Number(item.maxWidth.substring(0, item.maxWidth.length - 1)) * rect.width) / 100;\n  }\n  if (isPercent(item.width)) {\n    item.width = (Number(item.width.substring(0, item.width.length - 1)) * rect.width) / 100;\n  }\n  if (isPercent(item.height)) {\n    item.height = (Number(item.height.substring(0, item.height.length - 1)) * rect.width) / 100;\n  }\n  attrs.item = item;\n\n  // transform pager\n  if (!isEmpty(pager.textStyle)) {\n    transformToGraphic(pager.textStyle);\n  }\n  transformComponentStyle(pager.handler);\n  attrs.pager = pager;\n\n  if (background.visible && !isEmpty(background.style)) {\n    mergeSpec(attrs, background.style);\n    if (isValid(background.padding)) {\n      attrs.padding = background.padding;\n    }\n  }\n\n  return attrs;\n}\n"]}

package/esm/component/legend/interface.d.ts

@@ -1,7 +1,7 @@
 import type { LegendTitle } from '@visactor/vrender-components';
 import type { Datum, IOrientType, IPadding, IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';
 import type { IComponent } from '../interface';
-import type { IModelSpec } from '../../model/interface';
+import type { IComponentSpec } from '../base/interface';
 export type ILegend = IComponent & {
     getLegendData: () => Datum[];
     getSelectedData: () => StringOrNumber[];
@@ -32,8 +32,4 @@ export type ILegendCommonSpec = {
         padding?: IPadding | number | number[];
         style?: Omit<NoVisibleMarkStyle<IRectMarkSpec>, 'visible' | 'width' | 'height'>;
     };
-    regionIndex?: number | number[];
-    regionId?: StringOrNumber | StringOrNumber[];
-    seriesIndex?: number | number[];
-    seriesId?: StringOrNumber | StringOrNumber[];
-} & Omit<IModelSpec, 'orient'>;
+} & Omit<IComponentSpec, 'orient'>;

package/esm/component/legend/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/legend/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { LegendTitle } from '@visactor/vrender-components';\nimport type {\n  Datum,\n  IOrientType,\n  IPadding,\n  IRectMarkSpec,\n  ISymbolMarkSpec,\n  ITextMarkSpec,\n  StringOrNumber\n} from '../../typings';\nimport type { IComponent } from '../interface';\nimport type { IModelSpec } from '../../model/interface';\n\nexport type ILegend = IComponent & {\n  getLegendData: () => Datum[];\n  getSelectedData: () => StringOrNumber[];\n  setSelectedData: (d: StringOrNumber[]) => void;\n};\n\nexport type NoVisibleMarkStyle<T> = Omit<T, 'visible'>;\n\nexport type ITitle = {\n  /** 标题文本样式 */\n  textStyle?: NoVisibleMarkStyle<ITextMarkSpec>;\n  /**\n   * @deprecated 请使用 textStyle 配置文本样式\n   */\n  style?: NoVisibleMarkStyle<ITextMarkSpec>;\n  /** 文本前 mark 图元 */\n  shape?: {\n    /**\n     * 是否展示 shape\n     */\n    visible?: boolean;\n    /**\n     * shape 同 文本的间距\n     */\n    space?: number;\n    style?: NoVisibleMarkStyle<ISymbolMarkSpec>;\n  };\n  /**\n   * 标题的背景面板配置\n   */\n  background?: {\n    /**\n     * 是否绘制背景层\n     */\n    visible?: boolean;\n    /**\n     * 背景层样式\n     */\n    style?: Omit<NoVisibleMarkStyle<IRectMarkSpec>, 'visible' | 'width' | 'height'>;\n  };\n} & Omit<LegendTitle, 'textStyle' | 'style' | 'background'>;\n\n// 图例组件通用配置\nexport type ILegendCommonSpec = {\n  /**\n   * 是否显示图例\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 图例位置\n   * @default 'left'\n   */\n  orient?: IOrientType;\n  /**\n   * 图例在当前行列的对齐方式，起始 | 居中 | 末尾\n   * @default 'middle'\n   */\n  position?: 'start' | 'middle' | 'end';\n\n  /**\n   * 是否进行数据筛选，默认为 true\n   */\n  filter?: boolean;\n\n  /**\n   * 图例标题配置\n   */\n  title?: ITitle;\n\n  /**\n   * 图例背景配置\n   */\n  background?: {\n    /**\n     * 是否绘制背景层\n     */\n    visible?: boolean;\n    /**\n     * 背景内边距\n     */\n    padding?: IPadding | number | number[];\n    /**\n     * 背景层样式\n     */\n    style?: Omit<NoVisibleMarkStyle<IRectMarkSpec>, 'visible' | 'width' | 'height'>;\n  };\n\n  /**\n   * 图例关联的region索引\n   * @default 0\n   */\n  regionIndex?: number | number[];\n  /**\n   * 图例关联的region id\n   */\n  regionId?: StringOrNumber | StringOrNumber[];\n  /**\n   * 图例关联的系列索引\n   */\n  seriesIndex?: number | number[];\n  /**\n   * 图例关联的系列id\n   */\n  seriesId?: StringOrNumber | StringOrNumber[];\n} & Omit<IModelSpec, 'orient'>;\n"]}
+{"version":3,"sources":["../src/component/legend/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { LegendTitle } from '@visactor/vrender-components';\nimport type {\n  Datum,\n  IOrientType,\n  IPadding,\n  IRectMarkSpec,\n  ISymbolMarkSpec,\n  ITextMarkSpec,\n  StringOrNumber\n} from '../../typings';\nimport type { IComponent } from '../interface';\nimport type { IComponentSpec } from '../base/interface';\n\nexport type ILegend = IComponent & {\n  getLegendData: () => Datum[];\n  getSelectedData: () => StringOrNumber[];\n  setSelectedData: (d: StringOrNumber[]) => void;\n};\n\nexport type NoVisibleMarkStyle<T> = Omit<T, 'visible'>;\n\nexport type ITitle = {\n  /** 标题文本样式 */\n  textStyle?: NoVisibleMarkStyle<ITextMarkSpec>;\n  /**\n   * @deprecated 请使用 textStyle 配置文本样式\n   */\n  style?: NoVisibleMarkStyle<ITextMarkSpec>;\n  /** 文本前 mark 图元 */\n  shape?: {\n    /**\n     * 是否展示 shape\n     */\n    visible?: boolean;\n    /**\n     * shape 同 文本的间距\n     */\n    space?: number;\n    style?: NoVisibleMarkStyle<ISymbolMarkSpec>;\n  };\n  /**\n   * 标题的背景面板配置\n   */\n  background?: {\n    /**\n     * 是否绘制背景层\n     */\n    visible?: boolean;\n    /**\n     * 背景层样式\n     */\n    style?: Omit<NoVisibleMarkStyle<IRectMarkSpec>, 'visible' | 'width' | 'height'>;\n  };\n} & Omit<LegendTitle, 'textStyle' | 'style' | 'background'>;\n\n// 图例组件通用配置\nexport type ILegendCommonSpec = {\n  /**\n   * 是否显示图例\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * 图例位置\n   * @default 'left'\n   */\n  orient?: IOrientType;\n  /**\n   * 图例在当前行列的对齐方式，起始 | 居中 | 末尾\n   * @default 'middle'\n   */\n  position?: 'start' | 'middle' | 'end';\n\n  /**\n   * 是否进行数据筛选，默认为 true\n   */\n  filter?: boolean;\n\n  /**\n   * 图例标题配置\n   */\n  title?: ITitle;\n\n  /**\n   * 图例背景配置\n   */\n  background?: {\n    /**\n     * 是否绘制背景层\n     */\n    visible?: boolean;\n    /**\n     * 背景内边距\n     */\n    padding?: IPadding | number | number[];\n    /**\n     * 背景层样式\n     */\n    style?: Omit<NoVisibleMarkStyle<IRectMarkSpec>, 'visible' | 'width' | 'height'>;\n  };\n} & Omit<IComponentSpec, 'orient'>;\n"]}

package/esm/component/legend/util.js

@@ -1,4 +1,6 @@
-import { isEmpty, merge } from "@visactor/vutils";
+import { isEmpty } from "@visactor/vutils";
+
+import { mergeSpec } from "../../util";
 
 import { transformToGraphic } from "../../util/style";
 
@@ -6,7 +8,7 @@ export function transformLegendTitleAttributes(title) {
     var _a, _b;
     const transformedTitle = Object.assign({}, title);
     return isEmpty(title.style) || (transformedTitle.textStyle = transformToGraphic(title.style)), 
-    isEmpty(title.textStyle) || merge(transformedTitle.textStyle, transformToGraphic(title.textStyle)), 
+    isEmpty(title.textStyle) || mergeSpec(transformedTitle.textStyle, transformToGraphic(title.textStyle)), 
     (null === (_a = title.shape) || void 0 === _a ? void 0 : _a.style) && transformToGraphic(transformedTitle.shape.style), 
     (null === (_b = title.background) || void 0 === _b ? void 0 : _b.style) && transformToGraphic(transformedTitle.background.style), 
     transformedTitle;

package/esm/component/legend/util.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/legend/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,UAAU,8BAA8B,CAAC,KAAa;;IAC1D,MAAM,gBAAgB,qBACjB,KAAK,CACT,CAAC;IACF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QACzB,gBAAgB,CAAC,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAC9D;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;QAC7B,KAAK,CAAC,gBAAgB,CAAC,SAAS,EAAE,kBAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;KACxE;IAED,IAAI,MAAA,KAAK,CAAC,KAAK,0CAAE,KAAK,EAAE;QACtB,kBAAkB,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAClD;IAED,IAAI,MAAA,KAAK,CAAC,UAAU,0CAAE,KAAK,EAAE;QAC3B,kBAAkB,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KACvD;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAOD,MAAM,UAAU,SAAS,CAAC,IAAuB;IAC/C,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC;AACvF,CAAC","file":"util.js","sourcesContent":["import type { ILegendCommonSpec, ITitle } from './interface';\nimport { isEmpty, merge } from '@visactor/vutils';\nimport { transformToGraphic } from '../../util/style';\n\nexport function transformLegendTitleAttributes(title: ITitle) {\n  const transformedTitle = {\n    ...title\n  };\n  if (!isEmpty(title.style)) {\n    transformedTitle.textStyle = transformToGraphic(title.style);\n  }\n  if (!isEmpty(title.textStyle)) {\n    merge(transformedTitle.textStyle, transformToGraphic(title.textStyle));\n  }\n\n  if (title.shape?.style) {\n    transformToGraphic(transformedTitle.shape.style);\n  }\n\n  if (title.background?.style) {\n    transformToGraphic(transformedTitle.background.style);\n  }\n  return transformedTitle;\n}\n\n/**\n * 根据图例 spec.orient 参数判断是水平还是垂直布局\n * @param spec\n * @returns\n */\nexport function getLayout(spec: ILegendCommonSpec) {\n  return spec.orient === 'bottom' || spec.orient === 'top' ? 'horizontal' : 'vertical';\n}\n"]}
+{"version":3,"sources":["../src/component/legend/util.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAEtD,MAAM,UAAU,8BAA8B,CAAC,KAAa;;IAC1D,MAAM,gBAAgB,qBACjB,KAAK,CACT,CAAC;IACF,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QACzB,gBAAgB,CAAC,SAAS,GAAG,kBAAkB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAC9D;IACD,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,CAAC,EAAE;QAC7B,SAAS,CAAC,gBAAgB,CAAC,SAAS,EAAE,kBAAkB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC;KAC5E;IAED,IAAI,MAAA,KAAK,CAAC,KAAK,0CAAE,KAAK,EAAE;QACtB,kBAAkB,CAAC,gBAAgB,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;KAClD;IAED,IAAI,MAAA,KAAK,CAAC,UAAU,0CAAE,KAAK,EAAE;QAC3B,kBAAkB,CAAC,gBAAgB,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC;KACvD;IACD,OAAO,gBAAgB,CAAC;AAC1B,CAAC;AAOD,MAAM,UAAU,SAAS,CAAC,IAAuB;IAC/C,OAAO,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,MAAM,KAAK,KAAK,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,UAAU,CAAC;AACvF,CAAC","file":"util.js","sourcesContent":["import type { ILegendCommonSpec, ITitle } from './interface';\nimport { isEmpty } from '@visactor/vutils';\nimport { mergeSpec } from '../../util';\nimport { transformToGraphic } from '../../util/style';\n\nexport function transformLegendTitleAttributes(title: ITitle) {\n  const transformedTitle = {\n    ...title\n  };\n  if (!isEmpty(title.style)) {\n    transformedTitle.textStyle = transformToGraphic(title.style);\n  }\n  if (!isEmpty(title.textStyle)) {\n    mergeSpec(transformedTitle.textStyle, transformToGraphic(title.textStyle));\n  }\n\n  if (title.shape?.style) {\n    transformToGraphic(transformedTitle.shape.style);\n  }\n\n  if (title.background?.style) {\n    transformToGraphic(transformedTitle.background.style);\n  }\n  return transformedTitle;\n}\n\n/**\n * 根据图例 spec.orient 参数判断是水平还是垂直布局\n * @param spec\n * @returns\n */\nexport function getLayout(spec: ILegendCommonSpec) {\n  return spec.orient === 'bottom' || spec.orient === 'top' ? 'horizontal' : 'vertical';\n}\n"]}

package/esm/component/marker/interface.d.ts

@@ -1,7 +1,7 @@
 import type { IPadding, IPointLike } from '@visactor/vutils';
 import type { SymbolType } from '@visactor/vrender';
-import type { IModelSpec } from '../../model/interface';
 import type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';
+import type { IComponentSpec } from '../base/interface';
 export type IAggrType = 'sum' | 'average' | 'min' | 'max' | 'variance' | 'standardDeviation' | 'median';
 export type IDataPos = string | number | IAggrType;
 export type IDataPosCallback = (relativeSeriesData: any, startRelativeSeriesData: any, endRelativeSeriesData: any) => IDataPos;
@@ -44,7 +44,7 @@ export interface IMarkerAxisSpec {
     endRelativeSeriesId?: string;
     relativeRelativeSeriesIndex?: number;
 }
-export interface IMarkerSpec extends IModelSpec {
+export interface IMarkerSpec extends IComponentSpec {
     relativeSeriesIndex?: number;
     relativeSeriesId?: number;
     visible?: boolean;

package/esm/component/marker/interface.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/marker/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPadding, IPointLike } from '@visactor/vutils';\nimport type { SymbolType } from '@visactor/vrender';\nimport type { IModelSpec } from '../../model/interface';\nimport type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';\n\nexport type IAggrType = 'sum' | 'average' | 'min' | 'max' | 'variance' | 'standardDeviation' | 'median';\nexport type IDataPos = string | number | IAggrType;\nexport type IDataPosCallback = (\n  relativeSeriesData: any,\n  startRelativeSeriesData: any,\n  endRelativeSeriesData: any\n) => IDataPos;\nexport type IDataPointSpec = {\n  [key: string]: IDataPos;\n  /**\n   * 具体某个数据元素关联的series（仅在标注目标：数据元素下有效）\n   */\n  refRelativeSeriesIndex?: number;\n  refRelativeSeriesId?: StringOrNumber;\n};\nexport type IMarkerPositionsSpec = {\n  positions: IPointLike[];\n};\n\nexport type IMarkerLabelSpec = {\n  visible?: boolean;\n  /**\n   * label整体 - 是否自动旋转\n   */\n  autoRotate?: boolean;\n  /**\n   * label整体 - 最小宽度，像素值\n   * @default 30\n   */\n  minWidth?: number;\n  /**\n   * label整体 - 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  /**\n   * label整体 - 背景面板配置\n   */\n  labelBackground?: {\n    visible?: boolean;\n    /**\n     * 内部边距\n     */\n    padding?: IPadding;\n    style: Omit<IRectMarkSpec, 'visible'>;\n  };\n  /**\n   * label文本 - 文本内容，如果需要进行换行，则使用数组形式，如 ['abc', '123']\n   */\n  text?: string | string[] | number | number[];\n  /**\n   * label文本 - 文本格式化\n   * @param datum marker组件聚合或回归计算后的数据值\n   * @returns 格式化后的文本\n   */\n  formatMethod?: (datum: IDataPos) => string | string[] | number | number[];\n  /**\n   * label文本 - 文本样式\n   */\n  style?: Omit<ITextMarkSpec, 'visible'>;\n\n  /**\n   * label文本 - 文本前 mark 图元\n   */\n  shape?: {\n    visible?: boolean;\n    style: Omit<ISymbolMarkSpec, 'visible'>;\n  };\n  /**\n   * label文本 - shape 同文本之间的间距\n   */\n  space?: number;\n} & IMarkerRef;\n\nexport interface IMarkerRef {\n  /**\n   * label or symbol 相对line平行方向上的偏移\n   */\n  refX?: number;\n  /**\n   * label or symbol 相对line正交方向上的偏移\n   */\n  refY?: number;\n  /**\n   * label or symbol 相对默认角度的偏移 （label跟随line的角度做自动旋转时，默认按照line的平行向量作为初始角度）\n   */\n  refAngle?: number;\n}\n\nexport interface IMarkerAxisSpec {\n  /**\n   * 起点和终点关联的series（仅在标注目标：坐标空间下有效）\n   */\n  startRelativeSeriesIndex?: number;\n  endRelativeSeriesIndex?: number;\n  startRelativeSeriesId?: string;\n  endRelativeSeriesId?: string;\n  /**\n   * 被标注数据关联的series\n   */\n  relativeRelativeSeriesIndex?: number;\n}\n\nexport interface IMarkerSpec extends IModelSpec {\n  /**\n   * 标注数据关联的series\n   */\n  relativeSeriesIndex?: number;\n  relativeSeriesId?: number;\n  /**\n   * marker组件是否可见\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * marker组件是否可交互\n   * @default false\n   */\n  interactive?: boolean;\n  /**\n   * marker组件是否自动拓展轴范围\n   * @default false\n   * @since 1.1.0\n   */\n  autoRange?: boolean;\n  /**\n   * marker组件超出图表区域是否被裁剪\n   * @default false\n   * @since 1.3.0\n   */\n  clip?: boolean;\n}\n\nexport interface IMarkerSymbol extends IMarkerRef {\n  /** 是否展示 symbol */\n  visible: boolean;\n  /**\n   * symbol 形状，默认为带左右方向的箭头\n   */\n  symbolType?: SymbolType;\n  /**\n   * symbol 大小\n   */\n  size?: number;\n  style?: Omit<ISymbolMarkSpec, 'visible'>;\n}\n"]}
+{"version":3,"sources":["../src/component/marker/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { IPadding, IPointLike } from '@visactor/vutils';\nimport type { SymbolType } from '@visactor/vrender';\nimport type { IModelSpec } from '../../model/interface';\nimport type { IRectMarkSpec, ISymbolMarkSpec, ITextMarkSpec, StringOrNumber } from '../../typings';\nimport type { IComponentSpec } from '../base/interface';\n\nexport type IAggrType = 'sum' | 'average' | 'min' | 'max' | 'variance' | 'standardDeviation' | 'median';\nexport type IDataPos = string | number | IAggrType;\nexport type IDataPosCallback = (\n  relativeSeriesData: any,\n  startRelativeSeriesData: any,\n  endRelativeSeriesData: any\n) => IDataPos;\nexport type IDataPointSpec = {\n  [key: string]: IDataPos;\n  /**\n   * 具体某个数据元素关联的series（仅在标注目标：数据元素下有效）\n   */\n  refRelativeSeriesIndex?: number;\n  refRelativeSeriesId?: StringOrNumber;\n};\nexport type IMarkerPositionsSpec = {\n  positions: IPointLike[];\n};\n\nexport type IMarkerLabelSpec = {\n  visible?: boolean;\n  /**\n   * label整体 - 是否自动旋转\n   */\n  autoRotate?: boolean;\n  /**\n   * label整体 - 最小宽度，像素值\n   * @default 30\n   */\n  minWidth?: number;\n  /**\n   * label整体 - 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  /**\n   * label整体 - 背景面板配置\n   */\n  labelBackground?: {\n    visible?: boolean;\n    /**\n     * 内部边距\n     */\n    padding?: IPadding;\n    style: Omit<IRectMarkSpec, 'visible'>;\n  };\n  /**\n   * label文本 - 文本内容，如果需要进行换行，则使用数组形式，如 ['abc', '123']\n   */\n  text?: string | string[] | number | number[];\n  /**\n   * label文本 - 文本格式化\n   * @param datum marker组件聚合或回归计算后的数据值\n   * @returns 格式化后的文本\n   */\n  formatMethod?: (datum: IDataPos) => string | string[] | number | number[];\n  /**\n   * label文本 - 文本样式\n   */\n  style?: Omit<ITextMarkSpec, 'visible'>;\n\n  /**\n   * label文本 - 文本前 mark 图元\n   */\n  shape?: {\n    visible?: boolean;\n    style: Omit<ISymbolMarkSpec, 'visible'>;\n  };\n  /**\n   * label文本 - shape 同文本之间的间距\n   */\n  space?: number;\n} & IMarkerRef;\n\nexport interface IMarkerRef {\n  /**\n   * label or symbol 相对line平行方向上的偏移\n   */\n  refX?: number;\n  /**\n   * label or symbol 相对line正交方向上的偏移\n   */\n  refY?: number;\n  /**\n   * label or symbol 相对默认角度的偏移 （label跟随line的角度做自动旋转时，默认按照line的平行向量作为初始角度）\n   */\n  refAngle?: number;\n}\n\nexport interface IMarkerAxisSpec {\n  /**\n   * 起点和终点关联的series（仅在标注目标：坐标空间下有效）\n   */\n  startRelativeSeriesIndex?: number;\n  endRelativeSeriesIndex?: number;\n  startRelativeSeriesId?: string;\n  endRelativeSeriesId?: string;\n  /**\n   * 被标注数据关联的series\n   */\n  relativeRelativeSeriesIndex?: number;\n}\n\nexport interface IMarkerSpec extends IComponentSpec {\n  /**\n   * 标注数据关联的series\n   */\n  relativeSeriesIndex?: number;\n  relativeSeriesId?: number;\n  /**\n   * marker组件是否可见\n   * @default true\n   */\n  visible?: boolean;\n  /**\n   * marker组件是否可交互\n   * @default false\n   */\n  interactive?: boolean;\n  /**\n   * marker组件是否自动拓展轴范围\n   * @default false\n   * @since 1.1.0\n   */\n  autoRange?: boolean;\n  /**\n   * marker组件超出图表区域是否被裁剪\n   * @default false\n   * @since 1.3.0\n   */\n  clip?: boolean;\n}\n\nexport interface IMarkerSymbol extends IMarkerRef {\n  /** 是否展示 symbol */\n  visible: boolean;\n  /**\n   * symbol 形状，默认为带左右方向的箭头\n   */\n  symbolType?: SymbolType;\n  /**\n   * symbol 大小\n   */\n  size?: number;\n  style?: Omit<ISymbolMarkSpec, 'visible'>;\n}\n"]}

package/esm/component/poptip/interface.d.ts

@@ -0,0 +1,15 @@
+import type { PopTipAttributes } from '@visactor/vrender-components';
+import type { IColorKey } from '../../theme/color-scheme/interface';
+export interface IPoptipTheme extends Omit<PopTipAttributes, 'titleStyle' | 'contentStyle' | 'panel'> {
+    titleStyle?: Partial<Omit<PopTipAttributes['titleStyle'], 'fill'>> & {
+        fill?: PopTipAttributes['titleStyle']['fill'] | IColorKey;
+    };
+    contentStyle?: Partial<Omit<PopTipAttributes['contentStyle'], 'fill'>> & {
+        fill?: PopTipAttributes['contentStyle']['fill'] | IColorKey;
+    };
+    panel?: Partial<Omit<PopTipAttributes['panel'], 'fill' | 'stroke' | 'shadowColor'>> & {
+        fill?: PopTipAttributes['panel']['fill'] | IColorKey;
+        stroke?: PopTipAttributes['panel']['stroke'] | IColorKey;
+        shadowColor?: PopTipAttributes['panel']['shadowColor'] | IColorKey;
+    };
+}

package/esm/component/poptip/interface.js

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

package/esm/component/poptip/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/component/poptip/interface.ts"],"names":[],"mappings":"","file":"interface.js","sourcesContent":["import type { PopTipAttributes } from '@visactor/vrender-components';\nimport type { IColorKey } from '../../theme/color-scheme/interface';\n\nexport interface IPoptipTheme extends Omit<PopTipAttributes, 'titleStyle' | 'contentStyle' | 'panel'> {\n  titleStyle?: Partial<Omit<PopTipAttributes['titleStyle'], 'fill'>> & {\n    fill?: PopTipAttributes['titleStyle']['fill'] | IColorKey;\n  };\n  contentStyle?: Partial<Omit<PopTipAttributes['contentStyle'], 'fill'>> & {\n    fill?: PopTipAttributes['contentStyle']['fill'] | IColorKey;\n  };\n  panel?: Partial<Omit<PopTipAttributes['panel'], 'fill' | 'stroke' | 'shadowColor'>> & {\n    fill?: PopTipAttributes['panel']['fill'] | IColorKey;\n    stroke?: PopTipAttributes['panel']['stroke'] | IColorKey;\n    shadowColor?: PopTipAttributes['panel']['shadowColor'] | IColorKey;\n  };\n}\n"]}

package/esm/component/title/interface/spec.d.ts

@@ -1,8 +1,8 @@
 import type { IComponent } from '../../interface';
 import type { ITextGraphicAttribute, IRichTextCharacter, RichTextWordBreak } from '@visactor/vrender';
-import type { IModelSpec } from '../../../model/interface';
 import type { IOrientType, IPadding, StringOrNumber } from '../../../typings';
-export interface ITitleSpec extends Omit<IModelSpec, 'orient'> {
+import type { IComponentSpec } from '../../base/interface';
+export interface ITitleSpec extends Omit<IComponentSpec, 'orient'> {
     visible?: boolean;
     orient?: IOrientType;
     text: Text | Text[];

package/esm/component/title/interface/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/title/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IComponent } from '../../interface';\nimport type { ITextGraphicAttribute, IRichTextCharacter, RichTextWordBreak } from '@visactor/vrender';\nimport type { IModelSpec } from '../../../model/interface';\nimport type { IOrientType, IPadding, StringOrNumber } from '../../../typings';\n\nexport interface ITitleSpec extends Omit<IModelSpec, 'orient'> {\n  /**\n   * 是否显示标题\n   */\n  visible?: boolean;\n  /**\n   * Title位置\n   * @default 'top'\n   */\n  orient?: IOrientType;\n  /**\n   * 主标题内容\n   */\n  text: Text | Text[];\n  /**\n   * 副标题内容\n   */\n  subtext?: Text | Text[];\n  /**\n   * 标题左上角x坐标像素值\n   */\n  x?: number;\n  /**\n   * 标题左上角y坐标像素值\n   */\n  y?: number;\n  /**\n   * 标题宽度\n   */\n  width?: number;\n  /**\n   * 标题高度\n   */\n  height?: number;\n  /**\n   * 最小宽度，像素值\n   */\n  minWidth?: number;\n  /**\n   * 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  /**\n   * 最小高度，像素值\n   */\n  minHeight?: number;\n  /**\n   * 最大高度，像素值\n   */\n  maxHeight?: number;\n  /**\n   * 标题的边距留白\n   */\n  innerPadding?: IPadding | number | number[];\n  /**\n   * 文字水平对齐方式\n   * 'left' | 'center' | 'right'\n   */\n  align?: string;\n  /**\n   * 文字垂直对齐方式\n   * 'top' | 'middle' | 'bottom'\n   */\n  verticalAlign?: string;\n  /**\n   * 主标题样式\n   */\n  textStyle?: {\n    width?: number;\n    height?: number;\n    /**\n     * 文字水平对齐方式\n     * 'left' | 'center' | 'right'\n     */\n    align?: string;\n    /**\n     * 文字垂直对齐方式\n     * 'top' | 'middle' | 'bottom'\n     */\n    verticalAlign?: string;\n    /**\n     * 折行方式\n     * 'break-word' | 'break-all'\n     */\n    wordBreak?: RichTextWordBreak;\n    /**\n     * 按照宽度限制自动折行或显示省略号(maxLineWidth)\n     * 默认设置为title宽度\n     */\n    maxLineWidth?: number;\n    /**\n     * 高度限制控制显示内容及省略号(heightLimit)\n     */\n    heightLimit?: number;\n    /**\n     * 按照行数限制显示内容及省略号(lineClamp)\n     */\n    lineClamp?: number;\n    /**\n     * 富文本配置\n     */\n    character?: IRichTextCharacter[];\n  } & Partial<ITextGraphicAttribute>;\n  /**\n   * 副标题样式\n   */\n  subtextStyle?: {\n    /** 指定宽度 */\n    width?: number;\n    /** 指定高度 */\n    height?: number;\n    /**\n     * 文字水平对齐方式\n     * 'left' | 'center' | 'right'\n     */\n    align?: string;\n    /**\n     * 文字垂直对齐方式\n     * 'top' | 'middle' | 'bottom'\n     */\n    verticalAlign?: string;\n    /**\n     * 折行方式\n     * 'break-word' | 'break-all'\n     */\n    wordBreak?: RichTextWordBreak;\n    /**\n     * 按照宽度限制自动折行或显示省略号(maxLineWidth)\n     * 默认设置为title宽度\n     */\n    maxLineWidth?: number;\n    /**\n     * 高度限制控制显示内容及省略号(heightLimit)\n     */\n    heightLimit?: number;\n    /**\n     * 按照行数限制显示内容及省略号(lineClamp)\n     */\n    lineClamp?: number;\n    /**\n     * 富文本配置\n     */\n    character?: IRichTextCharacter[];\n  } & Partial<ITextGraphicAttribute>;\n}\n\nexport type Text = StringOrNumber;\n\nexport type ITitle = IComponent;\n"]}
+{"version":3,"sources":["../src/component/title/interface/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IComponent } from '../../interface';\nimport type { ITextGraphicAttribute, IRichTextCharacter, RichTextWordBreak } from '@visactor/vrender';\nimport type { IOrientType, IPadding, StringOrNumber } from '../../../typings';\nimport type { IComponentSpec } from '../../base/interface';\n\nexport interface ITitleSpec extends Omit<IComponentSpec, 'orient'> {\n  /**\n   * 是否显示标题\n   */\n  visible?: boolean;\n  /**\n   * Title位置\n   * @default 'top'\n   */\n  orient?: IOrientType;\n  /**\n   * 主标题内容\n   */\n  text: Text | Text[];\n  /**\n   * 副标题内容\n   */\n  subtext?: Text | Text[];\n  /**\n   * 标题左上角x坐标像素值\n   */\n  x?: number;\n  /**\n   * 标题左上角y坐标像素值\n   */\n  y?: number;\n  /**\n   * 标题宽度\n   */\n  width?: number;\n  /**\n   * 标题高度\n   */\n  height?: number;\n  /**\n   * 最小宽度，像素值\n   */\n  minWidth?: number;\n  /**\n   * 最大宽度，像素值。当文字超过最大宽度时，会自动省略。\n   */\n  maxWidth?: number;\n  /**\n   * 最小高度，像素值\n   */\n  minHeight?: number;\n  /**\n   * 最大高度，像素值\n   */\n  maxHeight?: number;\n  /**\n   * 标题的边距留白\n   */\n  innerPadding?: IPadding | number | number[];\n  /**\n   * 文字水平对齐方式\n   * 'left' | 'center' | 'right'\n   */\n  align?: string;\n  /**\n   * 文字垂直对齐方式\n   * 'top' | 'middle' | 'bottom'\n   */\n  verticalAlign?: string;\n  /**\n   * 主标题样式\n   */\n  textStyle?: {\n    width?: number;\n    height?: number;\n    /**\n     * 文字水平对齐方式\n     * 'left' | 'center' | 'right'\n     */\n    align?: string;\n    /**\n     * 文字垂直对齐方式\n     * 'top' | 'middle' | 'bottom'\n     */\n    verticalAlign?: string;\n    /**\n     * 折行方式\n     * 'break-word' | 'break-all'\n     */\n    wordBreak?: RichTextWordBreak;\n    /**\n     * 按照宽度限制自动折行或显示省略号(maxLineWidth)\n     * 默认设置为title宽度\n     */\n    maxLineWidth?: number;\n    /**\n     * 高度限制控制显示内容及省略号(heightLimit)\n     */\n    heightLimit?: number;\n    /**\n     * 按照行数限制显示内容及省略号(lineClamp)\n     */\n    lineClamp?: number;\n    /**\n     * 富文本配置\n     */\n    character?: IRichTextCharacter[];\n  } & Partial<ITextGraphicAttribute>;\n  /**\n   * 副标题样式\n   */\n  subtextStyle?: {\n    /** 指定宽度 */\n    width?: number;\n    /** 指定高度 */\n    height?: number;\n    /**\n     * 文字水平对齐方式\n     * 'left' | 'center' | 'right'\n     */\n    align?: string;\n    /**\n     * 文字垂直对齐方式\n     * 'top' | 'middle' | 'bottom'\n     */\n    verticalAlign?: string;\n    /**\n     * 折行方式\n     * 'break-word' | 'break-all'\n     */\n    wordBreak?: RichTextWordBreak;\n    /**\n     * 按照宽度限制自动折行或显示省略号(maxLineWidth)\n     * 默认设置为title宽度\n     */\n    maxLineWidth?: number;\n    /**\n     * 高度限制控制显示内容及省略号(heightLimit)\n     */\n    heightLimit?: number;\n    /**\n     * 按照行数限制显示内容及省略号(lineClamp)\n     */\n    lineClamp?: number;\n    /**\n     * 富文本配置\n     */\n    character?: IRichTextCharacter[];\n  } & Partial<ITextGraphicAttribute>;\n}\n\nexport type Text = StringOrNumber;\n\nexport type ITitle = IComponent;\n"]}

package/esm/component/tooltip/handler/dom/model/content-column-model.js

@@ -1,4 +1,4 @@
-import { isNumber, isString, merge, toNumber } from "@visactor/vutils";
+import { isNumber, isString, toNumber } from "@visactor/vutils";
 
 import { defaultKeyStyle, defaultContentColumnStyle, defaultValueStyle, defaultAdaptiveKeyStyle, defaultShapeStyle } from "./style-constants";
 
@@ -12,6 +12,8 @@ import { TOOLTIP_EMPTY_STRING } from "../../constants";
 
 import { getPixelPropertyStr } from "../util";
 
+import { mergeSpec } from "../../../../../util";
+
 export class ContentColumnModel extends BaseTooltipModel {
     constructor(parent, option, className, childIndex) {
         super(parent, option, childIndex), this.className = className;
@@ -41,22 +43,22 @@ export class ContentColumnModel extends BaseTooltipModel {
     setStyle() {
         var _a, _b, _c, _d;
         const tooltipStyle = this._option.getTooltipStyle();
-        super.setStyle(merge({}, defaultContentColumnStyle, tooltipStyle.content, this._getContentColumnStyle()));
+        super.setStyle(mergeSpec({}, defaultContentColumnStyle, tooltipStyle.content, this._getContentColumnStyle()));
         const renderContent = null !== (_b = null === (_a = this._option.getTooltipActual()) || void 0 === _a ? void 0 : _a.content) && void 0 !== _b ? _b : [], contentAttributes = null !== (_d = null === (_c = this._option.getTooltipAttributes()) || void 0 === _c ? void 0 : _c.content) && void 0 !== _d ? _d : [];
         renderContent.forEach(((line, i) => {
             var _a, _b, _c, _d, _e;
             let childStyle = {};
             if ("key-box" === this.className) {
                 const {key: key, isKeyAdaptive: isKeyAdaptive} = line;
-                childStyle = merge({}, isKeyAdaptive ? defaultAdaptiveKeyStyle : defaultKeyStyle, Object.assign(Object.assign({
+                childStyle = mergeSpec({}, isKeyAdaptive ? defaultAdaptiveKeyStyle : defaultKeyStyle, Object.assign(Object.assign({
                     height: getPixelPropertyStr(contentAttributes[i].height)
                 }, tooltipStyle.keyColumn.common), null === (_a = tooltipStyle.keyColumn.items) || void 0 === _a ? void 0 : _a[i]));
                 isString(key) && "" !== (null === (_b = null == key ? void 0 : key.trim) || void 0 === _b ? void 0 : _b.call(key)) || isNumber(key) || childStyle.visibility ? childStyle.visibility = "visible" : childStyle.visibility = "hidden", 
                 this.children[i].setStyle(childStyle);
-            } else "value-box" === this.className ? (childStyle = merge({}, defaultValueStyle, Object.assign(Object.assign({
+            } else "value-box" === this.className ? (childStyle = mergeSpec({}, defaultValueStyle, Object.assign(Object.assign({
                 height: getPixelPropertyStr(contentAttributes[i].height)
             }, tooltipStyle.valueColumn.common), null === (_c = tooltipStyle.valueColumn.items) || void 0 === _c ? void 0 : _c[i])), 
-            this.children[i].setStyle(childStyle)) : "shape-box" === this.className && (childStyle = merge({}, defaultShapeStyle, Object.assign(Object.assign({
+            this.children[i].setStyle(childStyle)) : "shape-box" === this.className && (childStyle = mergeSpec({}, defaultShapeStyle, Object.assign(Object.assign({
                 height: getPixelPropertyStr(contentAttributes[i].height)
             }, tooltipStyle.shapeColumn.common), null === (_d = tooltipStyle.shapeColumn.items) || void 0 === _d ? void 0 : _d[i])), 
             null === (_e = this.children[i]) || void 0 === _e || _e.setStyle(childStyle, this._getShapeSvgOption(line, i)));

package/esm/component/tooltip/handler/dom/model/content-column-model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/dom/model/content-column-model.ts"],"names":[],"mappings":"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","file":"content-column-model.js","sourcesContent":["import { isNumber, isString, merge, toNumber } from '@visactor/vutils';\nimport {\n  defaultKeyStyle,\n  defaultContentColumnStyle,\n  defaultValueStyle,\n  defaultAdaptiveKeyStyle,\n  defaultShapeStyle\n} from './style-constants';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport type { ITooltipModelOption } from './interface';\nimport type { IShapeSvgOption } from './shape-model';\n// eslint-disable-next-line no-duplicate-imports\nimport { ShapeModel } from './shape-model';\nimport { TextModel } from './text-model';\nimport { TOOLTIP_EMPTY_STRING } from '../../constants';\nimport { getPixelPropertyStr } from '../util';\nimport type { IToolTipLineActual } from '../../../../../typings';\n\nexport type ContentColumnType = 'shape-box' | 'key-box' | 'value-box';\n\nexport class ContentColumnModel extends BaseTooltipModel {\n  readonly className: ContentColumnType;\n\n  constructor(\n    parent: BaseTooltipModel | HTMLElement,\n    option: ITooltipModelOption,\n    className: ContentColumnType,\n    childIndex?: number\n  ) {\n    super(parent, option, childIndex);\n    this.className = className;\n  }\n\n  init(): void {\n    if (!this.product) {\n      this.product = this.createElement('div', [this.className]);\n    }\n    const renderContent = this._option.getTooltipActual()?.content ?? [];\n\n    if (this.className === 'shape-box' && !renderContent.some(c => c.hasShape && c.shapeType)) {\n      // 当有一行配有形状的时候，其他行要对齐。如果没有一行配有形状，则删除所有的行\n      Object.keys(this.children).forEach(key => {\n        const i = toNumber(key);\n        this.children[i].release();\n        delete this.children[i];\n      });\n    } else {\n      // 删除多余的行\n      Object.keys(this.children).forEach(key => {\n        const i = toNumber(key);\n        if (i >= renderContent.length) {\n          this.children[i].release();\n          delete this.children[i];\n        }\n      });\n      // 新增没有的行\n      for (let i = 0; i < renderContent.length; i++) {\n        if (!this.children[i]) {\n          if (this.className === 'key-box' || this.className === 'value-box') {\n            const text = new TextModel(this.product!, this._option, i);\n            text.init([this.className.substring(0, this.className.indexOf('-'))], undefined, 'div');\n            this.children[i] = text;\n          } else if (this.className === 'shape-box') {\n            const shape = new ShapeModel(this.product!, this._option, i);\n            shape.init(['shape'], undefined, 'div');\n            this.children[i] = shape;\n          }\n        }\n      }\n    }\n  }\n\n  setStyle() {\n    const tooltipStyle = this._option.getTooltipStyle();\n\n    super.setStyle(merge({}, defaultContentColumnStyle, tooltipStyle.content, this._getContentColumnStyle()));\n\n    const renderContent = this._option.getTooltipActual()?.content ?? [];\n    const contentAttributes = this._option.getTooltipAttributes()?.content ?? [];\n    renderContent.forEach((line, i) => {\n      let childStyle: any = {};\n      if (this.className === 'key-box') {\n        const { key, isKeyAdaptive } = line;\n        childStyle = merge({}, isKeyAdaptive ? defaultAdaptiveKeyStyle : defaultKeyStyle, {\n          height: getPixelPropertyStr(contentAttributes[i].height),\n          ...tooltipStyle.keyColumn.common,\n          ...tooltipStyle.keyColumn.items?.[i]\n        });\n        const hasContent = (isString(key) && key?.trim?.() !== '') || isNumber(key);\n        if (!hasContent && !childStyle.visibility) {\n          childStyle.visibility = 'hidden';\n        } else {\n          childStyle.visibility = 'visible';\n        }\n        (this.children[i] as TextModel).setStyle(childStyle);\n      } else if (this.className === 'value-box') {\n        childStyle = merge({}, defaultValueStyle, {\n          height: getPixelPropertyStr(contentAttributes[i].height),\n          ...tooltipStyle.valueColumn.common,\n          ...tooltipStyle.valueColumn.items?.[i]\n        });\n        (this.children[i] as TextModel).setStyle(childStyle);\n      } else if (this.className === 'shape-box') {\n        childStyle = merge({}, defaultShapeStyle, {\n          height: getPixelPropertyStr(contentAttributes[i].height),\n          ...tooltipStyle.shapeColumn.common,\n          ...tooltipStyle.shapeColumn.items?.[i]\n        });\n        (this.children[i] as ShapeModel)?.setStyle(childStyle, this._getShapeSvgOption(line, i));\n      }\n    });\n  }\n\n  setContent(): void {\n    const renderContent = this._option.getTooltipActual()?.content ?? [];\n    const contentAttributes = this._option.getTooltipAttributes()?.content ?? [];\n    renderContent.forEach((line, i) => {\n      let childContent: any;\n      if (this.className === 'key-box') {\n        const keyContent = line.key;\n        if ((isString(keyContent) && keyContent?.trim?.() !== '') || isNumber(keyContent)) {\n          childContent = keyContent;\n        } else {\n          childContent = TOOLTIP_EMPTY_STRING;\n        }\n        (this.children[i] as TextModel)?.setContent(childContent, contentAttributes[i].key?.multiLine);\n      } else if (this.className === 'value-box') {\n        const valueContent = line.value;\n        if ((isString(valueContent) && valueContent?.trim?.() !== '') || isNumber(valueContent)) {\n          childContent = valueContent;\n        } else {\n          childContent = TOOLTIP_EMPTY_STRING;\n        }\n        (this.children[i] as TextModel)?.setContent(childContent, contentAttributes[i].value?.multiLine);\n      } else if (this.className === 'shape-box') {\n        childContent = this._getShapeSvgOption(line, i);\n        this.children[i]?.setContent(childContent);\n      }\n    });\n  }\n\n  protected _getContentColumnStyle() {\n    const tooltipStyle = this._option.getTooltipStyle();\n\n    switch (this.className) {\n      case 'shape-box':\n        const renderContent = this._option.getTooltipActual()?.content ?? [];\n        return {\n          ...tooltipStyle.shapeColumn,\n          ...(this.className === 'shape-box' && !renderContent.some(c => c.hasShape && c.shapeType)\n            ? { display: 'none' }\n            : {})\n        };\n      case 'key-box':\n        return tooltipStyle.keyColumn;\n      case 'value-box':\n        return tooltipStyle.valueColumn;\n    }\n  }\n\n  protected _getShapeSvgOption(line: IToolTipLineActual, index: number): IShapeSvgOption {\n    const tooltipStyle = this._option.getTooltipStyle();\n    const shapeColumn = {\n      ...tooltipStyle.shapeColumn,\n      ...tooltipStyle.shapeColumn.items?.[index]\n    };\n    const keyColumn = {\n      ...tooltipStyle.keyColumn,\n      ...tooltipStyle.keyColumn.items?.[index]\n    };\n    return {\n      hasShape: line.hasShape,\n      shapeType: line.shapeType,\n      size: shapeColumn.width,\n      color: line.shapeColor,\n      hollow: line.shapeHollow,\n      marginTop: `calc((${keyColumn.lineHeight ?? keyColumn.fontSize ?? '18px'} - ${shapeColumn.width ?? '8px'}) / 2)`\n    } as IShapeSvgOption;\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/dom/model/content-column-model.ts"],"names":[],"mappings":"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","file":"content-column-model.js","sourcesContent":["import { isNumber, isString, toNumber } from '@visactor/vutils';\nimport {\n  defaultKeyStyle,\n  defaultContentColumnStyle,\n  defaultValueStyle,\n  defaultAdaptiveKeyStyle,\n  defaultShapeStyle\n} from './style-constants';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport type { ITooltipModelOption } from './interface';\nimport type { IShapeSvgOption } from './shape-model';\n// eslint-disable-next-line no-duplicate-imports\nimport { ShapeModel } from './shape-model';\nimport { TextModel } from './text-model';\nimport { TOOLTIP_EMPTY_STRING } from '../../constants';\nimport { getPixelPropertyStr } from '../util';\nimport type { IToolTipLineActual } from '../../../../../typings';\nimport { mergeSpec } from '../../../../../util';\n\nexport type ContentColumnType = 'shape-box' | 'key-box' | 'value-box';\n\nexport class ContentColumnModel extends BaseTooltipModel {\n  readonly className: ContentColumnType;\n\n  constructor(\n    parent: BaseTooltipModel | HTMLElement,\n    option: ITooltipModelOption,\n    className: ContentColumnType,\n    childIndex?: number\n  ) {\n    super(parent, option, childIndex);\n    this.className = className;\n  }\n\n  init(): void {\n    if (!this.product) {\n      this.product = this.createElement('div', [this.className]);\n    }\n    const renderContent = this._option.getTooltipActual()?.content ?? [];\n\n    if (this.className === 'shape-box' && !renderContent.some(c => c.hasShape && c.shapeType)) {\n      // 当有一行配有形状的时候，其他行要对齐。如果没有一行配有形状，则删除所有的行\n      Object.keys(this.children).forEach(key => {\n        const i = toNumber(key);\n        this.children[i].release();\n        delete this.children[i];\n      });\n    } else {\n      // 删除多余的行\n      Object.keys(this.children).forEach(key => {\n        const i = toNumber(key);\n        if (i >= renderContent.length) {\n          this.children[i].release();\n          delete this.children[i];\n        }\n      });\n      // 新增没有的行\n      for (let i = 0; i < renderContent.length; i++) {\n        if (!this.children[i]) {\n          if (this.className === 'key-box' || this.className === 'value-box') {\n            const text = new TextModel(this.product!, this._option, i);\n            text.init([this.className.substring(0, this.className.indexOf('-'))], undefined, 'div');\n            this.children[i] = text;\n          } else if (this.className === 'shape-box') {\n            const shape = new ShapeModel(this.product!, this._option, i);\n            shape.init(['shape'], undefined, 'div');\n            this.children[i] = shape;\n          }\n        }\n      }\n    }\n  }\n\n  setStyle() {\n    const tooltipStyle = this._option.getTooltipStyle();\n\n    super.setStyle(mergeSpec({}, defaultContentColumnStyle, tooltipStyle.content, this._getContentColumnStyle()));\n\n    const renderContent = this._option.getTooltipActual()?.content ?? [];\n    const contentAttributes = this._option.getTooltipAttributes()?.content ?? [];\n    renderContent.forEach((line, i) => {\n      let childStyle: any = {};\n      if (this.className === 'key-box') {\n        const { key, isKeyAdaptive } = line;\n        childStyle = mergeSpec({}, isKeyAdaptive ? defaultAdaptiveKeyStyle : defaultKeyStyle, {\n          height: getPixelPropertyStr(contentAttributes[i].height),\n          ...tooltipStyle.keyColumn.common,\n          ...tooltipStyle.keyColumn.items?.[i]\n        });\n        const hasContent = (isString(key) && key?.trim?.() !== '') || isNumber(key);\n        if (!hasContent && !childStyle.visibility) {\n          childStyle.visibility = 'hidden';\n        } else {\n          childStyle.visibility = 'visible';\n        }\n        (this.children[i] as TextModel).setStyle(childStyle);\n      } else if (this.className === 'value-box') {\n        childStyle = mergeSpec({}, defaultValueStyle, {\n          height: getPixelPropertyStr(contentAttributes[i].height),\n          ...tooltipStyle.valueColumn.common,\n          ...tooltipStyle.valueColumn.items?.[i]\n        });\n        (this.children[i] as TextModel).setStyle(childStyle);\n      } else if (this.className === 'shape-box') {\n        childStyle = mergeSpec({}, defaultShapeStyle, {\n          height: getPixelPropertyStr(contentAttributes[i].height),\n          ...tooltipStyle.shapeColumn.common,\n          ...tooltipStyle.shapeColumn.items?.[i]\n        });\n        (this.children[i] as ShapeModel)?.setStyle(childStyle, this._getShapeSvgOption(line, i));\n      }\n    });\n  }\n\n  setContent(): void {\n    const renderContent = this._option.getTooltipActual()?.content ?? [];\n    const contentAttributes = this._option.getTooltipAttributes()?.content ?? [];\n    renderContent.forEach((line, i) => {\n      let childContent: any;\n      if (this.className === 'key-box') {\n        const keyContent = line.key;\n        if ((isString(keyContent) && keyContent?.trim?.() !== '') || isNumber(keyContent)) {\n          childContent = keyContent;\n        } else {\n          childContent = TOOLTIP_EMPTY_STRING;\n        }\n        (this.children[i] as TextModel)?.setContent(childContent, contentAttributes[i].key?.multiLine);\n      } else if (this.className === 'value-box') {\n        const valueContent = line.value;\n        if ((isString(valueContent) && valueContent?.trim?.() !== '') || isNumber(valueContent)) {\n          childContent = valueContent;\n        } else {\n          childContent = TOOLTIP_EMPTY_STRING;\n        }\n        (this.children[i] as TextModel)?.setContent(childContent, contentAttributes[i].value?.multiLine);\n      } else if (this.className === 'shape-box') {\n        childContent = this._getShapeSvgOption(line, i);\n        this.children[i]?.setContent(childContent);\n      }\n    });\n  }\n\n  protected _getContentColumnStyle() {\n    const tooltipStyle = this._option.getTooltipStyle();\n\n    switch (this.className) {\n      case 'shape-box':\n        const renderContent = this._option.getTooltipActual()?.content ?? [];\n        return {\n          ...tooltipStyle.shapeColumn,\n          ...(this.className === 'shape-box' && !renderContent.some(c => c.hasShape && c.shapeType)\n            ? { display: 'none' }\n            : {})\n        };\n      case 'key-box':\n        return tooltipStyle.keyColumn;\n      case 'value-box':\n        return tooltipStyle.valueColumn;\n    }\n  }\n\n  protected _getShapeSvgOption(line: IToolTipLineActual, index: number): IShapeSvgOption {\n    const tooltipStyle = this._option.getTooltipStyle();\n    const shapeColumn = {\n      ...tooltipStyle.shapeColumn,\n      ...tooltipStyle.shapeColumn.items?.[index]\n    };\n    const keyColumn = {\n      ...tooltipStyle.keyColumn,\n      ...tooltipStyle.keyColumn.items?.[index]\n    };\n    return {\n      hasShape: line.hasShape,\n      shapeType: line.shapeType,\n      size: shapeColumn.width,\n      color: line.shapeColor,\n      hollow: line.shapeHollow,\n      marginTop: `calc((${keyColumn.lineHeight ?? keyColumn.fontSize ?? '18px'} - ${shapeColumn.width ?? '8px'}) / 2)`\n    } as IShapeSvgOption;\n  }\n}\n"]}

package/esm/component/tooltip/handler/dom/model/content-model.js

@@ -4,7 +4,7 @@ import { BaseTooltipModel } from "./base-tooltip-model";
 
 import { ContentColumnModel } from "./content-column-model";
 
-import { merge } from "@visactor/vutils";
+import { mergeSpec } from "../../../../../util";
 
 export class ContentModel extends BaseTooltipModel {
     init() {
@@ -24,7 +24,7 @@ export class ContentModel extends BaseTooltipModel {
         valueBox.init(), this.valueBox = valueBox, this.children[valueBox.childIndex] = valueBox;
     }
     setStyle(style) {
-        super.setStyle(merge({}, defaultContentContainerStyle, style)), Object.values(this.children).forEach((c => {
+        super.setStyle(mergeSpec({}, defaultContentContainerStyle, style)), Object.values(this.children).forEach((c => {
             c.setStyle();
         }));
     }

package/esm/component/tooltip/handler/dom/model/content-model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/dom/model/content-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAG5D,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEzC,MAAM,OAAO,YAAa,SAAQ,gBAAgB;IAKhD,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;SAC7D;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,aAAa,EAAE,CAAC;SACtB;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,WAAW,EAAE,CAAC;SACpB;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,aAAa,EAAE,CAAC;SACtB;IACH,CAAC;IAEO,aAAa;QACnB,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,IAAI,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IAChD,CAAC;IAEO,WAAW;QACjB,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QACjF,MAAM,CAAC,IAAI,EAAE,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;IAC5C,CAAC;IAEO,aAAa;QACnB,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,IAAI,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IAChD,CAAC;IAED,QAAQ,CAAC,KAAoC;QAC3C,KAAK,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC;QAC/D,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACvC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACvC,CAAC,CAAC,UAAU,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;CACF","file":"content-model.js","sourcesContent":["import { defaultContentContainerStyle } from './style-constants';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport { ContentColumnModel } from './content-column-model';\nimport type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { merge } from '@visactor/vutils';\n\nexport class ContentModel extends BaseTooltipModel {\n  shapeBox: Maybe<ContentColumnModel>;\n  keyBox: Maybe<ContentColumnModel>;\n  valueBox: Maybe<ContentColumnModel>;\n\n  init(): void {\n    if (!this.product) {\n      this.product = this.createElement('div', ['container-box']);\n    }\n    if (!this.shapeBox) {\n      this._initShapeBox();\n    }\n    if (!this.keyBox) {\n      this._initKeyBox();\n    }\n    if (!this.valueBox) {\n      this._initValueBox();\n    }\n  }\n\n  private _initShapeBox() {\n    const shapeBox = new ContentColumnModel(this.product!, this._option, 'shape-box', 0);\n    shapeBox.init();\n    this.shapeBox = shapeBox;\n    this.children[shapeBox.childIndex] = shapeBox;\n  }\n\n  private _initKeyBox() {\n    const keyBox = new ContentColumnModel(this.product!, this._option, 'key-box', 1);\n    keyBox.init();\n    this.keyBox = keyBox;\n    this.children[keyBox.childIndex] = keyBox;\n  }\n\n  private _initValueBox() {\n    const valueBox = new ContentColumnModel(this.product!, this._option, 'value-box', 2);\n    valueBox.init();\n    this.valueBox = valueBox;\n    this.children[valueBox.childIndex] = valueBox;\n  }\n\n  setStyle(style?: Partial<CSSStyleDeclaration>): void {\n    super.setStyle(merge({}, defaultContentContainerStyle, style));\n    Object.values(this.children).forEach(c => {\n      c.setStyle();\n    });\n  }\n\n  setContent(): void {\n    Object.values(this.children).forEach(c => {\n      c.setContent();\n    });\n  }\n\n  release(): void {\n    super.release();\n    this.shapeBox = null;\n    this.keyBox = null;\n    this.valueBox = null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/dom/model/content-model.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,4BAA4B,EAAE,MAAM,mBAAmB,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AACxD,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAE5D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAEhD,MAAM,OAAO,YAAa,SAAQ,gBAAgB;IAKhD,IAAI;QACF,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,CAAC,eAAe,CAAC,CAAC,CAAC;SAC7D;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,aAAa,EAAE,CAAC;SACtB;QACD,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;YAChB,IAAI,CAAC,WAAW,EAAE,CAAC;SACpB;QACD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE;YAClB,IAAI,CAAC,aAAa,EAAE,CAAC;SACtB;IACH,CAAC;IAEO,aAAa;QACnB,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,IAAI,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IAChD,CAAC;IAEO,WAAW;QACjB,MAAM,MAAM,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;QACjF,MAAM,CAAC,IAAI,EAAE,CAAC;QACd,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;QACrB,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,MAAM,CAAC;IAC5C,CAAC;IAEO,aAAa;QACnB,MAAM,QAAQ,GAAG,IAAI,kBAAkB,CAAC,IAAI,CAAC,OAAQ,EAAE,IAAI,CAAC,OAAO,EAAE,WAAW,EAAE,CAAC,CAAC,CAAC;QACrF,QAAQ,CAAC,IAAI,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,QAAQ,CAAC;QACzB,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,UAAU,CAAC,GAAG,QAAQ,CAAC;IAChD,CAAC;IAED,QAAQ,CAAC,KAAoC;QAC3C,KAAK,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,EAAE,4BAA4B,EAAE,KAAK,CAAC,CAAC,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACvC,CAAC,CAAC,QAAQ,EAAE,CAAC;QACf,CAAC,CAAC,CAAC;IACL,CAAC;IAED,UAAU;QACR,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;YACvC,CAAC,CAAC,UAAU,EAAE,CAAC;QACjB,CAAC,CAAC,CAAC;IACL,CAAC;IAED,OAAO;QACL,KAAK,CAAC,OAAO,EAAE,CAAC;QAChB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;QACrB,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;QACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC;IACvB,CAAC;CACF","file":"content-model.js","sourcesContent":["import { defaultContentContainerStyle } from './style-constants';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport { ContentColumnModel } from './content-column-model';\nimport type { Maybe } from '@visactor/vutils';\nimport { mergeSpec } from '../../../../../util';\n\nexport class ContentModel extends BaseTooltipModel {\n  shapeBox: Maybe<ContentColumnModel>;\n  keyBox: Maybe<ContentColumnModel>;\n  valueBox: Maybe<ContentColumnModel>;\n\n  init(): void {\n    if (!this.product) {\n      this.product = this.createElement('div', ['container-box']);\n    }\n    if (!this.shapeBox) {\n      this._initShapeBox();\n    }\n    if (!this.keyBox) {\n      this._initKeyBox();\n    }\n    if (!this.valueBox) {\n      this._initValueBox();\n    }\n  }\n\n  private _initShapeBox() {\n    const shapeBox = new ContentColumnModel(this.product!, this._option, 'shape-box', 0);\n    shapeBox.init();\n    this.shapeBox = shapeBox;\n    this.children[shapeBox.childIndex] = shapeBox;\n  }\n\n  private _initKeyBox() {\n    const keyBox = new ContentColumnModel(this.product!, this._option, 'key-box', 1);\n    keyBox.init();\n    this.keyBox = keyBox;\n    this.children[keyBox.childIndex] = keyBox;\n  }\n\n  private _initValueBox() {\n    const valueBox = new ContentColumnModel(this.product!, this._option, 'value-box', 2);\n    valueBox.init();\n    this.valueBox = valueBox;\n    this.children[valueBox.childIndex] = valueBox;\n  }\n\n  setStyle(style?: Partial<CSSStyleDeclaration>): void {\n    super.setStyle(mergeSpec({}, defaultContentContainerStyle, style));\n    Object.values(this.children).forEach(c => {\n      c.setStyle();\n    });\n  }\n\n  setContent(): void {\n    Object.values(this.children).forEach(c => {\n      c.setContent();\n    });\n  }\n\n  release(): void {\n    super.release();\n    this.shapeBox = null;\n    this.keyBox = null;\n    this.valueBox = null;\n  }\n}\n"]}

package/esm/component/tooltip/handler/dom/model/title-model.js

@@ -1,5 +1,3 @@
-import { merge } from "@visactor/vutils";
-
 import { defaultH2Style } from "./style-constants";
 
 import { BaseTooltipModel } from "./base-tooltip-model";
@@ -8,6 +6,8 @@ import { ShapeModel } from "./shape-model";
 
 import { TextModel } from "./text-model";
 
+import { mergeSpec } from "../../../../../util";
+
 export class TitleModel extends BaseTooltipModel {
     init() {
         const tooltipActual = this._option.getTooltipActual();
@@ -31,7 +31,7 @@ export class TitleModel extends BaseTooltipModel {
     setStyle(style) {
         var _a, _b, _c;
         const tooltipStyle = this._option.getTooltipStyle(), tooltipActual = this._option.getTooltipActual(), {title: title} = tooltipActual;
-        super.setStyle(merge({}, defaultH2Style, tooltipStyle.title, style)), null === (_a = this.shape) || void 0 === _a || _a.setStyle({
+        super.setStyle(mergeSpec({}, defaultH2Style, tooltipStyle.title, style)), null === (_a = this.shape) || void 0 === _a || _a.setStyle({
             paddingRight: null === (_b = tooltipStyle.shapeColumn.common) || void 0 === _b ? void 0 : _b.marginRight
         }, {
             hasShape: null == title ? void 0 : title.hasShape,

package/esm/component/tooltip/handler/dom/model/title-model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/dom/model/title-model.ts"],"names":[],"mappings":"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","file":"title-model.js","sourcesContent":["import type { Maybe } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { merge } from '@visactor/vutils';\nimport { defaultH2Style } from './style-constants';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport { ShapeModel } from './shape-model';\nimport { TextModel } from './text-model';\n\nexport class TitleModel extends BaseTooltipModel {\n  shape: Maybe<ShapeModel>;\n  textSpan: Maybe<TextModel>;\n\n  init(): void {\n    const tooltipActual = this._option.getTooltipActual();\n\n    if (!this.product) {\n      this.product = this.createElement('h2');\n    }\n\n    const { title } = tooltipActual;\n    if (title?.hasShape && title?.shapeType) {\n      if (!this.shape) {\n        this._initShape();\n      }\n    } else if (this.shape) {\n      this._releaseShape();\n    }\n\n    if (!this.textSpan) {\n      this._initTextSpan();\n    }\n  }\n\n  private _initShape() {\n    const shape = new ShapeModel(this.product!, this._option, 0);\n    shape.init();\n    this.shape = shape;\n    this.children[shape.childIndex] = shape;\n  }\n\n  private _releaseShape() {\n    if (!this.shape) {\n      return;\n    }\n    this.shape.release();\n    delete this.children[this.shape.childIndex];\n    this.shape = null;\n  }\n\n  private _initTextSpan() {\n    const textSpan = new TextModel(this.product!, this._option, 1);\n    textSpan.init();\n    this.textSpan = textSpan;\n    this.children[textSpan.childIndex] = textSpan;\n  }\n\n  setStyle(style?: Partial<CSSStyleDeclaration>): void {\n    const tooltipStyle = this._option.getTooltipStyle();\n    const tooltipActual = this._option.getTooltipActual();\n\n    const { title } = tooltipActual;\n    super.setStyle(merge({}, defaultH2Style, tooltipStyle.title, style));\n\n    this.shape?.setStyle(\n      {\n        paddingRight: tooltipStyle.shapeColumn.common?.marginRight\n      },\n      {\n        hasShape: title?.hasShape,\n        shapeType: title?.shapeType,\n        size: tooltipStyle.shapeColumn.common?.width,\n        color: title?.shapeColor,\n        hollow: title?.shapeHollow\n      }\n    );\n  }\n\n  setContent(): void {\n    const tooltipStyle = this._option.getTooltipStyle();\n    const tooltipActual = this._option.getTooltipActual();\n    const tooltipAttributes = this._option.getTooltipAttributes();\n\n    const { title } = tooltipActual;\n    this.init();\n    this.shape?.setStyle(undefined, {\n      hasShape: title?.hasShape,\n      shapeType: title?.shapeType,\n      size: tooltipStyle.shapeColumn.common?.width,\n      color: title?.shapeColor,\n      hollow: title?.shapeHollow\n    });\n    this.textSpan?.setContent(title?.value, tooltipAttributes.title?.value?.multiLine);\n  }\n\n  release(): void {\n    super.release();\n    this.shape = null;\n    this.textSpan = null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/dom/model/title-model.ts"],"names":[],"mappings":"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","file":"title-model.js","sourcesContent":["import type { Maybe } from '@visactor/vutils';\nimport { defaultH2Style } from './style-constants';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport { ShapeModel } from './shape-model';\nimport { TextModel } from './text-model';\nimport { mergeSpec } from '../../../../../util';\n\nexport class TitleModel extends BaseTooltipModel {\n  shape: Maybe<ShapeModel>;\n  textSpan: Maybe<TextModel>;\n\n  init(): void {\n    const tooltipActual = this._option.getTooltipActual();\n\n    if (!this.product) {\n      this.product = this.createElement('h2');\n    }\n\n    const { title } = tooltipActual;\n    if (title?.hasShape && title?.shapeType) {\n      if (!this.shape) {\n        this._initShape();\n      }\n    } else if (this.shape) {\n      this._releaseShape();\n    }\n\n    if (!this.textSpan) {\n      this._initTextSpan();\n    }\n  }\n\n  private _initShape() {\n    const shape = new ShapeModel(this.product!, this._option, 0);\n    shape.init();\n    this.shape = shape;\n    this.children[shape.childIndex] = shape;\n  }\n\n  private _releaseShape() {\n    if (!this.shape) {\n      return;\n    }\n    this.shape.release();\n    delete this.children[this.shape.childIndex];\n    this.shape = null;\n  }\n\n  private _initTextSpan() {\n    const textSpan = new TextModel(this.product!, this._option, 1);\n    textSpan.init();\n    this.textSpan = textSpan;\n    this.children[textSpan.childIndex] = textSpan;\n  }\n\n  setStyle(style?: Partial<CSSStyleDeclaration>): void {\n    const tooltipStyle = this._option.getTooltipStyle();\n    const tooltipActual = this._option.getTooltipActual();\n\n    const { title } = tooltipActual;\n    super.setStyle(mergeSpec({}, defaultH2Style, tooltipStyle.title, style));\n\n    this.shape?.setStyle(\n      {\n        paddingRight: tooltipStyle.shapeColumn.common?.marginRight\n      },\n      {\n        hasShape: title?.hasShape,\n        shapeType: title?.shapeType,\n        size: tooltipStyle.shapeColumn.common?.width,\n        color: title?.shapeColor,\n        hollow: title?.shapeHollow\n      }\n    );\n  }\n\n  setContent(): void {\n    const tooltipStyle = this._option.getTooltipStyle();\n    const tooltipActual = this._option.getTooltipActual();\n    const tooltipAttributes = this._option.getTooltipAttributes();\n\n    const { title } = tooltipActual;\n    this.init();\n    this.shape?.setStyle(undefined, {\n      hasShape: title?.hasShape,\n      shapeType: title?.shapeType,\n      size: tooltipStyle.shapeColumn.common?.width,\n      color: title?.shapeColor,\n      hollow: title?.shapeHollow\n    });\n    this.textSpan?.setContent(title?.value, tooltipAttributes.title?.value?.multiLine);\n  }\n\n  release(): void {\n    super.release();\n    this.shape = null;\n    this.textSpan = null;\n  }\n}\n"]}

package/esm/component/tooltip/handler/dom/model/tooltip-model.js

@@ -1,4 +1,4 @@
-import { isValid, merge } from "@visactor/vutils";
+import { isValid } from "@visactor/vutils";
 
 import { BaseTooltipModel } from "./base-tooltip-model";
 
@@ -8,6 +8,8 @@ import { TitleModel } from "./title-model";
 
 import { defaultContainerStyle } from "./style-constants";
 
+import { mergeSpec } from "../../../../../util";
+
 export class TooltipModel extends BaseTooltipModel {
     constructor(parent, option, classList, id) {
         super(parent, option, 0), this.title = null, this.content = null, this._classList = classList, 
@@ -64,7 +66,7 @@ export class TooltipModel extends BaseTooltipModel {
     }
     setStyle() {
         const tooltipStyle = this._option.getTooltipStyle();
-        super.setStyle(merge({}, defaultContainerStyle, tooltipStyle.panel)), Object.values(this.children).forEach(((c, i) => {
+        super.setStyle(mergeSpec({}, defaultContainerStyle, tooltipStyle.panel)), Object.values(this.children).forEach(((c, i) => {
             c.setStyle(i > 0 ? {
                 marginTop: tooltipStyle.spaceRow
             } : {

package/esm/component/tooltip/handler/dom/model/tooltip-model.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/component/tooltip/handler/dom/model/tooltip-model.ts"],"names":[],"mappings":"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","file":"tooltip-model.js","sourcesContent":["import { isValid, merge } from '@visactor/vutils';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport { ContentModel } from './content-model';\nimport type { ITooltipModelOption } from './interface';\nimport { TitleModel } from './title-model';\nimport { defaultContainerStyle } from './style-constants';\n\nexport class TooltipModel extends BaseTooltipModel {\n  title: TitleModel | null = null;\n  content: ContentModel | null = null;\n\n  private _classList: string[];\n  private _id: string;\n\n  constructor(parent: BaseTooltipModel | HTMLElement, option: ITooltipModelOption, classList: string[], id: string) {\n    super(parent, option, 0);\n    this._classList = classList;\n    this._id = id;\n  }\n\n  setVisibility(visibility: boolean) {\n    super.setVisibility(visibility);\n    if (!this.product) {\n      return;\n    }\n    const { classList } = this.product;\n    if (visibility) {\n      classList.add('visible');\n    } else {\n      classList.remove('visible');\n    }\n  }\n\n  init(): void {\n    const tooltipActual = this._option.getTooltipActual();\n\n    if (!this.product) {\n      this._initPanel(this._classList, this._id);\n    }\n\n    const { title } = tooltipActual;\n    if (title?.visible !== false && isValid(title?.value)) {\n      if (!this.title) {\n        this._initTitle();\n      }\n    } else if (this.title) {\n      this._releaseTitle();\n    }\n\n    const renderContent = tooltipActual.content ?? [];\n    if (renderContent.length > 0) {\n      if (!this.content) {\n        this._initContent();\n      }\n    } else if (this.content) {\n      this._releaseContent();\n    }\n  }\n\n  private _initPanel(classList?: string[], id?: string) {\n    const panel = this.createElement(\n      'div',\n      classList,\n      {\n        left: '0',\n        top: '0',\n        pointerEvents: 'none',\n        padding: '12px',\n        position: 'absolute',\n        zIndex: '99999999999999',\n        fontFamily: 'sans-serif',\n        fontSize: '11px',\n        borderRadius: '3px',\n        borderStyle: 'solid',\n        lineHeight: 'initial',\n        background: '#fff',\n        boxShadow: '2px 2px 4px rgba(0, 0, 0, 0.1)',\n        maxWidth: '100wh',\n        maxHeight: '100vh'\n      },\n      id\n    );\n    this.product = panel;\n  }\n\n  private _initTitle() {\n    const title = new TitleModel(this.product!, this._option, 0);\n    title.init();\n    this.title = title;\n    this.children[title.childIndex] = title;\n  }\n\n  private _releaseTitle() {\n    if (!this.title) {\n      return;\n    }\n    this.title.release();\n    delete this.children[this.title.childIndex];\n    this.title = null;\n  }\n\n  private _initContent() {\n    const content = new ContentModel(this.product!, this._option, 1);\n    content.init();\n    this.content = content;\n    this.children[content.childIndex] = content;\n  }\n\n  private _releaseContent() {\n    if (!this.content) {\n      return;\n    }\n    this.content.release();\n    delete this.children[this.content.childIndex];\n    this.content = null;\n  }\n\n  setStyle(): void {\n    const tooltipStyle = this._option.getTooltipStyle();\n\n    super.setStyle(merge({}, defaultContainerStyle, tooltipStyle.panel));\n    Object.values(this.children).forEach((c, i) => {\n      c.setStyle(\n        i > 0\n          ? {\n              marginTop: tooltipStyle.spaceRow\n            }\n          : {\n              marginTop: '0px'\n            }\n      );\n    });\n  }\n\n  setContent() {\n    Object.values(this.children).forEach(c => {\n      c.setContent();\n    });\n  }\n\n  release(): void {\n    super.release();\n    this.title = null;\n    this.content = null;\n  }\n}\n"]}
+{"version":3,"sources":["../src/component/tooltip/handler/dom/model/tooltip-model.ts"],"names":[],"mappings":"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","file":"tooltip-model.js","sourcesContent":["import { isValid } from '@visactor/vutils';\nimport { BaseTooltipModel } from './base-tooltip-model';\nimport { ContentModel } from './content-model';\nimport type { ITooltipModelOption } from './interface';\nimport { TitleModel } from './title-model';\nimport { defaultContainerStyle } from './style-constants';\nimport { mergeSpec } from '../../../../../util';\n\nexport class TooltipModel extends BaseTooltipModel {\n  title: TitleModel | null = null;\n  content: ContentModel | null = null;\n\n  private _classList: string[];\n  private _id: string;\n\n  constructor(parent: BaseTooltipModel | HTMLElement, option: ITooltipModelOption, classList: string[], id: string) {\n    super(parent, option, 0);\n    this._classList = classList;\n    this._id = id;\n  }\n\n  setVisibility(visibility: boolean) {\n    super.setVisibility(visibility);\n    if (!this.product) {\n      return;\n    }\n    const { classList } = this.product;\n    if (visibility) {\n      classList.add('visible');\n    } else {\n      classList.remove('visible');\n    }\n  }\n\n  init(): void {\n    const tooltipActual = this._option.getTooltipActual();\n\n    if (!this.product) {\n      this._initPanel(this._classList, this._id);\n    }\n\n    const { title } = tooltipActual;\n    if (title?.visible !== false && isValid(title?.value)) {\n      if (!this.title) {\n        this._initTitle();\n      }\n    } else if (this.title) {\n      this._releaseTitle();\n    }\n\n    const renderContent = tooltipActual.content ?? [];\n    if (renderContent.length > 0) {\n      if (!this.content) {\n        this._initContent();\n      }\n    } else if (this.content) {\n      this._releaseContent();\n    }\n  }\n\n  private _initPanel(classList?: string[], id?: string) {\n    const panel = this.createElement(\n      'div',\n      classList,\n      {\n        left: '0',\n        top: '0',\n        pointerEvents: 'none',\n        padding: '12px',\n        position: 'absolute',\n        zIndex: '99999999999999',\n        fontFamily: 'sans-serif',\n        fontSize: '11px',\n        borderRadius: '3px',\n        borderStyle: 'solid',\n        lineHeight: 'initial',\n        background: '#fff',\n        boxShadow: '2px 2px 4px rgba(0, 0, 0, 0.1)',\n        maxWidth: '100wh',\n        maxHeight: '100vh'\n      },\n      id\n    );\n    this.product = panel;\n  }\n\n  private _initTitle() {\n    const title = new TitleModel(this.product!, this._option, 0);\n    title.init();\n    this.title = title;\n    this.children[title.childIndex] = title;\n  }\n\n  private _releaseTitle() {\n    if (!this.title) {\n      return;\n    }\n    this.title.release();\n    delete this.children[this.title.childIndex];\n    this.title = null;\n  }\n\n  private _initContent() {\n    const content = new ContentModel(this.product!, this._option, 1);\n    content.init();\n    this.content = content;\n    this.children[content.childIndex] = content;\n  }\n\n  private _releaseContent() {\n    if (!this.content) {\n      return;\n    }\n    this.content.release();\n    delete this.children[this.content.childIndex];\n    this.content = null;\n  }\n\n  setStyle(): void {\n    const tooltipStyle = this._option.getTooltipStyle();\n\n    super.setStyle(mergeSpec({}, defaultContainerStyle, tooltipStyle.panel));\n    Object.values(this.children).forEach((c, i) => {\n      c.setStyle(\n        i > 0\n          ? {\n              marginTop: tooltipStyle.spaceRow\n            }\n          : {\n              marginTop: '0px'\n            }\n      );\n    });\n  }\n\n  setContent() {\n    Object.values(this.children).forEach(c => {\n      c.setContent();\n    });\n  }\n\n  release(): void {\n    super.release();\n    this.title = null;\n    this.content = null;\n  }\n}\n"]}

package/esm/component/tooltip/handler/dom/util.js

@@ -1,4 +1,4 @@
-import { isValid, merge, isArray } from "../../../../util";
+import { isValid, mergeSpec, isArray } from "../../../../util";
 
 const DEFAULT_SHAPE_SPACING = 8, DEFAULT_KEY_SPACING = 26, DEFAULT_VALUE_SPACING = 0;
 
@@ -24,7 +24,7 @@ export function getDomStyles(style, attributeCache) {
             transitionProperty: transitionDuration ? "transform" : "initial",
             transitionTimingFunction: transitionDuration ? "ease-out" : "initial"
         },
-        title: getLabelStyle(merge({}, title, null === (_e = null == attributeCache ? void 0 : attributeCache.title) || void 0 === _e ? void 0 : _e.value)),
+        title: getLabelStyle(mergeSpec({}, title, null === (_e = null == attributeCache ? void 0 : attributeCache.title) || void 0 === _e ? void 0 : _e.value)),
         content: {},
         shapeColumn: {
             common: shapeStyle,
@@ -63,7 +63,7 @@ export function getDomStyles(style, attributeCache) {
 
 function getLabelStyle(labelStyle, defaultStyle) {
     if (!labelStyle) return;
-    const {fontFamily: labelFont, fontSize: labelFontSize, fill: labelColor, textAlign: textAlign, lineHeight: lineHeight, fontWeight: fontWeight, multiLine: multiLine, wordBreak: wordBreak, maxWidth: maxWidth} = merge({}, defaultStyle, labelStyle), styleObj = {};
+    const {fontFamily: labelFont, fontSize: labelFontSize, fill: labelColor, textAlign: textAlign, lineHeight: lineHeight, fontWeight: fontWeight, multiLine: multiLine, wordBreak: wordBreak, maxWidth: maxWidth} = mergeSpec({}, defaultStyle, labelStyle), styleObj = {};
     return styleObj.fontFamily = labelFont, styleObj.fontSize = getPixelPropertyStr(labelFontSize), 
     styleObj.color = labelColor, styleObj.textAlign = textAlign, styleObj.lineHeight = getPixelPropertyStr(lineHeight), 
     styleObj.fontWeight = fontWeight, styleObj.whiteSpace = multiLine ? "initial" : "nowrap", 
@@ -73,7 +73,7 @@ function getLabelStyle(labelStyle, defaultStyle) {
 
 function getShapeStyle(shapeStyle, defaultStyle) {
     if (!shapeStyle) return;
-    const {size: size} = merge({}, defaultStyle, shapeStyle), styleObj = {};
+    const {size: size} = mergeSpec({}, defaultStyle, shapeStyle), styleObj = {};
     return styleObj.width = getPixelPropertyStr(size), styleObj;
 }
 //# sourceMappingURL=util.js.map