hqchart 1.1.12784 → 1.1.12786

package/lib/umychart.vue.js

@@ -8078,9 +8078,43 @@ for(var i=0;i<this.OverlayChartPaint.length;++i){var _item10=this.OverlayChartPa
 this.RecvMultiOverlayMinuteData=function(aryData){if(!IFrameSplitOperator.IsNonEmptyArray(aryData))return;var bUpdate=false;for(var i=0;i<aryData.length;++i){var overlayData=aryData[i];if(!overlayData.symbol)continue;for(var j=0;j<this.OverlayChartPaint.length;++j){var item=this.OverlayChartPaint[j];if(!item.MainData)continue;if(overlayData.symbol==item.Symbol){this.RecvOverlayMinuteData(overlayData,item,{Redraw:false});bUpdate=true;break;}}}if(bUpdate){this.UpdateFrameMaxMin();//调整坐标最大 最小值
 this.Frame.SetSizeChage(true);this.Draw();}};this.RecvOverlayMinuteData=function(data,paint,option){if(paint.IsDelete)return;if(this.EnableVerifyRecvData&&data.symbol!=paint.Symbol){JSConsole.Chart.Warn('[MinuteChartContainer::RecvOverlayMinuteData] recv data symbol not match. paint['+paint.Symbol+'] , Recv['+data.symbol+']');return;}var aryMinuteData=MinuteChartContainer.JsonDataToMinuteDataArray(data);var sourceData=null;var yClose;if(this.DayCount>1)//多日数据
 {if(aryMinuteData.length<=0)return;var minuteData=aryMinuteData[0];for(var i in paint.SourceData){var item=paint.SourceData[i];if(item.Date==minuteData.Date){paint.SourceData[i]=minuteData;var allMinuteData=this.HistoryMinuteDataToArray(paint.SourceData);var sourceData=new ChartData();sourceData.Data=allMinuteData;yClose=minuteData.YClose;break;}}if(sourceData==null)return;}else{if(aryMinuteData.length>0)sourceData=aryMinuteData[0];else sourceData=new ChartData();yClose=sourceData.YClose;}paint.Data=sourceData;paint.Title=data.name;paint.Symbol=data.symbol;paint.YClose=yClose;paint.Status=OVERLAY_STATUS_ID.STATUS_FINISHED_ID;var bRedraw=true;if(option&&option.Redraw==false)bRedraw=false;if(bRedraw){this.UpdateFrameMaxMin();//调整坐标最大 最小值
-this.Frame.SetSizeChage(true);this.Draw();}};this.RequestOverlayHistoryMinuteData=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.DayData))return;var self=this;var days=[];for(var i=0;i<this.DayData.length;++i){var item=this.DayData[i];days.push(item.Date);}if(days.length<=0)return;for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];var symbol=item.Symbol;if(!symbol)continue;if(item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID)continue;item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;if(this.NetworkFilter){var obj={Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData',//类名::函数名
-Explain:'叠加股票多日分时数据',Request:{Url:self.HistoryMinuteApiUrl,Data:{days:days,symbol:symbol},Type:'POST'},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;self.RecvOverlayHistoryMinuteData(data,item);});if(obj.PreventDefault==true)continue;//已被上层替换,不调用默认的网络请求
-}JSNetwork.HttpRequest({url:self.HistoryMinuteApiUrl,data:{"symbol":symbol,"days":days},type:"post",dataType:"json",async:true,success:function success(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;self.RecvOverlayHistoryMinuteData(data,item);}});}};this.RecvOverlayHistoryMinuteData=function(data,paint)//叠加历史的分钟数据
+this.Frame.SetSizeChage(true);this.Draw();}};this.RequestSingleOverlayHistoryMinuteData=function(symbol,days,item){item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;if(this.NetworkFilter){var obj={Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData',//类名::函数名
+Explain:'叠加股票多日分时数据',Request:{Url:this.HistoryMinuteApiUrl,Data:{days:days,symbol:symbol},Type:'POST'},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;this.RecvOverlayHistoryMinuteData(data,item);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
+}JSNetwork.HttpRequest({url:this.HistoryMinuteApiUrl,data:{"symbol":symbol,"days":days},type:"post",dataType:"json",async:true,success:function success(data){item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;this.RecvOverlayHistoryMinuteData(data,item);}});};this.RequestOverlayHistoryMinuteData=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.DayData))return;var self=this;var days=[];for(var i=0;i<this.DayData.length;++i){var item=this.DayData[i];days.push(item.Date);}if(days.length<=0)return;for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];var symbol=item.Symbol;if(!symbol)continue;if(item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID)continue;this.RequestSingleOverlayHistoryMinuteData(symbol,days,item);/*
+            item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+            if (this.NetworkFilter)
+            {
+                var obj=
+                {
+                    Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData', //类名::函数名
+                    Explain:'叠加股票多日分时数据',
+                    Request:{ Url:self.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
+                    Self:this,
+                    PreventDefault:false
+                };
+                this.NetworkFilter(obj, function(data) 
+                { 
+                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                    self.RecvOverlayHistoryMinuteData(data,item);
+                });
+
+                if (obj.PreventDefault==true) continue;   //已被上层替换,不调用默认的网络请求
+            }
+
+            JSNetwork.HttpRequest({
+                url: self.HistoryMinuteApiUrl,
+                data:{ "symbol": symbol, "days": days },
+                type:"post",
+                dataType: "json",
+                async:true,
+                success: function (data)
+                {
+                    item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                    self.RecvOverlayHistoryMinuteData(data,item);
+                }
+            });
+            */}};this.RecvOverlayHistoryMinuteData=function(data,paint)//叠加历史的分钟数据
 {if(this.EnableVerifyRecvData&&data.symbol!=paint.Symbol){JSConsole.Chart.Warn('[MinuteChartContainer::RecvOverlayHistoryMinuteData] recv data symbol not match. paint['+paint.Symbol+'] , Recv['+data.symbol+']');return;}if(!IFrameSplitOperator.IsNonEmptyArray(this.DayData))return;var dayData=MinuteChartContainer.JsonDataToMinuteDataArray(data);if(!IFrameSplitOperator.IsNonEmptyArray(dayData))return;var overlayDayData=[];for(var i=0;i<this.DayData.length;++i){var item=this.DayData[i];var bFind=false;for(var j=0;j<dayData.length;++j){if(item.Date==dayData[j].Date){overlayDayData.push(dayData[j]);bFind=true;break;}}if(!bFind)//当天不存在叠加数据, 存空
 {var empytData=new ChartData();empytData.Date=item.Date;empytData.Data.length=item.Data.length;overlayDayData.push(empytData);}}paint.SourceData=overlayDayData;var allMinuteData=this.HistoryMinuteDataToArray(overlayDayData);var yClose=overlayDayData[0].YClose;//取最近一个交易日前收盘最为中轴线
 //原始数据
@@ -12968,7 +13002,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12783";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12785";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

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

package/src/jscommon/umychart.js

@@ -76483,6 +76483,43 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
+    this.RequestSingleOverlayHistoryMinuteData=function(symbol, days, item)
+    {
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData', //类名::函数名
+                Explain:'叠加股票多日分时数据',
+                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayHistoryMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+
+        JSNetwork.HttpRequest({
+            url: this.HistoryMinuteApiUrl,
+            data:{ "symbol": symbol, "days": days },
+            type:"post",
+            dataType: "json",
+            async:true,
+            success: function (data)
+            {
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayHistoryMinuteData(data,item);
+            }
+        });
+    }
+
     this.RequestOverlayHistoryMinuteData=function()
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(this.DayData)) return;
@@ -76503,6 +76540,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (!symbol) continue;
             if (item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID) continue;
 
