hqchart 1.1.15428 → 1.1.15446

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

@@ -7073,6 +7073,9 @@ var JSCHART_EVENT_ID=
     ON_BEFORE_DRAW_HLINE:180,     //画图工具-水平线(ChartDrawPictureHorizontalLine) 绘图前
 
     ON_HIDE_ALL_POP_DIV:181,        //隐藏所有弹框div
+
+    //工具条
+    ON_CLICK_STATUSBAR_ITEM:301,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -55224,6 +55227,9 @@ function StockChip()
         if (recvData && recvData.PreventDefault)
             return recvData.Result;
 
+        if (MARKET_SUFFIX_NAME.IsIncludes(symbol, ARRAY_CHINA_FUTURES_SUFFIX)) 
+            return this.CalculateChip_Futrues();
+
         if (MARKET_SUFFIX_NAME.IsSHSZIndex(symbol)) return false;   //指数暂时不支持移动筹码
 
         var bindData=this.HQChart.ChartPaint[0].Data;
@@ -55353,6 +55359,142 @@ function StockChip()
         return true;
     }
 
+    this.CalculateChip_Futrues=function()   //计算期货筹码 (持仓和量计算的)
+    {
+        if (!this.HQChart) return false;
+        var symbol=this.HQChart.Symbol;
+        if (!symbol) return false;
+        var upperSymbol=symbol.toUpperCase();
+
+        if (!MARKET_SUFFIX_NAME.IsIncludes(symbol, ARRAY_CHINA_FUTURES_SUFFIX)) return false;
+
+        var bindData=this.HQChart.GetKData();
+        //if (bindData.Period>=4) return false;   //分钟K线不支持, 没时间做,以后再做吧
+        var count=bindData.DataOffset+parseInt(this.HQChart.CursorIndex);
+        if (count>=bindData.Data.length) count=bindData.Data.length-1;
+        var selData=bindData.Data[count];
+        var yPrice=selData.Close;
+
+        var mouseY=this.HQChart.LastPoint.Y;
+        if (mouseY) yPrice=this.HQChart.Frame.SubFrame[0].Frame.GetYData(mouseY);
+        
+        //JSConsole.Chart.Log("[StockChip::CalculateChip]",count,this.HQChart.CursorIndex,selData);
+        const rate=1;
+        var aryVol=[];
+        var seed=1,vol,maxPrice,minPrice;
+        for(let i=count;i>=0;--i)
+        {
+            var item=bindData.Data[i];
+            var changeRate=1;   //换手率
+            if (item.Position>0) changeRate=item.Vol/item.Position;
+            if (i==count) vol=item.Vol*changeRate;
+            else vol=item.Vol*seed;
+            var dataItem={Vol:vol,High:item.High,Low:item.Low};
+            aryVol.push(dataItem);
+            seed*=(1-changeRate*rate);
+
+            if (!maxPrice || maxPrice<item.High) maxPrice=item.High;
+            if (!minPrice || minPrice>item.Low) minPrice=item.Low;
+        }
+
+        //JSConsole.Chart.Log("[StockChip::CalculateChip]",maxPrice,minPrice);
+        if (!maxPrice || !minPrice) return true;
+
+        var priceZoom=this.PriceZoom;
+
+        maxPrice=parseInt(maxPrice*priceZoom);
+        minPrice=parseInt(minPrice*priceZoom);
+
+        var dataCount=maxPrice-minPrice;
+        var aryChip=new Array()
+        for(let i=0;i<=dataCount;++i)
+        {
+            aryChip.push(0);
+        }
+
+        var dayChip=[];
+        var distributeData;
+        if (this.ShowType==2)
+        {
+            var dayChip=
+            [
+                {Day:100, Color:this.DAY_COLOR[1][5]}, {Day:60, Color:this.DAY_COLOR[1][4]}, {Day:30, Color:this.DAY_COLOR[1][3]},
+                {Day:20, Color:this.DAY_COLOR[1][2]}, {Day:10, Color:this.DAY_COLOR[1][1]}, {Day:5, Color:this.DAY_COLOR[1][0]}
+            ];
+            for(let i in aryVol)
+            {
+                var item=aryVol[i];
+                var high=parseInt(item.High*priceZoom);
+                var low=parseInt(item.Low*priceZoom);
+                var averageVol=item.Vol;
+                if (high-low>0) averageVol=item.Vol/(high-low);
+                if (averageVol<=0.000000001) continue;
+
+                for(var k=0;k<dayChip.length;++k)
+                {
+                    if (i==dayChip[k].Day) 
+                    {
+                        dayChip[k].Chip=aryChip.slice(0);
+                        break;
+                    }
+                }
+
+                distributeData={Low:low, High:high, Vol:item.Vol, MaxPrice:maxPrice, MinPrice:minPrice};
+                this.CalculateDistribute(aryChip, distributeData );
+            }
+        }
+        else if (this.ShowType==1)
+        {
+            var dayChip=
+            [
+                {Day:5, Color:this.DAY_COLOR[0][0]},{Day:10, Color:this.DAY_COLOR[0][1]},{Day:20, Color:this.DAY_COLOR[0][2]},
+                {Day:30, Color:this.DAY_COLOR[0][3]},{Day:60, Color:this.DAY_COLOR[0][4]},{Day:100, Color:this.DAY_COLOR[0][5]}
+            ];
+
+            for(let i=aryVol.length-1;i>=0;--i)
+            {
+                var item=aryVol[i];
+                var high=parseInt(item.High*priceZoom);
+                var low=parseInt(item.Low*priceZoom);
+                var averageVol=item.Vol;
+                if (high-low>0) averageVol=item.Vol/(high-low);
+                if (averageVol<=0.000000001) continue;
+
+                for(var k=0;k<dayChip.length;++k)
+                {
+                    if (i==dayChip[k].Day) 
+                    {
+                        dayChip[k].Chip=aryChip.slice(0);
+                        break;
+                    }
+                }
+                
+                distributeData={Low:low, High:high, Vol:item.Vol, MaxPrice:maxPrice, MinPrice:minPrice};
+                this.CalculateDistribute(aryChip, distributeData);
+            }
+        }
+        else
+        {
+            for(let i in aryVol)
+            {
+                var item=aryVol[i];
+                var high=parseInt(item.High*priceZoom);
+                var low=parseInt(item.Low*priceZoom);
+                var averageVol=item.Vol;
+                if (high-low>0) averageVol=item.Vol/(high-low);
+                if (averageVol<=0.000000001) continue;
+
+                distributeData={Low:low, High:high, Vol:item.Vol, MaxPrice:maxPrice, MinPrice:minPrice};
+                this.CalculateDistribute(aryChip, distributeData);
+            }
+        }
+
+        if (!distributeData) return false;
+
+        this.Data={AllChip:aryChip, MaxVol:distributeData.MaxVol, MaxPrice:maxPrice, MinPrice:minPrice,SelectData:selData, DayChip:dayChip, YPrice:yPrice};
+        return true;
+    }
+
     this.DrawFrame=function()  //X轴成交量坐标
     {
         if (this.IsShowX==false) return;
@@ -83531,13 +83673,13 @@ function JSChartResource()
         {
             Color:"RGB(60,60,60)",
             Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
-            Font:{ Size:12, Name:"微软雅黑" }
+            Font:{ Size:14, Name:"微软雅黑" }
         },
 
         Row:
         {
             Mergin:{ Top:2, Bottom:2 },
-            Font:{ Size:15, Name:"微软雅黑"},
+            Font:{ Size:14, Name:"微软雅黑"},
             BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 }
         },
 
