@visactor/vchart 1.9.2 → 1.10.0-alpha.0

package/build/index.js

@@ -8336,9 +8336,6 @@
       clear() {
         this.transformCbList = null, this.commandList.length = 0, this.curves.length = 0;
       }
-      beginPath() {
-        this.clear();
-      }
       toString() {
         if (!this.toStringCbList) {
           const list = [];
@@ -8348,7 +8345,7 @@
             let path = "";
             for (let i = 0; i < bezierPathList.length; i += 6) path += `C${bezierPathList[i]} ${bezierPathList[i + 1]} ${bezierPathList[i + 2]} ${bezierPathList[i + 3]} ${bezierPathList[i + 4]} ${bezierPathList[i + 5]}`;
             return path;
-          }, list[enumCommandMap.R] = cmd => `M${cmd[1]} ${cmd[2]} h${cmd[3]} v${cmd[4]} H${cmd[1]}Z`, list[enumCommandMap.Z] = cmd => "Z", this.toStringCbList = list;
+          }, list[enumCommandMap.Z] = cmd => "Z", this.toStringCbList = list;
         }
         const list = this.toStringCbList;
         let path = "";
@@ -8687,7 +8684,6 @@
       zIndex: 0,
       layout: null,
       boundsPadding: 0,
-      renderStyle: "default",
       pickMode: "accurate",
       customPickShape: null,
       boundsMode: "accurate",
@@ -8785,7 +8781,7 @@
       strokeBoundsBuffer: 0,
       keepDirIn3d: !0
     });
