hqchart 1.1.13057 → 1.1.13062

package/src/jscommon/umychart.js

@@ -2799,7 +2799,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     { 
         IsValueFullRange:false , 
         IsDisplayLatest:false, 
-        SelectedBorder:{ Mode:0, SelFrame:0 }      //边框选中模式  Mode:0=禁用 1=右侧标记选中 2=指标窗口标记选中
+        SelectedBorder:{ Mode:0, SelFrame:0 },                      //边框选中模式  Mode:0=禁用 1=右侧标记选中 2=指标窗口标记选中
+        SelectedXBorder: { Mode:0, Date:null }          //X边框选中模式 Mode:0=禁用 分时图图有效
          //XDateFormat (多日分时图x轴底部日期格式)
     };  
 
@@ -3252,6 +3253,20 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
 
+        if (this.GlobalOption.SelectedXBorder && this.GlobalOption.SelectedXBorder.Mode>=1)
+        {
+            if (this.PtInMulitDayMinute)
+            {
+                var item=this.GlobalOption.SelectedXBorder;
+                var selectedDate=this.PtInMulitDayMinute(x,y);
+                if (item.Date!=selectedDate)
+                {
+                    item.Date=selectedDate
+                    bDrawDynamicInfo=true;
+                }
+            }
+        }
+
         if (this.TryClickCrossCursor(x,y, e))
         {
             return;
@@ -5056,6 +5071,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DrawSelectedStatus();
 
         this.DrawSelectedBorder();
+        if (this.DrawSelectedXBorder) this.DrawSelectedXBorder();
 
         var moveonPoint=null;
         if (this.LastMouseStatus && this.LastMouseStatus.MoveOnPoint) moveonPoint=this.LastMouseStatus.MoveOnPoint;
@@ -5482,6 +5498,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.DrawSelectedStatus();
         this.DrawSelectedBorder();
+        if (this.DrawSelectedXBorder) this.DrawSelectedXBorder();
 
         var moveonPoint=null;
         if (this.LastMouseStatus && this.LastMouseStatus.MoveOnPoint) moveonPoint=this.LastMouseStatus.MoveOnPoint;
@@ -50988,6 +51005,13 @@ function DynamicChartTitlePainting()
     this.MerginLeft=g_JSChartResource.IndexTitleMerginLeft;          //标题输出左边间距
 
     this.Buttons=[];  //按钮
+
+    this.UpDownArrowConfig=
+    {
+        UpColor:g_JSChartResource.IndexTitle.UpDownArrow.UpColor,
+        DownColor:g_JSChartResource.IndexTitle.UpDownArrow.DownColor,
+        UnchangeColor:g_JSChartResource.IndexTitle.UpDownArrow.UnchangeColor
+    };
     
 
     //动态标题
@@ -51528,27 +51552,68 @@ function DynamicChartTitlePainting()
                     else text=titleItem.Text;
 
                     var space=this.ParamSpace*GetDevicePixelRatio();
-                    var textWidth=this.Canvas.measureText(text).width+space; 
-                    if ((left+textWidth)>right) break;
+                    var indexTextWidth=this.Canvas.measureText(text).width;  //标题+数值长度
+                    var textWidth=indexTextWidth;
+
+                    if (IFrameSplitOperator.IsNonEmptyArray(titleItem.TextEx))
+                    {
+                        var xLeft=left;
+                        for(var n=0; n<titleItem.TextEx.length; ++n)
+                        {
+                            var outItem=titleItem.TextEx[n];
+                            var outTextWidth=this.Canvas.measureText(outItem.Text).width+2;
+                            outItem.Width=outTextWidth;
+                            outItem.Left=xLeft;
+
+                            textWidth+=outTextWidth;
+                            xLeft+=outTextWidth;
+                        }
+                    }
+
+                    if ((left+textWidth+space)>right) break;
                     
                     if (titleItem.BG)   //背景
                     {
                         var textHeight=this.Canvas.measureText("擎").width+2;
-                        var textWidth=this.Canvas.measureText(text).width+2;
                         var rtBG={ Left:left, Top:bottom-textHeight/2, Width:textWidth, Height:textHeight };
                         this.Canvas.fillStyle=titleItem.BG;
                         this.Canvas.fillRect(rtBG.Left,rtBG.Top-1, rtBG.Width, rtBG.Height);
 
                         this.Canvas.fillStyle=titleItem.Color;
-                        this.Canvas.fillText(text,rtBG.Left+1,bottom,textWidth);
+                        this.Canvas.fillText(text,rtBG.Left+1,bottom,indexTextWidth);
+                        left+=indexTextWidth;
+
+                        if (IFrameSplitOperator.IsNonEmptyArray(titleItem.TextEx))
+                        {
+                            for(var n=0; n<titleItem.TextEx.length; ++n)
+                            {
+                                var outItem=titleItem.TextEx[n];
+                                this.Canvas.fillStyle=outItem.TextColor;
+                                this.Canvas.fillText(outItem.Text,left,bottom,outItem.Width);
+                                left+=outItem.Width;
+                            }
+                        }
 
-                        left+=(textWidth+space);
+                        left+=space;
                     }
                     else
                     {
                         this.Canvas.fillStyle=titleItem.Color;
-                        this.Canvas.fillText(text,left,bottom,textWidth);
-                        left+=textWidth;
+                        this.Canvas.fillText(text,left,bottom,indexTextWidth);
+                        left+=indexTextWidth;
+
+                        if (IFrameSplitOperator.IsNonEmptyArray(titleItem.TextEx))
+                        {
+                            for(var n=0; n<titleItem.TextEx.length; ++n)
+                            {
+                                var outItem=titleItem.TextEx[n];
+                                this.Canvas.fillStyle=outItem.TextColor;
+                                this.Canvas.fillText(outItem.Text,left,bottom,outItem.Width);
+                                left+=outItem.Width;
+                            }
+                        }
+
+                        left+=space;
                     }
                 }
             }
