hqchart 1.1.13569 → 1.1.13577

package/src/jscommon/umychart.report.js

@@ -3150,7 +3150,7 @@ function JSReportChartContainer(uielement)
         switch(cmdID)
         {
             case JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID:
-                if (srcParam) this.ChangeSymbol(param);
+                if (srcParam) this.ChangeSymbol(srcParam);
                 break;
         }
     }
@@ -3681,6 +3681,7 @@ var REPORT_COLUMN_ID=
     CUSTOM_ICON_ID:103,             //自定义图标
     CUSTOM_CHECKBOX_ID:104,         //自定义checkbox
     CUSTOM_BUTTON_ID:105,           //自定义按钮
+    CUSTOM_PROGRESS_ID:106,         //进度条
 }
 
 var MAP_COLUMN_FIELD=new Map([
@@ -4064,6 +4065,13 @@ function ChartReport()
                 if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
                 if (item.Button) colItem.Button=CloneData(item.Button);
             }
+            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
+            {
+                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
+                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+                if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
+            }
             else if (item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID)
             {
 
@@ -4181,7 +4189,8 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID, Title:"",  TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() },
 
-            { Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID, Title:"", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() }
+            { Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID, Title:"", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
+            { Type:REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID, Title:"进度条", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() }
         ];
 
         for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -5154,6 +5163,15 @@ function ChartReport()
             
             this.GetCustomButtonDrawInfo(data, column, drawInfo);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
+        {
+            rtItem={ Left:left, Top:top,  Width:column.Width, Height:this.RowHeight };
+            rtItem.Right=rtItem.Left+rtItem.Width;
+            rtItem.Bottom=rtItem.Top+rtItem.Height;
+            drawInfo.Rect=rtItem;
+            
+            this.GetCustomProgressBarDrawInfo(data, column, drawInfo);
+        }
         
 
         //拖拽行颜色
@@ -5176,6 +5194,10 @@ function ChartReport()
         {
             this.DrawButton(drawInfo, left, top, itemWidth);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
+        {
+            this.DrawProgressBar(drawInfo, left, top, itemWidth);
+        }
         else
         {
             if (data.FlashBG && data.FlashBG.Data && column.ID!=undefined)
@@ -5491,6 +5513,22 @@ function ChartReport()
         if (IFrameSplitOperator.IsBool(buttonData.Enable)) drawInfo.Enable=buttonData.Enable;
     }
 
+    this.GetCustomProgressBarDrawInfo=function(data, column, drawInfo)
+    {
+        var barData=this.GetExtendData(data, column);
+        if (!barData) return;
+
+        drawInfo.Text=barData.Title;
+        drawInfo.ProgressBar=column.ProgressBar;
+        drawInfo.Enable=true;
+        drawInfo.Value=barData.Value;   //占比
+        drawInfo.Data=barData;
+        if (IFrameSplitOperator.IsBool(barData.Enable)) drawInfo.Enable=barData.Enable;
+        if (barData.TextColor) drawInfo.TextColor=barData.TextColor;
+        if (barData.BarColor) drawInfo.BarColor=barData.BarColor;
+        if (barData.BGColor) drawInfo.BGColor=barData.BGColor;
+    }
+
     this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
     {
         if (!IFrameSplitOperator.IsNumber(stock.Time)) return;
@@ -5833,6 +5871,67 @@ function ChartReport()
         }
     }
 
+    this.DrawProgressBar=function(drawInfo, left, top, width)
+    {
+        if (!drawInfo.ProgressBar) return;
+
+        var config=drawInfo.ProgressBar;
+        var rtBG=
+        { 
+            Left:left+config.Margin.Left, Top:top+config.Margin.Top, 
+            Height:this.RowHeight-config.Margin.Top-config.Margin.Bottom, 
+            Width:width-config.Margin.Left-config.Margin.Right
+        }
+        rtBG.Right=rtBG.Left+rtBG.Width;
+        rtBG.Bottom=rtBG.Top+rtBG.Height;
+
+        var bgColor=config.BGColor;
+        var barColor=config.BarColor;
+        var textColor=config.TextColor;
+        if (drawInfo.Enable===false)
+        {
+            bgColor=config.Disable.BGColor;
+            barColor=config.Disable.BarColor;
+            textColor=config.Disable.TextColor;
+        }
+
+        if (drawInfo.BGColor) bgColor=drawInfo.BGColor;
+        if (drawInfo.TextColor) textColor=drawInfo.TextColor;
+        if (drawInfo.BarColor) barColor=drawInfo.BarColor;
+
+        if (bgColor)
+        {
+            this.Canvas.fillStyle=bgColor;
+            this.Canvas.fillRect(rtBG.Left, rtBG.Top,rtBG.Width,rtBG.Height);
+        }
+
+        var fullBarWidth=rtBG.Width-config.BarMargin.Left-config.BarMargin.Right;
+        var value=drawInfo.Value;   // 0-1 进度条
+        var rtBar={ Left:rtBG.Left+config.BarMargin.Left, Top:rtBG.Top+config.BarMargin.Top, Bottom:rtBG.Bottom-config.BarMargin.Bottom, Width:0 };
+        if (value>0)
+        {
+            if (value>1) value=1;
+            rtBar.Width=fullBarWidth*value;
+            rtBar.Height=rtBar.Bottom-rtBar.Top;
+            if (rtBar.Width<1) rtBG.Width=1;
+    
+            this.Canvas.fillStyle=barColor;
+            this.Canvas.fillRect(rtBar.Left, rtBar.Top,rtBar.Width,rtBar.Height);
+        }
+
+        if (textColor && drawInfo.Text)
+        {
+            this.Canvas.font=config.Font;
+            this.Canvas.textBaseline="bottom";
+            this.Canvas.textAlign="left";
+
+            this.Canvas.fillStyle=textColor;
+            var xText=rtBar.Left+config.TextMargin.Left;
+            var yText=rtBar.Bottom-config.TextMargin.Bottom;
+            this.Canvas.fillText(drawInfo.Text, xText, yText);
+        }
+    }
+
     //字体由外面设置
     this.TextEllipsis=function(text, maxWidth, maxText)
     {

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

@@ -60283,6 +60283,7 @@ IChartDrawPicture.ArrayDrawPricture=
     { Name:"价格通道线", ClassName:'ChartDrawPicturePriceChannel',  Create:function() { return new ChartDrawPicturePriceChannel(); }},
     { Name:"文本", ClassName:'ChartDrawPictureText', Create:function() { return new ChartDrawPictureText(); }},
     { Name:"江恩角度线", ClassName:'ChartDrawPictureGannFan',  Create:function() { return new ChartDrawPictureGannFan(); }},
+    { Name:"江恩角度线2", ClassName:'ChartDrawPictureGannFan',  Create:function() { return new ChartDrawPictureGannFanV2(); }},
     { Name:"阻速线", ClassName:'ChartDrawPictureResistanceLine',  Create:function() { return new ChartDrawPictureResistanceLine(); }},
     { Name:"阻速线2", ClassName:'ChartDrawPictureResistanceLineV2',  Create:function() { return new ChartDrawPictureResistanceLineV2(); }},
     { Name:"黄金分割", ClassName:'ChartDrawPictureGoldenSection',  Create:function() { return new ChartDrawPictureGoldenSection(); }},
@@ -63681,6 +63682,7 @@ function ChartDrawPictureGannFan()
     this.LineDash=[5,10];
     this.EnableDottedLine=false;    //辅助线是否使用虚线
     this.EnableArea=true;           //是否绘制面积图
+    this.IsShowTitle=true;
 
     this.Super_SetOption=this.SetOption;    //父类函数
 
@@ -63693,10 +63695,10 @@ function ChartDrawPictureGannFan()
             if (Array.isArray(option.LineDash)) this.LineDash=option.LineDash;
             if (IFrameSplitOperator.IsBool(option.EnableDottedLine)) this.EnableDottedLine=option.EnableDottedLine;
             if (IFrameSplitOperator.IsBool(option.EnableArea)) this.EnableArea=option.EnableArea;
+            if (IFrameSplitOperator.IsBool(option.IsShowTitle)) this.IsShowTitle=option.IsShowTitle;
         }
     }
 
