tvcharts 0.8.56 → 0.8.58

package/lib/chart/boxes/BoxesLayout.js

@@ -152,7 +152,9 @@ var BoxesLayout = {
             text_halign = _a.text_halign,
             text_size = _a.text_size,
             text_valign = _a.text_valign,
-            text_wrap = _a.text_wrap;
+            text_wrap = _a.text_wrap,
+            fontStyle = _a.fontStyle,
+            fontWeight = _a.fontWeight;
           if (!border_color && !text && !bgcolor) {
             continue;
           }
@@ -185,7 +187,9 @@ var BoxesLayout = {
               width: width_1,
               height: height,
               x: x,
-              y: y
+              y: y,
+              fontStyle: fontStyle,
+              fontWeight: fontWeight
             });
           }
           points.push(left, right, startPoint[1], endPoint[1]);

package/lib/chart/boxes/BoxesView.js

@@ -126,7 +126,9 @@ var BoxesView = /** @class */function (_super) {
         align: item.align,
         fill: (_a = item.text_color) !== null && _a !== void 0 ? _a : '#fff',
         fontSize: item.text_size,
-        overflow: item.text_wrap === 'wrap_auto' ? 'breakAll' : 'none'
+        overflow: item.text_wrap === 'wrap_auto' ? 'breakAll' : 'none',
+        fontStyle: item.fontStyle,
+        fontWeight: item.fontWeight
       };
       var el = new graphic.Text({
         style: __assign({}, textStyle),

package/lib/chart/labels/LabelsView.js

@@ -111,7 +111,9 @@ var LabelsView = /** @class */function (_super) {
         _a = item.offset,
         offset = _a === void 0 ? [0, 0] : _a,
         textBorderColor = item.textBorderColor,
-        textBorderWidth = item.textBorderWidth;
+        textBorderWidth = item.textBorderWidth,
+        fontStyle = item.fontStyle,
+        fontWeight = item.fontWeight;
       var el = new graphic.Text({
         style: {
           text: text,
@@ -122,7 +124,9 @@ var LabelsView = /** @class */function (_super) {
           stroke: textBorderColor,
           lineWidth: textBorderWidth,
           x: point[0] + offset[0],
-          y: point[1] + offset[1]
+          y: point[1] + offset[1],
+          fontStyle: fontStyle,
+          fontWeight: fontWeight
         }
       });
       el.states.emphasis = emphasisState;

package/lib/chart/labels/labelsLayout.js

@@ -43,7 +43,7 @@
 */
 /* global Float32Array */
 import createRenderPlanner from '../helper/createRenderPlanner.js';
-import { map, each } from 'tvrender/lib/core/util.js';
+import { map, each, trim } from 'tvrender/lib/core/util.js';
 import { getSymbolLabelFontSize, getSymbolSize } from '../../util/symbolSize.js';
 import { getLineHeight, getWidth } from 'tvrender/lib/contain/text.js';
 // import { createFloat32Array } from '../../util/vendor.js';
@@ -185,6 +185,8 @@ var labelsLayout = {
           var textShow = labelModel.show;
           var fontSize = labelModel.fontSize;
           var position = labelModel.position || 'top';
+          var fontStyle = labelModel.fontStyle;
+          var fontWeight = labelModel.fontWeight;
           // const isBelowbar = yloc === 'belowbar';
           // if (isBelowbar) {
           //     position = 'bottom';
@@ -207,7 +209,10 @@ var labelsLayout = {
             // });
             // textRect = computedText.getBoundingRect();
             var textSize = fontSize ? fontSize + 'px' : gfontSize;
-            textRect = getTextRect(text, textSize + " " + (labelModel.fontFamily || gfontFamily));
+            var font = trim([
+            // FIXME in node-canvas fontWeight is before fontStyle
+            fontStyle || '', fontWeight || '', textSize, labelModel.fontFamily || gfontFamily].join(' '));
+            textRect = getTextRect(text, font);
             if (isLabel) {
               symbolSize = [textRect.width + HPadding, textRect.height + VPadding];
             }
@@ -275,7 +280,9 @@ var labelsLayout = {
               fontFamily: labelModel.fontFamily,
               offset: [oldOffset[0] + symbolOffset[0], oldOffset[1] + symbolOffset[1]],
               textBorderColor: labelModel.textBorderColor,
-              textBorderWidth: labelModel.textBorderWidth
+              textBorderWidth: labelModel.textBorderWidth,
+              fontStyle: fontStyle,
+              fontWeight: fontWeight
             });
           }
           // labelsData.setItemLayout(i, [point[0], price ?? point[1]]);

package/lib/component/helper/RoamController.js

@@ -238,8 +238,8 @@ var RoamController = /** @class */function (_super) {
     if (interactionMutex.isTaken(this._zr, 'globalPan')) {
       return;
     }
-    // const scale = e.pinchScale > 1 ? 1.1 : 1 / 1.1;
-    var scale = e.pinchScale;
+    var scale = e.pinchScale > 1 ? 1.05 : 1 / 1.05;
+    // const scale = e.pinchScale;
     // if (e.pinchScale === 1) {
     //     console.log('%c [ e ]-316', 'font-size:13px; background:pink; color:#bf2c9f;', e)
     // }
@@ -266,6 +266,10 @@ var RoamController = /** @class */function (_super) {
       requestAnimationFrame(function () {
         return _this._kineticScroll();
       });
+    } else {
+      trigger(this, 'dragEnd', 'moveOnMouseMove', {}, {
+        isAvailableBehavior: null
+      });
     }
   };
   RoamController.prototype._startKineticScroll = function () {

package/lib/component/table/TableView.js

@@ -190,12 +190,16 @@ var TableView = /** @class */function (_super) {
             height = cellItem.height,
             text_size = cellItem.text_size,
             _a = cellItem.text_font_family,
-            text_font_family = _a === void 0 ? DefaultFamily : _a;
+            text_font_family = _a === void 0 ? DefaultFamily : _a,
+            fontStyle = cellItem.fontStyle,
+            fontWeight = cellItem.fontWeight;
           var mergeCell = margeCellByKey[row + ':' + column];
           var fontSize = getSymbolLabelFontSize(text_size);
           var font = getFont({
             fontSize: fontSize,
-            fontFamily: text_font_family
+            fontFamily: text_font_family,
+            fontStyle: fontStyle,
+            fontWeight: fontWeight
           }, ecModel);
           // todo这个api算出来有问题
           // const textRect = textContain.getBoundingRect(text, font);
@@ -323,7 +327,9 @@ var TableView = /** @class */function (_super) {
             text_halign = cellItem.text_halign,
             text_color = cellItem.text_color,
             bgcolor = cellItem.bgcolor,
-            text_valign = cellItem.text_valign;
+            text_valign = cellItem.text_valign,
+            fontStyle = cellItem.fontStyle,
+            fontWeight = cellItem.fontWeight;
           var fontSize = getSymbolLabelFontSize(text_size);
           var x = columnObjByIndex[column].x;
           var width = columnObjByIndex[column].width;
@@ -365,7 +371,9 @@ var TableView = /** @class */function (_super) {
               fontFamily: text_font_family,
               verticalAlign: verticalAlign,
               align: align,
-              overflow: 'truncate'
+              overflow: 'truncate',
+              fontStyle: fontStyle,
+              fontWeight: fontWeight
             },
             x: x + getTextXOffset(width, align, 0),
             y: y + getTextYOffset(height, verticalAlign, 0),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tvcharts",
-  "version": "0.8.56",
+  "version": "0.8.58",
   "description": "基于echarts5.5.0二次开发",
   "license": "Apache-2.0",
   "keywords": [

package/types/src/chart/boxes/BoxesSeries.d.ts

@@ -1,6 +1,6 @@
 import SeriesModel from '../../model/Series.js';
 import SeriesData from '../../data/SeriesData.js';
-import { SeriesOption, SeriesOnCartesianOptionMixin, SeriesOnGeoOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin, SeriesLargeOptionMixin, OptionDataValue, StatesOptionMixin, SeriesEncodeOptionMixin } from '../../util/types.js';
+import { SeriesOption, SeriesOnCartesianOptionMixin, SeriesOnGeoOptionMixin, SeriesOnPolarOptionMixin, SeriesOnCalendarOptionMixin, SeriesLargeOptionMixin, OptionDataValue, StatesOptionMixin, SeriesEncodeOptionMixin, ZRFontStyle, ZRFontWeight } from '../../util/types.js';
 import { PathState } from 'tvrender/lib/graphic/Path.js';
 declare type LinesValue = OptionDataValue | OptionDataValue[];
 interface LinesStatesMixin {
@@ -20,6 +20,8 @@ export interface ITextEl {
     y: number;
     width?: number;
     height?: number;
+    fontStyle?: ZRFontStyle;
+    fontWeight?: ZRFontWeight;
 }
 export interface LinesStateOption {
     id: string;
@@ -35,6 +37,8 @@ export interface LinesStateOption {
         text_size?: ISize;
         text_valign?: ITextAlign;
         text_wrap?: 'wrap_none' | 'wrap_auto';
+        fontStyle?: ZRFontStyle;
+        fontWeight?: ZRFontWeight;
     };
 }
 export interface BoxesDataItemOption extends LinesStateOption, StatesOptionMixin<LinesStateOption, LinesStatesMixin & {

package/types/src/component/table/TableModel.d.ts

@@ -1,5 +1,5 @@
 import ComponentModel from '../../model/Component.js';
-import { ComponentOption } from '../../util/types.js';
+import { ComponentOption, ZRFontStyle, ZRFontWeight } from '../../util/types.js';
 import { PathState } from 'tvrender/lib/graphic/Path.js';
 export interface IMergeCell {
     end_column: number;
@@ -21,6 +21,8 @@ interface ICell {
     row: number;
     merge_columns?: number;
     merge_rows?: number;
+    fontStyle?: ZRFontStyle;
+    fontWeight?: ZRFontWeight;
 }
 export declare type IPosition = 'top_right' | 'top_left' | 'bottom_center' | 'bottom_left' | 'bottom_right' | 'middle_left' | 'middle_right' | 'top_center' | 'middle_center';
 export interface ITable {