@visactor/vchart 1.2.3 → 1.3.0-beta.10

package/cjs/util/scale.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.isSpecValueWithScale = exports.valueInScaleRange = exports.isValidScaleType = exports.initScaleWithSpec = exports.createScaleWithSpec = exports.createScale = void 0;
+}), exports.isSpecValueWithScale = exports.valueInScaleRange = exports.createScaleWithSpec = exports.createScale = void 0;
 
 const vutils_1 = require("@visactor/vutils"), vscale_1 = require("@visactor/vscale"), color_ordinal_scale_1 = require("../scale/color-ordinal-scale"), defaultScaleMap = {
     linear: vscale_1.LinearScale,
@@ -29,10 +29,6 @@ function initScaleWithSpec(scale, spec) {
     spec.specified && scale.specified && scale.specified(spec.specified));
 }
 
-function isValidScaleType(type) {
-    return Object.keys(defaultScaleMap).includes(type);
-}
-
 function valueInScaleRange(v, s) {
     if (!s) return v;
     const range = s.range(), min = Math.min(range[0], range[range.length - 1]), max = Math.max(range[0], range[range.length - 1]);
@@ -45,6 +41,5 @@ function isSpecValueWithScale(specValue) {
 }
 
 exports.createScale = createScale, exports.createScaleWithSpec = createScaleWithSpec, 
-exports.initScaleWithSpec = initScaleWithSpec, exports.isValidScaleType = isValidScaleType, 
 exports.valueInScaleRange = valueInScaleRange, exports.isSpecValueWithScale = isSpecValueWithScale;
 //# sourceMappingURL=scale.js.map

package/cjs/util/scale.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/scale.ts"],"names":[],"mappings":"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","file":"scale.js","sourcesContent":["/**\n * @description Scale 相关的工具函数\n */\nimport { isString, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../scale/interface';\nimport { BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';\n// eslint-disable-next-line no-duplicate-imports\nimport type { IBaseScale } from '@visactor/vscale';\nimport type { ScaleType } from '../typings/scale';\nimport type { IVisual, IVisualSpecBase } from '../typings/visual';\nimport { ColorOrdinalScale } from '../scale/color-ordinal-scale';\n\nconst defaultScaleMap = {\n  linear: LinearScale,\n  band: BandScale,\n  point: PointScale,\n  ordinal: OrdinalScale,\n  threshold: ThresholdScale,\n  colorOrdinal: ColorOrdinalScale\n};\n\nexport function createScale(type: keyof typeof defaultScaleMap): IBaseScale | null {\n  const scaleConstructor = defaultScaleMap[type];\n  if (scaleConstructor) {\n    return new scaleConstructor();\n  }\n\n  return null;\n}\n\nexport function createScaleWithSpec(\n  spec: IVisual<any>,\n  context: {\n    globalScale: IGlobalScale;\n    dataStatistics: DataView;\n  }\n): IBaseScale | null {\n  if ('scale' in spec && spec.scale) {\n    if (isString(spec.scale) && context?.globalScale) {\n      return context.globalScale.registerMarkAttributeScale(spec, context.dataStatistics);\n    }\n    return spec.scale as unknown as IBaseScale;\n  }\n  const scale = createScale((spec as IVisualSpecBase<any, any>).type);\n  if (scale) {\n    initScaleWithSpec(scale, spec as IVisualSpecBase<any, any>);\n  }\n  return scale;\n}\n\n// 需要一个通用的从spec初始化scale的方法，避免在scale属性更新后需要维护多组逻辑\nexport function initScaleWithSpec(scale: IBaseScale, spec: IVisualSpecBase<any, any>) {\n  if (!scale || !spec) {\n    return;\n  }\n\n  if (spec.domain) {\n    scale.domain(spec.domain);\n  }\n\n  if (spec.range) {\n    scale.range(spec.range);\n  }\n\n  if (spec.specified && (<OrdinalScale>scale).specified) {\n    (<OrdinalScale>scale).specified(spec.specified);\n  }\n}\n\nexport function isValidScaleType(type: ScaleType): boolean {\n  return Object.keys(defaultScaleMap).includes(type);\n}\n\nexport function valueInScaleRange(v: number, s?: IBaseScale) {\n  if (!s) {\n    return v;\n  }\n  const range = s.range();\n  const min = Math.min(range[0], range[range.length - 1]);\n  const max = Math.max(range[0], range[range.length - 1]);\n  return Math.min(Math.max(min, v), max);\n}\n\nexport function isSpecValueWithScale(specValue: any) {\n  return isValid(specValue?.field) && isValid(specValue?.scale);\n}\n"]}
+{"version":3,"sources":["../src/util/scale.ts"],"names":[],"mappings":";;;AAGA,6CAAqD;AAGrD,6CAAqH;AAErH,sEAAiE;AAEjE,MAAM,eAAe,GAAG;IACtB,MAAM,EAAE,oBAAW;IACnB,IAAI,EAAE,kBAAS;IACf,KAAK,EAAE,mBAAU;IACjB,OAAO,EAAE,qBAAY;IACrB,SAAS,EAAE,uBAAc;IACzB,YAAY,EAAE,uCAAiB;CAChC,CAAC;AAEF,SAAgB,WAAW,CAAC,IAAkC;IAC5D,MAAM,gBAAgB,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/C,IAAI,gBAAgB,EAAE;QACpB,OAAO,IAAI,gBAAgB,EAAE,CAAC;KAC/B;IAED,OAAO,IAAI,CAAC;AACd,CAAC;AAPD,kCAOC;AAED,SAAgB,mBAAmB,CACjC,IAAkB,EAClB,OAGC;IAED,IAAI,OAAO,IAAI,IAAI,IAAI,IAAI,CAAC,KAAK,EAAE;QACjC,IAAI,IAAA,iBAAQ,EAAC,IAAI,CAAC,KAAK,CAAC,KAAI,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,WAAW,CAAA,EAAE;YAChD,OAAO,OAAO,CAAC,WAAW,CAAC,0BAA0B,CAAC,IAAI,EAAE,OAAO,CAAC,cAAc,CAAC,CAAC;SACrF;QACD,OAAO,IAAI,CAAC,KAA8B,CAAC;KAC5C;IACD,MAAM,KAAK,GAAG,WAAW,CAAE,IAAkC,CAAC,IAAI,CAAC,CAAC;IACpE,IAAI,KAAK,EAAE;QACT,iBAAiB,CAAC,KAAK,EAAE,IAAiC,CAAC,CAAC;KAC7D;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAlBD,kDAkBC;AAGD,SAAS,iBAAiB,CAAC,KAAiB,EAAE,IAA+B;IAC3E,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,EAAE;QACnB,OAAO;KACR;IAED,IAAI,IAAI,CAAC,MAAM,EAAE;QACf,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;KAC3B;IAED,IAAI,IAAI,CAAC,KAAK,EAAE;QACd,KAAK,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;KACzB;IAED,IAAI,IAAI,CAAC,SAAS,IAAmB,KAAM,CAAC,SAAS,EAAE;QACtC,KAAM,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;KACjD;AACH,CAAC;AAED,SAAgB,iBAAiB,CAAC,CAAS,EAAE,CAAc;IACzD,IAAI,CAAC,CAAC,EAAE;QACN,OAAO,CAAC,CAAC;KACV;IACD,MAAM,KAAK,GAAG,CAAC,CAAC,KAAK,EAAE,CAAC;IACxB,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,MAAM,GAAG,GAAG,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACxD,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;AACzC,CAAC;AARD,8CAQC;AAED,SAAgB,oBAAoB,CAAC,SAAc;IACjD,OAAO,IAAA,gBAAO,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,IAAI,IAAA,gBAAO,EAAC,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,KAAK,CAAC,CAAC;AAChE,CAAC;AAFD,oDAEC","file":"scale.js","sourcesContent":["/**\n * @description Scale 相关的工具函数\n */\nimport { isString, isValid } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { IGlobalScale } from '../scale/interface';\nimport { type IBaseScale, BandScale, LinearScale, OrdinalScale, PointScale, ThresholdScale } from '@visactor/vscale';\nimport type { IVisual, IVisualSpecBase } from '../typings/visual';\nimport { ColorOrdinalScale } from '../scale/color-ordinal-scale';\n\nconst defaultScaleMap = {\n  linear: LinearScale,\n  band: BandScale,\n  point: PointScale,\n  ordinal: OrdinalScale,\n  threshold: ThresholdScale,\n  colorOrdinal: ColorOrdinalScale\n};\n\nexport function createScale(type: keyof typeof defaultScaleMap): IBaseScale | null {\n  const scaleConstructor = defaultScaleMap[type];\n  if (scaleConstructor) {\n    return new scaleConstructor();\n  }\n\n  return null;\n}\n\nexport function createScaleWithSpec(\n  spec: IVisual<any>,\n  context: {\n    globalScale: IGlobalScale;\n    dataStatistics: DataView;\n  }\n): IBaseScale | null {\n  if ('scale' in spec && spec.scale) {\n    if (isString(spec.scale) && context?.globalScale) {\n      return context.globalScale.registerMarkAttributeScale(spec, context.dataStatistics);\n    }\n    return spec.scale as unknown as IBaseScale;\n  }\n  const scale = createScale((spec as IVisualSpecBase<any, any>).type);\n  if (scale) {\n    initScaleWithSpec(scale, spec as IVisualSpecBase<any, any>);\n  }\n  return scale;\n}\n\n// 需要一个通用的从spec初始化scale的方法，避免在scale属性更新后需要维护多组逻辑\nfunction initScaleWithSpec(scale: IBaseScale, spec: IVisualSpecBase<any, any>) {\n  if (!scale || !spec) {\n    return;\n  }\n\n  if (spec.domain) {\n    scale.domain(spec.domain);\n  }\n\n  if (spec.range) {\n    scale.range(spec.range);\n  }\n\n  if (spec.specified && (<OrdinalScale>scale).specified) {\n    (<OrdinalScale>scale).specified(spec.specified);\n  }\n}\n\nexport function valueInScaleRange(v: number, s?: IBaseScale) {\n  if (!s) {\n    return v;\n  }\n  const range = s.range();\n  const min = Math.min(range[0], range[range.length - 1]);\n  const max = Math.max(range[0], range[range.length - 1]);\n  return Math.min(Math.max(min, v), max);\n}\n\nexport function isSpecValueWithScale(specValue: any) {\n  return isValid(specValue?.field) && isValid(specValue?.scale);\n}\n"]}

package/cjs/util/space.d.ts

@@ -1,19 +1,13 @@
-import type { ILayoutPaddingSpec } from '../model/interface';
-import type { IBoundsLike } from '@visactor/vutils';
-import type { ILayoutNumber, IPercent, ILayoutOrientPadding, ILayoutRect } from '../model/interface';
+import { type IBoundsLike } from '@visactor/vutils';
+import type { ILayoutPaddingSpec, IPercentOffset, ILayoutNumber, IPercent, ILayoutOrientPadding, ILayoutRect } from '../model/interface';
 import type { IPadding, IRect } from '../typings/space';
-import { Direction } from '../typings/space';
 import type { IPoint } from '../typings/coordinate';
 export declare function isValidOrient(orient: string): boolean;
-export declare function getSpecPadding(padding: IPadding | number | undefined | null, defaultPadding: IPadding): IPadding;
 export declare function isPointInRect(point: IPoint, rect: IRect): boolean;
 export declare function isPercent(v: any): v is IPercent;
+export declare function isPercentOffset(v: any): v is IPercentOffset;
 export declare function calcLayoutNumber(v: ILayoutNumber | undefined, size: number, callOp?: ILayoutRect): number;
 export declare function calcPadding(paddingSpec: ILayoutOrientPadding, rect: ILayoutRect, callOp: ILayoutRect): IPadding;
 export declare function boundsInRect(bounds: IBoundsLike, rect: ILayoutRect): ILayoutRect;
-export declare function boundsOutViewBox(bounds: IBoundsLike, box: IBoundsLike, direction: Direction): {
-    start: number;
-    end: number;
-};
 export declare function normalizeLayoutPaddingSpec(spec: ILayoutPaddingSpec): ILayoutOrientPadding;
 export declare function convertPoint(point: IPoint, relativePoint: IPoint, convert: boolean): IPoint;

package/cjs/util/space.js

@@ -2,9 +2,9 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.convertPoint = exports.normalizeLayoutPaddingSpec = exports.boundsOutViewBox = exports.boundsInRect = exports.calcPadding = exports.calcLayoutNumber = exports.isPercent = exports.isPointInRect = exports.getSpecPadding = exports.isValidOrient = void 0;
+}), exports.convertPoint = exports.normalizeLayoutPaddingSpec = exports.boundsInRect = exports.calcPadding = exports.calcLayoutNumber = exports.isPercentOffset = exports.isPercent = exports.isPointInRect = exports.isValidOrient = void 0;
 
