hqchart 1.1.14258 → 1.1.14274

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -6683,6 +6683,8 @@ var JSCHART_BUTTON_ID=
     INDEX_NAME_BUTTON:43,
 
     ADD_INDEX_WINDOW:44,    //增加指标窗口
+
+    CHIP_CLOSE:45,          //关闭筹码图
 }
 
 var JSCHART_DATA_FIELD_ID=
@@ -8767,6 +8769,34 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     }
 
+    this.TryPhoneClickButton=function(x,y,e)
+    {
+        if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域 , 指标标题点击
+        {
+            if (this.TryClickLock && this.TryClickLock(x, y)) return true;
+            if (this.TryClickIndexTitle && this.TryClickIndexTitle(x,y)) return true;
+        }
+
+        if (this.ClickFrameButton)
+        {
+            var button=this.Frame.PtInButtons(x,y);
+            if (button)
+            {
+                this.ClickFrameButton(button, e);
+                return true;
+            }
+        }
+
+        button=this.PtInExtendChartButtons(x,y);
+        if (button && this.ClickExtendChartButton)
+        {
+            this.ClickExtendChartButton(button, e);
+            return true;
+        }
+
+        return false;
+    }
+
     this.OnTouchStart=function(e)
     {
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
@@ -8789,23 +8819,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var touches = this.GetToucheData(e, this.IsForceLandscape);
             var pt=this.PointAbsoluteToRelative(touches[0].clientX, touches[0].clientY, true);
 
-            if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域 , 指标标题点击
-            {
-                var x = pt.X;
-                var y = pt.Y;
-                if (this.TryClickLock && this.TryClickLock(x, y)) return;
-                if (this.TryClickIndexTitle && this.TryClickIndexTitle(x,y)) return;
-            }
-
-            if (this.ClickFrameButton)
-            {
-                var button=this.Frame.PtInButtons(pt.X,pt.Y);
-                if (button)
-                {
-                    this.ClickFrameButton(button, e);
-                    return;
-                }
-            }
+            if (this.TryPhoneClickButton(pt.X, pt.Y, e)) return;
 
             if (this.EnableVerticalDrag )
             {
@@ -48686,8 +48700,12 @@ function StockChipPhone()
     //手机端没有按钮
     this.DrawToolbar=function(moveonPoint, mouseStatus) { }
 
+    this.CloseButtonConfig=CloneData(g_JSChartResource.StockChip.PhoneCloseButton);
+    
+
     this.Draw=function()
     {
+        this.Buttons=[];
         this.IsHScreen=this.ChartFrame.IsHScreen==true;
         this.PixelRatio=GetDevicePixelRatio();
         if (this.IsHScreen)
@@ -48730,6 +48748,7 @@ function StockChipPhone()
         }
 
         this.DrawBorder();
+        this.DrawCloseButton();
         this.SizeChange=false;
     }
 
@@ -49092,6 +49111,73 @@ function StockChipPhone()
         
         this.Canvas.fill();
     }
+
+    //关闭按钮
+    this.DrawCloseButton=function()
+    {
+        var config=this.CloseButtonConfig;
+        var font=`${config.Size}px ${config.Family}`;
+        var rtButton=null;
+        if (this.IsHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var right=border.Left-2;
+            var bottom=border.ChartHeight-2;
+            var left=right-config.Size;
+            var top=bottom-config.Size;
+
+            var rtButton={ Left:left, Top:top, Bottom:bottom, Right:right };
+            rtButton.Width=rtButton.Right-rtButton.Left;
+            rtButton.Height=rtButton.Bottom-rtButton.Top;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var top=border.Bottom+2;
+            var bottom=top+config.Size;
+            var right=border.ChartWidth-2;
+            var left=right-config.Size;
+
+            var rtButton={ Left:left, Top:top, Bottom:bottom, Right:right };
+            rtButton.Width=rtButton.Right-rtButton.Left;
+            rtButton.Height=rtButton.Bottom-rtButton.Top;
+        }
+
+        if (!rtButton) return;
+
+        if (config.Border)
+        {
+            if (config.Border.BGColor) 
+            {
+                this.Canvas.fillStyle=config.Border.BGColor;
+                this.Canvas.fillRect(rtButton.Left,rtButton.Top,rtButton.Width,rtButton.Height);
+            }
+        }
+
+        this.Canvas.fillStyle=config.Color;
+        this.Canvas.font=font;
+        this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="bottom";
+        if (this.IsHScreen)
+        {
+            var radius=config.Size/2;
+            var x=rtButton.Left+radius, y=rtButton.Bottom-radius;
+            this.Canvas.save(); 
+            this.Canvas.translate(x,y);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.fillText(config.Text,-radius,radius);
+            this.Canvas.restore();
+            
+        }
+        else
+        {
+            this.Canvas.fillText(config.Text, rtButton.Left, rtButton.Bottom);
+        }
+
+        var btnItem={ ID:JSCHART_BUTTON_ID.CHIP_CLOSE, Rect:rtButton };
+        this.Buttons.push(btnItem);
+    
+    }
 }
 
 //窗口分割
