hqchart 1.1.15111 → 1.1.15126

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

@@ -6766,6 +6766,14 @@ JSChart.RegisterChartFrameClass=function(name, option)
 }
 
 
+//注册DOM对话框类
+//option:{ Create:创建类方法 }
+JSChart.RegisterDOMClass=function(name, option)
+{
+    return g_JSDOMFactory.Add(name, option);
+}
+
+
 //一些公共函数
 JSChart.ToFixedPoint=function(value)
 {
@@ -14491,6 +14499,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(windowItem.IsShowTitleArrow)) frame.IsShowTitleArrow=windowItem.IsShowTitleArrow;
             if (IFrameSplitOperator.IsNumber(windowItem.TitleArrowType)) frame.TitleArrowType=windowItem.TitleArrowType;
             if (IFrameSplitOperator.IsBool(windowItem.IsShowIndexName)) frame.IsShowIndexName=windowItem.IsShowIndexName;
+            if (IFrameSplitOperator.IsBool(windowItem.IsSinlgeLine)) frame.IsSinlgeLine=windowItem.IsSinlgeLine;
             if (IFrameSplitOperator.IsBool(windowItem.IsShowOverlayIndexName)) frame.IsShowOverlayIndexName=windowItem.IsShowOverlayIndexName;
             if (IFrameSplitOperator.IsNumber(windowItem.IndexParamSpace)) frame.IndexParamSpace=windowItem.IndexParamSpace;
             if (IFrameSplitOperator.IsNumber(windowItem.IndexTitleSpace)) frame.IndexTitleSpace=windowItem.IndexTitleSpace;
@@ -14614,6 +14623,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (IFrameSplitOperator.IsBool(option.IsShowTitleArrow)) subFrame.Frame.IsShowTitleArrow=option.IsShowTitleArrow;
         if (IFrameSplitOperator.IsNumber(option.TitleArrowType)) subFrame.Frame.TitleArrowType=option.TitleArrowType;
         if (IFrameSplitOperator.IsBool(option.IsShowIndexName)) subFrame.Frame.IsShowIndexName=option.IsShowIndexName;
+        if (IFrameSplitOperator.IsBool(option.IsSinlgeLine)) subFrame.Frame.IsSinlgeLine=option.IsSinlgeLine;
         if (IFrameSplitOperator.IsBool(option.IsShowOverlayIndexName)) subFrame.Frame.IsShowOverlayIndexName=option.IsShowOverlayIndexName;
         if (IFrameSplitOperator.IsNumber(option.IndexParamSpace)) subFrame.Frame.IndexParamSpace=option.IndexParamSpace;
         if (IFrameSplitOperator.IsBool(option.IsShowXLine)) subFrame.Frame.IsShowXLine=option.IsShowXLine;
@@ -16699,6 +16709,36 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.UpdateWindowIndexV2(aryUpdate);
         return true;
     }
+
+    this.TryClickLock=function(x,y)
+    {
+        if (!this.Frame || !IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return false;
+
+        for(var i=0;i<this.Frame.SubFrame.length; ++i)
+        {
+            var item=this.Frame.SubFrame[i];
+            var chartLock=item.Frame.LockPaint;
+            if (!chartLock || !chartLock.LockRect) continue;
+
+            var tooltip=new TooltipData();
+            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
+
+            tooltip.HQChart=this;
+
+            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
+            if (event && event.Callback) 
+            {
+                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
+                event.Callback(event,sendData,this);
+            }
+
+
+            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
+            return true;
+        }
+
+        return false;
+    }
 }
 
 function GetDevicePixelRatio()
@@ -17353,6 +17393,7 @@ function IChartFramePainting()
     this.IsShowBorder = true;          //是否显示边框
     this.IsShowTitleArrow=g_JSChartResource.IndexTitle.EnableIndexArrow;        //是否显示指标信息上涨下跌箭头
     this.TitleArrowType=g_JSChartResource.IndexTitle.ArrowType;             //指标信息上涨下跌箭头类型 0=独立颜色 1=跟指标名字颜色一致
+    this.IsSinlgeLine=g_JSChartResource.IndexTitle.IsSinlgeLine;
     this.IsShowIndexName=true;         //是否显示指标名字
     this.IsShowOverlayIndexName=true;  //是否显示叠加指标名字
     //this.OverlayIndexType= { Position:0, LineSpace:5 };
