hqchart 1.1.14811 → 1.1.14817

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -4499,6 +4499,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (option.DrawTool.StorageKey && chart.ChartDrawStorage) chart.ChartDrawStorage.Load(option.DrawTool.StorageKey);
         }
 
+        if (option.KeyboardMove)
+        {
+            var item=option.KeyboardMove;
+            if (IFrameSplitOperator.IsPlusNumber(item.Delay)) chart.KeyboardMove.Delay=item.Delay;
+        }
+
         if (IFrameSplitOperator.IsNumber(option.StepPixel)) chart.StepPixel=option.StepPixel;
         if (option.ZoomStepPixel>0) chart.ZoomStepPixel=option.ZoomStepPixel;
         if (option.IsApiPeriod==true) chart.IsApiPeriod=option.IsApiPeriod;
@@ -7276,7 +7282,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DisableMouse=false;    //禁止鼠标事件
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
     this.PressTime=500;
-    this.IsPress=false;         //是否长按
+    this.IsPress=false;             //是否长按
+    this.IsPressKeyboard=false;     //是否键盘按键
 
     this.NetworkFilter;         //网络请求回调 function(data, callback);
     this.LastMouseStatus={ MouseOnToolbar:null }; // MouseOnToolbar={ Rect:{}, Title: }
@@ -7360,6 +7367,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     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.KeyboardMove={ Timer:null, Delay:100 , Enable:false, Event:null };   //键盘左右移动
 
     this.RestoreFocus=function(delay)
     {
@@ -11529,6 +11537,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
         var keyID = e.keyCode ? e.keyCode :e.which;
+        this.IsPressKeyboard=true;
 
         //回调事件
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
@@ -11563,6 +11572,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         switch(keyID)
         {
             case 37: //left
+                if (this.KeyboardMove.Enable) break;
                 if ((e.ctrlKey||e.shiftKey) && this.OnCustomKeyDown)
                 {
                     if (this.OnCustomKeyDown(keyID, e))
@@ -11602,6 +11612,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 }
                 break;
             case 39: //right
+                if (this.KeyboardMove.Enable) break;
                 if ((e.ctrlKey|| e.shiftKey) && this.OnCustomKeyDown)
                 {
                     if (this.OnCustomKeyDown(keyID, e))
@@ -11736,11 +11747,167 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if (draw) this.DrawDynamicInfo();
 
+        if (keyID==37 || keyID==39)
+            this.StartKeyboardMoveTimer(e);
+
         //不让滚动条滚动
         if(e.preventDefault) e.preventDefault();
         else e.returnValue = false;
     }
 
+
+    this.ClearKeyboardMoveTimer=function()
+    {
+        if (!this.KeyboardMove) return;
+
+        this.KeyboardMove.Event=null;
+
+        if (this.KeyboardMove.Timer)
+        {
+            clearTimeout(this.KeyboardMove.Timer);
+            this.KeyboardMove.Timer=null;
+            JSConsole.Chart.Log(`[JSChartContainer::ClearKeyboardMoveTimer] Stop` );
+        }
+
+        this.KeyboardMove.Enable=false;
+    }
+
+    this.StartKeyboardMoveTimer=function(e)
+    {
+        if (!this.KeyboardMove) return;
+        if (this.KeyboardMove.Enable) return;   //已启动
+
+        this.KeyboardMove.Event=e;
+        this.KeyboardMove.Enable=true;
+
+        JSConsole.Chart.Log(`[JSChartContainer::StartKeyboardMoveTimer] Start` );
+
+        this.AutoKeyboardMove();
+    }
+
+    this.AutoKeyboardMove=function()
+    {
+        if (!this.KeyboardMove) return false;
+        if (!this.KeyboardMove.Enable) return false;
+        if (!this.KeyboardMove.Event) return false;
+
+        this.KeyboardMove.Timer=setTimeout(()=> 
+        { 
+            this.OnKeyboardMoveTimerProc(); 
+        },this.KeyboardMove.Delay);
+    }
+
+
+    this.OnKeyboardMoveTimerProc=function()
+    {
+        if (!this.KeyboardMove) return false;
+        if (!this.KeyboardMove.Enable) return false;
+        if (!this.KeyboardMove.Event) return false;
+
+        var e=this.KeyboardMove.Event;
+        var keyID = e.keyCode ? e.keyCode :e.which;
+        var bStop=false;
+        switch(keyID)
+        {
+            case 37: //left
+                if ((e.ctrlKey||e.shiftKey) && this.OnCustomKeyDown)
+                {
+                    if (this.OnCustomKeyDown(keyID, e))
+                        break;
+                }
+
+                //K线 如果超出K线数据了 调整到最后一个数据
+                if (this.FixCursorIndexValid && this.FixCursorIndexValid())
+                {
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                    break;
+                }
+               
+                if (this.CursorIndex<=0.99999)
+                {
+                    if (!this.DataMoveLeft()) 
+                    {   //左移数据到头了 触发下载新数据
+                        if (this.DragDownloadData) this.DragDownloadData();
+                        break;
+                    }
+                    this.UpdataDataoffset();
+                    this.UpdatePointByCursorIndex();
+                    this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
+                    this.Draw();
+                    this.ShowTooltipByKeyDown();
+                    this.OnKLinePageChange("keydown");
+                }
+                else
+                {
+                    --this.CursorIndex;
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                }
+                break;
+
+            case 39: //right
+                if ((e.ctrlKey|| e.shiftKey) && this.OnCustomKeyDown)
+                {
+                    if (this.OnCustomKeyDown(keyID, e))
+                        break;
+                }
+
+                //K线 如果超出K线数据了 调整到最后一个数据
+                if (this.FixCursorIndexValid && this.FixCursorIndexValid())
+                {
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                    break;
+                }
+
+                var xPointcount=0;
+                if (this.Frame.XPointCount) xPointcount=this.Frame.XPointCount;
+                else xPointcount=this.Frame.SubFrame[0].Frame.XPointCount;
+                if (this.CursorIndex+1>=xPointcount)
+                {
+                    if (!this.DataMoveRight()) break;
+                    this.UpdataDataoffset();
+                    this.UpdatePointByCursorIndex();
+                    this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
+                    this.Draw();
+                    this.ShowTooltipByKeyDown();
+                    this.OnKLinePageChange("keydown");
+                }
+                else
+                {
+                    //判断是否在最后一个数据上
+                    var data=null;
+                    if (this.Frame.Data) data=this.Frame.Data;
+                    else data=this.Frame.SubFrame[0].Frame.Data;
+                    if (!data) break;
+                    if (this.CursorIndex+data.DataOffset+1>=data.Data.length) break;
+
+                    ++this.CursorIndex;
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                }
+                break;
+        }
+        
+
+        if (!bStop) this.AutoKeyboardMove();
+        return true;
+    }
+
+
+    this.OnKeyUp=function(e)
+    {
+        this.IsPressKeyboard=false;
+        this.ClearKeyboardMoveTimer();
+    }
+
     this.OnDoubleClick=function(x,y,e)
     {
         
@@ -57291,11 +57458,24 @@ IFrameSplitOperator.FormatDateTimeStringV2=function(datetime, format, languageID
     {
         case "YYYY-MM-DD":
             return `${datetime.getFullYear()}-${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}-${IFrameSplitOperator.NumberToString(datetime.getDate())}`;
-            
+        case 'MM-DD':
+            return `${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}-${IFrameSplitOperator.NumberToString(datetime.getDate())}`;
+        case "MM/DD":
+            return `${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}/${IFrameSplitOperator.NumberToString(datetime.getDate())}`;
+        case "YYYY-MM":
+            return `${datetime.getFullYear()}-${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}`;
+        case "YYYY/MM/DD":
+            return `${datetime.getFullYear()}/${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}/${IFrameSplitOperator.NumberToString(datetime.getDate())}`;
+        case "DD/MM/YYYY":
+            return `${IFrameSplitOperator.NumberToString(datetime.getDate())}/${IFrameSplitOperator.NumberToString(datetime.getMonth()+1)}/${datetime.getFullYear()}`;
+
+
         case "HH:MM:SS":
             return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}:${IFrameSplitOperator.NumberToString(datetime.getSeconds())}`;
         case "HH:MM":
             return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}`;
+        case "HH:MM:SS.fff":
+             return `${IFrameSplitOperator.NumberToString(datetime.getHours())}:${IFrameSplitOperator.NumberToString(datetime.getMinutes())}:${IFrameSplitOperator.NumberToString(datetime.getSeconds())}.${IFrameSplitOperator.MillisecondToString(datetime.getMilliseconds())}`;
         default:
             return null;
     }
@@ -83842,7 +84022,12 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             }
         }
 
-        if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true);            //键盘消息
+        if (bRegisterKeydown) 
+        {
+            this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true);            //键盘消息
+            this.UIElement.addEventListener("keyup", (e)=>{ this.OnKeyUp(e);}, true);
+        }
+
         if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true);                  //上下滚动消息
 
         this.InitalPopMinuteChart(option);
