hqchart 1.1.14691 → 1.1.14705

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

@@ -4569,6 +4569,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             }
         }
 
+        if (option.FastSlide)
+        {
+            var item=option.FastSlide;
+            if (IFrameSplitOperator.IsNumber(item.MinDistance)) chart.FastSlideConfig.MinDistance=item.MinDistance;
+            if (IFrameSplitOperator.IsNumber(item.MinSpeed)) chart.FastSlideConfig.MinSpeed=item.MinSpeed;
+            if (IFrameSplitOperator.IsNumber(item.MaxTime)) chart.FastSlideConfig.MaxTime=item.MaxTime;
+            if (IFrameSplitOperator.IsBool(item.Enable)) chart.FastSlideConfig.Enable=item.Enable;
+        }
+
         if (chart.ClassName=="KLineChartContainer")
         {
             if (!option.DragSelectRect)
@@ -4637,6 +4646,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.RightButton.Enable)) chart.ChartCorssCursor.RightButton.Enable=item.RightButton.Enable;
             }
 
+            if (item.BottomButton)
+            {
+                var subItem=item.BottomButton;
+                if (IFrameSplitOperator.IsBool(subItem.Enable)) chart.ChartCorssCursor.BottomButton.Enable=subItem.Enable;
+            }
+
             if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
             if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
             if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
@@ -5121,6 +5136,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsNumber(item.WheelYMove)) chart.EnableYDrag.WheelYMove=item.WheelYMove;
         }
 
+        if (option.FastSlide)
+        {
+            var item=option.FastSlide;
+            if (IFrameSplitOperator.IsNumber(item.MinDistance)) chart.FastSlideConfig.MinDistance=item.MinDistance;
+            if (IFrameSplitOperator.IsNumber(item.MinSpeed)) chart.FastSlideConfig.MinSpeed=item.MinSpeed;
+            if (IFrameSplitOperator.IsNumber(item.MaxTime)) chart.FastSlideConfig.MaxTime=item.MaxTime;
+            if (IFrameSplitOperator.IsBool(item.Enable)) chart.FastSlideConfig.Enable=item.Enable;
+        }
+
         //分页
         if (option.PageInfo) chart.SetPageInfo(option.PageInfo);
 
@@ -5142,6 +5166,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.RightButton.Enable)) chart.ChartCorssCursor.RightButton.Enable=item.RightButton.Enable;
             } 
 
+            if (item.BottomButton)
+            {
+                var subItem=item.BottomButton;
+                if (IFrameSplitOperator.IsBool(subItem.Enable)) chart.ChartCorssCursor.BottomButton.Enable=subItem.Enable;
+            }
+
             if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
             if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
 
@@ -6878,6 +6908,10 @@ var JSCHART_EVENT_ID=
     ON_DBCLICK_DEAL_ROW:167,
 
     ON_FORMAT_OVERLAY_INDEX_OUT_TEXT:168,       //格式化叠指标标题
+
+    ON_TOUCH_FAST_SLIDE:169,                    //快速滑动
+
+    ON_CLICK_CROSSCURSOR_BOTTOM:170,            //十字光标底部文字点击     
 }
 
 var JSCHART_OPERATOR_ID=
@@ -6906,6 +6940,8 @@ var JSCHART_OPERATOR_ID=
 
     OP_GOTO:16,     //移动到某一个天或某一个分钟
     OP_GOTO_BY_DATAINDEX:17,   //的移动到某一个数据起始位置
+
+    OP_MOVE_CORSSCURSOR:18,       //移动十字光标 { Step, Start:{ Date:, Time: } }
 }
 
 var JSCHART_DRAG_ID=
@@ -7251,6 +7287,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.mapEvent=new Map();   //通知外部调用 key:JSCHART_EVENT_ID value:{Callback:回调,}
 
     this.PhonePinch=null;       //手机双指操作信息
+    this.TouchDrag=null;        //手势拖动操作信息
     this.IsOnTouch = false;     //是否再操作数据
     this.TouchDrawCount = 0;    //手势绘制次数
     this.DisableMouse=false;    //禁止鼠标事件
