hqchart 1.1.14688 → 1.1.14696

package/src/jscommon/umychart.js

@@ -2596,7 +2596,7 @@ var JSCHART_EVENT_ID=
     ON_RCLICK_REPORT_HEADER:52,             //右键点击表头
     ON_REPORT_LOCAL_SORT:53,                //报价列表本地排序
     ON_DRAW_REPORT_NAME_COLOR:54,           //报价列表股票名称列颜色
-    ON_DRAW_CUSTOM_TEXT:55,                 //报价列表自定义列
+    ON_DRAW_CUSTOM_TEXT:55,                 //报价列表自定义列（废弃)
     ON_CLICK_REPORT_TAB:56,                 //报价列表标签点击
     ON_CLICK_REPORT_TABMENU:57,             //报价列表标签菜单点击
     ON_DRAW_REPORT_FIXEDROW_TEXT:58,        //报价列表固定行绘制
@@ -2738,6 +2738,8 @@ var JSCHART_EVENT_ID=
     ON_DBCLICK_DEAL_ROW:167,
 
     ON_FORMAT_OVERLAY_INDEX_OUT_TEXT:168,       //格式化叠指标标题
+
+    ON_TOUCH_FAST_SLIDE:169                    //快速滑动
 }
 
 var JSCHART_OPERATOR_ID=
@@ -3111,6 +3113,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;    //禁止鼠标事件
@@ -3197,6 +3200,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 };       //快速滑动配置 MinDistance=最小的距离 MinSpeed=最小速度 MaxTime=最大间隔时间(ms)
+
     this.RestoreFocus=function(delay)
     {
         var value=1000;
@@ -5314,6 +5319,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.IsOnTouch=true;
         this.TouchDrawCount=0;
         this.PhonePinch=null;
+        this.TouchDrag=null;
         this.StopDragTimer();
 
         var isSingleTouch=this.IsSingleTouch(e);
@@ -5359,11 +5365,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);
 
@@ -5371,8 +5374,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 } };
@@ -5494,11 +5503,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);
 
@@ -5633,6 +5638,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))
         {
@@ -5699,6 +5711,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)
         {
@@ -5737,6 +5751,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.OnTouchFinished();
         this.TouchDrawCount=0;
         this.PhonePinch=null;
+        this.TouchDrag=null;
     }
 
     this.OnTouchDBClick=function(points)
@@ -11550,6 +11565,41 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         return true;
     }
+
+    //快速滑动
+    this.FastSlideEvent=function()
+    {
+        if (!this.TouchDrag) return false;
+        if (!this.FastSlideConfig) return false;
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_TOUCH_FAST_SLIDE);
+        if (!event || !event.Callback) return false;
+
+        var config=this.FastSlideConfig;
+        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()
@@ -87596,13 +87646,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.IsOnTouch=true;
         this.TouchDrawCount=0;
         this.PhonePinch=null;
+        this.TouchDrag=null;
         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);
 
@@ -87628,6 +87680,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_开头
@@ -87708,6 +87766,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;
 
@@ -87754,11 +87813,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);
 
@@ -87850,6 +87905,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))
         {
@@ -87907,6 +87969,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)
         {
@@ -87942,9 +88006,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)
     {
@@ -93872,7 +93937,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);
@@ -93969,11 +94034,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);
 

package/src/jscommon/umychart.report.js

@@ -6521,10 +6521,12 @@ function ChartReport()
         else if (column.Type==REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID)
         {
             this.GetCustomNumberDrawInfo(data, column, drawInfo);
+            this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
         else if (column.Type==REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID)
         {
             this.GetCustomDateTimeDrawInfo(data, column, drawInfo);
+            this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
         else if (column.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID)
         {
@@ -6547,10 +6549,12 @@ function ChartReport()
         else if (column.Type==REPORT_COLUMN_ID.TIME_ID)
         {
             this.FormaTimeDrawInfo(column, stock, drawInfo, data);
+            this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
         else if (column.Type==REPORT_COLUMN_ID.DATE_ID)
         {
             this.FormaDateDrawInfo(column, stock, drawInfo, data);
+            this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
         else if (column.Type==REPORT_COLUMN_ID.CHECKBOX_ID)
         {
@@ -7010,12 +7014,6 @@ function ChartReport()
     this.GetCustomStringDrawInfo=function(data, column, drawInfo)
     {
         var value=this.GetExtendData(data, column);
-        if (column.IsDrawCallback)  //外部处理输出格式
-        {
-            this.GetCustomTextDrawInfo(column, data.Symbol, value, drawInfo, data);
-            return;
-        }
-
         if (!IFrameSplitOperator.IsString(value)) return;
         drawInfo.Text=value;
     }
@@ -7023,12 +7021,6 @@ function ChartReport()
     this.GetCustomNumberDrawInfo=function(data, column, drawInfo)
     {
         var value=this.GetExtendData(data, column);
-        if (column.IsDrawCallback)  //外部处理输出格式
-        {
-            this.GetCustomTextDrawInfo(column, data.Symbol, value, drawInfo, data);
-            return;
-        }
-
         if (!IFrameSplitOperator.IsNumber(value)) return;
 
         //格式化输出
@@ -7070,12 +7062,6 @@ function ChartReport()
         var value=this.GetExtendData(data, column);
         if (!IFrameSplitOperator.IsNumber(value)) return;
 
-        if (column.IsDrawCallback)  //外部处理输出格式
-        {
-            this.GetCustomTextDrawInfo(column, data.Symbol, value, drawInfo, data);
-            return;
-        }
-
         if (column.ValueType==0)
         {
             if (column.FormatType==1)
@@ -8211,42 +8197,9 @@ function ChartReport()
         }
     }
 
-    //外部配置显示格式 颜色 对齐方式
-    this.GetCustomTextDrawInfo=function(columnInfo, symbol, value, drawInfo, data)
-    {
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_CUSTOM_TEXT);
-        if (!event || !event.Callback) return false;
-
-        var sendData=
-        { 
-            Symbol:symbol, Column:columnInfo, Value:value, Data:data,
-            Out:{ Text:null, TextColor:null, TextAlign:null } 
-        };
-
-        event.Callback(event,sendData,this);
-
-        if (sendData.Out.Text) drawInfo.Text=sendData.Out.Text;
-        if (sendData.Out.TextColor) drawInfo.TextColor=sendData.Out.TextColor;
-        if (sendData.Out.TextAlign) drawInfo.TextAlign=sendData.Out.TextAlign;
-        if (sendData.Out.BGColor) drawInfo.BGColor=sendData.Out.BGColor;
-
-        return true;
-    }
-
     this.FormatDrawInfo=function(column, stock, drawInfo, data)
     {
-        if (!column.IsDrawCallback) return false;
-
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_FORMAT_DRAW_INFO);
-        if (!event || !event.Callback) return false;
-
-        var sendData=
-        {
-            Stock:stock, Column:column, Data:data,
-            DrawInfo:drawInfo
-        };
-
-        event.Callback(event,sendData,this);
+        this.FormatDrawInfoEvent(stock, data, column, drawInfo);
     }
 
     this.GetFixedRowTextDrawInfo=function(rowIndex, colIndex, columnInfo, drawInfo)

package/src/jscommon/umychart.testdata.js

@@ -262,7 +262,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
         */
 
-        //stockItem.minute.length=50;
+        stockItem.minute.length=50;
 
         var hqchartData={code:0, stock:[stockItem] };