hqchart 1.1.12525 → 1.1.12540

package/lib/umychart.vue.js

@@ -5726,7 +5726,7 @@ this.Canvas.strokeStyle=this.PointColor;if(isMoveOn)this.Canvas.lineWidth=1*pixe
 {this.Canvas.beginPath();this.Canvas.arc(item.X,item.Y,this.PointRadius*pixel,0,360,false);this.Canvas.fill();//画实心圆
 this.Canvas.closePath();}}this.Canvas.restore();};//计算2个点线的,左右的延长线的点
 this.CalculateExtendLinePoint=function(ptStart,ptEnd){var result={};var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();var top=this.Frame.ChartBorder.GetTopEx();var bottom=this.Frame.ChartBorder.GetBottom();var a=ptEnd.X-ptStart.X;var b=ptEnd.Y-ptStart.Y;if(a>0){var b2=bottom-ptStart.Y;var a2=a*b2/b;var pt=new Point();pt.X=ptStart.X+a2;pt.Y=bottom;result.End=pt;var b2=ptEnd.Y-top;var a2=a*b2/b;var pt2=new Point();pt2.Y=top;pt2.X=ptEnd.X-a2;result.Start=pt2;}else{var b2=bottom-ptStart.Y;var a2=Math.abs(a)*b2/b;var pt=new Point();pt.X=ptStart.X-a2;;pt.Y=bottom;result.End=pt;var b2=ptEnd.Y-top;var a2=Math.abs(a)*b2/b;var pt2=new Point();pt2.Y=top;pt2.X=ptEnd.X+a2;result.Start=pt2;}return result;};//计算2个点线的,点0->点1->延长线的点