@@ -20454,7 +20495,7 @@ function AverageWidthFrame()
 
         if (this.ClassName=="MinuteFrame" || this.ClassName=="KLineFrame")
         {
-            this.DivFrameToolbar=new JSDivFrameToolbar();
+            this.DivFrameToolbar=g_JSDOMFactory.Create('JSDivFrameToolbar');//new JSDivFrameToolbar();
             this.DivFrameToolbar.HQChart=hqchart;
             this.DivFrameToolbar.DivHQChart=divHQChart;
             this.DivFrameToolbar.FrameID=frameID;
@@ -30999,9 +31040,20 @@ function IChartPainting()
         var x=left+width/2;
         var y=top+height/2;
 
+        var bHScreen=this.ChartFrame.IsHScreen;
+        if (bHScreen)
+        {
+            this.Canvas.save(); 
+            this.Canvas.translate(x, y);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            x=0,y=0;
+        }
+
         this.Canvas.textAlign="center";
         this.Canvas.textBaseline="middle";
         this.Canvas.fillText(this.NotSupportMessage,x,y);
+
+        if (bHScreen)  this.Canvas.restore();
     }
 
     this.GetTooltipData=function(x,y,tooltip)
@@ -52043,6 +52095,8 @@ function ChartLock()
     this.IndexName;     //指标名字
     this.IndexID;       //指标ID
 
+    this.MinWidthText="  付费指标  "
+
     this.SetData=function(aryData)
     {
         this.AryData=aryData;
@@ -52170,11 +52224,27 @@ function ChartLock()
             }
         }
 
+        this.Canvas.font=this.Font;
+        var minWidth=this.Canvas.measureText(this.MinWidthText).width;
+
+        var aryText=null;
+        if (Array.isArray(this.Title)) aryText=this.Title;
+        else aryText=[{Text:this.Title}];
+            
+        var outSize={ };
+        if (!this.CalculateTextSize(aryText, this.Font, outSize)) outSize=null;
+        if (outSize && outSize.Width+8>minWidth) minWidth=outSize.Width+8;  //确保文字可以显示
+
         if (bHScreen)
         {
             var rtBG={ Left:border.Left, Right:border.RightEx, Top:left, Bottom:border.Bottom };
             rtBG.Width=rtBG.Right-rtBG.Left;
             rtBG.Height=rtBG.Bottom-rtBG.Top;
+            if (rtBG.Height<minWidth)
+            {
+                rtBG.Height=minWidth;
+                rtBG.Top=rtBG.Bottom-rtBG.Height;
+            }
             this.LockRect=rtBG;    //保存上锁区域
 
             if (bDraw)
@@ -52189,6 +52259,11 @@ function ChartLock()
             var rtBG={ Left:left, Right:border.RightEx, Top:border.TopTitle, Bottom:border.Bottom };
             rtBG.Width=rtBG.Right-rtBG.Left;
             rtBG.Height=rtBG.Bottom-rtBG.Top;
+            if (rtBG.Width<minWidth)
+            {
+                rtBG.Width=minWidth;
+                rtBG.Left=rtBG.Right-rtBG.Width;
+            }
             this.LockRect=rtBG;    //保存上锁区域
 
             if (bDraw)
@@ -52201,13 +52276,7 @@ function ChartLock()
         }
 
         if (!bDraw) return;
-
-        var aryText=null;
-        if (Array.isArray(this.Title)) aryText=this.Title;
-        else aryText=[{Text:this.Title}];
-            
-        var outSize={ };
-        if (!this.CalculateTextSize(aryText, this.Font, outSize)) return;
+        if (!outSize) return;
 
         this.Canvas.textAlign='left';
         this.Canvas.textBaseline='bottom';
@@ -66718,6 +66787,7 @@ function DynamicChartTitlePainting()
     this.IsShowIndexName=true;     //是否显示指标名字
     this.IsShowIndexTitle=true;    //是否显示指标标题信息
     this.IsShowNameArrow=false;
+    this.IsSinlgeLine=false;        //主图指标标题是否单行显示
     this.NameArrowConfig=CloneData(g_JSChartResource.IndexTitle.NameArrow);
     this.CustomLocation;    //自定义位置 { IsShow:, Top:， TitleHeight: }
 
@@ -67456,6 +67526,7 @@ function DynamicChartTitlePainting()
         this.IsShowUpDownArrow=this.Frame.IsShowTitleArrow;
         this.TitleArrowType=this.Frame.TitleArrowType;
         this.IsShowIndexName=this.Frame.IsShowIndexName;
