hqchart 1.1.14516 → 1.1.14533

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

@@ -6676,6 +6676,8 @@ var JSCHART_EVENT_ID=
     ON_CLICK_DEAL_ROW:165,
     ON_RCLICK_DEAL_ROW:166,
     ON_DBCLICK_DEAL_ROW:167,
+
+    ON_FORMAT_OVERLAY_INDEX_OUT_TEXT:168,       //格式化叠指标标题
 }
 
 var JSCHART_OPERATOR_ID=
@@ -6865,6 +6867,7 @@ var JSCHART_MENU_ID=
 
     CMD_RBUTTON_SELECT_RECT_ID:53,          //右键区间选择
     CMD_LBUTTON_SELECT_RECT_ID:54,          //左键区间选择
+    CMD_ENABLE_XDRAG_BOTTOM_ID:55,                 //X轴拖动缩放
 
 
 
@@ -8128,7 +8131,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
             var yMove=e.clientY-drag.LastMove.Y;
 
-            this.OnMoveFromeBorder(this.BorderDrag.Index, yMove);
+            if (!this.OnMoveFromeBorder(this.BorderDrag.Index, yMove)) return;
 
             drag.LastMove.X=e.clientX;
             drag.LastMove.Y=e.clientY;
@@ -11029,7 +11032,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.SelectChartDrawPicture=null;
                     if (this.ChartPictureMenu) this.ChartPictureMenu.Hide();
                     this.ClearChartDrawPicture(drawPicture);        //删除选中的画图工具
-                    this.CloseModifyDrawDialog();
                 }
                 else if (this.SelectedChart && this.SelectedChart.Selected.Identify)
                 {
@@ -11253,14 +11255,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     this.OnMoveFromeBorder=function(index, yMove)
     {
-        if (!this.Frame) return;
+        if (!this.Frame) return false;
 
-        if (!this.Frame.OnMoveFromeBorder(index,yMove)) return ;
+        if (!this.Frame.OnMoveFromeBorder(index,yMove)) return false;
 
         //this.Frame.SetSizeChage(true);
         this.Frame.SetFrameBorderSizeChange();
         this.Frame.ReDrawToolbar();
         this.Draw();
+
+        return true;
     }
 
     this.OnZoomUpDownFrameY=function(obj, yMove)
@@ -12847,20 +12851,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         if (!this.DialogModifyDraw) return;
 
-        if (chart.ClassName=="ChartDrawPictureText" || chart.ClassName=='ChartDrawVolProfile')
-        {
-            this.CloseModifyDrawDialog();
-
-            if (!this.ChartPictureMenu) this.ChartPictureMenu=g_DialogFactory.Create('ChartPictureSettingMenu', this.UIElement.parentNode);
-            if (!this.ChartPictureMenu) return;
-
-            var event={ data: { ChartPicture:chart, HQChart:this}};
-            this.ChartPictureMenu.DoModal(event);
-        }
-        else
-        {
-            this.ShowModifyDrawDialog(chart);
-        } 
+        this.ShowModifyDrawDialog(chart);
     }
 
     this.FinishMoveChartDrawPicture=function()
@@ -12912,6 +12903,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
             if (option && option.Draw==false) bDraw=false;
             if (bDraw) this.Draw();
+            if (this.DialogModifyDraw) this.DialogModifyDraw.OnClearChartDrawPicture(null);
         }
         else
         {
@@ -12931,6 +12923,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
                     if (option && option.Draw==false) bDraw=false;
                     if (bDraw) this.Draw();
+                    if (this.DialogModifyDraw) this.DialogModifyDraw.OnClearChartDrawPicture(drawPicture);
+                    break;
                 }
             }
         }
@@ -13059,6 +13053,23 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         else this.Draw();
     }
 
+    this.SetSplashScreen=function(option)
+    {
+        if (!option) return;
+
+        if (IFrameSplitOperator.IsBool(option.Enable)) this.ChartSplashPaint.EnableSplash(option.Enable);
+        if (option.Title) this.ChartSplashPaint.SetTitle(option.Title);
+
+        if (option.Draw) this.Draw();
+    }
+
+    this.IsEnableSplashScreen=function()
+    {
+        if (!this.ChartSplashPaint) return false;
+
+        return this.ChartSplashPaint.IsEnableSplash;
+    }
+
     //设置指标窗口属性 windowItem=SetOption.Windows[i], frameItem=SetOption.Frames[i];
     this.SetSubFrameAttribute=function(subFrame, windowItem, frameItem)
     {
@@ -14383,6 +14394,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             case JSCHART_MENU_ID.CMD_LBUTTON_SELECT_RECT_ID:
                 if (IFrameSplitOperator.IsBool(srcParam) && this.ChartDragSelectRect) this.ChartDragSelectRect.EnableLButton=srcParam;
                 break;
+            case JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID:
+                if (IFrameSplitOperator.IsBool(srcParam)) this.EnableXDrag.Bottom=srcParam;
+                break;
         }
     }
 
