hqchart 1.1.12493 → 1.1.12503

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

@@ -13134,6 +13134,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) //坐标是否在按钮上
@@ -13298,10 +13299,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;
@@ -13309,13 +13312,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);
         }   
     }
@@ -63746,7 +63772,8 @@ function JSChartResource()
     {
         TextColor:'rgb(178,34,34)',
         Font:"bold "+ 16*GetDevicePixelRatio() +"px 微软雅黑",
-        Text:"*仅学习使用*"     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        Text:"*仅学习使用*",     //不要修改声明, 任何修改声明产生的任何法律责任由修改者自行独立承担，与HQChart插件作者无关。
+        BGColor:"rgba(230,230,230, 0.5)",
     };
 
     //百分比坐标文字颜色
@@ -84638,6 +84665,7 @@ function PforecastInfo()
     delete this.newMethod;
 
     this.ClassName='PforecastInfo';
+    this.Explain='业绩预告';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84650,6 +84678,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,
@@ -84716,6 +84747,7 @@ function ResearchInfo()
     delete this.newMethod;
 
     this.ClassName='ResearchInfo';
+    this.Explain='调研';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84727,6 +84759,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,
@@ -84780,6 +84815,7 @@ function BlockTrading()
     delete this.newMethod;
 
     this.ClassName='BlockTrading';
+    this.Explain='大宗交易';
 
     this.RequestData=function(hqChart,obj)
     {
@@ -84792,6 +84828,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,
@@ -84863,7 +84901,8 @@ function TradeDetail()
     delete this.newMethod;
 
     this.ClassName='TradeDetail';
-
+    this.Explain='大宗交易';
+    
     this.RequestData=function(hqChart, obj)
     {
         var self = this;
@@ -84875,6 +84914,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,
@@ -102081,7 +102122,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;
@@ -102098,10 +102139,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)
@@ -102120,39 +102161,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
@@ -128215,7 +128294,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12492";
+var HQCHART_VERSION="1.1.12502";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.wechat/umychart.chartpaint.wechat.js

@@ -7068,6 +7068,7 @@ function ChartVolStick()
         else    //太细了直接话线
         {
             var preKItem=null;
+            var barColor=null;
             for (var i = this.Data.DataOffset, j = 0; i < this.Data.Data.length && j < xPointCount; ++i, ++j, xOffset += (dataWidth + distanceWidth)) 
             {
                 var value = this.Data.Data[i];
@@ -7089,14 +7090,8 @@ function ChartVolStick()
 
                 if (x > chartright) break;
 
-                if (isMinute)
-                {
-                    var barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
-                }
-                else
-                {
-                    var barColor=this.GetBarColor(kItem);
-                }
+                if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
+                else barColor=this.GetBarColor(kItem);
                 
                 this.Canvas.strokeStyle=barColor.Color;
 
@@ -7133,7 +7128,7 @@ function ChartVolStick()
         var xOffset = this.ChartBorder.GetTop() + distanceWidth / 2.0 + 2.0;
         var chartBottom = this.ChartBorder.GetBottom();
         var xPointCount = this.ChartFrame.XPointCount;
-
+        var isMinute=this.IsMinuteFrame();
         var yBottom = this.ChartFrame.GetYFromData(0);
 
         if (dataWidth >= this.MinBarWidth) 
@@ -7171,6 +7166,8 @@ function ChartVolStick()
         }
         else    //太细了直接话线
         {
+            var preKItem=null;
+            var barColor=null;
             for (var i = this.Data.DataOffset, j = 0; i < this.Data.Data.length && j < xPointCount; ++i, ++j, xOffset += (dataWidth + distanceWidth)) 
             {
                 var value = this.Data.Data[i];
@@ -7178,10 +7175,22 @@ function ChartVolStick()
                 if (value == null || kItem == null) continue;
 
                 var y = this.ChartFrame.GetYFromData(value);
-                var x = this.ChartFrame.GetXFromIndex(j);
+
+                if (isMinute)
+                {
+                    var x=this.ChartFrame.GetXFromIndex(j);
+                }
+                else
+                {
+                    var left=xOffset;
+                    var right=xOffset+dataWidth;
+                    var x=left+(right-left)/2;
+                }
                 if (x > chartBottom) break;
 
-                var barColor=this.GetBarColor(kItem);
+                if (isMinute) barColor=this.GetMinuteBarColor(kItem,preKItem);    //分时图颜色单独计算
+                else barColor=this.GetBarColor(kItem);
+                
                 this.Canvas.strokeStyle=barColor.Color;
 
                 //var x = this.ChartFrame.GetXFromIndex(j);
@@ -7189,6 +7198,8 @@ function ChartVolStick()
                 this.Canvas.moveTo(y, ToFixedPoint(x));
                 this.Canvas.lineTo(yBottom, ToFixedPoint(x));
                 this.Canvas.stroke();
+
+                preKItem=kItem;
             }
         }
     }

package/src/jscommon/umychart.wechat/umychart.klineinfo.wechat.js

@@ -95,6 +95,12 @@ function IKLineInfo()
             MaxRequestMinuteDayCount:hqChart.MaxRequestMinuteDayCount,    //分钟数据请求的天数
             Period:hqChart.Period       //周期
         };