@@ -52773,6 +52859,10 @@ IFrameSplitOperator.FormatDateString=function(value,format, languageID)
     {
         case 'MM-DD':
             return IFrameSplitOperator.NumberToString(month) + '-' + IFrameSplitOperator.NumberToString(day);
+        case "MM-DD/W":
+            var date=new Date(year,month-1,day);
+            var week=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],languageID);
+            return `${IFrameSplitOperator.NumberToString(month)}-${IFrameSplitOperator.NumberToString(day)}/${week}`;
         case "MM/DD":
             return `${IFrameSplitOperator.NumberToString(month)}/${IFrameSplitOperator.NumberToString(day)}`;
         case "MM/DD/W":
@@ -74326,6 +74416,16 @@ function JSChartResource()
             Size:13*GetDevicePixelRatio(),
             MerginLeft:4
         },
+
+        //手机端
+        PhoneCloseButton:
+        {
+            Family:"iconfont", 
+            Size:16*GetDevicePixelRatio(), 
+            Text:"\ue60c", 
+            Color:"rgb(255,255,255)",
+            Border:{ BGColor:"rgb(169,169,169)" }
+        }
     }
 
     //深度图
@@ -74460,7 +74560,7 @@ function JSChartResource()
             Size:12, Family:"iconfont",
             Arrow:[null, "\ue6b2", "\ue6b1"],           //[0]=默认排序的图标背景色
             Color:[null, "rgb(255,0,0)", "rgb(255,0,0)"],
-            Margin:{ Left:0, Bottom:6 }
+            Margin:{ Left:0, Bottom:2, Right:0,}
         },
 
         Item:
@@ -75244,6 +75344,20 @@ function JSChartResource()
             if (item.DefaultButton) T_SetButtonStyle(item.DefaultButton, this.StockChip.DefaultButton);
             if (item.LongButton) T_SetButtonStyle(item.LongButton, this.StockChip.LongButton);
             if (item.RecentButton) T_SetButtonStyle(item.RecentButton, this.StockChip.RecentButton);
+            if (item.CloseButton) T_SetButtonStyle(item.CloseButton, this.StockChip.CloseButton);
+
+            if (item.PhoneCloseButton)
+            {
+                var subItem=item.PhoneCloseButton;
+                if (subItem.Family) this.StockChip.PhoneCloseButton.Family=subItem.Family;
+                if (subItem.Text) this.StockChip.PhoneCloseButton.Text=subItem.Text;
+                if (subItem.Color) this.StockChip.PhoneCloseButton.Color=subItem.Color;
+                if (IFrameSplitOperator.IsNumber(subItem.Size)) this.StockChip.PhoneCloseButton.Size=subItem.Size;
+                if (subItem.Border)
+                {
+                    if (subItem.Border.BGColor) this.StockChip.PhoneCloseButton.Border.BGColor=subItem.Border.BGColor;
+                }
+            }
         }
 
         if (style.DepthChart)
@@ -84490,6 +84604,10 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             button.Chart.ShowType=2;
             this.Draw();
         }
+        else if (button.ID==JSCHART_BUTTON_ID.CHIP_CLOSE)
+        {
+            if (this.DeleteStockChipChart) this.DeleteStockChipChart();
+        }
     }
 
     //成交量分布图数据请求
@@ -92090,6 +92208,9 @@ function KLineChartHScreenContainer(uielement)
             var touches = this.GetToucheData(e, false);
             var pt=this.PointAbsoluteToRelative(touches[0].clientX, touches[0].clientY, true);
 
+            if (this.TryPhoneClickButton(pt.X,pt.Y,e)) return;
+
+            /*
             if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域, 指标标题点击
             {
                 var x = pt.X;
@@ -92107,6 +92228,7 @@ function KLineChartHScreenContainer(uielement)
                     return;
                 }
             }
+            */
 
             if (this.EnableVerticalDrag )
             {
@@ -116543,9 +116665,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:
@@ -126000,7 +126119,17 @@ function GetBlackStyle()
         StockChip:
         {
             InfoColor:'rgb(255,255,255)', //文字颜色
-            DayInfoColor:'rgb(0,0,0)' //周期颜色内文字颜色
+            DayInfoColor:'rgb(0,0,0)', //周期颜色内文字颜色
+
+            //手机端
+            PhoneCloseButton:
+            {
+                Family:"iconfont", 
+                Size:16*GetDevicePixelRatio(), 
+                Text:"\ue60c", 
+                Color:"rgb(255,255,255)",
+                Border:{ BGColor:"rgb(40,42,44)" }
+            }
         },
     
         //深度图
@@ -128011,15 +128140,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;
@@ -128189,8 +128311,6 @@ function JSReportChart(divElement)
     }
 }
 
