hqchart 1.1.12778 → 1.1.12780

package/lib/umychart.vue.js

@@ -7949,8 +7949,9 @@ else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.Overlay
 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);//增加下载动画
 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();//清空指标
 this.Frame.ClearYCoordinateMaxMin();this.ResetOverlaySymbolStatus();this.RequestData();};//[{ Symbol: , Color, Option: }]
-this.OverlaySymbols=function(aryData){var aryNewOverlay=[];for(var i=0,j=0;i<aryData.length;++i)//去重，已经叠加过的不用在叠加
-{var overlayItem=aryData[i];var strSymbol=overlayItem.Symbol;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::OverlaySymbols] overlay symbol='+strSymbol+' exist.');break;}}if(!bFind)aryNewOverlay.push(overlayItem);}if(!IFrameSplitOperator.IsNonEmptyArray(aryNewOverlay))return true;for(var i=0;i<aryNewSymbol.length;++i){var overlayItem=aryNewSymbol[i];var strSymbol=overlayItem.Symbol;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(overlayItem.Option&&overlayItem.Option.Color)paint.Color=overlayItem.Option.Color;//外部设置颜色
+this.OverlaySymbols=function(aryData,option){if(option&&option.ClearAll===true)//全部清空
+{for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];item.IsDelete=true;}this.OverlayChartPaint=[];}var aryNewOverlay=[];for(var i=0,j=0;i<aryData.length;++i)//去重，已经叠加过的不用在叠加
+{var overlayItem=aryData[i];var strSymbol=overlayItem.Symbol;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::OverlaySymbols] overlay symbol='+strSymbol+' exist.');break;}}if(!bFind)aryNewOverlay.push(overlayItem);}if(!IFrameSplitOperator.IsNonEmptyArray(aryNewOverlay))return true;for(var i=0;i<aryNewOverlay.length;++i){var overlayItem=aryNewOverlay[i];var strSymbol=overlayItem.Symbol;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(overlayItem.Option&&overlayItem.Option.Color)paint.Color=overlayItem.Option.Color;//外部设置颜色
 else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];++g_JSChartResource.OverlaySymbol.Random;paint.MainData=this.SourceData;//绑定主图数据
 if(paint.SetOption)paint.SetOption(overlayItem.Option);this.OverlayChartPaint.push(paint);}if(this.DayCount<=1)this.RequestOverlayMinuteData();//请求数据
 else this.RequestOverlayHistoryMinuteData();return true;};//叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
@@ -12927,7 +12928,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.12777";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.12779";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.12778",
+  "version": "1.1.12780",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -75203,8 +75203,18 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     }
 
     //[{ Symbol: , Color, Option: }]
-    this.OverlaySymbols=function(aryData)
+    this.OverlaySymbols=function(aryData, option)
     {
+        if (option && option.ClearAll===true)   //全部清空
+        {
+            for(var i=0; i<this.OverlayChartPaint.length; ++i)
+            {
+                var item=this.OverlayChartPaint[i];
+                item.IsDelete=true;
+            }
+            this.OverlayChartPaint=[];
+        }
+
         var aryNewOverlay=[];
         for(var i=0, j=0;i<aryData.length;++i)  //去重，已经叠加过的不用在叠加
         {
@@ -75227,9 +75237,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (!IFrameSplitOperator.IsNonEmptyArray(aryNewOverlay)) return true;
 
-        for(var i=0;i<aryNewSymbol.length;++i)
+        for(var i=0;i<aryNewOverlay.length;++i)
         {
-            var overlayItem=aryNewSymbol[i];
+            var overlayItem=aryNewOverlay[i];
             var strSymbol=overlayItem.Symbol;
             var paint=new ChartOverlayMinutePriceLine();
             paint.Canvas=this.Canvas;

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

@@ -79347,8 +79347,18 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     }
 
     //[{ Symbol: , Color, Option: }]
-    this.OverlaySymbols=function(aryData)
+    this.OverlaySymbols=function(aryData, option)
     {
+        if (option && option.ClearAll===true)   //全部清空
+        {
+            for(var i=0; i<this.OverlayChartPaint.length; ++i)
+            {
+                var item=this.OverlayChartPaint[i];
+                item.IsDelete=true;
+            }
+            this.OverlayChartPaint=[];
+        }
+
         var aryNewOverlay=[];
         for(var i=0, j=0;i<aryData.length;++i)  //去重，已经叠加过的不用在叠加
         {
@@ -79371,9 +79381,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (!IFrameSplitOperator.IsNonEmptyArray(aryNewOverlay)) return true;
 
-        for(var i=0;i<aryNewSymbol.length;++i)
+        for(var i=0;i<aryNewOverlay.length;++i)
         {
-            var overlayItem=aryNewSymbol[i];
+            var overlayItem=aryNewOverlay[i];
             var strSymbol=overlayItem.Symbol;
             var paint=new ChartOverlayMinutePriceLine();
             paint.Canvas=this.Canvas;
@@ -131377,7 +131387,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12777";
+var HQCHART_VERSION="1.1.12779";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -79391,8 +79391,18 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     }
 
     //[{ Symbol: , Color, Option: }]
-    this.OverlaySymbols=function(aryData)
+    this.OverlaySymbols=function(aryData, option)
     {
+        if (option && option.ClearAll===true)   //全部清空
+        {
+            for(var i=0; i<this.OverlayChartPaint.length; ++i)
+            {
+                var item=this.OverlayChartPaint[i];
+                item.IsDelete=true;
+            }
+            this.OverlayChartPaint=[];
+        }
+
         var aryNewOverlay=[];
         for(var i=0, j=0;i<aryData.length;++i)  //去重，已经叠加过的不用在叠加
         {
@@ -79415,9 +79425,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (!IFrameSplitOperator.IsNonEmptyArray(aryNewOverlay)) return true;
 
-        for(var i=0;i<aryNewSymbol.length;++i)
+        for(var i=0;i<aryNewOverlay.length;++i)
         {
-            var overlayItem=aryNewSymbol[i];
+            var overlayItem=aryNewOverlay[i];
             var strSymbol=overlayItem.Symbol;
             var paint=new ChartOverlayMinutePriceLine();
             paint.Canvas=this.Canvas;
@@ -131535,7 +131545,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12777";
+var HQCHART_VERSION="1.1.12779";
 
 function PrintHQChartVersion()
 {