hqchart 1.1.14576 → 1.1.14591

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

@@ -111,7 +111,7 @@ function JSIndexScript()
             ['VRSI',this.VRSI],['HSCOL',this.HSCOL],['DBQRV',this.DBQRV],['DBLB',this.DBLB],
             ['ACD',this.ACD],['EXPMA',this.EXPMA],['EXPMA_S',this.EXPMA_S],['HMA',this.HMA],
             ['LMA',this.LMA],['VMA',this.VMA],['AMV',this.AMV],['BBIBOLL',this.BBIBOLL],
-            ['ALLIGAT',this.ALLIGAT],['ZX',this.ZX],['XS',this.XS],['XS2',this.XS2],
+            ['ALLIGAT',this.ALLIGAT],["GMMA",this.GMMA],['ZX',this.ZX],['XS',this.XS],['XS2',this.XS2],
             ['SG-XDT',this.SG_XDT],['SG-SMX',this.SG_SMX],['SG-LB',this.SG_LB],['SG-PF',this.SG_PF],
             ['RAD',this.RAD],['SHT',this.SHT],['ZLJC',this.ZLJC],['ZLMM',this.ZLMM],['SLZT',this.SLZT],
             ['ADVOL',this.ADVOL],['CYC',this.CYC],['CYS',this.CYS],['CYQKL',this.CYQKL],
@@ -123,7 +123,8 @@ 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],
+            ["ADX", this.ADX],["SMACD", this.SMACD],["ACCER",this.ACCER],["AMO-TDX", this.AMO_TDX],
+            ["WSBVOL",this.WSBVOL], ["CCYD",this.CCYD], ["CCL",this.CCL],["ABI", this.ABI],
 
             ["持仓量", this.VOL_POSITION],  //成交量+持仓量
 
@@ -143,11 +144,11 @@ function JSIndexScript()
 
             ["两融余额", this.Margin2],["两融余额2", this.Margin3],
   
-            //外包指标
-            ['放心股-操盘BS点',this.FXG_BSPoint],
-            ['放心股-涨停多空线',this.FXG_INDEX],
-            ['放心股-涨停吸筹区',this.FXG_INDEX2],
-            ['放心股-量能黄金点',this.FXG_INDEX3],
+            //特色指标
+            ['特色指标-操盘BS点',this.FXG_BSPoint],
+            ['特色指标-涨停多空线',this.FXG_INDEX],
+            ['特色指标-涨停吸筹区',this.FXG_INDEX2],
+            ['特色指标-量能黄金点',this.FXG_INDEX3],
 
             //五彩K线(函数COLOR_开头)
             ['五彩K线-十字星',this.COLOR_KSTAR1],['五彩K线-早晨之星',this.COLOR_KSTAR2],['五彩K线-黄昏之星',this.COLOR_KSTAR3],['五彩K线-长十字',this.COLOR_SHI1],
@@ -708,6 +709,28 @@ MAVOL2:MA(VOLUME,M2);'
     return data;
 }
 
+
+JSIndexScript.prototype.AMO_TDX=function()
+{
+    let data=
+    {
+        Name:'AMO-TDX', Description:'成交金额(虚拟)', IsMainIndex:false,FloatPrecision:0,
+        Args:[ { Name:'M1', Value:5}, { Name:'M2', Value:10} ],
+        Script: //脚本
+'TOTAL:=IF(PERIOD=1,5,IF(PERIOD=2,15,IF(PERIOD=3,30,IF(PERIOD=4,60,IF(PERIOD=5,TOTALFZNUM,1)))));\n\
+MTIME:=MOD(FROMOPEN,TOTAL);\n\
+CTIME:=IF(MTIME<0.5,TOTAL,MTIME);\n\
+VAMO:=IF((CURRBARSCOUNT=1 AND DYNAINFO(8)>1),AMOUNT/10000.0*TOTAL/CTIME,DRAWNULL);\n\
+STICKLINE((CURRBARSCOUNT=1 AND DYNAINFO(8)>1),VAMO,0,-1,-1),COLOR00C0C0;\n\
+AMOW:AMOUNT/10000.0,VOLSTICK;\n\
+AMO1:MA(AMOW,M1);\n\
+AMO2:MA(AMOW,M2);'
+
+    };
+
+    return data;
+}
+
 JSIndexScript.prototype.RSI=function()
 {
     let data=
@@ -1445,6 +1468,40 @@ MACD:DIF-DEA,COLORSTICK;'
     return data;
 }
 
+JSIndexScript.prototype.SMACD = function () 
+{
+    let data =
+    {
+        Name: 'SMACD', Description: '单线平滑异同平均线', IsMainIndex: false,
+        Args: [{ Name: 'SHORT', Value: 12 },{ Name: 'LONG', Value: 26 },{ Name: 'MID', Value: 9 }],
+        Script: //脚本
+'DIF:=EMA(CLOSE,SHORT)-EMA(CLOSE,LONG);\n\
+DEA:EMA(DIF,MID);\n\
+MACD:DIF,COLORSTICK;'
+
+    };
+
+    return data;
+}
+
+
+JSIndexScript.prototype.ACCER = function () 
+{
+    let data =
+    {
+        Name: 'ACCER', Description: '幅度涨速', IsMainIndex: false,
+        Args: [{ Name: 'N', Value: 8 }],
+        Script: //脚本
+'ACCER:SLOPE(CLOSE,N)/CLOSE;'
+
+    };
+
+    return data;
+}
+
+
+
+
 JSIndexScript.prototype.QACD = function () 
 {
     let data =
@@ -1869,6 +1926,32 @@ JSIndexScript.prototype.ALLIGAT = function ()
     return data;
 }
 
