hqchart 1.1.14425 → 1.1.14439

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

@@ -3994,7 +3994,6 @@ if (!JSConsole)
 function JSChart(divElement, bOffscreen, bCacheCanvas)
 {
     this.DivElement=divElement;
-    this.DivToolElement=null;           //工具条
     this.JSChartContainer;              //画图控件
     this.ResizeListener;
 
@@ -4090,6 +4089,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         //画布大小通过div获取 如果有style里的大小 使用style里的
         var height=this.DivElement.offsetHeight;
         var width=this.DivElement.offsetWidth;
+        var pixelTatio = GetDevicePixelRatio(); //获取设备的分辨率s
         if (this.DivElement.style.height && this.DivElement.style.width)
         {
             if (this.DivElement.style.height.includes("px"))
@@ -4097,21 +4097,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (this.DivElement.style.width.includes("px"))
                 width=parseInt(this.DivElement.style.width.replace("px",""));
         }
-        
-        if (this.ToolElement)
-        {
-            //TODO调整工具条大小
-            height-=this.ToolElement.style.height.replace("px","");   //减去工具条的高度
-        }
 
-        this.CanvasElement.height=height;
-        this.CanvasElement.width=width;
-        this.CanvasElement.style.width=this.CanvasElement.width+'px';
-        this.CanvasElement.style.height=this.CanvasElement.height+'px';
+        this.CanvasElement.style.width=`${width}px`;
+        this.CanvasElement.style.height=`${height}px`;
 
-        var pixelTatio = GetDevicePixelRatio(); //获取设备的分辨率
-        this.CanvasElement.height*=pixelTatio;
-        this.CanvasElement.width*=pixelTatio;
+        this.CanvasElement.height=parseInt(pixelTatio*height);  //根据分辨率缩放
+        this.CanvasElement.width=parseInt(pixelTatio*width);
 
         if (this.OffscreenCanvasElement)
         {
@@ -9914,6 +9905,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         for(var i=0;i<this.ExtendChartPaint.length;++i)
         {
             var item=this.ExtendChartPaint[i];
+
             if (item.IsCallbackDraw) 
             {
                 if (["KLineYAxisBGPaint","DepthMapPaint","BackgroundPaint","MinuteBackgroundPaint", "SessionBreaksPaint"].includes(item.ClassName))
@@ -48415,6 +48407,25 @@ function IExtendChartPainting()
     {
         return GetFontHeight(this.Canvas, font, "擎");
     }
+
+    this.SetFillStyle=function(color, x0, y0, x1, y1)
+    {
+        if (Array.isArray(color))
+        {
+            let gradient = this.Canvas.createLinearGradient(x0, y0, x1, y1);
+            var offset=1/(color.length-1);
+            for(var i=0; i<color.length; ++i)
+            {
+                var value=i*offset;
+                gradient.addColorStop(value, color[i]);
+            }
+            this.Canvas.fillStyle=gradient;
+        }
+        else
+        {
+            this.Canvas.fillStyle=color;
+        }
+    }
 }
 
 //K线Tooltip, 显示在左边或右边
@@ -52584,7 +52595,7 @@ function KLineYAxisBGPaint()
 }
 
 
-//背景图 支持横屏
+//背景图 支持横屏 新版本
 function BackgroundPaint()
 {
     this.newMethod=IExtendChartPainting;   //派生
@@ -52596,327 +52607,210 @@ function BackgroundPaint()
     this.IsDynamic=false;
     this.IsCallbackDraw=true;   //在回调函数里绘制, 不在Draw()中绘制
 
+    this.IsDrawAllFrame=false;          //全部的指标框都画
+    this.SetDrawFrameID=new Set([0]);   //指定几个指标框画
+
     this.FrameID=0;
-    this.Data;      //背景数据 { Start:, End:, Color:[] }
+    this.Data;                              //背景数据[ { Start:{ Date:, Time: }, End:{ Date:, Time }, Color:['rgb(44,55,255)','rgb(200,55,255)'] }]
+    this.IsShow=true;
+    this.SubFrame=null;
+    
     this.ID=Guid(); //唯一的ID
-
-    /*
-    this.Data=
-    [ 
-        { Start:{ Date:20181201 }, End:{ Date:20181230 }, Color:'rgb(44,55,44)' } , 
-        { Start:{ Date:20190308 }, End:{ Date:20190404 }, Color:['rgb(44,55,255)','rgb(200,55,255)'] } 
-    ]
-    */
-
-    this.ChartSubFrame;
-    this.ChartBorder;
-    this.KData;
-    this.Period;
-    this.XPointCount=0;
+    this.HQChart;
 
     this.SetOption=function(option) //设置
     {
-        if (option.FrameID>0) this.FrameID=option.FrameID;
+        if (!option) return;
+
+        if (IFrameSplitOperator.IsNumber(option.FrameID)) this.FrameID=option.FrameID;
         if (IFrameSplitOperator.IsObjectExist(option.ID)) this.ID=option.ID;
+        if (IFrameSplitOperator.IsBool(option.IsDrawAllFrame)) this.IsDrawAllFrame=option.IsDrawAllFrame;
+        if (IFrameSplitOperator.IsNonEmptyArray(option.AryFrameID)) this.SetDrawFrameID=new Set(option.AryFrameID);
     }
 
     this.Draw=function()
     {
-        if (!this.Data || !this.HQChart) return;
-        if (!this.ChartFrame || !this.ChartFrame.SubFrame || this.ChartFrame.SubFrame.length<=this.FrameID) return;
-        var klineChart=this.HQChart.ChartPaint[0];
-        if (!klineChart || !klineChart.Data) return;
-
-        this.ChartSubFrame=this.ChartFrame.SubFrame[this.FrameID].Frame;
-        this.ChartBorder=this.ChartSubFrame.ChartBorder;
-        this.KData=klineChart.Data;
-        this.Period=this.HQChart.Period;
-        if (!this.KData || this.KData.Data.length<=0) return;
-
-        var isHScreen=(this.ChartSubFrame.IsHScreen===true);
-        this.XPointCount=this.ChartSubFrame.XPointCount;
-        var xPointCount=this.ChartSubFrame.XPointCount;
-        
-        var firstKItem=this.KData.Data[this.KData.DataOffset];
-        var endIndex=this.KData.DataOffset+xPointCount-1;
-        if (endIndex>=this.KData.Data.length) endIndex=this.KData.Data.length-1;
-        var endKItem=this.KData.Data[endIndex];
-        var showData=this.GetShowData(firstKItem,endKItem);
-        if (!showData || showData.length<=0) return;
-
-        var kLineMap=this.BuildKLineMap();
-        var bottom=this.ChartBorder.GetBottomEx();
-        var top=this.ChartBorder.GetTopEx();
-        var height=this.ChartBorder.GetHeightEx();
-        if (isHScreen)
+        this.SubFrame=null;
+
+        if (this.FrameID<0) return;
+        if (!this.HQChart) return;
+        if (!this.ChartFrame || !IFrameSplitOperator.IsNonEmptyArray(this.ChartFrame.SubFrame)) return;
+        if (!this.IsShow) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Data)) return;
+        if (!this.ChartFrame.SubFrame[this.FrameID]) return;
+        this.SubFrame=this.ChartFrame.SubFrame[this.FrameID].Frame;
+        if (!this.SubFrame) return;
+
+        var kData=this.HQChart.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
+
+        var bHScreen=(this.SubFrame.IsHScreen===true);
+        this.IsHScreen=bHScreen;
+        var isMinute=this.SubFrame.IsMinuteFrame();
+        var dataWidth=this.SubFrame.DataWidth;
+        var distanceWidth=this.SubFrame.DistanceWidth;
+        var xPointCount=this.SubFrame.XPointCount;
+        
+        var border=this.SubFrame.GetBorder();
+        if (bHScreen)
         {
-            top=this.ChartBorder.GetRightEx();
-            bottom=this.ChartBorder.GetLeftEx();
-            height=this.ChartBorder.GetWidthEx(); 
+            var chartright=border.BottomEx;
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
         }
 
-        for(var i in showData)
+        var mapBG=new Map();    //key= index, Value={  Start:{Left, Center, Right, Item:}, End:{ Left, Center, Right, Item:} }
+        var startIndex=kData.DataOffset;
+        for(var i=startIndex,j=0;i<kData.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
-            var item=showData[i];
-            var rt=this.GetBGCoordinate(item,kLineMap);
-            if (!rt) continue;
+            var kItem=kData.Data[i];
+            var aryFind=this.FindMatchData(kItem);
+            if (!aryFind) continue;
 
-            if (Array.isArray(item.Color))
+            if (isMinute)
             {
-                var gradient;
-                if (isHScreen) gradient = this.Canvas.createLinearGradient(bottom,rt.Left, top, rt.Left);
-                else gradient = this.Canvas.createLinearGradient(rt.Left,top, rt.Left,bottom);
-                var offset=1/item.Color.length;
-                for(var i in item.Color)
-                {
-                    gradient.addColorStop(i*offset, item.Color[i]);
-                }
-                this.Canvas.fillStyle=gradient;
+                var x=this.ChartFrame.GetXFromIndex(j);
+                var left=x;
+                var right=x;
             }
             else
             {
-                this.Canvas.fillStyle=item.Color;
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                var x=left+(right-left)/2;
             }
 
-            if (isHScreen) this.Canvas.fillRect(ToFixedRect(bottom),ToFixedRect(rt.Left),ToFixedRect(height),ToFixedRect(rt.Width));
-            else this.Canvas.fillRect(ToFixedRect(rt.Left),ToFixedRect(top),ToFixedRect(rt.Width),ToFixedRect(height));
+            for(var k=0;k<aryFind.length;++k)
+            {
+                var findItem=aryFind[k];
+                if (mapBG.has(findItem.Index))
+                {
+                    var bgItem=mapBG.get(findItem.Index);
+                    bgItem.End.Left=left;
+                    bgItem.End.Right=right;
+                    bgItem.End.Item=findItem.Item;
+                }
+                else
+                {
+                    mapBG.set(findItem.Index, { Item:findItem.Item, Start:{ Left:left, Right:right, Item:findItem.Item }, End:{ Left:left, Right:right, Item:findItem.Item }})
+                }
+            }
+        }
+
+        if (mapBG.size>0)
+        {
+            this.Canvas.save();
+            //this.ClipClient(bHScreen);
+            
+            this.DrawBG(mapBG);
+    
+            this.Canvas.restore();
         }
     }
 
-    this.GetShowData=function(first, end)
+    this.FindMatchData=function(kItem)
     {
-        if (!IFrameSplitOperator.IsNonEmptyArray(this.Data)) return null;
-
-        var aryData=[];
+        var aryFind=[];
         for(var i=0;i<this.Data.length;++i)
         {
             var item=this.Data[i];
-            var showItem={ };
-            if (item.Start.Date>=first.Date && item.Start.Date<=end.Date) showItem.Start=item.Start;
-            if (item.End.Date>=first.Date && item.End.Date<=end.Date) showItem.End=item.End;
-
-            if (item.Start.Date<first.Date && item.End.Date>end.Date)
+            var start=item.Start;
+            var end=item.End;
+            var bMatch=false;
+            if (IFrameSplitOperator.IsNumber(kItem.Date) && IFrameSplitOperator.IsNumber(kItem.Time))
             {
-                showItem.Start=first;
-                showItem.End=end;
+                if (kItem.Date>start.Date && kItem.Date<end.Date)
+                {
+                    bMatch=true;
+                }
+                else if (kItem.Date==start.Date && kItem.Date==end.Date)
+                {
+                    if (kItem.Time>=start.Time && kItem.Time<=end.Time)bMatch=true;
+                }
+                else if (kItem.Date==start.Date)
+                {
+                    if (kItem.Time>=start.Time) bMatch=true;
+                }
+                else if (kItem.Date==end.Date)
+                {
+                    if ((kItem.Time<=end.Time)) bMatch=true;
+                }
             }
-                
-
-            if (showItem.Start || showItem.End) 
+            else if (IFrameSplitOperator.IsNumber(kItem.Date) && !IFrameSplitOperator.IsNumber(kItem.Time))
             {
-                showItem.Color=item.Color;
-                aryData.push(showItem);
+                if (kItem.Date>=start.Date && kItem.Date<=end.Date) bMatch=true;
             }
+
+            if (bMatch) aryFind.push({ Index:i, Item:item });
         }
 
-        //JSConsole.Chart.Log('[BackgroundPaint::GetShowData]  aryData ', aryData);
-        return aryData;
+        if (aryFind.Length<=0) return null;
+
+        return aryFind;
     }
 
-    this.BuildKLineMap=function()
+    this.DrawBG=function(mapBG)
     {
-        var isHScreen=(this.ChartSubFrame.IsHScreen===true);
-        var dataWidth=this.ChartSubFrame.DataWidth;
-        var distanceWidth=this.ChartSubFrame.DistanceWidth;
-        var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
-        if (isHScreen) xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
-        var chartright=this.ChartBorder.GetRight();
-        if (isHScreen) chartright=this.ChartBorder.GetBottom();
-
-        var mapKLine={ Data:new Map() ,Start:null, End:null } ; //Key: date / date time, Value:索引
-        for(var i=this.KData.DataOffset,j=0; i<this.KData.Data.length && j<this.XPointCount; ++i,++j,xOffset+=(dataWidth+distanceWidth))
+        for(var mapItem of mapBG)
         {
-            var kItem=this.KData.Data[i];
-            var left=xOffset;
-            var right=xOffset+dataWidth;
-            if (right>chartright) break;
-            var x=left+(right-left)/2;
-
-            if (j==0) mapKLine.XLeft=left;
-            mapKLine.XRight=right;
-
-            var value={ Index:i, ShowIndex:j , X:x, Right:right, Left:left, Date:kItem.Date };
-            if (ChartData.IsMinutePeriod(this.Period,true))
-            {
-                var key=`Date:${kItem.Date} Time:${kItem.Time}`;
-                value.Time=kItem.Time;
-            }
-            else
+            var bgItem=mapItem[1];
+            //this.DrawBGItem(this.SubFrame, bgItem);
+            
+            for(var i=0;i<this.ChartFrame.SubFrame.length;++i)
             {
-                var key=`Date:${kItem.Date}`;
+                var subFrame=this.ChartFrame.SubFrame[i].Frame;
+                if (this.IsDrawAllFrame || this.SetDrawFrameID.has(i))
+                {
+                    this.DrawBGItem(subFrame, bgItem);
+                }
             }
-               
-            mapKLine.Data.set(key,value);
-
-            //保存下起始和结束位置
-            if (j==0) mapKLine.Start=value;
-            mapKLine.End=value;
         }
-
-        return mapKLine;
     }
 
-    this.GetBGCoordinate=function(item,kLineMap)
+    this.DrawBGItem=function(frame, bgItem)
     {
-        var xLeft=null, xRight=null;
-        var isMinutePeriod=ChartData.IsMinutePeriod(this.Period,true);
-        var bSingleDate=false;
-        //JSConsole.Chart.Log('[BackgroundPaint::GetBGCoordinate]  item ', item);
-        if (isMinutePeriod)
-        {
-            if (item.Start && item.End && item.Start.Date==item.End.Date && item.Start.Time==item.End.Time) bSingleDate=true;
-        }
-        else
-        {
-            if (item.Start && item.End && item.Start.Date==item.End.Date) bSingleDate=true;
-        }
-
-        if (bSingleDate)
-        {
-            if (isMinutePeriod)
-                var key=`Date:${item.Start.Date} Time:${item.Start.Time}`;
-            else 
-                var key=`Date:${item.Start.Date}`;
-
-            if (!kLineMap.Data.has(key)) return null;
-            var findItem=kLineMap.Data.get(key);
-            xLeft=findItem.Left;
-            xRight=findItem.Right;
-            return { Left:xLeft, Right:xRight, Width:xRight-xLeft };
-        }
-        
-        if (item.Start)
+        var border=frame.GetBorder();
+        if (this.IsHScreen)
         {
-            if (isMinutePeriod)
-                var key=`Date:${item.Start.Date} Time:${item.Start.Time}`;
-            else 
-                var key=`Date:${item.Start.Date}`;
-
-            if (kLineMap.Data.has(key)) 
-            {
-                var findItem=kLineMap.Data.get(key);
-                xLeft=findItem.Left;
-            }
-            else 
-            {
-                if (isMinutePeriod)
-                {
-                    if (item.Start.Date<kLineMap.Start.Date || (item.Start.Date==kLineMap.Start.Date && item.Start.Time<=kLineMap.Start.Time) ) 
-                    {
-                        xLeft=kLineMap.Start.Left;
-                    }
-                    else
-                    {
-                        for(var kItem of kLineMap.Data)
-                        {
-                            var value=kItem[1];
-                            if (value.Date>item.Start.Date || (value.Date==item.Start.Date && value.Time>item.Start.Time))
-                            {
-                                xLeft=value.Left;
-                                break;
-                            }
-                        }
-                    }
-                }
-                else
-                {
-                    if (item.Start.Date<=kLineMap.Start.Date) 
-                    {
-                        xLeft=kLineMap.Start.Left;
-                    }
-                    else
-                    {
-                        for(var kItem of kLineMap.Data)
-                        {
-                            var value=kItem[1];
-                            if (value.Date>item.Start.Date)
-                            {
-                                xLeft=value.Left;
-                                break;
-                            }
-                        }
-                    }
-                }
-            }
+            var top=border.RightEx;
+            var bottom=border.LeftEx;
+            var left=border.Top;
         }
         else
         {
-            xLeft=kLineMap.XLeft;
+            var top=border.TopEx;
+            var bottom=border.BottomEx;
+            var left=border.Left;
         }
 
-        if (item.End)
+        if (this.IsHScreen)
         {
-            if (isMinutePeriod)
-                var key=`Date:${item.End.Date} Time:${item.End.Time}`;
-            else 
-                var key=`Date:${item.End.Date}`;
-
-            if (kLineMap.Data.has(key))
-            {
-                var findItem=kLineMap.Data.get(key);
-                xRight=findItem.Right;
-            }
-            else
-            {
-                if (isMinutePeriod)
-                {
-                    if (item.End.Date<kLineMap.Start.Date || (item.End.Date==kLineMap.Start.Date && item.End.Time<kLineMap.Start.Time)) return null;
-
-                    if (item.End.Date<kLineMap.End.Date || (item.End.Date==kLineMap.End.Date && item.End.Time>=kLineMap.End.Time) ) 
-                    {
-                        xRight=kLineMap.End.Right;
-                    }
-                    else
-                    {
-                        var previousX=null;
-                        for(var kItem of kLineMap.Data)
-                        {
-                            var value=kItem[1];
-                            if (value.Date>item.End.Date || (value.Date==item.End.Date && value.Time>item.End.Time) )
-                            {
-                                xRight=previousX;
-                                break;
-                            }
-                            previousX=value.Right;
-                        }
-                    }
-                }
-                else
-                {
-                    if (item.End.Date<kLineMap.Start.Date) return null;
-
-                    if (item.End.Date<=kLineMap.End.Date) 
-                    {
-                        xRight=kLineMap.End.Right;
-                    }
-                    else
-                    {
-                        var previousX=null;
-                        for(var kItem of kLineMap.Data)
-                        {
-                            var value=kItem[1];
-                            if (value.Date>item.End.Date)
-                            {
-                                xRight=previousX;
-                                break;
-                            }
-                            previousX=value.Right;
-                        }
-                    }
-                }
-            }
+            this.SetFillStyle(bgItem.Item.Color,top,left,bottom,left);
+            var start=bgItem.Start;
+            var end=bgItem.End;
+            var rtBG={ Left:bottom, Right:top, Top:start.Left, Bottom:end.Right };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
         }
         else
         {
-            xRight=kLineMap.XRight;
+            this.SetFillStyle(bgItem.Item.Color, left,top, left,bottom);
+            var start=bgItem.Start;
+            var end=bgItem.End;
+            var rtBG={ Left:start.Left, Right:end.Right, Top:top, Bottom:bottom };
+            rtBG.Width=rtBG.Right-rtBG.Left;
+            rtBG.Height=rtBG.Bottom-rtBG.Top;
+            this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
         }
-
-        if (xLeft==null || xRight==null) return null;
-
-        return { Left:xLeft, Right:xRight, Width:xRight-xLeft };
     }
 }
 
