hqchart 1.1.14778 → 1.1.14787

package/src/jscommon/umychart.DialogTooltip.js

@@ -1348,6 +1348,16 @@ function JSFloatTooltip()
                 this.TReportIconTooltip(data);
             }
         }
+        else if (data.DataType==5)  //成交笔数
+        {
+            var tooltipData=data.Tooltip;
+            if (!tooltipData) return;
+
+            if (tooltipData.Type==2)    //提示信息
+            {
+                this.DealItemTooltip(data);
+            }
+        }
     }
 
     this.UpdateRealtimeHQTooltip=function(data)
@@ -1639,6 +1649,18 @@ function JSFloatTooltip()
 
         this.ShowTooltip(data);
     }
+
+    this.DealItemTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !IFrameSplitOperator.IsNonEmptyArray(tooltipData.Data.AryText)) return;
+        
+        this.AryText=tooltipData.Data.AryText;
+
+        this.UpdateTableDOM();
+
+        this.ShowTooltip(data);
+    }
  
     this.UpdateTableDOM=function()
     {

package/src/jscommon/umychart.deal.js

@@ -72,6 +72,7 @@ function JSDealChart(divElement)
         }
 
         if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable) chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
+        if (option.FloatTooltip && option.FloatTooltip.Enable) chart.InitalFloatTooltip(option.FloatTooltip);   //提示信息
 
         if (!option.Symbol) 
         {
@@ -100,6 +101,12 @@ function JSDealChart(divElement)
         if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
         if (IFrameSplitOperator.IsBool(option.EnableFilter)) chart.EnableFilter=option.EnableFilter;
 
+         var dealChart=chart.GetDealChart();
+         if (dealChart)
+         {
+            if (IFrameSplitOperator.IsNumber(option.SelectedStyle)) dealChart.SelectedStyle=option.SelectedStyle;
+         }
+
         //注册事件
         if (option.EventCallback)
         {
@@ -215,6 +222,7 @@ function JSDealChartContainer(uielement)
     this.LoadDataSplashTitle="数据加载中";           //下载数据提示信息
 
     this.TooltipMinuteChart;    //分时图
+    this.FloatTooltip;          //提示浮框
     
     this.UIElement=uielement;
     this.LastPoint=new Point();     //鼠标位置
@@ -228,6 +236,9 @@ function JSDealChartContainer(uielement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
+
+        this.DestroyMinuteChartTooltip();
+        this.DestroyFloatTooltip();
     }
 
     this.EnableFilterData=false;    //是否启动筛选
@@ -272,9 +283,55 @@ function JSDealChartContainer(uielement)
         this.TooltipMinuteChart.Hide();
     }
 
+    this.HideFloatTooltip=function()
+    {
+        if (!this.FloatTooltip) return;
+
+        this.FloatTooltip.Hide();
+    }
+
+    this.DestroyFloatTooltip=function()
+    {
+        if (!this.FloatTooltip) return;
+
+        this.FloatTooltip.Destroy();
+        this.FloatTooltip=null;
+    }
+
+    this.InitalFloatTooltip=function(option)
+    {
+        if (this.FloatTooltip) return;
+
+        this.FloatTooltip=new JSFloatTooltip();
+        this.FloatTooltip.Inital(this, option);
+        this.FloatTooltip.Create();
+    }
+
+    this.DrawFloatTooltip=function(point,toolTip)
+    {
+        if (!this.FloatTooltip) return;
+
+        this.UpdateFloatTooltip(point, toolTip)
+    }
+
+    this.UpdateFloatTooltip=function(point, toolTip)
+    {
+        if (!this.FloatTooltip) return;
+
+        var sendData=
+        {
+            Tooltip:toolTip,
+            Point:point,
+            DataType:5,
+        };
+
+        this.FloatTooltip.Update(sendData);
+    }
+
     this.HideAllTooltip=function()
     {
         this.HideMinuteChartTooltip();
+        this.HideFloatTooltip();
     }
 
     //筛选数据
@@ -386,6 +443,8 @@ function JSDealChartContainer(uielement)
         this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
         this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }
         this.UIElement.onmousemove=(e)=>{ this.UIOnMouseMove(e);}
+        this.UIElement.onmouseout=(e)=>{ this.UIOnMounseOut(e); }
+        this.UIElement.onmouseleave=(e)=>{ this.UIOnMouseleave(e); }
     }
 
     this.Draw=function()
