hqchart 1.1.14516 → 1.1.14533

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

@@ -6632,6 +6632,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=
@@ -6821,6 +6823,7 @@ var JSCHART_MENU_ID=
 
     CMD_RBUTTON_SELECT_RECT_ID:53,          //右键区间选择
     CMD_LBUTTON_SELECT_RECT_ID:54,          //左键区间选择
+    CMD_ENABLE_XDRAG_BOTTOM_ID:55,                 //X轴拖动缩放
 
 
 
@@ -8084,7 +8087,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;
@@ -10985,7 +10988,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)
                 {
@@ -11209,14 +11211,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)
@@ -12803,20 +12807,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()
@@ -12868,6 +12859,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
         {
@@ -12887,6 +12879,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;
                 }
             }
         }
@@ -13015,6 +13009,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)
     {
@@ -14339,6 +14350,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;
         }
     }
 
@@ -23807,11 +23821,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;
@@ -23829,6 +23869,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)) 
@@ -24122,11 +24176,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;
         }
@@ -25258,9 +25326,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 };
             }
@@ -63168,6 +63240,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();
@@ -63230,68 +63397,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)
                 {
@@ -68660,15 +68770,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)
@@ -68706,12 +68814,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;
-        }
     }
 
     //根据设置动态生成字体
@@ -68730,18 +68832,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;
@@ -73624,6 +73714,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);
@@ -75709,6 +75800,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;                  //透明度
 
@@ -77281,10 +77381,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;
@@ -83064,8 +83175,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;
@@ -84548,7 +84661,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;
@@ -84621,6 +84734,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 };
             }
         }
        
@@ -85688,6 +85802,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 },
@@ -85698,7 +85813,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},
 
@@ -85887,8 +86001,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);
         }
 
@@ -93205,7 +93317,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (item)
         {
             drawPicture=item.Create();
-            if (drawPicture.ClassName=='ChartDrawPictureText') drawPicture.HQChart=this;
         }
 
         if (!drawPicture)    //iconfont图标
@@ -93268,7 +93379,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();
@@ -93312,8 +93422,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             drawPicture.ValueToPoint();
             drawPicture.GetActiveDrawPicture=()=>{ return this.GetActiveDrawPicture(); }
 
-            if (drawPicture.ClassName==='ChartDrawPictureText') drawPicture.IsInitialized=true;
-
             this.ChartDrawPicture.push(drawPicture);
         }
 
@@ -98191,7 +98299,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)
@@ -98417,239 +98524,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)
 {
@@ -129322,7 +129196,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 微软雅黑',
@@ -131956,6 +131835,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;
@@ -132276,6 +132156,7 @@ function JSReportChartContainer(uielement)
 
     //
     this.TooltipMinuteChart;    //分时图
+    this.TooltipKLineChart;     //分时图
 
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
@@ -132286,6 +132167,7 @@ function JSReportChartContainer(uielement)
         this.StopAutoUpdate();
 
         this.DestroyMinuteChartTooltip();
+        this.DestroyKLineChartTooltip();
         this.DestroyFloatTooltip();
     }
 
@@ -132325,6 +132207,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;
@@ -132394,6 +132294,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)
     {
@@ -132759,7 +132688,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(); };
@@ -133563,8 +133492,7 @@ function JSReportChartContainer(uielement)
             if (wheelValue<0)   //下
             {
                 this.LastMouseStatus.TooltipStatus=null;
-                this.HideMinuteChartTooltip();
-                this.HideFloatTooltip();
+                this.HideAllTooltip();
                 if (this.GotoNextItem(1))
                 {
                     this.Draw();
@@ -133574,8 +133502,7 @@ function JSReportChartContainer(uielement)
             else if (wheelValue>0)  //上
             {
                 this.LastMouseStatus.TooltipStatus=null;
-                this.HideMinuteChartTooltip();
-                this.HideFloatTooltip();
+                this.HideAllTooltip();
                 if (this.GotoNextItem(-1))
                 {
                     this.Draw();
@@ -133588,8 +133515,7 @@ function JSReportChartContainer(uielement)
             if (wheelValue<0)   //下一页
             {
                 this.LastMouseStatus.TooltipStatus=null;
-                this.HideMinuteChartTooltip();
-                this.HideFloatTooltip();
+                this.HideAllTooltip();
                 if (this.GotoNextPage(this.PageUpDownCycle)) 
                 {
                     this.Draw();
@@ -133599,8 +133525,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();
@@ -133622,8 +133547,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
@@ -133912,7 +133836,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;
@@ -133988,7 +133913,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 };
                         }
                     }
@@ -134038,20 +133971,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();
@@ -134077,8 +134007,7 @@ function JSReportChartContainer(uielement)
 
     this.UIOnMouseleave=function(e)
     {
-        this.HideMinuteChartTooltip();
-        this.HideFloatTooltip();
+        this.HideAllTooltip();
 
         var tabChart=this.GetTabChart();
         if (tabChart && tabChart.MoveOnTabIndex>=0)
@@ -134304,7 +134233,7 @@ function JSReportChartContainer(uielement)
         document.onmouseup=null;
 
         this.StopAutoDragScrollTimer();
-        this.HideTooltip();
+        this.HideAllTooltip();
         var reportChart=this.GetReportChart();
 
         var mouseStatus={ Cursor:"default", Name:"Default"};;   //鼠标状态
@@ -136696,7 +136625,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;
@@ -138265,9 +138195,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);
         }
 
@@ -144582,7 +144512,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14515";
+var HQCHART_VERSION="1.1.14532";
 
 function PrintHQChartVersion()
 {