hqchart 1.1.12522 → 1.1.12536

package/lib/umychart.vue.js

@@ -5683,6 +5683,7 @@ this.EnableSave=true;//是否允许保存
 this.EnableCtrlMove=false;//是否按住Ctrl才能移动
 this.OnlyMoveXIndex=false;//只能在X轴刻度上移动
 this.IsSupportMagnet=false;//是否支持磁吸
+this.EnableMoveCheck=true;//允许移动时监测是否超出边界
 this.IsDrawFirst=false;this.IsShowYCoordinate=false;//是否在Y轴显示点的刻度
 this.LineColor=g_JSChartResource.DrawPicture.LineColor[0];//线段颜色
 //this.LineColor="#1e90ff";      //线段颜色，input type="color" 不支持rgb和rgba 的格式
@@ -5704,7 +5705,9 @@ this.ValueToPoint=function(){if(!this.Frame)return false;var data=this.Frame.Dat
 var isHScreen=this.Frame.IsHScreen;this.Point=[];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,false);pt.X=this.Frame.GetYFromData(item.YValue,false);}else{pt.X=this.Frame.GetXFromIndex(item.XValue-data.DataOffset,false);pt.Y=this.Frame.GetYFromData(item.YValue,false);}this.Point[i]=pt;}};this.UpdateXValue=function()//通过datetime更新x的索引
 {if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;var aryDateTime=[];for(var i=0;i<this.Value.length;++i){var item=this.Value[i];if(!item.DateTime)break;var dateTime={Date:item.DateTime.Date};if(IFrameSplitOperator.IsNumber(item.DateTime.Time))dateTime.Time=item.DateTime.Time;aryDateTime[i]=dateTime;}data.FindDataIndexByDateTime(aryDateTime);for(var i in aryDateTime){var findItem=aryDateTime[i];var valueItem=this.Value[i];if(findItem.Index>=0)valueItem.XValue=findItem.Index;}};//xStep,yStep 移动的偏移量
 this.Move=function(xStep,yStep){if(this.Status!=20)return fasle;if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;if(this.MovePointIndex==null)return false;var index=parseInt(this.MovePointIndex);if(index===100)//整体移动
-{for(var i in this.Point){this.Point[i].X+=xStep;this.Point[i].Y+=yStep;}}else if(index===0||index===1||index===2||index===3||index===4||index===5){if(index<this.Point.length){this.Point[index].X+=xStep;this.Point[index].Y+=yStep;}}else{return false;}};this.ClipFrame=function(){if(this.Frame.IsHScreen){var left=this.Frame.ChartBorder.GetLeftEx();var top=this.Frame.ChartBorder.GetTop();var width=this.Frame.ChartBorder.GetWidthEx();var height=this.Frame.ChartBorder.GetHeight();}else{var left=this.Frame.ChartBorder.GetLeft();var top=this.Frame.ChartBorder.GetTopEx();var width=this.Frame.ChartBorder.GetWidth();var height=this.Frame.ChartBorder.GetHeightEx();}this.Canvas.save();this.Canvas.beginPath();this.Canvas.rect(left,top,width,height);this.Canvas.clip();};//计算需要画的点的坐标option:{IsCheckX:是否检测X值, IsCheckY:是否检测Y值}
+{if(this.IsMoveOutOfBounds(this.Point,xStep,yStep))return false;for(var i in this.Point){this.Point[i].X+=xStep;this.Point[i].Y+=yStep;}}else if(index===0||index===1||index===2||index===3||index===4||index===5){if(index<this.Point.length){this.Point[index].X+=xStep;this.Point[index].Y+=yStep;}}else{return false;}};//是否超出边界了
+this.IsMoveOutOfBounds=function(aryPoint,xStep,yStep){if(!this.EnableMoveCheck)return false;if(!this.Frame)return false;if(this.Frame.ClassName=="MinuteFrame"||this.Frame.Class=="MinuteHScreenFrame")return false;var data=this.Frame.Data;if(!data)return false;if(!IFrameSplitOperator.IsNonEmptyArray(data.Data))return false;if(!IFrameSplitOperator.IsNonEmptyArray(aryPoint))return false;var isHScreen=this.Frame.IsHScreen;if(isHScreen){//TODO:横屏以后再做
+return false;}else{var offset=data.DataOffset;var startIndex=0-offset;var endIndex=data.Data.length-offset;if(xStep>0){var xEnd=this.Frame.GetXFromIndex(endIndex-1,false);for(var i=0;i<aryPoint.length;++i){var item=aryPoint[i];if(item.X+xStep>xEnd)return true;}}else if(xStep<0){var xStart=this.Frame.GetXFromIndex(startIndex,false);for(var i=0;i<aryPoint.length;++i){var item=aryPoint[i];if(item.X+xStep<xStart)return true;}}return false;}};this.ClipFrame=function(){if(this.Frame.IsHScreen){var left=this.Frame.ChartBorder.GetLeftEx();var top=this.Frame.ChartBorder.GetTop();var width=this.Frame.ChartBorder.GetWidthEx();var height=this.Frame.ChartBorder.GetHeight();}else{var left=this.Frame.ChartBorder.GetLeft();var top=this.Frame.ChartBorder.GetTopEx();var width=this.Frame.ChartBorder.GetWidth();var height=this.Frame.ChartBorder.GetHeightEx();}this.Canvas.save();this.Canvas.beginPath();this.Canvas.rect(left,top,width,height);this.Canvas.clip();};//计算需要画的点的坐标option:{IsCheckX:是否检测X值, IsCheckY:是否检测Y值}
 this.CalculateDrawPoint=function(option){if(this.Status<2)return null;if(!this.Point.length||!this.Frame)return null;var drawPoint=[];if(this.Status==10){var data=this.Frame.Data;if(!data)return null;var showCount=this.Frame.XPointCount;var invaildX=0;//超出范围的x点个数
 var isHScreen=this.Frame.IsHScreen;for(var i=0;i<this.Value.length;++i){var item=this.Value[i];var dataIndex=item.XValue-data.DataOffset;if(dataIndex<0||dataIndex>=showCount)++invaildX;var pt=new Point();if(isHScreen)//横屏X,Y对调
 {pt.Y=this.Frame.GetXFromIndex(item.XValue-data.DataOffset,false);pt.X=this.Frame.GetYFromData(item.YValue,false);}else{pt.X=this.Frame.GetXFromIndex(item.XValue-data.DataOffset,false);pt.Y=this.Frame.GetYFromData(item.YValue,false);}drawPoint.push(pt);}if(option&&option.IsCheckX===true){if(invaildX==this.Value.length)return null;}}else//移动中
@@ -5778,6 +5781,7 @@ this.Canvas.restore();};this.GetYCoordinatePoint=function(){if(this.IsFrameMinSi
 var aryPoint=[];for(var i=0;i<this.Value.length;++i){var item=this.Value[i];var y=this.Frame.GetYFromData(item.YValue,false);aryPoint.push({Y:y,YValue:item.YValue,Item:item,Color:this.PointColor});}return aryPoint;};}//画图工具-涂鸦线段 Y轴关联数值， X轴不关联
 function ChartDrawGraffitiLine(){this.newMethod=IChartDrawPicture;//派生
 this.newMethod();delete this.newMethod;this.ClassName='ChartDrawGraffitiLine';this.IsPointIn=this.IsPointIn_XYValue_Line;this.GetXYCoordinate=null;this.PointCount=2;//画点的个数
+this.EnableMoveCheck=false;//允许移动时不监测是否超出边界
 this.PointToValue=function(){if(!this.Frame)return false;var isHScreen=this.Frame.IsHScreen;if(isHScreen){for(var i=0;i<this.Point.length;++i){var item=this.Point[i];var yValue=this.Frame.GetYData(item.X);var valueItem={XValue:item.Y,YValue:yValue};this.Value[i]=valueItem;}}else{for(var i=0;i<this.Point.length;++i){var item=this.Point[i];var yValue=this.Frame.GetYData(item.Y);var valueItem={XValue:item.X,YValue:yValue};this.Value[i]=valueItem;}}return true;};//Value => Point
 this.ValueToPoint=function(){if(!this.Frame)return false;var isHScreen=this.Frame.IsHScreen;this.Point=[];for(var i in this.Value){var item=this.Value[i];var pt=new Point();if(isHScreen){pt.Y=item.XValue;pt.X=this.Frame.GetYFromData(item.YValue);}else{pt.X=item.XValue;pt.Y=this.Frame.GetYFromData(item.YValue,false);}this.Point[i]=pt;}};this.UpdateXValue=function()//通过datetime更新x的索引
 {};this.CalculateDrawPoint=function(option){if(this.Status<2)return null;if(!this.Point.length||!this.Frame)return null;var drawPoint=[];if(this.Status==10){var isHScreen=this.Frame.IsHScreen;for(var i in this.Value){var item=this.Value[i];var pt=new Point();if(isHScreen)//横屏X,Y对调
@@ -5852,7 +5856,7 @@ function ChartDrawPictureTrendLine(){this.newMethod=IChartDrawPicture;//派生
 this.newMethod();delete this.newMethod;this.ClassName='ChartDrawPictureTrendLine';this.IsPointIn=this.IsPointIn_XYValue_Line;this.GetXYCoordinate=this.GetXYCoordinate_default;this.OnlyMoveXIndex=true;this.IsSupportMagnet=true;this.Draw=function(){this.LinePoint=[];if(this.IsFrameMinSize())return;var drawPoint=this.CalculateDrawPoint({IsCheckX:false,IsCheckY:false});if(!drawPoint||drawPoint.length!=2)return;var ptStart=drawPoint[0];var ptEnd=drawPoint[1];var extendLine=this.CalculateExtendLinePoint(ptStart,ptEnd);this.ClipFrame();this.Canvas.strokeStyle=this.LineColor;this.SetLineWidth();this.Canvas.beginPath();this.Canvas.moveTo(extendLine.Start.X,extendLine.Start.Y);this.Canvas.lineTo(extendLine.End.X,extendLine.End.Y);this.Canvas.stroke();this.RestoreLineWidth();var line={Start:ptStart,End:ptEnd};this.LinePoint.push(line);this.DrawPoint(drawPoint);//画点
 this.Canvas.restore();};}//画图工具-矩形
 function ChartDrawPictureRect(){this.newMethod=IChartDrawPicture;//派生
-this.newMethod();delete this.newMethod;this.ClassName='ChartDrawPictureRect';this.GetXYCoordinate=this.GetXYCoordinate_default;this.Draw=function(){if(this.IsFrameMinSize())return;var drawPoint=this.CalculateDrawPoint({IsCheckX:true,IsCheckY:true});if(!drawPoint||drawPoint.length!=2)return;this.AreaColor=IChartDrawPicture.ColorToRGBA(this.LineColor,0.3);this.ClipFrame();this.Canvas.strokeStyle=this.LineColor;this.SetLineWidth();this.Canvas.beginPath();this.Canvas.rect(drawPoint[0].X,drawPoint[0].Y,drawPoint[1].X-drawPoint[0].X,drawPoint[1].Y-drawPoint[0].Y);this.Canvas.stroke();this.RestoreLineWidth();//透明背景
+this.newMethod();delete this.newMethod;this.ClassName='ChartDrawPictureRect';this.GetXYCoordinate=this.GetXYCoordinate_default;this.OnlyMoveXIndex=true;this.IsSupportMagnet=true;this.Draw=function(){if(this.IsFrameMinSize())return;var drawPoint=this.CalculateDrawPoint({IsCheckX:true,IsCheckY:true});if(!drawPoint||drawPoint.length!=2)return;this.AreaColor=IChartDrawPicture.ColorToRGBA(this.LineColor,0.3);this.ClipFrame();this.Canvas.strokeStyle=this.LineColor;this.SetLineWidth();this.Canvas.beginPath();this.Canvas.rect(drawPoint[0].X,drawPoint[0].Y,drawPoint[1].X-drawPoint[0].X,drawPoint[1].Y-drawPoint[0].Y);this.Canvas.stroke();this.RestoreLineWidth();//透明背景
 this.Canvas.fillStyle=this.AreaColor;this.Canvas.beginPath();this.Canvas.fillRect(drawPoint[0].X,drawPoint[0].Y,drawPoint[1].X-drawPoint[0].X,drawPoint[1].Y-drawPoint[0].Y);this.Canvas.restore();//画点
 this.DrawPoint(drawPoint);};//0-10 鼠标对应的点索引   100=鼠标在正个图形上  -1 鼠标不在图形上
 this.IsPointIn=function(x,y,option){if(this.IsFrameMinSize())return-1;if(!this.Frame||this.Status!=10)return-1;var data=this.Frame.Data;if(!data)return-1;var nIndex=this.IsPointInXYValue(x,y,option);if(nIndex>=0)return nIndex;var aryPoint=this.CalculateDrawPoint({IsCheckX:true,IsCheckY:true});if(!aryPoint||aryPoint.length!=2)return-1;//是否在矩形边框上
@@ -7916,9 +7920,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);//上海股票期权
@@ -12634,7 +12640,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.12521";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.12535";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.12522",
+  "version": "1.1.12536",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -50645,6 +50645,7 @@ function IChartDrawPicture()
     this.EnableCtrlMove=false;  //是否按住Ctrl才能移动
     this.OnlyMoveXIndex=false;  //只能在X轴刻度上移动
     this.IsSupportMagnet=false; //是否支持磁吸
+    this.EnableMoveCheck=true;  //允许移动时监测是否超出边界
 
     this.IsDrawFirst=false;
     this.IsShowYCoordinate=false;    //是否在Y轴显示点的刻度
@@ -50993,6 +50994,8 @@ function IChartDrawPicture()
         var index=parseInt(this.MovePointIndex);
         if (index===100)    //整体移动
         {
+            if (this.IsMoveOutOfBounds(this.Point, xStep, yStep)) return false;
+
             for(var i in this.Point)
             {
                 this.Point[i].X+=xStep;
@@ -51013,6 +51016,56 @@ function IChartDrawPicture()
         }
     }
 
+    //是否超出边界了
+    this.IsMoveOutOfBounds=function(aryPoint,xStep,yStep)
+    {
+        if (!this.EnableMoveCheck) return false;
+
+        if (!this.Frame) return false;
+
+        if (this.Frame.ClassName=="MinuteFrame" || this.Frame.Class=="MinuteHScreenFrame")
+            return false;
+
+        
+        var data=this.Frame.Data;
+        if (!data) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.Data)) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryPoint)) return false;
+        var isHScreen=this.Frame.IsHScreen;
+        if (isHScreen) 
+        {
+            //TODO:横屏以后再做
+            return false;
+        }
+        else
+        {
+            var offset=data.DataOffset;
+            var startIndex=0-offset;
+            var endIndex=data.Data.length-offset;
+
+            if (xStep>0)
+            {
+                var xEnd=this.Frame.GetXFromIndex(endIndex-1,false);
+                for(var i=0;i<aryPoint.length;++i)
+                {
+                    var item=aryPoint[i];
+                    if (item.X+xStep>xEnd) return true;
+                }
+            }
+            else if (xStep<0)
+            {
+                var xStart=this.Frame.GetXFromIndex(startIndex,false);
+                for(var i=0;i<aryPoint.length;++i)
+                {
+                    var item=aryPoint[i];
+                    if (item.X+xStep<xStart) return true;
+                }
+            }
+
+            return false;
+        }
+    }
+
     this.ClipFrame=function()
     {
         if (this.Frame.IsHScreen)
@@ -52145,6 +52198,7 @@ function ChartDrawGraffitiLine()
     this.IsPointIn=this.IsPointIn_XYValue_Line;
     this.GetXYCoordinate=null;
     this.PointCount=2;                          //画点的个数
+    this.EnableMoveCheck=false;                 //允许移动时不监测是否超出边界
 
     this.PointToValue=function()
     {
@@ -53169,6 +53223,8 @@ function ChartDrawPictureRect()
 
     this.ClassName='ChartDrawPictureRect';
     this.GetXYCoordinate=this.GetXYCoordinate_default;
+    this.OnlyMoveXIndex=true;
+    this.IsSupportMagnet=true;
 
     this.Draw=function()
     {
@@ -75935,6 +75991,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;
@@ -75942,13 +75999,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];
@@ -75970,6 +76029,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

@@ -54725,6 +54725,7 @@ function IChartDrawPicture()
     this.EnableCtrlMove=false;  //是否按住Ctrl才能移动
     this.OnlyMoveXIndex=false;  //只能在X轴刻度上移动
     this.IsSupportMagnet=false; //是否支持磁吸
+    this.EnableMoveCheck=true;  //允许移动时监测是否超出边界
 
     this.IsDrawFirst=false;
     this.IsShowYCoordinate=false;    //是否在Y轴显示点的刻度
@@ -55073,6 +55074,8 @@ function IChartDrawPicture()
         var index=parseInt(this.MovePointIndex);
         if (index===100)    //整体移动
         {
+            if (this.IsMoveOutOfBounds(this.Point, xStep, yStep)) return false;
+
             for(var i in this.Point)
             {
                 this.Point[i].X+=xStep;
@@ -55093,6 +55096,56 @@ function IChartDrawPicture()
         }
     }
 
+    //是否超出边界了
+    this.IsMoveOutOfBounds=function(aryPoint,xStep,yStep)
+    {
+        if (!this.EnableMoveCheck) return false;
+
+        if (!this.Frame) return false;
+
+        if (this.Frame.ClassName=="MinuteFrame" || this.Frame.Class=="MinuteHScreenFrame")
+            return false;
+
+        
+        var data=this.Frame.Data;
+        if (!data) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.Data)) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryPoint)) return false;
+        var isHScreen=this.Frame.IsHScreen;
+        if (isHScreen) 
+        {
+            //TODO:横屏以后再做
+            return false;
+        }
+        else
+        {
+            var offset=data.DataOffset;
+            var startIndex=0-offset;
+            var endIndex=data.Data.length-offset;
+
+            if (xStep>0)
+            {
+                var xEnd=this.Frame.GetXFromIndex(endIndex-1,false);
+                for(var i=0;i<aryPoint.length;++i)
+                {
+                    var item=aryPoint[i];
+                    if (item.X+xStep>xEnd) return true;
+                }
+            }
+            else if (xStep<0)
+            {
+                var xStart=this.Frame.GetXFromIndex(startIndex,false);
+                for(var i=0;i<aryPoint.length;++i)
+                {
+                    var item=aryPoint[i];
+                    if (item.X+xStep<xStart) return true;
+                }
+            }
+
+            return false;
+        }
+    }
+
     this.ClipFrame=function()
     {
         if (this.Frame.IsHScreen)
@@ -56225,6 +56278,7 @@ function ChartDrawGraffitiLine()
     this.IsPointIn=this.IsPointIn_XYValue_Line;
     this.GetXYCoordinate=null;
     this.PointCount=2;                          //画点的个数
+    this.EnableMoveCheck=false;                 //允许移动时不监测是否超出边界
 
     this.PointToValue=function()
     {
@@ -57249,6 +57303,8 @@ function ChartDrawPictureRect()
 
     this.ClassName='ChartDrawPictureRect';
     this.GetXYCoordinate=this.GetXYCoordinate_default;
+    this.OnlyMoveXIndex=true;
+    this.IsSupportMagnet=true;
 
     this.Draw=function()
     {
@@ -80015,6 +80071,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;
@@ -80022,13 +80079,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];
@@ -80050,6 +80109,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);
         }
     }
