hqchart 1.1.14754 → 1.1.14764

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

@@ -4658,6 +4658,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsBool(item.EnableDBClick)) chart.ChartCorssCursor.EnableDBClick=item.EnableDBClick;
 
             if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
+            if (IFrameSplitOperator.IsBool(item.IsShowIncrease)) chart.ChartCorssCursor.StringFormatX.IsShowIncrease=item.IsShowIncrease;
            
         }
 
@@ -7113,7 +7114,8 @@ var JSCHART_MENU_ID=
     CMD_CORSS_DBCLICK_ID:57,                //双击显示隐藏十字光标
     CMD_ENABLE_KLINE_DAY_SUMMARY_ID:58,     //K线底部显示走完剩余时间
     CMD_SHOW_BUYSELL_BAR_ID:59,             //盘口分析(右侧显示买卖盘柱子) 分时图
-
+    CMD_CORSS_SHOW_INCREASE_ID:60,          //十字光标 底部显示"至今涨幅"
+    CMD_CORSS_X_TEXTALIGN_ID:61,            //十字光标 底部文字对齐方式
 
 
     CMD_REPORT_CHANGE_BLOCK_ID:100,      //报价列表 切换板块ID
@@ -15154,6 +15156,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.ChartCorssCursor.IsShowClose=srcParam;
                 }
                 break;
+            case JSCHART_MENU_ID.CMD_CORSS_SHOW_INCREASE_ID:
+                if (IFrameSplitOperator.IsBool(srcParam) && this.ChartCorssCursor)
+                {
+                    this.ChartCorssCursor.StringFormatX.IsShowIncrease=srcParam;
+                }
+                break;
+            case JSCHART_MENU_ID.CMD_CORSS_X_TEXTALIGN_ID:
+                if (param==null) return false;
+                if (this.ChartCorssCursor) this.ChartCorssCursor.BottomConfig.Align=param;
+                break;
             case JSCHART_MENU_ID.CMD_CORSS_POINT_ID:
                 if (IFrameSplitOperator.IsBool(srcParam) && this.ChartCorssCursor) this.ChartCorssCursor.CorssPointConfig.Enable=srcParam;
                 break;
@@ -60325,6 +60337,7 @@ function ChartCorssCursor()
 
     this.StringFormatX;
     this.StringFormatY;
+    this.HQChart;
 
     this.ShowTextMode={ Left:1, Right:1, Bottom:1 }; //0=不显示  1=显示在框架外 2=显示在框架内
     this.TextFormat= { Right:0 };               //0=默认 1=价格显示(分时图才有用)
@@ -60924,13 +60937,16 @@ function ChartCorssCursor()
             var textWidth=this.Canvas.measureText(text).width;    //前后各空2个像素
             var margin=this.BottomConfig.Margin;
             var textOffset=this.BottomConfig.TextOffset;
+            var textAlign=this.BottomConfig.Align;
             var rtBG=
             { 
                 Top:bottom, Height:margin.Top+margin.Bottom+textHeight, 
                 XCenter:x, Width:textWidth+margin.Left+margin.Right 
             };
             rtBG.Bottom=rtBG.Top+rtBG.Height;
-            rtBG.Left=rtBG.XCenter-rtBG.Width/2;
+            if (textAlign==1) rtBG.Left=rtBG.XCenter-rtBG.Width/2;
+            else rtBG.Left=rtBG.XCenter;
+
             rtBG.Right=rtBG.Left+rtBG.Width;
 
             if (rtBG.Left<=0)
@@ -62369,7 +62385,8 @@ function HQDateStringFormat()
 
     this.DateFormatType=0;  //0=YYYY-MM-DD 1=YYYY/MM/DD  2=YYYY/MM/DD/W 3=DD/MM/YYYY
     this.LanguageID=0;
-    this.KItem=null;        //缓存当前的K线
+    this.KItem=null;            //缓存当前的K线
+    this.IsShowIncrease=false;   //是否显示"至今涨幅"
 
     this.Operator=function()
     {
@@ -62408,6 +62425,13 @@ function HQDateStringFormat()
             this.Text = this.Text + "  " + time;
         }
 
+        if (this.IsShowIncrease && IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))    //计算涨幅
+        {
+            var lastItem=this.Data.Data[this.Data.Data.length-1];   //最后一个数据
+            var value=(lastItem.Close-currentData.YClose)/currentData.YClose*100;
+            this.Text+=` ${g_JSChartLocalization.GetText('至今涨幅',this.LanguageID)}${value.toFixed(2)}%`;
+        }
+
         if (this.GetEventCallback)
         {
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_CORSSCURSOR_X_TEXT);
@@ -78760,7 +78784,7 @@ function JSChartResource()
             Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:14 }
         },
 