@@ -23851,11 +23865,37 @@ function HQTradeFrame()
     {
         if (this.SubFrame.length<=0) return false;
 
-        var topFrame=this.SubFrame[index];
+        var topFrame=null;
+        var aryTopTitleFrame=[];
+        for(var i=index;i>=0;--i)
+        {
+            var item=this.SubFrame[i];
+
+            if (item.Frame && item.Frame.ChartBorder && item.Frame.ChartBorder.IsShowTitleOnly)    //标题模式
+            {
+                aryTopTitleFrame.push(item);
+                continue;
+            }
+
+            if (item.Height>0)
+            {
+                topFrame=item;
+                break;
+            }
+        }
+
         var bottomFrame=null;
+        var aryBottomTitleFrame=[];
         for(var i=index+1;i<this.SubFrame.length;++i)
         {
             var item=this.SubFrame[i];
+
+            if (item.Frame && item.Frame.ChartBorder && item.Frame.ChartBorder.IsShowTitleOnly)    //标题模式
+            {
+                aryBottomTitleFrame.push(item);
+                continue;
+            }
+
             if (item.Height>0)
             {
                 bottomFrame=item;
@@ -23873,6 +23913,20 @@ function HQTradeFrame()
 
         var height=topFrame.Frame.ChartBorder.GetHeightEx();
         var height2=bottomFrame.Frame.ChartBorder.GetHeightEx();
+
+        for(var i=0;i<aryBottomTitleFrame.length;++i)
+        {
+            var item=aryBottomTitleFrame[i];
+            item.Frame.ChartBorder.Bottom+=yMove;
+            item.Frame.ChartBorder.Top+=yMove;
+        }
+
+        for(var i=0;i<aryTopTitleFrame.length;++i)
+        {
+            var item=aryTopTitleFrame[i];
+            item.Frame.ChartBorder.Bottom+=yMove;
+            item.Frame.ChartBorder.Top+=yMove;
+        }
         
         //缩小的时候 小于最小高度 不处理
         if ((height<this.MinSubFrameHeight && yMove<0) || (height2<this.MinSubFrameHeight && yMove>0)) 
@@ -24166,11 +24220,25 @@ function HQTradeFrame()
     this.SaveSubFrameHeightRate=function()
     {
         var height=this.ChartBorder.GetHeight();
+        var totalTitleHeight=0;
+        for(var i=0;i<this.SubFrame.length;++i)
+        {
+            var item=this.SubFrame[i];
+            var frame=item.Frame;
+            if (frame && frame.ChartBorder && frame.ChartBorder.IsShowTitleOnly && item.Height>0)
+                totalTitleHeight+=frame.ChartBorder.TitleHeight;
+        }
+        height-=totalTitleHeight;
 
         for(var i=0; i<this.SubFrame.length; ++i)
         {
             var item=this.SubFrame[i];
+            var frame=item.Frame;
+            if (item.Height<=0) continue;
+            if (frame && frame.ChartBorder && frame.ChartBorder.IsShowTitleOnly && item.Height>0) continue;
+
             var subHeight=item.Frame.ChartBorder.GetHeight();
+
             var rate=(subHeight/height)*100;
             item.Height=rate;
         }
@@ -25302,9 +25370,13 @@ function HQTradeFrame()
             var left=item.Frame.ChartBorder.GetLeft();
             var right=item.Frame.ChartBorder.GetRight();
 
-            item.Frame.Canvas.beginPath();
-            item.Frame.Canvas.rect(left,bottom-height/2,(right-left),height);
-            if (item.Frame.Canvas.isPointInPath(x,y))
+            var rtBorder={ Left:left, Right:right, Top:bottom-height/2, Height:height };
+            rtBorder.Bottom=rtBorder.Top+rtBorder.Height;
+            rtBorder.Width=rtBorder.Right-rtBorder.Left;
+            if (x>=rtBorder.Left && x<=rtBorder.Right && y>=rtBorder.Top && y<rtBorder.Bottom)
+            //item.Frame.Canvas.beginPath();
+            //item.Frame.Canvas.rect(left,bottom-height/2,(right-left),height);
+            //if (item.Frame.Canvas.isPointInPath(x,y))
             {
                 return { Index:i, Bottom:true };
             }
@@ -63212,6 +63284,101 @@ function DynamicChartTitlePainting()
         this.Canvas.restore();
     }
 
+    this.FormatOverlayTitle=function(item, overlayItem, titleIndex)
+    {
+        if (!item || !item.Data || !item.Data.Data || !item.Name) return null;
+        if (item.IsVisible===false) return null;
+        if (item.Data.Data.length<=0) return null;
+
+        var value=null;
+        var valueText=null;
+        var aryText=null;
+        if (item.DataType=="StraightLine")  //直线只有1个数据
+        {
+            value=item.Data.Data[0];
+            valueText=this.FormatValue(value,item);
+        }
+        else
+        {
+            var index=Math.abs(this.CursorIndex-0.5);
+            index=parseInt(index.toFixed(0));
+            if (this.IsKLineFrame) index=this.CursorIndex;
+            var dataIndex=item.Data.DataOffset+index;
+            if (dataIndex>=item.Data.Data.length) dataIndex=item.Data.Data.length-1;
+            if (dataIndex<0) return null;
+
+            value=item.Data.Data[dataIndex];
+            if (value==null) return null;
+
+            if (this.GetEventCallback)  //外部处理
+            {
+                var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_OVERLAY_INDEX_OUT_TEXT);
+                if (event)
+                {
+                    var sendData=
+                    { 
+                        Item:item, Index:titleIndex, Data:overlayItem, FrameID:this.Frame.Identify,
+                        DataIndex:dataIndex, Value:value, PreventDefault:false, Out:null
+                    };
+                    event.Callback(event,sendData,this);
+                    if (sendData.Out) return sendData.Out;
+                    if (sendData.PreventDefault) return sendData.Out;
+                }
+            }
+
+            if (item.DataType=="MultiReport")
+            {
+                valueText=this.FormatMultiReport(value,item);
+                if (!valueText) return null;
+            }
+            else if (item.DataType=="ChartStackedBar")
+            {
+                aryText=this.FormatStackedBarTitle(value, item);
+                if (!aryText) return null;
+            }
+            else if (item.DataType=="ChartMultiLine")   //多线段数据
+            {
+                aryText=this.ForamtMultiLineTitle(dataIndex, item);
+                if (!aryText) return null;
+            }
+            else if (item.DataType=="ChartMultiPoint")
+            {
+                aryText=this.ForamtMultiPointTitle(dataIndex, item);
+                if (!aryText) return null;
+            }
+            else if (item.DataType=="ChartMultiBar")
+            {
+                aryText=this.ForamtMultiBarTitle(dataIndex, item);
+                if (!aryText) return null;
+            }
+            else if (item.DataType=="DRAWKLINE")
+            {
+                aryText=this.FormatKLineTitle(value, item);
+                if (!aryText) return null;
+            }
+            else if (item.DataType=="ChartIndexTitle")
+            {
+                var outTitle=this.FormatIndexTitle(value, item);
+                if (!outTitle) return null;
+
+                valueText=outTitle.Text;
+                aryText=outTitle.ArrayText;
+            }
+            else if (item.DataType=="MULTI_POINT_LINE")
+            {
+                valueText=this.FormatMultiDataLine(value, item);
+                if (!valueText) return null;
+            }
+            else
+            {
+                valueText=this.FormatValue(value,item);
+            }
+        }
+
+
+        return { Text:valueText, ArrayText:aryText };
+    }
+
     this.DrawOverlayIndexSingleLine=function(moveonPoint, mouseStatus)   //叠加指标1个指标一行
     {
         var pixelRatio=GetDevicePixelRatio();
@@ -63274,68 +63441,11 @@ function DynamicChartTitlePainting()
             for(var i=0; i<overlayItem.Data.length; ++i)
             {
                 var item=overlayItem.Data[i];
-                if (!item || !item.Data || !item.Data.Data || !item.Name) continue;
-                if (item.IsVisible===false) continue;
-                if (item.Data.Data.length<=0) continue;
-
-                var value=null;
-                var valueText=null;
-                var aryText=null;
-                if (item.DataType=="StraightLine")  //直线只有1个数据
-                {
-                    value=item.Data.Data[0];
-                    valueText=this.FormatValue(value,item);
-                }
-                else
-                {
-                    var index=Math.abs(this.CursorIndex-0.5);
-                    index=parseInt(index.toFixed(0));
-                    if (this.IsKLineFrame) index=this.CursorIndex;
-                    var dataIndex=item.Data.DataOffset+index;
-                    if (dataIndex>=item.Data.Data.length) dataIndex=item.Data.Data.length-1;
-                    if (dataIndex<0) continue;
+                var outText=this.FormatOverlayTitle(item,overlayItem,i);
+                if (!outText) continue;
 
-                    value=item.Data.Data[dataIndex];
-                    if (value==null) continue;
-
-                    if (item.DataType=="MultiReport")
-                    {
-                        valueText=this.FormatMultiReport(value,item);
-                        if (!valueText) continue;
-                    }
-                    else if (item.DataType=="ChartStackedBar")
-                    {
-                        aryText=this.FormatStackedBarTitle(value, item);
-                        if (!aryText) continue;
-                    }
-                    else if (item.DataType=="ChartMultiPoint")
-                    {
-                        aryText=this.ForamtMultiPointTitle(dataIndex, item);
-                        if (!aryText) continue;
-                    }
-                    else if (item.DataType=="ChartMultiBar")
-                    {
-                        aryText=this.ForamtMultiBarTitle(dataIndex, item);
-                        if (!aryText) continue;
-                    }
-                    else if (item.DataType=="DRAWKLINE")
-                    {
-                        aryText=this.FormatKLineTitle(value, item);
-                        if (!aryText) continue;
-                    }
-                    else if (item.DataType=="ChartIndexTitle")
-                    {
-                        var outTitle=this.FormatIndexTitle(value, item);
-                        if (!outTitle) continue;
-
-                        valueText=outTitle.Text;
-                        aryText=outTitle.ArrayText;
-                    }
-                    else
-                    {
-                        valueText=this.FormatValue(value,item);
-                    }
-                }
+                var valueText=outText.Text;
+                var aryText=outText.ArrayText;
 
                 if (aryText)
                 {
@@ -68704,15 +68814,13 @@ function ChartDrawPictureText()
     delete this.newMethod;
 
     this.ClassName='ChartDrawPictureText';
-    this.Text='文本';
+    this.Text='输入文字';
     this.PointCount=1;
     this.FontOption={ Family:'微软雅黑', Size:20, Weight:null, Style:null };    //Weight(bold 粗体), Style(italic)
     //矢量图片
     //this.Text="\ue606";
     //this.FontOption={ Family:'iconfont', Size:20, Weight:null, Style:null };    //Weight(bold 粗体), Style(italic)
     this.TextRect=null;   //文字区域
-    this.IsInitialized=false;   //是否初始化了
-    this.SettingMenu;
     this.HQChart;
 
     this.SetOption=function(option)
@@ -68750,12 +68858,6 @@ function ChartDrawPictureText()
         this.TextRect.Height=textHeight
         //this.Canvas.strokeRect(this.TextRect.Left,this.TextRect.Top,this.TextRect.Width,this.TextRect.Height);
         this.Canvas.restore();
-
-        if (this.IsInitialized===false) 
-        {
-            this.SetTextOption();
-            this.IsInitialized=true;
-        }
     }
 
     //根据设置动态生成字体
@@ -68774,18 +68876,6 @@ function ChartDrawPictureText()
         return font;
     }
 
-    this.SetTextOption=function()
-    {
-        JSConsole.Chart.Log('[ChartDrawPictureText::SetTextOption]');
-        //创建div设置窗口
-        if (!this.SettingMenu) this.SettingMenu=new ChartPictureTextSettingMenu(this.Frame.ChartBorder.UIElement.parentNode);
-
-        this.SettingMenu.ChartPicture=this;
-        this.SettingMenu.HQChart=this.HQChart;
-        this.SettingMenu.Position={Left:this.TextRect.Left+this.TextRect.Width,Top:this.TextRect.Top};
-        this.SettingMenu.DoModal();
-    }
-
     this.IsPointIn=function(x,y)
     {
         if (!this.Frame || this.Status!=10) return -1;
@@ -73668,6 +73758,7 @@ function ChartDrawPriceNote()
 
         var price=this.Frame.GetYData(ptStart.Y, false);
         var text=price.toFixed(floatPrecision);
+        this.Canvas.font=font;
         var textHeight=this.Canvas.measureText("擎").width;
         var textWidth=this.Canvas.measureText(text).width;
         var angle=this.CalculateAngle(ptStart.X, ptStart.Y, ptEnd.X, ptEnd.Y);
@@ -75753,6 +75844,15 @@ function JSChartResource()
         TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
     }
 
+    this.PopKLineChart=
+    {
+        BGColor:"rgba(250,250,250,0.95)",
+        BorderColor:"rgb(0,0,0)",
+
+        TitleColor:'rgb(250,250,250)',       //标题颜色
+        TitleBGColor:"rgb(200, 66, 69)",    //标题背景颜色
+    }
+
     this.SelectRectBGColor="rgba(1,130,212,0.06)"; //背景色
  //   this.SelectRectAlpha=0.06;                  //透明度
 
@@ -77325,10 +77425,21 @@ function JSChartResource()
         if (style.PopMinuteChart)
         {
             var item=style.PopMinuteChart;
-            if (item.BGColor) this.PopMinuteChart.BGColor=item.BGColor;
-            if (item.BorderColor) this.PopMinuteChart.BorderColor=item.BorderColor;
-            if (item.TitleColor) this.DialogSearchIndex.TitleColor=item.TitleColor;
-            if (item.TitleBGColor) this.DialogSearchIndex.TitleBGColor=item.TitleBGColor;
+            var dest=this.PopMinuteChart;
+            if (item.BGColor) dest.BGColor=item.BGColor;
+            if (item.BorderColor) dest.BorderColor=item.BorderColor;
+            if (item.TitleColor) dest.TitleColor=item.TitleColor;
+            if (item.TitleBGColor) dest.TitleBGColor=item.TitleBGColor;
+        }
+
+        if (style.PopKLineChart)
+        {
+            var item=style.PopKLineChart;
+            var dest=this.PopKLineChart;
+            if (item.BGColor) dest.BGColor=item.BGColor;
+            if (item.BorderColor) dest.BorderColor=item.BorderColor;
+            if (item.TitleColor) dest.TitleColor=item.TitleColor;
+            if (item.TitleBGColor) dest.TitleBGColor=item.TitleBGColor;
         }
 
         if (style.DefaultTextColor) this.DefaultTextColor = style.DefaultTextColor;
@@ -83108,8 +83219,10 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         {
             if (option.KLine)
             {
-                if (IFrameSplitOperator.IsNumber(option.KLine.DrawType)) isChangeKLineDrawType=true;
-                if (IFrameSplitOperator.IsNumber(option.KLine.Right)) right=option.KLine.Right;
+                var item=option.KLine;
+                if (IFrameSplitOperator.IsNumber(item.DrawType)) isChangeKLineDrawType=true;
+                if (IFrameSplitOperator.IsNumber(item.Right)) right=item.Right;
+                if (IFrameSplitOperator.IsNumber(item.DataWidth)) this.KLineSize={ DataWidth:item.DataWidth };
             }
 
             if (option.Reload==true) isReload=true;
@@ -84592,7 +84705,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 bindData.Period=this.Period;
                 bindData.Right=this.Right;
 
-                if (bindData.Right>0 && MARKET_SUFFIX_NAME.IsSHSZStockA(item.Symbol))       //复权数据
+                if (bindData.Right>0 && MARKET_SUFFIX_NAME.IsEnableRight(item.Symbol))       //复权数据
                 {
                     var rightData=bindData.GetRightData(bindData.Right,{ AlgorithmType: this.RightFormula });
                     bindData.Data=rightData;
@@ -84665,6 +84778,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 var item=option.KLine;
                 if (IFrameSplitOperator.IsNumber(item.Right)) this.Right=item.Right;
                 if (IFrameSplitOperator.IsNumber(item.Period)) this.Period=item.Period;
+                if (IFrameSplitOperator.IsNumber(item.DataWidth)) this.KLineSize={ DataWidth:item.DataWidth };
             }
         }
        
@@ -85732,6 +85846,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     
                     { Name:"禁止拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[0]}, Checked:0==this.DragMode },
                     { Name:"启动拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[1]}, Checked:1==this.DragMode },
+                    { Name:"X轴拖动缩放", Data:{  ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID, Args:[!this.EnableXDrag.Bottom]}, Checked:this.EnableXDrag.Bottom },
                     { Name:"左键区间选择", Data:{ ID:JSCHART_MENU_ID.CMD_LBUTTON_SELECT_RECT_ID, Args:[!bLButtonSelectRect]}, Checked:bLButtonSelectRect },
                     { Name:"右键区间选择", Data:{ ID:JSCHART_MENU_ID.CMD_RBUTTON_SELECT_RECT_ID, Args:[!bRButtonSelectRect]}, Checked:bRButtonSelectRect },
                     { Name:JSPopMenu.SEPARATOR_LINE_NAME },
@@ -85742,7 +85857,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
                     { Name:"移动筹码图", Data:{ ID:bShowStockChip?JSCHART_MENU_ID.CMD_HIDE_STOCKCHIP_ID:JSCHART_MENU_ID.CMD_SHOW_STOCKCHIP_ID, Args:[stockChipConfig.Name, stockChipConfig]}, Checked:bShowStockChip},
 
-                   
 
                     { Name:"双击弹分时图", Data:{ ID:JSCHART_MENU_ID.CMD_ENABLE_POP_MINUTE_CHART_ID, Args:[!bPopMinuteChart]}, Checked:bPopMinuteChart},
 
@@ -85931,8 +86045,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             var self=this;
             drawPicture.GetActiveDrawPicture=function() { return self.GetActiveDrawPicture(); }
 
-            if (drawPicture.ClassName==='ChartDrawPictureText') drawPicture.IsInitialized=true;
-
             this.ChartDrawPicture.push(drawPicture);
         }
 
@@ -93249,7 +93361,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (item)
         {
             drawPicture=item.Create();
-            if (drawPicture.ClassName=='ChartDrawPictureText') drawPicture.HQChart=this;
         }
 
         if (!drawPicture)    //iconfont图标
@@ -93312,7 +93423,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         drawPicture.GetActiveDrawPicture=function() { return self.GetActiveDrawPicture(); }
 
-        if (drawPicture.ClassName==='ChartDrawPictureText') drawPicture.IsInitialized=true;
         this.ChartDrawPicture.push(drawPicture);
 
         if (obj.Draw==true) this.DrawDynamicInfo();
@@ -93356,8 +93466,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             drawPicture.ValueToPoint();
             drawPicture.GetActiveDrawPicture=()=>{ return this.GetActiveDrawPicture(); }
 
-            if (drawPicture.ClassName==='ChartDrawPictureText') drawPicture.IsInitialized=true;
-
             this.ChartDrawPicture.push(drawPicture);
         }
 
@@ -98235,7 +98343,6 @@ function DialogFactory()
     this.DataMap=new Map(
     [
         ["ChartPictureSettingMenu", { Create:function(divElement) { return new ChartPictureSettingMenu(divElement); } }],
-        ["ChartPictureTextSettingMenu", { Create:function(divElement) { return new ChartPictureTextSettingMenu(divElement); } }]
     ]); 
 
     this.Create=function(name, option)
@@ -98461,239 +98568,6 @@ function ChartPictureSettingMenu(divElement)
     }
 }
 
-//画图工具 文本设置窗口
-function ChartPictureTextSettingMenu(divElement)
-{
-    this.newMethod=IDivDialog;   //派生
-    this.newMethod(divElement);
-    delete this.newMethod;
-
-    this.ChartPicture;
-    this.SettingDiv;
-    this.Position;
-
-    this.BackupData;    //画图工具备份数据
-
-    this.Close=function()   
-    {
-        if (this.SettingDiv) this.DivElement.removeChild(this.SettingDiv);  //直接删除
-    }
-
-    this.DoModal=function()
-    {
-        var text=this.ChartPicture.Text;    //显示的文本
-        var fontOption=this.ChartPicture.FontOption;    //字体设置
-        var lineColor=this.ChartPicture.LineColor;
-        //数据备份, 点取消的时候把备份数据设置回去
-        this.BackupData=
-        {
-            Text:text, 
-            LineColor:lineColor,
-            FontOption:{Family: fontOption.Family, Size: fontOption.Size, Weight: fontOption.Weight, Style: fontOption.Style }
-        };
-        JSConsole.Chart.Log('[ChartPictureTextSettingMenu::DoModal] picture info',this.BackupData);
-
-        var self=this;
-        var div=this.DivElement.getElementsByClassName('chartpicture-text-setting')[0];
-        if (!div)
-        {
-            div=document.createElement("div");
-            div.className='chartpicture-text-setting';
-            this.DivElement.appendChild(div);
-            this.SettingDiv=div;
-        }
-        else 
-        {
-            this.SettingDiv=div;
-        }
-        
-        var titleContainerStr = '<div class="titleWrap">'+
-                                    '<span class="titleName">样式设置</span>'+
-                                    '<i class="closeBtn iconfont icon-close"></i>'+
-                                '</div>';
-                            
-        var fontSizeArray = [10,11,12,14,16,20,24,28,32,40];
-        var fontArray = ['微软雅黑','宋体','Arial','仿宋'];
-        var sizeListStr = "";
-        var fontListStr = "";
-        fontArray.forEach(function(item,index){
-            fontListStr += index !== 0 ? '<p>'+item+'</P>' : '<p class="active">'+item+'</P>';
-        });
-        fontSizeArray.forEach(function(item,index){
-            sizeListStr += index !== 5 ? '<p>'+item+'</P>' : '<p class="active">'+item+'</P>';
-        });
-        var contentContainerStr = '<div class="contentWrap">'+
-                                    '<div class="styleOptions">'+
-                                        '<span class="colorPicker"><input type="color" id="fontColor" value="#1e90ff"></span>'+
-                                        '<div class="likeSelect fontSelect"><span class="choicedText">微软雅黑</span><div class="selectList">'+fontListStr+'</div><i class="iconfont icon-xia"></i></div>'+
-                                        '<div class="likeSelect fontSizeSelect"><span class="choicedText">20</span><div class="selectList">'+sizeListStr+'</div><i class="iconfont icon-xia"></i></div>'+
-                                        '<span class="strongFont likeBtn"><i class="iconfont icon-jiacu"></i></span>'+
-                                        '<span class="italicsFont likeBtn"><i class="iconfont icon-qingxieL"></i></span>'+
-                                    '</div>'+
-                                    '<textarea class="tArea" id="tArea" placeholder="Text"></textarea>'+
-                                  '</div>';
-        var btnContainer = '<div class="btnsContainer">'+
-                                '<span class="okBtn btn">确认</span>'+
-                                '<span class="cancelBtn btn">取消</span>'+
-                            '</div>';
-
-        var pixelTatio = GetDevicePixelRatio();
-        var DoModalStr = titleContainerStr+contentContainerStr+btnContainer;
-        this.SettingDiv.style.left = this.Position.Left/pixelTatio + "px";
-        this.SettingDiv.style.top = this.Position.Top/pixelTatio + "px";
-        this.SettingDiv.innerHTML=DoModalStr;
-        this.SettingDiv.style.position = "absolute";
-        this.SettingDiv.style.display = "block";
-        $(".chartpicture-text-setting .colorPicker").css({ //初始设置
-            "borderColor":self.ChartPicture.LineColor,
-            "background-color":self.ChartPicture.LineColor
-        });
-
-        var family = this.ChartPicture.FontOption.Family;
-        $('.chartpicture-text-setting .fontSelect .choicedText').html(family);
-        fontArray.forEach(function(item,index){
-            if(item == family){
-                $('.chartpicture-text-setting .fontSelect p').removeClass('active');
-                $('.chartpicture-text-setting .fontSelect p').eq(index).addClass('active');
-            }
-        });
-
-        var size = this.ChartPicture.FontOption.Size;
-        $('.chartpicture-text-setting .fontSizeSelect .choicedText').html(size);
-        fontSizeArray.forEach(function(item,index){
-            if(item == size){
-                $('.chartpicture-text-setting .fontSizeSelect p').removeClass('active');
-                $('.chartpicture-text-setting .fontSizeSelect p').eq(index).addClass('active');
-            }
-        });
-
-        var weight = this.ChartPicture.FontOption.Weight;
-        if( weight != null && weight == 'bold'){
-            $('.chartpicture-text-setting .strongFont').addClass('hot');
-        }
-
-        var style = this.ChartPicture.FontOption.Style;
-        if( style != null && style == 'italic'){
-            $('.chartpicture-text-setting .italicsFont').addClass('hot');
-        }
-
-        var text = this.ChartPicture.Text;
-        $('.chartpicture-text-setting .tArea').val(text);  //结束初始设置
-
-        var defaultTextOption = { Family:'微软雅黑', Size:20, Weight:null, Style:null };
-        $(".chartpicture-text-setting #fontColor").change(
-            {
-                Picture:this.ChartPicture
-            },
-            function(event)
-            {  //颜色选择
-                var value = $(this).val();
-                $(this).parent().css({
-                    "borderColor":value,
-                    "background-color":value
-                });
-                var chart=event.data.Picture;
-                chart.LineColor = value;
-                if (chart.Update) chart.Update();   //更新界面
-            }
-        );
-        $(".chartpicture-text-setting .fontSelect,.chartpicture-text-setting .fontSizeSelect").click(function(){
-            $(this).find('.selectList').toggle();
-            $(this).toggleClass('hot');
-        });
-        $(".chartpicture-text-setting .fontSelect p").click(
-            {
-                Picture:this.ChartPicture
-            },
-            function(event){ //字体选择
-                var choicedText = $(this).closest(".fontSelect").find('.choicedText').html();
-                var currentSelect = event.currentTarget.innerHTML;
-                if(choicedText !== currentSelect){
-                    $(this).closest(".fontSelect").find('.choicedText').html(currentSelect);
-                    $(this).siblings().removeClass('active');
-                    $(this).addClass('active');
-                    var chart = event.data.Picture;
-                    chart.FontOption.Family = currentSelect;
-                    if (chart.Update) chart.Update();   //更新界面
-                }
-        });
-        $(".chartpicture-text-setting .fontSizeSelect p").click(
-            {
-                Picture:this.ChartPicture
-            },
-            function(event){  //字号选择
-            var choicedText = $(this).closest(".fontSizeSelect").find('.choicedText').html();
-            var currentSelect = event.currentTarget.innerHTML;
-            if(choicedText !== currentSelect){
-                $(this).closest(".fontSizeSelect").find('.choicedText').html(currentSelect);
-                $(this).siblings().removeClass('active');
-                $(this).addClass('active');
-                var chart = event.data.Picture;
-                chart.FontOption.Size = Number(currentSelect);
-                if (chart.Update) chart.Update();   //更新界面
-            }
-        });
-        $(".chartpicture-text-setting .strongFont").click(
-            {
-                Picture:this.ChartPicture
-            },
-            function(event){
-            $(this).toggleClass('hot');
-            var classnames = $(this).attr('class');
-            if(classnames.indexOf('hot') > 0){
-                var chart = event.data.Picture;
-                chart.FontOption.Weight = 'bold';
-                if (chart.Update) chart.Update();   //更新界面
-            }
-        });
-        $(".chartpicture-text-setting .italicsFont").click(
-            {
-                Picture:this.ChartPicture
-            },
-            function(event){
-            $(this).toggleClass('hot')
-            var classnames = $(this).attr('class');
-            if(classnames.indexOf('hot') > 0){
-                var chart = event.data.Picture;
-                chart.FontOption.Style = 'italic';
-                if (chart.Update) chart.Update();   //更新界面
-            }
-        });
-        $(".chartpicture-text-setting .titleWrap .closeBtn,.chartpicture-text-setting .btnsContainer .cancelBtn").click(  //取消
-            {
-                Picture:this.ChartPicture
-            },
-            function(event){
-                var picture = event.data.Picture;
-                picture.Text = self.BackupData.Text;
-                picture.LineColor = self.BackupData.LineColor;
-                picture.FontOption = self.BackupData.FontOption;
-                if (picture.Update) picture.Update();
-                self.Close();
-        });
-        $(".chartpicture-text-setting .tArea").keyup( //文本内容
-            {
-                Picture:this.ChartPicture
-            },
-            function(event){
-                JSConsole.Chart.Log('[ChartPictureTextSettingMenu::DoModal] $(".chartpicture-text-setting .tArea").keyup()');
-                var content = $(this).val();
-                var chart = event.data.Picture;
-                chart.Text = content;
-                if (chart.Update) chart.Update();   //更新界面
-        });
-
-        //确定按钮
-        $(".chartpicture-text-setting .btnsContainer .okBtn").click(
-            function()
-            {  
-                self.Close(); 
-                if (self.HQChart && self.HQChart.ChartDrawStorage) self.HQChart.ChartDrawStorage.SaveDrawData(self.ChartPicture);   //保存下
-            }
-        );
-    }
-}
-
 
 function ChartPictureVolProfileSettingMenu(divElement)
 {
@@ -129366,7 +129240,12 @@ function GetBlackStyle()
             BGColor:"rgba(0,0,0,0.85)",
             BorderColor:"rgb(230,230,230)",
         },
-    
+
+        PopKLineChart:
+        {
+            BGColor:"rgba(0,0,0,0.85)",
+            BorderColor:"rgb(230,230,230)",
+        },
     
         DefaultTextColor: "rgb(101,104,112)",
         DefaultTextFont: 14*GetDevicePixelRatio() +'px 微软雅黑',
@@ -132000,6 +131879,7 @@ function JSReportChart(divElement)
         if (option.EnablePopMenuV2===true) chart.InitalPopMenu();
         if (option.FloatTooltip && option.FloatTooltip.Enable) chart.InitalFloatTooltip(option.FloatTooltip);   //提示信息
         if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable) chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
