hqchart 1.1.12631 → 1.1.12633

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.
@@ -7312,12 +7312,7 @@ this.ClearIndexPaint();//清空指标
7312
7312
  if(option){if(option.Windows&&Array.isArray(option.Windows)&&option.Windows.length>0){var windows=option.Windows;var systemScript=new JSIndexScript();for(var i in windows){if(i>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
7313
7313
  var item=windows[i];if(!item)continue;if(item.Script){this.WindowIndex[i]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
7314
7314
  }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);//脚本执行
7315
- }}}}//清空叠加股票
7316
- if(option.ClearOverlay===true){for(var i in this.OverlayChartPaint){var item=this.OverlayChartPaint[i];item.IsDelete=true;}this.OverlayChartPaint=[];this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint;//绑定叠加
7317
- }//叠加股票
7318
- if(open.Overlay&&IFrameSplitOperator.IsNonEmptyArray(option.Overlay)){var setSymbol=new _set2.default();for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[j];setSymbol.add(item.Symbol);}for(var i=0;i<option.Overlay.length;++i){var item=option.Overlay[i];if(setSymbol.has(item.Symbol))continue;var paint=new ChartOverlayMinutePriceLine();paint.Canvas=this.Canvas;paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;paint.ChartFrame=this.Frame.SubFrame[0].Frame;paint.Name="Overlay-Minute";paint.Symbol=item.Symbol;paint.Identify='Overlay-Minute-'+item.Symbol;if(item.Color)paint.Color=item.Color;//外部设置颜色
7319
- else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];++g_JSChartResource.OverlaySymbol.Random;paint.MainData=this.SourceData;//绑定主图数据
7320
- if(paint.SetOption)paint.SetOption(item);this.OverlayChartPaint.push(paint);}}}this.ReloadChartDrawPicture();this.Frame.ClearUpDonwFrameYData();if(ChartData.IsDayPeriod(this.Period,true)){this.ClearStockCache();this.RequestHistoryData();//请求日线数据
7315
+ }}}}}this.ReloadChartDrawPicture();this.Frame.ClearUpDonwFrameYData();if(ChartData.IsDayPeriod(this.Period,true)){this.ClearStockCache();this.RequestHistoryData();//请求日线数据
7321
7316
  //this.ReqeustKLineInfoData();
7322
7317
  }else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ClearStockCache();this.ReqeustHistoryMinuteData();//请求分钟数据
7323
7318
  }else if(ChartData.IsTickPeriod(this.Period)){this.ClearStockCache();this.RequestTickData();}};this.ReqeustKLineInfoData=function(obj){if(obj&&obj.FunctionName=="RecvDragDayData")//增量更新
@@ -7816,7 +7811,13 @@ this.ResetOverlaySymbolStatus();this.ReloadChartDrawPicture();this.ClearIndexRun
7816
7811
  {var systemScript=new JSIndexScript();for(var i=0;i<option.Windows.length;++i){var index=2+i;if(index>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
7817
7812
  var item=option.Windows[i];if(!item)continue;if(item.Script){this.WindowIndex[index]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
7818
7813
  }else if(item.API){var apiItem=item.API;this.WindowIndex[index]=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[index]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
7819
- }}}}}if(!symbol||this.DayCount<=0){this.DrawEmpty();}else{this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);//增加下载动画
7814
+ }}}}//清空叠加股票
7815
+ if(option.ClearOverlay===true){for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];item.IsDelete=true;}this.OverlayChartPaint=[];this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint;//绑定叠加
7816
+ }//叠加股票
7817
+ if(option.Overlay&&IFrameSplitOperator.IsNonEmptyArray(option.Overlay)){var setSymbol=new _set2.default();for(var i=0;i<this.OverlayChartPaint.length;++i)//已有的叠加
7818
+ {var item=this.OverlayChartPaint[j];setSymbol.add(item.Symbol);}for(var i=0;i<option.Overlay.length;++i){var item=option.Overlay[i];if(setSymbol.has(item.Symbol))continue;var paint=new ChartOverlayMinutePriceLine();paint.Canvas=this.Canvas;paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;paint.ChartFrame=this.Frame.SubFrame[0].Frame;paint.Name="Overlay-Minute";paint.Symbol=item.Symbol;paint.Identify='Overlay-Minute-'+item.Symbol;if(item.Color)paint.Color=item.Color;//外部设置颜色
7819
+ else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];++g_JSChartResource.OverlaySymbol.Random;paint.MainData=this.SourceData;//绑定主图数据
7820
+ if(paint.SetOption)paint.SetOption(item);this.OverlayChartPaint.push(paint);}}}if(!symbol||this.DayCount<=0){this.DrawEmpty();}else{this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);//增加下载动画
7820
7821
  this.Draw();this.RequestData();}};this.SetPageInfo=function(pageInfo){if(!pageInfo)return;if(IFrameSplitOperator.IsBool(pageInfo.Enable))this.PageInfo.Enable=pageInfo.Enable;if(IFrameSplitOperator.IsNumber(pageInfo.Offset))this.PageInfo.Offset=pageInfo.Offset;if(IFrameSplitOperator.IsNumber(pageInfo.ShowDayCount))this.PageInfo.ShowDayCount=pageInfo.ShowDayCount;};this.ClearMinuteData=function(){this.SourceData=null;this.DayData=null;this.BeforeOpenData=null;this.AfterCloseData=null;this.MultiDayBeforeOpenData=null;this.MultiDayAfterCloseData=null;};this.ChangeDayCount=function(count,option){if(count<0)return;this.StopDisplayLatest();this.CancelAutoUpdate();this.AutoUpdateEvent(false,"MinuteChartContainer::ChangeDayCount");this.DayCount=count;this.ClearMinuteData();if(option&&option.PageInfo){this.SetPageInfo(option.PageInfo);this.ResetDayOffset();}if(this.DayCount>1){this.ChartDrawPicture=[];}else{this.ReloadChartDrawPicture();}this.ResetDataStatus();this.ClearIndexPaint();//清空指标
7821
7822
  this.ResetOverlaySymbolStatus();this.RequestData();};//叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
