hqchart 1.1.12734 → 1.1.12748

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

@@ -4483,6 +4483,11 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         {
             var item=option.GlobalOption;
             if (IFrameSplitOperator.IsBool(item.IsValueFullRange)) chart.GlobalOption.IsValueFullRange=item.IsValueFullRange;
+            if (item.SelectedBorder)
+            {
+                var subItem=item.SelectedBorder;
+                if (IFrameSplitOperator.IsNumber(subItem.Mode)) chart.GlobalOption.SelectedBorder.Mode=subItem.Mode;
+            }
         }
 
         if (option.EnableYDrag)
@@ -7031,7 +7036,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.IndexChartDrag;    //拖拽指标图形
     this.EnableIndexChartDrag=false;
 
-    this.GlobalOption={ IsValueFullRange:false , IsDisplayLatest:false };   //XDateFormat (多日分时图x轴底部日期格式)
+    this.GlobalOption=
+    { 
+        IsValueFullRange:false , 
+        IsDisplayLatest:false, 
+        SelectedBorder:{ Mode:0, SelFrame:0 }      //边框选中模式  Mode:0=禁用 1=右侧标记选中 2=指标窗口标记选中
+         //XDateFormat (多日分时图x轴底部日期格式)
+    };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
     this.EnableVerticalDrag=false;
@@ -7459,6 +7470,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             return;
         }
 
+        var bDrawDynamicInfo=false;
+        if (this.GlobalOption.SelectedBorder && this.GlobalOption.SelectedBorder.Mode>=1)
+        {
+            var item=this.GlobalOption.SelectedBorder;
+            var frameId=this.Frame.PtInFrame(x,y);
+            if (frameId>=0 && frameId!=item.SelFrame) 
+            {
+                item.SelFrame=frameId;
+                bDrawDynamicInfo=true;
+            }
+        }
+
         if (this.TryClickCrossCursor(x,y, e))
         {
             return;
@@ -7728,12 +7751,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     else  
                         this.DrawDynamicInfo();
                 }
+                else if (bDrawDynamicInfo)
+                {
+                    this.DrawDynamicInfo();
+                }
                     
             }
         }
 
         document.onmousemove=(e)=>{ this.DocOnMouseMove(e); }
         document.onmouseup=(e)=> { this.DocOnMouseUp(e); }
+
+
     }
 
     this.DocOnMouseMove=function(e)
@@ -9250,6 +9279,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.Frame.DrawToolbar) this.Frame.DrawToolbar(this.LastMouseStatus);
         this.DrawSelectedStatus();
 
+        this.DrawSelectedBorder();
+
         var moveonPoint=null;
         if (this.LastMouseStatus && this.LastMouseStatus.MoveOnPoint) moveonPoint=this.LastMouseStatus.MoveOnPoint;
         for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形
@@ -9465,6 +9496,19 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    this.DrawSelectedBorder=function()
+    {
+        if (!this.GlobalOption.SelectedBorder) return;
+        var item=this.GlobalOption.SelectedBorder;
+        if (!IFrameSplitOperator.IsPlusNumber(item.Mode)) return;
+        if (!IFrameSplitOperator.IsNumber(item.SelFrame) && item.SelFrame<0) return;
+
+        var subFrame=this.Frame.SubFrame[item.SelFrame];
+        if (!subFrame) return;
+
+        if (subFrame.Frame.DrawSelectedBorder) subFrame.Frame.DrawSelectedBorder(item);
+    }
+
     //当前屏K线涨幅Y轴刻度
     this.KLineIncreaseCustomHorizontal=function()
     {
@@ -9619,6 +9663,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.Frame.DrawToolbar) this.Frame.DrawToolbar(this.LastMouseStatus);
 
         this.DrawSelectedStatus();
+        this.DrawSelectedBorder();
 
         var moveonPoint=null;
         if (this.LastMouseStatus && this.LastMouseStatus.MoveOnPoint) moveonPoint=this.LastMouseStatus.MoveOnPoint;
@@ -12581,14 +12626,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     
             overlayFrame.Frame=frame;
 
