hqchart 1.1.15696 → 1.1.15708

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

@@ -5358,6 +5358,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 }
 
                 chart.SetSubFrameAttribute(chart.Frame.SubFrame[index],item, null);
+                chart.UpdateIndexTemporaryAttribute(i, item.AryTemporaryAttribute); //指标临时属性
             }
         }
 
@@ -17017,6 +17018,88 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         script.RecvSubscribeData(data,this,overlayIndex.WindowIndex,kData);
     }
+
+    this.UpdateIndexTemporaryAttribute=function(windowIndex, aryAttribute)
+    {
+        if (windowIndex<0) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryAttribute)) return;
+        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
+        var mainFrame=this.Frame.SubFrame[windowIndex].Frame;
+
+        this.IndexTemporaryAttribute[windowIndex]=[];
+        var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];
+
+        for(var i=0;i<aryAttribute.length;++i)
+        {
+            var item=aryAttribute[i];
+            if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE)
+            {
+                var backup=mainFrame.ChartBorder.BottomSpace;
+                mainFrame.ChartBorder.BottomSpace=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE)
+            {
+                var backup=mainFrame.ChartBorder.TopSpace;
+                mainFrame.ChartBorder.TopSpace=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT)
+            {
+                var backup=mainFrame.YSplitOperator.IsShowLeftText;
+                mainFrame.YSplitOperator.IsShowLeftText=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT)
+            {
+                var backup=mainFrame.YSplitOperator.IsShowRightText;
+                mainFrame.YSplitOperator.IsShowRightText=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE)
+            {
+                var backup=mainFrame.YSplitOperator.SplitType;
+                mainFrame.YSplitOperator.SplitType=item.Value;
+                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
+            }
+
+        }
+    }
+
+    this.RestoreIndexTemporaryAttribute=function(windowIndex)
+    {
+        if (windowIndex<0) return;
+        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
+        var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryTemporaryAttribute)) return;
+        var mainFrame=this.Frame.SubFrame[windowIndex].Frame;
+
+        for(var i=0;i<aryTemporaryAttribute.length;++i)
+        {
+            var item=aryTemporaryAttribute[i];
+            if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE)
+            {
+                mainFrame.ChartBorder.BottomSpace=item.BackupValue;
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE)
+            {
+                mainFrame.ChartBorder.TopSpace=item.BackupValue;
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT)
+            {
+                mainFrame.YSplitOperator.IsShowLeftText=item.BackupValue;
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT)
+            {
+                mainFrame.YSplitOperator.IsShowRightText=item.BackupValue;
+            }
+            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE)
+            {
+                mainFrame.YSplitOperator.SplitType=item.BackupValue;
+            }
+        }
+
+    }
 }
 
 function GetDevicePixelRatio()
@@ -83902,7 +83985,7 @@ function JSChartResource()
     {
         BuyColor:"rgb(242,54,69)",
         SellColor:"rgb(8,153,129)",
-        BarWidth:4*GetDevicePixelRatio(),
+        BarWidth:2*GetDevicePixelRatio(),
         MaxBarWidth:120,
         YOffset:1,
         Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
@@ -97116,88 +97199,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         this.Draw();
     }
