hqchart 1.1.12493 → 1.1.12503

package/src/jscommon/umychart.complier.js

@@ -9626,7 +9626,7 @@ function JSDraw(errorHandler,symbolData)
     {
         let drawData=[];
         let result={DrawData:drawData, DrawType:'POLYLINE'};
-        let isNumber=typeof(data)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
 
         let bFirstPoint=false;
         let bSecondPont=false;
@@ -9643,10 +9643,10 @@ function JSDraw(errorHandler,symbolData)
                     }
                 }
             }
-            else
+            else if (Array.isArray(condition))
             {
                 var bFind=false;
-                for(var i in condition)
+                for(var i=0; i<condition.length; ++i)
                 {
                     drawData[i]=null;
                     if (bFind)
@@ -9665,39 +9665,77 @@ function JSDraw(errorHandler,symbolData)
         }
         else
         {
-            let lineCache={Start:{ },End:{ }, List:new Array()};
-            for(let i in condition)
+            if (IFrameSplitOperator.IsNumber(condition))
             {
-                drawData[i]=null;
-                if (bFirstPoint==false && bSecondPont==false)
+                if (!condition) return result;
+                let lineCache={Start:{ },End:{ }, List:[]};
+                for(var i=0;i<data.length;++i)
                 {
-                    if (condition[i]==null || !condition[i]) continue;
-                    if (i>=data.length || !this.IsNumber(data[i])) continue;
+                    drawData[i]=null;
+                    if (bFirstPoint==false && bSecondPont==false)
+                    {
+                        if (!this.IsNumber(data[i])) continue;
 
-                    bFirstPoint=true;
-                    lineCache.Start={ID:parseInt(i), Value:data[i]};  //第1个点
-                }
-                else if (bFirstPoint==true && bSecondPont==false)
-                {
-                    if (condition[i]==null || !condition[i]) continue;
-                    if (i>=data.length || !this.IsNumber(data[i])) continue;
+                        bFirstPoint=true;
+                        lineCache.Start={ID:parseInt(i), Value:data[i]};  //第1个点
+                    }
+                    else if (bFirstPoint==true && bSecondPont==false)
+                    {
+                        if (!this.IsNumber(data[i])) continue;
+
+                        lineCache.End={ID:parseInt(i), Value:data[i]};   //第2个点
+                        //根据起始点和结束点 计算中间各个点的数据
+                        let lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
+
+                        for(let j in lineData)
+                        {
+                            let item=lineData[j];
+                            drawData[item.ID]=item.Value;
+                        }
 
-                    lineCache.End={ID:parseInt(i), Value:data[i]};   //第2个点
-                    //根据起始点和结束点 计算中间各个点的数据
-                    let lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
+                        let start={ ID:lineCache.End.ID,Value:lineCache.End.Value };
+                        lineCache={Start:start,End:{ } };
+                    }
+                }
 
-                    for(let j in lineData)
+                this.CalculateDrawDataExtendLine(drawData);
+            }
+            else
+            {
+                let lineCache={Start:{ },End:{ }, List:[]};
+                for(let i in condition)
+                {
+                    drawData[i]=null;
+                    if (bFirstPoint==false && bSecondPont==false)
                     {
-                        let item=lineData[j];
-                        drawData[item.ID]=item.Value;
+                        if (condition[i]==null || !condition[i]) continue;
+                        if (i>=data.length || !this.IsNumber(data[i])) continue;
+
+                        bFirstPoint=true;
+                        lineCache.Start={ID:parseInt(i), Value:data[i]};  //第1个点
                     }
+                    else if (bFirstPoint==true && bSecondPont==false)
+                    {
+                        if (condition[i]==null || !condition[i]) continue;
+                        if (i>=data.length || !this.IsNumber(data[i])) continue;
 
-                    let start={ ID:lineCache.End.ID,Value:lineCache.End.Value };
-                    lineCache={Start:start,End:{ } };
+                        lineCache.End={ID:parseInt(i), Value:data[i]};   //第2个点
+                        //根据起始点和结束点 计算中间各个点的数据
+                        let lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
+
+                        for(let j in lineData)
+                        {
+                            let item=lineData[j];
+                            drawData[item.ID]=item.Value;
+                        }
+
+                        let start={ ID:lineCache.End.ID,Value:lineCache.End.Value };
+                        lineCache={Start:start,End:{ } };
+                    }
                 }
-            }
 
-            this.CalculateDrawDataExtendLine(drawData);
+                this.CalculateDrawDataExtendLine(drawData);
+            }
         }
 
         return result

package/src/jscommon/umychart.js

@@ -9010,6 +9010,7 @@ function IChartFramePainting()
 
     this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;
     this.LogoTextFont=g_JSChartResource.FrameLogo.Font;
+    this.LogoBGColor=g_JSChartResource.FrameLogo.BGColor;
     this.GlobalOption;
 
     this.PtInButtons=function(x,y) //坐标是否在按钮上
