hqchart 1.1.15865 → 1.1.15870

package/lib/umychart.vue.js

@@ -7879,7 +7879,7 @@ Selected:{BGColor:"rgb(242,242,242)",LineColor:"rgb(46,46,46)",LineWidth:2},Move
 AryColor:[]};//日历
 this.Calendar={Title:{IsShow:true,HRate:0.12,Color:'rgb(0,0,0)',BGMargin:{Left:10,Right:0,Top:10,Bottom:10},Arrow:{Color:"rgb(120,120,120)",Scale:0.45},MoveOn:{BGColor:"rgb(220,220,220)",Color:'rgb(0,0,0)',Type:0,RoundRect:{Radius:[5*GetDevicePixelRatio()]}},Font:{SizeRate:0.45,Family:"微软雅黑"}},// HRate=高度占比
 WeekTitle:{Color:'rgb(0,0,0)',HRate:0.08,Type:1,//Type 0=1-7 1=1-5
-Font:{SizeRate:0.5,Family:"微软雅黑"}},Day:{Text:{Color:["rgb(0,0,0)","rgb(192,192,192)","rgb(220,220,220)"],YOffset:2},MoveOn:{BGColor:"rgb(220,220,220)",Color:"rgb(0,0,0)",RadiusRate:0.4},Today:{Enable:true,BGColor:"rgb(0,103,192)",Color:"rgb(250,250,250)",RadiusRate:0.42},Font:{SizeRate:0.4,Family:"微软雅黑"},Selected:{BorderColor:["rgb(0,103,192)","rgb(220,220,220)"],RadiusRate:0.4}},Month:{Text:{Color:["rgb(0,0,0)","rgb(192,192,192)","rgb(220,220,220)"],YOffset:2},MoveOn:{BGColor:"rgb(220,220,220)",Color:"rgb(0,0,0)"},Today:{Enable:true,BGColor:"rgb(0,103,192)",Color:"rgb(250,250,250)"},Font:{SizeRate:0.3,Family:"微软雅黑"}}};//自定义风格
+Font:{SizeRate:0.5,Family:"微软雅黑"}},Day:{Text:{Color:["rgb(0,0,0)","rgb(192,192,192)","rgb(220,220,220)"],YOffset:2},MoveOn:{BGColor:"rgb(220,220,220)",Color:"rgb(0,0,0)",RadiusRate:0.4},Today:{Enable:true,BGColor:"rgb(0,103,192)",Color:"rgb(250,250,250)",RadiusRate:0.42},Font:{SizeRate:0.4,Family:"微软雅黑"},Selected:{BorderColor:["rgb(0,103,192)","rgb(220,220,220)"],RadiusRate:0.4}},MarkDay:{Dots:{Radius:5,YOffset:5,Color:"rgb(220,20,60)"}},Month:{Text:{Color:["rgb(0,0,0)","rgb(192,192,192)","rgb(220,220,220)"],YOffset:2},MoveOn:{BGColor:"rgb(220,220,220)",Color:"rgb(0,0,0)"},Today:{Enable:true,BGColor:"rgb(0,103,192)",Color:"rgb(250,250,250)"},Font:{SizeRate:0.3,Family:"微软雅黑"}}};//自定义风格
 this.SetStyle=function(style){var T_SetButtonStyle=function T_SetButtonStyle(item,dest){if(!item)return;if(item.Color)dest.Color=item.Color;if(item.MoveOnColor)dest.MoveOnColor=item.MoveOnColor;if(item.SelectedColor)dest.SelectedColor=item.SelectedColor;if(item.Family)dest.Family=item.Family;if(item.Text)dest.Text=item.Text;if(IFrameSplitOperator.IsNumber(item.Size))dest.Size=item.Size;if(IFrameSplitOperator.IsNumber(item.MerginLeft))dest.MerginLeft=item.MerginLeft;};if(style.TooltipBGColor)this.TooltipBGColor=style.TooltipBGColor;if(style.TooltipAlpha)this.TooltipAlpha=style.TooltipAlpha;if(style.SelectRectBGColor)this.SelectRectBGColor=style.SelectRectBGColor;if(style.UpBarColor)this.UpBarColor=style.UpBarColor;if(style.DownBarColor)this.DownBarColor=style.DownBarColor;if(style.UnchagneBarColor)this.UnchagneBarColor=style.UnchagneBarColor;if(style.EmptyBarBGColor)this.EmptyBarBGColor=style.EmptyBarBGColor;if(style.HighLowBarColor)this.HighLowBarColor=style.HighLowBarColor;if(style.HighLowText){var dest=this.HighLowText;var item=style.HighLowText;if(item.FontName)dest.FontName=item.FontName;if(item.Color)dest.Color=item.Color;if(item.MaxText)dest.MaxText=item.MaxText;if(IFrameSplitOperator.IsPlusNumber(item.MaxSize))dest.MaxSize=item.MaxSize;if(IFrameSplitOperator.IsPlusNumber(item.MinSize))dest.MinSize=item.MinSize;}if(style.SplashScreen){var item=style.SplashScreen;if(item.BGColor)this.SplashScreen.BGColor=item.BGColor;if(item.Title)this.SplashScreen.Title=item.Title;if(item.TextColor)this.SplashScreen.TextColor=item.TextColor;if(item.Font)this.SplashScreen.Font=item.Font;}if(style.HLCArea){var item=style.HLCArea;if(item.HighLineColor)this.HLCArea.HighLineColor=item.HighLineColor;if(item.LowLineColor)this.HLCArea.LowLineColor=item.LowLineColor;if(item.CloseLineColor)this.HLCArea.CloseLineColor=item.CloseLineColor;if(item.UpAreaColor)this.HLCArea.UpAreaColor=item.UpAreaColor;if(item.DownAreaColor)this.HLCArea.DownAreaColor=item.DownAreaColor;if(IFrameSplitOperator.IsNumber(item.LineWidth))this.HLCArea.LineWidth=item.LineWidth;}if(style.Minute){if(style.Minute.VolBarColor)this.Minute.VolBarColor=style.Minute.VolBarColor;if(style.Minute.VolTitleColor)this.Minute.VolTitleColor=style.Minute.VolTitleColor;if(style.Minute.PriceColor)this.Minute.PriceColor=style.Minute.PriceColor;if(IFrameSplitOperator.IsNumber(style.Minute.PriceLineWidth))this.Minute.PriceLineWidth=style.Minute.PriceLineWidth;if(style.Minute.AvPriceColor)this.Minute.AvPriceColor=style.Minute.AvPriceColor;if(style.Minute.AreaPriceColor)this.Minute.AreaPriceColor=style.Minute.AreaPriceColor;if(style.Minute.PositionColor)this.Minute.PositionColor=style.Minute.PositionColor;if(style.Minute.FrameSplitTextColor)this.Minute.FrameSplitTextColor=style.Minute.FrameSplitTextColor;if(style.Minute.Before){var item=style.Minute.Before;if(item.BGColor)this.Minute.Before.BGColor=item.BGColor;if(item.LineColor)this.Minute.Before.LineColor=item.LineColor;if(item.VolColor)this.Minute.Before.VolColor=item.VolColor;if(item.AvPriceColor)this.Minute.Before.AvPriceColor=item.AvPriceColor;if(item.CloseIcon)T_SetButtonStyle(item.CloseIcon,this.Minute.Before.CloseIcon);if(item.Point){if(item.Point.Color)this.Minute.Before.Point.Color=item.Point.Color;if(item.Point.Radius)this.Minute.Before.Point.Radius=item.Point.Radius;}}if(style.Minute.After){var item=style.Minute.After;if(item.BGColor)this.Minute.After.BGColor=item.BGColor;if(item.LineColor)this.Minute.After.LineColor=item.LineColor;if(item.VolColor)this.Minute.After.VolColor=item.VolColor;if(item.AvPriceColor)this.Minute.After.AvPriceColor=item.AvPriceColor;if(item.Point){if(item.Point.Color)this.Minute.After.Point.Color=item.Point.Color;if(item.Point.Radius)this.Minute.After.Point.Radius=item.Point.Radius;}}if(style.Minute.NightDay){var item=style.Minute.NightDay;if(item.NightBGColor)this.Minute.NightDay.NightBGColor=item.NightBGColor;if(item.Font)this.Minute.NightDay.Font=item.Font;if(item.Day){var subItem=item.Day;if(subItem.Color)this.Minute.NightDay.Day.Color=subItem.Color;if(subItem.BGColor)this.Minute.NightDay.Day.BGColor=subItem.BGColor;if(subItem.BorderColor)this.Minute.NightDay.Day.BorderColor=subItem.BorderColor;CopyMarginConfig(this.Minute.NightDay.Day.Margin,subItem.Margin);}if(item.Night){var subItem=item.Night;if(subItem.Color)this.Minute.NightDay.Night.Color=subItem.Color;if(subItem.BGColor)this.Minute.NightDay.Night.BGColor=subItem.BGColor;if(subItem.BorderColor)this.Minute.NightDay.Night.BorderColor=subItem.BorderColor;CopyMarginConfig(this.Minute.NightDay.Night.Margin,subItem.Margin);}}if(style.Minute.BuySellBar){var item=style.Minute.BuySellBar;var dest=this.Minute.BuySellBar;if(item.BuyColor)dest.BuyColor=item.BuyColor;if(item.SellColor)dest.SellColor=item.SellColor;if(item.Font)dest.Font=item.Font;if(item.TextColor)dest.TextColor=item.TextColor;if(IFrameSplitOperator.IsNumber(item.BarWidth))dest.BarWidth=item.BarWidth;if(IFrameSplitOperator.IsNonEmptyArray(item.AryBarRange))dest.AryBarRange=item.AryBarRange;if(IFrameSplitOperator.IsNumber(item.YOffset))dest.YOffset=item.YOffset;}}if(style.PopMinuteChart){var item=style.PopMinuteChart;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(item.Mark){if(item.Mark.LineColor)dest.Mark.LineColor=item.Mark.LineColor;if(IFrameSplitOperator.IsNumber(item.Mark.LineWidth))dest.Mark.LineWidth=item.Mark.LineWidth;}if(item.Title){if(item.Title.Font)dest.Title.Font=item.Title.Font;}if(item.CorssCursor){if(item.CorssCursor.Font)dest.CorssCursor.Font=item.CorssCursor.Font;}if(item.Frame){if(item.Frame.Font)dest.Frame.Font=item.Frame.Font;}}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;if(style.DefaultTextFont)this.DefaultTextFont=style.DefaultTextFont;if(style.TitleFont)this.TitleFont=style.TitleFont;if(style.IndexTitleBGColor)this.IndexTitleBGColor=style.IndexTitleBGColor;if(style.IndexTitleBorderColor)this.IndexTitleBorderColor=style.IndexTitleBorderColor;if(style.IndexTitleBorderMoveOnColor)this.IndexTitleBorderMoveOnColor=style.IndexTitleBorderMoveOnColor;if(IFrameSplitOperator.IsNumber(style.IndexTitleBorderStyle))this.IndexTitleBorderStyle=style.IndexTitleBorderStyle;if(style.IndexTitleColor)this.IndexTitleColor=style.IndexTitleColor;if(style.IndexTitleSelectedColor)this.IndexTitleSelectedColor=style.IndexTitleSelectedColor;if(style.OverlayIndexTitleBGColor)this.OverlayIndexTitleBGColor=style.OverlayIndexTitleBGColor;if(style.UpTextColor)this.UpTextColor=style.UpTextColor;if(style.DownTextColor)this.DownTextColor=style.DownTextColor;if(style.UnchagneTextColor)this.UnchagneTextColor=style.UnchagneTextColor;if(style.CloseLineColor)this.CloseLineColor=style.CloseLineColor;if(style.CloseLineAreaColor)this.CloseLineAreaColor=style.CloseLineAreaColor;if(style.CloseLineWidth)this.CloseLineWidth=style.CloseLineWidth;if(style.FrameBorderPen)this.FrameBorderPen=style.FrameBorderPen;if(style.MultiDayBorderPen)this.MultiDayBorderPen=style.MultiDayBorderPen;if(style.FrameSplitPen)this.FrameSplitPen=style.FrameSplitPen;if(style.FrameDotSplitPen)this.FrameDotSplitPen=style.FrameDotSplitPen;if(style.FrameSplitTextColor)this.FrameSplitTextColor=style.FrameSplitTextColor;if(style.FrameSplitTextFont)this.FrameSplitTextFont=style.FrameSplitTextFont;if(style.FrameTitleBGColor)this.FrameTitleBGColor=style.FrameTitleBGColor;if(style.SelFrameBorderColor)this.SelFrameBorderColor=style.SelFrameBorderColor;if(IFrameSplitOperator.IsNumber(style.IndexTitleMerginLeft))this.IndexTitleMerginLeft=style.IndexTitleMerginLeft;if(style.IndexTitle){var item=style.IndexTitle;if(item.UpDownArrow){var subItem=item.UpDownArrow;if(subItem.UpColor)this.IndexTitle.UpDownArrow.UpColor=subItem.UpColor;if(subItem.DownColor)this.IndexTitle.UpDownArrow.DownColor=subItem.DownColor;if(subItem.UnchangeColor)this.IndexTitle.UpDownArrow.UnchangeColor=subItem.UnchangeColor;}if(IFrameSplitOperator.IsNumber(item.ArrowType))this.IndexTitle.ArrowType=item.ArrowType;if(IFrameSplitOperator.IsBool(item.EnableIndexArrow))this.IndexTitle.EnableIndexArrow=item.EnableIndexArrow;if(IFrameSplitOperator.IsBool(item.IsSinlgeLine))this.IndexTitle.IsSinlgeLine=item.IsSinlgeLine;if(item.NameArrow){var subItem=item.NameArrow;if(subItem.Color)this.IndexTitle.NameArrow.Color=subItem.Color;if(subItem.Symbol)this.IndexTitle.NameArrow.Symbol=subItem.Symbol;if(IFrameSplitOperator.IsNumber(subItem.Space))this.IndexTitle.NameArrow.Space=subItem.Space;}}if(style.Frame){if(style.Frame.XBottomOffset)this.Frame.XBottomOffset=style.Frame.XBottomOffset;if(style.Frame.YTopOffset)this.Frame.YTopOffset=style.Frame.YTopOffset;if(IFrameSplitOperator.IsNumber(style.Frame.XPointCount))this.Frame.XPointCount=style.Frame.XPointCount;if(style.Frame.PercentageText){var item=style.Frame.PercentageText;if(item.PriceColor)this.Frame.PercentageText.PriceColor=item.PriceColor;if(item.PercentageColor)this.Frame.PercentageText.PercentageColor=item.PercentageColor;if(item.SplitColor)this.Frame.PercentageText.SplitColor=item.SplitColor;if(item.Font)this.Frame.PercentageText.Font=item.Font;}}if(IFrameSplitOperator.IsNumber(style.ToolbarButtonStyle))this.ToolbarButtonStyle=style.ToolbarButtonStyle;if(IFrameSplitOperator.IsBool(style.IsDOMFrameTitle))this.IsDOMFrameTitle=style.IsDOMFrameTitle;if(style.FrameLatestPrice){var item=style.FrameLatestPrice;if(style.FrameLatestPrice.TextColor)this.FrameLatestPrice.TextColor=style.FrameLatestPrice.TextColor;if(style.FrameLatestPrice.UpBarColor)this.FrameLatestPrice.UpBarColor=style.FrameLatestPrice.UpBarColor;if(style.FrameLatestPrice.DownBarColor)this.FrameLatestPrice.DownBarColor=style.FrameLatestPrice.DownBarColor;if(style.FrameLatestPrice.UnchagneBarColor)this.FrameLatestPrice.UnchagneBarColor=style.FrameLatestPrice.UnchagneBarColor;if(style.FrameLatestPrice.BGAlpha)this.FrameLatestPrice.BGAlpha=style.FrameLatestPrice.BGAlpha;if(style.FrameLatestPrice.OverlayTextColor)this.FrameLatestPrice.OverlayTextColor=style.FrameLatestPrice.OverlayTextColor;if(item.EmptyBGColor)this.FrameLatestPrice.EmptyBGColor=item.EmptyBGColor;}if(style.OverlayFrame){var item=style.OverlayFrame;if(style.OverlayFrame.BolderPen)this.OverlayFrame.BolderPen=style.OverlayFrame.BolderPen;if(style.OverlayFrame.TitleColor)this.OverlayFrame.TitleColor=style.OverlayFrame.TitleColor;if(style.OverlayFrame.TitleFont)this.OverlayFrame.TitleFont=style.OverlayFrame.TitleFont;}if(style.CorssCursorBGColor)this.CorssCursorBGColor=style.CorssCursorBGColor;if(style.CorssCursorTextColor)this.CorssCursorTextColor=style.CorssCursorTextColor;if(style.CorssCursorTextFont)this.CorssCursorTextFont=style.CorssCursorTextFont;if(style.CorssCursorVPenColor)this.CorssCursorVPenColor=style.CorssCursorVPenColor;if(style.CorssCursorHPenColor)this.CorssCursorHPenColor=style.CorssCursorHPenColor;if(style.CorssCursorBorderColor)this.CorssCursorBorderColor=style.CorssCursorBorderColor;if(style.CorssCursorXRangeBGColor)this.CorssCursorXRangeBGColor=style.CorssCursorXRangeBGColor;if(style.CorssCursorLineDash)this.CorssCursorLineDash=style.CorssCursorLineDash.slice();if(style.CorssCursor&&style.CorssCursor.RightButton){var item=style.CorssCursor.RightButton;if(item.BGColor)this.CorssCursor.RightButton.BGColor=item.BGColor;if(item.PenColor)this.CorssCursor.RightButton.PenColor=item.PenColor;if(item.Icon)this.CorssCursor.RightButton.Icon=item.Icon;}if(style.CorssCursor&&style.CorssCursor.CorssPoint){var item=style.CorssCursor.CorssPoint;if(item.Center){var subItem=item.Center;var subDest=this.CorssCursor.CorssPoint.Center;if(IFrameSplitOperator.IsNumber(subItem.Radius))subDest.Radius=subItem.Radius;if(subItem.Color)subDest.Color=subItem.Color;}if(item.Border){var subItem=item.Border;var subDest=this.CorssCursor.CorssPoint.Border;if(IFrameSplitOperator.IsNumber(subItem.Width))subDest.Width=subItem.Width;if(subItem.Color)subDest.Color=subItem.Color;}}if(style.LatestPointFlash){var item=style.LatestPointFlash;var dest=this.LatestPointFlash;if(item.PointColor)dest.PointColor=item.PointColor;if(IFrameSplitOperator.IsNumber(item.PointRadius))dest.PointRadius=item.PointRadius;if(item.BGColor)dest.BGColor=item.BGColor;if(IFrameSplitOperator.IsNumber(item.BGRadius))dest.BGRadius=item.BGRadius;}if(style.KLine)this.KLine=style.KLine;if(style.VirtualKLine){var item=style.VirtualKLine;if(item.Color)this.VirtualKLine.Color=item.Color;if(item.LineDash)this.VirtualKLine.LineDash=item.LineDash;}if(style.PredictionKLine){if(style.PredictionKLine.Line){var item=style.PredictionKLine.Line;var dest=this.PredictionKLine.Line;if(item.Color)dest.Color=item.Color;if(item.LineDash)dest.LineDash=item.LineDash;if(IFrameSplitOperator.IsNumber(item.LineWidth))dest.LineWidth=item.LineWidth;}if(style.PredictionKLine.Bar){var item=style.PredictionKLine.Bar;var dest=this.PredictionKLine.Bar;if(item.UpColor)dest.UpColor=item.UpColor;if(item.DownColor)dest.DownColor=item.DownColor;if(item.UnchangeColor)dest.UnchangeColor=item.UnchangeColor;if(IFrameSplitOperator.IsNumber(item.DrawType)||item.DrawType===null)dest.DrawType=item.DrawType;}}if(style.PriceGapStyple){var item=style.PriceGapStyple;if(item.Line&&item.Line.Color)this.PriceGapStyple.Line.Color=item.Line.Color;if(item.Text){if(item.Text.Color)this.PriceGapStyple.Text.Color=item.Text.Color;if(item.Text.Font)this.PriceGapStyple.Text.Font=item.Text.Font;}}if(style.DaySummaryKLine){var item=style.DaySummaryKLine;var dest=this.DaySummaryKLine;if(item.Font)dest.Font=item.Font;if(item.TextColor)dest.TextColor=item.TextColor;if(IFrameSplitOperator.IsNumber(item.LeftMargin))dest.LeftMargin=item.LeftMargin;}if(style.Index){if(style.Index.LineColor)this.Index.LineColor=style.Index.LineColor;if(style.Index.NotSupport)this.Index.NotSupport=style.Index.NotSupport;}if(style.ColorArray)this.ColorArray=style.ColorArray;if(style.DrawPicture){var item=style.DrawPicture;if(item.LineColor)this.DrawPicture.LineColor=item.LineColor;if(item.PointColor)this.DrawPicture.PointColor=item.PointColor;if(item.XYCoordinate)this.DrawPicture.XYCoordinate=item.XYCoordinate;if(IFrameSplitOperator.IsNumber(item.PointType))this.DrawPicture.PointType=item.PointType;if(IFrameSplitOperator.IsBool(item.IsShowPoint))this.DrawPicture.IsShowPoint=item.IsShowPoint;}if(style.TooltipPaint){if(style.TooltipPaint.BGColor)this.TooltipPaint.BGColor=style.TooltipPaint.BGColor;if(style.TooltipPaint.BorderColor)this.TooltipPaint.BorderColor=style.TooltipPaint.BorderColor;if(style.TooltipPaint.TitleColor)this.TooltipPaint.TitleColor=style.TooltipPaint.TitleColor;if(style.TooltipPaint.TitleFont)this.TooltipPaint.TitleFont=style.TooltipPaint.TitleFont;if(style.TooltipPaint.DateTimeColor)this.TooltipPaint.DateTimeColor=style.TooltipPaint.DateTimeColor;if(style.TooltipPaint.VolColor)this.TooltipPaint.VolColor=style.TooltipPaint.VolColor;if(style.TooltipPaint.AmountColor)this.TooltipPaint.AmountColor=style.TooltipPaint.AmountColor;}if(style.PCTooltipPaint){var item=style.PCTooltipPaint;if(item.BGColor)this.PCTooltipPaint.BGColor=item.BGColor;if(item.BorderColor)this.PCTooltipPaint.BorderColor=item.BorderColor;if(item.TitleColor)this.PCTooltipPaint.TitleColor=item.TitleColor;if(item.TitleFont)this.PCTooltipPaint.TitleFont=item.TitleFont;if(item.DateTimeColor)this.PCTooltipPaint.DateTimeColor=item.DateTimeColor;if(item.VolColor)this.PCTooltipPaint.VolColor=item.VolColor;if(item.AmountColor)this.PCTooltipPaint.AmountColor=item.AmountColor;if(item.PositionColor)this.PCTooltipPaint.PositionColor=item.PositionColor;}if(style.DialogTooltip){var item=style.DialogTooltip;if(item.BGColor)this.DialogTooltip.BGColor=item.BGColor;if(item.BorderColor)this.DialogTooltip.BorderColor=item.BorderColor;if(item.TitleColor)this.DialogTooltip.TitleColor=item.TitleColor;if(item.TitleBGColor)this.DialogTooltip.TitleBGColor=item.TitleBGColor;if(item.DateTimeColor)this.DialogTooltip.DateTimeColor=item.DateTimeColor;if(item.VolColor)this.DialogTooltip.VolColor=item.VolColor;if(item.AmountColor)this.DialogTooltip.AmountColor=item.AmountColor;if(item.TurnoverRateColor)this.DialogTooltip.TurnoverRateColor=item.TurnoverRateColor;if(item.PositionColor)this.DialogTooltip.PositionColor=item.PositionColor;if(item.TextColor)this.DialogTooltip.TextColor=item.TextColor;if(item.ValueColor)this.DialogTooltip.ValueColor=item.ValueColor;}if(style.FloatTooltip){var item=style.FloatTooltip;if(item.BGColor)this.FloatTooltip.BGColor=item.BGColor;if(item.BorderColor)this.FloatTooltip.BorderColor=item.BorderColor;if(item.DateTimeColor)this.FloatTooltip.DateTimeColor=item.DateTimeColor;if(item.VolColor)this.FloatTooltip.VolColor=item.VolColor;if(item.AmountColor)this.FloatTooltip.AmountColor=item.AmountColor;if(item.TurnoverRateColor)this.FloatTooltip.TurnoverRateColor=item.TurnoverRateColor;if(item.PositionColor)this.FloatTooltip.PositionColor=item.PositionColor;if(item.TextColor)this.FloatTooltip.TextColor=item.TextColor;if(item.ValueColor)this.FloatTooltip.ValueColor=item.ValueColor;}if(style.DialogSelectRect){var item=style.DialogSelectRect;if(item.BGColor)this.DialogSelectRect.BGColor=item.BGColor;if(item.BorderColor)this.DialogSelectRect.BorderColor=item.BorderColor;if(item.TitleColor)this.DialogSelectRect.TitleColor=item.TitleColor;if(item.TextColor)this.DialogSelectRect.TextColor=item.TextColor;if(item.ValueColor)this.DialogSelectRect.ValueColor=item.ValueColor;if(item.VolColor)this.DialogSelectRect.VolColor=item.VolColor;if(item.AmountColor)this.DialogSelectRect.AmountColor=item.AmountColor;if(item.TurnoverRateColor)this.DialogSelectRect.TurnoverRateColor=item.TurnoverRateColor;if(item.PositionColor)this.DialogSelectRect.PositionColor=item.PositionColor;}if(style.DialogPopKeyboard){var item=style.DialogPopKeyboard;if(item.BGColor)this.DialogPopKeyboard.BGColor=item.BGColor;if(item.BorderColor)this.DialogPopKeyboard.BorderColor=item.BorderColor;if(item.TitleColor)this.DialogPopKeyboard.TitleColor=item.TitleColor;if(item.TitleBGColor)this.DialogTooltip.TitleBGColor=item.TitleBGColor;if(item.Input){var subItem=item.Input;if(subItem.BGColor)this.DialogPopKeyboard.Input.BGColor=subItem.BGColor;if(subItem.TextColor)this.DialogPopKeyboard.Input.TextColor=subItem.TextColor;}}if(style.Title){if(style.Title.TradeIndexColor)this.Title.TradeIndexColor=style.Title.TradeIndexColor;if(style.Title.ColorIndexColor)this.Title.ColorIndexColor=style.Title.ColorIndexColor;if(style.Title.VolColor)this.Title.VolColor=style.Title.VolColor;if(style.Title.AmountColor)this.Title.AmountColor=style.Title.AmountColor;if(style.Title.DateTimeColor)this.Title.DateTimeColor=style.Title.DateTimeColor;if(style.Title.NameColor)this.Title.NameColor=style.Title.NameColor;if(style.Title.SettingColor)this.Title.SettingColor=style.Title.SettingColor;if(style.Title.TurnoverRateColor)this.Title.TurnoverRateColor=style.Title.TurnoverRateColor;if(style.Title.PositionColor)this.Title.PositionColor=style.Title.PositionColor;}if(style.ChartSimpleTable)this.SetChartSimpleTable(style.ChartSimpleTable);if(style.ChartSimplePie)this.SetChartSimplePie(style.ChartSimplePie);if(style.ChartSimpleDoughnut)this.SetChartSimpleDoughnut(style.ChartSimpleDoughnut);if(style.ChartSimpleRadar)this.SetChartSimpleRadar(style.ChartSimpleRadar);if(style.ChartBaseLineBar)this.SetChartBaseLineBar(style.ChartBaseLineBar);if(style.ChartPointDot)this.SetChartPointDot(style.ChartPointDot);if(style.ChartHorizontalChannel)this.SetChartHorizontalChannel(style.ChartHorizontalChannel);if(style.DRAWICON){if(style.DRAWICON.Icon){var item=style.DRAWICON.Icon;if(IFrameSplitOperator.IsPlusNumber(item.MaxSize))this.DRAWICON.Icon.MaxSize=item.MaxSize;if(IFrameSplitOperator.IsPlusNumber(item.MinSize))this.DRAWICON.Icon.MinSize=item.MinSize;if(item.Zoom)this.DRAWICON.Icon.Zoom=item.Zoom;if(IFrameSplitOperator.IsNumber(item.YOffset))this.DRAWICON.Icon.YOffset=item.YOffset;}if(style.DRAWICON.Text){var item=style.DRAWICON.Text;if(IFrameSplitOperator.IsPlusNumber(item.MaxSize))this.DRAWICON.Text.MaxSize=item.MaxSize;if(IFrameSplitOperator.IsPlusNumber(item.MinSize))this.DRAWICON.Text.MinSize=item.MinSize;if(item.Zoom)this.DRAWICON.Text.Zoom=item.Zoom;if(item.FontName)this.DRAWICON.Text.FontName=item.FontName;if(IFrameSplitOperator.IsNumber(item.YOffset))this.DRAWICON.Text.YOffset=item.YOffset;}}if(style.DRAWTEXT){var item=style.DRAWTEXT;if(IFrameSplitOperator.IsPlusNumber(item.MaxSize))this.DRAWICON.MaxSize=item.MaxSize;if(IFrameSplitOperator.IsPlusNumber(item.MinSize))this.DRAWICON.MinSize=item.MinSize;if(item.Zoom)this.DRAWTEXT.Zoom=item.Zoom;if(item.FontName)this.DRAWTEXT.FontName=item.FontName;if(IFrameSplitOperator.IsNumber(item.YOffset))this.DRAWTEXT.YOffset=item.YOffset;}if(style.DRAWTEXT_FIX){var item=style.DRAWTEXT_FIX;if(item.Font)this.DRAWTEXT_FIX.Font=item.Font;}if(style.DRAWNUMBER_FIX){var item=style.DRAWNUMBER_FIX;if(item.Font)this.DRAWNUMBER_FIX.Font=item.Font;}if(style.DRAWNUMBER){var item=style.DRAWNUMBER;if(IFrameSplitOperator.IsPlusNumber(item.MaxSize))this.DRAWNUMBER.MaxSize=item.MaxSize;if(IFrameSplitOperator.IsPlusNumber(item.MinSize))this.DRAWNUMBER.MinSize=item.MinSize;if(item.Zoom)this.DRAWNUMBER.Zoom=item.Zoom;if(item.FontName)this.DRAWNUMBER.FontName=item.FontName;if(IFrameSplitOperator.IsNumber(item.YOffset))this.DRAWNUMBER.YOffset=item.YOffset;}if(style.DRAWABOVE){var item=style.DRAWABOVE;if(IFrameSplitOperator.IsNumber(item.YOffset))this.DRAWABOVE.YOffset=item.YOffset;}if(style.DOTLINE)this.DOTLINE=style.DOTLINE;if(style.DRAWSL)this.DOTLINE=style.DRAWSL;if(style.DragSubFrameBorder)this.DragSubFrameBorder=style.DragSubFrameBorder;if(style.DepthMapPaint){var item=style.DepthMapPaint;if(item.LineColor)this.DepthMapPaint.LineColor=item.LineColor;if(item.AreaColor)this.DepthMapPaint.AreaColor=item.AreaColor;if(item.TextColor)this.DepthMapPaint.TextColor=item.TextColor;if(item.TextBGColor)this.DepthMapPaint.TextBGColor=item.TextBGColor;}if(style.KLineYAxisBGPaint){var item=style.KLineYAxisBGPaint;if(item.Font)this.KLineYAxisBGPaint.Font=item.Font;if(item.LineColor)this.KLineYAxisBGPaint.LineColor=item.LineColor;if(item.DiffValutTextColor)this.KLineYAxisBGPaint.DiffValutTextColor=item.DiffValutTextColor;if(item.DiffValueBGColor)this.KLineYAxisBGPaint.DiffValueBGColor=item.DiffValueBGColor;}if(style.StockChip){var item=style.StockChip;if(item.InfoColor)this.StockChip.InfoColor=item.InfoColor;if(item.DayInfoColor)this.StockChip.DayInfoColor=item.DayInfoColor;if(item.Font)this.StockChip.Font=item.Font;if(item.DefaultButton)T_SetButtonStyle(item.DefaultButton,this.StockChip.DefaultButton);if(item.LongButton)T_SetButtonStyle(item.LongButton,this.StockChip.LongButton);if(item.RecentButton)T_SetButtonStyle(item.RecentButton,this.StockChip.RecentButton);if(item.CloseButton)T_SetButtonStyle(item.CloseButton,this.StockChip.CloseButton);if(item.PhoneCloseButton){var subItem=item.PhoneCloseButton;if(subItem.Family)this.StockChip.PhoneCloseButton.Family=subItem.Family;if(subItem.Text)this.StockChip.PhoneCloseButton.Text=subItem.Text;if(subItem.Color)this.StockChip.PhoneCloseButton.Color=subItem.Color;if(IFrameSplitOperator.IsNumber(subItem.Size))this.StockChip.PhoneCloseButton.Size=subItem.Size;if(IFrameSplitOperator.IsBool(subItem.IsShow))this.StockChip.PhoneCloseButton.IsShow=subItem.IsShow;if(subItem.Border){if(subItem.Border.BGColor)this.StockChip.PhoneCloseButton.Border.BGColor=subItem.Border.BGColor;}}}if(style.DepthChart){var item=style.DepthChart;if(item.BidColor){if(item.BidColor.Line)this.DepthChart.BidColor.Line=item.BidColor.Line;if(item.BidColor.Area)this.DepthChart.BidColor.Area=item.BidColor.Area;}if(item.AskColor){if(item.AskColor.Line)this.DepthChart.AskColor.Line=item.AskColor.Line;if(item.AskColor.Area)this.DepthChart.AskColor.Area=item.AskColor.Area;}if(item.LineWidth)this.DepthChart.LineWidth=item.LineWidth;}if(style.DepthCorss){var item=style.DepthCorss;if(item.BidColor){if(item.BidColor.Line)this.DepthCorss.BidColor.Line=item.BidColor.Line;}if(item.AskColor){if(item.AskColor.Line)this.DepthCorss.AskColor.Line=item.AskColor.Line;}if(item.LineWidth)this.DepthCorss.LineWidth=item.LineWidth;if(item.LineDash)this.DepthCorss.LineDash=item.LineDash;if(item.Tooltip){var tooltip=item.Tooltip;if(tooltip.BGColor)this.DepthCorss.Tooltip.BGColor=tooltip.BGColor;if(tooltip.TextColor)this.DepthCorss.Tooltip.TextColor=tooltip.TextColor;if(tooltip.Font)this.DepthCorss.Tooltip.Font=tooltip.Font;if(tooltip.LineHeight)this.DepthCorss.Tooltip.LineHeight=tooltip.LineHeight;var border=tooltip.Border;if(IFrameSplitOperator.IsNumber(border.Top))this.DepthCorss.Tooltip.Border.Top=border.Top;if(IFrameSplitOperator.IsNumber(border.Bottom))this.DepthCorss.Tooltip.Border.Bottom=border.Bottom;if(IFrameSplitOperator.IsNumber(border.Left))this.DepthCorss.Tooltip.Border.Left=border.Left;if(IFrameSplitOperator.IsNumber(border.Right))this.DepthCorss.Tooltip.Border.Right=border.Right;if(IFrameSplitOperator.IsNumber(border.ItemSpace))this.DepthCorss.Tooltip.Border.ItemSpace=border.ItemSpace;}}if(style.CIRCLEDOT){var item=style.CIRCLEDOT;if(IFrameSplitOperator.IsNumber(item.Radius))this.CIRCLEDOT.Radius=item.Radius;}if(style.POINTDOT){var item=style.POINTDOT;if(IFrameSplitOperator.IsNumber(item.Radius))this.POINTDOT.Radius=item.Radius;}if(style.RectSelect){var item=style.RectSelect;if(item.LineColor)this.RectSelect.LineColor=item.LineColor;if(item.LineWidth>0)this.RectSelect.LineWidth=item.LineWidth;if(item.LineDotted)this.RectSelect.LineDotted=item.LineDotted;if(item.AreaColor)this.RectSelect.AreaColor=item.AreaColor;if(item.SubAreaColor)this.RectSelect.SubAreaColor=item.SubAreaColor;if(item.RangeTextColor)this.RectSelect.RangeTextColor=item.RangeTextColor;if(item.RangeTextFont)this.RectSelect.RangeTextFont=item.RangeTextFont;if(item.RangeTextBGColor)this.RectSelect.RangeTextBGColor=item.RangeTextBGColor;if(item.RangeTextSubColor)this.RectSelect.RangeTextSubColor=item.RangeTextSubColor;if(item.RangeTextSubFont)this.RectSelect.RangeTextSubFont=item.RangeTextSubFont;if(item.RangeTextSubBGColor)this.RectSelect.RangeTextSubBGColor=item.RangeTextSubBGColor;if(item.Mark){var subItem=item.Mark;if(subItem.Family)this.RectSelect.Mark.Family=subItem.Family;if(subItem.Text)this.RectSelect.Mark.Text=subItem.Text;if(subItem.Color)this.RectSelect.Mark.Color=subItem.Color;if(IFrameSplitOperator.IsNumber(subItem.Size))this.RectSelect.Mark.Size=subItem.Size;if(subItem.Position){if(subItem.Position.Top)this.RectSelect.Mark.Position.Top=subItem.Position.Top;if(IFrameSplitOperator.IsNumber(subItem.Position.Index))this.RectSelect.Mark.Position.Index=subItem.Position.Index;}}}if(style.RectDrag){var item=style.RectDrag;var dest=this.RectDrag;if(item.LineColor)dest.LineColor=item.LineColor;if(IFrameSplitOperator.IsPlusNumber(item.LineWidth))dest.LineWidth=item.LineWidth;if(item.BGColor)dest.BGColor=item.BGColor;}if(style.OrderFlow){item=style.OrderFlow;if(item.UpColor)this.OrderFlow.UpColor=item.UpColor;if(item.DownColor)this.OrderFlow.DownColor=item.DownColor;if(item.UnchagneColor)this.OrderFlow.UnchagneColor=item.UnchagneColor;if(item.Text)this.OrderFlow.Text=item.Text;if(item.Line)this.OrderFlow.Line=item.Line;}if(style.OrderFlow_Style2){item=style.OrderFlow_Style2;if(item.UpColor)this.OrderFlow_Style2.UpColor=item.UpColor;if(item.DownColor)this.OrderFlow_Style2.DownColor=item.DownColor;if(item.UnchagneColor)this.OrderFlow_Style2.UnchagneColor=item.UnchagneColor;if(IFrameSplitOperator.IsNumber(item.BarWidth))this.OrderFlow_Style2.BarWidth=item.BarWidth;}if(style.ChartOX){var item=style.ChartOX;if(item.Family)this.ChartOX.Family=item.Family;if(item.Up)this.ChartOX.Up=item.Up;if(item.Down)this.ChartOX.Down=item.Down;if(item.SquareLineColor)this.ChartOX.SquareLineColor=item.SquareLineColor;}if(style.DealList){var item=style.DealList;if(item.BorderColor)this.DealList.BorderColor=item.BorderColor;if(item.UpTextColor)this.DealList.UpTextColor=item.UpTextColor;if(item.DownTextColor)this.DealList.DownTextColor=item.DownTextColor;if(item.UnchagneTextColor)this.DealList.UnchagneTextColor=item.UnchagneTextColor;if(item.CloseLineColor)this.DealList.CloseLineColor=item.CloseLineColor;if(item.Header){var header=item.Header;if(header.Color)this.DealList.Header.Color=header.Color;if(header.Mergin){var mergin=header.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Left))this.DealList.Header.Mergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Right))this.DealList.Header.Mergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Top))this.DealList.Header.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Bottom))this.DealList.Header.Mergin.Bottom=mergin.Bottom;}if(header.Font){var font=header.Font;if(font.Name)this.DealList.Header.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.DealList.Header.Font.Size=font.Size;}}if(item.Row){var row=item.Row;if(row.Mergin){var mergin=row.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Top))this.DealList.Row.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Bottom))this.DealList.Row.Mergin.Bottom=mergin.Bottom;}if(row.Font){var font=row.Font;if(font.Name)this.DealList.Row.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.DealList.Row.Font.Size=font.Size;}if(row.BarMergin){var mergin=row.BarMergin;if(IFrameSplitOperator.IsNumber(mergin.Left))this.DealList.Row.BarMergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Top))this.DealList.Row.BarMergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Right))this.DealList.Row.BarMergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Bottom))this.DealList.Row.BarMergin.Bottom=mergin.Bottom;}}if(item.FieldColor){var filed=item.FieldColor;if(filed.Vol)this.DealList.FieldColor.Vol=filed.Vol;if(filed.Time)this.DealList.FieldColor.Time=filed.Time;if(filed.Deal)this.DealList.FieldColor.Deal=filed.Deal;if(filed.Index)this.DealList.FieldColor.Index=filed.Index;if(filed.BarTitle)this.DealList.FieldColor.BarTitle=filed.BarTitle;if(filed.Text)this.DealList.FieldColor.Text=filed.Text;if(IFrameSplitOperator.IsNonEmptyArray(filed.Bar)){for(var i=0;i<filed.Bar.length;++i)this.DealList.FieldColor.Bar[i]=filed.Bar[i];}}if(item.Selected){var subItem=item.Selected;if(subItem.BGColor)this.DealList.Selected.BGColor=subItem.BGColor;if(subItem.LineColor)this.DealList.Selected.LineColor=subItem.LineColor;if(IFrameSplitOperator.IsPlusNumber(subItem.LineWidth))this.DealList.Selected.LineWidth=subItem.LineWidth;}}if(style.Report)this.SetReportStyle(style.Report);if(style.TReport)this.SetTReportStyle(style.TReport);if(style.SelectedChart){var item=style.SelectedChart;if(IFrameSplitOperator.IsNumber(item.LineWidth))this.SelectedChart.LineWidth=item.LineWidth;if(IFrameSplitOperator.IsNumber(item.Radius))this.SelectedChart.Radius=item.Radius;if(IFrameSplitOperator.IsNumber(item.MinSpace))this.SelectedChart.MinSpace=item.MinSpace;if(item.LineColor)this.SelectedChart.LineColor=item.LineColor;if(item.BGColor)this.SelectedChart.BGColor=item.BGColor;}if(style.DragMovePaint){var item=style.DragMovePaint;if(item.TextColor)this.DragMovePaint.TextColor=item.TextColor;if(item.Font)this.DragMovePaint.Font=item.Font;}if(style.SessionBreaksPaint){var item=style.SessionBreaksPaint;if(IFrameSplitOperator.IsNonEmptyArray(item.BGColor))this.SessionBreaksPaint.BGColor=item.BGColor.slice();if(item.SplitLine){var subItem=item.SplitLine;if(subItem.Color)this.SessionBreaksPaint.SplitLine.Color=subItem.Color;if(IFrameSplitOperator.IsNumber(subItem.Width))this.SessionBreaksPaint.SplitLine.Width=subItem.Width;this.SessionBreaksPaint.SplitLine.Dash=subItem.Dash;}}if(IFrameSplitOperator.IsNumber(style.ToolbarButtonStyle))this.ToolbarButtonStyle=style.ToolbarButtonStyle;if(style.Buttons){var buttons=style.Buttons;T_SetButtonStyle(buttons.CloseOverlayIndex,this.Buttons.CloseOverlayIndex);T_SetButtonStyle(buttons.CloseWindow,this.Buttons.CloseWindow);T_SetButtonStyle(buttons.ChangeIndex,this.Buttons.ChangeIndex);T_SetButtonStyle(buttons.OverlayIndex,this.Buttons.OverlayIndex);T_SetButtonStyle(buttons.ModifyIndexParam,this.Buttons.ModifyIndexParam);T_SetButtonStyle(buttons.MaxMinWindow,this.Buttons.MaxMinWindow);T_SetButtonStyle(buttons.TitleWindow,this.Buttons.TitleWindow);T_SetButtonStyle(buttons.ExportData,this.Buttons.ExportData);T_SetButtonStyle(buttons.AddIndexWindow,this.Buttons.AddIndexWindow);T_SetButtonStyle(buttons.IndexHelp,this.Buttons.IndexHelp);T_SetButtonStyle(buttons.IndexAIAnalyze,this.Buttons.IndexAIAnalyze);if(buttons.Tooltip){var item=buttons.Tooltip;var src=this.Buttons.Tooltip;if(item.Font)src.Font=item.Font;if(item.Color)src.Color=item.Color;if(item.ColorBG)src.ColorBG=item.ColorBG;if(item.ColorBorder)src.ColorBorder=item.ColorBorder;if(item.BorderRadius)src.BorderRadius=item.BorderRadius;if(item.Margin){if(IFrameSplitOperator.IsNumber(item.Margin.Left))src.Margin.Left=item.Margin.Left;if(IFrameSplitOperator.IsNumber(item.Margin.Top))src.Margin.Top=item.Margin.Top;if(IFrameSplitOperator.IsNumber(item.Margin.Bottom))src.Margin.Bottom=item.Margin.Bottom;if(IFrameSplitOperator.IsNumber(item.Margin.Right))src.Margin.Right=item.Margin.Right;}}}if(style.ChartDrawVolProfile){var item=style.ChartDrawVolProfile;if(item.UpVolColor)this.ChartDrawVolProfile.UpVolColor=item.UpVolColor;if(item.DownVolColor)this.ChartDrawVolProfile.DownVolColor=item.DownVolColor;if(item.AreaUpColor)this.ChartDrawVolProfile.AreaUpColor=item.AreaUpColor;if(item.AreaDonwColor)this.ChartDrawVolProfile.AreaDonwColor=item.AreaDonwColor;if(item.BGColor)this.ChartDrawVolProfile.BGColor=item.BGColor;if(item.BorderColor)this.ChartDrawVolProfile.BorderColor=item.BorderColor;if(item.VolLineColor)this.ChartDrawVolProfile.VolLineColor=item.VolLineColor;if(item.Text){if(item.Text.Color)this.ChartDrawVolProfile.Text.Color=item.Text.Color;if(item.Text.Family)this.ChartDrawVolProfile.Text.Family=item.Text.Family;if(IFrameSplitOperator.IsNumber(item.Text.FontMaxSize))this.ChartDrawVolProfile.Text.FontMaxSize=item.Text.FontMaxSize;if(IFrameSplitOperator.IsNumber(item.Text.FontMinSize))this.ChartDrawVolProfile.Text.FontMinSize=item.Text.FontMinSize;}}if(style.DisableLogo===true){if(this.FrameLogo)this.FrameLogo.Text=null;}if(style.ScrollBar){var item=style.ScrollBar;if(item.BorderColor)this.ScrollBar.BorderColor=item.BorderColor;if(item.XSplitTextFont)this.ScrollBar.XSplitTextFont=item.XSplitTextFont;if(item.XSplitTextColor)this.ScrollBar.XSplitTextColor=item.XSplitTextColor;if(item.XSplitLineColor)this.ScrollBar.XSplitLineColor=item.XSplitLineColor;if(item.Slider){var subItem=item.Slider;if(subItem.DateFont)this.ScrollBar.Slider.DateFont=subItem.DateFont;if(subItem.DateColor)this.ScrollBar.Slider.DateColor=subItem.DateColor;if(subItem.BarColor)this.ScrollBar.Slider.BarColor=subItem.BarColor;if(subItem.BarAreaColor)this.ScrollBar.Slider.BarAreaColor=subItem.BarAreaColor;if(IFrameSplitOperator.IsNumber(subItem.BarWidth))this.ScrollBar.Slider.BarWidth=subItem.BarWidth;if(IFrameSplitOperator.IsNumber(subItem.BarPadding))this.ScrollBar.Slider.BarPadding=subItem.BarPadding;if(IFrameSplitOperator.IsNumber(subItem.MinCenterWidth))this.ScrollBar.Slider.MinCenterWidth=subItem.MinCenterWidth;}if(item.BGChart){var subItem=item.BGChart;if(subItem.Color)this.ScrollBar.BGChart.Color=subItem.Color;if(subItem.AreaColor)this.ScrollBar.BGChart.AreaColor=subItem.AreaColor;if(IFrameSplitOperator.IsPlusNumber(subItem.LineWidth))this.ScrollBar.BGChart.LineWidth=subItem.LineWidth;}}if(style.FrameButtomToolbar)this.SetFrameButtomToolbar(style.FrameButtomToolbar);if(style.Keyboard)this.SetKeyboardStyle(style.Keyboard);if(style.MinuteToolbar)this.SetMinuteToolbar(style.MinuteToolbar);if(style.KLineToolbar)this.SetKLineToolbar(style.KLineToolbar);if(style.IndexLock)this.SetIndexLock(style.IndexLock);if(style.ChartScatterPlotV2)this.SetChartScatterPlotV2(style.ChartScatterPlotV2);if(style.ChartDrawTVLongPosition)this.SetChartDrawTVLongPosition(style.ChartDrawTVLongPosition);if(style.KLineCountDownPaint)this.SetKLineCountDownPaint(style.KLineCountDownPaint);if(style.SmallFloatTooltipV2)this.SetSmallFloatTooltipV2(style.SmallFloatTooltipV2);if(style.StockInfo)this.SetStockInfo(style.StockInfo);if(style.StatusBar)this.SetStatusBar(style.StatusBar);if(style.ScrollText)this.SetScrollText(style.ScrollText);if(style.MinuteInfo)this.SetMinuteInfo(style.MinuteInfo);if(style.OrderList)this.SetOrderList(style.OrderList);if(style.Calendar)this.SetCalendar(style.Calendar);};this.SetCalendar=function(style){var dest=this.Calendar;MergeObject(dest,style);};this.SetOrderList=function(style){var dest=this.OrderList;if(style.BorderColor)dest.BorderColor=style.BorderColor;if(style.UpTextColor)dest.UpTextColor=style.UpTextColor;if(style.DownTextColor)dest.DownTextColor=style.DownTextColor;if(style.UnchangeTextColor)dest.UnchangeTextColor=style.UnchangeTextColor;if(IFrameSplitOperator.IsNumber(style.UpTextColorID))dest.UpTextColorID=style.UpTextColorID;if(IFrameSplitOperator.IsNumber(style.DownTextColorID))dest.DownTextColor=style.DownTextColorID;if(IFrameSplitOperator.IsNumber(style.UnchangeTextColorID))dest.UnchangeTextColor=style.UnchangeTextColorID;if(style.Header){var subItem=style.Header;var subDest=this.OrderList.Header;if(subItem.Color)subDest.Color=subItem.Color;if(subItem.Margin)CopyMarginConfig(subDest.Margin,subItem.Margin);if(subItem.Font){if(IFrameSplitOperator.IsNumber(subItem.Font.Size))subDest.Font.Size=subItem.Font.Size;if(subItem.Font.Name)subDest.Font.Name=subItem.Font.Name;}}if(style.Item){var subItem=style.Item;var subDest=this.OrderList.Item;if(subItem.Margin)CopyMarginConfig(subDest.Margin,subItem.Margin);if(subItem.Font){if(IFrameSplitOperator.IsNumber(subItem.Font.Size))subDest.Font.Size=subItem.Font.Size;if(subItem.Font.Name)subDest.Font.Name=subItem.Font.Name;}}if(style.FieldColor){var subItem=style.Item;var subDest=this.OrderList.Item;if(subItem.Text)subDest.Text=subItem.Text;}if(style.Selected){var subItem=style.Selected;var subDest=this.OrderList.Selected;if(subItem.BGColor)subDest.BGColor=subItem.BGColor;if(subItem.LineColor)subDest.LineColor=subItem.LineColor;if(IFrameSplitOperator.IsNumber(subItem.LineWidth))subDest.LineWidth=subItem.LineWidth;}if(style.MoveOn){var subItem=style.MoveOn;var subDest=this.OrderList.MoveOn;if(subItem.LineColor)subDest.LineColor=subItem.LineColor;if(IFrameSplitOperator.IsNumber(subItem.LineWidth))subDest.LineWidth=subItem.LineWidth;}if(style.Footer){var subItem=style.Footer;var subDest=this.OrderList.Footer;if(subItem.Margin)CopyMarginConfig(subDest.Margin,subItem.Margin);if(subItem.ItemMargin)CopyMarginConfig(subDest.ItemMargin,subItem.ItemMargin);if(subItem.Font){if(IFrameSplitOperator.IsNumber(subItem.Font.Size))subDest.Font.Size=subItem.Font.Size;if(subItem.Font.Name)subDest.Font.Name=subItem.Font.Name;}if(subItem.ResetButton){if(subItem.ResetButton.ArcColor)subDest.ResetButton.ArcColor=subItem.ResetButton.ArcColor;if(subItem.ResetButton.MoveOnColor)subDest.ResetButton.MoveOnColor=subItem.ResetButton.MoveOnColor;if(IFrameSplitOperator.IsNumber(subItem.ResetButton.Size))subDest.ResetButton.Size=subItem.ResetButton.Size;if(subItem.ResetButton.Icon){var item=subItem.ResetButton.Icon;var destItem=subDest.ResetButton.Icon;if(item.LockedText)destItem.LockedText=item.LockedText;if(item.Text)destItem.Text=item.Text;if(item.Color)destItem.Color=item.Color;if(item.Family)destItem.Family=item.Family;if(IFrameSplitOperator.IsNumber(item.Size))destItem.Size=item.Size;}}}if(style.Selected){var subItem=style.Selected;var subDest=this.OrderList.Selected;if(subItem.BGColor)subDest.BGColor=subItem.BGColor;if(subItem.LineColor)subDest.LineColor=subItem.LineColor;if(IFrameSplitOperator.IsNumber(subItem.LineWidth))subDest.LineWidth=subItem.LineWidth;}};this.SetMinuteInfo=function(style){var dest=this.MinuteInfo;if(style.TextColor)dest.TextColor=style.TextColor;if(style.Font)dest.Font=style.Font;if(style.PointColor)dest.PointColor=style.PointColor;if(style.LineColor)dest.LineColor=style.LineColor;if(style.TextBGColor)dest.TextBGColor=style.TextBGColor;if(IFrameSplitOperator.IsNumber(style.PointRadius))dest.PointRadius=style.PointRadius;if(style.MinInfo&&style.MinInfo.Icon){var subItem=style.MinInfo.Icon;var subDest=this.MinuteInfo.MinInfo.Icon;if(IFrameSplitOperator.IsNumber(subItem.Size))subDest.Size=subItem.Size;if(subItem.Family)subDest.Family=subItem.Family;if(subItem.Text)subDest.Text=subItem.Text;if(subItem.HScreenText)subDest.HScreenText=subItem.HScreenText;if(subItem.Color)subDest.Color=subItem.Color;}};this.SetScrollText=function(style){var dest=this.ScrollText;if(style.Font)dest.Font=style.Font;if(style.Color)dest.Color=style.Color;if(style.MouseOnColor)dest.MouseOnColor=style.MouseOnColor;if(style.Margin){var item=style.Margin;if(IFrameSplitOperator.IsNumber(item.Top))dest.Margin.Top=item.Top;if(IFrameSplitOperator.IsNumber(item.Bottom))dest.Margin.Bottom=item.Bottom;}if(IFrameSplitOperator.IsNumber(style.LeftMargin))dest.LeftMargin=style.LeftMargin;if(IFrameSplitOperator.IsNumber(style.RightMargin))dest.RightMargin=style.RightMargin;if(IFrameSplitOperator.IsNumber(style.Spacing))dest.Spacing=style.Spacing;if(IFrameSplitOperator.IsNumber(style.MoveStep))dest.MoveStep=style.MoveStep;if(style.Label){var item=style.Label;var subDest=dest.Label;if(item.Color)subDest.Color=item.Color;if(item.Font)subDest.Font=item.Font;if(item.Margin)CopyMarginConfig(subDest.Margin,item.Margin);}};this.SetStatusBar=function(style){var dest=this.StatusBar;if(style.Table){var item=style.Table;if(item.Font)dest.Table.Font=item.Font;if(item.TitleColor)dest.Table.TitleColor=item.TitleColor;if(IFrameSplitOperator.IsNonEmptyArray(item.AryTextColor))dest.Table.AryTextColor=item.AryTextColor.slice();CopyMarginConfig(dest.Table.Margin,item.Margin);if(item.CellMargin){var subItem=item.CellMargin;CopyMarginConfig(dest.Table.CellMargin,subItem);if(IFrameSplitOperator.IsNumber(subItem.YOffset))dest.Table.CellMargin.YOffset=subItem.YOffset;}if(item.Separator){var subItem=item.Separator;var subDest=dest.Table.Separator;if(IFrameSplitOperator.IsNumber(subItem.Left))subDest.Left=subItem.Left;if(IFrameSplitOperator.IsNumber(subItem.Right))subDest.Left=subItem.Right;if(subItem.Line){if(IFrameSplitOperator.IsNumber(subItem.Line.Width))subDest.Line.Width=subItem.Line.Width;if(IFrameSplitOperator.IsNumber(subItem.Line.Top))subDest.Line.Top=subItem.Line.Top;if(IFrameSplitOperator.IsNumber(subItem.Line.Bottom))subDest.Line.Bottom=subItem.Line.Bottom;if(subItem.Line.Color)subDest.Line.Color=subItem.Line.Color;}}}if(style.DateTime){var item=style.DateTime;if(item.Font)dest.DateTime.Font=item.Font;if(item.TitleColor)dest.DateTime.TitleColor=item.TitleColor;if(item.Format)dest.DateTime.Format=item.Format;if(item.MaxText)dest.DateTime.MaxText=item.MaxText;if(item.Margin){var subItem=item.Margin;CopyMarginConfig(dest.DateTime.Margin,subItem);if(IFrameSplitOperator.IsNumber(subItem.YOffset))dest.DateTime.Margin.YOffset=subItem.YOffset;}}if(style.UpTextColor)dest.UpTextColor=style.UpTextColor;if(style.DownTextColor)dest.DownTextColor=style.DownTextColor;if(style.UnchangeTextColor)dest.UnchangeTextColor=style.UnchangeTextColor;if(style.BorderColor)dest.BorderColor=style.BorderColor;};this.SetStockInfo=function(style){var dest=this.StockInfo;if(style.BuySell){var item=style.BuySell;if(item.Font)dest.BuySell.Font=item.Font;if(item.TitleColor)dest.BuySell.TitleColor=item.TitleColor;if(item.VolColor)dest.BuySell.VolColor=item.VolColor;CopyMarginConfig(dest.BuySell.Margin,item.Margin);if(item.CellMargin){var subItem=item.CellMargin;CopyMarginConfig(dest.BuySell.CellMargin,subItem);if(IFrameSplitOperator.IsNumber(subItem.YOffset))dest.BuySell.CellMargin.YOffset=subItem.YOffset;}if(item.BottomLine){var subItem=item.BottomLine;if(subItem.Color)dest.BuySell.BottomLine.Color=subItem.Color;if(IFrameSplitOperator.IsBool(subItem.Enable))dest.BuySell.BottomLine.Enable=subItem.Enable;}if(item.TopLine){var subItem=item.TopLine;if(subItem.Color)dest.BuySell.TopLine.Color=subItem.Color;if(IFrameSplitOperator.IsBool(subItem.Enable))dest.BuySell.TopLine.Enable=subItem.Enable;}if(item.CenterLine){var subItem=item.CenterLine;if(subItem.BuyColor)dest.BuySell.CenterLine.BuyColor=subItem.BuyColor;if(subItem.SellColor)dest.BuySell.CenterLine.SellColor=subItem.SellColor;if(subItem.NoneColor)dest.BuySell.CenterLine.NoneColor=subItem.NoneColor;if(IFrameSplitOperator.IsNumber(subItem.Width))dest.BuySell.CenterLine.Width=subItem.Width;}}if(style.Table){var item=style.Table;if(item.Font)dest.Table.Font=item.Font;if(item.TitleColor)dest.Table.TitleColor=item.TitleColor;if(item.TextColor)dest.Table.TextColor=item.TextColor;CopyMarginConfig(dest.Table.Margin,item.Margin);if(item.CellMargin){var subItem=item.CellMargin;CopyMarginConfig(dest.Table.CellMargin,subItem);if(IFrameSplitOperator.IsNumber(subItem.YOffset))dest.Table.CellMargin.YOffset=subItem.YOffset;}}if(style.Header){var item=style.Header;if(item.Font)dest.Header.Font=item.Font;if(item.TextColor)dest.Header.TextColor=item.TextColor;if(item.Name){var subItem=item.Name;if(subItem.Font)dest.Header.Name.Font=subItem.Font;if(subItem.Color)dest.Header.Name.Color=subItem.Color;if(subItem.Margin){var margin=subItem.Margin;CopyMarginConfig(dest.Header.Name.Margin,margin);if(IFrameSplitOperator.IsNumber(margin.YOffset))dest.Header.Name.Margin.YOffset=margin.YOffset;}}if(item.Symbol){var subItem=item.Symbol;if(subItem.Font)dest.Header.Symbol.Font=subItem.Font;if(subItem.Color)dest.Header.Symbol.Color=subItem.Color;if(subItem.Margin){var margin=subItem.Margin;CopyMarginConfig(dest.Header.Symbol.Margin,margin);if(IFrameSplitOperator.IsNumber(margin.YOffset))dest.Header.Symbol.Margin.YOffset=margin.YOffset;}}if(IFrameSplitOperator.IsNonEmptyArray(item.AryCell)){for(var i=0;i<item.AryCell.length;++i){var subItem=item.AryCell[i];if(!dest.Header.AryCell[i])dest.Header.AryCell[i]={};var subDest=dest.Header.AryCell[i];if(subItem.Font)subDest.Font=subItem.Font;if(subItem.Margin){var margin=subItem.Margin;CopyMarginConfig(subDest.Margin,margin);if(IFrameSplitOperator.IsNumber(margin.YOffset))subDest.YOffset=margin.YOffset;}}}if(item.BottomLine){var subItem=item.BottomLine;if(subItem.Color)dest.Header.BottomLine.Color=subItem.Color;if(IFrameSplitOperator.IsBool(subItem.Enable))dest.Header.BottomLine.Enable=subItem.Enable;}}if(style.MouseOn){var item=style.MouseOn;if(item.BGColor)dest.MouseOn.BGColor=item.BGColor;}if(style.UpTextColor)dest.UpTextColor=style.UpTextColor;if(style.DownTextColor)dest.DownTextColor=style.DownTextColor;if(style.UnchangeTextColor)dest.UnchangeTextColor=style.UnchangeTextColor;if(style.BorderColor)dest.BorderColor=style.BorderColor;};this.SetSmallFloatTooltipV2=function(style){var dest=this.SmallFloatTooltipV2;if(style.BGColor)dest.BGColor=style.BGColor;if(style.BorderColor)dest.BorderColor=style.BorderColor;if(style.TextColor)dest.TextColor=style.TextColor;if(style.ValueColor)dest.ValueColor=style.ValueColor;};this.SetKLineCountDownPaint=function(style){var dest=this.KLineCountDownPaint;if(style.Font)dest.Font=style.Font;if(style.TextMargin){var item=style.TextMargin;CopyMarginConfig(dest.TextMargin,item);if(IFrameSplitOperator.IsNumber(item.YOffset))dest.TextMargin.YOffset=item.YOffset;}if(style.LabelMargin)CopyMarginConfig(dest.LabelMargin,style.LabelMargin);if(style.Line){var item=style.Line;if(IFrameSplitOperator.IsNumber(item.Width))dest.Line.Width=item.Width;if(IFrameSplitOperator.IsBool(item.IsShow))dest.Line.Width=item.Width;if(item.Dash)dest.Line.Dash=item.Dash;}if(style.Unchange){var item=style.Unchange;var subDest=dest.Unchange;if(item.BGColor)subDest.BGColor=item.BGColor;if(item.PriceColor)subDest.PriceColor=item.PriceColor;if(item.TimeColor)subDest.TimeColor=item.TimeColor;}if(style.Up){var item=style.Up;var subDest=dest.Up;if(item.BGColor)subDest.BGColor=item.BGColor;if(item.PriceColor)subDest.PriceColor=item.PriceColor;if(item.TimeColor)subDest.TimeColor=item.TimeColor;}if(style.Down){var item=style.Down;var subDest=dest.Down;if(item.BGColor)subDest.BGColor=item.BGColor;if(item.PriceColor)subDest.PriceColor=item.PriceColor;if(item.TimeColor)subDest.TimeColor=item.TimeColor;}};this.SetChartDrawTVLongPosition=function(style){if(style.TopArea){var item=style.TopArea;var dest=this.ChartDrawTVLongPosition.TopArea;if(item.AreaColor)dest.AreaColor=item.AreaColor;if(item.SelectedAreaColor)dest.SelectedAreaColor=item.SelectedAreaColor;if(item.TextBGColor)dest.TextBGColor=item.TextBGColor;if(item.TextColor)dest.BorderColor=item.TextColor;}if(style.BottomArea){var item=style.BottomArea;var dest=this.ChartDrawTVLongPosition.BottomArea;if(item.AreaColor)dest.AreaColor=item.AreaColor;if(item.SelectedAreaColor)dest.SelectedAreaColor=item.SelectedAreaColor;if(item.TextBGColor)dest.TextBGColor=item.TextBGColor;if(item.TextColor)dest.BorderColor=item.TextColor;}if(style.Label){var item=style.Label;var dest=this.ChartDrawTVLongPosition.Label;if(item.Font)dest.Font=item.Font;CopyMarginConfig(dest.Margin,item.Margin);}};this.SetKeyboardStyle=function(style){var item=style;var dest=this.Keyboard;if(item.BorderColor)dest.BorderColor=item.BorderColor;if(item.SelectedColor)dest.SelectedColor=item.SelectedColor;if(item.TextColor)dest.TextColor=item.TextColor;if(item.Item){var row=item.Item;if(row.Mergin){var mergin=row.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Left))dest.Item.Mergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Right))dest.Item.Mergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Top))dest.Item.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Bottom))dest.Item.Mergin.Bottom=mergin.Bottom;}if(row.Font){var font=row.Font;if(font.Name)dest.Item.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))dest.Item.Font.Size=font.Size;}if(row.BarMergin){var mergin=row.BarMergin;if(IFrameSplitOperator.IsNumber(mergin.Left))dest.Item.BarMergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Top))dest.Item.BarMergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Right))dest.Item.BarMergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Bottom))dest.Item.BarMergin.Bottom=mergin.Bottom;}if(row.NameFont){var font=row.NameFont;if(font.Name)dest.Item.NameFont.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))dest.Item.NameFont.Size=font.Size;}if(row.SymbolFont){var font=row.SymbolFont;if(font.Name)dest.Item.SymbolFont.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))dest.Item.SymbolFont.Size=font.Size;}}if(item.VScrollbar){var scroll=item.VScrollbar;if(IFrameSplitOperator.IsNumber(scroll.ScrollBarHeight))dest.VScrollbar.ScrollBarHeight=scroll.ScrollBarHeight;if(scroll.ButtonColor)dest.VScrollbar.ButtonColor=scroll.ButtonColor;if(scroll.BarColor)dest.VScrollbar.BarColor=scroll.BarColor;if(scroll.BorderColor)dest.VScrollbar.BorderColor=scroll.BorderColor;if(scroll.BGColor)dest.VScrollbar.BGColor=scroll.BGColor;if(scroll.BarWidth){var subItem=scroll.BarWidth;if(IFrameSplitOperator.IsNumber(subItem.Size))dest.VScrollbar.BarWidth.Size=subItem.Size;}}};this.SetReportStyle=function(style){var item=style;var dest=this.Report;if(item.BorderColor)this.Report.BorderColor=item.BorderColor;if(item.UpTextColor)this.Report.UpTextColor=item.UpTextColor;if(item.DownTextColor)this.Report.DownTextColor=item.DownTextColor;if(item.UnchagneTextColor)this.Report.UnchagneTextColor=item.UnchagneTextColor;if(item.BorderColor)this.Report.SelectedColor=item.SelectedColor;if(item.SelectedLine){var subItem=item.SelectedLine;var subDest=this.Report.SelectedLine;if(subItem.Color)subDest.Color=subItem.Color;if(IFrameSplitOperator.IsNumber(subItem.Width))subDest.Width=subItem.Width;}if(item.CloseLine){var closeLine=item.CloseLine;if(closeLine.CloseColor)this.Report.CloseLine.CloseColor=closeLine.CloseColor;if(closeLine.YCloseColor)this.Report.CloseLine.YCloseColor=closeLine.YCloseColor;if(closeLine.AreaColor)this.Report.CloseLine.AreaColor=closeLine.AreaColor;if(closeLine.UpColor)this.Report.CloseLine.UpColor=closeLine.UpColor;if(closeLine.UpAreaColor)this.Report.CloseLine.UpAreaColor=closeLine.UpAreaColor;if(closeLine.DownColor)this.Report.CloseLine.DownColor=closeLine.DownColor;if(closeLine.DownAreaColor)this.Report.CloseLine.DownAreaColor=closeLine.DownAreaColor;if(closeLine.UnchangeColor)this.Report.CloseLine.UnchangeColor=closeLine.UnchangeColor;if(closeLine.UnchangeAreaColor)this.Report.CloseLine.UnchangeAreaColor=closeLine.UnchangeAreaColor;}if(item.KLine){var kline=item.KLine;if(kline.UpColor)this.Report.KLine.UpColor=kline.UpColor;if(kline.DownColor)this.Report.KLine.DownColor=kline.DownColor;if(kline.UnchagneColor)this.Report.KLine.UnchagneColor=kline.UnchagneColor;if(IFrameSplitOperator.IsNumber(kline.DataWidth))this.Report.KLine.DataWidth=kline.DataWidth;if(IFrameSplitOperator.IsNumber(kline.DistanceWidth))this.Report.KLine.DistanceWidth=kline.DistanceWidth;}if(item.Header){var header=item.Header;if(header.Color)this.Report.Header.Color=header.Color;if(header.Mergin){var mergin=header.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Left))this.Report.Header.Mergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Right))this.Report.Header.Mergin.Left=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Top))this.Report.Header.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Bottom))this.Report.Header.Mergin.Bottom=mergin.Bottom;}if(header.Font){var font=header.Font;if(font.Name)this.Report.Header.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.Report.Header.Font.Size=font.Size;}}if(item.SortIcon){var sort=item.SortIcon;if(IFrameSplitOperator.IsNonEmptyArray(sort.Color))this.Report.SortIcon.Color=sort.Color.slice();if(IFrameSplitOperator.IsNumber(sort.Size))this.Report.SortIcon.Size=sort.Size;if(sort.Family)this.Report.SortIcon.Family=sort.Family;if(IFrameSplitOperator.IsNonEmptyArray(sort.Arrow))this.Report.SortIcon.Arrow=sort.Arrow.slice();if(sort.Margin){var margin=sort.Margin;if(IFrameSplitOperator.IsNumber(margin.Left))this.Report.SortIcon.Margin.Left=margin.Left;if(IFrameSplitOperator.IsNumber(margin.Right))this.Report.SortIcon.Margin.Right=margin.Right;if(IFrameSplitOperator.IsNumber(margin.Top))this.Report.SortIcon.Margin.Top=margin.Top;if(IFrameSplitOperator.IsNumber(margin.Bottom))this.Report.SortIcon.Margin.Bottom=margin.Bottom;}}if(item.Item){var row=item.Item;if(row.Mergin){var mergin=row.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Left))this.Report.Item.Mergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Right))this.Report.Item.Mergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Top))this.Report.Item.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Bottom))this.Report.Item.Mergin.Bottom=mergin.Bottom;}if(row.Font){var font=row.Font;if(font.Name)this.Report.Item.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.Report.Item.Font.Size=font.Size;}if(row.BarMergin){var mergin=row.BarMergin;if(IFrameSplitOperator.IsNumber(mergin.Left))this.Report.Item.BarMergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Top))this.Report.Item.BarMergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Right))this.Report.Item.BarMergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Bottom))this.Report.Item.BarMergin.Bottom=mergin.Bottom;}if(row.NameFont){var font=row.NameFont;if(font.Name)this.Report.Item.NameFont.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.Report.Item.NameFont.Size=font.Size;}if(row.SymbolFont){var font=row.SymbolFont;if(font.Name)this.Report.Item.SymbolFont.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.Report.Item.SymbolFont.Size=font.Size;}}if(item.FixedItem){var row=item.FixedItem;if(row.Font){var font=row.Font;if(font.Name)this.Report.FixedItem.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.Report.FixedItem.Font.Size=font.Size;}}if(item.LimitBorder){var limit=item.LimitBorder;if(limit.Color)this.Report.LimitBorder.Color=limit.Color;if(limit.Mergin){var mergin=limit.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Left))this.Report.LimitBorder.Mergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Top))this.Report.LimitBorder.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Right))this.Report.LimitBorder.Mergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Bottom))this.Report.LimitBorder.Mergin.Bottom=mergin.Bottom;}}if(item.LimitColor){var limit=item.LimitColor;if(limit.UpColor)this.Report.LimitColor.UpColor=limit.UpColor;if(limit.DownColor)this.Report.LimitColor.DownColor=limit.DownColor;if(limit.TextColor)this.Report.LimitColor.UpColor=limit.TextColor;}if(item.FieldColor){var filed=item.FieldColor;if(filed.Name)this.Report.FieldColor.Name=filed.Name;if(filed.Symbol)this.Report.FieldColor.Symbol=filed.Symbol;if(filed.Vol)this.Report.FieldColor.Vol=filed.Vol;if(filed.Amount)this.Report.FieldColor.Amount=filed.Amount;if(filed.Index)this.Report.FieldColor.Index=filed.Index;if(filed.BarTitle)this.Report.FieldColor.BarTitle=filed.BarTitle;if(filed.Text)this.Report.FieldColor.Text=filed.Text;if(IFrameSplitOperator.IsNonEmptyArray(filed.Bar)){for(var i=0;i<filed.Bar.length;++i)this.Report.FieldColor.Bar[i]=filed.Bar[i];}}if(item.NameSymbolV2){var nameSymbol=item.NameSymbolV2;if(nameSymbol.Name){var subItem=nameSymbol.Name;if(IFrameSplitOperator.IsNumber(subItem.Size))this.Report.NameSymbolV2.Name.Size=subItem.Size;if(subItem.Name)this.Report.NameSymbolV2.Name.Name=subItem.Name;if(subItem.Color)this.Report.NameSymbolV2.Name.Color=subItem.Color;}if(nameSymbol.Symbol){var subItem=nameSymbol.Symbol;if(IFrameSplitOperator.IsNumber(subItem.Size))this.Report.NameSymbolV2.Symbol.Size=subItem.Size;if(subItem.Name)this.Report.NameSymbolV2.Symbol.Name=subItem.Name;if(subItem.Color)this.Report.NameSymbolV2.Symbol.Color=subItem.Color;}}if(item.Tab){var tab=item.Tab;if(tab.Font){var font=tab.Font;if(font.Name)this.Report.Tab.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.Report.Tab.Font.Size=font.Size;}if(IFrameSplitOperator.IsNumber(tab.ScrollBarWidth))this.Report.Tab.ScrollBarWidth=tab.ScrollBarWidth;if(tab.ButtonColor)this.Report.Tab.ButtonColor=tab.ButtonColor;if(tab.BarColor)this.Report.Tab.BarColor=tab.BarColor;if(tab.BorderColor)this.Report.Tab.BorderColor=tab.BorderColor;if(tab.TabTitleColor)this.Report.Tab.TabTitleColor=tab.TabTitleColor;if(tab.TabSelectedTitleColor)this.Report.Tab.TabSelectedTitleColor=tab.TabSelectedTitleColor;if(tab.TabSelectedBGColor)this.Report.Tab.TabSelectedBGColor=tab.TabSelectedBGColor;if(tab.TabMoveOnTitleColor)this.Report.Tab.TabMoveOnTitleColor=tab.TabMoveOnTitleColor;if(tab.TabBGColor)this.Report.Tab.TabBGColor=tab.TabBGColor;}if(item.PageInfo){var pageinfo=item.PageInfo;if(pageinfo.Font){var font=pageinfo.Font;if(font.Name)this.Report.PageInfo.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))this.Report.PageInfo.Font.Size=font.Size;}if(pageinfo.TextColor)this.Report.PageInfo.TextColor=pageinfo.TextColor;if(pageinfo.BGColor)this.Report.PageInfo.BGColor=pageinfo.BGColor;if(pageinfo.Mergin){var mergin=pageinfo.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Left))this.Report.PageInfo.Mergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Top))this.Report.PageInfo.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Right))this.Report.PageInfo.Mergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Bottom))this.Report.PageInfo.Mergin.Bottom=mergin.Bottom;}}if(item.DragRow){var dragRow=item.DragRow;if(dragRow.Color)this.Report.DragRow.Color=dragRow.Color;if(dragRow.TextColor)this.Report.DragRow.TextColor=dragRow.TextColor;if(dragRow.MoveRowColor)this.Report.DragRow.MoveRowColor=dragRow.MoveRowColor;if(dragRow.SrcRowColor)this.Report.DragRow.SrcRowColor=dragRow.SrcRowColor;}if(item.VScrollbar){var subItem=item.VScrollbar;if(IFrameSplitOperator.IsNumber(subItem.ScrollBarHeight))dest.VScrollbar.ScrollBarHeight=subItem.ScrollBarHeight;if(subItem.ButtonColor)dest.VScrollbar.ButtonColor=subItem.ButtonColor;if(subItem.BarColor)dest.VScrollbar.BarColor=subItem.BarColor;if(subItem.BorderColor)dest.VScrollbar.BorderColor=subItem.BorderColor;if(subItem.BGColor)dest.VScrollbar.BGColor=subItem.BGColor;}if(item.CheckBox){var subItem=item.CheckBox;if(subItem.Family)dest.CheckBox.Family=subItem.Family;if(IFrameSplitOperator.IsNumber(subItem.Size))dest.CheckBox.Size=subItem.Size;if(subItem.Checked){var child=subItem.Checked;if(child.Color)dest.CheckBox.Checked.Color=child.Color;if(child.Symbol)dest.CheckBox.Checked.Symbol=child.Symbol;if(child.DisableColor)dest.CheckBox.Checked.DisableColor=child.DisableColor;}if(subItem.Unchecked){var child=subItem.Unchecked;if(child.Color)dest.CheckBox.Unchecked.Color=child.Color;if(child.Symbol)dest.CheckBox.Unchecked.Symbol=child.Symbol;if(child.DisableColor)dest.CheckBox.Unchecked.DisableColor=child.DisableColor;}CopyMarginConfig(dest.CheckBox.Margin,subItem.Margin);}if(item.Link){var subItem=item.Link;if(subItem.Font)dest.Link.Font=subItem.Font;if(subItem.TextColor)dest.Link.TextColor=subItem.TextColor;if(subItem.Disable&&subItem.Disable.TextColor)dest.Link.Disable.TextColor=subItem.Disable.TextColor;if(subItem.MouseOn&&subItem.MouseOn.TextColor)dest.Link.MouseOn.TextColor=subItem.MouseOn.TextColor;}if(item.ProgressBar){var subItem=item.ProgressBar;if(subItem.BGColor)dest.ProgressBar.BGColor=subItem.BGColor;if(subItem.BarColor)dest.ProgressBar.BarColor=subItem.BarColor;if(subItem.TextColor)dest.ProgressBar.TextColor=subItem.TextColor;if(subItem.Font)dest.ProgressBar.Font=subItem.Font;if(subItem.Disable){if(subItem.Disable.BGColor)dest.ProgressBar.Disable.BGColor=subItem.Disable.BGColor;if(subItem.Disable.BarColor)dest.ProgressBar.Disable.BarColor=subItem.Disable.BarColor;if(subItem.Disable.TextColor)dest.ProgressBar.Disable.TextColor=subItem.Disable.TextColor;}CopyMarginConfig(dest.ProgressBar.Margin,subItem.Margin);CopyMarginConfig(dest.ProgressBar.BarMargin,subItem.BarMargin);CopyMarginConfig(dest.ProgressBar.TextMargin,subItem.TextMargin);}if(item.Buttom){var subItem=item.Buttom;if(subItem.BGColor)dest.Buttom.BGColor=subItem.BGColor;if(subItem.TextColor)dest.Buttom.TextColor=subItem.TextColor;if(subItem.BorderColor)dest.Buttom.BorderColor=subItem.BorderColor;if(subItem.Font)dest.Buttom.Font=subItem.Font;if(subItem.Disable){if(subItem.Disable.BGColor)dest.Buttom.Disable.BGColor=subItem.Disable.BGColor;if(subItem.Disable.TextColor)dest.Buttom.Disable.TextColor=subItem.Disable.TextColor;}if(subItem.MouseOn){if(subItem.MouseOn.BGColor)dest.Buttom.MouseOn.BGColor=subItem.MouseOn.BGColor;if(subItem.MouseOn.TextColor)dest.Buttom.MouseOn.TextColor=subItem.MouseOn.TextColor;}CopyMarginConfig(dest.Buttom.Margin,subItem.Margin);CopyMarginConfig(dest.Buttom.TextMargin,subItem.TextMargin);}};this.SetTReportStyle=function(style){var item=style;var dest=this.TReport;if(item.BorderColor)dest.BorderColor=item.BorderColor;if(item.UpTextColor)dest.UpTextColor=item.UpTextColor;if(item.DownTextColor)dest.DownTextColor=item.DownTextColor;if(item.UnchangeTextColor)dest.UnchangeTextColor=item.UnchangeTextColor;if(item.BorderColor)dest.SelectedColor=item.SelectedColor;if(item.UpBGColor)dest.UpBGColor=item.UpBGColor;if(item.DownBGColor)dest.DownBGColor=item.DownBGColor;if(item.Header){var header=item.Header;if(header.Color)dest.Header.Color=header.Color;if(header.SortColor)dest.Header.SortColor=header.SortColor;if(header.Mergin){var mergin=header.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Left))dest.Header.Mergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Right))dest.Header.Mergin.Left=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Top))dest.Header.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Bottom))dest.Header.Mergin.Bottom=mergin.Bottom;}if(header.Font){var font=header.Font;if(font.Name)dest.Header.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))dest.Header.Font.Size=font.Size;}}if(item.CenterItem){var cell=item.CenterItem;if(cell.TextColor)dest.CenterItem.TextColor=cell.TextColor;if(cell.BaseTextColor)dest.CenterItem.BaseTextColor=cell.BaseTextColor;if(cell.BGColor)dest.CenterItem.BGColor=cell.BGColor;if(cell.MatchTextColor)dest.CenterItem.MatchTextColor=cell.MatchTextColor;}if(item.Item){var row=item.Item;if(row.Mergin){var mergin=row.Mergin;if(IFrameSplitOperator.IsNumber(mergin.Left))dest.Item.Mergin.Left=mergin.Left;if(IFrameSplitOperator.IsNumber(mergin.Right))dest.Item.Mergin.Right=mergin.Right;if(IFrameSplitOperator.IsNumber(mergin.Top))dest.Item.Mergin.Top=mergin.Top;if(IFrameSplitOperator.IsNumber(mergin.Bottom))dest.Item.Mergin.Bottom=mergin.Bottom;}if(row.Font){var font=row.Font;if(font.Name)dest.Item.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))dest.Item.Font.Size=font.Size;}if(row.NameFont){var font=row.NameFont;if(font.Name)dest.Item.NameFont.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))dest.Item.NameFont.Size=font.Size;}if(row.SymbolFont){var font=row.SymbolFont;if(font.Name)dest.Item.SymbolFont.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))dest.Item.SymbolFont.Size=font.Size;}}if(item.FieldColor){var filed=item.FieldColor;if(filed.Name)dest.FieldColor.Name=filed.Name;if(filed.Symbol)dest.FieldColor.Symbol=filed.Symbol;if(filed.Vol)dest.FieldColor.Vol=filed.Vol;if(filed.Amount)dest.FieldColor.Amount=filed.Amount;if(filed.Index)dest.FieldColor.Index=filed.Index;if(filed.Text)dest.FieldColor.Text=filed.Text;if(filed.Position)dest.FieldColor.Position=filed.Position;}if(item.MarkBorder){var subIem=item.MarkBorder;if(subIem.MaxPositionColor)dest.MarkBorder.MaxPositionColor=subIem.MaxPositionColor;}if(item.FixedItem){var subIem=item.FixedItem;if(subIem.Font){var font=subIem.Font;if(font.Name)dest.FixedItem.Font.Name=font.Name;if(IFrameSplitOperator.IsNumber(font.Size))dest.FixedItem.Font.Size=font.Size;}}};this.SetFrameButtomToolbar=function(style){var dest=this.FrameButtomToolbar;if(style.BGColor)dest.BGColor=style.BGColor;if(style.BorderColor)dest.BorderColor=style.BorderColor;if(style.Button){var button=style.Button;if(button.BorderColor)dest.Button.BorderColor=button.BorderColor;if(button.Font){var item=button.Font;var destItem=this.FrameButtomToolbar.Button.Font;if(item.Family)destItem.Family=item.Family;if(IFrameSplitOperator.IsNumber(item.Size))destItem.Size=item.Size;}if(button.TitleColor){var item=button.TitleColor;var destItem=this.FrameButtomToolbar.Button.TitleColor;if(item.Selected)destItem.Selected=item.Selected;if(item.Default)destItem.Default=item.Default;if(item.MoveOn)destItem.MoveOn=item.MoveOn;}if(button.BGColor){var item=button.BGColor;var destItem=this.FrameButtomToolbar.Button.BGColor;if(item.Selected)destItem.Selected=item.Selected;if(item.Default)destItem.Default=item.Default;if(item.MoveOn)destItem.MoveOn=item.MoveOn;}if(button.Mergin){var item=button.Mergin;var destItem=this.FrameButtomToolbar.Button.Mergin;if(IFrameSplitOperator.IsNumber(item.Left))destItem.Left=item.Left;if(IFrameSplitOperator.IsNumber(item.Right))destItem.Left=item.Right;if(IFrameSplitOperator.IsNumber(item.Top))destItem.Top=item.Top;if(IFrameSplitOperator.IsNumber(item.Bottom))destItem.Bottom=item.Bottom;}if(button.SVG){var item=button.SVG;var destItem=this.FrameButtomToolbar.Button.SVG;if(IFrameSplitOperator.IsNumber(item.Size))destItem.Size=item.Size;if(IFrameSplitOperator.IsNumber(item.MerginLeft))destItem.MerginLeft=item.MerginLeft;if(item.Family)destItem.Family=item.Family;}}};this.SetMinuteToolbar=function(style){var dest=this.MinuteToolbar;if(IFrameSplitOperator.IsBool(style.ModifyIndex))dest.ModifyIndex=style.ModifyIndex;if(IFrameSplitOperator.IsBool(style.ChangeIndex))dest.ChangeIndex=style.ChangeIndex;if(IFrameSplitOperator.IsBool(style.CloseIndex))dest.CloseIndex=style.CloseIndex;if(IFrameSplitOperator.IsBool(style.OverlayIndex))dest.OverlayIndex=style.OverlayIndex;if(IFrameSplitOperator.IsBool(style.MaxMinWindow))dest.MaxMinWindow=style.MaxMinWindow;if(IFrameSplitOperator.IsBool(style.TitleWindow))dest.TitleWindow=style.TitleWindow;if(IFrameSplitOperator.IsBool(style.ExportData))dest.ExportData=style.ExportData;if(IFrameSplitOperator.IsBool(style.AddIndexWindow))dest.AddIndexWindow=style.AddIndexWindow;if(IFrameSplitOperator.IsBool(style.IndexHelp))dest.IndexHelp=style.IndexHelp;if(IFrameSplitOperator.IsBool(style.IndexAIAnalyze))dest.IndexAIAnalyze=style.IndexAIAnalyze;if(IFrameSplitOperator.IsBool(style.IsShowOverlayToolbar))dest.IsShowOverlayToolbar=style.IsShowOverlayToolbar;if(IFrameSplitOperator.IsBool(style.IsShowOverlayFrame))dest.IsShowOverlayFrame=style.IsShowOverlayFrame;};this.SetKLineToolbar=function(style){var dest=this.KLineToolbar;if(IFrameSplitOperator.IsBool(style.ModifyIndex))dest.ModifyIndex=style.ModifyIndex;if(IFrameSplitOperator.IsBool(style.ChangeIndex))dest.ChangeIndex=style.ChangeIndex;if(IFrameSplitOperator.IsBool(style.CloseIndex))dest.CloseIndex=style.CloseIndex;if(IFrameSplitOperator.IsBool(style.OverlayIndex))dest.OverlayIndex=style.OverlayIndex;if(IFrameSplitOperator.IsBool(style.MaxMinWindow))dest.MaxMinWindow=style.MaxMinWindow;if(IFrameSplitOperator.IsBool(style.TitleWindow))dest.TitleWindow=style.TitleWindow;if(IFrameSplitOperator.IsBool(style.ExportData))dest.ExportData=style.ExportData;if(IFrameSplitOperator.IsBool(style.AddIndexWindow))dest.AddIndexWindow=style.AddIndexWindow;if(IFrameSplitOperator.IsBool(style.IndexHelp))dest.IndexHelp=style.IndexHelp;if(IFrameSplitOperator.IsBool(style.IndexAIAnalyze))dest.IndexAIAnalyze=style.IndexAIAnalyze;};this.SetChartSimpleTable=function(style){var dest=this.ChartSimpleTable;if(style.TextColor)dest.TextColor=style.TextColor;if(style.BGColor)dest.BGColor=style.BGColor;if(style.BorderColor)dest.BorderColor=style.BorderColor;if(style.TextFont){var item=style.TextFont;if(item.Name)dest.TextFont.Name=item.Name;if(IFrameSplitOperator.IsNumber(item.Size))dest.TextFont.Size=item.Size;}if(style.ItemMargin){var margin=style.ItemMargin;if(IFrameSplitOperator.IsNumber(margin.Left))dest.ItemMargin.Left=margin.Left;if(IFrameSplitOperator.IsNumber(margin.Right))dest.ItemMargin.Right=margin.Right;if(IFrameSplitOperator.IsNumber(margin.Top))dest.ItemMargin.Top=margin.Top;if(IFrameSplitOperator.IsNumber(margin.Bottom))dest.ItemMargin.Bottom=margin.Bottom;}};this.SetChartSimplePie=function(style){var dest=this.ChartSimplePie;if(style.TextFont){var item=style.TextFont;if(item.Name)dest.TextFont.Name=item.Name;if(IFrameSplitOperator.IsNumber(item.Size))dest.TextFont.Size=item.Size;}if(style.BorderColor)dest.BorderColor=style.BorderColor;if(style.Offset){var item=style.Offset;if(IFrameSplitOperator.IsNumber(item.X))dest.Offset.X=item.X;if(IFrameSplitOperator.IsNumber(item.Y))dest.Offset.Y=item.Y;}};this.SetChartSimpleDoughnut=function(style){var dest=this.ChartSimpleDoughnut;if(style.TextFont){var item=style.TextFont;if(item.Name)dest.TextFont.Name=item.Name;if(IFrameSplitOperator.IsNumber(item.Size))dest.TextFont.Size=item.Size;}if(style.BorderColor)dest.BorderColor=style.BorderColor;if(style.Offset){var item=style.Offset;if(IFrameSplitOperator.IsNumber(item.X))dest.Offset.X=item.X;if(IFrameSplitOperator.IsNumber(item.Y))dest.Offset.Y=item.Y;}};this.SetChartSimpleRadar=function(style){var dest=this.ChartSimpleRadar;if(style.TextFont){var item=style.TextFont;if(item.Name)dest.TextFont.Name=item.Name;if(IFrameSplitOperator.IsNumber(item.Size))dest.TextFont.Size=item.Size;}if(style.BorderColor)dest.BorderColor=style.BorderColor;if(style.TextColor)dest.TextColor=style.TextColor;if(style.Offset){var item=style.Offset;if(IFrameSplitOperator.IsNumber(item.X))dest.Offset.X=item.X;if(IFrameSplitOperator.IsNumber(item.Y))dest.Offset.Y=item.Y;}if(IFrameSplitOperator.IsNonEmptyArray(style.AryBGColor))dest.AryBGColor=style.AryBGColor.slice();if(IFrameSplitOperator.IsNonEmptyArray(style.AryArea))dest.AryArea=style.AryArea.slice();};this.SetChartBaseLineBar=function(style){var dest=this.ChartBaseLineBar;if(style.UpColor)dest.UpColor=style.UpColor;if(style.DownColor)dest.DownColor=style.DownColor;};this.SetChartPointDot=function(style){var dest=this.ChartPointDot;if(style.UpColor)dest.UpColor=style.UpColor;if(style.DownColor)dest.DownColor=style.DownColor;};this.SetChartHorizontalChannel=function(style){var dest=this.ChartHorizontalChannel;var subItem=style.Label;if(subItem){if(subItem.Color)dest.Label.Color=subItem.Color;if(subItem.Font)dest.Label.Font=subItem.Font;}};this.SetIndexLock=function(style){var item=style;var dest=this.IndexLock;if(item.BGColor)dest.BGColor=item.BGColor;if(item.TextColor)dest.TextColor=item.TextColor;if(item.Font)dest.Font=item.Font;if(item.Title)dest.Title=item.Title;};this.SetChartScatterPlotV2=function(style){var item=style;var dest=this.ChartScatterPlotV2;if(item.Color)dest.Color=item.Color;if(item.TextColor)dest.TextColor=item.TextColor;if(item.Font)dest.Font=item.Font;if(IFrameSplitOperator.IsNumber(item.Radius))dest.Radius=item.Radius;};}var g_JSChartResource=new JSChartResource();/////////////////////////////////////////////////////////////////////////////////
 //
 //
