hqchart 1.1.13197 → 1.1.13199

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -7997,7 +7997,7 @@ this.IsBeforeData=false;if(this.IsShowBeforeData&&this.DayCount===1&&MARKET_SUFF
7997
7997
  };var obj={Name:'MinuteChartContainer::RequestMinuteData',//类名::函数名
7998
7998
  Explain:'最新分时数据',Request:{Url:self.MinuteApiUrl,Data:{field:fields,symbol:[self.Symbol],callcation:callCation},Type:'POST'},Self:this,PreventDefault:false};if(dateRange)obj.DateRange=dateRange;//本地数据日期范围
7999
7999
  this.NetworkFilter(obj,function(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteData(data);});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
8000
- }JSNetwork.HttpRequest({url:self.MinuteApiUrl,data:{"field":fields,"symbol":[self.Symbol],"start":-1},type:"post",dataType:"json",async:true,success:function success(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteData(data);}});};this.RecvMinuteDataEvent=function(option){if(!this.mapEvent.has(JSCHART_EVENT_ID.RECV_MINUTE_DATA))return;var event=this.mapEvent.get(JSCHART_EVENT_ID.RECV_MINUTE_DATA);var data={MinuteData:this.SourceData,Stock:{Symbol:this.Symbol,Name:this.Name},Option:option};event.Callback(event,data,this);};this.UpdateLineColorData=function(data,date){if(!this.ColorLineData){this.ColorLineData=data;return;}//移除当前的
8000
+ }JSNetwork.HttpRequest({url:self.MinuteApiUrl,data:{"field":fields,"symbol":[self.Symbol],"start":-1},type:"post",dataType:"json",async:true,success:function success(data){self.ChartSplashPaint.EnableSplash(false);self.RecvMinuteData(data);}});};this.RecvMinuteDataEvent=function(option){if(!this.mapEvent.has(JSCHART_EVENT_ID.RECV_MINUTE_DATA))return;var event=this.mapEvent.get(JSCHART_EVENT_ID.RECV_MINUTE_DATA);var data={MinuteData:this.SourceData,Stock:{Symbol:this.Symbol,Name:this.Name},Option:option,DataStatus:this.DataStatus};event.Callback(event,data,this);};this.UpdateLineColorData=function(data,date){if(!this.ColorLineData){this.ColorLineData=data;return;}//移除当前的
8001
8001
  var aryColorLineData=this.ColorLineData.filter(function(item,index,arr){return item.Date!=date;});if(IFrameSplitOperator.IsNonEmptyArray(data)){for(var i in data){aryColorLineData.push(data[i]);}}this.ColorLineData=aryColorLineData;};this.UpdateCallCationData=function(beforeOpenData,afterCloseData){if(beforeOpenData&&IFrameSplitOperator.IsNonEmptyArray(this.MultiDayBeforeOpenData)){var lastItem=this.MultiDayBeforeOpenData[this.MultiDayBeforeOpenData.length-1];if(lastItem.Date==beforeOpenData.Date)//存在更新
8002
8002
  this.MultiDayBeforeOpenData[this.MultiDayBeforeOpenData.length-1]=beforeOpenData;else if(lastItem.Date<beforeOpenData.Date)//新的一天插入
8003
8003
  this.MultiDayBeforeOpenData.push(beforeOpenData);}if(afterCloseData&&IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)){var lastItem=this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1];if(lastItem.Date==afterCloseData.Date)this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1]=afterCloseData;else if(lastItem.Date<afterCloseData.Date)this.MultiDayAfterCloseData.push(afterCloseData);}this.CaclutateCallCationYRange();};this.RecvUpdateMinuteData=function(data){var minuteData=MinuteChartContainer.JsonDataToUpdateMinuteData(data);var aryColorData=MinuteChartContainer.JsonDataToMinuteLineColorData(data);this.BeforeOpenData=null;this.AfterCloseData=null;var beforeOpenData=MinuteChartContainer.JsonDataToBeforeOpenData(data);var afterCloseData=MinuteChartContainer.JsonDataToAfterCloseData(data);var updateTime=MinuteChartContainer.JsonDataToMinuteLastUpdateTime(data);//数据最后的更新时间
@@ -8016,7 +8016,8 @@ this.CreateChartDrawPictureByStorage();//创建画图工具
8016
8016
  this.UpdateFrameMaxMin();//调整坐标最大 最小值
8017
8017
  this.Frame.SetSizeChage(true);this.Draw();this.BindAllOverlayIndexData(this.SourceData);this.AutoUpdateEvent(true,"MinuteChartContainer::RecvUpdateMinuteData");this.AutoUpdate();};this.RecvMinuteData=function(data){if(!data){JSConsole.Chart.Warn("[MinuteChartContainer::RecvMinuteData] recv data is null");return;}if(data.dataType==1)//增量更新数据模式
8018
8018
  {this.RecvUpdateMinuteData(data);return;}if(!data.stock[0])return;if(data.stock[0].symbol!=this.Symbol&&this.EnableVerifyRecvData){JSConsole.Chart.Warn('[MinuteChartContainer::RecvMinuteData] recv data symbol not match. HQChart['+this.Symbol+'] , Recv['+data.stock[0].symbol+']');return;}var aryMinuteData=MinuteChartContainer.JsonDataToMinuteData(data);var aryColorData=MinuteChartContainer.JsonDataToMinuteLineColorData(data);this.BeforeOpenData=null;this.AfterCloseData=null;var beforeOpenData=MinuteChartContainer.JsonDataToBeforeOpenData(data);var afterCloseData=MinuteChartContainer.JsonDataToAfterCloseData(data);var updateTime=MinuteChartContainer.JsonDataToMinuteLastUpdateTime(data);//数据最后的更新时间
8019
- if(this.IsBeforeData)this.BeforeOpenData=beforeOpenData;if(this.IsAfterData)this.AfterCloseData=afterCloseData;this.DataStatus.LatestDay=true;if(this.DayCount>1)//多日走势图
8019
+ if(this.IsBeforeData)this.BeforeOpenData=beforeOpenData;if(this.IsAfterData)this.AfterCloseData=afterCloseData;var bFirstData=this.DataStatus.LatestDay==false;//首条单日数据
8020
+ this.DataStatus.LatestDay=true;if(this.DayCount>1)//多日走势图
8020
8021
  {this.UpdateCallCationData(beforeOpenData,afterCloseData);this.UpdateLineColorData(aryColorData,data.stock[0].date);this.UpdateLatestMinuteData(aryMinuteData,data.stock[0].date,data.stock[0]);this.UpdateHistoryMinuteUI(updateTime);this.RecvMinuteDataEvent({FunctionName:"RecvMinuteData"});this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
8021
8022
  this.BindAllOverlayIndexData(this.SourceData);this.AutoUpdateEvent(true,"MinuteChartContainer::RecvMinuteData");this.AutoUpdate();return;}//原始数据
8022
8023
  var sourceData=new ChartData();sourceData.Data=aryMinuteData;sourceData.UpdateTime=updateTime;this.ColorLineData=aryColorData;this.TradeDate=data.stock[0].date;this.Frame.SetDayCount(1);//单日数据
@@ -8026,7 +8027,7 @@ this.CaclutateLimitPrice(yClose,data.stock[0].limitprice);//计算涨停价格
8026
8027
  var extendData=null;if(data.stock[0].high>0&&data.stock[0].low>0)extendData={High:data.stock[0].high,Low:data.stock[0].low};this.BindMainData(sourceData,yClose,extendData);if(this.Frame.SubFrame.length>2){var bindData=new ChartData();bindData.Data=aryMinuteData;for(var i=2;i<this.Frame.SubFrame.length;++i){this.BindIndexData(i,bindData);}}for(var _i17 in this.Frame.SubFrame){var item=this.Frame.SubFrame[_i17];item.Frame.XSplitOperator.Symbol=this.Symbol;item.Frame.XSplitOperator.DayCount=1;item.Frame.XSplitOperator.Operator();//调整X轴个数
8027
8028
  item.Frame.YSplitOperator.Symbol=this.Symbol;for(var j in item.OverlayIndex)//子坐标X轴个数同步
8028
8029
  {var overlayItem=item.OverlayIndex[j];overlayItem.Frame.XPointCount=item.Frame.XPointCount;overlayItem.Frame.MinuteCount=item.Frame.MinuteCount;}}this.ChartCorssCursor.StringFormatY.Symbol=this.Symbol;this.ChartCorssCursor.StringFormatX.Symbol=this.Symbol;if(MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol))this.TitlePaint[0].IsShowDate=false;if(data.stock[0].IsHistoryMinute==true)this.TitlePaint[0].IsShowDate=true;var chartInfo=this.GetChartMinuteInfo();if(chartInfo)chartInfo.SourceData=this.SourceData;//数据绑定到信息地雷上