+
+JSIndexScript.prototype.GMMA = function () 
+{
+    let data =
+    {
+        Name: 'GMMA', Description: '顾比均线', IsMainIndex: true,
+        Args: [],
+        Script: //脚本
+'MA3:EMA(CLOSE,3),COLORC08080;\n\
+MA5:EMA(CLOSE,5),COLORC08080;\n\
+MA8:EMA(CLOSE,8),COLORC08080;\n\
+MA10:EMA(CLOSE,10),COLORC08080;\n\
+MA12:EMA(CLOSE,12),COLORC08080;\n\
+MA15:EMA(CLOSE,15),COLORC08080;\n\
+MA30:EMA(CLOSE,30),COLOR0080FF;\n\
+MA35:EMA(CLOSE,35),COLOR0080FF;\n\
+MA40:EMA(CLOSE,40),COLOR0080FF;\n\
+MA45:EMA(CLOSE,45),COLOR0080FF;\n\
+MA50:EMA(CLOSE,50),COLOR0080FF;\n\
+MA60:EMA(CLOSE,60),COLOR0080FF;'
+
+    };
+
+    return data;
+}
+
 JSIndexScript.prototype.ZX = function () 
 {
     let data =
@@ -3905,6 +3988,94 @@ B:=REF(LLV(CLOSE,N),1);
 }
 
 
+JSIndexScript.prototype.WSBVOL = function() 
+{
+    let data =
+    {
+        Name: 'WSBVOL', Description: '维斯波成交量', IsMainIndex: false,
+        Script: //脚本
+`UPTJ1:=CLOSE>REF(CLOSE,1);
+UPTJ2:=(CLOSE==REF(CLOSE,1) && REF(CLOSE,1)>REF(CLOSE,2));
+UPTJ3:=MAX(OPEN,CLOSE)<REF(C,BARSLAST(CLOSE>REF(CLOSE,1))) AND MIN(OPEN,CLOSE)>REF(O,BARSLAST(CLOSE>REF(CLOSE,1)));
+UPTJ4:=NOT (H<REF(H,1) AND L<REF(L,1));
+UP:=(UPTJ1 || UPTJ2 || UPTJ3) AND UPTJ4;
+DOWN:=NOT(UP);
+M1:=BARSLASTCOUNT(UP);
+N1:=BARSLASTCOUNT(DOWN);
+CZB:=IF(M1=1 OR N1=1,2*INTPART(VOL*100/10000),INTPART(VOL*100/10000));
+SZ:=IF(M1>0,SUM(CZB,M1),-1*SUM(CZB,N1));
+GY:=IF(N1>0,SUM(CZB,N1),0);
+XQ:=IF(M1>0,SUM(CZB,M1),0);
+NOTEXT1:STICKLINE(M1>0,0,XQ,1,0),COLORRED;
+NOTEXT2:STICKLINE(N1>0,0,GY,1,0),COLORGREEN;
+WSB:SZ,NODRAW;`
+    };
+
+    return data;
+}
+
+
+JSIndexScript.prototype.CCL = function() 
+{
+    let data =
+    {
+        Name: 'CCL', Description: '持仓量(适用于期货)', IsMainIndex: false,
+        Script: //脚本
+`持仓量:VOLINSTK;
+成交:VOL,COLORLIRED;
+仓差:VOLINSTK-REF(VOLINSTK,1),NODRAW;
+STICKLINE(仓差>0 AND C>REF(C,1),0,仓差,2,3),COLORRED;
+STICKLINE(仓差>0 AND C<REF(C,1),0,仓差,2,3),COLORCYAN;
+STICKLINE(仓差>0 AND C=REF(C,1),0,仓差,2,3),COLORGRAY;
+STICKLINE(仓差<0 AND C>REF(C,1),0,仓差,2,3),COLORRED;
+STICKLINE(仓差<0 AND C<REF(C,1),0,仓差,2,3),COLORCYAN;
+STICKLINE(仓差<0 AND C=REF(C,1),0,仓差,2,3),COLORGRAY;`
+    };
+
+    return data;
+}
+
+JSIndexScript.prototype.CCYD = function() 
+{
+    let data =
+    {
+        Name: 'CCYD', Description: '持仓异动(适用于期货)', IsMainIndex: false,
+        Script: //脚本
+`CCYD:=VOLINSTK-REF(VOLINSTK,1);
+SPYD:=C-REF(C,1);
+多头增仓:IF(SPYD>=0 AND CCYD>=0,ABS(CCYD),DRAWNULL),COLOR3232FF,NODRAW;
+空头减仓:IF(SPYD>0 AND CCYD<0,ABS(CCYD),DRAWNULL),COLOR3232FF,NODRAW;
+空头增仓:IF(SPYD<0 AND CCYD>=0,ABS(CCYD),DRAWNULL),COLORFFFF54,NODRAW;
+多头减仓:IF(SPYD<0 AND CCYD<0,ABS(CCYD),DRAWNULL),COLORFFFF54,NODRAW;
+STICKLINE(SPYD>=0 AND CCYD>=0,0,CCYD,3,1),COLOR3232FF;
+STICKLINE(SPYD>0 AND CCYD<0,CCYD,0,3,1),COLOR3232FF;
+STICKLINE(SPYD<0 AND CCYD>=0,CCYD,0,3,0),COLORFFFF54;
+STICKLINE(SPYD<0 AND CCYD<0,CCYD,0,3,0),COLORFFFF54;`
+    };
+
+    return data;
+}
+
+JSIndexScript.prototype.ABI = function() 
+{
+    let data =
+    {
+        Name: 'ABI', Description: '绝对广量指标', IsMainIndex: false,
+        Args: [{ Name: 'N', Value: 10 }],
+        Condition: 
+        { 
+            Period:[CONDITION_PERIOD.KLINE_DAY_ID, CONDITION_PERIOD.KLINE_WEEK_ID, CONDITION_PERIOD.KLINE_TWOWEEK_ID,
+                CONDITION_PERIOD.KLINE_MONTH_ID, CONDITION_PERIOD.KLINE_QUARTER_ID ,CONDITION_PERIOD.KLINE_YEAR_ID ],
+            Include:["000001.SH", "000003.SH", "000016.SH", "000300.SH", "000905.SH", "399001.SZ", " 399005.SZ", "399006.SZ"] 
+        },
+        Script: //脚本
+`ABI:100*ABS(ADVANCE-DECLINE)/(ADVANCE+DECLINE);
+MAABI:EMA(ABI,M);`
+    };
+
+    return data;
+}
+
 
 
 
