hqchart 1.1.12459 → 1.1.12470

package/src/jscommon/umychart.complier.js

@@ -19008,6 +19008,9 @@ function ScriptIndex(name,script,args,option)
     this.IsSync=false;      //是否是同步计算 (无数据请求)
     this.IsShow=true;       //是否显示图形
 
+    this.RunCount=0;        //已执行次数
+    this.MaxRunCount=-1;    //最大执行次数 -1=无限
+
     if (option)
     {
         if (option.FloatPrecision>=0) this.FloatPrecision=option.FloatPrecision;
@@ -19023,6 +19026,7 @@ function ScriptIndex(name,script,args,option)
         if (option.OutName) this.OutName=option.OutName;
         if (IFrameSplitOperator.IsNumber(option.YSplitType)) this.YSplitType=option.YSplitType;
         if (IFrameSplitOperator.IsBool(option.IsSync)) this.IsSync=option.IsSync;
+        if (IFrameSplitOperator.IsNumber(option.MaxRunCount)) this.MaxRunCount=option.MaxRunCount;
 
         if (option.Debug) 
         {
@@ -19092,6 +19096,14 @@ function ScriptIndex(name,script,args,option)
         }
     }
 
+    //是否超出执行的最大次数
+    this.IsExcessRunCount=function()
+    {
+        if (this.MaxRunCount<=0) return false;   //没有限制
+
+        return this.RunCount>=this.MaxRunCount;
+    }
+
     this.ExecuteScript=function(hqChart,windowIndex,hisData)
     {
         this.OutVar=[];
@@ -19161,6 +19173,7 @@ function ScriptIndex(name,script,args,option)
             return;
         }
 
+        ++this.RunCount;
         let code=this.Script;
         let run=JSComplier.Execute(code,option,hqChart.ScriptErrorCallback);
     }
@@ -22204,6 +22217,8 @@ function APIScriptIndex(name,script,args,option, isOverlay)
         if (hqDataType==HQ_DATA_TYPE.MULTIDAY_MINUTE_ID || hqDataType==HQ_DATA_TYPE.MINUTE_ID) postData.daycount=hqChart.DayCount;
         this.HQDataType=hqDataType;
 
+        ++this.RunCount;
+
         if (hqChart.NetworkFilter)
         {
             var obj=

package/src/jscommon/umychart.js

@@ -5025,6 +5025,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             {
                 this.ChartCorssCursor.LastPoint=this.LastPoint;
                 this.ChartCorssCursor.CursorIndex=this.CursorIndex;
+                if (this.EnableNewIndex)
+                {
+                    this.ChartCorssCursor.CorssCursorIndex=this.CorssCursorIndex;
+                    this.ChartCorssCursor.EnableNewIndex=this.EnableNewIndex;
+                }
 
                 var bRestoreCanvas=false;
                 if (this.CorssCursorCanvas) //独立的十字光标层
@@ -5387,6 +5392,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
             this.ChartCorssCursor.LastPoint=this.LastPoint;
             this.ChartCorssCursor.CursorIndex=this.CursorIndex;
+            if (this.EnableNewIndex)
+            {
+                this.ChartCorssCursor.CorssCursorIndex=this.CorssCursorIndex;
+                this.ChartCorssCursor.EnableNewIndex=this.EnableNewIndex;
+            }
 
             var bRestoreCanvas=false;
             if (this.CorssCursorCanvas) //独立的十字光标层
@@ -8438,6 +8448,30 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         
         return aryData;
     }
+
+    //重置指标计数器
+    this.ClearIndexRunCount=function()
+    {
+        //主图指标
+        for(var i=0;i<this.WindowIndex.length;++i)
+        {
+            var item=this.WindowIndex[i];
+            if (!item) continue;
+
+            item.RunCount=0;
+        }
+
+        //叠加指标
+        for(var i=0;i<this.Frame.SubFrame.length;++i)
+        {
+            var item=this.Frame.SubFrame[i];
+            for(var j=0; j<item.OverlayIndex.length; ++j)
+            {
+                var overlayItem=item.OverlayIndex[j];
+                if (overlayItem.Script) overlayItem.Script.RunCount=0;
+            }
+        }
+    }
 }
 
 function GetDevicePixelRatio()
