hqchart 1.1.14683 → 1.1.14691

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

@@ -5168,6 +5168,12 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             chart.EnableBorderDrag=option.EnableBorderDrag;
         }
 
+        if (IFrameSplitOperator.IsBool(option.EnableBuySellBar))
+        {
+            var barChart=chart.GetChartMinuteBuySellBar();
+            if (barChart) barChart.IsShow=option.EnableBuySellBar;
+        }
+
         this.AdjustChartBorder(chart);
 
         if (option.Frame)
@@ -6730,7 +6736,7 @@ var JSCHART_EVENT_ID=
     ON_RCLICK_REPORT_HEADER:52,             //右键点击表头
     ON_REPORT_LOCAL_SORT:53,                //报价列表本地排序
     ON_DRAW_REPORT_NAME_COLOR:54,           //报价列表股票名称列颜色
-    ON_DRAW_CUSTOM_TEXT:55,                 //报价列表自定义列
+    ON_DRAW_CUSTOM_TEXT:55,                 //报价列表自定义列（废弃)
     ON_CLICK_REPORT_TAB:56,                 //报价列表标签点击
     ON_CLICK_REPORT_TABMENU:57,             //报价列表标签菜单点击
     ON_DRAW_REPORT_FIXEDROW_TEXT:58,        //报价列表固定行绘制
@@ -7067,6 +7073,7 @@ var JSCHART_MENU_ID=
     CMD_FULLSCREEN_SUMMARY_ID:56,           //当前屏区间统计
     CMD_CORSS_DBCLICK_ID:57,                //双击显示隐藏十字光标
     CMD_ENABLE_KLINE_DAY_SUMMARY_ID:58,     //K线底部显示走完剩余时间
+    CMD_SHOW_BUYSELL_BAR_ID:59,             //盘口分析(右侧显示买卖盘柱子) 分时图
 
 
 
@@ -7309,6 +7316,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.CustomChartDrag;       //自定义图形的拖拽操作 { Type:, Data: }
 
     this.StockCache={ Data:null };        //扩展数据缓存数据
+    this.BuySellData={ ArySell:null, AryBuy:null }; //10档买卖盘
 
     this.JSPopMenu;     //内置菜单
     this.IsShowRightMenu=true;  //显示右键菜单
@@ -7360,6 +7368,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.ClearStockCache=function()
     {
         this.StockCache.Data=null;
+        this.BuySellData.AryBuy=null;
+        this.BuySellData.ArySell=null;
     }
 
     this.InitalPopMenu=function()   //初始化弹出窗口
@@ -15047,6 +15057,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.Draw();
                 }
                 break;
+            case JSCHART_MENU_ID.CMD_SHOW_BUYSELL_BAR_ID:
+                if (IFrameSplitOperator.IsBool(srcParam))
+                {
+                    var chart=this.GetChartMinuteBuySellBar();
+                    chart.IsShow=srcParam;
+                    this.RequestData({ ClearYCoordinateMaxMin:true });
+                    this.Draw();
+                }
+                break;
         }
     }
 
@@ -29697,7 +29716,8 @@ function ChartPaintFactory()
     [
         ["ChartKLine", { Create:function(option) { return new ChartKLine(); } }],   //K线图
         ["ChartMinuteVolumBar",{ Create:function(option) { return new ChartMinuteVolumBar(); } }],   //分时成交量柱子
-        ["ChartMinutePriceLine",{ Create:function(option) { return new ChartMinutePriceLine();} }]
+        ["ChartMinutePriceLine",{ Create:function(option) { return new ChartMinutePriceLine();} }],
+        ["ChartMinuteBuySellBar", { Create:function(option){ return new ChartMinuteBuySellBar(); }}],
     ]); 
 
     this.Create=function(name, option)
@@ -44218,6 +44238,216 @@ function ChartMinutePositionLine()
     }
 }
 