7822
7823
  this.OverlaySymbol=function(symbol,option){var arySymbol=null;if(IFrameSplitOperator.IsString(symbol))arySymbol=[symbol];else if(Array.isArray(symbol))arySymbol=symbol;if(!IFrameSplitOperator.IsNonEmptyArray(arySymbol))return false;var aryNewSymbol=[];for(var i=0,j=0;i<arySymbol.length;++i){var strSymbol=arySymbol[i];var bFind=false;for(j=0;j<this.OverlayChartPaint.length;++j){var item=this.OverlayChartPaint[j];if(item.Symbol==strSymbol){bFind=true;console.warn('[MinuteChartContainer::OverlaySymbol] overlay symbol='+strSymbol+' exist.');break;}}if(!bFind)aryNewSymbol.push(strSymbol);}if(!IFrameSplitOperator.IsNonEmptyArray(arySymbol))return true;for(var i=0;i<aryNewSymbol.length;++i){var strSymbol=aryNewSymbol[i];var paint=new ChartOverlayMinutePriceLine();paint.Canvas=this.Canvas;paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;paint.ChartFrame=this.Frame.SubFrame[0].Frame;paint.Name="Overlay-Minute";paint.Symbol=strSymbol;paint.Identify='Overlay-Minute-'+strSymbol;if(option&&option.Color)paint.Color=option.Color;//外部设置颜色
@@ -12772,7 +12773,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
12772
12773
  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);};}/********************************************************************************
12773
12774
  * 版本信息输出
12774
12775
  *
12775
- */var HQCHART_VERSION="1.1.12630";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();//把给外界调用的方法暴露出来
12776
+ */var HQCHART_VERSION="1.1.12632";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();//把给外界调用的方法暴露出来
12776
12777
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
12777
12778
  // BaseIndex:BaseIndex,
12778
12779
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "hqchart",
3
3
  "description": "stock chart",
4
4
  "author": "jones2000",
5
- "version": "1.1.12631",
5
+ "version": "1.1.12633",
6
6
  "main": "lib/main.js",
7
7
  "private": false,
8
8
  "license": "Apache License 2.0",
@@ -69037,53 +69037,6 @@ function KLineChartContainer(uielement,OffscreenElement)
69037
69037
  }
69038
69038
  }
69039
69039
  }