@@ -38015,10 +38049,13 @@ function MinuteTooltipPaint()
         }
         
         var upperSymbol;
-        this.YClose=this.TitlePaint.YClose;
-        this.YClose=item.YClose;
         if (this.HQChart.Symbol) upperSymbol=this.HQChart.Symbol.toUpperCase();
+        var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);    //国内期货, 纽约期货交易所
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
+
+        this.YClose=this.TitlePaint.YClose;
+        this.YClose=item.YClose;
+        if (isFutures && IFrameSplitOperator.IsNumber(item.YClearing)) this.YClose=item.YClearing;
         
         var aryText=[];
         var result={ AryText:aryText };
@@ -38353,9 +38390,11 @@ function MinuteLeftTooltipPaint()
         if (!drawData || !drawData.Data) return null;
 
         var aryText=[];
+        var isFutures=false;
         var upperSymbol;
         if (this.HQChart.Symbol) upperSymbol=this.HQChart.Symbol.toUpperCase();
         var defaultfloatPrecision=GetfloatPrecision(upperSymbol);//价格小数位数
+        if (upperSymbol) isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);    //国内期货, 纽约期货交易所
 
         if (drawData.Type==0)   //连续交易
         {
@@ -38363,6 +38402,7 @@ function MinuteLeftTooltipPaint()
             if (!item) return;
 
             this.YClose=item.YClose;
+            if (isFutures && IFrameSplitOperator.IsNumber(item.YClearing)) this.YClose=item.YClearing;
             var titleItem=this.FormatDate(item.Date);
             if (titleItem) aryText.push(titleItem);
 
@@ -38400,6 +38440,7 @@ function MinuteLeftTooltipPaint()
             if (!item) return;
             
             this.YClose=item.YClose;
+            if (isFutures && IFrameSplitOperator.IsNumber(item.YClearing)) this.YClose=item.YClearing;
             var titleItem=this.FormatDate(item.Date);
             if (titleItem) aryText.push(titleItem);
 
@@ -45020,6 +45061,9 @@ function ChartCorssCursor()
     this.IsFixXLastTime=false;                                  //是否修正X轴,超出当前时间的,X轴调整到当前最后的时间.
     this.IsDrawXRangeBG=false;                                  //是否绘制十字光标背景
 
+    this.EnableNewIndex=false;      //分时图是否使用最新的索引结构 (由外部chart容器传入)
+    this.CorssCursorIndex;          //分时图新版本的索引结构 (由外部chart容器传入)
+
     this.PointX;
     this.PointY;
 
@@ -45077,20 +45121,34 @@ function ChartCorssCursor()
 
     this.GetMinuteCloseYPoint=function(index)
     {
-        if (!IFrameSplitOperator.IsNumber(index)) return null;
-        index=parseInt(index);
-        if (!this.StringFormatX.Data) return null;
-        var data = this.StringFormatX.Data;
-        if (!data.Data || data.Data.length <= 0) return null;
-        var dataIndex = data.DataOffset + index;
-        if (dataIndex >= data.Data.length) dataIndex = data.Data.length - 1;
-        if (dataIndex < 0) return null;
+        if (this.EnableNewIndex && this.CorssCursorIndex)
+        {
+            if (!this.StringFormatX || !this.StringFormatX.GetMinuteCloseYPoint) return null;
+            
+            var closeData=this.StringFormatX.GetMinuteCloseYPoint(this.CorssCursorIndex);
+            if (!closeData) return null;
+            
+            this.Close=closeData.Price;
+            return closeData.Y;
+        }
+        else
+        {
 
-        var close = data.Data[dataIndex];
-        if (!IFrameSplitOperator.IsNumber(index)) return null;
-        this.Close=close;
-        var yPoint = this.Frame.GetYFromData(this.Close);
-        return yPoint;
+            if (!IFrameSplitOperator.IsNumber(index)) return null;
+            index=parseInt(index);
+            if (!this.StringFormatX.Data) return null;
+            var data = this.StringFormatX.Data;
+            if (!data.Data || data.Data.length <= 0) return null;
+            var dataIndex = data.DataOffset + index;
+            if (dataIndex >= data.Data.length) dataIndex = data.Data.length - 1;
+            if (dataIndex < 0) return null;
+    
+            var close = data.Data[dataIndex];
+            if (!IFrameSplitOperator.IsNumber(index)) return null;
+            this.Close=close;
+            var yPoint = this.Frame.GetYFromData(this.Close);
+            return yPoint;
+        }
     }
 
     this.GetDateTimeRange=function(index, option)
@@ -46757,6 +46815,7 @@ function HQMinuteTimeStringFormat()
     this.newMethod();
     delete this.newMethod;
 
+    this.ClassName="HQMinuteTimeStringFormat";
     this.Frame;
     this.Symbol;
     this.Point;
@@ -46888,6 +46947,88 @@ function HQMinuteTimeStringFormat()
 
         return true;
     }