-
-    this.UpdateIndexTemporaryAttribute=function(windowIndex, aryAttribute)
-    {
-        if (windowIndex<0) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(aryAttribute)) return;
-        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
-        var mainFrame=this.Frame.SubFrame[windowIndex].Frame;
-
-        this.IndexTemporaryAttribute[windowIndex]=[];
-        var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];
-
-        for(var i=0;i<aryAttribute.length;++i)
-        {
-            var item=aryAttribute[i];
-            if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE)
-            {
-                var backup=mainFrame.ChartBorder.BottomSpace;
-                mainFrame.ChartBorder.BottomSpace=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE)
-            {
-                var backup=mainFrame.ChartBorder.TopSpace;
-                mainFrame.ChartBorder.TopSpace=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT)
-            {
-                var backup=mainFrame.YSplitOperator.IsShowLeftText;
-                mainFrame.YSplitOperator.IsShowLeftText=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT)
-            {
-                var backup=mainFrame.YSplitOperator.IsShowRightText;
-                mainFrame.YSplitOperator.IsShowRightText=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE)
-            {
-                var backup=mainFrame.YSplitOperator.SplitType;
-                mainFrame.YSplitOperator.SplitType=item.Value;
-                aryTemporaryAttribute.push({ Name:item.Name, Value:item.Value, BackupValue:backup });
-            }
-
-        }
-    }
-
-    this.RestoreIndexTemporaryAttribute=function(windowIndex)
-    {
-        if (windowIndex<0) return;
-        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
-        var aryTemporaryAttribute=this.IndexTemporaryAttribute[windowIndex];
-        if (!IFrameSplitOperator.IsNonEmptyArray(aryTemporaryAttribute)) return;
-        var mainFrame=this.Frame.SubFrame[windowIndex].Frame;
-
-        for(var i=0;i<aryTemporaryAttribute.length;++i)
-        {
-            var item=aryTemporaryAttribute[i];
-            if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.BOTTOMSPACE)
-            {
-                mainFrame.ChartBorder.BottomSpace=item.BackupValue;
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.TOPSPACE)
-            {
-                mainFrame.ChartBorder.TopSpace=item.BackupValue;
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWLEFTTEXT)
-            {
-                mainFrame.YSplitOperator.IsShowLeftText=item.BackupValue;
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SHOWRIGHTTEXT)
-            {
-                mainFrame.YSplitOperator.IsShowRightText=item.BackupValue;
-            }
-            else if (item.Name==JSCHART_TEMPORARY_ATTRIBUTE.MAINFRAME.SPLITTYPE)
-            {
-                mainFrame.YSplitOperator.SplitType=item.BackupValue;
-            }
-        }
-
-    }
 }
 
 //API 返回数据 转化为array[]
@@ -97614,7 +97615,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     delete this.newMethod;
 
     this.ClassName='MinuteChartContainer';
-    this.WindowIndex=new Array();
+    this.WindowIndex=[];
+    this.IndexTemporaryAttribute=[];    //指标临时属性，切换指标时会清除
     this.Symbol;
     this.AryDate;                             //日期列表[]
     this.Name;
@@ -100453,8 +100455,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.ChangeScriptIndex=function(windowIndex,indexData,option)
     {
         this.DeleteIndexPaint(windowIndex, true);
+        this.RestoreIndexTemporaryAttribute(windowIndex);   //恢复临时属性
         this.WindowIndex[windowIndex]=new ScriptIndex(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
 
+        if (option)
+        {
+            if (option.AryTemporaryAttribute)
+            {
+                this.UpdateIndexTemporaryAttribute(windowIndex, option.AryTemporaryAttribute); //指标临时属性
+            }
+        }
+
         var bindData=this.SourceData;
         this.BindIndexData(windowIndex,bindData);   //执行脚本
 
@@ -100467,6 +100478,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.ChangeAPIIndex=function(windowIndex,indexData)
     {
         this.DeleteIndexPaint(windowIndex, true);
+        this.RestoreIndexTemporaryAttribute(windowIndex);   //恢复临时属性
         //使用API挂接指标数据 API:{ Name:指标名字, Script:指标脚本可以为空, Args:参数可以为空, Url:指标执行地址 }
         var apiItem=indexData.API;
         this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,indexData);
@@ -100474,6 +100486,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (indexData)
         {
             if (indexData.Window) this.SetFrameToolbar(windowIndex,indexData.Window);
+
+            if (indexData.AryTemporaryAttribute)
+            {
+                this.UpdateIndexTemporaryAttribute(windowIndex, indexData.AryTemporaryAttribute); //指标临时属性
+            }
         }
 
         this.Frame.ClearUpDonwFrameYData({ Index:windowIndex });
@@ -100607,11 +100624,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var bRefreshData= (dayCount!=null || symbol!=null);
 
         //清空所有的指标图型
-        for(var i=0;i<windows.length;++i)
+        for(var i=0;i<currentLength;++i)
         {
             this.DeleteIndexPaint(i);
             var frame=this.Frame.SubFrame[i];
             if (!frame) continue;
+            this.RestoreIndexTemporaryAttribute(i);   //恢复临时属性
             frame.YSpecificMaxMin=null;
             frame.YSplitScale = null;
         }
@@ -100697,6 +100715,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             }
            
             this.SetSubFrameAttribute(this.Frame.SubFrame[windowIndex], item, frameItem);
+            if (item) this.UpdateIndexTemporaryAttribute(windowIndex, item.AryTemporaryAttribute); //指标临时属性
         }
 
         //清空叠加指标