@@ -83953,6 +84095,57 @@ function JSChartResource()
         BorderColor:"rgb(192,192,192)"
     }
 
+    this.StatusBar=
+    {
+        Table:
+        {
+            Font:14*GetDevicePixelRatio() +'px 微软雅黑',
+            TitleColor:"rgb(90,90,90)",
+            AryTextColor:["rgb(90,90,90)","rgb(192,192,0)"],
+            Margin:{ Left:1*GetDevicePixelRatio(), Top:0, Bottom:0, Right:0 },
+            CellMargin:
+            { 
+                Top:5*GetDevicePixelRatio(), 
+                Bottom:5*GetDevicePixelRatio(), 
+                Left:5*GetDevicePixelRatio(), 
+                Right:5*GetDevicePixelRatio(), 
+                YOffset:1* GetDevicePixelRatio(),
+            },
+
+            Separator: { Left:10, Right:10, Line:{ Width:1, Color:"rgb(192,192,192)", Top:2, Bottom:2 } }
+        },
+
+        DateTime:
+        {
+            Font:14*GetDevicePixelRatio() +'px 微软雅黑',
+            TitleColor:"rgb(90,90,90)",
+            Format:"HH:MM:SS",
+            MaxText:"99:99:99",
+            Margin:{ Left:2*GetDevicePixelRatio(), Top:5*GetDevicePixelRatio(), Bottom:5*GetDevicePixelRatio(), Right:5*GetDevicePixelRatio(), YOffset:1*GetDevicePixelRatio() },
+        },
+
+        RightToolbar:
+        {
+            Icon:{ Family:"iconfont", Size:14*GetDevicePixelRatio() },
+
+            Margin:{ Left:1*GetDevicePixelRatio(), Top:0, Bottom:0, Right:2*GetDevicePixelRatio() },
+            CellMargin:
+            { 
+                Top:5*GetDevicePixelRatio(), 
+                Bottom:5*GetDevicePixelRatio(), 
+                Left:2*GetDevicePixelRatio(), 
+                Right:2*GetDevicePixelRatio(), 
+                YOffset:0,
+            },
+        },
+
+        UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
+        DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
+        UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
+
+        BorderColor:"rgb(192,192,192)"
+    }
+
 
     //自定义风格
     this.SetStyle=function(style)
