hqchart 1.1.14722 → 1.1.14734

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

@@ -5205,7 +5205,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (item.BottomSpace>=0) chart.Frame.SubFrame[i].Frame.ChartBorder.BottomSpace=item.BottomSpace*pixelRatio;
 
                 //是否显示关闭集合竞价按钮
-                if (IFrameSplitOperator.IsNumber(item.CloseBeforeButton)) chart.Frame.SubFrame[i].Frame.IsShowCloseButton=item.CloseBeforeButton;
+                if (IFrameSplitOperator.IsBool(item.CloseBeforeButton)) chart.Frame.SubFrame[i].Frame.IsShowCloseButton=item.CloseBeforeButton;
 
                 if (item.ClientBGColor) subFrame.ClientBGColor=item.ClientBGColor;
                 if (!IFrameSplitOperator.IsUndefined(item.HorizontalReserved)) subFrame.HorizontalReserved=item.HorizontalReserved;
@@ -14316,6 +14316,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             frame.YSplitOperator.ChartBorder=frame.ChartBorder;
             frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;
             frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
+            frame.YSplitOperator.HQChart=this;
     
             overlayFrame.Frame=frame;
 
@@ -15249,6 +15250,27 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         chart.Canvas=this.Canvas;
         chart.ChartBorder=frame.ChartBorder;
         chart.ChartFrame=frame;
+        chart.HQChart=this;
+       
+        this.ChartPaintEx.push(chart);
+
+        return true;
+    }
+
+    this.CreateChartPaintExtendV2=function(className, option, windowIndex)
+    {
+        if (windowIndex<0) return false;
+        var subFrame=this.Frame.SubFrame[windowIndex];
+        if (!subFrame || !subFrame.Frame) return false;
+
+        var chart=g_ChartPaintFactory.Create(className, option);
+        if (!chart) return false;
+
+        var frame=subFrame.Frame;
+        chart.Canvas=this.Canvas;
+        chart.ChartBorder=frame.ChartBorder;
+        chart.ChartFrame=frame;
+        chart.HQChart=this;
        
         this.ChartPaintEx.push(chart);
 
@@ -15791,6 +15813,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         return true;
     }
+
+    //是否是额外的集合竞价部分
+    this.IsCallAuctionFrame=function(frameID)
+    {
+        return false;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -29819,6 +29847,7 @@ function ChartPaintFactory()
         ["ChartMinuteVolumBar",{ Create:function(option) { return new ChartMinuteVolumBar(); } }],   //分时成交量柱子
         ["ChartMinutePriceLine",{ Create:function(option) { return new ChartMinutePriceLine();} }],
         ["ChartMinuteBuySellBar", { Create:function(option){ return new ChartMinuteBuySellBar(); }}],
+        ["ChartMinuteBarCallAuction", { Create:function(option){ return new ChartMinuteBarCallAuction(); }}]
     ]); 
 
     this.Create=function(name, option)
@@ -30747,6 +30776,7 @@ function ChartKLine()
     this.IsThinAKBar=true;      //美国线 柱子是否是线段 (false=柱子)
     this.OneLimitBarType=0;     //一字板颜色类型 4个价格全部都在同一个价位上 0=使用平盘颜色 1=跟昨收比较
     this.UnchangeBarType=0;     //0=使用unchange color 1=和昨收比较
+    this.EnableColorBar=false;  //K线柱子是否支持自定义颜色
 
     this.HighLowBarColor=g_JSChartResource.HighLowBarColor;
     this.HighLowTextConfig=
@@ -31679,7 +31709,7 @@ function ChartKLine()
 
                 this.DrawKBar_Custom(data, dataWidth, barColor, drawType, kLineOption, x, y, left, right, yLow, yHigh, yOpen, yClose, border, isHScreen);
             }