-const vutils_1 = require("@visactor/vutils"), type_1 = require("./type"), space_1 = require("../typings/space");
+const vutils_1 = require("@visactor/vutils"), type_1 = require("./type");
 
 function isValidOrient(orient) {
     switch (orient) {
@@ -19,15 +19,6 @@ function isValidOrient(orient) {
     }
 }
 
-function getSpecPadding(padding, defaultPadding) {
-    return (0, type_1.isNil)(padding) ? Object.assign({}, defaultPadding) : "number" == typeof padding ? {
-        top: padding,
-        bottom: padding,
-        left: padding,
-        right: padding
-    } : Object.assign(Object.assign({}, defaultPadding), padding);
-}
-
 function isPointInRect(point, rect) {
     const {x: x, y: y, width: width, height: height} = rect, {x: x0, y: y0} = point;
     return x0 < x + width && y0 < y + height && y0 > y && x0 > x;
@@ -37,9 +28,14 @@ function isPercent(v) {
     return !!(0, type_1.isString)(v) && (!!v.endsWith("%") && (0, type_1.couldBeValidNumber)(v.substring(0, v.length - 1)));
 }
 
+function isPercentOffset(v) {
+    return !!(0, type_1.isObject)(v) && ("percent" in v || "offset" in v);
+}
+
 function calcLayoutNumber(v, size, callOp) {
+    var _a, _b;
     return (0, type_1.isNumber)(v) ? v : isPercent(v) ? Number(v.substring(0, v.length - 1)) * size / 100 : (0, 
-    type_1.isFunction)(v) ? v(callOp) : 0;
+    type_1.isFunction)(v) ? v(callOp) : (0, type_1.isObject)(v) ? size * (null !== (_a = v.percent) && void 0 !== _a ? _a : 0) + (null !== (_b = v.offset) && void 0 !== _b ? _b : 0) : 0;
 }
 
 function calcPadding(paddingSpec, rect, callOp) {
@@ -76,25 +72,13 @@ function boundsInRect(bounds, rect) {
     };
 }
 
-function boundsOutViewBox(bounds, box, direction) {
-    if (!bounds || !box) return {
-        start: 0,
-        end: 0
-    };
-    const start = -(direction === space_1.Direction.horizontal ? bounds.x1 : bounds.y1), end = direction === space_1.Direction.horizontal ? bounds.x2 - (box.x2 - box.x1) : bounds.y2 - (box.y2 - box.y1);
-    return {
-        start: start > 0 ? start : 0,
-        end: end > 0 ? end : 0
-    };
-}
-
 function normalizeLayoutPaddingSpec(spec) {
     let result = {};
     return (0, vutils_1.isArray)(spec) ? ((0, type_1.isNil)(spec[0]) || (result.top = result.left = result.bottom = result.right = spec[0]), 
     (0, type_1.isNil)(spec[1]) || (result.left = result.right = spec[1]), (0, type_1.isNil)(spec[2]) || (result.bottom = spec[2]), 
     (0, type_1.isNil)(spec[3]) || (result.left = spec[3]), result) : (0, type_1.isNumber)(spec) || isPercent(spec) || (0, 
-    type_1.isFunction)(spec) ? (result.top = result.left = result.bottom = result.right = spec, 
-    result) : ((0, type_1.isObject)(spec) && (result = Object.assign({}, spec)), result);
+    type_1.isFunction)(spec) || isPercentOffset(spec) ? (result.top = result.left = result.bottom = result.right = spec, 
+    result) : (0, type_1.isObject)(spec) ? (result = Object.assign({}, spec), result) : result;
 }
 
 function convertPoint(point, relativePoint, convert) {
@@ -104,8 +88,8 @@ function convertPoint(point, relativePoint, convert) {
     } : point;
 }
 
-exports.isValidOrient = isValidOrient, exports.getSpecPadding = getSpecPadding, 
-exports.isPointInRect = isPointInRect, exports.isPercent = isPercent, exports.calcLayoutNumber = calcLayoutNumber, 
-exports.calcPadding = calcPadding, exports.boundsInRect = boundsInRect, exports.boundsOutViewBox = boundsOutViewBox, 
-exports.normalizeLayoutPaddingSpec = normalizeLayoutPaddingSpec, exports.convertPoint = convertPoint;
+exports.isValidOrient = isValidOrient, exports.isPointInRect = isPointInRect, exports.isPercent = isPercent, 
+exports.isPercentOffset = isPercentOffset, exports.calcLayoutNumber = calcLayoutNumber, 
+exports.calcPadding = calcPadding, exports.boundsInRect = boundsInRect, exports.normalizeLayoutPaddingSpec = normalizeLayoutPaddingSpec, 
+exports.convertPoint = convertPoint;
 //# sourceMappingURL=space.js.map

