hqchart 1.1.12831 → 1.1.12840

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -37766,49 +37766,37 @@ function ChartMACD()
         return this.PtInBar(x, y, { BarWidth:barWidth })
     }
 
-    this.Draw=function()
+    this.DrawBars=function(lineWidth, bUpBar)
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
-        if (this.IsShowIndexTitleOnly()) return;
-        if (this.IsHideScriptIndex()) return;
-
-        if (this.NotSupportMessage)
-        {
-            this.DrawNotSupportmessage();
-            return;
-        }
-
-        if (this.ChartFrame.IsHScreen===true)
-        {
-            this.HScreenDraw();
-            return;
-        }
-
         var isMinute=this.IsMinuteFrame();
+        var border=this.ChartBorder.GetBorder();
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
-        var border=this.ChartBorder.GetBorder();
+        var xPointCount=this.ChartFrame.XPointCount;
         var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+
         var chartright=border.RightEx;
-        var xPointCount=this.ChartFrame.XPointCount;
         var lockRect=this.GetLockRect();
         if (lockRect) chartright=lockRect.Left;
 
-        var bFirstPoint=true;
-        var drawCount=0;
+        if (bUpBar) this.Canvas.strokeStyle=this.UpColor;
+        else this.Canvas.strokeStyle=this.DownColor;
+
         var yBottom=this.ChartFrame.GetYFromData(0);
-        
-        var lineWidth=this.LineWidth*GetDevicePixelRatio();
-        if (this.LineWidth==50) lineWidth=dataWidth;
-        else if (lineWidth>dataWidth) lineWidth=dataWidth;
-        
-        var backupLineWidth=this.Canvas.lineWidth;
-        this.Canvas.lineWidth=lineWidth;
+        this.Canvas.beginPath();
+        var drawCount=0;
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
-        //for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
         {
             var value=this.Data.Data[i];
             if (value==null) continue;
+            if (bUpBar)
+            {
+                if (value<0) continue;
+            }
+            else
+            {
+                if (value>=0) continue;
+            }
 
             if (isMinute)
             {
@@ -37821,21 +37809,49 @@ function ChartMACD()
                 if (right>chartright) break;
                 var x=left+(right-left)/2;
             }
-            var y=this.ChartFrame.GetYFromData(value);
 
             if (x>chartright) break;
 
+            var y=this.ChartFrame.GetYFromData(value);
             var xFix=ToFixedPoint2(lineWidth, x); //毛边修正
-            this.Canvas.beginPath();
             this.Canvas.moveTo(xFix,yBottom);
             this.Canvas.lineTo(xFix,y);
+            ++drawCount;
+        }
 
-            if (value>=0) this.Canvas.strokeStyle=this.UpColor;
-            else this.Canvas.strokeStyle=this.DownColor;
-            this.Canvas.stroke();
-            this.Canvas.closePath();
+        if (drawCount>0) this.Canvas.stroke();
+    }
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+
+        if (this.NotSupportMessage)
+        {
+            this.DrawNotSupportmessage();
+            return;
+        }
+
+        if (this.ChartFrame.IsHScreen===true)
+        {
+            this.HScreenDraw();
+            return;
         }
 
+        var dataWidth=this.ChartFrame.DataWidth;
+        var lineWidth=this.LineWidth*GetDevicePixelRatio();
+        if (this.LineWidth==50) lineWidth=dataWidth;
+        else if (lineWidth>dataWidth) lineWidth=dataWidth;
+        
+        var backupLineWidth=this.Canvas.lineWidth;
+        this.Canvas.lineWidth=lineWidth;
+
+         //上下分开画
+        this.DrawBars(lineWidth, true);
+        this.DrawBars(lineWidth, false);
+
         this.Canvas.lineWidth=backupLineWidth;
     }
 
@@ -40161,38 +40177,95 @@ function ChartMultiText()
     this.Color=g_JSChartResource.DefaultTextColor;
     this.IsHScreen=false;   //是否横屏
 
