hqchart 1.1.13887 → 1.1.13894

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13887",
+  "version": "1.1.13894",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -76579,6 +76579,31 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         return true;
     }
 
+    this.RequestSingleOverlayHistoryData=function(symbol, dataCount, firstDate, item)
+    {
+        var self = this;
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'KLineChartContainer::RequestOverlayHistoryData', //类名::
+                Explain:'叠加股票日K线数据',
+                Request:{ Url:self.KLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestDataCount,"first":{ date: firstDate },
+                    field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                self.RecvOverlayHistoryData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+    }
+
     this.RequestOverlayHistoryData=function()
     {
         if (!this.OverlayChartPaint.length) return;
@@ -76595,47 +76620,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             let symbol=item.Symbol;
             if (!symbol) continue;
 
-            item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
-
-            if (this.NetworkFilter)
-            {
-                var obj=
-                {
-                    Name:'KLineChartContainer::RequestOverlayHistoryData', //类名::
-                    Explain:'叠加股票日K线数据',
-                    Request:{ Url:self.KLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestDataCount,"first":{ date: firstDate },
-                        field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
-                    Self:this,
-                    PreventDefault:false
-                };
-                this.NetworkFilter(obj, function(data) 
-                { 
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOverlayHistoryData(data,item);
-                });
-
-                if (obj.PreventDefault==true) continue;   //已被上层替换,不调用默认的网络请求
-            }
-
-            //请求数据
-            JSNetwork.HttpRequest({
-                url: this.KLineApiUrl,
-                data:
-                {
-                    "field": ["name","symbol","yclose","open","price","high"],
-                    "symbol": symbol,
-                    "start": -1,
-                    "count": dataCount.MaxRequestDataCount
-                },
-                type:"post",
-                dataType: "json",
-                async:true,
-                success: function (data)
-                {
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOverlayHistoryData(data,item);
-                }
-            });
+            this.RequestSingleOverlayHistoryData(symbol, dataCount, firstDate, item);
         }
     }
 
@@ -76686,6 +76671,32 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
     }
 
+    this.RequestSingleHistoryMinuteData=function(symbol, dataCount, firstDate,firstTime, item)
+    {
+        var self=this;
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'KLineChartContainer::RequestOverlayHistoryMinuteData', //类名::
+                Explain:'叠加股票分钟K线数据',
+                Request:{ Url:self.MinuteKLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestMinuteDayCount,"first":{ date: firstDate, time:firstTime },
+                    field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                self.RecvOveralyHistoryMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+    }
+
     this.RequestOverlayHistoryMinuteData=function()
     {
         if (!this.OverlayChartPaint.length) return;
@@ -76703,47 +76714,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             let symbol=item.Symbol;
             if (!symbol) continue;
 
-            item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
-
-            if (this.NetworkFilter)
-            {
-                var obj=
-                {
-                    Name:'KLineChartContainer::RequestOverlayHistoryMinuteData', //类名::
-                    Explain:'叠加股票分钟K线数据',
-                    Request:{ Url:self.MinuteKLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestMinuteDayCount,"first":{ date: firstDate, time:firstTime },
-                        field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
-                    Self:this,
-                    PreventDefault:false
-                };
-                this.NetworkFilter(obj, function(data) 
-                { 
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOveralyHistoryMinuteData(data,item);
-                });
-
-                if (obj.PreventDefault==true) continue;   //已被上层替换,不调用默认的网络请求
-            }
-
-            //请求数据
-            JSNetwork.HttpRequest({
-                url: this.MinuteKLineApiUrl,
-                data:
-                {
-                    "field": ["name","symbol","yclose","open","price","high",'vol','amount'],
-                    "symbol": symbol,
-                    "start": -1,
-                    "count": dataCount.MaxRequestMinuteDayCount
-                },
-                type:"post",
-                dataType: "json",
-                async:true,
-                success: function (data)
-                {
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOveralyHistoryMinuteData(data,item);
-                }
-            });
+            this.RequestSingleHistoryMinuteData(symbol,dataCount,firstDate,firstTime, item );
         }
     }
 

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

@@ -80504,6 +80504,31 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         return true;
     }
 