8029
- this.RecvMinuteDataEvent({FunctionName:"RecvMinuteData"});this.RequestMinuteInfoData();this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
8030
+ this.RecvMinuteDataEvent({FunctionName:"RecvMinuteData",Day:{IsFirstData:bFirstData}});this.RequestMinuteInfoData();this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
8030
8031
  this.CreateChartDrawPictureByStorage();//创建画图工具
8031
8032
  this.UpdateFrameMaxMin();//调整坐标最大 最小值
8032
8033
  this.Frame.SetSizeChage(true);this.Draw();this.BindAllOverlayIndexData(this.SourceData);if(data.AutoUpdate===false)//不执行自动更新
@@ -13176,7 +13177,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
13176
13177
  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);};}/********************************************************************************
13177
13178
  * 版本信息输出
13178
13179
  *
13179
- */var HQCHART_VERSION="1.1.13196";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();//把给外界调用的方法暴露出来
13180
+ */var HQCHART_VERSION="1.1.13198";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();//把给外界调用的方法暴露出来
13180
13181
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
13181
13182
  // BaseIndex:BaseIndex,
13182
13183
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.13197",
3
+ "version": "1.1.13199",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
@@ -78233,7 +78233,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
78233
78233
  if (!this.mapEvent.has(JSCHART_EVENT_ID.RECV_MINUTE_DATA)) return;
