hqchart 1.1.12884 → 1.1.12886

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.
Files changed (6) hide show
  1. package/lib/umychart.vue.js +6 -7
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.js +56 -30
  4. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +57 -31
  5. package/src/jscommon/umychart.version.js +1 -1
  6. package/src/jscommon/umychart.vue/umychart.vue.js +57 -31
package/lib/umychart.vue.js CHANGED
@@ -7599,13 +7599,13 @@ if(this.ZoomDownload.Tick.Status!=0)return;this.RequestZoomTickData(requestData)
7599
7599
  this.RequestDragTickData=function(){JSConsole.Chart.Log('[KLineChartContainer.RequestDragTickData] not finished.');};//请求拖动或缩放的分钟历史数据
7600
7600
  this.RequestPreviousMinuteData=function(option){var funcName=option.FuncName;var funcExplain=option.FuncExplain;var download=option.Download;var url=option.Url;var count=option.Count;//请求数据个数
7601
7601
  var self=this;this.AutoUpdateEvent(false,funcName);//停止自动更新
7602
- this.CancelAutoUpdate();download.Status=1;var firstItem=this.SourceData.Data[0];//最新的一条数据
7603
- var postData={"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"enddate":firstItem.Date,"endtime":firstItem.Time,"count":count,"first":{date:firstItem.Date,time:firstItem.Time}};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,//类名::函数
7602
+ this.CancelAutoUpdate();download.Status=1;var firstItem=null;if(IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))firstItem=this.SourceData.Data[0];//最新的一条数据
7603
+ else firstItem={Date:null,Time:null};var postData={"field":["name","symbol","yclose","open","price","high","low","vol"],"symbol":self.Symbol,"enddate":firstItem.Date,"endtime":firstItem.Time,"count":count,"first":{date:firstItem.Date,time:firstItem.Time}};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,//类名::函数
7604
7604
  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.RecvPreviousMinuteData(data,option);download.Status=0;self.AutoUpdateEvent(true,funcName);//自动更新
7605
7605
  self.AutoUpdate();});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
7606
7606
  }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);//自动更新
7607
7607
  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();//保存下上一次的数据个数
7608
- 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)//数据往前插
7608
+ var endIndex=null;if(IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data)){var firstData=this.SourceData.Data[0];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;}}}else{endIndex=aryDayData.length-1;}if(endIndex==null&&endIndex<0)return;for(var i=0;i<aryDayData.length&&i<=endIndex;++i)//数据往前插
7609
7609
  {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)//复权
7610
7610
  {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分钟线 不需要处理)
7611
7611
  {var periodData=bindData.GetPeriodData(bindData.Period);bindData.Data=periodData;}}var kLineCalculate=this.GetKLineCalulate();if(kLineCalculate)//额外的K线图形计算
@@ -7630,14 +7630,13 @@ bindData.Data=aryOverlayData;if(ChartData.IsMinutePeriod(bindData.Period,false)&
7630
7630
  {var periodData=bindData.GetPeriodData(bindData.Period);bindData.Data=periodData;}item.Data=bindData;}};//请求拖动或缩放的日线历史数据
7631
7631
  this.RequestPreviousDayData=function(option){var funcName=option.FuncName;var funcExplain=option.FuncExplain;var download=option.Download;var url=option.Url;var count=option.Count;//请求数据个数
7632
7632
  var self=this;this.AutoUpdateEvent(false,funcName);//停止自动更新
7633
- this.CancelAutoUpdate();download.Status=1;var firstItem=this.SourceData.Data[0];//最新的一条数据
7634
- 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,//类名::函数
7633
+ this.CancelAutoUpdate();download.Status=1;var firstItem=null;if(IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))firstItem=this.SourceData.Data[0];else firstItem={Date:null};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,//类名::函数
7635
7634
  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);//自动更新
7636
7635
  self.AutoUpdate();});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
7637
7636
  }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);//自动更新