-this.CalculateExtendLineEndPoint=function(aryPoint){var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();var bottom=this.Frame.ChartBorder.GetBottomEx();var top=this.Frame.ChartBorder.GetTopEx();var a=aryPoint[1].X-aryPoint[0].X;var b=aryPoint[1].Y-aryPoint[0].Y;if(a>0){var a1=right-aryPoint[0].X;var b1=a1*b/a;var y=b1+aryPoint[0].Y;if(y>=top&&y<=bottom){var pt=new Point();pt.X=right;pt.Y=y;return pt;}if(b>0){var b2=bottom-aryPoint[0].Y;var a2=a*b2/b;var x=a2+aryPoint[0].X;var pt2=new Point();pt2.X=x;pt2.Y=bottom;return pt2;}else{var b2=top-aryPoint[0].Y;var a2=a*b2/b;var x=a2+aryPoint[0].X;var pt2=new Point();pt2.X=x;pt2.Y=top;return pt2;}}else{var a1=aryPoint[0].X-left;var b1=a1*b/Math.abs(a);var y=b1+aryPoint[0].Y;if(y>=top&&y<=bottom){var pt=new Point();pt.X=left;pt.Y=y;return pt;}if(b>0){var b2=bottom-aryPoint[0].Y;var a2=a*b2/b;var x=a2+aryPoint[0].X;var pt2=new Point();pt2.X=x;pt2.Y=bottom;return pt2;}else{var b2=top-aryPoint[0].Y;var a2=a*b2/b;var x=a2+aryPoint[0].X;var pt2=new Point();pt2.X=x;pt2.Y=top;return pt2;}}};//坐标是否在点上 返回在第几个点上
+this.CalculateExtendLineEndPoint=function(aryPoint){var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();var bottom=this.Frame.ChartBorder.GetBottomEx();var top=this.Frame.ChartBorder.GetTopEx();var a=aryPoint[1].X-aryPoint[0].X;var b=aryPoint[1].Y-aryPoint[0].Y;if(a>0){var a1=right-aryPoint[0].X;var b1=a1*b/a;var y=b1+aryPoint[0].Y;if(y>=top&&y<=bottom){var pt=new Point();pt.X=right;pt.Y=y;return pt;}if(b>0){var b2=bottom-aryPoint[0].Y;var a2=a*b2/b;var x=a2+aryPoint[0].X;var pt2=new Point();pt2.X=x;pt2.Y=bottom;return pt2;}else if(b==0){var pt2=new Point();pt2.X=right;pt2.Y=aryPoint[0].Y;return pt2;}else{var b2=top-aryPoint[0].Y;var a2=a*b2/b;var x=a2+aryPoint[0].X;var pt2=new Point();pt2.X=x;pt2.Y=top;return pt2;}}else{var a1=aryPoint[0].X-left;var b1=a1*b/Math.abs(a);var y=b1+aryPoint[0].Y;if(y>=top&&y<=bottom){var pt=new Point();pt.X=left;pt.Y=y;return pt;}if(b>0){var b2=bottom-aryPoint[0].Y;var a2=a*b2/b;var x=a2+aryPoint[0].X;var pt2=new Point();pt2.X=x;pt2.Y=bottom;return pt2;}else if(b==0){var pt2=new Point();pt2.X=left;pt2.Y=aryPoint[0].Y;return pt2;}else{var b2=top-aryPoint[0].Y;var a2=a*b2/b;var x=a2+aryPoint[0].X;var pt2=new Point();pt2.X=x;pt2.Y=top;return pt2;}}};//坐标是否在点上 返回在第几个点上
 this.IsPointInXYValue=function(x,y,option){if(!this.Frame)return-1;var data=this.Frame.Data;if(!data)return-1;if(!this.Value)return-1;var radius=5;if(option&&IFrameSplitOperator.IsNumber(option.Zoom))radius+=option.Zoom;else if(this.Option&&IFrameSplitOperator.IsNumber(this.Option.Zoom))radius+=this.Option.Zoom;var isHScreen=this.Frame.IsHScreen;radius*=GetDevicePixelRatio();for(var i=0;i<this.Value.length;++i)//是否在点上
 {var item=this.Value[i];var pt=new Point();if(isHScreen){pt.Y=this.Frame.GetXFromIndex(item.XValue-data.DataOffset);pt.X=this.Frame.GetYFromData(item.YValue);}else{pt.X=this.Frame.GetXFromIndex(item.XValue-data.DataOffset);pt.Y=this.Frame.GetYFromData(item.YValue);}this.Canvas.beginPath();this.Canvas.arc(pt.X,pt.Y,radius,0,360);if(this.Canvas.isPointInPath(x,y))return i;}return-1;};//坐标是否在线段上 返回在第几个线段上
 this.IsPointInLine=function(x,y,option){if(!this.LinePoint)return-1;var lineWidth=5;if(option&&IFrameSplitOperator.IsNumber(option.Zoom))lineWidth+=option.Zoom;else if(this.Option&&IFrameSplitOperator.IsNumber(this.Option.Zoom))lineWidth+=this.Option.Zoom;var pixel=GetDevicePixelRatio();lineWidth*=pixel;for(var i=0;i<this.LinePoint.length;++i){var item=this.LinePoint[i];var ptStart=item.Start;var ptEnd=item.End;this.Canvas.beginPath();if(ptStart.X==ptEnd.X)//竖线
@@ -6209,13 +6209,14 @@ if(this.ExtendLine.Right)xRight=this.Frame.ChartBorder.GetRight();if(this.Extend
 var clrArea=null;this.Canvas.font=this.Font;if(this.ExtendLine.Left)this.Canvas.textAlign="left";else this.Canvas.textAlign="right";this.Canvas.textBaseline="bottom";for(var i=0;i<aryArea.length;++i){var item=aryArea[i];var y=yBottom-height*item.Value;//var yValue=baseValue+diffValue*item.Value;
 yValue=this.Frame.GetYData(y,false);y=ToFixedPoint(y);if(this.EnableBGColor&&IFrameSplitOperator.IsNumber(yPre)){var rtBG={Left:xLeft,Right:xRight,Top:yPre,Bottom:y};rtBG.Width=rtBG.Right-rtBG.Left;rtBG.Height=rtBG.Bottom-rtBG.Top;this.Canvas.fillStyle=clrArea;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}this.Canvas.strokeStyle=item.Color;this.Canvas.beginPath();this.Canvas.moveTo(xLeft,y);this.Canvas.lineTo(xRight,y);this.Canvas.stroke();var line={Start:{X:xLeft,Y:y},End:{X:xRight,Y:y}};this.LinePoint.push(line);//文字
 var text=item.Value+' ('+yValue.toFixed(2)+')';this.Canvas.fillStyle=item.Color;if(this.ExtendLine.Left)this.Canvas.fillText(text,xLeft+2,y-2);else this.Canvas.fillText(text,xLeft-2,y-2);yPre=y;clrArea=IChartDrawPicture.ColorToRGBA(item.Color,this.AreaConfig.Opacity);}};}function ChartFibSpeedResistanceFan(){this.newMethod=IChartDrawPicture;//派生
-this.newMethod();delete this.newMethod;this.ClassName='ChartFibSpeedResistanceFan';this.PointCount=2;this.Font=12*GetDevicePixelRatio()+"px 微软雅黑";this.IsPointIn=this.IsPointIn_XYValue_Line;this.GetXYCoordinate=this.GetXYCoordinate_default;this.PointToValue_Default=this.PointToValue;this.OnlyMoveXIndex=true;this.IsSupportMagnet=true;this.LineWidth=1;this.EnableBGColor=true;this.AreaConfig={AryYData:[{Value:0,Color:"rgb(128,128,128)",Enable:true},{Value:0.25,Color:"rgb(242,52,69)",Enable:true},{Value:0.382,Color:"rgb(255,152,0)",Enable:true},{Value:0.5,Color:"rgb(76,175,80)",Enable:true},{Value:0.618,Color:"rgb(8,153,129)",Enable:true},{Value:0.75,Color:"rgb(0,188,212)",Enable:true},{Value:1,Color:"rgb(120,123,134)",Enable:true}],AryXData:[{Value:0,Color:"rgb(128,128,128)",Enable:true},{Value:0.25,Color:"rgb(242,52,69)",Enable:true},{Value:0.382,Color:"rgb(255,152,0)",Enable:true},{Value:0.5,Color:"rgb(76,175,80)",Enable:true},{Value:0.618,Color:"rgb(8,153,129)",Enable:true},{Value:0.75,Color:"rgb(0,188,212)",Enable:true},{Value:1,Color:"rgb(120,123,134)",Enable:true}],Opacity:0.3};this.Draw=function(){this.LinePoint=[];if(this.IsFrameMinSize())return;var bCheckXY=false;var drawPoint=this.CalculateDrawPoint({IsCheckX:bCheckXY,IsCheckY:bCheckXY});if(!drawPoint)return;if(drawPoint.length!=2)return;this.ClipFrame();var ptStart=drawPoint[0];var ptEnd=drawPoint[1];this.SetLineWidth();this.DrawBlock(ptEnd,ptStart);this.RestoreLineWidth();this.DrawPoint(drawPoint);//画点
+this.newMethod();delete this.newMethod;this.ClassName='ChartFibSpeedResistanceFan';this.PointCount=2;this.Font=12*GetDevicePixelRatio()+"px 微软雅黑";this.IsPointIn=this.IsPointIn_XYValue_Line;this.GetXYCoordinate=this.GetXYCoordinate_default;this.PointToValue_Default=this.PointToValue;this.OnlyMoveXIndex=true;this.IsSupportMagnet=true;this.LineWidth=1;this.EnableBGColor=true;this.AreaConfig={AryYData:[{Value:0,Color:"rgb(128,128,128)",Enable:true},{Value:0.25,Color:"rgb(242,52,69)",Enable:true},{Value:0.382,Color:"rgb(255,152,0)",Enable:true},{Value:0.5,Color:"rgb(76,175,80)",Enable:true},{Value:0.618,Color:"rgb(8,153,129)",Enable:true},{Value:0.75,Color:"rgb(0,188,212)",Enable:true},{Value:1,Color:"rgb(120,123,134)",Enable:true}],AryXData:[{Value:0,Color:"rgb(128,128,128)",Enable:true},{Value:0.25,Color:"rgb(242,52,69)",Enable:true},{Value:0.382,Color:"rgb(255,152,0)",Enable:true},{Value:0.5,Color:"rgb(76,175,80)",Enable:true},{Value:0.618,Color:"rgb(8,153,129)",Enable:true},{Value:0.75,Color:"rgb(0,188,212)",Enable:true},{Value:1,Color:"rgb(120,123,134)",Enable:true}],Opacity:0.3};this.SetOption=function(option){if(!option)return;if(option.Font)this.Font=option.Font;if(option.LineWidth)this.LineWidth=option.LineWidth;if(IFrameSplitOperator.IsBool(option.EnableBGColor))this.EnableBGColor=option.EnableBGColor;if(option.AreaConfig)this.AreaConfig=option.AreaConfig;};//导出成存储格式
+this.ExportStorageData=function(){var storageData=this.ExportBaseData();storageData.Value=[];for(var i=0;i<this.Value.length&&i<this.PointCount;++i){var item=this.Value[i];storageData.Value.push({XValue:item.XValue,YValue:item.YValue});}storageData.Font=this.Font;storageData.EnableBGColor=this.EnableBGColor;storageData.AreaConfig=CloneData(this.AreaConfig);return storageData;};this.ImportStorageData=function(storageData){if(storageData.Font)this.Font=storageData.Font;if(IFrameSplitOperator.IsBool(storageData.EnableBGColor))this.EnableBGColor=storageData.EnableBGColor;if(storageData.AreaConfig)this.AreaConfig=storageData.AreaConfig;};this.Draw=function(){this.LinePoint=[];if(this.IsFrameMinSize())return;var bCheckXY=false;var drawPoint=this.CalculateDrawPoint({IsCheckX:bCheckXY,IsCheckY:bCheckXY});if(!drawPoint)return;if(drawPoint.length!=2)return;this.ClipFrame();var ptStart=drawPoint[0];var ptEnd=drawPoint[1];this.SetLineWidth();this.DrawBlock(ptEnd,ptStart);this.RestoreLineWidth();this.DrawPoint(drawPoint);//画点
 this.Canvas.restore();};//获取在第几象限
 this.GetQuadrant=function(ptStart,ptEnd){if(ptStart.X<ptEnd.X&&ptStart.Y>ptEnd.Y)return 1;else if(ptStart.X>ptEnd.X&&ptStart.Y>ptEnd.Y)return 2;else if(ptStart.X<ptEnd.X&&ptStart.Y<ptEnd.Y)return 4;else return 3;};this.DrawBlock=function(ptStart,ptEnd){var center=ptEnd;var xDiff=ptEnd.X-ptStart.X;var yDiff=ptEnd.Y-ptStart.Y;var quadrant=this.GetQuadrant(center,ptStart);//象限
 var aryYData=this.GetArrayAreaConfig(this.AreaConfig.AryYData);var ptPre=null;//上一个点
-var clrArea=null;this.Canvas.font=this.Font;var textOffset=4;if(quadrant==1||quadrant==4){this.Canvas.textAlign="right";textOffset=-4;}else{this.Canvas.textAlign="left";textOffset=4;}this.Canvas.textBaseline="middle";for(var i=0;i<aryYData.length;++i){var item=aryYData[i];var y=item.Value*yDiff+ptStart.Y;var pt=this.CalculateExtendLineEndPoint([center,{X:ptStart.X,Y:y}]);if(ptPre){this.Canvas.beginPath();this.Canvas.moveTo(center.X,center.Y);this.Canvas.lineTo(ptPre.X,ptPre.Y);this.Canvas.lineTo(pt.X,pt.Y);this.Canvas.closePath();this.Canvas.fillStyle=clrArea;this.Canvas.fill();}this.Canvas.strokeStyle=item.Color;this.Canvas.beginPath();this.Canvas.moveTo(center.X,center.Y);this.Canvas.lineTo(pt.X,pt.Y);this.Canvas.stroke();this.LinePoint.push({Start:center,End:pt});if(item.Value!=1){this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(center.X,y);this.Canvas.lineTo(ptStart.X,y);this.Canvas.stroke();}ptPre=pt;clrArea=IChartDrawPicture.ColorToRGBA(item.Color,this.AreaConfig.Opacity);//文字
+var clrArea=null;this.Canvas.font=this.Font;var border=this.Frame.GetBorder();var ptLeftTop={X:border.Left,Y:border.TopEx};var ptRightTop={X:border.Right,Y:border.TopEx};var ptLeftBottom={X:border.Left,Y:border.BottomEx};var ptRightBottom={X:border.Right,Y:border.BottomEx};var textOffset=4;if(quadrant==1||quadrant==4){this.Canvas.textAlign="right";textOffset=-4;}else{this.Canvas.textAlign="left";textOffset=4;}this.Canvas.textBaseline="middle";for(var i=0;i<aryYData.length;++i){var item=aryYData[i];var y=item.Value*yDiff+ptStart.Y;var pt=this.CalculateExtendLineEndPoint([center,{X:ptStart.X,Y:y}]);if(ptPre){this.Canvas.beginPath();this.Canvas.moveTo(center.X,center.Y);this.Canvas.lineTo(ptPre.X,ptPre.Y);if(quadrant==1){if(ptPre.X>=ptRightTop.X&&pt.X<ptRightTop.X){this.Canvas.lineTo(ptRightTop.X,ptRightTop.Y);}}else if(quadrant==2){if(ptPre.X<=ptLeftTop.X&&pt.X>ptLeftTop.X){this.Canvas.lineTo(ptLeftTop.X,ptLeftTop.Y);}}else if(quadrant==3){if(ptPre.X<=ptLeftBottom.X&&pt.X>ptLeftBottom.X){this.Canvas.lineTo(ptLeftBottom.X,ptLeftBottom.Y);}}else if(quadrant==4){if(ptPre.X>=ptRightBottom.X&&pt.X<ptRightBottom.X){this.Canvas.lineTo(ptRightBottom.X,ptRightBottom.Y);}}this.Canvas.lineTo(pt.X,pt.Y);this.Canvas.closePath();this.Canvas.fillStyle=clrArea;this.Canvas.fill();}this.Canvas.strokeStyle=item.Color;this.Canvas.beginPath();this.Canvas.moveTo(center.X,center.Y);this.Canvas.lineTo(pt.X,pt.Y);this.Canvas.stroke();this.LinePoint.push({Start:center,End:pt});if(item.Value!=1){this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(center.X,y);this.Canvas.lineTo(ptStart.X,y);this.Canvas.stroke();}ptPre=pt;clrArea=IChartDrawPicture.ColorToRGBA(item.Color,this.AreaConfig.Opacity);//文字
 var text=''+item.Value;this.Canvas.fillStyle=item.Color;this.Canvas.fillText(text,center.X+textOffset,y);}var aryXData=this.GetArrayAreaConfig(this.AreaConfig.AryXData);var ptPre=null;this.Canvas.textAlign="center";if(quadrant==3||quadrant==4){this.Canvas.textBaseline="bottom";textOffset=-5;}else{this.Canvas.textBaseline="top";textOffset=5;}for(var i=0;i<aryXData.length;++i){var item=aryXData[i];var x=item.Value*xDiff+ptStart.X;var pt=this.CalculateExtendLineEndPoint([center,{X:x,Y:ptStart.Y}]);if(ptPre)//面积
-{this.Canvas.beginPath();this.Canvas.moveTo(center.X,center.Y);this.Canvas.lineTo(ptPre.X,ptPre.Y);this.Canvas.lineTo(pt.X,pt.Y);this.Canvas.closePath();this.Canvas.fillStyle=clrArea;this.Canvas.fill();}this.Canvas.strokeStyle=item.Color;this.Canvas.beginPath();this.Canvas.moveTo(center.X,center.Y);this.Canvas.lineTo(pt.X,pt.Y);this.Canvas.stroke();this.LinePoint.push({Start:center,End:pt});if(item.Value!=1){this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(x,center.Y);this.Canvas.lineTo(x,ptStart.Y);this.Canvas.stroke();}ptPre=pt;clrArea=IChartDrawPicture.ColorToRGBA(item.Color,this.AreaConfig.Opacity);//文字
+{this.Canvas.beginPath();this.Canvas.moveTo(center.X,center.Y);this.Canvas.lineTo(ptPre.X,ptPre.Y);if(quadrant==1){if(ptPre.X<ptRightTop.X&&pt.X>=ptRightTop.X){this.Canvas.lineTo(ptRightTop.X,ptRightTop.Y);}}else if(quadrant==2){if(ptPre.X>ptLeftTop.X&&pt.X<=ptLeftTop.X){this.Canvas.lineTo(ptLeftTop.X,ptLeftTop.Y);}}else if(quadrant==3){if(ptPre.X>ptLeftBottom.X&&pt.X<=ptLeftBottom.X){this.Canvas.lineTo(ptLeftBottom.X,ptLeftBottom.Y);}}else if(quadrant==4){if(ptPre.X<ptRightBottom.X&&pt.X>=ptRightBottom.X){this.Canvas.lineTo(ptRightBottom.X,ptRightBottom.Y);}}this.Canvas.lineTo(pt.X,pt.Y);this.Canvas.closePath();this.Canvas.fillStyle=clrArea;this.Canvas.fill();}this.Canvas.strokeStyle=item.Color;this.Canvas.beginPath();this.Canvas.moveTo(center.X,center.Y);this.Canvas.lineTo(pt.X,pt.Y);this.Canvas.stroke();this.LinePoint.push({Start:center,End:pt});if(item.Value!=1){this.Canvas.strokeStyle=this.LineColor;this.Canvas.beginPath();this.Canvas.moveTo(x,center.Y);this.Canvas.lineTo(x,ptStart.Y);this.Canvas.stroke();}ptPre=pt;clrArea=IChartDrawPicture.ColorToRGBA(item.Color,this.AreaConfig.Opacity);//文字
 var text=''+item.Value;this.Canvas.fillStyle=item.Color;this.Canvas.fillText(text,x,center.Y+textOffset);}};this.GetArrayAreaConfig=function(aryData){var aryArea=[];for(var i=0;i<aryData.length;++i){var item=aryData[i];if(item.Enable)aryArea.push(item);}aryArea.sort(function(left,right){return right.Value-left.Value;});return aryArea;};}function ChartDrawStorage(){this.DrawData=new _map2.default();//画图工具数据 key=symbol-Period, value=Map() Key:Guid, Value:{Guid, Symbol, Period, ClassName, Value}
 this.StorageKey;this.GetEventCallback;//事件回调
 this.Load=function(key)//从本地读取画图工具
@@ -7920,9 +7921,11 @@ if(isFutures&&yClearing&&item.Close)item.Increase=(item.Close-yClearing)/yCleari
 //上次价格
 if(IFrameSplitOperator.IsNumber(jsData.price))preClose=jsData.price;if(IFrameSplitOperator.IsNumber(jsData.avprice)&&item.AvPrice===jsData.avprice)preAvPrice=jsData.avprice;if(jsData.ExtendData)item.ExtendData=jsData.ExtendData;//扩展数据
 aryMinuteData[i]=item;}return aryMinuteData;};//分钟增量数据  stock: [ { date:, yclose:， yclearing: , minute:[ [],]}  0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌 11=领先指标 ]
-MinuteChartContainer.JsonDataToUpdateMinuteData=function(data){if(!data||!data.stock)return null;var stock=data.stock[0];if(!IFrameSplitOperator.IsNumber(stock.date))return null;var symbol=data.stock[0].symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var minuteData={Date:stock.date,Data:[],Symbol:symbol,Name:stock.name};var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_DAY_EXTENDDATA;//扩展数据序号
-if(IFrameSplitOperator.IsNumber(stock.high))minuteData.High=stock.high;if(IFrameSplitOperator.IsNumber(stock.low))minuteData.Low=stock.low;if(IFrameSplitOperator.IsNumber(stock.yclose))minuteData.YClose=stock.yclose;if(IFrameSplitOperator.IsNumber(stock.YClearing))minuteData.YClearing=stock.yclearing;if(IFrameSplitOperator.IsNonEmptyArray(data.stock[0].minute)){for(var i=0;i<stock.minute.length;++i){var jsData=stock.minute[i];var item=new MinuteData();item.Date=jsData[0];item.Time=jsData[1];item.Open=jsData[2];item.High=jsData[3];item.Low=jsData[4];item.Close=jsData[5];item.AvPrice=jsData[6];item.Vol=jsData[7];item.Amount=jsData[8];if(IFrameSplitOperator.IsNumber(jsData[9]))item.Increase=jsData[9];if(IFrameSplitOperator.IsNumber(jsData[10]))item.Risefall=jsData[10];if(IFrameSplitOperator.IsNumber(jsData[11]))item.Lead=jsData[11];if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];item.DateTime=item.Date.toString()+" "+item.Time.toString();if(isSHSZ)item.Vol=item.Vol/100;//沪深股票原始单位股
+MinuteChartContainer.JsonDataToUpdateMinuteData=function(data){if(!data||!data.stock)return null;var stock=data.stock[0];if(!IFrameSplitOperator.IsNumber(stock.date))return null;var symbol=data.stock[0].symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);//国内期货, 纽约期货交易所
+var minuteData={Date:stock.date,Data:[],Symbol:symbol,Name:stock.name};var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_DAY_EXTENDDATA;//扩展数据序号
+if(IFrameSplitOperator.IsNumber(stock.high))minuteData.High=stock.high;if(IFrameSplitOperator.IsNumber(stock.low))minuteData.Low=stock.low;if(IFrameSplitOperator.IsNumber(stock.yclose))minuteData.YClose=stock.yclose;if(IFrameSplitOperator.IsNumber(stock.YClearing))minuteData.YClearing=stock.yclearing;if(IFrameSplitOperator.IsNonEmptyArray(stock.minute)){for(var i=0;i<stock.minute.length;++i){var jsData=stock.minute[i];var item=new MinuteData();item.YClearing=minuteData.YClearing;item.YClose=minuteData.YClose;item.Date=jsData[0];item.Time=jsData[1];item.Open=jsData[2];item.High=jsData[3];item.Low=jsData[4];item.Close=jsData[5];item.AvPrice=jsData[6];item.Vol=jsData[7];item.Amount=jsData[8];if(IFrameSplitOperator.IsNumber(jsData[9]))item.Increase=jsData[9];if(IFrameSplitOperator.IsNumber(jsData[10]))item.Risefall=jsData[10];if(IFrameSplitOperator.IsNumber(jsData[11]))item.Lead=jsData[11];if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];item.DateTime=item.Date.toString()+" "+item.Time.toString();if(isSHSZ)item.Vol=item.Vol/100;//沪深股票原始单位股
 if(IFrameSplitOperator.IsNumber(minuteData.YClose)&&item.Close)item.Increase=(item.Close-minuteData.YClose)/minuteData.YClose*100;//涨幅 (最新价格-昨收)/昨收*100;
+if(isFutures&&minuteData.YClearing&&item.Close)item.Increase=(item.Close-minuteData.YClearing)/minuteData.YClearing*100;//涨幅 (最新价格-昨结算价)/昨结算价*100;
 minuteData.Data.push(item);}}return minuteData;};MinuteChartContainer.JsonDataToMinuteLineColorData=function(data){if(!data||!data.stock[0])return null;var stockItem=data.stock[0];if(!stockItem.linecolor||!IFrameSplitOperator.IsNonEmptyArray(stockItem.linecolor.data))return null;var aryLineColor=[];for(var i in stockItem.linecolor.data){var item=stockItem.linecolor.data[i];if(!IFrameSplitOperator.IsNumber(item.type)||!IFrameSplitOperator.IsNumber(item.date)||!IFrameSplitOperator.IsNumber(item.start)||!IFrameSplitOperator.IsNumber(item.end)||!item.color)continue;if(item.start>=item.end)continue;var newItem={Type:item.type,Date:item.date,Start:item.start,End:item.end,Color:item.color};if(IFrameSplitOperator.IsPlusNumber(item.linewidth))newItem.LineWidth=item.linewidth;aryLineColor.push(newItem);}return aryLineColor;};//获取最后的数据更新时间
 MinuteChartContainer.JsonDataToMinuteLastUpdateTime=function(data){if(!data||!data.stock[0])return null;var stock=data.stock[0];if(!IFrameSplitOperator.IsNumber(stock.date)||!IFrameSplitOperator.IsNumber(stock.time))return null;return{Date:stock.date,Time:stock.time};};MinuteChartContainer.JsonDataToHistoryMinuteLastUpdateTime=function(data){if(!data||!data.updatetime)return null;var item=data.updatetime;if(!IFrameSplitOperator.IsNumber(item.date)||!IFrameSplitOperator.IsNumber(item.time))return null;return{Date:item.date,Time:item.time};};//多日日线数据API 转化成array[];
 MinuteChartContainer.JsonDataToMinuteDataArray=function(data){var symbol=data.symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var isSHO=MARKET_SUFFIX_NAME.IsSHO(upperSymbol);//上海股票期权
@@ -12638,7 +12641,7 @@ function HQChartScriptWorker(){this.Create=function(){var _this60=this;addEventL
 hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,Stock:{Symbol:message.Symbol},Request:{MaxDataCount:500,MaxMinuteDayCount:5},Period:message.Period,Right:message.Right,Data:hisData};if(IFrameSplitOperator.IsNumber(message.HQDataType))stockObj.HQDataType=message.HQDataType;indexConsole.ExecuteScript(stockObj);};this.OnRecvMessage=function(message){var data=message.data;if(!data)return;if(data.ID==JSCHART_WORKER_MESSAGE_ID.EXECUTE_SCRIPT){if(!IFrameSplitOperator.IsNonEmptyArray(data.AryIndex))return;for(var i=0;i<data.AryIndex.length;++i){var item=data.AryIndex[i];this.ExecuteScript(item,data);}}};this.OnExecuteFinish=function(data,indexInfo,jsExectute){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT};postMessage(message);};this.OnExecuteError=function(error,indexInfo){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12523";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12539";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12525",
+  "version": "1.1.12540",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -51412,6 +51412,13 @@ function IChartDrawPicture()
                 pt2.Y=bottom;
                 return pt2;
             }
+            else if (b==0)
+            {
+                var pt2=new Point();
+                pt2.X=right;
+                pt2.Y=aryPoint[0].Y;
+                return pt2;
+            }
             else
             {
                 var b2=top-aryPoint[0].Y;
@@ -51449,6 +51456,13 @@ function IChartDrawPicture()
                 pt2.Y=bottom;
                 return pt2;
             }
+            else if (b==0)
+            {
+                var pt2=new Point();
+                pt2.X=left;
+                pt2.Y=aryPoint[0].Y;
+                return pt2;
+            }
             else
             {
                 var b2=top-aryPoint[0].Y;
@@ -59755,6 +59769,42 @@ function ChartFibSpeedResistanceFan()
         Opacity:0.3
     }
 
+    this.SetOption=function(option)
+    {
+        if (!option) return;
+
+        if (option.Font) this.Font=option.Font;
+        if (option.LineWidth) this.LineWidth=option.LineWidth;
+        if (IFrameSplitOperator.IsBool(option.EnableBGColor)) this.EnableBGColor=option.EnableBGColor;
+        if (option.AreaConfig) this.AreaConfig=option.AreaConfig;
+    }
+
+    //导出成存储格式
+    this.ExportStorageData=function()
+    {
+        var storageData=this.ExportBaseData();
+
+        storageData.Value=[];
+        for(var i=0;i<this.Value.length && i<this.PointCount;++i)
+        {
+            var item=this.Value[i];
+            storageData.Value.push( { XValue:item.XValue, YValue:item.YValue } );
+        }
+    
+        storageData.Font=this.Font;
+        storageData.EnableBGColor=this.EnableBGColor;
+        storageData.AreaConfig=CloneData(this.AreaConfig);
+
+        return storageData;
+    }
+
+    this.ImportStorageData=function(storageData)
+    {
+        if (storageData.Font) this.Font=storageData.Font;
+        if (IFrameSplitOperator.IsBool(storageData.EnableBGColor))  this.EnableBGColor=storageData.EnableBGColor;
+        if (storageData.AreaConfig) this.AreaConfig=storageData.AreaConfig;
+    }
+
     this.Draw=function()
     {
         this.LinePoint=[];
@@ -59797,6 +59847,13 @@ function ChartFibSpeedResistanceFan()
         var ptPre=null; //上一个点
         var clrArea=null;
         this.Canvas.font=this.Font;
+       
+        var border=this.Frame.GetBorder();
+        var ptLeftTop={ X:border.Left, Y:border.TopEx };
+        var ptRightTop={X:border.Right, Y:border.TopEx };
+        var ptLeftBottom={ X:border.Left, Y:border.BottomEx };
+        var ptRightBottom={ X:border.Right, Y:border.BottomEx };
+
         var textOffset=4;
         if (quadrant==1 || quadrant==4) 
         {
@@ -59808,6 +59865,8 @@ function ChartFibSpeedResistanceFan()
             this.Canvas.textAlign="left";
             textOffset=4;
         }
+
+
         this.Canvas.textBaseline="middle";
         for(var i=0;i<aryYData.length;++i)
         {
@@ -59821,6 +59880,36 @@ function ChartFibSpeedResistanceFan()
                 this.Canvas.beginPath();
                 this.Canvas.moveTo(center.X,center.Y);
                 this.Canvas.lineTo(ptPre.X,ptPre.Y);
+
+                if (quadrant==1)
+                {   
+                    if (ptPre.X>=ptRightTop.X && pt.X<ptRightTop.X)
+                    {
+                        this.Canvas.lineTo(ptRightTop.X,ptRightTop.Y);
+                    }
+                }
+                else if (quadrant==2)
+                {
+                    if (ptPre.X<=ptLeftTop.X && pt.X>ptLeftTop.X)
+                    {
+                        this.Canvas.lineTo(ptLeftTop.X,ptLeftTop.Y);
+                    }
+                }
+                else if (quadrant==3)
+                {
+                    if (ptPre.X<=ptLeftBottom.X && pt.X>ptLeftBottom.X)
+                    {
+                        this.Canvas.lineTo(ptLeftBottom.X,ptLeftBottom.Y);
+                    }
+                }
+                else if (quadrant==4)
+                {
+                    if (ptPre.X>=ptRightBottom.X && pt.X<ptRightBottom.X)
+                    {
+                        this.Canvas.lineTo(ptRightBottom.X,ptRightBottom.Y);
+                    }
+                }
+
                 this.Canvas.lineTo(pt.X,pt.Y);
                 this.Canvas.closePath();
                 this.Canvas.fillStyle=clrArea;
@@ -59879,6 +59968,36 @@ function ChartFibSpeedResistanceFan()
                 this.Canvas.beginPath();
                 this.Canvas.moveTo(center.X,center.Y);
                 this.Canvas.lineTo(ptPre.X,ptPre.Y);
+
+                if (quadrant==1)
+                {
+                    if (ptPre.X<ptRightTop.X && pt.X>=ptRightTop.X)
+                    {
+                        this.Canvas.lineTo(ptRightTop.X,ptRightTop.Y);
+                    }
+                }
+                else if (quadrant==2)
+                {
+                    if (ptPre.X>ptLeftTop.X && pt.X<=ptLeftTop.X)
+                    {
+                        this.Canvas.lineTo(ptLeftTop.X,ptLeftTop.Y);
+                    }
+                }
+                else if (quadrant==3)
+                {
+                    if (ptPre.X>ptLeftBottom.X && pt.X<=ptLeftBottom.X)
+                    {
+                        this.Canvas.lineTo(ptLeftBottom.X,ptLeftBottom.Y);
+                    }
+                }
+                else if (quadrant==4)
+                {
+                    if (ptPre.X<ptRightBottom.X && pt.X>=ptRightBottom.X)
+                    {
+                        this.Canvas.lineTo(ptRightBottom.X,ptRightBottom.Y);
+                    }
+                }
+
                 this.Canvas.lineTo(pt.X,pt.Y);
                 this.Canvas.closePath();
                 this.Canvas.fillStyle=clrArea;
@@ -75991,6 +76110,7 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
     var symbol=data.stock[0].symbol;
     var upperSymbol=symbol.toUpperCase();
     var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);
+    var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);    //国内期货, 纽约期货交易所
     var minuteData={ Date:stock.date,  Data:[] , Symbol:symbol, Name:stock.name };
     var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_DAY_EXTENDDATA;  //扩展数据序号
     if (IFrameSplitOperator.IsNumber(stock.high)) minuteData.High=stock.high;
@@ -75998,13 +76118,15 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
     if (IFrameSplitOperator.IsNumber(stock.yclose)) minuteData.YClose=stock.yclose;
     if (IFrameSplitOperator.IsNumber(stock.YClearing)) minuteData.YClearing=stock.yclearing;
 
-    if (IFrameSplitOperator.IsNonEmptyArray(data.stock[0].minute))
+    if (IFrameSplitOperator.IsNonEmptyArray(stock.minute))
     {
         for(var i=0;i<stock.minute.length;++i)
         {
             var jsData=stock.minute[i];
             var item=new MinuteData();
     
+            item.YClearing=minuteData.YClearing;
+            item.YClose=minuteData.YClose;
             item.Date=jsData[0];
             item.Time=jsData[1];
             item.Open=jsData[2];
@@ -76026,6 +76148,10 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
             if (IFrameSplitOperator.IsNumber(minuteData.YClose) && item.Close) 
                 item.Increase=(item.Close-minuteData.YClose)/minuteData.YClose*100; //涨幅 (最新价格-昨收)/昨收*100;
     
+            if (isFutures && minuteData.YClearing && item.Close) 
+            item.Increase=(item.Close-minuteData.YClearing)/minuteData.YClearing*100; //涨幅 (最新价格-昨结算价)/昨结算价*100;
+
+                
             minuteData.Data.push(item);
         }
     }

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

@@ -55492,6 +55492,13 @@ function IChartDrawPicture()
                 pt2.Y=bottom;
                 return pt2;
             }
+            else if (b==0)
+            {
+                var pt2=new Point();
+                pt2.X=right;
+                pt2.Y=aryPoint[0].Y;
+                return pt2;
+            }
             else
             {
                 var b2=top-aryPoint[0].Y;
@@ -55529,6 +55536,13 @@ function IChartDrawPicture()
                 pt2.Y=bottom;
                 return pt2;
             }
+            else if (b==0)
+            {
+                var pt2=new Point();
+                pt2.X=left;
+                pt2.Y=aryPoint[0].Y;
+                return pt2;
+            }
             else
             {
                 var b2=top-aryPoint[0].Y;
@@ -63835,6 +63849,42 @@ function ChartFibSpeedResistanceFan()
         Opacity:0.3
     }
 
+    this.SetOption=function(option)
+    {
+        if (!option) return;
+
+        if (option.Font) this.Font=option.Font;
+        if (option.LineWidth) this.LineWidth=option.LineWidth;
+        if (IFrameSplitOperator.IsBool(option.EnableBGColor)) this.EnableBGColor=option.EnableBGColor;
+        if (option.AreaConfig) this.AreaConfig=option.AreaConfig;
+    }
+
+    //导出成存储格式
+    this.ExportStorageData=function()
+    {
+        var storageData=this.ExportBaseData();
+
+        storageData.Value=[];
+        for(var i=0;i<this.Value.length && i<this.PointCount;++i)
+        {
+            var item=this.Value[i];
+            storageData.Value.push( { XValue:item.XValue, YValue:item.YValue } );
+        }
+    
+        storageData.Font=this.Font;
+        storageData.EnableBGColor=this.EnableBGColor;
+        storageData.AreaConfig=CloneData(this.AreaConfig);
+
+        return storageData;
+    }
+
+    this.ImportStorageData=function(storageData)
+    {
+        if (storageData.Font) this.Font=storageData.Font;
+        if (IFrameSplitOperator.IsBool(storageData.EnableBGColor))  this.EnableBGColor=storageData.EnableBGColor;
+        if (storageData.AreaConfig) this.AreaConfig=storageData.AreaConfig;
+    }
+
     this.Draw=function()
     {
         this.LinePoint=[];
@@ -63877,6 +63927,13 @@ function ChartFibSpeedResistanceFan()
         var ptPre=null; //上一个点
         var clrArea=null;
         this.Canvas.font=this.Font;
+       
+        var border=this.Frame.GetBorder();
+        var ptLeftTop={ X:border.Left, Y:border.TopEx };
+        var ptRightTop={X:border.Right, Y:border.TopEx };
+        var ptLeftBottom={ X:border.Left, Y:border.BottomEx };
+        var ptRightBottom={ X:border.Right, Y:border.BottomEx };
+
         var textOffset=4;
         if (quadrant==1 || quadrant==4) 
         {
@@ -63888,6 +63945,8 @@ function ChartFibSpeedResistanceFan()
             this.Canvas.textAlign="left";
             textOffset=4;
         }
+
+
         this.Canvas.textBaseline="middle";
         for(var i=0;i<aryYData.length;++i)
         {
@@ -63901,6 +63960,36 @@ function ChartFibSpeedResistanceFan()
                 this.Canvas.beginPath();
                 this.Canvas.moveTo(center.X,center.Y);
                 this.Canvas.lineTo(ptPre.X,ptPre.Y);
+
+                if (quadrant==1)
+                {   
+                    if (ptPre.X>=ptRightTop.X && pt.X<ptRightTop.X)
+                    {
+                        this.Canvas.lineTo(ptRightTop.X,ptRightTop.Y);
+                    }
+                }
+                else if (quadrant==2)
+                {
+                    if (ptPre.X<=ptLeftTop.X && pt.X>ptLeftTop.X)
+                    {
+                        this.Canvas.lineTo(ptLeftTop.X,ptLeftTop.Y);
+                    }
+                }
+                else if (quadrant==3)
+                {
+                    if (ptPre.X<=ptLeftBottom.X && pt.X>ptLeftBottom.X)
+                    {
+                        this.Canvas.lineTo(ptLeftBottom.X,ptLeftBottom.Y);
+                    }
+                }
+                else if (quadrant==4)
+                {
+                    if (ptPre.X>=ptRightBottom.X && pt.X<ptRightBottom.X)
+                    {
+                        this.Canvas.lineTo(ptRightBottom.X,ptRightBottom.Y);
+                    }
+                }
+
                 this.Canvas.lineTo(pt.X,pt.Y);
                 this.Canvas.closePath();
                 this.Canvas.fillStyle=clrArea;
@@ -63959,6 +64048,36 @@ function ChartFibSpeedResistanceFan()
                 this.Canvas.beginPath();
                 this.Canvas.moveTo(center.X,center.Y);
                 this.Canvas.lineTo(ptPre.X,ptPre.Y);
+
+                if (quadrant==1)
+                {
+                    if (ptPre.X<ptRightTop.X && pt.X>=ptRightTop.X)
+                    {
+                        this.Canvas.lineTo(ptRightTop.X,ptRightTop.Y);
+                    }
+                }
+                else if (quadrant==2)
+                {
+                    if (ptPre.X>ptLeftTop.X && pt.X<=ptLeftTop.X)
+                    {
+                        this.Canvas.lineTo(ptLeftTop.X,ptLeftTop.Y);
+                    }
+                }
+                else if (quadrant==3)
+                {
+                    if (ptPre.X>ptLeftBottom.X && pt.X<=ptLeftBottom.X)
+                    {
+                        this.Canvas.lineTo(ptLeftBottom.X,ptLeftBottom.Y);
+                    }
+                }
+                else if (quadrant==4)
+                {
+                    if (ptPre.X<ptRightBottom.X && pt.X>=ptRightBottom.X)
+                    {
+                        this.Canvas.lineTo(ptRightBottom.X,ptRightBottom.Y);
+                    }
+                }
+
                 this.Canvas.lineTo(pt.X,pt.Y);
                 this.Canvas.closePath();
                 this.Canvas.fillStyle=clrArea;
@@ -80071,6 +80190,7 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
     var symbol=data.stock[0].symbol;
     var upperSymbol=symbol.toUpperCase();
     var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);
+    var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);    //国内期货, 纽约期货交易所
     var minuteData={ Date:stock.date,  Data:[] , Symbol:symbol, Name:stock.name };
     var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_DAY_EXTENDDATA;  //扩展数据序号
     if (IFrameSplitOperator.IsNumber(stock.high)) minuteData.High=stock.high;
@@ -80078,13 +80198,15 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
     if (IFrameSplitOperator.IsNumber(stock.yclose)) minuteData.YClose=stock.yclose;
     if (IFrameSplitOperator.IsNumber(stock.YClearing)) minuteData.YClearing=stock.yclearing;
 
-    if (IFrameSplitOperator.IsNonEmptyArray(data.stock[0].minute))
+    if (IFrameSplitOperator.IsNonEmptyArray(stock.minute))
     {
         for(var i=0;i<stock.minute.length;++i)
         {
             var jsData=stock.minute[i];
             var item=new MinuteData();
     
+            item.YClearing=minuteData.YClearing;
+            item.YClose=minuteData.YClose;
             item.Date=jsData[0];
             item.Time=jsData[1];
             item.Open=jsData[2];
@@ -80106,6 +80228,10 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
             if (IFrameSplitOperator.IsNumber(minuteData.YClose) && item.Close) 
                 item.Increase=(item.Close-minuteData.YClose)/minuteData.YClose*100; //涨幅 (最新价格-昨收)/昨收*100;
     
+            if (isFutures && minuteData.YClearing && item.Close) 
+            item.Increase=(item.Close-minuteData.YClearing)/minuteData.YClearing*100; //涨幅 (最新价格-昨结算价)/昨结算价*100;
+
+                
             minuteData.Data.push(item);
         }
     }
@@ -128943,7 +129069,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12523";
+var HQCHART_VERSION="1.1.12539";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -55536,6 +55536,13 @@ function IChartDrawPicture()
                 pt2.Y=bottom;
                 return pt2;
             }
