hqchart 1.1.15808 → 1.1.15821

package/src/jscommon/umychart.DialogTooltip.js

@@ -2038,7 +2038,10 @@ function JSFloatTooltip()
                     this.FormatPerformanceForecastText(item,aryText);
                     break;
                 default:
-                    this.FormatDefaultKLineInfoText(item, aryText);
+                    if (infoType>=KLINE_INFO_TYPE.DRAGON_TIGER_EX_START && infoType<=KLINE_INFO_TYPE.DRAGON_TIGER_EX_END)
+                        this.FormatDragonTigerText(item,defaultfloatPrecision,aryText);
+                    else 
+                        this.FormatDefaultKLineInfoText(item, aryText);
                     break;
             }
         }

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -57264,6 +57264,8 @@ HQData.DragonTiger_RequestData=function(data,callback)
             netBuyAmount:kItem.Amount*0.05,     //机构买入净额
             netBuyRatio:4.2,                //净买额占总成交比
             amount:kItem.Amount,            //市场总成交额
+            //color:"rgb(100,100,0)",
+            //infoType:1,
 
             aryText:
             [

package/src/jscommon/umychart.StatusBar.js

@@ -1076,9 +1076,9 @@ function ChartStatusBarStockData()
                         break;
                 }
             }
-        }
 
-        if (column.StringFormat && text) text=column.StringFormat.replace('{Value}',text);
+            if (column.StringFormat && text) text=column.StringFormat.replace('{Value}',text);
+        }
 
         return text;
     }

package/src/jscommon/umychart.js

@@ -2860,6 +2860,12 @@ var JSCHART_EVENT_ID=
 
     ON_CLICK_UP_SCROLL_TEXT_ITEM:383,
     ON_RCLICK_UP_SCROLL_TEXT_ITEM:384,
+
+    //价格列表
+    ON_CLICK_ORDER_CELL:401,
+    ON_RCLICK_ORDER_CELL:402,
+    ON_DBCLICK_ORDER_ROW:403,
+    ON_MOVEON_ORDER_CELL:404,  //鼠标在单元格
 }
 
 var JSCHART_OPERATOR_ID=
@@ -24671,6 +24677,10 @@ var KLINE_INFO_TYPE=
     //扩展信息
     EXTEND_INFO_START:301,
     EXTEND_INFO_END:399,
+
+    //龙虎榜预留类型
+    DRAGON_TIGER_EX_START:401,
+    DRAGON_TIGER_EX_END:499,
 }
 
 function KLineInfoData()
@@ -31868,7 +31878,7 @@ function ChartKLine()
         var iconTop=item.YMax+1*pixelTatio;
         var iconBottom=item.YMin+1*pixelTatio+iconSize;
         var drawTop=true;
