hqchart 1.1.13135 → 1.1.13140

package/src/jscommon/umychart.version.js

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

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

@@ -10806,13 +10806,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             { 
                 ID:key, Frame:frame, ChartPaint:[] , Max:null, Min:null, 
                 OverlayFrame:[],        //共享坐标
-                SingleOverlay:[]        //独立坐标
+                SingleOverlay:[],       //独立坐标
+                MainOverlayFrame:[null, null],  //叠加坐标在主坐标显示[0]=left [1]=right
             };
 
             for(var j=0;j<subItem.OverlayIndex.length;++j)
             {
                 var overlayItem=subItem.OverlayIndex[j];
                 var overlayFrame=overlayItem.Frame;
+
+                if (overlayFrame.IsShowMainFrame===1) item.MainOverlayFrame[0]= overlayFrame;
+                else if (overlayFrame.IsShowMainFrame===2) item.MainOverlayFrame[1]= overlayFrame;
+
                 if (overlayFrame.IsShareY)
                 {
                     if (!overlayFrame.MainFrame) continue;
@@ -10828,7 +10833,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 {
                     item.SingleOverlay.push(overlayItem);
                 }
-                
             }
 
             mapFrame.set(key, item);
@@ -10913,6 +10917,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 item.OverlayFrame[j].XYSplit=true;
             }
 
+            //叠加坐标显示在主图坐标 需要同步
+            for(var i=0;i<item.MainOverlayFrame.length;++i)
+            {
+                var subItem=item.MainOverlayFrame[i];
+                if (subItem) subItem.XYSplit=true;
+            }
+
             //独立坐标叠加指标
             for(var i=0;i<item.SingleOverlay.length;++i)
             {
@@ -13895,6 +13906,8 @@ function AverageWidthFrame()
     this.XTextExtend;   //[0]=底部  { Align:0=默认(居中), 1=左对齐 }
     this.XLineExtend;   //[0]=底部  { Mode:1, Color: }  Mode=1 分割线  Mode=2短线
 
+    this.FrameData={ SubFrameItem:null };    //窗口框架信息
+
     //画图工具刻度
     
     this.DrawPicture={ 
@@ -15844,6 +15857,25 @@ function AverageWidthFrame()
 
         if (divToolbar.style.display!='none') divToolbar.style.display='none';
     }
+
+    this.GetMainOverlayFrame=function()
+    {
+        if (!this.FrameData || !this.FrameData.SubFrameItem)  return null;
+
+        var subFrame=this.FrameData.SubFrameItem;
+        var leftFrame=null, rightFrame=null;
+        for(var i=0;i<subFrame.OverlayIndex.length;++i)
+        {
+            var item=subFrame.OverlayIndex[i];
+            var overlayFrame=item.Frame;
+            if (overlayFrame.IsShowMainFrame==2) rightFrame=overlayFrame;
+            else if (overlayFrame.IsShowMainFrame==1) leftFrame=overlayFrame;
+        }
+
+        if (!leftFrame && !rightFrame) return null;
+
+        return [leftFrame, rightFrame];
+    }
 }
 
 function MinuteFrame()
@@ -17953,7 +17985,7 @@ function OverlayMinuteFrame()
             this.HorizontalMax=this.MainFrame.HorizontalMax;
             this.HorizontalMin=this.MainFrame.HorizontalMin;
             this.HorizontalInfo=[];
-            for(var i in this.MainFrame.HorizontalInfo)
+            for(var i=0; i<this.MainFrame.HorizontalInfo.length; ++i)
             {
                 var item=this.MainFrame.HorizontalInfo[i];
                 this.HorizontalInfo.push(item);
@@ -17963,7 +17995,7 @@ function OverlayMinuteFrame()
         {
             if (this.YSplitOperator!=null) this.YSplitOperator.Operator();
         }
-        
+
         // if (this.XSplitOperator!=null) this.XSplitOperator.Operator(); 子坐标和主坐标X轴一致 所以不用计算
     }
 }
