hqchart 1.1.15237 → 1.1.15245

package/lib/umychart.vue.js

@@ -1184,7 +1184,7 @@ for(var i=0;i<chart.Frame.SubFrame.length;++i){chart.Frame.SubFrame[i].Frame.Cha
 this.SetPressKeyboardConfig=function(chart,option){if(!chart||!option)return;if(IFrameSplitOperator.IsBool(option.PauseUpdate))chart.PressKeyboardConfig.PauseUpdate=option.PauseUpdate;};//缺口设置 KLine:{ PriceGap:{ Enable, Count } }
 this.SetPriceGapConfig=function(chart,option){if(!option||!option.PriceGap)return;var klineChart=chart.ChartPaint[0];if(!klineChart)return;var item=option.PriceGap;if(IFrameSplitOperator.IsBool(item.Enable))klineChart.PriceGap.Enable=item.Enable;if(IFrameSplitOperator.IsNumber(item.Count))klineChart.PriceGap.Count=item.Count;};//历史K线图
 this.CreateKLineChartContainer=function(option){var _this=this;var chart=null;if(option.Type==="历史K线图横屏")chart=new KLineChartHScreenContainer(this.CanvasElement);else chart=new KLineChartContainer(this.CanvasElement,this.OffscreenCanvasElement,this.CacheCanvasElement);chart.GetExtraCanvas=function(name){return _this.GetExtraCanvas(name);};var extraElement=this.GetExtraCanvas(JSChart.CorssCursorCanvasKey);if(extraElement)chart.SetCorssCursorElement(extraElement);if(option.EventCallback)this.SetEventCallback(chart,option.EventCallback);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;var pixelRatio=GetDevicePixelRatio();//右键菜单
-if(IFrameSplitOperator.IsBool(option.IsShowRightMenu))chart.IsShowRightMenu=option.IsShowRightMenu;if(option.ScriptError)chart.ScriptErrorCallback=option.ScriptError;if(option.EnableScrollUpDown==true)chart.EnableScrollUpDown=option.EnableScrollUpDown;if(option.DisableMouse==true)chart.DisableMouse=option.DisableMouse;if(option.TouchMoveMinAngle)chart.TouchMoveMinAngle=option.TouchMoveMinAngle;if(option.EnableZoomUpDown)chart.EnableZoomUpDown=option.EnableZoomUpDown;if(IFrameSplitOperator.IsString(option.SplashTitle))chart.LoadDataSplashTitle=option.SplashTitle;if(IFrameSplitOperator.IsBool(option.EnableZoomIndexWindow))chart.EnableZoomIndexWindow=option.EnableZoomIndexWindow;if(IFrameSplitOperator.IsBool(option.IsDrawPictureXY))chart.IsDrawPictureXY=option.IsDrawPictureXY;if(IFrameSplitOperator.IsNumber(option.CtrlMoveStep))chart.CtrlMoveStep=option.CtrlMoveStep;if(IFrameSplitOperator.IsNumber(option.ShiftMoveStep))chart.ShiftMoveStep=option.ShiftMoveStep;if(IFrameSplitOperator.IsBool(option.EnableIndexChartDrag))chart.EnableIndexChartDrag=option.EnableIndexChartDrag;if(IFrameSplitOperator.IsBool(option.EnableVerifyRecvData))chart.EnableVerifyRecvData=option.EnableVerifyRecvData;if(option.GlobalOption){var item=option.GlobalOption;if(IFrameSplitOperator.IsBool(item.IsValueFullRange))chart.GlobalOption.IsValueFullRange=item.IsValueFullRange;if(item.SelectedBorder){var subItem=item.SelectedBorder;if(IFrameSplitOperator.IsNumber(subItem.Mode))chart.GlobalOption.SelectedBorder.Mode=subItem.Mode;}}if(option.EnableYDrag){var item=option.EnableYDrag;if(IFrameSplitOperator.IsBool(item.Left))chart.EnableYDrag.Left=item.Left;if(IFrameSplitOperator.IsBool(item.Right))chart.EnableYDrag.Right=item.Right;if(IFrameSplitOperator.IsBool(item.Wheel))chart.EnableYDrag.Wheel=item.Wheel;if(IFrameSplitOperator.IsNumber(item.WheelYMove))chart.EnableYDrag.WheelYMove=item.WheelYMove;}if(option.EnableXDrag){var item=option.EnableXDrag;if(IFrameSplitOperator.IsBool(item.Bottom))chart.EnableXDrag.Bottom=item.Bottom;if(item.LButton&&IFrameSplitOperator.IsNumber(item.LButton.Type))chart.EnableXDrag.LButton.Type=item.LButton.Type;if(item.RButton&&IFrameSplitOperator.IsNumber(item.RButton.Type))chart.EnableXDrag.RButton.Type=item.RButton.Type;}if(option.KLineTooltip){var item=option.KLineTooltip;if(IFrameSplitOperator.IsBool(item.Enable))chart.KLineTooltipConfig.Enable=item.Enable;if(IFrameSplitOperator.IsBool(item.EnableKeyDown))chart.KLineTooltipConfig.EnableKeyDown=item.EnableKeyDown;}if(option.KLine)//k线图的属性设置
+if(IFrameSplitOperator.IsBool(option.IsShowRightMenu))chart.IsShowRightMenu=option.IsShowRightMenu;if(option.ScriptError)chart.ScriptErrorCallback=option.ScriptError;if(option.EnableScrollUpDown==true)chart.EnableScrollUpDown=option.EnableScrollUpDown;if(option.DisableMouse==true)chart.DisableMouse=option.DisableMouse;if(option.TouchMoveMinAngle)chart.TouchMoveMinAngle=option.TouchMoveMinAngle;if(option.EnableZoomUpDown)chart.EnableZoomUpDown=option.EnableZoomUpDown;if(IFrameSplitOperator.IsString(option.SplashTitle))chart.LoadDataSplashTitle=option.SplashTitle;if(IFrameSplitOperator.IsBool(option.EnableZoomIndexWindow))chart.EnableZoomIndexWindow=option.EnableZoomIndexWindow;if(IFrameSplitOperator.IsBool(option.IsDrawPictureXY))chart.IsDrawPictureXY=option.IsDrawPictureXY;if(IFrameSplitOperator.IsNumber(option.CtrlMoveStep))chart.CtrlMoveStep=option.CtrlMoveStep;if(IFrameSplitOperator.IsNumber(option.ShiftMoveStep))chart.ShiftMoveStep=option.ShiftMoveStep;if(IFrameSplitOperator.IsBool(option.EnableIndexChartDrag))chart.EnableIndexChartDrag=option.EnableIndexChartDrag;if(IFrameSplitOperator.IsBool(option.EnableVerifyRecvData))chart.EnableVerifyRecvData=option.EnableVerifyRecvData;if(option.GlobalOption){var item=option.GlobalOption;if(IFrameSplitOperator.IsBool(item.IsValueFullRange))chart.GlobalOption.IsValueFullRange=item.IsValueFullRange;if(IFrameSplitOperator.IsBool(item.EnableXShortDate))chart.GlobalOption.EnableXShortDate=item.EnableXShortDate;if(item.SelectedBorder){var subItem=item.SelectedBorder;if(IFrameSplitOperator.IsNumber(subItem.Mode))chart.GlobalOption.SelectedBorder.Mode=subItem.Mode;}}if(option.EnableYDrag){var item=option.EnableYDrag;if(IFrameSplitOperator.IsBool(item.Left))chart.EnableYDrag.Left=item.Left;if(IFrameSplitOperator.IsBool(item.Right))chart.EnableYDrag.Right=item.Right;if(IFrameSplitOperator.IsBool(item.Wheel))chart.EnableYDrag.Wheel=item.Wheel;if(IFrameSplitOperator.IsNumber(item.WheelYMove))chart.EnableYDrag.WheelYMove=item.WheelYMove;}if(option.EnableXDrag){var item=option.EnableXDrag;if(IFrameSplitOperator.IsBool(item.Bottom))chart.EnableXDrag.Bottom=item.Bottom;if(item.LButton&&IFrameSplitOperator.IsNumber(item.LButton.Type))chart.EnableXDrag.LButton.Type=item.LButton.Type;if(item.RButton&&IFrameSplitOperator.IsNumber(item.RButton.Type))chart.EnableXDrag.RButton.Type=item.RButton.Type;}if(option.KLineTooltip){var item=option.KLineTooltip;if(IFrameSplitOperator.IsBool(item.Enable))chart.KLineTooltipConfig.Enable=item.Enable;if(IFrameSplitOperator.IsBool(item.EnableKeyDown))chart.KLineTooltipConfig.EnableKeyDown=item.EnableKeyDown;}if(option.KLine)//k线图的属性设置
 {var item=option.KLine;if(option.KLine.DragMode>=0)chart.DragMode=option.KLine.DragMode;if(option.KLine.Right>=0)chart.Right=option.KLine.Right;if(option.KLine.Period>=0)chart.Period=option.KLine.Period;if(option.KLine.MaxReqeustDataCount>0)chart.MaxRequestDataCount=option.KLine.MaxReqeustDataCount;//兼容老版本
 if(option.KLine.MaxRequestDataCount>0)chart.MaxRequestDataCount=option.KLine.MaxRequestDataCount;if(option.KLine.Info&&option.KLine.Info.length>0)chart.SetKLineInfo(option.KLine.Info,false);if(IFrameSplitOperator.IsBool(item.IsShowTooltip))chart.IsShowTooltip=item.IsShowTooltip;if(option.KLine.MaxRequestMinuteDayCount>0)chart.MaxRequestMinuteDayCount=option.KLine.MaxRequestMinuteDayCount;if(option.KLine.DrawType)chart.KLineDrawType=option.KLine.DrawType;if(option.KLine.FirstShowDate>19910101)chart.CustomShow={Date:option.KLine.FirstShowDate,PageSize:option.KLine.PageSize};//!!已弃用 新的格式"CustomShow"
 if(option.KLine.RightSpaceCount>0)chart.RightSpaceCount=option.KLine.RightSpaceCount;if(option.KLine.ZoomType>0)chart.ZoomType=option.KLine.ZoomType;if(option.KLine.DataWidth>=1)chart.KLineSize={DataWidth:option.KLine.DataWidth};if(IFrameSplitOperator.IsNumber(option.KLine.RightFormula))chart.RightFormula=option.KLine.RightFormula;}//自定义显示位置
@@ -1914,8 +1914,8 @@ LockCorssCursor:{X:{Enable:false}},CorssCursorStatus:{Value:null},//十字光标
 //图形中的单元选中状态
 MapIndexChartCache:new _map2.default(),//key 指标GUID
 TradeStatus:null,//当前交易状态 { Date, Time：数据最后更新的时间, Status: }
-LatestPoint:null//最新的点位置 { X:, Y: }
-};this.VerticalDrag;//通过X轴左右拖动数据(手势才有)
+LatestPoint:null,//最新的点位置 { X:, Y: }
+EnableXShortDate:true};this.VerticalDrag;//通过X轴左右拖动数据(手势才有)
 this.EnableVerticalDrag=false;//十字光标长留(手势才有)
 this.ClickModel={IsShowCorssCursor:false,PreventHide:false,IsClickButton:false,AutoClose:{Enable:false,Timer:null,DelayTime:3000}};//PreventHide 阻止隐藏十字光标 AutoClose=延迟关闭
 this.EnableClickModel=false;//标题栏显示最新数据