+
 function MinuteBackgroundPaint()
 {
     this.newMethod=IExtendChartPainting;   //派生
@@ -62516,7 +62410,7 @@ function DynamicChartTitlePainting()
         var left=positionInfo.Left;
         var right=positionInfo.Right;
         var bottom=positionInfo.Bottom;
-
+        var pixelRatio=GetDevicePixelRatio();
         for(var i=0; i<this.Data.length; ++i)
         {
             var item=this.Data[i];
@@ -62535,7 +62429,9 @@ function DynamicChartTitlePainting()
                     if (titleItem.Name) text=titleItem.Name+":"+titleItem.Text;
                     else text=titleItem.Text;
 
-                    var space=this.ParamSpace*GetDevicePixelRatio();
+                    if (IFrameSplitOperator.IsNumber(titleItem.LeftSpace)) left+=titleItem.LeftSpace*pixelRatio;
+
+                    var space=this.ParamSpace*pixelRatio;
                     var indexTextWidth=this.Canvas.measureText(text).width;  //标题+数值长度
                     var textWidth=indexTextWidth;
 
@@ -62611,7 +62507,7 @@ function DynamicChartTitlePainting()
                     if (dyTitle) text=dyTitle+":"+valueText;
                     else text=item.Name+":"+valueText;
                 }
-                var space=this.ParamSpace*GetDevicePixelRatio();
+                var space=this.ParamSpace*pixelRatio;
                 var textWidth=this.Canvas.measureText(text).width+space;
                 if ((left+textWidth)>right) break;
     
@@ -80187,12 +80083,14 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             var item=option.PopMinuteChart;
             this.PopMinuteChart=new JSPopMinuteChart();
             this.PopMinuteChart.Inital(this, item);
+            this.PopMinuteChart.Create();
             return true;
         }
         else if (option.KLine && option.KLine.KLineDoubleClick===true)  //旧的格式 不要使用了
         {
             this.PopMinuteChart=new JSPopMinuteChart();
             this.PopMinuteChart.Inital(this);
+            this.PopMinuteChart.Create();
             return true;
         }
         
