hqchart 1.1.14552 → 1.1.14555

package/src/jscommon/umychart.PopMinuteChart.js

@@ -30,6 +30,17 @@ function JSPopMinuteChart()
         Option:JSPopMinuteChart.GetMinuteOption(),
         JSChart:null,
         Date:null,
+        Symbol:null,
+        Name:null,
+        Chart:null,
+    }
+
+    this.ClearCache=function()
+    {
+        this.Minute.Date=null;
+        this.Minute.Symbol=null;
+        this.Minute.Name=null;
+        this.Minute.Chart=null;
     }
 
     this.Inital=function(hqchart, option)
@@ -43,6 +54,11 @@ function JSPopMinuteChart()
                 var item=CloneData(option.Option);  //复制一份出来
                 this.Minute.Option=Object.assign(this.Minute.Option,item);
             }
+
+            if (option.EnableMarkBG)    //标记背景
+            {
+                this.HQChart.CreateExtendChart("MarkPopMinutePaint");
+            }
         }
     }
 
@@ -83,6 +99,15 @@ function JSPopMinuteChart()
         if (this.HQChart) this.Minute.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);
         this.Minute.Option.OnCreatedCallback=(chart)=>{ this.OnCreateHQChart(chart); }
         this.Minute.Option.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback); }
+
+        this.Minute.Option.EventCallback=
+        [
+            {
+                event:JSCHART_EVENT_ID.ON_KEYDOWN,  //键盘消息
+                callback:(event, data, obj)=>{ this.OnKeyDown(event, data, obj); }
+            },
+        ];
+
         chart.SetOption(this.Minute.Option);  //设置K线配置
 
         document.body.appendChild(divDom);
@@ -143,14 +168,16 @@ function JSPopMinuteChart()
         if (!data.Symbol || !IFrameSplitOperator.IsPlusNumber(data.Date)) return;
 
         this.Date=data.Date;
-        var name=data.Symbol;
-        if (data.Name) name=data.Name;
-        var title=`${name} ${IFrameSplitOperator.FormatDateString(data.Date)} 分时图`
-        this.TitleBox.DivName.innerText=title;
+        this.Symbol=this.Name=data.Symbol;
+        if (data.Name) this.Name=data.Name;
+        this.Chart=data.Chart;
+       
+        this.UpdateDialogTitle();
 
         if (this.Minute.JSChart)
         {
-            this.Minute.JSChart.ChangeSymbol(data.Symbol);
+            this.Minute.JSChart.ChangeSymbol(this.Symbol);
+            this.MarkKLineBG();
         }
 
         if (!this.Minute.Option.EnableResize)
@@ -173,11 +200,19 @@ function JSPopMinuteChart()
         this.DivDialog.style.left = x + "px";
     }
 
+    this.UpdateDialogTitle=function()
+    {
+        var title=`${this.Name} ${IFrameSplitOperator.FormatDateString(this.Date)} 分时图 PageUp/PageDown翻页`;
+        this.TitleBox.DivName.innerText=title;
+    }
+
     this.Close=function(e)
     {
         if (!this.DivDialog) return;
 
+        this.ClearCache();
         this.DivDialog.style.visibility='hidden';
+        this.ClearMarkKLineBG();
     }
 
     this.OnMouseDownTitle=function(e)
@@ -239,6 +274,114 @@ function JSPopMinuteChart()
 
         if (this.Minute.JSChart) this.Minute.JSChart.SetLanguage(language);
     }
