tvcharts 0.6.51 → 0.6.53

package/dist/echarts.js

@@ -22287,6 +22287,33 @@ var ArrowUp = Path_default.extend({
     ctx.closePath();
   }
 });
+var ArrowUpClose = Path_default.extend({
+  type: "arrowUpClose",
+  shape: {
+    cx: 0,
+    cy: 0,
+    width: 0,
+    height: 0,
+    rectWidth: 0,
+    triangleHeight: 0
+  },
+  buildPath: function(ctx, shape) {
+    const {cx, cy, rectWidth, triangleHeight} = shape;
+    const width = shape.width / 2;
+    const height = shape.height / 2;
+    const triangleY = cy - height + triangleHeight;
+    const rectHeight = 3;
+    ctx.moveTo(cx, cy - height);
+    ctx.lineTo(cx + width, triangleY);
+    ctx.lineTo(cx + width - rectWidth, triangleY);
+    ctx.lineTo(cx + width - rectWidth, cy + height);
+    ctx.lineTo(cx - width + rectWidth, cy + height);
+    ctx.lineTo(cx - width + rectWidth, triangleY);
+    ctx.lineTo(cx - width, triangleY);
+    ctx.closePath();
+    ctx.rect(cx - width + 0.5, cy - height - 0.5 - rectHeight, shape.width - 0.5, rectHeight);
+  }
+});
 var ArrowDown = Path_default.extend({
   type: "arrowDown",
   shape: {
@@ -22312,6 +22339,33 @@ var ArrowDown = Path_default.extend({
     ctx.closePath();
   }
 });
+var ArrowDownClose = Path_default.extend({
+  type: "arrowDownClose",
+  shape: {
+    cx: 0,
+    cy: 0,
+    width: 0,
+    height: 0,
+    rectWidth: 0,
+    triangleHeight: 0
+  },
+  buildPath: function(ctx, shape) {
+    const {cx, cy, rectWidth, triangleHeight} = shape;
+    const width = shape.width / 2;
+    const height = shape.height / 2;
+    const triangleY = cy + height - triangleHeight;
+    const rectHeight = 3;
+    ctx.moveTo(cx, cy + height);
+    ctx.lineTo(cx + width, triangleY);
+    ctx.lineTo(cx + width - rectWidth, triangleY);
+    ctx.lineTo(cx + width - rectWidth, cy - height);
+    ctx.lineTo(cx - width + rectWidth, cy - height);
+    ctx.lineTo(cx - width + rectWidth, triangleY);
+    ctx.lineTo(cx - width, triangleY);
+    ctx.closePath();
+    ctx.rect(cx - width + 0.5, cy + height + 0.5, shape.width - 0.5, rectHeight);
+  }
+});
 var symbolCtors = {
   line: Line_default,
   rect: Rect_default,
@@ -22339,7 +22393,9 @@ var symbolCtors = {
   triangleDown: TriangleDown,
   triangleLeft: TriangleLeft,
   triangleRight: TriangleRight,
-  arrowDown: ArrowDown
+  arrowDown: ArrowDown,
+  arrowUpClose: ArrowUpClose,
+  arrowDownClose: ArrowDownClose
 };
 var symbolShapeMakers = {
   line: function(x, y, w, h, shape) {
@@ -22556,6 +22612,22 @@ var symbolShapeMakers = {
     shape.cy = y;
     shape.width = w;
     shape.height = h;
+  },
+  arrowUpClose: function(x, y, w, h, shape, parentShape) {
+    shape.rectWidth = parentShape.triangleWidth;
+    shape.triangleHeight = parentShape.triangleHeight;
+    shape.cx = x;
+    shape.cy = y;
+    shape.width = w;
+    shape.height = h;
+  },
+  arrowDownClose: function(x, y, w, h, shape, parentShape) {
+    shape.rectWidth = parentShape.triangleWidth;
+    shape.triangleHeight = parentShape.triangleHeight;
+    shape.cx = x;
+    shape.cy = y;
+    shape.width = w;
+    shape.height = h;
   }
 };
 var symbolBuildProxies = {};
@@ -24538,7 +24610,7 @@ var ECharts = class extends Eventful_default {
         barSpace: scale4.barSpace,
         lastBarRightSideDiffBarCount: startLastBarRightSideDiffBarCount - distanceBarCount
       };
-      doDispatchAction.call(this, payload, true);
+      doDispatchAction.call(this, payload, false);
     }
   }
   scrollToDataIndex(dataIndex, animationDuration) {
@@ -24554,7 +24626,6 @@ var ECharts = class extends Eventful_default {
     const size = ordinalMeta.getCategoriesSize();
     const distance2 = (scale4.lastBarRightSideDiffBarCount + (size - centerOffset - 1 - dataIndex)) * scale4.barSpace;
     this.scrollByDistance(distance2, animationDuration);
-    console.log("%c [ xAxisModal ]-1751", "font-size:13px; background:pink; color:#bf2c9f;", xAxisModal);
   }
   scrollToTimestamp(timestamp, animationDuration) {
     if (this._disposed) {
@@ -27404,9 +27475,7 @@ var OrdinalMeta = class {
       const value = val;
       if (isSegmentedByTime) {
         const index = i + categories.length;
-        if (isSegmentedByTime) {
-          addItem(value, index);
-        }
+        addItem(value, index);
       }
       return getName(val);
     });
@@ -29785,13 +29854,18 @@ function calculateCategoryInterval(axis) {
     const fontSize = typeof labelModel.get("fontSize") === "number" ? +labelModel.get("fontSize") : 12;
     return Math.round((fontSize + 4) * 5 / ordinalScale.barSpace);
   }
+  if (ordinalExtent[1] - ordinalExtent[0] < 1) {
+    return 0;
+  }
+  const splitIntervalWidth = axis.model.get("splitIntervalWidth");
+  if (axis.model.get("splitIntervalWidth")) {
+    const splitNumber = Math.ceil((axisExtent[1] - axisExtent[0]) / splitIntervalWidth);
+    return Math.ceil((ordinalExtent[1] - ordinalExtent[0]) / splitNumber);
+  }
   const params = fetchAutoCategoryIntervalCalculationParams(axis);
   const labelFormatter = makeLabelFormatter(axis);
   const rotation = (params.axisRotate - params.labelRotate) / 180 * Math.PI;
   const tickCount = ordinalScale.count();
-  if (ordinalExtent[1] - ordinalExtent[0] < 1) {
-    return 0;
-  }
   let step = 1;
   if (tickCount > 40) {
     step = Math.max(1, Math.floor(tickCount / 40));
@@ -55617,6 +55691,13 @@ function install24(registers) {
   registers.registerLayout(linesPlotLayout_default);
 }
 
+// src/chart/strategy/constants.ts
+var LongColor = "rgb(41, 98, 255)";
+var ShortColor = "rgb(255, 23, 68)";
+var CloseColor = "rgb(213, 0, 249)";
+var ArrowSize = [12, 16];
+var TriangleSize = [6, 10];
+
 // src/chart/strategy/SymbolPath.ts
 var LargeSymbolPathShape3 = class {
 };
@@ -55649,8 +55730,6 @@ var SymbolPath2 = class extends Path_default {
 var SymbolPath_default2 = SymbolPath2;
 
 // src/chart/strategy/StrategyView.ts
-var LongColor = "rgb(41, 98, 255)";
-var ShortColor = "rgb(255, 23, 68)";
 var StrategyView2 = class extends Chart_default {
   constructor() {
     super(...arguments);
@@ -55688,7 +55767,7 @@ var StrategyView2 = class extends Chart_default {
     const upTriangleEl = new SymbolPath_default2({
       shape: {
         points: upTriangle,
-        size: [6, 10]
+        size: TriangleSize
       },
       style: {
         fill: LongColor
@@ -55697,11 +55776,24 @@ var StrategyView2 = class extends Chart_default {
     });
     upTriangleEl.symbolProxy = createSymbol("triangleRight", 0, 0, 0, 0);
     symbolGroup.add(upTriangleEl);
+    const closeUpTriangle = data.getLayout("closeUpTriangle");
+    const closeUpTriangleEl = new SymbolPath_default2({
+      shape: {
+        points: closeUpTriangle,
+        size: TriangleSize
+      },
+      style: {
+        fill: CloseColor
+      },
+      z2
+    });
+    closeUpTriangleEl.symbolProxy = createSymbol("triangleRight", 0, 0, 0, 0);
+    symbolGroup.add(closeUpTriangleEl);
     const upArrow = data.getLayout("upArrow");
     const arrowUpEl = new SymbolPath_default2({
       shape: {
         points: upArrow,
-        size: [12, 16]
+        size: ArrowSize
       },
       style: {
         fill: LongColor
@@ -55715,11 +55807,29 @@ var StrategyView2 = class extends Chart_default {
       triangleHeight: 6
     };
     symbolGroup.add(arrowUpEl);
+    const closeUpArrow = data.getLayout("closeUpArrow");
+    const closeUpArrowEl = new SymbolPath_default2({
+      shape: {
+        points: closeUpArrow,
+        size: ArrowSize
+      },
+      style: {
+        fill: CloseColor
+      },
+      z2
+    });
+    closeUpArrowEl.symbolProxy = createSymbol("arrowUpClose", 0, 0, 0, 0);
+    closeUpArrowEl.symbolProxy.shape = {
+      ...closeUpArrowEl.symbolProxy.shape,
+      triangleWidth: 4,
+      triangleHeight: 6
+    };
+    symbolGroup.add(closeUpArrowEl);
     const downTriangle = data.getLayout("downTriangle");
     const downTriangleEl = new SymbolPath_default2({
       shape: {
         points: downTriangle,
-        size: [6, 10]
+        size: TriangleSize
       },
       style: {
         fill: ShortColor
@@ -55728,11 +55838,24 @@ var StrategyView2 = class extends Chart_default {
     });
     downTriangleEl.symbolProxy = createSymbol("triangleLeft", 0, 0, 0, 0);
     symbolGroup.add(downTriangleEl);
+    const closeDownTriangle = data.getLayout("closeDownTriangle");
+    const closeDownTriangleEl = new SymbolPath_default2({
+      shape: {
+        points: closeDownTriangle,
+        size: TriangleSize
+      },
+      style: {
+        fill: CloseColor
+      },
+      z2
+    });
+    closeDownTriangleEl.symbolProxy = createSymbol("triangleLeft", 0, 0, 0, 0);
+    symbolGroup.add(closeDownTriangleEl);
     const downArrow = data.getLayout("downArrow");
     const arrowDownEl = new SymbolPath_default2({
       shape: {
         points: downArrow,
-        size: [12, 16]
+        size: ArrowSize
       },
       style: {
         fill: ShortColor
@@ -55746,6 +55869,24 @@ var StrategyView2 = class extends Chart_default {
       triangleHeight: 6
     };
     symbolGroup.add(arrowDownEl);
+    const closeDownArrow = data.getLayout("closeDownArrow");
+    const closeDownArrowEl = new SymbolPath_default2({
+      shape: {
+        points: closeDownArrow,
+        size: ArrowSize
+      },
+      style: {
+        fill: CloseColor
+      },
+      z2
+    });
+    closeDownArrowEl.symbolProxy = createSymbol("arrowDownClose", 0, 0, 0, 0);
+    closeDownArrowEl.symbolProxy.shape = {
+      ...closeDownArrowEl.symbolProxy.shape,
+      triangleWidth: 4,
+      triangleHeight: 6
+    };
+    symbolGroup.add(closeDownArrowEl);
     const texts = data.getLayout("texts");
     const textColor = seriesModel.get("textColor");
     each(texts, function(item) {
@@ -55813,7 +55954,8 @@ StrategySeriesModel.defaultOption = {
 var StrategySeries_default = StrategySeriesModel;
 
 // src/chart/strategy/StrategyLayout.ts
-var arrowHeight = 16;
+var arrowHeight = ArrowSize[1];
+var closeArrowHeight = ArrowSize[1] + 3;
 var arrowMargin = 10;
 var textMargin = 6;
 var textHeight = 26;
@@ -55847,6 +55989,10 @@ var StrategyLayout = {
         const downTriangle = [];
         const upArrow = [];
         const downArrow = [];
+        const closeDownArrow = [];
+        const closeUpArrow = [];
+        const closeUpTriangle = [];
+        const closeDownTriangle = [];
         const texts = [];
         for (let i = params.start; i < params.end; i++) {
           const x = store.get(dimIdx0, i);
@@ -55859,8 +56005,10 @@ var StrategyLayout = {
           const baseDownPoint = coordSys.dataToPoint([x, baseDown]);
           const optimizeX = baseUpPoint[0] + 0.5;
           each(upOrders, function(item) {
-            upTriangle.push(coordSys.dataToPoint([x, item.price]));
-            upArrow.push([optimizeX, baseUpPoint[1] + arrowMargin + arrowHeight / 2]);
+            (item.isClose ? closeUpTriangle : upTriangle).push(coordSys.dataToPoint([x, item.price]));
+            const visibleArrowHeight = item.isClose ? closeArrowHeight : arrowHeight;
+            const arrowY = baseUpPoint[1] + arrowMargin + visibleArrowHeight / 2;
+            (item.isClose ? closeUpArrow : upArrow).push([optimizeX, arrowY]);
             if (!allInVisible) {
               const count2 = countVisible ? "+" + item.count : "";
               const comment = signVisible ? item.comment : "";
@@ -55868,24 +56016,26 @@ var StrategyLayout = {
                 text: `${comment}${split2}${count2}`,
                 point: [
                   baseUpPoint[0],
-                  baseUpPoint[1] + arrowMargin + arrowHeight + visibleTextMargin
+                  baseUpPoint[1] + arrowMargin + visibleArrowHeight + visibleTextMargin
                 ]
               });
             }
-            baseUpPoint[1] = baseUpPoint[1] + arrowMargin + arrowHeight + visibleTextMargin + visibleTextHeight;
+            baseUpPoint[1] = baseUpPoint[1] + arrowMargin + visibleArrowHeight + visibleTextMargin + visibleTextHeight;
           });
           each(downOrders, function(item) {
-            downTriangle.push(coordSys.dataToPoint([x, item.price]));
-            downArrow.push([optimizeX, baseDownPoint[1] - arrowMargin - arrowHeight / 2]);
+            (item.isClose ? closeDownTriangle : downTriangle).push(coordSys.dataToPoint([x, item.price]));
+            const visibleArrowHeight = item.isClose ? closeArrowHeight : arrowHeight;
+            const arrowY = baseDownPoint[1] - arrowMargin - visibleArrowHeight / 2;
+            (item.isClose ? closeDownArrow : downArrow).push([optimizeX, arrowY]);
             if (!allInVisible) {
               const count2 = countVisible ? "-" + item.count : "";
               const comment = signVisible ? item.comment : "";
               texts.push({text: `${count2}${split2}${comment}`, point: [
                 baseDownPoint[0],
-                baseDownPoint[1] - arrowMargin - arrowHeight - visibleTextMargin - visibleTextHeight
+                baseDownPoint[1] - arrowMargin - visibleArrowHeight - visibleTextMargin - visibleTextHeight
               ]});
             }
-            baseDownPoint[1] = baseDownPoint[1] - arrowMargin - arrowHeight - visibleTextMargin - visibleTextHeight;
+            baseDownPoint[1] = baseDownPoint[1] - arrowMargin - visibleArrowHeight - visibleTextMargin - visibleTextHeight;
           });
         }
         data.setLayout({
@@ -55893,7 +56043,11 @@ var StrategyLayout = {
           downTriangle,
           upArrow,
           downArrow,
-          texts
+          texts,
+          closeDownArrow,
+          closeUpArrow,
+          closeUpTriangle,
+          closeDownTriangle
         });
       }
     };