+        if (option.KLineChartTooltip && option.KLineChartTooltip.Enable) chart.InitalKLineChartTooltip(option.KLineChartTooltip);
 
         if (option.Symbol) chart.Symbol=option.Symbol;
         if (option.Name) chart.Name=option.Name;
@@ -132320,6 +132200,7 @@ function JSReportChartContainer(uielement)
 
     //
     this.TooltipMinuteChart;    //分时图
+    this.TooltipKLineChart;     //分时图
 
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
@@ -132330,6 +132211,7 @@ function JSReportChartContainer(uielement)
         this.StopAutoUpdate();
 
         this.DestroyMinuteChartTooltip();
+        this.DestroyKLineChartTooltip();
         this.DestroyFloatTooltip();
     }
 
@@ -132369,6 +132251,24 @@ function JSReportChartContainer(uielement)
         this.TooltipMinuteChart=null;
     }
 
+    this.InitalKLineChartTooltip=function(option)
+    {
+        if (this.TooltipKLineChart) return;
+
+        this.TooltipKLineChart=new JSTooltipKLineChart();
+        this.TooltipKLineChart.Inital(this, option);
+        this.TooltipKLineChart.Create();
+    }
+
+    this.DestroyKLineChartTooltip=function()
+    {
+        if (!this.TooltipKLineChart) return;
+
+        this.TooltipKLineChart.Destroy();
+        this.TooltipKLineChart=null;
+    }
+    
+
     this.InitalFloatTooltip=function(option)
     {
         if (this.FloatTooltip) return;
@@ -132438,6 +132338,35 @@ function JSReportChartContainer(uielement)
     }
 
 