@@ -584,12 +643,17 @@ function JSDealChartContainer(uielement)
         }
     }
 
+    this.GetDealChart=function()
+    {
+        return this.ChartPaint[0];
+    }
+
     this.RecvDealUpdateData=function(data)
     {
         var aryDeal=JSDealChartContainer.JsonDataToDealData(data);
         if (!IFrameSplitOperator.IsNonEmptyArray(aryDeal)) return;
 
-        var chart=this.ChartPaint[0];
+        var chart=this.GetDealChart();
         if (!chart) return;
 
         if (data.UpdateType===1)    //全量更新
@@ -660,7 +724,14 @@ function JSDealChartContainer(uielement)
 
         var self = this;
         var marketStatus=MARKET_SUFFIX_NAME.GetMarketStatus(this.Symbol);
-        if (marketStatus==0 || marketStatus==3) return; //闭市,盘后
+        if (marketStatus==0 || marketStatus==3) //闭市,盘后
+        {
+            this.AutoUpdateTimer=setTimeout(function() 
+            { 
+                self.AutoUpdate(); 
+            },20000);
+            return;
+        } 
 
         var frequency=this.AutoUpdateFrequency;
         if (marketStatus==1) //盘前
@@ -862,13 +933,12 @@ function JSDealChartContainer(uielement)
                         chartTooltipData={ Symbol:tooltipData.Stock.OriginalSymbol, Rect:tooltipData.Rect };
                     }
                 }
+                */
                 else
                 {
                     this.LastMouseStatus.TooltipStatus={ X:x, Y:y, Data:tooltipData, ClientX:e.clientX, ClientY:e.clientY };
                     bDrawTooltip=true;
                 }
-                */
-                
             }
         }
 
@@ -876,6 +946,17 @@ function JSDealChartContainer(uielement)
 
         if (bDraw) this.Draw();
 
+        if (this.LastMouseStatus.TooltipStatus) 
+        {
+            var xTooltip = e.clientX-this.UIElement.getBoundingClientRect().left;
+            var yTooltip = e.clientY-this.UIElement.getBoundingClientRect().top;
+            this.DrawFloatTooltip({X:xTooltip, Y:yTooltip, YMove:20/pixelTatio},this.LastMouseStatus.TooltipStatus.Data);
+        }
+        else
+        {
+            this.HideFloatTooltip();
+        }
+
         if (!bShowMinuteTooltip) this.HideMinuteChartTooltip();
         if (bShowMinuteTooltip) this.ShowMinuteChartTooltip(null, null, chartTooltipData);
     }
@@ -895,6 +976,16 @@ function JSDealChartContainer(uielement)
         e.preventDefault();
     }
 
