hqchart 1.1.14408 → 1.1.14416

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

@@ -15637,7 +15637,7 @@ function AverageWidthFrame()
     this.IsShowYLine=true;
     this.YInsideOffset=0;
     this.YTextBaseline=0;       //0=居中 1=上部 (目前就支持内部刻度)
-    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=价格/百分比 2=显示2行
+    this.MultiTextFormat=0;    //多行刻度信息显示模式 0=显示第1行 1=单行多个文本 2=显示2行 3=多行输出（json格式)
     this.RightTextMaxWidth=0;
 
     this.ShortYLineLength=5;
@@ -15972,6 +15972,7 @@ function AverageWidthFrame()
         var pixelRatio=GetDevicePixelRatio();
         var itemHeight=(border.BottomEx-border.TopEx)/this.HorizontalInfo.length;
         var aryMultiText=[];
+        var aryLeftMulitText=[];
         var rtPreRight, rtRight, rtLeft, rtPreLeft;
         var textBaseline=0; //0=上 1=中 2=下
         for(var i=this.HorizontalInfo.length-1; i>=0; --i)  //从上往下画分割线
@@ -16078,7 +16079,12 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[0]))
                 {
-                    if (this.MultiTextFormat==3)
+                    if (this.MultiTextFormat==1)    //显示1行 格式如:价格/百分比
+                    {
+                        var textData=this.CreateMulitCoordinateItem(item.Message[0], left-2, yText, this.Canvas.textBaseline, item);
+                        aryLeftMulitText.push(textData);
+                    }
+                    else if (this.MultiTextFormat==3)
                     {
                         var obj={ Data:item.Message[0], X:left, Y:yText, TextBaseLine:textBaseline, IsLeft:true, Item:item, TextPadding:this.YTextPadding[0] };
                         this.DrawMultiLineText(obj);
@@ -16164,25 +16170,9 @@ function AverageWidthFrame()
                 this.Canvas.textAlign="left";
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1)    //显示1行 格式:价格/百分比
+                    if (this.MultiTextFormat==1)    //显示1行 格式如:价格/百分比
                     {
-                        if (item.ExtendData)
-                        {
-                            if (item.ExtendData.Font) this.Canvas.font=item.ExtendData.Font;
-                        }
-                            
-                        var textData=
-                        { 
-                            Text:
-                            [ 
-                                {Text:item.Message[1][0], Width:this.Canvas.measureText(item.Message[1][0]).width },
-                                {Text:item.Message[1][1], Width:this.Canvas.measureText(item.Message[1][1]).width } 
-                            ],
-                            X:xText+2,
-                            Y:yText,
-                            TextBaseline:this.Canvas.textBaseline,
-                            Item:item
-                        }
+                        var textData=this.CreateMulitCoordinateItem(item.Message[1], xText+2, yText, this.Canvas.textBaseline, item);
                         aryMultiText.push(textData);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
@@ -16239,7 +16229,9 @@ function AverageWidthFrame()
             yPrev=y;
         }
 
-        if (IFrameSplitOperator.IsNonEmptyArray(aryMultiText) && this.MultiTextFormat==1) this.DrawHorizontalMuText(aryMultiText);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryLeftMulitText) && this.MultiTextFormat==1) this.DrawMultiCoordinateLeftText(aryLeftMulitText);
+        if (IFrameSplitOperator.IsNonEmptyArray(aryMultiText) && this.MultiTextFormat==1) this.DrawMultiCoordinateRightText(aryMultiText);
+        
 
         if (isDrawRight && this.IsDrawRightBorder && this.YRightTextInfo)
         {  
@@ -16268,6 +16260,41 @@ function AverageWidthFrame()
         }
     }
 