@@ -84922,9 +85115,66 @@ function JSChartResource()
 
         if (style.SmallFloatTooltipV2) this.SetSmallFloatTooltipV2(style.SmallFloatTooltipV2);
         if (style.StockInfo) this.SetStockInfo(style.StockInfo);
+        if (style.StatusBar) this.SetStatusBar(style.StatusBar);
 
     }
 
+    this.SetStatusBar=function(style)
+    {
+        var dest=this.StatusBar;
+
+        if (style.Table)
+        {
+            var item=style.Table;
+            if (item.Font) dest.Table.Font=item.Font;
+            if (item.TitleColor) dest.Table.TitleColor=item.TitleColor;
+            if (IFrameSplitOperator.IsNonEmptyArray(item.AryTextColor)) dest.Table.AryTextColor=item.AryTextColor.slice();
+            CopyMarginConfig(dest.Table.Margin, item.Margin);
+            if (item.CellMargin)
+            {
+                var subItem=item.CellMargin;
+                CopyMarginConfig(dest.Table.CellMargin, subItem);
+                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) dest.Table.CellMargin.YOffset=subItem.YOffset
+            }
+
+            if (item.Separator)
+            {
+                var subItem=item.Separator;
+                var subDest=dest.Table.Separator;
+                if (IFrameSplitOperator.IsNumber(subItem.Left)) subDest.Left=subItem.Left;
+                if (IFrameSplitOperator.IsNumber(subItem.Right)) subDest.Left=subItem.Right;
+
+                if (subItem.Line)
+                {
+                    if (IFrameSplitOperator.IsNumber(subItem.Line.Width)) subDest.Line.Width=subItem.Line.Width;
+                    if (IFrameSplitOperator.IsNumber(subItem.Line.Top)) subDest.Line.Top=subItem.Line.Top;
+                    if (IFrameSplitOperator.IsNumber(subItem.Line.Bottom)) subDest.Line.Bottom=subItem.Line.Bottom;
+                    if (subItem.Line.Color) subDest.Line.Color=subItem.Line.Color;
+                }
+            }
+        }
+
+        if (style.DateTime)
+        {
+            var item=style.DateTime;
+            if (item.Font) dest.DateTime.Font=item.Font;
+            if (item.TitleColor) dest.DateTime.TitleColor=item.TitleColor;
+            if (item.Format) dest.DateTime.Format=item.Format;
+            if (item.MaxText) dest.DateTime.MaxText=item.MaxText;
+            if (item.Margin)
+            {
+                var subItem=item.Margin;
+                CopyMarginConfig(dest.DateTime.Margin, subItem);
+                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) dest.DateTime.Margin.YOffset=subItem.YOffset;
+            }
+        }
+
+        if (style.UpTextColor) dest.UpTextColor=style.UpTextColor;
+        if (style.DownTextColor) dest.DownTextColor=style.DownTextColor;
+        if (style.UnchangeTextColor) dest.UnchangeTextColor=style.UnchangeTextColor;
+        if (style.BorderColor) dest.BorderColor=style.BorderColor;
+    }
+
     this.SetStockInfo=function(style)
     {
         var dest=this.StockInfo;
@@ -106642,6 +106892,7 @@ var MARKET_SUFFIX_NAME=
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
     GZFE:".GZFE",        //广州期货交易所
+    INE:".INE",          //上海国际能源交易中心
 
     USA:'.USA',          //美股
     FTSE:'.FTSE',        //富时中国
@@ -106886,11 +107137,61 @@ var MARKET_SUFFIX_NAME=
         return upperSymbol.indexOf(this.GZFE) > 0;
     },
 