+
+
+    this.OnKeyDown=function(event, data, obj)
+    {
+        switch(data.KeyID)
+        {
+            case 33:    //page up
+                data.PreventDefault=true;
+                var date=this.GetNextDate(1);
+                if (IFrameSplitOperator.IsPlusNumber(date)) this.ChangeDate(date);
+                break;
+            case 34:    //page down
+                data.PreventDefault=true;
+                var date=this.GetNextDate(-1);
+                if (IFrameSplitOperator.IsPlusNumber(date)) this.ChangeDate(date);
+                break;
+            default:
+                return;
+        }
+    }
+
+    this.GetNextDate=function(step)
+    {
+        if (!this.Chart) return null;
+        if (!IFrameSplitOperator.IsNumber(this.Date)) return null;
+        if (step==0) return null;
+
+        var kData=this.Chart.Data;
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return null;
+
+        var index=-1;
+        for(var i=0;i<kData.Data.length;++i)
+        {
+            var kItem=kData.Data[i];
+            if (!kItem) continue;
+
+            if (kItem.Date==this.Date)
+            {
+                index=i;
+                break;
+            }
+        }
+
+        if (index<0) return null;
+
+        var date=null;
+        if (step>0)
+        {
+            for(var i=1, j=0;j<step && index+i<kData.Data.length;++i)
+            {
+                var kItem=kData.Data[index+i];
+                if (!kItem || !IFrameSplitOperator.IsNumber(kItem.Date)) continue;
+
+                date=kItem.Date;
+                ++j;
+            }
+        }
+        else
+        {
+            step=Math.abs(step);
+            for(var i=1, j=0;j<step && index-i>=0;++i)
+            {
+                var kItem=kData.Data[index-i];
+                if (!kItem || !IFrameSplitOperator.IsNumber(kItem.Date)) continue;
+
+                date=kItem.Date;
+                ++j;
+            }
+        }
+
+        if (date==this.Date) return null;
+
+        return date;
+    }
+
+    //修改日期
+    this.ChangeDate=function(date)
+    {
+        if (!this.Minute.JSChart) return;
+           
+        this.Date=date;
+        this.UpdateDialogTitle();
+        this.Minute.JSChart.ChangeSymbol(this.Symbol);
+        this.MarkKLineBG();
+    }
+
+    this.MarkKLineBG=function()
+    {
+        if (!this.HQChart) return;
+
+        var finder=this.HQChart.GetExtendChartByClassName("MarkPopMinutePaint");
+        if (!finder || !finder.Chart) return;
+
+        finder.Chart.SetDate([this.Date]);
+        this.HQChart.Draw();
+
+    }
+
+    this.ClearMarkKLineBG=function()
+    {
+        if (!this.HQChart) return;
+
+        var finder=this.HQChart.GetExtendChartByClassName("MarkPopMinutePaint");
+        if (!finder || !finder.Chart) return;
+
+        finder.Chart.ClearData();
+        this.HQChart.Draw();
+    }
 }
 
 
@@ -570,6 +713,118 @@ JSTooltipMinuteChart.GetMinuteOption=function()
 }
 
 
+///////////////////////////////////////////////////////
+// K线上标记选中
+
+function MarkPopMinutePaint()
+{
+    this.newMethod=IExtendChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName="MarkPopMinutePaint";
+    this.MapDate;   //标记日期
+    this.BGColor="rgba(100,100,100,0.2)";
+    this.LineWidth=g_JSChartResource.PopMinuteChart.Mark.LineWidth;
+    this.LineColor=g_JSChartResource.PopMinuteChart.Mark.LineColor;
+    this.SubFrame;
+    this.IsDynamic=true;
+
+
+    this.ReloadResource=function(resource)
+    {
+        this.LineWidth=g_JSChartResource.PopMinuteChart.Mark.LineWidth;
+        this.LineColor=g_JSChartResource.PopMinuteChart.Mark.LineColor;
+    }
+
+    this.SetDate=function(aryDate)
+    {
+        this.MapDate=new Map();
+        if (IFrameSplitOperator.IsNonEmptyArray(aryDate))
+        {
+            for(var i=0;i<aryDate.length;++i)
+            {
+                var date=aryDate[i];
+                this.MapDate.set(date, { Date:date} );
+            }
+        }
+    }
+
+    this.ClearData=function()
+    {
+        this.MapDate=null;
+    }
+
+    this.Draw=function()
+    {
+        this.SubFrame=null;
+        if (!this.HQChart) return;
+        if (!this.ChartFrame || !IFrameSplitOperator.IsNonEmptyArray(this.ChartFrame.SubFrame)) return;
+        if (!this.MapDate || this.MapDate.size<=0) return;
+
+        var kData=this.HQChart.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
+        this.SubFrame=this.ChartFrame.SubFrame[0].Frame;
+        if (!this.SubFrame) return;
+
+        var dataWidth=this.SubFrame.DataWidth;
+        var distanceWidth=this.SubFrame.DistanceWidth;
+        var xPointCount=this.SubFrame.XPointCount;
+        var border=this.SubFrame.GetBorder();
+        var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        var chartright=border.RightEx;
+       
+        var startIndex=kData.DataOffset;
+        var aryBG=[];
+        for(var i=startIndex,j=0;i<kData.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var kItem=kData.Data[i];
+            if (!kItem) continue;
+            if (!this.MapDate.has(kItem.Date)) continue
+            
+            var left=xOffset;
+            var right=xOffset+dataWidth;
+            var x=left+(right-left)/2;
+
+            var bgItem={ Left:left, XCenter:x, Right:right, DataIndex:i, DataWidth:dataWidth };
+            aryBG.push(bgItem);
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(aryBG))
+        {
+            this.Canvas.save();
+            this.DrawBG(aryBG);
+            this.Canvas.restore();
+        }
+
+        this.SubFrame=null;
+    }
+
+    this.DrawBG=function(aryBG)
+    {
+        var border=this.ChartFrame.ChartBorder.GetBorder();
+        var pixelRatio=GetDevicePixelRatio();
+        if (this.MapDate.size==1)   //标记一天
+        {
+            var item=aryBG[0];
+            var lineWidth=this.LineWidth*pixelRatio;
+            if (item.DataWidth<=4) lineWidth=1*pixelRatio;
+
+            this.Canvas.lineWidth=lineWidth;
+            this.Canvas.strokeStyle=this.LineColor;
+            this.Canvas.beginPath();
+            this.Canvas.moveTo(item.XCenter,border.TopEx);
+            this.Canvas.lineTo(item.XCenter,border.BottomEx);
+            this.Canvas.stroke();
+        }
+    }
+}
+
+
+JSChart.RegisterExtendChartClass("MarkPopMinutePaint", { Create:function() { return new MarkPopMinutePaint}} );
+
+
+
 
 
 