+            else if (b==0)
+            {
+                var pt2=new Point();
+                pt2.X=right;
+                pt2.Y=aryPoint[0].Y;
+                return pt2;
+            }
             else
             {
                 var b2=top-aryPoint[0].Y;
@@ -55573,6 +55580,13 @@ function IChartDrawPicture()
                 pt2.Y=bottom;
                 return pt2;
             }
+            else if (b==0)
+            {
+                var pt2=new Point();
+                pt2.X=left;
+                pt2.Y=aryPoint[0].Y;
+                return pt2;
+            }
             else
             {
                 var b2=top-aryPoint[0].Y;
@@ -63879,6 +63893,42 @@ function ChartFibSpeedResistanceFan()
         Opacity:0.3
     }
 
+    this.SetOption=function(option)
+    {
+        if (!option) return;
+
+        if (option.Font) this.Font=option.Font;
+        if (option.LineWidth) this.LineWidth=option.LineWidth;
+        if (IFrameSplitOperator.IsBool(option.EnableBGColor)) this.EnableBGColor=option.EnableBGColor;
+        if (option.AreaConfig) this.AreaConfig=option.AreaConfig;
+    }
+
+    //导出成存储格式
+    this.ExportStorageData=function()
+    {
+        var storageData=this.ExportBaseData();
+
+        storageData.Value=[];
+        for(var i=0;i<this.Value.length && i<this.PointCount;++i)
+        {
+            var item=this.Value[i];
+            storageData.Value.push( { XValue:item.XValue, YValue:item.YValue } );
+        }
+    
+        storageData.Font=this.Font;
+        storageData.EnableBGColor=this.EnableBGColor;
+        storageData.AreaConfig=CloneData(this.AreaConfig);
+
+        return storageData;
+    }
+
+    this.ImportStorageData=function(storageData)
+    {
+        if (storageData.Font) this.Font=storageData.Font;
+        if (IFrameSplitOperator.IsBool(storageData.EnableBGColor))  this.EnableBGColor=storageData.EnableBGColor;
+        if (storageData.AreaConfig) this.AreaConfig=storageData.AreaConfig;
+    }
+
     this.Draw=function()
     {
         this.LinePoint=[];
@@ -63921,6 +63971,13 @@ function ChartFibSpeedResistanceFan()
         var ptPre=null; //上一个点
         var clrArea=null;
         this.Canvas.font=this.Font;
+       
+        var border=this.Frame.GetBorder();
+        var ptLeftTop={ X:border.Left, Y:border.TopEx };
+        var ptRightTop={X:border.Right, Y:border.TopEx };
+        var ptLeftBottom={ X:border.Left, Y:border.BottomEx };
+        var ptRightBottom={ X:border.Right, Y:border.BottomEx };
+
         var textOffset=4;
         if (quadrant==1 || quadrant==4) 
         {
@@ -63932,6 +63989,8 @@ function ChartFibSpeedResistanceFan()
             this.Canvas.textAlign="left";
             textOffset=4;
         }
+
+
         this.Canvas.textBaseline="middle";
         for(var i=0;i<aryYData.length;++i)
         {
@@ -63945,6 +64004,36 @@ function ChartFibSpeedResistanceFan()
                 this.Canvas.beginPath();
                 this.Canvas.moveTo(center.X,center.Y);
                 this.Canvas.lineTo(ptPre.X,ptPre.Y);
+
+                if (quadrant==1)
+                {   
+                    if (ptPre.X>=ptRightTop.X && pt.X<ptRightTop.X)
+                    {
+                        this.Canvas.lineTo(ptRightTop.X,ptRightTop.Y);
+                    }
+                }
+                else if (quadrant==2)
+                {
+                    if (ptPre.X<=ptLeftTop.X && pt.X>ptLeftTop.X)
+                    {
+                        this.Canvas.lineTo(ptLeftTop.X,ptLeftTop.Y);
+                    }
+                }
+                else if (quadrant==3)
+                {
+                    if (ptPre.X<=ptLeftBottom.X && pt.X>ptLeftBottom.X)
+                    {
+                        this.Canvas.lineTo(ptLeftBottom.X,ptLeftBottom.Y);
+                    }
+                }
+                else if (quadrant==4)
+                {
+                    if (ptPre.X>=ptRightBottom.X && pt.X<ptRightBottom.X)
+                    {
+                        this.Canvas.lineTo(ptRightBottom.X,ptRightBottom.Y);
+                    }
+                }
+
                 this.Canvas.lineTo(pt.X,pt.Y);
                 this.Canvas.closePath();
                 this.Canvas.fillStyle=clrArea;
@@ -64003,6 +64092,36 @@ function ChartFibSpeedResistanceFan()
                 this.Canvas.beginPath();
                 this.Canvas.moveTo(center.X,center.Y);
                 this.Canvas.lineTo(ptPre.X,ptPre.Y);
+
+                if (quadrant==1)
+                {
+                    if (ptPre.X<ptRightTop.X && pt.X>=ptRightTop.X)
+                    {
+                        this.Canvas.lineTo(ptRightTop.X,ptRightTop.Y);
+                    }
+                }
+                else if (quadrant==2)
+                {
+                    if (ptPre.X>ptLeftTop.X && pt.X<=ptLeftTop.X)
+                    {
+                        this.Canvas.lineTo(ptLeftTop.X,ptLeftTop.Y);
+                    }
+                }
+                else if (quadrant==3)
+                {
+                    if (ptPre.X>ptLeftBottom.X && pt.X<=ptLeftBottom.X)
+                    {
+                        this.Canvas.lineTo(ptLeftBottom.X,ptLeftBottom.Y);
+                    }
+                }
+                else if (quadrant==4)
+                {
+                    if (ptPre.X<ptRightBottom.X && pt.X>=ptRightBottom.X)
+                    {
+                        this.Canvas.lineTo(ptRightBottom.X,ptRightBottom.Y);
+                    }
+                }
+
                 this.Canvas.lineTo(pt.X,pt.Y);
                 this.Canvas.closePath();
                 this.Canvas.fillStyle=clrArea;
@@ -80115,6 +80234,7 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
     var symbol=data.stock[0].symbol;
     var upperSymbol=symbol.toUpperCase();
     var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);
+    var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);    //国内期货, 纽约期货交易所
     var minuteData={ Date:stock.date,  Data:[] , Symbol:symbol, Name:stock.name };
     var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_DAY_EXTENDDATA;  //扩展数据序号
     if (IFrameSplitOperator.IsNumber(stock.high)) minuteData.High=stock.high;