+    this.CreateMulitCoordinateItem=function(aryData, x, y, textBaseline, data)
+    {
+        var coordinateItem=
+        { 
+            AryText:[], X:x,Y:y, TextBaseline:textBaseline, Item:data
+        };
+
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Font) this.Canvas.font=item.Font;
+            var textWidth=0;
+            if (item.Text) textWidth=this.Canvas.measureText(item.Text).width;
+
+            coordinateItem.AryText.push({ Width:textWidth, Item:item });
+        }
+
+        return coordinateItem;
+    }
+
+    this.GetMulitCoordinateItemTextWidth=function(aryData)
+    {
+        var total=0;
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            if (item.Font) this.Canvas.font=item.Font;
+            var width=this.Canvas.measureText(item.Text).width;
+
+            total+=width;
+        }
+
+        return total;
+    }
+
     //多行文字刻度输出 obj={ Data:, X:, Y:, TextBaseLine:, IsLeft:, Item:刻度数据 }
     this.DrawMultiLineText=function(obj)
     {
@@ -16358,53 +16385,86 @@ function AverageWidthFrame()
         return rtRight;
     }
 
-    this.DrawHorizontalMuText=function(aryText)
+    //绘制多重坐标刻度文字 左侧
+    this.DrawMultiCoordinateLeftText=function(aryText)
     {
-        var maxWidth=[null,null];
-        for(var i=0;i<aryText.length;++i)
+        var aryMaxWidth=[];
+        for(var i=0, j=0;i<aryText.length;++i)
         {
             var item=aryText[i];
-            var width=item.Text[0].Width;
-            if (!IFrameSplitOperator.IsNumber(maxWidth[0])) maxWidth[0]=width;
-            else if (maxWidth[0]<width) maxWidth[0]=width;
-
-            width=item.Text[1].Width;
-            if (!IFrameSplitOperator.IsNumber(maxWidth[1])) maxWidth[1]=width;
-            else if (maxWidth[1]<width) maxWidth[1]=width;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                if (!IFrameSplitOperator.IsNumber(aryMaxWidth[j]) || aryMaxWidth[j]<textItem.Width) aryMaxWidth[j]=textItem.Width;
+            }
+            
         }
 
+        this.Canvas.textAlign="right";
         for(var i=0;i<aryText.length;++i)
         {
             var item=aryText[i];
             var message=item.Item;
-
+            var x=item.X;
             this.Canvas.textBaseline=item.TextBaseline;
-            if (message.ExtendData && message.ExtendData.Font) this.Canvas.font=message.ExtendData.Font;
-            else if (message.Font) this.Canvas.font=message.Font;
-
-            if (message.ExtendData && message.ExtendData.PriceColor) this.Canvas.fillStyle=message.ExtendData.PriceColor;
-            else this.Canvas.fillStyle=message.TextColor;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                var subText=textItem.Item;
+                if (subText && subText.Text)
+                {
+                    if (subText.Font) this.Canvas.font=subText.Font;          //字体
+                    else if (message.Font) this.Canvas.font=message.Font;
+    
+                    if (subText.Color) this.Canvas.fillStyle=subText.Color;   //颜色
+                    else this.Canvas.fillStyle=message.TextColor;
 
-            this.Canvas.textAlign="right";
-            var x=item.X+maxWidth[1];
-            this.Canvas.fillText(item.Text[1].Text,x,item.Y);
+                    this.Canvas.fillText(subText.Text,x,item.Y);
+                }
 
-            if (message.ExtendData && message.ExtendData.SplitColor) this.Canvas.fillStyle=message.ExtendData.SplitColor;
-            else this.Canvas.fillStyle=message.TextColor;
+                x-=aryMaxWidth[j];
+            }
+        }
+    }
 
-            this.Canvas.textAlign="left";
-            var splitWidth=this.Canvas.measureText('/').width;
-            this.Canvas.fillText('/',x,item.Y);
+    //绘制多重坐标刻度文字 右侧
+    this.DrawMultiCoordinateRightText=function(aryText)
+    {
+        var aryMaxWidth=[];
+        for(var i=0, j=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                if (!IFrameSplitOperator.IsNumber(aryMaxWidth[j]) || aryMaxWidth[j]<textItem.Width) aryMaxWidth[j]=textItem.Width;
+            }
             
-            if (message.ExtendData && message.ExtendData.PercentageColor) this.Canvas.fillStyle=message.ExtendData.PercentageColor;
-            else this.Canvas.fillStyle=message.TextColor;
+        }
 
