hqchart 1.1.13558 → 1.1.13569

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13558",
+  "version": "1.1.13569",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.DialogDrawTool.js

@@ -45,6 +45,7 @@ function JSDialogDrawTool()
                 { Title: '水平射线', ClassName: 'hqchart_drawtool icon-tubiao_shuipingshexian', Type:0, Data:{ ID:"水平射线" } },
                 { Title: '涂鸦线段', ClassName: 'hqchart_drawtool icon-draw_line', Type:0, Data:{ ID:"涂鸦线段" } },
                 { Title: '阻速线', ClassName: 'hqchart_drawtool icon-draw_resline', Type:0, Data:{ ID:"阻速线" } },
+                { Title: '通达信阻速线', ClassName: 'hqchart_drawtool icon-draw_resline', Type:0, Data:{ ID:"阻速线2" } },
                 { Title: '江恩角度线', ClassName: 'hqchart_drawtool icon-jiangenjiaoduxian', Type:0, Data:{ ID:"江恩角度线" } },
             ]
         }, 

package/src/jscommon/umychart.js

@@ -2600,6 +2600,7 @@ var JSCHART_EVENT_ID=
 
     ON_DRAW_REPORT_ROW_BG:140,              //报价列表整行背景
     ON_CLICK_REPORT_CHECKBOX:141,           //报价列表checkbox
+    ON_CLICK_REPORT_BUTTON:142,             //报价列表按钮
 
 
     ON_CHANGE_INDEX:150,        //切换指标
@@ -2772,8 +2773,12 @@ var JSCHART_MENU_ID=
 
     CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID:38,
 
+    CMD_SHOW_CORSS_LINE_ID:39,          //显示十字光标线
+
 
     CMD_REPORT_CHANGE_BLOCK_ID:60,      //报价列表 切换板块ID
+
+    
 }
 
 
@@ -9293,6 +9298,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     //右键菜单
     this.PopupMenuByRClick=function(menuData, x, y)
     {
+        if (!this.JSPopMenu) return;
+
         var rtClient=this.UIElement.getBoundingClientRect();
         var rtScroll=GetScrollPosition();
 
@@ -9555,6 +9562,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     if (this.ChartDragSelectRect) this.ChartDragSelectRect.ShowMode=param;
                 }
                 break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID:
+                if (IFrameSplitOperator.IsBool(srcParam))
+                {
+                    if (this.ChartCorssCursor) this.ChartCorssCursor.IsShowCorss=srcParam;
+                }
+                break;
         }
     }
 
@@ -56345,6 +56359,7 @@ IChartDrawPicture.ArrayDrawPricture=
     { Name:"文本", ClassName:'ChartDrawPictureText', Create:function() { return new ChartDrawPictureText(); }},
     { Name:"江恩角度线", ClassName:'ChartDrawPictureGannFan',  Create:function() { return new ChartDrawPictureGannFan(); }},
     { Name:"阻速线", ClassName:'ChartDrawPictureResistanceLine',  Create:function() { return new ChartDrawPictureResistanceLine(); }},
+    { Name:"阻速线2", ClassName:'ChartDrawPictureResistanceLineV2',  Create:function() { return new ChartDrawPictureResistanceLineV2(); }},
     { Name:"黄金分割", ClassName:'ChartDrawPictureGoldenSection',  Create:function() { return new ChartDrawPictureGoldenSection(); }},
     { Name:"百分比线", ClassName:'ChartDrawPicturePercentage',  Create:function() { return new ChartDrawPicturePercentage(); }},
     { Name:"波段线", ClassName:'ChartDrawPictureWaveBand',  Create:function() { return new ChartDrawPictureWaveBand(); }},
@@ -59738,6 +59753,23 @@ function ChartDrawPictureGannFan()
     this.IsPointIn=this.IsPointIn_XYValue_Line;
     this.LinePoint=[];
     this.Font=16*GetDevicePixelRatio() +"px 微软雅黑";