@@ -4366,6 +4537,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsNumber(item.ZIndex)) zindex=item.ZIndex;
                 if (item.Enable) this.CreateExtraCanvasElement(JSChart.RectDragCanvasKey, { ZIndex:zindex });   //创建独立的区间选择画布
             }
+
+            if (option.DragKLine)
+            {
+                var item=option.DragKLine;
+                if (IFrameSplitOperator.IsBool(item.EnableShfit)) chart.KLineDragConfig.EnableShfit=item.EnableShfit;
+            }
         }
 
         //创建子窗口
@@ -4417,6 +4594,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsNumber(item.PriceFormatType)) chart.ChartCorssCursor.StringFormatY.PriceFormatType=item.PriceFormatType;
             if (IFrameSplitOperator.IsNumber(item.DataFormatType)) chart.ChartCorssCursor.StringFormatY.DataFormatType=item.DataFormatType;
             if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
+            if (IFrameSplitOperator.IsBool(item.EnableDBClick)) chart.ChartCorssCursor.EnableDBClick=item.EnableDBClick;
 
             if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
            
@@ -4922,6 +5100,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsNumber(item.HPenType)) chart.ChartCorssCursor.HPenType=item.HPenType;
             if (IFrameSplitOperator.IsNumber(item.VPenType)) chart.ChartCorssCursor.VPenType=item.VPenType;
             if (IFrameSplitOperator.IsBool(item.EnableKeyboard)) chart.ChartCorssCursor.EnableKeyboard=item.EnableKeyboard;
+            if (IFrameSplitOperator.IsBool(item.EnableDBClick)) chart.ChartCorssCursor.EnableDBClick=item.EnableDBClick;
             if (IFrameSplitOperator.IsBool(item.IsShowCorssPoint)) chart.ChartCorssCursor.CorssPointConfig.Enable=item.IsShowCorssPoint;
             if (IFrameSplitOperator.IsNumber(item.VLineType)) chart.ChartCorssCursor.VLineType=item.VLineType;
         }
@@ -6820,12 +6999,14 @@ var JSCHART_MENU_ID=
     CMD_CORSS_ON_VAILD_TIME_ID:50,          //超出当前时间的,X轴调整到当前最后的时间(分时图)
     CMD_CORSS_ON_KLINE_ID:51,               //十字光标只能画在K线上   
     CMD_CORSS_POINT_ID:52,                  //十字光标圆点
+    
 
     CMD_RBUTTON_SELECT_RECT_ID:53,          //右键区间选择
     CMD_LBUTTON_SELECT_RECT_ID:54,          //左键区间选择
     CMD_ENABLE_XDRAG_BOTTOM_ID:55,          //X轴拖动缩放
 
     CMD_FULLSCREEN_SUMMARY_ID:56,           //当前屏区间统计
+    CMD_CORSS_DBCLICK_ID:57,                //双击显示隐藏十字光标
 
 
 
@@ -8119,6 +8300,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         document.oncontextmenu=(e)=> { this.DocContextMenu(e); }
     }
 