@@ -9174,10 +9175,12 @@ function IChartFramePainting()
         var text=g_JSChartResource.FrameLogo.Text;
         if (!IFrameSplitOperator.IsString(text)) return;
 
-        this.Canvas.fillStyle=this.LogoTextColor;
+        
         this.Canvas.font=this.LogoTextFont;
         this.Canvas.textAlign = 'left';
         this.Canvas.textBaseline = 'bottom';
+        var height=this.Canvas.measureText("擎").width;
+        var width=this.Canvas.measureText(text).width;
         if (this.IsHScreen)
         {
             var x=border.Left+5;
@@ -9185,13 +9188,36 @@ function IChartFramePainting()
             this.Canvas.save();
             this.Canvas.translate(x,y);
             this.Canvas.rotate(90 * Math.PI / 180);
-            this.Canvas.fillText(text,0,0);
+
+            var rtBG={ Left:0, Bottom:0, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            this.Canvas.fillStyle=this.LogoTextColor;
+            this.Canvas.fillText(text,1,0);
             this.Canvas.restore();
         }
         else
         {
-            var x=border.Left+5;
-            var y=border.Bottom-5;
+            var rtBG={ Left:border.Left+5, Bottom:border.Bottom-5, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            var x=rtBG.Left+1;
+            var y=rtBG.Bottom-1;
+            this.Canvas.fillStyle=this.LogoTextColor;
             this.Canvas.fillText(text,x,y);
         }   
     }
@@ -59622,7 +59648,8 @@ function JSChartResource()
     {
         TextColor:'rgb(178,34,34)',
         Font:"bold "+ 16*GetDevicePixelRatio() +"px 微软雅黑",
-        Text:"*仅学习使用*"     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        Text:"*仅学习使用*",     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        BGColor:"rgba(230,230,230, 0.5)",
     };
 
     //百分比坐标文字颜色
@@ -80514,6 +80541,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80526,6 +80554,9 @@ function PforecastInfo()
         this.Data=[];
 
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Pforecast.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -80592,6 +80623,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80603,6 +80635,9 @@ function ResearchInfo()
 
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Research.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -80656,6 +80691,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -80668,6 +80704,8 @@ function BlockTrading()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.BlockTrading.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -80739,7 +80777,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -80751,6 +80790,8 @@ function TradeDetail()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.TradeDetail.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,

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

@@ -13090,6 +13090,7 @@ function IChartFramePainting()
 
     this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;
     this.LogoTextFont=g_JSChartResource.FrameLogo.Font;
+    this.LogoBGColor=g_JSChartResource.FrameLogo.BGColor;
     this.GlobalOption;
 
     this.PtInButtons=function(x,y) //坐标是否在按钮上
@@ -13254,10 +13255,12 @@ function IChartFramePainting()
         var text=g_JSChartResource.FrameLogo.Text;
         if (!IFrameSplitOperator.IsString(text)) return;
 
-        this.Canvas.fillStyle=this.LogoTextColor;
+        
         this.Canvas.font=this.LogoTextFont;
         this.Canvas.textAlign = 'left';
         this.Canvas.textBaseline = 'bottom';
+        var height=this.Canvas.measureText("擎").width;
+        var width=this.Canvas.measureText(text).width;
         if (this.IsHScreen)
         {
             var x=border.Left+5;
@@ -13265,13 +13268,36 @@ function IChartFramePainting()
             this.Canvas.save();
             this.Canvas.translate(x,y);
             this.Canvas.rotate(90 * Math.PI / 180);
-            this.Canvas.fillText(text,0,0);
+
+            var rtBG={ Left:0, Bottom:0, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            this.Canvas.fillStyle=this.LogoTextColor;
+            this.Canvas.fillText(text,1,0);
             this.Canvas.restore();
         }
         else
         {
-            var x=border.Left+5;
-            var y=border.Bottom-5;
+            var rtBG={ Left:border.Left+5, Bottom:border.Bottom-5, Width:width+4, Height:height+4 };
+            rtBG.Top=rtBG.Bottom-rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
+
+            if (this.LogoBGColor)
+            {
+                this.Canvas.fillStyle=this.LogoBGColor;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);
+            }
+
+            var x=rtBG.Left+1;
+            var y=rtBG.Bottom-1;
+            this.Canvas.fillStyle=this.LogoTextColor;
             this.Canvas.fillText(text,x,y);
         }   
     }
@@ -63702,7 +63728,8 @@ function JSChartResource()
     {
         TextColor:'rgb(178,34,34)',
         Font:"bold "+ 16*GetDevicePixelRatio() +"px 微软雅黑",
-        Text:"*仅学习使用*"     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        Text:"*仅学习使用*",     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        BGColor:"rgba(230,230,230, 0.5)",
     };
 
     //百分比坐标文字颜色
