hqchart 1.1.14853 → 1.1.14860

package/src/jscommon/umychart.testdata.js

@@ -732,6 +732,10 @@ HQData.RequestRealtimeData=function(data, callback)
 
     var hqchartData={ code:0, stock:aryStock };
 
+    var time=new Date();
+    //if (time.getSeconds()%3==1) 
+        hqchartData.LatestPointFlash={ FlashCount:2 };
+
    
     callback(hqchartData);
     
@@ -2279,6 +2283,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_DRAWSVG(data, callback); 
     else if (request.Data.indexname=="API_BASELINE_BAR")
         HQData.APIIndex_BASELINE_BAR(data, callback);
+    else if (request.Data.indexname=="API_VERTLINE")
+        HQData.APIIndex_VERTLINE(data, callback);
 }
 
 
@@ -3649,7 +3655,7 @@ HQData.APIIndex_BASELINE_BAR=function(data, callback)
     {
         var kItem=kData.Data[i];
         
-        var item={ Date:kItem.Date, Time:kItem.Time, Up:kItem.Vol*0.2, Down:(kItem.Vol*0.35)*-1 };
+        var item={ Date:kItem.Date, Time:kItem.Time, Up:kItem.Vol*0.2, Down:(kItem.Vol*0.35) };
         pointData.Draw.DrawData.push(item);
     }
 
@@ -3665,3 +3671,41 @@ HQData.APIIndex_BASELINE_BAR=function(data, callback)
 }
 
 
+HQData.APIIndex_VERTLINE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var lineData=
+    { 
+        name:"VERTLINE", type:1, 
+        Draw:
+        { 
+            Name:"VERTLINE",
+            DrawType:"VERTLINE",
+            DrawData:{ Data:[] },
+        },
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        
+        var value=0;
+        if (i%5==1) value=1;
+        lineData.Draw.DrawData.Data[i]=value;
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[ lineData] },
+    };
+
+    console.log('[HQData.APIIndex_VERTLINE] apiData ', apiData);
+    callback(apiData);
+}
+
+

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

@@ -4883,6 +4883,17 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         
         this.AdjustTitleHeight(chart);
 
+        if (option.LatestPointFlash)
+        {
+            var item=option.LatestPointFlash;
+            if (item.Enable)
+            {
+                this.CreateExtraCanvasElement(JSChart.LatestPointFlashKey, { ZIndex:6 });
+                chart.CreateExtendChart("LatestPointFlashPaint", item);
+                chart.StartLatestPointFlash();
+            }
+        }
+
         return chart;
     }
 
@@ -6900,6 +6911,8 @@ var JSCHART_EVENT_ID=
     ON_CLICK_CHART_CELL:171,                    //点击图形单元
 
     GET_DEFAULT_INDEX_PARAM:172,                //获取指标默认参数
+
+    ON_RELOAD_RESOURCE:173,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -13592,6 +13605,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.ReloadChartCorssCursor(option,option.Resource);
         this.ReloadChartDrawPictureResource(option.Resource);
 
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_RELOAD_RESOURCE); //配色重新加载
+        if (event && event.Callback)
+        {
+            var sendData={ Option:option };
+            event.Callback(event, sendData, this);
+        }
+
         if (option.Update && this.Update) this.Update( {UpdateCursorIndexType:2} );       //是否立即更新并重绘
         else if (option.Draw==true || option.Redraw==true) this.Draw(); //是否立即重绘
 
@@ -31339,6 +31359,8 @@ function ChartKLine()
         LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin,
     }
 