@@ -2978,7 +2978,7 @@ this.ReDrawToolbar=false;}};//Y轴面积背景
 this.DrawCustomHorizontalArea=function(){if(this.IsMinSize)return;if(this.ChartBorder.IsShowTitleOnly)return;if(!IFrameSplitOperator.IsNonEmptyArray(this.CustomHorizontalInfo))return;for(var i=0;i<this.CustomHorizontalInfo.length;++i){var item=this.CustomHorizontalInfo[i];if(item.Type==5)this.DrawCustomAreaItem(item);}};//画边框
 this.SuperDrawBorder=this.DrawBorder;this.DrawBorder=function(){if(!this.IsShowBorder)return;if(this.IsMinSize)return;this.SuperDrawBorder();if(this.Identify==1)//走势图和成交量中间用粗线分割开
 {var border=this.ChartBorder.GetBorder();var left=ToFixedPoint(border.Left);var top=ToFixedPoint(border.Top);var right=ToFixedPoint(border.Right);this.Canvas.strokeStyle=this.PenBorder;this.Canvas.beginPath();this.Canvas.moveTo(left,top);this.Canvas.lineTo(right,top);this.Canvas.save();this.Canvas.lineWidth=2*GetDevicePixelRatio();this.Canvas.stroke();this.Canvas.restore();}};this.DrawVolTitle=function(symbol){if(!MARKET_SUFFIX_NAME.IsShowMinuteVolTitle(symbol))return;if(this.Identify==1)//显示"成交量"
-{var pixelRatio=GetDevicePixelRatio();var left=this.ChartBorder.GetLeft()+2*pixelRatio+this.YInsideOffset;var top=this.ChartBorder.GetTopEx()+2*pixelRatio;this.Canvas.textAlign='left';this.Canvas.textBaseline='top';if(g_JSChartResource.Minute.VolBarColor||g_JSChartResource.Minute.VolTitleColor){if(g_JSChartResource.Minute.VolBarColor)this.Canvas.fillStyle=g_JSChartResource.Minute.VolBarColor;else this.Canvas.fillStyle=g_JSChartResource.Minute.VolTitleColor;var languageID=this.YSplitOperator.LanguageID;var text=g_JSChartLocalization.GetText('MVol-Vol',languageID);this.Canvas.fillText(text,left,top);left+=this.Canvas.measureText(text).width;left+=6*GetDevicePixelRatio();}if(this.IsShowPositionTitle){text=g_JSChartLocalization.GetText('MVol-Position',languageID);this.Canvas.fillStyle=g_JSChartResource.Minute.PositionColor;this.Canvas.fillText(text,left,top);}}};this.DrawToolbar=function(){if(this.ToolbarButtonStyle==1)return;if(g_JSChartResource.IsDOMFrameToolbar===true)return;if(!this.DivFrameToolbar)return;this.DivFrameToolbar.Show(this.Identify);};//手绘,不用DOM,使用DOM太麻烦了
+{var pixelRatio=GetDevicePixelRatio();var left=this.ChartBorder.GetLeft()+2*pixelRatio+this.YInsideOffset;var top=this.ChartBorder.GetTopEx()+2*pixelRatio;this.Canvas.textAlign='left';this.Canvas.textBaseline='top';if(g_JSChartResource.Minute.VolBarColor||g_JSChartResource.Minute.VolTitleColor){if(g_JSChartResource.Minute.VolBarColor)this.Canvas.fillStyle=g_JSChartResource.Minute.VolBarColor;else this.Canvas.fillStyle=g_JSChartResource.Minute.VolTitleColor;var languageID=this.YSplitOperator.LanguageID;var text=g_JSChartLocalization.GetText('MVol-Vol',languageID);this.Canvas.fillText(text,left,top);left+=this.Canvas.measureText(text).width;left+=6*GetDevicePixelRatio();}if(this.IsShowPositionTitle){text=g_JSChartLocalization.GetText('MVol-Position',languageID);this.Canvas.fillStyle=g_JSChartResource.Minute.PositionColor;this.Canvas.fillText(text,left,top);}}};this.DrawToolbar=function(){var bDraw=true;if(this.ToolbarButtonStyle==1)bDraw=false;if(g_JSChartResource.IsDOMFrameToolbar===true)bDraw=false;if(!this.DivFrameToolbar)return;if(!bDraw)this.HideToolbar();else this.DivFrameToolbar.Show(this.Identify);};//手绘,不用DOM,使用DOM太麻烦了
 this.DrawToolbarV2=function(moveonPoint,mouseStatus){if(g_JSChartResource.IsDOMFrameToolbar===true)return;if(this.Identify==0&&this.IsShowCloseButton)this.DrawCloseBeforeButton(moveonPoint,mouseStatus);//盘前集合竞价关闭按钮
 if(this.ChartBorder.TitleHeight<5)return;var aryButton=[];if(this.Identify!=0&&this.Identify!=1)//价格图和成交量图只有自定义按钮
 {if(this.CloseIndex)aryButton.push({ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW,Style:this.CloseWindowButton});if(this.MaxMinWindow)aryButton.push({ID:JSCHART_BUTTON_ID.MAX_MIN_WINDOW,Style:this.MaxMinWindowButton});if(this.TitleWindow)aryButton.push({ID:JSCHART_BUTTON_ID.TITLE_WINDOW,Style:this.TitleWindowButton});if(this.ExportData)aryButton.push({ID:JSCHART_BUTTON_ID.EXPORT_DATA,Style:this.ExportDataButton});if(this.OverlayIndex)aryButton.push({ID:JSCHART_BUTTON_ID.OVERLAY_INDEX,Style:this.OverlayIndexButton});if(this.ChangeIndex)aryButton.push({ID:JSCHART_BUTTON_ID.CHANGE_INDEX,Style:this.ChangeIndexButton});if(this.ModifyIndex)aryButton.push({ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM,Style:this.ModifyIndexParamButton});if(this.AddIndexWindow)aryButton.push({ID:JSCHART_BUTTON_ID.ADD_INDEX_WINDOW,Style:this.AddIndexWindowButton});if(this.IndexHelp)aryButton.push({ID:JSCHART_BUTTON_ID.INDEX_HELP,Style:this.IndexHelpButton});}if(IFrameSplitOperator.IsNonEmptyArray(this.CustomToolbar)){for(var i=0;i<this.CustomToolbar.length;++i){var item=this.CustomToolbar[i];if(item.ID&&item.Style)aryButton.push({ID:item.ID,Style:item.Style,TooltipText:item.TooltipText,Data:item.Data});}}this.DrawTitleButton(aryButton,moveonPoint,mouseStatus);};this.DrawCloseBeforeButton=function(moveonPoint,mouseStatus){if(this.Identify!=0)return;var border=this.ChartBorder.GetBorder();if(border.DayBorder)return;if(this.ChartBorder.LeftExtendWidth<10)return;var rtButton={Left:border.Left,Top:border.TopEx,Width:this.BeforeCloseIcon.Size,Height:this.BeforeCloseIcon.Size};rtButton.Right=rtButton.Left+this.BeforeCloseIcon.Size;rtButton.Bottom=rtButton.Top+this.BeforeCloseIcon.Size;var item={Rect:rtButton,Name:"集合竞价关闭按钮",ID:JSCHART_BUTTON_ID.CLOSE_BEFOREOPEN_ID};var color=this.BeforeCloseIcon.Color;if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){color=this.BeforeCloseIcon.MoveOnColor;if(mouseStatus)mouseStatus.MouseOnToolbar={Rect:rtButton,Item:item,Frame:this,Point:{X:moveonPoint.X,Y:moveonPoint.Y}};}var font=this.BeforeCloseIcon.Size+'px '+this.BeforeCloseIcon.Family;this.Canvas.font=font;this.Canvas.fillStyle=color;this.Canvas.textAlign='left';this.Canvas.textBaseline='top';this.Canvas.fillText(this.BeforeCloseIcon.Text,border.Left,border.TopEx);this.Buttons.push(item);};this.DrawMultiDayBeforeDataBG=function(border){var dayBorder=border.DayBorder;var top=ToFixedPoint(border.Top);var bottom=ToFixedPoint(border.Bottom);var height=bottom-top;this.Canvas.strokeStyle=this.MultiDayBorderPen;for(var i=0;i<dayBorder.length;++i){var drawCount=0;var item=dayBorder[i];var left=ToFixedPoint(item.Left);var right=ToFixedPoint(item.LeftEx);var width=right-left;if(width>3)//盘前
@@ -3076,7 +3076,7 @@ this.IsDrawTitleBG=false;this.IsShowNameArrow=false;this.CustomVerticalInfo=[];/
 //           Type:1,  Space: 第几个空白间距,  Line:{ Color:线段颜色, Type:线段类型 0 直线 1 虚线 }
 this.DrawCustomVerticalEvent;this.RightSpaceCount=0;this.Logarithmic=null;//{Up:上部 , Donw:下部 , OpenPrice:第一个开盘价}
 this.CustomToolbar=[];//自定义toolbar按钮 { ID:, Html:, Click }  2.0版本 { ID, Style:{ 见 g_JSChartResource.Buttons.CloseWindow}}
-this.ToolbarType=0;this.DrawToolbar=function(){if(this.ToolbarButtonStyle==1)return;if(g_JSChartResource.IsDOMFrameToolbar===true)return;if(!this.DivFrameToolbar)return;this.DivFrameToolbar.Show(this.Identify);};//手绘,不用DOM,使用DOM太麻烦了
+this.ToolbarType=0;this.DrawToolbar=function(){var bDraw=true;if(this.ToolbarButtonStyle==1)bDraw=false;if(g_JSChartResource.IsDOMFrameToolbar===true)bDraw=false;if(!this.DivFrameToolbar)return;if(!bDraw)this.HideToolbar();else this.DivFrameToolbar.Show(this.Identify);};//手绘,不用DOM,使用DOM太麻烦了
 this.DrawToolbarV2=function(moveonPoint,mouseStatus){if(g_JSChartResource.IsDOMFrameToolbar===true)return;this.Buttons=[];if(this.IsMinSize==true)return;if(this.ChartBorder.TitleHeight<5)return;var aryButton=[];//第1个窗口不能关闭
 if(this.CloseIndex&&this.Identify!==0)aryButton.push({ID:JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW,Style:this.CloseWindowButton});if(this.MaxMinWindow&&this.Identify!=0)aryButton.push({ID:JSCHART_BUTTON_ID.MAX_MIN_WINDOW,Style:this.MaxMinWindowButton});if(this.TitleWindow&&this.Identify!=0)aryButton.push({ID:JSCHART_BUTTON_ID.TITLE_WINDOW,Style:this.TitleWindowButton});if(this.ExportData)aryButton.push({ID:JSCHART_BUTTON_ID.EXPORT_DATA,Style:this.ExportDataButton});if(this.OverlayIndex)aryButton.push({ID:JSCHART_BUTTON_ID.OVERLAY_INDEX,Style:this.OverlayIndexButton});if(this.ChangeIndex)aryButton.push({ID:JSCHART_BUTTON_ID.CHANGE_INDEX,Style:this.ChangeIndexButton});if(this.ModifyIndex)aryButton.push({ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM,Style:this.ModifyIndexParamButton});if(this.AddIndexWindow)aryButton.push({ID:JSCHART_BUTTON_ID.ADD_INDEX_WINDOW,Style:this.AddIndexWindowButton});if(this.IndexHelp)aryButton.push({ID:JSCHART_BUTTON_ID.INDEX_HELP,Style:this.IndexHelpButton});if(IFrameSplitOperator.IsNonEmptyArray(this.CustomToolbar)){for(var i=0;i<this.CustomToolbar.length;++i){var item=this.CustomToolbar[i];if(item.ID&&item.Style){var btnItem={ID:item.ID,Style:item.Style,TooltipText:item.TooltipText,Data:item.Data};if(item.IsLeft===true)//左侧按钮
 {}else{aryButton.push(btnItem);//右侧按钮
@@ -4119,7 +4119,7 @@ else if(data.Direction==2)preItem.Y=yLow;//下
 //this.Canvas.fillRect(rect.X,rect.Y,rect.Width,rect.Height);
 this.TooltipRect.push([i,rect]);//[0]数据索引 [1]数据区域
 }}};this.DrawHLCArea=function(){var isHScreen=this.ChartFrame.IsHScreen===true;var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;if(isHScreen){var border=this.ChartBorder.GetHScreenBorder();var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.BottomEx;var borderLeft=border.TopEx;}else{var border=this.ChartBorder.GetBorder();var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;var borderLeft=border.LeftEx;}var lowPath=new Path2D();var highPath=new Path2D();var closePath=new Path2D();var upArea=new Path2D();var downArea=new Path2D();var aryHighPoint=[];var aryLowPoint=[];var aryClosePoint=[];var bFirstPoint=true;if(this.Data.DataOffset>0)//把最左边的一个点连上
-{var data=this.Data.Data[this.Data.DataOffset-1];if(data&&IFrameSplitOperator.IsNumber(data.Close)&&IFrameSplitOperator.IsNumber(data.High)&&IFrameSplitOperator.IsNumber(data.Low)){var x=borderLeft;var yClose=this.GetYFromData(data.Close,false);var yHigh=this.GetYFromData(data.High,false);var yLow=this.GetYFromData(data.Low,false);if(isHScreen){closePath.moveTo(yClose,x);highPath.moveTo(yHigh,x);lowPath.moveTo(yLow,x);upArea.moveTo(yHigh,x);downArea.moveTo(yLow,x);aryClosePoint.push({X:yClose,Y:x});aryHighPoint.push({X:yHigh,Y:x});aryLowPoint.push({X:yLow,Y:x});}else{closePath.moveTo(x,yClose);highPath.moveTo(x,yHigh);lowPath.moveTo(x,yLow);upArea.moveTo(x,yHigh);downArea.moveTo(x,yLow);aryClosePoint.push({X:x,Y:yClose});aryHighPoint.push({X:x,Y:yHigh});aryLowPoint.push({X:x,Y:yLow});}bFirstPoint=false;}}this.ShowRange.Start=this.Data.DataOffset;this.ShowRange.End=this.ShowRange.Start;this.ShowRange.DataCount=0;this.ShowRange.ShowCount=xPointCount;this.DrawKRange.Start=this.Data.DataOffset;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth,++this.ShowRange.DataCount){var data=this.Data.Data[i];this.ShowRange.End=i;if(!data||!IFrameSplitOperator.IsNumber(data.Close)||!IFrameSplitOperator.IsNumber(data.High)||!IFrameSplitOperator.IsNumber(data.Low))continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;var yClose=this.GetYFromData(data.Close,false);var yHigh=this.GetYFromData(data.High,false);var yLow=this.GetYFromData(data.Low,false);this.DrawKRange.End=i;if(bFirstPoint){if(isHScreen){closePath.moveTo(yClose,x);highPath.moveTo(yHigh,x);lowPath.moveTo(yLow,x);upArea.moveTo(yHigh,x);downArea.moveTo(yLow,x);}else{closePath.moveTo(x,yClose);highPath.moveTo(x,yHigh);lowPath.moveTo(x,yLow);upArea.moveTo(x,yHigh);downArea.moveTo(x,yLow);}bFirstPoint=false;}else{if(isHScreen){closePath.lineTo(yClose,x);highPath.lineTo(yHigh,x);lowPath.lineTo(yLow,x);upArea.lineTo(yHigh,x);downArea.lineTo(yLow,x);}else{closePath.lineTo(x,yClose);highPath.lineTo(x,yHigh);lowPath.lineTo(x,yLow);upArea.lineTo(x,yHigh);downArea.lineTo(x,yLow);}}if(isHScreen){aryClosePoint.push({X:yClose,Y:x});aryHighPoint.push({X:yHigh,Y:x});aryLowPoint.push({X:yLow,Y:x});}else{aryClosePoint.push({X:x,Y:yClose});aryHighPoint.push({X:x,Y:yHigh});aryLowPoint.push({X:x,Y:yLow});}}if(bFirstPoint)return;for(var i=aryClosePoint.length-1;i>=0;--i){var item=aryClosePoint[i];upArea.lineTo(item.X,item.Y);downArea.lineTo(item.X,item.Y);}upArea.closePath();downArea.closePath();this.Canvas.fillStyle=this.HLCAreaConfig.UpAreaColor;this.Canvas.fill(upArea);this.Canvas.fillStyle=this.HLCAreaConfig.DownAreaColor;this.Canvas.fill(downArea);if(IFrameSplitOperator.IsNumber(this.HLCAreaConfig.LineWidth))this.Canvas.lineWidth=this.HLCAreaConfig.LineWidth;this.Canvas.strokeStyle=this.HLCAreaConfig.CloseLineColor;this.Canvas.stroke(closePath);this.Canvas.strokeStyle=this.HLCAreaConfig.HighLineColor;this.Canvas.stroke(highPath);this.Canvas.strokeStyle=this.HLCAreaConfig.LowLineColor;this.Canvas.stroke(lowPath);};this.ClipTickClient=function(isHScreen){var border=this.GetBorder();if(isHScreen==true){var left=this.ChartBorder.GetLeftEx();var right=this.ChartBorder.GetRightEx();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}else{var left=border.Left;var right=border.Right;var top=border.TopTitle;var bottom=border.Bottom;}this.Canvas.beginPath();this.Canvas.rect(left,top,right-left,bottom-top);this.Canvas.clip();};this.ClipWindow=function(isHScreen){if(isHScreen==true){var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRightEx();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}else{var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var top=this.ChartBorder.GetTopEx();var bottom=this.ChartBorder.GetBottom();}this.Canvas.beginPath();this.Canvas.rect(left,top,right-left,bottom-top);//this.Canvas.stroke(); //调试用
+{var data=this.Data.Data[this.Data.DataOffset-1];if(data&&IFrameSplitOperator.IsNumber(data.Close)&&IFrameSplitOperator.IsNumber(data.High)&&IFrameSplitOperator.IsNumber(data.Low)){var x=borderLeft;var yClose=this.GetYFromData(data.Close,false);var yHigh=this.GetYFromData(data.High,false);var yLow=this.GetYFromData(data.Low,false);if(isHScreen){closePath.moveTo(yClose,x);highPath.moveTo(yHigh,x);lowPath.moveTo(yLow,x);upArea.moveTo(yHigh,x);downArea.moveTo(yLow,x);aryClosePoint.push({X:yClose,Y:x});aryHighPoint.push({X:yHigh,Y:x});aryLowPoint.push({X:yLow,Y:x});}else{closePath.moveTo(x,yClose);highPath.moveTo(x,yHigh);lowPath.moveTo(x,yLow);upArea.moveTo(x,yHigh);downArea.moveTo(x,yLow);aryClosePoint.push({X:x,Y:yClose});aryHighPoint.push({X:x,Y:yHigh});aryLowPoint.push({X:x,Y:yLow});}bFirstPoint=false;}}this.ShowRange.Start=this.Data.DataOffset;this.ShowRange.End=this.ShowRange.Start;this.ShowRange.DataCount=0;this.ShowRange.ShowCount=xPointCount;this.DrawKRange.Start=this.Data.DataOffset;for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth,++this.ShowRange.DataCount){var data=this.Data.Data[i];this.ShowRange.End=i;if(!data||!IFrameSplitOperator.IsNumber(data.Close)||!IFrameSplitOperator.IsNumber(data.High)||!IFrameSplitOperator.IsNumber(data.Low))continue;var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;var yClose=this.GetYFromData(data.Close,false);var yHigh=this.GetYFromData(data.High,false);var yLow=this.GetYFromData(data.Low,false);this.DrawKRange.End=i;if(bFirstPoint){if(isHScreen){closePath.moveTo(yClose,x);highPath.moveTo(yHigh,x);lowPath.moveTo(yLow,x);upArea.moveTo(yHigh,x);downArea.moveTo(yLow,x);}else{closePath.moveTo(x,yClose);highPath.moveTo(x,yHigh);lowPath.moveTo(x,yLow);upArea.moveTo(x,yHigh);downArea.moveTo(x,yLow);}bFirstPoint=false;}else{if(isHScreen){closePath.lineTo(yClose,x);highPath.lineTo(yHigh,x);lowPath.lineTo(yLow,x);upArea.lineTo(yHigh,x);downArea.lineTo(yLow,x);}else{closePath.lineTo(x,yClose);highPath.lineTo(x,yHigh);lowPath.lineTo(x,yLow);upArea.lineTo(x,yHigh);downArea.lineTo(x,yLow);}}if(isHScreen){aryClosePoint.push({X:yClose,Y:x});aryHighPoint.push({X:yHigh,Y:x});aryLowPoint.push({X:yLow,Y:x});}else{aryClosePoint.push({X:x,Y:yClose});aryHighPoint.push({X:x,Y:yHigh});aryLowPoint.push({X:x,Y:yLow});}}if(bFirstPoint)return;for(var i=aryClosePoint.length-1;i>=0;--i){var item=aryClosePoint[i];upArea.lineTo(item.X,item.Y);downArea.lineTo(item.X,item.Y);}upArea.closePath();downArea.closePath();this.Canvas.fillStyle=this.HLCAreaConfig.UpAreaColor;this.Canvas.fill(upArea);this.Canvas.fillStyle=this.HLCAreaConfig.DownAreaColor;this.Canvas.fill(downArea);if(IFrameSplitOperator.IsNumber(this.HLCAreaConfig.LineWidth))this.Canvas.lineWidth=this.HLCAreaConfig.LineWidth;this.Canvas.strokeStyle=this.HLCAreaConfig.CloseLineColor;this.Canvas.stroke(closePath);this.Canvas.strokeStyle=this.HLCAreaConfig.HighLineColor;this.Canvas.stroke(highPath);this.Canvas.strokeStyle=this.HLCAreaConfig.LowLineColor;this.Canvas.stroke(lowPath);};this.ClipTickClient=function(isHScreen){var border=this.GetBorder();if(isHScreen==true){var left=this.ChartBorder.GetLeftEx();var right=this.ChartBorder.GetRightEx();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}else{var left=border.Left;var right=border.Right;var top=border.TopTitle;var bottom=border.Bottom;}this.Canvas.beginPath();this.Canvas.rect(left,top,right-left,bottom-top);this.Canvas.clip();};this.ClipWindow=function(isHScreen){if(isHScreen==true){var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRightEx();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}else{var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}this.Canvas.beginPath();this.Canvas.rect(left,top,right-left,bottom-top);//this.Canvas.stroke(); //调试用
 this.Canvas.clip();};this.ClipClient=function(isHScreen)//裁剪客户端
 {if(isHScreen==true){var left=this.ChartBorder.GetLeftEx();var right=this.ChartBorder.GetRightEx();var top=this.ChartBorder.GetTop();var bottom=this.ChartBorder.GetBottom();}else{var left=this.ChartBorder.GetLeft();var right=this.ChartBorder.GetRight();var top=this.ChartBorder.GetTopEx();var bottom=this.ChartBorder.GetBottomEx();if(this.ChartBorder.BottomSpace>0)bottom+=1;if(this.DrawType==13)//需要显示文字,裁剪要大点
 {top=this.ChartBorder.GetTopTitle();bottom=this.ChartBorder.GetBottom();}}this.Canvas.beginPath();this.Canvas.rect(left,top,right-left,bottom-top);//this.Canvas.stroke(); //调试用
@@ -6004,8 +6004,9 @@ this.SplitDateTime=function()//根据时间分割
 {this.Frame.VerticalInfo=[];var itemWidth=this.Frame.DistanceWidth+this.Frame.DataWidth;var xOffset=this.Frame.Data.DataOffset;var xPointCount=this.Frame.XPointCount;var lastYear=null,lastMonth=null;var textDistance=0;var barDistance=0;for(var i=0,index=xOffset;i<xPointCount&&index<this.Frame.Data.Data.length;++i,++index){textDistance+=itemWidth;++barDistance;var infoData=null;if(i==0){var date=IFrameSplitOperator.FormatDateString(this.Frame.Data.Data[index].Date,'MM-DD');infoData={Value:index-xOffset,Text:date};}else if(textDistance>this.MinTextDistance&&barDistance>=this.MinBarDistance){var time=IFrameSplitOperator.FormatTimeString(this.Frame.Data.Data[index].Time);infoData={Value:index-xOffset,Text:time};}if(infoData){var info=new CoordinateInfo();info.Value=infoData.Value;if(this.ShowText)info.Message[0]=infoData.Text;if(info.Value==0)info.LineType=-1;//第1个分割线不画
 this.Frame.VerticalInfo.push(info);textDistance=0;barDistance=0;if(i==0)textDistance=-(this.MinTextDistance/2);}}};this.SplitSecond=function()//根据时间分割
 {this.Frame.VerticalInfo=[];var itemWidth=this.Frame.DistanceWidth+this.Frame.DataWidth;var xOffset=this.Frame.Data.DataOffset;var xPointCount=this.Frame.XPointCount;var textDistance=0;var barDistance=0;for(var i=0,index=xOffset;i<xPointCount&&index<this.Frame.Data.Data.length;++i,++index){textDistance+=itemWidth;++barDistance;var infoData=null;if(i==0){var date=IFrameSplitOperator.FormatDateString(this.Frame.Data.Data[index].Date,'MM-DD');infoData={Value:index-xOffset,Text:date};}else if(textDistance>this.MinTextDistance&&barDistance>=this.MinBarDistance){var time=IFrameSplitOperator.FormatTimeString(this.Frame.Data.Data[index].Time,"HH:MM:SS");infoData={Value:index-xOffset,Text:time};}if(infoData){var info=new CoordinateInfo();info.Value=infoData.Value;if(this.ShowText)info.Message[0]=infoData.Text;this.Frame.VerticalInfo.push(info);textDistance=0;barDistance=0;if(i==0)textDistance=-(this.MinTextDistance/2);}}};this.SplitMilliSecond=function(){this.Frame.VerticalInfo=[];var itemWidth=this.Frame.DistanceWidth+this.Frame.DataWidth;var xOffset=this.Frame.Data.DataOffset;var xPointCount=this.Frame.XPointCount;var textDistance=0;var barDistance=0;for(var i=0,index=xOffset;i<xPointCount&&index<this.Frame.Data.Data.length;++i,++index){textDistance+=itemWidth;++barDistance;var infoData=null;if(i==0){var date=IFrameSplitOperator.FormatDateString(this.Frame.Data.Data[index].Date,'HH:MM:SS.fff');infoData={Value:index-xOffset,Text:date};}else if(textDistance>this.MinTextDistance&&barDistance>=this.MinBarDistance){var time=IFrameSplitOperator.FormatTimeString(this.Frame.Data.Data[index].Time,"HH:MM:SS.fff");infoData={Value:index-xOffset,Text:time};}if(infoData){var info=new CoordinateInfo();info.Value=infoData.Value;if(this.ShowText)info.Message[0]=infoData.Text;this.Frame.VerticalInfo.push(info);textDistance=0;barDistance=0;if(i==0)textDistance=-(this.MinTextDistance/2);}}};this.SplitDate=function()//根据日期分割
-{this.Frame.VerticalInfo=[];var xOffset=this.Frame.Data.DataOffset;var xPointCount=this.Frame.XPointCount;var lastYear=null,lastMonth=null;var minDistance=12;var monthCount=0;for(var i=0,index=xOffset,distance=minDistance;i<xPointCount&&index<this.Frame.Data.Data.length;++i,++index){var year=parseInt(this.Frame.Data.Data[index].Date/10000);var month=parseInt(this.Frame.Data.Data[index].Date/100)%100;if(lastMonth!=month)++monthCount;if(distance<minDistance||lastYear!=null&&lastYear==year&&lastMonth!=null&&lastMonth==month){lastMonth=month;++distance;continue;}var info=new CoordinateInfo();info.Value=index-xOffset;var text;if(lastYear==null||lastYear!=year){text=year.toString();}else if(lastMonth==null||lastMonth!=month){text=month.toString()+'月';text=g_JSChartLocalization.GetText(text,this.LanguageID);}lastYear=year;lastMonth=month;if(this.ShowText)info.Message[0]=text;if(info.Value==0)info.LineType=-1;//第1个分割线不画
-this.Frame.VerticalInfo.push(info);distance=0;}if(this.Period==0&&monthCount<=2)this.SplitShortDate();};//分隔在2个月一下的格式
+{this.Frame.VerticalInfo=[];var xOffset=this.Frame.Data.DataOffset;var xPointCount=this.Frame.XPointCount;var lastYear=null,lastMonth=null;var minDistance=12;var monthCount=0;var globalOption=this.Frame.GlobalOption;for(var i=0,index=xOffset,distance=minDistance;i<xPointCount&&index<this.Frame.Data.Data.length;++i,++index){var year=parseInt(this.Frame.Data.Data[index].Date/10000);var month=parseInt(this.Frame.Data.Data[index].Date/100)%100;if(lastMonth!=month)++monthCount;if(distance<minDistance||lastYear!=null&&lastYear==year&&lastMonth!=null&&lastMonth==month){lastMonth=month;++distance;continue;}var info=new CoordinateInfo();info.Value=index-xOffset;var text;if(lastYear==null||lastYear!=year){text=year.toString();}else if(lastMonth==null||lastMonth!=month){text=month.toString()+'月';text=g_JSChartLocalization.GetText(text,this.LanguageID);}lastYear=year;lastMonth=month;if(this.ShowText)info.Message[0]=text;if(info.Value==0)info.LineType=-1;//第1个分割线不画
+this.Frame.VerticalInfo.push(info);distance=0;}var bShowShortDate=true;//日线显示在2个月以下的 显示格式
+if(globalOption&&IFrameSplitOperator.IsBool(globalOption.EnableXShortDate))bShowShortDate=globalOption.EnableXShortDate;if(bShowShortDate&&this.Period==0&&monthCount<=2)this.SplitShortDate();};//分隔在2个月以内的格式
 this.SplitShortDate=function(){this.Frame.VerticalInfo=[];var xOffset=this.Frame.Data.DataOffset;var xPointCount=this.Frame.XPointCount;var minDistance=12;var isFirstYear=true;for(var i=0,index=xOffset,distance=minDistance;i<xPointCount&&index<this.Frame.Data.Data.length;++i,++index){var year=parseInt(this.Frame.Data.Data[index].Date/10000);//var month=parseInt(this.Frame.Data.Data[index].Date/100)%100;
 //var day=parseInt(this.Frame.Data.Data[index].Date%100);
 if(distance<minDistance){++distance;continue;}var info=new CoordinateInfo();info.Value=index-xOffset;var text;if(isFirstYear){text=year.toString();isFirstYear=false;}else{text=IFrameSplitOperator.FormatDateString(this.Frame.Data.Data[index].Date,'MM-DD');}if(this.ShowText)info.Message[0]=text;if(info.Value==0)info.LineType=-1;//第1个分割线不画
@@ -14133,7 +14134,7 @@ this.HeaderFontConfig={Size:g_JSChartResource.Report.Header.Font.Size,Name:g_JSC
 this.ItemFontConfig={Size:g_JSChartResource.Report.Item.Font.Size,Name:g_JSChartResource.Report.Item.Font.Name};this.ItemMergin={Left:g_JSChartResource.Report.Item.Mergin.Left,Right:g_JSChartResource.Report.Item.Mergin.Right,Top:g_JSChartResource.Report.Item.Mergin.Top,Bottom:g_JSChartResource.Report.Item.Mergin.Bottom};this.BarMergin={Top:g_JSChartResource.Report.Item.BarMergin.Top,Left:g_JSChartResource.Report.Item.BarMergin.Left,Right:g_JSChartResource.Report.Item.BarMergin.Right,Bottom:g_JSChartResource.Report.Item.BarMergin.Bottom};this.LimitBorderColor=g_JSChartResource.Report.LimitBorder.Color;this.LimitMergin={Top:g_JSChartResource.Report.LimitBorder.Mergin.Top,Left:g_JSChartResource.Report.LimitBorder.Mergin.Left,Right:g_JSChartResource.Report.LimitBorder.Mergin.Right,Bottom:g_JSChartResource.Report.LimitBorder.Mergin.Bottom};this.DragRowColor=g_JSChartResource.Report.DragRow.Color;this.DragRowTextColor=g_JSChartResource.Report.DragRow.TextColor;this.DragMoveRowColor=g_JSChartResource.Report.DragRow.MoveRowColor;this.DragSrcRowColor=g_JSChartResource.Report.DragRow.SrcRowColor;//排序图标
 this.SortConfig={Size:g_JSChartResource.Report.SortIcon.Size,Family:g_JSChartResource.Report.SortIcon.Family,Arrow:g_JSChartResource.Report.SortIcon.Arrow.slice(),Color:g_JSChartResource.Report.SortIcon.Color.slice(),Margin:{Left:g_JSChartResource.Report.SortIcon.Margin.Left,Bottom:g_JSChartResource.Report.SortIcon.Margin.Bottom}};for(var i=0;i<this.Column.length;++i){var item=this.Column[i];if(item.Type==REPORT_COLUMN_ID.INDEX_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Index;else if(item.Type==REPORT_COLUMN_ID.SYMBOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Symbol;else if(item.Type==REPORT_COLUMN_ID.NAME_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Name;else if(item.Type==REPORT_COLUMN_ID.VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.BUY_VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.SELL_VOL_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Vol;else if(item.Type==REPORT_COLUMN_ID.AMOUNT_ID)item.TextColor=g_JSChartResource.Report.FieldColor.Amount;else if(item.Type==REPORT_COLUMN_ID.VOL_IN_ID)item.TextColor=g_JSChartResource.Report.DownTextColor;else if(item.Type==REPORT_COLUMN_ID.VOL_OUT_ID)item.TextColor=g_JSChartResource.Report.UpTextColor;else item.TextColor=g_JSChartResource.Report.FieldColor.Text;}if(this.Tab)this.Tab.ReloadResource(resource);if(this.VScrollbar)this.VScrollbar.ReloadResource(resource);this.CheckBoxConfig=CloneData(g_JSChartResource.Report.CheckBox);this.LinkConfig=CloneData(g_JSChartResource.Report.Link);this.ProgressBarConfig=CloneData(g_JSChartResource.Report.ProgressBar);};this.CreateColumnItem=function(item){var colItem=this.GetDefaultColunm(item.Type);if(!colItem)return null;if(item.Title)colItem.Title=item.Title;if(IFrameSplitOperator.IsNonEmptyArray(item.AryTitle))colItem.AryTitle=item.AryTitle;if(item.TextAlign)colItem.TextAlign=item.TextAlign;if(item.TextColor)colItem.TextColor=item.TextColor;if(item.HeaderColor)colItem.HeaderColor=item.HeaderColor;if(item.MaxText)colItem.MaxText=item.MaxText;if(item.MaxText2)colItem.MaxText=item.MaxText2;if(item.TitleAlign)colItem.TitleAlign=item.TitleAlign;if(IFrameSplitOperator.IsNumber(item.Space))colItem.Space=item.Space;if(item.ID)colItem.ID=item.ID;if(item.FullColBGColor)colItem.FullColBGColor=item.FullColBGColor;//整列背景色
 if(item.HeaderBGColor)colItem.HeaderBGColor=item.HeaderBGColor;//表头背景色
-if(IFrameSplitOperator.IsNumber(item.Sort))colItem.Sort=item.Sort;if(IFrameSplitOperator.IsNumber(item.FixedWidth))colItem.FixedWidth=item.FixedWidth;if(IFrameSplitOperator.IsBool(item.EnableDragWidth))colItem.EnableDragWidth=item.EnableDragWidth;colItem.IsDrawCallback=false;if(IFrameSplitOperator.IsBool(item.IsDrawCallback))colItem.IsDrawCallback=item.IsDrawCallback;if(IFrameSplitOperator.IsBool(item.EnableFormatDrawInfoEvent))colItem.EnableFormatDrawInfoEvent=item.EnableFormatDrawInfoEvent;if(IFrameSplitOperator.IsNumber(item.FloatPrecision))colItem.FloatPrecision=item.FloatPrecision;//小数位数
+if(IFrameSplitOperator.IsNumber(item.Sort))colItem.Sort=item.Sort;if(IFrameSplitOperator.IsNumber(item.FixedWidth))colItem.FixedWidth=item.FixedWidth;else if(item.FixedWidth===null)colItem.FixedWidth=null;if(IFrameSplitOperator.IsBool(item.EnableDragWidth))colItem.EnableDragWidth=item.EnableDragWidth;colItem.IsDrawCallback=false;if(IFrameSplitOperator.IsBool(item.IsDrawCallback))colItem.IsDrawCallback=item.IsDrawCallback;if(IFrameSplitOperator.IsBool(item.EnableFormatDrawInfoEvent))colItem.EnableFormatDrawInfoEvent=item.EnableFormatDrawInfoEvent;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) 3=(>YClose =YClose <YClose)
 if(item.Icon)colItem.Icon=item.Icon;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;if(item.Sort==1||item.Sort==2)//1本地排序 2=远程排序
@@ -14256,7 +14257,7 @@ this.DrawLine=function(lineData,column,rtItem){if(!lineData)return false;if(!IFr
 {if(lineData.YClose==priceMax&&lineData.YClose==priceMin){priceMax=lineData.YClose+lineData.YClose*0.1;priceMin=lineData.YClose-lineData.YClose*0.1;}else{var distanceValue=Math.max(Math.abs(lineData.YClose-priceMax),Math.abs(lineData.YClose-priceMin));priceMax=lineData.YClose+distanceValue;priceMin=lineData.YClose-distanceValue;}}var Temp_GetYFromData=function Temp_GetYFromData(value){if(value<=priceMin)return bottom;if(value>=priceMax)return top;var value=height*(value-priceMin)/(priceMax-priceMin);return bottom-value;};this.Canvas.save();var yCenter=null;if(IFrameSplitOperator.IsNumber(lineData.YClose)){var y=Temp_GetYFromData(lineData.YClose);y=ToFixedPoint(y);yCenter=y;this.Canvas.setLineDash([2,2]);this.Canvas.strokeStyle=this.CloseLineConfig.YCloseColor;this.Canvas.beginPath();this.Canvas.moveTo(left,y);this.Canvas.lineTo(right,y);this.Canvas.stroke();this.Canvas.setLineDash([]);}if(lineData.Color)this.Canvas.strokeStyle=lineData.Color;else this.Canvas.strokeStyle=this.CloseLineConfig.CloseColor;var bFirstPoint=true;var ptFirst={};//第1个点
 var drawCount=0,x,y;for(var i=0;i<lineData.Data.length;++i){var value=lineData.Data[i];if(!IFrameSplitOperator.IsNumber(value))continue;x=Temp_GetXFromIndex(i);y=Temp_GetYFromData(value);if(bFirstPoint){this.Canvas.beginPath();this.Canvas.moveTo(x,y);bFirstPoint=false;ptFirst={X:x,Y:y};}else{this.Canvas.lineTo(x,y);}++drawCount;}if(drawCount>0){this.Canvas.stroke();if(column.IsDrawArea&&IFrameSplitOperator.IsNumber(yCenter)){this.Canvas.lineTo(x,yCenter);this.Canvas.lineTo(ptFirst.X,yCenter);this.Canvas.closePath();var areaColor=this.CloseLineConfig.AreaColor;if(lineData.AreaColor)areaColor=lineData.AreaColor;this.SetFillStyle(areaColor,left,top,left,bottom);this.Canvas.fill();}}this.Canvas.restore();};//klineData={ Data:[ open, high, low, close ] }
 this.DrawKLine=function(klineData,column,rtItem,data){if(column.IsDrawCallback)//外部处理输出格式
-{var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAW_KLINE);if(event||event.Callback){var sendData={Column:column,Data:data,KLineData:klineData,Rect:rtItem,PreventDefault:false};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}}if(!klineData)return;if(!IFrameSplitOperator.IsNonEmptyArray(klineData.Data))return;var high=klineData.Data[1];var low=klineData.Data[2];var aryKLine=[{Open:klineData.Data[0],High:high,Low:low,Close:klineData.Data[3]}];this.DrawKLineBar(aryKLine,high,low,rtItem);};this.DrawKLineBar=function(aryKLine,high,low,rtItem){var yMergin=4;var left=rtItem.Left+this.ItemMergin.Left;var width=rtItem.Width-this.ItemMergin.Left-this.ItemMergin.Right;var left=rtItem.Left+this.ItemMergin.Left;var top=rtItem.Top+this.ItemMergin.Top+yMergin;var height=rtItem.Height-this.ItemMergin.Top-this.ItemMergin.Bottom-yMergin*2;var right=left+width;var bottom=top+height;var Temp_GetYFromData=function Temp_GetYFromData(value){if(value<=low)return bottom;if(value>=high)return top;var value=height*(value-low)/(high-low);return bottom-value;};var dataWidth=this.KLineConfig.DataWidth;var distanceWidth=this.KLineConfig.DistanceWidth;var xOffset=left;var x,xLeft,xRight;for(var i=0;i<aryKLine.length;++i,xOffset+=dataWidth+distanceWidth){var item=aryKLine[i];xLeft=xOffset;xRight=xOffset+dataWidth;x=xLeft+(xRight-xLeft)/2;if(xRight>right)break;var yLow=Temp_GetYFromData(item.Low,false);var yHigh=Temp_GetYFromData(item.High,false);var yOpen=Temp_GetYFromData(item.Open,false);var yClose=Temp_GetYFromData(item.Close,false);var y=yHigh;if(item.Open<item.Close)//阳线
+{var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAW_KLINE);if(event||event.Callback){var sendData={Column:column,Data:data,KLineData:klineData,Rect:rtItem,PreventDefault:false};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}}if(!klineData)return;var aryKLine=[];var high=null,low=null;if(IFrameSplitOperator.IsNonEmptyArray(klineData.AryData)){for(var i=0;i<klineData.AryData.length;++i){var item=klineData.AryData[i];var kItem={Open:item[0],High:item[1],Low:item[2],Close:item[3]};if(high==null||high<item[1])high=item[1];if(low==null||low>item[2])low=item[2];aryKLine.push(kItem);}}else if(IFrameSplitOperator.IsNonEmptyArray(klineData.Data)){high=klineData.Data[1];low=klineData.Data[2];var kItem={Open:klineData.Data[0],High:high,Low:low,Close:klineData.Data[3]};aryKLine.push(kItem);}if(!IFrameSplitOperator.IsNonEmptyArray(aryKLine))return;this.DrawKLineBar(aryKLine,high,low,rtItem);};this.DrawKLineBar=function(aryKLine,high,low,rtItem){var yMergin=4;var left=rtItem.Left+this.ItemMergin.Left;var width=rtItem.Width-this.ItemMergin.Left-this.ItemMergin.Right;var left=rtItem.Left+this.ItemMergin.Left;var top=rtItem.Top+this.ItemMergin.Top+yMergin;var height=rtItem.Height-this.ItemMergin.Top-this.ItemMergin.Bottom-yMergin*2;var right=left+width;var bottom=top+height;var Temp_GetYFromData=function Temp_GetYFromData(value){if(value<=low)return bottom;if(value>=high)return top;var value=height*(value-low)/(high-low);return bottom-value;};var dataWidth=this.KLineConfig.DataWidth;var distanceWidth=this.KLineConfig.DistanceWidth;var xOffset=left;var x,xLeft,xRight;for(var i=0;i<aryKLine.length;++i,xOffset+=dataWidth+distanceWidth){var item=aryKLine[i];xLeft=xOffset;xRight=xOffset+dataWidth;x=xLeft+(xRight-xLeft)/2;if(xRight>right)break;var yLow=Temp_GetYFromData(item.Low,false);var yHigh=Temp_GetYFromData(item.High,false);var yOpen=Temp_GetYFromData(item.Open,false);var yClose=Temp_GetYFromData(item.Close,false);var y=yHigh;if(item.Open<item.Close)//阳线
 {this.DrawKBarItem(item,dataWidth,this.KLineConfig.UpColor,1,xLeft,xRight,yLow,yHigh,yOpen,yClose);}else if(item.Open>item.Close)//阴线
 {this.DrawKBarItem(item,dataWidth,this.KLineConfig.DownColor,0,xLeft,xRight,yLow,yHigh,yOpen,yClose);}else//平线
 {this.DrawKBarItem(item,dataWidth,this.KLineConfig.UnchagneColor,0,xLeft,xRight,yLow,yHigh,yOpen,yClose);}}};this.DrawKBarItem=function(data,dataWidth,barColor,drawType,left,right,yLow,yHigh,yOpen,yClose){var isEmptyBar=false;if(drawType==1)isEmptyBar=true;var yBarTop=Math.min(yOpen,yClose);var yBarBottom=Math.max(yOpen,yClose);var barTopValue=Math.max(data.Open,data.Close);var barBottomValue=Math.min(data.Open,data.Close);this.Canvas.fillStyle=barColor;this.Canvas.strokeStyle=barColor;var x=left+(right-left)/2;if(isEmptyBar){if(dataWidth%2!=0)dataWidth-=1;}if(dataWidth>=4){if(data.High>barTopValue){this.Canvas.beginPath();var xBar=x;if(isEmptyBar)xBar=left+dataWidth/2;this.Canvas.moveTo(ToFixedPoint(xBar),ToFixedPoint(yBarTop));this.Canvas.lineTo(ToFixedPoint(xBar),ToFixedPoint(yHigh));this.Canvas.stroke();}if(Math.abs(yBarBottom-yBarTop)<1){this.Canvas.fillRect(ToFixedRect(left),ToFixedRect(yBarTop),ToFixedRect(dataWidth),1);//高度小于1,统一使用高度1
@@ -14268,7 +14269,7 @@ this.GetNameColor=function(colunmInfo,symbol,rowType){var event=this.GetEventCal
 }var row=this.PtInBody(x,y);if(row){var btnStatus={Redraw:false};this.OnClickButton(x,y,e,btnStatus);var bRedraw=true;if(this.MultiSelectModel==1){if(e&&e.ctrlKey)//多选
 {var pos=this.MultiSelectedRow.indexOf(row.DataIndex);if(pos>=0)this.MultiSelectedRow.splice(pos,1);else this.MultiSelectedRow.push(row.DataIndex);}else if(e&&e.shiftKey)//批量多选
 {this.OnShiftClickRow(row);}else{if(this.MultiSelectedRow.length==1&&this.MultiSelectedRow[0]==row.DataIndex)bRedraw=false;else this.MultiSelectedRow=[row.DataIndex];}this.SelectedFixedRow=-1;}else{if(this.SelectedModel==0){if(this.SelectedRowData&&this.SelectedRowData.Index==row.Index&&this.SelectedRowData.Symbol==row.Symbol)bRedraw=false;this.SelectedRowData={Index:row.Index,Symbol:row.Symbol};this.SelectedFixedRow=-1;}else{if(this.SelectedRowData&&this.SelectedRowData.DataIndex==row.DataIndex&&this.SelectedRowData.Symbol==row.Symbol)bRedraw=false;this.SelectedRowData={DataIndex:row.DataIndex,Symbol:row.Symbol};this.SelectedFixedRow=-1;}}var eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_ROW;if(e.button==2)eventID=JSCHART_EVENT_ID.ON_RCLICK_REPORT_ROW;this.SendClickEvent(eventID,{Data:row,X:x,Y:y,e:e,Inside:insidePoint,UIElement:uiElement});return{Type:2,Redraw:bRedraw||btnStatus.Redraw,Row:row};//行
-}var header=this.PtInHeader(x,y);if(header){var eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;if(e.button==2){eventID=JSCHART_EVENT_ID.ON_RCLICK_REPORT_HEADER;}else if(e.button==0){eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;}this.SendClickEvent(eventID,{Data:row,X:x,Y:y,e:e,Inside:insidePoint,UIElement:uiElement});return{Type:3,Redraw:bRedraw,Header:header};//表头
+}var header=this.PtInHeader(x,y);if(header){var eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;if(e.button==2){eventID=JSCHART_EVENT_ID.ON_RCLICK_REPORT_HEADER;}else if(e.button==0){eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;}this.SendClickEvent(eventID,{Data:header,X:x,Y:y,e:e,Inside:insidePoint,UIElement:uiElement});return{Type:3,Redraw:bRedraw,Header:header};//表头
 }return null;};this.OnShiftClickRow=function(row){if(this.MultiSelectedRow.length<=0){this.MultiSelectedRow.push(row.DataIndex);return;}var max=null,min=null;for(var i=0;i<this.MultiSelectedRow.length;++i){var value=this.MultiSelectedRow[i];if(max==null||max<value)max=value;if(min==null||min>value)min=value;if(value==row.DataIndex)//移除
 {this.MultiSelectedRow.splice(i,1);return;}}if(max==min){var start=row.DataIndex,end=max;if(start>end){start=max;end=row.DataIndex;}this.MultiSelectedRow=[];for(var i=start;i<=end;++i){this.MultiSelectedRow.push(i);}}else{if(row.DataIndex<=max&&row.DataIndex>=min){this.MultiSelectedRow.push(row.DataIndex);}else{var start=Math.min(row.DataIndex,min);var end=Math.max(row.DataIndex,max);this.MultiSelectedRow=[];for(var i=start;i<=end;++i){this.MultiSelectedRow.push(i);}}}};this.OnDragRow=function(x,y,e)//Type: 5=顶部  6=空白行 2=行 7=底部
 {if(!this.Data)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var topOffset=this.RowHeight/2;var top=this.RectClient.Top+this.HeaderHeight;var right=this.ChartBorder.GetChartWidth();var textTop=top+this.FixedRowHeight*this.FixedRowCount;if(y<textTop+topOffset)return{Type:5};for(var i=this.Data.YOffset,j=0;i<this.Data.Data.length&&j<this.RowCount;++i,++j){var symbol=this.Data.Data[i];var rtRow={Left:0,Top:textTop,Right:right,Bottom:textTop+this.RowHeight};rtRow.Top+=topOffset;rtRow.Bottom+=topOffset;if(x>=rtRow.Left&&x<=rtRow.Right&&y>=rtRow.Top&&y<=rtRow.Bottom){var data={DataIndex:i,Index:j,Symbol:symbol,Pos:0};if(j==0)data.Pos=1;else if(j==this.RowCount-1)data.Pos=2;return{Type:2,Data:data};}textTop+=this.RowHeight;}if(j<this.RowCount)return{Type:6};return{Type:7};};this.OnDragHeader=function(x,y,e)//Type:1=行 2=左边  3=右边 4=空白 5=固定行
@@ -15105,7 +15106,7 @@ this.SelectedClassName="UMyChart_MenuItem_Tr_Selected";this.RestoreFocusDelay=10
 "UMyChart_MenuItem_Td_Arrow"//箭头
 ];this.Inital=function(hqchart,option){this.HQChart=hqchart;this.MouseDownlistenerPtr=this.OnWindowMouseDown.bind(this);window.addEventListener('mousedown',this.MouseDownlistenerPtr);};this.Destroy=function(){if(this.MouseDownlistenerPtr){window.removeEventListener('mousedown',this.MouseDownlistenerPtr);this.MouseDownlistenerPtr=null;}};//创建菜单
 this.CreatePopMenu=function(data){this.Clear();if(!IFrameSplitOperator.IsNonEmptyArray(data.Menu))return;var root=document.createElement("div");root.className="UMyChart_PopMenu";var table=document.createElement("table");table.className="UMyChart_PopMenu_Table";root.appendChild(table);var tbody=document.createElement("tbody");tbody.className="UMyChart_PopMenu_Tbody";table.appendChild(tbody);var rootData={Root:root,TBody:tbody,Table:table};root.JSMenuData=rootData;for(var i=0;i<data.Menu.length;++i){var item=data.Menu[i];if(item.Name==JSPopMenu.SEPARATOR_LINE_NAME){var trSeparator=this.CreateSeparatorTr();if(trSeparator)tbody.appendChild(trSeparator);continue;}var trDom=this.CreateMenu(rootData,item);tbody.appendChild(trDom);}document.body.appendChild(root);this.RootDOM=root;this.TBodyDOM=tbody;if(IFrameSplitOperator.IsNumber(data.Position))this.Data.Position=data.Position;if(data.ClickCallback)this.ClickCallback=data.ClickCallback;if(data.RestoreFocusCallback)this.RestoreFocusCallback=data.RestoreFocusCallback;};//清除菜单
-this.Clear=function(){this.Data.Menu=[];this.Data.Position=JSPopMenu.POSITION_ID.RIGHT_MENU_ID;this.ClickCallback=null;if(!this.RootDOM)return;document.body.removeChild(this.RootDOM);this.RootDOM=null;this.TBodyDOM=null;for(var i=0;i<this.ArySubRootDOM.length;++i){document.body.removeChild(this.ArySubRootDOM[i]);}this.ArySubRootDOM=[];};this.CreateMenu=function(parentItem,item){var _this87=this;var trDom=document.createElement("tr");trDom.className='UMyChart_MenuItem_Tr';if(item.Disable===true)trDom.classList.add('UMyChart_DrawTool_Disable_Tr');var prtTdDom=null;for(var i=0;i<this.AryTDClassName.length;++i){var tdDom=document.createElement("td");tdDom.className=this.AryTDClassName[i];if(i==0)//图标
+this.Clear=function(){this.Data.Menu=[];this.Data.Position=JSPopMenu.POSITION_ID.RIGHT_MENU_ID;this.ClickCallback=null;if(!this.RootDOM)return;document.body.removeChild(this.RootDOM);this.RootDOM=null;this.TBodyDOM=null;for(var i=0;i<this.ArySubRootDOM.length;++i){document.body.removeChild(this.ArySubRootDOM[i]);}this.ArySubRootDOM=[];};this.CreateMenu=function(parentItem,item){var _this87=this;var trDom=document.createElement("tr");trDom.className='UMyChart_MenuItem_Tr';if(item.Disable===true)trDom.classList.add('UMyChart_DrawTool_Disable_Tr');var prtTdDom=null;var aryTDClassName=this.AryTDClassName;if(IFrameSplitOperator.IsNonEmptyArray(item.AryTDClassName))aryTDClassName=item.AryTDClassName;for(var i=0;i<aryTDClassName.length;++i){var tdDom=document.createElement("td");tdDom.className=aryTDClassName[i];if(i==0)//图标
 {if(item.Checked){var spanDom=document.createElement("span");spanDom.className=this.CheckedClassName;spanDom.style["font-size"]="10px";tdDom.appendChild(spanDom);}}else if(i==1)//内容
 {tdDom.innerText=item.Name;}else if(i==2)//快捷方式
 {if(item.Text)tdDom.innerText=item.Text;}else if(i==3)//箭头
@@ -15645,7 +15646,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.15236";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n*                                                                                                                                                                                                                                                                                                                                        \n*                                                                                           :%@@-                                                                        \n*                                                                                          :@@@@-                                                                        \n*            =@@@@          :#@@@           .:+#@@@#=:                    :=*@@@@@@#+-.    *@@@@.                                                                        \n*           :@@@@@         .@@@@@         .#@@@@@@@@@@@-                +@@@@@@@@@@@@@+    @@@@@                                                     -%@@*               \n*           +@@@@%         #@@@@#        *@@@@@@@@@@@@@@%.            =@@@@@@@@@@@@@@@-    @@@@@                                                    -@@@@+               \n*           %@@@@*         @@@@@+      .%@@@@@@@@@@@@@@@@%:          #@@@@@@@@@@@@@@@%     @@@@#                                                    *@@@@=               \n*           @@@@@=         @@@@@-     .%@@@@@@@*++*%@@@@@@%        .%@@@@@@@%*+==+**=     -@@@@+                                                    #@@@@-               \n*           @@@@@.         @@@@@.     #@@@@@%=      =@@@@@@*       %@@@@@@#:              *@@@@-   :::.           .-+*###+:          :::  .+##+: -%%@@@@@%%%%            \n*          .@@@@@         .@@@@@.    +@@@@@%         .@@@@@@      *@@@@@@:                %@@@@: +@@@@@%.       :%@@@@@@@@@@:       *@@@ :@@@@@* @@@@@@@@@@@@            \n*          :@@@@@         :@@@@@     @@@@@%           :@@@@@+     @@@@@@:                 %@@@@-@@@@@@@@@.      @@@@@@@@@@@@@.     :@@@%-@@@@@@.:@@@@@@@@@@@#            \n*          -@@@@%         -@@@@@    =@@@@@.            %@@@@%    %@@@@@-                  %@@@@@@@@@@@@@@*      %@@@@@@@@@@@@+     -@@@@@@@@@@# -@@@@@@@@@@@.            \n*          +@@@@%=========#@@@@%    @@@@@#             :@@@@@   .@@@@@%                   @@@@@@@@%@@@@@@@      -%+:.  .#@@@@*     +@@@@@@@%%@. .::+@@@@#::              \n*          #@@@@@@@@@@@@@@@@@@@#   .@@@@@              .@@@@@   :@@@@@.                   @@@@@@#.  #@@@@@.             -@@@@*     #@@@@@@:        *@@@@+                \n*          %@@@@@@@@@@@@@@@@@@@+   :@@@@@              .@@@@@   -@@@@@                    @@@@@+     @@@@@.             :@@@@*     @@@@@%          #@@@@-                \n*          @@@@@@@@@@@@@@@@@@@@:   :@@@@%              :@@@@@   +@@@@%                   -@@@@+      @@@@@              -@@@@+     @@@@@.          @@@@@.                \n*         .@@@@@@@@@@@@@@@@@@@@    :@@@@%              -@@@@%   *@@@@%                   #@@@@.      @@@@@       .=*#%%%@@@@@=    :@@@@#           @@@@@.                \n*         -@@@@@:::::::::=@@@@@    :@@@@@              @@@@@*   +@@@@%                   @@@@@       @@@@%     -#@@@@@@@@@@@@:    -@@@@*           @@@@@                 \n*         =@@@@%         =@@@@%    .@@@@@             :@@@@@.   -@@@@%                   @@@@@      .@@@@*    +@@@@@@@@@@@@@@.    =@@@@+          .@@@@@                 \n*         +@@@@#         +@@@@#     @@@@@#            %@@@@%    :@@@@@                  .@@@@%      =@@@@=   -@@@@@*-:..%@@@@     +@@@@=          :@@@@#                 \n*         *@@@@*         *@@@@*     +@@@@@:          #@@@@@+    .@@@@@@                 :@@@@%      *@@@@-   @@@@@.     @@@@%     #@@@@:          =@@@@+                 \n*         %@@@@=         %@@@@+      @@@@@@-       .%@@@@@#      #@@@@@#                :@@@@%      #@@@@:   @@@@%      @@@@*     %@@@@.          #@@@@-                 \n*         @@@@@-         @@@@@=      =@@@@@@#=...-*@@@@@@@:       @@@@@@%=.    :+**.    :@@@@*      %@@@@.  .@@@@*     *@@@@=     @@@@@           %@@@@+                 \n*        .@@@@@:        .@@@@@:       *@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@%%%@@@@@@    +@@@@-      @@@@@   .@@@@@:  :%@@@@@-    .@@@@%           %@@@@@*+-              \n*        :@@@@@         :@@@@@         +@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@@@@@@@@@%   %@@@@       @@@@@    @@@@@@@@@@@@@@@:    -@@@@*           *@@@@@@@@-             \n*        =@@@@@         -@@@@@          :@@@@@@@@@@@@@@@@@@@#       :@@@@@@@@@@@@@@@%   @@@@@       %@@@%    #@@@@@@@@@#@@@@.    +@@@@-           .@@@@@@@@#             \n*        *@@@@#         =@@@@%            :#@@@@@@@#: :@@@@@=         =@@@@@@@@@@@+.    @@@@@       :@@@+     *@@@@@@@- %@@@     *@@@=             =@@@@@@@*             \n*        =++++-         -++++=               .:::.     .=*+:            :-=+++=:.       ****=        .=+.      .-++=:   :+++     -+=:               .-=+=:.     \n*        \n*        \n*        HQChart       \n*        Ver: '+HQCHART_VERSION+'  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.15244";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n*                                                                                                                                                                                                                                                                                                                                        \n*                                                                                           :%@@-                                                                        \n*                                                                                          :@@@@-                                                                        \n*            =@@@@          :#@@@           .:+#@@@#=:                    :=*@@@@@@#+-.    *@@@@.                                                                        \n*           :@@@@@         .@@@@@         .#@@@@@@@@@@@-                +@@@@@@@@@@@@@+    @@@@@                                                     -%@@*               \n*           +@@@@%         #@@@@#        *@@@@@@@@@@@@@@%.            =@@@@@@@@@@@@@@@-    @@@@@                                                    -@@@@+               \n*           %@@@@*         @@@@@+      .%@@@@@@@@@@@@@@@@%:          #@@@@@@@@@@@@@@@%     @@@@#                                                    *@@@@=               \n*           @@@@@=         @@@@@-     .%@@@@@@@*++*%@@@@@@%        .%@@@@@@@%*+==+**=     -@@@@+                                                    #@@@@-               \n*           @@@@@.         @@@@@.     #@@@@@%=      =@@@@@@*       %@@@@@@#:              *@@@@-   :::.           .-+*###+:          :::  .+##+: -%%@@@@@%%%%            \n*          .@@@@@         .@@@@@.    +@@@@@%         .@@@@@@      *@@@@@@:                %@@@@: +@@@@@%.       :%@@@@@@@@@@:       *@@@ :@@@@@* @@@@@@@@@@@@            \n*          :@@@@@         :@@@@@     @@@@@%           :@@@@@+     @@@@@@:                 %@@@@-@@@@@@@@@.      @@@@@@@@@@@@@.     :@@@%-@@@@@@.:@@@@@@@@@@@#            \n*          -@@@@%         -@@@@@    =@@@@@.            %@@@@%    %@@@@@-                  %@@@@@@@@@@@@@@*      %@@@@@@@@@@@@+     -@@@@@@@@@@# -@@@@@@@@@@@.            \n*          +@@@@%=========#@@@@%    @@@@@#             :@@@@@   .@@@@@%                   @@@@@@@@%@@@@@@@      -%+:.  .#@@@@*     +@@@@@@@%%@. .::+@@@@#::              \n*          #@@@@@@@@@@@@@@@@@@@#   .@@@@@              .@@@@@   :@@@@@.                   @@@@@@#.  #@@@@@.             -@@@@*     #@@@@@@:        *@@@@+                \n*          %@@@@@@@@@@@@@@@@@@@+   :@@@@@              .@@@@@   -@@@@@                    @@@@@+     @@@@@.             :@@@@*     @@@@@%          #@@@@-                \n*          @@@@@@@@@@@@@@@@@@@@:   :@@@@%              :@@@@@   +@@@@%                   -@@@@+      @@@@@              -@@@@+     @@@@@.          @@@@@.                \n*         .@@@@@@@@@@@@@@@@@@@@    :@@@@%              -@@@@%   *@@@@%                   #@@@@.      @@@@@       .=*#%%%@@@@@=    :@@@@#           @@@@@.                \n*         -@@@@@:::::::::=@@@@@    :@@@@@              @@@@@*   +@@@@%                   @@@@@       @@@@%     -#@@@@@@@@@@@@:    -@@@@*           @@@@@                 \n*         =@@@@%         =@@@@%    .@@@@@             :@@@@@.   -@@@@%                   @@@@@      .@@@@*    +@@@@@@@@@@@@@@.    =@@@@+          .@@@@@                 \n*         +@@@@#         +@@@@#     @@@@@#            %@@@@%    :@@@@@                  .@@@@%      =@@@@=   -@@@@@*-:..%@@@@     +@@@@=          :@@@@#                 \n*         *@@@@*         *@@@@*     +@@@@@:          #@@@@@+    .@@@@@@                 :@@@@%      *@@@@-   @@@@@.     @@@@%     #@@@@:          =@@@@+                 \n*         %@@@@=         %@@@@+      @@@@@@-       .%@@@@@#      #@@@@@#                :@@@@%      #@@@@:   @@@@%      @@@@*     %@@@@.          #@@@@-                 \n*         @@@@@-         @@@@@=      =@@@@@@#=...-*@@@@@@@:       @@@@@@%=.    :+**.    :@@@@*      %@@@@.  .@@@@*     *@@@@=     @@@@@           %@@@@+                 \n*        .@@@@@:        .@@@@@:       *@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@%%%@@@@@@    +@@@@-      @@@@@   .@@@@@:  :%@@@@@-    .@@@@%           %@@@@@*+-              \n*        :@@@@@         :@@@@@         +@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@@@@@@@@@%   %@@@@       @@@@@    @@@@@@@@@@@@@@@:    -@@@@*           *@@@@@@@@-             \n*        =@@@@@         -@@@@@          :@@@@@@@@@@@@@@@@@@@#       :@@@@@@@@@@@@@@@%   @@@@@       %@@@%    #@@@@@@@@@#@@@@.    +@@@@-           .@@@@@@@@#             \n*        *@@@@#         =@@@@%            :#@@@@@@@#: :@@@@@=         =@@@@@@@@@@@+.    @@@@@       :@@@+     *@@@@@@@- %@@@     *@@@=             =@@@@@@@*             \n*        =++++-         -++++=               .:::.     .=*+:            :-=+++=:.       ****=        .=+.      .-++=:   :+++     -+=:               .-=+=:.     \n*        \n*        \n*        HQChart       \n*        Ver: '+HQCHART_VERSION+'  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.15237",
+  "version": "1.1.15245",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -57501,6 +57501,16 @@ HQData.Report_RequestStockData=function(data, callback)
 
                 //K线
                 var kData={ Data:[newItem[3], newItem[4], newItem[5], newItem[6]] };
+                //多根K线使用AryData， 单根K线用Data
+                kData.AryData=
+                [
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                ]
                 newItem[33]=kData;
 
 

package/src/jscommon/umychart.js

@@ -319,11 +319,14 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         {
             var item=option.GlobalOption;
             if (IFrameSplitOperator.IsBool(item.IsValueFullRange)) chart.GlobalOption.IsValueFullRange=item.IsValueFullRange;
+            if (IFrameSplitOperator.IsBool(item.EnableXShortDate)) chart.GlobalOption.EnableXShortDate=item.EnableXShortDate;
+            
             if (item.SelectedBorder)
             {
                 var subItem=item.SelectedBorder;
                 if (IFrameSplitOperator.IsNumber(subItem.Mode)) chart.GlobalOption.SelectedBorder.Mode=subItem.Mode;
             }
+            
         }
 
         if (option.EnableYDrag)
@@ -3395,6 +3398,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         TradeStatus:null,   //当前交易状态 { Date, Time：数据最后更新的时间, Status: }
 
         LatestPoint:null,   //最新的点位置 { X:, Y: }
+
+        EnableXShortDate:true,
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -16716,11 +16721,13 @@ function MinuteFrame()
 
     this.DrawToolbar=function()
     {
-        if (this.ToolbarButtonStyle==1) return;
-        if (g_JSChartResource.IsDOMFrameToolbar===true) return;
-
+        var bDraw=true;
+        if (this.ToolbarButtonStyle==1) bDraw=false;
+        if (g_JSChartResource.IsDOMFrameToolbar===true) bDraw=false;
         if (!this.DivFrameToolbar) return;
-        this.DivFrameToolbar.Show(this.Identify);
+
+        if (!bDraw) this.HideToolbar();
+        else this.DivFrameToolbar.Show(this.Identify);
     }
 
     //手绘,不用DOM,使用DOM太麻烦了
@@ -18951,11 +18958,13 @@ function KLineFrame()
 
     this.DrawToolbar=function()
     {
-        if (this.ToolbarButtonStyle==1) return;
-        if (g_JSChartResource.IsDOMFrameToolbar===true) return;
+        var bDraw=true;
+        if (this.ToolbarButtonStyle==1) bDraw=false;
+        if (g_JSChartResource.IsDOMFrameToolbar===true) bDraw=false;
         if (!this.DivFrameToolbar) return;
 
-        this.DivFrameToolbar.Show(this.Identify);
+        if (!bDraw) this.HideToolbar();
+        else this.DivFrameToolbar.Show(this.Identify);
     }
 
     //手绘,不用DOM,使用DOM太麻烦了
@@ -30396,7 +30405,7 @@ function ChartKLine()
         {
             var left=this.ChartBorder.GetLeft();
             var right=this.ChartBorder.GetRight();
-            var top=this.ChartBorder.GetTopEx();
+            var top=this.ChartBorder.GetTop();
             var bottom=this.ChartBorder.GetBottom();
         }
 
@@ -56987,6 +56996,7 @@ function FrameSplitKLineX()
         var lastYear=null, lastMonth=null;
         var minDistance=12;
         var monthCount=0;
+        var globalOption=this.Frame.GlobalOption;
         for(var i=0, index=xOffset, distance=minDistance;i<xPointCount && index<this.Frame.Data.Data.length ;++i,++index)
         {
             var year=parseInt(this.Frame.Data.Data[index].Date/10000);
@@ -57024,12 +57034,14 @@ function FrameSplitKLineX()
             this.Frame.VerticalInfo.push(info);
             distance=0;
         }
-
-        if (this.Period==0 && monthCount<=2)
+                  
+        var bShowShortDate=true;  //日线显示在2个月以下的 显示格式
+        if (globalOption && IFrameSplitOperator.IsBool(globalOption.EnableXShortDate)) bShowShortDate=globalOption.EnableXShortDate;
+        if (bShowShortDate && this.Period==0 && monthCount<=2)
             this.SplitShortDate();
     }
 
-    //分隔在2个月一下的格式
+    //分隔在2个月以内的格式
     this.SplitShortDate=function()
     {
         this.Frame.VerticalInfo=[];

package/src/jscommon/umychart.popMenu.js

@@ -125,10 +125,12 @@ function JSPopMenu()
         if (item.Disable===true) trDom.classList.add('UMyChart_DrawTool_Disable_Tr');
         
         var prtTdDom=null;
-        for(var i=0;i<this.AryTDClassName.length;++i)
+        var aryTDClassName=this.AryTDClassName;
+        if (IFrameSplitOperator.IsNonEmptyArray(item.AryTDClassName)) aryTDClassName=item.AryTDClassName;
+        for(var i=0;i<aryTDClassName.length;++i)
         {
             var tdDom=document.createElement("td");
-            tdDom.className=this.AryTDClassName[i];
+            tdDom.className=aryTDClassName[i];
 
             if (i==0)   //图标
             {

package/src/jscommon/umychart.report.js

@@ -5494,6 +5494,7 @@ function ChartReport()
         if (item.HeaderBGColor) colItem.HeaderBGColor=item.HeaderBGColor;       //表头背景色
         if (IFrameSplitOperator.IsNumber(item.Sort)) colItem.Sort=item.Sort;
         if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
+        else if (item.FixedWidth===null) colItem.FixedWidth=null;
         if (IFrameSplitOperator.IsBool(item.EnableDragWidth)) colItem.EnableDragWidth=item.EnableDragWidth;
 
         colItem.IsDrawCallback=false;
@@ -8841,15 +8842,29 @@ function ChartReport()
         }
 
         if (!klineData) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(klineData.Data)) return;
-
-        var high=klineData.Data[1];
-        var low=klineData.Data[2];
-        var aryKLine=
-        [ 
-            { Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3]}, 
-            //{ Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3]}  
-        ];
+        var aryKLine=[];
+        var high=null, low=null;
+        if (IFrameSplitOperator.IsNonEmptyArray(klineData.AryData))
+        {
+            for(var i=0;i<klineData.AryData.length;++i)
+            {
+                var item=klineData.AryData[i];
+                var kItem={ Open:item[0], High:item[1], Low:item[2], Close:item[3] };
+                if (high==null || high<item[1]) high=item[1];
+                if (low==null || low>item[2]) low=item[2];
+                aryKLine.push(kItem);
+            }
+        }
+        else if (IFrameSplitOperator.IsNonEmptyArray(klineData.Data))
+        {
+            high=klineData.Data[1];
+            low=klineData.Data[2];
+            var kItem={ Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3] };
+            aryKLine.push(kItem);
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryKLine)) return;
+       
         this.DrawKLineBar(aryKLine, high, low, rtItem);
     }
 
@@ -9153,7 +9168,7 @@ function ChartReport()
                 eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;
             }
 
-            this.SendClickEvent(eventID, { Data:row, X:x, Y:y , e:e, Inside:insidePoint, UIElement:uiElement});
+            this.SendClickEvent(eventID, { Data:header, X:x, Y:y , e:e, Inside:insidePoint, UIElement:uiElement});
             return { Type:3, Redraw:bRedraw, Header:header };  //表头
         }
 

package/src/jscommon/umychart.resource/css/tools.css

@@ -939,6 +939,11 @@ input[type="color"] {
     margin-right: 10px;
 }
 
+.UMyChart_MenuItem_Td_None
+{
+    display:none;
+}
+
 
 .UMyChart_MenuItem_Tr:hover
 {

package/src/jscommon/umychart.testdata.js

@@ -1987,6 +1987,16 @@ HQData.Report_RequestStockData=function(data, callback)
 
                 //K线
                 var kData={ Data:[newItem[3], newItem[4], newItem[5], newItem[6]] };
+                //多根K线使用AryData， 单根K线用Data
+                kData.AryData=
+                [
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                ]
                 newItem[33]=kData;
 
 

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

@@ -4415,11 +4415,14 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         {
             var item=option.GlobalOption;
             if (IFrameSplitOperator.IsBool(item.IsValueFullRange)) chart.GlobalOption.IsValueFullRange=item.IsValueFullRange;
+            if (IFrameSplitOperator.IsBool(item.EnableXShortDate)) chart.GlobalOption.EnableXShortDate=item.EnableXShortDate;
+            
             if (item.SelectedBorder)
             {
                 var subItem=item.SelectedBorder;
                 if (IFrameSplitOperator.IsNumber(subItem.Mode)) chart.GlobalOption.SelectedBorder.Mode=subItem.Mode;
             }
+            
         }
 
         if (option.EnableYDrag)
@@ -7491,6 +7494,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         TradeStatus:null,   //当前交易状态 { Date, Time：数据最后更新的时间, Status: }
 
         LatestPoint:null,   //最新的点位置 { X:, Y: }
+
+        EnableXShortDate:true,
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -20812,11 +20817,13 @@ function MinuteFrame()
 
     this.DrawToolbar=function()
     {
-        if (this.ToolbarButtonStyle==1) return;
-        if (g_JSChartResource.IsDOMFrameToolbar===true) return;
-
+        var bDraw=true;
+        if (this.ToolbarButtonStyle==1) bDraw=false;
+        if (g_JSChartResource.IsDOMFrameToolbar===true) bDraw=false;
         if (!this.DivFrameToolbar) return;
-        this.DivFrameToolbar.Show(this.Identify);
+
+        if (!bDraw) this.HideToolbar();
+        else this.DivFrameToolbar.Show(this.Identify);
     }
 
     //手绘,不用DOM,使用DOM太麻烦了
@@ -23047,11 +23054,13 @@ function KLineFrame()
 
     this.DrawToolbar=function()
     {
-        if (this.ToolbarButtonStyle==1) return;
-        if (g_JSChartResource.IsDOMFrameToolbar===true) return;
+        var bDraw=true;
+        if (this.ToolbarButtonStyle==1) bDraw=false;
+        if (g_JSChartResource.IsDOMFrameToolbar===true) bDraw=false;
         if (!this.DivFrameToolbar) return;
 
-        this.DivFrameToolbar.Show(this.Identify);
+        if (!bDraw) this.HideToolbar();
+        else this.DivFrameToolbar.Show(this.Identify);
     }
 
     //手绘,不用DOM,使用DOM太麻烦了
@@ -34492,7 +34501,7 @@ function ChartKLine()
         {
             var left=this.ChartBorder.GetLeft();
             var right=this.ChartBorder.GetRight();
-            var top=this.ChartBorder.GetTopEx();
+            var top=this.ChartBorder.GetTop();
             var bottom=this.ChartBorder.GetBottom();
         }
 
@@ -61083,6 +61092,7 @@ function FrameSplitKLineX()
         var lastYear=null, lastMonth=null;
         var minDistance=12;
         var monthCount=0;
+        var globalOption=this.Frame.GlobalOption;
         for(var i=0, index=xOffset, distance=minDistance;i<xPointCount && index<this.Frame.Data.Data.length ;++i,++index)
         {
             var year=parseInt(this.Frame.Data.Data[index].Date/10000);
@@ -61120,12 +61130,14 @@ function FrameSplitKLineX()
             this.Frame.VerticalInfo.push(info);
             distance=0;
         }
-
-        if (this.Period==0 && monthCount<=2)
+                  
+        var bShowShortDate=true;  //日线显示在2个月以下的 显示格式
+        if (globalOption && IFrameSplitOperator.IsBool(globalOption.EnableXShortDate)) bShowShortDate=globalOption.EnableXShortDate;
+        if (bShowShortDate && this.Period==0 && monthCount<=2)
             this.SplitShortDate();
     }
 
-    //分隔在2个月一下的格式
+    //分隔在2个月以内的格式
     this.SplitShortDate=function()
     {
         this.Frame.VerticalInfo=[];
@@ -145904,6 +145916,7 @@ function ChartReport()
         if (item.HeaderBGColor) colItem.HeaderBGColor=item.HeaderBGColor;       //表头背景色
         if (IFrameSplitOperator.IsNumber(item.Sort)) colItem.Sort=item.Sort;
         if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
+        else if (item.FixedWidth===null) colItem.FixedWidth=null;
         if (IFrameSplitOperator.IsBool(item.EnableDragWidth)) colItem.EnableDragWidth=item.EnableDragWidth;
 
         colItem.IsDrawCallback=false;
@@ -149251,15 +149264,29 @@ function ChartReport()
         }
 
         if (!klineData) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(klineData.Data)) return;
+        var aryKLine=[];
+        var high=null, low=null;
+        if (IFrameSplitOperator.IsNonEmptyArray(klineData.AryData))
+        {
+            for(var i=0;i<klineData.AryData.length;++i)
+            {
+                var item=klineData.AryData[i];
+                var kItem={ Open:item[0], High:item[1], Low:item[2], Close:item[3] };
+                if (high==null || high<item[1]) high=item[1];
+                if (low==null || low>item[2]) low=item[2];
+                aryKLine.push(kItem);
+            }
+        }
+        else if (IFrameSplitOperator.IsNonEmptyArray(klineData.Data))
+        {
+            high=klineData.Data[1];
+            low=klineData.Data[2];
+            var kItem={ Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3] };
+            aryKLine.push(kItem);
+        }
 
-        var high=klineData.Data[1];
-        var low=klineData.Data[2];
-        var aryKLine=
-        [ 
-            { Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3]}, 
-            //{ Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3]}  
-        ];
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryKLine)) return;
+       
         this.DrawKLineBar(aryKLine, high, low, rtItem);
     }
 
@@ -149563,7 +149590,7 @@ function ChartReport()
                 eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;
             }
 
-            this.SendClickEvent(eventID, { Data:row, X:x, Y:y , e:e, Inside:insidePoint, UIElement:uiElement});
+            this.SendClickEvent(eventID, { Data:header, X:x, Y:y , e:e, Inside:insidePoint, UIElement:uiElement});
             return { Type:3, Redraw:bRedraw, Header:header };  //表头
         }
 