+
+    this.IsShfitDragKLine=function(e)
+    {
+        if (this.DragMode!=1) return false;
+        if (!this.KLineDragConfig) return false;
+        if (!this.KLineDragConfig.EnableShfit) return false;
+        if (!e.shiftKey) return false;
+
+        return true;
+    }
+
     this.DocOnMouseMove=function(e)
     {
         //加载数据中,禁用鼠标事件
@@ -8134,6 +8326,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         var moveSetpY=Math.abs(drag.LastMove.Y-e.clientY);
         var isDragSelectRect=(this.RectSelectDrag && this.RectSelectDrag.Index>=0);
         var isDragSubSelectRect=(this.RectSelectDrag && this.RectSelectDrag.Type==4);
+        var bShfitDragKLine=this.IsShfitDragKLine(e);   //shift+鼠标移动K线
         if (drag.CurrentMove) 
         {
             drag.CurrentMove.X=e.clientX;
@@ -8241,7 +8434,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
             this.OnDragXCoordinateZoom(drag, {X:moveSetp, Y:moveSetpY}, e);
         }
-        else if ((bLButtonSelectRect || bRButtonSelectRect) && !isDragSelectRect && !isDragSubSelectRect)  //左右键区间选择
+        else if ((bLButtonSelectRect || bRButtonSelectRect) && !isDragSelectRect && !isDragSubSelectRect && !bShfitDragKLine)  //左右键区间选择
         {
             var yMoveSetp=Math.abs(drag.LastMove.Y-e.clientY);
 
@@ -8353,6 +8546,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var isLeft=true;
                 if (drag.LastMove.X<e.clientX) isLeft=false;//右移数据
 
+                //按住shift才能移动K线
+                if (this.KLineDragConfig && this.KLineDragConfig.EnableShfit && !e.shiftKey) return;
+
                 var cursorStatus="pointer";
                 var oneStepWidth=this.GetMoveOneStepWidth();
                 if (moveSetp<oneStepWidth)
@@ -8450,6 +8646,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         var isDragSelectRect=(this.RectSelectDrag && this.RectSelectDrag.Index>=0);
         var isDragSubSelectRect=(this.RectSelectDrag && this.RectSelectDrag.Type==4);
         var bClearDrawPicture=true;
+        var bShfitDragKLine=this.IsShfitDragKLine(e);
         if (this.CurrentChartDrawPicture)
         {
             var drawPicture=this.CurrentChartDrawPicture;
@@ -8492,7 +8689,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
             if (this.OnMinuteSelectRectMouseUp) this.OnMinuteSelectRectMouseUp(e);  //分时图区间选择
         }
-        else if (bLButtonSelectRect || bRButtonSelectRect)  //K线图区间选择
+        else if ((bLButtonSelectRect || bRButtonSelectRect) && !bShfitDragKLine)  //K线图区间选择
         {
             var drag=this.MouseDrag;
             drag.LastMove.X=e.clientX;
@@ -9781,6 +9978,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 item.Draw();
         }
 
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_5);
+
         if (this.Frame.DrawOveraly)
             this.Frame.DrawOveraly(true);   //画叠加指标
 
@@ -9804,9 +10003,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             item.Draw();
         }
 
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_8);
+
         if (this.Frame.DrawOveraly)
             this.Frame.DrawOveraly(false);   //画叠加指标
 
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_10);
+
+        /*
         //固定扩展图形
         for(var i=0;i<this.ExtendChartPaint.length;++i)
         {
@@ -9815,6 +10019,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (item.DrawAfterPicture) continue;
             if (!item.IsDynamic && item.IsAnimation==false) item.Draw();
         }
+        */
 
         if (this.Frame.DrawInsideHorizontal) this.Frame.DrawInsideHorizontal();
         this.KLineIncreaseCustomHorizontal();
@@ -9843,6 +10048,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         var moveonPoint=null;
         if (this.LastMouseStatus && this.LastMouseStatus.MoveOnPoint) moveonPoint=this.LastMouseStatus.MoveOnPoint;
+
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_20, { MoveonPoint:moveonPoint} );
+
+        /*
         for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形
         {
             var item=this.ExtendChartPaint[i];
@@ -9854,6 +10063,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (item.DrawToolbar) item.DrawToolbar(moveonPoint);
             }
         }
+        */
 
         for(var i=0;i<this.ChartDrawPicture.length;++i)
         {
@@ -9943,6 +10153,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             item.Draw(moveonPoint, this.LastMouseStatus);
         }
 
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25);
+        /*
         for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形
         {
             var item=this.ExtendChartPaint[i];
@@ -9950,7 +10162,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (item.DrawAfterPicture) continue;
             if (item.IsDynamic && item.DrawAfterTitle===true && item.IsAnimation==false) item.Draw();
         }
+        */
 
+        if (this.EnableAnimation) this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_30);
+
+        /*
         if (this.EnableAnimation)
         {
             for(var i=0;i<this.ExtendChartPaint.length;++i) //动画
@@ -9959,6 +10175,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (item.IsAnimation===true) item.Draw();
             }
         }
+        */
 
         for(var i=0;i<this.ChartDrawPicture.length;++i)
         {
@@ -9977,12 +10194,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.CurrentChartDrawPicture.Draw();
         }
 
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_50);
+        /*
         for(var i=0;i<this.ExtendChartPaint.length;++i) //画图工具绘制完成以后 动态扩展图形
         {
             var item=this.ExtendChartPaint[i];
             if (item.DrawAfterPicture)
                 item.Draw();
         }
+        */
 
         this.OffscreenToShowCanvas();
 
@@ -10011,6 +10231,45 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         ++this.TouchDrawCount;
     }
 
