hqchart 1.1.14349 → 1.1.14363

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

@@ -44487,7 +44487,7 @@ function ChartMultiBar()
 
         for(var mapItem of mapBar)
         {
-            aryBar=mapItem[1].AryBar;
+            var aryBar=mapItem[1].AryBar;
             if (!IFrameSplitOperator.IsNonEmptyArray(aryBar)) continue;
 
             var config=null;
@@ -44495,6 +44495,7 @@ function ChartMultiBar()
             var count=0;
             var drawType=-1;    //1=直线 2=实心 3=空心
             var barWidth=1;
+            this.Canvas.beginPath();
             for(var i=0;i<aryBar.length;++i)
             {
                 var item=aryBar[i];
@@ -44518,7 +44519,6 @@ function ChartMultiBar()
 
                 if (drawType==1)
                 {
-                    this.Canvas.beginPath();
                     if (this.IsHScreen)
                     {
                         this.Canvas.moveTo(ToFixedPoint(item.Y),ToFixedPoint(item.X));
@@ -45265,10 +45265,18 @@ function ChartMultiText()
             var mapItem=this.MapCache.get(key);
             if (!IFrameSplitOperator.IsNonEmptyArray(mapItem.Data)) continue;
 
-            var left=xOffset;
-            var right=xOffset+dataWidth;
-            if (right>chartright) break;
-            var x=left+(right-left)/2;
+            if (isMinute)
+            {
+                var x=this.ChartFrame.GetXFromIndex(j);
+            }
+            else
+            {
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                if (right>chartright) break;
+                var x=left+(right-left)/2;
+            }
+            
 
             for(var k=0;k<mapItem.Data.length;++k)
             {
@@ -45323,7 +45331,6 @@ function ChartMultiText()
 
                 if (item.Line)
                 {
-                    var kItem=this.Data.Data[item.Index];
                     var price=item.Line.KData=="H"? kItem.High:kItem.Low;
                     var yPrice=this.ChartFrame.GetYFromData(price, false);
                     var yText=y;
@@ -57075,8 +57082,9 @@ function ChartCorssCursor()
         Icon:g_JSChartResource.CorssCursor.RightButton.Icon
     };
 
-    this.RightMargin={ Left:2, Right:2, Top:4, Bottom:3 };
-    CopyMarginConfig(this.RightMargin, g_JSChartResource.CorssCursor.RightMargin);
+    this.RightMargin=CloneData(g_JSChartResource.CorssCursor.RightMargin);
+    this.BottomConfig=CloneData(g_JSChartResource.CorssCursor.BottomText);     //底部输出配置
+    this.LeftConfig=CloneData(g_JSChartResource.CorssCursor.LeftText);
 
     //内部使用
     this.Close=null;     //收盘价格
@@ -57448,36 +57456,48 @@ function ChartCorssCursor()
         {
             var text=this.StringFormatY.Text;
             this.Canvas.font=this.Font;
-            var textWidth=this.Canvas.measureText(text).width+4;    //前后各空2个像素
-            var textSize={ Width:textWidth, Height:this.TextHeight, Text:[] };
+            var textWidth=this.Canvas.measureText(text).width;    //前后各空2个像素
+            var textSize={ Width:textWidth+4, Height:this.TextHeight, Text:[] };
             var buttonData={Y:y, YValue:yValue, FrameID:yValueExtend.FrameID };
-            if (this.Frame.ChartBorder.Left>=30 && this.ShowTextMode.Left==1)
+
+            if (this.Frame.ChartBorder.Left>=30)    //左边
             {
-                if (left<textWidth ) //左边空白的地方太少了画布下
+                var margin=this.LeftConfig.Margin;
+                var textOffset=this.LeftConfig.TextOffset;
+
+                var rtBG=null;
+                if (this.ShowTextMode.Left==1)
                 {
-                    this.DrawTextBGRect(ToFixedPoint(2),ToFixedPoint(y-this.TextHeight/2),ToFixedRect(textWidth),ToFixedRect(this.TextHeight));
-                    this.Canvas.textAlign="left";
-                    this.Canvas.textBaseline="middle";
-                    this.Canvas.fillStyle=this.TextColor;
-                    this.Canvas.fillText(text,2+2,y,textWidth);
+                    var rtBG={ Right:left, Width:textWidth+margin.Left+margin.Right, YCenter:y, Height:textHeight+margin.Top+margin.Bottom };
+                    rtBG.Left=rtBG.Right-rtBG.Width;
+                    rtBG.Top=rtBG.YCenter-rtBG.Height/2;
+                    rtBG.Bottom=rtBG.Top+rtBG.Height;
+
+                    if (rtBG.Left<0) 
+                    {
+                        rtBG.Left=0;
+                        rtBG.Right=rtBG.Left+rtBG.Width;
+                    }
                 }
-                else
+                else if (this.ShowTextMode.Left==2) //在框架内显示
                 {
-                    this.DrawTextBGRect(left-2,y-this.TextHeight/2,-textWidth,this.TextHeight);
-                    this.Canvas.textAlign="right";
-                    this.Canvas.textBaseline="middle";
+                    var rtBG={ Left:left, Width:textWidth+margin.Left+margin.Right, YCenter:y, Height:textHeight+margin.Top+margin.Bottom };
+                    rtBG.Right=rtBG.Left+rtBG.Width;
+                    rtBG.Top=rtBG.YCenter-rtBG.Height/2;
+                    rtBG.Bottom=rtBG.Top+rtBG.Height;
+                }
+
+                if (rtBG)
+                {
+                    this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+                    this.Canvas.textAlign="left";
+                    this.Canvas.textBaseline="bottom";
                     this.Canvas.fillStyle=this.TextColor;
-                    this.Canvas.fillText(text,left-4,y,textWidth);
+                    this.Canvas.fillText(text,rtBG.Left+textOffset.X, rtBG.Bottom+textOffset.Y);
                 }
             }
-            else if (this.ShowTextMode.Left==2) //在框架内显示
-            {
-                this.DrawTextBGRect(left,y-this.TextHeight/2,textWidth,this.TextHeight);
-                this.Canvas.textAlign="left";
-                this.Canvas.textBaseline="middle";
-                this.Canvas.fillStyle=this.TextColor;
-                this.Canvas.fillText(text,left+2,y,textWidth);
-            }
+
+            
 
             var complexText=
             { 
@@ -57619,26 +57639,42 @@ function ChartCorssCursor()
             var text=this.StringFormatX.Text;
             this.Canvas.font=this.Font;
             this.Canvas.fillStyle=this.TextBGColor;
-            var textWidth=this.Canvas.measureText(text).width+4;    //前后各空2个像素
+            var textWidth=this.Canvas.measureText(text).width;    //前后各空2个像素
+            var margin=this.BottomConfig.Margin;
+            var textOffset=this.BottomConfig.TextOffset;
+            var rtBG=
+            { 
+                Top:bottom, Height:margin.Top+margin.Bottom+textHeight, 
+                XCenter:x, Width:textWidth+margin.Left+margin.Right 
+            };
+            rtBG.Bottom=rtBG.Top+rtBG.Height;
+            rtBG.Left=rtBG.XCenter-rtBG.Width/2;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (rtBG.Left<=0)
+            {
+                rtBG.Left=0;
+                rtBG.Right=rtBG.Left+rtBG.Width;
+            }
+            else if (rtBG.Right>=right)
+            {
+                rtBG.Right=right;
+                rtBG.Left=rtBG.Right-rtBG.Width;
+            }
 
-            var yCenter=bottom+2+this.TextHeight/2;
-            var yTop=bottom+2;
             var bShowText=true;
             if (this.ShowTextMode.Bottom==2)
             {
-                yCenter=bottom-this.TextHeight/2-2;
-                yTop=bottom-this.TextHeight-2;
+                rtBG.Bottom=bottom;
+                rtBG.Top=rtBG.Bottom-rtBG.Height;
             }
             else if (this.ShowTextMode.Bottom==8)
             {
                 var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_CORSSCURSOR_POSITION);
                 if (event && event.Callback)
                 {
-                    var sendData={ YCenter:yCenter, YTop:yTop, Height:this.TextHeight, IsShowText:bShowText };
+                    var sendData={ RectText:rtBG, IsShowText:bShowText, X:x, Y:y };
                     event.Callback(event, sendData, this);
-
-                    yCenter=sendData.YCenter;
-                    yTop=sendData.YTop;
                     bShowText=sendData.IsShowText;
                 }
             }
@@ -57646,31 +57682,12 @@ function ChartCorssCursor()
             //JSConsole.Chart.Log('[ChartCorssCursor::Draw] ',yCenter);
             if (bShowText)
             {
-                if (x-textWidth/2<3)    //左边位置不够了, 顶着左边画
-                {
-                    this.DrawTextBGRect(x-1,yTop,textWidth,this.TextHeight);
-                    this.Canvas.textAlign="left";
-                    this.Canvas.textBaseline="middle";
-                    this.Canvas.fillStyle=this.TextColor;
-                    this.Canvas.fillText(text,x+1,yCenter,textWidth);
-                }
-                else if (x+textWidth/2>=right)
-                {
-                    this.DrawTextBGRect(right-textWidth,yTop,textWidth,this.TextHeight);
-                    this.Canvas.textAlign="right";
-                    this.Canvas.textBaseline="middle";
-                    this.Canvas.fillStyle=this.TextColor;
-                    this.Canvas.fillText(text,right-2,yCenter,textWidth);
-                }
-                else
-                {
-                    this.DrawTextBGRect(x-textWidth/2,yTop,textWidth,this.TextHeight);
-                    this.Canvas.textAlign="center";
-                    this.Canvas.textBaseline="middle";
-                    this.Canvas.fillStyle=this.TextColor;
-                    this.Canvas.fillText(text,x,yCenter,textWidth);
-                }
-            }
+                this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+                this.Canvas.textAlign="left";
+                this.Canvas.textBaseline="bottom";
+                this.Canvas.fillStyle=this.TextColor;
+                this.Canvas.fillText(text,rtBG.Left+textOffset.X,rtBG.Bottom+textOffset.Y,textWidth);
+        }
         }
 
         //子坐标Y轴
@@ -74998,7 +75015,10 @@ function JSChartResource()
             Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:18 }
         },
 
-        RightMargin: { Left:2, Right:2, Top:5, Bottom:3 }
+        RightMargin: { Left:2, Right:2, Top:5, Bottom:3 },
+
+        BottomText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
+        LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } }
     };
 
     this.LockBGColor = "rgb(220, 220, 220)";        //指标锁区域颜色
