hqchart 1.1.12760 → 1.1.12767

package/lib/umychart.vue.js

@@ -7077,10 +7077,11 @@ this.CreateChartDrawPictureByStorage();//创建画图工具
 this.UpdataDataoffset();//更新数据偏移
 this.UpdatePointByCursorIndex();//更新十字光标位子
 this.UpdateFrameMaxMin();//调整坐标最大 最小值
-this.Frame.SetSizeChage(true);this.Draw();};this.ReqeustHistoryMinuteData=function(){var self=this;this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);this.FlowCapitalReady=false;this.ResetPage();//重置分页
+this.Frame.SetSizeChage(true);this.Draw();};this.RequestHistoryMinuteData=function(){var self=this;this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);this.FlowCapitalReady=false;this.ResetPage();//重置分页
 this.ResetDragDownload();this.ResetZoomDownload();this.Draw();if(this.NetworkFilter){var kLineDrawType=this.GetKLineDrawType();var obj={Name:'KLineChartContainer::ReqeustHistoryMinuteData',//类名::
 Explain:'1分钟K线数据',Request:{Url:self.MinuteKLineApiUrl,Type:'POST',Data:{symbol:self.Symbol,count:self.MaxRequestMinuteDayCount,field:["name","symbol","yclose","open","price","high","low","vol"],period:this.Period,right:this.Right,klineDrawType:kLineDrawType}},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteHistoryData(data);var page=self.Page.Minute;if(page.Enable==true&&page.Finish==false){self.ReqeustHistoryMinutePageData();}else{self.AutoUpdateEvent(true,'KLineChartContainer::ReqeustHistoryMinuteData');self.AutoUpdate();}});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
-}JSNetwork.HttpRequest({url:this.MinuteKLineApiUrl,data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestMinuteDayCount},type:"post",dataType:"json",async:true,success:function success(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteHistoryData(data);var page=self.Page.Minute;if(page.Enable==true&&page.Finish==false){self.ReqeustHistoryMinutePageData();}else{self.AutoUpdateEvent(true,'KLineChartContainer::ReqeustHistoryMinuteData');self.AutoUpdate();}}});};this.RecvMinuteHistoryData=function(data){if(this.EnableVerifyRecvData&&data.symbol!=this.Symbol){JSConsole.Chart.Warn('[KLineChartContainer::RecvMinuteHistoryData] recv data symbol not match. HQChart['+this.Symbol+'] , Recv['+data.symbol+']');return;}var aryDayData=KLineChartContainer.JsonDataToMinuteHistoryData(data);//原始数据
+}JSNetwork.HttpRequest({url:this.MinuteKLineApiUrl,data:{"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"start":-1,"count":self.MaxRequestMinuteDayCount},type:"post",dataType:"json",async:true,success:function success(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteHistoryData(data);var page=self.Page.Minute;if(page.Enable==true&&page.Finish==false){self.ReqeustHistoryMinutePageData();}else{self.AutoUpdateEvent(true,'KLineChartContainer::ReqeustHistoryMinuteData');self.AutoUpdate();}}});};//支持老版本
+this.ReqeustHistoryMinuteData=this.RequestHistoryMinuteData;this.RecvMinuteHistoryData=function(data){if(this.EnableVerifyRecvData&&data.symbol!=this.Symbol){JSConsole.Chart.Warn('[KLineChartContainer::RecvMinuteHistoryData] recv data symbol not match. HQChart['+this.Symbol+'] , Recv['+data.symbol+']');return;}var aryDayData=KLineChartContainer.JsonDataToMinuteHistoryData(data);//原始数据
 var sourceData=new ChartData();sourceData.Data=aryDayData;sourceData.DataType=1;//0=日线数据 1=分钟数据
 sourceData.Symbol=data.symbol;this.SourceData=sourceData;if(this.BeforeBindMainData)this.BeforeBindMainData("RecvMinuteHistoryData");//显示的数据
 var bindData=new ChartData();bindData.Data=aryDayData;bindData.Right=this.Right;bindData.Period=this.Period;bindData.DataType=1;bindData.Symbol=data.symbol;if(bindData.Right>0&&!this.IsApiPeriod&&this.RightFormula>=1)//复权
@@ -7262,7 +7263,7 @@ this.ResetScrollBar();this.ResetOverlaySymbolStatus();this.ClearIndexRunCount();
 //this.ReqeustKLineInfoData();
 }else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.CancelAutoUpdate();//先停止定时器
 this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');//切换周期先停止更新
-this.ResetScrollBar();this.ResetOverlaySymbolStatus();this.ClearIndexRunCount();this.Frame.ClearYCoordinateMaxMin();this.ReqeustHistoryMinuteData();//请求分钟数据
+this.ResetScrollBar();this.ResetOverlaySymbolStatus();this.ClearIndexRunCount();this.Frame.ClearYCoordinateMaxMin();this.RequestHistoryMinuteData();//请求分钟数据
 }else if(ChartData.IsTickPeriod(this.Period)){this.CancelAutoUpdate();//先停止定时器
 this.AutoUpdateEvent(false,'KLineChartContainer::ChangePeriod');this.ResetScrollBar();this.ClearIndexRunCount();this.Frame.ClearYCoordinateMaxMin();this.RequestTickData();//请求分笔数据
 }};//复权切换
@@ -7272,7 +7273,7 @@ this.AutoUpdateEvent(false,'KLineChartContainer::ChangeRight');//切换复权先
 this.ClearIndexPaint();this.ResetOverlaySymbolStatus();this.ResetScrollBar();this.RequestHistoryData();//请求日线数据
 }else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.CancelAutoUpdate();//先停止定时器
 this.AutoUpdateEvent(false,'KLineChartContainer::ChangeRight');//切换复权先停止更新