@@ -19297,6 +19329,7 @@ function OverlayKLineFrame()
 
     this.MainFrame=null;    //主框架
     this.IsShareY=false;    //使用和主框架公用Y轴
+    this.IsShowMainFrame=0; //是否显示在主框架坐标上 1=左边 2=右边
     this.IsCalculateYMaxMin=true;   //是否计算Y最大最小值
     this.RightOffset=50;
     this.PenBorder=g_JSChartResource.OverlayFrame.BolderPen; //'rgb(0,0,0)'
@@ -19507,8 +19540,6 @@ function OverlayKLineFrame()
         {
             if (this.YSplitOperator!=null) this.YSplitOperator.Operator();
         }
-        
-        // if (this.XSplitOperator!=null) this.XSplitOperator.Operator(); 子坐标和主坐标X轴一致 所以不用计算
     }
 
     //画Y轴
@@ -26530,6 +26561,14 @@ function ChartKLine()
     this.IsThinAKBar=true;  //美国线 柱子是否是线段 (false=柱子)
 
     this.HighLowBarColor=g_JSChartResource.HighLowBarColor;
+    this.HighLowTextConfig=
+    { 
+        FontName:g_JSChartResource.HighLowText.FontName, 
+        MaxSize:g_JSChartResource.HighLowText.MaxSize, 
+        MinSize:g_JSChartResource.HighLowText.MinSize, 
+        Color:g_JSChartResource.HighLowText.Color,  //未用
+        MaxText:g_JSChartResource.HighLowText.MaxText
+    };
 
     this.HLCAreaConfig=
     {
@@ -28980,6 +29019,12 @@ function ChartKLine()
             var top=this.ChartBorder.GetTopEx();
             var bottom=this.ChartBorder.GetBottomEx();
             if (this.ChartBorder.BottomSpace>0) bottom+=1;
+
+            if (this.DrawType==13)  //需要显示文字,裁剪要大点
+            {
+                top=this.ChartBorder.GetTopTitle();
+                bottom=this.ChartBorder.GetBottom();
+            }
         }
 
         this.Canvas.beginPath();
@@ -30803,6 +30848,15 @@ function ChartKLine()
 
         this.Canvas.fillStyle=this.HighLowBarColor;
         this.Canvas.strokeStyle=this.HighLowBarColor;
+        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);
+        var font=this.GetHighLowTextFont(dataWidth,distanceWidth);
+        var bShowText=false;
+        if (font)
+        {
+            bShowText=true;
+            this.Canvas.font=font;
+        }
+
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth),++this.ShowRange.DataCount)
         {
             var data=this.Data.Data[i];
@@ -30829,6 +30883,7 @@ function ChartKLine()
                 else
                 {
                     this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(yBarTop),ToFixedRect(dataWidth),ToFixedRect(barHeight));   
+                    if (bShowText) this.DrawHighLowText(yHigh, yLow, x, data, defaultfloatPrecision);
                     //TODO:文字输出 
                 }
             }
@@ -30868,6 +30923,38 @@ function ChartKLine()
         }
     }
 
+    this.DrawHighLowText=function(yHigh, yLow, x, kItem, floatPrecision)
+    {
+        this.Canvas.textAlign="center";
+
+        var text=kItem.High.toFixed(floatPrecision);
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.fillText(text,x,yHigh-2);
+
+        var text=kItem.Low.toFixed(floatPrecision);
+        this.Canvas.textBaseline="top";
+        this.Canvas.fillText(text,x,yLow+3);
+    }
+
+    this.GetHighLowTextFont=function(dataWidth, distanceWidth)
+    {
+        var barWidth=dataWidth+distanceWidth;
+        var text=this.HighLowTextConfig.MaxText;
+        var min=Math.min(this.HighLowTextConfig.MaxSize,this.HighLowTextConfig.MinSize);
+        var max=Math.max(this.HighLowTextConfig.MaxSize,this.HighLowTextConfig.MinSize);
+
+        for(var i=max; i>=min; --i)
+        {
+            var font=`${i*GetDevicePixelRatio()}px ${this.HighLowTextConfig.FontName}`;
+            this.Canvas.font=font;
+            var textWidth=this.Canvas.measureText(text).width;
+            if (textWidth<=barWidth)
+                return font;
+        }
+
+        return null;
+    }
+
     //////////////////////////////////////////////////////////////
     //标识缺口
     //
