hqchart 1.1.12845 → 1.1.12851

package/lib/umychart.vue.js

@@ -11496,7 +11496,8 @@ this.VisitBinaryExpression=function(node){var stack=[];stack.push(node);var temp
 switch(value.Operator){case'-':value.Out=this.Algorithm.Subtract(leftValue,rightValue);break;case'*':value.Out=this.Algorithm.Multiply(leftValue,rightValue);break;case'/':value.Out=this.Algorithm.Divide(leftValue,rightValue);break;case'+':value.Out=this.Algorithm.Add(leftValue,rightValue);break;case'>':value.Out=this.Algorithm.GT(leftValue,rightValue);break;case'>=':value.Out=this.Algorithm.GTE(leftValue,rightValue);break;case'<':value.Out=this.Algorithm.LT(leftValue,rightValue);break;case'<=':value.Out=this.Algorithm.LTE(leftValue,rightValue);break;case'==':case'='://= 比较
 value.Out=this.Algorithm.EQ(leftValue,rightValue);break;case'!=':case'<>':value.Out=this.Algorithm.NEQ(leftValue,rightValue);break;}if(JS_EXECUTE_DEBUG_LOG)JSConsole.Complier.Log('[JSExecute::VisitBinaryExpression] BinaryExpression',value);}else if(value.Type==Syntax.LogicalExpression){var _leftValue=this.GetNodeValue(value.Left);var _rightValue=this.GetNodeValue(value.Right);if(JS_EXECUTE_DEBUG_LOG)JSConsole.Complier.Log('[JSExecute::VisitBinaryExpression] LogicalExpression',value,_leftValue,_rightValue);value.Out=null;//保存中间值
 switch(value.Operator){case'&&':case'AND':value.Out=this.Algorithm.And(_leftValue,_rightValue);break;case'||':case'OR':value.Out=this.Algorithm.Or(_leftValue,_rightValue);break;}if(JS_EXECUTE_DEBUG_LOG)JSConsole.Complier.Log('[JSExecute::VisitBinaryExpression] LogicalExpression',value);}node=temp;}}return node.Out;};this.GetNodeValue=function(node){switch(node.Type){case Syntax.Literal://数字
-return node.Value;case Syntax.UnaryExpression:if(node.Operator=='-'){var value=this.GetNodeValue(node.Argument);return this.Algorithm.Subtract(0,value);}return node.Argument.Value;case Syntax.Identifier:var value=this.ReadVariable(node.Name,node);return value;case Syntax.BinaryExpression:case Syntax.LogicalExpression:return this.VisitBinaryExpression(node);case Syntax.CallExpression:return this.VisitCallExpression(node);case Syntax.MemberExpression:return this.ReadMemberVariable(node);default:this.ThrowUnexpectedNode(node);}};this.ThrowUnexpectedNode=function(node,message,word){var marker=node.Marker;var msg=message||"执行异常";return this.ErrorHandler.ThrowError(marker.Index,marker.Line,marker.Column,msg,word);};this.ThrowDownloadSF=function(node,job,message){var marker=node.Marker;var msg=message;return this.ErrorHandler.ThrowDownloadJob(marker.Index,marker.Line,marker.Column,msg,job);};this.ThrowError=function(){};}//脚本说明
+return node.Value;case Syntax.UnaryExpression:if(node.Operator=='-'){var value=this.GetNodeValue(node.Argument);return this.Algorithm.Subtract(0,value);}return node.Argument.Value;case Syntax.Identifier:var value=this.ReadVariable(node.Name,node);return value;case Syntax.BinaryExpression:case Syntax.LogicalExpression:if(node.Out)return node.Out;//如果没有数据需要重新计算
+JSConsole.Complier.Log('[JSExecute::GetNodeValue] VisitBinaryExpression',node);return this.VisitBinaryExpression(node);case Syntax.CallExpression:return this.VisitCallExpression(node);case Syntax.MemberExpression:return this.ReadMemberVariable(node);default:this.ThrowUnexpectedNode(node);}};this.ThrowUnexpectedNode=function(node,message,word){var marker=node.Marker;var msg=message||"执行异常";return this.ErrorHandler.ThrowError(marker.Index,marker.Line,marker.Column,msg,word);};this.ThrowDownloadSF=function(node,job,message){var marker=node.Marker;var msg=message;return this.ErrorHandler.ThrowDownloadJob(marker.Index,marker.Line,marker.Column,msg,job);};this.ThrowError=function(){};}//脚本说明
 function JSExplainer(ast,option){this.AST=ast;this.ErrorHandler=new ErrorHandler();this.ErrorCallback;//执行错误回调
 this.UpdateUICallback;this.CallbackParam;this.JobList=[];//执行的任务队列
 this.VarTable=new _map2.default();//变量表
@@ -13029,7 +13030,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.12844";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.12850";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.12845",
+  "version": "1.1.12851",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.complier.js

@@ -17975,6 +17975,9 @@ function JSExecute(ast,option)
                 return value;
             case Syntax.BinaryExpression:
             case Syntax.LogicalExpression:
+                if (node.Out) return node.Out;
+                //如果没有数据需要重新计算
+                JSConsole.Complier.Log('[JSExecute::GetNodeValue] VisitBinaryExpression', node);
                 return this.VisitBinaryExpression(node);
             case Syntax.CallExpression:
                 return this.VisitCallExpression(node);

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

@@ -113579,6 +113579,9 @@ function JSExecute(ast,option)
                 return value;
             case Syntax.BinaryExpression:
             case Syntax.LogicalExpression:
+                if (node.Out) return node.Out;
+                //如果没有数据需要重新计算
+                JSConsole.Complier.Log('[JSExecute::GetNodeValue] VisitBinaryExpression', node);
                 return this.VisitBinaryExpression(node);
             case Syntax.CallExpression:
                 return this.VisitCallExpression(node);
@@ -131880,7 +131883,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12844";
+var HQCHART_VERSION="1.1.12850";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -113623,6 +113623,9 @@ function JSExecute(ast,option)
                 return value;
             case Syntax.BinaryExpression:
             case Syntax.LogicalExpression:
+                if (node.Out) return node.Out;
+                //如果没有数据需要重新计算
+                JSConsole.Complier.Log('[JSExecute::GetNodeValue] VisitBinaryExpression', node);
                 return this.VisitBinaryExpression(node);
             case Syntax.CallExpression:
                 return this.VisitCallExpression(node);
@@ -132038,7 +132041,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12844";
+var HQCHART_VERSION="1.1.12850";
 
 function PrintHQChartVersion()
 {