+    this.DrawExtendChartPaint=function(level, option)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.ExtendChartPaint)) return;
+
+        //扩展图形
+        for(var i=0;i<this.ExtendChartPaint.length;++i)
+        {
+            var item=this.ExtendChartPaint[i];
+            if (item.IsCallbackDraw) continue;
+            
+            var value=item.GetPriority();   //绘图优先级
+            if (value!=level) continue;
+
+            if (level==IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_20)
+            {
+                item.Draw();
+                if (item.DrawToolbar && option) item.DrawToolbar(option.MoveonPoint, option.LastMouseStatus);
+            }
+            else if (level==IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25 && option)
+            {
+                if (item.ClassName=='KLineTooltipPaint' && option)
+                {
+                    if (option.Tooltip==false) continue;
+                    if (option.Point) item.LatestPoint=option.Point;
+                }
+                else if (item.ClassName=="MinuteTooltipPaint" && option)
+                {
+                    if (option.Point) item.LatestPoint=option.Point;
+                }
+
+                item.Draw(option.MoveonPoint, option.LastMouseStatus);
+            }
+            else
+            {
+                item.Draw();
+            }
+        }
+    }
+
     this.PtInButton=function(x, y)
     {
         var button=this.Frame.PtInButtons(x,y);
@@ -10323,6 +10582,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         var moveonPoint=null;
         if (this.LastMouseStatus && this.LastMouseStatus.MoveOnPoint) moveonPoint=this.LastMouseStatus.MoveOnPoint;
+
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_20, { MoveonPoint:moveonPoint, LastMouseStatus:this.LastMouseStatus } );
+
+        /*
         for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形
         {
             var item=this.ExtendChartPaint[i];
@@ -10334,6 +10597,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (item.DrawToolbar) item.DrawToolbar(moveonPoint, this.LastMouseStatus);
             }
         }
+        */
 
         for(var i=0;i<this.ChartDrawPicture.length;++i)
         {
@@ -10432,6 +10696,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             item.Draw(moveonPoint, this.LastMouseStatus);
         }
 
+
+        var exChartOption={ MoveonPoint:moveonPoint, LastMouseStatus:this.LastMouseStatus };
+        if (option)
+        {
+            exChartOption.Tooltip=option.Tooltip;
+            exChartOption.Point=option.Point;
+        }
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25,exChartOption);
+        /*
         for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形   在动态标题以后画
         {
             var item=this.ExtendChartPaint[i];
@@ -10449,7 +10722,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
             if (item.IsDynamic && item.DrawAfterTitle===true) item.Draw(moveonPoint, this.LastMouseStatus);
         }
+        */
 
+        if (this.EnableAnimation) this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_30);
+        /*
         if (this.EnableAnimation)
         {
             for(var i=0;i<this.ExtendChartPaint.length;++i) //动画
@@ -10458,6 +10734,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (item.IsAnimation===true) item.Draw();
             }
         }
+        */
 
         for(var i=0;i<this.ChartDrawPicture.length;++i)
         {
@@ -10479,12 +10756,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.CurrentChartDrawPicture.Draw();
         }
 
+        this.DrawExtendChartPaint(IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_50);
+        /*
         for(var i=0;i<this.ExtendChartPaint.length;++i) //动态扩展图形
         {
             var item=this.ExtendChartPaint[i];
             if (item.DrawAfterPicture) 
                 item.Draw();
         }
+        */
 
         if (this.LastMouseStatus.MouseOnToolbar)    //工具栏按钮提示信息
         {
@@ -10961,7 +11241,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
 
         var draw=false;
-        if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
+        if (keyID==27 && this.PopMinuteChart && this.PopMinuteChart.IsShow())
+        {
+            this.PopMinuteChart.Close();
+            draw=true;
+        }
+        else if (this.ChartCorssCursor && this.ChartCorssCursor.OnKeyDown)   //十字光标 隐藏显示
         {
             var sendData={ e:e, KeyID:keyID, Draw:false, PreventDefault:false };
             this.ChartCorssCursor.OnKeyDown(sendData);
@@ -11125,6 +11410,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         this.CurrentChartDrawPicture=null;
                 }
                 break;
+            case 13:    //回车
+                if (this.OnCustomKeyDown) this.OnCustomKeyDown(keyID, e);
+                break;
             default:
                 return;
         }
@@ -11138,7 +11426,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.OnDoubleClick=function(x,y,e)
     {
-        //JSConsole.Chart.Log(e);
+        
     }
 
     this.ZoomIndexWindow=function(frameID, option)   //最大化/最小化指标窗口 
@@ -14494,6 +14782,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             case JSCHART_MENU_ID.CMD_CORSS_POINT_ID:
                 if (IFrameSplitOperator.IsBool(srcParam) && this.ChartCorssCursor) this.ChartCorssCursor.CorssPointConfig.Enable=srcParam;
                 break;
+            case JSCHART_MENU_ID.CMD_CORSS_DBCLICK_ID:
+                if (IFrameSplitOperator.IsBool(srcParam) && this.ChartCorssCursor) this.ChartCorssCursor.EnableDBClick=srcParam;
+                break;
             case JSCHART_MENU_ID.CMD_RBUTTON_SELECT_RECT_ID:
                 if (IFrameSplitOperator.IsBool(srcParam) && this.ChartDragSelectRect) this.ChartDragSelectRect.EnableRButton=srcParam;
                 break;
@@ -49176,12 +49467,34 @@ function IExtendChartPainting()
     this.IsCallbackDraw=false;          //在回调函数里绘制, 不在Draw()中绘制
     this.ID=Guid();
 
+    this.DrawPriority=null;             //绘图优先级
+
     //上下左右间距
     this.Left=5;
     this.Right=5;
     this.Top=5;
     this.Bottom=5;
 
