hqchart 1.1.14855 → 1.1.14862

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);
+}
+
+
 
 
 /*暴露外部用的方法*/

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

@@ -6955,6 +6955,8 @@ var JSCHART_EVENT_ID=
     ON_CLICK_CHART_CELL:171,                    //点击图形单元
 
     GET_DEFAULT_INDEX_PARAM:172,                //获取指标默认参数
+
+    ON_RELOAD_RESOURCE:173,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -13647,6 +13649,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(); //是否立即重绘
 
@@ -79271,6 +79280,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 微软雅黑`,  //刻度坐标
         }
     }
 
@@ -80953,6 +80977,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)
@@ -127378,7 +127414,7 @@ var SCRIPT_CHART_NAME=
     CLIP_COLOR_STICK:"CLIP_COLOR_STICK",  //上下柱子 裁剪
 
     DRAW_KLINE:"DRAWKLINE",
-    BASELINE_BAR:"BASELINE_BAR"
+    BASELINE_BAR:"BASELINE_BAR",
 }
 
 
@@ -132337,6 +132373,24 @@ 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;
+                    if (draw.Config)
+                    {
+                        var config=draw.Config;
+                        if (IFrameSplitOperator.IsString(config.LineWidth)) outVarItem.LineWidth=config.LineWidth;
+                        if (IFrameSplitOperator.IsNumber(config.LineType)) drawItem.DrawData.LineType=config.LineType;
+                        if (config.Color) outVarItem.Color=config.color;
+                    }
+
+                    result.push(outVarItem);
+                }
                 else if (draw.DrawType=='STICKLINE')    //柱子
                 {
                     drawItem.Name=draw.Name;
@@ -133938,7 +133992,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)', //叠加指标背景色
     
@@ -133974,7 +134028,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)",           //十字光标线段颜色
     
@@ -155198,6 +155252,10 @@ function JSPopMinuteChart()
     this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
     this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
 
+    this.TitleFont=g_JSChartResource.PopMinuteChart.Title.Font;                 //指标标题字体
+    this.CorssCursorFont=g_JSChartResource.PopMinuteChart.CorssCursor.Font;     //十字光标
+    this.FrameSplitTextFont=g_JSChartResource.PopMinuteChart.Frame.Font;        //刻度文字
+
     this.Minute=
     {
         Option:JSPopMinuteChart.GetMinuteOption(),
@@ -155279,13 +155337,31 @@ function JSPopMinuteChart()
             callback:(event, data, obj)=>{ this.OnKeyDown(event, data, obj); }
         };
 
+        var reloadResourceEvent=
+        {
+            event:JSCHART_EVENT_ID.ON_RELOAD_RESOURCE,
+            callback:(event, data, obj)=>{ this.LoadChartResource(obj); }
+        }
+
+        var splitXEvent=
+        {
+            event:JSCHART_EVENT_ID.ON_SPLIT_XCOORDINATE,
+            callback:(event, data, obj)=>{ this.OnSplitXCoordinate(event, data, obj); }
+        };
+
+        var splitYEvent=
+        {
+            event:JSCHART_EVENT_ID.ON_SPLIT_YCOORDINATE,
+            callback:(event, data, obj)=>{ this.OnSplitYCoordinate(event, data, obj); }
+        }
+
         if (Array.isArray(this.Minute.Option.EventCallback))
         {
-            this.Minute.Option.EventCallback.push(keyDownEvent);
+            this.Minute.Option.EventCallback.unshift(keyDownEvent,reloadResourceEvent,splitYEvent,splitYEvent);
         }
         else
         {
-            this.Minute.Option.EventCallback=[keyDownEvent];
+            this.Minute.Option.EventCallback=[keyDownEvent,reloadResourceEvent,splitXEvent,splitYEvent];
         }
         
         chart.SetOption(this.Minute.Option);  //设置K线配置
@@ -155324,7 +155400,7 @@ function JSPopMinuteChart()
 
     this.OnCreateHQChart=function(chart)
     {
-
+        this.LoadChartResource(chart);
     }
 
     this.Destroy=function()
@@ -155445,6 +155521,10 @@ function JSPopMinuteChart()
         this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
         this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
 
+        this.TitleFont=g_JSChartResource.PopMinuteChart.Title.Font; 
+        this.CorssCursorFont=g_JSChartResource.PopMinuteChart.CorssCursor.Font; //十字光标
+        this.FrameSplitTextFont=g_JSChartResource.PopMinuteChart.Frame.Font
+
         if (!this.DivDialog) return;
 
         this.UpdateStyle();
@@ -155452,6 +155532,35 @@ function JSPopMinuteChart()
         if (this.Minute.JSChart) this.Minute.JSChart.ReloadResource(option);
     }
 
+    this.LoadChartResource=function(chart)
+    {
+        if (IFrameSplitOperator.IsNonEmptyArray(chart.TitlePaint))
+        {
+            for(var i=0;i<chart.TitlePaint.length;++i)
+            {
+                var item=chart.TitlePaint[i];
+                if (!item) continue;
+
+                item.Font=this.TitleFont;
+            }
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(chart.WindowIndex))
+        {
+            for(var i=0;i<chart.WindowIndex.length;++i) //去掉指标里面的字体
+            {
+                var item=chart.WindowIndex[i];
+                if (!item) continue;
+                item.TitleFont=null;
+            }
+        }
+
+        if (chart.ChartCorssCursor)
+        {
+            chart.ChartCorssCursor.Font=this.CorssCursorFont;
+        }
+    }
+
     this.SetLanguage=function(language)
     {
         if (!this.DivDialog) return;
@@ -155578,6 +155687,34 @@ function JSPopMinuteChart()
         finder.Chart.ClearData();
         this.HQChart.Draw();
     }
+
+    this.OnSplitXCoordinate=function(event, data, obj)
+    {
+        var frame=data.Frame;
+        if (IFrameSplitOperator.IsNonEmptyArray(frame.VerticalInfo))
+        {
+            for(var i=0;i<frame.VerticalInfo.length;++i)
+            {
+                var item=frame.VerticalInfo[i];
+                if (!item) continue;
+                if (item.Font) item.Font=this.FrameSplitTextFont;
+            }
+        }
+    }
+
+    this.OnSplitYCoordinate=function(event, data, obj)
+    {
+        var frame=data.Frame;
+        if (IFrameSplitOperator.IsNonEmptyArray(frame.HorizontalInfo))
+        {
+            for(var i=0;i<frame.HorizontalInfo.length;++i)
+            {
+                var item=frame.HorizontalInfo[i];
+                if (!item) continue;
+                if (item.Font) item.Font=this.FrameSplitTextFont;
+            }
+        }
+    }
 }
 
 
@@ -155605,7 +155742,7 @@ JSPopMinuteChart.GetMinuteOption=function()
         //BeforeOpen:{IsShow:true, Width:120, IsShowMultiDay:true, MulitiDayWidth:100, },
         //AfterClose:{IsShow:true, Width:100, IsShowMultiDay:true, MulitiDayWidth:50,  ShareVol:2 }, //ShareVol:0=盘后成交量独立坐标, 1==盘后成交量主图共用 2==盘后成交量盘前共用
 
-        CorssCursorInfo:{ Left:2, Right:1, Bottom:1 },
+        CorssCursorInfo:{ Left:1, Right:1, Bottom:1 },
                 
         MinuteLine:
         {
@@ -155633,8 +155770,8 @@ JSPopMinuteChart.GetMinuteOption=function()
         {
             Left:20,    //左边间距
             Right:20,     //右边间距
-            Top:25,
-            Bottom:25,
+            Top:20,
+            Bottom:20,
 
             AutoLeft:{ Blank:10, MinWidth:60 },
             AutoRight:{ Blank:10, MinWidth:60 },
@@ -155665,6 +155802,11 @@ function JSTooltipMinuteChart()
 
     this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
     this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
+
+    this.TitleFont=g_JSChartResource.PopMinuteChart.Title.Font;                 //指标标题字体
+    this.CorssCursorFont=g_JSChartResource.PopMinuteChart.CorssCursor.Font;     //十字光标
+    this.FrameSplitTextFont=g_JSChartResource.PopMinuteChart.Frame.Font;        //刻度文字
+
     this.OnCreatedCallback;
 
     this.Minute=
@@ -155712,6 +155854,35 @@ function JSTooltipMinuteChart()
         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); }
+
+
+        var reloadResourceEvent=
+        {
+            event:JSCHART_EVENT_ID.ON_RELOAD_RESOURCE,
+            callback:(event, data, obj)=>{ this.LoadChartResource(obj); }
+        }
+
+        var splitXEvent=
+        {
+            event:JSCHART_EVENT_ID.ON_SPLIT_XCOORDINATE,
+            callback:(event, data, obj)=>{ this.OnSplitXCoordinate(event, data, obj); }
+        };
+
+        var splitYEvent=
+        {
+            event:JSCHART_EVENT_ID.ON_SPLIT_YCOORDINATE,
+            callback:(event, data, obj)=>{ this.OnSplitYCoordinate(event, data, obj); }
+        }
+
+        if (Array.isArray(this.Minute.Option.EventCallback))
+        {
+            this.Minute.Option.EventCallback.unshift(reloadResourceEvent,splitYEvent,splitYEvent);
+        }
+        else
+        {
+            this.Minute.Option.EventCallback=[reloadResourceEvent,splitXEvent,splitYEvent];
+        }
+
         chart.SetOption(this.Minute.Option);  //设置K线配置
 
         document.body.appendChild(divDom);
@@ -155752,6 +155923,8 @@ function JSTooltipMinuteChart()
 
     this.OnCreateHQChart=function(chart)
     {
+        this.LoadChartResource(chart);
+
         if (this.OnCreatedCallback) this.OnCreatedCallback(chart);
     }
 
@@ -155832,6 +156005,10 @@ function JSTooltipMinuteChart()
         this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
         this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
 
+        this.TitleFont=g_JSChartResource.PopMinuteChart.Title.Font;                 //指标标题字体
+        this.CorssCursorFont=g_JSChartResource.PopMinuteChart.CorssCursor.Font;     //十字光标
+        this.FrameSplitTextFont=g_JSChartResource.PopMinuteChart.Frame.Font;        //刻度文字
+
         if (!this.DivDialog) return;
 
         this.UpdateStyle();
@@ -155839,6 +156016,63 @@ function JSTooltipMinuteChart()
         if (this.Minute.JSChart) this.Minute.JSChart.ReloadResource(option);
     }
 
+    this.LoadChartResource=function(chart)
+    {
+        if (IFrameSplitOperator.IsNonEmptyArray(chart.TitlePaint))
+        {
+            for(var i=0;i<chart.TitlePaint.length;++i)
+            {
+                var item=chart.TitlePaint[i];
+                if (!item) continue;
+
+                item.Font=this.TitleFont;
+            }
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(chart.WindowIndex))
+        {
+            for(var i=0;i<chart.WindowIndex.length;++i) //去掉指标里面的字体
+            {
+                var item=chart.WindowIndex[i];
+                if (!item) continue;
+                item.TitleFont=null;
+            }
+        }
+
+        if (chart.ChartCorssCursor)
+        {
+            chart.ChartCorssCursor.Font=this.CorssCursorFont;
+        }
+    }
+
+    this.OnSplitXCoordinate=function(event, data, obj)
+    {
+        var frame=data.Frame;
+        if (IFrameSplitOperator.IsNonEmptyArray(frame.VerticalInfo))
+        {
+            for(var i=0;i<frame.VerticalInfo.length;++i)
+            {
+                var item=frame.VerticalInfo[i];
+                if (!item) continue;
+                if (item.Font) item.Font=this.FrameSplitTextFont;
+            }
+        }
+    }
+
+    this.OnSplitYCoordinate=function(event, data, obj)
+    {
+        var frame=data.Frame;
+        if (IFrameSplitOperator.IsNonEmptyArray(frame.HorizontalInfo))
+        {
+            for(var i=0;i<frame.HorizontalInfo.length;++i)
+            {
+                var item=frame.HorizontalInfo[i];
+                if (!item) continue;
+                if (item.Font) item.Font=this.FrameSplitTextFont;
+            }
+        }
+    }
+
 }
 
 JSTooltipMinuteChart.GetMinuteOption=function()
@@ -155865,7 +156099,7 @@ JSTooltipMinuteChart.GetMinuteOption=function()
         //BeforeOpen:{IsShow:true, Width:120, IsShowMultiDay:true, MulitiDayWidth:100, },
         //AfterClose:{IsShow:true, Width:100, IsShowMultiDay:true, MulitiDayWidth:50,  ShareVol:2 }, //ShareVol:0=盘后成交量独立坐标, 1==盘后成交量主图共用 2==盘后成交量盘前共用
 
-        CorssCursorInfo:{ Left:2, Right:1, Bottom:1 },
+        CorssCursorInfo:{ Left:1, Right:1, Bottom:1 },
                 
         MinuteLine:
         {
@@ -155895,8 +156129,8 @@ JSTooltipMinuteChart.GetMinuteOption=function()
         {
             Left:20,    //左边间距
             Right:120,     //右边间距
-            Top:25,
-            Bottom:25,
+            Top:20,
+            Bottom:20,
 
             AutoLeft:{ Blank:10, MinWidth:40 },
             AutoRight:{ Blank:10, MinWidth:40 },
@@ -161308,7 +161542,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14854";
+var HQCHART_VERSION="1.1.14861";
 
 function PrintHQChartVersion()
 {