-            this.Canvas.textAlign="right";
-            var x=item.X+maxWidth[1]+maxWidth[0]+splitWidth;
-            this.Canvas.fillText(item.Text[0].Text,x,item.Y);
+        this.Canvas.textAlign="right";
+        for(var i=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            var message=item.Item;
+            var x=item.X;
+            this.Canvas.textBaseline=item.TextBaseline;
+            for(var j=0;j<item.AryText.length;++j)
+            {
+                var textItem=item.AryText[j];
+                var subText=textItem.Item;
+                if (subText && subText.Text)
+                {
+                    if (subText.Font) this.Canvas.font=subText.Font;          //字体
+                    else if (message.Font) this.Canvas.font=message.Font;
+    
+                    if (subText.Color) this.Canvas.fillStyle=subText.Color;   //颜色
+                    else this.Canvas.fillStyle=message.TextColor;
 
-            var textWidth=maxWidth[1]+maxWidth[0]+splitWidth*4;
-            if (this.RightTextMaxWidth<textWidth) this.RightTextMaxWidth=textWidth;
+                    x+=aryMaxWidth[j];
+                    this.Canvas.fillText(subText.Text,x,item.Y);
+                }
+            }
         }
     }
 
@@ -17982,7 +18042,8 @@ function AverageWidthFrame()
             {
                 if (Array.isArray(item.Message[0]))
                 {
-                    textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
+                    if (this.MultiTextFormat==1) textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[0]);
+                    else textWidth=this.GetMulitTextMaxWidth(item.Message[0]);
                 }
                 else
                 {
@@ -18001,17 +18062,9 @@ function AverageWidthFrame()
 
                 if (Array.isArray(item.Message[1]))
                 {
-                    if (this.MultiTextFormat==1 && IFrameSplitOperator.IsNonEmptyArray(item.Message[1]))    //显示1行 格式:价格/百分比
+                    if (this.MultiTextFormat==1)    //显示1行 格式:价格/百分比
                     {
-                        if (item.ExtendData && item.ExtendData.Font) this.Canvas.font=item.ExtendData.Font;
-                        
-                        var width1=this.Canvas.measureText(item.Message[1][0]).width;
-                        var width2=this.Canvas.measureText(item.Message[1][1]).width;
-                        var width3=this.Canvas.measureText('/').width;
-                        textWidth=width1+width3;
-                        if (rightExtendWidth<width2) rightExtendWidth=width2;
-
-                        //JSConsole.Chart.Log(`[ChartData::GetScaleTextWidth] ${item.Message[1][1]}/${item.Message[1][0]} ${textWidth}, ${rightExtendWidth}`);
+                        textWidth=this.GetMulitCoordinateItemTextWidth(item.Message[1]);
                     }
                     else if (this.MultiTextFormat==2)   //显示2行
                     {
@@ -54716,7 +54769,7 @@ function FrameSplitKLinePriceY()
     this.EnableZoomUpDown=false;    //上下左右拖拽
     this.LastMaxMin;        //当前显示的最高最低范围
 
-    this.PercentageTextFormat=0;    //0=显示第1行  1=显示2行 2=单行格式: 价格/百分比
+    this.PercentageTextFormat=0;    //0=显示第1行  1=单行格式: 价格/百分比, 2=显示2行 3=2行显示(json格式)
 
     this.IsEnableDragY=function()
     {
@@ -54948,17 +55001,7 @@ function FrameSplitKLinePriceY()
             var price=(value+1)*firstOpenPrice;
             var item=new CoordinateInfo();
             item.Value=price;
-            if (this.IsShowLeftText) item.Message[0]=price.toFixed(floatPrecision);     //左边价格坐标  
-            
-            if (this.IsShowRightText) 
-            {
-                var strPrice=price.toFixed(floatPrecision);
-                var text=(value*100).toFixed(2);    //右边百分比
-                text=IFrameSplitOperator.RemoveZero(text);
-                text+='%';
-                item.Message[1]=[text,strPrice];
-                item.ExtendData=textColor;
-            }
+            this.FormatPercentageItem(item, value, floatPrecision,textColor);
             aryHorizontal.push(item);
         }
 
@@ -54969,16 +55012,7 @@ function FrameSplitKLinePriceY()
 
             var item=new CoordinateInfo();
             item.Value=price;
-            if (this.IsShowLeftText) item.Message[0]=price.toFixed(floatPrecision);   //左边价格坐标      
-            if (this.IsShowRightText) 
-            {
-                var strPrice=price.toFixed(floatPrecision);
-                var text=(value*100).toFixed(2);    //右边百分比
-                text=IFrameSplitOperator.RemoveZero(text);
-                text+='%';
-                item.Message[1]=[text,strPrice];  
-                item.ExtendData=textColor;
-            }
+            this.FormatPercentageItem(item, value, floatPrecision,textColor);
             aryHorizontal.push(item);
         }
 
@@ -54994,6 +55028,26 @@ function FrameSplitKLinePriceY()
         return true;
     }
 
+    this.FormatPercentageItem=function(item, percentage, floatPrecision, textColor)
+    {
+        var price=item.Value;
+        var strPrice=price.toFixed(floatPrecision);
+        if (this.IsShowLeftText) item.Message[0]=strPrice;   //左边价格坐标  
+
+        if (this.IsShowRightText)   //右侧 价格/百分比
+        {
+            var strPrcentage=`${IFrameSplitOperator.RemoveZero(percentage.toFixed(2))}%`;    //右边百分比
+            if (this.PercentageTextFormat==1)
+                item.Message[1]=[{ Text:strPrice, Color:textColor.PriceColor }, {Text:"/", Color:textColor.PercentageColor}, {Text:strPrcentage, Color:textColor.SplitColor}];
+            else if (this.PercentageTextFormat==3)
+                item.Message[1]=[{ Text:strPrice, Color:textColor.PriceColor }, {Text:strPrcentage, Color:textColor.PercentageColor}];
+            else if (this.PercentageTextFormat==2)
+                item.Message[1]=[strPrcentage, strPrice];
+            else
+                item.Message[1]=strPrcentage;
+        }    
+    }
+
     //等比坐标 当前屏最后第2根K线的收盘加为基准, 上下涨幅10%分割
     this.SplitIncrease=function(splitData,floatPrecision)    
     {
@@ -56832,7 +56886,7 @@ function FrameSplitMinutePriceY()
                 }
                 else if (this.RightTextFormat==2) //价格/百分比
                 {
-                    coordinate.Message[1]=[strPer,strPrice];
+                    coordinate.Message[1]=[ {Text:strPrice}, {Text:"/"}, { Text:strPer} ];
                 }
                 else 
                 {
@@ -127387,7 +127441,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
             {
                 outVarItem.Data=this.FittingMinuteArray(item.data,date,time,hqChart);
                 if (item.color) outVarItem.Color=item.color;
-                if (item.linewidth>=1) outVarItem.LineWidth=item.linewidth;
+                if (item.linewidth) outVarItem.LineWidth=item.linewidth;
                 if (item.isshow==false) outVarItem.IsShow = false;
                 if (item.isexdata==true) outVarItem.IsExData = true;
                 if (item.BreakPoint) outVarItem.BreakPoint=item.BreakPoint;
@@ -128402,9 +128456,9 @@ function GetBlackStyle()
            
             PercentageText:      //百分比坐标文字颜色
             { 
-                PriceColor:'rgb(101,104,112)', 
-                PercentageColor:"rgb(101,104,112)", 
-                SplitColor:"rgb(101,104,112)",
+                PriceColor:'rgb(220,220,220)', 
+                PercentageColor:"rgb(220,220,220)", 
+                SplitColor:"rgb(220,220,220)",
                 Font:14*GetDevicePixelRatio() +"px 微软雅黑"
             }
         }, 
@@ -143351,7 +143405,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14407";
+var HQCHART_VERSION="1.1.14415";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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