-        BottomText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
+        BottomText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 }, Align:1 },  //Align 0=左对齐 1=居中
         LeftText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
         RightText:{ Margin: { Left:4, Right:4, Top:0, Bottom:0 }, TextOffset:{X:4, Y:-1 } },
         RightOverlayText:{ Margin: { Left:2, Right:2, Top:0, Bottom:0 }, TextOffset:{X:2, Y:-1 } }, //右侧叠加坐标
@@ -81922,6 +81946,8 @@ function JSChartLocalization()
         ["周", {CN:'周', EN:'Week', TC:'周'} ],
         ["月", {CN:'月', EN:'Month', TC:'月'} ],
         ["年", {CN:'年', EN:'Year', TC:'年'} ],
+
+        ["至今涨幅", {CN:'至今涨幅', EN:'increase to date ', TC:'至今涨幅'}]
         
     ]);
 
@@ -83750,6 +83776,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.ChartCorssCursor.StringFormatX=g_DivTooltipDataForamt.Create("CorssCursor_XStringFormat");
         this.ChartCorssCursor.StringFormatX.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.StringFormatX.LanguageID=this.LanguageID;
+        this.ChartCorssCursor.StringFormatX.IsShowIncrease=true;
         this.ChartCorssCursor.StringFormatY=g_DivTooltipDataForamt.Create("CorssCursor_YStringFormat");
         this.ChartCorssCursor.StringFormatY.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.StringFormatY.LanguageID=this.LanguageID;
@@ -83757,6 +83784,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.ChartCorssCursor.StringFormatY.HQChart=this;
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.OnChangeStatusCallback=(data, obj)=>{ this.OnChangeCorssCursorStatus(data,obj); }
+        this.ChartCorssCursor.HQChart=this;
 
         //创建等待提示
         this.ChartSplashPaint = new ChartSplashPaint();
@@ -88854,6 +88882,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var bCorssDrawVaildTime=false;
         var bCorssDrawPoint=false;
         var bCorssBCClick=false;
+        var bCorssShowIncrease=false;
+        var crossXTextAlign=-1;
         if (this.ChartCorssCursor) 
         {
             bShowCorss=this.ChartCorssCursor.IsShowCorss;
@@ -88861,6 +88891,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
             bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
             bCorssBCClick=this.ChartCorssCursor.EnableDBClick;
+            bCorssShowIncrease=this.ChartCorssCursor.StringFormatX.IsShowIncrease;
+            crossXTextAlign=this.ChartCorssCursor.BottomConfig.Align;
         }
 
         var bPopMinuteChart=false;
@@ -88885,6 +88917,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             }
         }
 
+        //K线浮框 是否显示指标信息
+        var bTooltipDialogShowIndexTitle=false;
+        if (this.DialogTooltip)
+        {
+            bTooltipDialogShowIndexTitle=this.DialogTooltip.IndexTitle.Enable;
+        }
+
         var aryMenu=
         [
             { 
@@ -89047,6 +89086,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
                     { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
                     { Name:"双击显示/隐藏", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_DBCLICK_ID, Args:[!bCorssBCClick]}, Checked:bCorssBCClick },
+                    { Name:"至今涨幅显示/隐藏", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_SHOW_INCREASE_ID, Args:[!bCorssShowIncrease]}, Checked:bCorssShowIncrease },
+                    { 
+                        Name:"底部文字对齐", 
+                        SubMenu:
+                        [
+                            { Name:"居中", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_X_TEXTALIGN_ID, Args:[1]}, Checked:crossXTextAlign===1 },
+                            { Name:"左对齐", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_X_TEXTALIGN_ID, Args:[0]}, Checked:crossXTextAlign===0 },
+                        ]
+                    },
                 ]
             },
             {
@@ -89101,6 +89149,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                         [
                             { Name:"禁用", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:false}]}, Checked:!this.DialogTooltip },
                             { Name:"样式1", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:0}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===0) },
+                            { Name:"样式1-指标显示", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, IndexTitle:{Enable:!bTooltipDialogShowIndexTitle}} ]}, Checked:bTooltipDialogShowIndexTitle },
                             { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:1}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===1) },
                         ]
                     },
@@ -90704,13 +90753,14 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         var dataType=0;
         var kItem=null;