@@ -80122,13 +80242,15 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
     if (IFrameSplitOperator.IsNumber(stock.yclose)) minuteData.YClose=stock.yclose;
     if (IFrameSplitOperator.IsNumber(stock.YClearing)) minuteData.YClearing=stock.yclearing;
 
-    if (IFrameSplitOperator.IsNonEmptyArray(data.stock[0].minute))
+    if (IFrameSplitOperator.IsNonEmptyArray(stock.minute))
     {
         for(var i=0;i<stock.minute.length;++i)
         {
             var jsData=stock.minute[i];
             var item=new MinuteData();
     
+            item.YClearing=minuteData.YClearing;
+            item.YClose=minuteData.YClose;
             item.Date=jsData[0];
             item.Time=jsData[1];
             item.Open=jsData[2];
@@ -80150,6 +80272,10 @@ MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
             if (IFrameSplitOperator.IsNumber(minuteData.YClose) && item.Close) 
                 item.Increase=(item.Close-minuteData.YClose)/minuteData.YClose*100; //涨幅 (最新价格-昨收)/昨收*100;
     
+            if (isFutures && minuteData.YClearing && item.Close) 
+            item.Increase=(item.Close-minuteData.YClearing)/minuteData.YClearing*100; //涨幅 (最新价格-昨结算价)/昨结算价*100;
+
+                
             minuteData.Data.push(item);
         }
     }