@@ -83774,6 +83672,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 chart.SetOption(option);
                 this.ExtendChartPaint.push(chart);
                 return chart;
+            case "BackgroundPaint":
             case '背景图':
                 chart=new BackgroundPaint();
                 chart.Canvas=this.Canvas;
@@ -92374,6 +92273,16 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 chart.SetOption(option);
                 this.ExtendChartPaint.push(chart);
                 return chart;
+            case "BackgroundPaint":
+            case "背景图":
+                chart=new BackgroundPaint();
+                chart.Canvas=this.Canvas;
+                chart.ChartBorder=this.Frame.ChartBorder;
+                chart.ChartFrame=this.Frame;
+                chart.HQChart=this;
+                chart.SetOption(option);
+                this.ExtendChartPaint.push(chart);
+                return chart;
             default:
                 chart=g_ExtendChartPaintFactory.Create(name);
                 if (!chart) return null;
@@ -132624,19 +132533,21 @@ function JSReportChartContainer(uielement)
                 }
                 break;
             case 38:    //up
-                var result=this.MoveSelectedRow(-1);
+                var result=this.MoveSelectedRow(-1, {EnablePageCycle: this.PageUpDownCycle});
                 if (result)
                 {
                     if (result.Redraw) this.Draw();
                     if (result.Update) this.DelayUpdateStockData();
+                    this.MoveSelectedRowEvent(result.OldIndex, result.NewIndex);
                 }
                 break;
             case 40:    //down