package/src/jscommon/umychart.js

@@ -6986,16 +6986,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
+        var keyID = e.keyCode ? e.keyCode :e.which;
+
         //回调事件
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
         if (event && event.Callback)
         {
-            var sendData={ e:e, PreventDefault:false };
+            var sendData={ e:e, KeyID:keyID, PreventDefault:false };
             event.Callback(event, sendData, this);
             if (sendData.PreventDefault) return;
         }
-        
-        var keyID = e.keyCode ? e.keyCode :e.which;
 
         var draw=false;
         if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
@@ -36087,8 +36087,7 @@ function ChartStickLine()
     this.Width=0;                                   //柱子宽度 0=1 3,50=k线宽度 101=K线宽度+间距宽度
     this.IsHScreen=false;
     
-    this.EmptyBGColor=null;             //空心柱子背景色(缓存)
-    this.BarCache={ };                  //Type:1=线段 2=柱子
+    this.BarCache={ Type:0 };                  //Type:1=线段 2=柱子
 
     this.SetEmptyBar=function()         //设置空心柱子
     {
@@ -72079,6 +72078,12 @@ function JSChartResource()
 
         TitleColor:'rgb(250,250,250)',       //标题颜色
         TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
+
+        Mark:
+        {
+            LineColor:"rgba(255,165,0,0.6)",
+            LineWidth:2,
+        }
     }
 
     this.PopKLineChart=
@@ -73685,6 +73690,11 @@ function JSChartResource()
             if (item.BorderColor) dest.BorderColor=item.BorderColor;
             if (item.TitleColor) dest.TitleColor=item.TitleColor;
             if (item.TitleBGColor) dest.TitleBGColor=item.TitleBGColor;
+            if (item.Mark)
+            {
+                if (item.Mark.LineColor) dest.Mark.LineColor=item.Mark.LineColor;
+                if (IFrameSplitOperator.IsNumber(item.Mark.LineWidth)) dest.Mark.LineWidth=item.Mark.LineWidth;
+            }
         }
 
         if (style.PopKLineChart)
@@ -77173,6 +77183,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     this.ShowMinuteChartDialog=function(data, x,y)
     {
         if (!this.PopMinuteChart) return;
+        if (!ChartData.IsDayPeriod(this.Period,true)) return;   //只支持日K
         if (!data.Tooltip || !data.Chart) return;
 
         var pixelRatio=GetDevicePixelRatio();
@@ -77198,7 +77209,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         if (!symbol) return;
 
-        this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data }, x/pixelRatio,y/pixelRatio);
+        this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data, Chart:data.Tooltip.ChartPaint }, x/pixelRatio,y/pixelRatio);
     }
 
    
