hqchart 1.1.14135 → 1.1.14147

package/src/jscommon/umychart.TReport.js

@@ -73,6 +73,11 @@ function JSTReportChart(divElement)
 
         if (option.EnableResize==true) this.CreateResizeListener();
 
+        if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable)
+        {
+            chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
+        }
+
         if (option.Symbol)
         {
             chart.Draw();
@@ -324,12 +329,56 @@ function JSTReportChartContainer(uielement)
     this.DragXScroll=null;  //{Start:{x,y}, End:{x, y}}
     this.EnablePageCycle=false; //是否循环翻页
 
+    this.TooltipMinuteChart;    //分时图
+    this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
+
     this.IsDestroy=false;        //是否已经销毁了
 
     this.ChartDestory=function()    //销毁
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
+        this.DestroyMinuteChartTooltip();
+    }
+
+    this.InitalMinuteChartTooltip=function(option)
+    {
+        if (this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart=new JSTooltipMinuteChart();
+        this.TooltipMinuteChart.Inital(this, option);
+        this.TooltipMinuteChart.Create();
+    }
+
+    this.DestroyMinuteChartTooltip=function()
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart.Destroy();
+        this.TooltipMinuteChart=null;
+    }
+
+    //data={ Symbol }
+    this.ShowMinuteChartTooltip=function(x,y, data)
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+
+        data.Offset={ Left:offsetLeft, Top:offsetTop };
+
+        this.TooltipMinuteChart.Show(data, x,y);
+    }
+
+    this.HideMinuteChartTooltip=function()
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart.Hide();
     }
 
     //清空固定行数据
@@ -420,11 +469,12 @@ function JSTReportChartContainer(uielement)
         
         this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
         this.UIElement.onmousedown=(e)=> { this.UIOnMouseDown(e); }
