hqchart 1.1.12503 → 1.1.12513

package/src/jscommon/umychart.js

@@ -6290,6 +6290,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return false;
     }
 
+    this.IsMinuteContainer=function()
+    {
+        if (this.ClassName=="MinuteChartContainer" || this.ClassName=="MinuteChartHScreenContainer") return true;
+
+        return false;
+    }
+
     this.UpdatePointByCursorIndex=function(type)    //type 1=根据十字光标更新 2=强制取消十字光标
     {
         var pt={X:null, Y:null};
@@ -20865,9 +20872,12 @@ function IChartPainting()
             }
             else if (valueType==3)
             {
-                var price=this.Data.Data[i].Close;
-                if (price==null) continue;
-                value=price/this.YClose*this.MainYClose;
+                var minItem=this.Data.Data[i];
+                var mainItem=this.MainData.Data[i];
+                if (!minItem || !IFrameSplitOperator.IsNumber(minItem.Close) || !IFrameSplitOperator.IsNumber(minItem.YClose)) continue;
+                if (!mainItem || !IFrameSplitOperator.IsNumber(mainItem.Close) || !IFrameSplitOperator.IsNumber(mainItem.YClose)) continue;
+                var price=minItem.Close;
+                var value=price/minItem.YClose*mainItem.YClose;
             }
             else if (valueType==4)
             {
@@ -20987,9 +20997,12 @@ function IChartPainting()
             }
             else if (valueType==3)
             {
-                var price=this.Data.Data[i].Close;
-                if (price==null) continue;
-                var value=price/this.YClose*this.MainYClose;
+                var minItem=this.Data.Data[i];
+                var mainItem=this.MainData.Data[i];
+                if (!minItem || !IFrameSplitOperator.IsNumber(minItem.Close) || !IFrameSplitOperator.IsNumber(minItem.YClose)) continue;
+                if (!mainItem || !IFrameSplitOperator.IsNumber(mainItem.Close) || !IFrameSplitOperator.IsNumber(mainItem.YClose)) continue;
+                var price=minItem.Close;
+                var value=price/minItem.YClose*mainItem.YClose;
             }
             else
             {
@@ -31639,19 +31652,16 @@ function ChartOverlayMinutePriceLine()
 
     this.Color="rgb(65,105,225)";
     this.MainData;                  //主图数据
-    this.MainYClose;                //主图股票的前收盘价
     this.SourceData;                //原始数据
 
     this.ClassName="ChartOverlayMinutePriceLine";
     this.Title;
     this.Symbol;                    //叠加的股票代码
-    this.YClose;                    //叠加的股票前收盘
     this.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
 
     this.OverlayType=0; //叠加方式 0=百分比叠加  1=绝对叠加
     this.IsCalcuateMaxMin=true; //是否参与计算Y轴的最大最小值
 
-
     this.SetOption=function(option)
     {
         if (option)
@@ -31663,19 +31673,21 @@ function ChartOverlayMinutePriceLine()
 
     this.PtInChart=function(x,y)
     {
-        var option={ MinuteOverlayPrice:true, YClose:this.YClose, MainYClose:this.MainYClose, OverlayType:this.OverlayType };
+        var option={ MinuteOverlayPrice:true, OverlayType:this.OverlayType };
         return this.PtInLine(x, y, option);
     }
 
     this.DrawSelectedStatus=function()
     {
-        var option={ MinuteOverlayPrice:true, YClose:this.YClose, MainYClose:this.MainYClose, OverlayType:this.OverlayType };
+        var option={ MinuteOverlayPrice:true, OverlayType:this.OverlayType };
         this.DrawLinePoint(option);
     }
 
     this.Draw=function()
     {
         if (!this.Data) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+
         if (this.NotSupportMessage)
         {
             this.DrawNotSupportmessage();
@@ -31696,37 +31708,53 @@ function ChartOverlayMinutePriceLine()
         var bFirstPoint=true;
         var drawCount=0;
         var xOffset=0, showValue=0;
+        var yClose=null, mainYClose=null;
+        var pointCount=0;
         for(var i=this.Data.DataOffset+xOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
         {
-            var value=this.Data.Data[i].Close;
-            if (value==null) continue;
+            var item=this.Data.Data[i];
+            if (item && IFrameSplitOperator.IsNumber(item.Close)) 
+            {
+                if (bFirstPoint)    //百分比使用每天的昨收计算
+                {
+                    yClose=item.YClose;
+                    var minItem=this.MainData.Data[i];
+                    mainYClose=minItem.YClose;
+                }
 
-            showValue=value;           //绝对叠加
-            if (this.OverlayType==0) showValue=value/this.YClose*this.MainYClose;   //百分比
+                var value=item.Close;
+                showValue=value;           //绝对叠加
 
-            var x=this.ChartFrame.GetXFromIndex(j);
-            var y=this.ChartFrame.GetYFromData(showValue, false);
+                if (this.OverlayType==0) 
+                    showValue=value/yClose*mainYClose;   //百分比
 
-            if (bFirstPoint)
-            {
-                this.Canvas.strokeStyle=this.Color;
-                this.Canvas.beginPath();
-                if (isHScreen) this.Canvas.moveTo(y,x);
-                else this.Canvas.moveTo(x,y);
-                bFirstPoint=false;
-            }
-            else
-            {
-                if (isHScreen) this.Canvas.lineTo(y,x);
-                else this.Canvas.lineTo(x,y);
+                var x=this.ChartFrame.GetXFromIndex(j);
+                var y=this.ChartFrame.GetYFromData(showValue, false);
+
+                if (bFirstPoint)
+                {
+                    this.Canvas.strokeStyle=this.Color;
+                    this.Canvas.beginPath();
+                    if (isHScreen) this.Canvas.moveTo(y,x);
+                    else this.Canvas.moveTo(x,y);
+                    bFirstPoint=false;
+                }
+                else
+                {
+                    if (isHScreen) this.Canvas.lineTo(y,x);
+                    else this.Canvas.lineTo(x,y);
+                }
+
+                ++drawCount;
             }
 
-            ++drawCount;
+            ++pointCount;
 
-            if (drawCount>=minuteCount) //上一天的数据和这天地数据线段要断开
+            if (pointCount>=minuteCount) //上一天的数据和这天地数据线段要断开
             {
                 bFirstPoint=true;
-                this.Canvas.stroke();
+                pointCount=0;
+                if (drawCount>0) this.Canvas.stroke();
                 drawCount=0;
             }
         }
@@ -31739,24 +31767,46 @@ function ChartOverlayMinutePriceLine()
     this.GetMaxMin=function()
     {
         var xPointCount=this.ChartFrame.XPointCount;
-        var range={};
+        var range={ Min:null, Max:null };
         if (!this.IsCalcuateMaxMin) return range;
-        if (this.YClose==null) return range;
 
-        range.Min=this.MainYClose;
-        range.Max=this.MainYClose;
+        var minuteCount=this.ChartFrame.MinuteCount;
+        var yClose=null, mainYClose=null;
+        var bFirstPoint=true;
+        var pointCount=0;
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
         {
-            var value=this.Data.Data[i].Close;
-            if (value==null) continue;
+            var item=this.Data.Data[i];
+            if (!item || !IFrameSplitOperator.IsNumber(item.Close)) 
+            {
+                ++pointCount;
+                continue;
+            }
 
-            if (this.OverlayType==0) value=value/this.YClose*this.MainYClose;
+            if (bFirstPoint)
+            {
+                yClose=item.YClose;
+                var minItem=this.MainData.Data[i];
+                mainYClose=minItem.YClose;
+                bFirstPoint=false;
+            }
+
+            var value=item.Close;
+            if (this.OverlayType==0) value=value/yClose*mainYClose;
 
             if (range.Max==null) range.Max=value;
             if (range.Min==null) range.Min=value;
 
             if (range.Max<value) range.Max=value;
             if (range.Min>value) range.Min=value;
+
+            ++pointCount;
+
+            if (pointCount>=minuteCount)
+            {
+                bFirstPoint=true;
+                pointCount=0;
+            }
         }
 
         //JSConsole.Chart.Log(`[ChartOverlayMinutePriceLine::GetMaxMin] max=${range.Max} min=${range.Min}`);
@@ -47135,7 +47185,16 @@ function HistoryDataStringFormat()
 
         this.Width=157;
         if (this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID) this.Width=180;
+        var titleData=this.GetFormatTitle(data);
+        if (!titleData) return false;
+        var outData=this.GenerateTitleHtml(titleData);
+        if (!outData) return false;
+
+        this.Text=outData.Html;
+        this.Height=outData.LineCount*this.LineHeight;
+        return true;
 
+        /*
         var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
         var strDate=IFrameSplitOperator.FormatDateString(data.Date);
         var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
@@ -47225,6 +47284,178 @@ function HistoryDataStringFormat()
 
         this.Height=this.LineCount*this.LineHeight;
         return true;
+        */
+    }
+
+    this.GenerateTitleHtml=function(data)
+    {
+        var lineCount=0;
+        var strHtml="", text;
+        if (data.Name)
+        {
+            text=`<span style='color:rgb(0,0,0);font:微软雅黑;font-size:12px;text-align:center;display: block;'>${data.Name}</span>`;
+            strHtml+=text;
+            ++lineCount;
+        }
+
+        if (data.Title)
+        {
+            text=`<span class='tooltip-title'>${data.Title}</span>`;
+            strHtml+=text;
+            ++lineCount;
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(data.AryText))
+        {
+            for(var i=0;i<data.AryText.length;++i)
+            {
+                var item=data.AryText[i];
+                if (i>0) strHtml+='<br/>';
+                var text=`<span class='tooltip-con'>${item.Title}</span><span class='tooltip-num' style='color:${item.Color};'>${item.Text}</span>`;
+                strHtml+=text;
+                ++lineCount;
+            }
+        }
+
+        return { Html:strHtml, LineCount:lineCount };
+    }
+
+    this.GetFormatTitle=function(data)
+    {
+        if (!data) return null;
+
+        var upperSymbol=this.Symbol.toUpperCase();
+        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
+        var date=new Date(parseInt(data.Date/10000),(data.Date/100%100-1),data.Date%100);
+        var strDate=IFrameSplitOperator.FormatDateString(data.Date);
+
+        var title2=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],this.LanguageID);
+        var isTickPeriod=ChartData.IsTickPeriod(this.Value.ChartPaint.Data.Period);
+        if (ChartData.IsMinutePeriod(this.Value.ChartPaint.Data.Period,true)) // 分钟周期
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time);
+        }
+        else if (ChartData.IsSecondPeriod(this.Value.ChartPaint.Data.Period) || isTickPeriod)
+        {
+            title2=IFrameSplitOperator.FormatTimeString(data.Time,'HH:MM:SS');
+        }
+
+        var result={ AryText:null, Title:`${strDate}&nbsp&nbsp${title2}`, Name:null };
+        if (isTickPeriod)
+        {
+            var aryText=
+            [
+                { 
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Price',this.LanguageID), 
+                    Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetColor(data.Open,data.YClose)
+                },
+            ];
+
+            if (IFrameSplitOperator.IsNumber(data.YClose)) 
+            {
+                var increase=(data.Close-data.YClose)/data.YClose*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),
+                    Text:`${increase.toFixed(2)}%`,
+                    Color:this.GetColor(increase,0)
+                }
+                aryText.push(item);
+            }
+
+            result.AryText=aryText;
+        }
+        else if (data.IsNonTrade)
+        {
+
+        }
+        else
+        {
+            var vol=data.Vol;
+            if (upperSymbol && MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol)) vol/=100; //A股统一转成手
+            var eventUnchangeKLine=null;    //定制平盘K线颜色事件
+            if (this.GetEventCallback) eventUnchangeKLine=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_UNCHANGE_KLINE_TITLE_COLOR);
+
+            var aryText=
+            [
+                { 
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Open',this.LanguageID), 
+                    Text:IFrameSplitOperator.IsNumber(data.Open)? data.Open.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor("DivTooltip-Open",data.Open,data.YClose,data,eventUnchangeKLine),
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-High',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.High)? data.High.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor("DivTooltip-High",data.High,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Low',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Low)? data.Low.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor('DivTooltip-Low',data.Low,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Close',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Close)? data.Close.toFixed(defaultfloatPrecision):'--',
+                    Color:this.GetPriceColor('DivTooltip-Close',data.Close,data.YClose,data,eventUnchangeKLine)
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Vol',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(vol)? IFrameSplitOperator.FormatValueString(vol,2,this.LanguageID):'--',
+                    Color:this.VolColor
+                },
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Amount',this.LanguageID),
+                    Text:IFrameSplitOperator.IsNumber(data.Amount)? IFrameSplitOperator.FormatValueString(data.Amount,2,this.LanguageID):'--',
+                    Color:this.AmountColor
+                }
+            ];
+
+            if (IFrameSplitOperator.IsNumber(data.YClose)) 
+            {
+                var increase=(data.Close-data.YClose)/data.YClose*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Increase',this.LanguageID),
+                    Text:`${increase.toFixed(2)}%`,
+                    Color:this.GetColor(increase,0)
+                }
+                aryText.push(item);
+            }
+
+            if(MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol) && data.FlowCapital>0)  //换手率
+            {
+                var value=data.Vol/data.FlowCapital*100;
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Exchange',this.LanguageID),
+                    Text:`${value.toFixed(2)}%`,
+                    Color:this.TurnoverRateColor
+                }
+                aryText.push(item);
+            }
+
+            if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol) && IFrameSplitOperator.IsNumber(data.Position))
+            {
+                var item=
+                {
+                    Title:g_JSChartLocalization.GetText('DivTooltip-Position',this.LanguageID),
+                    Text:`${data.Position}`,
+                    Color:this.PositionColor
+                }
+            }
+
+            //叠加股票
+            if (this.Value.ChartPaint.Name=="Overlay-KLine")
+            {
+                result.Name=this.Value.ChartPaint.Title;
+            }
+
+            result.AryText=aryText;
+        }
+
+
+        return result;
     }
 
     this.GetColor=function(price,yclse)