+        var dataIndex=-1;
         if (this.ChartCorssCursor.ClientPos>=0)
         {
             var hisData=this.ChartOperator_Temp_GetHistoryData();;
             if (!hisData) return false;  //数据还没有到达
             if (!IFrameSplitOperator.IsNonEmptyArray(hisData.Data)) return false;
     
-            var dataIndex=hisData.DataOffset+this.ChartCorssCursor.CursorIndex;
+            dataIndex=hisData.DataOffset+this.ChartCorssCursor.CursorIndex;
             if (dataIndex>=hisData.Data.length) dataIndex=hisData.Data.length-1;
             var kItem=hisData.Data[dataIndex];
         }
@@ -90724,6 +90774,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsNumber(kItem.Time)) dataID.Time=kItem.Time;
             if (!this.DialogTooltip.IsEqualDataID(dataID)) return false;
 
+            dataIndex=hisData.Data.length-1
             dataType=1;
         }
 
@@ -90735,6 +90786,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             KItem:kItem, 
             Symbol:this.Symbol, Name:this.Name,
             LastValue:this.ChartCorssCursor.LastValue,
+            DataIndex:dataIndex,                    //K先索引位置
         };
 
         this.DialogTooltip.Update(sendData);
@@ -93626,6 +93678,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ChartCorssCursor.CallAcutionXOperator=new CallAcutionXOperator();
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.OnChangeStatusCallback=(data, obj)=>{ this.OnChangeCorssCursorStatus(data,obj); }
+        this.ChartCorssCursor.HQChart=this;
 
         //创建等待提示
         this.ChartSplashPaint = new ChartSplashPaint();
@@ -99188,6 +99241,7 @@ function KLineChartHScreenContainer(uielement)
         this.ChartCorssCursor.StringFormatY.ExtendChartPaint=this.ExtendChartPaint;
         this.ChartCorssCursor.StringFormatY.HQChart=this;
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+        this.ChartCorssCursor.HQChart=this;
 
         //创建等待提示
         this.ChartSplashPaint = new ChartSplashPaint();
@@ -99370,7 +99424,8 @@ function MinuteChartHScreenContainer(uielement)
         this.ChartCorssCursor.StringFormatY.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
         this.ChartCorssCursor.StringFormatY.HQChart=this;
         this.ChartCorssCursor.CallAcutionXOperator=new CallAcutionXOperator();
-        this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+        this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
+        this.ChartCorssCursor.HQChart=this;
 
          //创建等待提示
          this.ChartSplashPaint = new ChartSplashPaint();
@@ -134317,17 +134372,22 @@ function JSDealChartContainer(uielement)
         chart.YClose=data.yclose;
         chart.Open=data.open;
 
-        if (this.IsShowLastPage)    //显示最后一屏
-        {
-            var pageSize=chart.GetPageSize(true);
-            var offset=aryDeal.length-pageSize;
-            if (offset<0) offset=0;
-            this.Data.DataOffset=offset;
-        }
+        if (this.IsShowLastPage) this.SetLastPageDataOffset();   //显示最后一屏
         
         this.Draw();
     }
 