-                var result=this.MoveSelectedRow(1)
+                var result=this.MoveSelectedRow(1, {EnablePageCycle: this.PageUpDownCycle})
                 if (result)
                 {
                     if (result.Redraw) this.Draw();
                     if (result.Update) this.DelayUpdateStockData();
+                    this.MoveSelectedRowEvent(result.OldIndex, result.NewIndex);
                 }
                 break;
             case 37: //left
@@ -133797,13 +133708,19 @@ function JSReportChartContainer(uielement)
         return false;
     }
 
-    this.MoveSelectedRow=function(step)
+    // option={ EnablePageCycle: true/false(是否循环翻页) }
+    this.MoveSelectedRow=function(step, option)
     {
         var chart=this.ChartPaint[0];
         if (!chart) return null;
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
+        var bPageCycle=false;
+        if (option)
+        {
+            if (IFrameSplitOperator.IsBool(option.EnablePageCycle)) bPageCycle=option.EnablePageCycle;
+        }
 
-        var result={ Redraw:false, Update:false };  //Redraw=重绘, Update=更新数据
+        var result={ Redraw:false, Update:false, OldIndex:-1, NewIndex:-1 };  //Redraw=重绘, Update=更新数据
 
         if (chart.MultiSelectModel==1)
         {
@@ -133905,6 +133822,7 @@ function JSReportChartContainer(uielement)
             var pageStatus=chart.GetCurrentPageStatus();
             var pageSize=pageStatus.End-pageStatus.Start+1;
             var selected=pageStatus.SelectedRow;
+            result.OldIndex=this.Data.YOffset+selected;
             if (step>0)
             {
                 selected+=step;
@@ -133912,6 +133830,7 @@ function JSReportChartContainer(uielement)
                 chart.SelectedRow=selected;
                 chart.SelectedFixedRow=-1;
                 result.Redraw=true;
+                result.NewIndex=this.Data.YOffset+selected;
                 return result;
             }
             else if (step<0)
@@ -133925,6 +133844,7 @@ function JSReportChartContainer(uielement)
 
                 chart.SelectedRow=selected;
                 chart.SelectedFixedRow=-1;
+                result.NewIndex=this.Data.YOffset+selected;
                 result.Redraw=true;
                 return result;
             }
@@ -133934,18 +133854,23 @@ function JSReportChartContainer(uielement)
             var pageStatus=chart.GetCurrentPageStatus();
             var pageSize=pageStatus.PageSize;
             var selected=pageStatus.SelectedRow;
+            result.OldIndex=pageStatus.SelectedRow;
             if (step>0)
             {
                 if (selected<0 || selected<pageStatus.Start || selected>pageStatus.End)
                 {
                     chart.SelectedRow=pageStatus.Start;
                     result.Redraw=true;
+                    result.NewIndex=pageStatus.Start;
                     return result;
                 }
 
                 var offset=this.Data.YOffset;
                 for(var i=0;i<step;++i)
                 {
+                    if (selected+1>=this.Data.Data.length && !bPageCycle)
+                        break;
+
                     ++selected;
                     if (selected>pageStatus.End) ++offset;
 
@@ -133961,7 +133886,7 @@ function JSReportChartContainer(uielement)
 
                 chart.SelectedRow=selected;
                 this.Data.YOffset=offset;
-
+                result.NewIndex=selected;
                 return result;
             }
             else if (step<0)
@@ -133970,6 +133895,7 @@ function JSReportChartContainer(uielement)
                 {
                     chart.SelectedRow=pageStatus.End;
                     result.Redraw=true;
+                    result.NewIndex=pageStatus.End;
                     return result;
                 }
 
@@ -133977,6 +133903,9 @@ function JSReportChartContainer(uielement)
                 var offset=this.Data.YOffset;
                 for(var i=0;i<step;++i)
                 {
+                    if (selected<=0 && !bPageCycle)    //不能循环翻页
+                        break;
+
                     --selected;
                     if (selected<pageStatus.Start) --offset;
 
@@ -133993,6 +133922,7 @@ function JSReportChartContainer(uielement)
 
                 chart.SelectedRow=selected;
                 this.Data.YOffset=offset;
+                result.NewIndex=selected;
 
                 return result;
             }
@@ -134001,6 +133931,36 @@ function JSReportChartContainer(uielement)
         return null;
     }
 
+    this.MoveSelectedRowEvent=function(oldIndex, newIndex)
+    {
+        var chart=this.ChartPaint[0];
+        if (!chart) return null;
+
+        if (oldIndex==newIndex) return;
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOVE_SELECTED_REPORT_ROW);
+        if (!event || !event.Callback) return;
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(chart.Data.Data)) return;
+        var arySymbol=chart.Data.Data;
+
+        var oldData=null, newData=null;
+        if (oldIndex>=0 && oldIndex<arySymbol.length)
+        {
+            var symbol=arySymbol[oldIndex];
+            oldData={ Symbol:symbol, Index:oldIndex };
+        }
+
+        if (newIndex>=0 && newIndex<arySymbol.length)
+        {
+            var symbol=arySymbol[newIndex];
+            newData={ Symbol:symbol, Index:newIndex };
+        }
+
+        var endData={ Old:oldData, Now:newData };
+        event.Callback(event, endData, this);
+    }
+
     //左右移动
     this.MoveXOffset=function(step)
     {
@@ -148230,6 +148190,13 @@ function JSPopMinuteChart()
             this.Minute.JSChart.ChangeSymbol(data.Symbol);
         }
 