+        this.IsSinlgeLine=this.Frame.IsSinlgeLine;
         this.IsShowOverlayIndexName=this.Frame.IsShowOverlayIndexName;
         this.OverlayIndexType.Position=this.Frame.OverlayIndexType.Position;
         this.OverlayIndexType.LineSpace=this.Frame.OverlayIndexType.LineSpace;
@@ -67862,6 +67933,7 @@ function DynamicChartTitlePainting()
 
                     if ((left+textWidth+space)>right) 
                     {
+                        if (this.IsSinlgeLine) break;
                         left=newLineLeft;
                         bottom+=lineHeight;
                         right=this.Frame.ChartBorder.GetRight();    //第2行以后 右侧边框
@@ -67926,6 +67998,7 @@ function DynamicChartTitlePainting()
                 var textWidth=this.Canvas.measureText(text).width+space;
                 if ((left+textWidth)>right) //换行
                 {
+                    if (this.IsSinlgeLine) break;
                     left=newLineLeft;
                     bottom+=lineHeight;
                     right=this.Frame.ChartBorder.GetRight();    //第2行以后 右侧边框
@@ -81413,6 +81486,8 @@ function JSChartResource()
         EnableIndexArrow:true,  //指标数值是否带上涨下跌箭头
 
         NameArrow:{ Color:"rgb(43,54,69)", Space:2, Symbol:'▼' },
+
+        IsSinlgeLine:false, //主图指标是否单行显示 false=多行显示
     }
 
     this.Title={
@@ -83098,6 +83173,7 @@ function JSChartResource()
 
             if (IFrameSplitOperator.IsNumber(item.ArrowType)) this.IndexTitle.ArrowType=item.ArrowType;
             if (IFrameSplitOperator.IsBool(item.EnableIndexArrow)) this.IndexTitle.EnableIndexArrow=item.EnableIndexArrow;
+            if (IFrameSplitOperator.IsBool(item.IsSinlgeLine)) this.IndexTitle.IsSinlgeLine=item.IsSinlgeLine;
 
             if (item.NameArrow)
             {
@@ -90862,32 +90938,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
-    this.TryClickLock=function(x,y)
-    {
-        for(var i=0;i<this.Frame.SubFrame.length; ++i)
-        {
-            var item=this.Frame.SubFrame[i];
-            var chartLock=item.Frame.LockPaint;
-            if (!chartLock || !chartLock.LockRect) continue;
-
-            var tooltip=new TooltipData();
-            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
-
-            tooltip.HQChart=this;
-            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
-            if (event && event.Callback) 
-            {
-                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
-                event.Callback(event,sendData,this);
-            }
-
-            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
-            return true;
-        }
-
-        return false;
-    }
-
     this.TryClickIndexTitle=function(x,y)
     {
         for(var i in this.TitlePaint)
@@ -100694,34 +100744,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         return false;
     }
-
-    this.TryClickLock=function(x,y)
-    {
-        for(var i=0;i<this.Frame.SubFrame.length; ++i)
-        {
-            var item=this.Frame.SubFrame[i];
-            var chartLock=item.Frame.LockPaint;
-            if (!chartLock || !chartLock.LockRect) continue;
-
-            var tooltip=new TooltipData();
-            if (!chartLock.GetTooltipData(x,y,tooltip)) continue;
-
-            tooltip.HQChart=this;
-
-            var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEX_LOCK);
-            if (event && event.Callback) 
-            {
-                var sendData={ FrameID:item.Frame.Identify, Data:tooltip };
-                event.Callback(event,sendData,this);
-            }
-
-
-            if (tooltip.Data.Callback) tooltip.Data.Callback(tooltip);
-            return true;
-        }
-
-        return false;
-    }
 }
 
 //盘前数据
@@ -102673,6 +102695,7 @@ function KLineChartHScreenContainer(uielement)
             frame.RightSpaceCount=this.RightSpaceCount; //右边
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
             frame.GlobalOption=this.GlobalOption;
+            frame.CreateLockPaint();
 
             frame.HorizontalMax=20;
             frame.HorizontalMin=10;
@@ -102861,6 +102884,7 @@ function MinuteChartHScreenContainer(uielement)
             frame.XPointCount=243;
             frame.HQChart=this;
             frame.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+            frame.CreateLockPaint();
 
             var DEFAULT_HORIZONTAL=[9,8,7,6,5,4,3,2,1];
             frame.HorizontalMax=DEFAULT_HORIZONTAL[0];
@@ -109547,7 +109571,7 @@ function JSDivFrameToolbar()
         {
             var item=aryButton[i];
             if (!item.ID || !item.ClassName) continue;
-            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null };
+            var newItem={ ID:item.ID, ClassName:item.ClassName, Span:null,Div:null, TooltipSpan:null, SpanText:item.SpanText };
             if (item.Tooltip && item.Tooltip.Text) newItem.Tooltip={ Text:item.Tooltip.Text };
 
             this.AryButton.push(newItem);
@@ -109578,7 +109602,7 @@ function JSDivFrameToolbar()
         if (!frame && this.FrameID>=0 && this.FrameID<this.HQChart.Frame.SubFrame.length) 
             frame=this.HQChart.Frame.SubFrame[this.FrameID].Frame;
 
-        var aryDefaultButton=JSDivFrameToolbar.GetDfaultButtons();
+        var aryDefaultButton=JSDivFrameToolbar.GetDfaultButtons(frame);
         var aryButton=[];
         for(var i=0;i<aryDefaultButton.length; i++)
         {
@@ -109636,8 +109660,6 @@ function JSDivFrameToolbar()
         this.SetToolbar(aryButton); //重新设置按钮
     }
 
-    
-
     this.Destroy=function()
     {
         if (this.DivToolbar) 
@@ -109705,6 +109727,7 @@ function JSDivFrameToolbar()
         var spanDom=document.createElement("span");
         spanDom.className=item.ClassName;
         spanDom.onmousedown=(e)=>{ this.OnClickButton(e, item); };
+        if (item.SpanText) spanDom.innerText=item.SpanText;
         item.Span=spanDom;
         btnDiv.appendChild(spanDom);
 
@@ -109789,7 +109812,7 @@ function JSDivFrameToolbar()
     }
 }
 
