hqchart 1.1.14905 → 1.1.14912

package/src/jscommon/umychart.js

@@ -41727,7 +41727,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;    //默认最大值
@@ -41736,6 +41739,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;
@@ -41746,6 +41817,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;
@@ -41913,7 +41992,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);
     }
 }
 
@@ -61856,6 +61967,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;
@@ -62501,6 +62651,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);

package/src/jscommon/umychart.report.js

@@ -5095,7 +5095,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=[];
 
@@ -6979,7 +6979,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);
         }
@@ -7122,10 +7122,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} ] }
+                }
             }
         }
 
@@ -7497,6 +7500,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))
         {

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

@@ -45823,7 +45823,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;    //默认最大值
@@ -45832,6 +45835,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;
@@ -45842,6 +45913,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;
@@ -46009,7 +46088,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);
     }
 }
 
@@ -65952,6 +66063,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;
@@ -66597,6 +66747,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);
@@ -129807,7 +129962,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;
@@ -129819,6 +129974,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)
@@ -129826,11 +129982,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;
     }
 
 
@@ -131401,6 +131566,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();
@@ -142628,7 +142794,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=[];
 
@@ -144512,7 +144678,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);
         }
@@ -144655,10 +144821,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} ] }
+                }
             }
         }
 
@@ -145030,6 +145199,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))
         {
@@ -150915,7 +151093,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14904";
+var HQCHART_VERSION="1.1.14911";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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