hqchart 1.1.14905 → 1.1.14912

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

@@ -45867,7 +45867,10 @@ function ChartBaseLineBar()
     this.ClassName="ChartBaseLineBar";
     this.UpColor=g_JSChartResource.ChartBaseLineBar.UpColor;
     this.DownColor=g_JSChartResource.ChartBaseLineBar.DownColor;
+    this.UpName;
+    this.DownName;
     this.LineWidth=1;
+    this.Style=0;   //0=坐标使用主图坐标  1=独立坐标
     this.IsDrawFirst=true;
     this.AryData=[];    //{ Date, Time, Up, Down }
     this.DefaultMax;    //默认最大值
@@ -45876,6 +45879,74 @@ function ChartBaseLineBar()
     this.YBaseLine;
     this.BarMaxHeight; //{ Up:, Down: }
 
+    this.DrawStyle2=function()
+    {
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var bMinute=this.IsMinuteFrame();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xPointCount=this.ChartFrame.XPointCount;
+        var border=this.ChartFrame.GetBorder();
+
+        if (bHScreen)
+        {
+            var chartright=border.BottomEx;
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
+        }
+
+        this.Canvas.save();
+        this.ClipClient(bHScreen);
+
+        this.YBaseLine=this.ChartFrame.GetYFromData(0, false);
+        var aryUpBar=[], aryDownBar=[];
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var kItem=this.Data.Data[i];
+            if (!kItem) continue;
+            var key=this.BuildKey(kItem);
+            if (!this.MapCache.has(key)) continue;
+
+            var item=this.MapCache.get(key);
+
+            if (bMinute)
+            {
+                var x=this.ChartFrame.GetXFromIndex(j);
+            }
+            else
+            {
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                if (right>chartright) break;
+                var x=left+(right-left)/2;
+            }
+
+            if (IFrameSplitOperator.IsNumber(item.Up))
+            {
+                var value=Math.abs(item.Up);
+                var y=this.ChartFrame.GetYFromData(value, false);
+                
+                aryUpBar.push({ X:x, Y:y});
+            }
+            
+            if (IFrameSplitOperator.IsNumber(item.Down))
+            {
+                var value=Math.abs(item.Down)*-1;
+                var y=this.ChartFrame.GetYFromData(value, false);
+                aryDownBar.push({X:x, Y:y});
+            }
+        }
+
+        this.DrawBars(aryUpBar, this.UpColor);
+        this.DrawBars(aryDownBar,this.DownColor);
+
+        this.Canvas.restore();
+    }
+
     this.Draw=function()
     {
         this.YBaseLine=null;
@@ -45886,6 +45957,14 @@ function ChartBaseLineBar()
         if (!this.HQChart) return;
         if(!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
         if (!IFrameSplitOperator.IsNumber(this.MaxValue)) return;
+
+        if (this.Style==1)
+        {
+            this.DrawStyle2();
+            return;
+        }
+
+
         this.CalculateBaseLine();
 
         if (!IFrameSplitOperator.IsNumber(this.YBaseLine)) return;
@@ -46053,7 +46132,39 @@ function ChartBaseLineBar()
 
     this.GetMaxMin=function()
     {
-        return {Min:null, Max:null};
+        var range={Min:null, Max:null};
+
+        if (this.Style==1)  //独立坐标
+        {
+            if (IFrameSplitOperator.IsNumber(this.DefaultMax)) range.Max=this.DefaultMax;
+            range.Min=0;
+
+            var xPointCount=this.ChartFrame.XPointCount;
+            for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
+            {
+                var kItem=this.Data.Data[i];
+                if (!kItem) continue;
+                var key=this.BuildKey(kItem);
+                if (!this.MapCache.has(key)) continue;
+
+                var item=this.MapCache.get(key);
+                var value=Math.abs(item.Up);
+                if (range.Max==null || range.Max<value) range.Max=value;
+                var value=Math.abs(item.Down)*-1;
+                if (range.Min>value) range.Min=value;
+            }
+        }
+        
+        return range;
+    }
+
+    this.GetItem=function(kItem)
+    {
+        if (!this.MapCache || this.MapCache.size<=0) return null;
+        var key=this.BuildKey(kItem);
+        if (!this.MapCache.has(key)) return null;
+
+        return this.MapCache.get(key);
     }
 }
 
@@ -65996,6 +66107,45 @@ function DynamicChartTitlePainting()
         return aryText;
     }
 