+    IsINE:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        return upperSymbol.indexOf(this.INE) > 0;
+    },
+
+    //是否包含某一个市场的
+    IsIncludes:function(symbol, arySuffix)
+    {
+        if (!symbol) return false;
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySuffix)) return false;
+        var upperSymbol=symbol.toUpperCase();
+
+        var bMatch=false;
+        for(var i=0;i<arySuffix.length;++i)
+        {
+            var item=arySuffix[i];
+            switch(item)
+            {
+                case this.SHFE:
+                case this.SHFE2:
+                    if (this.IsSHFE(upperSymbol)) bMatch=true;
+                    break;
+                case this.CFFEX2:
+                case this.CFFEX:
+                case this.CFFEX3:
+                    if (this.IsCFFEX(upperSymbol)) bMatch=true;
+                    break;
+                case this.DCE:
+                    if (this.IsDCE(upperSymbol)) bMatch=true;
+                    break;
+                case this.CZCE:
+                    if (this.IsCZCE(upperSymbol)) bMatch=true;
+                    break;
+                case this.GZFE:
+                    if (this.IsGZFE(upperSymbol)) bMatch=true;
+                    break;
+                case this.INE:
+                    if (this.IsINE(upperSymbol)) bMatch=true;
+                    break;
+            }
+
+            if (bMatch) return true;
+        }
+
+        return false;
+    },
+
     IsChinaFutures:function(upperSymbol)   //是否是国内期货 /期权
     {
+        if (!upperSymbol) return false;
+        
         return this.IsSHO(upperSymbol) || this.IsSZO(upperSymbol) || 
-            this.IsGZFE(upperSymbol) ||
-            this.IsCFFEX(upperSymbol) || this.IsCZCE(upperSymbol) || this.IsDCE(upperSymbol) || this.IsSHFE(upperSymbol);
+                this.IsGZFE(upperSymbol) || this.IsINE(upperSymbol) ||
+                this.IsCFFEX(upperSymbol) || this.IsCZCE(upperSymbol) || this.IsDCE(upperSymbol) || this.IsSHFE(upperSymbol);
     },
 
     IsFutures:function(upperSymbol) //是否是期货 包含国外的
@@ -107399,6 +107700,16 @@ var MARKET_SUFFIX_NAME=
 
 }
 
+//国内期货市场
+const ARRAY_CHINA_FUTURES_SUFFIX=
+[
+    MARKET_SUFFIX_NAME.SHFE,
+    MARKET_SUFFIX_NAME.CFFEX,
+    MARKET_SUFFIX_NAME.DCE,
+    MARKET_SUFFIX_NAME.CZCE,
+    MARKET_SUFFIX_NAME.GZFE, 
+    MARKET_SUFFIX_NAME.INE
+];
 
 //走势图分钟数据对应的时间
 function MinuteTimeStringData() 
@@ -107744,7 +108055,8 @@ function MinuteTimeStringData()
         if (MARKET_SUFFIX_NAME.IsTW(upperSymbol)) return this.GetTW(upperSymbol);
         if (MARKET_SUFFIX_NAME.IsJP(upperSymbol)) return this.GetJP(upperSymbol);
         if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol)) return this.GetUSA(upperSymbol);