-JSReportChart.TooltipCursorCanvasKey="hq_report_tooltip";   //提示信息
-
 
 JSReportChart.Init=function(divElement)
 {
@@ -128269,9 +128389,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';
@@ -128355,6 +128472,7 @@ function JSReportChartContainer(uielement)
         this.StopAutoUpdate();
 
         this.DestroyMinuteChartTooltip();
+        this.DestroyFloatTooltip();
     }
 
     this.StopAutoDragScrollTimer=function()
@@ -128393,6 +128511,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)
     {
@@ -128543,12 +128706,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)
         {
@@ -128570,6 +128727,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))
             {
@@ -128661,8 +128819,6 @@ function JSReportChartContainer(uielement)
         {
             this.DelayDraw(500);
         }
-
-        this.DrawTooltip(this.LastMouseStatus.TooltipStatus);
     }
 
     this.DelayDraw=function(frequency)
@@ -129594,6 +129750,7 @@ function JSReportChartContainer(uielement)
             {
                 this.LastMouseStatus.TooltipStatus=null;
                 this.HideMinuteChartTooltip();
+                this.HideFloatTooltip();
                 if (this.GotoNextItem(1))
                 {
                     this.Draw();
@@ -129604,6 +129761,7 @@ function JSReportChartContainer(uielement)
             {
                 this.LastMouseStatus.TooltipStatus=null;
                 this.HideMinuteChartTooltip();
+                this.HideFloatTooltip();
                 if (this.GotoNextItem(-1))
                 {
                     this.Draw();
@@ -129617,6 +129775,7 @@ function JSReportChartContainer(uielement)
             {
                 this.LastMouseStatus.TooltipStatus=null;
                 this.HideMinuteChartTooltip();
+                this.HideFloatTooltip();
                 if (this.GotoNextPage(this.PageUpDownCycle)) 
                 {
                     this.Draw();
@@ -129627,6 +129786,7 @@ function JSReportChartContainer(uielement)
             {
                 this.LastMouseStatus.TooltipStatus=null;
                 this.HideMinuteChartTooltip();
+                this.HideFloatTooltip();
                 if (this.GotoPreviousPage(this.PageUpDownCycle)) 
                 {
                     this.Draw();
@@ -129649,6 +129809,7 @@ function JSReportChartContainer(uielement)
         if (keyID==116) return; //F15刷新不处理
 
         this.HideMinuteChartTooltip();
+        this.HideFloatTooltip();
         switch(keyID)
         {
             case 33:    //page up
@@ -130049,7 +130210,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)
         {
@@ -130064,6 +130235,7 @@ function JSReportChartContainer(uielement)
     this.UIOnMounseOut=function(e)
     {
         this.HideMinuteChartTooltip();
+        this.HideFloatTooltip();
         
         var bDraw=false;
         var tabChart=this.GetTabChart();
@@ -130090,6 +130262,7 @@ function JSReportChartContainer(uielement)
     this.UIOnMouseleave=function(e)
     {
         this.HideMinuteChartTooltip();
+        this.HideFloatTooltip();
 
         var tabChart=this.GetTabChart();
         if (tabChart && tabChart.MoveOnTabIndex>=0)
@@ -131646,16 +131819,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:    //自定义数值字段
@@ -132041,28 +132214,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();
-    }
 }
 
 
@@ -132391,6 +132542,7 @@ function ChartReport()
     this.SelectedRow=-1;                //选中行ID
     this.SelectedFixedRow=-1;           //选中固定行ID
     this.IsDrawBorder=1;                //是否绘制单元格边框
+    this.HeaderRowCount=1;              //表头行数
 
     //多选模式
     this.MultiSelectModel=0;            //0=禁用 1=开启     
@@ -132435,6 +132587,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
         }
     }
@@ -132523,6 +132676,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;           //单元格输出行数
@@ -132656,6 +132810,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;
@@ -133188,7 +133343,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;
         
@@ -133205,90 +133370,70 @@ 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) 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;
+        
+        if (drawInfo.AryText.length>1)
+            var nnnn=10;
+        
+        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)  //图标
@@ -133301,81 +133446,113 @@ 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);
+                var sortText=this.SortConfig.Arrow[item.Sort.Type];
+                var sortColor=this.SortConfig.Color[item.Sort.Type];
+                this.Canvas.font=this.SortFont;
+                this.Canvas.fillStyle=sortColor;
+                this.Canvas.fillText(sortText,x,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;
+        } 
     }
 
     //是否绘制排序背景图标
@@ -133390,57 +133567,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;
@@ -134064,9 +134190,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);
         }
@@ -134125,7 +134249,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);
@@ -134177,6 +134301,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;
@@ -136906,7 +137044,7 @@ function ChartVScrollbar()
     }
 }
 
-
+/* 使用div替换掉了
 function ChartCellTooltip()
 {
     this.Canvas;                            //画布
@@ -137068,6 +137206,7 @@ function ChartCellTooltip()
         }
     }
 }
+*/
 /*
    Copyright (c) 2018 jones
  
@@ -140409,7 +140548,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14257";
+var HQCHART_VERSION="1.1.14273";
 
 function PrintHQChartVersion()
 {