+    this.RequestSingleOverlayHistoryData=function(symbol, dataCount, firstDate, item)
+    {
+        var self = this;
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'KLineChartContainer::RequestOverlayHistoryData', //类名::
+                Explain:'叠加股票日K线数据',
+                Request:{ Url:self.KLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestDataCount,"first":{ date: firstDate },
+                    field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                self.RecvOverlayHistoryData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+    }
+
     this.RequestOverlayHistoryData=function()
     {
         if (!this.OverlayChartPaint.length) return;
@@ -80520,47 +80545,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             let symbol=item.Symbol;
             if (!symbol) continue;
 
-            item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
-
-            if (this.NetworkFilter)
-            {
-                var obj=
-                {
-                    Name:'KLineChartContainer::RequestOverlayHistoryData', //类名::
-                    Explain:'叠加股票日K线数据',
-                    Request:{ Url:self.KLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestDataCount,"first":{ date: firstDate },
-                        field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
-                    Self:this,
-                    PreventDefault:false
-                };
-                this.NetworkFilter(obj, function(data) 
-                { 
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOverlayHistoryData(data,item);
-                });
-
-                if (obj.PreventDefault==true) continue;   //已被上层替换,不调用默认的网络请求
-            }
-
-            //请求数据
-            JSNetwork.HttpRequest({
-                url: this.KLineApiUrl,
-                data:
-                {
-                    "field": ["name","symbol","yclose","open","price","high"],
-                    "symbol": symbol,
-                    "start": -1,
-                    "count": dataCount.MaxRequestDataCount
-                },
-                type:"post",
-                dataType: "json",
-                async:true,
-                success: function (data)
-                {
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOverlayHistoryData(data,item);
-                }
-            });
+            this.RequestSingleOverlayHistoryData(symbol, dataCount, firstDate, item);
         }
     }
 
@@ -80611,6 +80596,32 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
     }
 
+    this.RequestSingleHistoryMinuteData=function(symbol, dataCount, firstDate,firstTime, item)
+    {
+        var self=this;
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'KLineChartContainer::RequestOverlayHistoryMinuteData', //类名::
+                Explain:'叠加股票分钟K线数据',
+                Request:{ Url:self.MinuteKLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestMinuteDayCount,"first":{ date: firstDate, time:firstTime },
+                    field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                self.RecvOveralyHistoryMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+    }
+
     this.RequestOverlayHistoryMinuteData=function()
     {
         if (!this.OverlayChartPaint.length) return;
@@ -80628,47 +80639,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             let symbol=item.Symbol;
             if (!symbol) continue;
 
-            item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
-
-            if (this.NetworkFilter)
-            {
-                var obj=
-                {
-                    Name:'KLineChartContainer::RequestOverlayHistoryMinuteData', //类名::
-                    Explain:'叠加股票分钟K线数据',
-                    Request:{ Url:self.MinuteKLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestMinuteDayCount,"first":{ date: firstDate, time:firstTime },
-                        field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
-                    Self:this,
-                    PreventDefault:false
-                };
-                this.NetworkFilter(obj, function(data) 
-                { 
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOveralyHistoryMinuteData(data,item);
-                });
-
-                if (obj.PreventDefault==true) continue;   //已被上层替换,不调用默认的网络请求
-            }
-
-            //请求数据
-            JSNetwork.HttpRequest({
-                url: this.MinuteKLineApiUrl,
-                data:
-                {
-                    "field": ["name","symbol","yclose","open","price","high",'vol','amount'],
-                    "symbol": symbol,
-                    "start": -1,
-                    "count": dataCount.MaxRequestMinuteDayCount
-                },
-                type:"post",
-                dataType: "json",
-                async:true,
-                success: function (data)
-                {
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOveralyHistoryMinuteData(data,item);
-                }
-            });
+            this.RequestSingleHistoryMinuteData(symbol,dataCount,firstDate,firstTime, item );
         }
     }
 
@@ -138487,7 +138458,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13886";
+var HQCHART_VERSION="1.1.13893";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -80548,6 +80548,31 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         return true;
     }
 
