hqchart 1.1.13492 → 1.1.13502

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

@@ -6722,6 +6722,9 @@ var JSCHART_MENU_ID=
     CMD_CHANGE_LANGUAGE_ID:37,          //语言切换
 
     CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID:38,
+
+
+    CMD_REPORT_CHANGE_BLOCK_ID:60,      //报价列表 切换板块ID
 }
 
 
@@ -13831,7 +13834,7 @@ function IsRecvOverlap(rect1, rect2)
     return Math.max(rect1.Left,rect2.Left) < Math.min(rect1.Right,rect2.Right) && Math.max(rect1.Top,rect2.Top) < Math.min(rect1.Bottom,rect2.Bottom); 
 }
 
-function CopyMerginConfig(dest,src)
+function CopyMarginConfig(dest,src)
 {
     if (!src || !dest) return;
 
@@ -13841,6 +13844,9 @@ function CopyMerginConfig(dest,src)
     if (IFrameSplitOperator.IsNumber(src.Bottom)) dest.Bottom=src.Bottom;
 }
 
+//兼容老版本
+function CopyMerginConfig(dest,src) { CopyMarginConfig(dest,src); }
+
 
 function Point()
 {
@@ -53078,6 +53084,9 @@ function ChartCorssCursor()
         Icon:g_JSChartResource.CorssCursor.RightButton.Icon
     };
 
+    this.RightMargin={ Left:2, Right:2, Top:4, Bottom:3 };
+    CopyMarginConfig(this.RightMargin, g_JSChartResource.CorssCursor.RightMargin);
+
     //内部使用
     this.Close=null;     //收盘价格
     this.Status=0;       //当前状态 0=隐藏 1=显示
@@ -53445,6 +53454,7 @@ function ChartCorssCursor()
             var text=this.StringFormatY.Text;
             this.Canvas.font=this.Font;
             var textWidth=this.Canvas.measureText(text).width+4;    //前后各空2个像素
+            var textSize={ Width:textWidth, Height:this.TextHeight, Text:[] };
             var buttonData={Y:y, YValue:yValue, FrameID:yValueExtend.FrameID };
             if (this.Frame.ChartBorder.Left>=30 && this.ShowTextMode.Left==1)
             {
@@ -53474,38 +53484,37 @@ function ChartCorssCursor()
                 this.Canvas.fillText(text,left+2,y,textWidth);
             }
 
+            var complexText=
+            { 
+                ShowType:0, //0=单行(默认)  1=多行 
+                Font:this.Font, Color:this.TextColor,
+                Text:[ { Text:text, Margin:this.RightMargin } ],
+            };
+
+            var yTop=y-this.TextHeight/2;
+
             if (this.StringFormatY.PercentageText)
             {
                 if (this.TextFormat.Right==0)
                 {
                     text=this.StringFormatY.PercentageText+'%';
-                    textWidth=this.Canvas.measureText(text).width+4;    //前后各空2个像素
+                    complexText.Text[0].Text=text;
                 }
             }
 
             if (this.StringFormatY.RText) 
             {
                 text=this.StringFormatY.RText;
-                var textWidth=this.Canvas.measureText(text).width+4;    //前后各空2个像素
+                complexText.Text[0].Text=text;
             }
 
-            var complexText=null;
             if (this.StringFormatY.RComplexText && IFrameSplitOperator.IsNonEmptyArray(this.StringFormatY.RComplexText.Text))
             {
-                var textWidth=0;
                 complexText=this.StringFormatY.RComplexText;
-                for(var i=0; i<complexText.Text.length; ++i)
-                {
-                    var item=complexText.Text[i];
-                    var itemWidth=this.Canvas.measureText(item.Text).width+4;    //前后各空2个像素
-
-                    if (i>0 && IFrameSplitOperator.IsNumber(complexText.Space))
-                        textWidth+=complexText.Space;
-
-                    textWidth+=itemWidth;
-                }
             }
 
