hqchart 1.1.12607 → 1.1.12610

package/lib/umychart.vue.js

@@ -7847,7 +7847,8 @@ item.Frame.YSplitOperator.Symbol=this.Symbol;for(var j in item.OverlayIndex)//
 this.RecvMinuteDataEvent({FunctionName:"RecvMinuteData"});this.RequestMinuteInfoData();this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
 this.CreateChartDrawPictureByStorage();//创建画图工具
 this.UpdateFrameMaxMin();//调整坐标最大 最小值
-this.Frame.SetSizeChage(true);this.Draw();this.BindAllOverlayIndexData(this.SourceData);this.AutoUpdateEvent(true,"MinuteChartContainer::RecvMinuteData");this.AutoUpdate();};this.CaclutateLimitPrice=function(yClose,limitData){this.LimitPrice=null;//var limitData=data.stock[0].limitprice;
+this.Frame.SetSizeChage(true);this.Draw();this.BindAllOverlayIndexData(this.SourceData);if(data.AutoUpdate===false)//不执行自动更新
+{}else{this.AutoUpdateEvent(true,"MinuteChartContainer::RecvMinuteData");this.AutoUpdate();}};this.CaclutateLimitPrice=function(yClose,limitData){this.LimitPrice=null;//var limitData=data.stock[0].limitprice;
 if(limitData&&limitData.max>0&&limitData.min>0)//API里带涨停价格 直接使用
 {this.LimitPrice={Max:limitData.max,Min:limitData.min};return;}var range=MARKET_SUFFIX_NAME.GetLimitPriceRange(this.Symbol,this.Name);//通过规则获取涨停价格
 if(!range){JSConsole.Chart.Log('[MinuteChartContainer::CaclutateLimitPrice] '+this.Symbol+' no limit price.');return;}//var yClose=data.stock[0].yclose;
@@ -12716,12 +12717,14 @@ this.AreaColor=g_JSChartResource.ScrollBar.BGChart.AreaColor;//面积图颜色
 //
 //
 //////////////////////////////////////////////////////////////////////////////////
-function HQChartScriptWorker(){this.Create=function(){var _this60=this;addEventListener('message',function(obj){_this60.OnRecvMessage(obj);});};this.NetworkFilter=function(data,callback,indexInfo){JSConsole.Complier.Log('[HQChartScriptWorker::NetworkFilter] ['+data.Name+']['+data.Explain+'] data=',data);//数据下载
-};this.ExecuteScript=function(indexData,message){var _this61=this;var scriptObj={};if(indexData.Script){scriptObj.Name=indexData.Name;scriptObj.ID=indexData.Index;scriptObj.Script=indexData.Script;}else{if(!indexData.Index)return false;var scriptData=new JSIndexScript();var finder=scriptData.Get(indexData.Index);if(!finder)return false;scriptObj.ID=indexData.Index;scriptObj.Name=finder.Name;scriptObj.Script=finder.Script;scriptObj.Args=finder.Args;}if(indexData.Args)scriptObj.Args=indexData.Args;var indexInfo={Name:scriptObj.Name,ID:scriptObj.ID,Script:scriptObj.Script,Args:scriptObj.Args,Guid:message.Guid};scriptObj.ErrorCallback=function(error){_this61.OnExecuteError(error,indexInfo);};scriptObj.FinishCallback=function(data,jsExectute){_this61.OnExecuteFinish(data,indexInfo,jsExectute);};scriptObj.NetworkFilter=function(data,callback){_this61.NetworkFilter(data,callback,indexInfo);};JSConsole.Complier.Log('[HQChartScriptWorker::ExecuteScript] scriptObj=',scriptObj);var indexConsole=new ScriptIndexConsole(scriptObj);var hisData=null;if(message&&message.Data){hisData=new ChartData();hisData.Data=message.Data;hisData.Right=message.Right;hisData.Period=message.Period;hisData.DataType=message.DataType;//0=日线 1=分钟
-hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,Stock:{Symbol:message.Symbol},Request:{MaxDataCount:500,MaxMinuteDayCount:5},Period:message.Period,Right:message.Right,Data:hisData};if(IFrameSplitOperator.IsNumber(message.HQDataType))stockObj.HQDataType=message.HQDataType;indexConsole.ExecuteScript(stockObj);};this.OnRecvMessage=function(message){var data=message.data;if(!data)return;if(data.ID==JSCHART_WORKER_MESSAGE_ID.EXECUTE_SCRIPT){if(!IFrameSplitOperator.IsNonEmptyArray(data.AryIndex))return;for(var i=0;i<data.AryIndex.length;++i){var item=data.AryIndex[i];this.ExecuteScript(item,data);}}};this.OnExecuteFinish=function(data,indexInfo,jsExectute){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT};postMessage(message);};this.OnExecuteError=function(error,indexInfo){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
+function HQChartScriptWorker(){this.Status=0;//0=空闲  1=运行
+this.Create=function(){var _this60=this;addEventListener('message',function(obj){_this60.OnRecvMessage(obj);});};this.NetworkFilter=function(data,callback,indexInfo){JSConsole.Complier.Log('[HQChartScriptWorker::NetworkFilter] ['+data.Name+']['+data.Explain+'] data=',data);//数据下载
+};this.ExecuteScript=function(indexData,message){var _this61=this;var scriptObj={};if(indexData.Script){scriptObj.Name=indexData.Name;scriptObj.ID=indexData.Index;scriptObj.Script=indexData.Script;}else{if(!indexData.Index)return false;var scriptData=new JSIndexScript();var finder=scriptData.Get(indexData.Index);if(!finder)return false;scriptObj.ID=indexData.Index;scriptObj.Name=finder.Name;scriptObj.Script=finder.Script;scriptObj.Args=finder.Args;}if(indexData.Args)scriptObj.Args=indexData.Args;var indexInfo={Name:scriptObj.Name,ID:scriptObj.ID,Script:scriptObj.Script,Args:scriptObj.Args,Guid:message.Guid};scriptObj.ErrorCallback=function(error){_this61.OnExecuteError(error,indexInfo,message);};scriptObj.FinishCallback=function(data,jsExectute){_this61.OnExecuteFinish(data,indexInfo,jsExectute,message);};scriptObj.NetworkFilter=function(data,callback){_this61.NetworkFilter(data,callback,indexInfo,message);};JSConsole.Complier.Log('[HQChartScriptWorker::ExecuteScript] scriptObj=',scriptObj);var indexConsole=new ScriptIndexConsole(scriptObj);var hisData=null;if(message&&message.Data){hisData=new ChartData();hisData.Data=message.Data;hisData.Right=message.Right;hisData.Period=message.Period;hisData.DataType=message.DataType;//0=日线 1=分钟
+hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,Stock:{Symbol:message.Symbol},Request:{MaxDataCount:500,MaxMinuteDayCount:5},Period:message.Period,Right:message.Right,Data:hisData};if(IFrameSplitOperator.IsNumber(message.HQDataType))stockObj.HQDataType=message.HQDataType;indexConsole.ExecuteScript(stockObj);};this.OnRecvMessage=function(message){var data=message.data;if(!data)return;if(data.ID==JSCHART_WORKER_MESSAGE_ID.EXECUTE_SCRIPT){if(!IFrameSplitOperator.IsNonEmptyArray(data.AryIndex))return;for(var i=0;i<data.AryIndex.length;++i){var item=data.AryIndex[i];this.Status=1;//执行状态
+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.12606";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.12609";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

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12607",
+  "version": "1.1.12610",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -75006,8 +75006,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         this.BindAllOverlayIndexData(this.SourceData);
         
-        this.AutoUpdateEvent(true, "MinuteChartContainer::RecvMinuteData");
-        this.AutoUpdate();
+        if (data.AutoUpdate===false)    //不执行自动更新
+        {
+
+        }   
+        else
+        {
+            this.AutoUpdateEvent(true, "MinuteChartContainer::RecvMinuteData");
+            this.AutoUpdate();
+        }
     }
 
     this.CaclutateLimitPrice=function(yClose, limitData)

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

@@ -79086,8 +79086,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         this.BindAllOverlayIndexData(this.SourceData);
         
-        this.AutoUpdateEvent(true, "MinuteChartContainer::RecvMinuteData");
-        this.AutoUpdate();
+        if (data.AutoUpdate===false)    //不执行自动更新
+        {
+
+        }   
+        else
+        {
+            this.AutoUpdateEvent(true, "MinuteChartContainer::RecvMinuteData");
+            this.AutoUpdate();
+        }
     }
 
     this.CaclutateLimitPrice=function(yClose, limitData)
@@ -129653,7 +129660,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12606";
+var HQCHART_VERSION="1.1.12609";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -79130,8 +79130,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         this.BindAllOverlayIndexData(this.SourceData);
         
-        this.AutoUpdateEvent(true, "MinuteChartContainer::RecvMinuteData");
-        this.AutoUpdate();
+        if (data.AutoUpdate===false)    //不执行自动更新
+        {
+
+        }   
+        else
+        {
+            this.AutoUpdateEvent(true, "MinuteChartContainer::RecvMinuteData");
+            this.AutoUpdate();
+        }
     }
 
     this.CaclutateLimitPrice=function(yClose, limitData)
@@ -129698,7 +129705,7 @@ function ScrollBarBGChart()
 
 function HQChartScriptWorker()
 {
-
+    this.Status=0;  //0=空闲  1=运行
     this.Create=function()
     {
         addEventListener('message', (obj)=>{ this.OnRecvMessage(obj); });
@@ -129736,9 +129743,9 @@ function HQChartScriptWorker()
         if (indexData.Args) scriptObj.Args=indexData.Args;
 
         var indexInfo={ Name:scriptObj.Name, ID:scriptObj.ID, Script:scriptObj.Script, Args:scriptObj.Args, Guid:message.Guid };
-        scriptObj.ErrorCallback=(error)=>{ this.OnExecuteError(error,indexInfo); };
-        scriptObj.FinishCallback=(data, jsExectute)=>{ this.OnExecuteFinish(data, indexInfo, jsExectute); };
-        scriptObj.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback, indexInfo); };
+        scriptObj.ErrorCallback=(error)=>{ this.OnExecuteError(error, indexInfo, message); };
+        scriptObj.FinishCallback=(data, jsExectute)=>{ this.OnExecuteFinish(data, indexInfo, jsExectute, message); };
+        scriptObj.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback, indexInfo, message); };
 
         JSConsole.Complier.Log('[HQChartScriptWorker::ExecuteScript] scriptObj=',scriptObj);
 
@@ -129781,18 +129788,21 @@ function HQChartScriptWorker()
             for(var i=0;i<data.AryIndex.length;++i)
             {
                 var item=data.AryIndex[i];
+                this.Status=1;  //执行状态
                 this.ExecuteScript(item,data);
             }
+
+            this.Status=0;
         }
     }
     