7638
7637
  self.AutoUpdate();}});};this.RecvPreviousDayData=function(data,option){var download=option.Download;var aryDayData=KLineChartContainer.JsonDataToHistoryData(data);if(!aryDayData||aryDayData.length<=0){download.IsEnd=true;//下完了
7639
7638
  JSConsole.Chart.Log('[KLineChartContainer.RecvPreviousDayData] '+this.Symbol+' data end. FuncName='+option.FuncName);return;}var lastDataCount=this.GetHistoryDataCount();//保存下上一次的数据个数
7640
- 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)//数据往前插
7639
+ var endIndex=null;if(IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data)){var firstData=this.SourceData.Data[0];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;}}}else{var firstData={Date:null};endIndex=aryDayData.length-1;}if(endIndex==null&&endIndex<0)return;for(var i=0;i<aryDayData.length&&i<=endIndex;++i)//数据往前插
7641
7640
  {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)//复权
7642
7641
  {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分钟线 不需要处理)
7643
7642
  {var periodData=bindData.GetPeriodData(bindData.Period);bindData.Data=periodData;}}var kLineCalculate=this.GetKLineCalulate();if(kLineCalculate)//额外的K线图形计算
@@ -13036,7 +13035,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
13036
13035
  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);};}/********************************************************************************
13037
13036
  * 版本信息输出
13038
13037
  *
13039
- */var HQCHART_VERSION="1.1.12883";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();//把给外界调用的方法暴露出来
13038
+ */var HQCHART_VERSION="1.1.12885";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();//把给外界调用的方法暴露出来
13040
13039
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
13041
13040
  // BaseIndex:BaseIndex,
13042
13041
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.12884",
3
+ "version": "1.1.12886",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.js CHANGED
@@ -71807,7 +71807,12 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
71807
71807
  this.AutoUpdateEvent(false,funcName); //停止自动更新
71808
71808
  this.CancelAutoUpdate();
71809
71809
  download.Status=1;
71810
- var firstItem=this.SourceData.Data[0]; //最新的一条数据
71810
+ var firstItem=null;
71811
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
71812
+ firstItem=this.SourceData.Data[0]; //最新的一条数据
71813
+ else
71814
+ firstItem={Date:null, Time:null};
71815
+
71811
71816
  var postData=
71812
71817
  {
71813
71818
  "field": ["name","symbol", "yclose","open","price","high","low","vol"],
@@ -71881,25 +71886,31 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
71881
71886
  }
71882
71887
 
71883
71888
  var lastDataCount=this.GetHistoryDataCount(); //保存下上一次的数据个数
71884
-
71885
- var firstData=this.SourceData.Data[0];
71886
71889
  var endIndex=null;
71887
- for(var i=aryDayData.length-1;i>=0;--i)
71890
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
71888
71891
  {
71889
- var item=aryDayData[i];
71890
- if (firstData.Date>item.Date || (firstData.Date==item.Date && firstData.Time>item.Time))
71892
+ var firstData=this.SourceData.Data[0];
71893
+ for(var i=aryDayData.length-1;i>=0;--i)
71891
71894
  {
71892
- endIndex=i;
71893
- break;
71894
- }
71895
- else if (firstData.Date==item.Date && firstData.Time==item.Time)
71896
- {
71897
- firstData.YClose=item.YClose;
71898
- endIndex=i-1;
71899
- break;
71895
+ var item=aryDayData[i];
71896
+ if (firstData.Date>item.Date || (firstData.Date==item.Date && firstData.Time>item.Time))
71897
+ {
71898
+ endIndex=i;
71899
+ break;
71900
+ }
71901
+ else if (firstData.Date==item.Date && firstData.Time==item.Time)
71902
+ {
71903
+ firstData.YClose=item.YClose;
71904
+ endIndex=i-1;
71905
+ break;
71906
+ }
71900
71907
  }
71901
71908
  }
71902
-
71909
+ else
71910
+ {
71911
+ endIndex=aryDayData.length-1;
71912
+ }
71913
+
71903
71914
  if (endIndex==null && endIndex<0) return;
71904
71915
 
71905
71916
  for(var i=0;i<aryDayData.length && i<=endIndex;++i) //数据往前插
@@ -72106,7 +72117,12 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
72106
72117
  this.AutoUpdateEvent(false,funcName); //停止自动更新
72107
72118
  this.CancelAutoUpdate();