-
     this.Draw=function()
     {
         this.LinePoint=[];
@@ -63717,16 +63719,19 @@ function ChartDrawPictureGannFan()
             this.CalculateLines(drawPoint[0],drawPoint[1],quadrant);
             if (this.EnableArea) this.DrawArea();
 
-            for(var i in this.LinePoint)
+            for(var i=0; i<this.LinePoint.length; ++i)
             {
                 var item=this.LinePoint[i];
                 this.DrawLine(item.Start,item.End,item.IsDottedLine);
             }
 
-            for(var i in this.LinePoint)
+            if (this.IsShowTitle)
             {
-                var item =this.LinePoint[i];
-                if (item.Text && item.PtEnd) this.DrawTitle(item.PtEnd,item.Text);
+                for(var i=0; i<this.LinePoint.length; ++i)
+                {
+                    var item =this.LinePoint[i];
+                    if (item.Text && item.PtEnd) this.DrawTitle(item.PtEnd,item.Text);
+                }
             }
         }
         else
@@ -63938,13 +63943,68 @@ function ChartDrawPictureGannFan()
     }
 }
 
+
+//江恩角度线（Gann Fan） 通达信版本
+function ChartDrawPictureGannFanV2()
+{
+    this.newMethod=ChartDrawPictureGannFan;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartDrawPictureGannFanV2';
+    this.EnableDottedLine=true;    //辅助线是否使用虚线
+    this.LineDash=[4,8];
+    this.EnableArea=false;
+
+    this.Super_CalculateLines=this.CalculateLines;
+
+    this.CalculateLines=function(ptStart,ptEnd,quadrant)
+    {
+        if (!this.Super_CalculateLines(ptStart,ptEnd,quadrant)) return false;
+
+        var border=this.Frame.ChartBorder.GetBorder();
+        if (quadrant==1)
+        {
+            var line={ Start:ptStart, End:{ X:border.Right, Y:ptStart.Y}, IsDottedLine:false, PtEnd:null, Text:null };
+            this.LinePoint.push(line);
+
+            var line={ Start:ptStart, End:{ X:ptStart.X, Y:border.TopEx }, IsDottedLine:false, PtEnd:null, Text:null };
+            this.LinePoint.push(line);
+        }
+        else if (quadrant==2)
+        {
+            var line={ Start:ptStart, End:{ X:ptStart.X, Y:border.TopEx }, IsDottedLine:false, PtEnd:null, Text:null };
+            this.LinePoint.push(line);
+
+            var line={ Start:ptStart, End:{ X:border.Left, Y:ptStart.Y}, IsDottedLine:false, PtEnd:null, Text:null };
+            this.LinePoint.push(line);
+        }
+        else if (quadrant==3)
+        {
+            var line={ Start:ptStart, End:{ X:border.Left, Y:ptStart.Y}, IsDottedLine:false, PtEnd:null, Text:null };
+            this.LinePoint.push(line);
+
+            var line={ Start:ptStart, End:{ X:ptStart.X, Y:border.BottomEx }, IsDottedLine:false, PtEnd:null, Text:null };
+            this.LinePoint.push(line);
+        }
+        else if (quadrant==4)
+        {
+            var line={ Start:ptStart, End:{ X:ptStart.X, Y:border.BottomEx }, IsDottedLine:false, PtEnd:null, Text:null };
+            this.LinePoint.push(line);
+
+            var line={ Start:ptStart, End:{ X:border.Right, Y:ptStart.Y}, IsDottedLine:false, PtEnd:null, Text:null };
+            this.LinePoint.push(line);
+        }
+    }
+}
+
 //阻速线  （高 3等份）
 function ChartDrawPictureResistanceLine()
 {
     this.newMethod=ChartDrawPictureGannFan;   //派生
     this.newMethod();
     delete this.newMethod;
-
+    
     this.ClassName='ChartDrawPictureResistanceLine';
 
     //计算线段
@@ -64083,6 +64143,7 @@ function ChartDrawPictureResistanceLineV2()
     this.EnableDottedLine=true;    //辅助线是否使用虚线
     this.LineDash=[4,8];
     this.EnableArea=false;
+    this.IsShowTitle=false;
 }
 
 