@@ -51731,7 +51796,7 @@ function DynamicChartTitlePainting()
                     }
                 }
 
-                var arrow=null;
+                var arrowSuper=null;    //独立颜色
                 
                 if (this.IsShowUpDownArrow)
                 {
@@ -51739,9 +51804,9 @@ function DynamicChartTitlePainting()
                     if (dataIndex-1>=0) preValue=item.Data.Data[dataIndex-1];
                     if (IFrameSplitOperator.IsNumber(preValue))
                     {
-                        if (preValue>value) arrow='↓';
-                        else if (preValue<value) arrow='↑';
-                        else arrow='→';
+                        if (preValue>value) arrowSuper={ Text:'↓', TextColor:this.UpDownArrowConfig.DownColor };
+                        else if (preValue<value) arrowSuper={ Text:'↑', TextColor:this.UpDownArrowConfig.UpColor};
+                        else arrowSuper={ Text:'→', TextColor:this.UpDownArrowConfig.UnchangeColor };
                     }
                 }
             
@@ -51752,7 +51817,21 @@ function DynamicChartTitlePainting()
                     if (dyValue) valueText=dyValue;
                 }
 
-                if (arrow) valueText+=arrow;
+                if (arrowSuper)
+                {
+                    var outItem={ Name:null, Text:valueText, Color:item.Color, TextEx:[arrowSuper] };
+                    if (item.Name) 
+                    {
+                        var text=item.Name;
+                        var dyTitle=this.GetDynamicOutName(item.Name);  //动态标题
+                        if (dyTitle) text=dyTitle;
+                        outItem.Name=text;
+                    }
+                    //outItem.BG='rgb(100,100,100)';
+
+                    aryText=[outItem];
+                    valueText=null;
+                }
             }
         }
 
@@ -62591,6 +62670,16 @@ function JSChartResource()
     this.OverlayIndexTitleBGColor='rgba(255,255,255,0.7)';
     this.IndexTitleMerginLeft=1;        //指标输出左边间距
 