+//分时图 右侧10档买卖柱子
+function ChartMinuteBuySellBar()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.BuyColor=g_JSChartResource.Minute.BuySellBar.BuyColor;
+    this.SellColor=g_JSChartResource.Minute.BuySellBar.SellColor;
+    this.BarWidth=g_JSChartResource.Minute.BuySellBar.BarWidth;
+    this.MaxBarWidth=g_JSChartResource.Minute.BuySellBar.MaxBarWidth;
+    this.YOffset=g_JSChartResource.Minute.BuySellBar.YOffset;
+    this.Font=g_JSChartResource.Minute.BuySellBar.Font;
+    this.TextColor=g_JSChartResource.Minute.BuySellBar.TextColor;
+
+    this.IsDrawFirst=true;
+    this.IsShow=false;
+
+    this.BuySellData=null; //{ AryBuy:[{ Price:10.5, Vol:300}], ArySell:[{ Price:10.5, Vol:300}] }
+
+    this.ReloadResource=function(resource)
+    {
+        this.BuyColor=g_JSChartResource.Minute.BuySellBar.BuyColor;
+        this.SellColor=g_JSChartResource.Minute.BuySellBar.SellColor;
+        this.BarWidth=g_JSChartResource.Minute.BuySellBar.BarWidth;
+        this.MaxBarWidth=g_JSChartResource.Minute.BuySellBar.MaxBarWidth;
+        this.YOffset=g_JSChartResource.Minute.BuySellBar.YOffset;
+        this.Font=g_JSChartResource.Minute.BuySellBar.Font;
+        this.TextColor=g_JSChartResource.Minute.BuySellBar.TextColor;
+    }
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+        if (!this.BuySellData) return;
+
+        var volRange=this.GetVolRange();
+        if (!volRange) return;
+
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var xPointCount=this.ChartFrame.XPointCount;
+
+        var xStart=this.ChartFrame.GetXFromIndex(xPointCount-this.MaxBarWidth);
+        var xEnd=this.ChartFrame.GetXFromIndex(xPointCount-1);
+
+        function _Temp_GetXFromData(value)
+        {
+            var maxWidth=xEnd-xStart;
+            var width = maxWidth * (value - volRange.Min) / (volRange.Max - volRange.Min);
+            return xEnd-width;
+        }
+
+        this.Canvas.save();
+        this.ClipClient(bHScreen);
+        
+        var aryBuy=this.BuySellData.AryBuy;
+        if (IFrameSplitOperator.IsNonEmptyArray(aryBuy))
+        {
+            this.Canvas.beginPath();
+            var lineCount=0;
+            for(var i=0;i<aryBuy.length;++i)
+            {
+                var item=aryBuy[i];
+                if (!item || !IFrameSplitOperator.IsNumber(item.Vol) || !IFrameSplitOperator.IsNumber(item.Price)) continue;
+                
+                var y=this.GetYFromData(item.Price,false)
+                var x=_Temp_GetXFromData(item.Vol);
+
+                if (bHScreen)
+                {
+                    y-=-this.YOffset;
+                    this.Canvas.moveTo(y,x);
+                    this.Canvas.lineTo(y,xEnd);
+                }
+                else
+                {
+                    y-=-this.YOffset;
+                    this.Canvas.moveTo(x,y);
+                    this.Canvas.lineTo(xEnd,y);
+                }
+
+                ++lineCount;
+            }
+
+            if (lineCount>0)
+            {
+                this.Canvas.strokeStyle=this.BuyColor;
+                if (IFrameSplitOperator.IsPlusNumber(this.BarWidth)) this.Canvas.lineWidth=this.BarWidth;
+                this.Canvas.stroke();
+            }
+        }
+
+        var arySell=this.BuySellData.ArySell;
+        if (IFrameSplitOperator.IsNonEmptyArray(arySell))
+        {
+            this.Canvas.beginPath();
+            var lineCount=0;
+            for(var i=0;i<arySell.length;++i)
+            {
+                var item=arySell[i];
+                if (!item || !IFrameSplitOperator.IsNumber(item.Vol) || !IFrameSplitOperator.IsNumber(item.Price)) continue;
+    
+                var y=this.GetYFromData(item.Price,false);
+                var x=_Temp_GetXFromData(item.Vol);
+    
+                if (bHScreen)
+                {
+                    y-=-this.YOffset;
+                    this.Canvas.moveTo(y,x);
+                    this.Canvas.lineTo(y,xEnd);
+                }
+                else
+                {
+                    y-=-this.YOffset;
+                    this.Canvas.moveTo(x,y);
+                    this.Canvas.lineTo(xEnd,y);
+                }
+                
+                ++lineCount;
+            }
+    
+            if (lineCount>0)
+            {
+                this.Canvas.strokeStyle=this.SellColor;
+                if (IFrameSplitOperator.IsPlusNumber(this.BarWidth)) this.Canvas.lineWidth=this.BarWidth;
+                this.Canvas.stroke();
+            }
+        }
+
+        
+        this.DrawMaxVolText(volRange.Max, xStart);
+
+        this.Canvas.restore();
+    }
+
+    this.DrawMaxVolText=function(value, x)
+    {
+        if (!IFrameSplitOperator.IsNumber(value)) return;
+
+        var border=this.ChartFrame.GetBorder();
+        var text=value.toFixed(0);
+        this.Canvas.textAlign = 'left';
+        this.Canvas.textBaseline = 'bottom';
+        this.Canvas.font=this.Font;
+        this.Canvas.fillStyle=this.TextColor;
+
+        if (this.ChartFrame.IsHScreen===true)
+        {
+            var yBottom=border.LeftEx+1;
+            this.Canvas.save(); 
+            this.Canvas.translate(yBottom,x);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.fillText(text,0,0);
+            this.Canvas.restore();
+        }
+        else
+        {
+            var yBottom=border.Bottom-1;
+            this.Canvas.fillText(text,x,yBottom);
+        }
+    }
+
+    this.GetVolRange=function()
+    {
+        if (!this.BuySellData) return null;
+
+        var range={ Min:0, Max:null };
+        var aryBuy=this.BuySellData.AryBuy;
+        var arySell=this.BuySellData.ArySell;
+        var count=0;
+
+        if (IFrameSplitOperator.IsNonEmptyArray(aryBuy))
+        {
+            for(var i=0;i<aryBuy.length;++i)
+            {
+                var item=aryBuy[i];
+                if (!IFrameSplitOperator.IsNumber(item.Vol)) continue;
+    
+                if (range.Min==null || range.Min>item.Vol) range.Min=item.Vol;
+                if (range.Max==null || range.Max<item.Vol) range.Max=item.Vol;
+                ++count;
+            }
+        }
+
+        if (IFrameSplitOperator.IsNonEmptyArray(arySell))
+        {
+            for(var i=0;i<arySell.length;++i)
+            {
+                var item=arySell[i];
+                if (!IFrameSplitOperator.IsNumber(item.Vol)) continue;
+    
+                if (range.Min==null || range.Min>item.Vol) range.Min=item.Vol;
+                if (range.Max==null || range.Max<item.Vol) range.Max=item.Vol;
+                ++count;
+            }
+        }
+
+        if (count<=0) return null;
+
+        return range;
+    }
+
+    this.GetMaxMin=function()
+    {
+        return { Min:null, Max:null };
+    }
+}
+
 //分钟信息地雷 支持横屏
 function ChartMinuteInfo()
 {
@@ -51457,6 +51687,7 @@ function MinuteLeftTooltipPaint()
     this.Draw=function()
     {
         if (!this.IsEnableDraw()) return;
+        if (this.ChartFrame && this.ChartFrame.IsHScreen===true) return;   //不支持横屏
 
         this.TitlePaint=this.HQChart.TitlePaint[0];
         if (!this.TitlePaint) return;
@@ -77713,6 +77944,17 @@ function JSChartResource()
         Night: { Color:"rgb(0,0,0)", BGColor:"rgb(179,179,179)", BorderColor:"rgb(179,179,179)", Margin:{ Left:5, Top:2, Bottom:2, Right:5 } },
     }
 
+    this.Minute.BuySellBar=
+    {
+        BuyColor:"rgb(242,54,69)",
+        SellColor:"rgb(8,153,129)",
+        BarWidth:4*GetDevicePixelRatio(),
+        MaxBarWidth:120,
+        YOffset:1,
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+        TextColor:"rgb(128,128,128)",
+    }
+
     this.DefaultTextColor="rgb(43,54,69)";                          //图形中默认的字体颜色
     this.DefaultTextFont=14*GetDevicePixelRatio() +'px 微软雅黑';    //图形中默认的字体
     this.TitleFont=13*GetDevicePixelRatio() +'px 微软雅黑';          //指标显示,tooltip显示字体
@@ -78828,6 +79070,7 @@ function JSChartResource()
     {
         BorderColor:'rgb(192,192,192)',    //边框线
         SelectedColor:"rgb(180,240,240)",  //选中行
+        SelectedLine:{ Color:"rgb(180,240,240)", Width:2 },
         Header:
         {
             Color:"rgb(60,60,60)",      //表头文字颜色
@@ -79250,6 +79493,19 @@ function JSChartResource()
                     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.IsNumber(item.MaxBarWidth)) dest.MaxBarWidth=item.MaxBarWidth;
+                if (IFrameSplitOperator.IsNumber(item.YOffset)) dest.YOffset=item.YOffset;
+            }
         }
 
         if (style.PopMinuteChart)