+    this.RequestSingleOverlayHistoryData=function(symbol, dataCount, firstDate, item)
+    {
+        var self = this;
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'KLineChartContainer::RequestOverlayHistoryData', //类名::
+                Explain:'叠加股票日K线数据',
+                Request:{ Url:self.KLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestDataCount,"first":{ date: firstDate },
+                    field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                self.RecvOverlayHistoryData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+    }
+
     this.RequestOverlayHistoryData=function()
     {
         if (!this.OverlayChartPaint.length) return;
@@ -80564,47 +80589,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             let symbol=item.Symbol;
             if (!symbol) continue;
 
-            item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
-
-            if (this.NetworkFilter)
-            {
-                var obj=
-                {
-                    Name:'KLineChartContainer::RequestOverlayHistoryData', //类名::
-                    Explain:'叠加股票日K线数据',
-                    Request:{ Url:self.KLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestDataCount,"first":{ date: firstDate },
-                        field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
-                    Self:this,
-                    PreventDefault:false
-                };
-                this.NetworkFilter(obj, function(data) 
-                { 
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOverlayHistoryData(data,item);
-                });
-
-                if (obj.PreventDefault==true) continue;   //已被上层替换,不调用默认的网络请求
-            }
-
-            //请求数据
-            JSNetwork.HttpRequest({
-                url: this.KLineApiUrl,
-                data:
-                {
-                    "field": ["name","symbol","yclose","open","price","high"],
-                    "symbol": symbol,
-                    "start": -1,
-                    "count": dataCount.MaxRequestDataCount
-                },
-                type:"post",
-                dataType: "json",
-                async:true,
-                success: function (data)
-                {
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOverlayHistoryData(data,item);
-                }
-            });
+            this.RequestSingleOverlayHistoryData(symbol, dataCount, firstDate, item);
         }
     }
 
@@ -80655,6 +80640,32 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
     }
 
+    this.RequestSingleHistoryMinuteData=function(symbol, dataCount, firstDate,firstTime, item)
+    {
+        var self=this;
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'KLineChartContainer::RequestOverlayHistoryMinuteData', //类名::
+                Explain:'叠加股票分钟K线数据',
+                Request:{ Url:self.MinuteKLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestMinuteDayCount,"first":{ date: firstDate, time:firstTime },
+                    field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                self.RecvOveralyHistoryMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+    }
+
     this.RequestOverlayHistoryMinuteData=function()
     {
         if (!this.OverlayChartPaint.length) return;
@@ -80672,47 +80683,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             let symbol=item.Symbol;
             if (!symbol) continue;
 
-            item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
-
-            if (this.NetworkFilter)
-            {
-                var obj=
-                {
-                    Name:'KLineChartContainer::RequestOverlayHistoryMinuteData', //类名::
-                    Explain:'叠加股票分钟K线数据',
-                    Request:{ Url:self.MinuteKLineApiUrl, Data: { symbol: symbol, count: dataCount.MaxRequestMinuteDayCount,"first":{ date: firstDate, time:firstTime },
-                        field:["name","symbol","yclose","open","price","high",'vol','amount'] }, Type:'POST' }, 
-                    Self:this,
-                    PreventDefault:false
-                };
-                this.NetworkFilter(obj, function(data) 
-                { 
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOveralyHistoryMinuteData(data,item);
-                });
-
-                if (obj.PreventDefault==true) continue;   //已被上层替换,不调用默认的网络请求
-            }
-
-            //请求数据
-            JSNetwork.HttpRequest({
-                url: this.MinuteKLineApiUrl,
-                data:
-                {
-                    "field": ["name","symbol","yclose","open","price","high",'vol','amount'],
-                    "symbol": symbol,
-                    "start": -1,
-                    "count": dataCount.MaxRequestMinuteDayCount
-                },
-                type:"post",
-                dataType: "json",
-                async:true,
-                success: function (data)
-                {
-                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
-                    self.RecvOveralyHistoryMinuteData(data,item);
-                }
-            });
+            this.RequestSingleHistoryMinuteData(symbol,dataCount,firstDate,firstTime, item );
         }
     }
 
@@ -143043,7 +143014,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13886";
+var HQCHART_VERSION="1.1.13893";
 
 function PrintHQChartVersion()
 {