hqchart 1.1.15018 → 1.1.15029

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -10468,12 +10468,20 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);
     }
 
+    this.ClearCorssCursorCanvas=function()
+    {
+        if (!this.CorssCursorCanvas) return;
+
+        this.CorssCursorCanvas.clearRect(0,0,this.CorssCursorElement.width,this.CorssCursorElement.height);
+    }
+
     this.Draw=function()
     {
         if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
         if (this.UIElement.width<=0 || this.UIElement.height<=0) return; 
 
         this.StopDrawDynamicInfo();
+        this.ClearCorssCursorCanvas();
 
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_BEFORE_DRAW);
         if (event && event.Callback)
@@ -10647,7 +10655,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (this.CorssCursorCanvas) //独立的十字光标层
                 {
                     this.ChartCorssCursor.Canvas=this.CorssCursorCanvas;
-                    this.ChartCorssCursor.Canvas.clearRect(0,0,this.CorssCursorElement.width,this.CorssCursorElement.height)
                     bRestoreCanvas=true;
                 }
 
@@ -11451,6 +11458,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         if (!this.ChartCorssCursor) return null;
         if (this.ChartCorssCursor.Status===0) return null;
+        if (!this.ChartCorssCursor.IsShowCorss) return null;
 
         var kItem=this.ChartCorssCursor.StringFormatX.KItem;
         if (!kItem) return null;
@@ -58889,6 +58897,8 @@ IFrameSplitOperator.FormatDateTimeStringV2=function(datetime, format, languageID
 
         case "HH:MM:SS":
             return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}:${IFrameSplitOperator.NumberToString(datetime.getSeconds())}`;
+        case "MM:SS":
+            return `${IFrameSplitOperator.NumberToString(datetime.getMinutes())}:${IFrameSplitOperator.NumberToString(datetime.getSeconds())}`;
         case "HH:MM":
             return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
         case "HH:MM:SS.fff":
@@ -61978,7 +61988,7 @@ function ChartCorssCursor()
 
     //内部使用
     this.Close=null;     //收盘价格
-    this.Status=0;       //当前状态 0=隐藏 1=显示
+    this.Status=0;       //当前状态 0=隐藏 1=显示底部  2=十字线
 
     this.ReloadResource=function(resource)
     {
@@ -81549,6 +81559,15 @@ function JSChartResource()
         ValueColor:"rgb(0,0,0)",            //数值
     };
 
+    this.SmallFloatTooltipV2=
+    {
+        BGColor:'rgb(250,250,250)',         //背景色
+        BorderColor:'rgb(20,20,20)',        //边框颜色
+
+        TextColor:"rgb(0,0,0)",             //数值名称
+        ValueColor:"rgb(0,0,0)",            //数值
+    };
+
     //区间统计
     this.DialogSelectRect=
     {
@@ -82260,7 +82279,8 @@ function JSChartResource()
         {
             TextColor:"rgb(60,60,83)",
             BaseTextColor:"rgb(60,60,83)",
-            BGColor:"rgb(180,180,180)"
+            BGColor:"rgb(180,180,180)",
+            MatchTextColor:"rgb(60,60,83)",
         },
 
         FieldColor:
@@ -83334,8 +83354,20 @@ function JSChartResource()
 
         if (style.ChartDrawTVLongPosition) this.SetChartDrawTVLongPosition(style.ChartDrawTVLongPosition);
         if (style.KLineCountDownPaint) this.SetKLineCountDownPaint(style.KLineCountDownPaint);
+
+        if (style.SmallFloatTooltipV2) this.SetSmallFloatTooltipV2(style.SmallFloatTooltipV2);
     }
 
+    this.SetSmallFloatTooltipV2=function(style)
+    {
+        var dest=this.SmallFloatTooltipV2;
+
+        if (style.BGColor) dest.BGColor=style.BGColor;
+        if (style.BorderColor) dest.BorderColor=style.BorderColor;
+
+        if (style.TextColor) dest.TextColor=style.TextColor;
+        if (style.ValueColor) dest.ValueColor=style.ValueColor;
+    }
 
     this.SetKLineCountDownPaint=function(style)
     {
@@ -83870,6 +83902,7 @@ function JSChartResource()
             if (cell.TextColor) dest.CenterItem.TextColor=cell.TextColor;
             if (cell.BaseTextColor) dest.CenterItem.BaseTextColor=cell.BaseTextColor;
             if (cell.BGColor) dest.CenterItem.BGColor=cell.BGColor;
+            if (cell.MatchTextColor) dest.CenterItem.MatchTextColor=cell.MatchTextColor;
         }
 
         if (item.Item)
@@ -112480,7 +112513,7 @@ function JSAlgorithm(errorHandler,symbolData)
     this.EMA=function(data,dayCount)
     {
         var result = [];
-        if (data.length<=0) return result;
+        if (!data || data.length<=0) return result;
 
         if (Array.isArray(dayCount))
         {
@@ -136477,6 +136510,15 @@ function GetBlackStyle()
             ValueColor:"rgb(210,210,210)",            //数值
         },
 
+        SmallFloatTooltipV2:
+        {
+            BGColor:'rgb(20,20,20)',            //背景色
+            BorderColor:'rgb(170,170,170)',     //边框颜色
+
+            TextColor:"rgb(210,210,210)",             //数值名称
+            ValueColor:"rgb(210,210,210)",            //数值
+        },
+
         DialogSelectRect:
         {
             BGColor:'rgb(20,20,20)',            //背景色
@@ -136907,7 +136949,8 @@ function GetBlackStyle()
             {
                 TextColor:"rgb(16,226,217)",
                 BaseTextColor:"rgb(60,60,83)",
-                BGColor:"rgb(65,65,65)"
+                BGColor:"rgb(65,65,65)",
+                MatchTextColor:"rgb(210,210,210)"
             },
 
             FieldColor:
@@ -153133,7 +153176,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15017";
+var HQCHART_VERSION="1.1.15028";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.15017";
+var HQCHART_VERSION="1.1.15028";
 
 function PrintHQChartVersion()
 {