+    this.LineDash=[5,10];
+    this.EnableDottedLine=false;    //辅助线是否使用虚线
+    this.EnableArea=true;           //是否绘制面积图
+
+    this.Super_SetOption=this.SetOption;    //父类函数
+
+    this.SetOption=function(option)
+    {
+        if (this.Super_SetOption) this.Super_SetOption(option);
+        if (option)
+        {
+            if (option.Font) this.Font=option.Font;
+            if (Array.isArray(option.LineDash)) this.LineDash=option.LineDash;
+            if (IFrameSplitOperator.IsBool(option.EnableDottedLine)) this.EnableDottedLine=option.EnableDottedLine;
+            if (IFrameSplitOperator.IsBool(option.EnableArea)) this.EnableArea=option.EnableArea;
+        }
+    }
 
 
     this.Draw=function()
@@ -59755,10 +59787,10 @@ function ChartDrawPictureGannFan()
         var quadrant=this.GetQuadrant(drawPoint[0],drawPoint[1]);
 
         this.SetLineWidth();
-        if (quadrant===1 || quadrant===4)
+        if (quadrant===1 || quadrant===2 || quadrant===3 || quadrant===4)
         {
             this.CalculateLines(drawPoint[0],drawPoint[1],quadrant);
-            this.DrawArea();
+            if (this.EnableArea) this.DrawArea();
 
             for(var i in this.LinePoint)
             {
@@ -59786,7 +59818,7 @@ function ChartDrawPictureGannFan()
     this.GetQuadrant=function(ptStart,ptEnd)
     {
         if (ptStart.X<ptEnd.X && ptStart.Y>ptEnd.Y) return 1;
-        else if (ptStart.X<ptEnd.X && ptStart.Y>ptEnd.Y) return 2;
+        else if (ptStart.X>ptEnd.X && ptStart.Y>ptEnd.Y) return 2;
         else if (ptStart.X < ptEnd.X && ptStart.Y< ptEnd.Y) return 4;
         else return 3;
     }
@@ -59795,7 +59827,7 @@ function ChartDrawPictureGannFan()
     //isDotline 是否是虚线
     this.DrawLine=function(ptStart,ptEnd,isDottedline)
     {
-        if (isDottedline) this.Canvas.setLineDash([5,10]);
+        if (isDottedline) this.Canvas.setLineDash(this.LineDash);
 
         this.Canvas.strokeStyle=this.LineColor;
         this.Canvas.beginPath();
@@ -59857,27 +59889,15 @@ function ChartDrawPictureGannFan()
         var lineHeight=Math.abs(ptStart.Y-ptEnd.Y);
         if (quadrant===1)
         {
-            /*
-            var line={Start:ptLineStart, End:new Point(), IsDottedLine:false};
-            line.End.X=ptStart.X;
-            line.End.Y=top;
-            this.LinePoint.push(line);
-
-            line={Start:ptLineStart, End:new Point(), IsDottedLine:false};
-            line.End.X=right;
-            line.End.Y=ptStart.Y;
-            this.LinePoint.push(line);
-            */
-
             var extendLine=this.CalculateExtendLinePoint(ptStart,ptEnd);
             var line={Start:ptLineStart, End:extendLine.Start, IsDottedLine:false,PtEnd:ptLineEnd, Text:'1:1'};
             this.LinePoint.push(line);
 
-            for(var i in SPLIT_LINE_VALUE)
+            for(var i=0;i<SPLIT_LINE_VALUE.length; ++i)
             {
                 if (lineWidth>5)
                 {
-                    line={Start:ptLineStart, End:null, IsDottedLine:false,PtEnd:new Point(),Text:SPLIT_LINE_X_TITLE[i]};
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(),Text:SPLIT_LINE_X_TITLE[i]};
                     line.PtEnd.Y=ptEnd.Y;
                     line.PtEnd.X=ptStart.X+lineWidth*SPLIT_LINE_VALUE[i];
                     var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
@@ -59886,7 +59906,7 @@ function ChartDrawPictureGannFan()
                 }
                 if (lineHeight>5)
                 {
-                    line={Start:ptLineStart, End:null, IsDottedLine:false,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
                     line.PtEnd.Y=ptStart.Y-lineHeight*SPLIT_LINE_VALUE[i];
                     line.PtEnd.X=ptEnd.X;
                     var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
@@ -59896,29 +59916,77 @@ function ChartDrawPictureGannFan()
             }
             
         }
-        else if (quadrant==4)
+        else if (quadrant==2)
         {
-            /*
-            var line={Start:ptLineStart, End:new Point(), IsDottedLine:false};
-            line.End.X=ptStart.X;
-            line.End.Y=bottom;
+            var extendLine=this.CalculateExtendLinePoint(ptStart,ptEnd);
+            var line={Start:ptLineStart, End:extendLine.Start, IsDottedLine:false,PtEnd:ptLineEnd, Text:'1:1'};
             this.LinePoint.push(line);
 
-            line={Start:ptLineStart, End:new Point(), IsDottedLine:false};
-            line.End.X=right;
-            line.End.Y=ptStart.Y;
+            for(var i=0;i<SPLIT_LINE_VALUE.length; ++i)
+            {
+                
+                if (lineWidth>5)
+                {
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(),Text:SPLIT_LINE_X_TITLE[i]};
+                    line.PtEnd.Y=ptEnd.Y;
+                    line.PtEnd.X=ptStart.X-lineWidth*SPLIT_LINE_VALUE[i];
+                    var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
+                    line.End=extendLine.Start;
+                    this.LinePoint.push(line);
+                }
+
+                
+                if (lineHeight>5)
+                {
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
+                    line.PtEnd.Y=ptStart.Y-lineHeight*SPLIT_LINE_VALUE[i];
+                    line.PtEnd.X=ptEnd.X;
+                    var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
+                    line.End=extendLine.Start;
+                    this.LinePoint.push(line);
+                }
+                    
+            }
+        }
+        else if (quadrant==3)
+        {
+            var extendLine=this.CalculateExtendLinePoint(ptStart,ptEnd);
+            var line={Start:ptLineStart, End:extendLine.End, IsDottedLine:false,PtEnd:ptLineEnd, Text:'1:1'};
             this.LinePoint.push(line);
-            */
 
+            for(var i=0;i<SPLIT_LINE_VALUE.length; ++i)
+            {
+                if (lineWidth>5)
+                {
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(),Text:SPLIT_LINE_X_TITLE[i]};
+                    line.PtEnd.Y=ptEnd.Y;
+                    line.PtEnd.X=ptStart.X-lineWidth*SPLIT_LINE_VALUE[i];
+                    var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
+                    line.End=extendLine.End;
+                    this.LinePoint.push(line);
+                }
+                if (lineHeight>5)
+                {
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
+                    line.PtEnd.Y=ptStart.Y+lineHeight*SPLIT_LINE_VALUE[i];
+                    line.PtEnd.X=ptEnd.X;
+                    var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
+                    line.End=extendLine.End;
+                    this.LinePoint.push(line);
+                }
+            }
+        }
+        else if (quadrant==4)
+        {
             var extendLine=this.CalculateExtendLinePoint(ptStart,ptEnd);
             var line={Start:ptLineStart, End:extendLine.End, IsDottedLine:false,PtEnd:ptLineEnd, Text:'1:1'};
             this.LinePoint.push(line);
 
-            for(var i in SPLIT_LINE_VALUE)
+            for(var i=0;i<SPLIT_LINE_VALUE.length; ++i)
             {
                 if (lineWidth>5)
                 {
-                    line={Start:ptLineStart, End:null, IsDottedLine:false,PtEnd:new Point(),Text:SPLIT_LINE_X_TITLE[i]};
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(),Text:SPLIT_LINE_X_TITLE[i]};
                     line.PtEnd.Y=ptEnd.Y;
                     line.PtEnd.X=ptStart.X+lineWidth*SPLIT_LINE_VALUE[i];
                     var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
@@ -59927,7 +59995,7 @@ function ChartDrawPictureGannFan()
                 }
                 if (lineHeight>5)
                 {
-                    line={Start:ptLineStart, End:null, IsDottedLine:false,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
                     line.PtEnd.Y=ptStart.Y+lineHeight*SPLIT_LINE_VALUE[i];
                     line.PtEnd.X=ptEnd.X;
                     var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
@@ -59936,7 +60004,10 @@ function ChartDrawPictureGannFan()
                 }
             }
         }
-        else return false;
+        else 
+        {
+            return false;
+        }
 
         return true;
     }
@@ -59975,11 +60046,11 @@ function ChartDrawPictureResistanceLine()
             var line={Start:ptLineStart, End:extendLine.Start, IsDottedLine:false,PtEnd:ptLineEnd, Text:'1:1'};
             this.LinePoint.push(line);
 
-            for(var i in SPLIT_LINE_VALUE)
+            for(var i=0;i<SPLIT_LINE_VALUE.length; ++i)
             {
                 if (lineHeight>5)
                 {
-                    line={Start:ptLineStart, End:null, IsDottedLine:false,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
                     line.PtEnd.Y=ptStart.Y-lineHeight*SPLIT_LINE_VALUE[i];
                     line.PtEnd.X=ptEnd.X;
                     var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
@@ -59987,7 +60058,45 @@ function ChartDrawPictureResistanceLine()
                     this.LinePoint.push(line);
                 }
             }
-            
+        }
+        else if (quadrant==2)
+        {
+            var extendLine=this.CalculateExtendLinePoint(ptStart,ptEnd);
+            var line={Start:ptLineStart, End:extendLine.Start, IsDottedLine:false,PtEnd:ptLineEnd, Text:'1:1'};
+            this.LinePoint.push(line);
+
+            for(var i=0;i<SPLIT_LINE_VALUE.length; ++i)
+            {
+                if (lineHeight>5)
+                {
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
+                    line.PtEnd.Y=ptStart.Y-lineHeight*SPLIT_LINE_VALUE[i];
+                    line.PtEnd.X=ptEnd.X;
+                    var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
+                    line.End=extendLine.Start;
+                    this.LinePoint.push(line);
+                }
+                    
+            }
+        }
+        else if (quadrant==3)
+        {
+            var extendLine=this.CalculateExtendLinePoint(ptStart,ptEnd);
+            var line={Start:ptLineStart, End:extendLine.End, IsDottedLine:false,PtEnd:ptLineEnd, Text:'1:1'};
+            this.LinePoint.push(line);
+
+            for(var i=0;i<SPLIT_LINE_VALUE.length; ++i)
+            {
+                if (lineHeight>5)
+                {
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
+                    line.PtEnd.Y=ptStart.Y+lineHeight*SPLIT_LINE_VALUE[i];
+                    line.PtEnd.X=ptEnd.X;
+                    var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
+                    line.End=extendLine.End;
+                    this.LinePoint.push(line);
+                }
+            }
         }
         else if (quadrant==4)
         {
@@ -59995,11 +60104,11 @@ function ChartDrawPictureResistanceLine()
             var line={Start:ptLineStart, End:extendLine.End, IsDottedLine:false,PtEnd:ptLineEnd, Text:'1:1'};
             this.LinePoint.push(line);
 
-            for(var i in SPLIT_LINE_VALUE)
+            for(var i=0;i<SPLIT_LINE_VALUE.length; ++i)
             {
                 if (lineHeight>5)
                 {
-                    line={Start:ptLineStart, End:null, IsDottedLine:false,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
+                    line={Start:ptLineStart, End:null, IsDottedLine:this.EnableDottedLine,PtEnd:new Point(), Text:SPLIT_LINE_Y_TITLE[i]};
                     line.PtEnd.Y=ptStart.Y+lineHeight*SPLIT_LINE_VALUE[i];
                     line.PtEnd.X=ptEnd.X;
                     var extendLine=this.CalculateExtendLinePoint(line.Start,line.PtEnd);
@@ -60008,7 +60117,10 @@ function ChartDrawPictureResistanceLine()
                 }
             }
         }
-        else return false;
+        else 
+        {
+            return false;
+        }
 
         return true;
     }
@@ -60035,6 +60147,22 @@ function ChartDrawPictureResistanceLine()
     }
 }
 