@@ -154263,7 +154290,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15236";
+var HQCHART_VERSION="1.1.15244";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.15236";
+var HQCHART_VERSION="1.1.15244";
 
 function PrintHQChartVersion()
 {

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

@@ -57519,6 +57519,16 @@ HQData.Report_RequestStockData=function(data, callback)
 
                 //K线
                 var kData={ Data:[newItem[3], newItem[4], newItem[5], newItem[6]] };
+                //多根K线使用AryData， 单根K线用Data
+                kData.AryData=
+                [
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                    [newItem[3], newItem[4], newItem[5], newItem[6]],
+                ]
                 newItem[33]=kData;
 
 

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

@@ -4459,11 +4459,14 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         {
             var item=option.GlobalOption;
             if (IFrameSplitOperator.IsBool(item.IsValueFullRange)) chart.GlobalOption.IsValueFullRange=item.IsValueFullRange;
+            if (IFrameSplitOperator.IsBool(item.EnableXShortDate)) chart.GlobalOption.EnableXShortDate=item.EnableXShortDate;
+            
             if (item.SelectedBorder)
             {
                 var subItem=item.SelectedBorder;
                 if (IFrameSplitOperator.IsNumber(subItem.Mode)) chart.GlobalOption.SelectedBorder.Mode=subItem.Mode;
             }
+            
         }
 
         if (option.EnableYDrag)
@@ -7535,6 +7538,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         TradeStatus:null,   //当前交易状态 { Date, Time：数据最后更新的时间, Status: }
 
         LatestPoint:null,   //最新的点位置 { X:, Y: }
+
+        EnableXShortDate:true,
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -20856,11 +20861,13 @@ function MinuteFrame()
 
     this.DrawToolbar=function()
     {
-        if (this.ToolbarButtonStyle==1) return;
-        if (g_JSChartResource.IsDOMFrameToolbar===true) return;
-
+        var bDraw=true;
+        if (this.ToolbarButtonStyle==1) bDraw=false;
+        if (g_JSChartResource.IsDOMFrameToolbar===true) bDraw=false;
         if (!this.DivFrameToolbar) return;
-        this.DivFrameToolbar.Show(this.Identify);
+
+        if (!bDraw) this.HideToolbar();
+        else this.DivFrameToolbar.Show(this.Identify);
     }
 
     //手绘,不用DOM,使用DOM太麻烦了
@@ -23091,11 +23098,13 @@ function KLineFrame()
 
     this.DrawToolbar=function()
     {
-        if (this.ToolbarButtonStyle==1) return;
-        if (g_JSChartResource.IsDOMFrameToolbar===true) return;
+        var bDraw=true;
+        if (this.ToolbarButtonStyle==1) bDraw=false;
+        if (g_JSChartResource.IsDOMFrameToolbar===true) bDraw=false;
         if (!this.DivFrameToolbar) return;
 
-        this.DivFrameToolbar.Show(this.Identify);
+        if (!bDraw) this.HideToolbar();
+        else this.DivFrameToolbar.Show(this.Identify);
     }
 
     //手绘,不用DOM,使用DOM太麻烦了
@@ -34536,7 +34545,7 @@ function ChartKLine()
         {
             var left=this.ChartBorder.GetLeft();
             var right=this.ChartBorder.GetRight();
-            var top=this.ChartBorder.GetTopEx();
+            var top=this.ChartBorder.GetTop();
             var bottom=this.ChartBorder.GetBottom();
         }
 
@@ -61127,6 +61136,7 @@ function FrameSplitKLineX()
         var lastYear=null, lastMonth=null;
         var minDistance=12;
         var monthCount=0;
+        var globalOption=this.Frame.GlobalOption;
         for(var i=0, index=xOffset, distance=minDistance;i<xPointCount && index<this.Frame.Data.Data.length ;++i,++index)
         {
             var year=parseInt(this.Frame.Data.Data[index].Date/10000);
@@ -61164,12 +61174,14 @@ function FrameSplitKLineX()
             this.Frame.VerticalInfo.push(info);
             distance=0;
         }
-
-        if (this.Period==0 && monthCount<=2)
+                  
+        var bShowShortDate=true;  //日线显示在2个月以下的 显示格式
+        if (globalOption && IFrameSplitOperator.IsBool(globalOption.EnableXShortDate)) bShowShortDate=globalOption.EnableXShortDate;
+        if (bShowShortDate && this.Period==0 && monthCount<=2)
             this.SplitShortDate();
     }
 