@@ -85622,7 +85807,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
     this.RecvRealtimeData=function(data)
     {
-        if (this.IsOnTouch==true) return;   //正在操作中不更新数据
+        if (this.IsOnTouch==true) return;           //正在操作手势不更新数据
+        if (this.IsPressKeyboard==true) return;     //正在操作键盘不更新数据
 
         if (data.Ver==3.0)
         {
@@ -85962,6 +86148,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     this.RecvMinuteRealtimeDataV2=function(data)    //新版本的
     {
         if (this.IsOnTouch==true) return;   //正在操作中不更新数据
+        if (this.IsPressKeyboard==true) return;     //正在操作键盘不更新数据
+
         if (this.EnableVerifyRecvData && data.symbol!=this.Symbol)
         {
             JSConsole.Chart.Warn(`[KLineChartContainer::RecvMinuteRealtimeDataV2] recv data symbol not match. HQChart[${this.Symbol}] , Recv[${data.symbol}]`);
@@ -99628,7 +99816,11 @@ function DepthChartContainer(uielement)
             }
         }
 
-        if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true);            //键盘消息
+        if (bRegisterKeydown) 
+        {
+            this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true);            //键盘消息
+            this.UIElement.addEventListener("keyup", (e)=>{ this.OnKeyUp(e);}, true);
+        }
         if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true);                //上下滚动消息
     }
 