72108
72119
  download.Status=1;
72109
- var firstItem=this.SourceData.Data[0]; //最新的一条数据
72120
+ var firstItem=null;
72121
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
72122
+ firstItem=this.SourceData.Data[0];
72123
+ else
72124
+ firstItem={Date:null};
72125
+
72110
72126
  var postData=
72111
72127
  {
72112
72128
  "field": ["name","symbol", "yclose","open","price","high","low","vol"],
@@ -72177,24 +72193,34 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
72177
72193
  return;
72178
72194
  }
72179
72195
  var lastDataCount=this.GetHistoryDataCount(); //保存下上一次的数据个数
72180
-
72181
- var firstData=this.SourceData.Data[0];
72182
72196
  var endIndex=null;
72183
- for(var i=aryDayData.length-1;i>=0;--i)
72184
- {
72185
- var item=aryDayData[i];
72186
- if (firstData.Date>item.Date)
72187
- {
72188
- endIndex=i;
72189
- break;
72190
- }
72191
- else if (firstData.Date==item.Date)
72197
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
72198
+ {
72199
+ var firstData=this.SourceData.Data[0];
72200
+
72201
+ for(var i=aryDayData.length-1;i>=0;--i)
72192
72202
  {
72193
- firstData.YClose=item.YClose;
72194
- endIndex=i-1;
72195
- break;
72203
+ var item=aryDayData[i];
72204
+ if (firstData.Date>item.Date)
72205
+ {
72206
+ endIndex=i;
72207
+ break;
72208
+ }
72209
+ else if (firstData.Date==item.Date)
72210
+ {
72211
+ firstData.YClose=item.YClose;
72212
+ endIndex=i-1;
72213
+ break;
72214
+ }
72196
72215
  }
72197
72216
  }
72217
+ else
72218
+ {
72219
+ var firstData={ Date:null };
72220
+ endIndex=aryDayData.length-1;
72221
+ }
72222
+
72223
+
72198
72224
  if (endIndex==null && endIndex<0) return;
72199
72225
 
72200
72226
  for(var i=0; i<aryDayData.length && i<=endIndex;++i) //数据往前插
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -75974,7 +75974,12 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
75974
75974
  this.AutoUpdateEvent(false,funcName); //停止自动更新
75975
75975
  this.CancelAutoUpdate();
75976
75976
  download.Status=1;
75977
- var firstItem=this.SourceData.Data[0]; //最新的一条数据
75977
+ var firstItem=null;
75978
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
75979
+ firstItem=this.SourceData.Data[0]; //最新的一条数据
75980
+ else
75981
+ firstItem={Date:null, Time:null};
75982
+
75978
75983
  var postData=
75979
75984
  {
75980
75985
  "field": ["name","symbol", "yclose","open","price","high","low","vol"],
@@ -76048,25 +76053,31 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
76048
76053
  }
76049
76054
 
76050
76055
  var lastDataCount=this.GetHistoryDataCount(); //保存下上一次的数据个数
76051
-
76052
- var firstData=this.SourceData.Data[0];
76053
76056
  var endIndex=null;
76054
- for(var i=aryDayData.length-1;i>=0;--i)
76057
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
76055
76058
  {
76056
- var item=aryDayData[i];
76057
- if (firstData.Date>item.Date || (firstData.Date==item.Date && firstData.Time>item.Time))
76059
+ var firstData=this.SourceData.Data[0];
76060
+ for(var i=aryDayData.length-1;i>=0;--i)
76058
76061
  {
76059
- endIndex=i;
76060
- break;
76061
- }
76062
- else if (firstData.Date==item.Date && firstData.Time==item.Time)
76063
- {
76064
- firstData.YClose=item.YClose;
76065
- endIndex=i-1;
76066
- break;
76062
+ var item=aryDayData[i];
76063
+ if (firstData.Date>item.Date || (firstData.Date==item.Date && firstData.Time>item.Time))
76064
+ {
76065
+ endIndex=i;
76066
+ break;
76067
+ }
76068
+ else if (firstData.Date==item.Date && firstData.Time==item.Time)
76069
+ {
76070
+ firstData.YClose=item.YClose;
76071
+ endIndex=i-1;
76072
+ break;
76073
+ }
76067
76074
  }
76068
76075
  }
76069
-
76076
+ else
76077
+ {
76078
+ endIndex=aryDayData.length-1;
76079
+ }
76080
+
76070
76081
  if (endIndex==null && endIndex<0) return;
76071
76082
 
76072
76083
  for(var i=0;i<aryDayData.length && i<=endIndex;++i) //数据往前插
@@ -76273,7 +76284,12 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
76273
76284
  this.AutoUpdateEvent(false,funcName); //停止自动更新
76274
76285
  this.CancelAutoUpdate();
76275
76286
  download.Status=1;
76276
- var firstItem=this.SourceData.Data[0]; //最新的一条数据
76287
+ var firstItem=null;
76288
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
76289
+ firstItem=this.SourceData.Data[0];
76290
+ else
76291
+ firstItem={Date:null};
76292
+
76277
76293
  var postData=
76278
76294
  {
76279
76295
  "field": ["name","symbol", "yclose","open","price","high","low","vol"],
@@ -76344,24 +76360,34 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
76344
76360
  return;
76345
76361
  }
76346
76362
  var lastDataCount=this.GetHistoryDataCount(); //保存下上一次的数据个数
76347
-
76348
- var firstData=this.SourceData.Data[0];
76349
76363
  var endIndex=null;
76350
- for(var i=aryDayData.length-1;i>=0;--i)
76351
- {
76352
- var item=aryDayData[i];
76353
- if (firstData.Date>item.Date)
76354
- {
76355
- endIndex=i;
76356
- break;
76357
- }
76358
- else if (firstData.Date==item.Date)
76364
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
76365
+ {
76366
+ var firstData=this.SourceData.Data[0];
76367
+
76368
+ for(var i=aryDayData.length-1;i>=0;--i)
76359
76369
  {
76360
- firstData.YClose=item.YClose;
76361
- endIndex=i-1;
76362
- break;
76370
+ var item=aryDayData[i];
76371
+ if (firstData.Date>item.Date)
76372
+ {
76373
+ endIndex=i;
76374
+ break;
76375
+ }
76376
+ else if (firstData.Date==item.Date)
76377
+ {
76378
+ firstData.YClose=item.YClose;
76379
+ endIndex=i-1;
76380
+ break;
76381
+ }
76363
76382
  }
76364
76383
  }
76384
+ else
76385
+ {
76386
+ var firstData={ Date:null };
76387
+ endIndex=aryDayData.length-1;
76388
+ }
76389
+
76390
+
76365
76391
  if (endIndex==null && endIndex<0) return;
76366
76392
 
76367
76393
  for(var i=0; i<aryDayData.length && i<=endIndex;++i) //数据往前插
@@ -132079,7 +132105,7 @@ function ScrollBarBGChart()
132079
132105
 
132080
132106
 
132081
132107
 
132082
- var HQCHART_VERSION="1.1.12883";
132108
+ var HQCHART_VERSION="1.1.12885";
132083
132109
 
132084
132110
  function PrintHQChartVersion()
132085
132111
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.12883";
8
+ var HQCHART_VERSION="1.1.12885";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -76018,7 +76018,12 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
76018
76018
  this.AutoUpdateEvent(false,funcName); //停止自动更新
76019
76019
  this.CancelAutoUpdate();
76020
76020
  download.Status=1;
76021
- var firstItem=this.SourceData.Data[0]; //最新的一条数据
76021
+ var firstItem=null;
76022
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
76023
+ firstItem=this.SourceData.Data[0]; //最新的一条数据
76024
+ else
76025
+ firstItem={Date:null, Time:null};
76026
+
76022
76027
  var postData=
76023
76028
  {
76024
76029
  "field": ["name","symbol", "yclose","open","price","high","low","vol"],
@@ -76092,25 +76097,31 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
76092
76097
  }
76093
76098
 
76094
76099
  var lastDataCount=this.GetHistoryDataCount(); //保存下上一次的数据个数
76095
-
76096
- var firstData=this.SourceData.Data[0];
76097
76100
  var endIndex=null;
76098
- for(var i=aryDayData.length-1;i>=0;--i)
76101
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
76099
76102
  {
76100
- var item=aryDayData[i];
76101
- if (firstData.Date>item.Date || (firstData.Date==item.Date && firstData.Time>item.Time))
76103
+ var firstData=this.SourceData.Data[0];
76104
+ for(var i=aryDayData.length-1;i>=0;--i)
76102
76105
  {
76103
- endIndex=i;
76104
- break;
76105
- }
76106
- else if (firstData.Date==item.Date && firstData.Time==item.Time)
76107
- {
76108
- firstData.YClose=item.YClose;
76109
- endIndex=i-1;
76110
- break;
76106
+ var item=aryDayData[i];
76107
+ if (firstData.Date>item.Date || (firstData.Date==item.Date && firstData.Time>item.Time))
76108
+ {
76109
+ endIndex=i;
76110
+ break;
76111
+ }
76112
+ else if (firstData.Date==item.Date && firstData.Time==item.Time)
76113
+ {
76114
+ firstData.YClose=item.YClose;
76115
+ endIndex=i-1;
76116
+ break;
76117
+ }
76111
76118
  }
76112
76119
  }
76113
-
76120
+ else
76121
+ {
76122
+ endIndex=aryDayData.length-1;
76123
+ }
76124
+
76114
76125
  if (endIndex==null && endIndex<0) return;
76115
76126
 
76116
76127
  for(var i=0;i<aryDayData.length && i<=endIndex;++i) //数据往前插
@@ -76317,7 +76328,12 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
76317
76328
  this.AutoUpdateEvent(false,funcName); //停止自动更新
76318
76329
  this.CancelAutoUpdate();
76319
76330
  download.Status=1;
76320
- var firstItem=this.SourceData.Data[0]; //最新的一条数据
76331
+ var firstItem=null;
76332
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
76333
+ firstItem=this.SourceData.Data[0];
76334
+ else
76335
+ firstItem={Date:null};
76336
+
76321
76337
  var postData=
76322
76338
  {
76323
76339
  "field": ["name","symbol", "yclose","open","price","high","low","vol"],
@@ -76388,24 +76404,34 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
76388
76404
  return;
76389
76405
  }
76390
76406
  var lastDataCount=this.GetHistoryDataCount(); //保存下上一次的数据个数
76391
-
76392
- var firstData=this.SourceData.Data[0];
76393
76407
  var endIndex=null;
76394
- for(var i=aryDayData.length-1;i>=0;--i)
76395
- {
76396
- var item=aryDayData[i];
76397
- if (firstData.Date>item.Date)
76398
- {
76399
- endIndex=i;
76400
- break;
76401
- }
76402
- else if (firstData.Date==item.Date)
76408
+ if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
76409
+ {
76410
+ var firstData=this.SourceData.Data[0];
76411
+
76412
+ for(var i=aryDayData.length-1;i>=0;--i)
76403
76413
  {
76404
- firstData.YClose=item.YClose;
76405
- endIndex=i-1;
76406
- break;
76414
+ var item=aryDayData[i];
76415
+ if (firstData.Date>item.Date)
76416
+ {
76417
+ endIndex=i;
76418
+ break;
76419
+ }
76420
+ else if (firstData.Date==item.Date)
76421
+ {
76422
+ firstData.YClose=item.YClose;
76423
+ endIndex=i-1;
76424
+ break;
76425
+ }
76407
76426
  }
76408
76427
  }
76428
+ else
76429
+ {
76430
+ var firstData={ Date:null };
76431
+ endIndex=aryDayData.length-1;
76432
+ }
76433
+
76434
+
76409
76435
  if (endIndex==null && endIndex<0) return;
76410
76436
 
76411
76437
  for(var i=0; i<aryDayData.length && i<=endIndex;++i) //数据往前插
@@ -132237,7 +132263,7 @@ function HQChartScriptWorker()
132237
132263
 
132238
132264
 
132239
132265
 
132240
- var HQCHART_VERSION="1.1.12883";
132266
+ var HQCHART_VERSION="1.1.12885";
132241
132267
 
132242
132268
  function PrintHQChartVersion()
132243
132269
  {