+            this.RequestSingleOverlayHistoryMinuteData(symbol, days, item);
+
+            /*
             item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
             if (this.NetworkFilter)
@@ -76536,6 +76576,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     self.RecvOverlayHistoryMinuteData(data,item);
                 }
             });
+            */
         }
     }
 

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

@@ -80627,6 +80627,43 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
+    this.RequestSingleOverlayHistoryMinuteData=function(symbol, days, item)
+    {
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData', //类名::函数名
+                Explain:'叠加股票多日分时数据',
+                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayHistoryMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+
+        JSNetwork.HttpRequest({
+            url: this.HistoryMinuteApiUrl,
+            data:{ "symbol": symbol, "days": days },
+            type:"post",
+            dataType: "json",
+            async:true,
+            success: function (data)
+            {
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayHistoryMinuteData(data,item);
+            }
+        });
+    }
+
     this.RequestOverlayHistoryMinuteData=function()
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(this.DayData)) return;
@@ -80647,6 +80684,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (!symbol) continue;
             if (item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID) continue;
 
+            this.RequestSingleOverlayHistoryMinuteData(symbol, days, item);
+
+            /*
             item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
             if (this.NetworkFilter)
@@ -80680,6 +80720,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     self.RecvOverlayHistoryMinuteData(data,item);
                 }
             });
+            */
         }
     }
 
@@ -131446,7 +131487,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12783";
+var HQCHART_VERSION="1.1.12785";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -80671,6 +80671,43 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
+    this.RequestSingleOverlayHistoryMinuteData=function(symbol, days, item)
+    {
+        item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
+
+        if (this.NetworkFilter)
+        {
+            var obj=
+            {
+                Name:'MinuteChartContainer::RequestOverlayHistoryMinuteData', //类名::函数名
+                Explain:'叠加股票多日分时数据',
+                Request:{ Url:this.HistoryMinuteApiUrl, Data:{days:days, symbol:symbol}, Type:'POST' }, 
+                Self:this,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(data) 
+            { 
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayHistoryMinuteData(data,item);
+            });
+
+            if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+        }
+
+        JSNetwork.HttpRequest({
+            url: this.HistoryMinuteApiUrl,
+            data:{ "symbol": symbol, "days": days },
+            type:"post",
+            dataType: "json",
+            async:true,
+            success: function (data)
+            {
+                item.Status=OVERLAY_STATUS_ID.STATUS_RECVDATA_ID;
+                this.RecvOverlayHistoryMinuteData(data,item);
+            }
+        });
+    }
+
     this.RequestOverlayHistoryMinuteData=function()
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(this.DayData)) return;
@@ -80691,6 +80728,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (!symbol) continue;
             if (item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID) continue;
 
+            this.RequestSingleOverlayHistoryMinuteData(symbol, days, item);
+
+            /*
             item.Status=OVERLAY_STATUS_ID.STATUS_REQUESTDATA_ID;
 
             if (this.NetworkFilter)
@@ -80724,6 +80764,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     self.RecvOverlayHistoryMinuteData(data,item);
                 }
             });
+            */
         }
     }
 
@@ -131604,7 +131645,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12783";
+var HQCHART_VERSION="1.1.12785";
 
 function PrintHQChartVersion()
 {