+
+    this.GetMinuteCloseYPoint=function(cursorIndexData)
+    {
+        var type=cursorIndexData.Type;
+        if (type==1 || type==2 || type==3)  //单日  1=主图 2=盘前 3=盘后
+        {
+            if (type==1)
+            {
+                if (!this.Data || this.Data.Data.length <= 0) return null;
+                var index=cursorIndexData.DataIndex;
+                if (index<0 || index>=this.Data.Data.length) index=this.Data.Data.length-1;
+
+                var close = this.Data.Data[index];
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+            else if (type==2)
+            {
+                if (!this.BeforeOpenData || !this.BeforeOpenData.Data) return false;
+                if (cursorIndexData.DataIndex<0 || cursorIndexData.DataIndex>=this.BeforeOpenData.Data.length) return null;
+                var item=this.BeforeOpenData.Data[cursorIndexData.DataIndex];
+
+                var close=item.Price;
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+            else if (type==3)
+            {
+                if (!this.AfterCloseData || !this.AfterCloseData.Data) return false;
+                if (cursorIndexData.DataIndex<0 || cursorIndexData.DataIndex>=this.AfterCloseData.Data.length) return null;
+                var item=this.AfterCloseData.Data[cursorIndexData.DataIndex];
+
+                var close=item.Price;
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+        }
+        else if (type==10 || type==20 || type==30)  //多日  10=主图 20=盘前 30=盘后
+        {
+            if (type==10)
+            {
+                if (!this.Data || this.Data.Data.length <= 0) return null;
+                var index=this.Frame.MinuteCount*cursorIndexData.DayIndex+cursorIndexData.DataIndex;
+                if (index<0 || index>=this.Data.Data.length) index=this.Data.Data.length-1;
+
+                var close = this.Data.Data[index];
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+            else if (type==20)
+            {
+                var multiDayBeforeOpenData=this.GetMultiDayBeforeOpenData();
+                if (!multiDayBeforeOpenData) return null;
+                if (cursorIndexData.DayIndex<0 || cursorIndexData.DayIndex>=multiDayBeforeOpenData.length) return null;
+
+                var dayItem=multiDayBeforeOpenData[cursorIndexData.DayIndex];
+                if (cursorIndexData.DataIndex<0 || cursorIndexData.DataIndex>=dayItem.Data.length) return null;
+                var item=dayItem.Data[cursorIndexData.DataIndex];
+
+                var close=item.Price;
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+            else if (type==30)
+            {
+                var multiDayAfterCloseData=this.GetMultiDayAfterCloseData();
+                if (!multiDayAfterCloseData) return null;
+                if (cursorIndexData.DayIndex<0 || cursorIndexData.DayIndex>=multiDayAfterCloseData.length) return null;
+
+                var dayItem=multiDayAfterCloseData[cursorIndexData.DayIndex];
+                if (cursorIndexData.DataIndex<0 || cursorIndexData.DataIndex>=dayItem.Data.length) return null;
+                var item=dayItem.Data[cursorIndexData.DataIndex];
+
+                var close=item.Price;
+                var yPoint = this.Frame.GetYFromData(close);
+                return { Price:close, Y:yPoint };
+            }
+        }
+
+
+        return null;
+    }
 }
 
 
@@ -48091,7 +48232,10 @@ function DynamicMinuteTitlePainting()
     {
         if (!data || !data.Data) return;
 
-        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
+        var upperSymbol=this.Symbol.toUpperCase();
+        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);   //价格小数位数
+        var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);    //国内期货, 纽约期货交易所
+        
         var item=data.Data;
         var isLastOne=data.IsLastOne;
         var aryText=[]; //{Color:, Text: }
@@ -48137,6 +48281,8 @@ function DynamicMinuteTitlePainting()
         var amount=item.Amount;
         var yClose=item.YClose;
         if (!IFrameSplitOperator.IsNumber(yClose)) yClose=this.YClose;
+        if (isFutures && IFrameSplitOperator.IsNumber(item.YClearing)) yClose=item.YClearing;     //期货使用昨结算
+        
 
         if (IFrameSplitOperator.IsNumber(close))
         {
@@ -64293,22 +64439,27 @@ function KLineChartContainer(uielement,OffscreenElement)
     {
         if (!this.WindowIndex[windowIndex]) return;
 
-        if (typeof(this.WindowIndex[windowIndex].RequestData)=="function")  //数据需要另外下载的.
+        var item=this.WindowIndex[windowIndex];
+        if (typeof(item.RequestData)=="function")  //数据需要另外下载的.
         {
-            this.WindowIndex[windowIndex].RequestData(this,windowIndex,hisData, option);
+            item.RequestData(this,windowIndex,hisData, option);
             return;
         }
-        if (typeof(this.WindowIndex[windowIndex].ExecuteScript)=='function')
+
+        if (typeof(item.ExecuteScript)=='function')
         {
-            this.WindowIndex[windowIndex].ExecuteScript(this,windowIndex,hisData);
+            if (option && option.CheckRunCount)
+                if (item.IsExcessRunCount()) return;
+
+            item.ExecuteScript(this,windowIndex,hisData);
             return;
         }
 
-        this.WindowIndex[windowIndex].BindData(this,windowIndex,hisData);
+        item.BindData(this,windowIndex,hisData);
     }
 
     //叠加指标
-    this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData)
+    this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData, option)
     {
         if (!overlayItem.Script) return;
 
@@ -64320,6 +64471,9 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (typeof(overlayItem.Script.ExecuteScript)=='function')
         {
+            if (option && option.CheckRunCount)
+                if (overlayItem.Script.IsExcessRunCount()) return;
+                
             overlayItem.Script.ExecuteScript(this,windowIndex,hisData);
             return;
         }
@@ -64485,7 +64639,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         });
     }
 
