hqchart 1.1.13014 → 1.1.13019

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

@@ -56295,6 +56295,7 @@ function IChartDrawPicture()
 
     this.IsDrawFirst=false;
     this.IsShowYCoordinate=false;    //是否在Y轴显示点的刻度
+    this.IsShow=true;                //是否显示
 
     this.LineColor=g_JSChartResource.DrawPicture.LineColor[0];                            //线段颜色
     //this.LineColor="#1e90ff";      //线段颜色，input type="color" 不支持rgb和rgba 的格式
@@ -57364,6 +57365,8 @@ function IChartDrawPicture()
     this.GetXYCoordinate_default=function()
     {
         if (this.IsFrameMinSize()) return null;
+        if (!this.IsShow) return null;
+
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
 
         return this.PointRange(drawPoint);
@@ -57819,6 +57822,7 @@ function ChartDrawPictureLine()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
         if (!drawPoint) return;
@@ -57856,6 +57860,7 @@ function ChartDrawPictureLine()
     this.GetYCoordinatePoint=function()
     {
         if (this.IsFrameMinSize()) return null;
+        if (!this.IsShow) return null;
 
         if (this.Status<2) return null;
         if(!this.Point.length || !this.Frame) return null;
@@ -58018,6 +58023,7 @@ function ChartDrawGraffitiLine()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
         if (!drawPoint) return;
@@ -58073,6 +58079,7 @@ function ChartDrawArrowLine()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
         if (!drawPoint) return;
@@ -58191,6 +58198,7 @@ function ChartDrawPictureHaflLine()
         this.LinePoint=[];
         this.FullLine=null;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:false, IsCheckY:false});
         if (!drawPoint || drawPoint.length!=2) return;
@@ -58269,6 +58277,7 @@ function ChartDrawPictureHorizontalLine()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint();
         if (!drawPoint || drawPoint.length!=1) return;
@@ -58525,6 +58534,7 @@ function ChartDrawHLine()
         this.ButtonBGWidth=0;
 
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint();
         if (!drawPoint || drawPoint.length!=1) return;
@@ -58922,6 +58932,7 @@ function ChartDrawPictureTrendLine()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:false, IsCheckY:false});
         if (!drawPoint || drawPoint.length!=2) return;
@@ -58964,6 +58975,7 @@ function ChartDrawPictureRect()
     this.Draw=function()
     {
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint || drawPoint.length!=2) return;
@@ -59075,6 +59087,7 @@ function ChartDrawPictureArc()
     this.Draw=function()
     {
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint();
         if (!drawPoint || drawPoint.length!=2) return;
@@ -59306,6 +59319,7 @@ function ChartDrawPictureWaveMW()
         this.LinePoint=[];
         if (!this.Frame) return;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         this.IsHScreen=this.Frame.IsHScreen;
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
@@ -59604,6 +59618,7 @@ function ChartDrawPictureParallelLines()
         this.LinePoint=[];
         this.CenterLine.Line=null;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:false, IsCheckY:false}); //不检测x,y
         if (!drawPoint) return;
@@ -59717,6 +59732,7 @@ function ChartDrawFlatTop()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint) return;
@@ -60069,6 +60085,7 @@ function ChartDrawPictureParallelChannel()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint();
         if (!drawPoint) return;
@@ -60219,6 +60236,7 @@ function ChartDrawPictureText()
     {
         this.TextRect=null;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint || drawPoint.length!=1) return;
@@ -60322,6 +60340,7 @@ function ChartDrawPictureIconFont()
     {
         this.TextRect=null;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint || drawPoint.length!=1) return;
@@ -60420,6 +60439,7 @@ function ChartDrawPictureGannFan()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint) return;
@@ -60731,6 +60751,7 @@ function ChartDrawPictureGoldenSection()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint();
         if (!drawPoint) return;
@@ -60908,6 +60929,7 @@ function ChartDrawPictureTriangle()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint) return;
@@ -61027,6 +61049,7 @@ function ChartDrawPictureSymmetryAngle()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint) return;
@@ -61121,6 +61144,7 @@ function ChartDrawPictureCircle()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint || drawPoint.length!=2) return;
@@ -61184,6 +61208,7 @@ function ChartDrawPictureQuadrangle()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint) return;
@@ -61280,6 +61305,7 @@ function ChartDrawPictureFibonacci()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint();
         if (!drawPoint) return;
@@ -61482,6 +61508,7 @@ function ChartDrawLinearRegression(option)
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( { IsCheckX:true, IsCheckY:true} );
         if (!drawPoint || drawPoint.length!=2) 