@@ -80146,6 +80402,14 @@ function JSChartResource()
         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)
@@ -90650,6 +90914,24 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return false;
     }
 
+    this.GetChartMinuteBuySellBar=function()
+    {
+        var chart=this.ChartPaint[3];
+        if (!chart) return null;
+
+        if (chart.Name!="Minute-BuySell-Bar") return null;
+
+        return chart;
+    }
+
+    this.IsShowMinuteBuySellBar=function()
+    {
+        var chart=this.GetChartMinuteBuySellBar();
+        if (!chart) return false;
+
+        return chart.IsShow;
+    }
+
     //左右拖拽
     this.OnDragMode_One=function(moveData, e)
     {
@@ -92109,7 +92391,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             bRButtonSelectRect=this.ChartDragSelectRect.EnableRButton;
             bLButtonSelectRect=this.ChartDragSelectRect.EnableLButton;
         }
-        
+
+        var bShowBuySellBar=this.IsShowMinuteBuySellBar();
+       
         var minItem=null;
         if (frameID>=0 && option && IFrameSplitOperator.IsNumber(option.CursorIndex))
         {
@@ -92206,6 +92490,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 SubMenu:
                 [
                     { Name:"画图工具", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID, Args:[]}, Checked:this.IsShowDrawToolDialog()},
+                    { Name:"盘口分析", Data:{ ID:JSCHART_MENU_ID.CMD_SHOW_BUYSELL_BAR_ID, Args:[!bShowBuySellBar]}, Checked:bShowBuySellBar },
 
                     { Name:JSPopMenu.SEPARATOR_LINE_NAME },
                     
@@ -92898,6 +93183,16 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         volLine.ShareAfterVol=this.ShareAfterVol;
         this.ChartPaint[2]=volLine;
 
+        var buySellBar=g_ChartPaintFactory.Create("ChartMinuteBuySellBar");
+        buySellBar.Canvas=this.Canvas;
+        buySellBar.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
+        buySellBar.ChartFrame=this.Frame.SubFrame[0].Frame;
+        buySellBar.Name="Minute-BuySell-Bar";
+        buySellBar.Identify="Minute-BuySell-Bar";
+        buySellBar.BuySellData=this.BuySellData;
+        this.ChartPaint[3]=buySellBar;
+        
+
         this.TitlePaint[0]=new DynamicMinuteTitlePainting();
         this.TitlePaint[0].Frame=this.Frame.SubFrame[0].Frame;
         this.TitlePaint[0].Canvas=this.Canvas;
@@ -93503,7 +93798,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.AutoUpdateEvent(false, "MinuteChartContainer::ChangeDayCount");
         this.DayCount=count;
         this.ClearMinuteData();
+        this.ClearStockCache();
         this.UnlockCorssCursor();
+        this.Frame.ClearYCoordinateMaxMin();
 
         if (option && option.PageInfo)
         {
@@ -93773,8 +94070,14 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
-    this.RequestData=function()
+    //option={ ClearYCoordinateMaxMin:true }
+    this.RequestData=function(option)
     {
+        if (option)
+        {
+            if (option.ClearYCoordinateMaxMin===true) this.Frame.ClearYCoordinateMaxMin();
+        }
+
         if (this.DayCount<=1) this.RequestMinuteData();               
         else this.RequestHistoryMinuteData();
     }
@@ -93846,11 +94149,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 After:this.IsShowMultiDayAfterData
             }   //集合竞价
 
+            var bBuySellBar=this.IsShowMinuteBuySellBar();
+
             var obj=
             {
                 Name:'MinuteChartContainer::RequestHistoryMinuteData', //类名::函数
                 Explain:'多日分时数据',
-                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation, AryDate:this.AryDate }, Type:'POST' }, 
+                Request:{ Url:self.HistoryMinuteApiUrl, Data:{daycount:self.DayCount, symbol:self.Symbol, callcation:callCation, AryDate:this.AryDate, IsShowBuySellBar:bBuySellBar }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -93897,6 +94202,10 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         this.DataStatus.MultiDay=true;
 
+        var lastDayData=null;
+        if (IFrameSplitOperator.IsNonEmptyArray(data.data) && data.data[0]) lastDayData=data.data[0];
+        if (lastDayData) this.RecvBuySellData(lastDayData.BuySellData);
+
         this.CaclutateCallCationYRange();
         this.Symbol=data.symbol;
         this.Name=data.name;
@@ -94216,6 +94525,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.IsAfterData=true;
         }
 