+    this.ShowKLineChartTooltip=function(x,y, data)
+    {
+        if (!this.TooltipKLineChart) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+
+        data.Offset={ Left:offsetLeft, Top:offsetTop };
+
+        this.TooltipKLineChart.Show(data, x,y);
+    }
+
+    this.HideKLineChartTooltip=function()
+    {
+        if (!this.TooltipKLineChart) return;
+
+        this.TooltipKLineChart.Hide();
+    }
+
+    this.HideAllTooltip=function()
+    {
+        this.HideKLineChartTooltip();
+        this.HideMinuteChartTooltip();
+        this.HideFloatTooltip();
+    }
+
 
     this.AutoScrollPage=function(step)
     {
@@ -132803,7 +132732,7 @@ function JSReportChartContainer(uielement)
                 if (IFrameSplitOperator.IsNumber(item.Sort)) this.SortInfo.Sort=item.Sort;
             }
 
-            if (IFrameSplitOperator.IsBool(option.IsReloadStockList))
+            if (IFrameSplitOperator.IsBool(option.IsReloadStockList) && option.IsReloadStockList)
             {
                 var requestOption={ Callback:null };
                 if (this.Symbol) requestOption.Callback=()=>{ this.RequestMemberListData(); };
@@ -133607,8 +133536,7 @@ function JSReportChartContainer(uielement)
             if (wheelValue<0)   //下
             {
                 this.LastMouseStatus.TooltipStatus=null;
-                this.HideMinuteChartTooltip();
-                this.HideFloatTooltip();
+                this.HideAllTooltip();
                 if (this.GotoNextItem(1))
                 {
                     this.Draw();
@@ -133618,8 +133546,7 @@ function JSReportChartContainer(uielement)
             else if (wheelValue>0)  //上
             {
                 this.LastMouseStatus.TooltipStatus=null;
-                this.HideMinuteChartTooltip();
-                this.HideFloatTooltip();
+                this.HideAllTooltip();
                 if (this.GotoNextItem(-1))
                 {
                     this.Draw();
@@ -133632,8 +133559,7 @@ function JSReportChartContainer(uielement)
             if (wheelValue<0)   //下一页
             {
                 this.LastMouseStatus.TooltipStatus=null;
-                this.HideMinuteChartTooltip();
-                this.HideFloatTooltip();
+                this.HideAllTooltip();
                 if (this.GotoNextPage(this.PageUpDownCycle)) 
                 {
                     this.Draw();
@@ -133643,8 +133569,7 @@ function JSReportChartContainer(uielement)
             else if (wheelValue>0)  //上一页
             {
                 this.LastMouseStatus.TooltipStatus=null;
-                this.HideMinuteChartTooltip();
-                this.HideFloatTooltip();
+                this.HideAllTooltip();
                 if (this.GotoPreviousPage(this.PageUpDownCycle)) 
                 {
                     this.Draw();
@@ -133666,8 +133591,7 @@ function JSReportChartContainer(uielement)
         var keyID = e.keyCode ? e.keyCode :e.which;
         if (keyID==116) return; //F15刷新不处理
 
-        this.HideMinuteChartTooltip();
-        this.HideFloatTooltip();
+        this.HideAllTooltip();
         switch(keyID)
         {
             case 33:    //page up
@@ -133956,7 +133880,8 @@ function JSReportChartContainer(uielement)
         if (this.LastMouseStatus.TooltipStatus) bDrawTooltip=true;
         this.LastMouseStatus.TooltipStatus=null;
 
-        var bShowChartTooltip=false;
+        var bShowKLineTooltip=false;
+        var bShowMinuteTooltip=false;
         var chartTooltipData=null;
         
         if (this.DragRow) return;
@@ -134032,7 +133957,15 @@ function JSReportChartContainer(uielement)
                     {
                         if (tooltipData.Stock && tooltipData.Stock.Symbol)
                         {
-                            bShowChartTooltip=true;
+                            bShowMinuteTooltip=true;
+                            chartTooltipData={ Symbol:tooltipData.Stock.OriginalSymbol, Rect:tooltipData.Rect };
+                        }
+                    }
+                    else if (tooltipData.Type==21)
+                    {
+                        if (tooltipData.Stock && tooltipData.Stock.Symbol)
+                        {
+                            bShowKLineTooltip=true;
                             chartTooltipData={ Symbol:tooltipData.Stock.OriginalSymbol, Rect:tooltipData.Rect };
                         }
                     }
@@ -134082,20 +134015,17 @@ function JSReportChartContainer(uielement)
             this.HideFloatTooltip();
         }
 
-        if (bShowChartTooltip)
-        {
-            this.ShowMinuteChartTooltip(null, null, chartTooltipData);
-        }
-        else
-        {
-            this.HideMinuteChartTooltip();
-        }
+        if (!bShowKLineTooltip) this.HideKLineChartTooltip();
+        if (!bShowMinuteTooltip) this.HideMinuteChartTooltip();
+
+        if (bShowMinuteTooltip) this.ShowMinuteChartTooltip(null, null, chartTooltipData);
+        if (bShowKLineTooltip) this.ShowKLineChartTooltip(null, null, chartTooltipData);
+
     }
 
     this.UIOnMounseOut=function(e)
     {
-        this.HideMinuteChartTooltip();
-        this.HideFloatTooltip();
+        this.HideAllTooltip();
         
         var bDraw=false;
         var tabChart=this.GetTabChart();
@@ -134121,8 +134051,7 @@ function JSReportChartContainer(uielement)
 
     this.UIOnMouseleave=function(e)
     {
-        this.HideMinuteChartTooltip();
-        this.HideFloatTooltip();
+        this.HideAllTooltip();
 
         var tabChart=this.GetTabChart();
         if (tabChart && tabChart.MoveOnTabIndex>=0)
@@ -134348,7 +134277,7 @@ function JSReportChartContainer(uielement)
         document.onmouseup=null;
 
         this.StopAutoDragScrollTimer();
-        this.HideTooltip();
+        this.HideAllTooltip();
         var reportChart=this.GetReportChart();
 
         var mouseStatus={ Cursor:"default", Name:"Default"};;   //鼠标状态
@@ -136740,7 +136669,8 @@ function ChartReport()
         if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision;    //小数位数
         if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
         if (item.Icon) colItem.Icon=item.Icon;
-        if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.EnableChartTooltip=item.EnableChartTooltip;
+        if (IFrameSplitOperator.IsBool(item.EnableChartTooltip)) colItem.ChartTooltip={ Enable:item.EnableChartTooltip, Type:20 };
+        if (item.ChartTooltip) colItem.ChartTooltip={ Enable:item.ChartTooltip.Enable, Type:item.ChartTooltip.Type };
 
         //点击表头弹出菜单
         if (IFrameSplitOperator.IsBool(item.EnablePopupHeaderMenu)) colItem.EnablePopupHeaderMenu=item.EnablePopupHeaderMenu;
@@ -138309,9 +138239,9 @@ function ChartReport()
             var tooltipData={ Rect:rtItem, Stock:stock, Index:index, Column:column, RowType:rowType, Type:drawInfo.Tooltip.Type, Data:drawInfo.Tooltip.Data };
             this.TooltipRect.push(tooltipData);
         }
-        else if (column.EnableChartTooltip)
+        else if (column.ChartTooltip && column.ChartTooltip.Enable && IFrameSplitOperator.IsNumber(column.ChartTooltip.Type))   //Type 20分时图 21K线图
         {
-            var tooltipData={ Rect:rtItem, Stock:stock, Index:index, Column:column, RowType:rowType, Type:20 };
+            var tooltipData={ Rect:rtItem, Stock:stock, Index:index, Column:column, RowType:rowType, Type:column.ChartTooltip.Type };
             this.TooltipRect.push(tooltipData);
         }
 
@@ -148200,6 +148130,11 @@ var JS_DRAWTOOL_MENU_ID=
     CMD_CHANGE_BORDER_COLOR_ID:9,   //边框颜色
 
     CMD_LOCK_DRAW_CHART_ID:10,      //上锁
+
+    CMD_ZOOM_FONT_ID:11,    //字体放大
+    CMD_ZOOM_OUT_FONT_ID:12, //字体缩小
+    CMD_MODIFY_TEXT_ID:13,  //随机生成文字内容
+    CMD_ADVANCED_SETTING_ID:14, //高级设置
 };
 
 function JSDialogDrawTool()
@@ -148292,6 +148227,7 @@ function JSDialogDrawTool()
                 { Title: '时间范围', ClassName: 'hqchart_drawtool icon-jiagefanwei', Type:0, Data:{ ID:"DateRange" }  },
                 { Title: "价格和时间范围", ClassName:"hqchart_drawtool icon-jiagefanwei", Type:0, Data:{ ID:"DatePriceRange" } },
                 { Title: "监测线", ClassName:"hqchart_drawtool icon-jiance", Type:0, Data:{ ID:"MonitorLine"} },
+                { Title: "固定范围成交量分布图", ClassName:"hqchart_drawtool icon-tubiao_gudingfanweichengjiaoliangfenbutu", Type:0, Data:{ ID:"固定范围成交量分布图"}}
             ]
         },
         {
@@ -148801,6 +148737,10 @@ function JSDialogModifyDraw()
     this.FontColorButton=null;
     this.BorderColorButton=null;
     this.LockButton=null;
+    this.FontZoomButton=null;
+    this.FontZoomOutButton=null;
+    this.ModifyTextButton=null;
+    this.AdvancedButton=null;
 
     this.RandomLineColor=["rgb(255,69,0)", "rgb(173,255,47)", "rgb(238,154,73)", "rgb(255,105,180)"];               //线段颜色
     this.RandomBGColor=["rgba(210,251,209，0.8)", "rgb(217,217,253)", "rgb(255,208,204)", "rgb(252,249,206)"];      //背景颜色
@@ -148813,9 +148753,13 @@ function JSDialogModifyDraw()
         { Title:"修改字体颜色", ClassName: 'hqchart_drawtool icon-zitiyanse', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_FONT_COLOR_ID }},
         { Title:"修改背景颜色", ClassName: 'hqchart_drawtool icon-zitibeijingse', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BG_COLOR_ID }},
         { Title:"修改边框颜色", ClassName: 'hqchart_drawtool icon-biankuang', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BORDER_COLOR_ID }},
+        { Title:"字体放大", ClassName: 'hqchart_drawtool icon-zoomin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ZOOM_FONT_ID }},
+        { Title:"字体缩小", ClassName: 'hqchart_drawtool icon-zoomout', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ZOOM_OUT_FONT_ID }},
+        { Title:"随机生成文字内容", ClassName: 'hqchart_drawtool icon-bianji', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_MODIFY_TEXT_ID }},
+        { Title:"高级设置", ClassName: 'hqchart_drawtool icon-setting', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_ADVANCED_SETTING_ID }},
+
         { Title:"上锁", ClassName: 'hqchart_drawtool icon-lock', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_LOCK_DRAW_CHART_ID }},
         { Title:"删除图形", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID }},