+            this.CalculateComplexTextSize(complexText, textSize);
+
             if (this.Frame.ChartBorder.Right>=30 && this.ShowTextMode.Right==1)
             {
                 var isOverlayIndex=false;       //是否有叠加子坐标
@@ -53514,66 +53523,52 @@ function ChartCorssCursor()
                 {
                     var frame=this.Frame.SubFrame[yValueExtend.FrameID];
                     isOverlayIndex=frame.OverlayIndex.length>0;
-                    overlayIndexInterval=frame.Interval;
+                    overlayIndexInterval=null
+                    if (isOverlayIndex)
+                    {
+                        for(var i=0;i<=frame.OverlayIndex.length;++i)
+                        {
+                            var item=frame.OverlayIndex[i];
+                            if (item.Frame.IsShow===false) continue;
+                            if (!item.Frame.GetXHorizontal) continue;
+
+                            var overlayLeft=item.Frame.GetXHorizontal();
+                            overlayIndexInterval=overlayLeft-right;
+                            break;
+                        }
+                    }
                 }
 
-                if (isOverlayIndex && textWidth>overlayIndexInterval)   //大于子坐标宽度
+                //叠加坐标
+                if (isOverlayIndex && textSize.Width>overlayIndexInterval && overlayIndexInterval>0)   //大于子坐标宽度
                 {
                     var drawRight=right+overlayIndexInterval;
                     if (drawRight>chartRight) drawRight=chartRight;
 
-                    var itemLeft=drawRight-2-textWidth;
-                    this.DrawTextBGRect(itemLeft,y-this.TextHeight/2,textWidth,this.TextHeight);
-                    if (complexText) 
-                    {
-                        this.DrawComplexText(itemLeft,y,complexText);
-                    }
-                    else
-                    {
-                        this.Canvas.textAlign="right";
-                        this.Canvas.textBaseline="middle";
-                        this.Canvas.fillStyle=this.TextColor;
-                        this.Canvas.fillText(text,drawRight-4,y,textWidth);
-                    }
+                    var itemLeft=drawRight-2-textSize.Width;
+                    this.DrawTextBGRect(itemLeft,yTop,textSize.Width,textSize.Height);
+                    this.DrawComplexTextV2(itemLeft, yTop, complexText, textSize);
+
+                    if (this.RightButton.Enable) this.DrawRightButton(yTop, itemLeft,this.TextHeight,this.TextHeight,buttonData);
                 }
-                else if (rightWidth<textWidth)   //右边空白显示不下, 
+                else if (rightWidth<textSize.Width)   //右边空白显示不下, 
                 {
-                    var itemLeft=chartRight-2-textWidth;
-                    this.DrawTextBGRect(itemLeft,y-this.TextHeight/2,textWidth,this.TextHeight);
-                    if (complexText) 
-                    {
-                        this.DrawComplexText(itemLeft,y,complexText);
-                    }
-                    else
-                    {
-                        this.Canvas.textAlign="right";
-                        this.Canvas.textBaseline="middle";
-                        this.Canvas.fillStyle=this.TextColor;
-                        this.Canvas.fillText(text,chartRight-4,y,textWidth);
-                    }
-
-                    if (this.RightButton.Enable) this.DrawRightButton(y-this.TextHeight/2, chartRight-2-textWidth,this.TextHeight,this.TextHeight,buttonData);
+                    var itemLeft=chartRight-2-textSize.Width;
+                    this.DrawTextBGRect(itemLeft,yTop,textSize.Width,textSize.Height);
+                    this.DrawComplexTextV2(itemLeft, yTop ,complexText, textSize);
+                    
+                    if (this.RightButton.Enable) this.DrawRightButton(yTop, chartRight-2-textSize.Width,this.TextHeight,this.TextHeight,buttonData);
                 }
                 else
                 {
                     var itemLeft=right+2;
-                    this.DrawTextBGRect(itemLeft,y-this.TextHeight/2,textWidth,this.TextHeight);
-
-                    if (complexText) 
-                    {
-                        this.DrawComplexText(itemLeft,y,complexText);
-                    }
-                    else
-                    {
-                        this.Canvas.textAlign="left";
-                        this.Canvas.textBaseline="middle";
-                        this.Canvas.fillStyle=this.TextColor;
-                        this.Canvas.fillText(text,right+4,y,textWidth);
-                    }
+                    this.DrawTextBGRect(itemLeft,yTop,textSize.Width,textSize.Height);
+                    this.DrawComplexTextV2(itemLeft,yTop,complexText,textSize);
 
-                    if (this.RightButton.Enable) this.DrawRightButton(y-this.TextHeight/2, right+2,this.TextHeight,this.TextHeight,buttonData);
+                    if (this.RightButton.Enable) this.DrawRightButton(yTop, right+2,this.TextHeight,this.TextHeight,buttonData);
                 }
 
+                /*
                 if (this.StringFormatY.RExtendText && this.StringFormatY.RExtendText.length>0)
                 {
                     var yOffset=0;
@@ -53605,26 +53600,16 @@ function ChartCorssCursor()
                         yOffset+=this.TextHeight;
                     }
                 }
+                */
             }
             else if (this.ShowTextMode.Right==2)
             {
                 this.Canvas.fillStyle=this.TextBGColor;
-                var showLeft=right-textWidth;
-                this.DrawTextBGRect(showLeft,y-this.TextHeight/2,textWidth,this.TextHeight);
-
-                if (complexText) 
-                {
-                    this.DrawComplexText(showLeft,y,complexText);
-                }
-                else
-                {
-                    this.Canvas.textAlign="left";
-                    this.Canvas.textBaseline="middle";
-                    this.Canvas.fillStyle=this.TextColor;
-                    this.Canvas.fillText(text,showLeft+2,y,textWidth);
-                }
+                var showLeft=right-textSize.Width;
+                this.DrawTextBGRect(showLeft,yTop,textSize.Width,textSize.Height);
+                this.DrawComplexTextV2(showLeft,yTop,complexText,textSize);
 
-                if (this.RightButton.Enable) this.DrawRightButton(y-this.TextHeight/2, showLeft,this.TextHeight,this.TextHeight,buttonData);
+                if (this.RightButton.Enable) this.DrawRightButton(yTop, showLeft,this.TextHeight,this.TextHeight,buttonData);
             }
         }
 
