hqchart 1.1.14269 → 1.1.14276

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

@@ -74602,9 +74602,9 @@ function JSChartResource()
         SortIcon:
         {
             Size:12, Family:"iconfont",
-            Arrow:[null, "\ue6b2", "\ue6b1"],           //[0]=默认排序的图标背景色
-            Color:[null, "rgb(255,0,0)", "rgb(255,0,0)"],
-            Margin:{ Left:0, Bottom:6 }
+            Arrow:["\ue704", "\ue81b", "\uf0c9"],           //[0]=默认排序的图标背景色
+            Color:['rgb(169,169,169)', "rgb(51,51,51)", "rgb(51,51,51)"],
+            Margin:{ Left:1*GetDevicePixelRatio(), Bottom:2, Right:0,}
         },
 
         Item:
@@ -75866,6 +75866,23 @@ function JSChartResource()
             }
         }
 
+        if (item.SortIcon)
+        {
+            var sort=item.SortIcon;
+            if (IFrameSplitOperator.IsNonEmptyArray(sort.Color)) this.Report.SortIcon.Color=sort.Color.slice();
+            if (IFrameSplitOperator.IsNumber(sort.Size)) this.Report.SortIcon.Size=sort.Size;
+            if (sort.Family) this.Report.SortIcon.Family=sort.Family;
+            if (IFrameSplitOperator.IsNonEmptyArray(sort.Arrow)) this.Report.SortIcon.Arrow=sort.Arrow.slice();
+            if (sort.Margin)
+            {
+                var margin=sort.Margin;
+                if (IFrameSplitOperator.IsNumber(margin.Left)) this.Report.SortIcon.Margin.Left=margin.Left;
+                if (IFrameSplitOperator.IsNumber(margin.Right)) this.Report.SortIcon.Margin.Right=margin.Right;
+                if (IFrameSplitOperator.IsNumber(margin.Top)) this.Report.SortIcon.Margin.Top=margin.Top;
+                if (IFrameSplitOperator.IsNumber(margin.Bottom)) this.Report.SortIcon.Margin.Bottom=margin.Bottom;
+            }
+        }
+
         if (item.Item)
         {
             var row=item.Item;
@@ -116709,9 +116726,6 @@ function JSExecute(ast,option)
 
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_OTHER_SYMBOL_DATA:  //指定股票数据
                 return this.SymbolData.GetOtherSymbolData(jobItem);
-            
-            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_RELEASE_DATE_DATA:
-                return this.SymbolData.GetCompanyReleaseDate(jobItem.ID);
 
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BALANCE:
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_RATE:
@@ -126298,6 +126312,12 @@ function GetBlackStyle()
                 //Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
                 Font:{ Size:12, Name:"微软雅黑" }
             },
+
+             //排序图标
+            SortIcon:
+            {
+                Color:['rgb(105,105,105)', "rgb(255,255,255)", "rgb(255,255,255)"],
+            },
     
             Item:
             {
@@ -128187,15 +128207,8 @@ function JSReportChart(divElement)
         if (option.EnableResize==true) this.CreateResizeListener();
 
         if (option.EnablePopMenuV2===true) chart.InitalPopMenu();
-        if (option.EnableTooltip) 
-        {
-            this.CreateExtraCanvasElement(JSReportChart.TooltipCursorCanvasKey, { ZIndex:99 });
-        }
-
-        if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable)
-        {
-            chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
-        }
+        if (option.FloatTooltip && option.FloatTooltip.Enable) chart.InitalFloatTooltip(option.FloatTooltip);   //提示信息
+        if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable) chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
 
         if (option.Symbol) chart.Symbol=option.Symbol;
         if (option.Name) chart.Name=option.Name;
@@ -128365,8 +128378,6 @@ function JSReportChart(divElement)
     }
 }
 
-JSReportChart.TooltipCursorCanvasKey="hq_report_tooltip";   //提示信息
-
 
 JSReportChart.Init=function(divElement)
 {
@@ -128445,9 +128456,6 @@ function JSReportChartContainer(uielement)
     this.SplashTitle={ StockList:"下载码表中.....", MemberList:"下载成分中....." } ;
 
     this.Canvas=uielement.getContext("2d");         //画布
-    
-    this.TooltipCanvas;
-    this.ChartTooltip;
 
     this.Tooltip=document.createElement("div");
     this.Tooltip.className='jsreport-tooltip';
@@ -128531,6 +128539,7 @@ function JSReportChartContainer(uielement)
         this.StopAutoUpdate();
 
         this.DestroyMinuteChartTooltip();
+        this.DestroyFloatTooltip();
     }
 
     this.StopAutoDragScrollTimer=function()