+//阻速线2  （高 3等份）通达信版本
+function ChartDrawPictureResistanceLineV2()
+{
+    this.newMethod=ChartDrawPictureResistanceLine;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartDrawPictureResistanceLineV2';
+    this.EnableDottedLine=true;    //辅助线是否使用虚线
+    this.LineDash=[4,8];
+    this.EnableArea=false;
+}
+
+
+
+
 //黄金分割线
 function ChartDrawPictureGoldenSection()
 {
@@ -67147,7 +67275,7 @@ function JSChartResource()
 
         Item:
         {
-            Mergin:{ Top:2, Bottom:0,Left:5, Right:5 }, //单元格四周间距
+            Mergin:{ Top:2, Bottom:4,Left:5, Right:5 }, //单元格四周间距
             Font:{ Size:15, Name:"微软雅黑"},
             BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 },//单元格字体
             NameFont:{ Size:14, Name:"微软雅黑" },
@@ -74918,6 +75046,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (this.GetExtendChartByClassName("SessionBreaksPaint")) bBGSpit=true;
         if (this.GetExtendChartByClassName('StockChip')) bShowStockChip=true;       //筹码
 
+        var bShowCorss=false;   //十字光标十字线
+        if (this.ChartCorssCursor) bShowCorss=this.ChartCorssCursor.IsShowCorss;
+
         var aryMenu=
         [
             { 
@@ -75076,6 +75207,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog() },
 
                     { Name:"移动筹码图", Data:{ ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID, Args:[]}, Checked:bShowStockChip},
+
+                    { Name:"十字光标线", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
+
                     { Name:JSPopMenu.SEPARATOR_LINE_NAME },
                     { 
                         Name:"鼠标形状", 
@@ -78580,6 +78714,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (item && item.Symbol) aryOverlaySymbol.push(item.Symbol)
         }
 
+        var bShowCorss=false;   //十字光标十字线
+        if (this.ChartCorssCursor) bShowCorss=this.ChartCorssCursor.IsShowCorss;
+
         var aryMenu=
         [
             { 
@@ -78648,6 +78785,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 SubMenu:
                 [
                     { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog()},
+                    { Name:"十字光标线", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID, Args:[!bShowCorss]}, Checked:bShowCorss },
 
                     {
                         Name:"区间选择样式", 
@@ -78657,7 +78795,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                             { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID, Args:[1]}, Checked:1==this.ChartDragSelectRect.ShowMode },
                             { Name:"样式3", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID, Args:[2]}, Checked:2==this.ChartDragSelectRect.ShowMode },
                         ]
-                    }
+                    },
+
+                    
                 ]
             }
 