@@ -53744,6 +53729,137 @@ function ChartCorssCursor()
         }
     }
 
+    this.DrawComplexTextV2=function(left, yTop, complexText, size)
+    {
+        this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="bottom";
+        var showType=0;
+        if (complexText.ShowType==1) showType=complexText.ShowType;
+        if (showType==1)    //多行
+        {
+            var xLeft=left;
+            var yText=yTop;    //顶
+            for(var i=0; i<complexText.Text.length; ++i)
+            {
+                var item=complexText.Text[i];
+                var itemSize=size.Text[i];
+
+                if (item.Font) this.Canvas.font=item.Font;
+                else this.Canvas.font=complexText.Font;
+                
+                if (item.Color) this.Canvas.fillStyle=item.Color;
+                else this.Canvas.fillStyle=complexText.Color;
+
+                var y=yText+itemSize.Height;
+                var x=xLeft;
+                if (item.Margin)
+                {
+                    var margin=item.Margin;
+                    if (IFrameSplitOperator.IsNumber(margin.Bottom)) y-=margin.Bottom;
+                    if (IFrameSplitOperator.IsNumber(margin.Left)) x+=margin.Left;
+                }
+
+                this.Canvas.fillText(item.Text,x,y,itemSize.Width);
+                
+                yText+=itemSize.Height;
+            }
+        }
+        else    //水平 单行
+        {
+            var xText=left;
+            var yBottom=yTop+size.Height;
+            for(var i=0; i<complexText.Text.length; ++i)
+            {
+                var item=complexText.Text[i];
+                var itemSize=size.Text[i];
+
+                if (item.Font) this.Canvas.font=item.Font;
+                else this.Canvas.font=complexText.Font;
+                
+                if (item.Color) this.Canvas.fillStyle=item.Color;
+                else this.Canvas.fillStyle=complexText.Color;
+
+                var y=yBottom;
+                var x=xText;
+                if (item.Margin)
+                {
+                    var margin=item.Margin;
+                    if (IFrameSplitOperator.IsNumber(margin.Bottom)) y-=margin.Bottom;
+                    if (IFrameSplitOperator.IsNumber(margin.Left)) x+=margin.Left;
+                }
+
+                this.Canvas.fillText(item.Text,x,y,itemSize.Width);
+                
+                xText+=itemSize.Width;
+            }
+        }
+    }
+
+    this.CalculateComplexTextSize=function(complexText, size)
+    {
+        if (!complexText || !IFrameSplitOperator.IsNonEmptyArray(complexText.Text)) return;
+
+        var showType=0;
+        if (complexText.ShowType==1) showType=complexText.ShowType;
+        if (showType==1)    //多行
+        {
+            var textWidth=0, textHeight=0;
+            for(var i=0; i<complexText.Text.length; ++i)
+            {
+                var item=complexText.Text[i];
+                if (item.Font) this.Canvas.font=item.Font;
+                else this.Canvas.font=complexText.Font;
+                var itemWidth=this.Canvas.measureText(item.Text).width;    //前后各空2个像素
+                var itemHeight=this.Canvas.measureText("擎").width;
+                if (item.Margin)
+                {
+                    var margin=item.Margin;
+                    if (IFrameSplitOperator.IsNumber(margin.Left)) itemWidth+=margin.Left;
+                    if (IFrameSplitOperator.IsNumber(margin.Right)) itemWidth+=margin.Right;
+                    if (IFrameSplitOperator.IsNumber(margin.Top)) itemHeight+=margin.Top;
+                    if (IFrameSplitOperator.IsNumber(margin.Bottom)) itemHeight+=margin.Bottom;
+                }
+
+                size.Text[i]={ Width:itemWidth, Height:itemHeight };    //保存所有文字的大小信息
+
+                if (textWidth<itemWidth) textWidth=itemWidth;
+                textHeight+=itemHeight;
+            }
+
+            size.Width=textWidth;
+            size.Height=textHeight;
+        }
+        else    //水平 单行
+        {
+            var textWidth=0, textHeight=0;
+            for(var i=0; i<complexText.Text.length; ++i)
+            {
+                var item=complexText.Text[i];
+                if (item.Font) this.Canvas.font=item.Font;
+                else this.Canvas.font=complexText.Font;
+
+                var itemWidth=this.Canvas.measureText(item.Text).width;    //前后各空2个像素
+                var itemHeight=this.Canvas.measureText("擎").width;
+                if (item.Margin)
+                {
+                    var margin=item.Margin;
+                    if (IFrameSplitOperator.IsNumber(margin.Left)) itemWidth+=margin.Left;
+                    if (IFrameSplitOperator.IsNumber(margin.Right)) itemWidth+=margin.Right;
+                    if (IFrameSplitOperator.IsNumber(margin.Top)) itemHeight+=margin.Top;
+                    if (IFrameSplitOperator.IsNumber(margin.Bottom)) itemHeight+=margin.Bottom;
+                }
+
+                size.Text[i]={ Width:itemWidth, Height:itemHeight };    //保存所有文字的大小信息
+
+                textWidth+=itemWidth;
+                if (textHeight<itemHeight) textHeight=itemHeight;
+            }
+
+            size.Width=textWidth;
+            size.Height=textHeight;
+        }
+    }
+
     this.DrawRightButton=function(drawTop, drawRight, drawWidth, drawHeight, data)
     {
         this.Canvas.fillStyle=this.RightButton.BGColor;
@@ -65547,7 +65663,7 @@ function ChartDrawMonitorLine()
             if (item.LineDash) dest.LineDash=item.LineDash;
             if (IFrameSplitOperator.IsNumber(item.LineSpace)) dest.LineSpace=item.LineSpace;
             if (IFrameSplitOperator.IsNumber(item.TextAlign)) dest.TextAlign=item.TextAlign;
-            if (item.Mergin) CopyMerginConfig(dest.Mergin, item.Mergin);
+            if (item.Mergin) CopyMarginConfig(dest.Mergin, item.Mergin);
         }
 
         if (option.FormatLabelTextCallback) this.FormatLabelTextCallback=option.FormatLabelTextCallback;