+    this.IndexTitle=
+    {
+        UpDownArrow:    //数值涨跌箭头
+        {
+            UpColor:"rgb(238,21,21)",   //上涨
+            DownColor:"rgb(25,158,0)",  //下跌
+            UnchangeColor:"rgb(0,0,0)"  //不变
+        }
+    }
+
     this.Title={
         TradeIndexColor:'rgb(105,105,105)', //交易指标颜色
         ColorIndexColor:'rgb(112,128,144)',  //五彩K线颜色
@@ -63699,6 +63788,18 @@ function JSChartResource()
         if (style.SelFrameBorderColor) this.SelFrameBorderColor=style.SelFrameBorderColor;
         if (IFrameSplitOperator.IsNumber(style.IndexTitleMerginLeft)) this.IndexTitleMerginLeft = style.IndexTitleMerginLeft;
 
+        if (style.IndexTitle)
+        {
+            var item=style.IndexTitle;
+            if (item.UpDownArrow)
+            {
+                var subItem=item.UpDownArrow;
+                if (subItem.UpColor) this.IndexTitle.UpDownArrow.UpColor = subItem.UpColor;
+                if (subItem.DownColor) this.IndexTitle.UpDownArrow.DownColor = subItem.DownColor;
+                if (subItem.UnchangeColor) this.IndexTitle.UpDownArrow.UnchangeColor = subItem.UnchangeColor;
+            }
+        }
+
         if (style.Frame)
         {
             if (style.Frame.XBottomOffset) this.Frame.XBottomOffset=style.Frame.XBottomOffset;
@@ -72463,7 +72564,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.DataStatus={ MultiDay:false, LatestDay:false };      //MultiDay=多日  LatestDay:当天
 
     this.ZoomStepPixel=50;
-   
 
     //集合竞价设置 obj={ Left:true/false, Right:true/false, MultiDay:{Left:, Right:} }
     this.SetCallCationDataBorder=function(obj)
@@ -77451,6 +77551,105 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return false;
     }
+
+    this.ClearSelectedXBorder=function()
+    {
+        if (!this.GlobalOption || !this.GlobalOption.SelectedXBorder) return;
+        var item=this.GlobalOption.SelectedXBorder;
+        item.Date=null;
+    }
+
+    this.DrawSelectedXBorder=function()
+    {
+        if (this.DayCount<=1) return null;
+        if (this.Frame.IsHScreen===true) return null;
+
+        if (!this.GlobalOption || !this.GlobalOption.SelectedXBorder) return;
+        var item=this.GlobalOption.SelectedXBorder;
+        if (!IFrameSplitOperator.IsPlusNumber(item.Mode)) return;
+        if (!IFrameSplitOperator.IsPlusNumber(item.Date)) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.DayData)) return;
+
+        var rtSelected=null;
+        var dayIndex=item.DayIndex;
+        var border=this.Frame.ChartBorder.GetBorder();
+        var rtClient={ Left:border.Left, Top:border.Top, Right:border.Right, Bottom: border.Bottom };
+        rtClient.Width=rtClient.Right-rtClient.Left;
+        var mainFrame=this.Frame.SubFrame[0].Frame; //主图框架
+        var xPointCount=mainFrame.XPointCount;
+        var minuteCount=mainFrame.MinuteCount;
+        var lDayCount=xPointCount/minuteCount;
+        var dayWidth=rtClient.Width/lDayCount;
+
+        if (border.DayBorder)
+        {
+
+        }
+        else
+        {
+            var dayIndex=-1;
+            for(var i=0;i<this.DayData.length;++i)
+            {
+                var dayItem=this.DayData[i];
+                if (dayItem.Date==item.Date)
+                {
+                    dayIndex=this.DayData.length-1-i;
+                    break;
+                }
+            }
+
+            if (dayIndex<0) return;
+
+            rtSelected={ Left:border.Left+dayIndex*dayWidth, Width:dayWidth, Top:border.Bottom, Bottom:border.ChartHeight };
+            rtSelected.Right=rtSelected.Left+rtSelected.Width;
+            rtSelected.Height=rtSelected.Bottom-rtSelected.Top;
+        }
+
+
+        mainFrame.Canvas.strokeStyle=g_JSChartResource.SelFrameBorderColor;
+        mainFrame.Canvas.strokeRect(ToFixedPoint(rtSelected.Left),ToFixedPoint(rtSelected.Top),ToFixedRect(rtSelected.Width),ToFixedRect(rtSelected.Height)-1);
+    }
+
+    this.PtInMulitDayMinute=function(x,y)
+    {
+        if (this.DayCount<=1) return null;
+        if (this.Frame.IsHScreen===true) return null;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.DayData)) return null;
+
+        var border=this.Frame.ChartBorder.GetBorder();
+        var rtClient={ Left:border.Left, Top:border.Top, Right:border.Right, Bottom: border.Bottom };
+        rtClient.Width=rtClient.Right-rtClient.Left;
+        if (!(x>rtClient.Left && x<rtClient.Right && y>rtClient.Top && y<rtClient.Bottom)) return null; //不在窗口里面
+
+        if (border.DayBorder)
+        {
+
+        }
+        else
+        {
+            var mainFrame=this.Frame.SubFrame[0].Frame; //主图框架
+            var xPointCount=mainFrame.XPointCount;
+            var minuteCount=mainFrame.MinuteCount;
+            var lDayCount=xPointCount/minuteCount;
+            var dayWidth=rtClient.Width/lDayCount;
+            var rtDay={ Left:rtClient.Left, Right:dayWidth+rtClient.Left };
+            for(var i=0;i<lDayCount;++i)
+            {
+                if (x>=rtDay.Left && x<=rtDay.Right)
+                {
+                    var dayItem=this.DayData[this.DayData.length-1-i];
+                    if (!dayItem) return null;
+
+                    return dayItem.Date;
+                }
+
+                rtDay.Left+=dayWidth;
+                rtDay.Right+=dayWidth;
+            }
+        }
+
+        return null;
+    }
 }
 
 //盘前数据