+
+    this.GetPriority=function()
+    {
+        if (IFrameSplitOperator.IsNumber(this.DrawPriority)) return this.DrawPriority;  //新版本
+
+        //老版本转换
+
+        if (!this.IsDynamic && !this.DrawAfterPicture) return IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_10;
+
+        if (this.DrawAfterTitle===false && this.IsAnimation==false) return IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_20;
+
+        if (this.DrawAfterTitle===true) return IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
+
+        if (this.IsAnimation===true) return IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_35;
+
+        if (this.DrawAfterPicture===true) IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_50;
+
+        return IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_50
+    }
+
     this.Draw=function()
     {
 
@@ -49218,6 +49531,23 @@ function IExtendChartPainting()
     }
 }
 
+//绘图优先级
+IExtendChartPainting.DRAW_PRIORITY_ID=
+{
+    LEVEL_1:1,
+    LEVEL_5:5,      //  叠加指数图形前面  指标图形 IsDrawFirst=true
+    LEVEL_8:8,      //  叠加指数图形前面  指标图形 IsDrawFirst=false  
+    LEVEL_10:10,    //  IsDynamic=false 
+
+    LEVEL_20:20,    //  IsDynamic=true  
+
+    LEVEL_25:25,    //  DrawAfterTitle=true 标题栏绘制完成以后
+
+    LEVEL_35:35,    //  IsAnimation=true
+
+    LEVEL_50:50,    //  DrawAfterPicture=true;       是否在画图工具以后绘制
+}
+
 //K线Tooltip, 显示在左边或右边
 function KLineTooltipPaint()
 {
@@ -49237,6 +49567,7 @@ function KLineTooltipPaint()
     this.AmountColor=g_JSChartResource.TooltipPaint.AmountColor;    //成交金额
     this.LatestPoint;               //手势位置
     this.ShowPosition=0;            //显示位置 0=左 1=右
+    this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
 
     this.Left=1*GetDevicePixelRatio();
     this.Top=5*GetDevicePixelRatio();
@@ -49980,6 +50311,7 @@ function MinuteLeftTooltipPaint()
     this.IsDynamic=true;
     this.IsEraseBG=true;
     this.DrawAfterTitle=true;
+    this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
     this.ClassName='MinuteLeftTooltipPaint';
     this.BorderColor=g_JSChartResource.PCTooltipPaint.BorderColor;    //边框颜色
     this.BGColor=g_JSChartResource.PCTooltipPaint.BGColor;            //背景色
@@ -50390,6 +50722,7 @@ function StockChip()
     this.PixelRatio=GetDevicePixelRatio();
     this.ShowType=0;    //0=所有筹码  1=周期前  2=周期内
     this.IsDynamic=true;
+    this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_20;
     this.ClientRect={};
     this.Font=g_JSChartResource.StockChip.Font;
     this.InfoColor=g_JSChartResource.StockChip.InfoColor;
@@ -54069,6 +54402,7 @@ function FrameButtomToolbarPaint()
     this.FrameGuid=null;
     this.IsDynamic=true;
     this.DrawAfterTitle=true;
+    this.DrawPriority=IExtendChartPainting.DRAW_PRIORITY_ID.LEVEL_25;
 
     this.AryButton=[];      // { Title:, ID:, Data:数据, TooltipText:提示信息 }
     this.SelectedID=null;   // 选中按钮ID
@@ -58214,6 +58548,7 @@ function ChartCorssCursor()
     this.CallAcutionXOperator;
 
     this.EnableKeyboard=false;   //是否支持键盘隐藏显示
+    this.EnableDBClick=false;     //是否允许双击显示|隐藏十字光标
     this.OnChangeStatusCallback;    //状态切换以后回调
     
 
@@ -59442,6 +59777,27 @@ function ChartCorssCursor()
         }
     }
 
+    this.OnDBClick=function(data)
+    {
+        if (!this.EnableDBClick) return; 
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame)) return;
+
+        //在主图框架内
+        var frame=this.Frame.SubFrame[0].Frame;
+        if (!frame) return;
+
+        var border=frame.GetBorder();
+        var rtClient={ Left:border.Left, Top:border.Top, Bottom:border.Bottom, Right:border.Right };
+        var x=data.X, y=data.Y;
+        if (x>=rtClient.Left && x<=rtClient.Right && y>=rtClient.Top && y<=rtClient.Bottom)
+        {
+            this.IsShowCorss=!this.IsShowCorss
+            data.Draw=true;
+    
+            if (this.OnChangeStatusCallback) this.OnChangeStatusCallback({ Type:1, IsShowCorss:this.IsShowCorss }, this);
+        }
+    }
+
 
     this.DrawCorssPoint=function(x,y)
     {
@@ -80263,6 +80619,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         { KeyID:87, SecondKeyID:3, CMD:JSCHART_MENU_ID.CMD_FULLSCREEN_SUMMARY_ID, Args:null, Description:"Alt+W	全屏区间统计" },
     ]
 
+    this.KLineDragConfig={ EnableShfit:false };  //是否启动Shift+鼠标拖动K线
+
     this.GetKLineCalulate=function()
     {
         var kLineDrawType=this.GetKLineDrawType();
@@ -81335,6 +81693,10 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             this.MoveCorssCursorDown(this.ShiftUpDownStepPixel);
             return true;
         }