@@ -61876,6 +61903,7 @@ function ChartDrawPriceLine()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( { IsCheckX:false, IsCheckY:true } );
         if (!drawPoint) return;
@@ -61976,6 +62004,7 @@ function ChartDrawPriceLineV2()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( { IsCheckX:false, IsCheckY:true } );
         if (!drawPoint) return;
@@ -62146,6 +62175,7 @@ function ChartDrawVerticalLine()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         if (!this.Frame || !this.Frame.Data) return;
         var data=this.Frame.Data;
@@ -62224,6 +62254,7 @@ function ChartDrawWaveRuler()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint) return;
@@ -62386,6 +62417,7 @@ function ChartDrawWaveRuler2Point()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint) return;
@@ -62518,6 +62550,7 @@ function ChartDrawBox()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
         if (!drawPoint) return;
@@ -62748,6 +62781,7 @@ function ChartDrawTwoPointDemo()
         this.LinePoint=[];
         this.PointInfo=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint) return;
@@ -62985,6 +63019,7 @@ function ChartDrawHLineSegment()
         this.IsHScreen=this.Frame.IsHScreen;
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( { IsCheckX:false, IsCheckY:true} );
         if (!drawPoint || drawPoint.length!=2) return;
@@ -63640,6 +63675,7 @@ function ChartDrawNote()
         this.TextRect=null;
         this.PtCenter=null;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint || drawPoint.length!=1) return;
@@ -64023,6 +64059,7 @@ function ChartDrawAnchoredText()
         if (this.Status<2) return;
         if(this.Point.length!=1 || !this.Frame) return;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint();
         if (!drawPoint || drawPoint.length!=1) return;
@@ -64372,6 +64409,7 @@ function ChartDrawPriceLabel()
     {
         this.TextRect=null;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:true, IsCheckY:true});
         if (!drawPoint || drawPoint.length!=1) return;
@@ -64611,6 +64649,7 @@ function ChartDrawPriceNote()
         this.LinePoint=[];
         this.TextRect=null;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:true, IsCheckY:true} );
         if (!drawPoint) return;
@@ -64955,6 +64994,7 @@ function ChartDrawFibWedge()
         this.TextAngle=null;
         this.Radius=null;
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
 
         var drawPoint=this.CalculateDrawPoint({IsCheckX:false, IsCheckY:false});
         if (!IFrameSplitOperator.IsNonEmptyArray(drawPoint)) return;
@@ -65338,6 +65378,8 @@ function ChartFibRetracement()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
+
         var bCheckXY=true;
         if (this.ExtendLine.Left || this.ExtendLine.Right) bCheckXY=false;
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:bCheckXY, IsCheckY:bCheckXY} );
@@ -65530,6 +65572,8 @@ function ChartFibSpeedResistanceFan()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
+
         var bCheckXY=false;
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:bCheckXY, IsCheckY:bCheckXY} );
         if (!drawPoint) return;
@@ -65795,6 +65839,8 @@ function ChartPriceRange()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
+
         var bCheckXY=true;
         if (this.ExtendLine.Left || this.ExtendLine.Right) bCheckXY=false;
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:bCheckXY, IsCheckY:bCheckXY} );
@@ -65912,6 +65958,8 @@ function ChartDateRange()
     {
         this.LinePoint=[];
         if (this.IsFrameMinSize()) return;
+        if (!this.IsShow) return;
+
         var bCheckXY=true;
         var drawPoint=this.CalculateDrawPoint( {IsCheckX:bCheckXY, IsCheckY:bCheckXY} );
         if (!drawPoint) return;
@@ -94649,6 +94697,15 @@ function Node(ErrorHandler)
             return;
         }
 
+        //"MA.MA1"(10,5,5)"
+        if (callee.Type==Syntax.Literal)
+        {
+            var item={ ID:JS_EXECUTE_JOB_ID.JOB_EXECUTE_INDEX, Args:args,  FunctionName:callee.Value, DynamicName:callee.Value };
+            if (token) item.Token={ Index:token.Start, Line:token.LineNumber };
+            this.ExecuteIndex.push(item);
+            return;
+        }
+
         if (callee.Name=='COVER_C' || callee.Name=='COVER_O' || callee.Name=='COVER_H' || callee.Name=='COVER_L' || callee.Name=='COVER_A' || callee.Name=='COVER_V')   //跨周期函数
         {
             var periodName=args[0].Value;
@@ -108638,6 +108695,98 @@ function JSSymbolData(ast,option,jsExecute)
         
     }
 
