hqchart 1.1.12798 → 1.1.12809

package/src/jscommon/umychart.js

@@ -2151,12 +2151,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         }
     }
 
-    this.EnableSplashScreen=function(option)
+    this.EnableSplashScreen=function(enable, option)
     {
         if(this.JSChartContainer && typeof(this.JSChartContainer.EnableSplashScreen)=='function')
         {
             JSConsole.Chart.Log('[JSChart:EnableSplashScreen] ');
-            this.JSChartContainer.EnableSplashScreen(option);
+            this.JSChartContainer.EnableSplashScreen(enable, option);
         }
     }
 
@@ -2550,6 +2550,8 @@ var JSCHART_EVENT_ID=
     ON_CREATE_OVERLAY_FRAME:118,        //创建叠加框架回调
 
     ON_CREATE_CUSTOM_Y_COORDINATE:119,  //自定义Y轴刻度
+
+    ON_BEFORE_DRAW_SPLASH_SCREEN:120,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -3121,6 +3123,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.UIOnDblClick=function(e)
     {
+        if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return;
+
         var pixelTatio = GetDevicePixelRatio();
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
         var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
@@ -4996,7 +5000,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.Draw=function()
     {
-        
         if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
         if (this.UIElement.width<=0 || this.UIElement.height<=0) return; 
 
@@ -5017,6 +5020,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash)
         {
+            var data=this.InvokeBeforeDrawSplashScreenCallback();
+            if (data && data.PreventDefault===true) return;
+
             this.Frame.ClearCoordinateText();
             this.Frame.Draw( { IsEnableSplash:this.ChartSplashPaint.IsEnableSplash} );
             this.ChartSplashPaint.Draw();
@@ -5446,6 +5452,48 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         return status;
     }
+
+    this.InvokeBeforeDrawSplashScreenCallback=function()
+    {
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_BEFORE_DRAW_SPLASH_SCREEN);
+        if (!event || !event.Callback) return null;
+
+        var data={ PreventDefault:false };
+        event.Callback(event,data,this);
+
+        return data;
+    }
+
+    this.DrawSplashScreen=function(option)
+    {
+        var data=this.InvokeBeforeDrawSplashScreenCallback();
+        if (data && data.PreventDefault===true) return;
+
+        if (this.Frame.ScreenImageData==null && !this.CacheCanvas) return;
+
+        if (this.Frame.ScreenImageData)
+        {
+            this.Canvas.putImageData(this.Frame.ScreenImageData,0,0);
+        }
+        else if (this.CacheCanvas)
+        {
+            this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height)
+            this.Canvas.drawImage(this.CacheElement,0,0);
+        }
+
+        var bgColor=g_JSChartResource.SplashScreen.BGColor;
+        this.Canvas.fillStyle=bgColor;
+        this.Canvas.fillRect(0,0,this.UIElement.width,this.UIElement.height)
+
+        if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash)
+        {
+            var title=g_JSChartResource.SplashScreen.Title;
+            if (option && option.Title) title=option.Title;
+            this.ChartSplashPaint.SetTitle(title);
+            this.ChartSplashPaint.Draw();
+        }
+    }
+
     //画动态信息
     this.DrawDynamicInfo=function(option)
     {
@@ -6151,14 +6199,23 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var cursorIndex={ ZoomType:this.ZoomType ,IsLockRight:this.IsZoomLockRight };
                 cursorIndex.Index=parseInt(Math.abs(this.CursorIndex-0.5).toFixed(0));
                 if (!this.Frame.ZoomDown(cursorIndex, { ZoomDownloadDataCallback:(requestData)=>{ this.ZoomDownloadData(requestData) } })) break;
+                
                 this.CursorIndex=cursorIndex.Index;
                 this.UpdataDataoffset();
                 this.UpdatePointByCursorIndex();
                 this.UpdateFrameMaxMin();
                 this.ResetFrameXSplit();
-                this.Draw();
+                if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true)
+                {
+                    
+                }
+                else
+                {
+                    this.Draw();
+                }
                 this.ShowTooltipByKeyDown();
                 this.OnKLinePageChange("keydown");
+                
                 break;
             case 46:    //del
                 if (this.SelectChartDrawPicture)
@@ -7983,16 +8040,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     }
 
     //全屏提示信息 { Title:提示信息, Draw:false/true 是否立即重绘, }
-    this.EnableSplashScreen=function(option)
+    this.EnableSplashScreen=function(enable, option)
     {
         if (!this.ChartSplashPaint) return;
-        if (!option) return;
 
-        if (IFrameSplitOperator.IsString(option.Title)) this.ChartSplashPaint.SetTitle(option.Title);
-        this.ChartSplashPaint.EnableSplash(true);
+        this.ChartSplashPaint.EnableSplash(enable);
 
-        if (option.Draw===false) return;
-        this.Draw();
+        if (option && option.Draw===false) return;
+
+        if (enable) this.DrawSplashScreen(option);
+        else this.Draw();
     }
 
     //设置指标窗口属性 windowItem=SetOption.Windows[i], frameItem=SetOption.Frames[i];
@@ -17741,6 +17798,18 @@ function HQTradeFrame()
         return result;
     }
 