-        var yOffset=0;
+        var yOffset=0, yTopOffset=0;
         for(var i in infoData.Data)
         {
             var infoItem=infoData.Data[i];
@@ -31904,35 +31914,41 @@ function ChartKLine()
                     if (infoPosition===1) //底部
                     {
                         var yBottom=bottom+yOffset;
-                        this.Canvas.fillText(icon.Text,item.XCenter,yBottom,iconSize);
                         var iconRect=new Rect(item.XCenter-iconSize/2,yBottom-iconSize,iconSize,iconSize);
+                        this.DrawInfoIcon(item, icon, iconRect);
+                        
                         var infoCache={ Data:new Array(infoItem), Rect:iconRect, Type:infoItem.InfoType, TextRect:{X:item.XCenter, Y:yBottom}, IsShowNumber:bShowNumber };
                         mapImage.set(infoItem.InfoType,infoCache);
                         yOffset-=iconSize;
                     }
                     else if (infoPosition===2)  //顶部
                     {
-                        var yBottom=topTitle+iconSize+1;
-                        this.Canvas.fillText(icon.Text,item.XCenter,yBottom,iconSize);
+                        var yBottom=topTitle+iconSize+1+yTopOffset;
                         var iconRect=new Rect(item.XCenter-iconSize/2,yBottom-iconSize,iconSize,iconSize);
+                        this.DrawInfoIcon(item, icon, iconRect);
+                        
                         var infoCache={ Data:new Array(infoItem), Rect:iconRect, Type:infoItem.InfoType, TextRect:{X:item.XCenter, Y:yBottom}, IsShowNumber:bShowNumber };
                         mapImage.set(infoItem.InfoType,infoCache);
+
+                        yTopOffset+=iconSize;
                     }
                     else
                     {
-                        if (drawTop)
+                        if (drawTop)    //K线上面
                         {
-                            this.Canvas.fillText(icon.Text,item.XCenter,iconTop,iconSize);
                             var iconRect=new Rect(item.XCenter-iconSize/2,iconTop-iconSize,iconSize,iconSize);
+                            this.DrawInfoIcon(item, icon, iconRect);
+                            
                             var infoCache={ Data:new Array(infoItem), Rect:iconRect, Type:infoItem.InfoType, TextRect:{X:item.XCenter, Y:iconTop}, IsShowNumber:bShowNumber };
                             mapImage.set(infoItem.InfoType,infoCache);
                             iconTop-=iconSize;
                             if (iconTop-iconSize<top ) drawTop=false;
                         }
-                        else    //上面显示不下,就显示在下面
+                        else    //上面显示不下,就显示在K线下面
                         {
-                            this.Canvas.fillText(icon.Text,item.XCenter,iconBottom,iconSize);
                             var iconRect=new Rect(item.XCenter-iconSize/2,iconBottom-iconSize,iconSize,iconSize);
+                            this.DrawInfoIcon(item, icon, iconRect);
+                            
                             var infoCache={ Data:new Array(infoItem), Rect:iconRect, Type:infoItem.InfoType, TextRect:{X:item.XCenter, Y:iconBottom} , IsShowNumber:bShowNumber};
                             mapImage.set(infoItem.InfoType,infoCache);
                             iconBottom+=iconSize;
@@ -31972,6 +31988,18 @@ function ChartKLine()
         this.ClipClient(isHScreen);
     }
 
+    this.DrawInfoIcon=function(item, iconItem, rtIcon)
+    {
+        if (iconItem.BGColor)
+        {
+            this.Canvas.fillStyle=iconItem.BGColor;
+            this.Canvas.fillRect(rtIcon.X, rtIcon.Y, rtIcon.Width, rtIcon.Height);
+        }
+
+        this.Canvas.fillStyle=iconItem.Color;
+        this.Canvas.fillText(iconItem.Text,item.XCenter,rtIcon.Y+rtIcon.Height, rtIcon.Width);
+    }
+
     //画交易图标
     this.DrawTradeIcon=function()
     {
@@ -80701,7 +80729,15 @@ function JSChartResource()
             },
             DragonTiger:    //龙虎榜
             {
-                IconFont: { Family:'iconfont', Text:'\ue62f', HScreenText:'\ue68a' ,Color:'#b22626' } //SVG 文本
+                //默认值
+                IconFont: { Family:'iconfont', Text:'\ue62f', HScreenText:'\ue68a' ,Color:'#b22626' }, //SVG 文本
+
+                //自定义值
+                AryIconFont:
+                [
+                    { Family:'iconfont', Text:'\ue6c3', HScreenText:'\ue6c3' ,Color:'rgb(255,165,0)'},
+                    { Family:'iconfont', Text:'\ue6c5', HScreenText:'\ue6c5' ,Color:'rgb(0,191,255)'},
+                ]
             },
             News:   //新闻
             {
@@ -82195,6 +82231,52 @@ function JSChartResource()
         }
     }
 
+    this.OrderList=
+    {
+        BorderColor:'rgba(192,192,192, 0.3)',    //边框线
+
+        Header:
+        {
+            Color:"RGB(60,60,60)",
+            Margin:{ Left:5, Right:5, Top:2, Bottom:4 },
+            Font:{ Size:14, Name:"微软雅黑" }
+        },
+
+        Item:
+        {
+            Margin:{ Top:2, Bottom:4,Left:5, Right:5 }, //单元格四周间距
+            Font:{ Size:15, Name:"微软雅黑"},
+        },
+
+        FieldColor:
+        {
+            Text:"rgb(60,60,60)",   //默认文本
+        },
+
+        UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
+        DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
+        UnchagneTextColor:"rgb(0,0,0)",     //平盘文字颜色
+
+        Selected:
+        {
+            BGColor:"rgb(180,240,240)",
+            LineColor:"rgb(128,128,128)",
+            LineWidth:2,
+        },
+
+        MoveOn:
+        {
+            LineColor:"rgb(55, 131, 250)",
+            LineWidth:2,
+        },
+
+        //自定义颜色
+        AryColor:
+        [
+
+        ]
+    }
+
 
     //自定义风格
     this.SetStyle=function(style)
@@ -83158,7 +83240,68 @@ function JSChartResource()
         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);