-this.ClearIndexPaint();this.ResetOverlaySymbolStatus();this.ResetScrollBar();this.ReqeustHistoryMinuteData();//请求分钟数据
+this.ClearIndexPaint();this.ResetOverlaySymbolStatus();this.ResetScrollBar();this.RequestHistoryMinuteData();//请求分钟数据
 }}};//设置第1屏的起始日期
 this.SetFirstShowDate=function(obj){if(!obj||!obj.Date)return;var option={ID:JSCHART_OPERATOR_ID.OP_GOTO,Date:obj.Date};if(IFrameSplitOperator.IsNumber(obj.Time))option.Time=obj.Time;if(IFrameSplitOperator.IsNumber(obj.PageSize))option.PageSize=obj.PageSize;this.ChartOperator(option);};//删除某一个窗口的指标, bCallDestory=是否调用图形销毁函数
 this.DeleteIndexPaint=function(windowIndex,bCallDestroy){var paint=new Array();//踢出当前窗口的指标画法
@@ -7352,7 +7353,7 @@ scriptIndex.Create(this,windowIndex);overlayFrame.Script=scriptIndex;}var event=
 {if(!this.DeleteOverlayIndex(identify,null))return;this.UpdateFrameMaxMin();//重新计算坐标范围
 this.Frame.ResetXYSplit(true);this.Draw();};this.ChangeKLineDrawType=function(drawType,isDraw,option){if(this.KLineDrawType==drawType&&!option)return;var oldKLineType=this.KLineDrawType;this.KLineDrawType=drawType;var setKLineType=new _set2.default([5,7,8,10,11,12,17]);if(setKLineType.has(oldKLineType)||setKLineType.has(drawType)){var chart=this.ChartPaint[0];if(chart)chart.DrawType=this.KLineDrawType;this.CancelAutoUpdate();//先停止定时器
 this.AutoUpdateEvent(false,'KLineChartContainer::ChangeKLineDrawType');if(ChartData.IsDayPeriod(this.Period,true)){this.ResetOverlaySymbolStatus();this.RequestHistoryData();//请求日线数据
-}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ResetOverlaySymbolStatus();this.ReqeustHistoryMinuteData();//请求分钟数据
+}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ResetOverlaySymbolStatus();this.RequestHistoryMinuteData();//请求分钟数据
 }return;}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(i==0){item.DrawType=this.KLineDrawType;if(option){if(IFrameSplitOperator.IsBool(option.IsThinAKBar))item.IsThinAKBar=option.IsThinAKBar;}}else if(item.ClassName=='ChartVolStick'){item.KLineDrawType=this.KLineDrawType;}}for(var i in this.OverlayChartPaint)//叠加K线样式修改
 {var item=this.OverlayChartPaint[i];item.DrawType=this.KLineDrawType;}if(isDraw==false)return;this.UpdateFrameMaxMin();//调整坐标最大 最小值
 this.Frame.SetSizeChage(true);this.Draw();};//修改坐标类型 
