hqchart 1.1.15111 → 1.1.15126

package/src/jscommon/umychart.js

@@ -2626,6 +2626,14 @@ JSChart.RegisterChartFrameClass=function(name, option)
 }
 
 
+//注册DOM对话框类
+//option:{ Create:创建类方法 }
+JSChart.RegisterDOMClass=function(name, option)
+{
+    return g_JSDOMFactory.Add(name, option);
+}
+
+
 //一些公共函数
 JSChart.ToFixedPoint=function(value)
 {
@@ -10351,6 +10359,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(windowItem.IsShowTitleArrow)) frame.IsShowTitleArrow=windowItem.IsShowTitleArrow;
             if (IFrameSplitOperator.IsNumber(windowItem.TitleArrowType)) frame.TitleArrowType=windowItem.TitleArrowType;
             if (IFrameSplitOperator.IsBool(windowItem.IsShowIndexName)) frame.IsShowIndexName=windowItem.IsShowIndexName;
+            if (IFrameSplitOperator.IsBool(windowItem.IsSinlgeLine)) frame.IsSinlgeLine=windowItem.IsSinlgeLine;
             if (IFrameSplitOperator.IsBool(windowItem.IsShowOverlayIndexName)) frame.IsShowOverlayIndexName=windowItem.IsShowOverlayIndexName;
             if (IFrameSplitOperator.IsNumber(windowItem.IndexParamSpace)) frame.IndexParamSpace=windowItem.IndexParamSpace;
             if (IFrameSplitOperator.IsNumber(windowItem.IndexTitleSpace)) frame.IndexTitleSpace=windowItem.IndexTitleSpace;
@@ -10474,6 +10483,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (IFrameSplitOperator.IsBool(option.IsShowTitleArrow)) subFrame.Frame.IsShowTitleArrow=option.IsShowTitleArrow;
         if (IFrameSplitOperator.IsNumber(option.TitleArrowType)) subFrame.Frame.TitleArrowType=option.TitleArrowType;
         if (IFrameSplitOperator.IsBool(option.IsShowIndexName)) subFrame.Frame.IsShowIndexName=option.IsShowIndexName;
+        if (IFrameSplitOperator.IsBool(option.IsSinlgeLine)) subFrame.Frame.IsSinlgeLine=option.IsSinlgeLine;
         if (IFrameSplitOperator.IsBool(option.IsShowOverlayIndexName)) subFrame.Frame.IsShowOverlayIndexName=option.IsShowOverlayIndexName;
         if (IFrameSplitOperator.IsNumber(option.IndexParamSpace)) subFrame.Frame.IndexParamSpace=option.IndexParamSpace;
         if (IFrameSplitOperator.IsBool(option.IsShowXLine)) subFrame.Frame.IsShowXLine=option.IsShowXLine;
@@ -12559,6 +12569,36 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpdateWindowIndexV2(aryUpdate);
         return true;
     }
+
+    this.TryClickLock=function(x,y)
+    {
+        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return false;
+
+        for(var i=0;i<this.Frame.SubFrame.length; ++i)
+        {
+            var item=this.Frame.SubFrame[i];
+            var chartLock=item.Frame.LockPaint;
+            if (!chartLock || !chartLock.LockRect) continue;
+
+            var tooltip=new TooltipData();
+            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
+
+            tooltip.HQChart=this;
+
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
+            if (event && event.Callback) 
+            {
+                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
+                event.Callback(event,sendData,this);
+            }
+
+
+            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
+            return true;
+        }
+
+        return false;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -13213,6 +13253,7 @@ function IChartFramePainting()
     this.IsShowBorder = true;          //是否显示边框
     this.IsShowTitleArrow=g_JSChartResource.IndexTitle.EnableIndexArrow;        //是否显示指标信息上涨下跌箭头
     this.TitleArrowType=g_JSChartResource.IndexTitle.ArrowType;             //指标信息上涨下跌箭头类型 0=独立颜色 1=跟指标名字颜色一致
+    this.IsSinlgeLine=g_JSChartResource.IndexTitle.IsSinlgeLine;
     this.IsShowIndexName=true;         //是否显示指标名字
     this.IsShowOverlayIndexName=true;  //是否显示叠加指标名字
     //this.OverlayIndexType= { Position:0, LineSpace:5 };
@@ -16314,7 +16355,7 @@ function AverageWidthFrame()
 
         if (this.ClassName=="MinuteFrame" || this.ClassName=="KLineFrame")
         {
-            this.DivFrameToolbar=new JSDivFrameToolbar();
+            this.DivFrameToolbar=g_JSDOMFactory.Create('JSDivFrameToolbar');//new JSDivFrameToolbar();
             this.DivFrameToolbar.HQChart=hqchart;
             this.DivFrameToolbar.DivHQChart=divHQChart;
             this.DivFrameToolbar.FrameID=frameID;
@@ -26859,9 +26900,20 @@ function IChartPainting()
         var x=left+width/2;
         var y=top+height/2;
 
+        var bHScreen=this.ChartFrame.IsHScreen;
+        if (bHScreen)
+        {
+            this.Canvas.save(); 
+            this.Canvas.translate(x, y);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            x=0,y=0;
+        }
+
         this.Canvas.textAlign="center";
         this.Canvas.textBaseline="middle";
         this.Canvas.fillText(this.NotSupportMessage,x,y);
+
+        if (bHScreen)  this.Canvas.restore();
     }
 
     this.GetTooltipData=function(x,y,tooltip)
@@ -47903,6 +47955,8 @@ function ChartLock()
     this.IndexName;     //指标名字
     this.IndexID;       //指标ID
 
+    this.MinWidthText="  付费指标  "
+
     this.SetData=function(aryData)
     {
         this.AryData=aryData;
@@ -48030,11 +48084,27 @@ function ChartLock()
             }
         }
 
