@visactor/vchart 1.7.0-alpha.2 → 1.7.0

package/build/index.js

@@ -58630,7 +58630,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     registerVChartCore();
 
-    const version = "1.7.0-alpha.2";
+    const version = "1.7.0";
 
     class ChartData {
         get dataList() {
@@ -62706,9 +62706,20 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             this.type = TextMark.type;
         }
         _getDefaultStyle() {
-            const defaultStyle = Object.assign(Object.assign({}, super._getDefaultStyle()), { angle: 0, textAlign: 'center', lineWidth: 0 });
+            const defaultStyle = Object.assign(Object.assign({}, super._getDefaultStyle()), { angle: 0, textAlign: 'center', lineWidth: 0, textConfig: [] });
             return defaultStyle;
         }
+        _initProduct(group) {
+            const view = this.getVGrammarView();
+            const id = this.getProductId();
+            if (this.getStyle('textType') === 'rich') {
+                this._product = view.mark(GrammarMarkType.richtext, group !== null && group !== void 0 ? group : view.rootMark).id(id);
+            }
+            else {
+                this._product = view.mark(GrammarMarkType.text, group !== null && group !== void 0 ? group : view.rootMark).id(id);
+            }
+            this._compiledProductId = id;
+        }
     }
     TextMark.type = MarkTypeEnum.text;
 