+        //5档买卖盘
+        var bBuySellBar=this.IsShowMinuteBuySellBar();
+
         if (this.NetworkFilter)
         {
             var dateRange=null;
@@ -94240,7 +94552,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 Name:'MinuteChartContainer::RequestMinuteData', //类名::函数名
                 Explain:'最新分时数据',
-                Request:{ Url:self.MinuteApiUrl, Data:{field:fields, symbol:[self.Symbol], callcation:callCation, AryDate:this.AryDate }, Type:'POST' }, 
+                Request:{ Url:self.MinuteApiUrl, Data:{field:fields, symbol:[self.Symbol], callcation:callCation, AryDate:this.AryDate, IsShowBuySellBar:bBuySellBar }, Type:'POST' }, 
                 Self:this,
                 PreventDefault:false
             };
@@ -94375,6 +94687,21 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
+    this.RecvBuySellData=function(data)
+    {
+        if (!data) return;
+
+        if (Array.isArray(data.AryBuy))
+        {
+            this.BuySellData.AryBuy=data.AryBuy.slice();
+        }
+
+        if (Array.isArray(data.ArySell))
+        {
+            this.BuySellData.ArySell=data.ArySell.slice();
+        }
+    }
+
     this.RecvMinuteData=function(data)
     {
         if (!data) 
@@ -94409,7 +94736,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         var bFirstData=(this.DataStatus.LatestDay==false);   //首条单日数据
 
-        this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
+        if (IFrameSplitOperator.IsNonEmptyArray(data.stock) && data.stock[0])
+        {
+            this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
+            this.RecvBuySellData(data.stock[0].BuySellData);
+        }
+        
         this.DataStatus.LatestDay=true;
             
         if (this.DayCount>1)    //多日走势图
@@ -131667,6 +131999,14 @@ function GetBlackStyle()
                 Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
                 Day: { Color:"rgb(153,153,153)", BGColor:"rgb(51,51,51)", BorderColor:"rgb(51,51,51)", Margin:{ Left:5, Top:2, Bottom:2, Right:5 } },
                 Night: { Color:"rgb(153,153,153)", BGColor:"rgb(51,51,51)", BorderColor:"rgb(51,51,51)", Margin:{ Left:5, Top:2, Bottom:2, Right:5 } },
+            },
+
+            BuySellBar:
+            {
+                BuyColor:"rgb(102, 33, 33)",
+                SellColor:"rgb(20, 63, 31)",
+                Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+                TextColor:"rgb(220,220,220)",
             }
         },
 
