hqchart 1.1.14683 → 1.1.14691

package/src/jscommon/umychart.report.js

@@ -221,6 +221,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);
@@ -4731,6 +4732,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;              //表头行数
 
@@ -4755,6 +4757,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 };
@@ -4875,6 +4878,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 }} 
@@ -5019,8 +5024,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)
@@ -5362,6 +5370,7 @@ function ChartReport()
         this.ShowSymbol=[];
         this.TooltipRect=[];
         this.ButtonRect=[];
+        this.AryFullSelectedRow=[];
         this.DevicePixelRatio=GetDevicePixelRatio()
         this.LastMouseStatus=lastMouseStatus;
 
@@ -5386,6 +5395,7 @@ function ChartReport()
 
         this.ClipClient();
         this.DrawBorder();
+        this.DrawSelectedRow();
         this.Canvas.restore();
 
         this.DrawDragRow();
@@ -5400,6 +5410,7 @@ function ChartReport()
 
         this.LastMouseStatus=null;
         this.SizeChange=false;
+        this.AryFullSelectedRow=[];
     }
 
     this.DrawDragHeaderBG=function()
@@ -5942,6 +5953,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;
@@ -6033,8 +6046,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);
@@ -6043,6 +6064,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()
@@ -6484,10 +6521,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)
         {
@@ -6510,10 +6549,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)
         {
@@ -6562,10 +6603,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))
         {
@@ -6670,8 +6713,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)
@@ -6957,12 +7014,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;
     }
@@ -6970,12 +7021,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;
 
         //格式化输出
@@ -7017,12 +7062,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)
@@ -7331,9 +7370,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);   //画一个背景色, 不然是一个黑的背景
         }
@@ -8154,42 +8197,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)

package/src/jscommon/umychart.style.js

@@ -88,6 +88,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)",
             }
         },
 
@@ -702,6 +710,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)",

package/src/jscommon/umychart.testdata.js

@@ -197,6 +197,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol[0];             //请求的股票代码
     var callcation=data.Request.Data.callcation;        //集合竞价
+    var bBuySellBar=data.Request.Data.IsShowBuySellBar;
     console.log(`[HQData::RequestMinuteData] Symbol=${symbol}`);
 
     setTimeout(()=>{
@@ -227,6 +228,29 @@ HQData.Minute_RequestMinuteData=function(data, callback)
             stockItem.beforeinfo=beforeinfo;
         }
 
+        var lastPrice=stockItem.minute[stockItem.minute.length-1].price;
+
+
+        if (bBuySellBar)    //盘口分析
+        {
+            var aryBuy=[];
+            var value=lastPrice+0.01;
+            for(var i=0;i<10;++i)
+            {
+                aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+    
+            var arySell=[];
+            for(var i=0;i<10;++i)
+            {
+                arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+
+            stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
+        }
+
         //测试用 这里可以修改数据
         //var lastItem=srcStock.minute[srcStock.minute.length-1];
         //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
@@ -238,7 +262,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
         */
 
-        //stockItem.minute.length=50;
+        stockItem.minute.length=50;
 
         var hqchartData={code:0, stock:[stockItem] };
     
@@ -336,6 +360,7 @@ HQData.Minute_RequestHistoryMinuteData=function(data, callback)
     var symbol=data.Request.Data.symbol;                //请求的股票代码
     var dayCount=data.Request.Data.daycount;
     var callcation=data.Request.Data.callcation;        //集合竞价
+    var bBuySellBar=data.Request.Data.IsShowBuySellBar;
   
     console.log(`[HQData::Minute_RequestHistoryMinuteData] Symbol=${symbol}`);
 
@@ -372,6 +397,29 @@ HQData.Minute_RequestHistoryMinuteData=function(data, callback)
             item.beforeinfo=beforeinfo;
         }
     }
+
+    if (bBuySellBar)    //盘口分析
+    {
+        var dayItem=aryDay[0];
+        var lastPrice=dayItem.minute[dayItem.minute.length-1][4];
+
+        var aryBuy=[];
+        var value=lastPrice+0.01;
+        for(var i=0;i<10;++i)
+        {
+            aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
+            value+=0.02;
+        }
+
+        var arySell=[];
+        for(var i=0;i<10;++i)
+        {
+            arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
+            value+=0.02;
+        }
+
+        dayItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
+    }
    
     var hqchartData={code:0, data:aryDay, name:symbol, symbol: symbol};