+    this.SetLastPageDataOffset=function()
+    {
+        var chart=this.ChartPaint[0];
+        var dataCount=0;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data)) dataCount=this.SourceData.Data.length;
+        var pageSize=chart.GetPageSize(true);
+        var offset=dataCount-pageSize;
+        if (offset<0) offset=0;
+        this.Data.DataOffset=offset;
+    }
+
     //增量数据下载
     this.RequestDealUpdateData=function()
     {
@@ -134370,6 +134430,7 @@ function JSDealChartContainer(uielement)
             this.SourceData.Data=aryDeal;
             this.Data.Data=this.FilterData(this.CloneArray(aryDeal));
             if (this.Data.DataOffset>= this.Data.Data.length) this.Data.DataOffset=0;
+            if (this.IsShowLastPage) this.SetLastPageDataOffset();   //显示最后一屏
         }
         else
         {
@@ -135191,6 +135252,7 @@ function ChartDealList()
 
         var clientWidth=this.RectClient.Right-this.RectClient.Left;
         this.TableCount=parseInt(clientWidth/sumWidth);
+        if (this.TableCount<=0) this.TableCount=1;  //只少显示一个
         if (this.IsSingleTable) this.TableCount=1;
         this.TableWidth=clientWidth/this.TableCount;
 
@@ -155272,13 +155334,29 @@ function JSDialogTooltip()
     this.PositionColor=g_JSChartResource.DialogTooltip.PositionColor;
     this.DateTimeColor=g_JSChartResource.DialogTooltip.DateTimeColor;
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
-    this.MaxRowCount=25;
+    this.MaxRowCount=35;
+
+
+    this.ValueAlign=
+    {
+        Right:"UMyChart_Tooltip_Text_Span",
+    };
+
+    this.TitleAlign=
+    {
+        Right:"UMyChart_Tooltip_Title_Span",
+        Left:"UMyChart_Tooltip_Title_Left_Span",
+        Center:"UMyChart_Tooltip_Title_Center_Span",
+    };
 
     this.AryData=[];
     this.AryText=[];
 
     this.KItemCache=null;
+    this.KItemCache2=null;  //{ DataIndex:k线索引 }
     this.KItemCacheID=null;
+    this.IndexTitle={ Enable:false, MaxCount:3 };    //是否显示指标标题
+
     this.LastValueCache=null;       //最后的鼠标位置对应的数值
     this.LastValueCacheID=null;     //鼠标信息
     this.DataID=null;               //当前显示的数据时间{ Symbol:, Date:, Time: }
@@ -155291,6 +155369,13 @@ function JSDialogTooltip()
         if (option)
         {
             if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
+            if (IFrameSplitOperator.IsPlusNumber(option.MaxRowCount)) this.MaxRowCount=option.MaxRowCount;
+            if (option.IndexTitle)
+            {
+                var item=option.IndexTitle;
+                if (IFrameSplitOperator.IsBool(item.Enable)) this.IndexTitle.Enable=item.Enable;
+                if (IFrameSplitOperator.IsPlusNumber(item.MaxCount)) this.IndexTitle.MaxCount=item.MaxCount;
+            }
         }
     }
 
@@ -155299,6 +155384,7 @@ function JSDialogTooltip()
         this.AryData=[];
         this.AryText=[];
         this.KItemCache=null;
+        this.KItemCache2=null;
         this.KItemCacheID=null;
 
         if (this.DivDialog) 
@@ -155413,7 +155499,7 @@ function JSDialogTooltip()
         {
             for(var i=0;i<this.MaxRowCount;++i)
             {
-                var rowItem={ Tr:null, TitleSpan:null, TextSpan:null };
+                var rowItem={ Tr:null, TitleSpan:null, TextSpan:null, TitleTd:null, TextTd:null  };
 
                 var trDom=document.createElement("tr");
                 trDom.className='UMyChart_Tooltip_Group_Tr';
@@ -155423,6 +155509,7 @@ function JSDialogTooltip()
                 var tdDom=document.createElement("td");
                 tdDom.className="UMyChart_Tooltip_Title_Td";   //标题
                 trDom.appendChild(tdDom);
+                rowItem.TitleTd=tdDom;
 
                 var spanDom=document.createElement("span");
                 spanDom.className='UMyChart_Tooltip_Title_Span';
@@ -155433,6 +155520,7 @@ function JSDialogTooltip()
                 var tdDom=document.createElement("td");
                 tdDom.className="UMyChart_Tooltip_Text_Td";    //数值
                 trDom.appendChild(tdDom);
+                rowItem.TextTd=tdDom;
 
                 var spanDom=document.createElement("span");
                 spanDom.className='UMyChart_Tooltip_Text_Span';
@@ -155468,6 +155556,7 @@ function JSDialogTooltip()
             if (this.KItemCacheID!=strKItem)    //数据变动的才更新
             {
                 this.KItemCache= JSON.parse(strKItem);
+                this.KItemCache2={ DataIndex:data.DataIndex };
                 this.KItemCacheID=strKItem;
                 bUpdata=true;
             }
@@ -155532,6 +155621,7 @@ function JSDialogTooltip()
             if (this.KItemCacheID!=strKItem)    //数据变动的才更新
             {
                 this.KItemCache= JSON.parse(strKItem);
+                this.KItemCache2={ DataIndex:data.DataIndex };
                 this.KItemCacheID=strKItem;
                 bUpdata=true;
             }
@@ -155592,9 +155682,18 @@ function JSDialogTooltip()
         if (!this.KItemCache) return;
 
         if (this.HQChart.ClassName=='KLineChartContainer')
+        {
             this.AryText=this.GetFormatKLineTooltipText(this.KItemCache);
+            if (this.IndexTitle.Enable)
+            {
+                var aryIndexTitle=this.GetIndexTitleTooltipText(this.KItemCache,this.KItemCache2);
+                if (IFrameSplitOperator.IsNonEmptyArray(aryIndexTitle)) this.AryText.push(...aryIndexTitle);
+            }
+        }
         else if (this.HQChart.ClassName=='MinuteChartContainer')
+        {
             this.AryText=this.GetFormatMinuteTooltipText(this.KItemCache);
+        }
         else
             return;
 
@@ -155605,9 +155704,53 @@ function JSDialogTooltip()
             var item=this.AryData[index];
 
             item.TitleSpan.innerText=outItem.Title;
-            item.TitleSpan.style.color=this.TextColor;
+            if (outItem.TitleColor)  item.TitleSpan.style.color=outItem.TitleColor;
+            else item.TitleSpan.style.color=this.TextColor;
+
             item.TextSpan.innerText=outItem.Text;
             item.TextSpan.style.color=outItem.Color;
+
+            //修改右侧数值样式
+            if (outItem.ClassName) 
+            {
+                item.TextSpan.className=outItem.ClassName;
+            }
+            else
+            {
+                if (item.TextSpan.className!=this.ValueAlign.Right) item.TextSpan.className=this.ValueAlign.Right;
+            }
+
+            //修改左侧标题样式
+            if (outItem.TitleClassName)
+            {
+                item.TitleSpan.className=outItem.TitleClassName;
+            }
+            else
+            {
+                if (this.Style==0)
+                {
+                    if (item.TitleSpan.className!=this.TitleAlign.Right) item.TitleSpan.className=this.TitleAlign.Right;
+                }
+                else if (this.Style==1)
+                {
+                    if (item.TitleSpan.className!=this.TitleAlign.Left) item.TitleSpan.className=this.TitleAlign.Left;
+                }
+            }
+
+            if (item.TitleTd)
+            {
+                if (outItem.IsMergeCell)    //合并单元格
+                {
+                    item.TitleTd.colSpan=2;
+                    item.TextTd.style.display="none";
+                }
+                else
+                {
+                    if (item.TitleTd.colSpan!=1) item.TitleTd.colSpan=1;
+                    item.TextTd.style.display="";
+                }
+            }
+            
             item.Tr.style.display="";
             if (item.Tr2) item.Tr2.style.display="";
         }
@@ -155803,6 +155946,57 @@ function JSDialogTooltip()
         return aryText;
     }
 