@@ -69548,7 +69664,7 @@ function ChartInfoLine()
             if (item.BGColor) dest.BGColor=item.BGColor;
             if (IFrameSplitOperator.IsNumber(item.LineSpace)) dest.LineSpace=item.LineSpace;
             if (IFrameSplitOperator.IsNumber(item.TextAlign)) dest.TextAlign=item.TextAlign;
-            if (item.Mergin) CopyMerginConfig(dest.Mergin, item.Mergin);
+            if (item.Mergin) CopyMarginConfig(dest.Mergin, item.Mergin);
         }
 
         if (option.FormatLabelTextCallback) this.FormatLabelTextCallback=option.FormatLabelTextCallback;
@@ -70208,7 +70324,9 @@ function JSChartResource()
             BGColor:'rgb(43,54,69)', 
             PenColor:'rgb(255,255,255)',
             Icon: { Text:'\ue6a3', Color:'rgb(255,255,255)', Family:"iconfont", Size:18 }
-        } 
+        },
+
+        RightMargin: { Left:2, Right:2, Top:5, Bottom:3 }
     };
 
     this.LockBGColor = "rgb(220, 220, 220)";        //指标锁区域颜色
@@ -125132,6 +125250,8 @@ function JSReportChart(divElement)
         this.JSChartContainer=chart;
         this.DivElement.JSChart=this;   //div中保存一份
 