@@ -76420,9 +76431,10 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         LabelRule["line"] = "line";
     })(LabelRule || (LabelRule = {}));
     function textAttribute(labelInfo, datum, formatMethod, formatter) {
+        var _a;
         const { labelMark, series } = labelInfo;
         const field = series.getMeasureField()[0];
-        const textAttribute = { text: datum[field], data: datum };
+        const textAttribute = { text: datum[field], data: datum, textType: (_a = labelInfo.labelSpec.textType) !== null && _a !== void 0 ? _a : 'text' };
         const attributes = Object.keys(labelMark.stateStyle.normal);
         for (const key of attributes) {
             const attr = labelMark.getAttribute(key, datum);
@@ -80729,31 +80741,18 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                         : transformToGraphic(spec.subTick.style),
                     state: transformStateStyle(spec.subTick.state)
                 },
-                title: {
-                    visible: spec.title.visible,
-                    position: spec.title.position,
-                    space: spec.title.space,
-                    autoRotate: false,
-                    angle: titleAngle ? degreeToRadian(titleAngle) : null,
-                    textStyle: mergeSpec({}, titleTextStyle, transformToGraphic(spec.title.style)),
-                    padding: spec.title.padding,
-                    shape: {
+                title: Object.assign({ visible: spec.title.visible, position: spec.title.position, space: spec.title.space, autoRotate: false, angle: titleAngle ? degreeToRadian(titleAngle) : null, textStyle: mergeSpec({}, titleTextStyle, transformToGraphic(spec.title.style)), padding: spec.title.padding, shape: {
                         visible: (_b = spec.title.shape) === null || _b === void 0 ? void 0 : _b.visible,
                         space: (_c = spec.title.shape) === null || _c === void 0 ? void 0 : _c.space,
                         style: transformToGraphic((_d = spec.title.shape) === null || _d === void 0 ? void 0 : _d.style)
-                    },
-                    background: {
+                    }, background: {
                         visible: (_e = spec.title.background) === null || _e === void 0 ? void 0 : _e.visible,
                         style: transformToGraphic((_f = spec.title.background) === null || _f === void 0 ? void 0 : _f.style)
-                    },
-                    state: {
+                    }, state: {
                         text: transformStateStyle(spec.title.state),
                         shape: transformStateStyle((_g = spec.title.shape) === null || _g === void 0 ? void 0 : _g.state),
                         background: transformStateStyle((_h = spec.title.background) === null || _h === void 0 ? void 0 : _h.state)
-                    },
-                    pickable: ((_j = spec.title.style) === null || _j === void 0 ? void 0 : _j.pickable) !== false,
-                    childrenPickable: ((_k = spec.title.style) === null || _k === void 0 ? void 0 : _k.pickable) !== false
-                },
+                    }, pickable: ((_j = spec.title.style) === null || _j === void 0 ? void 0 : _j.pickable) !== false, childrenPickable: ((_k = spec.title.style) === null || _k === void 0 ? void 0 : _k.pickable) !== false }, spec.title),
                 panel: {
                     visible: (_l = spec.background) === null || _l === void 0 ? void 0 : _l.visible,
                     style: transformToGraphic((_m = spec.background) === null || _m === void 0 ? void 0 : _m.style),
@@ -83399,21 +83398,29 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
     const measureTooltipText = (text, style) => {
         var _a;
-        text = (text !== null && text !== void 0 ? text : '').toString();
         let textLines;
-        if (style.multiLine) {
-            textLines = text.split('\n');
-            textLines = textLines.map((line, i) => (i < textLines.length - 1 ? line + '\n' : line));
+        let textConfig;
+        if (!((text === null || text === void 0 ? void 0 : text.type) === 'rich' || (text === null || text === void 0 ? void 0 : text.type) === 'html')) {
+            text = (text !== null && text !== void 0 ? text : '').toString();
+            if (style.multiLine) {
+                textLines = text.split('\n');
+                textLines = textLines.map((line, i) => (i < textLines.length - 1 ? line + '\n' : line));
+            }
+            else {
+                textLines = [text];
+            }
+            textConfig = textLines.map(line => (Object.assign(Object.assign({}, style), { text: line })));
         }
         else {
-            textLines = [text];
+            textConfig = text.text;
+            textLines = text;
         }
         const bound = getRichTextBounds({
             wordBreak: (_a = style.wordBreak) !== null && _a !== void 0 ? _a : 'break-word',
             maxWidth: style.maxWidth ? style.maxWidth : undefined,
             width: 0,
             height: 0,
-            textConfig: textLines.map(line => (Object.assign(Object.assign({}, style), { text: line })))
+            textConfig: textConfig
         });
         return {
             width: bound.width(),
@@ -89589,25 +89596,9 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             };
         }
         _getTitleAttrs() {
-            var _a, _b, _c, _d, _e, _f, _g;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j;
             const realWidth = Math.max(0, (_a = this._spec.width) !== null && _a !== void 0 ? _a : this.getLayoutRect().width);
-            return {
-                text: (_b = this._spec.text) !== null && _b !== void 0 ? _b : '',
-                subtext: (_c = this._spec.subtext) !== null && _c !== void 0 ? _c : '',
-                x: (_d = this._spec.x) !== null && _d !== void 0 ? _d : 0,
-                y: (_e = this._spec.y) !== null && _e !== void 0 ? _e : 0,
-                width: realWidth,
-                height: this._spec.height,
-                minWidth: this._spec.minWidth,
-                maxWidth: this._spec.maxWidth,
-                minHeight: this._spec.minHeight,
-                maxHeight: this._spec.maxHeight,
-                padding: this._spec.innerPadding,
-                align: (_f = this._spec.align) !== null && _f !== void 0 ? _f : 'left',
-                verticalAlign: (_g = this._spec.verticalAlign) !== null && _g !== void 0 ? _g : 'top',
-                textStyle: Object.assign({ width: realWidth }, this._spec.textStyle),
-                subtextStyle: Object.assign({ width: realWidth }, this._spec.subtextStyle)
-            };
+            return Object.assign(Object.assign({}, pickWithout(this._spec, ['padding'])), { textType: (_b = this._spec.textType) !== null && _b !== void 0 ? _b : 'text', text: (_c = this._spec.text) !== null && _c !== void 0 ? _c : '', subtextType: (_d = this._spec.subtextType) !== null && _d !== void 0 ? _d : 'text', subtext: (_e = this._spec.subtext) !== null && _e !== void 0 ? _e : '', x: (_f = this._spec.x) !== null && _f !== void 0 ? _f : 0, y: (_g = this._spec.y) !== null && _g !== void 0 ? _g : 0, width: realWidth, height: this._spec.height, minWidth: this._spec.minWidth, maxWidth: this._spec.maxWidth, minHeight: this._spec.minHeight, maxHeight: this._spec.maxHeight, padding: this._spec.innerPadding, align: (_h = this._spec.align) !== null && _h !== void 0 ? _h : 'left', verticalAlign: (_j = this._spec.verticalAlign) !== null && _j !== void 0 ? _j : 'top', textStyle: Object.assign({ width: realWidth }, this._spec.textStyle), subtextStyle: Object.assign({ width: realWidth }, this._spec.subtextStyle) });
         }
         _createOrUpdateTitleComponent(attrs) {
             if (this._titleComponent) {