hqchart 1.1.12780 → 1.1.12784

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.12780",
+  "version": "1.1.12784",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -36692,24 +36692,36 @@ function ChartDrawSVG()
             if (item.Line)
             {
                 var lineItem=item.Line;
-                var price;
+                var price=null, yPrice=null;
                 var kItem=this.Data.Data[item.Index];
-                switch(lineItem.Value)
+                if (lineItem.Value=="Bottom")
                 {
-                    case "C":
-                        price=kItem.Close;
-                        break;
-                    case "H":
-                        price=kItem.High;
-                        break;
-                    case "L":
-                        price=kItem.Low;
-                        break;
+                    yPrice=bottom;
+                }
+                else if (lineItem.Value=="Top")
+                {
+                    yPrice=top;
+                }
+                else
+                {
+                    switch(lineItem.Value)
+                    {
+                        case "C":
+                            price=kItem.Close;
+                            break;
+                        case "H":
+                            price=kItem.High;
+                            break;
+                        case "L":
+                            price=kItem.Low;
+                            break;    
+                    }
+    
+                    if (!IFrameSplitOperator.IsNumber(price)) continue;
+                    
+                    yPrice=this.ChartFrame.GetYFromData(price);
                 }
-
-                if (!IFrameSplitOperator.IsNumber(price)) continue;
                 
-                var yPrice=this.ChartFrame.GetYFromData(price);
                 if (yPrice>=rtSVG.Top && yPrice<=rtSVG.Bottom) continue;
 
                 var yText;
@@ -76279,6 +76291,49 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         JSConsole.Chart.Log(`[MinuteChartContainer::CaclutateLimitPrice] ${this.Symbol} tofixed(2) max:${this.LimitPrice.Max} min:${this.LimitPrice.Min}`);
     }
 
+    this.RequestSingleOverlayMinuteData=function(symbol, date, item)
+    {
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'MinuteChartContainer::RequestOverlayMinuteData', //类名::函数名
+                Explain:'叠加股票最新分时数据',
+                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:[date], symbol:symbol}, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+
+        //请求数据
+        JSNetwork.HttpRequest({
+            url: this.HistoryMinuteApiUrl,
+            data:
+            {
+                "symbol":symbol,
+                "days": [date],
+            },
+            type:"post",
+            dataType: "json",
+            async:true,
+            success: function (data)
+            {
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                //self.RecvMultiOverlayMinuteData([data]);
+                this.RecvOverlayMinuteData(data,item);
+            }
+        });
+    }
+
     //请求叠加数据 (主数据下载完再下载))
     this.RequestOverlayMinuteData=function()
     {
@@ -76293,6 +76348,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             var symbol=item.Symbol;
             if (!symbol) continue;
 
+            this.RequestSingleOverlayMinuteData(symbol, date, item);
+
+            /*
             item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
             if (this.NetworkFilter)
@@ -76332,6 +76390,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     self.RecvOverlayMinuteData(data,item);
                 }
             });
+            */
         }
     }
 

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

@@ -40836,24 +40836,36 @@ function ChartDrawSVG()
             if (item.Line)
             {
                 var lineItem=item.Line;
-                var price;
+                var price=null, yPrice=null;
                 var kItem=this.Data.Data[item.Index];
-                switch(lineItem.Value)
+                if (lineItem.Value=="Bottom")
                 {
-                    case "C":
-                        price=kItem.Close;
-                        break;
-                    case "H":
-                        price=kItem.High;
-                        break;
-                    case "L":
-                        price=kItem.Low;
-                        break;
+                    yPrice=bottom;
+                }
+                else if (lineItem.Value=="Top")
+                {
+                    yPrice=top;
+                }
+                else
+                {
+                    switch(lineItem.Value)
+                    {
+                        case "C":
+                            price=kItem.Close;
+                            break;
+                        case "H":
+                            price=kItem.High;
+                            break;
+                        case "L":
+                            price=kItem.Low;
+                            break;    
+                    }
+    
+                    if (!IFrameSplitOperator.IsNumber(price)) continue;
+                    
+                    yPrice=this.ChartFrame.GetYFromData(price);
                 }
-
-                if (!IFrameSplitOperator.IsNumber(price)) continue;
                 
-                var yPrice=this.ChartFrame.GetYFromData(price);
                 if (yPrice>=rtSVG.Top && yPrice<=rtSVG.Bottom) continue;
 
                 var yText;
@@ -80423,6 +80435,49 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         JSConsole.Chart.Log(`[MinuteChartContainer::CaclutateLimitPrice] ${this.Symbol} tofixed(2) max:${this.LimitPrice.Max} min:${this.LimitPrice.Min}`);
     }
 