+        else if (keyID==13) //回车显示分时图
+        {
+            this.OnEnterKeyDown();
+        }
         else
         {
             return false;
@@ -81474,6 +81836,30 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.ShowTooltipByKeyDown();
     }
 
+    this.OnEnterKeyDown=function()
+    {
+        if (!this.PopMinuteChart) return false;
+        if (!ChartData.IsDayPeriod(this.Period,true)) return false;   //只支持日K
+        if (!this.ChartCorssCursor || !this.ChartCorssCursor.IsShowCorss || this.ChartCorssCursor.ClientPos<0) return false;
+        var index=this.ChartCorssCursor.CursorIndex;
+        index=parseInt(index.toFixed(0));
+        var kData=this.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+        var dataIndex=kData.DataOffset+index;
+        if (dataIndex<0 || dataIndex>=kData.Data.length) return false;
+
+        var kItem = kData.Data[dataIndex];
+        if (!kItem) return false;
+        
+        var frame=this.Frame.SubFrame[0].Frame;
+        var x=frame.GetXFromIndex(index);
+        var y=frame.GetYFromData(kItem.Close);
+
+        var data={ Chart:this, Tooltip:{ ChartPaint:this.ChartPaint[0], Data:kItem } };
+
+        this.ShowMinuteChartDialog(data, x, y);
+    }
+
     //获取K线图实例
     this.GetKLineChart=function()
     {
@@ -86231,12 +86617,14 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var bCorssDrawKLine=false;
         var bCorssDrawVaildTime=false;
         var bCorssDrawPoint=false;
+        var bCorssBCClick=false;
         if (this.ChartCorssCursor) 
         {
             bShowCorss=this.ChartCorssCursor.IsShowCorss;
             bCorssDrawKLine=this.ChartCorssCursor.IsOnlyDrawKLine && this.ChartCorssCursor.IsShowClose;
             bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
             bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
+            bCorssBCClick=this.ChartCorssCursor.EnableDBClick;
         }
 
         var bPopMinuteChart=false;
@@ -86422,6 +86810,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"显示在K线上", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_KLINE_ID, Args:[!bCorssDrawKLine]}, Checked:bCorssDrawKLine },
                     { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
                     { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
+                    { Name:"双击显示/隐藏", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_DBCLICK_ID, Args:[!bCorssBCClick]}, Checked:bCorssBCClick },
                 ]
             },
             {
@@ -86895,6 +87284,14 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
     this.OnDoubleClick=function(x,y,e)
     {
+        var bDraw=false;
+        if (this.ChartCorssCursor)
+        {
+            var data={ e:e, X:x, Y:y, Draw:false };
+            this.ChartCorssCursor.OnDBClick(data);
+            bDraw=data.Draw
+        }
+            
         if (this.EnableYDrag && (this.EnableYDrag.Left || this.EnableYDrag.Right) && this.Frame && this.Frame.PtInFrameY)
         {
             var pixelTatio = GetDevicePixelRatio();
@@ -86931,6 +87328,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             }
         }
 
+        if (bDraw) this.Draw();
+
         var tooltip=new TooltipData();
         if (!this.PtInChartPaintTooltip(x,y,tooltip))
         {
@@ -90492,12 +90891,14 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var bCorssDrawCloseLine=false;  //十字光标只能画在走势图价格线上
         var bCorssDrawVaildTime=false;
         var bCorssDrawPoint=false;
+        var bCorssBCClick=false;
         if (this.ChartCorssCursor) 
         {
             bShowCorss=this.ChartCorssCursor.IsShowCorss;
             bCorssDrawCloseLine=this.ChartCorssCursor.IsOnlyDrawMinute;
             bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;
             bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;
+            bCorssBCClick=this.ChartCorssCursor.EnableDBClick;
         }
 
         var bRButtonSelectRect=false,bLButtonSelectRect=false;
@@ -90594,6 +90995,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     { Name:"画在价格线上", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_CLOSE_LINE_ID, Args:[!bCorssDrawCloseLine]}, Checked:bCorssDrawCloseLine },
                     { Name:"画在有效X轴上",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID, Args:[!bCorssDrawVaildTime]}, Checked:bCorssDrawVaildTime },
                     { Name:"画圆点",Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID, Args:[!bCorssDrawPoint]}, Checked:bCorssDrawPoint },
+                    { Name:"双击显示/隐藏", Data:{ ID:JSCHART_MENU_ID.CMD_CORSS_DBCLICK_ID, Args:[!bCorssBCClick]}, Checked:bCorssBCClick },
                 ]
             },
 
@@ -90734,6 +91136,14 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     {
         JSConsole.Chart.Log("[MinuteChartContainer::OnDoubleClick]", e);
 
+        var bDraw=false;
+        if (this.ChartCorssCursor)
+        {
+            var data={ e:e, X:x, Y:y, Draw:false };
+            this.ChartCorssCursor.OnDBClick(data);
+            bDraw=data.Draw
+        }
+
         if (this.EnableYDrag && (this.EnableYDrag.Left || this.EnableYDrag.Right) && this.Frame && this.Frame.PtInFrameY)
         {
             var pixelTatio = GetDevicePixelRatio();
@@ -90771,10 +91181,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 if (this.ZoomIndexWindow(frameId, {X:x, Y:y}))
                 {
                     this.Frame.SetSizeChage(true);
-                    this.Draw();
+                    bDraw=true;
                 }
             }
         }