package/src/jscommon/umychart.report.js

@@ -3680,6 +3680,7 @@ var REPORT_COLUMN_ID=
     CUSTOM_DATETIME_TEXT_ID:102,    //自定义日期类型
     CUSTOM_ICON_ID:103,             //自定义图标
     CUSTOM_CHECKBOX_ID:104,         //自定义checkbox
+    CUSTOM_BUTTON_ID:105,           //自定义按钮
 }
 
 var MAP_COLUMN_FIELD=new Map([
@@ -4056,6 +4057,13 @@ function ChartReport()
                 if (item.CheckBox) colItem.CheckBox=CloneData(item.CheckBox);
                 else colItem.CheckBox=CloneData(g_JSChartResource.Report.CheckBox);
             }
+            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
+            {
+                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
+                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+                if (item.Button) colItem.Button=CloneData(item.Button);
+            }
             else if (item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID)
             {
 
@@ -4173,7 +4181,7 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID, Title:"",  TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() },
 
-            
+            { Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID, Title:"", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() }
         ];
 
         for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -5137,6 +5145,15 @@ function ChartReport()
 
             this.GetCustomCheckBoxDrawInfo(data, column, drawInfo);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
+        {
+            rtItem={ Left:left, Top:top,  Width:column.Width, Height:this.RowHeight };
+            rtItem.Right=rtItem.Left+rtItem.Width;
+            rtItem.Bottom=rtItem.Top+rtItem.Height;
+            drawInfo.Rect=rtItem;
+            
+            this.GetCustomButtonDrawInfo(data, column, drawInfo);
+        }
         
 
         //拖拽行颜色