-
     ];
 
     this.RestoreFocusDelay=800;
@@ -148905,7 +148849,22 @@ function JSDialogModifyDraw()
                 this.LockButton=data;
                 this.LockButton.Span.style['color']="rgb(220,220,220)";
                 break;
-
+            case JS_DRAWTOOL_MENU_ID.CMD_ZOOM_FONT_ID:
+                this.FontZoomButton=data;
+                divItem.style.display="none";
+                break;
+            case JS_DRAWTOOL_MENU_ID.CMD_ZOOM_OUT_FONT_ID:
+                this.FontZoomOutButton=data;
+                divItem.style.display="none";
+                break;  
+            case JS_DRAWTOOL_MENU_ID.CMD_MODIFY_TEXT_ID:
+                this.ModifyTextButton=data;
+                divItem.style.display="none";
+                break;  
+            case JS_DRAWTOOL_MENU_ID.CMD_ADVANCED_SETTING_ID:
+                this.AdvancedButton=data;
+                divItem.style.display="none";
+                break;    
         }
 
         parentDivDom.appendChild(divItem);
@@ -148937,6 +148896,18 @@ function JSDialogModifyDraw()
             case JS_DRAWTOOL_MENU_ID.CMD_LOCK_DRAW_CHART_ID:
                 this.ModifyLockChart();
                 break;