@@ -128569,6 +128578,51 @@ function JSReportChartContainer(uielement)
         this.TooltipMinuteChart=null;
     }
 
+    this.InitalFloatTooltip=function(option)
+    {
+        if (this.FloatTooltip) return;
+
+        this.FloatTooltip=new JSFloatTooltip();
+        this.FloatTooltip.Inital(this, option);
+        this.FloatTooltip.Create();
+    }
+
+    this.HideFloatTooltip=function()
+    {
+        if (!this.FloatTooltip) return;
+
+        this.FloatTooltip.Hide();
+    }
+
+    this.DestroyFloatTooltip=function()
+    {
+        if (!this.FloatTooltip) return;
+
+        this.FloatTooltip.Destroy();
+        this.FloatTooltip=null;
+    }
+
+    this.DrawFloatTooltip=function(point,toolTip)
+    {
+        if (!this.FloatTooltip) return;
+
+        this.UpdateFloatTooltip(point, toolTip)
+    }
+
+    this.UpdateFloatTooltip=function(point, toolTip)
+    {
+        if (!this.FloatTooltip) return;
+
+        var sendData=
+        {
+            Tooltip:toolTip,
+            Point:point,
+            DataType:3,
+        };
+
+        this.FloatTooltip.Update(sendData);
+    }
+
     //data={ Symbol }
     this.ShowMinuteChartTooltip=function(x,y, data)
     {
@@ -128719,12 +128773,6 @@ function JSReportChartContainer(uielement)
 
         this.ChartPaint[0]=chart;
 
-         //提示信息
-        var chartTooltip=new ChartCellTooltip();
-        chartTooltip.Frame=this.Frame;
-        chartTooltip.ChartBorder=this.Frame.ChartBorder;
-        this.ChartTooltip=chartTooltip;
-
         //页脚
         if (option && option.PageInfo===true)
         {
@@ -128746,6 +128794,7 @@ function JSReportChartContainer(uielement)
             if (IFrameSplitOperator.IsNumber(option.FixedRowCount)) chart.FixedRowCount=option.FixedRowCount;   //固定行
             if (IFrameSplitOperator.IsBool(option.ItemBorder)) chart.IsDrawBorder=option.ItemBorder;            //单元格边框
             if (IFrameSplitOperator.IsNumber(option.SelectedModel)) chart.SelectedModel=option.SelectedModel;
+            if (IFrameSplitOperator.IsNumber(option.HeaderRowCount)) chart.HeaderRowCount=option.HeaderRowCount;
 
             if (IFrameSplitOperator.IsNonEmptyArray(option.FixedSymbol))
             {
@@ -128837,8 +128886,6 @@ function JSReportChartContainer(uielement)
         {
             this.DelayDraw(500);
         }
-
-        this.DrawTooltip(this.LastMouseStatus.TooltipStatus);
     }
 
     this.DelayDraw=function(frequency)
@@ -129770,6 +129817,7 @@ function JSReportChartContainer(uielement)
             {
                 this.LastMouseStatus.TooltipStatus=null;
                 this.HideMinuteChartTooltip();
+                this.HideFloatTooltip();
                 if (this.GotoNextItem(1))
                 {
                     this.Draw();
@@ -129780,6 +129828,7 @@ function JSReportChartContainer(uielement)
             {
                 this.LastMouseStatus.TooltipStatus=null;
                 this.HideMinuteChartTooltip();
+                this.HideFloatTooltip();
                 if (this.GotoNextItem(-1))
                 {
                     this.Draw();
@@ -129793,6 +129842,7 @@ function JSReportChartContainer(uielement)
             {
                 this.LastMouseStatus.TooltipStatus=null;
                 this.HideMinuteChartTooltip();
+                this.HideFloatTooltip();
                 if (this.GotoNextPage(this.PageUpDownCycle)) 
                 {
                     this.Draw();
@@ -129803,6 +129853,7 @@ function JSReportChartContainer(uielement)
             {
                 this.LastMouseStatus.TooltipStatus=null;
                 this.HideMinuteChartTooltip();
+                this.HideFloatTooltip();
                 if (this.GotoPreviousPage(this.PageUpDownCycle)) 
                 {
                     this.Draw();
@@ -129825,6 +129876,7 @@ function JSReportChartContainer(uielement)
         if (keyID==116) return; //F15刷新不处理
 
         this.HideMinuteChartTooltip();
+        this.HideFloatTooltip();
         switch(keyID)
         {
             case 33:    //page up
@@ -130225,7 +130277,17 @@ function JSReportChartContainer(uielement)
         if (mouseStatus) this.UIElement.style.cursor=mouseStatus.Cursor;
 
         if (bDraw || bDrawTab) this.Draw();
-        else if (bDrawTooltip) this.DrawTooltip(this.LastMouseStatus.TooltipStatus);
+
+        if (this.LastMouseStatus.TooltipStatus) 
+        {
+            var xTooltip = e.clientX-this.UIElement.getBoundingClientRect().left;
+            var yTooltip = e.clientY-this.UIElement.getBoundingClientRect().top;
+            this.DrawFloatTooltip({X:xTooltip, Y:yTooltip, YMove:20/pixelTatio},this.LastMouseStatus.TooltipStatus.Data);
+        }
+        else
+        {
+            this.HideFloatTooltip();
+        }
 
         if (bShowChartTooltip)
         {
@@ -130240,6 +130302,7 @@ function JSReportChartContainer(uielement)
     this.UIOnMounseOut=function(e)
     {
         this.HideMinuteChartTooltip();
+        this.HideFloatTooltip();
         
         var bDraw=false;
         var tabChart=this.GetTabChart();
@@ -130266,6 +130329,7 @@ function JSReportChartContainer(uielement)
     this.UIOnMouseleave=function(e)
     {
         this.HideMinuteChartTooltip();
+        this.HideFloatTooltip();
 
         var tabChart=this.GetTabChart();
         if (tabChart && tabChart.MoveOnTabIndex>=0)
@@ -131822,16 +131886,16 @@ function JSReportChartContainer(uielement)
             case REPORT_COLUMN_ID.VOL_OUT_ID:
             case REPORT_COLUMN_ID.DATE_ID:
 
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:
-            case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER1_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER2_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER3_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER4_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER5_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER6_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER7_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER8_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER9_ID:
+            case REPORT_COLUMN_ID.RESERVE_NUMBER10_ID:
             
                 return this.LocalNumberSort(left, right, column, sortType);
             case REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID:    //自定义数值字段
@@ -132217,28 +132281,6 @@ function JSReportChartContainer(uielement)
 
         return true;
     }
-
-    this.DrawTooltip=function(tooltipStatus)
-    {
-        if (!this.GetExtraCanvas) return;
-        if (!this.TooltipCanvas)
-        {
-            var finder=this.GetExtraCanvas(JSReportChart.TooltipCursorCanvasKey);
-            if (!finder) return;
-            this.TooltipCanvas=finder.Canvas;
-        }
-
-        if (!this.TooltipCanvas) return;
-        this.ClearCanvas(this.TooltipCanvas);
-        if (!this.ChartTooltip) return;
-
-        if (!tooltipStatus || !tooltipStatus.Data) return;
-
-        this.ChartTooltip.Canvas=this.TooltipCanvas;
-        this.ChartTooltip.Point={ X:tooltipStatus.X, Y:tooltipStatus.Y };
-        this.ChartTooltip.Data=tooltipStatus.Data.Data;
-        this.ChartTooltip.Draw();
-    }
 }
 
 
@@ -132567,6 +132609,7 @@ function ChartReport()
     this.SelectedRow=-1;                //选中行ID
     this.SelectedFixedRow=-1;           //选中固定行ID
     this.IsDrawBorder=1;                //是否绘制单元格边框
+    this.HeaderRowCount=1;              //表头行数
 
     //多选模式
     this.MultiSelectModel=0;            //0=禁用 1=开启     
@@ -132611,6 +132654,7 @@ function ChartReport()
         Margin:
         { 
             Left:g_JSChartResource.Report.SortIcon.Margin.Left, 
+            Right:g_JSChartResource.Report.SortIcon.Margin.Right,
             Bottom:g_JSChartResource.Report.SortIcon.Margin.Bottom
         }
     }
@@ -132699,6 +132743,7 @@ function ChartReport()
     this.NameSymbolFont={ Symbol:null, Name:null };
     this.RowCount=0;            //一屏显示行数
     this.HeaderHeight=0;        //表头高度
+    this.HeaderFontHeight=0;    //表头字体高度
     this.FixedRowHeight=0;      //固定行高度
     this.RowHeight=0;           //行高度
     this.ItemTextLines=1;           //单元格输出行数
@@ -132832,6 +132877,7 @@ function ChartReport()
         if (!colItem) return null;
 
         if (item.Title) colItem.Title=item.Title;
+        if (IFrameSplitOperator.IsNonEmptyArray(item.AryTitle)) colItem.AryTitle=item.AryTitle;
         if (item.TextAlign) colItem.TextAlign=item.TextAlign;
         if (item.TextColor) colItem.TextColor=item.TextColor;
         if (item.HeaderColor) colItem.HeaderColor=item.HeaderColor;
@@ -133364,7 +133410,17 @@ function ChartReport()
             if (item.Width<itemWidth) item.Width=itemWidth;
         }
 
-        this.HeaderHeight=this.GetFontHeight(this.HeaderFont,"擎")+ this.HeaderMergin.Top+ this.HeaderMergin.Bottom;
+        this.HeaderFontHeight=this.GetFontHeight(this.HeaderFont,"擎");
+        if (this.HeaderRowCount<=1) //单行
+        {
+            this.HeaderHeight=this.HeaderFontHeight+(this.HeaderMergin.Top+this.HeaderMergin.Bottom);
+        }
+        else
+        {
+            this.HeaderHeight=(this.HeaderFontHeight*this.HeaderRowCount)+(this.HeaderMergin.Top+this.HeaderMergin.Bottom);
+        }
+
+
         if (!this.IsShowHeader) this.HeaderHeight=0;
         if (this.FixedRowCount<=0) this.FixedRowHeight=0;
         
@@ -133381,90 +133437,68 @@ function ChartReport()
         this.IsShowAllColumn=(subWidth<reportWidth);
     }
 
-    this.DrawHeader=function()
+    this.DrawHeaderItem=function(column, rtCell, index)
     {
-        if (!this.IsShowHeader) return;
-
-        var left=this.RectClient.Left;
-        var top=this.RectClient.Top;
-        var y=top+this.HeaderMergin.Top+(this.HeaderHeight-this.HeaderMergin.Top-this.HeaderMergin.Bottom)/2;
-        var yBottom=top+this.HeaderHeight;
-        var bDrawSortBG=this.IsDrawSortBGIcon();
-
-        this.Canvas.font=this.HeaderFont;
-        
-        var textLeft=left;
-        //固定列
-        for(var i=0;i<this.FixedColumn && i<this.Column.length;++i)
+        if (column.HeaderBGColor)     //背景色
         {
-            var item=this.Column[i];
-            var itemWidth=item.Width;
-            var textWidth=itemWidth-this.HeaderMergin.Left-this.HeaderMergin.Right;
-            var x=textLeft+this.HeaderMergin.Left;
+            this.DrawItemBG({ Rect:rtCell, BGColor:column.HeaderBGColor });
+        }
 
-            if (item.HeaderBGColor) 
-            {
-                var rtBG={Left:textLeft, Top:top, Width:itemWidth, Height:this.HeaderHeight };
-                rtBG.Right=rtBG.Left+rtBG.Width;
-                rtBG.Bottom=rtBG.Top+rtBG.Height;
-                this.DrawItemBG({ Rect:rtBG, BGColor:item.HeaderBGColor });
-            }
+        var textWidth=rtCell.Width-this.HeaderMergin.Left-this.HeaderMergin.Right;
+        //AryText=[ { Text:标题, Sort:{Type:排序}, Icon:图标 }]
+        var drawInfo={ Rect:rtCell, AryText:[ { Text:null} ], YText:rtCell.Bottom-this.HeaderMergin.Bottom, Index:index, TextWidth:textWidth };
 
-            var iconWidth=0;
-            if (item.Icon && item.Icon.Symbol)  //图标
+        if (this.HeaderRowCount>1)  //多行
+        {
+            if (IFrameSplitOperator.IsNonEmptyArray(column.AryTitle))
             {
-                var iconWidth=item.Icon.Size;
-                if (item.Icon.Margin)
+                drawInfo.AryText=[];
+                for(var i=0;i<column.AryTitle.length && i<this.HeaderRowCount;++i)
                 {
-                    var margin=item.Icon.Margin;
-                    if (IFrameSplitOperator.IsNumber(margin.Left)) iconWidth+=margin.Left;
-                    if (IFrameSplitOperator.IsNumber(margin.Right)) iconWidth+=margin.Right;
+                    var text=column.AryTitle[i];
+                    drawInfo.AryText.push({ Text:text } );
                 }
-            }
-            textWidth-=iconWidth;
-
-            if (item.HeaderColor) this.Canvas.fillStyle=item.HeaderColor;
-            else this.Canvas.fillStyle=this.HeaderColor;
-
-            var textSize={ }
-            if (this.SortInfo && this.SortInfo.Field==i && this.SortInfo.Sort>0)
-            {
-                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort, textSize);
-            }
-            else if (item.Sort>0 && bDrawSortBG)
-            {
-                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,0,textSize);
+                drawInfo.YText-=((this.HeaderRowCount-1)*this.HeaderFontHeight);
             }
             else
             {
-                this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);
+                if (column.Title) drawInfo.AryText[0].Text=column.Title;
+                drawInfo.YText=rtCell.Bottom-this.HeaderMergin.Bottom-(this.HeaderRowCount*this.HeaderFontHeight)/2+this.HeaderFontHeight/2;
             }
+        }
+        else    //单行
+        {
+            if (column.Title) drawInfo.AryText[0].Text=column.Title;
+        }
 
-            if (iconWidth>0)
-            {
-                this.DrawHeaderIcon(item.Icon, textSize.Right, yBottom, i, item);
-                this.Canvas.font=this.HeaderFont;
-            }
+        var lastItem=drawInfo.AryText[drawInfo.AryText.length-1];
 
-           this.Canvas.fillStyle=this.HeaderColor;
+        //排序
+        var bDrawSortBG=this.IsDrawSortBGIcon();
+        if (this.SortInfo && this.SortInfo.Field==index && this.SortInfo.Sort>0) lastItem.Sort={ Type:this.SortInfo.Sort };
+        else if (column.Sort>0 && bDrawSortBG && IFrameSplitOperator.IsNonEmptyArray(column.SortType) && column.SortType.length>=2) lastItem.Sort={ Type:0 };
 
-            textLeft+=item.Width;
-        }
+        //图标
+        if (column.Icon) lastItem.Icon=column.Icon;
 
-        for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i)
-        {
-            var item=this.Column[i];
-            var itemWidth=item.Width;
-            var textWidth=itemWidth-this.HeaderMergin.Left-this.HeaderMergin.Right;
-            var x=textLeft+this.HeaderMergin.Left;
+        this.DrawHeaderText(column, drawInfo);
+    }
 
-            if (item.HeaderBGColor) 
-            {
-                var rtBG={Left:textLeft, Top:top, Width:itemWidth, Height:this.HeaderHeight };
-                rtBG.Right=rtBG.Left+rtBG.Width;
-                rtBG.Bottom=rtBG.Top+rtBG.Height;
-                this.DrawItemBG({ Rect:rtBG, BGColor:item.HeaderBGColor });
-            }
+    this.DrawHeaderText=function(column, drawInfo)
+    {
+        if (column.HeaderColor) this.Canvas.fillStyle=column.HeaderColor;
+        else this.Canvas.fillStyle=this.HeaderColor;
+
+        var pixelRatio=GetDevicePixelRatio();
+        var cellWidth=drawInfo.Rect.Width;
+        var bDrawSortBG=this.IsDrawSortBGIcon();
+        
+        var y=drawInfo.YText;
+        for(var i=0;i<drawInfo.AryText.length;++i)
+        {
+            var x=drawInfo.Rect.Left+this.HeaderMergin.Left;
+            var item=drawInfo.AryText[i];
+            var textSize={ TextMaxWidth:drawInfo.TextWidth };
 
             var iconWidth=0;
             if (item.Icon && item.Icon.Symbol)  //图标
@@ -133477,81 +133511,123 @@ function ChartReport()
                     if (IFrameSplitOperator.IsNumber(margin.Right)) iconWidth+=margin.Right;
                 }
             }
+            if (iconWidth>0) textSize.TextMaxWidth-=iconWidth;
 
-            textWidth-=iconWidth;
-
-            if (item.HeaderColor) this.Canvas.fillStyle=item.HeaderColor;
-            else this.Canvas.fillStyle=this.HeaderColor;
+            var sortWidth=0;    //排序图标
+            if (item.Sort && this.SortConfig && IFrameSplitOperator.IsPlusNumber(this.SortConfig.Size))
+            {
+                sortWidth=this.SortConfig.Size*pixelRatio;
+                if (this.SortConfig.Margin)
+                {
+                    var margin=this.SortConfig.Margin;
+                    if (IFrameSplitOperator.IsNumber(margin.Left)) sortWidth+=margin.Left;
+                    if (IFrameSplitOperator.IsNumber(margin.Right)) sortWidth+=margin.Right;
+                }
+            }
+            if (sortWidth>0) textSize.TextMaxWidth-=sortWidth;
+            
 
-            var textSize={ }
-            if (this.SortInfo && this.SortInfo.Field==i && this.SortInfo.Sort>0)
+            var textWidth=0;
+            if (item.Text) 
             {
-                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,this.SortInfo.Sort,textSize);
+                this.Canvas.font=this.HeaderFont;
+                textWidth=this.Canvas.measureText(item.Text).width;
             }
-            else if (item.Sort>0)
+
+            if (column.TextAlign=='center') x=x+(cellWidth-textWidth)/2;
+            else if (column.TextAlign=='right') x=x+textSize.TextMaxWidth-textWidth;
+            
+            if (item.Text)      //文字
             {
-                this.DrawSortHeader(item.Title,item.TextAlign,x,yBottom,textWidth,0, textSize);
+                this.Canvas.fillText(item.Text,x,y);
+                x+=textWidth;
             }
-            else
+
+            if (sortWidth>1)    //排序
             {
-                this.DrawText(item.Title,item.TextAlign,x,yBottom,textWidth,textSize);
+                this.Canvas.font=this.SortFont;
+                var xSort=x;
+                if (this.SortConfig.Margin && IFrameSplitOperator.IsNumber(this.SortConfig.Margin.Left)) xSort+=this.SortConfig.Margin.Left;
+                if (item.Sort.Type!=0 && bDrawSortBG)   //背景
+                {
+                    var sortText=this.SortConfig.Arrow[0];
+                    var sortColor=this.SortConfig.Color[0];
+                    this.Canvas.fillStyle=sortColor;
+                    this.Canvas.fillText(sortText,xSort,y-this.SortConfig.Margin.Bottom);
+                }
+
+                var sortText=this.SortConfig.Arrow[item.Sort.Type];
+                var sortColor=this.SortConfig.Color[item.Sort.Type];
+                this.Canvas.fillStyle=sortColor;
+                this.Canvas.fillText(sortText,xSort,y-this.SortConfig.Margin.Bottom);
+                x+=sortWidth;
             }
 
-            if (iconWidth>0)
+            if (iconWidth>1)    //图标
             {
-                this.DrawHeaderIcon(item.Icon, textSize.Right, yBottom, i, item);
-                this.Canvas.font=this.HeaderFont;
+                var icon=item.Icon;
+                var iconFont=`${icon.Size}px ${icon.Family}`;
+                this.Canvas.font=iconFont;
+                if (icon.Color) this.Canvas.fillStyle=icon.Color;
+                var yOffset=0, xOffset=0;
+                if (icon.Margin && IFrameSplitOperator.IsNumber(icon.Margin.Left)) xOffset=icon.Margin.Left;
+                if (icon.Margin && IFrameSplitOperator.IsNumber(icon.Margin.Bottom)) yOffset=-icon.Margin.Bottom;
+                this.Canvas.fillText(icon.Symbol, x+xOffset, y+yOffset);
+
+                if (icon.Tooltip)
+                {
+                    var rtIcon={ Left:x+xOffset, Bottom:y+yOffset, Width:icon.Size, Height:icon.Size };
+                    rtIcon.Right=rtIcon.Left+rtIcon.Width;
+                    rtIcon.Top=rtIcon.Bottom-rtIcon.Height;
+        
+                    var tooltipData={ Rect:rtIcon, Type:2, Column:column, Index:drawInfo.Index, Data:icon.Tooltip.Data };
+                    this.TooltipRect.push(tooltipData);
+                }
             }
 
-            textLeft+=item.Width;
-        } 
+            y+=this.HeaderFontHeight;
+        }
     }
 
-    this.DrawText=function(text, textAlign, x, yBottom, cellWidth, textSize)
+    this.DrawHeader=function()
     {
-        var textWidth=this.Canvas.measureText(text).width;
-        if (textAlign=='center')
-        {
-            x=x+(cellWidth-textWidth)/2;
-        }
-        else if (textAlign=='right')
-        {
-            x=x+cellWidth-textWidth;
-        }
+        if (!this.IsShowHeader) return;
 
+        var left=this.RectClient.Left;
+        var top=this.RectClient.Top;
+        this.Canvas.font=this.HeaderFont;
+        
+        var textLeft=left;
         this.Canvas.textAlign="left";
         this.Canvas.textBaseline="bottom";
-        this.Canvas.fillText(text,x,yBottom-this.HeaderMergin.Bottom);
-
-        if (textSize) 
+        //固定列
+        for(var i=0;i<this.FixedColumn && i<this.Column.length;++i)
         {
-            textSize.Right=x+textWidth;
-            textSize.Width=textWidth;
-        }
-    }
+            var item=this.Column[i];
+            var itemWidth=item.Width;
+            //var textWidth=itemWidth-this.HeaderMergin.Left-this.HeaderMergin.Right;
 
-    this.DrawHeaderIcon=function(icon, x, yBottom, index, column)
-    {
-        var iconFont=`${icon.Size}px ${icon.Family}`;
-        this.Canvas.font=iconFont;
-        this.Canvas.textAlign="left";
-        if (icon.Color) this.Canvas.fillStyle=icon.Color;
+            var rtCell={ Left:textLeft, Width:itemWidth, Top:top, Height:this.HeaderHeight };
+            rtCell.Right=rtCell.Left+rtCell.Width;
+            rtCell.Bottom=rtCell.Top+rtCell.Height;
 
-        var xIcon=x;
-        var yIcon=yBottom;
-        if (icon.Margin && IFrameSplitOperator.IsNumber(icon.Margin.Left)) xIcon+=icon.Margin.Left;
-        if (icon.Margin && IFrameSplitOperator.IsNumber(icon.Margin.Bottom)) yIcon-=icon.Margin.Bottom;
-        this.Canvas.fillText(icon.Symbol, xIcon, yIcon);
+            this.DrawHeaderItem(item, rtCell, i);
+            textLeft+=item.Width;
+        }
 
-        if (icon.Tooltip)
+        for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i)
         {
-            var rtIcon={ Left:xIcon, Bottom:yIcon, Width:icon.Size, Height:icon.Size };
-            rtIcon.Right=rtIcon.Left+rtIcon.Width;
-            rtIcon.Top=rtIcon.Bottom-rtIcon.Height;
+            var item=this.Column[i];
+            var itemWidth=item.Width;
+            //var textWidth=itemWidth-this.HeaderMergin.Left-this.HeaderMergin.Right;
 
-            var tooltipData={ Rect:rtIcon, Type:2, Column:column, Index:index, Data:icon.Tooltip.Data };
-            this.TooltipRect.push(tooltipData);
-        }
+            var rtCell={ Left:textLeft, Width:itemWidth, Top:top, Height:this.HeaderHeight };
+            rtCell.Right=rtCell.Left+rtCell.Width;
+            rtCell.Bottom=rtCell.Top+rtCell.Height;
+
+            this.DrawHeaderItem(item, rtCell, i);
+            textLeft+=item.Width;
+        } 
     }
 
     //是否绘制排序背景图标