-    //分隔在2个月一下的格式
+    //分隔在2个月以内的格式
     this.SplitShortDate=function()
     {
         this.Frame.VerticalInfo=[];
@@ -145948,6 +145960,7 @@ function ChartReport()
         if (item.HeaderBGColor) colItem.HeaderBGColor=item.HeaderBGColor;       //表头背景色
         if (IFrameSplitOperator.IsNumber(item.Sort)) colItem.Sort=item.Sort;
         if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
+        else if (item.FixedWidth===null) colItem.FixedWidth=null;
         if (IFrameSplitOperator.IsBool(item.EnableDragWidth)) colItem.EnableDragWidth=item.EnableDragWidth;
 
         colItem.IsDrawCallback=false;
@@ -149295,15 +149308,29 @@ function ChartReport()
         }
 
         if (!klineData) return;
-        if (!IFrameSplitOperator.IsNonEmptyArray(klineData.Data)) return;
+        var aryKLine=[];
+        var high=null, low=null;
+        if (IFrameSplitOperator.IsNonEmptyArray(klineData.AryData))
+        {
+            for(var i=0;i<klineData.AryData.length;++i)
+            {
+                var item=klineData.AryData[i];
+                var kItem={ Open:item[0], High:item[1], Low:item[2], Close:item[3] };
+                if (high==null || high<item[1]) high=item[1];
+                if (low==null || low>item[2]) low=item[2];
+                aryKLine.push(kItem);
+            }
+        }
+        else if (IFrameSplitOperator.IsNonEmptyArray(klineData.Data))
+        {
+            high=klineData.Data[1];
+            low=klineData.Data[2];
+            var kItem={ Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3] };
+            aryKLine.push(kItem);
+        }
 