@@ -132281,6 +132621,7 @@ function GetBlackStyle()
         {
             BorderColor:'rgb(38,38,41)',    //边框线
             SelectedColor:"rgb(49,48,56)",  //选中行
+            SelectedLine:{ Color:"rgb(250,250,250)" },
             Header:
             {
                 Color:"RGB(245,245,245)",
@@ -134407,6 +134748,7 @@ function JSReportChart(divElement)
         {
             if (IFrameSplitOperator.IsNumber(option.TextOverflowStyle)) reportChart.TextOverflowStyle=option.TextOverflowStyle;
             if (IFrameSplitOperator.IsNumber(option.MultiSelectModel)) reportChart.MultiSelectModel=option.MultiSelectModel;
+            if (IFrameSplitOperator.IsNumber(option.SelectedStyle)) reportChart.SelectedStyle=option.SelectedStyle;
         }
 
         this.SetChartBorder(chart, option);
@@ -138917,6 +139259,7 @@ function ChartReport()
     this.SelectedModel=0;               //选中模式 0=SelectedRow表示当前屏索引
     this.SelectedRow=-1;                //选中行ID
     this.SelectedFixedRow=-1;           //选中固定行ID
+    this.SelectedStyle=1;               //选中行样式 1=整行填充 2=底部绘制直线
     this.IsDrawBorder=1;                //是否绘制单元格边框
     this.HeaderRowCount=1;              //表头行数
 
@@ -138941,6 +139284,7 @@ function ChartReport()
 
     this.BorderColor=g_JSChartResource.Report.BorderColor;          //边框线
     this.SelectedColor=g_JSChartResource.Report.SelectedColor;      //选中行
+    this.SelectedLineConfig={ Color:g_JSChartResource.Report.SelectedLine.Color, Width:g_JSChartResource.Report.SelectedLine.Width }; //选中行底部线段
 
     //表头配置
     this.HeaderFontConfig={ Size:g_JSChartResource.Report.Header.Font.Size, Name:g_JSChartResource.Report.Header.Font.Name };
@@ -139061,6 +139405,8 @@ function ChartReport()
     this.IsShowAllColumn=false;   //是否已显示所有列
     this.DevicePixelRatio=GetDevicePixelRatio();  //分辨率
 
+    this.AryFullSelectedRow=[];     //选中行
+
     //{ 
     //  Type:列id, Title:标题, TextAlign:文字对齐方式, MaxText:文字最大宽度 , TextColor:文字颜色, Sort:0=不支持排序 1=本地排序 0=远程排序, 
     //  Icon:{ Family:"iconfont", Size:12, Symbol:"", Margin: { Left:, Bottom }} 
@@ -139205,8 +139551,11 @@ function ChartReport()
         if (IFrameSplitOperator.IsNumber(item.Sort)) colItem.Sort=item.Sort;
         if (IFrameSplitOperator.IsNumber(item.FixedWidth)) colItem.FixedWidth=item.FixedWidth;
         if (IFrameSplitOperator.IsBool(item.EnableDragWidth)) colItem.EnableDragWidth=item.EnableDragWidth;
+
+        colItem.IsDrawCallback=false;
         if (IFrameSplitOperator.IsBool(item.IsDrawCallback)) colItem.IsDrawCallback=item.IsDrawCallback;
-        else colItem.IsDrawCallback=false;
+
+        if (IFrameSplitOperator.IsBool(item.EnableFormatDrawInfoEvent)) colItem.EnableFormatDrawInfoEvent=item.EnableFormatDrawInfoEvent;
 
         if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision;    //小数位数
         if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
@@ -139548,6 +139897,7 @@ function ChartReport()
         this.ShowSymbol=[];
         this.TooltipRect=[];
         this.ButtonRect=[];
+        this.AryFullSelectedRow=[];
         this.DevicePixelRatio=GetDevicePixelRatio()
         this.LastMouseStatus=lastMouseStatus;
 
@@ -139572,6 +139922,7 @@ function ChartReport()
 
         this.ClipClient();
         this.DrawBorder();
+        this.DrawSelectedRow();
         this.Canvas.restore();
 
         this.DrawDragRow();
@@ -139586,6 +139937,7 @@ function ChartReport()
 
         this.LastMouseStatus=null;
         this.SizeChange=false;
+        this.AryFullSelectedRow=[];
     }
 
     this.DrawDragHeaderBG=function()
@@ -140128,6 +140480,8 @@ function ChartReport()
         var left=this.RectClient.Left;
         var rowWidth=this.RectClient.Right-this.RectClient.Left;
 
+        var arySelectedRow=[];
+
         //固定行
         var textTop=top;
         this.Canvas.font=this.ItemFixedFont;
@@ -140219,8 +140573,16 @@ function ChartReport()
 
             if (bFillRow)
             {
-                this.Canvas.fillStyle=this.SelectedColor;
-                this.Canvas.fillRect(left,textTop,rowWidth,this.RowHeight);   
+                var rtRowBG={ Left:left, Top:textTop, Width:rowWidth, Height:this.RowHeight };
+                rtRowBG.Right=rtRowBG.Left+rtRowBG.Width;
+                rtRowBG.Bottom=rtRowBG.Top+rtRowBG.Height;
+                this.AryFullSelectedRow.push(rtRowBG);
+
+                if (this.SelectedStyle===1)
+                {
+                    this.Canvas.fillStyle=this.SelectedColor;
+                    this.Canvas.fillRect(rtRowBG.Left,rtRowBG.Top,rtRowBG.Width,rtRowBG.Height);   
+                }
             }
 
             this.DrawRow(symbol, textTop, i);
@@ -140229,6 +140591,22 @@ function ChartReport()
 
             textTop+=this.RowHeight;
         }
