hqchart 1.1.12809 → 1.1.12820

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

@@ -166,6 +166,7 @@ function JSIndexScript()
             ['神奇九转', this.NineTurns],
             ['EMA', this.EMA3], ['EMA4', this.EMA4], ['EMA5', this.EMA5],['EMA6', this.EMA6],
             ["ICHIMOKU",this.ICHIMOKU],["CDP-STD", this.CDP_STD],["TBP-STD",this.TBP_STD],
+            ["ADX", this.ADX],
 
             //通达信特色指标
             ["散户线", this.ShareholderCount],["NXTS", this.NXTS],["FKX", this.FKX],["两融资金", this.Margin4],
@@ -4170,6 +4171,28 @@ TBP:REF(REF(C,1)+IF(DIRECT0>50,MIN(MF0,MF1),MAX(MF0,MF1)),1);\n\
     return data;
 }
 
+JSIndexScript.prototype.ADX = function () 
+{
+    let data =
+    {
+        Name: 'ADX', Description: '均趋向指标', IsMainIndex: true,
+        Args: [{ Name: 'N', Value: 14 }],
+        Script: //脚本
+`TR1:=SMA(MAX(MAX(HIGH-LOW,ABS(HIGH-REF(CLOSE,1))),ABS(LOW-REF(CLOSE,1))),N,1);
+HD:=HIGH-REF(HIGH,1);
+LD:=REF(LOW,1)-LOW;
+DMP:=SMA(IF(HD>0 AND HD>LD,HD,0),N,1);
+DMM:=SMA(IF(LD>0 AND LD>HD,LD,0),N,1);
+PDI:DMP*100/TR1,COLORRED,DOTLINE;
+MDI:DMM*100/TR1,COLORGREEN,DOTLINE;
+ADX:SMA(ABS(MDI-PDI)/(MDI+PDI)*100,N,1),COLORYELLOW,LINETHICK2;
+20;
+40;`
+    };
+
+    return data;
+}
+
 
 JSIndexScript.prototype.TEST = function () 
 {
@@ -52068,8 +52091,8 @@ function ChartSplashPaint()
 {
     this.Frame;
     this.Canvas;                            //画布
-    this.Font=g_JSChartResource.DefaultTextFont;            //字体
-    this.TextColor=g_JSChartResource.DefaultTextColor;      //文本颜色
+    this.Font=g_JSChartResource.SplashScreen.Font;                  //字体
+    this.TextColor=g_JSChartResource.SplashScreen.TextColor;        //文本颜色
     this.IsEnableSplash=false;
     this.SplashTitle='数据加载中';
     this.HQChart;
@@ -66252,7 +66275,9 @@ function JSChartResource()
     this.SplashScreen=
     {
         BGColor:"rgba(112,128,144,0.5)",
-        Title:"下载数据中......"
+        Title:"下载数据中......",
+        TextColor:"rgb(43,54,69)",
+        Font:14*GetDevicePixelRatio() +'px 微软雅黑'
     }
 
     this.HLCArea=
@@ -67333,6 +67358,8 @@ function JSChartResource()
             var item=style.SplashScreen;
             if (item.BGColor) this.SplashScreen.BGColor=item.BGColor;
             if (item.Title) this.SplashScreen.Title=item.Title;
+            if (item.TextColor) this.SplashScreen.TextColor=item.TextColor;
+            if (item.Font) this.SplashScreen.Font=item.Font;
         }
 
         if (style.HLCArea)
@@ -71300,7 +71327,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         item.BindData(this,windowIndex,hisData);
     }
 