-    this.BindAllOverlayIndexData=function(hisData)
+    this.BindAllOverlayIndexData=function(hisData, option)
     {
         if (!this.Frame || !this.Frame.SubFrame) return;
 
@@ -64496,7 +64650,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             for(var j in item.OverlayIndex)
             {
                 var overlayItem=item.OverlayIndex[j];
-                this.BindOverlayIndexData(overlayItem,i,hisData)
+                this.BindOverlayIndexData(overlayItem,i,hisData,option)
             }
         }
     }
@@ -65179,7 +65333,7 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         for(var i=0; i<this.Frame.SubFrame.length; ++i)
         {
-            this.BindIndexData(i,bindData);
+            this.BindIndexData(i,bindData, { CheckRunCount:true });
         }
 
         //刷新画图
@@ -65192,7 +65346,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.SendKLineUpdateEvent(bindData);
 
         //叠加指标计算
-        this.BindAllOverlayIndexData(bindData);
+        this.BindAllOverlayIndexData(bindData,{ CheckRunCount:true });
 
         if (this.mapEvent.has(JSCHART_EVENT_ID.ON_RECV_REALTIME_DATA))
         {
@@ -65917,6 +66071,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.ClearRectSelect(true);
         this.Frame.ClearUpDonwFrameYData();
         this.ClearCustomKLine();
+       
 
         var kLineDrawType=this.GetKLineDrawType();
         if (kLineDrawType==10 || kLineDrawType==11 || kLineDrawType==12 || kLineDrawType==16) isDataTypeChange=true;
@@ -65938,6 +66093,7 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (isDataTypeChange==false && !this.IsApiPeriod)
         {
+            this.ClearIndexRunCount();
             this.Update( {UpdateCursorIndexType:2} ); //更新的时候 取消显示十字光标
             return;
         }
@@ -65950,6 +66106,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');                //切换周期先停止更新
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
+            this.ClearIndexRunCount();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
@@ -65959,6 +66116,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');                //切换周期先停止更新
             this.ResetScrollBar();
             this.ResetOverlaySymbolStatus();
+            this.ClearIndexRunCount();
             this.ReqeustHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
@@ -65966,6 +66124,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.CancelAutoUpdate();                    //先停止定时器
             this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');
             this.ResetScrollBar();
+            this.ClearIndexRunCount();
             this.RequestTickData();                     //请求分笔数据
         }
     }