+
+        //K线数据范围
+        var hisData=null;
+        if (hqChart.ChartOperator_Temp_GetHistroyData)  hisData=hqChart.ChartOperator_Temp_GetHistroyData();
+        if (hisData)
+            obj.DateRange=hisData.GetDateRange();
         
         return obj;
     }
@@ -152,12 +158,17 @@ function InvestorInfo()
     this.newMethod();
     delete this.newMethod;
 
-    this.RequestData=function(hqChart)
+    this.ClassName="InvestorInfo";
+    this.Explain="互动易";
+
+    this.RequestData=function(hqChart, obj)
     {
         var self = this;
         var param={ HQChart:hqChart };
         this.Data=[];
 
+        if (this.NetworkFilter(hqChart,obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         wx.request({
             url: g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Investor.ApiUrl,
@@ -303,12 +314,14 @@ function PforecastInfo()
     this.ClassName='PforecastInfo';
     this.Explain='业绩预告';
 
-    this.RequestData=function(hqChart)
+    this.RequestData=function(hqChart,obj)
     {
         var self = this;
         this.Data = [];
         var param={ HQChart:hqChart };
 
+        if (this.NetworkFilter(hqChart,obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         wx.request({
             url: g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Pforecast.ApiUrl,
@@ -377,13 +390,15 @@ function ResearchInfo()
     this.ClassName='ResearchInfo';
     this.Explain='投资者关系';
 
-    this.RequestData=function(hqChart)
+    this.RequestData=function(hqChart,obj)
     {
         var self = this;
         var param= { HQChart:hqChart };
 
         this.Data=[];
 
+        if (this.NetworkFilter(hqChart,obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         wx.request({
             url: g_JSChartResource.Domain+g_JSChartResource.KLine.Info.Research.ApiUrl,
@@ -441,12 +456,14 @@ function BlockTrading()
     this.ClassName='BlockTrading';
     this.Explain='大宗交易';
 
-    this.RequestData=function(hqChart)
+    this.RequestData=function(hqChart,obj)
     {
         var self = this;
         var param={ HQChart:hqChart,};
         this.Data=[];
 
+        if (this.NetworkFilter(hqChart,obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         wx.request({
             url: g_JSChartResource.Domain+g_JSChartResource.KLine.Info.BlockTrading.ApiUrl,
@@ -521,13 +538,15 @@ function TradeDetail()
     this.ClassName='TradeDetail';
     this.Explain='龙虎榜';
 
-    this.RequestData=function(hqChart)
+    this.RequestData=function(hqChart,obj)
     {
         var self = this;
         var param={ HQChart:hqChart };
 
         this.Data=[];
 
+        if (this.NetworkFilter(hqChart,obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         wx.request({
             url: g_JSChartResource.Domain+g_JSChartResource.KLine.Info.TradeDetail.ApiUrl,
@@ -609,7 +628,7 @@ function PolicyInfo()
         }
     }
 
-    this.RequestData = function (hqChart) 
+    this.RequestData = function (hqChart,obj) 
     {
         var self = this;
         this.Data = [];
@@ -617,6 +636,8 @@ function PolicyInfo()
 
         // setTimeout(function () { self.RecvData(null, param); }, 2000); //模拟数据到达
 
+        if (this.NetworkFilter(hqChart,obj)) return; //已被上层替换,不调用默认的网络请求
+
         //请求数据
         wx.request({
           url: g_JSChartResource.Domain + g_JSChartResource.KLine.Info.Policy.ApiUrl,

package/src/jscommon/umychart.wechat/umychart.version.wechat.js

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