+    this.FormatBaseLineBarTitle=function(kItem, dataInfo)
+    {
+        var result=null;
+        var aryText=[];
+
+        if (!kItem) return result;
+        if (!dataInfo.Chart) return result;
+
+        var chart=dataInfo.Chart;
+        var item=chart.GetItem(kItem);
+        if (!item) return result;
+        if (!IFrameSplitOperator.IsNumber(item.Up) && !IFrameSplitOperator.IsNumber(item.Down)) return result;
+
+        result={ Text:null, ArrayText:aryText };
+        if (IFrameSplitOperator.IsNumber(item.Up))
+        {
+            var textItem={ Name:null, Text:null };
+            textItem.Text=this.FormatValue(item.Up, dataInfo);
+            
+            if (chart.UpName) textItem.Name=chart.UpName;
+            if (chart.UpColor) textItem.Color=chart.UpColor;
+            aryText.push(textItem);
+        }
+
+        if (IFrameSplitOperator.IsNumber(item.Down))
+        {
+            var textItem={ Name:null, Text:null };
+            textItem.Text=this.FormatValue(item.Down,dataInfo);
+            if (chart.DownName) textItem.Name=chart.DownName;
+            if (chart.DownColor) textItem.Color=chart.DownColor;
+
+            if (aryText.length>0)  textItem.LeftSpace=3;
+
+            aryText.push(textItem);
+        }
+
+        return result;
+    }
+
     this.FormatKLineTitle=function(item, dataInfo)
     {
         if (!item) return null;
@@ -66641,6 +66791,11 @@ function DynamicChartTitlePainting()
             {
                 return null;
             }
+            else if (item.DataType=="ChartBaseLineBar")
+            {
+                var outTitle=this.FormatBaseLineBarTitle(value, item);
+                return outTitle;
+            }
             else if (g_ScriptIndexChartFactory.Has(item.DataType)) //外部挂接
             {
                 var find=g_ScriptIndexChartFactory.Get(item.DataType);
@@ -129851,7 +130006,7 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
-    this.CreateBaseLineBar=function(hqChart,windowIndex,varItem,id)
+    this.CreateBaseLineBar=function(hqChart,windowIndex,varItem,i)
     {
         var chart=new ChartBaseLineBar();
         chart.Canvas=hqChart.Canvas;
@@ -129863,6 +130018,7 @@ function ScriptIndex(name,script,args,option)
 
         chart.Data=hqChart.GetKData();      //绑定K线
         chart.AryData=varItem.Draw.DrawData;
+        chart.Style=1;                     //主图使用独立坐标模式
 
         var config=varItem.Draw.Config;
         if (config)
@@ -129870,11 +130026,20 @@ function ScriptIndex(name,script,args,option)
             if (config.UpColor) chart.UpColor=config.UpColor;
             if (config.DownColor) chart.DownColor=config.DownColor;
             if (IFrameSplitOperator.IsNumber(config.DefaultMax)) chart.DefaultMax=config.DefaultMax;
+            if (IFrameSplitOperator.IsNumber(config.Style)) chart.Style=config.Style;
+            if (config.UpName) chart.UpName=config.UpName;
+            if (config.DownName) chart.DownName=config.DownName;
         }
         
         chart.BuildCacheData();
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
+
+        var titleIndex=windowIndex+1;
+        var titleData=new DynamicTitleData(chart.Data,null,chart.Color);
+        titleData.DataType="ChartBaseLineBar";
+        titleData.Chart=chart;
+        hqChart.TitlePaint[titleIndex].Data[i]=titleData;
     }
 
 
@@ -131445,6 +131610,7 @@ function OverlayScriptIndex(name,script,args,option)
             if (config.UpColor) chart.UpColor=config.UpColor;
             if (config.DownColor) chart.DownColor=config.DownColor;
             if (IFrameSplitOperator.IsNumber(config.DefaultMax)) chart.DefaultMax=config.DefaultMax;
+            if (IFrameSplitOperator.IsNumber(config.Style)) chart.Style=config.Style;
         }
         
         chart.BuildCacheData();
@@ -142672,7 +142838,7 @@ function ChartReport()
     this.RectClient={};
 
     //{ Rect:rtItem, Stock:stock, Index:index, Column:column, RowType:rowType, Type:drawInfo.Tooltip.Type, Data:{ AryText:[ {Text:xx} ]} };
-    //Type:1=数据截断 2=表头提示信息  20=分时图
+    //Type:1=数据截断 2=表头提示信息  4=提示信息 20=分时图 21=K线
     // { Text, Color, Title:, TitleColor, Space, Margin:{ Left, Top, Right, Bottom }}
     this.TooltipRect=[];
 