-            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_OVERLAY_FRAME);
-            if (event && event.Callback)
-            {
-                var sendData={ OverlayFrame:overlayFrame, WindowIndex:dest.WindowIndex, SubFrame:subFrame };
-                event.Callback(event, sendData, this);
-            }
-
-
             var scriptIndex;
             if (findItem) 
             {
@@ -12602,6 +12639,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
             
             overlayFrame.Script=scriptIndex;
+
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_OVERLAY_FRAME);
+            if (event && event.Callback)
+            {
+                var sendData={ OverlayFrame:overlayFrame, WindowIndex:dest.WindowIndex, SubFrame:subFrame };
+                event.Callback(event, sendData, this);
+            }
+
             subFrame.OverlayIndex.push(overlayFrame);
     
             var updateWindowIndex=dest.WindowIndex;
@@ -13880,7 +13925,11 @@ function AverageWidthFrame()
     //Y轴刻度长线
     this.YLineExtend;    //[0]=左 [1]=右     { Width:5, Color:颜色,  }
     this.YTextExtend;    //[0]=左 [1]=右     { Align:0=默认  1=左对齐 2=右对齐 }
-    this.YRightTextInfo;
+    this.YRightTextInfo; 
+
+    //X轴延长线
+    this.XTextExtend;   //[0]=底部  { Align:0=默认(居中), 1=左对齐 }
+    this.XLineExtend;   //[0]=底部  { Mode:1, Color: }  Mode=1 分割线  Mode=2短线
 
     //画图工具刻度
     
@@ -14698,6 +14747,18 @@ function AverageWidthFrame()
         //JSConsole.Chart.Log('[AverageWidthFrame.DrawVertical] bottom',bottom);
         if (this.ChartBorder.Bottom<=5*GetDevicePixelRatio()) return;   //高度不够 不显示
 
+        var bottomTextExtend=null;
+        if (this.XTextExtend)
+        {
+            bottomTextExtend=this.XTextExtend[0];
+        }
+
+        var bottomLineExtend=null;
+        if (this.XLineExtend)
+        {
+            bottomLineExtend=this.XLineExtend[0];
+        }
+
         var xPrev=null; //上一个坐标x的值
         var textRightPrev=null; //上一次刻度输出右边x坐标
         for(var i=0; i<this.VerticalInfo.length; ++i)
@@ -14762,31 +14823,39 @@ function AverageWidthFrame()
 
             if (this.VerticalInfo[i].Message[0]!=null)
             {
-                if (this.VerticalInfo[i].Font!=null)
-                    this.Canvas.font=this.VerticalInfo[i].Font;
-                
+                if (this.VerticalInfo[i].Font) this.Canvas.font=this.VerticalInfo[i].Font;
+
                 var textLeft=0;
                 
                 this.Canvas.strokeStyle=item.TextColor;
                 var testWidth=this.Canvas.measureText(this.VerticalInfo[i].Message[0]).width;
                 var textHeight=this.Canvas.measureText("擎").width;
-                if (x<testWidth/2)
+                if (bottomTextExtend && bottomTextExtend.Align==1)
                 {
                     this.Canvas.textAlign="left";
                     this.Canvas.textBaseline="top";
                     textLeft=x;
                 }
-                else if ((x + testWidth / 2) >= this.ChartBorder.GetChartWidth())
-                {
-                    this.Canvas.textAlign = "right";
-                    this.Canvas.textBaseline="top";
-                    textLeft=x-testWidth;
-                }
                 else
                 {
-                    this.Canvas.textAlign="center";
-                    this.Canvas.textBaseline="top";
-                    textLeft=x-(testWidth/2);
+                    if (x<testWidth/2)
+                    {
+                        this.Canvas.textAlign="left";
+                        this.Canvas.textBaseline="top";
+                        textLeft=x;
+                    }
+                    else if ((x + testWidth / 2) >= this.ChartBorder.GetChartWidth())
+                    {
+                        this.Canvas.textAlign = "right";
+                        this.Canvas.textBaseline="top";
+                        textLeft=x-testWidth;
+                    }
+                    else
+                    {
+                        this.Canvas.textAlign="center";
+                        this.Canvas.textBaseline="top";
+                        textLeft=x-(testWidth/2);
+                    }
                 }
                 
                 if (textRightPrev==null || textLeft>textRightPrev)
@@ -14803,6 +14872,36 @@ function AverageWidthFrame()
                         yText+=lineLength+2*pixelRatio;
                     }
 
