hqchart 1.1.14903 → 1.1.14910

package/src/jscommon/umychart.js

@@ -41728,6 +41728,7 @@ function ChartBaseLineBar()
     this.UpColor=g_JSChartResource.ChartBaseLineBar.UpColor;
     this.DownColor=g_JSChartResource.ChartBaseLineBar.DownColor;
     this.LineWidth=1;
+    this.Style=0;   //0=坐标使用主图坐标  1=独立坐标
     this.IsDrawFirst=true;
     this.AryData=[];    //{ Date, Time, Up, Down }
     this.DefaultMax;    //默认最大值
@@ -41736,6 +41737,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 +41815,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 +41990,30 @@ 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;
     }
 }
 

package/src/jscommon/umychart.report.js

@@ -1515,7 +1515,7 @@ function JSReportChartContainer(uielement)
             return;
         }
 
-        if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+        //if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
         if (this.SortInfo && this.SortInfo.Field>=0 && this.SortInfo.Sort>0)
         {
             var column=chart.Column[this.SortInfo.Field];
@@ -1527,7 +1527,7 @@ function JSReportChartContainer(uielement)
         }
 
         var arySymbol=chart.ShowSymbol;
-        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return;
+        //if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return;
         this.RequestStockData(arySymbol);
     }
 
@@ -4382,10 +4382,15 @@ function JSReportChartContainer(uielement)
         if (!chart) return;
 
         var self=this;
-        var startIndex=this.Data.YOffset;
         var pageSize=chart.GetPageSize();
-        var endIndex=startIndex+pageSize;
-        if (endIndex>=this.Data.Data.length) endIndex=this.Data.Data.length-1;
+        var endIndex=0;
+        var startIndex=0;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) 
+        {
+            startIndex=this.Data.YOffset;
+            endIndex=startIndex+pageSize;
+            if (endIndex>=this.Data.Data.length) endIndex=this.Data.Data.length-1;
+        }
 
         if (this.NetworkFilter)
         {
@@ -5090,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=[];
 
@@ -6974,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);
         }
@@ -7117,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} ] }
+                }
             }
         }
 
@@ -7492,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

@@ -45824,6 +45824,7 @@ function ChartBaseLineBar()
     this.UpColor=g_JSChartResource.ChartBaseLineBar.UpColor;
     this.DownColor=g_JSChartResource.ChartBaseLineBar.DownColor;
     this.LineWidth=1;
+    this.Style=0;   //0=坐标使用主图坐标  1=独立坐标
     this.IsDrawFirst=true;
     this.AryData=[];    //{ Date, Time, Up, Down }
     this.DefaultMax;    //默认最大值
@@ -45832,6 +45833,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 +45911,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 +46086,30 @@ 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;
     }
 }
 
@@ -129826,6 +129926,7 @@ 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;
         }
         
         chart.BuildCacheData();
@@ -131401,6 +131502,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();
@@ -139048,7 +139150,7 @@ function JSReportChartContainer(uielement)
             return;
         }
 
-        if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+        //if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
         if (this.SortInfo && this.SortInfo.Field>=0 && this.SortInfo.Sort>0)
         {
             var column=chart.Column[this.SortInfo.Field];
@@ -139060,7 +139162,7 @@ function JSReportChartContainer(uielement)
         }
 
         var arySymbol=chart.ShowSymbol;
-        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return;
+        //if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return;
         this.RequestStockData(arySymbol);
     }
 
@@ -141915,10 +142017,15 @@ function JSReportChartContainer(uielement)
         if (!chart) return;
 
         var self=this;
-        var startIndex=this.Data.YOffset;
         var pageSize=chart.GetPageSize();
-        var endIndex=startIndex+pageSize;
-        if (endIndex>=this.Data.Data.length) endIndex=this.Data.Data.length-1;
+        var endIndex=0;
+        var startIndex=0;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) 
+        {
+            startIndex=this.Data.YOffset;
+            endIndex=startIndex+pageSize;
+            if (endIndex>=this.Data.Data.length) endIndex=this.Data.Data.length-1;
+        }
 
         if (this.NetworkFilter)
         {
@@ -142623,7 +142730,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=[];
 
@@ -144507,7 +144614,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);
         }
@@ -144650,10 +144757,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} ] }
+                }
             }
         }
 
@@ -145025,6 +145135,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))
         {
@@ -150910,7 +151029,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14902";
+var HQCHART_VERSION="1.1.14909";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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