package/src/jscommon/umychart.style.js

@@ -97,6 +97,16 @@ function GetBlackStyle()
         DownTextColor: "rgb(25,158,0)",
         UnchagneTextColor: "rgb(190, 190 ,190)",
         CloseLineColor: 'rgb(250,250,250)',
+
+        IndexTitle:
+        {
+            UpDownArrow:    //数值涨跌箭头
+            {
+                UpColor:"rgb(238,21,21)",   //上涨
+                DownColor:"rgb(25,158,0)",  //下跌
+                UnchangeColor:"rgb(190, 190 ,190)"  //不变
+            }
+        },
     
         Title:
         {

package/src/jscommon/umychart.testdata.js

@@ -51,6 +51,10 @@ HQData.NetworkFilter=function(data, callback)
             HQData.AnnouncementInfo_RequestData(data,callback);
             break;
 
+        case "JSSymbolData::GetLatestData":
+            HQData.RequestLatestData(data,callback);
+            break;
+
        
 
 
@@ -282,3 +286,36 @@ HQData.TradeDetail_RequestData=function(data,callback)
 
     callback(TEST_TRADE_DETAL_DATA);
 }
+
+HQData.RequestLatestData=function(data,callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol[0];
+    var id=data.Args[0];
+    var value=1;
+    switch(id)
+    {
+        case 3:
+            value=KLINE_1DAY_DATA.stock[0].yclose;
+            break;
+        case 4:
+            value=KLINE_1DAY_DATA.stock[0].open;
+            break;
+        case 5:
+            value=KLINE_1DAY_DATA.stock[0].high;
+            break;
+        case 6:
+            value=KLINE_1DAY_DATA.stock[0].low;
+            break;
+        case 7:
+            value=KLINE_1DAY_DATA.stock[0].price;
+            break;
+        case 8:
+            value=KLINE_1DAY_DATA.stock[0].vol;
+            break;
+    }
+
+    var hqchartData={ symbol:symbol, ver:2.0, data:[ {id:id, value:value }]};
+
+    callback(hqchartData);
+}