@@ -67266,6 +67425,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.ClearKLineCaluate();
         this.HideTooltip();
         this.ResetScrollBar();
+        this.ClearIndexRunCount();
         
         this.Symbol=symbol;
         if (!symbol)
@@ -72363,6 +72523,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ClearIndexPaint();             //清空指标
         this.ResetOverlaySymbolStatus();
         this.ReloadChartDrawPicture();
+        this.ClearIndexRunCount();
 
         if (option)
         {
@@ -73751,7 +73912,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
-    this.BindIndexData=function(windowIndex,hisData)
+    this.BindIndexData=function(windowIndex, hisData, option)
     {
         if (!this.WindowIndex[windowIndex]) return;
 
@@ -74196,7 +74357,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     }
 
     //计算叠加指标
-    this.BindAllOverlayIndexData=function(hisData)
+    this.BindAllOverlayIndexData=function(hisData, option)
     {
         if (!this.Frame || !this.Frame.SubFrame) return;
 
@@ -74207,13 +74368,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             for(var j in item.OverlayIndex)
             {
                 var overlayItem=item.OverlayIndex[j];
-                this.BindOverlayIndexData(overlayItem,i,hisData)
+                this.BindOverlayIndexData(overlayItem,i,hisData,option)
             }
         }
     }
 
     //叠加指标