@@ -128887,7 +128950,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12521";
+var HQCHART_VERSION="1.1.12535";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -54769,6 +54769,7 @@ function IChartDrawPicture()
     this.EnableCtrlMove=false;  //是否按住Ctrl才能移动
     this.OnlyMoveXIndex=false;  //只能在X轴刻度上移动
     this.IsSupportMagnet=false; //是否支持磁吸
+    this.EnableMoveCheck=true;  //允许移动时监测是否超出边界
 
     this.IsDrawFirst=false;
     this.IsShowYCoordinate=false;    //是否在Y轴显示点的刻度
@@ -55117,6 +55118,8 @@ function IChartDrawPicture()
         var index=parseInt(this.MovePointIndex);
         if (index===100)    //整体移动
         {
+            if (this.IsMoveOutOfBounds(this.Point, xStep, yStep)) return false;
+
             for(var i in this.Point)
             {
                 this.Point[i].X+=xStep;
@@ -55137,6 +55140,56 @@ function IChartDrawPicture()
         }
     }
 
+    //是否超出边界了
+    this.IsMoveOutOfBounds=function(aryPoint,xStep,yStep)
+    {
+        if (!this.EnableMoveCheck) return false;
+
+        if (!this.Frame) return false;
+
+        if (this.Frame.ClassName=="MinuteFrame" || this.Frame.Class=="MinuteHScreenFrame")
+            return false;
+
+        
+        var data=this.Frame.Data;
+        if (!data) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.Data)) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryPoint)) return false;
+        var isHScreen=this.Frame.IsHScreen;
+        if (isHScreen) 
+        {
+            //TODO:横屏以后再做
+            return false;
+        }
+        else
+        {
+            var offset=data.DataOffset;
+            var startIndex=0-offset;
+            var endIndex=data.Data.length-offset;
+
+            if (xStep>0)
+            {
+                var xEnd=this.Frame.GetXFromIndex(endIndex-1,false);
+                for(var i=0;i<aryPoint.length;++i)
+                {
+                    var item=aryPoint[i];
+                    if (item.X+xStep>xEnd) return true;
+                }
+            }
+            else if (xStep<0)
+            {
+                var xStart=this.Frame.GetXFromIndex(startIndex,false);
+                for(var i=0;i<aryPoint.length;++i)
+                {
+                    var item=aryPoint[i];
+                    if (item.X+xStep<xStart) return true;
+                }
+            }
+
+            return false;
+        }
+    }
+
     this.ClipFrame=function()
     {
         if (this.Frame.IsHScreen)
@@ -56269,6 +56322,7 @@ function ChartDrawGraffitiLine()
     this.IsPointIn=this.IsPointIn_XYValue_Line;
     this.GetXYCoordinate=null;
     this.PointCount=2;                          //画点的个数
+    this.EnableMoveCheck=false;                 //允许移动时不监测是否超出边界
 
     this.PointToValue=function()
     {
@@ -57293,6 +57347,8 @@ function ChartDrawPictureRect()
 
     this.ClassName='ChartDrawPictureRect';
     this.GetXYCoordinate=this.GetXYCoordinate_default;
+    this.OnlyMoveXIndex=true;
+    this.IsSupportMagnet=true;
 
     this.Draw=function()
     {
@@ -80059,6 +80115,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;
@@ -80066,13 +80123,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];
@@ -80094,6 +80153,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);
         }
     }
@@ -129040,7 +129103,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12521";
+var HQCHART_VERSION="1.1.12535";
 
 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.12534";
 
 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,134 @@ 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);
+        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 +10072,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;
+}
+
 /*
     历史分钟走势图
 */