+        this.Canvas.font=this.Font;
+        var minWidth=this.Canvas.measureText(this.MinWidthText).width;
+
+        var aryText=null;
+        if (Array.isArray(this.Title)) aryText=this.Title;
+        else aryText=[{Text:this.Title}];
+            
+        var outSize={ };
+        if (!this.CalculateTextSize(aryText, this.Font, outSize)) outSize=null;
+        if (outSize && outSize.Width+8>minWidth) minWidth=outSize.Width+8;  //确保文字可以显示
+
         if (bHScreen)
         {
             var rtBG={ Left:border.Left, Right:border.RightEx, Top:left, Bottom:border.Bottom };
             rtBG.Width=rtBG.Right-rtBG.Left;
             rtBG.Height=rtBG.Bottom-rtBG.Top;
+            if (rtBG.Height<minWidth)
+            {
+                rtBG.Height=minWidth;
+                rtBG.Top=rtBG.Bottom-rtBG.Height;
+            }
             this.LockRect=rtBG;    //保存上锁区域
 
             if (bDraw)
@@ -48049,6 +48119,11 @@ function ChartLock()
             var rtBG={ Left:left, Right:border.RightEx, Top:border.TopTitle, Bottom:border.Bottom };
             rtBG.Width=rtBG.Right-rtBG.Left;
             rtBG.Height=rtBG.Bottom-rtBG.Top;
+            if (rtBG.Width<minWidth)
+            {
+                rtBG.Width=minWidth;
+                rtBG.Left=rtBG.Right-rtBG.Width;
+            }
             this.LockRect=rtBG;    //保存上锁区域
 
             if (bDraw)
@@ -48061,13 +48136,7 @@ function ChartLock()
         }
 
         if (!bDraw) return;
-
-        var aryText=null;
-        if (Array.isArray(this.Title)) aryText=this.Title;
-        else aryText=[{Text:this.Title}];
-            
-        var outSize={ };
-        if (!this.CalculateTextSize(aryText, this.Font, outSize)) return;
+        if (!outSize) return;
 
         this.Canvas.textAlign='left';
         this.Canvas.textBaseline='bottom';
@@ -62578,6 +62647,7 @@ function DynamicChartTitlePainting()
     this.IsShowIndexName=true;     //是否显示指标名字
     this.IsShowIndexTitle=true;    //是否显示指标标题信息
     this.IsShowNameArrow=false;
+    this.IsSinlgeLine=false;        //主图指标标题是否单行显示
     this.NameArrowConfig=CloneData(g_JSChartResource.IndexTitle.NameArrow);
     this.CustomLocation;    //自定义位置 { IsShow:, Top:， TitleHeight: }
 
@@ -63316,6 +63386,7 @@ function DynamicChartTitlePainting()
         this.IsShowUpDownArrow=this.Frame.IsShowTitleArrow;
         this.TitleArrowType=this.Frame.TitleArrowType;
         this.IsShowIndexName=this.Frame.IsShowIndexName;
+        this.IsSinlgeLine=this.Frame.IsSinlgeLine;
         this.IsShowOverlayIndexName=this.Frame.IsShowOverlayIndexName;
         this.OverlayIndexType.Position=this.Frame.OverlayIndexType.Position;
         this.OverlayIndexType.LineSpace=this.Frame.OverlayIndexType.LineSpace;