@@ -49633,6 +49720,7 @@ function FrameSplitY()
         if (this.SplitType!=1) this.Frame.HorizontalInfo = this.Filter(this.Frame.HorizontalInfo,(splitData.Max>0 && splitData.Min<0));
         
         this.RightFrameSplitY();
+        this.MainOverlayFrameSplitY();  //主图Y轴绑定叠加Y轴坐标
         this.CallAcutionSplitY(this.SplitCount,splitData);
 
         if (this.EnableRemoveZero) this.RemoveZero(this.Frame.HorizontalInfo);
@@ -49853,6 +49941,41 @@ function FrameSplitY()
         }
     }
 
+    this.MainOverlayFrameSplitY=function()
+    {
+        if (!this.Frame.GetMainOverlayFrame) return;
+        var aryOverlayFrame=this.Frame.GetMainOverlayFrame();
+        if (!aryOverlayFrame ) return;
+
+        if (aryOverlayFrame[1])
+        {
+            var rightFrame=aryOverlayFrame[1];
+            if (rightFrame.YSplitOperator) rightFrame.YSplitOperator.Operator();
+
+            for(var i=0;i<this.Frame.HorizontalInfo.length;++i)
+            {
+                var item=this.Frame.HorizontalInfo[i];
+                var y=this.Frame.GetYFromData(item.Value);
+                var yValue=rightFrame.GetYData(y);
+                item.Message[1] = IFrameSplitOperator.FormatValueString(yValue, this.FloatPrecision,this.LanguageID);
+            }
+        }
+
+        if (aryOverlayFrame[0])
+        {
+            var leftFrame=aryOverlayFrame[0];
+            if (leftFrame.YSplitOperator) leftFrame.YSplitOperator.Operator();
+
+            for(var i=0;i<this.Frame.HorizontalInfo.length;++i)
+            {
+                var item=this.Frame.HorizontalInfo[i];
+                var y=this.Frame.GetYFromData(item.Value);
+                var yValue=leftFrame.GetYData(y);
+                item.Message[0] = IFrameSplitOperator.FormatValueString(yValue, this.FloatPrecision,this.LanguageID);
+            }
+        }
+    }
+
     this.CustomCoordinate=function()
     {
         this.Frame.CustomHorizontalInfo=[];
@@ -67012,6 +67135,7 @@ function JSChartResource()
     this.UnchagneBarColor="rgb(0,0,0)"; //平盘柱子颜色
     this.EmptyBarBGColor="rgb(255,255,255)";  //空心柱子背景色
     this.HighLowBarColor='rgb(41,98,255)';  //high low bar 颜色
+    this.HighLowText={ FontName:"arial", MaxSize:30, MinSize:4, Color:"rgb(41,98,255)", MaxText:"9999.9" };
 
     this.SplashScreen=
     {
@@ -68182,6 +68306,16 @@ function JSChartResource()
         if (style.UnchagneBarColor) this.UnchagneBarColor = style.UnchagneBarColor;
         if (style.EmptyBarBGColor) this.EmptyBarBGColor=style.EmptyBarBGColor;
         if (style.HighLowBarColor) this.HighLowBarColor=style.HighLowBarColor;
+        if (style.HighLowText)
+        {
+            var dest=this.HighLowText;
+            var item=style.HighLowText;
+            if (item.FontName) dest.FontName=item.FontName;
+            if (item.Color) dest.Color=item.Color;
+            if (item.MaxText) dest.MaxText=item.MaxText;
+            if (IFrameSplitOperator.IsPlusNumber(item.MaxSize)) dest.MaxSize=item.MaxSize;
+            if (IFrameSplitOperator.IsPlusNumber(item.MinSize)) dest.MinSize=item.MinSize;
+        }
 
         if (style.SplashScreen)
         {
@@ -69352,7 +69486,7 @@ function KLineCustomCalulate()
             ["RenkoCalculate",      { Create:function() { return new RenkoCalculate(); }  }],
             ["HeikinAshiCalculate", { Create:function() { return new HeikinAshiCalculate(); }  }],
             ["LineBreakCalcuate",   { Create:function() { return new LineBreakCalcuate(); }  }],
-            ["KagiCalculate",       { Create:function(){ return new RenkoCalculate(); } }]
+            ["KagiCalculate",       { Create:function(){ return new KagiCalculate(); } }]
         ]
     );
 
@@ -69535,7 +69669,38 @@ function RenkoCalculate()
 //
 function KagiCalculate()
 {
+    this.Symbol;
+    this.SourceData;
+    this.FloatPrecision=2;  //品种小数位数
+    this.ATR={ Count:14 };  //使用ATR计算砖块大小
 
+    this.RecvHistoryData=function(sourceData, option)  //历史日线数据
+    {
+        this.Symbol=option.Symbol;
+        this.SourceData=sourceData;
+        this.FloatPrecision=GetfloatPrecision(this.Symbol);
+        return this.Calculate(sourceData);
+    }
+
+    this.Calculate=function(sourceData)
+    {
+        var bindData=new ChartData();
+        bindData.Data=[]
+        bindData.Right=sourceData.Right;
+        bindData.Period=sourceData.Period;
+        bindData.DataType=sourceData.DataType;
+        bindData.Symbol=sourceData.symbol;
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(sourceData.Data)) return bindData;
+
+        var periodCount=this.ATR.Count;
+
+        var kItem=sourceData.Data[0];
+        this.LastData=HistoryData.Copy(kItem);
+        for(var i=1; i<sourceData.Data.length; )    
+        {
+        }
+    }
 }
 
 //////////////////////////////////////////////////////////////////