+    this.RequestSingleOverlayMinuteData=function(symbol, date, item)
+    {
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'MinuteChartContainer::RequestOverlayMinuteData', //类名::函数名
+                Explain:'叠加股票最新分时数据',
+                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:[date], symbol:symbol}, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+
+        //请求数据
+        JSNetwork.HttpRequest({
+            url: this.HistoryMinuteApiUrl,
+            data:
+            {
+                "symbol":symbol,
+                "days": [date],
+            },
+            type:"post",
+            dataType: "json",
+            async:true,
+            success: function (data)
+            {
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                //self.RecvMultiOverlayMinuteData([data]);
+                this.RecvOverlayMinuteData(data,item);
+            }
+        });
+    }
+
     //请求叠加数据 (主数据下载完再下载))
     this.RequestOverlayMinuteData=function()
     {
@@ -80437,6 +80492,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             var symbol=item.Symbol;
             if (!symbol) continue;
 
+            this.RequestSingleOverlayMinuteData(symbol, date, item);
+
+            /*
             item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
             if (this.NetworkFilter)
@@ -80476,6 +80534,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     self.RecvOverlayMinuteData(data,item);
                 }
             });
+            */
         }
     }
 
@@ -131387,7 +131446,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12779";
+var HQCHART_VERSION="1.1.12783";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -40880,24 +40880,36 @@ function ChartDrawSVG()
             if (item.Line)
             {
                 var lineItem=item.Line;
-                var price;
+                var price=null, yPrice=null;
                 var kItem=this.Data.Data[item.Index];
-                switch(lineItem.Value)
+                if (lineItem.Value=="Bottom")
                 {
-                    case "C":
-                        price=kItem.Close;
-                        break;
-                    case "H":
-                        price=kItem.High;
-                        break;
-                    case "L":
-                        price=kItem.Low;
-                        break;
+                    yPrice=bottom;
+                }
+                else if (lineItem.Value=="Top")
+                {
+                    yPrice=top;
+                }
+                else
+                {
+                    switch(lineItem.Value)
+                    {
+                        case "C":
+                            price=kItem.Close;
+                            break;
+                        case "H":
+                            price=kItem.High;
+                            break;
+                        case "L":
+                            price=kItem.Low;
+                            break;    
+                    }
+    
+                    if (!IFrameSplitOperator.IsNumber(price)) continue;
+                    
+                    yPrice=this.ChartFrame.GetYFromData(price);
                 }
-
-                if (!IFrameSplitOperator.IsNumber(price)) continue;
                 
-                var yPrice=this.ChartFrame.GetYFromData(price);
                 if (yPrice>=rtSVG.Top && yPrice<=rtSVG.Bottom) continue;
 
                 var yText;
@@ -80467,6 +80479,49 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         JSConsole.Chart.Log(`[MinuteChartContainer::CaclutateLimitPrice] ${this.Symbol} tofixed(2) max:${this.LimitPrice.Max} min:${this.LimitPrice.Min}`);
     }
 
+    this.RequestSingleOverlayMinuteData=function(symbol, date, item)
+    {
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'MinuteChartContainer::RequestOverlayMinuteData', //类名::函数名
+                Explain:'叠加股票最新分时数据',
+                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:[date], symbol:symbol}, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+
+        //请求数据
+        JSNetwork.HttpRequest({
+            url: this.HistoryMinuteApiUrl,
+            data:
+            {
+                "symbol":symbol,
+                "days": [date],
+            },
+            type:"post",
+            dataType: "json",
+            async:true,
+            success: function (data)
+            {
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                //self.RecvMultiOverlayMinuteData([data]);
+                this.RecvOverlayMinuteData(data,item);
+            }
+        });
+    }
+
     //请求叠加数据 (主数据下载完再下载))
     this.RequestOverlayMinuteData=function()
     {
@@ -80481,6 +80536,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             var symbol=item.Symbol;
             if (!symbol) continue;
 
+            this.RequestSingleOverlayMinuteData(symbol, date, item);
+
+            /*
             item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
             if (this.NetworkFilter)
@@ -80520,6 +80578,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     self.RecvOverlayMinuteData(data,item);
                 }
             });
+            */
         }
     }
 
@@ -131545,7 +131604,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12779";
+var HQCHART_VERSION="1.1.12783";
 
 function PrintHQChartVersion()
 {