+
+        
+    }
+
+    this.DrawSelectedRow=function()
+    {
+        if (this.SelectedStyle===2 && IFrameSplitOperator.IsNonEmptyArray(this.AryFullSelectedRow))
+        {
+            this.Canvas.fillStyle=this.SelectedLineConfig.Color;
+            var lineWidth=this.SelectedLineConfig.Width;
+            for(var i=0;i<this.AryFullSelectedRow.length;++i)
+            {
+                var rtBG=this.AryFullSelectedRow[i];
+                this.Canvas.fillRect(rtBG.Left,rtBG.Bottom-lineWidth,rtBG.Width,lineWidth); 
+            }
+        }
     }
 
     this.GetSelectedSymbol=function()
@@ -140670,10 +141048,12 @@ function ChartReport()
         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)
         {
@@ -140696,10 +141076,12 @@ function ChartReport()
         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)
         {
             this.FormaDateDrawInfo(column, stock, drawInfo, data);
+            this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
         else if (column.Type==REPORT_COLUMN_ID.CHECKBOX_ID)
         {
@@ -140748,10 +141130,12 @@ function ChartReport()
         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.IsReserveProgressBarColumn(column.Type))
         {
@@ -140856,8 +141240,22 @@ function ChartReport()
             var buttonData={ Stock:stock, Index:index, ColumnIndex:columnIndex, Column:column, Rect:drawInfo.Botton.Rect, Type:drawInfo.Botton.Type, Data:drawInfo.Data };
             this.ButtonRect.push(buttonData);
         }
+    }
 