-    this.Draw=function()
+    this.BuildKey=function(item)
     {
-        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
-        if (!this.Data || this.Data.length<=0) return;
-        if (!this.Texts) return;
+        if (IFrameSplitOperator.IsNumber(item.Time))
+        {
+            var key=`${kItem.Date}-${item.Time}`;
+        }
+        else
+        {
+            var key=`${item.Date}`;
+        }
+        
+        return key;
+    }
 
-        this.IsHScreen=(this.ChartFrame.IsHScreen===true);
+    this.GetShowTextData=function()
+    {
         var xPointCount=this.ChartFrame.XPointCount;
         var offset=this.Data.DataOffset;
-        var left=this.ChartBorder.GetLeft();
-        var right=this.ChartBorder.GetRight();
-        var top=this.ChartBorder.GetTopEx();
-        var bottom=this.ChartBorder.GetBottomEx();
-
-        if (this.IsHScreen)
-        {
-            left=this.ChartBorder.GetTop();
-            right=this.ChartBorder.GetBottom();
-        }
 
-        var y=0;
+        var mapText=new Map();  //key='date-time' value={ Data:[] }
         for(var i=0; i<this.Texts.length; ++i)
         {
             var item=this.Texts[i];
-
             if (!item.Text) continue;
             if (!IFrameSplitOperator.IsNumber(item.Index)) continue;
 
             var index=item.Index-offset;
             if (index>=0 && index<xPointCount)
             {
-                var x=this.ChartFrame.GetXFromIndex(index);
+                var key=this.BuildKey(item);
+                if (mapText.has(key))
+                {
+                    var textItem=mapText.get(key);
+                    textItem.Data.push(item);
+                }
+                else
+                {
+                    var textItem={ Data:[item] };
+                    mapText.set(key, textItem);
+                }
+            }
+        }
+
+        return mapText;
+    }
+
+    this.DrawAllText=function(mapText)
+    {
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var isMinute=this.IsMinuteFrame();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xPointCount=this.ChartFrame.XPointCount;
+
+        if (bHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var chartright=border.BottomEx;
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var left=this.ChartBorder.GetTop();
+            var right=this.ChartBorder.GetBottom();
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
+            var left=this.ChartBorder.GetLeft();
+            var right=this.ChartBorder.GetRight();
+        }
+
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var kItem=this.Data.Data[i];
+            if (!kItem) continue;
+
+            var key=this.BuildKey(kItem);
+            if (!mapText.has(key)) continue;
+
+            var left=xOffset;
+            var right=xOffset+dataWidth;
+            if (right>chartright) break;
+            var x=left+(right-left)/2;
+
+            var textItem=mapText.get(key);
+            for(var k=0;k<textItem.Data.length;++k)
+            {
+                var item=textItem.Data[k];
+
                 if (item.Value=="TOP") y=top;
                 else if (item.Value=="BOTTOM") y=bottom;
                 else y=this.ChartFrame.GetYFromData(item.Value);
@@ -40274,6 +40347,20 @@ function ChartMultiText()
         }
     }
 
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.Data || this.Data.length<=0) return;
+        if (!this.Texts) return;
+
+        this.IsHScreen=(this.ChartFrame.IsHScreen===true);
+
+        var mapText=this.GetShowTextData();
+        if (mapText.size<=0) return;
+
+        this.DrawAllText(mapText);
+    }
+
     this.GetMaxMin=function()
     {
         var range={ Min:null, Max:null };
@@ -92702,7 +92789,7 @@ function MinuteCoordinateData()
         {
             Full:   //完整模式
             [
-                [0, 0, "rgb(200,200,200)", "09:30"],    //[0]=索引 [1]=线段类型 [2]=文字颜色(弃用) [3]=刻度文字 [4]=线段颜色 [5]=背景色
+                [0, 0, "rgb(200,200,200)", "09:30"],    //[0]=索引 [1]=线段类型(预留) [2]=文字颜色(弃用) [3]=刻度文字 [4]=线段颜色 [5]=背景色
                 [31, 0, "RGB(200,200,200)", "10:00"],
                 [61, 0, "RGB(200,200,200)", "10:30"],
                 [91, 0, "RGB(200,200,200)", "11:00"],
@@ -131951,7 +132038,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12830";
+var HQCHART_VERSION="1.1.12839";
 
 function PrintHQChartVersion()
 {