69040
-
69041
- //清空叠加股票
69042
- if (option.ClearOverlay===true)
69043
- {
69044
- for(var i in this.OverlayChartPaint)
69045
- {
69046
- var item=this.OverlayChartPaint[i];
69047
- item.IsDelete=true;
69048
- }
69049
-
69050
- this.OverlayChartPaint=[];
69051
- this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
69052
- this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint; //绑定叠加
69053
- }
69054
-
69055
- //叠加股票
69056
- if (open.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
69057
- {
69058
- var setSymbol=new Set();
69059
- for(var i=0;i<this.OverlayChartPaint.length;++i)
69060
- {
69061
- var item=this.OverlayChartPaint[j];
69062
- setSymbol.add(item.Symbol);
69063
- }
69064
-
69065
- for(var i=0;i<option.Overlay.length;++i)
69066
- {
69067
- var item=option.Overlay[i];
69068
- if (setSymbol.has(item.Symbol)) continue;
69069
-
69070
- var paint=new ChartOverlayMinutePriceLine();
69071
- paint.Canvas=this.Canvas;
69072
- paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
69073
- paint.ChartFrame=this.Frame.SubFrame[0].Frame;
69074
- paint.Name="Overlay-Minute";
69075
- paint.Symbol=item.Symbol;
69076
- paint.Identify=`Overlay-Minute-${item.Symbol}`;
69077
- if (item.Color) paint.Color=item.Color; //外部设置颜色
69078
- else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
69079
- ++g_JSChartResource.OverlaySymbol.Random;
69080
- paint.MainData=this.SourceData; //绑定主图数据
69081
-
69082
- if (paint.SetOption) paint.SetOption(item);
69083
-
69084
- this.OverlayChartPaint.push(paint);
69085
- }
69086
- }
69087
69040
  }
69088
69041
 
69089
69042
  this.ReloadChartDrawPicture();
@@ -74180,6 +74133,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
74180
74133
  }
74181
74134
  }
74182
74135
  }
74136
+
74137
+ //清空叠加股票
74138
+ if (option.ClearOverlay===true)
74139
+ {
74140
+ for(var i=0; i<this.OverlayChartPaint.length; ++i)
74141
+ {
74142
+ var item=this.OverlayChartPaint[i];
74143
+ item.IsDelete=true;
74144
+ }
74145
+
74146
+ this.OverlayChartPaint=[];
74147
+ this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
74148
+ this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint; //绑定叠加
74149
+ }
74150
+
74151
+ //叠加股票
74152
+ if (option.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
74153
+ {
74154
+ var setSymbol=new Set();
74155
+ for(var i=0;i<this.OverlayChartPaint.length;++i) //已有的叠加
74156
+ {
74157
+ var item=this.OverlayChartPaint[j];
74158
+ setSymbol.add(item.Symbol);
74159
+ }
74160
+
74161
+ for(var i=0;i<option.Overlay.length;++i)
74162
+ {
74163
+ var item=option.Overlay[i];
74164
+ if (setSymbol.has(item.Symbol)) continue;
74165
+
74166
+ var paint=new ChartOverlayMinutePriceLine();
74167
+ paint.Canvas=this.Canvas;
74168
+ paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
74169
+ paint.ChartFrame=this.Frame.SubFrame[0].Frame;
74170
+ paint.Name="Overlay-Minute";
74171
+ paint.Symbol=item.Symbol;
74172
+ paint.Identify=`Overlay-Minute-${item.Symbol}`;
74173
+ if (item.Color) paint.Color=item.Color; //外部设置颜色
74174
+ else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
74175
+ ++g_JSChartResource.OverlaySymbol.Random;
74176
+ paint.MainData=this.SourceData; //绑定主图数据
74177
+
74178
+ if (paint.SetOption) paint.SetOption(item);
74179
+
74180
+ this.OverlayChartPaint.push(paint);
74181
+ }
74182
+ }
74183
74183
  }
74184
74184
 
74185
74185
  if (!symbol || this.DayCount<=0)
@@ -73117,53 +73117,6 @@ function KLineChartContainer(uielement,OffscreenElement)
73117
73117
  }
73118
73118
  }
73119
73119
  }