+    this.LastPoint={ };  //最后一个点的信息 {X, Y, KItem:, Date:, Time: }
+
     this.AddToDaySummary=function(kItem)
     {
         if (!this.DaySummary.Enable) return false;
@@ -31842,6 +31864,8 @@ function ChartKLine()
             if (i==this.Data.Data.length-1)
             {
                 ptLast={ X:x, Y:yClose, XLeft:left, XRight:right, KItem:data, ChartRight:chartright };
+
+                this.LastPoint={ X:x, Y:yClose, KItem:data };
             }
 
             if (this.PriceGap.Enable )
@@ -31975,6 +31999,11 @@ function ChartKLine()
 
             prePoint={ X:x, Y:yClose};
 
+            if (i==this.Data.Data.length-1) //最后一个点
+            {
+                this.LastPoint={ X:x, Y:yClose, KItem:data };
+            }
+
             if (this.PriceGap.Enable)
             {
                 var yLow=this.GetYFromData(data.Low, false);
@@ -33938,8 +33967,29 @@ function ChartKLine()
         this.Canvas.clip();
     }
 
+    this.ClearLastPoint=function()
+    {
+        this.LastPoint={ };
+        if (this.ChartFrame.GlobalOption)
+        {
+            var item=this.ChartFrame.GlobalOption;
+            item.LatestPoint=null;
+        }
+    }
+
+    this.UpdateGlobalLatestPoint=function()
+    {
+        if (this.Identify!="Main-KLine") return;
+        if (!this.ChartFrame.GlobalOption) return;
+
+        var item=this.ChartFrame.GlobalOption;
+        if (IFrameSplitOperator.IsNumber(this.LastPoint.X) && IFrameSplitOperator.IsNumber(this.LastPoint.Y))
+            item.LatestPoint={ X:this.LastPoint.X, Y:this.LastPoint.Y };
+    }
+
     this.Draw=function()
     {
+        this.ClearLastPoint();
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
@@ -33996,6 +34046,7 @@ function ChartKLine()
             this.Canvas.restore();
             this.DrawPredictionLine();
             if (this.PriceGap.Enable) this.DrawPriceGap();
+            this.UpdateGlobalLatestPoint();
             return;
         }
         else if (this.DrawType==2)
@@ -34067,6 +34118,8 @@ function ChartKLine()
 
         this.Canvas.restore();
 
+        this.UpdateGlobalLatestPoint();
+
         this.DrawPredictionLine();
         if (this.PriceGap.Enable) this.DrawPriceGap();
 
@@ -56170,6 +56223,7 @@ function LatestPointFlashPaint()
     this.BGColor=g_JSChartResource.LatestPointFlash.BGColor;
     this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
     this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
+    this.Style=1;   //0=默认配置 1=图形保持一致
     this.FlashCanvas;
 
     this.SetOption=function(option)
@@ -56194,6 +56248,23 @@ function LatestPointFlashPaint()
         this.BGRadius=g_JSChartResource.LatestPointFlash.BGRadius;
     }
 