-        if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
+        if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || 
+            MARKET_SUFFIX_NAME.IsGZFE(upperSymbol) || MARKET_SUFFIX_NAME.IsINE(upperSymbol))
         {
             var splitData = g_FuturesTimeData.GetSplitData(upperSymbol, option);
             if (!splitData) return null;
@@ -108236,7 +108548,7 @@ function MinuteCoordinateData()
                 data=this.GetTWData(upperSymbol,width);
             else if (MARKET_SUFFIX_NAME.IsJP(upperSymbol))
                 data=this.GetJPData(upperSymbol,width);
-            else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
+            else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol) || MARKET_SUFFIX_NAME.IsINE(upperSymbol))
                 return this.GetChinatFuturesData(upperSymbol, width, option);
             else if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol))
                 data = this.GetUSAData(upperSymbol,width);
@@ -109083,6 +109395,13 @@ function FuturesTimeData()
         [MARKET_SUFFIX_NAME.SHFE + '-LU', {Time:6,Decimal:0,Name:'低硫燃油'}],
         [MARKET_SUFFIX_NAME.SHFE + '-BC', {Time:4,Decimal:0,Name:'国际铜'}],
         [MARKET_SUFFIX_NAME.SHFE + '-EC', {Time:0,Decimal:0,Name:'集运指数'}],
+
+        //上海国际能源交易中心 独立的一个市场
+        [MARKET_SUFFIX_NAME.INE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
+        [MARKET_SUFFIX_NAME.INE + '-SC', {Time:5,Decimal:1,Name:'原油'}],
+        [MARKET_SUFFIX_NAME.INE + '-LU', {Time:6,Decimal:0,Name:'低硫燃油'}],
+        [MARKET_SUFFIX_NAME.INE + '-BC', {Time:4,Decimal:0,Name:'国际铜'}],
+        [MARKET_SUFFIX_NAME.INE + '-EC', {Time:0,Decimal:0,Name:'集运指数'}],
        
         //郑州期货交易所
         [MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
@@ -109199,6 +109518,11 @@ function FuturesTimeData()
             oneWordName = MARKET_SUFFIX_NAME.GZFE + '-' + oneWord;
             twoWordsName = MARKET_SUFFIX_NAME.GZFE + '-' + twoWords;
         }
+        else if (MARKET_SUFFIX_NAME.IsINE(upperSymbol))     //上海国际能源交易中心
+        {
+            oneWordName = MARKET_SUFFIX_NAME.INE + '-' + oneWord;
+            twoWordsName = MARKET_SUFFIX_NAME.INE + '-' + twoWords;
+        }
 
         if (this.MAP_TWOWORDS.has(twoWordsName))
         {
@@ -139439,13 +139763,13 @@ function GetBlackStyle()
             {
                 Color:"RGB(245,245,245)",
                 Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
-                Font:{ Size:12, Name:"微软雅黑" }
+                //Font:{ Size:12, Name:"微软雅黑" }
             },
     
             Row:
             {
                 Mergin:{ Top:2, Bottom:2 },
-                Font:{ Size:15, Name:"微软雅黑"},
+                //Font:{ Size:15, Name:"微软雅黑"},
                 BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 }
             },
     
@@ -139793,6 +140117,48 @@ function GetBlackStyle()
             UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
             DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
             UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
+            BorderColor:'rgb(38,38,41)',        //边框线
+        },
+
+
+        StatusBar:
+        {
+            Table:
+            {
+                //Font:14*GetDevicePixelRatio() +'px 微软雅黑',
+                TitleColor:"rgb(250,250,250)",
+                AryTextColor:["rgb(250,250,250)", "rgb(255, 185, 15)"],
+                //Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
+                //CellMargin:{ Top:5, Bottom:5, Left:5, Right:5, YOffset:0 },
+                //ItemSpace:20,
+
+                Separator: 
+                { 
+                    //Left:20, 
+                   // Right:20, 
+                    Line:
+                    { 
+                        //Width:1, 
+                        Color:"rgb(38,38,41)", 
+                        //Top:2, 
+                        //Bottom:2 
+                    } 
+                }
+            },
+
+            DateTime:
+            {
+                //Font:14*GetDevicePixelRatio() +'px 微软雅黑',
+                TitleColor:"rgb(250,250,250)",
+                //Format:"HH:MM:SS",
+                //MaxText:"99:99:99",
+                //Margin:{ Left:2*GetDevicePixelRatio(), Top:5*GetDevicePixelRatio(), Bottom:5*GetDevicePixelRatio(), Right:5*GetDevicePixelRatio(), YOffset:1*GetDevicePixelRatio() },
+            },
+
+            UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
+            DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
+            UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
+
             BorderColor:'rgb(38,38,41)',        //边框线
         }
         