73120
-
73121
- //清空叠加股票
73122
- if (option.ClearOverlay===true)
73123
- {
73124
- for(var i in this.OverlayChartPaint)
73125
- {
73126
- var item=this.OverlayChartPaint[i];
73127
- item.IsDelete=true;
73128
- }
73129
-
73130
- this.OverlayChartPaint=[];
73131
- this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
73132
- this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint; //绑定叠加
73133
- }
73134
-
73135
- //叠加股票
73136
- if (open.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
73137
- {
73138
- var setSymbol=new Set();
73139
- for(var i=0;i<this.OverlayChartPaint.length;++i)
73140
- {
73141
- var item=this.OverlayChartPaint[j];
73142
- setSymbol.add(item.Symbol);
73143
- }
73144
-
73145
- for(var i=0;i<option.Overlay.length;++i)
73146
- {
73147
- var item=option.Overlay[i];
73148
- if (setSymbol.has(item.Symbol)) continue;
73149
-
73150
- var paint=new ChartOverlayMinutePriceLine();
73151
- paint.Canvas=this.Canvas;
73152
- paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
73153
- paint.ChartFrame=this.Frame.SubFrame[0].Frame;
73154
- paint.Name="Overlay-Minute";
73155
- paint.Symbol=item.Symbol;
73156
- paint.Identify=`Overlay-Minute-${item.Symbol}`;
73157
- if (item.Color) paint.Color=item.Color; //外部设置颜色
73158
- else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
73159
- ++g_JSChartResource.OverlaySymbol.Random;
73160
- paint.MainData=this.SourceData; //绑定主图数据
73161
-
73162
- if (paint.SetOption) paint.SetOption(item);
73163
-
73164
- this.OverlayChartPaint.push(paint);
73165
- }
73166
- }
73167
73120
  }
73168
73121
 
73169
73122
  this.ReloadChartDrawPicture();
@@ -78260,6 +78213,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
78260
78213
  }
78261
78214
  }
78262
78215
  }
78216
+
78217
+ //清空叠加股票
78218
+ if (option.ClearOverlay===true)
78219
+ {
78220
+ for(var i=0; i<this.OverlayChartPaint.length; ++i)
78221
+ {
78222
+ var item=this.OverlayChartPaint[i];
78223
+ item.IsDelete=true;
78224
+ }
78225
+
78226
+ this.OverlayChartPaint=[];
78227
+ this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
78228
+ this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint; //绑定叠加
78229
+ }
78230
+
78231
+ //叠加股票
78232
+ if (option.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
78233
+ {
78234
+ var setSymbol=new Set();
78235
+ for(var i=0;i<this.OverlayChartPaint.length;++i) //已有的叠加
78236
+ {
78237
+ var item=this.OverlayChartPaint[j];
78238
+ setSymbol.add(item.Symbol);
78239
+ }
78240
+
78241
+ for(var i=0;i<option.Overlay.length;++i)
78242
+ {
78243
+ var item=option.Overlay[i];
78244
+ if (setSymbol.has(item.Symbol)) continue;
78245
+
78246
+ var paint=new ChartOverlayMinutePriceLine();
78247
+ paint.Canvas=this.Canvas;
78248
+ paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
78249
+ paint.ChartFrame=this.Frame.SubFrame[0].Frame;
78250
+ paint.Name="Overlay-Minute";
78251
+ paint.Symbol=item.Symbol;
78252
+ paint.Identify=`Overlay-Minute-${item.Symbol}`;
78253
+ if (item.Color) paint.Color=item.Color; //外部设置颜色
78254
+ else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
78255
+ ++g_JSChartResource.OverlaySymbol.Random;
78256
+ paint.MainData=this.SourceData; //绑定主图数据
78257
+
78258
+ if (paint.SetOption) paint.SetOption(item);
78259
+
78260
+ this.OverlayChartPaint.push(paint);
78261
+ }
78262
+ }
78263
78263
  }
78264
78264
 
78265
78265
  if (!symbol || this.DayCount<=0)
@@ -130038,7 +130038,7 @@ function ScrollBarBGChart()
130038
130038
 
130039
130039
 
130040
130040
 
130041
- var HQCHART_VERSION="1.1.12630";
130041
+ var HQCHART_VERSION="1.1.12632";
130042
130042
 
130043
130043
  function PrintHQChartVersion()
130044
130044
  {
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.12630";
8
+ var HQCHART_VERSION="1.1.12632";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
@@ -73161,53 +73161,6 @@ function KLineChartContainer(uielement,OffscreenElement)
73161
73161
  }
73162
73162
  }
73163
73163
  }