-            else if (this.DrawType==9 && data.ColorData)
+            else if ((this.DrawType==9 || this.EnableColorBar) && data.ColorData)
             {
                 this.DrawColorKBar(data, data.ColorData, dataWidth, x, y, left, right, yLow, yHigh, yOpen, yClose, isHScreen);
             }
@@ -38687,6 +38717,8 @@ function ChartMinuteVolumBar()
         var isHScreen=(this.ChartFrame.IsHScreen===true);
         var yPrice=this.YClose;             //上一分钟的价格
         var yBottom=this.ChartFrame.GetYFromData(0);
+        var yBottom=border.BottomEx;
+        if (isHScreen) yBottom=border.LeftEx;
         var unit=this.GetVolUnit();
         if (callAutionData.Ver==1.0)
         {
@@ -38877,6 +38909,28 @@ function ChartMinuteVolumBar()
 
 }
 
+//只画集合竞价柱子
+function ChartMinuteBarCallAuction()
+{
+    this.newMethod=ChartMinuteVolumBar;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName="ChartMinuteBarCallAuction";
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+
+        this.DrawBeforeOpen();
+        this.DrawMultiDayBeforeOpen();
+
+        this.DrawAfterClose();
+        this.DrawMultiDayAfterClose();
+    }
+}
+
 function ChartErrorMessage()
 {
     this.newMethod=IChartPainting;   //派生
@@ -44232,6 +44286,8 @@ function ChartOverlayMinutePriceLine()
 }
 
 
+
+
 //分钟持仓线
 function ChartMinutePositionLine()
 {
@@ -58359,7 +58415,8 @@ function FrameSplitY()
 
     this.CallAcutionSplitY=function(count,splitData)
     {
-        if (this.Frame.Identify!=1) return null;
+        if (!this.IsCallAuctionFrame()) return;
+
         var aryCallAcution=this.GetCallAcutionSplitY(count,splitData);
         if (!aryCallAcution) return;
 
@@ -58387,9 +58444,18 @@ function FrameSplitY()
         }
     }
 