-    this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData)
+    this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData, option)
     {
         if (!overlayItem.Script) return;
 
@@ -74944,7 +75105,9 @@ MinuteChartContainer.JsonDataToMinuteData=function(data,isBeforeData)
     var preClose=data.stock[0].yclose;      //前一个数据价格
     var preAvPrice=data.stock[0].yclose;    //前一个均价
     var yClose=data.stock[0].yclose;
-    if (isFutures && data.stock[0].yclearing) yClose=preClose=preAvPrice=data.stock[0].yclearing;  //期货使用昨结算价
+    var yClearing=data.stock[0].yclearing;
+
+    if (isFutures && yClearing) preClose=preAvPrice=yClearing;  //期货使用昨结算价
 
     if (!IFrameSplitOperator.IsNonEmptyArray(data.stock[0].minute)) return aryMinuteData;
 
@@ -74953,7 +75116,7 @@ MinuteChartContainer.JsonDataToMinuteData=function(data,isBeforeData)
     {
         var jsData=data.stock[0].minute[i];
         var item=new MinuteData();
-
+        item.YClearing=yClearing;
         item.YClose=yClose;
         item.Close=jsData.price;
         item.Open=jsData.open;
@@ -74984,24 +75147,11 @@ MinuteChartContainer.JsonDataToMinuteData=function(data,isBeforeData)
 
         if (!item.AvPrice) item.AvPrice=preAvPrice;
 
-        //价格是0的 都用空
-        //if (item.Open<=0) item.Open=null;
-        //if (item.Close<=0) item.Close=null;
-        //if (item.AvPrice<=0) item.AvPrice=null;
-        //if (item.High<=0) item.High=null;
-        //if (item.Low<=0) item.Low=null;
-
-        //if (isFutures) item.AvPrice=null;    //期货均价暂时没有
-            
         if (yClose && item.Close) 
             item.Increase=(item.Close-yClose)/yClose*100; //涨幅 (最新价格-昨收)/昨收*100;
 
-        
-        //均价太大 可能是后台算错了
-        var checkValue=Math.abs(item.AvPrice-item.Close);
-        //JSConsole.Chart.Log(`[MinuteChartContainer::JsonDataToMinuteData] checkValue=${checkValue}, ${item.Close*0.13} `)
-        if (isSHSZ && checkValue>item.Close*0.13 ) 
-            item.AvPrice=preAvPrice;
+        if (isFutures && yClearing && item.Close) 
+            item.Increase=(item.Close-yClearing)/yClearing*100; //涨幅 (最新价格-昨结算价)/昨结算价*100;
 
         //上次价格
         if (IFrameSplitOperator.IsNumber(jsData.price)) preClose=jsData.price;
@@ -75115,7 +75265,7 @@ 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);    //上海股票期权
+    var isSHO=MARKET_SUFFIX_NAME.IsSHO(upperSymbol);            //上海股票期权
     var isSZO=MARKET_SUFFIX_NAME.IsSZO(upperSymbol);            //深证股票期权
     var isFutures=MARKET_SUFFIX_NAME.IsFutures(upperSymbol);    //国内期货, 纽约期货交易所
     var result=[];
@@ -75125,22 +75275,25 @@ MinuteChartContainer.JsonDataToMinuteDataArray=function(data)
         var minuteData=[];
         var dayData=data.data[i];
         var date=dayData.date;
+        var yClearing=dayData.yclearing;    //昨结算价
         var yClose=dayData.yclose;          //前收盘 计算涨幅
         var preClose=yClose;                //前一个数据价格
         var preAvPrice=null;                //上一个均价
-        var yClearing=dayData.yclearing;    //昨结算价
 
-        //var preAvPrice=data.stock[0].yclose;    //前一个均价
+        if (isFutures && yClearing) preClose=preAvPrice=yClearing;  //期货使用昨结算价
+
         for(var j in dayData.minute)
         {
             var jsData=dayData.minute[j];
             if (jsData[2]) preClose=jsData[2];  //保存上一个收盘数据
             var item=new MinuteData();
+            item.YClearing=yClearing;
             item.YClose=yClose;
             item.Close=jsData[2];
             item.Open=jsData[1];
             item.High=jsData[3];
             item.Low=jsData[4];
+            item.Increase=null;
             if (isSHSZ) item.Vol=jsData[5]/100; //原始单位股
             else item.Vol=jsData[5];
             item.Amount=jsData[6];
@@ -75163,23 +75316,12 @@ MinuteChartContainer.JsonDataToMinuteDataArray=function(data)
 
             if (!item.AvPrice && preAvPrice) item.AvPrice=preAvPrice;
 
-            if (item.Close && yClose) item.Increase = (item.Close - yClose)/yClose*100;
-            else item.Increase=null;
-
-            //价格是0的 都用空
-            //if (item.Open<=0) item.Open=null;
-            //if (item.Close<=0) item.Close=null;
-            //if (item.AvPrice<=0) item.AvPrice=null;
-            //if (item.High<=0) item.High=null;
-            //if (item.Low<=0) item.Low=null;
-            //if (item.AvPrice<=0) item.AvPrice=null;
+            if (item.Close && yClose) 
+                item.Increase = (item.Close - yClose)/yClose*100;
 
-            //均价太大 可能是后台算错了
-            if (item.AvPrice && isSHSZ)
-            {
-                var checkValue=Math.abs(item.AvPrice-item.Close);
-                if (checkValue>item.Close*0.13 ) item.AvPrice=preAvPrice;
-            }
+            if (item.Close && yClearing && isFutures)
+                item.Increase = (item.Close - yClearing)/yClearing*100;
+           
 
             if (jsData.length>7 && jsData[7]>0 && item.AvPrice===jsData[7]) preAvPrice=jsData[7];
             if (jsData[extendDataIndex]) item.ExtendData=jsData[extendDataIndex];
@@ -75190,9 +75332,9 @@ MinuteChartContainer.JsonDataToMinuteDataArray=function(data)
         var newData=new ChartData();
         newData.Data=minuteData;
         newData.YClose=yClose;
+        if (IFrameSplitOperator.IsNumber(yClearing)) newData.YClearing=yClearing;
         newData.Close=dayData.close;
         newData.Date=date;
-        if (IFrameSplitOperator.IsNumber(yClearing)) newData.YClearing=yClearing;
 
         result.push(newData);
     }
@@ -75241,6 +75383,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
     
     var date=callAuctionData.Date;
     var yClose=callAuctionData.YClose;
+    var yClearing=callAuctionData.YClearing;
     var extendDataIndex=isBeforeOpen? JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA:JSCHART_DATA_FIELD_ID.MINUTE_AFTERCLOSE_EXTENDDATA;  //扩展数据序号
     if (callAuctionData.Ver==1.0)
     {
@@ -75250,6 +75393,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
             var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
             var jsData=data[i];
             item.YClose=yClose;
+            item.YClearing=yClearing;
             item.Time=jsData[0];
             item.Date=date;
             item.Price=jsData[1];
@@ -75273,6 +75417,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
             var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
             var jsData=data[i];
             item.YClose=yClose;
+            item.YClearing=yClearing;
             item.Time=jsData[0];
             item.Date=date;
             item.Price=jsData[1];
@@ -75300,6 +75445,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
             var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
             var jsData=data[i];
             item.YClose=yClose;
+            item.YClearing=yClearing;
             item.Time=jsData[0];
             item.Date=date;
             item.Price=jsData[1];
@@ -75329,7 +75475,7 @@ MinuteChartContainer.JosnDataToBeforeOpenDataArray=function(data)
     for(var i in data.data)
     {
         var dayItem=data.data[i];
-        var beforeOpenData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose };
+        var beforeOpenData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose, YClearing:dayItem.YClearing };
         if (dayItem.beforeinfo)
         {
             if (IFrameSplitOperator.IsNumber(dayItem.beforeinfo.totalcount)) beforeOpenData.TotalCount=dayItem.beforeinfo.totalcount;
@@ -75354,7 +75500,7 @@ MinuteChartContainer.JosnDataToAfterCloseDataArray=function(data)
     for(var i in data.data)
     {
         var dayItem=data.data[i];
-        var afterCloseData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose };
+        var afterCloseData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose, YClearing:dayItem.YClearing };
 
         if (dayItem.afterinfo)
         {
@@ -84473,6 +84619,8 @@ var MARKET_SUFFIX_NAME=
 
     IsFutures:function(upperSymbol) //是否是期货 包含国外的
     {
+        if (!upperSymbol) return false;
+
         return this.IsChinaFutures(upperSymbol) || 
             this.IsNYMEX(upperSymbol) || this.IsCOMEX(upperSymbol) || this.IsNYBOT(upperSymbol) || this.IsCBOT(upperSymbol) ||
             this.IsLME(upperSymbol) || this.IsTOCOM(upperSymbol);