-        var high=klineData.Data[1];
-        var low=klineData.Data[2];
-        var aryKLine=
-        [ 
-            { Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3]}, 
-            //{ Open:klineData.Data[0], High:high, Low:low, Close:klineData.Data[3]}  
-        ];
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryKLine)) return;
+       
         this.DrawKLineBar(aryKLine, high, low, rtItem);
     }
 
@@ -149607,7 +149634,7 @@ function ChartReport()
                 eventID=JSCHART_EVENT_ID.ON_CLICK_REPORT_HEADER;
             }
 
-            this.SendClickEvent(eventID, { Data:row, X:x, Y:y , e:e, Inside:insidePoint, UIElement:uiElement});
+            this.SendClickEvent(eventID, { Data:header, X:x, Y:y , e:e, Inside:insidePoint, UIElement:uiElement});
             return { Type:3, Redraw:bRedraw, Header:header };  //表头
         }
 
@@ -157714,10 +157741,12 @@ function JSPopMenu()
         if (item.Disable===true) trDom.classList.add('UMyChart_DrawTool_Disable_Tr');
         
         var prtTdDom=null;
-        for(var i=0;i<this.AryTDClassName.length;++i)
+        var aryTDClassName=this.AryTDClassName;
+        if (IFrameSplitOperator.IsNonEmptyArray(item.AryTDClassName)) aryTDClassName=item.AryTDClassName;
+        for(var i=0;i<aryTDClassName.length;++i)
         {
             var tdDom=document.createElement("td");
-            tdDom.className=this.AryTDClassName[i];
+            tdDom.className=aryTDClassName[i];
 
             if (i==0)   //图标
             {
@@ -166320,7 +166349,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15236";
+var HQCHART_VERSION="1.1.15244";
 
 function PrintHQChartVersion()
 {