+    this.UIOnMounseOut=function(e)
+    {
+        this.HideAllTooltip();
+    }
+
+    this.UIOnMouseleave=function(e)
+    {
+        this.HideAllTooltip();
+    }
+
     this.GotoNextPage=function()
     {
         if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return false;
@@ -994,8 +1085,9 @@ JSDealChartContainer.JsonDataToDealData=function(data)
         if (item[5]) dealItem.StrTime=item[5];
         if (item[6]) dealItem.ID=item[6];
 
-        if (item[11]) dealItem.Symbol=item[11]; //股票代码
-        if (item[12]) dealItem.Name=item[12];   //股票名称
+        if (item[11]) dealItem.Symbol=item[11];     //股票代码
+        if (item[12]) dealItem.Name=item[12];       //股票名称
+        if (item[13]) dealItem.BGColor=item[13];    //整行颜色
 
         if (item[100]) dealItem.Guid=item[100];
 
@@ -1211,7 +1303,8 @@ function ChartDealList()
 
     this.BorderColor=g_JSChartResource.DealList.BorderColor;    //边框线
 
-    this.SelectedConfig={ BGColor:g_JSChartResource.DealList.Selected.BGColor };
+    this.SelectedConfig={ BGColor:g_JSChartResource.DealList.Selected.BGColor, LineColor:g_JSChartResource.DealList.Selected.LineColor, LineWidth:g_JSChartResource.DealList.Selected.LineWidth };
+    this.SelectedStyle=1;               //选中行样式 1=整行填充 2=底部绘制直线
 
     //表头配置
     this.HeaderFontConfig={ Size:g_JSChartResource.DealList.Header.Font.Size, Name:g_JSChartResource.DealList.Header.Font.Name };
@@ -1533,6 +1626,7 @@ function ChartDealList()
         var left=this.RectClient.Left+this.HeaderMergin.Left;
         var dataCount=this.Data.Data.length;
         var index=this.Data.DataOffset;
+        var selectedRowData=null;
 
         if (this.ShowOrder==1)
         {
@@ -1547,8 +1641,8 @@ function ChartDealList()
                 for(j=0;j<this.RowCount && index>=0;++j, --index)
                 {
                     var dataItem=this.Data.Data[index];
-                    this.DrawSelectedRow(dataItem, index, rtRow);
-    
+                    this.DrawSelectedRow(dataItem, index, rtRow)
+                       
                     this.DrawRow(dataItem, textLeft, textTop, index);
     
                     textTop+=this.RowHeight;
@@ -1569,7 +1663,14 @@ function ChartDealList()
                     rtRow.Right=rtRow.Left+rtRow.Width;
                     rtRow.Bottom=rtRow.Top+rtRow.Height;
 
-                    this.DrawSelectedRow(dataItem, index, rtRow);
+                    if (dataItem.BGColor)
+                    {
+                        this.Canvas.fillStyle=dataItem.BGColor;
+                        this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+                    }
+
+                    if (this.DrawSelectedRow(dataItem, index, rtRow))
+                        selectedRowData={ Rect:rtRow };
     
                     this.DrawRow(dataItem, textLeft, textTop, index);
 
@@ -1578,6 +1679,14 @@ function ChartDealList()
                     textTop+=this.RowHeight;
                 }
             }
+
+            if (selectedRowData && this.SelectedStyle===2)
+            {
+                var rtBG=selectedRowData.Rect;
+                this.Canvas.fillStyle=this.SelectedConfig.LineColor;
+                var lineWidth=this.SelectedConfig.LineWidth;
+                this.Canvas.fillRect(rtBG.Left,rtBG.Bottom-lineWidth,rtBG.Width,lineWidth); 
+            }
         }
     }
 
@@ -1699,14 +1808,22 @@ function ChartDealList()
             
             if (bDrawV2)
             {
-                this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, rtItem.Left, rtItem.Top, rtItem.Width, drawInfo.BGColor);
+                //this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, rtItem.Left, rtItem.Top, rtItem.Width, drawInfo.BGColor);
+                this.DrawItemTextV2(drawInfo, rtItem);
             }
             else
             {
                 this.DrawItemText(text, textColor, textAlign, left, top, itemWidth);
             }
 
-            if (item.ChartTooltip && item.ChartTooltip.Enable && IFrameSplitOperator.IsNumber(item.ChartTooltip.Type))   //Type 20分时图 21K线图
+
+            if (drawInfo.Tooltip)
+            {
+                //Type:2=数据提示信息
+                var tooltipData={ Rect:rtItem, Data:data, Index:dataIndex, Column:item, Type:drawInfo.Tooltip.Type, Data:drawInfo.Tooltip.Data };
+                this.TooltipRect.push(tooltipData);
+            }
+            else if (item.ChartTooltip && item.ChartTooltip.Enable && IFrameSplitOperator.IsNumber(item.ChartTooltip.Type))   //Type 20分时图 21K线图
             {
                 var tooltipData={ Rect:rtItem, Data:data, Index:dataIndex, Column:item, Type:item.ChartTooltip.Type };
                 this.TooltipRect.push(tooltipData);
@@ -1779,6 +1896,15 @@ function ChartDealList()
         {
             drawInfo.Text=item;
         }
+
+        if (item && item.Tooltip && IFrameSplitOperator.IsNonEmptyArray(item.Tooltip.AryText))
+        {
+            drawInfo.Tooltip=
+            { 
+                Type:2, 
+                Data:{ AryText:item.Tooltip.AryText }
+            }
+        }
     }
 
     this.GetUpDownColor=function(price, price2)