+        if (option.EnablePopMenuV2===true) chart.InitalPopMenu();
+
         if (option.Symbol) chart.Symbol=option.Symbol;
         if (option.Name) chart.Name=option.Name;
 
@@ -125414,6 +125534,9 @@ function JSReportChartContainer(uielement)
 
     this.IsDestroy=false;        //是否已经销毁了
 
+    this.JSPopMenu;             //内置菜单
+    this.IsShowRightMenu=true;
+
     this.ChartDestory=function()    //销毁
     {
         this.IsDestroy=true;
@@ -125431,6 +125554,14 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    this.InitalPopMenu=function()   //初始化弹出窗口
+    {
+        if (this.JSPopMenu) return;
+
+        this.JSPopMenu=new JSPopMenu();     //内置菜单
+        this.JSPopMenu.Inital();
+    }
+
     this.AutoScrollPage=function(step)
     {
         this.AutoDragScrollTimer=setTimeout(() =>
@@ -126628,6 +126759,18 @@ function JSReportChartContainer(uielement)
 
     //去掉右键菜单
     this.UIOnContextMenu=function(e)
+    {
+        if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
+
+        if (!this.IsShowRightMenu) return;
+
+        var x = e.clientX-this.UIElement.getBoundingClientRect().left;
+        var y = e.clientY-this.UIElement.getBoundingClientRect().top;
+
+        if(typeof(this.OnRightMenu)=='function') this.OnRightMenu(x,y,e);   //右键菜单事件
+    }
+
+    this.OnRightMenu=function(x,y,e)
     {
         e.preventDefault();
     }
@@ -127753,6 +127896,52 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    this.GetTabPopMenu=function(tabItem)
+    {
+        var aryMenu=[ ];
+
+        if (IFrameSplitOperator.IsNonEmptyArray(tabItem.ArySubMenu))
+        {
+            for(var i=0;i<tabItem.ArySubMenu.length;++i)
+            {
+                var item=tabItem.ArySubMenu[i];
+                var menuItem={ Name:item.Title, Data:{ ID:item.CommandID, Args:[item.ID]} };
+
+                aryMenu.push(menuItem);
+            }
+        }
+
+
+        return aryMenu;
+    }
+
+    this.PopupTabMenu=function(menuData, tab, e)
+    {
+        if (!this.JSPopMenu) return;
+
+        var rtTab=tab.Rect;
+        var pixelRatio=GetDevicePixelRatio();
+        var rtCell={ Left:rtTab.Left/pixelRatio, Right:rtTab.Right/pixelRatio, Bottom:rtTab.Bottom/pixelRatio, Top:rtTab.Top/pixelRatio };
+        rtCell.Width=rtCell.Right-rtCell.Left;
+        rtCell.Height=rtCell.Bottom-rtCell.Top;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+        rtCell.Left+=offsetLeft;
+        rtCell.Right+=offsetLeft;
+        rtCell.Top+=offsetTop;
+        rtCell.Bottom+=offsetTop;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByTab(rtCell);
+
+        if(e.preventDefault) e.preventDefault();
+        if(e.stopPropagation) e.stopPropagation();
+    }
+
     //点击标签
     this.OnClickTab=function(tabData, e)
     {
@@ -127766,36 +127955,80 @@ function JSReportChartContainer(uielement)
 
         if (tabData.Tab.IsMenu)
         {
+            var menuData={ Menu:this.GetTabPopMenu(tabData.Tab), Position:JSPopMenu.POSITION_ID.TAB_MENU_ID };
+            menuData.ClickCallback=(data)=>{ this.OnClickTabPopMenu(tabData, data); }
+
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_REPORT_TABMENU);
             if (event && event.Callback)
             {
-                redraw=true;
-                var rtItem=tabData.Rect;
-                var rtDOM={ Left: rtItem.Left/pixelTatio, Right:rtItem.Right/pixelTatio, Top:rtItem.Top/pixelTatio, Bottom:rtItem.Bottom/pixelTatio };
-
-                var sendData={ Data:tabData, IsSide:{X:x, Y:x}, UIElement:uiElement, Rect:rtDOM, e:e , Redraw:redraw };
+                var sendData={ MenuData:menuData, Tab:tabData, PreventDefault:false, e:e };
                 event.Callback(event, sendData, this);
-                if (IFrameSplitOperator.IsBool(sendData.Redraw)) redraw=sendData.Redraw;
+                if (sendData.PreventDefault==true) return;
             }
 
-            this.SetSelectedTab(tabData.Index); //选中tab
+            this.PopupTabMenu(menuData, tabData.Tab, e);
         }
         else
         {
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_REPORT_TAB);
             if (event && event.Callback)
             {
-                var sendData={ Data:tabData, IsSide:{X:x, Y:x}, UIElement:uiElement, e:e , Redraw:redraw };
+                var sendData={ Data:tabData, IsSide:{X:x, Y:x}, UIElement:uiElement, e:e , Redraw:redraw, PreventDefault:false };
                 event.Callback(event, sendData, this);
                 if (IFrameSplitOperator.IsBool(sendData.Redraw)) redraw=sendData.Redraw;
+                if (sendData.PreventDefault==true) return;
             }
 
-            this.SetSelectedTab(tabData.Index);
+            if (tabData.Tab.CommandID==JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID)
+            {
+                this.ExecuteMenuCommand(tabData.Tab.CommandID,  [tabData.Tab.ID]);
+                this.SetSelectedTab(tabData.Index);
+            }
         }
 
         if (redraw) this.Draw();
     }
 
+    this.OnClickTabPopMenu=function(tabData, data)
+    {
+        JSConsole.Chart.Log('[JSReportChartContainer::OnClickTabPopMenu] ',tabData, data);
+
+        var cmdID=data.Data.ID;     //命令ID
+        var aryArgs=data.Data.Args; //参数
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);  //回调通知外部
+        if (event && event.Callback)
+        {
+            var data={ PreventDefault:false, CommandID:cmdID, Args:aryArgs, SrcData:data, TabData:tabData };
+            event.Callback(event,data,this);
+            if (data.PreventDefault) return;
+        }
+
+        this.ExecuteMenuCommand(cmdID,aryArgs);
+        
+        this.SetSelectedTab(tabData.Index);
+        this.Draw();
+    }
+
+    this.ExecuteMenuCommand=function(cmdID, aryArgs)
+    {
+        JSConsole.Chart.Log('[JSReportChartContainer::ExecuteMenuCommand] cmdID=, aryArgs=', cmdID,aryArgs);
+
+        var param=null, srcParam=null;  //原始值
+        if (IFrameSplitOperator.IsNonEmptyArray(aryArgs))
+        {
+            srcParam=aryArgs[0];
+            if (IFrameSplitOperator.IsNumber(aryArgs[0])) param=aryArgs[0];
+        }
+
+        switch(cmdID)
+        {
+            case JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID:
+                if (srcParam) this.ChangeSymbol(param);
+                break;
+        }
+    }
+
     this.SwapColumn=function(leftIndex, rightIndex, option)
     {
         var reportChart=this.GetReportChart();
@@ -128711,6 +128944,14 @@ function ChartReport()
         return null;
     }
 