+        this.UIElement.onmousemove=(e)=>{ this.UIOnMouseMove(e);}
 
         /*
         this.UIElement.onmouseup=(e)=>{ this.UIOnMounseUp(e); }
         this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }
-        this.UIElement.onmousemove=(e)=>{ this.UIOnMouseMove(e);}
+        
         this.UIElement.onmouseout=(e)=>{ this.UIOnMounseOut(e); }
         this.UIElement.onmouseleave=(e)=>{ this.UIOnMouseleave(e); }
         
@@ -443,6 +493,7 @@ function JSTReportChartContainer(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)
         {
@@ -991,6 +1042,79 @@ function JSTReportChartContainer(uielement)
         //document.onmouseup=(e)=> { this.DocOnMouseUp(e); }
     }
 
+    this.GetReportChart=function()
+    {
+        var chart=this.ChartPaint[0];
+        if (!chart)  return;
+
+        return chart;
+    }
+
+    this.UIOnMouseMove=function(e)
+    {
+        var pixelTatio = GetDevicePixelRatio();
+        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;
+        if (this.LastMouseStatus.TooltipStatus) bDrawTooltip=true;
+        this.LastMouseStatus.TooltipStatus=null;
+
+        var bShowChartTooltip=false;
+        var chartTooltipData=null;
+        
+        this.LastMouseStatus.OnMouseMove={ X:x, Y:y };
+        var mouseStatus={ Cursor:"default", Name:"Default"};;   //鼠标状态
+        var report=this.GetReportChart();
+        var bDraw=false;
+        
+        if (report)
+        {
+            var tooltipData=report.GetTooltipData(x,y);  //单元格提示信息
+            if (tooltipData)
+            {
+                if (tooltipData.Type==20)
+                {
+                    if (tooltipData.Data && tooltipData.Data.Symbol)
+                    {
+                        bShowChartTooltip=true;
+                        chartTooltipData={ Symbol:tooltipData.Data.Symbol, Rect:tooltipData.Rect };
+                    }
+                }
+                else
+                {
+                    this.LastMouseStatus.TooltipStatus={ X:x, Y:y, Data:tooltipData, ClientX:e.clientX, ClientY:e.clientY };
+                    bDrawTooltip=true;
+                }
+            }
+            
+        }
+
+        /* 目前没有用到
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_MOUSE_MOVE);
+        if (event)
+        {
+            var sendData={X:x, Y:y, Cell:cell };
+            event.Callback(event,sendData,this);
+        }
+        */
+
+        if (mouseStatus) this.UIElement.style.cursor=mouseStatus.Cursor;
+        //if (bDrawTooltip) this.DrawTooltip(this.LastMouseStatus.TooltipStatus);
+
+        if (bShowChartTooltip)
+        {
+            this.ShowMinuteChartTooltip(null, null, chartTooltipData);
+        }
+        else
+        {
+            this.HideMinuteChartTooltip();
+        }
+    }
+
     //点表头
     this.OnClickHeader=function(clickData, e)
     {
@@ -1812,7 +1936,8 @@ function ChartTReport()
             if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision;    //小数位数
             if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
             if (item.DefaultText) colItem.DefaultText=item.DefaultText;
-            
+            if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.EnableChartTooltip=item.EnableChartTooltip;
+
             if (item.Sort==1)   //1本地排序 2=远程排序
             {
                 colItem.SortType=[1,2];         //默认 降序 ，升序
@@ -2333,7 +2458,7 @@ function ChartTReport()
     this.DrawCenterItem=function(index, data, column, rtItem, cellType) //cellType 0=中间字段 1=左侧 2=右侧
     {
         //tooltip提示
-        if (column.EnableTooltip===true)  this.TooltipRect.push({ Rect:rtItem, data:data, Index:index, Column:column, CellType:cellType });
+        if (column.EnableTooltip===true)  this.TooltipRect.push({ Rect:rtItem, Data:data, Index:index, Column:column, CellType:cellType, Type:1 });
 
         var rtText={ Left:rtItem.Left+this.ItemMergin.Left, Right:rtItem.Right-this.ItemMergin.Right, Top:rtItem.Top+this.ItemMergin.Top, Bottom:rtItem.Bottom-this.ItemMergin.Bottom };
         rtText.Width=rtText.Right-rtText.Left;
@@ -2347,7 +2472,7 @@ function ChartTReport()
 
     this.DrawItem=function(index, exePriceData, data, column, rtItem, cellType)
     {
-        if (column.EnableTooltip===true)  this.TooltipRect.push({ Rect:rtItem, data:data, Index:index, Column:column, CellType:cellType });
+        if (column.EnableTooltip===true)  this.TooltipRect.push({ Rect:rtItem, Data:data, Index:index, Column:column, CellType:cellType, Type:1 });
 
         var rtText={ Left:rtItem.Left+this.ItemMergin.Left, Right:rtItem.Right-this.ItemMergin.Right, Top:rtItem.Top+this.ItemMergin.Top, Bottom:rtItem.Bottom-this.ItemMergin.Bottom };
         rtText.Width=rtText.Right-rtText.Left;
@@ -2434,6 +2559,12 @@ function ChartTReport()
         }
 
         this.DrawCell(drawInfo, exePriceData, column.Type, cellType);
+
+        if (column.EnableChartTooltip)
+        {
+            var tooltipData={ Rect:rtItem, Data:data, Index:index, Column:column, CellType:cellType, Type:20 };
+            this.TooltipRect.push(tooltipData);
+        }
     }
 
     this.FormatReserveNumber=function(column, data, drawInfo)
@@ -2606,6 +2737,25 @@ function ChartTReport()
         }
     }
 
