hqchart 1.1.13304 → 1.1.13313

package/src/jscommon/umychart.version.js

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

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

@@ -6615,6 +6615,9 @@ var JSCHART_MENU_ID=
     CMD_CHANGE_DEFAULTCURSOR_ID:32,     //修改鼠标形状
     CMD_CHANGE_API_INDEX_ID:33,         //切换后台接口指标
     CMD_CHANGE_SCRIPT_INDEX_ID:34,      //切换成自定义的脚本指标
+
+    CMD_CHANGE_BASELINE_ID:35,          //分时图切换基准线
+
 }
 
 
@@ -13253,6 +13256,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (this.ShowCallAuctionData && IFrameSplitOperator.IsBool(srcParam))
                     this.ShowCallAuctionData({ Left:srcParam, MultiDay:{ Left:srcParam }});
                 break;
+            case JSCHART_MENU_ID.CMD_CHANGE_BASELINE_ID:
+                if (this.ChangeBaselineType && IFrameSplitOperator.IsNumber(param))
+                    this.ChangeBaselineType(param);
+                break;
 
             case JSCHART_MENU_ID.CMD_SELECTED_ZOOM_ID:
                 if (this.ShowSelectData && srcParam) this.ShowSelectData(srcParam);
@@ -59516,6 +59523,8 @@ IChartDrawPicture.ArrayDrawPricture=
 
     { Name:"水平线2", ClassName:"ChartDrawHLine", Create:function() { return new ChartDrawHLine(); }},
 
+    { Name:"MonitorLine", ClassName:"ChartDrawMonitorLine", Create:function() { return new ChartDrawMonitorLine(); }},
+
 
     //trading view样式
     { Name:"Note", ClassName:"ChartDrawNote", Create:function() { return new ChartDrawNote(); } },
@@ -64371,6 +64380,222 @@ function ChartDrawCrosshair()
     }
 }
 