@@ -133566,57 +133642,6 @@ function ChartReport()
         return true;
     }
 
-    this.DrawSortHeader=function(text, textAlign, x, yBottom, width, sortType,textSize)
-    {
-        var pixelRatio=GetDevicePixelRatio();
-        var sortText=this.SortConfig.Arrow[sortType];
-        var sortBGText=this.SortConfig.Arrow[0];
-        var sortBGColor=this.SortConfig.Color[0];
-        this.Canvas.font=this.HeaderFont;
-        var textWidth=this.Canvas.measureText(text).width;
-        var sortTextWidth=this.SortConfig.Size*pixelRatio+this.SortConfig.Margin.Left;
-
-        if (textAlign=='center')
-        {
-            x=x+width/2-(sortTextWidth+textWidth)/2;
-        }
-        else if (textAlign=='right')
-        {
-            x=(x+width)-sortTextWidth-textWidth;
-        }
-
-        this.Canvas.textBaseline="bottom";
-        this.Canvas.textAlign="left";
-
-        var xText=x;
-        this.Canvas.font=this.HeaderFont;
-        this.Canvas.fillStyle=this.HeaderColor;
-        this.Canvas.fillText(text,xText,yBottom-this.HeaderMergin.Bottom);
-
-        xText+=(textWidth+this.SortConfig.Margin.Left);
-        this.Canvas.font=this.SortFont;
-        if (sortBGText && sortBGColor)
-        {
-            this.Canvas.fillStyle=sortBGColor;
-            this.Canvas.fillText(sortBGText,xText,yBottom-this.SortConfig.Margin.Bottom);
-        }
-
-        if (sortType>0)
-        {
-            this.Canvas.fillStyle=this.SortConfig.Color[sortType];
-            this.Canvas.fillText(sortText,xText,yBottom-this.SortConfig.Margin.Bottom);
-        }
-
-        this.Canvas.font=this.HeaderFont;
-        this.Canvas.fillStyle=this.HeaderColor;
-
-        if (textSize)
-        {
-            textSize.Right=x+textWidth+sortTextWidth;
-            textSize.Width=textWidth+sortTextWidth;
-        }
-    }
-
     this.DrawBorder=function()
     {
         if (!this.IsDrawBorder) return;
@@ -134240,9 +134265,7 @@ function ChartReport()
         {
             this.FormatReserveNumber(column, stock, drawInfo);
         }
-        else if ([REPORT_COLUMN_ID.RESERVE_STRING1_ID,REPORT_COLUMN_ID.RESERVE_STRING2_ID,REPORT_COLUMN_ID.RESERVE_STRING3_ID,REPORT_COLUMN_ID.RESERVE_STRING4_ID,
-            REPORT_COLUMN_ID.RESERVE_STRING5_ID,REPORT_COLUMN_ID.RESERVE_STRING6_ID,REPORT_COLUMN_ID.RESERVE_STRING7_ID,REPORT_COLUMN_ID.RESERVE_STRING8_ID,
-            REPORT_COLUMN_ID.RESERVE_STRING9_ID,REPORT_COLUMN_ID.RESERVE_STRING10_ID].includes(column.Type))
+        else if (this.IsReserveString(column.Type))
         {
             this.FormatReserveString(column, stock, drawInfo);
         }
@@ -134301,7 +134324,7 @@ function ChartReport()
 
             this.DrawItemBG(drawInfo);
 
-            if (column.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID) 
+            if (column.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID || this.IsReserveString(column.Type)) 
                 this.DrawCustomText(drawInfo,column, x, top, textWidth);
             else
                 this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, x, top, textWidth, drawInfo.BGColor);