-    this.OnExecuteFinish=function(data, indexInfo, jsExectute)
+    this.OnExecuteFinish=function(data, indexInfo, jsExectute, jobInfo)
     {
-        var message={ Data:data, IndexInfo:indexInfo , ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT };
+        var message={ Data:data, IndexInfo:indexInfo , ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT, JobInfo:jobInfo };
         postMessage(message);
     }
 
-    this.OnExecuteError=function(error,indexInfo)
+    this.OnExecuteError=function(error, indexInfo, jobData)
     {
         var message={ IndexInfo:indexInfo, ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT, Error:error };
         postMessage(message);
@@ -129806,7 +129816,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12606";
+var HQCHART_VERSION="1.1.12609";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.worker.js

@@ -6,7 +6,7 @@
 
 function HQChartScriptWorker()
 {
-
+    this.Status=0;  //0=空闲  1=运行
     this.Create=function()
     {
         addEventListener('message', (obj)=>{ this.OnRecvMessage(obj); });
@@ -44,9 +44,9 @@ function HQChartScriptWorker()
         if (indexData.Args) scriptObj.Args=indexData.Args;
 
         var indexInfo={ Name:scriptObj.Name, ID:scriptObj.ID, Script:scriptObj.Script, Args:scriptObj.Args, Guid:message.Guid };
-        scriptObj.ErrorCallback=(error)=>{ this.OnExecuteError(error,indexInfo); };
-        scriptObj.FinishCallback=(data, jsExectute)=>{ this.OnExecuteFinish(data, indexInfo, jsExectute); };
-        scriptObj.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback, indexInfo); };
+        scriptObj.ErrorCallback=(error)=>{ this.OnExecuteError(error, indexInfo, message); };
+        scriptObj.FinishCallback=(data, jsExectute)=>{ this.OnExecuteFinish(data, indexInfo, jsExectute, message); };
+        scriptObj.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback, indexInfo, message); };
 
         JSConsole.Complier.Log('[HQChartScriptWorker::ExecuteScript] scriptObj=',scriptObj);
 
@@ -89,18 +89,21 @@ function HQChartScriptWorker()
             for(var i=0;i<data.AryIndex.length;++i)
             {
                 var item=data.AryIndex[i];
+                this.Status=1;  //执行状态
                 this.ExecuteScript(item,data);
             }
+
+            this.Status=0;
         }
     }
     
-    this.OnExecuteFinish=function(data, indexInfo, jsExectute)
+    this.OnExecuteFinish=function(data, indexInfo, jsExectute, jobInfo)
     {
-        var message={ Data:data, IndexInfo:indexInfo , ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT };
+        var message={ Data:data, IndexInfo:indexInfo , ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT, JobInfo:jobInfo };
         postMessage(message);
     }
 
-    this.OnExecuteError=function(error,indexInfo)
+    this.OnExecuteError=function(error, indexInfo, jobData)
     {
         var message={ IndexInfo:indexInfo, ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT, Error:error };
         postMessage(message);