@@ -108461,7 +108480,6 @@ function IMinuteInfo()
     this.RequestData=function(hqChart)
     {
         var self = this;
-        this.Data=[];
         var param=
         {
             HQChart:hqChart
@@ -108513,6 +108531,7 @@ function MarketEventInfo()
 
     this.RecvData=function(recvData,param)
     {
+        this.Data=[];
         if (recvData && recvData.ver==3)
         {
             this.RecvDataV3(recvData,param);
@@ -108589,6 +108608,8 @@ function MinuteNewsInfo()
 
     this.RecvData=function(recvData,param)
     {
+        this.Data=[];
+
         if (!recvData || !IFrameSplitOperator.IsNonEmptyArray(recvData.list)) return;
 
         for(var i=0;i<recvData.list.length;++i)
@@ -140676,6 +140697,16 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType==SCRIPT_CHART_NAME.DRAW_HORIZONTAL_CHANNEL)
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+                    drawItem.Config=draw.Config;
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -141470,8 +141501,8 @@ function GetBlackStyle()
 
             BuySellBar:
             {
-                BuyColor:"rgb(102, 33, 33)",
-                SellColor:"rgb(20, 63, 31)",
+                BuyColor:"rgb(255,0,0)",
+                SellColor:"rgb(0,255,0)",
                 Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
                 TextColor:"rgb(220,220,220)",
             }
@@ -167328,7 +167359,7 @@ function JSFloatTooltip()
         if (!this.DivDialog) return;
         this.LanguageID=this.HQChart.LanguageID;
 
-        if (data.DataType==1)
+        if (data.DataType==1)   //K线图|分时图
         {
             var tooltipData=data.Tooltip;
             if (!tooltipData) return;
@@ -167417,6 +167448,10 @@ function JSFloatTooltip()
                 this.DealItemTooltip(data);
             }
         }
+        else if (data.DataType==6)  //五档买卖盘
+        {
+            this.StockInfoTooltip(data);
+        }
     }
 
     this.UpdateRealtimeHQTooltip=function(data)
@@ -167839,6 +167874,54 @@ function JSFloatTooltip()
 
         this.ShowTooltip(data);
     }
+
+    this.StockInfoTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        var cellData=null;
+        if (tooltipData.Data && tooltipData.Data.Data) cellData=tooltipData.Data.Data;
+        if (!cellData) return;
+        if (cellData.Type!=3) return;
+        var aryData=null;   //买卖5档数据
+        if (cellData.Value && cellData.Value.AryData) aryData=cellData.Value.AryData;
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryData)) return;
+
+        var aryText=[]; //输出内容
+        var totalVol=0, totalAmount=0;
+        for(var i=0;i<aryData.length && i<=cellData.Value.Index;++i)
+        {
+            var item=aryData[i];
+            if (IFrameSplitOperator.IsNumber(item.Vol) && IFrameSplitOperator.IsNumber(item.Price))
+            {
+                totalVol+=item.Vol;
+                totalAmount+=item.Price*item.Vol;
+            }
+        }
+
+        var strPrice="--.---";   //均价
+        var avPrice=null;
+        if (totalVol>0) 
+        {
+            avPrice=totalAmount/totalVol;
+            strPrice=avPrice.toFixed(3);
+        }
+
+        var strIncrease='--.--%' //涨幅
+        if (IFrameSplitOperator.IsNumber(avPrice) && IFrameSplitOperator.IsPlusNumber(cellData.Value.YClose))
+        {
+            var value=(avPrice-cellData.Value.YClose)/cellData.Value.YClose*100;
+            strIncrease=`${value.toFixed(2)}%`;
+        }
+        
+
+        var text=` 前${cellData.Value.Index+1}档 幅度:${strIncrease} 委托总量:${totalVol} 均价:${strPrice} `;
+        var item={ Title:text,  Color:this.TextColor, IsMergeCell:true ,TitleClassName:this.TitleAlign.Center };
+        aryText.push(item);
+
+        this.AryText=aryText;
+        this.UpdateTableDOM();
+        this.ShowTooltip(data);
+    }
  
     this.UpdateTableDOM=function()
     {
@@ -172663,6 +172746,7 @@ function JSStockInfoChart(divElement)
 
         if (option.EnableResize==true) this.CreateResizeListener();
         if (option.EnablePopMenuV2===true) chart.InitalPopMenu();
+        if (option.FloatTooltip && option.FloatTooltip.Enable) chart.InitalFloatTooltip(option.FloatTooltip);   //提示信息
 
         if (option.Symbol)
         {
@@ -172865,9 +172949,12 @@ function JSStockInfoChartContainer(uielement)
     this.AutoUpdateFrequency=15000;             //15秒更新一次数据
 
     this.JSPopMenu;             //内置菜单
+    this.FloatTooltip;          //提示浮框
 
     this.UIElement=uielement;
-   
+    
+    this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
+
     this.IsDestroy=false;        //是否已经销毁了
 
     this.ChartDestroy=function()    //销毁
@@ -172876,6 +172963,58 @@ function JSStockInfoChartContainer(uielement)
         this.StopAutoUpdate();
 
         this.DestroyPopMenu();
+        this.DestroyFloatTooltip();
+    }
+
+    //内置提示信息
+    this.HideFloatTooltip=function()
+    {
+        if (!this.FloatTooltip) return;
+
+        this.FloatTooltip.Hide();
+    }
+
+    this.DestroyFloatTooltip=function()
+    {
+        if (!this.FloatTooltip) return;
+
+        this.FloatTooltip.Destroy();
+        this.FloatTooltip=null;
+    }
+
+    this.InitalFloatTooltip=function(option)
+    {
+        if (this.FloatTooltip) return;
+
+        this.FloatTooltip=new JSFloatTooltip();
+        this.FloatTooltip.Inital(this, option);
+        this.FloatTooltip.Create();
+    }
+
+     this.DrawFloatTooltip=function(point,toolTip)
+    {
+        if (!this.FloatTooltip) return;
+
+        this.UpdateFloatTooltip(point, toolTip)
+    }
+
+    this.UpdateFloatTooltip=function(point, toolTip)
+    {
+        if (!this.FloatTooltip) return;
+
+        var sendData=
+        {
+            Tooltip:toolTip,
+            Point:point,
+            DataType:6,
+        };
+
+        this.FloatTooltip.Update(sendData);
+    }
+
+    this.HideAllTooltip=function()
+    {
+        this.HideFloatTooltip();
     }
 
     //设置事件回调
@@ -173246,11 +173385,39 @@ function JSStockInfoChartContainer(uielement)
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
         var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
 
+        this.LastMouseStatus.OnMouseMove={ X:x, Y:y };
+         
+        var bDrawTooltip=false;
+        if (this.LastMouseStatus.TooltipStatus) bDrawTooltip=true;
+        this.LastMouseStatus.TooltipStatus=null;
+
         var option={ Update:false };
 
         this.OnChartMouseMove(x,y,e,option);
 
+        var tooltipData=this.GetChartTooltipData(x, y);
+        if (tooltipData && tooltipData.Data)
+        {
+            var item=tooltipData.Data;
+            if (item.Data && item.Data.Type==3) //5档买卖盘名字
+            {
+                this.LastMouseStatus.TooltipStatus={ X:x, Y:y, Data:tooltipData, ClientX:e.clientX, ClientY:e.clientY };
+                bDrawTooltip=true;
+            }
+        }
+
         if (option.Update===true) this.Draw();
+
+        if (this.LastMouseStatus.TooltipStatus)
+        {
+            var xTooltip = e.clientX-this.UIElement.getBoundingClientRect().left;
+            var yTooltip = e.clientY-this.UIElement.getBoundingClientRect().top;
+            this.DrawFloatTooltip({X:xTooltip, Y:yTooltip, YMove:20/pixelTatio},this.LastMouseStatus.TooltipStatus.Data);
+        }
+        else
+        {
+            this.HideFloatTooltip();
+        }
     }
 
     this.OnChartMouseMove=function(x, y, e, option)