+                    if (bottomLineExtend)
+                    {
+                        if (bottomLineExtend.Mode===1)
+                        {
+                            if (item.Value>1)
+                            {
+                                if (bottomLineExtend.Color) this.Canvas.strokeStyle=bottomLineExtend.Color;
+                                this.Canvas.beginPath();
+                                this.Canvas.moveTo(xFixed,bottom);
+                                this.Canvas.lineTo(xFixed,border.ChartHeight);
+                                this.Canvas.stroke();
+                                x+=1;
+                            }
+                        }
+                        else if (bottomLineExtend.Mode===2)
+                        {
+                            if (bottomLineExtend.Width>=1)
+                            {
+                                var lineLength=bottomLineExtend.Width;
+                                if (bottomLineExtend.Color) this.Canvas.strokeStyle=bottomLineExtend.Color;
+                                this.Canvas.beginPath();
+                                this.Canvas.moveTo(xFixed,yText);
+                                this.Canvas.lineTo(xFixed,yText+lineLength);
+                                this.Canvas.stroke();
+        
+                                yText+=lineLength+2;
+                            }
+                        }
+                    }
+
                     //item.TextBGColor="rgb(0,255,0)";
                     if (item.TextBGColor)   //文字背景色
                     {
@@ -17792,6 +17891,8 @@ function KLineFrame()
     this.TitleWindow=g_JSChartResource.KLineToolbar.TitleWindow;
     this.ExportData=g_JSChartResource.KLineToolbar.ExportData;      //是否显示'导出数据'菜单
 
+    this.SelBorderColor=g_JSChartResource.SelFrameBorderColor;
+
     this.ModifyIndexEvent;   //改参数 点击事件
     this.ChangeIndexEvent;   //换指标 点击事件
     this.ToolbarRect=null;   //保存工具条的位置
@@ -18971,6 +19072,31 @@ function KLineFrame()
         }
     }
 
+    this.DrawSelectedBorder=function(option)
+    {
+        if (this.Identify===0) return;
+
+        var border=this.IsHScreen==true?this.ChartBorder.GetHScreenBorder():this.ChartBorder.GetBorder();
+
+        var left=ToFixedPoint(border.Left);
+        var top=ToFixedPoint(border.Top);
+        var right=ToFixedPoint(border.Right);
+        var bottom=ToFixedPoint(border.Bottom);
+        var height=bottom-top;
+
+        this.Canvas.strokeStyle=this.SelBorderColor;
+
+        if (option.Mode==1)
+        {
+            var xRight=ToFixedPoint(border.ChartWidth);
+            this.Canvas.strokeRect(right,top,xRight-right-1,height);  //少一个像素让边框显示出来
+        }
+        else
+        {
+            this.Canvas.strokeRect(left,top,right-left-1,height);  //少一个像素让边框显示出来
+        }
+    }
+
     //是否在X轴坐标上
     //this.PtInVertical=function(x,y) { return false; }
 }
@@ -19005,6 +19131,7 @@ function OverlayKLineFrame()
 
     this.CloseButton=CloneData(g_JSChartResource.Buttons.CloseOverlayIndex);
     this.ModifyIndexParamButton=CloneData(g_JSChartResource.Buttons.ModifyIndexParam);
+    this.DrawSelectedBorder=null;
 
     this.KLineFrame_ReloadResource=this.ReloadResource;
     this.ReloadResource=function(resource)
@@ -19733,6 +19860,8 @@ function KLineHScreenFrame()
     this.ClassName='KLineHScreenFrame';
     this.IsHScreen=true;        //是否是横屏
 