@@ -129096,7 +129222,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12523";
+var HQCHART_VERSION="1.1.12539";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.wechat/umychart.version.wechat.js

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

package/src/jscommon/umychart.wechat/umychart.wechat.3.0.js

@@ -9134,6 +9134,12 @@ function MinuteChartContainer(uielement)
 
     this.RecvMinuteData = function (data) 
     {
+        if (data.data && data.data.dataType===1)   //增量更新数据模式
+        {
+            this.RecvUpdateMinuteData(data.data);
+            return;
+        }
+
         var aryMinuteData = MinuteChartContainer.JsonDataToMinuteData(data.data);
 
         if (this.DayCount > 1)    //多日走势图
@@ -9205,6 +9211,135 @@ function MinuteChartContainer(uielement)
         this.AutoUpdate();
     }
 
+    this.RecvUpdateMinuteData=function(data)
+    {
+        var minuteData=MinuteChartContainer.JsonDataToUpdateMinuteData(data);
+
+        if (this.DayCount > 1)    //多日走势图
+        {
+            this.UpdateLatestMinuteDataV2(minuteData);
+            this.UpdateHistoryMinuteUI();
+            this.RecvMinuteDataEvent();
+            this.RequestOverlayMinuteData();    //更新最新叠加数据
+            this.BindAllOverlayIndexData(this.SourceData);
+            if (typeof (this.UpdateUICallback) == 'function') this.UpdateUICallback('RecvMinuteData', this);
+            this.AutoUpdate();
+            return;
+        }
+
+        this.UpdateLatestMinuteDataV2(minuteData);
+        var sourceData=this.SourceData;
+        var aryMinuteData=this.SourceData.Data;
+        var upperSymbol = this.Symbol.toUpperCase();
+        var isFutures = MARKET_SUFFIX_NAME.IsFutures(upperSymbol);
+        var yClose=minuteData.YClose;
+        if (data.stock[0].yclearing && isFutures) yClose = data.stock[0].yclearing; //期货使用前结算价
+        this.CaclutateLimitPrice(yClose, data.stock[0].limitprice); //计算涨停价格
+        var extendData = { High: data.stock[0].high, Low: data.stock[0].low };
+        this.BindMainData(sourceData, yClose, extendData);
+
+        for (var i=0;i<this.Frame.SubFrame.length;++i)  //把股票代码设置到X轴刻度类里
+        {
+            var item = this.Frame.SubFrame[i];
+            item.Frame.XSplitOperator.Symbol = this.Symbol;
+            item.Frame.XSplitOperator.DayCount = 1;
+            item.Frame.XSplitOperator.Operator();   //调整X轴个数
+            item.Frame.YSplitOperator.Symbol = this.Symbol;
+        }
+
+        //计算指标
+        if (this.Frame.SubFrame.length > 2) 
+        {
+            var bindData = new ChartData();
+            bindData.Data = aryMinuteData;
+            for (var i = 2; i < this.Frame.SubFrame.length; ++i) 
+            {
+                this.BindIndexData(i, bindData);
+            }
+        }
+
+        var chartInfo = this.GetChartMinuteInfo();
+        if (chartInfo) chartInfo.SourceData = this.SourceData;    //数据绑定到信息地雷上
+        this.RecvMinuteDataEvent();
+        this.RequestMinuteInfoData();
+        this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
+
+        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+        this.Frame.SetSizeChage(true);
+        this.Draw();
+
+        this.BindAllOverlayIndexData(this.SourceData);
+
+        if (typeof (this.UpdateUICallback) == 'function') this.UpdateUICallback('RecvMinuteData', this);
+
+        this.AutoUpdate();
+    }
+
+    //更新最新的几条数据
+    this.UpdateLatestMinuteDataV2=function(minuteData)
+    {
+        if (this.DayCount>1)
+        {
+            if (!this.DayData) return;
+
+            var findItem=null;
+            for(var i=0; i<this.DayData.length; ++i)
+            {
+                var item=this.DayData[i];
+                if (item.Date===date)  
+                {
+                    findItem=item;
+                    break;
+                }
+            }
+    
+            if (!findItem) return;
+    
+            var findIndex=-1;
+            var firstItem=minuteData.Data[0];
+            for(var i=0;i<findItem.Data.length;++i)
+            {
+                var item=findItem.Data[i];
+                
+                if (item.Date==firstItem.Date && item.Time==firstItem.Time)
+                {
+                    findIndex=i;
+                    break;
+                }
+            }
+    
+            if (findIndex<0) findIndex=findItem.Data.length;
+            for(var i=0, j=findIndex; i<minuteData.Data.length; ++i, ++j)
+            {
+                var item=minuteData.Data[i];
+                findItem.Data[j]=item;
+            }
+        }
+        else
+        {
+            if (!this.SourceData) return;
+            var findIndex=-1;
+            var firstItem=minuteData.Data[0];
+            for(var i=0;i<this.SourceData.Data.length;++i)
+            {
+                var item=this.SourceData.Data[i];
+                if (item.Date==firstItem.Date && item.Time==firstItem.Time)
+                {
+                    findIndex=i;
+                    break;
+                }
+            }
+
+            if (findIndex<0) findIndex=this.SourceData.Data.length;
+            for(var i=0, j=findIndex; i<minuteData.Data.length; ++i, ++j)
+            {
+                var item=minuteData.Data[i];
+                this.SourceData.Data[j]=item;
+            }
+        }
+        
+    }
+
     //请求叠加数据 (主数据下载完再下载))
     this.RequestOverlayMinuteData = function () 
     {
@@ -9938,6 +10073,67 @@ MinuteChartContainer.JsonDataToMinuteDataArray = function (data)
     return result;
 }
 