@@ -141760,6 +141952,8 @@ function ChartReport()
         for(var i=0;i<this.Column.length;++i)
         {
             var item=this.Column[i];
+            this.Canvas.font=this.ItemFont;
+
             if (item.Type==REPORT_COLUMN_ID.SYMBOL_NAME_ID)
             {
                 this.Canvas.font=this.ItemNameFont;
@@ -142247,6 +142441,7 @@ function ChartReport()
             }
 
             this.DrawFullRowBGColor(symbol, eventDrawBG, i, rtRowBG, { Selected:selectedSymbol } );
+            this.DrawFlashFullRowBGColor(symbol, rtRowBG);
 
             if (bFillRow)
             {
@@ -142296,6 +142491,27 @@ function ChartReport()
         }
     }
 
+    this.DrawFlashFullRowBGColor=function(symbol, rtBG)
+    {
+        var data= { Symbol:symbol, FlashBG:null };
+        if (this.GetFlashBGDataCallback) data.FlashBG=this.GetFlashBGDataCallback(symbol, Date.now());
+        if (!data.FlashBG) return;
+
+        var id=-1;
+        if (!data.FlashBG.Data.has(id)) return;
+
+        var flashItem=data.FlashBG.Data.get(id);
+        if (flashItem && flashItem.Count)
+        {
+            this.Canvas.fillStyle=flashItem.Color;
+            this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height); 
+        }
+
+        --flashItem.Count;
+
+        if (this.GlobalOption) ++this.GlobalOption.FlashBGCount;
+    }
+
     this.DrawSelectedRow=function()
     {
         if (this.SelectedStyle===2 && IFrameSplitOperator.IsNonEmptyArray(this.AryFullSelectedRow))
@@ -143935,6 +144151,8 @@ function ChartReport()
         {
             drawInfo.Botton={ Rect:rtBG, Type:1 };
         }
+
+        this.Canvas.font=this.ItemFont;
     }
 
     this.DrawProgressBar=function(drawInfo, left, top, width)
@@ -149339,7 +149557,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14810";
+var HQCHART_VERSION="1.1.14816";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.14810";
+var HQCHART_VERSION="1.1.14816";
 
 function PrintHQChartVersion()
 {