78234
78234
 
78235
78235
  var event=this.mapEvent.get(JSCHART_EVENT_ID.RECV_MINUTE_DATA);
78236
- var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option };
78236
+ var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option, DataStatus:this.DataStatus };
78237
78237
  event.Callback(event,data,this);
78238
78238
  }
78239
78239
 
@@ -78431,6 +78431,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
78431
78431
  if (this.IsBeforeData) this.BeforeOpenData=beforeOpenData;
78432
78432
  if (this.IsAfterData) this.AfterCloseData=afterCloseData;
78433
78433
 
78434
+ var bFirstData=(this.DataStatus.LatestDay==false); //首条单日数据
78434
78435
  this.DataStatus.LatestDay=true;
78435
78436
 
78436
78437
  if (this.DayCount>1) //多日走势图
@@ -78519,7 +78520,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
78519
78520
  var chartInfo=this.GetChartMinuteInfo();
78520
78521
  if (chartInfo) chartInfo.SourceData=this.SourceData; //数据绑定到信息地雷上
78521
78522
 
78522
- this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData"} );
78523
+ this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} } );
78523
78524
  this.RequestMinuteInfoData();
78524
78525
  this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
78525
78526
  this.CreateChartDrawPictureByStorage(); //创建画图工具
@@ -82125,7 +82125,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
82125
82125
  if (!this.mapEvent.has(JSCHART_EVENT_ID.RECV_MINUTE_DATA)) return;
82126
82126
 
82127
82127
  var event=this.mapEvent.get(JSCHART_EVENT_ID.RECV_MINUTE_DATA);
82128
- var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option };
82128
+ var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option, DataStatus:this.DataStatus };
82129
82129
  event.Callback(event,data,this);
82130
82130
  }
82131
82131
 
@@ -82323,6 +82323,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
82323
82323
  if (this.IsBeforeData) this.BeforeOpenData=beforeOpenData;
82324
82324
  if (this.IsAfterData) this.AfterCloseData=afterCloseData;
82325
82325
 
82326
+ var bFirstData=(this.DataStatus.LatestDay==false); //首条单日数据
82326
82327
  this.DataStatus.LatestDay=true;
82327
82328
 
82328
82329
  if (this.DayCount>1) //多日走势图
@@ -82411,7 +82412,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
82411
82412
  var chartInfo=this.GetChartMinuteInfo();
82412
82413
  if (chartInfo) chartInfo.SourceData=this.SourceData; //数据绑定到信息地雷上
82413
82414
 
82414
- this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData"} );
82415
+ this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} } );
82415
82416
  this.RequestMinuteInfoData();
82416
82417
  this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
82417
82418
  this.CreateChartDrawPictureByStorage(); //创建画图工具
@@ -131845,7 +131846,7 @@ function ScrollBarBGChart()
131845
131846
 
131846
131847
 
131847
131848
 
131848
- var HQCHART_VERSION="1.1.13196";
131849
+ var HQCHART_VERSION="1.1.13198";
131849
131850
 
131850
131851
  function PrintHQChartVersion()
131851
131852
  {
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.13196";
8
+ var HQCHART_VERSION="1.1.13198";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
@@ -82169,7 +82169,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
82169
82169
  if (!this.mapEvent.has(JSCHART_EVENT_ID.RECV_MINUTE_DATA)) return;
82170
82170
 
82171
82171
  var event=this.mapEvent.get(JSCHART_EVENT_ID.RECV_MINUTE_DATA);
82172
- var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option };
82172
+ var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option, DataStatus:this.DataStatus };
82173
82173
  event.Callback(event,data,this);
82174
82174
  }
82175
82175
 
@@ -82367,6 +82367,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
82367
82367
  if (this.IsBeforeData) this.BeforeOpenData=beforeOpenData;
82368
82368
  if (this.IsAfterData) this.AfterCloseData=afterCloseData;
82369
82369
 
82370
+ var bFirstData=(this.DataStatus.LatestDay==false); //首条单日数据
82370
82371
  this.DataStatus.LatestDay=true;
82371
82372
 
82372
82373
  if (this.DayCount>1) //多日走势图
@@ -82455,7 +82456,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
82455
82456
  var chartInfo=this.GetChartMinuteInfo();
82456
82457
  if (chartInfo) chartInfo.SourceData=this.SourceData; //数据绑定到信息地雷上
82457
82458
 
82458
- this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData"} );
82459
+ this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} } );
82459
82460
  this.RequestMinuteInfoData();
82460
82461
  this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
82461
82462
  this.CreateChartDrawPictureByStorage(); //创建画图工具
@@ -134758,7 +134759,7 @@ function HQChartScriptWorker()
134758
134759
 
134759
134760
 
134760
134761
 
134761
- var HQCHART_VERSION="1.1.13196";
134762
+ var HQCHART_VERSION="1.1.13198";
134762
134763
 
134763
134764
  function PrintHQChartVersion()
134764
134765
  {