@@ -7306,7 +7343,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.EnableVerticalDrag=false;
 
     //十字光标长留(手势才有)
-    this.ClickModel={ IsShowCorssCursor:false };
+    this.ClickModel={ IsShowCorssCursor:false, PreventHide:false }; //PreventHide 阻止隐藏十字光标
     this.EnableClickModel=false;
 
     //标题栏显示最新数据
@@ -7337,6 +7374,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         //SecondKeyID 1=shiftKey 2=ctrlKey 3=altKey
     this.AryHotKey=[];  //热键 { KeyID:87, SecondKeyID:1, CMD:JSCHART_MENU_ID.CMD_FULLSCREEN_SUMMARY_ID, Args:null, Description:"Alt+W	全屏区间统计" },
 
+    this.FastSlideConfig={ MinDistance:500, MinSpeed:3, MaxTime:250, Enable:false };       //快速滑动配置 MinDistance=最小的距离 MinSpeed=最小速度 MaxTime=最大间隔时间(ms)
+
     this.RestoreFocus=function(delay)
     {
         var value=1000;
@@ -7929,11 +7968,23 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         var button=this.ChartCorssCursor.PtInButton(x,y);
         if (!button) return false;
 
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_CROSSCURSOR_RIGHT);
-        if (event && event.Callback)
+        if (button.Type==1)
         {
-            var sendData={ Button:button, e };
-            event.Callback(event,sendData,this);
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_CROSSCURSOR_RIGHT);
+            if (event && event.Callback)
+            {
+                var sendData={ Button:button, e };
+                event.Callback(event,sendData,this);
+            }
+        }
+        else if (button.Type==2)
+        {
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_CROSSCURSOR_BOTTOM);
+            if (event && event.Callback)
+            {
+                var sendData={ Button:button, e };
+                event.Callback(event,sendData,this);
+            }
         }
 
         return true;
@@ -9443,6 +9494,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             return true;
         }
 
+        if (this.TryClickCrossCursor(x,y))
+        {
+            return true;
+        }
+
         return false;
     }
 
@@ -9454,6 +9510,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.IsOnTouch=true;
         this.TouchDrawCount=0;
         this.PhonePinch=null;
+        this.TouchDrag=null;
+        if (this.ClickModel) this.ClickModel.PreventHide=false;
         this.StopDragTimer();
 
         var isSingleTouch=this.IsSingleTouch(e);