+        if (!this.Minute.Option.EnableResize)
+        {
+            if (this.Minute.JSChart) this.Minute.JSChart.OnSize();
+        }
+
+        
+
         //超出窗口调整位置
         var height=this.DivDialog.offsetHeight;
         var width=this.DivDialog.offsetWidth;
@@ -148331,7 +148298,7 @@ JSPopMinuteChart.GetMinuteOption=function()
         
         EnableSelectRect:true,
         EnableZoomIndexWindow:true,
-        EnableResize:true,
+        EnableResize:false,
 
         //BeforeOpen:{IsShow:true, Width:120, IsShowMultiDay:true, MulitiDayWidth:100, },
         //AfterClose:{IsShow:true, Width:100, IsShowMultiDay:true, MulitiDayWidth:50,  ShareVol:2 }, //ShareVol:0=盘后成交量独立坐标, 1==盘后成交量主图共用 2==盘后成交量盘前共用
@@ -148679,8 +148646,13 @@ function JSPopKeyboard()
         JSChart:null,
     }
 
-    this.Inital=function()
+    this.Inital=function(option)
     {
+        if (option)
+        {
+            if (IFrameSplitOperator.IsBool(option.EnableResize))  this.Keyboard.Option.EnableResize=option.EnableResize;
+        }
+
         window.addEventListener('mousedown', (e)=>{ this.OnWindowMouseDown(e)});
     }
 
@@ -148880,6 +148852,11 @@ function JSPopKeyboard()
     {
         if (!this.DivDialog) return;
 
+        if (!this.Keyboard.Option.EnableResize) //自动调整大小
+        {
+            if (this.Keyboard.JSChart) this.Keyboard.JSChart.OnSize();
+        }
+
         //显示在右下方
         var height=this.DivDialog.offsetHeight;
         var width=this.DivDialog.offsetWidth;
@@ -149011,7 +148988,7 @@ JSPopKeyboard.GetOption=function()
         },
 
         BorderLine:1|2|4|8,
-        EnableResize:true,
+        EnableResize:false,
 
         //{ Type:列id, Title:标题, TextAlign:文字对齐方式, MaxText:文字最大宽度 , TextColor:文字颜色, Sort:0=不支持排序 1=本地排序 0=远程排序 }
         Column:   
@@ -153232,7 +153209,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14424";
+var HQCHART_VERSION="1.1.14438";
 
 function PrintHQChartVersion()
 {