@@ -128501,7 +128562,7 @@ function JSReportChartContainer(uielement)
         switch(cmdID)
         {
             case JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID:
-                if (srcParam) this.ChangeSymbol(param);
+                if (srcParam) this.ChangeSymbol(srcParam);
                 break;
         }
     }
@@ -129032,6 +129093,7 @@ var REPORT_COLUMN_ID=
     CUSTOM_ICON_ID:103,             //自定义图标
     CUSTOM_CHECKBOX_ID:104,         //自定义checkbox
     CUSTOM_BUTTON_ID:105,           //自定义按钮
+    CUSTOM_PROGRESS_ID:106,         //进度条
 }
 
 var MAP_COLUMN_FIELD=new Map([
@@ -129415,6 +129477,13 @@ function ChartReport()
                 if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
                 if (item.Button) colItem.Button=CloneData(item.Button);
             }
+            else if (item.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
+            {
+                if (!IFrameSplitOperator.IsNumber(item.DataIndex) && !IFrameSplitOperator.IsNumber(item.BlockIndex)) continue;
+                if (IFrameSplitOperator.IsNumber(item.DataIndex)) colItem.DataIndex=item.DataIndex;                  //数据在扩展数据索引列
+                if (IFrameSplitOperator.IsNumber(item.BlockIndex)) colItem.BlockIndex=item.BlockIndex;
+                if (item.ProgressBar) colItem.ProgressBar=CloneData(item.ProgressBar);
+            }
             else if (item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID)
             {
 
@@ -129532,7 +129601,8 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID, Title:"",  TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() },
 
-            { Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID, Title:"", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() }
+            { Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID, Title:"", TextAlign:"center", FixedWidth:50*GetDevicePixelRatio() },
+            { Type:REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID, Title:"进度条", TextAlign:"center", FixedWidth:100*GetDevicePixelRatio() }
         ];
 
         for(var i=0;i<DEFAULT_COLUMN.length;++i)
@@ -130505,6 +130575,15 @@ function ChartReport()
             
             this.GetCustomButtonDrawInfo(data, column, drawInfo);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
+        {
+            rtItem={ Left:left, Top:top,  Width:column.Width, Height:this.RowHeight };
+            rtItem.Right=rtItem.Left+rtItem.Width;
+            rtItem.Bottom=rtItem.Top+rtItem.Height;
+            drawInfo.Rect=rtItem;
+            
+            this.GetCustomProgressBarDrawInfo(data, column, drawInfo);
+        }
         
 
         //拖拽行颜色
@@ -130527,6 +130606,10 @@ function ChartReport()
         {
             this.DrawButton(drawInfo, left, top, itemWidth);
         }
+        else if (column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID)
+        {
+            this.DrawProgressBar(drawInfo, left, top, itemWidth);
+        }
         else
         {
             if (data.FlashBG && data.FlashBG.Data && column.ID!=undefined)
@@ -130842,6 +130925,22 @@ function ChartReport()
         if (IFrameSplitOperator.IsBool(buttonData.Enable)) drawInfo.Enable=buttonData.Enable;
     }
 
+    this.GetCustomProgressBarDrawInfo=function(data, column, drawInfo)
+    {
+        var barData=this.GetExtendData(data, column);
+        if (!barData) return;
+
+        drawInfo.Text=barData.Title;
+        drawInfo.ProgressBar=column.ProgressBar;
+        drawInfo.Enable=true;
+        drawInfo.Value=barData.Value;   //占比
+        drawInfo.Data=barData;
+        if (IFrameSplitOperator.IsBool(barData.Enable)) drawInfo.Enable=barData.Enable;
+        if (barData.TextColor) drawInfo.TextColor=barData.TextColor;
+        if (barData.BarColor) drawInfo.BarColor=barData.BarColor;
+        if (barData.BGColor) drawInfo.BGColor=barData.BGColor;
+    }
+
     this.FormaTimeDrawInfo=function(column, stock, drawInfo, data)
     {
         if (!IFrameSplitOperator.IsNumber(stock.Time)) return;
@@ -131184,6 +131283,67 @@ function ChartReport()
         }
     }
 