@@ -140344,8 +140710,11 @@ function JSDealChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (chart) chart.Data=null;
 
-        if (option && IFrameSplitOperator.IsNumber(option.TradeDate))
-            this.TradeDate=option.TradeDate;
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNumber(option.TradeDate)) this.TradeDate=option.TradeDate;
+            if (IFrameSplitOperator.IsNonEmptyArray(option.Column)) this.SetColumn(option.Column);
+        } 
 
         if (!this.Symbol)
         {
@@ -140453,6 +140822,7 @@ function JSDealChartContainer(uielement)
         chart.Data=this.Data;
         chart.Symbol=this.Symbol;
         chart.YClose=data.yclose;
+        chart.YFClose=data.yfclose;
         chart.Open=data.open;
 
         if (this.IsShowLastPage) this.SetLastPageDataOffset();   //显示最后一屏
@@ -141120,8 +141490,6 @@ var DEAL_COLUMN_ID=
     SYMBOL_ID:11,       //股票代码
     NAME_ID:12,         //股票名称
 
-   
-
     //预留数值类型 10个
     RESERVE_NUMBER1_ID:201,         //ReserveNumber1:
     RESERVE_NUMBER2_ID:202,
@@ -141199,6 +141567,7 @@ function ChartDealList()
     //this.Data={Offset:0, Data:[ {Time:925, Price:20.1, Vol:10000050, BS:1, Deal:45 }, {Time:925, Price:18.2, Vol:1150, BS:1, Deal:5 }] };
     this.Symbol;
     this.YClose;    //昨收
+    this.YFClose;   //昨结算
     this.Open;      //开盘价
     this.Decimal=2; //小数位数
     this.IsSingleTable=false;    //单表模式
@@ -141353,7 +141722,6 @@ function ChartDealList()
             { Type:DEAL_COLUMN_ID.STRING_TIME_ID, Title:"时间", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Time, MaxText:"88:88:88" },
             { Type:DEAL_COLUMN_ID.INDEX_ID, Title:"序号", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Index, MaxText:"88888" },
 
-           
             { Type:DEAL_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
             { Type:DEAL_COLUMN_ID.CUSTOM_TEXT_ID, Title:"自定义", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎擎" },
 
@@ -141682,10 +142050,7 @@ function ChartDealList()
             }
             else if (item.Type==DEAL_COLUMN_ID.PRICE_ID)
             {
-                if (data.Price>this.YClose) textColor=this.UpColor;
-                else if (data.Price<this.YClose) textColor=this.DownColor;
-                else textColor=this.UnchangeColor;
-
+                textColor=this.GetPriceColor(data.Price);
                 text=data.Price.toFixed(this.Decimal);
             }
             else if (item.Type==DEAL_COLUMN_ID.VOL_ID)
@@ -141786,6 +142151,29 @@ function ChartDealList()
         }
     }
 