@@ -5155,6 +5172,10 @@ function ChartReport()
         {
             this.DrawCheckbox(drawInfo, left, top, itemWidth);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
+        {
+            this.DrawButton(drawInfo, left, top, itemWidth);
+        }
         else
         {
             if (data.FlashBG && data.FlashBG.Data && column.ID!=undefined)
@@ -5248,9 +5269,9 @@ function ChartReport()
             }
         }
 
-        this.Canvas.textBaseline="middle";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.fillStyle=drawInfo.TextColor;
-        this.Canvas.fillText(text,x,top+this.ItemMergin.Top+this.RowHeight/2);
+        this.Canvas.fillText(text,x,top+this.RowHeight-this.ItemMergin.Bottom);
 
         if (bClip) this.Canvas.restore();
     }
@@ -5457,6 +5478,19 @@ function ChartReport()
         drawInfo.CheckBox=column.CheckBox;
     }
 
+    this.GetCustomButtonDrawInfo=function(data, column, drawInfo)
+    {
+        var buttonData=this.GetExtendData(data, column);
+        if (!buttonData) return;
+
+        drawInfo.Text=buttonData.Title;
+        drawInfo.Button=column.Button;
+        drawInfo.Font=column.Button.Font;
+        drawInfo.Enable=true;
+        drawInfo.Data=buttonData;
+        if (IFrameSplitOperator.IsBool(buttonData.Enable)) drawInfo.Enable=buttonData.Enable;
+    }
+
     this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
     {
         if (!IFrameSplitOperator.IsNumber(stock.Time)) return;
@@ -5617,9 +5651,9 @@ function ChartReport()
             }
         }
 