+//分钟增量数据  stock: [ { date:, yclose:， yclearing: , minute:[ [],]}  0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌 11=领先指标 ]
+MinuteChartContainer.JsonDataToUpdateMinuteData=function(data)
+{
+    if (!data || !data.stock) return null;
+    var stock=data.stock[0];
+    if (!IFrameSplitOperator.IsNumber(stock.date)) return null;
+
+    var symbol=data.stock[0].symbol;
+    var upperSymbol=symbol.toUpperCase();
+    var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);
+    var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);    //国内期货, 纽约期货交易所
+    var minuteData={ Date:stock.date,  Data:[] , Symbol:symbol, Name:stock.name };
+    var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_DAY_EXTENDDATA;  //扩展数据序号
+    if (IFrameSplitOperator.IsNumber(stock.high)) minuteData.High=stock.high;
+    if (IFrameSplitOperator.IsNumber(stock.low)) minuteData.Low=stock.low;
+    if (IFrameSplitOperator.IsNumber(stock.yclose)) minuteData.YClose=stock.yclose;
+    if (IFrameSplitOperator.IsNumber(stock.YClearing)) minuteData.YClearing=stock.yclearing;
+
+    if (IFrameSplitOperator.IsNumber(stock.high)) minuteData.High=stock.high;
+    if (IFrameSplitOperator.IsNumber(stock.low)) minuteData.Low=stock.low;
+    if (IFrameSplitOperator.IsNumber(stock.yclose)) minuteData.YClose=stock.yclose;
+    if (IFrameSplitOperator.IsNumber(stock.YClearing)) minuteData.YClearing=stock.yclearing;
+
+    if (!IFrameSplitOperator.IsNonEmptyArray(stock.minute)) return minuteData;
+
+    for(var i=0;i<stock.minute.length;++i)
+    {
+        var jsData=stock.minute[i];
+        var item=new MinuteData();
+
+        item.YClearing=minuteData.YClearing;
+        item.YClose=minuteData.YClose;
+        item.Date=jsData[0];
+        item.Time=jsData[1];
+        item.Open=jsData[2];
+        item.High=jsData[3];
+        item.Low=jsData[4];
+        item.Close=jsData[5];
+        item.AvPrice=jsData[6];
+        item.Vol=jsData[7];
+        item.Amount=jsData[8];
+        if (IFrameSplitOperator.IsNumber(jsData[9])) item.Increase=jsData[9];
+        if (IFrameSplitOperator.IsNumber(jsData[10])) item.Risefall=jsData[10];
+        if (IFrameSplitOperator.IsNumber(jsData[11])) item.Lead=jsData[11];
+
+        if (jsData[extendDataIndex]) item.ExtendData=jsData[extendDataIndex];
+        item.DateTime=item.Date.toString()+" "+item.Time.toString();
+        if (isSHSZ) item.Vol=item.Vol/100; //沪深股票原始单位股
+
+        if (IFrameSplitOperator.IsNumber(minuteData.YClose) && item.Close) 
+            item.Increase=(item.Close-minuteData.YClose)/minuteData.YClose*100; //涨幅 (最新价格-昨收)/昨收*100;
+
+        if (isFutures && minuteData.YClearing && item.Close) 
+            item.Increase=(item.Close-minuteData.YClearing)/minuteData.YClearing*100; //涨幅 (最新价格-昨结算价)/昨结算价*100;
+
+        minuteData.Data.push(item);
+    }
+
+    return minuteData;
+}
+
 /*
     历史分钟走势图
 */