hqchart 1.1.13573 → 1.1.13584

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

@@ -6570,6 +6570,7 @@ var JSCHART_EVENT_ID=
     ON_DRAW_REPORT_ROW_BG:140,              //报价列表整行背景
     ON_CLICK_REPORT_CHECKBOX:141,           //报价列表checkbox
     ON_CLICK_REPORT_BUTTON:142,             //报价列表按钮
+    ON_CLICK_REPORT_LINK:143,               //报价列表 链接
 
 
     ON_CHANGE_INDEX:150,        //切换指标
@@ -71408,10 +71409,46 @@ function JSChartResource()
         CheckBox:
         {
             Family:"iconfont", Size:15,
-            Checked:{ Color:"rgb(33,148,240)", Symbol:"\ue6b3", DisableColor:"rgb(112,128,144)" },
-            Unchecked:{ Color:"rgb(33,148,240)", Symbol:"\ue6b4", DisableColor:"rgb(112,128,144)" },
+            Checked:{ Color:"rgb(69,147,238)", Symbol:"\ue6b3", DisableColor:"rgb(230,230,230)", MouseOnColor:"rgb(69,147,238)" },
+            Unchecked:{ Color:"rgb(120,120,120)", Symbol:"\ue6b4", DisableColor:"rgb(230,230,230)", MouseOnColor:"rgb(69,147,238)" },
 
             Margin:{ Left:5, Right:5, Bottom:2, Top:4 },
+        },
+
+        Link:
+        {
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+            TextColor:"rgb(30,144,255)",
+
+            Disable:{ TextColor:"rgb(211,211,211)" },
+            MouseOn:{ TextColor:"rgb(30,144,255)" },
+        },
+
+        ProgressBar:
+        {
+            BGColor:"rgb(229,231,238)",
+            BarColor:"rgb(26,125,255)",
+            Margin:{ Left:2, Right:2, Bottom:2, Top:2 },
+            BarMargin:{ Left:2, Right:2, Bottom:2, Top:2 },
+            TextColor:"rgb(0,0,0)",
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+            TextMargin:{ Left:40, Right:2, Bottom:2, Top:2},
+            Disable:{ BGColor:"rgb(229,231,238)", BarColor:"rgb(131,131,131)", TextColor:"rgb(159,161,159)"}
+        },
+
+        Button:
+        {
+            BGColor:"rgb(61,134,180)",
+            TextColor:"rgb(255,255,255)",
+            BorderColor:"rgb(200,200,200)",
+
+            Disable:{ BGColor:"rgb(105,105,105)", TextColor:"rgb(169,169,169)"},
+            MouseOn:{ BGColor:"rgb(57,125,169)", TextColor:"rgb(230,230,230)" },
+
+            Margin:{ Left:5, Right:5, Bottom:2, Top:2 },
+            TextMargin:{ Bottom:2 },
+
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`
         }
     },
 
@@ -72454,6 +72491,58 @@ function JSChartResource()
 
             CopyMarginConfig(dest.CheckBox.Margin, subItem.Margin);
         }
+
+        if (item.Link)
+        {
+            var subItem=item.Link;
+            if (subItem.Font) dest.Link.Font=subItem.Font;
+            if (subItem.TextColor) dest.Link.TextColor=subItem.TextColor;
+            if (subItem.Disable && subItem.Disable.TextColor) dest.Link.Disable.TextColor=subItem.Disable.TextColor;
+            if (subItem.MouseOn && subItem.MouseOn.TextColor) dest.Link.MouseOn.TextColor=subItem.MouseOn.TextColor;
+        }
+
+        if (item.ProgressBar)
+        {
+            var subItem=item.ProgressBar;
+            if (subItem.BGColor) dest.ProgressBar.BGColor=subItem.BGColor;
+            if (subItem.BarColor) dest.ProgressBar.BarColor=subItem.BarColor;
+            if (subItem.TextColor) dest.ProgressBar.TextColor=subItem.TextColor;
+            if (subItem.Font) dest.ProgressBar.Font=subItem.Font;
+            if (subItem.Disable)
+            {
+                if (subItem.Disable.BGColor) dest.ProgressBar.Disable.BGColor=subItem.Disable.BGColor;
+                if (subItem.Disable.BarColor) dest.ProgressBar.Disable.BarColor=subItem.Disable.BarColor;
+                if (subItem.Disable.TextColor) dest.ProgressBar.Disable.TextColor=subItem.Disable.TextColor;
+            }
+
+            CopyMarginConfig(dest.ProgressBar.Margin, subItem.Margin);
+            CopyMarginConfig(dest.ProgressBar.BarMargin, subItem.BarMargin);
+            CopyMarginConfig(dest.ProgressBar.TextMargin, subItem.TextMargin);
+        }
+
+        if (item.Buttom)
+        {
+            var subItem=item.Buttom;
+            if (subItem.BGColor) dest.Buttom.BGColor=subItem.BGColor;
+            if (subItem.TextColor) dest.Buttom.TextColor=subItem.TextColor;
+            if (subItem.BorderColor) dest.Buttom.BorderColor=subItem.BorderColor;
+            if (subItem.Font) dest.Buttom.Font=subItem.Font;
+
+            if (subItem.Disable)
+            {
+                if (subItem.Disable.BGColor) dest.Buttom.Disable.BGColor=subItem.Disable.BGColor;
+                if (subItem.Disable.TextColor) dest.Buttom.Disable.TextColor=subItem.Disable.TextColor;
+            }
+
+            if (subItem.MouseOn)
+            {
+                if (subItem.MouseOn.BGColor) dest.Buttom.MouseOn.BGColor=subItem.MouseOn.BGColor;
+                if (subItem.MouseOn.TextColor) dest.Buttom.MouseOn.TextColor=subItem.MouseOn.TextColor;
+            }
+
+            CopyMarginConfig(dest.Buttom.Margin, subItem.Margin);
+            CopyMarginConfig(dest.Buttom.TextMargin, subItem.TextMargin);
+        }
         
     }
 
@@ -123874,8 +123963,29 @@ function GetBlackStyle()
             CheckBox:
             {
                 Family:"iconfont", Size:15,
-                Checked:{ Color:"rgb(237,60,31)", Symbol:"\ue6b3", DisableColor:"rgb(112,128,144)" },
-                Unchecked:{ Color:"rgb(237,60,31)", Symbol:"\ue6b4", DisableColor:"rgb(112,128,144)" },
+                Checked:{ Color:"rgb(69,147,238)", Symbol:"\ue6b3", DisableColor:"rgb(120,120,120)", MouseOnColor:"rgb(69,147,238)" },
+                Unchecked:{ Color:"rgb(210,210,210)", Symbol:"\ue6b4", DisableColor:"rgb(120,120,120)", MouseOnColor:"rgb(69,147,238)" },
+            },
+
+            Link:
+            {
+                Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+                TextColor:"rgb(0,144,255)",
+
+                Disable:{ TextColor:"rgb(211,211,211)" },
+                MouseOn:{ TextColor:"rgb(0,144,255)" },
+            },
+
+            ProgressBar:
+            {
+                BGColor:"rgb(20,24,28)",
+                BarColor:"rgb(47,124,197)",
+                Margin:{ Left:2, Right:2, Bottom:2, Top:2 },
+                BarMargin:{ Left:2, Right:2, Bottom:2, Top:2 },
+                TextColor:"rgb(230,230,230)",
+                Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+                TextMargin:{ Left:40, Right:2, Bottom:2, Top:2},
+                Disable:{ BGColor:"rgb(61,61,61)", BarColor:"rgb(131,131,131)", TextColor:"rgb(159,161,159)"}
             }
         },
 
@@ -125916,7 +126026,8 @@ function JSReportChartContainer(uielement)
     this.JSPopMenu;             //内置菜单
     this.IsShowRightMenu=true;
 
-    this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null };
+    //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
+    this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
    
     this.ChartDestory=function()    //销毁
     {
@@ -126155,6 +126266,7 @@ function JSReportChartContainer(uielement)
         this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);
         var pixelTatio = GetDevicePixelRatio(); //获取设备的分辨率
         this.Canvas.lineWidth=pixelTatio;       //手机端需要根据分辨率比调整线段宽度
+        this.LastMouseStatus.MouseOnStatus=null;
 
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash)
         {
@@ -126171,14 +126283,14 @@ function JSReportChartContainer(uielement)
         {
             var item=this.ChartPaint[i];
             if (item.IsDrawFirst)
-                item.Draw();
+                item.Draw(this.LastMouseStatus);
         }
 
         for(var i=0; i<this.ChartPaint.length; ++i)
         {
             var item=this.ChartPaint[i];
             if (!item.IsDrawFirst)
-                item.Draw();
+                item.Draw(this.LastMouseStatus);
         }
 
         if (this.GlobalOption.FlashBGCount>0)
@@ -127209,6 +127321,7 @@ function JSReportChartContainer(uielement)
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
         var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
         
+        var oldMouseOnStatus=this.LastMouseStatus.MouseOnStatus;
         this.LastMouseStatus.OnMouseMove=null;
 
         var bDrawTooltip=false;
@@ -127220,6 +127333,7 @@ function JSReportChartContainer(uielement)
         if (this.DragColumnWidth) return;
 
         var tabChart=this.GetTabChart();
+        var bDrawTab=false;
         if (tabChart)
         {
             var tabData=tabChart.PtInTab(x,y);
@@ -127229,9 +127343,18 @@ function JSReportChartContainer(uielement)
                 if (tabChart.MoveOnTabIndex!=index)
                 {
                     tabChart.MoveOnTabIndex=index;
-                    this.Draw();
+                    bDrawTab=true;
                 }
             }
+            else
+            {
+                if (tabChart.MoveOnTabIndex>=0) 
+                {
+                    tabChart.MoveOnTabIndex=-1;
+                    bDrawTab=true;
+                }
+                    
+            }
         }
 
         this.LastMouseStatus.OnMouseMove={ X:x, Y:y };
@@ -127249,12 +127372,28 @@ function JSReportChartContainer(uielement)
             }
             else
             {
-                var bottonData=report.GetButtonData(x,y)
-                if (bottonData)
+                var buttonData=report.GetButtonData(x,y);
+                var mouseOnStatus=null;
+                if (buttonData)
                 {
                     mouseStatus={ Cursor:"pointer", Name:"Botton"};
+                    if (buttonData.Type==1 || buttonData.Type==0 || buttonData.Type==2)
+                    {
+                        mouseOnStatus={ Index:buttonData.Index, ColumnIndex:buttonData.ColumnIndex };
+                    }
                 }
 
+                //console.log("[UIOnMouseMove] ", oldMouseOnStatus, mouseOnStatus)
+                if ((!oldMouseOnStatus && mouseOnStatus) || (oldMouseOnStatus && !mouseOnStatus))
+                {
+                    bDraw=true;
+                }
+                else if (oldMouseOnStatus && mouseOnStatus)
+                {
+                    if (oldMouseOnStatus.Index!=mouseOnStatus.Index || oldMouseOnStatus.ColumnIndex!=mouseOnStatus.ColumnIndex)
+                        bDraw=true;
+                }
+                   
                 var tooltipData=report.GetTooltipData(x,y);  //单元格提示信息
                 if (tooltipData)
                 {
@@ -127288,7 +127427,7 @@ function JSReportChartContainer(uielement)
 
         if (mouseStatus) this.UIElement.style.cursor=mouseStatus.Cursor;
 
-        if (bDraw) this.Draw();
+        if (bDraw || bDrawTab) this.Draw();
         else if (bDrawTooltip) this.DrawTooltip(this.LastMouseStatus.TooltipStatus);
     }
 
@@ -128606,7 +128745,7 @@ function JSReportChartContainer(uielement)
         switch(cmdID)
         {
             case JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID:
-                if (srcParam) this.ChangeSymbol(param);
+                if (srcParam) this.ChangeSymbol(srcParam);
                 break;
         }
     }
@@ -129137,6 +129276,8 @@ var REPORT_COLUMN_ID=
     CUSTOM_ICON_ID:103,             //自定义图标
     CUSTOM_CHECKBOX_ID:104,         //自定义checkbox
     CUSTOM_BUTTON_ID:105,           //自定义按钮
+    CUSTOM_PROGRESS_ID:106,         //进度条
+    CUSTOM_LINK_ID:107,              //链接
 }
 
 var MAP_COLUMN_FIELD=new Map([
@@ -129307,6 +129448,9 @@ function ChartReport()
     }
 
     this.CheckBoxConfig=CloneData(g_JSChartResource.Report.CheckBox);
+    this.LinkConfig=CloneData(g_JSChartResource.Report.Link);
+    this.ProgressBarConfig=CloneData(g_JSChartResource.Report.ProgressBar);
+    this.ButtonConfig=CloneData(g_JSChartResource.Report.Button);
 
     //股票代码+股票名称
     this.ItemSymbolFontConfig={Size:g_JSChartResource.Report.Item.SymbolFont.Size, Name:g_JSChartResource.Report.Item.SymbolFont.Name};
@@ -129350,6 +129494,8 @@ function ChartReport()
     //{ Rect:rtItem, Type: 0=checkedbox, 1=button, 2=link , Stock, Index:index, Column:column }
     this.ButtonRect=[]; 
 
+    this.LastMouseStatus;
+
     this.ReloadResource=function(resource)
     {
         this.DevicePixelRatio=GetDevicePixelRatio()
@@ -129440,6 +129586,10 @@ function ChartReport()
 
         if (this.Tab) this.Tab.ReloadResource(resource);
         if (this.VScrollbar) this.VScrollbar.ReloadResource(resource);
+
+        this.CheckBoxConfig=CloneData(g_JSChartResource.Report.CheckBox);
+        this.LinkConfig=CloneData(g_JSChartResource.Report.Link);
+        this.ProgressBarConfig=CloneData(g_JSChartResource.Report.ProgressBar);
     }
 
     this.SetColumn=function(aryColumn)
@@ -129511,7 +129661,7 @@ function ChartReport()
                 if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
                 if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
                 if (item.CheckBox) colItem.CheckBox=CloneData(item.CheckBox);
-                else colItem.CheckBox=CloneData(g_JSChartResource.Report.CheckBox);
+                else colItem.CheckBox=this.CheckBoxConfig;
             }
             else if (item.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID)
             {
@@ -129519,6 +129669,23 @@ function ChartReport()
                 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 colItem.Button=this.ButtonConfig;
+            }
+            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_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.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
+                else colItem.ProgressBar=this.ProgressBarConfig;
+            }
+            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_LINK_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.Link) colItem.Link=CloneData(item.Link);
+                else colItem.Link=this.LinkConfig;
             }
             else if (item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID)
             {
@@ -129637,7 +129804,9 @@ 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() }
+            { Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID, Title:"", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
+            { Type:REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID, Title:"进度条", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() },
+            { Type:REPORT_COLUMN_ID.CUSTOM_LINK_ID, Title:"链接地址", TextAlign:"center", MaxText:"擎擎擎擎擎" }
         ];
 
         for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -129658,12 +129827,13 @@ function ChartReport()
         this.Canvas.clip();
     }
 
-    this.Draw=function()
+    this.Draw=function(lastMouseStatus)
     {
         this.ShowSymbol=[];
         this.TooltipRect=[];
         this.ButtonRect=[];
         this.DevicePixelRatio=GetDevicePixelRatio()
+        this.LastMouseStatus=lastMouseStatus;
 
         if (this.GlobalOption) this.GlobalOption.FlashBGCount=0;
 
@@ -129695,6 +129865,7 @@ function ChartReport()
             this.VScrollbar.DrawScrollbar(this.RectClient.Left,this.RectClient.Top+this.HeaderHeight, this.RectClient.Right, bottom-this.BottomToolbarHeight-4);
         }
 
+        this.LastMouseStatus=null;
         this.SizeChange=false;
     }
 
@@ -130334,7 +130505,7 @@ function ChartReport()
         for(var i=0;i<this.FixedColumn && i<this.Column.length;++i)
         {
             var item=this.Column[i];
-            this.DrawItem(dataIndex, data, item, left, top, rowType);
+            this.DrawItem(dataIndex, data, item, left, top, rowType, i);
             left+=item.Width;
 
             if (left>=chartRight) break;
@@ -130343,20 +130514,24 @@ function ChartReport()
         for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i)
         {
             var item=this.Column[i];
-            this.DrawItem(dataIndex, data, item, left, top, rowType);
+            this.DrawItem(dataIndex, data, item, left, top, rowType, i);
             left+=item.Width;
 
             if (left>=chartRight) break;
         }
     }
 
-    this.DrawItem=function(index, data, column, left, top, rowType)
+    this.DrawItem=function(index, data, column, left, top, rowType, columnIndex)
     {
         var itemWidth=column.Width;
         var x=left+this.ItemMergin.Left;
         var textWidth=column.Width-this.ItemMergin.Left-this.ItemMergin.Right;
         var stock=data.Stock;
-        var drawInfo={ Text:null, TextColor:column.TextColor , TextAlign:column.TextAlign, Tooltip:null };
+        var drawInfo=
+        { 
+            Text:null, TextColor:column.TextColor , TextAlign:column.TextAlign, Tooltip:null, 
+            Index:index, ColumnIndex:columnIndex
+        };
         var rtItem={ Left:left, Top:top,  Width:column.Width, Height:this.RowHeight };
         rtItem.Right=rtItem.Left+rtItem.Width;
         rtItem.Bottom=rtItem.Top+rtItem.Height;
@@ -130610,6 +130785,19 @@ function ChartReport()
             
             this.GetCustomButtonDrawInfo(data, column, drawInfo);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_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.GetCustomProgressBarDrawInfo(data, column, drawInfo);
+        }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID)
+        {
+            this.GetCustomLinkDrawInfo(data, column, drawInfo);
+        }
         
 
         //拖拽行颜色
@@ -130632,6 +130820,14 @@ function ChartReport()
         {
             this.DrawButton(drawInfo, left, top, itemWidth);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
+        {
+            this.DrawProgressBar(drawInfo, left, top, itemWidth);
+        }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID)
+        {
+            this.DrawLinkText(drawInfo, x, top, textWidth);
+        }
         else
         {
             if (data.FlashBG && data.FlashBG.Data && column.ID!=undefined)
@@ -130665,7 +130861,7 @@ function ChartReport()
 
         if (drawInfo.Botton)
         {
-            var buttonData={ Stock:stock, Index:index, Column:column, Rect:drawInfo.Botton.Rect, Type:drawInfo.Botton.Type, Data:drawInfo.Data };
+            var buttonData={ Stock:stock, Index:index, ColumnIndex:columnIndex, Column:column, Rect:drawInfo.Botton.Rect, Type:drawInfo.Botton.Type, Data:drawInfo.Data };
             this.ButtonRect.push(buttonData);
         }
     }
@@ -130947,6 +131143,36 @@ function ChartReport()
         if (IFrameSplitOperator.IsBool(buttonData.Enable)) drawInfo.Enable=buttonData.Enable;
     }
 
+    this.GetCustomProgressBarDrawInfo=function(data, column, drawInfo)
+    {
+        var barData=this.GetExtendData(data, column);
+        if (!barData) return;
+
+        drawInfo.Text=barData.Title;
+        drawInfo.ProgressBar=column.ProgressBar;
+        drawInfo.Enable=true;
+        drawInfo.Value=barData.Value;   //占比
+        drawInfo.Data=barData;
+        if (IFrameSplitOperator.IsBool(barData.Enable)) drawInfo.Enable=barData.Enable;
+        if (barData.TextColor) drawInfo.TextColor=barData.TextColor;
+        if (barData.BarColor) drawInfo.BarColor=barData.BarColor;
+        if (barData.BGColor) drawInfo.BGColor=barData.BGColor;
+    }
+
+    this.GetCustomLinkDrawInfo=function(data, column, drawInfo)
+    {
+        var linkData=this.GetExtendData(data, column);
+        if (!linkData) return;
+
+        drawInfo.Text=linkData.Title;
+        drawInfo.Link=column.Link;
+        drawInfo.Enable=true;
+        drawInfo.Data=linkData;
+        drawInfo.MaxText=column.MaxText;
+        if (IFrameSplitOperator.IsBool(linkData.Enable)) drawInfo.Enable=linkData.Enable;
+        if (linkData.TextColor) drawInfo.TextColor=linkData.TextColor;
+    }
+
     this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
     {
         if (!IFrameSplitOperator.IsNumber(stock.Time)) return;
@@ -131216,35 +131442,57 @@ function ChartReport()
         if (!IFrameSplitOperator.IsBool(drawInfo.Checked)) return;
         if (!drawInfo.CheckBox) return;
 
-        drawInfo.Font=`${drawInfo.CheckBox.Size*this.DevicePixelRatio}px ${drawInfo.CheckBox.Family}`;
+        var config=drawInfo.CheckBox;
+        drawInfo.Font=`${config.Size*this.DevicePixelRatio}px ${config.Family}`;
         var textAlign=drawInfo.TextAlign;
         var size=drawInfo.CheckBox.Size*this.DevicePixelRatio;
         var x=left+drawInfo.CheckBox.Margin.Left;
         var y=top+this.RowHeight-drawInfo.CheckBox.Margin.Bottom;
+
         if (textAlign=='center') x=left+width/2-size/2;
-        else if (textAlign=='right') x=left+width-drawInfo.CheckBox.Margin.Right;
+        else if (textAlign=='right') x=left+width-config.Margin.Right;
+
+        var rtBox={ Left:x, Bottom:y, Width:size, Height:size };
+        rtBox.Right=rtBox.Left+rtBox.Width;
+        rtBox.Top=rtBox.Bottom-rtBox.Height;
+
+        //鼠标在上面
+        var bMouseOn=false;
+        if (drawInfo.Enable && this.LastMouseStatus && this.LastMouseStatus.OnMouseMove)
+        {
+            var xMouse=this.LastMouseStatus.OnMouseMove.X;
+            var yMouse=this.LastMouseStatus.OnMouseMove.Y;
+            if (xMouse>rtBox.Left && xMouse<rtBox.Right && yMouse>rtBox.Top && yMouse<rtBox.Bottom)
+            {
+                bMouseOn=true;
+                this.LastMouseStatus.MouseOnStatus={ Index:drawInfo.Index, ColumnIndex:drawInfo.ColumnIndex, Type:0 };
+            }
+        }
 
         this.Canvas.font=drawInfo.Font;
         this.Canvas.textBaseline="bottom";
         this.Canvas.textAlign="left";
         if (drawInfo.Checked===true)
         {
-            if (drawInfo.Enable===false)  this.Canvas.fillStyle=drawInfo.CheckBox.Checked.DisableColor;
-            else this.Canvas.fillStyle=drawInfo.CheckBox.Checked.Color;
-            this.Canvas.fillText(drawInfo.CheckBox.Checked.Symbol,x,y);
+            var textColor=config.Checked.Color;
+            if (drawInfo.Enable===false) textColor=config.Checked.DisableColor;
+            else if (bMouseOn) textColor=config.Checked.MouseOnColor;
+
+            this.Canvas.fillStyle=textColor;
+            this.Canvas.fillText(config.Checked.Symbol,x,y);
         }
         else if (drawInfo.Checked===false)
         {
-            if (drawInfo.Enable===false)  this.Canvas.fillStyle=drawInfo.CheckBox.Unchecked.DisableColor;
-            else this.Canvas.fillStyle=drawInfo.CheckBox.Unchecked.Color;
-            this.Canvas.fillText(drawInfo.CheckBox.Unchecked.Symbol,x,y);
+            var textColor=config.Unchecked.Color;
+            if (drawInfo.Enable===false)  textColor=config.Unchecked.DisableColor;
+            else if (bMouseOn) textColor=config.Unchecked.MouseOnColor;
+
+            this.Canvas.fillStyle=textColor;
+            this.Canvas.fillText(config.Unchecked.Symbol,x,y);
         }
 
         if (drawInfo.Enable)
         {
-            var rtBox={ Left:x, Bottom:y, Width:size, Height:size };
-            rtBox.Right=rtBox.Left+rtBox.Width;
-            rtBox.Top=rtBox.Bottom-rtBox.Height;
             drawInfo.Botton={ Rect:rtBox, Type:0 };
         }
     }
@@ -131253,6 +131501,7 @@ function ChartReport()
     {
         if (!drawInfo.Button) return;
 
+        var config=drawInfo.Button;
         var rtBG=
         { 
             Left:left+drawInfo.Button.Margin.Left, Top:top+drawInfo.Button.Margin.Top, 
@@ -131262,11 +131511,26 @@ function ChartReport()
         rtBG.Right=rtBG.Left+rtBG.Width;
         rtBG.Bottom=rtBG.Top+rtBG.Height;
 
-        var bgColor=drawInfo.Button.BGColor, textColor=drawInfo.Button.TextColor;
+        var bgColor=config.BGColor, textColor=config.TextColor;
         if (drawInfo.Enable===false)
         {
-            bgColor=drawInfo.Button.Disable.BGColor;
-            textColor=drawInfo.Button.Disable.TextColor;
+            bgColor=config.Disable.BGColor;
+            textColor=config.Disable.TextColor;
+        }
+        else
+        {
+            if (this.LastMouseStatus && this.LastMouseStatus.OnMouseMove && config.MouseOn)
+            {
+                var x=this.LastMouseStatus.OnMouseMove.X;
+                var y=this.LastMouseStatus.OnMouseMove.Y;
+                if (x>rtBG.Left && x<rtBG.Right && y>rtBG.Top && y<rtBG.Bottom)
+                {
+                    bgColor=config.MouseOn.BGColor;
+                    textColor=config.MouseOn.TextColor;
+
+                    this.LastMouseStatus.MouseOnStatus={ Index:drawInfo.Index, ColumnIndex:drawInfo.ColumnIndex, Type:1 };
+                }
+            }
         }
 
         this.Canvas.fillStyle=bgColor;
@@ -131289,6 +131553,142 @@ function ChartReport()
         }
     }
 
+    this.DrawProgressBar=function(drawInfo, left, top, width)
+    {
+        if (!drawInfo.ProgressBar) return;
+
+        var config=drawInfo.ProgressBar;
+        var rtBG=
+        { 
+            Left:left+config.Margin.Left, Top:top+config.Margin.Top, 
+            Height:this.RowHeight-config.Margin.Top-config.Margin.Bottom, 
+            Width:width-config.Margin.Left-config.Margin.Right
+        }
+        rtBG.Right=rtBG.Left+rtBG.Width;
+        rtBG.Bottom=rtBG.Top+rtBG.Height;
+
+        var bgColor=config.BGColor;
+        var barColor=config.BarColor;
+        var textColor=config.TextColor;
+        if (drawInfo.Enable===false)
+        {
+            bgColor=config.Disable.BGColor;
+            barColor=config.Disable.BarColor;
+            textColor=config.Disable.TextColor;
+        }
+
+        if (drawInfo.BGColor) bgColor=drawInfo.BGColor;
+        if (drawInfo.TextColor) textColor=drawInfo.TextColor;
+        if (drawInfo.BarColor) barColor=drawInfo.BarColor;
+
+        if (bgColor)
+        {
+            this.Canvas.fillStyle=bgColor;
+            this.Canvas.fillRect(rtBG.Left, rtBG.Top,rtBG.Width,rtBG.Height);
+        }
+
+        var fullBarWidth=rtBG.Width-config.BarMargin.Left-config.BarMargin.Right;
+        var value=drawInfo.Value;   // 0-1 进度条
+        var rtBar={ Left:rtBG.Left+config.BarMargin.Left, Top:rtBG.Top+config.BarMargin.Top, Bottom:rtBG.Bottom-config.BarMargin.Bottom, Width:0 };
+        if (value>0)
+        {
+            if (value>1) value=1;
+            rtBar.Width=fullBarWidth*value;
+            rtBar.Height=rtBar.Bottom-rtBar.Top;
+            if (rtBar.Width<1) rtBG.Width=1;
+    
+            this.Canvas.fillStyle=barColor;
+            this.Canvas.fillRect(rtBar.Left, rtBar.Top,rtBar.Width,rtBar.Height);
+        }
+
+        if (textColor && drawInfo.Text)
+        {
+            this.Canvas.font=config.Font;
+            this.Canvas.textBaseline="bottom";
+            this.Canvas.textAlign="left";
+
+            this.Canvas.fillStyle=textColor;
+            var xText=rtBar.Left+config.TextMargin.Left;
+            var yText=rtBar.Bottom-config.TextMargin.Bottom;
+            this.Canvas.fillText(drawInfo.Text, xText, yText);
+        }
+    }
+
+    this.DrawLinkText=function(drawInfo, left, top, width)
+    {
+        if (!drawInfo.Link || !drawInfo.Text) return;
+
+        var config=drawInfo.Link;
+        var text=drawInfo.Text;
+        var textAlign=drawInfo.TextAlign;
+        var font=config.Font;
+        var color=config.TextColor;
+
+       
+
+        this.Canvas.font=font;
+        var textWidth=this.Canvas.measureText(text).width;
+        var textHeight=this.Canvas.measureText("擎").width;
+        var x=left;
+        if (width>=textWidth)
+        {
+            if (textAlign=='center') x=left+(width-textWidth)/2;
+            else if (textAlign=='right') x=left+width-textWidth;
+        }
+        else
+        {
+            text=this.TextEllipsis(text, width, drawInfo.MaxText);
+            textWidth=this.Canvas.measureText(text).width;
+
+            //数据截断提示信息
+            drawInfo.Tooltip=
+            { 
+                Type:2, 
+                Data:{ AryText:[ {Text:drawInfo.Text} ] }
+            }
+        }
+
+        var rtText={Left:x, Bottom:top+this.RowHeight-this.ItemMergin.Bottom, Height:textHeight, Width:textWidth };
+        rtText.Right=rtText.Left+rtText.Width;
+        rtText.Top=rtText.Bottom-rtText.Height;
+
+        var drawLine=false; //下划线
+        if (drawInfo.Enable===false) 
+        {
+            color=config.Disable.TextColor;
+        }
+        else if (this.LastMouseStatus && this.LastMouseStatus.OnMouseMove && config.MouseOn)
+        {
+            var x=this.LastMouseStatus.OnMouseMove.X;
+            var y=this.LastMouseStatus.OnMouseMove.Y;
+            if (x>rtText.Left && x<rtText.Right && y>rtText.Top && y<rtText.Bottom)
+            {
+                color=config.MouseOn.TextColor;
+                drawLine=true;
+                this.LastMouseStatus.MouseOnStatus={ Index:drawInfo.Index, ColumnIndex:drawInfo.ColumnIndex, Type:2 };
+            }
+        }
+
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.textAlign="left";
+        this.Canvas.fillStyle=color;
+        this.Canvas.fillText(text,rtText.Left, rtText.Bottom);
+
+        if (drawLine)
+        {
+            this.Canvas.strokeStyle=color;
+            this.Canvas.beginPath();
+            this.Canvas.moveTo(rtText.Left,rtText.Bottom);
+            this.Canvas.lineTo(rtText.Right,rtText.Bottom);
+            this.Canvas.stroke();
+        }
+
+        if (drawInfo.Enable)
+        {
+            drawInfo.Botton={ Rect:rtText, Type:2 };
+        }
+    }
+
     //字体由外面设置
     this.TextEllipsis=function(text, maxWidth, maxText)
     {
@@ -132001,6 +132401,14 @@ function ChartReport()
             status.Redraw=true;
             return true;
         }
+        else if (buttonData.Type===2)   //link
+        {
+            var sendData={ Column:buttonData.Column, Index:buttonData.Index, Stock:buttonData.Stock, Data:buttonData.Data };
+            this.SendClickEvent(JSCHART_EVENT_ID.ON_CLICK_REPORT_LINK, sendData)
+
+            status.Redraw=true;
+            return true;
+        }
         
         return false;
     }
@@ -132255,7 +132663,7 @@ function ChartReport()
 
             if (x>=rt.Left && x<=rt.Right && y>=rt.Top && y<=rt.Bottom)
             {
-                return { Rect:item.Rect, Stock:item.Stock, Column:item.Column, Index:item.Index, Type:item.Type, Data:item.Data };
+                return { Rect:item.Rect, Stock:item.Stock, Column:item.Column, Index:item.Index, Type:item.Type, Data:item.Data, ColumnIndex:item.ColumnIndex };
             }
         }
     }
@@ -137094,26 +137502,36 @@ function JSScrollBarChart(divElement)
 {
     this.DivElement=divElement;
     this.JSChartContainer;              //表格控件
+    this.ResizeListener;
 
-     //h5 canvas
-     this.CanvasElement=document.createElement("canvas");
-     this.CanvasElement.className='jsscrollbar-drawing';
-     this.CanvasElement.id=Guid();
-     this.CanvasElement.setAttribute("tabindex",0);
-     if (this.CanvasElement.style) this.CanvasElement.style.outline='none';
-     if(divElement.hasChildNodes())
-     {
-         JSConsole.Chart.Log("[JSScrollBarChart::JSScrollBarChart] divElement hasChildNodes", divElement.childNodes);
-     }
-     divElement.appendChild(this.CanvasElement);
+    //h5 canvas
+    this.CanvasElement=document.createElement("canvas");
+    this.CanvasElement.className='jsscrollbar-drawing';
+    this.CanvasElement.id=Guid();
+    this.CanvasElement.setAttribute("tabindex",0);
+    if (this.CanvasElement.style) this.CanvasElement.style.outline='none';
+    if(divElement.hasChildNodes())
+    {
+        JSConsole.Chart.Log("[JSScrollBarChart::JSScrollBarChart] divElement hasChildNodes", divElement.childNodes);
+    }
+    divElement.appendChild(this.CanvasElement);
 
 
     this.OnSize=function()
     {
         //画布大小通过div获取
-        var height=parseInt(this.DivElement.style.height.replace("px",""));
+        var height=this.DivElement.offsetHeight;
+        var width=this.DivElement.offsetWidth;
+        if (this.DivElement.style.height && this.DivElement.style.width)
+        {
+            if (this.DivElement.style.height.includes("px"))
+                height=parseInt(this.DivElement.style.height.replace("px",""));
+            if (this.DivElement.style.width.includes("px"))
+                width=parseInt(this.DivElement.style.width.replace("px",""));
+        }  
+
         this.CanvasElement.height=height;
-        this.CanvasElement.width=parseInt(this.DivElement.style.width.replace("px",""));
+        this.CanvasElement.width=width;
         this.CanvasElement.style.width=this.CanvasElement.width+'px';
         this.CanvasElement.style.height=this.CanvasElement.height+'px';
 
@@ -137135,12 +137553,14 @@ function JSScrollBarChart(divElement)
 
         if (!chart) return false;
 
+        this.JSChartContainer=chart;
+        this.DivElement.JSChart=this;   //div中保存一份
+
+        if (option.EnableResize==true) this.CreateResizeListener();
+
         if (option.OnCreatedCallback) option.OnCreatedCallback(chart);
 
         chart.Draw();
-
-        this.JSChartContainer=chart;
-        this.DivElement.JSChart=this;   //div中保存一份
     }
 
     this.CreateJSScrollBarChartContainer=function(option)
@@ -137185,6 +137605,18 @@ function JSScrollBarChart(divElement)
         if (IFrameSplitOperator.IsBool(item.AutoRight)) chart.AutoMargin.Right=item.AutoRight;
     }
 
+    this.CreateResizeListener=function()
+    {
+        this.ResizeListener = new ResizeObserver((entries)=>{ this.OnDivResize(entries); });
+        this.ResizeListener.observe(this.DivElement);
+    }
+
+    this.OnDivResize=function(entries)
+    {
+        JSConsole.Chart.Log("[JSScrollBarChart::OnDivResize] entries=", entries);
+        this.OnSize( );
+    }
+
     /////////////////////////////////////////////////////////////////////////////
     //对外接口
     
@@ -137330,6 +137762,11 @@ function JSScrollBarChartContainer(uielement)
         this.IsDestroy=true;
     }
 
+    this.GetHQChart=function()
+    {
+        return this.HQChart;
+    }
+
     //设置事件回调
     //{event:事件id, callback:回调函数}
     this.AddEventCallback=function(object)
@@ -137408,6 +137845,36 @@ function JSScrollBarChartContainer(uielement)
         //this.UIElement.ontouchend=(e)=> {this.OnTouchEnd(e); } 
     }
 
+    //创建一个图形
+    this.CreateChartPaint=function(name)
+    {
+        var chart=g_ChartPaintFactory.Create(name);
+        if (!chart) return null;
+
+        chart.ChartFrame=this.Frame;
+        chart.ChartBorder=this.Frame.ChartBorder;
+        chart.Canvas=this.Canvas;
+        chart.Data=this.Frame.Data;
+        chart.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+        chart.GetHQChartCallback=()=>{ return this.GetHQChart(); }
+
+        return chart;
+    }
+
+    this.GetChartPaintByClassName=function(name)
+    {
+        for(var i=0; i<this.ChartPaint.length; ++i)
+        {
+            var item=this.ChartPaint[i];
+            if (item.ClassName==name)
+            {
+                return { Chart:item, Index:i };
+            }
+        }
+
+        return null;
+    }
+
     this.Draw=function()
     {
         if (this.UIElement.width<=0 || this.UIElement.height<=0) return; 
@@ -140002,7 +140469,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13572";
+var HQCHART_VERSION="1.1.13583";
 
 function PrintHQChartVersion()
 {