-JSDivFrameToolbar.GetDfaultButtons=function()
+JSDivFrameToolbar.GetDfaultButtons=function(frame)
 {
     var aryButton=
     [
@@ -109813,12 +109836,50 @@ JSDivFrameToolbar.GetDfaultButtons=function()
             ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-close", Tooltip:{ Text:"关闭窗口"},
             Span:null,Div:null, TooltipSpan:null
         },
+
+        /*
+        { 
+            ID:"TEST_8889", ClassName:"UMyChart_FrameToolbar_Span_Text", Tooltip:{ Text:"测试按钮提示"}, SpanText:"测试按钮",
+            Span:null, Div:null, TooltipSpan:null
+        },
+        */
     ];
 
     return aryButton
 }
 
 
+
+//DOM工厂类
+function JSDOMFactory()
+{
+    //[key:name, { Create:function(divElement) { return new class(divElement); }} ]
+    this.DataMap=new Map(
+    [
+        ["JSDivFrameToolbar", { Create:function(option) { return new JSDivFrameToolbar(option); } }],
+    ]); 
+
+    this.Create=function(name, option)
+    {
+        if (!this.DataMap.has(name)) 
+        {
+            JSConsole.Chart.Warn(`[JSDOMFactory::Create] can't find class=${name}.`);
+            return null;
+        }
+
+        var item=this.DataMap.get(name);
+        return item.Create(option);
+    }
+
+    this.Add=function(name, option)
+    {
+        this.DataMap.set(name, { Create:option.Create } );
+    }
+}
+
+var g_JSDOMFactory=new JSDOMFactory();
+
+
 function JSToolbarTooltip()
 {
     this.DivTooltip=null;
@@ -164605,7 +164666,7 @@ function JSDialogSearchIndex()
             var indexItem=cellItem.IndexItem;
             if (indexItem.Type==0 )  //系统指标 
             {
-                this.HQChart.ChangeIndex(this.OpData.WindowIndex, indexItem.ID );
+                this.HQChart.ChangeIndex(this.OpData.WindowIndex, indexItem.ID, indexItem);
             }
             else if(indexItem.Type==4 || indexItem.Type==5) //五彩K线
             {
@@ -164636,6 +164697,7 @@ function JSDialogSearchIndex()
             if (indexItem.Type==0)  //系统指标
             {
                 var obj={ WindowIndex:this.OpData.WindowIndex, IndexName:indexItem.ID };
+                if (indexItem.Lock) obj.Lock=indexItem.Lock;
                 this.HQChart.AddOverlayIndex(obj);
             }
             else if (indexItem.Type==1) //自定义脚本指标
@@ -165100,11 +165162,7 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
                 [
                     { Name:"收盘线(后台指标)", ID:"API-DRAWTEXTREL", Type:2, Args:null },
                     { Name:"高低均价(自定义脚本)", ID:"HIGH_LOW_AV", Type:1, Script:"均价:(H+L)/2;高:H;低:L;", Args:[ { Name:'N', Value:20}, { Name:'M', Value:6}]},
-                    { 
-                        Name:"波段量能跟庄-波段量能", ID:"TEST_INDEX_4AE0_1", Type:1, Args:null,
-                        Script:TEST_INDEX_4AE0_1,
-                        Lock:{ IsLocked:true }
-                    }
+                    { Name:"指标异常(后台指标)", ID:"API_ERRORMESSAGE", Type:2, Args:null,}
                 ]
             },
             {
@@ -165112,11 +165170,8 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
                 AryIndex:
                 [
                     { Name:"面积图(后台指标)", ID:"API-DRAWBAND", Type:2, Args:null, Lock:{ IsLocked:true } },
-                    { 
-                        Name:"波段量能跟庄-波段量能", ID:"TEST_INDEX_4AE0_1", Type:1, Args:null,
-                        Script:TEST_INDEX_4AE0_1,
-                        Lock:{ IsLocked:true }
-                    }
+                    { Name:"波段量能跟庄-波段量能", ID:"TEST_INDEX_4AE0_1", Type:0, Lock:{ IsLocked:true } },
+                    { Name:"飞龙八级进-主图", ID:"TEST_INDEX_4AE0_2", Type:0, Lock:{ IsLocked:true } }
                 ]
             },
             {
@@ -165619,6 +165674,7 @@ function JSDialogModifyIndexParam()
 /////////////////////////////////////////////////////////////////////////////////////////////
 //测试指标
 
+
 var TEST_INDEX_4AE0_1=`能量:=SQRT(VOL)*(((C-(H+L)/2))/((H+L)/2));
 平滑能量:=EMA(能量,16);
 能量惯性:EMA(平滑能量,16);
@@ -165635,6 +165691,111 @@ STICKLINE(能量惯性<0,(能量惯性-能量惯性*0.6),(能量惯性-能量惯
 STICKLINE(能量惯性<0,(能量惯性-能量惯性*0.8),(能量惯性-能量惯性*0.95),3,0), COLORFFFF00;`
 
 
+var TEST_INDEX_4AE0_2=`
+MA3:MA(CLOSE,3),COLORWHITE;
+MA17:MA(CLOSE,17),COLORYELLOW;
+QQ:=0,COLORWHITE;
+MA1:=MA(CLOSE,3);
+MA2:=MA(CLOSE,17);
+JG:=CROSS(MA1,MA2);
+VOLUME:=VOL,VOLSTICK;
+MAVOL1:=MA(VOLUME,3);
+MAVOL2:=MA(VOLUME,17);
+NL:=CROSS(MAVOL1,MAVOL2);
+DIF:=EMA(CLOSE,12)-EMA(CLOSE,26);
+DEA:=EMA(DIF,9);
+MACD:=(DIF-DEA)*2,COLORSTICK;
+NA:=CROSS(DIF,DEA);
+RSV:=(CLOSE-LLV(LOW,9))/(HHV(HIGH,9)-LLV(LOW,9))*100;
+K:=SMA(RSV,9,1);
+D:=SMA(K,9,1);
+J:=3*K-2*D;
+KD:=CROSS(K,D) AND CROSS(J,D);
+飞龙八级进:DRAWTEXT((JG AND NL AND NA) OR (JG AND NL AND KD) OR
+(JG AND NA AND KD) OR (NL AND NA AND KD),L*0.95,' 飞龙八级进'),COLORYELLOW;
+X:=LLV(J,2)=LLV(J,8);
+Y:=IF(CROSS(J,REF(J+0.01,1)) AND X AND J<20,30,0);
+DRAWTEXT(CROSS(J,REF(J+0.01,1)) AND X AND J<20,LOW*0.98,''),COLORLIMAGENTA;
+空:=EMA(C,5);
+均衡:=EMA(空,5),COLORWHITE;
+中轨:=HHV(MA(H,13),13),COLORRED,LINETHICK2;
+VAR5:=FILTER(均衡>REF(均衡,1)AND 中轨<REF(中轨,1)AND C>REF(C,1),11);
+DRAWTEXT(VAR5,L*0.98,''),COLORYELLOW;
+PT:=XMA(H,20);
+PAN:=XMA(CLOSE,7),COLORBROWN;
+RUO:=MEMA(CLOSE,3),COLORLIBLUE;
+STICKLINE(CLOSE> REF(CLOSE,1) ,HIGH,LOW,0,1 ),COLORRED;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,3,0 ),COLOR000055;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,2.7,0 ),COLOR000077;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,2.1,0 ),COLOR000099;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,1.5,0 ),COLOR0000BB;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,0.9,0 ),COLOR0000DD;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,0.3,0 ),COLOR0000FF;
+STICKLINE(CLOSE= REF(CLOSE,1) ,HIGH,LOW,0,1 ),COLORWHITE;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,3,0 ),COLOR555555;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,2.7,0 ),COLOR777777;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,2.1,0 ),COLOR999999;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,1.5,0 ),COLORBBBBBB;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,0.9,0 ),COLORDDDDDD;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,0.3,0 ),COLORFFFFFF;
+STICKLINE(CLOSE< REF(CLOSE,1) ,HIGH,LOW,0,1 ),COLORCYAN;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,3,0 ),COLOR990000;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,2.7,0 ),COLORCC0000;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,2.1,0 ),COLORFF4400;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,1.5,0 ),COLORFF8800;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,0.9,0 ),COLORFFCC00;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,0.3,0 ),COLORCYAN;
+高:=REF(HHV(H,80),3);
+低:=REF(LLV(L,80),3);
+H19:=高-(高-低)*0.191;
+H38:=高-(高-低)*0.382;
+H中:=高-(高-低)*0.5;
+H61:=高-(高-低)*0.618;
+H80:=高-(高-低)*0.809;
+顶点:REFDATE(高,DATE),COLORWHITE;
+REFDATE(H19,DATE),COLORYELLOW;
+REFDATE(H38,DATE),COLORMAGENTA;
+REFDATE(H中,DATE),COLORRED;
+REFDATE(H61,DATE),COLORMAGENTA;
+REFDATE(H80,DATE),COLORYELLOW;
+低点:REFDATE(低,DATE),COLORWHITE;
+DRAWTEXT(ISLASTBAR,低点,''),COLORWHITE;
+`
+
+
+//添加测试系统指标
+AddTestSystemIndex=function()
+{
+    var aryIndex=[];
+
+    aryIndex.push(
+    { 
+        ID:"TEST_INDEX_4AE0_1",   
+        Name: '波段量能跟庄-波段量能', 
+        Script:TEST_INDEX_4AE0_1,
+        Args: null,
+       
+    });
+
+    
+    aryIndex.push(
+    {   
+        ID:"TEST_INDEX_4AE0_2",              //指标ID                    
+        Name:'飞龙八级进-主图',               //指标名称                    
+        Description:'飞龙八级进',            //描述信息                    
+        IsMainIndex:true,                  //是否是主图指标    
+        Condition: { Period:[CONDITION_PERIOD.KLINE_DAY_ID], Message:"指标(飞龙八级进-主图)只支持日线周期" },                
+        Args:null,                          //指标参数                                      
+        Script:TEST_INDEX_4AE0_2,                
+    });
+
+    JSIndexScript.AddIndex(aryIndex);
+}
+
+
+AddTestSystemIndex();
+
+
 
 
 ///////////////////////////////////////////////////////////////////////////////////
@@ -165758,7 +165919,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15110";
+var HQCHART_VERSION="1.1.15125";
 
 function PrintHQChartVersion()
 {
@@ -165888,6 +166049,8 @@ export default {
     IChartDrawPicture:IChartDrawPicture,        //画图工具
     DynamicTitleData:DynamicTitleData,          //指标标题数据
 
+    JSDivFrameToolbar:JSDivFrameToolbar,        //div指标工具条
+
     CONDITION_PERIOD:CONDITION_PERIOD,          //指标周期条件枚举
 
     //内部图形导出
@@ -165925,6 +166088,7 @@ export default {
         JSCHART_MENU_ID:JSCHART_MENU_ID,
         JSCHART_TRADE_STATUS_ID:JSCHART_TRADE_STATUS_ID,        //交易状态
         JSCHART_CORSSCURSOR_STATUS_ID:JSCHART_CORSSCURSOR_STATUS_ID,    //十字光标状态
+        CONDITION_PERIOD:CONDITION_PERIOD,          //指标周期条件枚举
     },