@@ -72703,7 +72934,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     //叠加股票
     this.OverlaySymbol=function(symbol,option)
     {
-        for(var i in this.OverlayChartPaint)
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
             var item=this.OverlayChartPaint[i];
             if (item.Symbol==symbol)
@@ -72723,11 +72954,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (option && option.Color) paint.Color=option.Color; //外部设置颜色
         else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
         ++g_JSChartResource.OverlaySymbol.Random;
-        if (this.ChartPaint[0].YClose>0 && this.ChartPaint[0].Data) //绑定主图数据
-        {
-            paint.MainData=this.ChartPaint[0].Data; 
-            paint.MainYClose=this.ChartPaint[0].YClose;        
-        }
+        paint.MainData=this.SourceData; //绑定主图数据
 
         if (paint.SetOption) paint.SetOption(option);
 
@@ -73695,7 +73922,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
             let item=this.OverlayChartPaint[i];
-            if (!item.MainData || !(item.MainYClose>0) ) continue;
+            if (!item.MainData) continue;
             if (item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID) continue;
             var symbol=item.Symbol;
             if (!symbol) continue;
@@ -73756,7 +73983,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             for(var j=0; j<this.OverlayChartPaint.length; ++j)
             {
                 var item=this.OverlayChartPaint[j];
-                if (!item.MainData || !(item.MainYClose>0) ) continue;
+                if (!item.MainData) continue;
                 if (overlayData.symbol==item.Symbol)
                 {
                     this.RecvOverlayMinuteData(overlayData, item, { Redraw:false });
@@ -73917,6 +74144,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 var empytData=new ChartData();
                 empytData.Date=item.Date;
+                empytData.Data.length=item.Data.length;
                 overlayDayData.push(empytData);
             }
         }
@@ -74150,11 +74378,10 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.ExtendChartPaint[0].Name=this.Name;
         }
 
-        for(var i in this.OverlayChartPaint)
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
             var item=this.OverlayChartPaint[i];
-            item.MainData=this.ChartPaint[0].Data;         //叠加股票
-            item.MainYClose=yClose;
+            item.MainData=minuteData;           //绑定主图数据
         }
     }
 

package/src/jscommon/umychart.stock.js

@@ -17,8 +17,8 @@
 
 function JSStockResource() 
 {
-  this.Domain = "https://opensource.zealink.com";               //API域名
-  this.CacheDomain = "https://opensourcecache.zealink.com";     //缓存域名
+    this.Domain = "http://127.0.0.1:8886";               //API域名
+    this.CacheDomain = "http://127.0.0.1:8886";          //缓存域名
 }
 
 var g_JSStockResource = new JSStockResource();