+    this.ClipClient=function()
+    {
+        this.Canvas.save();
+        this.Canvas.beginPath();
+        this.Canvas.rect(this.RectClient.Left,this.RectClient.Top,(this.RectClient.Right-this.RectClient.Left),(this.RectClient.Bottom-this.RectClient.Top));
+        //this.Canvas.stroke(); //调试用
+        this.Canvas.clip();
+    }
 
     this.Draw=function()
     {
@@ -128722,12 +128963,7 @@ function ChartReport()
         if (this.SizeChange) this.CalculateSize();
         else this.UpdateCacheData();
 
-        this.Canvas.save();
-
-        this.Canvas.beginPath();
-        this.Canvas.rect(this.RectClient.Left,this.RectClient.Top,(this.RectClient.Right-this.RectClient.Left),(this.RectClient.Bottom-this.RectClient.Top));
-        //this.Canvas.stroke(); //调试用
-        this.Canvas.clip();
+        this.ClipClient();
 
         this.DrawHeader();
         this.DrawBody();
@@ -128740,7 +128976,9 @@ function ChartReport()
             this.Tab.DrawScrollbar(this.RectClient.Left,bottom-this.BottomToolbarHeight, this.RectClient.Right, bottom);
         }
 
+        this.ClipClient();
         this.DrawBorder();