@@ -9468,7 +9526,8 @@ 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.TryPhoneClickButton(pt.X, pt.Y, e)) return;
+            if (this.TryPhoneClickButton(pt.X, pt.Y, e)) 
+                return;
 
             if (this.EnableVerticalDrag )
             {
@@ -9499,11 +9558,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
             if (this.EnableClickModel && this.ClickModel.IsShowCorssCursor==true) bStartTimer=false;
 
-            var drag=
-            {
-                "Click":{},
-                "LastMove":{}  //最后移动的位置
-            };
+            var drag= { Click:{}, LastMove:{}, StartTime:Date.now() }; //LastMove 最后移动的位置 
+            var touchDrag={ Click:{}, LastMove:{}, StartTime:Date.now() };
 
             //var touches=this.GetToucheData(e,this.IsForceLandscape);
 
@@ -9511,8 +9567,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             drag.Click.Y=touches[0].clientY;
             drag.LastMove.X=touches[0].clientX;
             drag.LastMove.Y=touches[0].clientY;
-
             this.MouseDrag=drag;
+
+            touchDrag.Click.X=touches[0].clientX;
+            touchDrag.Click.Y=touches[0].clientY;
+            touchDrag.LastMove.X=touches[0].clientX;
+            touchDrag.LastMove.Y=touches[0].clientY;
+            this.TouchDrag=touchDrag;
+
             var drawPictureActive=this.GetActiveDrawPicture();  //上一次选中的
             var selectedChart={ Chart:this.SelectedChart.Selected.Chart, Identify:this.SelectedChart.Selected.Identify };   //上一次选中的图形
             this.PhoneTouchInfo={ Start:{X:touches[0].clientX, Y:touches[0].clientY }, End:{ X:touches[0].clientX, Y:touches[0].clientY } };
@@ -9634,11 +9696,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (this.IsPhonePinching(e))
         {
-            var phonePinch=
-            {
-                "Start":{},
-                "Last":{}
-            };
+            var phonePinch={ Start:{}, Last:{}, StartTime:Date.now() };
 
             var touches=this.GetToucheData(e,this.IsForceLandscape);
 
@@ -9773,6 +9831,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.PhoneTouchInfo.End.X=touches[0].clientX;
                 this.PhoneTouchInfo.End.Y=touches[0].clientY;
             }
+
+            if (this.TouchDrag)
+            {
+                var touchDrag=this.TouchDrag;
+                touchDrag.LastMove.X=touches[0].clientX;
+                touchDrag.LastMove.Y=touches[0].clientY;
+            }
         }
         else if (this.IsPhonePinching(e))
         {
@@ -9839,6 +9904,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         JSConsole.Chart.Log('[KLineChartContainer:OnTouchEnd]',e);
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
+        this.FastSlideEvent();
+
         var bClearDrawPicture=true;
         if (this.CurrentChartDrawPicture)
         {
@@ -9877,6 +9944,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.OnTouchFinished();
         this.TouchDrawCount=0;
         this.PhonePinch=null;
+        this.TouchDrag=null;
     }
 
     this.OnTouchDBClick=function(points)
@@ -10831,6 +10899,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             {
                 if (this.TouchStatus.CorssCursorShow==true) this.ChartCorssCursor.Draw();
             }
+            else if (this.EnableClickModel)
+            {
+                if (this.ClickModel.IsShowCorssCursor===true) this.ChartCorssCursor.Draw();
+            }
             else if (this.IsOnTouch===false && this.CurrentChartDrawPicture && this.CurrentChartDrawPicture.IsShowCorssCursor===true)    //开始绘图
             {
                 this.ChartCorssCursor.Draw();
@@ -15690,6 +15762,43 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         return true;
     }
+
+    //快速滑动
+    this.FastSlideEvent=function()
+    {
+        if (!this.TouchDrag) return false;
+        if (!this.FastSlideConfig) return false;
+        var config=this.FastSlideConfig;
+        if (!config.Enable) return false;
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_TOUCH_FAST_SLIDE);
+        if (!event || !event.Callback) return false;
+
+        
+        var drag=this.TouchDrag;
+        var time=Date.now();
+        var spanTime=time-drag.StartTime;
+        if (spanTime>config.MaxTime) return false;
+
+        if (!drag.Click || !drag.LastMove) return false;
+
+        var xStart=drag.Click.X;
+        var xEnd=drag.LastMove.X;
+
+        if (!IFrameSplitOperator.IsNumber(xStart) || !IFrameSplitOperator.IsNumber(xEnd)) return false;
+
+        var distance=xEnd-xStart;
+        var speed=Math.abs(distance)/spanTime;
+        JSConsole.Chart.Log(`[JSChartContainer:FastSlideEvent] speed=${speed}, distance=${distance}, spanTime=${spanTime}`);
+
+        if (Math.abs(distance)<config.MinDistance) return false;
+        if (speed<config.MinSpeed) return false;
+
+        var sendData={ Speed:speed, Distance:distance, IsLeft:distance<0?true:false }
+        event.Callback(event, sendData, this);
+
+        return true;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -44248,7 +44357,7 @@ function ChartMinuteBuySellBar()
     this.BuyColor=g_JSChartResource.Minute.BuySellBar.BuyColor;
     this.SellColor=g_JSChartResource.Minute.BuySellBar.SellColor;
     this.BarWidth=g_JSChartResource.Minute.BuySellBar.BarWidth;
-    this.MaxBarWidth=g_JSChartResource.Minute.BuySellBar.MaxBarWidth;
+    this.AryBarRange=g_JSChartResource.Minute.BuySellBar.AryBarRange;
     this.YOffset=g_JSChartResource.Minute.BuySellBar.YOffset;
     this.Font=g_JSChartResource.Minute.BuySellBar.Font;
     this.TextColor=g_JSChartResource.Minute.BuySellBar.TextColor;
@@ -44263,7 +44372,7 @@ function ChartMinuteBuySellBar()
         this.BuyColor=g_JSChartResource.Minute.BuySellBar.BuyColor;
         this.SellColor=g_JSChartResource.Minute.BuySellBar.SellColor;
         this.BarWidth=g_JSChartResource.Minute.BuySellBar.BarWidth;
-        this.MaxBarWidth=g_JSChartResource.Minute.BuySellBar.MaxBarWidth;
+        this.AryBarRange=g_JSChartResource.Minute.BuySellBar.AryBarRange;
         this.YOffset=g_JSChartResource.Minute.BuySellBar.YOffset;
         this.Font=g_JSChartResource.Minute.BuySellBar.Font;
         this.TextColor=g_JSChartResource.Minute.BuySellBar.TextColor;
@@ -44279,11 +44388,29 @@ function ChartMinuteBuySellBar()
         var volRange=this.GetVolRange();
         if (!volRange) return;
 
+        var minData=this.HQChart.GetKData();
+        if (!minData || !IFrameSplitOperator.IsNonEmptyArray(minData.Data)) return;
+
         var bHScreen=(this.ChartFrame.IsHScreen===true);
         var xPointCount=this.ChartFrame.XPointCount;
+        var minuteCount=this.ChartFrame.MinuteCount;
+        var minIndex=(minData.Data.length-1)%minuteCount;
+
+        var startIndex=xPointCount-1-120;
+        var endIndex=xPointCount-1;
+        for(var i=0;i<this.AryBarRange.length;++i)
+        {
+            var item=this.AryBarRange[i];
+            if (minIndex<(minuteCount-1-item.End))
+            {
+                startIndex=xPointCount-1-item.Start;
+                endIndex=xPointCount-1-item.End;
+                break;
+            }
+        }
 
-        var xStart=this.ChartFrame.GetXFromIndex(xPointCount-this.MaxBarWidth);
-        var xEnd=this.ChartFrame.GetXFromIndex(xPointCount-1);
+        var xStart=this.ChartFrame.GetXFromIndex(startIndex);
+        var xEnd=this.ChartFrame.GetXFromIndex(endIndex);
 
         function _Temp_GetXFromData(value)
         {
@@ -59879,6 +60006,12 @@ function ChartCorssCursor()
         Icon:g_JSChartResource.CorssCursor.RightButton.Icon
     };
 
+    //底部按钮
+    this.BottomButton=
+    {
+        Enable:false, Rect:null, 
+    }
+
     this.RightMargin=CloneData(g_JSChartResource.CorssCursor.RightMargin);
     this.BottomConfig=CloneData(g_JSChartResource.CorssCursor.BottomText);     //底部输出配置
     this.LeftConfig=CloneData(g_JSChartResource.CorssCursor.LeftText);
@@ -60082,6 +60215,7 @@ function ChartCorssCursor()
     {
         this.Status=0;
         this.RightButton.Rect=null;
+        this.BottomButton.Rect=null;
         this.LastValue=null;
 
         if (!this.LastPoint) return;
@@ -60487,6 +60621,11 @@ function ChartCorssCursor()
                 this.Canvas.textBaseline="bottom";
                 this.Canvas.fillStyle=this.TextColor;
                 this.Canvas.fillText(text,rtBG.Left+textOffset.X,rtBG.Bottom+textOffset.Y,textWidth);
+
+                var buttonData={X:x, Y:y, XValue:xValue, FrameID:yValueExtend.FrameID };
+                if (this.StringFormatX.KItem) buttonData.KItem=this.StringFormatX.KItem;
+                this.BottomButton.Rect=rtBG;
+                this.BottomButton.Data=buttonData;
             }
         }
 
