hqchart 1.1.12804 → 1.1.12813

package/lib/umychart.vue.js

@@ -7591,7 +7591,8 @@ self.AutoUpdate();});if(obj.PreventDefault==true)return;//已被上层替换,不
 }JSNetwork.HttpRequest({url:url,data:postData,type:"post",dataType:"json",async:true,success:function success(data){self.RecvPreviousMinuteData(data,option);download.Status=0;self.AutoUpdateEvent(true,funcName);//自动更新
 self.AutoUpdate();}});};this.RecvPreviousMinuteData=function(data,option){var download=option.Download;var aryDayData=KLineChartContainer.JsonDataToMinuteHistoryData(data);if(!aryDayData||aryDayData.length<=0){download.IsEnd=true;JSConsole.Chart.Log('[KLineChartContainer.RecvPreviousMinuteData] '+this.Symbol+' data end. FuncName='+option.FuncName);this.Draw();return;}var lastDataCount=this.GetHistoryDataCount();//保存下上一次的数据个数
 var firstData=this.SourceData.Data[0];var endIndex=null;for(var i=aryDayData.length-1;i>=0;--i){var item=aryDayData[i];if(firstData.Date>item.Date||firstData.Date==item.Date&&firstData.Time>item.Time){endIndex=i;break;}else if(firstData.Date==item.Date&&firstData.Time==item.Time){firstData.YClose=item.YClose;endIndex=i-1;break;}}if(endIndex==null&&endIndex<0)return;for(var i=0;i<aryDayData.length&&i<=endIndex;++i)//数据往前插
-{var item=aryDayData[i];this.SourceData.Data.splice(i,0,item);}var bindData=new ChartData();bindData.Data=this.SourceData.Data;bindData.Period=this.Period;bindData.Right=this.Right;bindData.DataType=this.SourceData.DataType;bindData.Symbol=this.Symbol;if(!this.IsApiPeriod){if(ChartData.IsDayPeriod(bindData.Period,false)||ChartData.IsMinutePeriod(bindData.Period,false))//周期数据 (0= 日线,4=1分钟线 不需要处理)
+{var item=aryDayData[i];this.SourceData.Data.splice(i,0,item);}var bindData=new ChartData();bindData.Data=this.SourceData.Data;bindData.Period=this.Period;bindData.Right=this.Right;bindData.DataType=this.SourceData.DataType;bindData.Symbol=this.Symbol;if(!this.IsApiPeriod){if(bindData.Right>0&&this.RightFormula>=1)//复权
+{var rightData=bindData.GetRightData(bindData.Right,{AlgorithmType:this.RightFormula});bindData.Data=rightData;}if(ChartData.IsDayPeriod(bindData.Period,false)||ChartData.IsMinutePeriod(bindData.Period,false))//周期数据 (0= 日线,4=1分钟线 不需要处理)
 {var periodData=bindData.GetPeriodData(bindData.Period);bindData.Data=periodData;}}var kLineCalculate=this.GetKLineCalulate();if(kLineCalculate)//额外的K线图形计算
 {var newBindData=kLineCalculate.RecvHistoryData(bindData,{Symbol:this.Symbol,Function:option.RecvFuncName});bindData=newBindData;this.FlowCapitalReady=true;}//绑定数据
 this.UpdateMainData(bindData,lastDataCount);if(option)//缩放需要调整当前屏的位置
@@ -7614,18 +7615,19 @@ this.RequestPreviousDayData=function(option){var funcName=option.FuncName;var fu
 var self=this;this.AutoUpdateEvent(false,funcName);//停止自动更新
 this.CancelAutoUpdate();download.Status=1;var firstItem=this.SourceData.Data[0];//最新的一条数据
 var postData={"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"enddate":firstItem.Date,"count":count,"first":{date:firstItem.Date}};if(IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint)){postData.overlay=[];for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];postData.overlay.push({symbol:item.Symbol});}}if(this.NetworkFilter){var obj={Name:funcName,//类名::函数
-Explain:funcExplain,Request:{Url:url,Type:'POST',Data:postData,Period:this.Period,Right:this.Right},DragDownload:download,Self:this,PreventDefault:false,ZoomData:option.ZoomData};this.NetworkFilter(obj,function(data){self.RecvPreviousDayData(data,option);download.Status=0;self.AutoUpdateEvent(true,funcName);//自动更新
+Explain:funcExplain,Request:{Url:url,Type:'POST',Data:postData,Period:this.Period,Right:this.Right},DragDownload:download,Option:option,Self:this,PreventDefault:false,ZoomData:option.ZoomData};this.NetworkFilter(obj,function(data){self.RecvPreviousDayData(data,option);download.Status=0;self.AutoUpdateEvent(true,funcName);//自动更新
 self.AutoUpdate();});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
 }JSNetwork.HttpRequest({url:url,data:postData,type:"post",dataType:"json",async:true,success:function success(data){self.RecvPreviousDayData(data,option);download.Status=0;self.AutoUpdateEvent(true,funcName);//自动更新
 self.AutoUpdate();}});};this.RecvPreviousDayData=function(data,option){var download=option.Download;var aryDayData=KLineChartContainer.JsonDataToHistoryData(data);if(!aryDayData||aryDayData.length<=0){download.IsEnd=true;//下完了
 JSConsole.Chart.Log('[KLineChartContainer.RecvPreviousDayData] '+this.Symbol+' data end. FuncName='+option.FuncName);return;}var lastDataCount=this.GetHistoryDataCount();//保存下上一次的数据个数
 var firstData=this.SourceData.Data[0];var endIndex=null;for(var i=aryDayData.length-1;i>=0;--i){var item=aryDayData[i];if(firstData.Date>item.Date){endIndex=i;break;}else if(firstData.Date==item.Date){firstData.YClose=item.YClose;endIndex=i-1;break;}}if(endIndex==null&&endIndex<0)return;for(var i=0;i<aryDayData.length&&i<=endIndex;++i)//数据往前插
-{var item=aryDayData[i];this.SourceData.Data.splice(i,0,item);}var bindData=new ChartData();bindData.Data=this.SourceData.Data;bindData.Period=this.Period;bindData.Right=this.Right;bindData.DataType=this.SourceData.DataType;bindData.Symbol=this.Symbol;if(!this.IsApiPeriod){if(ChartData.IsDayPeriod(bindData.Period,false)||ChartData.IsMinutePeriod(bindData.Period,false))//周期数据 (0= 日线,4=1分钟线 不需要处理)
+{var item=aryDayData[i];this.SourceData.Data.splice(i,0,item);}var bindData=new ChartData();bindData.Data=this.SourceData.Data;bindData.Period=this.Period;bindData.Right=this.Right;bindData.DataType=this.SourceData.DataType;bindData.Symbol=this.Symbol;if(!this.IsApiPeriod){if(bindData.Right>0)//复权
+{var rightData=bindData.GetRightData(bindData.Right,{AlgorithmType:this.RightFormula});bindData.Data=rightData;}if(ChartData.IsDayPeriod(bindData.Period,false)||ChartData.IsMinutePeriod(bindData.Period,false))//周期数据 (0= 日线,4=1分钟线 不需要处理)
 {var periodData=bindData.GetPeriodData(bindData.Period);bindData.Data=periodData;}}var kLineCalculate=this.GetKLineCalulate();if(kLineCalculate)//额外的K线图形计算
 {var newBindData=kLineCalculate.RecvHistoryData(bindData,{Symbol:this.Symbol,Function:option.RecvFuncName});bindData=newBindData;this.FlowCapitalReady=true;}//绑定数据
-this.UpdateMainData(bindData,lastDataCount);if(option&&option.ZoomData)//缩放需要调整当前屏的位置
-{var zoomData=option.ZoomData;var showCount=zoomData.PageSize-zoomData.RightSpaceCount;//一屏显示的数据个数
-bindData.DataOffset=bindData.Data.length-showCount;if(bindData.DataOffset<0)bindData.DataOffset=0;}this.UpdateOverlayDragDayData(data);this.BindInstructionIndexData(bindData);//执行指示脚本
+this.UpdateMainData(bindData,lastDataCount);if(option)//缩放需要调整当前屏的位置
+{if(option.ZoomData){var zoomData=option.ZoomData;var showCount=zoomData.PageSize-zoomData.RightSpaceCount;//一屏显示的数据个数
+bindData.DataOffset=bindData.Data.length-showCount;if(bindData.DataOffset<0)bindData.DataOffset=0;}else if(IFrameSplitOperator.IsNumber(option.DataOffset)){bindData.DataOffset+=option.DataOffset;if(bindData.DataOffset<0)bindData.DataOffset=0;}}this.UpdateOverlayDragDayData(data);this.BindInstructionIndexData(bindData);//执行指示脚本
 for(var i=0;i<this.Frame.SubFrame.length;++i){this.BindIndexData(i,bindData);}//刷新画图
 this.UpdataDataoffset();//更新数据偏移
 this.UpdatePointByCursorIndex();//更新十字光标位子
@@ -7633,7 +7635,7 @@ this.UpdateFrameMaxMin();//调整坐标最大 最小值
 this.Frame.SetSizeChage(true);this.UpdateChartDrawXValue();//更新画图工具X轴索引
 this.Draw();//更新信息地雷
 this.ReqeustKLineInfoData({FunctionName:option.RecvFuncName,StartDate:firstData.Date});//叠加指标计算
-this.BindAllOverlayIndexData(bindData);};this.RequestZoomDayData=function(requestData){var count=this.MaxRequestDataCount;if(requestData.Count>count)count=requestData.Count;var zoomData={PageSize:requestData.PageSize,DataCount:requestData.DataCount,RightSpaceCount:requestData.RightSpaceCount};var option={FuncName:'KLineChartContainer::RequestZoomDayData',FuncExplain:"缩放日K数据下载",RecvFuncName:"RecvZoomDayData",Download:this.ZoomDownload.Day,Url:this.ZoomKLineApiUrl,Count:count,ZoomData:zoomData};this.RequestPreviousDayData(option);};this.RequestDragDayData=function(){var option={FuncName:'KLineChartContainer::RequestDragDayData',FuncExplain:"拖拽日K数据下载",RecvFuncName:"RecvDragDayData",Download:this.DragDownload.Day,Url:this.DragKLineApiUrl,Count:this.MaxRequestDataCount};this.RequestPreviousDayData(option);};//更新叠加数据
+this.BindAllOverlayIndexData(bindData);};this.RequestZoomDayData=function(requestData){var count=this.MaxRequestDataCount;if(requestData.Count>count)count=requestData.Count;var zoomData={PageSize:requestData.PageSize,DataCount:requestData.DataCount,RightSpaceCount:requestData.RightSpaceCount};var option={FuncName:'KLineChartContainer::RequestZoomDayData',FuncExplain:"缩放日K数据下载",RecvFuncName:"RecvZoomDayData",Download:this.ZoomDownload.Day,Url:this.ZoomKLineApiUrl,XShowCount:this.Frame.GetXShowCount(),Count:count,ZoomData:zoomData};this.RequestPreviousDayData(option);};this.RequestDragDayData=function(){var option={FuncName:'KLineChartContainer::RequestDragDayData',FuncExplain:"拖拽日K数据下载",RecvFuncName:"RecvDragDayData",Download:this.DragDownload.Day,Url:this.DragKLineApiUrl,Count:this.MaxRequestDataCount,XShowCount:this.Frame.GetXShowCount()};this.RequestPreviousDayData(option);};//更新叠加数据
 this.UpdateOverlayDragDayData=function(data){if(!IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint))return;var aryRecvOverlayData=data.overlay;if(!IFrameSplitOperator.IsNonEmptyArray(aryRecvOverlayData))return;for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Symbol)continue;if(!item.MainData)continue;//等待主图股票数据未下载完
 if(item.Status!=OVERLAY_STATUS_ID.STATUS_FINISHED_ID)continue;var findData=null;for(var j=0;j<aryRecvOverlayData.length;++j)//查找对应的叠加股票数据
 {var overlayItem=aryRecvOverlayData[j];if(overlayItem.symbol==item.Symbol){findData=overlayItem;break;}}if(!findData)continue;var aryDayData=KLineChartContainer.JsonDataToHistoryData(findData);var sourceData=item.SourceData;//叠加股票的所有数据
@@ -13009,7 +13011,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.12803";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.12812";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.12804",
+  "version": "1.1.12813",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -71729,6 +71729,12 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (!this.IsApiPeriod)
         {
+            if (bindData.Right>0 && this.RightFormula>=1)   //复权
+            {
+                var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula } );
+                bindData.Data=rightData;
+            }
+
             if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据 (0= 日线,4=1分钟线 不需要处理)
             {
                 var periodData=bindData.GetPeriodData(bindData.Period);
@@ -71938,6 +71944,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                 Explain:funcExplain,
                 Request:{ Url:url,  Type:'POST' , Data: postData, Period:this.Period, Right:this.Right }, 
                 DragDownload:download,
+                Option:option,
                 Self:this,
                 PreventDefault:false,
                 ZoomData:option.ZoomData
@@ -72015,6 +72022,12 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (!this.IsApiPeriod)
         {
+            if (bindData.Right>0)    //复权
+            {
+                var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
+                bindData.Data=rightData;
+            }
+
             if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据 (0= 日线,4=1分钟线 不需要处理)
             {
                 var periodData=bindData.GetPeriodData(bindData.Period);
@@ -72032,12 +72045,20 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         //绑定数据
         this.UpdateMainData(bindData,lastDataCount);
-        if (option && option.ZoomData)  //缩放需要调整当前屏的位置
+        if (option)  //缩放需要调整当前屏的位置
         {
-            var zoomData=option.ZoomData;
-            var showCount=zoomData.PageSize-zoomData.RightSpaceCount;   //一屏显示的数据个数
-            bindData.DataOffset= bindData.Data.length-showCount;
-            if (bindData.DataOffset<0) bindData.DataOffset=0;
+            if (option.ZoomData)
+            {
+                var zoomData=option.ZoomData;
+                var showCount=zoomData.PageSize-zoomData.RightSpaceCount;   //一屏显示的数据个数
+                bindData.DataOffset= bindData.Data.length-showCount;
+                if (bindData.DataOffset<0) bindData.DataOffset=0;
+            }
+            else if (IFrameSplitOperator.IsNumber(option.DataOffset))
+            {
+                bindData.DataOffset+=option.DataOffset;
+                if (bindData.DataOffset<0) bindData.DataOffset=0;
+            }
         }
 
         this.UpdateOverlayDragDayData(data);
@@ -72076,6 +72097,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             RecvFuncName:"RecvZoomDayData",
             Download:this.ZoomDownload.Day,
             Url:this.ZoomKLineApiUrl,
+            XShowCount:this.Frame.GetXShowCount(),
             Count:count,
             ZoomData:zoomData
         };
@@ -72093,7 +72115,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             RecvFuncName:"RecvDragDayData",
             Download:this.DragDownload.Day,
             Url:this.DragKLineApiUrl,
-            Count:this.MaxRequestDataCount
+            Count:this.MaxRequestDataCount,
+            XShowCount:this.Frame.GetXShowCount(),
         };
 
         this.RequestPreviousDayData(option);