+    this.GetChartColor=function()
+    {
+        var chart=this.HQChart.ChartPaint[0];
+        if (!chart) return;
+
+        if (chart.ClassName=="ChartKLine")
+        {
+            this.PointColor=chart.CloseLineColor;
+            this.BGColor=IChartDrawPicture.ColorToRGBA(chart.CloseLineColor, 0.6);
+        }
+        else if (chart.ClassName=="ChartMinutePriceLine")
+        {
+            this.PointColor=chart.Color;
+            this.BGColor=IChartDrawPicture.ColorToRGBA(chart.Color, 0.6);
+        }
+    }
+
     this.Draw=function()
     {
         if (!this.FlashCanvas) return;
@@ -56212,6 +56283,8 @@ function LatestPointFlashPaint()
         var point=this.HQChart.GlobalOption.LatestPoint;
         if (!IFrameSplitOperator.IsNumber(point.X) || !IFrameSplitOperator.IsNumber(point.Y)) return;
 
+        if (this.Style==1) this.GetChartColor();
+
         this.FlashCanvas.fillStyle=this.BGColor;
         this.FlashCanvas.beginPath();
         this.FlashCanvas.arc(point.X,point.Y,this.BGRadius,0,360,false);
@@ -79163,6 +79236,21 @@ function JSChartResource()
         {
             LineColor:"rgba(255,165,0,0.6)",
             LineWidth:2,
+        },
+
+        Title:
+        {
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+        },
+
+        CorssCursor:
+        {
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`
+        },
+
+        Frame:
+        {
+            Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,  //刻度坐标
         }
     }
 
@@ -80845,6 +80933,18 @@ function JSChartResource()
                 if (item.Mark.LineColor) dest.Mark.LineColor=item.Mark.LineColor;
                 if (IFrameSplitOperator.IsNumber(item.Mark.LineWidth)) dest.Mark.LineWidth=item.Mark.LineWidth;
             }
+            if (item.Title)
+            {
+                if (item.Title.Font) dest.Title.Font=item.Title.Font;
+            }
+            if (item.CorssCursor)
+            {
+                if (item.CorssCursor.Font) dest.CorssCursor.Font=item.CorssCursor.Font;
+            }
+            if (item.Frame)
+            {
+                if (item.Frame.Font) dest.Frame.Font=item.Frame.Font;
+            }
         }
 
         if (style.PopKLineChart)
@@ -86426,6 +86526,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
             if (!bFind) return;
         }
+
+        if (data.LatestPointFlash)  //最新数据闪烁
+        {
+            var item=data.LatestPointFlash;
+            if (IFrameSplitOperator.IsNumber(item.FlashCount))
+                this.SetLatestPointFlash(item.FlashCount)
+        }
         
         var bindData=new ChartData();
         bindData.Data=this.SourceData.Data;
@@ -127263,7 +127370,7 @@ var SCRIPT_CHART_NAME=
     CLIP_COLOR_STICK:"CLIP_COLOR_STICK",  //上下柱子 裁剪
 
     DRAW_KLINE:"DRAWKLINE",
-    BASELINE_BAR:"BASELINE_BAR"
+    BASELINE_BAR:"BASELINE_BAR",
 }
 
 
@@ -132222,6 +132329,16 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="VERTLINE") //竖线
+                {
+                    drawItem.Text=draw.Text;
+                    drawItem.Name=draw.Name;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData={ Data:this.FittingArray(draw.DrawData.Data,date,time,hqChart) };
+                    outVarItem.Draw=drawItem;
+
+                    result.push(outVarItem);
+                }
                 else if (draw.DrawType=='STICKLINE')    //柱子
                 {
                     drawItem.Name=draw.Name;
@@ -133823,7 +133940,7 @@ function GetBlackStyle()
         MultiDayBorderPen:"rgba(236,236,236,0.5)",
         FrameSplitPen: "rgba(236,236,236,0.13)",          //分割线
         FrameSplitTextColor: "rgb(220,220,220)",     //刻度文字颜色
-        FrameSplitTextFont: 12*GetDevicePixelRatio() +"px 微软雅黑",        //坐标刻度文字字体
+        FrameSplitTextFont: 14*GetDevicePixelRatio() +"px 微软雅黑",        //坐标刻度文字字体
         FrameTitleBGColor: "rgb(0,0,0)",      //标题栏背景色
         OverlayIndexTitleBGColor:'rgba(0,0,0,0.7)', //叠加指标背景色
     
@@ -133859,7 +133976,7 @@ function GetBlackStyle()
     
         CorssCursorBGColor: "rgb(43,54,69)",            //十字光标背景
         CorssCursorTextColor: "rgb(255,255,255)",
-        CorssCursorTextFont: 12*GetDevicePixelRatio() +"px 微软雅黑",
+        CorssCursorTextFont: 14*GetDevicePixelRatio() +"px 微软雅黑",
         CorssCursorHPenColor: "rgb(130,130,130)",           //十字光标线段颜色
         CorssCursorVPenColor: "rgb(130,130,130)",           //十字光标线段颜色
     
@@ -150197,7 +150314,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14852";
+var HQCHART_VERSION="1.1.14859";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -56264,6 +56264,10 @@ HQData.RequestRealtimeData=function(data, callback)
 
     var hqchartData={ code:0, stock:aryStock };
 
+    var time=new Date();
+    //if (time.getSeconds()%3==1) 
+        hqchartData.LatestPointFlash={ FlashCount:2 };
+
    
     callback(hqchartData);
     
@@ -57811,6 +57815,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_DRAWSVG(data, callback); 
     else if (request.Data.indexname=="API_BASELINE_BAR")
         HQData.APIIndex_BASELINE_BAR(data, callback);
+    else if (request.Data.indexname=="API_VERTLINE")
+        HQData.APIIndex_VERTLINE(data, callback);
 }
 
 
@@ -59181,7 +59187,7 @@ HQData.APIIndex_BASELINE_BAR=function(data, callback)
     {
         var kItem=kData.Data[i];
         
-        var item={ Date:kItem.Date, Time:kItem.Time, Up:kItem.Vol*0.2, Down:(kItem.Vol*0.35)*-1 };
+        var item={ Date:kItem.Date, Time:kItem.Time, Up:kItem.Vol*0.2, Down:(kItem.Vol*0.35) };
         pointData.Draw.DrawData.push(item);
     }
 
@@ -59197,6 +59203,44 @@ HQData.APIIndex_BASELINE_BAR=function(data, callback)
 }
 
 
+HQData.APIIndex_VERTLINE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var lineData=
+    { 
+        name:"VERTLINE", type:1, 
+        Draw:
+        { 
+            Name:"VERTLINE",
+            DrawType:"VERTLINE",
+            DrawData:{ Data:[] },
+        },
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        
+        var value=0;
+        if (i%5==1) value=1;
+        lineData.Draw.DrawData.Data[i]=value;
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[ lineData] },
+    };
+
+    console.log('[HQData.APIIndex_VERTLINE] apiData ', apiData);
+    callback(apiData);
+}
+
+
 
 
 /*暴露外部用的方法*/