@@ -12093,7 +12093,7 @@ numberData.SingleValue=data2;numberData.DataType=1;if(IFrameSplitOperator.IsNumb
     DRAWICON(C>MA5,MA5,2);//表示在收盘价大于5周期均线的k线对应的MA5数值位置上画出图标ICON2。
     写完“DRAWICON(C>MA5,MA5,” 以后，点击插入图标按钮，再单击选中的图标插入到函数中，图标用ICO1~ICO105（或1~105）表示。
     */this.DRAWICON=function(condition,data,type){if(IFrameSplitOperator.IsString(type))//把ICO1=>1
-{var value=type.replace('ICO',"");type=parseInt(value);}var icon=g_JSComplierResource.GetDrawIcon(type);if(!icon)g_JSComplierResource.GetDrawTextIcon(type);if(!icon)icon={Symbol:'🚩'};var drawData=[];var result={DrawData:drawData,DrawType:'DRAWICON',Icon:icon,IconType:type};if(condition.length<=0)return result;var IsNumber=typeof data=="number";if(typeof condition=='number'){if(!condition)return result;for(var i=0;i<this.SymbolData.Data.Data.length;++i){if(IsNumber){drawData[i]=data;}else{if(i<data.length&&this.IsNumber(data[i]))drawData[i]=data[i];else drawData[i]=null;}}return result;}for(var i in condition){drawData[i]=null;if(!condition[i])continue;if(IsNumber){drawData[i]=data;}else{if(this.IsNumber(data[i]))drawData[i]=data[i];}}return result;};/*
+{var value=type.replace('ICO',"");type=parseInt(value);}var icon=g_JSComplierResource.GetDrawIcon(type);if(!icon)icon=g_JSComplierResource.GetDrawTextIcon(type);if(!icon)icon={Symbol:'🚩'};var drawData=[];var result={DrawData:drawData,DrawType:'DRAWICON',Icon:icon,IconType:type};if(condition.length<=0)return result;var IsNumber=typeof data=="number";if(typeof condition=='number'){if(!condition)return result;for(var i=0;i<this.SymbolData.Data.Data.length;++i){if(IsNumber){drawData[i]=data;}else{if(i<data.length&&this.IsNumber(data[i]))drawData[i]=data[i];else drawData[i]=null;}}return result;}for(var i in condition){drawData[i]=null;if(!condition[i])continue;if(IsNumber){drawData[i]=data;}else{if(this.IsNumber(data[i]))drawData[i]=data[i];}}return result;};/*
     ICON：在k线图上，显示小图标。
 
     用法：ICON(TYPE,ICON);
@@ -13784,7 +13784,8 @@ AryColor:[]},//日历
 Calendar:{Title:{Color:'rgb(240,240,240)',Arrow:{Color:"rgb(136, 136, 136)"},MoveOn:{BGColor:"rgb(220,220,220)",Color:"rgb(0,0,0)"}},// HRate=高度占比
 WeekTitle:{Color:'rgb(240,240,240)'},Day:{Text:{Color:["rgb(240, 240, 240)","rgb(128,128,128)","rgb(105,105,105)"]},//MoveOn:{ BGColor:"rgb(220,220,220)", Color:"rgb(0,0,0)" },
 //Today:{ Enable:true, BGColor:"rgb(0,103,192)", Color:"rgb(250,250,250)" },
-Selected:{BorderColor:["rgb(0,103,192)","rgb(0,0,0)"]}},Month:{Text:{Color:["rgb(240, 240, 240)","rgb(128,128,128)","rgb(105,105,105)"]}//MoveOn:{ BGColor:"rgb(220,220,220)", Color:"rgb(0,0,0)" },
+Selected:{BorderColor:["rgb(0,103,192)","rgb(0,0,0)"]}},MarkDay:{//Dots:{ Color:"rgb(165,42,42)" }
+},Month:{Text:{Color:["rgb(240, 240, 240)","rgb(128,128,128)","rgb(105,105,105)"]}//MoveOn:{ BGColor:"rgb(220,220,220)", Color:"rgb(0,0,0)" },
 //Today:{ Enable:true, BGColor:"rgb(0,103,192)", Color:"rgb(250,250,250)" },
 //Font:{ SizeRate:0.3, Family:"微软雅黑"}
 }}};return BLACK_STYLE;}var STYLE_TYPE_ID={BLACK_ID:1,//黑色风格
@@ -14642,7 +14643,8 @@ drawInfo.Text=(index+1).toString();}else if(column.Type==REPORT_COLUMN_ID.SYMBOL
 if(stock&&stock.NameEx){var nameEx=stock.NameEx;drawInfo.Text=this.TextEllipsis(nameEx.Text,textWidth,column.MaxText);drawInfo.TextColor=this.GetNameColor(column,data.Symbol,rowType);if(nameEx.Symbol)drawInfo.Symbol=nameEx.Symbol;}}else if(column.Type==REPORT_COLUMN_ID.PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.Price,stock,data,drawInfo,{LimitBG:true});this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.OPEN_ID){//如果行情开盘价为涨停价或跌停价,则对内容加灰框
 if(stock){this.DrawLimitPriceBorder(stock.Open,stock,left,top,column.Width);this.GetPriceDrawInfo(stock.Open,stock,data,drawInfo,{LimitBG:true});}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.HIGH_ID){//如果行情最高价为涨停价,则对内容加灰框
 if(stock){this.DrawLimitPriceBorder(stock.High,stock,left,top,column.Width);this.GetPriceDrawInfo(stock.High,stock,data,drawInfo,{LimitBG:true});}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.LOW_ID){//如果行情最低价为跌停价,则对内容加灰框
-if(stock){this.DrawLimitPriceBorder(stock.Low,stock,left,top,column.Width);this.GetPriceDrawInfo(stock.Low,stock,data,drawInfo,{LimitBG:true});}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.YCLOSE_ID){if(stock)this.GetPriceDrawInfo(stock.YClose,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.BUY_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.BuyPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.FUTURES_CLOSE_ID||column.Type==REPORT_COLUMN_ID.FUTURES_YCLOSE_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];this.GetPriceDrawInfo(value,stock,data,drawInfo);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SELL_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.SellPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.AVERAGE_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.AvPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.EXCHANGE_RATE_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.Exchange))drawInfo.Text=stock.Exchange.toFixed(2);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.BUY_VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.BuyVol))drawInfo.Text=this.FormatVolString(stock.BuyVol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SELL_VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.SellVol))drawInfo.Text=this.FormatVolString(stock.SellVol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.Vol))drawInfo.Text=this.FormatVolString(stock.Vol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_IN_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.VolIn))drawInfo.Text=this.FormatVolString(stock.VolIn);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_OUT_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.VolOut))drawInfo.Text=this.FormatVolString(stock.VolOut);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.TOTAL_SHARES_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.TotalShares))drawInfo.Text=this.FormatVolString(stock.TotalShares);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.OutShares))drawInfo.Text=this.FormatVolString(stock.OutShares);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID||column.Type==REPORT_COLUMN_ID.MARKET_VALUE_ID||column.Type==REPORT_COLUMN_ID.AMOUNT_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName]))drawInfo.Text=this.FormatVolString(stock[fieldName]);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.INCREASE_ID||column.Type==REPORT_COLUMN_ID.AMPLITUDE_ID||column.Type==REPORT_COLUMN_ID.UPDOWN_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_1M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_3M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_5M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_10M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_15M_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];drawInfo.Text=value.toFixed(data.Decimal);drawInfo.TextColor=this.GetUpDownColor(value,0);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.FUTURES_POSITION_ID||column.Type==REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID||column.Type==REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID){//持仓量原始值输出
+if(stock){this.DrawLimitPriceBorder(stock.Low,stock,left,top,column.Width);this.GetPriceDrawInfo(stock.Low,stock,data,drawInfo,{LimitBG:true});}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.YCLOSE_ID){if(stock)this.GetPriceDrawInfo(stock.YClose,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.BUY_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.BuyPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.FUTURES_CLOSE_ID||column.Type==REPORT_COLUMN_ID.FUTURES_YCLOSE_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];this.GetPriceDrawInfo(value,stock,data,drawInfo);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SELL_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.SellPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.AVERAGE_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.AvPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.EXCHANGE_RATE_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.Exchange))drawInfo.Text=stock.Exchange.toFixed(2);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.BUY_VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.BuyVol))drawInfo.Text=this.FormatVolString(stock.BuyVol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SELL_VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.SellVol))drawInfo.Text=this.FormatVolString(stock.SellVol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.Vol))drawInfo.Text=this.FormatVolString(stock.Vol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_IN_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.VolIn))drawInfo.Text=this.FormatVolString(stock.VolIn);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_OUT_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.VolOut))drawInfo.Text=this.FormatVolString(stock.VolOut);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.TOTAL_SHARES_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.TotalShares))drawInfo.Text=this.FormatVolString(stock.TotalShares);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.OutShares))drawInfo.Text=this.FormatVolString(stock.OutShares);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID||column.Type==REPORT_COLUMN_ID.MARKET_VALUE_ID||column.Type==REPORT_COLUMN_ID.AMOUNT_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName]))drawInfo.Text=this.FormatVolString(stock[fieldName]);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.INCREASE_ID||column.Type==REPORT_COLUMN_ID.AMPLITUDE_ID||column.Type==REPORT_COLUMN_ID.UPDOWN_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_1M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_3M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_5M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_10M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_15M_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);var dec=data.Decimal;if(column.Type==REPORT_COLUMN_ID.INCREASE_ID||column.Type==REPORT_COLUMN_ID.AMPLITUDE_ID)dec=2;//涨幅,振幅是百分比
+if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];drawInfo.Text=value.toFixed(data.Decimal);drawInfo.TextColor=this.GetUpDownColor(value,0);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.FUTURES_POSITION_ID||column.Type==REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID||column.Type==REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID){//持仓量原始值输出
 var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];drawInfo.Text=value.toFixed(0);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID){this.GetCustomStringDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID){this.GetCustomNumberDrawInfo(data,column,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID){this.GetCustomDateTimeDrawInfo(data,column,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID){this.GetCustomIconDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CLOSE_LINE_ID){var rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;if(stock)this.DrawLine(stock.CloseLine,column,rtItem);}else if(column.Type==REPORT_COLUMN_ID.KLINE_ID){var rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;this.DrawKLine(stock.KLine,column,rtItem,data);}else if(column.Type==REPORT_COLUMN_ID.TIME_ID){this.FormaTimeDrawInfo(column,stock,drawInfo,data);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.DATE_ID||column.Type==REPORT_COLUMN_ID.DELIVERY_DATE_ID||column.Type==REPORT_COLUMN_ID.OPEN_DATE_ID||column.Type==REPORT_COLUMN_ID.EXPIRE_DATE_ID){this.FormaDateDrawInfo(column,stock,drawInfo,data);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CHECKBOX_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;drawInfo.Checked=false;drawInfo.Enable=true;drawInfo.CheckBox=this.CheckBoxConfig;drawInfo.Data=stock;if(stock&&IFrameSplitOperator.IsBool(stock.Checked))drawInfo.Checked=stock.Checked;}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomCheckBoxDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomButtonDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomProgressBarDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID){this.GetCustomLinkDrawInfo(data,column,drawInfo);}else if(this.IsReserveNumber(column.Type)){this.FormatReserveNumber(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveString(column.Type)){this.FormatReserveString(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveDateTime(column.Type)){this.FormatReserveDateTime(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveProgressBarColumn(column.Type)){this.FormatReserveProgressBar(column,stock,drawInfo);}else if(this.IsReserveButtonColumn(column.Type)){this.FormatReserveButton(column,stock,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER){if(IFrameSplitOperator.IsNonEmptyArray(column.AryField)){var yBottom=rtItem.Bottom-this.ItemMergin.Bottom-(column.AryField.length-1)*this.ItemFontHeight;var rtText={Left:left+this.ItemMergin.Left,Width:textWidth,Height:this.ItemFontHeight,Bottom:yBottom};rtText.Right=rtText.Left+rtText.Width;rtText.Top=rtText.Bottom-rtText.Height;for(var k=0;k<column.AryField.length;++k){drawInfo.Text=null;var subItem=column.AryField[k];this.BuildSubCellTextData(subItem,column,stock,drawInfo,data);this.DrawSubCellText(drawInfo,column,rtText);rtText.Bottom+=this.ItemFontHeight;rtText.Top+=this.ItemFontHeight;}}}//拖拽行颜色
 if(rowType==3)drawInfo.TextColor=this.DragRowTextColor;if(drawInfo.Symbol){this.DrawItemTextEx(drawInfo,x,top,textWidth);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID){this.DrawIconItem(drawInfo,x,top,textWidth);}else if(column.Type==REPORT_COLUMN_ID.CHECKBOX_ID||column.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID){this.DrawCheckbox(drawInfo,left,top,itemWidth);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID||this.IsReserveButtonColumn(column.Type)){this.DrawButton(drawInfo,left,top,itemWidth);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID||this.IsReserveProgressBarColumn(column.Type)){this.DrawProgressBar(drawInfo,left,top,itemWidth);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID){this.DrawLinkText(drawInfo,x,top,textWidth);}else if(column.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER){}else{if(data.FlashBG&&data.FlashBG.Data&&column.ID!=undefined){if(data.FlashBG.Data.has(column.ID)){var flashItem=data.FlashBG.Data.get(column.ID);var drawBG={Rect:drawInfo.Rect,BGColor:flashItem.Color};--flashItem.Count;this.DrawItemBG(drawBG);if(this.GlobalOption)++this.GlobalOption.FlashBGCount;}}this.DrawItemBG(drawInfo);if(column.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID||this.IsReserveString(column.Type))this.DrawReserveString(drawInfo,column,x,top,textWidth);else this.DrawItemText(drawInfo.Text,drawInfo.TextColor,drawInfo.TextAlign,x,top,textWidth,drawInfo.BGColor);}//tooltip提示
 if(drawInfo.Tooltip){//Type:1=数据截断 4=提示信息
@@ -16650,8 +16652,7 @@ xLeft=rtItem.Right;}}}},{key:"FormatFooterCell",value:function FormatFooterCell(
    使用新的class语法
 */var JSCalendarChart=/*#__PURE__*/function(){function JSCalendarChart(divElement){_classCallCheck(this,JSCalendarChart);_defineProperty(this,"DivElement",null);_defineProperty(this,"JSChartContainer",null);//表格控件
 _defineProperty(this,"ResizeListener",null);//大小变动监听
-_defineProperty(this,"CanvasElement",null);_defineProperty(this,"OnDivResize",function(entries){JSConsole.Chart.Log("[JSCalendarChart::OnDivResize] entries=",entries);this.OnSize();});//事件回调
-_defineProperty(this,"AddEventCallback",function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.AddEventCallback=='function'){JSConsole.Chart.Log('[JSCalendarChart:AddEventCallback] obj=',obj);this.JSChartContainer.AddEventCallback(obj);}});_defineProperty(this,"ChartDestroy",function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestroy=='function'){this.JSChartContainer.ChartDestroy();}});this.DivElement=divElement;//h5 canvas
+_defineProperty(this,"CanvasElement",null);_defineProperty(this,"OnDivResize",function(entries){JSConsole.Chart.Log("[JSCalendarChart::OnDivResize] entries=",entries);this.OnSize();});this.DivElement=divElement;//h5 canvas
 this.CanvasElement=document.createElement("canvas");this.CanvasElement.className='jsorderlist-drawing';this.CanvasElement.id=Guid();this.CanvasElement.setAttribute("tabindex",0);if(this.CanvasElement.style)this.CanvasElement.style.outline='none';if(divElement.hasChildNodes()){JSConsole.Chart.Log("[JSCalendarChart::JSOrderChart] divElement hasChildNodes",divElement.childNodes);}divElement.appendChild(this.CanvasElement);}return _createClass(JSCalendarChart,[{key:"OnSize",value:function OnSize(){//画布大小通过div获取
 var height=this.DivElement.offsetHeight;var width=this.DivElement.offsetWidth;if(this.DivElement.style.height&&this.DivElement.style.width){if(this.DivElement.style.height.includes("px"))height=parseInt(this.DivElement.style.height.replace("px",""));if(this.DivElement.style.width.includes("px"))width=parseInt(this.DivElement.style.width.replace("px",""));}this.CanvasElement.height=height;this.CanvasElement.width=width;this.CanvasElement.style.width=this.CanvasElement.width+'px';this.CanvasElement.style.height=this.CanvasElement.height+'px';var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
 this.CanvasElement.height*=pixelTatio;this.CanvasElement.width*=pixelTatio;JSConsole.Chart.Log("[JSCalendarChart::OnSize] devicePixelRatio=".concat(window.devicePixelRatio,", height=").concat(this.CanvasElement.height,", width=").concat(this.CanvasElement.width));if(this.JSChartContainer&&this.JSChartContainer.OnSize){this.JSChartContainer.OnSize();}}},{key:"SetOption",value:function SetOption(option){var chart=this.CreateJSCalendarChartContainer(option);if(!chart)return false;if(option.OnCreatedCallback)option.OnCreatedCallback(chart);this.JSChartContainer=chart;this.DivElement.JSChart=this;//div中保存一份
@@ -16660,15 +16661,19 @@ if(IFrameSplitOperator.IsNonEmptyArray(option.EventCallback)){for(var i=0;i<opti
 chart.GotoToday();chart.Draw();}},{key:"CreateResizeListener",value:function CreateResizeListener(){var _this138=this;this.ResizeListener=new ResizeObserver(function(entries){_this138.OnDivResize(entries);});this.ResizeListener.observe(this.DivElement);}},{key:"CreateJSCalendarChartContainer",value:function CreateJSCalendarChartContainer(option){var chart=new JSCalendarChartContainer(this.CanvasElement);chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;this.SetChartBorder(chart,option);//是否自动更新
 if(option.IsAutoUpdate!=null)chart.IsAutoUpdate=option.IsAutoUpdate;if(option.AutoUpdateFrequency>0)chart.AutoUpdateFrequency=option.AutoUpdateFrequency;var calendarChart=chart.GetCalendarChart();//注册事件
 if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}return chart;}},{key:"SetChartBorder",value:function SetChartBorder(chart,option){if(!option.Border)return;var item=option.Border;if(IFrameSplitOperator.IsNumber(option.Border.Left))chart.Frame.ChartBorder.Left=option.Border.Left;if(IFrameSplitOperator.IsNumber(option.Border.Right))chart.Frame.ChartBorder.Right=option.Border.Right;if(IFrameSplitOperator.IsNumber(option.Border.Top))chart.Frame.ChartBorder.Top=option.Border.Top;if(IFrameSplitOperator.IsNumber(option.Border.Bottom))chart.Frame.ChartBorder.Bottom=option.Border.Bottom;var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
-chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTatio;chart.Frame.ChartBorder.Top*=pixelTatio;chart.Frame.ChartBorder.Bottom*=pixelTatio;}},{key:"ReloadResource",value://重新加载配置
-function ReloadResource(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSCalendarChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}}}],[{key:"Init",value://初始化 静态方法
-function Init(divElement){var jsChartControl=new JSCalendarChart(divElement);jsChartControl.OnSize();return jsChartControl;}}]);}();var JSCalendarChartContainer=/*#__PURE__*/function(){//是否已经销毁了
+chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTatio;chart.Frame.ChartBorder.Top*=pixelTatio;chart.Frame.ChartBorder.Bottom*=pixelTatio;}//事件回调
+},{key:"AddEventCallback",value:function AddEventCallback(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.AddEventCallback=='function'){JSConsole.Chart.Log('[JSCalendarChart:AddEventCallback] obj=',obj);this.JSChartContainer.AddEventCallback(obj);}}//重新加载配置
+},{key:"ReloadResource",value:function ReloadResource(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSCalendarChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}}},{key:"ChartDestroy",value:function ChartDestroy(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestroy=='function'){this.JSChartContainer.ChartDestroy();}}},{key:"SetMarkData",value:function SetMarkData(aryData,opiton){if(this.JSChartContainer&&typeof this.JSChartContainer.SetMarkData=='function'){this.JSChartContainer.SetMarkData(aryData,opiton);}}//初始化 静态方法
+}],[{key:"Init",value:function Init(divElement){var jsChartControl=new JSCalendarChart(divElement);jsChartControl.OnSize();return jsChartControl;}}]);}();var JSCalendarChartContainer=/*#__PURE__*/function(){//是否已经销毁了
 function JSCalendarChartContainer(uielement){_classCallCheck(this,JSCalendarChartContainer);_defineProperty(this,"ClassName",'JSCalendarChartContainer');_defineProperty(this,"Frame",void 0);//框架画法
 _defineProperty(this,"ChartPaint",[]);//图形画法
 _defineProperty(this,"Canvas",null);//画布
 _defineProperty(this,"NetworkFilter",null);//数据回调接口
-_defineProperty(this,"Data",{Days:[],Current:{Year:null,Month:null},Months:[{Text:"1月",Month:202609},{Text:"2月",Month:202609},{Text:"3月",Month:202609}]});//显示数据  Days:[{ Date:20250101, Text:"1" }] ,
-//事件回调
+_defineProperty(this,"Data",{Current:{Year:null,Month:null},//标题栏显示年和月份
+Days:[],// 日期 { Text:, Date:, Week:1, Type: 0 当前月 -1 上个月 1=下个月 }
+Months:[],//月份 { Text:"1月", Date:20260100, Month:1 }
+MapDayMarks:new Map()//日期标记 key=date vallue={ Date:, Type, }
+});//事件回调
 _defineProperty(this,"MapEvent",new Map());//通知外部调用 key:JSCHART_EVENT_ID value:{Callback:回调,}
 _defineProperty(this,"AutoUpdateTimer",null);_defineProperty(this,"AutoUpdateFrequency",15000);//更新频率
 _defineProperty(this,"FloatTooltip",null);//提示浮框
@@ -16711,7 +16716,8 @@ var prevLastDate=new Date(year,month-1,0);for(var i=firstDayIndex;i>=0;i--){var
 var aryDays=[];for(var d=1;d<=dayCount;d++){var curDate=new Date(year,month-1,d);var date=curDate.getFullYear()*10000+(curDate.getMonth()+1)*100+curDate.getDate();aryDays.push({Day:curDate.getDate(),Week:this.GetWeekDayNum(curDate),Date:date,Type:0});}// 合并前置 + 当月
 var allDays=[].concat(aryPreDay,aryDays);// ========== 3、尾部填充下个月日期，凑满7天整行 ==========
 var fillCount=6*7-allDays.length;if(fillCount>0){// 下月第一天
-var nextDate=new Date(year,month,1);for(var i=1;i<=fillCount;i++){var curDate=new Date(nextDate);curDate.setDate(nextDate.getDate()+i-1);var date=curDate.getFullYear()*10000+(curDate.getMonth()+1)*100+curDate.getDate();allDays.push({Day:curDate.getDate(),Week:this.GetWeekDayNum(curDate),Date:date,Type:1});}}return allDays;}},{key:"GetMonths",value:function GetMonths(year,month){var curDate=new Date(year,month-1,1);var aryMonth=[];for(var i=0;i<16;++i){var month=curDate.getMonth()+1;var date=curDate.getFullYear()*10000+(curDate.getMonth()+1)*100;aryMonth.push({Month:curDate.getMonth()+1,Date:date});curDate.setMonth(curDate.getMonth()+1);}return aryMonth;}},{key:"GotoToday",value:function GotoToday(option){var chart=this.GetCalendarChart();if(!chart)return;var today=new Date();var year=today.getFullYear();var month=today.getMonth()+1;if(chart.Type===1)this.GotoMulitMonth(year,1,option);else this.GotoMonth(year,month,option);}},{key:"GotoMonth",value:function GotoMonth(year,month,option){var aryDay=this.GetDays(year,month);this.Data.Days=[];for(var i=0;i<aryDay.length;++i){var item=aryDay[i];var dayItem={Date:item.Date,Type:item.Type,Week:item.Week,Day:item.Day};dayItem.Text="".concat(dayItem.Day);this.Data.Days.push(dayItem);}this.Data.Current.Year=year;this.Data.Current.Month=month;if(option){if(option.Draw===true)this.Draw();}}},{key:"GotoNextMonth",value:function GotoNextMonth(option){var curDate=new Date(this.Data.Current.Year,this.Data.Current.Month-1,1);curDate.setMonth(curDate.getMonth()+1);var year=curDate.getFullYear();var month=curDate.getMonth()+1;var chart=this.GetCalendarChart();if(!chart)return;var range=chart.GetDateLimitRange();var end=parseInt(range.End/100);if(year*100+month>end)return false;this.GotoMonth(year,month,option);}},{key:"GotoPreviousMonth",value:function GotoPreviousMonth(option){var curDate=new Date(this.Data.Current.Year,this.Data.Current.Month-1,1);curDate.setMonth(curDate.getMonth()-1);var year=curDate.getFullYear();var month=curDate.getMonth()+1;this.GotoMonth(year,month,option);}},{key:"GotoMulitMonth",value:function GotoMulitMonth(year,month,option){var aryMonth=this.GetMonths(year,month);this.Data.Months=[];for(var i=0;i<aryMonth.length;++i){var item=aryMonth[i];var dayItem={Date:item.Date,Month:item.Month};dayItem.Text="".concat(dayItem.Month,"\u6708");this.Data.Months.push(dayItem);}var item=this.Data.Months[9];var curYear=parseInt(item.Date/10000);for(var i=0;i<this.Data.Months.length;++i){var item=this.Data.Months[i];var value=parseInt(item.Date/10000);if(value>curYear)item.Type=1;else if(value<curYear)item.Type=-1;else item.Type=0;}this.Data.Current.Year=curYear;this.Data.Current.Month=null;if(option){if(option.Draw===true)this.Draw();}}},{key:"GotoNextYear",value:function GotoNextYear(option){var item=this.Data.Months[0];var year=parseInt(item.Date/10000);var month=parseInt(item.Date/100)%100;var curDate=new Date(year,month-1,1);curDate.setFullYear(curDate.getFullYear()+1);var year=curDate.getFullYear();var chart=this.GetCalendarChart();if(!chart)return;var range=chart.GetDateLimitRange();var end=parseInt(range.End/10000);if(year>end)return false;this.GotoMulitMonth(year,1,option);}},{key:"GotoPreviousYear",value:function GotoPreviousYear(option){var item=this.Data.Months[0];var year=parseInt(item.Date/10000);var month=parseInt(item.Date/100)%100;var curDate=new Date(year,month-1,1);curDate.setFullYear(curDate.getFullYear()-1);this.GotoMulitMonth(curDate.getFullYear(),1,option);}},{key:"MoveNextMulitMonth",value:function MoveNextMulitMonth(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Months))return false;var chart=this.GetCalendarChart();if(!chart)return;var range=chart.GetDateLimitRange();var end=range.End;var item=this.Data.Months[8];if(item.Date>end)return false;var item=this.Data.Months[0];var year=parseInt(item.Date/10000);var month=parseInt(item.Date/100)%100;var curDate=new Date(year,month-1,1);curDate.setMonth(curDate.getMonth()+4);this.GotoMulitMonth(curDate.getFullYear(),curDate.getMonth()+1,option);return true;}},{key:"MovePreviousMulitMonth",value:function MovePreviousMulitMonth(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Months))return false;var item=this.Data.Months[0];var year=parseInt(item.Date/10000);var month=parseInt(item.Date/100)%100;var curDate=new Date(year,month-1,1);curDate.setMonth(curDate.getMonth()-4);this.GotoMulitMonth(curDate.getFullYear(),curDate.getMonth()+1,option);return true;}},{key:"ReloadResource",value:function ReloadResource(option){this.Frame.ReloadResource(option);for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.ReloadResource)item.ReloadResource(option);}if(option&&(option.Redraw||option.Draw)){this.SetSizeChange(true);this.Draw();}}}]);}();var JSCHART_CALENDAR_BUTTON_ID={MONTH_TITLE_ID:0,YEAR_TITLE_ID:1,DAY_CELL_ID:11,MONTH_CELL_ID:12,MONTH_UP_ARROW_ID:51,MONTH_DOWN_ARROW_ID:52,YEAR_UP_ARROW_ID:53,YEAR_DOWN_ARROW_ID:54};var JSCalendarFrame=/*#__PURE__*/function(){function JSCalendarFrame(){_classCallCheck(this,JSCalendarFrame);_defineProperty(this,"ChartBorder",void 0);_defineProperty(this,"Canvas",void 0);//画布
+var nextDate=new Date(year,month,1);for(var i=1;i<=fillCount;i++){var curDate=new Date(nextDate);curDate.setDate(nextDate.getDate()+i-1);var date=curDate.getFullYear()*10000+(curDate.getMonth()+1)*100+curDate.getDate();allDays.push({Day:curDate.getDate(),Week:this.GetWeekDayNum(curDate),Date:date,Type:1});}}return allDays;}},{key:"GetMonths",value:function GetMonths(year,month){var curDate=new Date(year,month-1,1);var aryMonth=[];for(var i=0;i<16;++i){var month=curDate.getMonth()+1;var date=curDate.getFullYear()*10000+(curDate.getMonth()+1)*100;aryMonth.push({Month:curDate.getMonth()+1,Date:date});curDate.setMonth(curDate.getMonth()+1);}return aryMonth;}},{key:"GotoToday",value:function GotoToday(option){var chart=this.GetCalendarChart();if(!chart)return;var today=new Date();var year=today.getFullYear();var month=today.getMonth()+1;if(chart.Type===1)this.GotoMulitMonth(year,1,option);else this.GotoMonth(year,month,option);}},{key:"GotoMonth",value:function GotoMonth(year,month,option){var aryDay=this.GetDays(year,month);this.Data.Days=[];for(var i=0;i<aryDay.length;++i){var item=aryDay[i];var dayItem={Date:item.Date,Type:item.Type,Week:item.Week,Day:item.Day};dayItem.Text="".concat(dayItem.Day);this.Data.Days.push(dayItem);}this.Data.Current.Year=year;this.Data.Current.Month=month;if(option){if(option.Draw===true)this.Draw();}}},{key:"GotoNextMonth",value:function GotoNextMonth(option){var curDate=new Date(this.Data.Current.Year,this.Data.Current.Month-1,1);curDate.setMonth(curDate.getMonth()+1);var year=curDate.getFullYear();var month=curDate.getMonth()+1;var chart=this.GetCalendarChart();if(!chart)return;var range=chart.GetDateLimitRange();var end=parseInt(range.End/100);if(year*100+month>end)return false;this.GotoMonth(year,month,option);}},{key:"GotoPreviousMonth",value:function GotoPreviousMonth(option){var curDate=new Date(this.Data.Current.Year,this.Data.Current.Month-1,1);curDate.setMonth(curDate.getMonth()-1);var year=curDate.getFullYear();var month=curDate.getMonth()+1;this.GotoMonth(year,month,option);}},{key:"GotoMulitMonth",value:function GotoMulitMonth(year,month,option){var aryMonth=this.GetMonths(year,month);this.Data.Months=[];for(var i=0;i<aryMonth.length;++i){var item=aryMonth[i];var dayItem={Date:item.Date,Month:item.Month};dayItem.Text="".concat(dayItem.Month,"\u6708");this.Data.Months.push(dayItem);}var item=this.Data.Months[9];var curYear=parseInt(item.Date/10000);for(var i=0;i<this.Data.Months.length;++i){var item=this.Data.Months[i];var value=parseInt(item.Date/10000);if(value>curYear)item.Type=1;else if(value<curYear)item.Type=-1;else item.Type=0;}this.Data.Current.Year=curYear;this.Data.Current.Month=null;if(option){if(option.Draw===true)this.Draw();}}},{key:"GotoNextYear",value:function GotoNextYear(option){var item=this.Data.Months[0];var year=parseInt(item.Date/10000);var month=parseInt(item.Date/100)%100;var curDate=new Date(year,month-1,1);curDate.setFullYear(curDate.getFullYear()+1);var year=curDate.getFullYear();var chart=this.GetCalendarChart();if(!chart)return;var range=chart.GetDateLimitRange();var end=parseInt(range.End/10000);if(year>end)return false;this.GotoMulitMonth(year,1,option);}},{key:"GotoPreviousYear",value:function GotoPreviousYear(option){var item=this.Data.Months[0];var year=parseInt(item.Date/10000);var month=parseInt(item.Date/100)%100;var curDate=new Date(year,month-1,1);curDate.setFullYear(curDate.getFullYear()-1);this.GotoMulitMonth(curDate.getFullYear(),1,option);}},{key:"MoveNextMulitMonth",value:function MoveNextMulitMonth(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Months))return false;var chart=this.GetCalendarChart();if(!chart)return;var range=chart.GetDateLimitRange();var end=range.End;var item=this.Data.Months[8];if(item.Date>end)return false;var item=this.Data.Months[0];var year=parseInt(item.Date/10000);var month=parseInt(item.Date/100)%100;var curDate=new Date(year,month-1,1);curDate.setMonth(curDate.getMonth()+4);this.GotoMulitMonth(curDate.getFullYear(),curDate.getMonth()+1,option);return true;}},{key:"MovePreviousMulitMonth",value:function MovePreviousMulitMonth(option){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Months))return false;var item=this.Data.Months[0];var year=parseInt(item.Date/10000);var month=parseInt(item.Date/100)%100;var curDate=new Date(year,month-1,1);curDate.setMonth(curDate.getMonth()-4);this.GotoMulitMonth(curDate.getFullYear(),curDate.getMonth()+1,option);return true;}},{key:"ReloadResource",value:function ReloadResource(option){this.Frame.ReloadResource(option);for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.ReloadResource)item.ReloadResource(option);}if(option&&(option.Redraw||option.Draw)){this.SetSizeChange(true);this.Draw();}}},{key:"ClearMarks",value:function ClearMarks(){this.Data.MapDayMarks=new Map();}//{ Date:20250101, Type:0, Color:可选, Radius:可选,  YOffset:可选 }
+},{key:"SetMarkData",value:function SetMarkData(aryData,option){this.Data.MapDayMarks=new Map();if(!IFrameSplitOperator.IsNonEmptyArray(aryData))return;for(var i=0;i<aryData.length;++i){var item=aryData[i];if(!IFrameSplitOperator.IsPlusNumber(item.Date))continue;this.Data.MapDayMarks.set(item.Date,item);}if(option){if(option.Draw===true)this.Draw();}}}]);}();var JSCHART_CALENDAR_BUTTON_ID={MONTH_TITLE_ID:0,YEAR_TITLE_ID:1,DAY_CELL_ID:11,MONTH_CELL_ID:12,MONTH_UP_ARROW_ID:51,MONTH_DOWN_ARROW_ID:52,YEAR_UP_ARROW_ID:53,YEAR_DOWN_ARROW_ID:54};var JSCalendarFrame=/*#__PURE__*/function(){function JSCalendarFrame(){_classCallCheck(this,JSCalendarFrame);_defineProperty(this,"ChartBorder",void 0);_defineProperty(this,"Canvas",void 0);//画布
 //BorderColor=g_JSChartResource.DealList.BorderColor;    //边框线
 _defineProperty(this,"LogoTextColor",g_JSChartResource.FrameLogo.TextColor);_defineProperty(this,"LogoTextFont",g_JSChartResource.FrameLogo.Font);}return _createClass(JSCalendarFrame,[{key:"ReloadResource",value:function ReloadResource(resource){this.BorderColor=g_JSChartResource.DealList.BorderColor;//边框线
 this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;this.LogoTextFont=g_JSChartResource.FrameLogo.Font;}},{key:"Draw",value:function Draw(option){var left=ToFixedPoint(this.ChartBorder.GetLeft());var top=ToFixedPoint(this.ChartBorder.GetTop());var right=ToFixedPoint(this.ChartBorder.GetRight());var bottom=ToFixedPoint(this.ChartBorder.GetBottom());var width=right-left;var height=bottom-top;}},{key:"DrawLogo",value:function DrawLogo(){var text=g_JSChartResource.FrameLogo.Text;if(!IFrameSplitOperator.IsString(text))return;this.Canvas.fillStyle=this.LogoTextColor;this.Canvas.font=this.LogoTextFont;this.Canvas.textAlign='left';this.Canvas.textBaseline='bottom';var x=this.ChartBorder.GetLeft()+5;var y=this.ChartBorder.GetBottom()-5;this.Canvas.fillText(text,x,y);}}]);}();var ChartCalendar=/*#__PURE__*/function(){function ChartCalendar(){_classCallCheck(this,ChartCalendar);_defineProperty(this,"Canvas",null);//画布
@@ -16723,10 +16729,10 @@ _defineProperty(this,"IsDrawFirst",false);_defineProperty(this,"GetEventCallback
 _defineProperty(this,"SizeChange",true);_defineProperty(this,"Type",0);//0=日 1=月 2=年
 _defineProperty(this,"TitleConfig",{IsShow:g_JSChartResource.Calendar.Title.IsShow,HRate:g_JSChartResource.Calendar.Title.HRate,Color:g_JSChartResource.Calendar.Title.Color,BGMargin:CloneData(g_JSChartResource.Calendar.Title.BGMargin),Arrow:CloneData(g_JSChartResource.Calendar.Title.Arrow),MoveOn:CloneData(g_JSChartResource.Calendar.Title.MoveOn),Font:CloneData(g_JSChartResource.Calendar.Title.Font)});// HRate=高度占比
 _defineProperty(this,"WeekTitleConfig",{Color:g_JSChartResource.Calendar.WeekTitle.Color,HRate:g_JSChartResource.Calendar.WeekTitle.HRate,Type:g_JSChartResource.Calendar.WeekTitle.Type,//Type 0=1-7 1=1-5
-AryText:["","一","二","三","四","五","六","日"],Font:CloneData(g_JSChartResource.Calendar.WeekTitle.Font)});_defineProperty(this,"DayConfig",{Text:CloneData(g_JSChartResource.Calendar.Day.Text),MoveOn:CloneData(g_JSChartResource.Calendar.Day.MoveOn),Today:CloneData(g_JSChartResource.Calendar.Day.Today),Font:CloneData(g_JSChartResource.Calendar.Day.Font),Selected:CloneData(g_JSChartResource.Calendar.Day.Selected)});_defineProperty(this,"MonthConfig",{Text:CloneData(g_JSChartResource.Calendar.Month.Text),MoveOn:CloneData(g_JSChartResource.Calendar.Month.MoveOn),Today:CloneData(g_JSChartResource.Calendar.Month.Today),Font:CloneData(g_JSChartResource.Calendar.Month.Font)});_defineProperty(this,"ArySelectedDay",[]);//选中的日期 [{ Date:20260618 } ]
+AryText:["","一","二","三","四","五","六","日"],Font:CloneData(g_JSChartResource.Calendar.WeekTitle.Font)});_defineProperty(this,"DayConfig",{Text:CloneData(g_JSChartResource.Calendar.Day.Text),MoveOn:CloneData(g_JSChartResource.Calendar.Day.MoveOn),Today:CloneData(g_JSChartResource.Calendar.Day.Today),Font:CloneData(g_JSChartResource.Calendar.Day.Font),Selected:CloneData(g_JSChartResource.Calendar.Day.Selected)});_defineProperty(this,"MarkDayConfig",{Dots:CloneData(g_JSChartResource.Calendar.MarkDay.Dots)});_defineProperty(this,"MonthConfig",{Text:CloneData(g_JSChartResource.Calendar.Month.Text),MoveOn:CloneData(g_JSChartResource.Calendar.Month.MoveOn),Today:CloneData(g_JSChartResource.Calendar.Month.Today),Font:CloneData(g_JSChartResource.Calendar.Month.Font)});_defineProperty(this,"ArySelectedDay",[]);//选中的日期 [{ Date:20260618 } ]
 //缓存
 _defineProperty(this,"RectClient",null);_defineProperty(this,"MoveOnData",{Data:null,Enable:true});//鼠标在上面
-_defineProperty(this,"AryCellRect",[]);}return _createClass(ChartCalendar,[{key:"SetOption",value:function SetOption(option){if(!option)return;if(option.Title){var item=option.Title;if(IFrameSplitOperator.IsBool(item.IsShow))this.TitleConfig.IsShow=item.IsShow;if(IFrameSplitOperator.IsNumber(item.Type))this.Type=item.Type;}}},{key:"ReloadResource",value:function ReloadResource(resource){this.TitleConfig.HRate=g_JSChartResource.Calendar.Title.HRate;this.TitleConfig.Color=g_JSChartResource.Calendar.Title.Color;this.TitleConfig.BGMargin=CloneData(g_JSChartResource.Calendar.Title.BGMargin);this.TitleConfig.Arrow=CloneData(g_JSChartResource.Calendar.Title.Arrow);this.TitleConfig.MoveOn=CloneData(g_JSChartResource.Calendar.Title.MoveOn);this.TitleConfig.Font=CloneData(g_JSChartResource.Calendar.Title.Font);this.WeekTitleConfig.Color=g_JSChartResource.Calendar.WeekTitle.Color;this.WeekTitleConfig.HRate=g_JSChartResource.Calendar.WeekTitle.HRate;this.WeekTitleConfig.Type=g_JSChartResource.Calendar.WeekTitle.Type;this.WeekTitleConfig.Font=CloneData(g_JSChartResource.Calendar.WeekTitle.Font);this.DayConfig.Text=CloneData(g_JSChartResource.Calendar.Day.Text);this.DayConfig.MoveOn=CloneData(g_JSChartResource.Calendar.Day.MoveOn);this.DayConfig.Today=CloneData(g_JSChartResource.Calendar.Day.Today);this.DayConfig.Font=CloneData(g_JSChartResource.Calendar.Day.Font);this.DayConfig.Selected=CloneData(g_JSChartResource.Calendar.Day.Selected);this.MonthConfig.Text=CloneData(g_JSChartResource.Calendar.Month.Text);this.MonthConfig.MoveOn=CloneData(g_JSChartResource.Calendar.Month.MoveOn);this.MonthConfig.Today=CloneData(g_JSChartResource.Calendar.Month.Today);this.MonthConfig.Font=CloneData(g_JSChartResource.Calendar.Month.Font);}},{key:"ChangeType",value:function ChangeType(type){this.Type=type;this.SizeChange=true;}},{key:"Draw",value:function Draw(){this.AryCellRect=[];if(this.SizeChange)this.CalculateSize();if(this.Type===1){this.DrawTitle();this.DrawMonths();}else if(this.Type===2){this.DrawTitle();this.DrawYears();}else{this.DrawTitle();this.DrawWeekTitle();this.DrawDays();}this.SizeChange=false;}},{key:"GetWeekTitleInfo",value:function GetWeekTitleInfo(){if(this.WeekTitleConfig.Type===1)return{Count:5,AryWeek:[1,2,3,4,5]};else return{Count:7,AryWeek:[1,2,3,4,5,6,7]};}},{key:"CalculateDayModeSize",value:function CalculateDayModeSize(){var border=this.ChartBorder.GetBorder();var weekTitle=this.GetWeekTitleInfo();var colCount=weekTitle.Count;this.RectClient={Left:border.Left,Top:border.Top,Bottom:border.Bottom,Right:border.Right};this.RectClient.Width=this.RectClient.Right-this.RectClient.Left;this.RectClient.Height=this.RectClient.Bottom-this.RectClient.Top;var weekHeight=this.RectClient.Height*this.WeekTitleConfig.HRate;var titleHeight=0;if(this.TitleConfig.IsShow)titleHeight=this.RectClient.Height*this.TitleConfig.HRate;this.RectClient.WeekHeight=weekHeight;this.RectClient.TitleHeight=titleHeight;var dateHeight=this.RectClient.Height-weekHeight-titleHeight;this.RectClient.Cell={Width:this.RectClient.Width/colCount,Height:dateHeight/6};}},{key:"CalculateMonthModeSize",value:function CalculateMonthModeSize(){var border=this.ChartBorder.GetBorder();var colCount=4;this.RectClient={Left:border.Left,Top:border.Top,Bottom:border.Bottom,Right:border.Right};this.RectClient.Width=this.RectClient.Right-this.RectClient.Left;this.RectClient.Height=this.RectClient.Bottom-this.RectClient.Top;var titleHeight=0;if(this.TitleConfig.IsShow)titleHeight=this.RectClient.Height*this.TitleConfig.HRate;this.RectClient.TitleHeight=titleHeight;var dateHeight=this.RectClient.Height-titleHeight;this.RectClient.Cell={Width:this.RectClient.Width/colCount,Height:dateHeight/4};}},{key:"CalculateSize",value:function CalculateSize()//计算大小
+_defineProperty(this,"AryCellRect",[]);}return _createClass(ChartCalendar,[{key:"SetOption",value:function SetOption(option){if(!option)return;if(option.Title){var item=option.Title;if(IFrameSplitOperator.IsBool(item.IsShow))this.TitleConfig.IsShow=item.IsShow;if(IFrameSplitOperator.IsNumber(item.Type))this.Type=item.Type;}}},{key:"ReloadResource",value:function ReloadResource(resource){this.TitleConfig.HRate=g_JSChartResource.Calendar.Title.HRate;this.TitleConfig.Color=g_JSChartResource.Calendar.Title.Color;this.TitleConfig.BGMargin=CloneData(g_JSChartResource.Calendar.Title.BGMargin);this.TitleConfig.Arrow=CloneData(g_JSChartResource.Calendar.Title.Arrow);this.TitleConfig.MoveOn=CloneData(g_JSChartResource.Calendar.Title.MoveOn);this.TitleConfig.Font=CloneData(g_JSChartResource.Calendar.Title.Font);this.WeekTitleConfig.Color=g_JSChartResource.Calendar.WeekTitle.Color;this.WeekTitleConfig.HRate=g_JSChartResource.Calendar.WeekTitle.HRate;this.WeekTitleConfig.Type=g_JSChartResource.Calendar.WeekTitle.Type;this.WeekTitleConfig.Font=CloneData(g_JSChartResource.Calendar.WeekTitle.Font);this.DayConfig.Text=CloneData(g_JSChartResource.Calendar.Day.Text);this.DayConfig.MoveOn=CloneData(g_JSChartResource.Calendar.Day.MoveOn);this.DayConfig.Today=CloneData(g_JSChartResource.Calendar.Day.Today);this.DayConfig.Font=CloneData(g_JSChartResource.Calendar.Day.Font);this.DayConfig.Selected=CloneData(g_JSChartResource.Calendar.Day.Selected);this.MarkDayConfig.Dots=CloneData(g_JSChartResource.Calendar.MarkDay.Dots),this.MonthConfig.Text=CloneData(g_JSChartResource.Calendar.Month.Text);this.MonthConfig.MoveOn=CloneData(g_JSChartResource.Calendar.Month.MoveOn);this.MonthConfig.Today=CloneData(g_JSChartResource.Calendar.Month.Today);this.MonthConfig.Font=CloneData(g_JSChartResource.Calendar.Month.Font);}},{key:"ChangeType",value:function ChangeType(type){this.Type=type;this.SizeChange=true;}},{key:"Draw",value:function Draw(){this.AryCellRect=[];if(this.SizeChange)this.CalculateSize();if(this.Type===1){this.DrawTitle();this.DrawMonths();}else if(this.Type===2){this.DrawTitle();this.DrawYears();}else{this.DrawTitle();this.DrawWeekTitle();this.DrawDays();}this.SizeChange=false;}},{key:"GetWeekTitleInfo",value:function GetWeekTitleInfo(){if(this.WeekTitleConfig.Type===1)return{Count:5,AryWeek:[1,2,3,4,5]};else return{Count:7,AryWeek:[1,2,3,4,5,6,7]};}},{key:"CalculateDayModeSize",value:function CalculateDayModeSize(){var border=this.ChartBorder.GetBorder();var weekTitle=this.GetWeekTitleInfo();var colCount=weekTitle.Count;this.RectClient={Left:border.Left,Top:border.Top,Bottom:border.Bottom,Right:border.Right};this.RectClient.Width=this.RectClient.Right-this.RectClient.Left;this.RectClient.Height=this.RectClient.Bottom-this.RectClient.Top;var weekHeight=this.RectClient.Height*this.WeekTitleConfig.HRate;var titleHeight=0;if(this.TitleConfig.IsShow)titleHeight=this.RectClient.Height*this.TitleConfig.HRate;this.RectClient.WeekHeight=weekHeight;this.RectClient.TitleHeight=titleHeight;var dateHeight=this.RectClient.Height-weekHeight-titleHeight;this.RectClient.Cell={Width:this.RectClient.Width/colCount,Height:dateHeight/6};}},{key:"CalculateMonthModeSize",value:function CalculateMonthModeSize(){var border=this.ChartBorder.GetBorder();var colCount=4;this.RectClient={Left:border.Left,Top:border.Top,Bottom:border.Bottom,Right:border.Right};this.RectClient.Width=this.RectClient.Right-this.RectClient.Left;this.RectClient.Height=this.RectClient.Bottom-this.RectClient.Top;var titleHeight=0;if(this.TitleConfig.IsShow)titleHeight=this.RectClient.Height*this.TitleConfig.HRate;this.RectClient.TitleHeight=titleHeight;var dateHeight=this.RectClient.Height-titleHeight;this.RectClient.Cell={Width:this.RectClient.Width/colCount,Height:dateHeight/4};}},{key:"CalculateSize",value:function CalculateSize()//计算大小
 {if(this.Type===1)this.CalculateMonthModeSize();else this.CalculateDayModeSize();}},{key:"DrawTitleMoveOnBG",value:function DrawTitleMoveOnBG(rtBG,config){if(!config||!config.BGColor)return;if(config.Type===1){this.Canvas.fillStyle=config.BGColor;this.Canvas.fillRect(rtBG.Left,rtBG.Top,rtBG.Width,rtBG.Height);}else{var radius=[3];if(config.RoundRect&&IFrameSplitOperator.IsNonEmptyArray(config.RoundRect.Radius))radius=config.RoundRect.Radius;var path=new Path2D();path.roundRect(ToFixedPoint(rtBG.Left),ToFixedPoint(rtBG.Top),ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height),radius);this.Canvas.fillStyle=config.BGColor;this.Canvas.fill(path);}}},{key:"DrawTitle",value:function DrawTitle(){var config=this.TitleConfig;if(!config.IsShow)return;if(!this.Data||!this.Data.Current)return;if(this.Type==1)var text="".concat(this.Data.Current.Year,"\u5E74");else var text="".concat(this.Data.Current.Year,"\u5E74").concat(this.Data.Current.Month,"\u6708");var top=this.RectClient.Top;var left=this.RectClient.Left;var cellSize=this.RectClient.Cell;var fontSize=this.RectClient.TitleHeight*config.Font.SizeRate;var font="".concat(fontSize,"px ").concat(config.Font.Family);this.Canvas.font=font;this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var margin=config.BGMargin;var rtCell={Left:left+margin.Left,Top:top+margin.Top,Width:this.RectClient.Width-2*cellSize.Width-(margin.Left+margin.Right),Height:this.RectClient.TitleHeight-(margin.Top+margin.Bottom)};rtCell.Right=rtCell.Left+rtCell.Width;rtCell.Bottom=rtCell.Top+rtCell.Height;var btnTitleID=JSCHART_CALENDAR_BUTTON_ID.MONTH_TITLE_ID;if(this.Type===1)btnTitleID=JSCHART_CALENDAR_BUTTON_ID.YEAR_TITLE_ID;this.AryCellRect.push({Type:btnTitleID,Rect:rtCell,Data:this.Data.Current});var bMoveOnTitle=false;if(this.MoveOnData&&this.MoveOnData.Data){var item=this.MoveOnData.Data;if(item.Type===btnTitleID){this.DrawTitleMoveOnBG(rtCell,config.MoveOn);bMoveOnTitle=true;}}var xText=left+cellSize.Width*0.3;var yText=this.RectClient.Top+this.RectClient.TitleHeight/2+fontSize/2;var color=config.Color;if(bMoveOnTitle&&config.MoveOn.Color)color=config.MoveOn.Color;this.Canvas.fillStyle=color;this.Canvas.fillText(text,xText,yText);// 上下箭头
 var rtDown={Top:rtCell.Top,Bottom:rtCell.Bottom,Width:rtCell.Height,Height:rtCell.Height};rtDown.Right=this.RectClient.Right-cellSize.Width*0.3;rtDown.Left=rtDown.Right-rtDown.Width;var btnDownID=JSCHART_CALENDAR_BUTTON_ID.MONTH_DOWN_ARROW_ID;if(this.Type===1)btnDownID=JSCHART_CALENDAR_BUTTON_ID.YEAR_DOWN_ARROW_ID;this.AryCellRect.push({Type:btnDownID,Rect:rtDown,Data:null});var bMoveOnArrow=false;if(this.MoveOnData&&this.MoveOnData.Data){var item=this.MoveOnData.Data;if(item.Type===btnDownID){this.DrawTitleMoveOnBG(rtDown,config.MoveOn);bMoveOnArrow=true;}}this.DrawTitleArrow(rtDown,1);var rtUp={Top:rtCell.Top,Bottom:rtCell.Bottom,Width:rtCell.Height,Height:rtCell.Height};rtUp.Right=rtDown.Left-cellSize.Width*0.1;rtUp.Left=rtUp.Right-rtUp.Width;var btnUpID=JSCHART_CALENDAR_BUTTON_ID.MONTH_UP_ARROW_ID;if(this.Type===1)btnUpID=JSCHART_CALENDAR_BUTTON_ID.YEAR_UP_ARROW_ID;this.AryCellRect.push({Type:btnUpID,Rect:rtUp,Data:null});var bMoveOnArrow=false;if(this.MoveOnData&&this.MoveOnData.Data){var item=this.MoveOnData.Data;if(item.Type===btnUpID){this.DrawTitleMoveOnBG(rtUp,config.MoveOn);bMoveOnArrow=true;}}this.DrawTitleArrow(rtUp,0);}},{key:"DrawTitleArrow",value:function DrawTitleArrow(rtCell,type){var config=this.TitleConfig;var scale=config.Arrow.Scale;// 缩放比值，1=最大
 var triSide=rtCell.Width*scale;var triH=Math.sqrt(3)/2*triSide;// 区域内居中偏移
@@ -16740,12 +16746,13 @@ this.Canvas.closePath();}else{this.Canvas.beginPath();this.Canvas.moveTo(x0,y0);
 }if(text){var textWidth=this.Canvas.measureText(text).width;var xText=rtCell.Left+(rtCell.Width-textWidth)/2;var yText=rtCell.Top+rtCell.Height/2+fontSize/2;this.Canvas.fillStyle=config.Color;this.Canvas.fillText(text,xText,yText);}xCell=rtCell.Right;}}},{key:"DrawMonths",value:function DrawMonths(){if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Months))return;var colCount=4;var config=this.MonthConfig;var cellSize=this.RectClient.Cell;var dayFontSize=Math.min(cellSize.Width,cellSize.Height)*config.Font.SizeRate;var dayFont="".concat(dayFontSize,"px ").concat(config.Font.Family);var date=new Date();var today=date.getFullYear()*10000+(date.getMonth()+1)*100;var range=this.GetDateLimitRange();this.Canvas.font=dayFont;this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var left=this.RectClient.Left;var xCell=left,yCell=this.RectClient.Top+this.RectClient.TitleHeight;var xText,yText;for(var i=0,j=0;i<this.Data.Months.length;++i){var dayItem=this.Data.Months[i];var rtCell={Left:xCell,Top:yCell,Width:cellSize.Width,Height:cellSize.Height};rtCell.Right=rtCell.Left+rtCell.Width;rtCell.Bottom=rtCell.Top+rtCell.Height;var bDisable=dayItem.Date>range.End||dayItem.Date<range.Start;var bMoveOn=false;var bToday=false;if(today===dayItem.Date){this.Canvas.fillStyle=config.Today.BGColor;var radius=Math.min(cellSize.Width,cellSize.Height)*0.40;var x=rtCell.Left+rtCell.Width/2,y=rtCell.Top+rtCell.Height/2;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();bToday=true;}else if(this.MoveOnData&&this.MoveOnData.Data){var item=this.MoveOnData.Data;if(item.Type===JSCHART_CALENDAR_BUTTON_ID.MONTH_CELL_ID&&item.Data.Date==dayItem.Date){if(config.MoveOn.BGColor){this.Canvas.fillStyle=config.MoveOn.BGColor;var radius=Math.min(cellSize.Width,cellSize.Height)*0.42;var x=rtCell.Left+rtCell.Width/2,y=rtCell.Top+rtCell.Height/2;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();//this.Canvas.fillRect(rtCell.Left,rtCell.Top,rtCell.Width,rtCell.Height);
 }bMoveOn=true;}}if(!bDisable)this.AryCellRect.push({Type:JSCHART_CALENDAR_BUTTON_ID.MONTH_CELL_ID,Rect:rtCell,Data:dayItem});if(dayItem.Text){var textWidth=this.Canvas.measureText(dayItem.Text).width;xText=rtCell.Left+(rtCell.Width-textWidth)/2;yText=rtCell.Top+rtCell.Height/2+dayFontSize/2+config.Text.YOffset;var color=config.Text.Color[0];if(dayItem.Type!==0)color=config.Text.Color[1];if(bDisable)color=config.Text.Color[2];if(bMoveOn&&config.MoveOn.Color)color=config.MoveOn.Color;if(bToday&&config.Today.Color)color=config.Today.Color;this.Canvas.fillStyle=color;this.Canvas.fillText(dayItem.Text,xText,yText);}xCell=rtCell.Right;if(j>0&&(j+1)%colCount==0)//换行
 {yCell=rtCell.Bottom;xCell=left;}++j;}}},{key:"DayYears",value:function DayYears(){}},{key:"IsSelectedDay",value:function IsSelectedDay(date){if(!IFrameSplitOperator.IsNonEmptyArray(this.ArySelectedDay))return false;for(var i=0;i<this.ArySelectedDay.length;++i){var item=this.ArySelectedDay[i];if(item.Date==date)return true;}return false;}},{key:"GetDateLimitRange",value:function GetDateLimitRange(){var range={Start:0,End:99999999};//范围
-if(!this.DateLimit)return range;if(this.DateLimit.End){var item=this.DateLimit.End;if(item.Enable){var date=new Date();range.End=date.getFullYear()*10000+(date.getMonth()+1)*100+date.getDate();if(IFrameSplitOperator.IsPlusNumber(item.Date))range.End=item.Date;}}if(this.DateLimit.Start){var item=this.DateLimit.Start;if(item.Enable){if(IFrameSplitOperator.IsPlusNumber(item.Date))range.Start=item.Date;}}return range;}},{key:"DrawDays",value:function DrawDays(){if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Days))return;var weekTitle=this.GetWeekTitleInfo();var colCount=weekTitle.Count;var config=this.DayConfig;var cellSize=this.RectClient.Cell;var dayFontSize=Math.min(cellSize.Width,cellSize.Height)*config.Font.SizeRate;;var dayFont="".concat(dayFontSize,"px ").concat(config.Font.Family);var date=new Date();var today=date.getFullYear()*10000+(date.getMonth()+1)*100+date.getDate();var range=this.GetDateLimitRange();this.Canvas.font=dayFont;this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var left=this.RectClient.Left;var xCell=left,yCell=this.RectClient.Top+this.RectClient.WeekHeight+this.RectClient.TitleHeight;var xText,yText;for(var i=0,j=0;i<this.Data.Days.length;++i){var dayItem=this.Data.Days[i];var rtCell={Left:xCell,Top:yCell,Width:cellSize.Width,Height:cellSize.Height};rtCell.Right=rtCell.Left+rtCell.Width;rtCell.Bottom=rtCell.Top+rtCell.Height;if(!weekTitle.AryWeek.includes(dayItem.Week))continue;var bDisable=dayItem.Date>range.End||dayItem.Date<range.Start;var bMoveOn=false;var bToday=false;if(today===dayItem.Date){this.Canvas.fillStyle=config.Today.BGColor;var radius=Math.min(cellSize.Width,cellSize.Height)*config.Today.RadiusRate;var x=rtCell.Left+rtCell.Width/2,y=rtCell.Top+rtCell.Height/2;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();bToday=true;}else if(this.MoveOnData&&this.MoveOnData.Data){var item=this.MoveOnData.Data;if(item.Type===JSCHART_CALENDAR_BUTTON_ID.DAY_CELL_ID&&item.Data.Date==dayItem.Date){if(config.MoveOn.BGColor){this.Canvas.fillStyle=config.MoveOn.BGColor;var radius=Math.min(cellSize.Width,cellSize.Height)*config.MoveOn.RadiusRate;var x=rtCell.Left+rtCell.Width/2,y=rtCell.Top+rtCell.Height/2;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();//this.Canvas.fillRect(rtCell.Left,rtCell.Top,rtCell.Width,rtCell.Height);
-}bMoveOn=true;}}if(this.IsSelectedDay(dayItem.Date)){var radius=Math.min(cellSize.Width,cellSize.Height)*config.Selected.RadiusRate;var x=rtCell.Left+rtCell.Width/2,y=rtCell.Top+rtCell.Height/2;var color=config.Selected.BorderColor[0];if(bToday){radius-=2;color=config.Selected.BorderColor[1];}this.Canvas.strokeStyle=color;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.closePath();this.Canvas.stroke();}if(!bDisable)this.AryCellRect.push({Type:JSCHART_CALENDAR_BUTTON_ID.DAY_CELL_ID,Rect:rtCell,Data:dayItem});if(dayItem.Text){var textWidth=this.Canvas.measureText(dayItem.Text).width;xText=rtCell.Left+(rtCell.Width-textWidth)/2;yText=rtCell.Top+rtCell.Height/2+dayFontSize/2+config.Text.YOffset;var color=config.Text.Color[0];if(dayItem.Type!==0)color=config.Text.Color[1];if(bDisable)color=config.Text.Color[2];if(bMoveOn&&config.MoveOn.Color)color=config.MoveOn.Color;if(bToday&&config.Today.Color)color=config.Today.Color;this.Canvas.fillStyle=color;this.Canvas.fillText(dayItem.Text,xText,yText);}xCell=rtCell.Right;if(j>0&&(j+1)%colCount==0)//换行
-{yCell=rtCell.Bottom;xCell=left;}++j;}}},{key:"PtInCell",value:function PtInCell(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryCellRect))return null;for(var i=0;i<this.AryCellRect.length;++i){var item=this.AryCellRect[i];var rtCell=item.Rect;if(x>=rtCell.Left&&x<=rtCell.Right&&y>=rtCell.Top&&y<=rtCell.Bottom){var data={Rect:rtCell,Type:item.Type,Data:item.Data};return data;}}return null;}},{key:"OnMouseOn",value:function OnMouseOn(x,y,e){var pixelTatio=GetDevicePixelRatio();var insidePoint={X:x/pixelTatio,Y:y/pixelTatio};var uiElement;if(this.UIElement)uiElement={Left:this.UIElement.getBoundingClientRect().left,Top:this.UIElement.getBoundingClientRect().top};else uiElement={Left:null,Top:null};var bDraw=false;var cell=this.PtInCell(x,y);if(cell){bDraw=false;var selData=this.MoveOnData.Data;if(selData&&cell.Type==selData.Type){if(cell.Type===JSCHART_CALENDAR_BUTTON_ID.DAY_CELL_ID||cell.Type===JSCHART_CALENDAR_BUTTON_ID.MONTH_CELL_ID){if(cell.Data.Date!=selData.Data.Date){this.MoveOnData.Data={Type:cell.Type,Data:cell.Data};bDraw=true;}}}else{this.MoveOnData.Data={Type:cell.Type,Data:cell.Data};bDraw=true;}return{Redraw:bDraw,Cell:cell};}if(this.MoveOnData.Data){this.MoveOnData.Data=null;bDraw=true;}return{Redraw:bDraw,Cell:null};}},{key:"OnMouseDown",value:function OnMouseDown(x,y,e){var cell=this.PtInCell(x,y);if(!cell)return null;var bDraw=false;return{Type:cell.Type,Redraw:bDraw,Data:cell.Data};}},{key:"SetSelectedDay",value:function SetSelectedDay(aryData){this.ArySelectedDay=[];if(IFrameSplitOperator.IsNonEmptyArray(aryData))this.ArySelectedDay=aryData.slice();}}]);}();/********************************************************************************
+if(!this.DateLimit)return range;if(this.DateLimit.End){var item=this.DateLimit.End;if(item.Enable){var date=new Date();range.End=date.getFullYear()*10000+(date.getMonth()+1)*100+date.getDate();if(IFrameSplitOperator.IsPlusNumber(item.Date))range.End=item.Date;}}if(this.DateLimit.Start){var item=this.DateLimit.Start;if(item.Enable){if(IFrameSplitOperator.IsPlusNumber(item.Date))range.Start=item.Date;}}return range;}},{key:"GetMarkItemByDate",value:function GetMarkItemByDate(date){if(!this.Data.MapDayMarks.has(date))return null;return this.Data.MapDayMarks.get(date);}},{key:"DrawDays",value:function DrawDays(){if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Days))return;var weekTitle=this.GetWeekTitleInfo();var colCount=weekTitle.Count;var config=this.DayConfig;var cellSize=this.RectClient.Cell;var dayFontSize=Math.min(cellSize.Width,cellSize.Height)*config.Font.SizeRate;;var dayFont="".concat(dayFontSize,"px ").concat(config.Font.Family);var date=new Date();var today=date.getFullYear()*10000+(date.getMonth()+1)*100+date.getDate();var range=this.GetDateLimitRange();this.Canvas.font=dayFont;this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var left=this.RectClient.Left;var xCell=left,yCell=this.RectClient.Top+this.RectClient.WeekHeight+this.RectClient.TitleHeight;var xText,yText;for(var i=0,j=0;i<this.Data.Days.length;++i){var dayItem=this.Data.Days[i];var rtCell={Left:xCell,Top:yCell,Width:cellSize.Width,Height:cellSize.Height};rtCell.Right=rtCell.Left+rtCell.Width;rtCell.Bottom=rtCell.Top+rtCell.Height;if(!weekTitle.AryWeek.includes(dayItem.Week))continue;var bDisable=dayItem.Date>range.End||dayItem.Date<range.Start;var bMoveOn=false;var bToday=false;if(today===dayItem.Date){this.Canvas.fillStyle=config.Today.BGColor;var radius=Math.min(cellSize.Width,cellSize.Height)*config.Today.RadiusRate;var x=rtCell.Left+rtCell.Width/2,y=rtCell.Top+rtCell.Height/2;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();bToday=true;}else if(this.MoveOnData&&this.MoveOnData.Data){var item=this.MoveOnData.Data;if(item.Type===JSCHART_CALENDAR_BUTTON_ID.DAY_CELL_ID&&item.Data.Date==dayItem.Date){if(config.MoveOn.BGColor){this.Canvas.fillStyle=config.MoveOn.BGColor;var radius=Math.min(cellSize.Width,cellSize.Height)*config.MoveOn.RadiusRate;var x=rtCell.Left+rtCell.Width/2,y=rtCell.Top+rtCell.Height/2;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();//this.Canvas.fillRect(rtCell.Left,rtCell.Top,rtCell.Width,rtCell.Height);
+}bMoveOn=true;}}if(this.IsSelectedDay(dayItem.Date)){var radius=Math.min(cellSize.Width,cellSize.Height)*config.Selected.RadiusRate;var x=rtCell.Left+rtCell.Width/2,y=rtCell.Top+rtCell.Height/2;var color=config.Selected.BorderColor[0];if(bToday){radius-=2;color=config.Selected.BorderColor[1];}this.Canvas.strokeStyle=color;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.closePath();this.Canvas.stroke();}if(!bDisable)this.AryCellRect.push({Type:JSCHART_CALENDAR_BUTTON_ID.DAY_CELL_ID,Rect:rtCell,Data:dayItem});yText=rtCell.Top+rtCell.Height/2+dayFontSize/2+config.Text.YOffset;//文字底部
+if(dayItem.Text){var textWidth=this.Canvas.measureText(dayItem.Text).width;xText=rtCell.Left+(rtCell.Width-textWidth)/2;var color=config.Text.Color[0];if(dayItem.Type!==0)color=config.Text.Color[1];if(bDisable)color=config.Text.Color[2];if(bMoveOn&&config.MoveOn.Color)color=config.MoveOn.Color;if(bToday&&config.Today.Color)color=config.Today.Color;this.Canvas.fillStyle=color;this.Canvas.fillText(dayItem.Text,xText,yText);}var markItem=this.GetMarkItemByDate(dayItem.Date);if(markItem)this.DrawMarkDay(dayItem,markItem,rtCell,yText);xCell=rtCell.Right;if(j>0&&(j+1)%colCount==0)//换行
+{yCell=rtCell.Bottom;xCell=left;}++j;}}},{key:"DrawMarkDay",value:function DrawMarkDay(dayItem,markItem,rtCell,yText){var config=this.MarkDayConfig;var radius=config.Dots.Radius;var yOffset=config.Dots.YOffset;var color=config.Dots.Color;if(markItem.Color)color=markItem.Color;if(IFrameSplitOperator.IsNumber(markItem.YOffset))yOffset=markItem.YOffset;if(IFrameSplitOperator.IsNumber(markItem.Radius))radius=markItem.Radius;var x=rtCell.Left+rtCell.Width/2;var y=yText+yOffset;this.Canvas.fillStyle=color;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();}},{key:"PtInCell",value:function PtInCell(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryCellRect))return null;for(var i=0;i<this.AryCellRect.length;++i){var item=this.AryCellRect[i];var rtCell=item.Rect;if(x>=rtCell.Left&&x<=rtCell.Right&&y>=rtCell.Top&&y<=rtCell.Bottom){var data={Rect:rtCell,Type:item.Type,Data:item.Data};return data;}}return null;}},{key:"OnMouseOn",value:function OnMouseOn(x,y,e){var pixelTatio=GetDevicePixelRatio();var insidePoint={X:x/pixelTatio,Y:y/pixelTatio};var uiElement;if(this.UIElement)uiElement={Left:this.UIElement.getBoundingClientRect().left,Top:this.UIElement.getBoundingClientRect().top};else uiElement={Left:null,Top:null};var bDraw=false;var cell=this.PtInCell(x,y);if(cell){bDraw=false;var selData=this.MoveOnData.Data;if(selData&&cell.Type==selData.Type){if(cell.Type===JSCHART_CALENDAR_BUTTON_ID.DAY_CELL_ID||cell.Type===JSCHART_CALENDAR_BUTTON_ID.MONTH_CELL_ID){if(cell.Data.Date!=selData.Data.Date){this.MoveOnData.Data={Type:cell.Type,Data:cell.Data};bDraw=true;}}}else{this.MoveOnData.Data={Type:cell.Type,Data:cell.Data};bDraw=true;}return{Redraw:bDraw,Cell:cell};}if(this.MoveOnData.Data){this.MoveOnData.Data=null;bDraw=true;}return{Redraw:bDraw,Cell:null};}},{key:"OnMouseDown",value:function OnMouseDown(x,y,e){var cell=this.PtInCell(x,y);if(!cell)return null;var bDraw=false;return{Type:cell.Type,Redraw:bDraw,Data:cell.Data};}},{key:"SetSelectedDay",value:function SetSelectedDay(aryData){this.ArySelectedDay=[];if(IFrameSplitOperator.IsNonEmptyArray(aryData))this.ArySelectedDay=aryData.slice();}}]);}();/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.15864";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: ".concat(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.15869";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: ".concat(HQCHART_VERSION,"  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ");console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 var _default=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.15865",
+  "version": "1.1.15870",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart/umychart.js

@@ -86633,6 +86633,11 @@ function JSChartResource()
             Selected:{ BorderColor:["rgb(0,103,192)", "rgb(220,220,220)"], RadiusRate:0.4 }
         }, 
 
+        MarkDay:
+        {
+            Dots:{ Radius:5, YOffset:5, Color:"rgb(220,20,60)" }
+        },
+
         Month:
         {
             Text:{ Color:["rgb(0,0,0)", "rgb(192,192,192)", "rgb(220,220,220)"], YOffset:2 },
@@ -126123,7 +126128,7 @@ function JSDraw(errorHandler,symbolData)
         } 
 
         var icon=g_JSComplierResource.GetDrawIcon(type);
-        if (!icon) g_JSComplierResource.GetDrawTextIcon(type);
+        if (!icon) icon=g_JSComplierResource.GetDrawTextIcon(type);
         if (!icon) icon={Symbol:'🚩'};
 
         let drawData=[];
@@ -144479,6 +144484,11 @@ function GetBlackStyle()
                 Selected:{ BorderColor:["rgb(0,103,192)", "rgb(0,0,0)"] }
             }, 
 
+            MarkDay:
+            {
+                //Dots:{ Color:"rgb(165,42,42)" }
+            },
+
             Month:
             {
                 Text:{ Color:["rgb(240, 240, 240)", "rgb(128,128,128)","rgb(105,105,105)"] },
@@ -154307,6 +154317,8 @@ function ChartReport()
             column.Type==REPORT_COLUMN_ID.RISING_SPEED_10M_ID || column.Type==REPORT_COLUMN_ID.RISING_SPEED_15M_ID )
         {
             var fieldName=MAP_COLUMN_FIELD.get(column.Type);
+            var dec=data.Decimal;
+            if (column.Type==REPORT_COLUMN_ID.INCREASE_ID || column.Type==REPORT_COLUMN_ID.AMPLITUDE_ID) dec=2; //涨幅,振幅是百分比
             if (stock && IFrameSplitOperator.IsNumber(stock[fieldName]))
             {
                 var value=stock[fieldName];
@@ -177701,7 +177713,7 @@ function ChartScrollText()
 
 
 
-var HQCHART_VERSION="1.1.15864";
+var HQCHART_VERSION="1.1.15869";
 
 function PrintHQChartVersion()
 {