73164
-
73165
- //清空叠加股票
73166
- if (option.ClearOverlay===true)
73167
- {
73168
- for(var i in this.OverlayChartPaint)
73169
- {
73170
- var item=this.OverlayChartPaint[i];
73171
- item.IsDelete=true;
73172
- }
73173
-
73174
- this.OverlayChartPaint=[];
73175
- this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
73176
- this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint; //绑定叠加
73177
- }
73178
-
73179
- //叠加股票
73180
- if (open.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
73181
- {
73182
- var setSymbol=new Set();
73183
- for(var i=0;i<this.OverlayChartPaint.length;++i)
73184
- {
73185
- var item=this.OverlayChartPaint[j];
73186
- setSymbol.add(item.Symbol);
73187
- }
73188
-
73189
- for(var i=0;i<option.Overlay.length;++i)
73190
- {
73191
- var item=option.Overlay[i];
73192
- if (setSymbol.has(item.Symbol)) continue;
73193
-
73194
- var paint=new ChartOverlayMinutePriceLine();
73195
- paint.Canvas=this.Canvas;
73196
- paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
73197
- paint.ChartFrame=this.Frame.SubFrame[0].Frame;
73198
- paint.Name="Overlay-Minute";
73199
- paint.Symbol=item.Symbol;
73200
- paint.Identify=`Overlay-Minute-${item.Symbol}`;
73201
- if (item.Color) paint.Color=item.Color; //外部设置颜色
73202
- else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
73203
- ++g_JSChartResource.OverlaySymbol.Random;
73204
- paint.MainData=this.SourceData; //绑定主图数据
73205
-
73206
- if (paint.SetOption) paint.SetOption(item);
73207
-
73208
- this.OverlayChartPaint.push(paint);
73209
- }
73210
- }
73211
73164
  }
73212
73165
 
73213
73166
  this.ReloadChartDrawPicture();
@@ -78304,6 +78257,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
78304
78257
  }
78305
78258
  }
78306
78259
  }
78260
+
78261
+ //清空叠加股票
78262
+ if (option.ClearOverlay===true)
78263
+ {
78264
+ for(var i=0; i<this.OverlayChartPaint.length; ++i)
78265
+ {
78266
+ var item=this.OverlayChartPaint[i];
78267
+ item.IsDelete=true;
78268
+ }
78269
+
78270
+ this.OverlayChartPaint=[];
78271
+ this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
78272
+ this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint; //绑定叠加
78273
+ }
78274
+
78275
+ //叠加股票
78276
+ if (option.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
78277
+ {
78278
+ var setSymbol=new Set();
78279
+ for(var i=0;i<this.OverlayChartPaint.length;++i) //已有的叠加
78280
+ {
78281
+ var item=this.OverlayChartPaint[j];
78282
+ setSymbol.add(item.Symbol);
78283
+ }
78284
+
78285
+ for(var i=0;i<option.Overlay.length;++i)
78286
+ {
78287
+ var item=option.Overlay[i];
78288
+ if (setSymbol.has(item.Symbol)) continue;
78289
+
78290
+ var paint=new ChartOverlayMinutePriceLine();
78291
+ paint.Canvas=this.Canvas;
78292
+ paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
78293
+ paint.ChartFrame=this.Frame.SubFrame[0].Frame;
78294
+ paint.Name="Overlay-Minute";
78295
+ paint.Symbol=item.Symbol;
78296
+ paint.Identify=`Overlay-Minute-${item.Symbol}`;
78297
+ if (item.Color) paint.Color=item.Color; //外部设置颜色
78298
+ else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
78299
+ ++g_JSChartResource.OverlaySymbol.Random;
78300
+ paint.MainData=this.SourceData; //绑定主图数据
78301
+
78302
+ if (paint.SetOption) paint.SetOption(item);
78303
+
78304
+ this.OverlayChartPaint.push(paint);
78305
+ }
78306
+ }
78307
78307
  }
78308
78308
 
78309
78309
  if (!symbol || this.DayCount<=0)
@@ -130196,7 +130196,7 @@ function HQChartScriptWorker()
130196
130196
 
130197
130197
 
130198
130198
 
130199
- var HQCHART_VERSION="1.1.12630";
130199
+ var HQCHART_VERSION="1.1.12632";
130200
130200
 
130201
130201
  function PrintHQChartVersion()
130202
130202
  {