@@ -63722,6 +63793,7 @@ function DynamicChartTitlePainting()
 
                     if ((left+textWidth+space)>right) 
                     {
+                        if (this.IsSinlgeLine) break;
                         left=newLineLeft;
                         bottom+=lineHeight;
                         right=this.Frame.ChartBorder.GetRight();    //第2行以后 右侧边框
@@ -63786,6 +63858,7 @@ function DynamicChartTitlePainting()
                 var textWidth=this.Canvas.measureText(text).width+space;
                 if ((left+textWidth)>right) //换行
                 {
+                    if (this.IsSinlgeLine) break;
                     left=newLineLeft;
                     bottom+=lineHeight;
                     right=this.Frame.ChartBorder.GetRight();    //第2行以后 右侧边框
@@ -77273,6 +77346,8 @@ function JSChartResource()
         EnableIndexArrow:true,  //指标数值是否带上涨下跌箭头
 
         NameArrow:{ Color:"rgb(43,54,69)", Space:2, Symbol:'▼' },
+
+        IsSinlgeLine:false, //主图指标是否单行显示 false=多行显示
     }
 
     this.Title={
@@ -78958,6 +79033,7 @@ function JSChartResource()
 
             if (IFrameSplitOperator.IsNumber(item.ArrowType)) this.IndexTitle.ArrowType=item.ArrowType;
             if (IFrameSplitOperator.IsBool(item.EnableIndexArrow)) this.IndexTitle.EnableIndexArrow=item.EnableIndexArrow;
+            if (IFrameSplitOperator.IsBool(item.IsSinlgeLine)) this.IndexTitle.IsSinlgeLine=item.IsSinlgeLine;
 
             if (item.NameArrow)
             {
@@ -86722,32 +86798,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
-    this.TryClickLock=function(x,y)
-    {
-        for(var i=0;i<this.Frame.SubFrame.length; ++i)
-        {
-            var item=this.Frame.SubFrame[i];
-            var chartLock=item.Frame.LockPaint;
-            if (!chartLock || !chartLock.LockRect) continue;
-
-            var tooltip=new TooltipData();
-            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
-
-            tooltip.HQChart=this;
-            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
-            if (event && event.Callback) 
-            {
-                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
-                event.Callback(event,sendData,this);
-            }
-
-            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
-            return true;
-        }
-
-        return false;
-    }
-
     this.TryClickIndexTitle=function(x,y)
     {
         for(var i in this.TitlePaint)
@@ -96554,34 +96604,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return false;
     }
-
-    this.TryClickLock=function(x,y)
-    {
-        for(var i=0;i<this.Frame.SubFrame.length; ++i)
-        {
-            var item=this.Frame.SubFrame[i];
-            var chartLock=item.Frame.LockPaint;
-            if (!chartLock || !chartLock.LockRect) continue;
-
-            var tooltip=new TooltipData();
-            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
-
-            tooltip.HQChart=this;
-
-            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
-            if (event && event.Callback) 
-            {
-                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
-                event.Callback(event,sendData,this);
-            }
-
-
-            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
-            return true;
-        }
-
-        return false;
-    }
 }
 
 //盘前数据
@@ -98533,6 +98555,7 @@ function KLineChartHScreenContainer(uielement)
             frame.RightSpaceCount=this.RightSpaceCount; //右边
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
             frame.GlobalOption=this.GlobalOption;
+            frame.CreateLockPaint();
 
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
@@ -98721,6 +98744,7 @@ function MinuteChartHScreenContainer(uielement)
             frame.XPointCount=243;
             frame.HQChart=this;
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+            frame.CreateLockPaint();
 
             var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
             frame.HorizontalMax=DEFAULT_HORIZONTAL[0];
@@ -105407,7 +105431,7 @@ function JSDivFrameToolbar()
         {
             var item=aryButton[i];
             if (!item.ID || !item.ClassName) continue;
-            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null };
+            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null, SpanText:item.SpanText };
             if (item.Tooltip && item.Tooltip.Text) newItem.Tooltip={ Text:item.Tooltip.Text };
 
             this.AryButton.push(newItem);
@@ -105438,7 +105462,7 @@ function JSDivFrameToolbar()
         if (!frame && this.FrameID>=0 && this.FrameID<this.HQChart.Frame.SubFrame.length) 
             frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;
 
-        var aryDefaultButton=JSDivFrameToolbar.GetDfaultButtons();
+        var aryDefaultButton=JSDivFrameToolbar.GetDfaultButtons(frame);
         var aryButton=[];
         for(var i=0;i<aryDefaultButton.length; i++)
         {
@@ -105496,8 +105520,6 @@ function JSDivFrameToolbar()
         this.SetToolbar(aryButton); //重新设置按钮
     }
 
-    
-
     this.Destroy=function()
     {
         if (this.DivToolbar) 
@@ -105565,6 +105587,7 @@ function JSDivFrameToolbar()
         var spanDom=document.createElement("span");
         spanDom.className=item.ClassName;
         spanDom.onmousedown=(e)=>{ this.OnClickButton(e, item); };
+        if (item.SpanText) spanDom.innerText=item.SpanText;
         item.Span=spanDom;
         btnDiv.appendChild(spanDom);
 
@@ -105649,7 +105672,7 @@ function JSDivFrameToolbar()
     }
 }
 