+    this.DrawSelectedBorder=null;
+
     //画标题背景色
     this.DrawTitleBG=function()
     {
@@ -40580,7 +40709,7 @@ function ChartDrawSVG()
             x=this.ChartFrame.GetXFromIndex(index);
             if (item.Value=="Top") y=top;
             else if (item.Value=="Bottom") y=bottom;
-            else y=this.ChartFrame.GetYFromData(item.Value);
+            else y=this.ChartFrame.GetYFromData(item.Value, false);
             if (IFrameSplitOperator.IsNumber(item.YOffset)) y+=item.YOffset;    //Y轴偏移
 
             var svgItem=item.SVG;
@@ -65987,8 +66116,9 @@ function JSChartResource()
     this.FrameSplitTextColor="rgb(117,125,129)";    //刻度文字颜色
     this.FrameSplitTextFont=14*GetDevicePixelRatio() +"px 微软雅黑";            //坐标刻度文字字体
     this.FrameTitleBGColor="rgb(246,251,253)";  //标题栏背景色
+    this.SelFrameBorderColor='rgb(130, 130, 130)';
     this.Frame={ 
-        XBottomOffset:1*GetDevicePixelRatio(),  //X轴文字向下偏移
+        XBottomOffset:2*GetDevicePixelRatio(),  //X轴文字向下偏移
         YTopOffset:2*GetDevicePixelRatio(),      //Y轴顶部文字向下偏移
         YTextPadding:[2,2]
     };
@@ -67044,6 +67174,7 @@ function JSChartResource()
         if (style.FrameSplitTextColor) this.FrameSplitTextColor = style.FrameSplitTextColor;
         if (style.FrameSplitTextFont) this.FrameSplitTextFont = style.FrameSplitTextFont;
         if (style.FrameTitleBGColor) this.FrameTitleBGColor = style.FrameTitleBGColor;
+        if (style.SelFrameBorderColor) this.SelFrameBorderColor=style.SelFrameBorderColor;
         if (IFrameSplitOperator.IsNumber(style.IndexTitleMerginLeft)) this.IndexTitleMerginLeft = style.IndexTitleMerginLeft;
 
         if (style.Frame)
@@ -73017,13 +73148,6 @@ function KLineChartContainer(uielement,OffscreenElement)
         
         overlayFrame.Frame=frame;
 
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_OVERLAY_FRAME);
-        if (event && event.Callback)
-        {
-            var sendData={ OverlayFrame:overlayFrame, WindowIndex:windowIndex, SubFrame:subFrame };
-            event.Callback(event, sendData, this);
-        }
-
         if (apiItem)
         {
             var apiIndex=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,obj, true);
@@ -73058,6 +73182,13 @@ function KLineChartContainer(uielement,OffscreenElement)
             overlayFrame.Script=scriptIndex;
         }
 
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_OVERLAY_FRAME);
+        if (event && event.Callback)
+        {
+            var sendData={ OverlayFrame:overlayFrame, WindowIndex:windowIndex, SubFrame:subFrame };
+            event.Callback(event, sendData, this);
+        }
+
         subFrame.OverlayIndex.push(overlayFrame);
         return overlayFrame;
     }
@@ -95932,7 +96063,7 @@ function Node(ErrorHandler)
             "CAPITAL","TOTALCAPITAL","EXCHANGE",
             "HYBLOCK","DYBLOCK","GNBLOCK","FGBLOCK","ZSBLOCK","ZHBLOCK","ZDBLOCK","HYZSCODE",
             "GNBLOCKNUM","FGBLOCKNUM","ZSBLOCKNUM","ZHBLOCKNUM","ZDBLOCKNUM",
-            "HYSYL","HYSJL"
+            "HYSYL","HYSJL","FROMOPEN"
         ]);
 
         if (setVariantName.has(varName))
@@ -95943,12 +96074,6 @@ function Node(ErrorHandler)
             return;
         }
 
-        if (varName=='FROMOPEN')
-        {
-            this.IsNeedLatestIndexData=true;
-            return;
-        }
-
         if (varName=='ADVANCE' || varName=="DECLINE")
         {
             var item={ ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_INDEX_INCREASE_DATA, IsSelfSymbol:true, FunctionName:varName };
@@ -106473,31 +106598,6 @@ function JSSymbolData(ast,option,jsExecute)
         JSConsole.Complier.Log('[JSSymbolData::RecvLatestIndexData]', this.LatestIndexData);
     }
 