@@ -173267,6 +173434,20 @@ function JSStockInfoChartContainer(uielement)
         return false;
     }
 
+    this.GetChartTooltipData=function(x, y)
+    {
+        var toolTip=new TooltipData();
+        for(var i=0;i<this.ChartPaint.length;++i)
+        {
+            var item=this.ChartPaint[i];
+            if (item.GetTooltipData(x,y,toolTip))
+            {
+                return toolTip;
+            }
+        }
+        return null;
+    }
+
     this.TryClickPaintEvent=function(eventID, ptClick, e)
     {
         var event=this.GetEventCallback(eventID);
@@ -173304,6 +173485,8 @@ function JSStockInfoChartContainer(uielement)
         this.ChartClearMouseOnData(option);
 
         if (option.Update===true) this.Draw();
+
+        this.HideAllTooltip();
     }
 
     this.UIOnMounseOut=function(e)
@@ -173314,7 +173497,7 @@ function JSStockInfoChartContainer(uielement)
 
         if (option.Update===true) this.Draw();
 
-        //this.HideAllTooltip();
+        this.HideAllTooltip();
     }
 
     this.ChartClearMouseOnData=function(option)
@@ -173834,7 +174017,7 @@ function ChartStockData()
         {
             xText=left;
             var item=this.Data.Sells[i];
-            this.DrawBuySellItem(item, xText, yText, cellWidth, cellHeight, { Type:1, Index:i});
+            this.DrawBuySellItem(item, xText, yText, cellWidth, cellHeight, { Type:2, Index:i});
             if (IFrameSplitOperator.IsNumber(item.Vol)) sellVol+=item.Vol;
             yText+=cellHeight;
         }