+    this.GetTooltipData=function(x,y)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.TooltipRect)) return null;
+
+        for(var i=0;i<this.TooltipRect.length;++i)
+        {
+            var item=this.TooltipRect[i];
+            var rt=item.Rect;
+            if (!rt) continue;
+
+            if (x>=rt.Left && x<=rt.Right && y>=rt.Top && y<=rt.Bottom)
+            {
+                return { Rect:item.Rect, Data:item.Data, Column:item.Column, Index:item.Index, Type:item.Type, CellType:item.CellType };
+            }
+        }
+
+        return null;
+    }
+
     this.OnMouseDown=function(x,y,e)    //Type: 2=行 3=表头
     {
         if (!this.Data) return null;

package/src/jscommon/umychart.js

@@ -581,10 +581,24 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if(option.KLineTitle)
         {
             var item=option.KLineTitle;
+            var chartTitle=chart.TitlePaint[0];
             if(option.KLineTitle.IsShowName==false) chart.TitlePaint[0].IsShowName=false;
             if(option.KLineTitle.IsShowSettingInfo==false) chart.TitlePaint[0].IsShowSettingInfo=false;
             if(option.KLineTitle.IsShow == false) chart.TitlePaint[0].IsShow = false;
             if(IFrameSplitOperator.IsBool(item.IsTitleShowLatestData)) chart.IsTitleShowLatestData=item.IsTitleShowLatestData;
+
+            if (item.ShowPostion)   //显示位置高级配置
+            {
+                var subItem=item.ShowPostion;
+                if (!chartTitle.ShowPositionConfig) chartTitle.ShowPositionConfig={ Margin:{ } };
+                if (IFrameSplitOperator.IsNumber(subItem.Type)) chartTitle.ShowPositionConfig.Type=subItem.Type;
+                if (subItem.Margin) 
+                {
+                    if (IFrameSplitOperator.IsNumber(subItem.Margin.Left)) chartTitle.ShowPositionConfig.Margin.Left=subItem.Margin.Left;
+                    if (IFrameSplitOperator.IsNumber(subItem.Margin.Right)) chartTitle.ShowPositionConfig.Margin.Right=subItem.Margin.Right;
+                    if (IFrameSplitOperator.IsNumber(subItem.Margin.Bottom)) chartTitle.ShowPositionConfig.Margin.Bottom=subItem.Margin.Bottom;
+                }
+            }
         }
 
         //叠加股票
@@ -1078,14 +1092,26 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if(option.MinuteTitle)
         {
             var item=option.MinuteTitle;
+            var chartTitle=chart.TitlePaint[0];
             if(IFrameSplitOperator.IsBool(item.IsShowName)) chart.TitlePaint[0].IsShowName=item.IsShowName;
             if(IFrameSplitOperator.IsBool(item.IsShowDate)) chart.TitlePaint[0].IsShowDate=item.IsShowDate;
             if(IFrameSplitOperator.IsBool(item.IsShowTime)) chart.TitlePaint[0].IsShowTime=item.IsShowTime;
             if(IFrameSplitOperator.IsBool(item.IsTitleShowLatestData)) chart.IsTitleShowLatestData=item.IsTitleShowLatestData;
             if(IFrameSplitOperator.IsBool(item.IsAlwaysShowLastData)) chart.TitlePaint[0].IsAlwaysShowLastData=item.IsAlwaysShowLastData;
             if(IFrameSplitOperator.IsNumber(item.ShowLastDataFormat)) chart.TitlePaint[0].ShowLastDataFormat=item.ShowLastDataFormat;
-            if (IFrameSplitOperator.IsNumber(item.TitleBaseLine)) chart.TitlePaint[0].TitleBaseLine=item.TitleBaseLine;
             if (item.TimeFormat) chart.TitlePaint[0].TimeFormat=item.TimeFormat;
+            if (item.ShowPostion)   //显示位置高级配置
+            {
+                var subItem=item.ShowPostion;
+                if (!chartTitle.ShowPositionConfig) chartTitle.ShowPositionConfig={ Margin:{ } };
+                if (IFrameSplitOperator.IsNumber(subItem.Type)) chartTitle.ShowPositionConfig.Type=subItem.Type;
+                if (subItem.Margin) 
+                {
+                    if (IFrameSplitOperator.IsNumber(subItem.Margin.Left)) chartTitle.ShowPositionConfig.Margin.Left=subItem.Margin.Left;
+                    if (IFrameSplitOperator.IsNumber(subItem.Margin.Right)) chartTitle.ShowPositionConfig.Margin.Right=subItem.Margin.Right;
+                    if (IFrameSplitOperator.IsNumber(subItem.Margin.Bottom)) chartTitle.ShowPositionConfig.Margin.Bottom=subItem.Margin.Bottom;
+                }
+            }
         }
 
         if (IFrameSplitOperator.IsBool(option.CorssCursorTouchEnd)) chart.CorssCursorTouchEnd = option.CorssCursorTouchEnd;
@@ -35458,8 +35484,6 @@ function ChartDrawLastBarText()
         YOffset:g_JSChartResource.DRAWICON.Icon.YOffset //Direction==2的向下偏移
     };  
 
-    this.IconFamily=g_JSChartResource.DRAWLASTICON.Family;
-
     this.ReloadResource=function(resource)
     {
         this.TextSize=
@@ -35474,8 +35498,7 @@ function ChartDrawLastBarText()
             Max: g_JSChartResource.DRAWICON.Icon.MaxSize, Min:g_JSChartResource.DRAWICON.Icon.MinSize, //图标的最大最小值
             Zoom:{ Type:g_JSChartResource.DRAWICON.Icon.Zoom.Type , Value:g_JSChartResource.DRAWICON.Icon.Zoom.Value }, //放大倍数
         }; 