@@ -60706,17 +60845,42 @@ function ChartCorssCursor()
     }
 
     this.PtInButton=function(x,y)
+    {
+        var item=this.PtInRightButton(x,y);
+        if (item) return item;
+
+        item=this.PtInButtomButton(x,y);
+        if (item) return item;
+
+        return null;
+    }
+
+    this.PtInRightButton=function(x,y)
     {
         if (!this.RightButton.Enable) return null;
         if (!this.RightButton.Rect) return null;
 
         var rect=this.RightButton.Rect;
-        this.Canvas.beginPath();
-        this.Canvas.rect(rect.Left,rect.Top,rect.Width,rect.Height);
-        if (this.Canvas.isPointInPath(x,y))
+        if (x>=rect.Left && x<=rect.Right && y>=rect.Top && y<=rect.Bottom)
         {
-            return { Data:this.RightButton.Data, Rect:rect };
+            return { Data:this.RightButton.Data, Rect:rect, Type:1 };   //Type:1=右侧  2=底部
         }
+
+        return null;
+    }
+    
+    this.PtInButtomButton=function(x,y)
+    {
+        if (!this.BottomButton.Enable) return null;
+        if (!this.BottomButton.Rect) return null;
+
+        var rect=this.BottomButton.Rect;
+        if (x>=rect.Left && x<=rect.Right && y>=rect.Top && y<=rect.Bottom)
+        {
+            return { Data:this.BottomButton.Data, Rect:rect , Type:2 }; //Type:1=右侧  2=底部
+        }
+
+        return null;
     }
 
     this.DrawTextBGRect=function(x,y, height, width)