@@ -173853,7 +174036,7 @@ function ChartStockData()
         {
             xText=left;
             var item=this.Data.Buys[i];
-            this.DrawBuySellItem(item, xText, yText, cellWidth, cellHeight, { Type:2, Index:i});
+            this.DrawBuySellItem(item, xText, yText, cellWidth, cellHeight, { Type:1, Index:i});
             if (IFrameSplitOperator.IsNumber(item.Vol)) buyVol+=item.Vol;
             yText+=cellHeight;
         }
@@ -173929,6 +174112,13 @@ function ChartStockData()
         {
             this.Canvas.fillStyle=config.TitleColor;
             this.Canvas.fillText(item.Name,xText+config.CellMargin.Left,yBottom);
+            var textWidth=this.Canvas.measureText(item.Name).width+2;
+            var rtCell={ Left:xText+config.CellMargin.Left, Top:top, Height:cellHeight,  Width:textWidth };
+            rtCell.Right=rtCell.Left+rtCell.Width;
+            rtCell.Bottom=rtCell.Top+rtCell.Height;
+
+            var key=`${itemInfo.Type==1?"BUY":"SELL"}_NAME_${itemInfo.Index}`;
+            this.AryCellRect.push({ Rect:rtCell, Data:{ Type:3, Key:key, Value:{ Index:itemInfo.Index, Type:itemInfo.Type, YClose:this.GetYClose(), AryData:itemInfo.Type==1?this.Data.Buys:this.Data.Sells } }});
         }
         xText+=cellWidth;
 
@@ -174146,19 +174336,21 @@ function ChartStockData()
     }
 
     this.GetPriceColor=function(price)
+    {
+        var yClose=this.GetYClose();
+        if (!IFrameSplitOperator.IsNumber(yClose)) return  this.UnchangeColor;
+        return this.GetUpDownColor(price, yClose);
+    }
+
+    this.GetYClose=function()
     {
         var upperSymbol=null;
         if (this.Data.Symbol) upperSymbol=this.Data.Symbol.toUpperCase();
-        if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
-        {
-            if (!IFrameSplitOperator.IsNumber(this.Data.YFClose)) return  this.UnchangeColor;
-            return this.GetUpDownColor(price, this.Data.YFClose);
-        }
-        else
-        {
-            if (!IFrameSplitOperator.IsNumber(this.Data.YClose)) return this.UnchangeColor;
-            return this.GetUpDownColor(price, this.Data.YClose);
-        }
+        var price=null;
+        if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)) price=this.Data.YFClose;
+        else price=this.Data.YClose;
+
+        return price;
     }
 
     this.GetUpDownColor=function(price, price2)
@@ -175265,7 +175457,7 @@ function ChartScrollText()
 
 
 
-var HQCHART_VERSION="1.1.15695";
+var HQCHART_VERSION="1.1.15707";
 
 function PrintHQChartVersion()
 {