-        this.Canvas.textBaseline="middle";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.fillStyle=textColor;
-        this.Canvas.fillText(text,x,top+this.ItemMergin.Top+this.RowHeight/2);
+        this.Canvas.fillText(text,x,top+this.RowHeight-this.ItemMergin.Bottom);
 
         if (bClip) this.Canvas.restore();
     }
@@ -5759,6 +5793,46 @@ function ChartReport()
         }
     }
 
+    this.DrawButton=function(drawInfo, left, top, width)
+    {
+        if (!drawInfo.Button) return;
+
+        var rtBG=
+        { 
+            Left:left+drawInfo.Button.Margin.Left, Top:top+drawInfo.Button.Margin.Top, 
+            Height:this.RowHeight-drawInfo.Button.Margin.Top-drawInfo.Button.Margin.Bottom, 
+            Width:width-drawInfo.Button.Margin.Left-drawInfo.Button.Margin.Right
+        }
+        rtBG.Right=rtBG.Left+rtBG.Width;
+        rtBG.Bottom=rtBG.Top+rtBG.Height;
+
+        var bgColor=drawInfo.Button.BGColor, textColor=drawInfo.Button.TextColor;
+        if (drawInfo.Enable===false)
+        {
+            bgColor=drawInfo.Button.Disable.BGColor;
+            textColor=drawInfo.Button.Disable.TextColor;
+        }
+
+        this.Canvas.fillStyle=bgColor;
+        this.Canvas.fillRect(rtBG.Left, rtBG.Top,rtBG.Width,rtBG.Height);
+
+        this.Canvas.font=drawInfo.Font;
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.textAlign="left";
+        this.Canvas.fillStyle=textColor;
+        var textWidth=this.Canvas.measureText(drawInfo.Text).width;
+
+        var x=rtBG.Left;
+        if (textWidth<rtBG.Width) x+=(rtBG.Width-textWidth)/2;
+        var y=rtBG.Bottom-drawInfo.Button.TextMargin.Bottom;
+        this.Canvas.fillText(drawInfo.Text,x,y);
+
+        if (drawInfo.Enable)
+        {
+            drawInfo.Botton={ Rect:rtBG, Type:1 };
+        }
+    }
+
     //字体由外面设置
     this.TextEllipsis=function(text, maxWidth, maxText)
     {
@@ -6447,7 +6521,7 @@ function ChartReport()
         var buttonData=this.GetButtonData(x,y);
         if (!buttonData) return true;
         
-        if (buttonData.Type===0)
+        if (buttonData.Type===0)    //checkbox
         {
             var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, Data:buttonData.Data, PreventDefault: false };
             this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_CHECKBOX, sendData)
@@ -6463,6 +6537,14 @@ function ChartReport()
             status.Redraw=true;
             return true;
         }
+        else if (buttonData.Type===1)   //button
+        {
+            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, Data:buttonData.Data };
+            this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_BUTTON, sendData)
+
+            status.Redraw=true;
+            return true;
+        }
         
         return false;
     }

package/src/jscommon/umychart.style.js

@@ -532,7 +532,7 @@ function GetBlackStyle()
     
             Item:
             {
-                Mergin:{ Top:2, Bottom:0,Left:5, Right:5 },
+                Mergin:{ Top:2, Bottom:4,Left:5, Right:5 },
                 Font:{ Size:15, Name:"微软雅黑"},
                 BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 },
                 NameFont:{ Size:14, Name:"微软雅黑" },