@@ -134353,6 +134376,20 @@ function ChartReport()
         return ARARY_TYPE.includes(value);
     }
 
+    this.IsReserveString=function(value)
+    {
+        var ARARY_TYPE=
+        [
+            REPORT_COLUMN_ID.RESERVE_STRING1_ID,REPORT_COLUMN_ID.RESERVE_STRING2_ID,REPORT_COLUMN_ID.RESERVE_STRING3_ID,REPORT_COLUMN_ID.RESERVE_STRING4_ID,
+            REPORT_COLUMN_ID.RESERVE_STRING5_ID,REPORT_COLUMN_ID.RESERVE_STRING6_ID,REPORT_COLUMN_ID.RESERVE_STRING7_ID,REPORT_COLUMN_ID.RESERVE_STRING8_ID,
+            REPORT_COLUMN_ID.RESERVE_STRING9_ID,REPORT_COLUMN_ID.RESERVE_STRING10_ID
+        ];
+
+        return ARARY_TYPE.includes(value);
+    }
+
+   
+
     this.DrawCustomText=function(drawInfo, column, left, top, cellWidth)
     {
         if (!drawInfo.Text) return;
@@ -137082,7 +137119,7 @@ function ChartVScrollbar()
     }
 }
 
-
+/* 使用div替换掉了
 function ChartCellTooltip()
 {
     this.Canvas;                            //画布
@@ -137244,6 +137281,7 @@ function ChartCellTooltip()
         }
     }
 }
+*/
 /*
    Copyright (c) 2018 jones
  
@@ -147206,11 +147244,26 @@ function JSFloatTooltip()
             {
                 this.UpdateChartDrawSVGV2Tooltip(data);
             }
+           
         }
         else if (data.DataType==2)  //更新实时行情数据
         {
             this.UpdateRealtimeHQTooltip(data);
         }
+        else if (data.DataType==3)  //报价列表
+        {
+            var tooltipData=data.Tooltip;
+            if (!tooltipData) return;
+
+            if (tooltipData.Type==2)  //报价列表表头图标提示信息
+            {
+                this.ReportHeaderIconTooltip(data);
+            }
+            else if (tooltipData.Type==1)   //单元格截断内容
+            {
+                this.ReportCellTruncateTooltip(data);
+            }
+        }
     }
 
     this.UpdateRealtimeHQTooltip=function(data)
@@ -147450,6 +147503,34 @@ function JSFloatTooltip()
 
         this.ShowTooltip(data);
     }
+
+    //表头图标
+    this.ReportHeaderIconTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !IFrameSplitOperator.IsNonEmptyArray(tooltipData.Data.AryText)) return;
+        
+        this.AryText=tooltipData.Data.AryText;
+        this.UpdateTableDOM();
+
+        this.ShowTooltip(data);
+    }
+
+    //表格单元格截断内容
+    this.ReportCellTruncateTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !IFrameSplitOperator.IsNonEmptyArray(tooltipData.Data.AryText)) return;
+        
+        var item=tooltipData.Data.AryText[0];
+        if (!item.Text) return;
+        
+        this.AryText=[ { Title:item.Text, IsMergeCell:true } ];
+
+        this.UpdateTableDOM();
+
+        this.ShowTooltip(data);
+    }
  
     this.UpdateTableDOM=function()
     {
@@ -150146,7 +150227,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14268";
+var HQCHART_VERSION="1.1.14275";
 
 function PrintHQChartVersion()
 {