-    //叠加指标
+    //叠加指标 option={ CheckRunCount:执行次数检测 ,SyncExecute:同步|异步检测 }
     this.BindOverlayIndexData=function(overlayItem, windowIndex, hisData, option)
     {
         if (!overlayItem.Script) return;
@@ -71313,8 +71340,20 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (typeof(overlayItem.Script.ExecuteScript)=='function')
         {
-            if (option && option.CheckRunCount)
-                if (overlayItem.Script.IsExcessRunCount()) return;
+            if (option) 
+            {
+                if (option.CheckRunCount)   //检测执行次数
+                {
+                    if (overlayItem.Script.IsExcessRunCount()) 
+                        return;
+                }
+
+                if (IFrameSplitOperator.IsBool(option.SyncExecute)) //异步|同步
+                {
+                    if (overlayItem.Script.IsSync!=option.SyncExecute) 
+                        return;
+                }
+            }
                 
             overlayItem.Script.ExecuteScript(this,windowIndex,hisData);
             return;
@@ -71490,7 +71529,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         for(var i=0;i<this.Frame.SubFrame.length;++i)
         {
             var item=this.Frame.SubFrame[i];
-            for(var j in item.OverlayIndex)
+            for(var j=0; j<item.OverlayIndex.length; ++j)
             {
                 var overlayItem=item.OverlayIndex[j];
                 this.BindOverlayIndexData(overlayItem,i,hisData,option)
@@ -71573,12 +71612,14 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (page.Enable) page.Index=1;    //第一页下载完成
 
-        this.BindInstructionIndexData(bindData);    //执行指示脚本
+        this.BindInstructionIndexData(bindData);        //执行指示脚本
         for(var i=0; i<this.Frame.SubFrame.length; ++i) //执行指标
         {
             this.BindIndexData(i,bindData);
         }
 
+        this.BindAllOverlayIndexData(bindData, { SyncExecute:true });   //同步模式叠加指标
+
         //刷新画图
         this.UpdataDataoffset();           //更新数据偏移
         this.UpdateFrameMaxMin();          //调整坐标最大 最小值
@@ -71586,8 +71627,8 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.UpdatePointByCursorIndex(2);   //取消十字光标
         this.Draw();
 
-        //叠加指标
-        this.BindAllOverlayIndexData(bindData);
+        
+        this.BindAllOverlayIndexData(bindData,{ SyncExecute:false } );  //异步模式叠加指标
 
         if (this.mapEvent.has(JSCHART_EVENT_ID.RECV_HISTROY_DATA))
         {
@@ -71881,6 +71922,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.BindIndexData(i,bindData);
         }
 
+        this.BindAllOverlayIndexData(bindData, { SyncExecute:true });   //同步模式叠加指标
+
         //刷新画图
         this.UpdataDataoffset();           //更新数据偏移
         this.UpdatePointByCursorIndex(2);  //切换周期了取消十字光标
@@ -71889,7 +71932,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Draw();
         
         //叠加指标
-        this.BindAllOverlayIndexData(bindData);
+        this.BindAllOverlayIndexData(bindData, { SyncExecute:false } );  //异步模式叠加指标
 
         if (this.mapEvent.has(JSCHART_EVENT_ID.RECV_HISTROY_DATA))
         {
@@ -72181,6 +72224,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.BindIndexData(i,bindData, { CheckRunCount:true });
         }
 
+        this.BindAllOverlayIndexData(bindData, {  CheckRunCount:true, SyncExecute:true });   //同步模式叠加指标
+
         //刷新画图
         this.UpdataDataoffset();           //更新数据偏移
         this.UpdatePointByCursorIndex(1);  //更新十字光标位子
@@ -72188,10 +72233,10 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Frame.SetSizeChage(true);
         this.Draw();
 
-        this.SendKLineUpdateEvent(bindData);
+        this.SendKLineUpdateEvent(bindData);    
 
         //叠加指标计算
-        this.BindAllOverlayIndexData(bindData,{ CheckRunCount:true });
+        this.BindAllOverlayIndexData(bindData, { CheckRunCount:true,SyncExecute:false });     //异步模式叠加指标
 
         if (this.mapEvent.has(JSCHART_EVENT_ID.ON_RECV_REALTIME_DATA))
         {
@@ -72429,6 +72474,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.BindIndexData(i,bindData);
         }
 
+        this.BindAllOverlayIndexData(bindData, {  CheckRunCount:true, SyncExecute:true });   //同步模式叠加指标
+
         //刷新画图
         this.UpdataDataoffset();           //更新数据偏移
         this.UpdatePointByCursorIndex(1);  //更新十字光标位子
@@ -72439,7 +72486,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.SendKLineUpdateEvent(bindData);
 
         //更新叠加指标
-        this.BindAllOverlayIndexData(bindData);
+        this.BindAllOverlayIndexData(bindData, { CheckRunCount:true,SyncExecute:false });     //异步模式叠加指标
 
         if (this.mapEvent.has(JSCHART_EVENT_ID.ON_RECV_REALTIME_DATA))
         {
@@ -72505,6 +72552,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.BindIndexData(i,bindData);
         }
 
+        this.BindAllOverlayIndexData(bindData, { CheckRunCount:true, SyncExecute:true });   //同步模式叠加指标
+
         //刷新画图
         this.UpdataDataoffset();           //更新数据偏移
         this.UpdatePointByCursorIndex(1);  //更新十字光标位子
@@ -72515,7 +72564,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.SendKLineUpdateEvent(bindData);
 
         //更新叠加指标
-        this.BindAllOverlayIndexData(bindData);
+        this.BindAllOverlayIndexData(bindData, { CheckRunCount:true, SyncExecute:false });  //异步模式叠加指标
     }
 
     //更新当天的全量分钟数据
@@ -73450,7 +73499,7 @@ function KLineChartContainer(uielement,OffscreenElement)
 
             if (IFrameSplitOperator.IsNumber(obj.FloatPrecision)) indexData.FloatPrecision=obj.FloatPrecision;
             if (IFrameSplitOperator.IsNumber(obj.StringFormat)) indexData.StringFormat=obj.StringFormat;
-
+            if (IFrameSplitOperator.IsBool(obj.IsSync)) indexData.IsSync=obj.IsSync;
             var scriptIndex=new OverlayScriptIndex(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
             scriptIndex.OverlayIndex={ IsOverlay:true, Identify:overlayFrame.Identify, WindowIndex:windowIndex, Frame:overlayFrame };    //叠加指标信息
             overlayFrame.Script=scriptIndex;
@@ -75964,6 +76013,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.BindIndexData(i,bindData);
         }
 
+        this.BindAllOverlayIndexData(bindData, { SyncExecute:true });   //同步模式叠加指标
+
         //刷新画图
         this.UpdataDataoffset();           //更新数据偏移
         this.UpdatePointByCursorIndex();   //更新十字光标位子
@@ -75973,7 +76024,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.Draw();
 
         //叠加指标计算
-        this.BindAllOverlayIndexData(bindData);
+        this.BindAllOverlayIndexData(bindData, { SyncExecute:false });  //异步模式叠加指标
     }
 
     this.RequestZoomMinuteData=function(requestData)
@@ -76132,6 +76183,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                 Explain:funcExplain,
                 Request:{ Url:url,  Type:'POST' , Data: postData, Period:this.Period, Right:this.Right }, 
                 DragDownload:download,
+                Option:option,
                 Self:this,
                 PreventDefault:false,
                 ZoomData:option.ZoomData
@@ -76209,6 +76261,12 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         if (!this.IsApiPeriod)
         {
+            if (bindData.Right>0)    //复权
+            {
+                var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
+                bindData.Data=rightData;
+            }
+
             if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据 (0= 日线,4=1分钟线 不需要处理)
             {
                 var periodData=bindData.GetPeriodData(bindData.Period);
@@ -76226,12 +76284,20 @@ function KLineChartContainer(uielement,OffscreenElement)
 
         //绑定数据
         this.UpdateMainData(bindData,lastDataCount);
-        if (option && option.ZoomData)  //缩放需要调整当前屏的位置
+        if (option)  //缩放需要调整当前屏的位置
         {
-            var zoomData=option.ZoomData;
-            var showCount=zoomData.PageSize-zoomData.RightSpaceCount;   //一屏显示的数据个数
-            bindData.DataOffset= bindData.Data.length-showCount;
-            if (bindData.DataOffset<0) bindData.DataOffset=0;
+            if (option.ZoomData)
+            {
+                var zoomData=option.ZoomData;
+                var showCount=zoomData.PageSize-zoomData.RightSpaceCount;   //一屏显示的数据个数
+                bindData.DataOffset= bindData.Data.length-showCount;
+                if (bindData.DataOffset<0) bindData.DataOffset=0;
+            }
+            else if (IFrameSplitOperator.IsNumber(option.DataOffset))
+            {
+                bindData.DataOffset+=option.DataOffset;
+                if (bindData.DataOffset<0) bindData.DataOffset=0;
+            }
         }
 
         this.UpdateOverlayDragDayData(data);
@@ -76242,6 +76308,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             this.BindIndexData(i,bindData);
         }
 
+        this.BindAllOverlayIndexData(bindData, { SyncExecute:true });   //同步模式叠加指标
+
         //刷新画图
         this.UpdataDataoffset();           //更新数据偏移
         this.UpdatePointByCursorIndex();   //更新十字光标位子
@@ -76254,7 +76322,7 @@ function KLineChartContainer(uielement,OffscreenElement)
         this.ReqeustKLineInfoData( { FunctionName:option.RecvFuncName, StartDate:firstData.Date } );
 
         //叠加指标计算
-        this.BindAllOverlayIndexData(bindData);
+        this.BindAllOverlayIndexData(bindData, { SyncExecute:false });  //异步模式叠加指标
     }
 
     this.RequestZoomDayData=function(requestData)
@@ -76270,6 +76338,7 @@ function KLineChartContainer(uielement,OffscreenElement)
             RecvFuncName:"RecvZoomDayData",
             Download:this.ZoomDownload.Day,
             Url:this.ZoomKLineApiUrl,
+            XShowCount:this.Frame.GetXShowCount(),
             Count:count,
             ZoomData:zoomData
         };
@@ -76287,7 +76356,8 @@ function KLineChartContainer(uielement,OffscreenElement)
             RecvFuncName:"RecvDragDayData",
             Download:this.DragDownload.Day,
             Url:this.DragKLineApiUrl,
-            Count:this.MaxRequestDataCount
+            Count:this.MaxRequestDataCount,
+            XShowCount:this.Frame.GetXShowCount(),
         };
 
         this.RequestPreviousDayData(option);