+    this.GetXShowCount=function()
+    {
+        var xPointcount=-1;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.SubFrame)) return xPointcount;
+
+        var subFrame=this.SubFrame[0];
+        if (!subFrame.Frame) return xPointcount;
+
+        xPointcount=subFrame.Frame.XPointCount;
+        return xPointcount;
+    }
+
     this.XCoordinateZoom=function(step, isMoveLeft)
     {
         var result=this.SubFrame[0].Frame.XCoordinateZoom(step, isMoveLeft);
@@ -61992,6 +62061,12 @@ function JSChartResource()
     this.EmptyBarBGColor="rgb(255,255,255)";  //空心柱子背景色
     this.HighLowBarColor='rgb(41,98,255)';  //high low bar 颜色
 
+    this.SplashScreen=
+    {
+        BGColor:"rgba(112,128,144,0.5)",
+        Title:"下载数据中......"
+    }
+
     this.HLCArea=
     {
         HighLineColor:'rgb(242,54,69)',
@@ -63065,6 +63140,13 @@ function JSChartResource()
         if (style.EmptyBarBGColor) this.EmptyBarBGColor=style.EmptyBarBGColor;
         if (style.HighLowBarColor) this.HighLowBarColor=style.HighLowBarColor;
 
+        if (style.SplashScreen)
+        {
+            var item=style.SplashScreen;
+            if (item.BGColor) this.SplashScreen.BGColor=item.BGColor;
+            if (item.Title) this.SplashScreen.Title=item.Title;
+        }
+
         if (style.HLCArea)
         {
             var item=style.HLCArea;
@@ -66244,7 +66326,14 @@ function KLineChartContainer(uielement,OffscreenElement)
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
                     this.ResetFrameXSplit();
-                    this.Draw();
+                    if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true)
+                    {
+
+                    }
+                    else
+                    {
+                        this.Draw();
+                    }
                     this.OnKLinePageChange("wheel");
                 }
             }
@@ -71599,6 +71688,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         {
             download.IsEnd=true; 
             JSConsole.Chart.Log(`[KLineChartContainer.RecvPreviousMinuteData] ${this.Symbol} data end. FuncName=${option.FuncName}`);
+            this.Draw();
             return;
         }
 
@@ -71639,6 +71729,12 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (!this.IsApiPeriod)
         {
+            if (bindData.Right>0 && this.RightFormula>=1)   //复权
+            {
+                var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula } );
+                bindData.Data=rightData;
+            }
+
             if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据 (0= 日线,4=1分钟线 不需要处理)
             {
                 var periodData=bindData.GetPeriodData(bindData.Period);
@@ -71656,12 +71752,20 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         //绑定数据
         this.UpdateMainData(bindData,lastDataCount);
-        if (option && option.ZoomData)  //缩放需要调整当前屏的位置
+        if (option)  //缩放需要调整当前屏的位置
         {
-            var zoomData=option.ZoomData;
-            var showCount=zoomData.PageSize-zoomData.RightSpaceCount;   //一屏显示的数据个数
-            bindData.DataOffset= bindData.Data.length-showCount;
-            if (bindData.DataOffset<0) bindData.DataOffset=0;
+            if (option.ZoomData)
+            {
+                var zoomData=option.ZoomData;
+                var showCount=zoomData.PageSize-zoomData.RightSpaceCount;   //一屏显示的数据个数
+                bindData.DataOffset= bindData.Data.length-showCount;
+                if (bindData.DataOffset<0) bindData.DataOffset=0;
+            }
+            else if (IFrameSplitOperator.IsNumber(option.DataOffset))
+            {
+                bindData.DataOffset+=option.DataOffset;
+                if (bindData.DataOffset<0) bindData.DataOffset=0;
+            }
         }
 
         this.UpdateOverlayDragMinuteData(data);
@@ -71684,7 +71788,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.BindAllOverlayIndexData(bindData);
     }
 
-    this.RequestZoomMinuteData=function()
+    this.RequestZoomMinuteData=function(requestData)
     {
         var zoomData={ PageSize:requestData.PageSize, DataCount:requestData.DataCount, RightSpaceCount:requestData.RightSpaceCount };
 
@@ -71693,9 +71797,10 @@ function KLineChartContainer(uielement,OffscreenElement)
             FuncName:'KLineChartContainer::RequestZoomMinuteData',
             FuncExplain:"缩放分钟|秒K线数据下载",
             RecvFuncName:"RecvZoomMinuteData",
-            Download:this.DragDownload.Minute,
+            Download:this.ZoomDownload.Minute,
             Url:this.ZoomMinuteKLineApiUrl,
             Count:this.MaxRequestMinuteDayCount,
+            XShowCount:this.Frame.GetXShowCount(),
             ZoomData:zoomData
         };
 
@@ -71711,7 +71816,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             RecvFuncName:"RecvDragMinuteData",
             Download:this.DragDownload.Minute,
             Url:this.DragMinuteKLineApiUrl,
-            Count:this.MaxRequestMinuteDayCount
+            Count:this.MaxRequestMinuteDayCount,
+            XShowCount:this.Frame.GetXShowCount(),
         };
 
         this.RequestPreviousMinuteData(option);