@@ -144556,7 +144722,7 @@ function ChartReport()
         //tooltip提示
         if (drawInfo.Tooltip)
         {
-            //Type:1=数据截断
+            //Type:1=数据截断 4=提示信息
             var tooltipData={ Rect:rtItem, Stock:stock, Index:index, Column:column, RowType:rowType, Type:drawInfo.Tooltip.Type, Data:drawInfo.Tooltip.Data };
             this.TooltipRect.push(tooltipData);
         }
@@ -144699,10 +144865,13 @@ function ChartReport()
             this.Canvas.clip();
 
             //数据截断提示信息
-            drawInfo.Tooltip=
-            { 
-                Type:1, 
-                Data:{ AryText:[ {Text:drawInfo.Text} ] }
+            if (!drawInfo.Tooltip)
+            {
+                drawInfo.Tooltip=
+                { 
+                    Type:1, 
+                    Data:{ AryText:[ {Text:drawInfo.Text} ] }
+                }
             }
         }
 
@@ -145074,6 +145243,15 @@ function ChartReport()
             if (item.Text) drawInfo.Text=item.Text;
             if (item.TextColor) drawInfo.TextColor=item.TextColor;
             if (item.BGColor) drawInfo.BGColor=item.BGColor;
+
+            if (item.Tooltip && IFrameSplitOperator.IsNonEmptyArray(item.Tooltip.AryText))
+            {
+                drawInfo.Tooltip=
+                { 
+                    Type:4, 
+                    Data:{ AryText:item.Tooltip.AryText }
+                }
+            }
         }
         else if (IFrameSplitOperator.IsString(item))
         {
@@ -156886,6 +157064,10 @@ function JSTooltipKLineChart()
 
     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=null;
 
     this.KLine=
@@ -156931,6 +157113,35 @@ function JSTooltipKLineChart()
         if (this.HQChart) this.KLine.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);
         this.KLine.Option.OnCreatedCallback=(chart)=>{ this.OnCreateHQChart(chart); }
         this.KLine.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.KLine.Option.EventCallback))
+        {
+            this.KLine.Option.EventCallback.unshift(reloadResourceEvent,splitYEvent,splitYEvent);
+        }
+        else
+        {
+            this.KLine.Option.EventCallback=[reloadResourceEvent,splitXEvent,splitYEvent];
+        }
+
+
         chart.SetOption(this.KLine.Option);  //设置K线配置
 
         document.body.appendChild(divDom);
@@ -156960,6 +157171,8 @@ function JSTooltipKLineChart()
 
     this.OnCreateHQChart=function(chart)
     {
+        this.LoadChartResource(chart);
+
         if (this.OnCreatedCallback) this.OnCreatedCallback(chart);
     }
 
@@ -157041,6 +157254,10 @@ function JSTooltipKLineChart()
         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();
@@ -157048,6 +157265,63 @@ function JSTooltipKLineChart()
         if (this.KLine.JSChart) this.KLine.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;
+            }
+        }
+    }
+
 }
 
 JSTooltipKLineChart.GetKLineOption=function()
@@ -158908,6 +159182,10 @@ function JSFloatTooltip()
             {
                 this.ReportCellTruncateTooltip(data);
             }
+            else if (tooltipData.Type==4)   //单元格提示信息
+            {
+                this.ReportCellTooltip(data);
+            }
         }
         else if (data.DataType==4)  //T型报价
         {
@@ -159194,6 +159472,18 @@ function JSFloatTooltip()
         this.ShowTooltip(data);
     }
 
+    //单元格提示信息
+    this.ReportCellTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !IFrameSplitOperator.IsNonEmptyArray(tooltipData.Data.AryText)) return;
+        
+        this.AryText=tooltipData.Data.AryText;
+        this.UpdateTableDOM();
+
+        this.ShowTooltip(data);
+    }
+
     //表格单元格截断内容
     this.ReportCellTruncateTooltip=function(data)
     {
@@ -159244,7 +159534,8 @@ function JSFloatTooltip()
             if (outItem.HTMLTitle) item.TitleSpan.innerHTML=outItem.HTMLTitle
             else item.TitleSpan.innerText=outItem.Title;
 
-            item.TitleSpan.style.color=this.TextColor;
+            if (outItem.TitleColor) item.TitleSpan.style.color=outItem.TitleColor;
+            else item.TitleSpan.style.color=this.TextColor;
 
             if (outItem.HTMLText) item.TextSpan.innerHTML=outItem.HTMLText
             else item.TextSpan.innerText=outItem.Text;
@@ -162135,7 +162426,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14904";
+var HQCHART_VERSION="1.1.14911";
 
 function PrintHQChartVersion()
 {