+            case JS_DRAWTOOL_MENU_ID.CMD_ZOOM_FONT_ID:
+                this.ModifyFontZoom(1);
+                break;
+            case JS_DRAWTOOL_MENU_ID.CMD_ZOOM_OUT_FONT_ID:
+                this.ModifyFontZoom(-1);
+                break;
+            case JS_DRAWTOOL_MENU_ID.CMD_MODIFY_TEXT_ID:
+                this.ModifyText();
+                break;
+            case JS_DRAWTOOL_MENU_ID.CMD_ADVANCED_SETTING_ID:
+                this.AdvancedSetting();
+                break;
         }
     }
 
@@ -148978,6 +148949,19 @@ function JSDialogModifyDraw()
         this.Close();
     }
 
+    this.OnClearChartDrawPicture=function(drawPicture)
+    {
+        if (!this.IsShow()) return;
+
+        if (!drawPicture) 
+        {
+            this.Close();
+            return;
+        }
+
+        if (this.ChartPicture && drawPicture.Guid==this.ChartPicture.Guid) this.Close();
+    }
+
     this.ShowButton=function(dom, diaplay)
     {
         if (dom.style.display==diaplay) return;
@@ -149093,6 +149077,65 @@ function JSDialogModifyDraw()
         this.HQChart.Draw();
     }
 