-        
-        this.IconFamily=g_JSChartResource.DRAWLASTICON.Family;
+
     }
 
     this.Draw=function()
@@ -35526,15 +35549,28 @@ function ChartDrawLastBarText()
         this.Canvas.textBaseline=textBaseline;
         this.Canvas.textAlign=textAlign;
         this.Canvas.fillStyle = item.Color;
-        this.Canvas.fillText(item.Text, x, y);
+
+        if (this.IsHScreen)
+        {
+            this.Canvas.save(); 
+            this.Canvas.translate(y, x);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.fillText(item.Text,0,0);
+            this.Canvas.restore();
+        }
+        else
+        {
+            this.Canvas.fillText(item.Text, x, y);
+        }
     }
 
     this.DrawLastIcon=function(item,x,y)
     {
+        var icon=item.Icon;
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
         var iconSize=this.GetDynamicIconSize(dataWidth,distanceWidth,this.IconSize.Max,this.IconSize.Min,this.IconSize.Zoom);
-        var font=`${iconSize}px ${this.IconFamily}`;
+        var font=`${iconSize}px ${icon.Family}`;
 
         var textBaseline='bottom';
         if (item.TextBaseline) textBaseline=item.TextBaseline;
@@ -35545,7 +35581,20 @@ function ChartDrawLastBarText()
         this.Canvas.textBaseline=textBaseline;
         this.Canvas.textAlign=textAlign;
         this.Canvas.fillStyle = item.Color;
-        this.Canvas.fillText(item.Icon.Symbol, x, y);
+
+        if (this.IsHScreen)
+        {
+            this.Canvas.save(); 
+            this.Canvas.translate(y, x);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.fillText(icon.Symbol,0,0);
+            this.Canvas.restore();
+        }
+        else
+        {
+            this.Canvas.fillText(icon.Symbol, x, y);
+        }
+        
     }
 
     this.GetMaxMin=function()
@@ -54014,6 +54063,7 @@ function DynamicKLineTitlePainting()
     this.IsShowSettingInfo=true;    //是否显示设置信息(周期 复权)
     this.IsShowDateTime=true;       //是否显示日期
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
+    this.ShowPositionConfig={ Margin:{ Bottom:2 } };        //显示位置高级配置 { Type:1 左对齐, Margin:{ Left, Right, Bottom } }
     this.OnDrawEvent;
     this.OnMouseMoveEvent;
     this.HQChart;
@@ -54246,25 +54296,104 @@ function DynamicKLineTitlePainting()
         return result;
     }
 