-JSDivFrameToolbar.GetDfaultButtons=function()
+JSDivFrameToolbar.GetDfaultButtons=function(frame)
 {
     var aryButton=
     [
@@ -105673,12 +105696,50 @@ JSDivFrameToolbar.GetDfaultButtons=function()
             ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close", Tooltip:{ Text:"关闭窗口"},
             Span:null,Div:null, TooltipSpan:null
         },
+
+        /*
+        { 
+            ID:"TEST_8889", ClassName:"UMyChart_FrameToolbar_Span_Text", Tooltip:{ Text:"测试按钮提示"}, SpanText:"测试按钮",
+            Span:null, Div:null, TooltipSpan:null
+        },
+        */
     ];
 
     return aryButton
 }
 
 
+
+//DOM工厂类
+function JSDOMFactory()
+{
+    //[key:name, { Create:function(divElement) { return new class(divElement); }} ]
+    this.DataMap=new Map(
+    [
+        ["JSDivFrameToolbar", { Create:function(option) { return new JSDivFrameToolbar(option); } }],
+    ]); 
+
+    this.Create=function(name, option)
+    {
+        if (!this.DataMap.has(name)) 
+        {
+            JSConsole.Chart.Warn(`[JSDOMFactory::Create] can't find class=${name}.`);
+            return null;
+        }
+
+        var item=this.DataMap.get(name);
+        return item.Create(option);
+    }
+
+    this.Add=function(name, option)
+    {
+        this.DataMap.set(name, { Create:option.Create } );
+    }
+}
+
+var g_JSDOMFactory=new JSDOMFactory();
+
+
 function JSToolbarTooltip()
 {
     this.DivTooltip=null;

package/src/jscommon/umychart.testdata.js

@@ -351,7 +351,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
 
         //盘中
-        stockItem.minute.length=50;
+        //stockItem.minute.length=50;
          //测试用 这里可以修改数据
         //var lastItem=srcStock.minute[srcStock.minute.length-1];
         //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
@@ -1967,6 +1967,9 @@ HQData.Report_RequestStockData=function(data, callback)
                 var testDate=new Date();
                 testDate.setHours(testDate.getHours() + i*2)
                 newItem[401]={ DateTime:testDate } ;
+
+
+                newItem[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]={ Value:"ddddd" };
                 
 
                 item.Data=newItem;
@@ -2684,6 +2687,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_SCATTER_PLOT_V2(data, callback);
     else if (request.Data.indexname=="API_KLINE_TABLE")
         HQData.APIIndex_KLINE_TABLE(data, callback);
+    else if (request.Data.indexname=="API_MINUTE_TABLE")
+        HQData.APIIndex_MINUTE_TABLE(data, callback);
     else if (request.Data.indexname=="API_DRAWSVG")
         HQData.APIIndex_DRAWSVG(data, callback); 
     else if (request.Data.indexname=="API_BASELINE_BAR")
@@ -2691,6 +2696,9 @@ HQData.Report_APIIndex=function(data, callback)
     else if (request.Data.indexname=="API_VERTLINE")
         HQData.APIIndex_VERTLINE(data, callback);
 
+    else if (request.Data.indexname=="API_ERRORMESSAGE")
+        HQData.APIIndex_ErrorMessage(data, callback);
+
 
     //付费图形
     else if (request.Data.indexname=="API_MARK_AREA_V2")
@@ -3886,6 +3894,114 @@ HQData.APIIndex_KLINE_TABLE=function(data, callback)
 }
 
 