+    this.GetPriceColor=function(price)
+    {
+        var upperSymbol=null;
+        if (this.Symbol) upperSymbol=this.Symbol.toUpperCase();
+        if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+        {
+            if (!IFrameSplitOperator.IsNumber(this.YFClose)) return  this.UnchangeColor;
+            return this.GetUpDownColor(price, this.YFClose);
+        }
+        else
+        {
+            if (!IFrameSplitOperator.IsNumber(this.YClose)) return this.UnchangeColor;
+            return this.GetUpDownColor(price, this.YClose);
+        }
+    }
+
+    this.GetUpDownColor=function(price, price2)
+    {
+        if (price>price2) return this.UpColor;
+        else if (price<price2) return this.DownColor;
+        else return this.UnchangeColor;
+    }
+
     this.FormatReserveNumber=function(column, data, drawInfo)
     {
         if (column.DefaultText) drawInfo.Text=column.DefaultText;
@@ -143927,6 +144315,8 @@ function JSReportChartContainer(uielement)
         //80=整行背景色
         //101-199=数值型  201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
 
+        var upperSymbol=null;
+        if (stock.Symbol) upperSymbol=stock.Symbol.toUpperCase();
         if (IFrameSplitOperator.IsString(item[1])) stock.Name=item[1];
         if (IFrameSplitOperator.IsNumber(item[2])) stock.YClose=item[2];
         if (IFrameSplitOperator.IsNumber(item[3])) stock.Open=item[3];
@@ -143958,17 +144348,39 @@ function JSReportChartContainer(uielement)
 
         if (item[27]) stock.NameEx=item[27];      //扩展名字
 
+        if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38];        //持仓量
+        if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39];          //结算价
+        if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40];         //昨结算价
+        if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41];    //开仓量
+        if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42];   //平仓量
+
         //衍生数据计算
         if (!IFrameSplitOperator.IsNumber(item[21]))    //涨幅%
         {
-            if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
-                stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;
+            if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+            {
+                if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YFClose) && stock.YFClose!=0)
+                    stock.Increase=(stock.Price-stock.YFClose)/stock.YFClose*100;
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
+                    stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;
+            }
         }
 
         if (!IFrameSplitOperator.IsNumber(item[22]))    //涨跌
         {
-            if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose))
-                stock.UpDown=stock.Price-stock.YClose;
+            if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+            {
+                if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YFClose))
+                    stock.UpDown=stock.Price-stock.YFClose;
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose))
+                    stock.UpDown=stock.Price-stock.YClose;
+            }
         }   
 
         if (!IFrameSplitOperator.IsNumber(item[23]))    //换手率%
@@ -143979,8 +144391,17 @@ function JSReportChartContainer(uielement)
 
         if (!IFrameSplitOperator.IsNumber(item[24]))    //振幅%
         {
-            if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
-                stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;
+            if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+            {
+                if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YFClose) && stock.YFClose!=0)
+                    stock.Amplitude=(stock.High-stock.Low)/stock.YFClose*100;
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
+                    stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;
+            }
+            
         }
 
         if (!IFrameSplitOperator.IsNumber(item[25]))    //流通市值
@@ -144009,11 +144430,7 @@ function JSReportChartContainer(uielement)
 
         if (IFrameSplitOperator.IsBool(item[37])) stock.Checked=item[37];
 
-        if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38];        //持仓量
-        if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39];          //结算价
-        if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40];         //昨结算价
-        if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41];    //开仓量
-        if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42];   //平仓量
+        
 
         //1,3,5,10,15 涨速%
         if (IFrameSplitOperator.IsNumber(item[43])) stock.RSpeed1M=item[43]; 
@@ -150303,7 +150720,16 @@ function ChartReport()
         }
         else    //昨收价 计算颜色
         {
-            if (IFrameSplitOperator.IsNumber(stock.YClose))  yClose=stock.YClose;
+            var upperSymbol=null;
+            if (stock.Symbol) upperSymbol=stock.Symbol.toUpperCase();
+            if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol) && IFrameSplitOperator.IsNumber(stock.YFClose))
+            {
+                yClose=stock.YFClose;
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(stock.YClose))  yClose=stock.YClose;
+            }
         }
 
         if (!IFrameSplitOperator.IsNumber(yClose))  
@@ -163828,7 +164254,7 @@ function JSDialogTooltip()
             return item;
         }
 
-        if (IFrameSplitOperator.IsNumber(yClose) && format!=1)
+        if (IFrameSplitOperator.IsNumber(yClose) && format!=1 && yClose!=0)
         {
             var value=(price-yClose)/yClose*100;
             item.Text=`${price.toFixed(defaultfloatPrecision)}(${value.toFixed(2)}%)`;
@@ -163904,9 +164330,7 @@ function JSDialogTooltip()
             Color:this.ValueColor
         };
 
-        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
-
-      
+        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose) || yClose===0) return item;
 
         var diffValue=price-yClose;
         var value=(price-yClose)/yClose;
@@ -163954,7 +164378,7 @@ function JSDialogTooltip()
         };
 
 
-        if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+        if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose) || yClose===0) return item;
 
         var diffValue=high-low;
         var value=(high-low)/yClose;
@@ -168147,7 +168571,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15427";
+var HQCHART_VERSION="1.1.15445";
 
 function PrintHQChartVersion()
 {