@@ -70915,6 +71080,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             }
 
             var subFrame=new SubFrameItem();
+            frame.FrameData.SubFrameItem=subFrame;
             subFrame.Frame=frame;
             if (i==0)
                 subFrame.Height=20;
@@ -70981,6 +71147,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
 
         var subFrame=new SubFrameItem();
+        frame.FrameData.SubFrameItem=subFrame;
         subFrame.Frame=frame;
         subFrame.Height=10;
 
@@ -73500,6 +73667,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         else if (obj.ShowRightText===false) frame.IsShow=false;
         if (IFrameSplitOperator.IsBool(obj.ShowToolbar)) frame.IsShowToolbar=obj.ShowToolbar;   //废弃
         if (IFrameSplitOperator.IsBool(obj.IsShareY)) frame.IsShareY=obj.IsShareY;
+        if (IFrameSplitOperator.IsNumber(obj.IsShowMainFrame)) frame.IsShowMainFrame=obj.IsShowMainFrame;
         //if (IFrameSplitOperator.IsBool(obj.IsShowIndexTitle)) frame.IsShowIndexTitle=obj.IsShowIndexTitle;
         if (IFrameSplitOperator.IsBool(obj.IsCalculateYMaxMin)) frame.IsCalculateYMaxMin=obj.IsCalculateYMaxMin;   //是否计算Y最大最小值
 
@@ -134152,7 +134320,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13134";
+var HQCHART_VERSION="1.1.13139";
 
 function PrintHQChartVersion()
 {