+HQData.APIIndex_MINUTE_TABLE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=data.HQChart.GetKData(); //hqchart图形的分钟数据
+
+    var tableData= 
+    { 
+        name:'JS_CHART_MINUTETABLE_9DFC', type:1, 
+        Draw: 
+        { 
+            DrawType:'JS_CHART_MINUTETABLE_9DFC', 
+            DrawData:[ ] ,                                      //数据  [ [ { Text, Color: BGColor }, ...... ], [],]
+
+            Config:
+            {
+                //BGColor:"rgba(238,232,205,0.5)",
+                //BorderColor:"rgb(220,220,220)",
+                TextColor:"rgb(250,250,250)",
+                ItemMergin:{ Left:1, Right:1, Top:0, Bottom:0, YOffset:0 },
+                TextFont:{ Family:'微软雅黑' , FontMaxSize:14*GetDevicePixelRatio(), },
+                Style:1,
+                CellWidth:18*GetDevicePixelRatio(),
+                CellHeight:14*GetDevicePixelRatio(),
+                RowCount:2,
+                LineColor:"rgb(5,105,225)",
+                LineDash:[5*GetDevicePixelRatio(),5*GetDevicePixelRatio()],
+            }
+        },
+        
+    };
+
+    for(var i=0;i<kData.Data.length;++i)   
+    {
+        var kItem=kData.Data[i];
+
+        //一列数据
+        var colItem={ Date:kItem.Date, Time:kItem.Time, Data:[ ] };
+
+        if (kItem.Time==1030 || kItem.Time==1035)
+        {
+            colItem.Data[0]= 
+            {
+                Text:"多", Color:"rgb(250,250,250)", BGColor:'rgb(250,0,0)', TextAlign:"center",
+                Tooltip:
+                {
+                    AryText:
+                    [
+                        {Title:"日期", Text:`${kItem.Date} ${kItem.Time}`},
+                        {Title:"买入价", Text:`${kItem.Close.toFixed(2)}`, TextColor:"rgb(250,0,0)"},
+                        {Title:"数量", Text:`${HQData.GetRandomTestData(100,400).toFixed(0)}`,TextColor:"rgb(255,165,0)" },
+                    ]
+                }
+            };
+        }
+        else if (kItem.Time==1033 || kItem.Time==1025)
+        {
+            colItem.Data[0]= 
+            {
+                Text:"空", Color:"rgb(250,250,250)", BGColor:'rgb(0,128,0)', TextAlign:"center",
+                Tooltip:
+                {
+                    AryText:
+                    [
+                        {Title:"日期", Text:`${kItem.Date} ${kItem.Time}`},
+                        {Title:"买入价", Text:`${kItem.Close.toFixed(2)}`, TextColor:"rgb(250,0,0)"},
+                        {Title:"数量", Text:`${HQData.GetRandomTestData(100,400).toFixed(0)}`,TextColor:"rgb(255,165,0)" },
+                    ]
+                }
+            };
+        }
+        else if (kItem.Time==1028 || kItem.Time==1032 || kItem.Time==1034 )
+        {
+            colItem.Data[1]= 
+            {
+                Text:"平", Color:"rgb(250,250,250)", BGColor:'rgb(255,165,0)', TextAlign:"center",
+                Tooltip:
+                {
+                    AryText:
+                    [
+                        {Title:"日期", Text:`${kItem.Date} ${kItem.Time}`},
+                        {Title:"卖入价", Text:`${kItem.Close.toFixed(2)}`, TextColor:"rgb(34,139,34)"},
+                        {Title:"数量", Text:`${HQData.GetRandomTestData(100,400).toFixed(0)}`,TextColor:"rgb(255,165,0)" },
+                    ]
+                }
+            };
+        }
+        else 
+        {
+            continue;
+        }
+        
+
+        tableData.Draw.DrawData.push(colItem);
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[tableData] } 
+    };
+
+    console.log('[KLineChart::APIIndex_KLINE_TABLE2] apiData ', apiData);
+    callback(apiData);
+}
+
+
 HQData.APIIndex_DRAWSVG=function(data, callback)
 {
     data.PreventDefault=true;
@@ -4274,3 +4390,11 @@ HQData.API_CHART_AREA_TEXT=function(data, callback)
 }
 
 
+HQData.APIIndex_ErrorMessage=function(data, callback)
+{
+    var hqchartData={ outdata:{ date:null, time:null, outvar:[] } , code:0};
+    hqchartData.error={ message:"错误提示信息" };
+    callback(hqchartData);
+}
+
+