-    const DefaultRichTextAttribute = Object.assign(Object.assign({}, DefaultAttribute), {
+    const DefaultRichTextAttribute = Object.assign(Object.assign(Object.assign({}, DefaultAttribute), DefaultTextStyle), {
       width: 300,
       height: 300,
       ellipsis: !0,
@@ -17037,6 +17033,24 @@
       getFrameCache() {
         return this.shouldUpdateShape() && (this.doUpdateFrameCache(), this.clearUpdateShapeTag()), this._frameCache;
       }
+      combinedStyleToCharacter(config) {
+        const {
+          fill: fill,
+          stroke: stroke,
+          fontSize: fontSize,
+          fontFamily: fontFamily,
+          fontStyle: fontStyle,
+          fontWeight: fontWeight
+        } = this.attribute;
+        return Object.assign({
+          fill: fill,
+          stroke: stroke,
+          fontSize: fontSize,
+          fontFamily: fontFamily,
+          fontStyle: fontStyle,
+          fontWeight: fontWeight
+        }, config);
+      }
       doUpdateFrameCache() {
         var _a;
         const {
@@ -17055,7 +17069,7 @@
           } = this.attribute,
           paragraphs = [];
         for (let i = 0; i < textConfig.length; i++) if ("image" in textConfig[i]) {
-          const config = textConfig[i],
+          const config = this.combinedStyleToCharacter(textConfig[i]),
             iconCache = config.id && this._frameCache && this._frameCache.icons && this._frameCache.icons.get(config.id);
           if (iconCache) paragraphs.push(iconCache);else {
             const icon = new RichTextIcon(config);
@@ -17065,7 +17079,7 @@
             }, icon.richtextId = config.id, paragraphs.push(icon);
           }
         } else {
-          const richTextConfig = textConfig[i];
+          const richTextConfig = this.combinedStyleToCharacter(textConfig[i]);
           if (isNumber$1(richTextConfig.text) && (richTextConfig.text = `${richTextConfig.text}`), richTextConfig.text && richTextConfig.text.includes("\n")) {
             const textParts = richTextConfig.text.split("\n");
             for (let j = 0; j < textParts.length; j++) paragraphs.push(new Paragraph(textParts[j], 0 !== j, richTextConfig));
@@ -21880,7 +21894,7 @@
       }
       getRenderContribution(graphic) {
         let renderer;
-        return renderer || (renderer = this.selectRenderByNumberType(graphic.numberType, graphic)), renderer || (renderer = this.selectRenderByType(graphic.type)), renderer;
+        return renderer || (renderer = this.selectRenderByNumberType(graphic.numberType)), renderer || (renderer = this.selectRenderByType(graphic.type)), renderer;
       }
       renderItem(graphic, drawContext, params) {
         if (this.InterceptorContributions.length) for (let i = 0; i < this.InterceptorContributions.length; i++) {
@@ -21912,13 +21926,8 @@
       selectRenderByType(type) {
         return Logger.getInstance().warn("未知错误，不应该走到这里"), null;
       }
-      selectRenderByNumberType(type, graphic) {
-        let data;
-        if (graphic.attribute.renderStyle) {
-          const currentRenderMap = this.styleRenderMap.get(graphic.attribute.renderStyle);
-          data = currentRenderMap && currentRenderMap.get(type);
-        }
-        return data || this.currentRenderMap.get(type) || this.defaultRenderMap.get(type);
+      selectRenderByNumberType(type) {
+        return this.currentRenderMap.get(type) || this.defaultRenderMap.get(type);
       }
       clearScreen(renderService, context, drawContext) {
         var _a, _b;
@@ -58794,7 +58803,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         registerChartPlugin(MediaQuery);
     };
 
-    const version = "1.9.2";
+    const version = "1.10.0-alpha.0";
 
     const addVChartProperty = (data, op) => {
         const context = op.beforeCall();
@@ -67353,24 +67362,29 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
     };
 
     class TextMark extends BaseMark {
-        constructor() {
-            super(...arguments);
+        getTextType() {
+            return this._textType;
+        }
+        constructor(name, option) {
+            super(name, option);
             this.type = TextMark.type;
+            this._textType = 'text';
         }
         _getDefaultStyle() {
             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);
+        initStyleWithSpec(spec, key) {
+            super.initStyleWithSpec(spec, key);
+            if (spec.textType) {
+                this._textType = spec.textType;
             }
-            else {
-                this._product = view.mark(GrammarMarkType.text, group !== null && group !== void 0 ? group : view.rootMark).id(id);
+        }
+        compileEncode() {
+            super.compileEncode();
+            if (this._textType === 'rich') {
+                this._product.encodeState('group', { textType: this._textType });
             }
-            this._compiledProductId = id;
         }
     }
     TextMark.type = "text";
@@ -75348,7 +75362,7 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 textAlign: d => { var _a; return (_a = d.label) === null || _a === void 0 ? void 0 : _a.textAlign; },
                 angle: d => { var _a, _b; return (_b = (_a = d.label) === null || _a === void 0 ? void 0 : _a.angle) !== null && _b !== void 0 ? _b : 0; },
                 fontSize: 10,
-                text: d => d.name
+                text: (d) => d.name
             }, STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Series);
         }
         initTooltip() {
@@ -77912,6 +77926,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     return datum.x1 === datum.x0 ? Number.MIN_VALUE : datum.x1 - datum.x0;
                 }
             }, STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Series);
+            if (labelMark.getTextType() === 'rich') {
+                this.setMarkStyle(labelMark, {
+                    maxWidth: datum => Math.abs(datum.x0 - datum.x1),
+                    maxHeight: datum => Math.abs(datum.y0 - datum.y1),
+                    ellipsis: true
+                }, STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Series);
+            }
         }
         initNonLeafLabelMarkStyle(labelMark) {
             if (!labelMark) {
@@ -77940,6 +77961,13 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                     return datum.x1 === datum.x0 ? Number.MIN_VALUE : datum.x1 - datum.x0;
                 }
             }, STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Series);
+            if (labelMark.getTextType() === 'rich') {
+                this.setMarkStyle(labelMark, {
+                    maxWidth: datum => Math.abs(datum.x0 - datum.x1),
+                    maxHeight: datum => Math.abs(datum.y0 - datum.y1),
+                    ellipsis: true
+                }, STATE_VALUE_ENUM.STATE_NORMAL, exports.AttributeLevel.Series);
+            }
         }
         initAnimation() {
             this.getMarksInType("rect").forEach(mark => {
@@ -88872,22 +88900,28 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
             let lines = [];
             if (isXYLayout) {
                 lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange);
-                points = [
-                    {
-                        x: lines[0][0].x,
-                        y: lines[1][0].y
-                    },
-                    lines[0][0],
-                    {
-                        x: lines[1][0].x,
-                        y: lines[0][0].y
-                    },
-                    lines[1][0]
-                ];
+                const [start, end] = lines;
+                if (start && start.length && end && end.length) {
+                    points = [
+                        {
+                            x: start[0].x,
+                            y: end[0].y
+                        },
+                        start[0],
+                        {
+                            x: end[0].x,
+                            y: start[0].y
+                        },
+                        end[0]
+                    ];
+                }
             }
             else if (isXLayout || isYLayout) {
                 lines = xyLayout(data, startRelativeSeries, endRelativeSeries, relativeSeries, autoRange);
-                points = [...lines[0], lines[1][1], lines[1][0]];
+                const [start, end] = lines;
+                if (start && start.length && end && end.length) {
+                    points = [...start, end[1], end[0]];
+                }
             }
             else if (isCoordinateLayout) {
                 points = coordinateLayout(data, relativeSeries, autoRange, spec.coordinatesOffset);
@@ -88919,7 +88953,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._markerComponent.setAttributes({
                     points: points,
                     label: Object.assign(Object.assign({}, (_c = this._markerComponent.attribute) === null || _c === void 0 ? void 0 : _c.label), { text: this._spec.label.formatMethod
-                            ? this._spec.label.formatMethod(dataPoints, seriesData)
+                            ?
+                                this._spec.label.formatMethod(dataPoints, seriesData)
                             : (_e = (_d = this._markerComponent.attribute) === null || _d === void 0 ? void 0 : _d.label) === null || _e === void 0 ? void 0 : _e.text }),
                     limitRect,
                     dx: this._layoutOffsetX,
@@ -89539,15 +89574,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
         };
     }
     function treemapLabel(labelInfo) {
-        const labelSpec = labelInfo.labelSpec;
         return {
-            customLayoutFunc: (labels) => {
-                return labels.map(label => {
-                    const datum = label.data;
-                    const attribute = textAttribute(labelInfo, datum, labelSpec.formatMethod);
-                    return createText(Object.assign(Object.assign({}, attribute), { id: label.id, pickable: false }));
-                });
-            },
+            customLayoutFunc: (labels, text) => text,
             overlap: false
         };
     }
@@ -90158,7 +90186,8 @@ C0.3-1.4,0.3-1.4,0.3-1.4z;`;
                 this._markerComponent.setAttributes({
                     position: point,
                     itemContent: Object.assign(Object.assign({}, attribute.itemContent), { textStyle: Object.assign(Object.assign({}, textStyle), { text: ((_f = this._spec.itemContent.text) === null || _f === void 0 ? void 0 : _f.formatMethod)
-                                ? this._spec.itemContent.text.formatMethod(dataPoints, seriesData)
+                                ?
+                                    this._spec.itemContent.text.formatMethod(dataPoints, seriesData)
                                 : textStyle.text }) }),
                     limitRect,
                     dx: this._layoutOffsetX,