+    this.CallDynamicScriptIndex=function(job, varTable)
+    {
+        var callInfo=job.DynamicName;
+        var indexInfo={ Job:job, PeriodID:this.Period , Symbol:this.Symbol };
+        if (!this.ReadIndexFunctionValue(callInfo,indexInfo))     //读取指标
+        {
+            var token=job.Token;
+            this.Execute.ErrorHandler.ThrowError(token.Index,token.Line,0,`CallDynamicScriptIndex() Error: '${callInfo}' ${indexInfo.Error}`);
+        }
+
+        var systemIndex=new JSIndexScript();    //系统指标
+        var systemItem=systemIndex.Get(indexInfo.Name);
+        if (!systemItem)
+        {
+            var token=job.Token;
+            this.Execute.ErrorHandler.ThrowError(token.Index,token.Line,0,`CallDynamicScriptIndex() Error: '${callInfo}' ${indexInfo.Name} 指标不存在`);
+        }
+
+        indexInfo.SytemIndex=systemItem;    
+        if (!this.ReadDynamicIndexArgumentValue(job.Args, indexInfo, varTable))
+        {
+            var token=job.Token;
+            this.Execute.ErrorHandler.ThrowError(token.Index,token.Line,0,`CallDynamicScriptIndex() ${indexInfo.Name} 指标参数错误 : ${indexInfo.Error} `);
+        }
+
+        JSConsole.Complier.Log('[JSSymbolData::CallMemberScriptIndex] call script index', indexInfo);
+
+        var dateTimeRange=this.Data.GetDateRange();
+
+        var option=
+        {
+            HQDataType:this.DataType,
+            Symbol:indexInfo.Symbol,
+            Name:'',
+            Right:this.Right,           //复权
+            Period:indexInfo.PeriodID,  //周期
+            Data:null,
+            SourceData:null,
+            Callback:(outVar,job, symbolData)=> { 
+                this.RecvDynamicScriptIndexData(outVar,job,symbolData);
+                this.Execute.RunNextJob();
+            },
+            CallbackParam:indexInfo,
+            Async:true,
+            MaxRequestDataCount:this.MaxRequestDataCount+30*2,
+            MaxRequestMinuteDayCount:this.MaxRequestMinuteDayCount+2,
+            Arguments:indexInfo.Args,
+            //Condition:this.Condition,
+            IsBeforeData:this.IsBeforeData,
+            NetworkFilter:this.NetworkFilter,
+            IsApiPeriod:this.IsApiPeriod,
+            KLineRange:dateTimeRange    //K线数据范围
+        };
+
+        //执行脚本
+        var run=JSComplier.Execute(systemItem.Script,option,(error, indexInfo)=>{this.ExecuteScriptIndexError(error,indexInfo)});
+    }
+
+    this.ReadDynamicIndexArgumentValue=function(args, result, varTable)
+    {
+        result.Args=[];
+        for(var i =0;i<result.SytemIndex.Args.length; ++i)    //复制参数
+        {
+            var item=result.SytemIndex.Args[i];
+            result.Args.push({ Value:item.Value, Name:item.Name, IsDefault:true });
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(args)) return true;
+
+        for(var i=0;i<args.length;++i)
+        {
+            var item=args[i];
+            var argItem=result.Args[i];
+            if (!argItem) continue;
+            if (item.Type==Syntax.Literal)
+            {
+                argItem.Value=item.Value;
+                argItem.IsDefault=false;
+            }
+            else if (item.Type==Syntax.Identifier)  //支持传参
+            {
+                if (varTable.has(item.Name))
+                {
+                    argItem.Value=varTable.get(item.Name);
+                    argItem.IsDefault=false;
+                }
+            }
+        }
+
+        return true;
+    }
+
     /*****************************************************************************************************************************
         脚本调用
 
@@ -108651,10 +108800,13 @@ function JSSymbolData(ast,option,jsExecute)
         CALCSTOCKINDEX('SH600000','KDJ',3)表示上证600000的KDJ指标第3个输出即J之值,第一个参数可在前面加SZ(深市),SH(沪市),BJ(京市),或市场_,,
         CALCSTOCKINDEX('47_IFL0','MACD',2)表示IFL0品种的MACD指标第2个输出值.
 
+        "MA.MA1"(6,12,18)
+
     *******************************************************************************************************************************/
-    this.CallScriptIndex=function(job)
+    this.CallScriptIndex=function(job, varTable)
     {
         if (job.Member) return this.CallMemberScriptIndex(job);
+        if (job.DynamicName) return this.CallDynamicScriptIndex(job, varTable);
 
         if (!job.Args || !(job.Args.length>=2)) 
         {
@@ -108767,6 +108919,42 @@ function JSSymbolData(ast,option,jsExecute)
         }
     }
 