-    this.GetLatestIndexCacheData=function(dataname)
-    {
-        if (!this.LatestIndexData) return  null;
-
-        switch(dataname)
-        {
-            case 'FROMOPEN':
-                {
-                    var value=parseInt(this.LatestIndexData.Time/100);
-                    var time=parseInt(value/100)*60+(value%100);    //转化为分钟个数
-                    var index=0;
-                    if(time <= 9 * 60 + 25) index=0;
-                    else if(time < 9 * 60 + 30) index=1;
-                    else if(time <= 11 * 60 + 30) index=(time - (9 * 60 + 30) + 1);
-                    else if(time < 13 * 60) index=121;
-                    else if(time <= 15 * 60) index=(122 + time - 13 * 60);
-                    else index=242;
-                    return index;
-                }
-            default:
-                return null;
-        }
-    }
-    
-
     this.GetVolRateData=function(job,node)
     {
         var volrKey=job.ID.toString()+'-VolRate-'+this.Symbol;
@@ -111562,6 +111662,8 @@ function JSExecute(ast,option)
 
             case "HYSYL":
             case "HYSJL":
+
+            case 'FROMOPEN':
                 return this.SymbolData.GetStockCacheData({ VariantName:name, Node:node });
             case 'SETCODE':
                 return this.SymbolData.SETCODE();
@@ -111589,8 +111691,6 @@ function JSExecute(ast,option)
                 return this.SymbolData.DAY();
             case 'PERIOD':
                 return this.SymbolData.PERIOD();
-            case 'FROMOPEN':
-                return this.SymbolData.GetLatestIndexCacheData('FROMOPEN');
 
             case "HOUR":
                 return this.SymbolData.HOUR();
@@ -116462,6 +116562,9 @@ function OverlayScriptIndex(name,script,args,option)
                     case 'DRAWICON':
                         this.CreateIcon(hqChart,windowIndex,item,i);
                         break;
+                    case "TIPICON":
+                        this.CreateTipIcon(hqChart,windowIndex,item,i);
+                        break;
                     case 'DRAWCHANNEL':
                         this.CreateChannel(hqChart,windowIndex,item,i);
                         break;
@@ -117174,6 +117277,74 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateTipIcon=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartDrawSVG();
+        chart.Canvas=hqChart.Canvas;
+
+        chart.Name=varItem.Name;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+
+        if (hqChart.ChartPaint[0].IsMinuteFrame())
+            chart.Data=hqChart.SourceData;
+        else
+            chart.Data=hqChart.ChartPaint[0].Data;  //绑定K线
+        
+        chart.Family=varItem.Draw.Icon.Family;
+        chart.TextFont=g_JSChartResource.TIPICON.TextFont;
+        
+        var svgSize=g_JSChartResource.TIPICON.Size;
+        var svgColor=g_JSChartResource.TIPICON.Color;
+        var svgYOffset=0;
+        var svgVAlign=2;    //上下对齐方式
+        if (IFrameSplitOperator.IsNumber(varItem.YOffset)) svgYOffset=varItem.YOffset;
+        if (varItem.Color) svgColor=this.GetColor(varItem.Color);
+        if (varItem.DrawFontSize>0) svgSize=varItem.DrawFontSize;
+        if (varItem.DrawVAlign>=0) svgVAlign=varItem.DrawVAlign;   
+
+        if (varItem.Draw && IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.DrawData) && varItem.Draw.Icon)
+        {
+            var drawData=varItem.Draw.DrawData;
+            var aryData=[];
+            var isArrayTip=Array.isArray(varItem.Draw.Text);
+            var singleTip=null;
+            if (!isArrayTip && varItem.Draw.Text) singleTip={ Text:varItem.Draw.Text };
+
+            for(var j=0;j<drawData.length;++j)
+            {
+                var item=drawData[j];
+                if (!IFrameSplitOperator.IsNumber(item)) continue;
+
+                var svgItem=
+                { 
+                    Index:j, Value:item, 
+                    SVG:{ Symbol:varItem.Draw.Icon.Symbol, Size:svgSize, Color:svgColor, YOffset:svgYOffset, VAlign:svgVAlign }
+                };
+
+                if (isArrayTip)
+                {
+                    var text=varItem.Draw.Text[j];
+                    if (text) svgItem.Tooltip={ Text:text };
+                }
+                else
+                {
+                    svgItem.Tooltip=singleTip;
+                }
+
+                aryData.push(svgItem);
+            }
+
+            chart.Texts= aryData;
+        }
+
+        frame.ChartPaint.push(chart);
+    }
+
+
     //创建通道
     this.CreateChannel=function(hqChart,windowIndex,varItem,id)
     {
@@ -120305,7 +120476,7 @@ function GetBlackStyle()
     
         Frame:
         { 
-            XBottomOffset:1*GetDevicePixelRatio(), //X轴文字向下偏移
+            XBottomOffset:2*GetDevicePixelRatio(), //X轴文字向下偏移
            
             PercentageText:      //百分比坐标文字颜色
             { 
@@ -131192,7 +131363,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12732";
+var HQCHART_VERSION="1.1.12747";
 
 function PrintHQChartVersion()
 {