@@ -86024,17 +86035,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
+        var keyID = e.keyCode ? e.keyCode :e.which;
+
         //回调事件
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
         if (event && event.Callback)
         {
-            var sendData={ e:e, PreventDefault:false };
+            var sendData={ e:e, KeyID:keyID, PreventDefault:false };
             event.Callback(event, sendData, this);
             if (sendData.PreventDefault) return;
         }
 
-        var keyID = e.keyCode ? e.keyCode :e.which;
-
         var draw=false;
         if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
         {

package/src/jscommon/umychart.style.js

@@ -95,6 +95,11 @@ function GetBlackStyle()
         {
             BGColor:"rgba(0,0,0,0.85)",
             BorderColor:"rgb(230,230,230)",
+
+            Mark:
+            {
+                LineColor:"rgba(255,215,0,0.6)",
+            }
         },
 
         PopKLineChart:

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

@@ -10911,16 +10911,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
+        var keyID = e.keyCode ? e.keyCode :e.which;
+
         //回调事件
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
         if (event && event.Callback)
         {
-            var sendData={ e:e, PreventDefault:false };
+            var sendData={ e:e, KeyID:keyID, PreventDefault:false };
             event.Callback(event, sendData, this);
             if (sendData.PreventDefault) return;
         }
-        
-        var keyID = e.keyCode ? e.keyCode :e.which;
 
         var draw=false;
         if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
@@ -40012,8 +40012,7 @@ function ChartStickLine()
     this.Width=0;                                   //柱子宽度 0=1 3,50=k线宽度 101=K线宽度+间距宽度
     this.IsHScreen=false;
     
-    this.EmptyBGColor=null;             //空心柱子背景色(缓存)
-    this.BarCache={ };                  //Type:1=线段 2=柱子
+    this.BarCache={ Type:0 };                  //Type:1=线段 2=柱子
 
     this.SetEmptyBar=function()         //设置空心柱子
     {
@@ -76004,6 +76003,12 @@ function JSChartResource()
 
         TitleColor:'rgb(250,250,250)',       //标题颜色
         TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
+
+        Mark:
+        {
+            LineColor:"rgba(255,165,0,0.6)",
+            LineWidth:2,
+        }
     }
 
     this.PopKLineChart=
@@ -77610,6 +77615,11 @@ function JSChartResource()
             if (item.BorderColor) dest.BorderColor=item.BorderColor;
             if (item.TitleColor) dest.TitleColor=item.TitleColor;
             if (item.TitleBGColor) dest.TitleBGColor=item.TitleBGColor;
+            if (item.Mark)
+            {
+                if (item.Mark.LineColor) dest.Mark.LineColor=item.Mark.LineColor;
+                if (IFrameSplitOperator.IsNumber(item.Mark.LineWidth)) dest.Mark.LineWidth=item.Mark.LineWidth;
+            }
         }
 
         if (style.PopKLineChart)
@@ -81098,6 +81108,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
     this.ShowMinuteChartDialog=function(data, x,y)
     {
         if (!this.PopMinuteChart) return;
+        if (!ChartData.IsDayPeriod(this.Period,true)) return;   //只支持日K
         if (!data.Tooltip || !data.Chart) return;
 
         var pixelRatio=GetDevicePixelRatio();
@@ -81123,7 +81134,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         if (!symbol) return;
 
-        this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data }, x/pixelRatio,y/pixelRatio);
+        this.PopMinuteChart.Show({ Date:date, Symbol:symbol, Data:data.Tooltip.Data, Chart:data.Tooltip.ChartPaint }, x/pixelRatio,y/pixelRatio);
     }
 
    
@@ -89949,17 +89960,17 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
 
+        var keyID = e.keyCode ? e.keyCode :e.which;
+
         //回调事件
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);
         if (event && event.Callback)
         {
-            var sendData={ e:e, PreventDefault:false };
+            var sendData={ e:e, KeyID:keyID, PreventDefault:false };
             event.Callback(event, sendData, this);
             if (sendData.PreventDefault) return;
         }
 
-        var keyID = e.keyCode ? e.keyCode :e.which;
-
         var draw=false;
         if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
         {
@@ -129592,6 +129603,11 @@ function GetBlackStyle()
         {
             BGColor:"rgba(0,0,0,0.85)",
             BorderColor:"rgb(230,230,230)",
+
+            Mark:
+            {
+                LineColor:"rgba(255,215,0,0.6)",
+            }
         },
 
         PopKLineChart:
@@ -144926,7 +144942,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14551";
+var HQCHART_VERSION="1.1.14554";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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