+    this.GetLeft=function(isHScreen)
+    {
+        if (isHScreen)
+        {
+            var left=this.Frame.ChartBorder.GetTop();
+            if (this.ShowPositionConfig)
+            {
+                var item=this.ShowPositionConfig;
+                if (item.Type===1) left=0;
+                if (item.Margin && IFrameSplitOperator.IsNumber(item.Margin.Left)) left+=item.Margin.Left;
+            }
+            return left;
+        }
+        else
+        {
+            var left=this.Frame.ChartBorder.GetLeft();
+            if (this.ShowPositionConfig)
+            {
+                var item=this.ShowPositionConfig;
+                if (item.Type===1) left=0;
+                if (item.Margin && IFrameSplitOperator.IsNumber(item.Margin.Left)) left+=item.Margin.Left;
+            }
+            return left;
+        }
+    }
+
+    this.GetRight=function(isHScreen)
+    {
+        if (isHScreen)
+        {
+            var right = this.Frame.ChartBorder.GetHeight();
+            if (this.ShowPositionConfig)
+            {
+                var item=this.ShowPositionConfig;
+                if (item.Type===1) right=this.Frame.ChartBorder.GetChartHeight();
+                if (item.Margin && IFrameSplitOperator.IsNumber(item.Margin.Right)) right-=item.Margin.Right;
+            }
+    
+            return right;
+        }
+        else
+        {
+            var right = this.Frame.ChartBorder.GetRight();
+            if (this.ShowPositionConfig)
+            {
+                var item=this.ShowPositionConfig;
+                if (item.Type===1) right=this.Frame.ChartBorder.GetChartWidth();
+                if (item.Margin && IFrameSplitOperator.IsNumber(item.Margin.Right)) right-=item.Margin.Right;
+            }
+    
+            return right;
+        }
+        
+    }
+
+    this.GetBottom=function(isHScreen)
+    {
+        if (isHScreen)
+        {
+            var bottom=this.Frame.ChartBorder.GetRight();
+            if (this.ShowPositionConfig)
+            {
+                var item=this.ShowPositionConfig;
+                if (item.Margin && IFrameSplitOperator.IsNumber(item.Margin.Bottom)) bottom+=item.Margin.Bottom;
+            }
+
+            return bottom;
+        }
+        else
+        {
+            var bottom = this.Frame.ChartBorder.GetTop();
+            if (this.ShowPositionConfig)
+            {
+                var item=this.ShowPositionConfig;
+                if (item.Margin && IFrameSplitOperator.IsNumber(item.Margin.Bottom)) bottom-=item.Margin.Bottom;
+            }
+
+            return bottom;
+        }
+       
+    }
+
     this.DrawItem=function(item)
     {
         var isHScreen=this.Frame.IsHScreen===true;
-        var left=this.Frame.ChartBorder.GetLeft();
-        var bottom=this.Frame.ChartBorder.GetTop()-this.Frame.ChartBorder.Top/2;
-        var right=this.Frame.ChartBorder.GetRight();
-        //var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
-        //var upperSymbol=this.Symbol.toUpperCase();
+        var left=this.GetLeft(isHScreen);
+        var right=this.GetRight(isHScreen);
+
+        var bottom=this.GetBottom(isHScreen);
         var pixelRatio=GetDevicePixelRatio();
         if (isHScreen)
         {
             if (this.Frame.ChartBorder.Right<5*pixelRatio) return;
-            var left=2;
-            var bottom=this.Frame.ChartBorder.Right/2;    //上下居中显示
-            var right=this.Frame.ChartBorder.GetHeight();
-            var xText=this.Frame.ChartBorder.GetChartWidth();
-            var yText=this.Frame.ChartBorder.GetTop();
+            var xText=bottom;
+            var yText=left;
             this.Canvas.translate(xText, yText);
             this.Canvas.rotate(90 * Math.PI / 180);
+            left=bottom=0;
         }
         else
         {
@@ -54272,9 +54401,9 @@ function DynamicKLineTitlePainting()
         }
 
         this.Canvas.textAlign="left";
-        this.Canvas.textBaseline="middle";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.font=this.Font;
-        var position = { Left: left, Bottom: bottom, IsHScreen: isHScreen };
+        var position = { Left: left, MaxRight:right, Bottom: bottom, IsHScreen: isHScreen };
         var titleData=this.GetFormatTitle({ Data:item });
 
         if (titleData && IFrameSplitOperator.IsNonEmptyArray(titleData.AryText))
@@ -54378,14 +54507,17 @@ function DynamicKLineTitlePainting()
         return false;
     }
 
-    this.DrawText=function(title,color,position)
+    this.DrawText=function(title,color,position )
     {
         if (!title) return true;
 
         var isHScreen=this.Frame.IsHScreen===true;
+        
         var right = this.Frame.ChartBorder.GetRight();
         if (isHScreen) right=this.Frame.ChartBorder.GetHeight();
 
+        if (IFrameSplitOperator.IsNumber(position.MaxRight)) right=position.MaxRight;
+
         this.Canvas.fillStyle = color;
         var textWidth = this.Canvas.measureText(title).width;
         if (position.Left + textWidth > right) return false;
@@ -54447,7 +54579,6 @@ function DynamicMinuteTitlePainting()
 
     this.MultiDayBeforeOpenData;    //多日分时图 盘前数据
     this.MultiDayAfterCloseData;    //多日分时图 收盘数据
-    this.TitleBaseLine=1;           //0=top 1=middle 2=bottom
 
     this.TimeFormat;                //显示时间格式 "HH:MM:SS", "hh:MM", "HH:MM:SS.fff"
     
@@ -54764,43 +54895,30 @@ function DynamicMinuteTitlePainting()
         var pixelRatio=GetDevicePixelRatio();
         var isHScreen=this.Frame.IsHScreen===true;
         var border=this.Frame.GetBorder();
-        var left=border.Left;
-        var bottom=border.Top-this.Frame.ChartBorder.Top/2;
-        var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
-        this.Canvas.font=this.Font;
-
+        var left=this.GetLeft(isHScreen);
+        var right=this.GetRight(isHScreen);
+        var bottom =this.GetBottom(isHScreen);
+       
         if (isHScreen)
         {
             if (this.Frame.ChartBorder.Right<5*pixelRatio) return;
-            var left=2;
-            var bottom=this.Frame.ChartBorder.Right/2;    //上下居中显示
-            var xText=border.ChartWidth;
-            var yText=border.Top;
+            var xText=bottom;
+            var yText=left;
             this.Canvas.translate(xText, yText);
             this.Canvas.rotate(90 * Math.PI / 180);
+            left=bottom=0; //旋转以后 位置调整0
         }
         else
         {
             if (this.Frame.ChartBorder.Top<5*pixelRatio) return;
         }
 
-        this.Canvas.textAlign="left";
-        if (this.TitleBaseLine==0)  //上
-        {
-            this.Canvas.textBaseline="top";
-            bottom=2*pixelRatio;
-        }
-        else if (this.TitleBaseLine==2) //下
-        {
-            this.Canvas.textBaseline="bottom";
-            var bottom=border.Top
-        }
-        else    //中
-        {
-            this.Canvas.textBaseline="middle";
-        }
         
-        var position = { Left: left, Bottom: bottom, IsHScreen: isHScreen };
+        this.Canvas.font=this.Font;
+        this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="bottom";
+
+        var position = { Left: left, MaxRight:right, Bottom: bottom, IsHScreen: isHScreen };
         var titleData=this.GetFormatTitle({ Data:item, IsLastOne:isLastOne });
 
         if (titleData && IFrameSplitOperator.IsNonEmptyArray(titleData.AryText))
@@ -69670,11 +69788,6 @@ function JSChartResource()
         Color:"rgb(255,165,0)"
     }
 