+
+    }
+
+    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 (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;
+        }
     }
 
     this.SetMinuteInfo=function(style)
@@ -90709,25 +90852,44 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (bUpdate==true) this.ReqeustKLineInfoData({ FunctionName:"SetKLineInfo" });
     }
 
-    //添加信息地雷
-    this.AddKLineInfo=function(infoName,bUpdate)
+
+    //option={ ClassName:, Name: }
+    this.GetKLineInfo=function(option)
     {
-        var classInfo=JSKLineInfoMap.GetClassInfo(infoName);
-        if (!classInfo)
+        if (!option) return null;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.ChartInfo)) return null;
+
+        var className=null;
+        if (option.Name)
         {
-            console.warn("[KLineChartContainer::AddKLineInfo] can't find infoname=", infoName);
-            return;
+            var classInfo=JSKLineInfoMap.GetClassInfo(option.Name);
+            if (classInfo) className=classInfo.ClassName;
         }
 
-        for(var i in this.ChartInfo)
+        if (!className) return null;
+
+        for(var i=0; i<this.ChartInfo.length; ++i)
         {
             var item=this.ChartInfo[i];
-            if (item.ClassName==classInfo.ClassName)    //已经存在
-                return;
+            if (item.ClassName==className)    //已经存在
+                return item;
         }
 
+        return null;
+    }
+
+    //添加信息地雷
+    this.AddKLineInfo=function(infoName,bUpdate)
+    {
+        var item=this.GetKLineInfo({ Name:infoName });
+        if (item) return;
+
         var infoItem=JSKLineInfoMap.Get(infoName);
-        if (!infoItem) return;
+        if (!infoItem) 
+        {
+            console.warn(`[KLineChartContainer::AddKLineInfo] can't find infoName=${infoName}`);
+            return;
+        }
 
         var item=infoItem.Create();
         item.MaxRequestDataCount=this.MaxRequestDataCount;
@@ -90739,39 +90901,28 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
     }
 