+
+        if (bDraw) this.Draw();
     }
 
     this.GetDataItem=function(pointInfo)
@@ -104430,7 +104842,7 @@ function Node(ErrorHandler)
         //CAPITAL流通股本(手), EXCHANGE 换手率, TOTALCAPITAL 总股本(手)
         let setVariantName=new Set(
         [
-            "CAPITAL","TOTALCAPITAL","EXCHANGE",
+            "CAPITAL","TOTALCAPITAL","EXCHANGE","HSL",
             "HYBLOCK","DYBLOCK","GNBLOCK","FGBLOCK","ZSBLOCK","ZHBLOCK","ZDBLOCK","HYZSCODE",
             "GNBLOCKNUM","FGBLOCKNUM","ZSBLOCKNUM","ZHBLOCKNUM","ZDBLOCKNUM",
             "HYSYL","HYSJL","FROMOPEN",
@@ -117974,7 +118386,7 @@ function JSSymbolData(ast,option,jsExecute)
                 {
                     var dataType=0;
                     if (IFrameSplitOperator.IsNumber(recvData.DataType)) dataType=recvData.DataType;
-                    self.RecvStockValue(recvData.Data,jobItem,key,dataType);
+                    self.RecvStockValue(recvData.Data,jobItem,key,dataType,recvData);
                 }
                
                 self.Execute.RunNextJob();
@@ -117989,7 +118401,7 @@ function JSSymbolData(ast,option,jsExecute)
         };
 
         var apiDownload;
-        if (jobItem.VariantName=="CAPITAL" || jobItem.VariantName=="TOTALCAPITAL" || jobItem.VariantName=="EXCHANGE")
+        if (jobItem.VariantName=="CAPITAL" || jobItem.VariantName=="TOTALCAPITAL" || jobItem.VariantName=="EXCHANGE" || jobItem.VariantName=="HSL")
         {
             var callback=function(recvData, jobItem, key) 
             { 
@@ -118184,7 +118596,7 @@ function JSSymbolData(ast,option,jsExecute)
         }
     }
 
-    this.RecvStockValue=function(recvData,jobItem,key,dataType)
+    this.RecvStockValue=function(recvData,jobItem,key,dataType, srcData)
     {
         if (!recvData)
         {
@@ -118215,8 +118627,9 @@ function JSSymbolData(ast,option,jsExecute)
                 var bindData=new ChartData();
                 bindData.Data=aryFittingData;
                 var result=bindData.GetValue();
+                var bVersion2=srcData && srcData.Ver==2;    //2.0 版本
 
-                if (key=="EXCHANGE")    //计算换手率=成交量/流通股本*100
+                if (!bVersion2 && (key=="EXCHANGE" || key=="HSL"))    //计算换手率=成交量/流通股本*100
                 {
                     for(var i in result)
                     {
@@ -120236,7 +120649,7 @@ function JSExecute(ast,option)
 
         ['CAPITAL',null],   //流通股本（手）
         ["TOTALCAPITAL",null], //TOTALCAPITAL  当前总股本 手
-        ['EXCHANGE',null],   //换手率
+        ['EXCHANGE',null],   ["HSL",null], //换手率
         ['SETCODE', null],  //市场类型
         ['CODE',null],      //品种代码
         ['STKNAME',null],   //品种名称
@@ -120486,6 +120899,7 @@ function JSExecute(ast,option)
             case "TOTALCAPITAL":
             case 'CAPITAL':
             case 'EXCHANGE':
+            case "HSL":
 
             case "HYBLOCK":
             case "DYBLOCK":
@@ -122153,7 +122567,7 @@ function JSExplainer(ast,option)
         ['BARSTATUS',"数据位置状态"],     //BARSTATUS返回数据位置信息,1表示第一根K线,2表示最后一个数据,0表示中间位置.
 
         ['CAPITAL',"当前流通股本(手)"], ["TOTALCAPITAL","当前总股本(手)"], 
-        ['EXCHANGE',"换手率"],   //换手率
+        ['EXCHANGE',"换手率"],   ['HSL',"换手线"],
         ['SETCODE', "市场类型"],  //市场类型
         ['CODE',"品种代码"],      //品种代码
         ['STKNAME',"品种名称"],   //品种名称
@@ -129411,6 +129825,7 @@ function DownloadFinanceData(obj)
             case 1: //FINANCE(1) 总股本(随时间可能有变化) 股
             case 7: //FINANCE(7) 流通股本(随时间可能有变化) 股
             case "EXCHANGE": //换手率
+            case "HSL"://换手率
                 this.DownloadHistoryData(id);
                 break;
             case 3:
@@ -129537,6 +129952,7 @@ function DownloadFinanceData(obj)
                 return ["capital.total", "capital.date"];
             case 7:
                 return ["capital.a", "capital.date"];
+            case "HSL":
             case "EXCHANGE":
                 return ["capital.a", "capital.date"];
 
@@ -129670,6 +130086,7 @@ function DownloadFinanceData(obj)
                 if (!item.capital) return null;
                 return { Date:date, Value:item.capital.total };
             case 7:
+            case "HSL": //换手率
             case "EXCHANGE":    //换手率 历史流通股本
                 if (!item.capital) return null;
                 return { Date:date, Value:item.capital.a };
@@ -145239,7 +145656,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14575";
+var HQCHART_VERSION="1.1.14590";
 
 function PrintHQChartVersion()
 {