@@ -61764,9 +61928,11 @@ function HQDateStringFormat()
 
     this.DateFormatType=0;  //0=YYYY-MM-DD 1=YYYY/MM/DD  2=YYYY/MM/DD/W 3=DD/MM/YYYY
     this.LanguageID=0;
+    this.KItem=null;        //缓存当前的K线
 
     this.Operator=function()
     {
+        this.KItem=null;
         if (!IFrameSplitOperator.IsNumber(this.Value)) return false;
         if (!this.Data) return false;
 
@@ -61774,6 +61940,7 @@ function HQDateStringFormat()
         index=parseInt(index.toFixed(0));
         if (this.Data.DataOffset+index>=this.Data.Data.length) return false;
         var currentData = this.Data.Data[this.Data.DataOffset+index];
+        this.KItem=currentData;
         var dateFormatString="YYYY-MM-DD";
         if (this.DateFormatType==1) dateFormatString="YYYY/MM/DD";
         else if (this.DateFormatType==2) dateFormatString="YYYY/MM/DD/W";
@@ -77953,6 +78120,8 @@ function JSChartResource()
         YOffset:1,
         Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
         TextColor:"rgb(128,128,128)",
+
+        AryBarRange:[{ Start:240, End:120 }, { Start:120, End:0}],
     }
 
     this.DefaultTextColor="rgb(43,54,69)";                          //图形中默认的字体颜色
@@ -79503,7 +79672,7 @@ function JSChartResource()
                 if (item.Font) dest.Font=item.Font;
                 if (item.TextColor) dest.TextColor=item.TextColor;
                 if (IFrameSplitOperator.IsNumber(item.BarWidth)) dest.BarWidth=item.BarWidth;
-                if (IFrameSplitOperator.IsNumber(item.MaxBarWidth)) dest.MaxBarWidth=item.MaxBarWidth;
+                if (IFrameSplitOperator.IsNonEmptyArray(item.AryBarRange)) dest.AryBarRange=item.AryBarRange;
                 if (IFrameSplitOperator.IsNumber(item.YOffset)) dest.YOffset=item.YOffset;
             }
         }
@@ -82716,33 +82885,179 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 return;
             }
 