+        this.Canvas.restore();
 
         this.DrawDragRow();
 
@@ -130871,7 +131109,7 @@ function ChartReportTab()
     this.IsShow=true;                   //是否显示
 
     //Tab
-    this.TabList=[];                //{ Title:标题, ID:, IsMenu: 是否菜单 }
+    this.TabList=[];                //{ Title:标题, ID:, IsMenu: 是否菜单, ArySubMenu:[ { Title:, ID: }] }
     this.SelectedTabIndex=-1;
     this.MoveOnTabIndex=-1;
     
@@ -130940,7 +131178,7 @@ function ChartReportTab()
 
             var tabItem={ Title:item.Title, IsMenu:false, FixedSymbol:[], FixedRowCount:0 };
             if (item.ID) tabItem.ID=item.ID;
-            if (item.MenuID) tabItem.MenuID=item.MenuID;
+            if (item.CommandID) tabItem.CommandID=item.CommandID;
             if (IFrameSplitOperator.IsBool(item.IsMenu)) tabItem.IsMenu=item.IsMenu;
             if (IFrameSplitOperator.IsNonEmptyArray(item.FixedSymbol))
             {
@@ -130952,6 +131190,10 @@ function ChartReportTab()
                     ++tabItem.FixedRowCount;
                 }
             }
+
+            if (IFrameSplitOperator.IsNonEmptyArray(item.ArySubMenu))
+                tabItem.ArySubMenu=item.ArySubMenu.slice();
+            
             this.TabList.push(tabItem);
         }
     }
@@ -138358,7 +138600,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13491";
+var HQCHART_VERSION="1.1.13501";
 
 function PrintHQChartVersion()
 {