-       
+    this.FormatDrawInfoEvent=function(stock, data, column, drawInfo)
+    {
+        if (!column.EnableFormatDrawInfoEvent) return;
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_FORMAT_DRAW_INFO);
+        if (!event || !event.Callback) return;
+
+        var sendData=
+        {
+            Stock:stock, Column:column, Data:data,
+            DrawInfo:drawInfo
+        };
+
+        event.Callback(event, sendData, this);
     }
 
     this.IsReserveProgressBarColumn=function(value)
@@ -141143,12 +141541,6 @@ function ChartReport()
     this.GetCustomStringDrawInfo=function(data, column, drawInfo)
     {
         var value=this.GetExtendData(data, column);
-        if (column.IsDrawCallback)  //外部处理输出格式
-        {
-            this.GetCustomTextDrawInfo(column, data.Symbol, value, drawInfo, data);
-            return;
-        }
-
         if (!IFrameSplitOperator.IsString(value)) return;
         drawInfo.Text=value;
     }
@@ -141156,12 +141548,6 @@ function ChartReport()
     this.GetCustomNumberDrawInfo=function(data, column, drawInfo)
     {
         var value=this.GetExtendData(data, column);
-        if (column.IsDrawCallback)  //外部处理输出格式
-        {
-            this.GetCustomTextDrawInfo(column, data.Symbol, value, drawInfo, data);
-            return;
-        }
-
         if (!IFrameSplitOperator.IsNumber(value)) return;
 
         //格式化输出
@@ -141203,12 +141589,6 @@ function ChartReport()
         var value=this.GetExtendData(data, column);
         if (!IFrameSplitOperator.IsNumber(value)) return;
 
-        if (column.IsDrawCallback)  //外部处理输出格式
-        {
-            this.GetCustomTextDrawInfo(column, data.Symbol, value, drawInfo, data);
-            return;
-        }
-
         if (column.ValueType==0)
         {
             if (column.FormatType==1)
@@ -141517,9 +141897,13 @@ function ChartReport()
 
     this.DrawItemBG=function(drawInfo)
     {
-        if (drawInfo.BGColor && drawInfo.Rect)//绘制背景色
+        if (!drawInfo.BGColor) return;
+
+        var rtItem=drawInfo.Rect;   //绘制背景色
+        if (drawInfo.RectBG) rtItem=drawInfo.RectBG;
+
+        if (rtItem)
         {
-            var rtItem=drawInfo.Rect;
             this.Canvas.fillStyle=drawInfo.BGColor;
             this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);   //画一个背景色, 不然是一个黑的背景
         }
@@ -142340,42 +142724,9 @@ function ChartReport()
         }
     }
 