+    this.IsCallAuctionFrame=function()
+    {
+        if (this.Frame.Identify==1) return true;
+
+        if (!this.HQChart || !this.HQChart.IsCallAuctionFrame) return false;
+        
+        return this.HQChart.IsCallAuctionFrame(this.Frame.Identify);
+    }
+
     this.GetCallAcutionSplitY=function(count,splitData)
     {
-        if (this.Frame.Identify!=1) return null;
+        if (!this.IsCallAuctionFrame()) return null;
 
         var isBeforeData=(this.IsBeforeData==true && this.BeforeOpenData && (this.BeforeOpenData.Ver==2.0 || this.BeforeOpenData.Ver==3.0));
         var isAfterData=(this.IsAfterData==true && this.AfterCloseData && (this.AfterCloseData.Ver==2.0 || this.AfterCloseData.Ver==3.0));
@@ -58404,7 +58470,7 @@ function FrameSplitY()
             for(var i=0;i<count;++i)
             {
                 var item=new CoordinateInfo();
-                var yValue=intervalY*i;
+                var yValue=intervalY*i+splitData.Min;
                 item.Value=yValue;
                 item.LineType=8;
                 if (isBeforeData )
@@ -58454,7 +58520,7 @@ function FrameSplitY()
             for(var i=0;i<count;++i)
             {
                 var item=new CoordinateInfo();
-                var yValue=intervalY*i;
+                var yValue=intervalY*i+splitData.Min;
                 item.Value=yValue;
                 item.LineType=9;
                 var isVaild=false;
@@ -60466,6 +60532,28 @@ function ChartCorssCursor()
 
             this.CalculateComplexTextSize(complexText, textSize);
 
+            //计算右侧文本输出顶部位置
+            function _Temp_CalculateRightTextBGTop(rtBG, complexText, defaultTextHeight)
+            {
+                if (complexText.ShowType==1)
+                {
+                    var yValue=defaultTextHeight/2;
+                    if (IFrameSplitOperator.IsNonEmptyArray(textSize.Text) && textSize.Text[0])
+                    {
+                        var itemSize=textSize.Text[0];
+                        if (IFrameSplitOperator.IsNumber(itemSize.Height)) yValue=itemSize.Height/2;
+                    }  
+
+                    rtBG.Top=rtBG.YCenter-yValue;
+                    rtBG.Bottom=rtBG.Top+rtBG.Height;
+                }
+                else
+                {
+                    rtBG.Top=rtBG.YCenter-rtBG.Height/2;
+                    rtBG.Bottom=rtBG.Top+rtBG.Height;
+                }
+            }
+
             if (this.Frame.ChartBorder.Right>=30 && this.ShowTextMode.Right==1)
             {
                 var isOverlayIndex=false;       //是否有叠加子坐标
@@ -60496,17 +60584,8 @@ function ChartCorssCursor()
                 {
                     var rtBG={ Right:right+overlayIndexInterval, Width:textSize.Width, YCenter:y, Height:textSize.Height };
                     rtBG.Left=rtBG.Right-rtBG.Width;
-                    if (complexText.ShowType==1)
-                    {
-                        rtBG.Top=rtBG.YCenter-this.TextHeight/2;
-                        rtBG.Bottom=rtBG.Top+rtBG.Height;
-                    }
-                    else
-                    {
-                        rtBG.Top=rtBG.YCenter-rtBG.Height/2;
-                        rtBG.Bottom=rtBG.Top+rtBG.Height;
-                    }
-
+                    _Temp_CalculateRightTextBGTop(rtBG,complexText,this.TextHeight);
+                    
                     if (rtBG.Right>chartRight) 
                     {
                         rtBG.Right=chartRight;
@@ -60525,16 +60604,7 @@ function ChartCorssCursor()
                 {
                     var rtBG={ Left:right+1, Width:textSize.Width, YCenter:y, Height:textSize.Height };
                     rtBG.Right=rtBG.Left+rtBG.Width;
-                    if (complexText.ShowType==1)
-                    {
-                        rtBG.Top=rtBG.YCenter-this.TextHeight/2;
-                        rtBG.Bottom=rtBG.Top+rtBG.Height;
-                    }
-                    else
-                    {
-                        rtBG.Top=rtBG.YCenter-rtBG.Height/2;
-                        rtBG.Bottom=rtBG.Top+rtBG.Height;
-                    }
+                    _Temp_CalculateRightTextBGTop(rtBG,complexText,this.TextHeight);
                     
                     if (rtBG.Right>chartRight) 
                     {
@@ -60552,11 +60622,9 @@ function ChartCorssCursor()
             {
                 var rtBG={ Right:right, Width:textSize.Width, YCenter:y, Height:textSize.Height };
                 rtBG.Left=rtBG.Right-rtBG.Width;
-                rtBG.Top=rtBG.YCenter-rtBG.Height/2;
-                rtBG.Bottom=rtBG.Top+rtBG.Height;
-
+                _Temp_CalculateRightTextBGTop(rtBG,complexText,this.TextHeight);
+                
                 this.Canvas.fillStyle=this.TextBGColor;
-                var showLeft=right-textSize.Width;
                 this.DrawTextBGRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
                 this.DrawComplexRightText(rtBG,complexText,textSize);
 
@@ -61796,6 +61864,7 @@ function HQPriceStringFormat()
     this.RComplexText;      //{ Space:2 间距, Text:[ {Color:, Text: }] }  支持单行多颜色
     this.Point;
     this.ClientPos=-1;
+    this.HQChart;
 
     this.ExtendChartPaint;
     this.RExtendText=[];
@@ -61948,6 +62017,32 @@ function HQPriceStringFormat()
             if (this.DataFormatType==1) this.Text=IFrameSplitOperator.FormatValueThousandsString(this.Value,defaultfloatPrecision);
             else this.Text=IFrameSplitOperator.FormatValueString(this.Value,defaultfloatPrecision,this.LanguageID);
             if (IFrameSplitOperator.IsNumber(this.RValue)) this.RText=IFrameSplitOperator.FormatValueString(this.RValue,defaultfloatPrecision,this.LanguageID);
+
+            var bCallAuction=false;
+            if (this.HQChart && this.HQChart.IsCallAuctionFrame) 
+                bCallAuction=this.HQChart.IsCallAuctionFrame(this.FrameID);
+
+            if (bCallAuction)
+            {
+                if (this.ClientPos==2) 
+                {
+                    this.GetBeforeOpen();
+                }
+                else if (this.ClientPos==3)
+                {
+                    if (this.ShareAfterVol==0 || this.ShareAfterVol==2) 
+                        this.GetAfterClose();
+                }
+                else if (this.ClientPos>=200 && this.ClientPos<=299) 
+                {
+                    this.GetMultiDayBeforeOpen();
+                }
+                else if (this.ClientPos>=300 && this.ClientPos<=399 ) 
+                {
+                    if (this.ShareAfterVol==0 || this.ShareAfterVol==2)
+                        this.GetMultiDayAfterClose();
+                }
+            }
         }
 
         if (this.GetEventCallback)
@@ -65086,8 +65181,11 @@ function DynamicChartTitlePainting()
         if (this.IsMinuteFrame && this.PointInfo &&  ( this.PointInfo.ClientPos==2 || this.PointInfo.ClientPos==3 ||  (this.PointInfo.ClientPos>=200&& this.PointInfo.ClientPos<=299) || (this.PointInfo.ClientPos>=300&& this.PointInfo.ClientPos<=399) ))
         {
             var result={ PreventDefault:false }
-            this.DrawMainCallAuction({ Left:left, Right:right, Bottom:bottom }, rtText, result);
-            if (result.PreventDefault===false) this.DrawMainIndexTitle({ Left:left, Right:right, Bottom:bottom }, isShowLastData, rtText);
+            var yRight=right;
+            if (this.Frame.ToolbarCacheSize && this.Frame.ToolbarCacheSize.RToolbar) yRight=this.Frame.ToolbarCacheSize.RToolbar.Left-2;    //右侧按钮宽度要去掉
+            this.DrawMainCallAuction({ Left:left, Right:yRight, Bottom:bottom }, rtText, result);
+            if (result.PreventDefault===false) this.DrawMainIndexTitle({ Left:left, Right:yRight, Bottom:bottom }, isShowLastData, rtText);
+            if (IFrameSplitOperator.IsNumber(rtText.Bottom)) bottom=rtText.Bottom;
         }
         else
         {
@@ -83348,6 +83446,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.ChartCorssCursor.StringFormatY.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.StringFormatY.LanguageID=this.LanguageID;
         this.ChartCorssCursor.StringFormatY.ExtendChartPaint=this.ExtendChartPaint;
+        this.ChartCorssCursor.StringFormatY.HQChart=this;
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.OnChangeStatusCallback=(data, obj)=>{ this.OnChangeCorssCursorStatus(data,obj); }
 
@@ -93215,6 +93314,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ChartCorssCursor.StringFormatY.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.StringFormatY.LanguageID=this.LanguageID;
         this.ChartCorssCursor.StringFormatY.ShareAfterVol=this.ShareAfterVol;
+        this.ChartCorssCursor.StringFormatY.HQChart=this;
         this.ChartCorssCursor.CallAcutionXOperator=new CallAcutionXOperator();
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.OnChangeStatusCallback=(data, obj)=>{ this.OnChangeCorssCursorStatus(data,obj); }
@@ -93332,6 +93432,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 frame.YSplitOperator.LanguageID=this.LanguageID;
                 frame.YSplitOperator.FrameSplitData=this.FrameSplitData.get('double');
                 frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+                frame.YSplitOperator.HQChart=this;
                 if (i==1) frame.YSplitOperator.ShareAfterVol=this.ShareAfterVol;
             }
 
@@ -93407,6 +93508,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         frame.YSplitOperator.FrameSplitData=this.FrameSplitData.get('double');
         frame.YSplitOperator.Frame=frame;
         frame.YSplitOperator.ChartBorder=border;
+        frame.YSplitOperator.HQChart=this;
         frame.XSplitOperator=new FrameSplitMinuteX();
         frame.XSplitOperator.Frame=frame;
         frame.XSplitOperator.ChartBorder=border;
@@ -95803,6 +95905,20 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ChartPaint[2].MultiDayBeforeOpenData=multiBeforeOpenData;
         this.ChartPaint[2].MultiDayAfterCloseData=multiAfterCloseData;
 
+        for(var i=0;i<this.ChartPaintEx.length;++i)
+        {
+            var item=this.ChartPaintEx[i];
+            if (item.ClassName=="ChartMinuteBarCallAuction")
+            {
+                item.YClose=yClose;
+                item.Symbol=this.Symbol;
+                item.BeforeOpenData=this.BeforeOpenData;
+                item.AfterCloseData=this.AfterCloseData;
+                item.MultiDayBeforeOpenData=multiBeforeOpenData;
+                item.MultiDayAfterCloseData=multiAfterCloseData;
+            }
+        }
+
         for(var i in this.Frame.SubFrame)
         {
             var item=this.Frame.SubFrame[i];
@@ -95915,6 +96031,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             frame.YSplitOperator.FrameSplitData=this.FrameSplitData.get('double');
             frame.YSplitOperator.Frame=frame;
             frame.YSplitOperator.ChartBorder=frame.ChartBorder;
+            frame.YSplitOperator.HQChart=this;
             frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;
             frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
             frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;
@@ -96917,6 +97034,25 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return data;
     }
+
+    this.IsCallAuctionFrame=function(frameID)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaintEx)) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return false;
+        if (frameID<0 || frameID>=this.Frame.SubFrame.length) return false;
+        var subItem=this.Frame.SubFrame[frameID];
+        if (!subItem || !subItem.Frame) return false;
+
+        var subFrame=subItem.Frame;
+        for(var i=0;i<this.ChartPaintEx.length;++i)
+        {
+            var item=this.ChartPaintEx[i];
+            if (item.ChartFrame && item.ChartFrame.Guid==subFrame.Guid) 
+                return true;
+        }
+
+        return false;
+    }
 }
 
 //盘前数据
@@ -98740,6 +98876,7 @@ function KLineChartHScreenContainer(uielement)
         this.ChartCorssCursor.StringFormatY=g_DivTooltipDataForamt.Create("CorssCursor_YStringFormat");
         this.ChartCorssCursor.StringFormatY.LanguageID=this.LanguageID;
         this.ChartCorssCursor.StringFormatY.ExtendChartPaint=this.ExtendChartPaint;
+        this.ChartCorssCursor.StringFormatY.HQChart=this;
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
 
         //创建等待提示
@@ -98921,6 +99058,7 @@ function MinuteChartHScreenContainer(uielement)
         this.ChartCorssCursor.StringFormatX.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.StringFormatY=g_DivTooltipDataForamt.Create("CorssCursor_YStringFormat");
         this.ChartCorssCursor.StringFormatY.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+        this.ChartCorssCursor.StringFormatY.HQChart=this;
         this.ChartCorssCursor.CallAcutionXOperator=new CallAcutionXOperator();
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
 
@@ -98998,6 +99136,7 @@ function MinuteChartHScreenContainer(uielement)
                 frame.YSplitOperator.LanguageID=this.LanguageID;
                 frame.YSplitOperator.FrameSplitData=this.FrameSplitData.get('double');
                 frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+                frame.YSplitOperator.HQChart=this;
             }
 
             frame.YSplitOperator.Frame=frame;
@@ -147994,7 +148133,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14721";
+var HQCHART_VERSION="1.1.14733";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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