package/cjs/util/space.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/space.ts"],"names":[],"mappings":"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","file":"space.js","sourcesContent":["import type { ILayoutPaddingSpec } from '../model/interface';\nimport type { IBoundsLike } from '@visactor/vutils';\nimport { isArray } from '@visactor/vutils';\nimport { isNumber, isNil, isString, isFunction, couldBeValidNumber, isObject } from './type';\nimport type { ILayoutNumber, IPercent, ILayoutOrientPadding, ILayoutRect } from '../model/interface';\nimport type { IPadding, IRect } from '../typings/space';\n// eslint-disable-next-line no-duplicate-imports\nimport { Direction } from '../typings/space';\nimport type { IPoint } from '../typings/coordinate';\n\nexport function isValidOrient(orient: string): boolean {\n  switch (orient) {\n    case 'left':\n    case 'right':\n    case 'top':\n    case 'bottom':\n      return true;\n    default:\n      return false;\n  }\n}\n\nexport function getSpecPadding(padding: IPadding | number | undefined | null, defaultPadding: IPadding): IPadding {\n  if (isNil(padding)) {\n    return { ...defaultPadding };\n  }\n  if (typeof padding === 'number') {\n    return {\n      top: padding,\n      bottom: padding,\n      left: padding,\n      right: padding\n    };\n  }\n  return {\n    ...defaultPadding,\n    ...padding\n  };\n}\n\nexport function isPointInRect(point: IPoint, rect: IRect) {\n  const { x, y, width, height } = rect;\n  const { x: x0, y: y0 } = point;\n  return x0 < x + width && y0 < y + height && y0 > y && x0 > x;\n}\n\nexport function isPercent(v: any): v is IPercent {\n  if (!isString(v)) {\n    return false;\n  }\n  if (!v.endsWith('%')) {\n    return false;\n  }\n  return couldBeValidNumber(v.substring(0, v.length - 1));\n}\n\nexport function calcLayoutNumber(\n  v: ILayoutNumber | undefined,\n  size: number,\n  callOp?: ILayoutRect //如果是函数类型的话，函数的参数\n) {\n  if (isNumber(v)) {\n    return v;\n  }\n  if (isPercent(v)) {\n    return (Number(v.substring(0, v.length - 1)) * size) / 100;\n  }\n  if (isFunction(v)) {\n    return v(callOp);\n  }\n  return 0;\n}\n\nexport function calcPadding(\n  paddingSpec: ILayoutOrientPadding,\n  rect: ILayoutRect,\n  callOp: ILayoutRect //如果是函数类型的话，函数的参数\n): IPadding {\n  const result: IPadding = {\n    top: 0,\n    bottom: 0,\n    left: 0,\n    right: 0\n  };\n  if (Object.values(paddingSpec).every(value => isNumber(value))) {\n    result.top = (<IPadding>paddingSpec).top ?? 0;\n    result.right = (<IPadding>paddingSpec).right ?? 0;\n    result.bottom = (<IPadding>paddingSpec).bottom ?? 0;\n    result.left = (<IPadding>paddingSpec).left ?? 0;\n    return result;\n  }\n  const paddings = [\n    {\n      orients: ['left', 'right'],\n      size: rect.width\n    },\n    {\n      orients: ['top', 'bottom'],\n      size: rect.height\n    }\n  ];\n  paddings.forEach(p => {\n    p.orients.forEach(o => {\n      result[o] = calcLayoutNumber(paddingSpec[o], p.size, callOp);\n    });\n  });\n  return result;\n}\n\nexport function boundsInRect(bounds: IBoundsLike, rect: ILayoutRect): ILayoutRect {\n  if (!bounds) {\n    return { width: 0, height: 0 };\n  }\n  return {\n    width: Math.ceil(Math.min(bounds.x2 - bounds.x1, rect.width)),\n    height: Math.ceil(Math.min(bounds.y2 - bounds.y1, rect.height))\n  };\n}\n\nexport function boundsOutViewBox(\n  bounds: IBoundsLike,\n  box: IBoundsLike,\n  direction: Direction\n): {\n  start: number;\n  end: number;\n} {\n  if (!bounds || !box) {\n    return { start: 0, end: 0 };\n  }\n  const start = -(direction === Direction.horizontal ? bounds.x1 : bounds.y1);\n  const end = direction === Direction.horizontal ? bounds.x2 - (box.x2 - box.x1) : bounds.y2 - (box.y2 - box.y1);\n  return { start: start > 0 ? start : 0, end: end > 0 ? end : 0 };\n}\n\nexport function normalizeLayoutPaddingSpec(spec: ILayoutPaddingSpec): ILayoutOrientPadding {\n  let result: ILayoutOrientPadding = {};\n  if (isArray(spec)) {\n    if (!isNil(spec[0])) {\n      result.top = result.left = result.bottom = result.right = spec[0];\n    }\n    if (!isNil(spec[1])) {\n      result.left = result.right = spec[1];\n    }\n    if (!isNil(spec[2])) {\n      result.bottom = spec[2];\n    }\n    if (!isNil(spec[3])) {\n      result.left = spec[3];\n    }\n    return result;\n  }\n  if (isNumber(spec) || isPercent(spec) || isFunction(spec)) {\n    result.top = result.left = result.bottom = result.right = spec;\n    return result;\n  }\n  if (isObject(spec)) {\n    result = { ...spec };\n  }\n  return result;\n}\n\nexport function convertPoint(point: IPoint, relativePoint: IPoint, convert: boolean) {\n  if (convert) {\n    return {\n      x: point.x + relativePoint.x,\n      y: point.y + relativePoint.y\n    };\n  }\n  return point;\n}\n"]}
+{"version":3,"sources":["../src/util/space.ts"],"names":[],"mappings":"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","file":"space.js","sourcesContent":["import { isArray, type IBoundsLike } from '@visactor/vutils';\nimport { isNumber, isNil, isString, isFunction, couldBeValidNumber, isObject } from './type';\nimport type {\n  ILayoutPaddingSpec,\n  IPercentOffset,\n  ILayoutNumber,\n  IPercent,\n  ILayoutOrientPadding,\n  ILayoutRect\n} from '../model/interface';\nimport type { IPadding, IRect } from '../typings/space';\nimport type { IPoint } from '../typings/coordinate';\n\nexport function isValidOrient(orient: string): boolean {\n  switch (orient) {\n    case 'left':\n    case 'right':\n    case 'top':\n    case 'bottom':\n      return true;\n    default:\n      return false;\n  }\n}\n\nexport function isPointInRect(point: IPoint, rect: IRect) {\n  const { x, y, width, height } = rect;\n  const { x: x0, y: y0 } = point;\n  return x0 < x + width && y0 < y + height && y0 > y && x0 > x;\n}\n\nexport function isPercent(v: any): v is IPercent {\n  if (!isString(v)) {\n    return false;\n  }\n  if (!v.endsWith('%')) {\n    return false;\n  }\n  return couldBeValidNumber(v.substring(0, v.length - 1));\n}\n\nexport function isPercentOffset(v: any): v is IPercentOffset {\n  if (!isObject(v)) {\n    return false;\n  }\n  if ('percent' in v || 'offset' in v) {\n    return true;\n  }\n  return false;\n}\n\nexport function calcLayoutNumber(\n  v: ILayoutNumber | undefined,\n  size: number,\n  callOp?: ILayoutRect //如果是函数类型的话，函数的参数\n) {\n  if (isNumber(v)) {\n    return v;\n  }\n  if (isPercent(v)) {\n    return (Number(v.substring(0, v.length - 1)) * size) / 100;\n  }\n  if (isFunction(v)) {\n    return v(callOp);\n  }\n  if (isObject(v)) {\n    return size * (v.percent ?? 0) + (v.offset ?? 0);\n  }\n  return 0;\n}\n\nexport function calcPadding(\n  paddingSpec: ILayoutOrientPadding,\n  rect: ILayoutRect,\n  callOp: ILayoutRect //如果是函数类型的话，函数的参数\n): IPadding {\n  const result: IPadding = {\n    top: 0,\n    bottom: 0,\n    left: 0,\n    right: 0\n  };\n  if (Object.values(paddingSpec).every(value => isNumber(value))) {\n    result.top = (<IPadding>paddingSpec).top ?? 0;\n    result.right = (<IPadding>paddingSpec).right ?? 0;\n    result.bottom = (<IPadding>paddingSpec).bottom ?? 0;\n    result.left = (<IPadding>paddingSpec).left ?? 0;\n    return result;\n  }\n  const paddings = [\n    {\n      orients: ['left', 'right'],\n      size: rect.width\n    },\n    {\n      orients: ['top', 'bottom'],\n      size: rect.height\n    }\n  ];\n  paddings.forEach(p => {\n    p.orients.forEach(o => {\n      result[o] = calcLayoutNumber(paddingSpec[o], p.size, callOp);\n    });\n  });\n  return result;\n}\n\nexport function boundsInRect(bounds: IBoundsLike, rect: ILayoutRect): ILayoutRect {\n  if (!bounds) {\n    return { width: 0, height: 0 };\n  }\n  return {\n    width: Math.ceil(Math.min(bounds.x2 - bounds.x1, rect.width)),\n    height: Math.ceil(Math.min(bounds.y2 - bounds.y1, rect.height))\n  };\n}\n\nexport function normalizeLayoutPaddingSpec(spec: ILayoutPaddingSpec): ILayoutOrientPadding {\n  let result: ILayoutOrientPadding = {};\n  if (isArray(spec)) {\n    if (!isNil(spec[0])) {\n      result.top = result.left = result.bottom = result.right = spec[0];\n    }\n    if (!isNil(spec[1])) {\n      result.left = result.right = spec[1];\n    }\n    if (!isNil(spec[2])) {\n      result.bottom = spec[2];\n    }\n    if (!isNil(spec[3])) {\n      result.left = spec[3];\n    }\n    return result;\n  }\n  if (isNumber(spec) || isPercent(spec) || isFunction(spec) || isPercentOffset(spec)) {\n    result.top = result.left = result.bottom = result.right = spec;\n    return result;\n  }\n  if (isObject(spec)) {\n    result = { ...spec };\n    return result;\n  }\n  return result;\n}\n\nexport function convertPoint(point: IPoint, relativePoint: IPoint, convert: boolean) {\n  if (convert) {\n    return {\n      x: point.x + relativePoint.x,\n      y: point.y + relativePoint.y\n    };\n  }\n  return point;\n}\n"]}

package/cjs/util/text.d.ts

@@ -1,9 +1,8 @@
 import type { ITextMeasureOption } from '@visactor/vutils';