@@ -84594,6 +84621,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84606,6 +84634,9 @@ function PforecastInfo()
         this.Data=[];
 
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Pforecast.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84672,6 +84703,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84683,6 +84715,9 @@ function ResearchInfo()
 
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Research.ApiUrl;
+
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84736,6 +84771,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84748,6 +84784,8 @@ function BlockTrading()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.BlockTrading.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -84819,7 +84857,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -84831,6 +84870,8 @@ function TradeDetail()
         this.Data=[];
         var url=g_JSChartResource.Domain+g_JSChartResource.KLine.Info.TradeDetail.ApiUrl;
 
+        if (this.NetworkFilter(hqChart, obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         JSNetwork.HttpRequest({
             url: url,
@@ -102037,7 +102078,7 @@ function JSDraw(errorHandler,symbolData)
     {
         let drawData=[];
         let result={DrawData:drawData, DrawType:'POLYLINE'};
-        let isNumber=typeof(data)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
 
         let bFirstPoint=false;
         let bSecondPont=false;
@@ -102054,10 +102095,10 @@ function JSDraw(errorHandler,symbolData)
                     }
                 }
             }
-            else
+            else if (Array.isArray(condition))
             {
                 var bFind=false;
-                for(var i in condition)
+                for(var i=0; i<condition.length; ++i)
                 {
                     drawData[i]=null;
                     if (bFind)
@@ -102076,39 +102117,77 @@ function JSDraw(errorHandler,symbolData)
         }
         else
         {
-            let lineCache={Start:{ },End:{ }, List:new Array()};
-            for(let i in condition)
+            if (IFrameSplitOperator.IsNumber(condition))
             {
-                drawData[i]=null;
-                if (bFirstPoint==false && bSecondPont==false)
+                if (!condition) return result;
+                let lineCache={Start:{ },End:{ }, List:[]};
+                for(var i=0;i<data.length;++i)
                 {
-                    if (condition[i]==null || !condition[i]) continue;
-                    if (i>=data.length || !this.IsNumber(data[i])) continue;
+                    drawData[i]=null;
+                    if (bFirstPoint==false && bSecondPont==false)
+                    {
+                        if (!this.IsNumber(data[i])) continue;
 
-                    bFirstPoint=true;
-                    lineCache.Start={ID:parseInt(i), Value:data[i]};  //第1个点
-                }
-                else if (bFirstPoint==true && bSecondPont==false)
-                {
-                    if (condition[i]==null || !condition[i]) continue;
-                    if (i>=data.length || !this.IsNumber(data[i])) continue;
+                        bFirstPoint=true;
+                        lineCache.Start={ID:parseInt(i), Value:data[i]};  //第1个点
+                    }
+                    else if (bFirstPoint==true && bSecondPont==false)
+                    {
+                        if (!this.IsNumber(data[i])) continue;
 
-                    lineCache.End={ID:parseInt(i), Value:data[i]};   //第2个点
-                    //根据起始点和结束点 计算中间各个点的数据
-                    let lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
+                        lineCache.End={ID:parseInt(i), Value:data[i]};   //第2个点
+                        //根据起始点和结束点 计算中间各个点的数据
+                        let lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
 
-                    for(let j in lineData)
+                        for(let j in lineData)
+                        {
+                            let item=lineData[j];
+                            drawData[item.ID]=item.Value;
+                        }
+
+                        let start={ ID:lineCache.End.ID,Value:lineCache.End.Value };
+                        lineCache={Start:start,End:{ } };
+                    }
+                }
+
+                this.CalculateDrawDataExtendLine(drawData);
+            }
+            else
+            {
+                let lineCache={Start:{ },End:{ }, List:[]};
+                for(let i in condition)
+                {
+                    drawData[i]=null;
+                    if (bFirstPoint==false && bSecondPont==false)
                     {
-                        let item=lineData[j];
-                        drawData[item.ID]=item.Value;
+                        if (condition[i]==null || !condition[i]) continue;
+                        if (i>=data.length || !this.IsNumber(data[i])) continue;
+
+                        bFirstPoint=true;
+                        lineCache.Start={ID:parseInt(i), Value:data[i]};  //第1个点
                     }
+                    else if (bFirstPoint==true && bSecondPont==false)
+                    {
+                        if (condition[i]==null || !condition[i]) continue;
+                        if (i>=data.length || !this.IsNumber(data[i])) continue;
+
+                        lineCache.End={ID:parseInt(i), Value:data[i]};   //第2个点
+                        //根据起始点和结束点 计算中间各个点的数据
+                        let lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
 
-                    let start={ ID:lineCache.End.ID,Value:lineCache.End.Value };
-                    lineCache={Start:start,End:{ } };
+                        for(let j in lineData)
+                        {
+                            let item=lineData[j];
+                            drawData[item.ID]=item.Value;
+                        }
+
+                        let start={ ID:lineCache.End.ID,Value:lineCache.End.Value };
+                        lineCache={Start:start,End:{ } };
+                    }
                 }
-            }
 
-            this.CalculateDrawDataExtendLine(drawData);
+                this.CalculateDrawDataExtendLine(drawData);
+            }
         }
 
         return result
@@ -128062,7 +128141,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12492";
+var HQCHART_VERSION="1.1.12502";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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