+            return this.ChartOperator_Temp_SetChartCorssCursor(findIndex, item);
+        }
+        else if (id==JSCHART_OPERATOR_ID.OP_MOVE_CORSSCURSOR) //移动十字光标 { Step, Start:{ Date, Time }}
+        {
+            if (!IFrameSplitOperator.IsNumber(obj.Step)) return false;
+            if (obj.Step==0) return false;
+            var step=obj.Step;
+
             if (!this.Frame || !this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return false;
-            var frame=this.Frame.SubFrame[0].Frame;
+            var showCount=this.Frame.SubFrame[0].Frame.XPointCount; //一屏显示个数
 
-            var x=frame.GetXFromIndex(findIndex);
-            var y=frame.GetYFromData(item.Close);
+            var kData=this.GetKData();
+            if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;  //数据还没有到达
 
-            //保存最后一次鼠标移动信息
-            var MoveStatus={ X:x, Y:y, IsInClient: this.IsMouseOnClient(x,y) };
-            this.LastMouseStatus.OnMouseMove=MoveStatus;
-            this.LastMouseStatus.MoveOnPoint={X:x, Y:y};    //鼠标移动的位置
+            var start=kData.DataOffset;
+            var bDayPeriod=ChartData.IsDayPeriod(this.Period,true);
+            var findItem=null, dataIndex=-1;
+            for(var i=0; i<kData.Data.length; ++i)
+            {
+                var item=kData.Data[i];
+                if (!item) continue;
 
-            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOUSE_MOVE);
-            var titleChart=this.TitlePaint[0];
-            if (event && titleChart) titleChart.OnMouseMoveEvent=event;
+                if (bDayPeriod)
+                {
+                    if (item.Date==obj.Start.Date)
+                    {
+                        findItem=item;
+                        dataIndex=i;
+                        break;
+                    }
+                }
+                else
+                {
+                    if (item.Date==obj.Start.Date && item.Time==obj.Start.Time)
+                    {
+                        findItem=item;
+                        dataIndex=i;
+                        break;
+                    }
+                }
+            }
 
-            var pixelTatio = GetDevicePixelRatio(); 
+            if (!findItem) return false;
 
-            var e={};
-            e.clientX=(x/pixelTatio)+this.UIElement.getBoundingClientRect().left;
-            e.clientY=(y/pixelTatio)+this.UIElement.getBoundingClientRect().top;
-            this.MoveOnPoint={X:x, Y:y};
-            this.OnMouseMove(x,y,e);
-            this.LastMouseStatus.MoveOnPoint=null;
-            if (titleChart) titleChart.OnMouseMoveEvent=null;
+            var index=-1;
+            var dataOffset=kData.DataOffset;
+            if (dataIndex>=start && dataIndex<=start+(showCount-1))
+            {
+                index=dataIndex-start;
+            }
+            else    //需要调整当前屏范围
+            {
+                if (step>0) 
+                {
+                    if (dataIndex+showCount>=kData.Data.length)
+                    {
+                        dataOffset=kData.Data.length-showCount;
+                        index=dataIndex-dataOffset;
+                    }
+                    else
+                    {
+                        index=0;
+                        dataOffset=dataIndex;
+                    }
+                }
+                else 
+                {
+                    if (dataIndex-showCount<0)
+                    {
+                        dataOffset=0;
+                        index=dataIndex;
+                    }
+                    else if (dataIndex+showCount>=kData.Data.length)
+                    {
+                        dataOffset=kData.Data.length-showCount;
+                        index=dataIndex-dataOffset;
+                    }
+                    else
+                    {
+                        index=showCount;
+                        dataOffset=dataIndex-showCount;
+                    }
+                }
+            }
+
+            var kItem=findItem;
+            if (step>0)
+            {
+                for(var i=dataIndex+1, j=0; i<kData.Data.length && j<step; ++i, ++j)
+                {
+                    ++index;
+                    dataIndex=i;
+                    if (index>=(showCount-1))
+                    {
+                        index=showCount-1;
+                        dataOffset+=1;
+                    }
+
+                    var item=kData.Data[i];
+                    if (!item) continue;
+
+                    var kItem=item;
+                }
+            }
+            else if (step<0)
+            {
+                for(var i=dataIndex-1, j=0;i>=0 && j<Math.abs(step);--i, ++j)
+                {
+                    --index
+                    dataIndex=i;
+                    if (index<=0)
+                    {
+                        index=0;
+                        dataOffset-=1;
+                    }
+
+                    var item=kData.Data[i];
+                    if (!item) continue;
+                    var kItem=item;
+                }
+            }
+
+            if (!kItem) return false;
+
+            obj.KItem=kItem;
+            if (kData.DataOffset==dataOffset)
+            {
+                return this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+            }
+            else
+            {
+                kData.DataOffset=dataOffset
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.ResetFrameXSplit();
+                this.Frame.SetSizeChage(true);
+                this.Draw();
+                this.ChartOperator_Temp_SetChartCorssCursor(index, kItem);
+                return true;
+            }
         }
     }
 