-    this.DRAWLASTICON=
-    {
-        Family:'iconfont', 
-    }
-
     this.POINTDOT=
     {
         Radius:2*GetDevicePixelRatio()
@@ -73277,7 +73390,11 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         isInClient=this.Canvas.isPointInPath(x,y);
 
         //PC触摸板双指缩放时deltaY数值在[-20,20]之间
-        if (IFrameSplitOperator.IsNumber(e.deltaY) && Math.abs(e.deltaY)<90) return;
+        if (IFrameSplitOperator.IsNumber(e.deltaY))
+        {
+            var value=e.deltaY*pixelTatio;
+            if (Math.abs(value)<90) return;
+        } 
 
         var wheelValue=e.wheelDelta;
         if (!IFrameSplitOperator.IsObjectExist(e.wheelDelta))
@@ -80388,6 +80505,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.ClassName='MinuteChartContainer';
     this.WindowIndex=new Array();
     this.Symbol;
+    this.AryDate;                             //日期列表[]
     this.Name;
     this.SourceData;                          //原始的历史数据
     this.IndexBindData;                       //计算指标需要绑定的分钟数据
@@ -83155,6 +83273,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     this.OverlayChartPaint.push(paint);
                 }
             }
+
+            if (IFrameSplitOperator.IsNonEmptyArray(option.AryDate))
+            {
+                this.AryDate=option.AryDate.slice();
+            }
         }
 
         if (!symbol || this.DayCount<=0)
@@ -83204,6 +83327,14 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.SetPageInfo(option.PageInfo);
             this.ResetDayOffset();
         }
+
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNonEmptyArray(option.AryDate))
+            {
+                this.AryDate=option.AryDate.slice();
+            }
+        }
         
         this.ReloadChartDrawPicture();
         this.ResetDataStatus();
@@ -83536,7 +83667,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 Name:'MinuteChartContainer::RequestHistoryMinuteData', //类名::函数
                 Explain:'多日分时数据',
-                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation }, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation, AryDate:this.AryDate }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -83926,7 +84057,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 Name:'MinuteChartContainer::RequestMinuteData', //类名::函数名
                 Explain:'最新分时数据',
-                Request:{ Url:self.MinuteApiUrl, Data:{field:fields, symbol:[self.Symbol], callcation:callCation }, Type:'POST' }, 
+                Request:{ Url:self.MinuteApiUrl, Data:{field:fields, symbol:[self.Symbol], callcation:callCation, AryDate:this.AryDate }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };

package/src/jscommon/umychart.resource/css/tools.css

@@ -1562,15 +1562,14 @@ input[type="color"] {
     visibility:hidden;
     background-color: rgba(255,255,255,0.95);
     border: solid 1px rgba(200, 210, 219, 0.92);
-    display: flex;
-    flex-flow: column;  
     z-index: 99;
     pointer-events:none;
 }
 
 .UMyChart_Tooltip_Minute_Chart_Div
 {
-    flex: 1
+    height: 100%;
+    width: 100%;
 }