@@ -126920,6 +126940,16 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=='MULTI_BAR')
+                {
+                    drawItem.Text=draw.Text;
+                    drawItem.Name=draw.Name;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+                    outVarItem.Draw=drawItem;
+
+                    result.push(outVarItem);
+                }
                 else if (draw.DrawType=="DRAWCOLORKLINE")
                 {
                     drawItem.Name=draw.Name;
@@ -142727,7 +142757,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14348";
+var HQCHART_VERSION="1.1.14362";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -57398,6 +57398,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_DRAW_SIMPLE_RADAR(data, callback);
     else if (request.Data.indexname=="API_MULTI_BAR")
         HQData.APIIndex_MULTI_BAR(data, callback);
+    else if (request.Data.indexname=="API_MULTI_TEXT")
+        HQData.APIIndex_MULTI_TEXT(data, callback);
     
 }
 
@@ -58034,7 +58036,7 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
         [
             //{Date:20190916, Time: Value:15.5, Value2:0 },
         ],
-        Width:20
+        Width:5
     };
 
     for(var i=0;i<kData.Data.length;++i)
@@ -58063,6 +58065,57 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
 }
 
 
+HQData.APIIndex_MULTI_TEXT=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var SVGData= 
+    { 
+        name:'MULTI_TEXT', type:1, 
+        Draw: 
+        { 
+            DrawType:'MULTI_TEXT', 
+            DrawData: []
+        } //绘制文字
+    };
+
+    var ARRAY_COLOR=['rgb(255,248,220)','rgb(230,230,250)','rgb(100,149,237)','rgb(32,178,170)','rgb(152,251,152)','rgb(128,128,0)','rgb(255,165,0)','rgb(255,160,122)','rgb(205,92,92)']
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var item=kData.Data[i];
+        if (i%5!=3) continue;
+
+        var colorIndex=Math.ceil(Math.random()*ARRAY_COLOR.length-1);
+        var drawItem=
+        { 
+            Date:item.Date, Time:item.Time, Value:"H", Text:`最高：${item.High.toFixed(2)}`,Color:ARRAY_COLOR[colorIndex], Baseline:2, YMove:-2
+        };
+
+        var colorIndex=Math.ceil(Math.random()*ARRAY_COLOR.length-1);
+        var drawItem2=
+        { 
+            Date:item.Date, Time:item.Time, Value:item.Low, Text:`最低:${item.Low.toFixed(2)}`,Color:ARRAY_COLOR[colorIndex], Baseline:1, YMove:2
+        };
+
+        SVGData.Draw.DrawData.push(drawItem);
+        SVGData.Draw.DrawData.push(drawItem2);
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[SVGData] } 
+    };
+
+    console.log('[HQData.APIIndex_MULTI_TEXT] apiData ', apiData);
+    callback(apiData);
+}
+
+
 
 
 /*暴露外部用的方法*/