+    
+    this.ChartOperator_Temp_SetChartCorssCursor=function(index, kItem)
+    {
+        if (!this.Frame || !this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return false;
+        var frame=this.Frame.SubFrame[0].Frame;
+
+        var x=frame.GetXFromIndex(index);
+        var y=frame.GetYFromData(kItem.Close);
+
+        //保存最后一次鼠标移动信息
+        var MoveStatus={ X:x, Y:y, IsInClient: this.IsMouseOnClient(x,y) };
+        this.LastMouseStatus.OnMouseMove=MoveStatus;
+        this.LastMouseStatus.MoveOnPoint={X:x, Y:y};    //鼠标移动的位置
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MOUSE_MOVE);
+        var titleChart=this.TitlePaint[0];
+        if (event && titleChart) titleChart.OnMouseMoveEvent=event;
+
+        var pixelTatio = GetDevicePixelRatio(); 
+        var e={ };
+        e.clientX=(x/pixelTatio)+this.UIElement.getBoundingClientRect().left;
+        e.clientY=(y/pixelTatio)+this.UIElement.getBoundingClientRect().top;
+        this.MoveOnPoint={X:x, Y:y};
+        this.OnMouseMove(x,y,e);
+        this.LastMouseStatus.MoveOnPoint=null;
+        if (titleChart) titleChart.OnMouseMoveEvent=null;
+
+        return true;
+    }
+
     //内部函数
     this.ChartOperator_Temp_GetHistoryData=function()
     {
@@ -86926,7 +87241,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     {
         if (this.DragMode==JSCHART_DRAG_ID.CLICK_TOUCH_MODE_ID)
         {
-            if (this.TouchStatus.CorssCursorShow==true && this.TouchDrawCount>0) return;
+            if (this.ClickModel.IsShowCorssCursor==true && this.ClickModel.PreventHide) return;
+            if (this.ClickModel.IsShowCorssCursor==true && this.TouchDrawCount>0 ) return;
 
             this.TouchStatus.CorssCursorShow=false;
             this.DrawDynamicInfo();
@@ -86935,7 +87251,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         if (this.EnableClickModel===true)
         {
-            if (this.ClickModel.IsShowCorssCursor==true && this.TouchDrawCount>0) return;
+            if (this.ClickModel.IsShowCorssCursor==true && this.ClickModel.PreventHide) return; //阻止隐藏
+            if (this.ClickModel.IsShowCorssCursor==true && this.TouchDrawCount>0 ) return;
 
             this.ClickModel.IsShowCorssCursor=false;
             this.DrawDynamicInfo();
@@ -91736,13 +92053,16 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.IsOnTouch=true;
         this.TouchDrawCount=0;
         this.PhonePinch=null;
+        this.TouchDrag=null;
+        if (this.ClickModel) this.ClickModel.PreventHide=false;
         this.StopDragTimer();
 
         if (this.EnableScrollUpDown==false) e.preventDefault();  //上下拖动图形不能阻止事件
 
         if (this.IsPhoneDragging(e))
         {
-            var drag= { Click:{}, LastMove:{} };//LastMove=最后移动的位置
+            var drag= { Click:{}, LastMove:{}, StartTime:Date.now() };//LastMove=最后移动的位置  StartTime=开始时间
+            var touchDrag={ Click:{}, LastMove:{}, StartTime:Date.now() };
             var touches=this.GetToucheData(e,this.IsForceLandscape);
             var pt=this.PointAbsoluteToRelative(touches[0].clientX, touches[0].clientY, true);
 
@@ -91768,6 +92088,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             drag.Click.Y=touches[0].clientY;
             drag.LastMove.X=touches[0].clientX;
             drag.LastMove.Y=touches[0].clientY;
+
+            touchDrag.Click.X=touches[0].clientX;
+            touchDrag.Click.Y=touches[0].clientY;
+            touchDrag.LastMove.X=touches[0].clientX;
+            touchDrag.LastMove.Y=touches[0].clientY;
+
             var self=this;
 
             var T_ShowCorssCursor=function() //临时函数(Temp_) T_开头
@@ -91848,6 +92174,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 }
     
                 this.MouseDrag=drag;
+                this.TouchDrag=touchDrag;
                 this.PhoneTouchInfo={ Start:{X:touches[0].clientX, Y:touches[0].clientY }, End:{ X:touches[0].clientX, Y:touches[0].clientY } };
                 this.SelectChartDrawPicture=null;
 
@@ -91894,11 +92221,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
         else if (this.IsPhonePinching(e))
         {
-            var phonePinch=
-            {
-                "Start":{},
-                "Last":{}
-            };
+            var phonePinch= { Start:{}, Last:{}, StartTime:Date.now() };
 
             var touches=this.GetToucheData(e,this.IsForceLandscape);
 
@@ -91990,6 +92313,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 this.PhoneTouchInfo.End.X=touches[0].clientX;
                 this.PhoneTouchInfo.End.Y=touches[0].clientY;
             }
+
+            if (this.TouchDrag)
+            {
+                var touchDrag=this.TouchDrag;
+                touchDrag.LastMove.X=touches[0].clientX;
+                touchDrag.LastMove.Y=touches[0].clientY;
+            }
         }
         else if (this.IsPhonePinching(e))
         {
@@ -92047,6 +92377,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         JSConsole.Chart.Log('[MinuteChartContainer::OnTouchEnd]',e);
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
+        this.FastSlideEvent();
+
         var bClearDrawPicture=true;
         if (this.CurrentChartDrawPicture)
         {
@@ -92082,9 +92414,10 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.TouchEvent({ EventID:JSCHART_EVENT_ID.ON_PHONE_TOUCH, FunctionName:"OnTouchEnd"}, e);
         this.OnTouchFinished();
         this.TouchDrawCount=0;
+        this.TouchDrag=null;
     }
 
-    
+
     //键盘左右移动十字光标
     this.OnKeyDown=function(e)
     {
@@ -93190,6 +93523,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         buySellBar.Name="Minute-BuySell-Bar";
         buySellBar.Identify="Minute-BuySell-Bar";
         buySellBar.BuySellData=this.BuySellData;
+        buySellBar.HQChart=this;
         this.ChartPaint[3]=buySellBar;
         
 
@@ -95790,6 +96124,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     {
         if (this.EnableClickModel===true)
         {
+            if (this.ClickModel.IsShowCorssCursor==true && this.ClickModel.PreventHide) return; //阻止隐藏
             if (this.ClickModel.IsShowCorssCursor==true && this.TouchDrawCount>0) return;
 
             this.ClickModel.IsShowCorssCursor=false;
@@ -98012,7 +98347,7 @@ function KLineChartHScreenContainer(uielement)
 
             if (this.VerticalDrag) bStartTimer=false;
 
-            var drag= {  Click:{}, LastMove:{}  }; //LastMove=最后移动的位置
+            var drag= {  Click:{}, LastMove:{}, StartTime:Date.now()  }; //LastMove=最后移动的位置
            
 
             //var touches=this.GetToucheData(e,false);
@@ -98109,11 +98444,7 @@ function KLineChartHScreenContainer(uielement)
         }
         else if (this.IsPhonePinching(e))
         {
-            var phonePinch=
-            {
-                "Start":{},
-                "Last":{}
-            };
+            var phonePinch={ Start:{}, Last:{}, StartTime:Date.now() };
 
             var touches=this.GetToucheData(e,false);
 
@@ -158346,7 +158677,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14690";
+var HQCHART_VERSION="1.1.14704";
 
 function PrintHQChartVersion()
 {