-    //外部配置显示格式 颜色 对齐方式
-    this.GetCustomTextDrawInfo=function(columnInfo, symbol, value, drawInfo, data)
-    {
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_CUSTOM_TEXT);
-        if (!event || !event.Callback) return false;
-
-        var sendData=
-        { 
-            Symbol:symbol, Column:columnInfo, Value:value, Data:data,
-            Out:{ Text:null, TextColor:null, TextAlign:null } 
-        };
-
-        event.Callback(event,sendData,this);
-
-        if (sendData.Out.Text) drawInfo.Text=sendData.Out.Text;
-        if (sendData.Out.TextColor) drawInfo.TextColor=sendData.Out.TextColor;
-        if (sendData.Out.TextAlign) drawInfo.TextAlign=sendData.Out.TextAlign;
-        if (sendData.Out.BGColor) drawInfo.BGColor=sendData.Out.BGColor;
-
-        return true;
-    }
-
     this.FormatDrawInfo=function(column, stock, drawInfo, data)
     {
-        if (!column.IsDrawCallback) return false;
-
-        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_FORMAT_DRAW_INFO);
-        if (!event || !event.Callback) return false;
-
-        var sendData=
-        {
-            Stock:stock, Column:column, Data:data,
-            DrawInfo:drawInfo
-        };
-
-        event.Callback(event,sendData,this);
+        this.FormatDrawInfoEvent(stock, data, column, drawInfo);
     }
 
     this.GetFixedRowTextDrawInfo=function(rowIndex, colIndex, columnInfo, drawInfo)
@@ -157995,7 +158346,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14682";
+var HQCHART_VERSION="1.1.14690";
 
 function PrintHQChartVersion()
 {