+    this.GetIndexTitleTooltipText=function(kItem, data)
+    {
+        if (!(this.Style===0)) return null;
+
+        if (!this.HQChart) return null;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.TitlePaint)) return null;
+        if (!IFrameSplitOperator.IsNumber(data.DataIndex) || data.DataIndex<0) return null;
+
+        var aryText=[];
+        var dataIndex=data.DataIndex;
+        for(var i=0,j=0,k=0; i<this.HQChart.TitlePaint.length && k<this.IndexTitle.MaxCount; ++i)
+        {
+            var titleChart=this.HQChart.TitlePaint[i];
+            if (titleChart.ClassName!="DynamicChartTitlePainting") continue;
+            if (!IFrameSplitOperator.IsNonEmptyArray(titleChart.Data)) continue;
+
+            var indexName=titleChart.Title;
+            //if (titleChart.ArgumentsText) indexName+=titleChart.ArgumentsText;
+            aryText.push({ Title:indexName, IsMergeCell:true, TitleClassName:this.TitleAlign.Center });
+            for(j=0;j<titleChart.Data.length;++j)
+            {
+                var item=titleChart.Data[j];
+                if (!item || !item.Data || !IFrameSplitOperator.IsNonEmptyArray(item.Data.Data)) continue;
+                if (item.IsShow===false) continue;
+                if (item.IsVisible===false) continue;
+                if (item.DataType) continue;    //定制类型暂时不支持
+
+                value=item.Data.Data[dataIndex];
+                var text="--";
+                if (value)  text=titleChart.FormatValue(value, item);
+
+                var title=item.Name;
+                var dyTitle=titleChart.GetDynamicOutName(item.Name);  //动态标题
+                if (dyTitle) title=dyTitle;
+
+                var tooltipItem=
+                { 
+                    Title:title,
+                    Text:text,
+                    Color:item.Color
+                };
+
+                aryText.push(tooltipItem);
+            }
+
+            ++k;
+        }
+
+        return aryText;
+    }
+
     this.GetFormatMinuteTooltipText=function(data)
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
@@ -159619,7 +159813,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14753";
+var HQCHART_VERSION="1.1.14763";
 
 function PrintHQChartVersion()
 {