+//画图工具-监测线
+function ChartDrawMonitorLine()
+{
+    this.newMethod=IChartDrawPicture;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartDrawMonitorLine';
+    this.PointCount=1;
+    this.IsPointIn=this.IsPointIn_XYValue_Line;
+    this.IsHScreen=false;
+    this.GetXYCoordinate=this.GetXYCoordinate_default;
+    this.FormatLabelTextCallback=null;
+
+    this.LineColor='rgb(255,215,0)'
+    this.LabelConfig=
+    { 
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`, 
+        BGColor:"rgb(30,144,255)", YTextOffset:4,
+        LineColor:"rgba(255,215,0,0.8)",
+        LineDash:[3,5],
+    }
+
+   
+    this.SetOption=function(option)
+    {
+        if (option.LineColor) this.LineColor=option.LineColor;
+        if (option.Label)
+        {
+            var item=option.Label;
+            var dest=this.LabelConfig
+            if (item.Font) dest.Font=item.Font;
+            if (item.BGColor) dest.BGColor=item.BGColor;
+            if (item.LineColor) dest.LineColor=item.LineColor;
+            if (item.LineDash) dest.LineDash=item.LineDash;
+            if (IFrameSplitOperator.IsNumber(item.YTextOffset)) dest.YTextOffset=item.YTextOffset;
+        }
+        
+        if (option.FormatLabelText) this.FormatLabelTextCallback=option.FormatLabelText;
+    }
+
+    this.Draw=function()
+    {
+        this.LinePoint=[];
+        if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
+
+        if (!this.Frame || !this.Frame.Data) return;
+        var data=this.Frame.Data;
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.Data)) return;
+
+        if (this.Point.length!=1) return;
+        if (this.Value.length!=1) return;
+        this.IsHScreen=this.Frame.IsHScreen;
+        if (this.IsHScreen) return;
+
+        if (this.Status==20) this.DrawMoveLine();
+        else if (this.Status==10) this.DrawMonitorLine(data);
+    }
+
+    this.DrawMoveLine=function()
+    {
+        var border=this.Frame.ChartBorder.GetBorder();
+        var pt=this.Point[0];
+        var x=ToFixedPoint(pt.X);
+        this.ClipFrame();
+
+        this.Canvas.strokeStyle=this.LineColor;
+        this.Canvas.beginPath();
+        this.Canvas.moveTo(x,border.TopEx);
+        this.Canvas.lineTo(x,border.BottomEx);
+        this.Canvas.stroke();
+
+        this.Canvas.restore();
+    }
+
+    this.DrawMonitorLine=function(data)
+    {
+        var isMinute=this.Frame.IsMinuteFrame();
+        var dataWidth=this.Frame.DataWidth;
+        var distanceWidth=this.Frame.DistanceWidth;
+        var xPointCount=this.Frame.XPointCount;
+
+        if (this.IsHScreen)
+        {
+            //var border=this.Frame.ChartBorder.GetHScreenBorder();
+            //var chartright=border.BottomEx;
+            //var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var border=this.Frame.ChartBorder.GetBorder();
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
+        }
+
+        var ptData=this.Value[0];
+        this.ClipFrame();
+        
+        var labelInfo=null;
+        for(var i=data.DataOffset,j=0;i<data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var item=data.Data[i];
+
+            if (isMinute)
+            {
+                var x=this.Frame.GetXFromIndex(j);
+            }
+            else
+            {
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                if (right>chartright) break;
+                var x=left+(right-left)/2;
+            }
+
+            if (i==ptData.XValue)   //起始
+            {
+                this.Canvas.strokeStyle=this.LineColor;
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(x,border.TopEx);
+                this.Canvas.lineTo(x,border.BottomEx);
+                this.Canvas.stroke();
+
+                var line={Start:{X:x, Y:border.TopEx}, End:{X:x, Y:border.BottomEx}};
+                this.LinePoint.push(line);
+            }
+            else if (i==data.Data.length-1)  //结束
+            {
+                if (this.LabelConfig.LineDash)  this.Canvas.setLineDash(this.LabelConfig.LineDash);
+                this.Canvas.strokeStyle=this.LabelConfig.LineColor;
+                this.Canvas.beginPath();
+                this.Canvas.moveTo(x,border.TopEx);
+                this.Canvas.lineTo(x,border.BottomEx);
+                this.Canvas.stroke();
+                if (this.LabelConfig.LineDash) this.Canvas.setLineDash([]);
+
+                labelInfo={ Left:right, Data:data, StartIndex:ptData.XValue, AryText:[] };
+            }
+        }
+
+        this.Canvas.restore();
+
+        if (labelInfo) this.DrawLabel(labelInfo);
+    }
+
+    this.DrawLabel=function(labelInfo)
+    {
+        if (!this.FormatLabelTextCallback) return;
+        this.FormatLabelTextCallback(labelInfo);
+        if (!IFrameSplitOperator.IsNonEmptyArray(labelInfo.AryText)) return;
+        if (!IFrameSplitOperator.IsNumber(labelInfo.YValue)) return;
+
+        /*
+        labelInfo.YValue=7.15;
+        labelInfo.AryText=
+        [
+            { Name:"标题1:", Text:"6666", NameColor:"rgb(255,255,255)", TextColor:"rgb(30,10,30)" },
+            { Name:"标题2:", Text:"08.00", NameColor:"rgb(255,255,255)", TextColor:"rgb(30,10,30)" },
+            { Name:"标题3:", Text:"999.1", NameColor:"rgb(255,255,255)", TextColor:"rgb(30,10,30)" },
+            { Name:"标题4:", Text:"320" , NameColor:"rgb(255,255,255)", TextColor:"rgb(30,10,30)"},
+            { Name:"标题5:", Text:"77775.77", NameColor:"rgb(255,255,255)", TextColor:"rgb(30,10,30)" }
+        ]
+        */
+
+        var y=this.Frame.GetYFromData(labelInfo.YValue,false);
+        this.Canvas.font=this.LabelConfig.Font;
+        this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="top";
+        var lineHeight=this.Canvas.measureText("擎").width+2;
+        var maxWidth=0, lineCount=0;
+        for(var i=0;i<labelInfo.AryText.length;++i)
+        {
+            var item=labelInfo.AryText[i];
+            item.NameWidth=0;
+            item.TextWidth=0;
+            if (item.Name) item.NameWidth=this.Canvas.measureText(item.Name).width+2;
+            if (item.Text) item.TextWidth=this.Canvas.measureText(item.Text).width+2;
+
+            var itemWidth=item.NameWidth+item.TextWidth;
+            if (maxWidth<itemWidth) maxWidth=itemWidth;
+            ++lineCount;
+        }
+
+        var rtBG={ Left:labelInfo.Left+1, Top:y, Width:maxWidth+4, Height:lineHeight*lineCount+4 };
+        rtBG.Right=rtBG.Left+rtBG.Width;
+        rtBG.Bottom=rtBG.Top+rtBG.Height;
+        if (this.LabelConfig.BGColor)
+        {
+            this.Canvas.fillStyle=this.LabelConfig.BGColor
+            this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height)); 
+        }
+
+        var xText=rtBG.Left+2;
+        var yText=rtBG.Top+this.LabelConfig.YTextOffset;
+        for(var i=0;i<labelInfo.AryText.length;++i)
+        {
+            var item=labelInfo.AryText[i];
+
+            if (item.Name)
+            {
+                this.Canvas.fillStyle=item.NameColor;
+                this.Canvas.fillText(item.Name,xText,yText);
+            }
+            
+            if (item.Text)
+            {
+                this.Canvas.fillStyle=item.TextColor;
+                this.Canvas.fillText(item.Text,xText+item.NameWidth ,yText);
+            }
+
+            yText+=lineHeight;
+        }
+    }
+}
+
 //画图工具-波浪尺
 function ChartDrawWaveRuler()
 {
@@ -79334,6 +79559,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.DataStatus={ MultiDay:false, LatestDay:false, LatestDate:null};      //MultiDay=多日  LatestDay:当天 LatestDate:最后的日期
 
     this.ZoomStepPixel=50;
+    this.BaselineType=0;    //基准线类型 0=最新昨收盘 1=多日前昨收盘
 
     //集合竞价设置 obj={ Left:true/false, Right:true/false, MultiDay:{Left:, Right:} }
     this.SetCallCationDataBorder=function(obj)
@@ -80809,6 +81035,16 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     { Name:"最近3日", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID, Args:[3]}, Checked:this.DayCount==3 },
                     { Name:"最近4日", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID, Args:[4]}, Checked:this.DayCount==4 },
                     { Name:"最近5日", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID, Args:[5]}, Checked:this.DayCount==5 },
+
+                    { 
+                        Name:"基准线选择",
+                        SubMenu:
+                        [
+                            { Name:"最新昨收价", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_BASELINE_ID, Args:[0]}, Checked:this.BaselineType===0 },
+                            { Name:"多日前昨收价", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_BASELINE_ID, Args:[1]}, Checked:this.BaselineType===1 }
+                        ]
+
+                    }
                 ]
             },
             {
@@ -81997,6 +82233,14 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
+    this.ChangeBaselineType=function(type)
+    {
+        if (this.BaselineType==type) return;
+
+        this.BaselineType=type;
+        if (this.DayCount>1) this.RequestData();
+    }
+
     //[{ Symbol: , Color, Option: }]
     this.OverlaySymbols=function(aryData, option)
     {
@@ -82484,10 +82728,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
 
         var upperSymbol=this.Symbol.toUpperCase();
-
-        var yClose=this.DayData[0].YClose;
         var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);
-        if (IFrameSplitOperator.IsNumber(this.DayData[0].YClearing) && isFutures) yClose=this.DayData[0].YClearing; //期货使用前结算价
+        var dayItem=this.DayData[0];    //最新
+        if (this.BaselineType===1) dayItem=this.DayData[this.DayData.length-1]; //多日前
+
+        var yClose=dayItem.YClose;
+        if (IFrameSplitOperator.IsNumber(dayItem.YClearing) && isFutures) yClose=dayItem.YClearing; //期货使用前结算价
+
         this.BindMainData(sourceData,yClose);
         
          //外汇 均线暂时不用
@@ -84312,6 +84559,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         {
             var value=frame.GetXData(x);
             index=parseInt(value.toFixed(0));
+            if (IFrameSplitOperator.IsNumber(data.DataOffset)) index+=data.DataOffset;  //加上数据偏移
         }
         else if (clientPos>=100 && clientPos<=199)
         {
@@ -135401,6 +135649,7 @@ function JSDialogDrawTool()
             [
                 { Title: '价格范围', ClassName: 'hqchart_drawtool icon-shijianfanwei', Type:0, Data:{ ID:"PriceRange" }  },
                 { Title: '时间范围', ClassName: 'hqchart_drawtool icon-jiagefanwei', Type:0, Data:{ ID:"DateRange" }  },
+                { Title: "监测线", ClassName:"hqchart_drawtool icon-jiance", Type:0, Data:{ ID:"MonitorLine"} },
             ]
         },
         {
@@ -135748,7 +135997,7 @@ function JSDialogDrawTool()
         { 
             LineColor:this.LineColor,   //线段颜色
             LineWidth:this.LineWidth,   //线段宽度
-            //PointColor:'rgba(255,130,71,0.5)'    //点颜色
+            PointColor:this.LineColor    //点颜色
         };
 
         var name=data.Item.Data.ID;
@@ -135831,6 +136080,19 @@ function JSDialogDrawTool()
 }
 
 
+/////////////////////////////////////////////////////////////////////////////////////
+// 修改画图工具
+//
+//
+////////////////////////////////////////////////////////////////////////////////////
+function JSDialogModifyDraw()
+{
+    this.DivDialog=null;
+    this.HQChart;
+    this.ChartPicture;
+}
+
+
 
 
 
@@ -135955,7 +136217,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13303";
+var HQCHART_VERSION="1.1.13312";
 
 function PrintHQChartVersion()
 {