-    //更新信息地雷数据  Option :{ InsertNew:,  如果没有找到对应的地雷，是否插入新的地雷, Update:是否立即请求数据  }
+    //更新信息地雷列表 Option :{ InsertNew:,  如果没有找到对应的地雷，是否插入新的地雷, Update:是否立即请求数据  }
     this.UpdateKLineInfo=function(infoName, option)  
     {
-        var classInfo=JSKLineInfoMap.GetClassInfo(infoName);
-        if (!classInfo)
-        {
-            console.warn("[KLineChartContainer::UpdateKLineInfo] can't find infoname=", infoName);
-            return;
-        }
-
         var bInsertNew=false, bUpdate=false;
         if (option)
         {
             if (IFrameSplitOperator.IsBoolean(option.InsertNew)) bInsertNew=option.InsertNew;
             if (IFrameSplitOperator.IsBoolean(option.Update)) bUpdate=option.Update;    
         }
-        var finder=null;
-        for(var i=0;i<this.ChartInfo.length; ++i)
-        {
-            var item=this.ChartInfo[i];
-            if (item.ClassName==classInfo.ClassName)
-            {
-                finder=item;
-                break;
-            }
-        }
 
+        var finder=this.GetKLineInfo({ Name:infoName });
+       
         if (!finder)
         {
             if (bInsertNew===true)
             {
                 var infoItem=JSKLineInfoMap.Get(infoName);
-                if (!infoItem) return;
+                if (!infoItem) 
+                {
+                    console.warn(`[KLineChartContainer::UpdateKLineInfo] can't find infoname=${infoName}`);
+                    return;
+                }
 
                 var item=infoItem.Create();
                 item.MaxRequestDataCount=this.MaxRequestDataCount;
@@ -101118,7 +101269,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         strDescription+="5. High:这一分钟内最高价\r\n";
         strDescription+="6. Low:这一分钟内最低价\r\n";
         strDescription+="7. Amount:这一分钟内总的成交金额\r\n";
-        strDescription+="8. Vol:这一分钟内总的成交量\r\n";
+        strDescription+="8. Vol:这一分钟内总的成交量(股)\r\n";
         strDescription+="9. AvPrice:均价\r\n";
         strDescription+="10. YClose:昨收价\r\n";
         strDescription+="11. YClearing:昨结算价\r\n";
@@ -104969,7 +105120,7 @@ JSKLineInfoMap.GetClassInfo=function(id)
     return JSKLineInfoMap.Get(id);
 }
 
-JSKLineInfoMap.GetIconUrl=function(type)
+JSKLineInfoMap.GetIconUrl=function(type, item)
 {     
     switch(type)
     {
@@ -105024,6 +105175,16 @@ JSKLineInfoMap.GetIconFont=function(type)
         return value;
     }
 
+    if (type>=KLINE_INFO_TYPE.DRAGON_TIGER_EX_START && type<=KLINE_INFO_TYPE.DRAGON_TIGER_EX_END)
+    {
+        var index=type-KLINE_INFO_TYPE.DRAGON_TIGER_EX_START;
+        var value=g_JSChartResource.KLine.Info.DragonTiger.IconFont;
+        var aryData=g_JSChartResource.KLine.Info.DragonTiger.AryIconFont;
+        if (IFrameSplitOperator.IsNonEmptyArray(aryData) && aryData[index]) value=aryData[index];
+
+        return value;
+    }
+
     switch(type)
     {
         case KLINE_INFO_TYPE.INVESTOR:
@@ -105469,7 +105630,15 @@ function DragonTigerInfo()
             var infoData=new KLineInfoData();
             infoData.Date= item.date;
             infoData.Title=item.title;
-            infoData.InfoType=KLINE_INFO_TYPE.DRAGON_TIGER;
+            var infoType=KLINE_INFO_TYPE.DRAGON_TIGER;
+            if (IFrameSplitOperator.IsNumber(item.infoType))
+            {
+                infoType=KLINE_INFO_TYPE.DRAGON_TIGER_EX_START+item.infoType;
+                if (infoType>KLINE_INFO_TYPE.DRAGON_TIGER_EX_END) infoType=KLINE_INFO_TYPE.DRAGON_TIGER_EX_END;
+            }
+            infoData.InfoType=infoType;
+            if (item.color) infoData.Color=item.color;  //图标颜色
+
             infoData.ExtendData=
             {
                 BuyAmount:item.buyAmount,       //机构买入总额
@@ -110548,6 +110717,8 @@ function JSDivFrameToolbar()
 
     this.Destroy=function()
     {
+        this.HideTooltip();
+
         if (this.DivToolbar) 
         {
             if (this.DivHQChart.removeChild) this.DivHQChart.removeChild(this.DivToolbar);