+    this.RecvDynamicScriptIndexData=function(outVar,indexInfo,symbolData)
+    {
+        JSConsole.Complier.Log('[JSSymbolData::RecvDynamicScriptIndexData] ', outVar, indexInfo, symbolData);
+        var kLine=symbolData.Data.Data;
+        var aryOutVar=outVar;
+        var data=this.Data.FitKLineIndex(kLine,aryOutVar,this.Period,indexInfo.PeriodID);
+
+        var objName=indexInfo.Name;
+        var memberValue={};
+        if (this.Execute.VarTable.has(objName))
+            memberValue=this.Execute.VarTable.get(objName);
+        else
+            this.Execute.VarTable.set(objName, memberValue);
+
+        var strValue="";
+        for(var i=0; i<indexInfo.Args.length; ++i)
+        {
+            var item=indexInfo.Args[i];
+            if (item.IsDefault===false)
+            {
+                if (strValue.length>0) strValue+=","; 
+                strValue+=`${item.Value}`;
+            }
+        }
+        var strArgs=`(${strValue})`;
+
+        //保存所有的指标数据, 下面用到了就可以不用算了
+        for(var i=0; i<data.length; ++i)
+        {
+            var key=`${outVar[i].Name}#${strArgs}`;
+            if (indexInfo.Period) key+='#'+indexInfo.Period;    //带周期的变量
+            
+            memberValue[key]=data[i].Data;
+        } 
+    }
+
     this.RecvScriptIndexData=function(outVar,indexInfo,symbolData)
     {
         var key=this.GenerateScriptIndexKey(indexInfo);
@@ -109640,7 +109828,8 @@ var JS_EXECUTE_JOB_ID=
     //KDJ.K , KDJ.K#WEEK
     //STKINDI('600000.sh','MA.MA1#WEEK',5,10,20,30,60,120);
     //CALCSTOCKINDEX('SH600000','KDJ',3)表示上证600000的KDJ指标第3个输出即J之值,第一个参数可在前面加SZ(深市),SH(沪市),BJ(京市)
-    JOB_EXECUTE_INDEX:30010,                
+    //"MA.MA(5,5,5)" 调用动态指标
+    JOB_EXECUTE_INDEX:30010,   
 
     JOB_RUN_SCRIPT:10000, //执行脚本
 
@@ -109959,7 +110148,7 @@ function JSExecute(ast,option)
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_CUSTOM_API_DATA:
                 return this.SymbolData.DownloadCustomAPIData(jobItem);
             case JS_EXECUTE_JOB_ID.JOB_EXECUTE_INDEX:
-                return this.SymbolData.CallScriptIndex(jobItem);
+                return this.SymbolData.CallScriptIndex(jobItem, this.VarTable);
 
             case JS_EXECUTE_JOB_ID.JOB_RUN_SCRIPT:
                 if (this.Debug===1 && this.DebugFilter) 
@@ -110939,6 +111128,35 @@ function JSExecute(ast,option)
             args.push(value);
         }
 
+        if (node.Callee.Type==Syntax.Literal)
+        {
+            var dynamicName=node.Callee.Value;
+            var aryValue=dynamicName.split(".");
+            if (aryValue.length!=2) 
+            {
+                this.ThrowUnexpectedNode(node,`调用指标格式'${dynamicName}'错误`);
+            }
+
+            var name=aryValue[0];
+            var outName=aryValue[1];
+            var strValue="";
+            for(var i=0; i<args.length; ++i)
+            {
+                var value=args[i];
+                if (strValue.length>0) strValue+=","; 
+                strValue+=`${value}`;
+            }
+            var strArgs=`(${strValue})`;
+            var key=`${outName}#${strArgs}`;
+
+            node.Out=[];
+            if (!this.VarTable.has(name)) return node.Out;
+            var indexData=this.VarTable.get(name);
+            var value=indexData[key];
+            if (value) node.Out=value;
+            return node.Out;
+        }
+
         if (funcName==="IFC")
         {
             //IFC(X,A,B)若X不为0则执行A,否则执行B.IFC与IF函数的区别:根据X的值来选择性执行A、B表达式.
@@ -111944,6 +112162,13 @@ function JSExplainer(ast,option)
             args.push(value);
         }
 
+        if (node.Callee.Type==Syntax.Literal)
+        {
+            var dynamicName=node.Callee.Value;
+            node.Out=`指标引用'${dynamicName}'`;
+            return node.Out;
+        }
+
         JSConsole.Complier.Log('[JSExplainer::VisitCallExpression]' , funcName, '(', args.toString() ,')');
 
         if (g_JSComplierResource.IsCustomFunction(funcName))
@@ -129854,7 +130079,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13013";
+var HQCHART_VERSION="1.1.13018";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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