+    this.DrawProgressBar=function(drawInfo, left, top, width)
+    {
+        if (!drawInfo.ProgressBar) return;
+
+        var config=drawInfo.ProgressBar;
+        var rtBG=
+        { 
+            Left:left+config.Margin.Left, Top:top+config.Margin.Top, 
+            Height:this.RowHeight-config.Margin.Top-config.Margin.Bottom, 
+            Width:width-config.Margin.Left-config.Margin.Right
+        }
+        rtBG.Right=rtBG.Left+rtBG.Width;
+        rtBG.Bottom=rtBG.Top+rtBG.Height;
+
+        var bgColor=config.BGColor;
+        var barColor=config.BarColor;
+        var textColor=config.TextColor;
+        if (drawInfo.Enable===false)
+        {
+            bgColor=config.Disable.BGColor;
+            barColor=config.Disable.BarColor;
+            textColor=config.Disable.TextColor;
+        }
+
+        if (drawInfo.BGColor) bgColor=drawInfo.BGColor;
+        if (drawInfo.TextColor) textColor=drawInfo.TextColor;
+        if (drawInfo.BarColor) barColor=drawInfo.BarColor;
+
+        if (bgColor)
+        {
+            this.Canvas.fillStyle=bgColor;
+            this.Canvas.fillRect(rtBG.Left, rtBG.Top,rtBG.Width,rtBG.Height);
+        }
+
+        var fullBarWidth=rtBG.Width-config.BarMargin.Left-config.BarMargin.Right;
+        var value=drawInfo.Value;   // 0-1 进度条
+        var rtBar={ Left:rtBG.Left+config.BarMargin.Left, Top:rtBG.Top+config.BarMargin.Top, Bottom:rtBG.Bottom-config.BarMargin.Bottom, Width:0 };
+        if (value>0)
+        {
+            if (value>1) value=1;
+            rtBar.Width=fullBarWidth*value;
+            rtBar.Height=rtBar.Bottom-rtBar.Top;
+            if (rtBar.Width<1) rtBG.Width=1;
+    
+            this.Canvas.fillStyle=barColor;
+            this.Canvas.fillRect(rtBar.Left, rtBar.Top,rtBar.Width,rtBar.Height);
+        }
+
+        if (textColor && drawInfo.Text)
+        {
+            this.Canvas.font=config.Font;
+            this.Canvas.textBaseline="bottom";
+            this.Canvas.textAlign="left";
+
+            this.Canvas.fillStyle=textColor;
+            var xText=rtBar.Left+config.TextMargin.Left;
+            var yText=rtBar.Bottom-config.TextMargin.Bottom;
+            this.Canvas.fillText(drawInfo.Text, xText, yText);
+        }
+    }
+
     //字体由外面设置
     this.TextEllipsis=function(text, maxWidth, maxText)
     {
@@ -135985,7 +136145,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13568";
+var HQCHART_VERSION="1.1.13576";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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