@@ -81500,7 +81570,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         for(var i=0;i<this.Frame.SubFrame.length;++i)
         {
             var item=this.Frame.SubFrame[i];
-            for(var j in item.OverlayIndex)
+            for(var j=0;j<item.OverlayIndex.length; ++j)
             {
                 var overlayItem=item.OverlayIndex[j];
                 this.BindOverlayIndexData(overlayItem,i,hisData,option)
@@ -112388,6 +112458,7 @@ function JSExecute(ast,option)
                     outVar=this.SymbolData.GetOtherSymolCacheData({ Literal:outVar });
                 varName="__temp_li_"+i+"__";
                 var type=0;
+                if (!Array.isArray(outVar)) outVar=this.SingleDataToArrayData(outVar);
                 this.OutVarTable.push({Name:varName, Data:outVar, Type:type, NoneName:true});
             }
             else if (item.Expression.Type==Syntax.BinaryExpression)
@@ -117154,7 +117225,9 @@ function OverlayScriptIndex(name,script,args,option)
 
         param.HQChart.UpdataDataoffset();           //更新数据偏移
         param.HQChart.UpdateFrameMaxMin();          //调整坐标最大 最小值
-        param.HQChart.Draw();
+
+        if (param.Self.IsSync===false)    //异步需要马上刷新，同步主图数据更新的时候会刷新的
+            param.HQChart.Draw();
 
         var event=hqChart.GetOverlayIndexEvent();  //指标计算完成回调
         if (event)
@@ -120864,6 +120937,12 @@ function GetBlackStyle()
         UnchagneBarColor: "rgb(228,228,228)", //平盘
         EmptyBarBGColor:'rgb(0,0,0)',   //空心柱子背景色
 
+        SplashScreen:
+        {
+            BGColor:"rgba(112,128,144,0.5)",
+            TextColor:"rgb(230,230,230)",
+        },
+
         HLCArea:
         {
             HighLineColor:'rgb(238,21,21)',
@@ -131833,7 +131912,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12808";
+var HQCHART_VERSION="1.1.12819";
 
 function PrintHQChartVersion()
 {