-import { TextMeasure, TestTextMeasure } from '@visactor/vutils';
+import { TextMeasure } from '@visactor/vutils';
 import type { IRichTextAttribute } from '@visactor/vrender';
 import type { ITextMarkSpec } from '../typings';
 export declare const initTextMeasure: (textSpec?: Partial<ITextMarkSpec>, option?: Partial<ITextMeasureOption>, useNaiveCanvas?: boolean) => TextMeasure<ITextMarkSpec>;
-export declare const testTextMeasure: (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean) => TestTextMeasure<any>;
 type IRichTextBoundsParams = Partial<IRichTextAttribute>;
 export declare function getRichTextBounds(params: IRichTextBoundsParams): import("@visactor/vutils").IBounds;
 export {};

package/cjs/util/text.js

@@ -2,7 +2,7 @@
 
 Object.defineProperty(exports, "__esModule", {
     value: !0
-}), exports.getRichTextBounds = exports.testTextMeasure = exports.initTextMeasure = void 0;
+}), exports.getRichTextBounds = exports.initTextMeasure = void 0;
 
 const vutils_1 = require("@visactor/vutils"), vrender_1 = require("@visactor/vrender"), theme_1 = require("../theme"), initTextMeasure = (textSpec, option, useNaiveCanvas) => new vutils_1.TextMeasure(Object.assign({
     defaultFontParams: {
@@ -15,16 +15,6 @@ const vutils_1 = require("@visactor/vutils"), vrender_1 = require("@visactor/vre
 
 exports.initTextMeasure = initTextMeasure;
 
-const testTextMeasure = (textSpec, useVRender) => new vutils_1.TestTextMeasure({
-    defaultFontParams: {
-        fontFamily: theme_1.DEFAULT_TEXT_FONT_FAMILY,
-        fontSize: theme_1.DEFAULT_TEXT_FONT_SIZE
-    },
-    getTextBounds: useVRender ? vrender_1.getTextBounds : void 0
-}, textSpec);
-
-exports.testTextMeasure = testTextMeasure;
-
 const richText = (0, vrender_1.createRichText)({});
 
 function getRichTextBounds(params) {

package/cjs/util/text.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":";;;AAEA,6CAAgE;AAGhE,+CAAkE;AAElE,oCAA4E;AAErE,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,MAAoC,EACpC,cAAwB,EACI,EAAE;IAC9B,OAAO,IAAI,oBAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,gCAAwB;YACpC,QAAQ,EAAE,8BAAsB;SACjC,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAa,EACzD,cAAc,EAAE,cAAc,GAAG,oBAAW,CAAC,iBAAiB,GAAG,oBAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,eAAe,mBAiB1B;AAGK,MAAM,eAAe,GAAG,CAAC,QAAiC,EAAE,UAAoB,EAAwB,EAAE;IAC/G,OAAO,IAAI,wBAAe,CACxB;QACE,iBAAiB,EAAE;YACjB,UAAU,EAAE,gCAAwB;YACpC,QAAQ,EAAE,8BAAsB;SACjC;QACD,aAAa,EAAE,UAAU,CAAC,CAAC,CAAC,uBAAa,CAAC,CAAC,CAAC,SAAS;KACtD,EACD,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAXW,QAAA,eAAe,mBAW1B;AAKF,MAAM,QAAQ,GAAG,IAAA,wBAAc,EAAC,EAAE,CAAC,CAAC;AACpC,SAAgB,iBAAiB,CAAC,MAA6B;IAC7D,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,QAAQ,CAAC,UAAU,CAAC;AAC7B,CAAC;AAHD,8CAGC","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, TestTextMeasure } from '@visactor/vutils';\nimport type { IRichTextAttribute } from '@visactor/vrender';\n// eslint-disable-next-line no-duplicate-imports\nimport { createRichText, getTextBounds } from '@visactor/vrender';\nimport type { ITextMarkSpec } from '../typings';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../theme';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextMarkSpec>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextMarkSpec> => {\n  return new TextMeasure<ITextMarkSpec>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n/** 测试方法 */\nexport const testTextMeasure = (textSpec?: Partial<ITextMarkSpec>, useVRender?: boolean): TestTextMeasure<any> => {\n  return new TestTextMeasure(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useVRender ? getTextBounds : undefined\n    },\n    textSpec\n  );\n};\n\n/** 测量富文本 */\n// FIXME: 等 vrender 支持后删掉\ntype IRichTextBoundsParams = Partial<IRichTextAttribute>;\nconst richText = createRichText({});\nexport function getRichTextBounds(params: IRichTextBoundsParams) {\n  richText.setAttributes(params);\n  return richText.AABBBounds;\n}\n"]}
+{"version":3,"sources":["../src/util/text.ts"],"names":[],"mappings":";;;AAEA,6CAAgE;AAGhE,+CAAkE;AAElE,oCAA4E;AAErE,MAAM,eAAe,GAAG,CAC7B,QAAiC,EACjC,MAAoC,EACpC,cAAwB,EACI,EAAE;IAC9B,OAAO,IAAI,oBAAW,iBAElB,iBAAiB,EAAE;YACjB,UAAU,EAAE,gCAAwB;YACpC,QAAQ,EAAE,8BAAsB;SACjC,EACD,aAAa,EAAE,cAAc,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBAAa,EACzD,cAAc,EAAE,cAAc,GAAG,oBAAW,CAAC,iBAAiB,GAAG,oBAAW,CAAC,iBAAiB,CAAC,WAAW,EAAE,IACzG,CAAC,MAAM,aAAN,MAAM,cAAN,MAAM,GAAI,EAAE,CAAC,GAEnB,QAAQ,CACT,CAAC;AACJ,CAAC,CAAC;AAjBW,QAAA,eAAe,mBAiB1B;AAKF,MAAM,QAAQ,GAAG,IAAA,wBAAc,EAAC,EAAE,CAAC,CAAC;AACpC,SAAgB,iBAAiB,CAAC,MAA6B;IAC7D,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;IAC/B,OAAO,QAAQ,CAAC,UAAU,CAAC;AAC7B,CAAC;AAHD,8CAGC","file":"text.js","sourcesContent":["import type { ITextMeasureOption } from '@visactor/vutils';\n// eslint-disable-next-line no-duplicate-imports\nimport { TextMeasure, TestTextMeasure } from '@visactor/vutils';\nimport type { IRichTextAttribute } from '@visactor/vrender';\n// eslint-disable-next-line no-duplicate-imports\nimport { createRichText, getTextBounds } from '@visactor/vrender';\nimport type { ITextMarkSpec } from '../typings';\nimport { DEFAULT_TEXT_FONT_FAMILY, DEFAULT_TEXT_FONT_SIZE } from '../theme';\n\nexport const initTextMeasure = (\n  textSpec?: Partial<ITextMarkSpec>,\n  option?: Partial<ITextMeasureOption>,\n  useNaiveCanvas?: boolean\n): TextMeasure<ITextMarkSpec> => {\n  return new TextMeasure<ITextMarkSpec>(\n    {\n      defaultFontParams: {\n        fontFamily: DEFAULT_TEXT_FONT_FAMILY,\n        fontSize: DEFAULT_TEXT_FONT_SIZE\n      },\n      getTextBounds: useNaiveCanvas ? undefined : getTextBounds,\n      specialCharSet: '-/: .,@%\\'\"~' + TextMeasure.ALPHABET_CHAR_SET + TextMeasure.ALPHABET_CHAR_SET.toUpperCase(),\n      ...(option ?? {})\n    },\n    textSpec\n  );\n};\n\n/** 测量富文本 */\n// FIXME: 等 vrender 支持后删掉\ntype IRichTextBoundsParams = Partial<IRichTextAttribute>;\nconst richText = createRichText({});\nexport function getRichTextBounds(params: IRichTextBoundsParams) {\n  richText.setAttributes(params);\n  return richText.AABBBounds;\n}\n"]}

package/cjs/vchart-all.js

@@ -16,6 +16,6 @@ Object.defineProperty(exports, "VChart", {
 const chart_1 = require("./chart"), component_1 = require("./component"), layout_1 = require("./layout"), vrender_components_1 = require("@visactor/vrender-components");
 
 (0, vrender_components_1.loadPoptip)({}), core_1.VChart.useChart([ chart_1.AreaChart, chart_1.LineChart, chart_1.BarChart, chart_1.Bar3dChart, chart_1.ScatterChart, chart_1.MapChart, chart_1.PieChart, chart_1.Pie3dChart, chart_1.RoseChart, chart_1.RadarChart, chart_1.CommonChart, chart_1.SequenceChart, chart_1.HistogramChart, chart_1.Histogram3dChart, chart_1.CircularProgressChart, chart_1.WordCloudChart, chart_1.WordCloud3dChart, chart_1.FunnelChart, chart_1.Funnel3dChart, chart_1.LinearProgressChart, chart_1.RangeColumnChart, chart_1.RangeColumn3dChart, chart_1.SunburstChart, chart_1.CirclePackingChart, chart_1.TreeMapChart, chart_1.WaterfallChart, chart_1.BoxPlotChart, chart_1.SankeyChart, chart_1.GaugeChart, chart_1.RangeAreaChart, chart_1.HeatmapChart ]), 
-core_1.VChart.useComponent([ component_1.CartesianLinearAxis, component_1.CartesianBandAxis, component_1.CartesianTimeAxis, component_1.CartesianLogAxis, component_1.PolarBandAxis, component_1.PolarLinearAxis, component_1.DiscreteLegend, component_1.ContinuousLegend, component_1.Tooltip, component_1.CartesianCrossHair, component_1.PolarCrossHair, component_1.DataZoom, component_1.ScrollBar, component_1.Indicator, component_1.GeoCoordinate, component_1.MarkLine, component_1.Title, component_1.MarkArea, component_1.Player, component_1.Label, component_1.MarkPoint, component_1.Brush, component_1.CustomMark, component_1.MapLabelComponent ]), 
+core_1.VChart.useComponent([ component_1.CartesianLinearAxis, component_1.CartesianBandAxis, component_1.CartesianTimeAxis, component_1.CartesianLogAxis, component_1.CartesianSymlogAxis, component_1.PolarBandAxis, component_1.PolarLinearAxis, component_1.DiscreteLegend, component_1.ContinuousLegend, component_1.Tooltip, component_1.CartesianCrossHair, component_1.PolarCrossHair, component_1.DataZoom, component_1.ScrollBar, component_1.Indicator, component_1.GeoCoordinate, component_1.MarkLine, component_1.Title, component_1.MarkArea, component_1.Player, component_1.TotalLabel, component_1.Label, component_1.MarkPoint, component_1.Brush, component_1.CustomMark, component_1.MapLabelComponent ]), 
 core_1.Factory.registerLayout("grid", layout_1.GridLayout), core_1.Factory.registerLayout("layout3d", layout_1.Layout3d);
 //# sourceMappingURL=vchart-all.js.map

package/cjs/vchart-all.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vchart-all.ts"],"names":[],"mappings":";;;AAAA,iCAAyC;AAsIhC,uFAtIA,aAAM,OAsIA;AArIf,mCAgCiB;AAEjB,2CAyBqB;AACrB,qCAAgD;AAChD,qEAA0D;AAG1D,IAAA,+BAAU,EAAC,EAAE,CAAC,CAAC;AAGf,aAAM,CAAC,QAAQ,CAAC;IACd,iBAAS;IACT,iBAAS;IACT,gBAAQ;IACR,kBAAU;IACV,oBAAY;IACZ,gBAAQ;IACR,gBAAQ;IACR,kBAAU;IACV,iBAAS;IACT,kBAAU;IACV,mBAAW;IACX,qBAAa;IACb,sBAAc;IACd,wBAAgB;IAChB,6BAAqB;IACrB,sBAAc;IACd,wBAAgB;IAChB,mBAAW;IACX,qBAAa;IACb,2BAAmB;IACnB,wBAAgB;IAChB,0BAAkB;IAClB,qBAAa;IACb,0BAAkB;IAClB,oBAAY;IACZ,sBAAc;IACd,oBAAY;IACZ,mBAAW;IACX,kBAAU;IACV,sBAAc;IACd,oBAAY;CACb,CAAC,CAAC;AAGH,aAAM,CAAC,YAAY,CAAC;IAClB,+BAAmB;IACnB,6BAAiB;IACjB,6BAAiB;IACjB,4BAAgB;IAChB,yBAAa;IACb,2BAAe;IACf,0BAAc;IACd,4BAAgB;IAChB,mBAAO;IACP,8BAAkB;IAClB,0BAAc;IACd,oBAAQ;IACR,qBAAS;IACT,qBAAS;IACT,yBAAa;IACb,oBAAQ;IACR,iBAAK;IACL,oBAAQ;IACR,kBAAM;IACN,iBAAK;IACL,qBAAS;IACT,iBAAK;IACL,sBAAU;IACV,6BAAiB;CAClB,CAAC,CAAC;AAGH,cAAO,CAAC,cAAc,CAAC,MAAM,EAAE,mBAAiB,CAAC,CAAC;AAClD,cAAO,CAAC,cAAc,CAAC,UAAU,EAAE,iBAAe,CAAC,CAAC","file":"vchart-all.js","sourcesContent":["import { VChart, Factory } from './core';\nimport {\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreeMapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n} from './chart';\n\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  PolarBandAxis,\n  CartesianLogAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent\n} from './component';\nimport { GridLayout, Layout3d } from './layout';\nimport { loadPoptip } from '@visactor/vrender-components';\n\n// 装载 poptip\nloadPoptip({});\n\n// charts\nVChart.useChart([\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreeMapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  CartesianLogAxis,\n  PolarBandAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent\n]);\n\n// layout\nFactory.registerLayout('grid', GridLayout as any);\nFactory.registerLayout('layout3d', Layout3d as any);\n\nexport { VChart };\n"]}
+{"version":3,"sources":["../src/vchart-all.ts"],"names":[],"mappings":";;;AAAA,iCAAyC;AA0IhC,uFA1IA,aAAM,OA0IA;AAzIf,mCAgCiB;AAEjB,2CA2BqB;AACrB,qCAAgD;AAChD,qEAA0D;AAG1D,IAAA,+BAAU,EAAC,EAAE,CAAC,CAAC;AAGf,aAAM,CAAC,QAAQ,CAAC;IACd,iBAAS;IACT,iBAAS;IACT,gBAAQ;IACR,kBAAU;IACV,oBAAY;IACZ,gBAAQ;IACR,gBAAQ;IACR,kBAAU;IACV,iBAAS;IACT,kBAAU;IACV,mBAAW;IACX,qBAAa;IACb,sBAAc;IACd,wBAAgB;IAChB,6BAAqB;IACrB,sBAAc;IACd,wBAAgB;IAChB,mBAAW;IACX,qBAAa;IACb,2BAAmB;IACnB,wBAAgB;IAChB,0BAAkB;IAClB,qBAAa;IACb,0BAAkB;IAClB,oBAAY;IACZ,sBAAc;IACd,oBAAY;IACZ,mBAAW;IACX,kBAAU;IACV,sBAAc;IACd,oBAAY;CACb,CAAC,CAAC;AAGH,aAAM,CAAC,YAAY,CAAC;IAClB,+BAAmB;IACnB,6BAAiB;IACjB,6BAAiB;IACjB,4BAAgB;IAChB,+BAAmB;IACnB,yBAAa;IACb,2BAAe;IACf,0BAAc;IACd,4BAAgB;IAChB,mBAAO;IACP,8BAAkB;IAClB,0BAAc;IACd,oBAAQ;IACR,qBAAS;IACT,qBAAS;IACT,yBAAa;IACb,oBAAQ;IACR,iBAAK;IACL,oBAAQ;IACR,kBAAM;IACN,sBAAU;IACV,iBAAK;IACL,qBAAS;IACT,iBAAK;IACL,sBAAU;IACV,6BAAiB;CAClB,CAAC,CAAC;AAGH,cAAO,CAAC,cAAc,CAAC,MAAM,EAAE,mBAAiB,CAAC,CAAC;AAClD,cAAO,CAAC,cAAc,CAAC,UAAU,EAAE,iBAAe,CAAC,CAAC","file":"vchart-all.js","sourcesContent":["import { VChart, Factory } from './core';\nimport {\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreeMapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n} from './chart';\n\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  PolarBandAxis,\n  CartesianLogAxis,\n  CartesianSymlogAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent,\n  TotalLabel\n} from './component';\nimport { GridLayout, Layout3d } from './layout';\nimport { loadPoptip } from '@visactor/vrender-components';\n\n// 装载 poptip\nloadPoptip({});\n\n// charts\nVChart.useChart([\n  AreaChart,\n  LineChart,\n  BarChart,\n  Bar3dChart,\n  ScatterChart,\n  MapChart,\n  PieChart,\n  Pie3dChart,\n  RoseChart,\n  RadarChart,\n  CommonChart,\n  SequenceChart,\n  HistogramChart,\n  Histogram3dChart,\n  CircularProgressChart,\n  WordCloudChart,\n  WordCloud3dChart,\n  FunnelChart,\n  Funnel3dChart,\n  LinearProgressChart,\n  RangeColumnChart,\n  RangeColumn3dChart,\n  SunburstChart,\n  CirclePackingChart,\n  TreeMapChart,\n  WaterfallChart,\n  BoxPlotChart,\n  SankeyChart,\n  GaugeChart,\n  RangeAreaChart,\n  HeatmapChart\n]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  CartesianLogAxis,\n  CartesianSymlogAxis,\n  PolarBandAxis,\n  PolarLinearAxis,\n  DiscreteLegend,\n  ContinuousLegend,\n  Tooltip,\n  CartesianCrossHair,\n  PolarCrossHair,\n  DataZoom,\n  ScrollBar,\n  Indicator,\n  GeoCoordinate,\n  MarkLine,\n  Title,\n  MarkArea,\n  Player,\n  TotalLabel,\n  Label,\n  MarkPoint,\n  Brush,\n  CustomMark,\n  MapLabelComponent\n]);\n\n// layout\nFactory.registerLayout('grid', GridLayout as any);\nFactory.registerLayout('layout3d', Layout3d as any);\n\nexport { VChart };\n"]}

package/cjs/vchart-simple.js

@@ -4,7 +4,7 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.VChart = void 0;
 
-const core_1 = require("./core");
+const label_1 = require("./component/label/label"), cartesian_1 = require("./component/crosshair/cartesian"), tooltip_1 = require("./component/tooltip/tooltip"), legend_1 = require("./component/legend/discrete/legend"), time_axis_1 = require("./component/axis/cartesian/time-axis"), band_axis_1 = require("./component/axis/cartesian/band-axis"), linear_axis_1 = require("./component/axis/cartesian/linear-axis"), core_1 = require("./core");
 
 Object.defineProperty(exports, "VChart", {
     enumerable: !0,
@@ -13,8 +13,7 @@ Object.defineProperty(exports, "VChart", {
     }
 });
 
-const chart_1 = require("./chart"), component_1 = require("./component");
+const line_1 = require("./chart/line"), pie_1 = require("./chart/pie"), bar_1 = require("./chart/bar");
 
-core_1.VChart.useChart([ chart_1.LineChart, chart_1.BarChart, chart_1.PieChart ]), 
-core_1.VChart.useComponent([ component_1.CartesianLinearAxis, component_1.CartesianBandAxis, component_1.CartesianTimeAxis, component_1.DiscreteLegend, component_1.Tooltip, component_1.CartesianCrossHair, component_1.Label ]);
+core_1.VChart.useChart([ line_1.LineChart, bar_1.BarChart, pie_1.PieChart ]), core_1.VChart.useComponent([ linear_axis_1.CartesianLinearAxis, band_axis_1.CartesianBandAxis, time_axis_1.CartesianTimeAxis, legend_1.DiscreteLegend, tooltip_1.Tooltip, cartesian_1.CartesianCrossHair, label_1.Label ]);
 //# sourceMappingURL=vchart-simple.js.map

package/cjs/vchart-simple.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":";;;AAGA,iCAAgC;AA0BvB,uFA1BA,aAAM,OA0BA;AAzBf,mCAAwD;AACxD,2CAQqB;AAGrB,aAAM,CAAC,QAAQ,CAAC,CAAC,iBAAS,EAAE,gBAAQ,EAAE,gBAAQ,CAAC,CAAC,CAAC;AAGjD,aAAM,CAAC,YAAY,CAAC;IAClB,+BAAmB;IACnB,6BAAiB;IACjB,6BAAiB;IACjB,0BAAc;IACd,mBAAO;IACP,8BAAkB;IAClB,iBAAK;CACN,CAAC,CAAC","file":"vchart-simple.js","sourcesContent":["/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { LineChart, BarChart, PieChart } from './chart';\nimport {\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n} from './component';\n\n// charts\nVChart.useChart([LineChart, BarChart, PieChart]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n]);\n\nexport { VChart };\n"]}
+{"version":3,"sources":["../src/vchart-simple.ts"],"names":[],"mappings":";;;AAAA,mDAAgD;AAChD,+DAAqE;AACrE,yDAAsD;AACtD,+DAAoE;AACpE,oEAAyE;AACzE,oEAAyE;AACzE,wEAA6E;AAI7E,iCAAgC;AAmBvB,uFAnBA,aAAM,OAmBA;AAlBf,uCAAyC;AACzC,qCAAuC;AACvC,qCAAuC;AAGvC,aAAM,CAAC,QAAQ,CAAC,CAAC,gBAAS,EAAE,cAAQ,EAAE,cAAQ,CAAC,CAAC,CAAC;AAGjD,aAAM,CAAC,YAAY,CAAC;IAClB,iCAAmB;IACnB,6BAAiB;IACjB,6BAAiB;IACjB,uBAAc;IACd,iBAAO;IACP,8BAAkB;IAClB,aAAK;CACN,CAAC,CAAC","file":"vchart-simple.js","sourcesContent":["import { Label } from './component/label/label';\nimport { CartesianCrossHair } from './component/crosshair/cartesian';\nimport { Tooltip } from './component/tooltip/tooltip';\nimport { DiscreteLegend } from './component/legend/discrete/legend';\nimport { CartesianTimeAxis } from './component/axis/cartesian/time-axis';\nimport { CartesianBandAxis } from './component/axis/cartesian/band-axis';\nimport { CartesianLinearAxis } from './component/axis/cartesian/linear-axis';\n/**\n * @description 包含基础的折柱饼图，提供坐标轴、离散图例以及 tooltip、crosshair、label 组件\n */\nimport { VChart } from './core';\nimport { LineChart } from './chart/line';\nimport { PieChart } from './chart/pie';\nimport { BarChart } from './chart/bar';\n\n// charts\nVChart.useChart([LineChart, BarChart, PieChart]);\n\n// components\nVChart.useComponent([\n  CartesianLinearAxis,\n  CartesianBandAxis,\n  CartesianTimeAxis,\n  DiscreteLegend,\n  Tooltip,\n  CartesianCrossHair,\n  Label\n]);\n\nexport { VChart };\n"]}

package/esm/animation/spec.d.ts

@@ -1,6 +1,6 @@
 import type { IAnimationConfig } from '@visactor/vgrammar';
 import type { EasingType } from '@visactor/vrender';
-export type { IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar';
+export type { IRunningConfig as IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar';
 export type IStateAnimateSpec<Preset extends string> = {
     preset?: Preset | false;
     duration?: number;

package/esm/animation/spec.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/animation/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar';\nimport type { EasingType } from '@visactor/vrender';\nexport type { IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar';\n\nexport type IStateAnimateSpec<Preset extends string> = {\n  /**\n   * 预设动画效果\n   */\n  preset?: Preset | false;\n  /**\n   * 图表动画时长\n   */\n  duration?: number;\n  /**\n   * 动画延迟开始的时长\n   */\n  delay?: number;\n  /**\n   * 动画缓动效果\n   */\n  easing?: EasingType;\n  /**\n   * 是否轮流执行\n   */\n  oneByOne?: boolean;\n};\n\nexport type IMarkAnimateSpec<MarkName extends string> = Partial<\n  Record<MarkName, false | IAnimationConfig | IAnimationConfig[]>\n>;\n\nexport interface IAnimationSpec<MarkName extends string, Preset extends string> {\n  /**\n   * 图表入场动画\n   * 支持配置图表内置不同动画效果\n   */\n  animationAppear?: boolean | IStateAnimateSpec<Preset> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 新增数据动画\n   */\n  animationEnter?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 数据更新动画\n   */\n  animationUpdate?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 数据删除动画\n   */\n  animationExit?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 图表退场动画\n   */\n  animationDisappear?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 循环动画\n   */\n  animationNormal?: IMarkAnimateSpec<MarkName>;\n}\nexport interface IMorphSeriesSpec {\n  /**\n   * 系列全局动画是否开启\n   * @default true\n   */\n  enable?: boolean;\n  /**\n   * 图元匹配字段\n   * 系列前后根据 morphKey 配置的内容进行关联\n   */\n  morphKey?: string;\n  /**\n   * 数据匹配字段\n   * 多数据图元可配置\n   */\n  morphElementKey?: string;\n}\n"]}
+{"version":3,"sources":["../src/animation/spec.ts"],"names":[],"mappings":"","file":"spec.js","sourcesContent":["import type { IAnimationConfig } from '@visactor/vgrammar';\nimport type { EasingType } from '@visactor/vrender';\nexport type { IRunningConfig as IMorphConfig, IMorphAnimationConfig } from '@visactor/vgrammar';\n\nexport type IStateAnimateSpec<Preset extends string> = {\n  /**\n   * 预设动画效果\n   */\n  preset?: Preset | false;\n  /**\n   * 图表动画时长\n   */\n  duration?: number;\n  /**\n   * 动画延迟开始的时长\n   */\n  delay?: number;\n  /**\n   * 动画缓动效果\n   */\n  easing?: EasingType;\n  /**\n   * 是否轮流执行\n   */\n  oneByOne?: boolean;\n};\n\nexport type IMarkAnimateSpec<MarkName extends string> = Partial<\n  Record<MarkName, false | IAnimationConfig | IAnimationConfig[]>\n>;\n\nexport interface IAnimationSpec<MarkName extends string, Preset extends string> {\n  /**\n   * 图表入场动画\n   * 支持配置图表内置不同动画效果\n   */\n  animationAppear?: boolean | IStateAnimateSpec<Preset> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 新增数据动画\n   */\n  animationEnter?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 数据更新动画\n   */\n  animationUpdate?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 数据更新 - 数据删除动画\n   */\n  animationExit?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 图表退场动画\n   */\n  animationDisappear?: boolean | Omit<IStateAnimateSpec<Preset>, 'preset'> | IMarkAnimateSpec<MarkName>;\n  /**\n   * 循环动画\n   */\n  animationNormal?: IMarkAnimateSpec<MarkName>;\n}\nexport interface IMorphSeriesSpec {\n  /**\n   * 系列全局动画是否开启\n   * @default true\n   */\n  enable?: boolean;\n  /**\n   * 图元匹配字段\n   * 系列前后根据 morphKey 配置的内容进行关联\n   */\n  morphKey?: string;\n  /**\n   * 数据匹配字段\n   * 多数据图元可配置\n   */\n  morphElementKey?: string;\n}\n"]}

package/esm/chart/area/area.js

@@ -1,14 +1,14 @@
+import { AreaSeries } from "./../../series/area/area";
+
 import { SeriesTypeEnum } from "../../series/interface";
 
 import { CartesianChart } from "../cartesian/cartesian";
 
 import { ChartTypeEnum } from "../interface";
 
-import { setDefaultCrosshairForCartesianChart } from "../util";
-
 import { VChart } from "../../core/vchart";
 
-import { AreaSeries } from "../../series";
+import { setDefaultCrosshairForCartesianChart } from "../util";
 
 VChart.useSeries([ AreaSeries ]);
 
@@ -19,7 +19,6 @@ export class AreaChart extends CartesianChart {
     _getDefaultSeriesSpec(spec) {
         var _a;
         return Object.assign(Object.assign({}, super._getDefaultSeriesSpec(spec)), {
-            invalidType: spec.invalidType || "break",
             point: spec.point,
             line: spec.line,
             area: spec.area,

package/esm/chart/area/area.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/area/area.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAC;AAC1C,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/B,MAAM,OAAO,SAAU,SAAQ,cAAc;IAA7C;;QAGW,SAAI,GAAW,aAAa,CAAC,IAAI,CAAC;QAClC,eAAU,GAAW,cAAc,CAAC,IAAI,CAAC;IAkBpD,CAAC;IAhBW,qBAAqB,CAAC,IAAoB;;QAClD,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,WAAW,EAAE,IAAI,CAAC,WAAW,IAAI,OAAO,EACxC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,MAAM,EACrC,WAAW,EAAE,IAAI,CAAC,WAAW,IAC7B;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AApBe,cAAI,GAAW,aAAa,CAAC,IAAI,CAAC;AAClC,cAAI,GAAW,eAAe,CAAC","file":"area.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport type { IAreaChartSpec } from './interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport { AreaSeries } from '../../series';\nVChart.useSeries([AreaSeries]);\n\nexport class AreaChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.area;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.area;\n  readonly seriesType: string = SeriesTypeEnum.area;\n\n  protected _getDefaultSeriesSpec(spec: IAreaChartSpec): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      invalidType: spec.invalidType || 'break',\n      point: spec.point,\n      line: spec.line,\n      area: spec.area,\n      seriesMark: spec.seriesMark ?? 'area',\n      activePoint: spec.activePoint\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/area/area.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,0BAA0B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAE7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAC/D,MAAM,CAAC,SAAS,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;AAE/B,MAAM,OAAO,SAAU,SAAQ,cAAc;IAA7C;;QAGW,SAAI,GAAW,aAAa,CAAC,IAAI,CAAC;QAClC,eAAU,GAAW,cAAc,CAAC,IAAI,CAAC;IAiBpD,CAAC;IAfW,qBAAqB,CAAC,IAAoB;;QAClD,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,KAAK,EAAE,IAAI,CAAC,KAAK,EACjB,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,IAAI,EAAE,IAAI,CAAC,IAAI,EACf,UAAU,EAAE,MAAA,IAAI,CAAC,UAAU,mCAAI,MAAM,EACrC,WAAW,EAAE,IAAI,CAAC,WAAW,IAC7B;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAnBe,cAAI,GAAW,aAAa,CAAC,IAAI,CAAC;AAClC,cAAI,GAAW,eAAe,CAAC","file":"area.js","sourcesContent":["import { AreaSeries } from './../../series/area/area';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport type { IAreaChartSpec } from './interface';\nimport { VChart } from '../../core/vchart';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nVChart.useSeries([AreaSeries]);\n\nexport class AreaChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.area;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.area;\n  readonly seriesType: string = SeriesTypeEnum.area;\n\n  protected _getDefaultSeriesSpec(spec: IAreaChartSpec): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      point: spec.point,\n      line: spec.line,\n      area: spec.area,\n      seriesMark: spec.seriesMark ?? 'area',\n      activePoint: spec.activePoint\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}

package/esm/chart/bar/bar-3d.js

@@ -1,3 +1,5 @@
+import { Bar3dSeries } from "./../../series/bar/bar-3d";
+
 import { SeriesTypeEnum } from "../../series/interface";
 
 import { CartesianChart } from "../cartesian/cartesian";
@@ -6,8 +8,6 @@ import { ChartTypeEnum } from "../interface";
 
 import { VChart } from "../../core/vchart";
 
-import { Bar3dSeries } from "../../series";
-
 VChart.useSeries([ Bar3dSeries ]);
 
 export class Bar3dChart extends CartesianChart {

package/esm/chart/bar/bar-3d.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/bar/bar-3d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAE3C,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAEhC,MAAM,OAAO,UAAW,SAAQ,cAAc;IAA9C;;QAGW,SAAI,GAAW,aAAa,CAAC,KAAK,CAAC;QACnC,eAAU,GAAW,cAAc,CAAC,KAAK,CAAC;IAWrD,CAAC;IATW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAoB,IAAK,CAAC,QAAQ,EAC1C,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,aAAa,EAAoB,IAAK,CAAC,aAAa,IACpD;IACJ,CAAC;;AAbe,eAAI,GAAW,aAAa,CAAC,KAAK,CAAC;AACnC,eAAI,GAAW,eAAe,CAAC","file":"bar-3d.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { VChart } from '../../core/vchart';\nimport { Bar3dSeries } from '../../series';\nimport type { IBar3dChartSpec } from './interface';\nVChart.useSeries([Bar3dSeries]);\n\nexport class Bar3dChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar3d;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar3d;\n  readonly seriesType: string = SeriesTypeEnum.bar3d;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBar3dChartSpec>spec).barWidth,\n      barMaxWidth: (<IBar3dChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBar3dChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBar3dChartSpec>spec).barGapInGroup\n    };\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/bar/bar-3d.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,2BAA2B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,CAAC,SAAS,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC;AAEhC,MAAM,OAAO,UAAW,SAAQ,cAAc;IAA9C;;QAGW,SAAI,GAAW,aAAa,CAAC,KAAK,CAAC;QACnC,eAAU,GAAW,cAAc,CAAC,KAAK,CAAC;IAWrD,CAAC;IATW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAoB,IAAK,CAAC,QAAQ,EAC1C,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,WAAW,EAAoB,IAAK,CAAC,WAAW,EAChD,aAAa,EAAoB,IAAK,CAAC,aAAa,IACpD;IACJ,CAAC;;AAbe,eAAI,GAAW,aAAa,CAAC,KAAK,CAAC;AACnC,eAAI,GAAW,eAAe,CAAC","file":"bar-3d.js","sourcesContent":["import { Bar3dSeries } from './../../series/bar/bar-3d';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { VChart } from '../../core/vchart';\nimport type { IBar3dChartSpec } from './interface';\nVChart.useSeries([Bar3dSeries]);\n\nexport class Bar3dChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar3d;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar3d;\n  readonly seriesType: string = SeriesTypeEnum.bar3d;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBar3dChartSpec>spec).barWidth,\n      barMaxWidth: (<IBar3dChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBar3dChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBar3dChartSpec>spec).barGapInGroup\n    };\n  }\n}\n"]}

package/esm/chart/bar/bar.js

@@ -1,3 +1,5 @@
+import { BarSeries } from "./../../series/bar/bar";
+
 import { SeriesTypeEnum } from "../../series/interface";
 
 import { CartesianChart } from "../cartesian/cartesian";
@@ -8,8 +10,6 @@ import { setDefaultCrosshairForCartesianChart } from "../util";
 
 import { VChart } from "../../core/vchart";
 
-import { BarSeries } from "../../series";
-
 VChart.useSeries([ BarSeries ]);
 
 export class BarChart extends CartesianChart {

package/esm/chart/bar/bar.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/chart/bar/bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,cAAc,CAAC;AAEzC,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAE9B,MAAM,OAAO,QAAS,SAAQ,cAAc;IAA5C;;QAGW,SAAI,GAAW,aAAa,CAAC,GAAG,CAAC;QACjC,eAAU,GAAW,cAAc,CAAC,GAAG,CAAC;IAgBnD,CAAC;IAdW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAkB,IAAK,CAAC,QAAQ,EACxC,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,aAAa,EAAkB,IAAK,CAAC,aAAa,IAClD;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAlBe,aAAI,GAAW,aAAa,CAAC,GAAG,CAAC;AACjC,aAAI,GAAW,eAAe,CAAC","file":"bar.js","sourcesContent":["import { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport { BarSeries } from '../../series';\nimport type { IBarChartSpec } from './interface';\nVChart.useSeries([BarSeries]);\n\nexport class BarChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar;\n  readonly seriesType: string = SeriesTypeEnum.bar;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBarChartSpec>spec).barWidth,\n      barMaxWidth: (<IBarChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBarChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBarChartSpec>spec).barGapInGroup\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}
+{"version":3,"sources":["../src/chart/bar/bar.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,oCAAoC,EAAE,MAAM,SAAS,CAAC;AAC/D,OAAO,EAAE,MAAM,EAAE,MAAM,mBAAmB,CAAC;AAE3C,MAAM,CAAC,SAAS,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;AAE9B,MAAM,OAAO,QAAS,SAAQ,cAAc;IAA5C;;QAGW,SAAI,GAAW,aAAa,CAAC,GAAG,CAAC;QACjC,eAAU,GAAW,cAAc,CAAC,GAAG,CAAC;IAgBnD,CAAC;IAdW,qBAAqB,CAAC,IAAS;QACvC,uCACK,KAAK,CAAC,qBAAqB,CAAC,IAAI,CAAC,KACpC,QAAQ,EAAkB,IAAK,CAAC,QAAQ,EACxC,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,WAAW,EAAkB,IAAK,CAAC,WAAW,EAC9C,aAAa,EAAkB,IAAK,CAAC,aAAa,IAClD;IACJ,CAAC;IAED,aAAa,CAAC,IAAS;QACrB,KAAK,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAC1B,oCAAoC,CAAC,IAAI,CAAC,CAAC;IAC7C,CAAC;;AAlBe,aAAI,GAAW,aAAa,CAAC,GAAG,CAAC;AACjC,aAAI,GAAW,eAAe,CAAC","file":"bar.js","sourcesContent":["import { BarSeries } from './../../series/bar/bar';\nimport { SeriesTypeEnum } from '../../series/interface';\nimport { CartesianChart } from '../cartesian/cartesian';\nimport { ChartTypeEnum } from '../interface';\nimport { setDefaultCrosshairForCartesianChart } from '../util';\nimport { VChart } from '../../core/vchart';\nimport type { IBarChartSpec } from './interface';\nVChart.useSeries([BarSeries]);\n\nexport class BarChart extends CartesianChart {\n  static readonly type: string = ChartTypeEnum.bar;\n  static readonly view: string = 'singleDefault';\n  readonly type: string = ChartTypeEnum.bar;\n  readonly seriesType: string = SeriesTypeEnum.bar;\n\n  protected _getDefaultSeriesSpec(spec: any): any {\n    return {\n      ...super._getDefaultSeriesSpec(spec),\n      barWidth: (<IBarChartSpec>spec).barWidth,\n      barMaxWidth: (<IBarChartSpec>spec).barMaxWidth,\n      barMinWidth: (<IBarChartSpec>spec).barMinWidth,\n      barGapInGroup: (<IBarChartSpec>spec).barGapInGroup\n    };\n  }\n\n  transformSpec(spec: any): void {\n    super.transformSpec(spec);\n    setDefaultCrosshairForCartesianChart(spec);\n  }\n}\n"]}

package/esm/chart/base-chart.d.ts

@@ -1,4 +1,4 @@
-import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec } from '../typings';
+import type { ISeriesSpec, Datum, IMarkStateSpec, IRegionQuerier, MaybeArray, IPadding, IRect, StringOrNumber, IChartSpec, IDataValues } from '../typings';
 import type { LayoutCallBack } from '../layout/interface';
 import type { ILayoutModelState, ILayoutOrientPadding, ILayoutRect, IModel, IModelOption, IUpdateSpecResult } from '../model/interface';
 import type { IChart, IChartLayoutOption, IChartRenderOption, IChartOption, IChartEvaluateOption, ILayoutParams, DimensionIndexOption } from './interface';
@@ -13,7 +13,7 @@ import { Stack } from './stack';
 import type { ITheme } from '../theme/interface';
 import type { IParserOptions } from '@visactor/vdataset/es/parser';
 import type { IBoundsLike } from '@visactor/vutils';
-import type { IMorphConfig, IMark as IVGrammarMark, IView } from '@visactor/vgrammar';
+import type { IRunningConfig as IMorphConfig, IMark as IVGrammarMark, IView } from '@visactor/vgrammar';
 import { CompilableBase } from '../compile/compilable-base';
 import type { IGlobalScale } from '../scale/interface';
 import type { IRectMark } from '../mark/rect';
@@ -96,7 +96,9 @@ export declare class BaseChart extends CompilableBase implements IChart {
     getMarkById(id: number): IMark | undefined;
     updateParseData(id: string, data: Datum[], options?: IParserOptions): void;
     updateData(id: StringOrNumber, data: unknown, updateGlobalScale?: boolean, options?: IParserOptions): void;
+    updateFullData(data: IDataValues | IDataValues[], updateGlobalScale?: boolean): void;
     onRender(option: IChartRenderOption): void;
+    setCanvasRect(width: number, height: number): void;
     getCanvasRect(): Omit<IRect, 'x' | 'y'>;
     getSeriesData(id: StringOrNumber | undefined, index: number | undefined): DataView | undefined;
     private _transformSpecScale;

package/esm/chart/base-chart.js

@@ -34,7 +34,7 @@ import { Factory } from "../core/factory";
 
 import { Event } from "../event/event";
 
-import { isArray, isValid, createID, calcPadding, normalizeLayoutPaddingSpec, array, isTrueBrowser, isString, convertBackgroundSpec, isMiniAppLikeMode } from "../util";
+import { isArray, isValid, createID, calcPadding, normalizeLayoutPaddingSpec, array, convertBackgroundSpec } from "../util";
 
 import { Stack } from "./stack";
 
@@ -46,7 +46,7 @@ import { DEFAULT_CHART_WIDTH, DEFAULT_CHART_HEIGHT } from "../constant/base";
 
 import { dataToDataView } from "../data/initialize";
 
-import { has, isFunction, isEmpty, getContainerSize } from "@visactor/vutils";
+import { has, isFunction, isEmpty } from "@visactor/vutils";
 
 import { getActualColor, getDataScheme } from "../theme/color-scheme/util";
 
@@ -58,6 +58,8 @@ import { ChartEvent, VGRAMMAR_HOOK_EVENT } from "../constant";
 
 import { DimensionEventEnum } from "../event/events/dimension";
 
+import { calculateChartSize } from "./util";
+
 export class BaseChart extends CompilableBase {
     getSpec() {
         return this._spec;
@@ -333,36 +335,28 @@ export class BaseChart extends CompilableBase {
         dv && dv.parseNewData(data, options), updateGlobalScale && this.updateGlobalScaleDomain(), 
         this.getAllModels().forEach((model => model.onDataUpdate()));
     }
+    updateFullData(data, updateGlobalScale = !0) {
+        const dvs = [];
+        array(data).forEach((d => {
+            const dv = this._dataSet.getDataView(d.id);
+            dv && (dvs.push({
+                d: d,
+                dv: dv
+            }), dv.markRunning());
+        })), dvs.forEach((({d: d, dv: dv}) => {
+            dv.setFields(d.fields), dv.parseNewData(d.values, d.parser);
+        })), updateGlobalScale && this.updateGlobalScaleDomain(), this.getAllModels().forEach((model => model.onDataUpdate()));
+    }
     onRender(option) {}
+    setCanvasRect(width, height) {
+        this._canvasRect = {
+            width: width,
+            height: height
+        };
+    }
     getCanvasRect() {
-        var _a;
-        if (this._canvasRect) return this._canvasRect;
-        const {width: userWidth, height: userHeight} = this._spec;
-        if (isValid(userWidth) && isValid(userHeight)) this._canvasRect = {
-            width: userWidth,
-            height: userHeight
-        }; else {
-            let width = DEFAULT_CHART_WIDTH, height = DEFAULT_CHART_HEIGHT;
-            const container = this._option.container, canvas = this._option.canvas;
-            if (container) {
-                const {width: containerWidth, height: containerHeight} = getContainerSize(this._option.container, DEFAULT_CHART_WIDTH, DEFAULT_CHART_HEIGHT);
-                width = containerWidth, height = containerHeight;
-            } else if (canvas && isTrueBrowser(this._option.mode)) {
-                let canvasNode;
-                canvasNode = isString(canvas) ? null === document || void 0 === document ? void 0 : document.getElementById(canvas) : canvas;
-                const {width: containerWidth, height: containerHeight} = getContainerSize(canvasNode, DEFAULT_CHART_WIDTH, DEFAULT_CHART_HEIGHT);
-                width = containerWidth, height = containerHeight;
-            } else if (isMiniAppLikeMode(this._option.mode) && (null === (_a = this._option.modeParams) || void 0 === _a ? void 0 : _a.domref)) {
-                const domRef = this._option.modeParams.domref;
-                width = domRef.width, height = domRef.height;
-            }
-            width = null != userWidth ? userWidth : width, height = null != userHeight ? userHeight : height, 
-            this._canvasRect = {
-                width: width,
-                height: height
-            };
-        }
-        return this._canvasRect;
+        return this._canvasRect || (this._canvasRect = calculateChartSize(this._spec, this._option)), 
+        this._canvasRect;
     }
     getSeriesData(id, index) {
         if (!this._spec.data) return this._option.onError("no data in spec!"), null;
@@ -439,9 +433,9 @@ export class BaseChart extends CompilableBase {
         result))));
     }
     updateDataSpec(result) {
-        this._spec.data && array(this._spec.data).forEach((d => {
+        this._spec.data && array(this._spec.data).forEach(((d, i) => {
             const dataView = this._dataSet.getDataView(d.id);
-            dataView && (d.values ? dataView.updateRawData(d.values) : d.latestData || dataView.updateRawData([]));
+            dataView ? d.values ? dataView.updateRawData(d.values) : d.latestData || dataView.updateRawData([]) : result.reMakeData = !0;
         }));
     }
     updateRegionSpec(result) {
@@ -469,8 +463,14 @@ export class BaseChart extends CompilableBase {
     }
     updateSeriesSpec(result) {
         this._spec.series.length === this._series.length ? this._series.forEach((s => {
-            this._mergeUpdateResult(result, s.updateSpec(this._spec.series[s.getSpecIndex()])), 
-            s.reInit();
+            var _a;
+            const spec = this._spec.series[s.getSpecIndex()];
+            if (result.reMakeData) {
+                let values;
+                values = spec.data ? spec.data.values : null === (_a = this.getSeriesData(spec.dataId, spec.dataIndex)) || void 0 === _a ? void 0 : _a.latestData, 
+                s.updateRawData(values);
+            }
+            this._mergeUpdateResult(result, s.updateSpec(spec)), s.reInit();
         })) : result.reMake = !0;
     }
     getCanvas() {
@@ -502,7 +502,8 @@ export class BaseChart extends CompilableBase {
             largeThreshold: spec.largeThreshold,
             progressiveStep: spec.progressiveStep,
             progressiveThreshold: spec.progressiveThreshold,
-            background: spec.seriesBackground
+            background: spec.seriesBackground,
+            invalidType: spec.invalidType
         };
     }
     _mergeUpdateResult(resultA, resultB) {