+    this.ModifyFontZoom=function(step)
+    {
+        if (!this.ChartPicture || !this.HQChart) return;
+        if (this.ChartPicture.FontOption.Size+step<=2) return;
+
+        var chart=this.ChartPicture;
+        chart.FontOption.Size+=step;
+
+        if (chart.ClassName=="ChartDrawNote") chart.NoteFontOption.Size+=step;
+
+        this.HQChart.Draw();
+    }
+
+    this.ModifyText=function()
+    {
+        if (!this.ChartPicture || !this.HQChart) return;
+
+        var chart=this.ChartPicture;
+        switch(chart.ClassName)
+        {
+            case "ChartDrawPictureText":
+                chart.Text=this.GetRandomText(chart.Text);
+                break;
+            case "ChartDrawAnchoredText":
+                var text=null;
+                if (IFrameSplitOperator.IsNonEmptyArray(chart.AryText)) text=chart.AryText[0].Text;
+                chart.AryText=[ {Text:this.GetRandomText(text)},  {Text:this.GetRandomText(null)}];
+                break;
+            case "ChartDrawNote":
+                var text=null;
+                if (IFrameSplitOperator.IsNonEmptyArray(chart.AryNoteText)) text=chart.AryNoteText[0].Text;
+                chart.AryNoteText=[ {Text:this.GetRandomText(text)},  {Text:this.GetRandomText(null)}];
+                break;
+            default:
+                return;
+        }
+
+        this.HQChart.Draw();
+    }
+
+    this.GetRandomText=function(text)
+    {
+        var ARY_TEXT=["下跌形态","反转十字星","低位档五阳线","倒V型反转","双顶","持续整理形态"];
+
+        var index=this.GetRandomTestData(0, ARY_TEXT.length-1);
+        for(var i=index;i<10;++i)
+        {
+            var value=ARY_TEXT[i%ARY_TEXT.length];
+            if (value!=text) return value;
+        }
+    }
+
+    this.GetRandomTestData=function(min, max)   //测试数据
+    {
+        min = Math.ceil(min);
+        max = Math.floor(max);
+        return Math.floor(Math.random() * (max - min + 1)) + min; //含最大值，含最小值 
+    }
+
     this.Show=function(x, y)
     {
         if (!this.DivDialog) this.Create();
@@ -149106,27 +149149,42 @@ function JSDialogModifyDraw()
     {
         this.ChartPicture=chart;
 
-        var bShowLineColor=true, bShowBGColor=false, bShowFontColor=false, bShowBorderColor=false;
+        var bShowLineColor=true, bShowBGColor=false, bShowFontColor=false, bShowBorderColor=false, bShowFontZoom=false, bModifyText=false, bAdvanced=false;;
         var bgColor=null, fontColor=null,borderColor=null;
-        var ARRAY_TEXT_CHART=['ChartDrawPriceLabel', "ChartDrawAnchoredText","ChartDrawPriceNote"];
+        var ARRAY_TEXT_CHART=['ChartDrawPriceLabel', "ChartDrawAnchoredText","ChartDrawPriceNote", ];
         if (ARRAY_TEXT_CHART.includes(chart.ClassName))
         {
             bShowBGColor=true;
             bShowFontColor=true;
             bShowBorderColor=true;
+            bShowFontZoom=true;
+            if (chart.ClassName=="ChartDrawAnchoredText") bModifyText=true;
             bgColor=chart.BGColor;
             fontColor=chart.TextColor;
             borderColor=chart.BorderColor;
         }
+        else if (chart.ClassName=="ChartDrawPictureText")
+        {
+            bModifyText=true;
+            bShowFontZoom=true;
+            bShowLineColor=true;
+        }
         else if (chart.ClassName=="ChartDrawNote")
         {
             bShowBGColor=true;
             bShowFontColor=true;
             bShowBorderColor=true;
+            bModifyText=true;
+            bShowFontZoom=true;
             bgColor=chart.NoteBGColor;
             fontColor=chart.NoteTextColor;
             borderColor=chart.NoteBorderColor;
         }
+        else if (chart.ClassName=="ChartDrawVolProfile")
+        {
+            bShowLineColor=false;
+            bAdvanced=true;
+        }
         
         if (this.ColorButton)
         {
@@ -149173,6 +149231,30 @@ function JSDialogModifyDraw()
             var item=this.LockButton;
             item.Span.style['color']=this.ChartPicture.EnableMove?"rgb(220,220,220)":"rgb(0,0,0)";
         }
+
+        if (this.FontZoomButton)
+        {
+            var item=this.FontZoomButton;
+            this.ShowButton(item.Div, bShowFontZoom?"inline":"none");
+        }
+
+        if (this.FontZoomOutButton)
+        {
+            var item=this.FontZoomOutButton;
+            this.ShowButton(item.Div, bShowFontZoom?"inline":"none");
+        }
+
+        if (this.ModifyTextButton)
+        {
+            var item=this.ModifyTextButton;
+            this.ShowButton(item.Div, bModifyText?"inline":"none");
+        }
+
+        if (this.AdvancedButton)
+        {
+            var item=this.AdvancedButton;
+            this.ShowButton(item.Div, bAdvanced?"inline":"none");
+        }
     }
 
     this.OnMouseDownTitle=function(e)
@@ -149793,6 +149875,278 @@ JSTooltipMinuteChart.GetMinuteOption=function()
 
 
 
+
+
+/*
+   Copyright (c) 2018 jones
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   开源项目 https://github.com/jones2000/HQChart
+ 
+   jones_2000@163.com
+*/
+
+
+///////////////////////////////////////////////////////
+//  K线图提示信息
+//
+//////////////////////////////////////////////////////
+
+function JSTooltipKLineChart()
+{
+    this.DivDialog=null;
+    this.HQChart=null;
+    this.ID=Guid();
+
+    this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
+    this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
+    this.OnCreateCallback;
+
+    this.KLine=
+    {
+        Option:JSTooltipKLineChart.GetKLineOption(),
+        JSChart:null,
+        Symbol:null,
+    }
+
+    this.Inital=function(hqchart, option)
+    {
+        this.HQChart=hqchart;
+
+        if (option)
+        {
+            if (IFrameSplitOperator.IsObject(option.Option)) 
+            {
+                var item=CloneData(option.Option);  //复制一份出来
+                this.KLine.Option=Object.assign(this.KLine.Option,item);
+            }
+            if (option.OnCreateCallback) this.OnCreateCallback=option.OnCreateCallback;
+        }
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement('div');
+        divDom.className='UMyChart_Tooltip_KLine_Div';
+        divDom.id=this.ID;
+
+        var divChart=document.createElement('div');
+        divChart.className='UMyChart_Tooltip_KLine_Chart_Div';
+        divDom.appendChild(divChart);
+
+        this.DivDialog=divDom;
+
+        var chart=JSChart.Init(divChart);
+        this.KLine.JSChart=chart;
+
+        //语言跟主图保持一致
+        if (this.HQChart) this.KLine.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);
+        this.KLine.Option.OnCreatedCallback=(chart)=>{ this.OnCreateHQChart(chart); }
+        this.KLine.Option.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback); }
+        chart.SetOption(this.KLine.Option);  //设置K线配置
+
+        document.body.appendChild(divDom);
+
+        this.UpdateStyle();
+    }
+
+    this.UpdateStyle=function()
+    {
+        if (!this.DivDialog) return;
+
+        if (this.BGColor) this.DivDialog.style['background-color']=this.BGColor;
+        if (this.BorderColor) this.DivDialog.style['border-color']=this.BorderColor;
+    }
+
+    this.NetworkFilter=function(data, callback)
+    {
+        if (!this.HQChart || !this.HQChart.NetworkFilter) return;
+
+        this.HQChart.NetworkFilter(data, callback);       
+    }
+
+    this.OnCreateHQChart=function(chart)
+    {
+        if (this.OnCreateCallback) this.OnCreateCallback(chart);
+    }
+
+    this.Destroy=function()
+    {
+        if (this.DivDialog) document.body.removeChild(this.DivDialog);
+        this.DivDialog=null;
+        this.TitleBox=null;
+        if (!this.KLine.JSChart) this.KLine.JSChart.ChartDestory();
+        this.KLine.JSChart=null;
+    }
+
+    this.IsShow=function()
+    {
+        if (!this.DivDialog) return false;
+        
+        return this.DivDialog.style.visibility==='visible';
+    }
+
+    this.Show=function(data, x, y)
+    {
+        if (!this.DivDialog) this.Create();
+        if (!data || !data.Symbol) return;
+
+        var symbol=data.Symbol;
+        if (this.KLine.JSChart)
+        {
+            if (this.KLine.Symbol!=symbol)
+            {
+                this.KLine.Symbol=symbol;
+                this.KLine.JSChart.ChangeSymbol(symbol);
+            }
+        }
+
+        if (!this.KLine.Option.EnableResize)
+        {
+            if (this.KLine.JSChart) this.KLine.JSChart.OnSize({ Type:1 });
+        }
+
+        if (IFrameSplitOperator.IsNumberV2(x,y))
+        {
+
+        }
+        else if (data.Rect)
+        {
+            var rtCell=data.Rect;
+            var pixelRatio=GetDevicePixelRatio();
+            var rtItem={ Left:rtCell.Left/pixelRatio, Right:rtCell.Right/pixelRatio, Bottom:rtCell.Bottom/pixelRatio, Top:rtCell.Top/pixelRatio };
+            rtItem.Width=rtItem.Right-rtItem.Left;
+            rtItem.Height=rtItem.Bottom-rtItem.Top;
+
+            //超出窗口调整位置
+            var height=this.DivDialog.offsetHeight;
+            var width=this.DivDialog.offsetWidth;
+            var x=rtItem.Right+data.Offset.Left;
+            var y=rtItem.Bottom+data.Offset.Top;
+
+            var xRight=window.innerWidth-5;
+            var ybottom=window.innerHeight-5;
+            if (x+width>xRight) x=(rtItem.Left+data.Offset.Left)-width;
+            if (y+height>ybottom) y=(rtItem.Top+data.Offset.Top)-height;
+
+            this.DivDialog.style.visibility='visible';
+            this.DivDialog.style.top = y + "px";
+            this.DivDialog.style.left = x + "px";
+        }
+    }
+
+    this.Hide=function()
+    {
+        if (!this.DivDialog) return;
+        if (this.DivDialog.style.visibility!='hidden')
+            this.DivDialog.style.visibility='hidden';
+    }
+
+
+    this.ReloadResource=function(option)
+    {
+        this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
+        this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
+
+        if (!this.DivDialog) return;
+
+        this.UpdateStyle();
+
+        if (this.KLine.JSChart) this.KLine.JSChart.ReloadResource(option);
+    }
+
+}
+
+JSTooltipKLineChart.GetKLineOption=function()
+{
+    var option=
+    {
+        Type:'历史K线图',   //创建图形类型
+        Windows: //窗口指标
+        [
+            { Index:"MA",Change:false, Modify:false },
+            { Index:"MACD", Close:false, Change:false, Modify:false,MaxMin:false,TitleWindow:false },
+        ], 
+
+        //Language:'EN',
+
+        Symbol:null,
+        IsAutoUpdate:false,       //是自动更新数据
+        AutoUpdateFrequency:3000,   //数据更新频率
+               
+
+        SplashTitle:'加载数据中......',
+        IsShowRightMenu:false,          //右键菜单
+        CtrlMoveStep:10,
+    
+        KLine:  //K线设置
+        {
+            DragMode:1,                 //拖拽模式 0=禁止拖拽 1=数据拖拽 2=区间选择
+            Right:1,                    //复权 0 不复权 1 前复权 2 后复权
+            Period:0,                   //周期 0 日线 1 周线 2 月线 3 年线 
+            MaxRequestDataCount:3000,   //数据个数
+            MaxRequestMinuteDayCount:5, //分钟数据获取几天数据  默认取5天数据
+            IsShowTooltip:false,                 //是否显示K线提示信息
+            DrawType:0,      //K线类型 0=实心K线柱子 1=收盘价线 2=美国线 3=空心K线柱子 4=收盘价面积图
+            KLineDoubleClick:false, //禁止双击弹框
+            RightSpaceCount:0,
+            ZoomType:0,
+            DataWidth:2,
+        },
+
+        StepPixel:0,
+
+        Listener:
+        {
+            KeyDown:false,
+            Wheel:false
+        },
+
+                
+    
+        KLineTitle: //标题设置
+        {
+            IsShowName:true,        //不显示股票名称
+            IsShowSettingInfo:true, //不显示周期/复权
+            //IsTitleShowLatestData:true,
+        },
+    
+        Border: //边框
+        {
+            
+            Left:1,         //左边间距
+            Right:20,       //右边间距
+            Bottom:25,      //底部间距
+            Top:25,         //顶部间距
+
+            AutoLeft:{ Blank:10, MinWidth:30 },
+            AutoRight:{ Blank:5, MinWidth:30 },
+        },
+                
+            Frame:  //子框架设置
+            [
+                {
+                    SplitCount:4,
+                    IsShowLeftText:false,
+                },
+
+                { SplitCount:3,IsShowLeftText:false, },
+                { SplitCount:3, IsShowLeftText:false,}
+            ],
+        }
+    return option;
+}
+
+
+
+
+
+
+
+
+
+
 /*
    Copyright (c) 2018 jones
  
@@ -154282,8 +154636,16 @@ function JSDialogModifyIndexParam()
 
         item.Value=value;
 
-        if (this.IndexData.Type==1) this.HQChart.UpdateWindowIndex(this.IndexData.WindowIndex);
-        else if (this.IndexData.Type==2) this.HQChart.UpdateOverlayIndex(this.IndexData.Identify);
+        
+
+        if (this.IndexData.Type==1) 
+        {
+            this.HQChart.UpdateWindowIndex(this.IndexData.WindowIndex);
+        }
+        else if (this.IndexData.Type==2) 
+        {
+            this.HQChart.UpdateOverlayIndex(this.IndexData.Identify);
+        }
     }
 }
 
@@ -154411,7 +154773,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14515";
+var HQCHART_VERSION="1.1.14532";
 
 function PrintHQChartVersion()
 {