@@ -1796,12 +1922,17 @@ function ChartDealList()
 
     this.DrawSelectedRow=function(data, index, rtRow)
     {
-        if (!this.SelectedData) return;
-        if (!this.SelectedData.Enable) return;
-        if (!this.SelectedData.Guid || this.SelectedData.Guid!=data.Guid) return; 
+        if (!this.SelectedData) return false;
+        if (!this.SelectedData.Enable) return false;
+        if (!this.SelectedData.Guid || this.SelectedData.Guid!=data.Guid) return false;
 
-        this.Canvas.fillStyle=this.SelectedConfig.BGColor;
-        this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+        if ( this.SelectedStyle==1)
+        {
+            this.Canvas.fillStyle=this.SelectedConfig.BGColor;
+            this.Canvas.fillRect(rtRow.Left,rtRow.Top, rtRow.Width, rtRow.Height);
+        }
+       
+        return true;
     }
 
     this.DrawItemText=function(text, textColor, textAlign, left, top, width)
@@ -1822,9 +1953,44 @@ function ChartDealList()
             this.Canvas.textAlign="left";
         }
 
-        this.Canvas.textBaseline="middle";
+        this.Canvas.textBaseline="bottom";
         this.Canvas.fillStyle=textColor;
-        if (text) this.Canvas.fillText(text,x,top+this.RowHeight/2);
+        if (text) this.Canvas.fillText(text,x,top+this.RowHeight-2);
+    }
+
+    this.DrawItemTextV2=function(drawInfo, rtItem)
+    {
+        if (drawInfo.BGColor)
+        {
+            this.Canvas.fillStyle=drawInfo.BGColor;
+            this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height); 
+        }
+
+        if (drawInfo.Text)
+        {
+            var text=drawInfo.Text;
+            var x=rtItem.Left;
+            if (drawInfo.TextAlign=='center')
+            {
+                x=rtItem.Left+rtItem.Width/2;
+                this.Canvas.textAlign="center";
+            }
+            else if (drawInfo.TextAlign=='right')
+            {
+                x=rtItem.Left+rtItem.Width-2;
+                this.Canvas.textAlign="right";
+            }
+            else
+            {
+                x+=2;
+                this.Canvas.textAlign="left";
+            }
+
+            var textWidth=this.Canvas.measureText(text).width+1;
+            this.Canvas.textBaseline="bottom";
+            this.Canvas.fillStyle=drawInfo.TextColor;
+            this.Canvas.fillText(text,x,rtItem.Top+this.RowHeight-2);
+        }
     }
 
     this.DrawMultiBar=function(colunmInfo, data, rtItem)

package/src/jscommon/umychart.index.data.js

@@ -581,7 +581,7 @@ JSIndexScript.prototype.MACD=function()
 {
     let data=
     {
-        Name:'MACD', Description:'平滑异同平均', IsMainIndex:false,
+        Name:'MACD', Description:'平滑异同平均', IsMainIndex:false,FloatPrecision:3,
         Args:[ { Name:'SHORT', Value:12}, { Name:'LONG', Value:26}, { Name:'MID', Value:9} ],
         Script: //脚本
 'DIF:EMA(CLOSE,SHORT)-EMA(CLOSE,LONG);\n\

package/src/jscommon/umychart.js

@@ -75617,6 +75617,8 @@ function JSChartResource()
         Selected:
         {
             BGColor:"rgb(180,240,240)",
+            LineColor:"rgb(128,128,128)",
+            LineWidth:2,
         }
     },
 
@@ -76736,6 +76738,8 @@ function JSChartResource()
             {
                 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;
             }
         }
 
@@ -76750,7 +76754,7 @@ function JSChartResource()
             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.LineColor) this.SelectedChart.BGColor=item.BGColor;
+            if (item.BGColor) this.SelectedChart.BGColor=item.BGColor;
         }
 
         if (style.DragMovePaint)

package/src/jscommon/umychart.report.js

@@ -490,6 +490,7 @@ function JSReportChartContainer(uielement)
     //
     this.TooltipMinuteChart;    //分时图
     this.TooltipKLineChart;     //分时图
+    this.FloatTooltip;          //提示浮框
 
     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
     this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };

package/src/jscommon/umychart.style.js

@@ -701,7 +701,8 @@ function GetBlackStyle()
 
             Selected:
             {
-                BGColor:"rgb(49,48,56)",
+                BGColor:"rgba(49,48,56,0.7)",
+                LineColor:"rgb(220,220,220)",
             }
         },