@@ -7433,7 +7434,7 @@ var item=windows[i];if(!item)continue;if(item.Script){this.WindowIndex[i]=new Sc
 }else if(item.API){var apiItem=item.API;this.WindowIndex[i]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexID=item.Index;var indexInfo=systemScript.Get(indexID);if(indexInfo){var args=indexInfo.Args;if(item.Args)indexInfo.Args=item.Args;indexInfo.ID=indexID;this.WindowIndex[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
 }}}}}this.ReloadChartDrawPicture();this.Frame.ClearUpDonwFrameYData();if(ChartData.IsDayPeriod(this.Period,true)){this.ClearStockCache();this.RequestHistoryData();//请求日线数据
 //this.ReqeustKLineInfoData();
-}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ClearStockCache();this.ReqeustHistoryMinuteData();//请求分钟数据
+}else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ClearStockCache();this.RequestHistoryMinuteData();//请求分钟数据
 }else if(ChartData.IsTickPeriod(this.Period)){this.ClearStockCache();this.RequestTickData();}};this.ReqeustKLineInfoData=function(obj){if(obj&&obj.FunctionName=="RecvDragDayData")//增量更新
 {obj.Update=true;}else{if(this.ChartPaint.length>0){var klinePaint=this.ChartPaint[0];klinePaint.InfoData=new _map2.default();}obj.Update=false;}//信息地雷信息
 if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartInfo))return;for(var i=0;i<this.ChartInfo.length;++i){this.ChartInfo[i].RequestData(this,obj);}};//设置K线信息地雷
@@ -12912,7 +12913,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.12759";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.12765";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.12760",
+  "version": "1.1.12767",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -67265,7 +67265,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Draw();
     }
 
-    this.ReqeustHistoryMinuteData=function()
+    this.RequestHistoryMinuteData=function()
     {
         var self=this;
         this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);
@@ -67343,6 +67343,8 @@ function KLineChartContainer(uielement,OffscreenElement)
         });
     }
 
+    //支持老版本
+    this.ReqeustHistoryMinuteData=this.RequestHistoryMinuteData;
 
     this.RecvMinuteHistoryData=function(data)
     {
@@ -68515,7 +68517,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
             this.Frame.ClearYCoordinateMaxMin();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -68565,7 +68567,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                 this.ClearIndexPaint();
                 this.ResetOverlaySymbolStatus();
                 this.ResetScrollBar();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }  
         }
     }
@@ -69056,7 +69058,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
             {
                 this.ResetOverlaySymbolStatus();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }
 
             return;
@@ -69906,7 +69908,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
             this.ClearStockCache();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {

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

@@ -71409,7 +71409,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Draw();
     }
 
-    this.ReqeustHistoryMinuteData=function()
+    this.RequestHistoryMinuteData=function()
     {
         var self=this;
         this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);
@@ -71487,6 +71487,8 @@ function KLineChartContainer(uielement,OffscreenElement)
         });
     }
 
+    //支持老版本
+    this.ReqeustHistoryMinuteData=this.RequestHistoryMinuteData;
 
     this.RecvMinuteHistoryData=function(data)
     {
@@ -72659,7 +72661,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
             this.Frame.ClearYCoordinateMaxMin();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -72709,7 +72711,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                 this.ClearIndexPaint();
                 this.ResetOverlaySymbolStatus();
                 this.ResetScrollBar();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }  
         }
     }
@@ -73200,7 +73202,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
             {
                 this.ResetOverlaySymbolStatus();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }
 
             return;
@@ -74050,7 +74052,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
             this.ClearStockCache();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -131226,7 +131228,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12759";
+var HQCHART_VERSION="1.1.12765";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -71453,7 +71453,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Draw();
     }
 
-    this.ReqeustHistoryMinuteData=function()
+    this.RequestHistoryMinuteData=function()
     {
         var self=this;
         this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);
@@ -71531,6 +71531,8 @@ function KLineChartContainer(uielement,OffscreenElement)
         });
     }
 
+    //支持老版本
+    this.ReqeustHistoryMinuteData=this.RequestHistoryMinuteData;
 
     this.RecvMinuteHistoryData=function(data)
     {
@@ -72703,7 +72705,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
             this.Frame.ClearYCoordinateMaxMin();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -72753,7 +72755,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                 this.ClearIndexPaint();
                 this.ResetOverlaySymbolStatus();
                 this.ResetScrollBar();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }  
         }
     }
@@ -73244,7 +73246,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
             {
                 this.ResetOverlaySymbolStatus();
-                this.ReqeustHistoryMinuteData();            //请求分钟数据
+                this.RequestHistoryMinuteData();            //请求分钟数据
             }
 
             return;
@@ -74094,7 +74096,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
         {
             this.ClearStockCache();
-            this.ReqeustHistoryMinuteData();            //请求分钟数据
+            this.RequestHistoryMinuteData();            //请求分钟数据
         } 
         else if (ChartData.IsTickPeriod(this.Period))
         {
@@ -131384,7 +131386,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12759";
+var HQCHART_VERSION="1.1.12765";
 
 function PrintHQChartVersion()
 {