hqchart 1.1.15816 → 1.1.15821

package/src/jscommon/umychart.js

@@ -31878,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];
@@ -31914,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;
@@ -31982,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()
     {
@@ -90834,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;
@@ -90864,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;

package/src/jscommon/umychart.order.js

@@ -355,6 +355,7 @@ class JSOrderChartContainer
         if (option)
         {
             if (IFrameSplitOperator.IsNumber(option.BorderLine)) this.Frame.BorderLine=option.BorderLine;   //边框
+            if (IFrameSplitOperator.IsBool(option.IsShowHeader)) chart.IsShowHeader=option.IsShowHeader;
         }
 
         var bRegisterKeydown=true;
@@ -1316,7 +1317,8 @@ class ChartOrderList
     Data=null;                          //数据 { Data:[ { Price:, Color:, BGColor:, Data:{ } } ], Offset: }
     Symbol=null;
     Decimal=2; //小数位数
-    IsShowHeader=true;    //是否显示表头
+    IsShowHeader=true;      //是否显示表头
+    IsShowFooter=true;      //是否显示页脚
     SelectedData={ Data:null, Enable:true };         //{ Data:{ ColIndex:null, Price:null, Type:null }, Enable:是否启动 }
     MoveOnData={ Data:null, Enable:true };                         //鼠标在上面
 
@@ -1352,14 +1354,22 @@ class ChartOrderList
         Top:g_JSChartResource.OrderList.Item.Margin.Top, 
         Bottom:g_JSChartResource.OrderList.Item.Margin.Bottom,
     };
+
+    FooterConfig=
+    {
+        Font:{ Size:g_JSChartResource.OrderList.Header.Font.Size, Name:g_JSChartResource.OrderList.Header.Font.Name },
+        Margin:CloneData(g_JSChartResource.OrderList.Header.Margin )
+    }
    
     //缓存
     HeaderFont=12*GetDevicePixelRatio() +"px 微软雅黑";
     ItemFont=15*GetDevicePixelRatio() +"px 微软雅黑";
+    FooterFont=12*GetDevicePixelRatio() +"px 微软雅黑";
 
     RowHeight=20;
     RowCount=0;
     HeaderHeight=0;
+    FooterHeight=0;
 
     //自定义颜色
     AryColor=g_JSChartResource.OrderList.AryColor.slice();
@@ -1389,6 +1399,14 @@ class ChartOrderList
     TooltipRect=[];
     MapDrawPrice=new Map(); //当前绘制的价格列表
 
+
+    SetOption(option)
+    {
+        if (!option) return;
+        if (IFrameSplitOperator.IsBool(option.IsShowHeader)) this.IsShowHeader=option.IsShowHeader;
+        if (IFrameSplitOperator.IsBool(option.IsShowFooter)) this.IsShowFooter=option.IsShowFooter;
+    }
+
     ReloadResource(resource)
     {
         this.UpColor=g_JSChartResource.OrderList.UpTextColor;
@@ -1557,6 +1575,7 @@ class ChartOrderList
         this.DrawBodyBG();
         this.DrawBorder();
         this.DrawBody();
+        this.DrawFooter();
         this.Canvas.restore();
 
         this.SizeChange=false;
@@ -1647,8 +1666,15 @@ class ChartOrderList
         this.HeaderHeight=this.GetFontHeight(this.HeaderFont,"擎")+ this.HeaderMargin.Top+ this.HeaderMargin.Bottom;
         if (!this.IsShowHeader) this.HeaderHeight=0;
 
+        this.FooterHeight=0;
+        if (this.IsShowFooter)
+        {
+            var config=this.FooterConfig;
+            this.FooterHeight=this.GetFontHeight(this.FooterFont,"擎")+config.Margin.Top+config.Margin.Bottom;
+        }
+        
         this.RowHeight=this.GetFontHeight(this.ItemFont,"擎")+ this.ItemMargin.Top+ this.ItemMargin.Bottom;
-        this.RowCount=parseInt((this.RectClient.Bottom-this.RectClient.Top-this.HeaderHeight)/this.RowHeight);
+        this.RowCount=parseInt((this.RectClient.Bottom-this.RectClient.Top-this.HeaderHeight-this.FooterHeight)/this.RowHeight);
     }
 
     DrawHeader()
@@ -1755,6 +1781,11 @@ class ChartOrderList
             yCellTop=top+this.HeaderHeight;
         }
 
+        if (this.IsShowFooter)
+        {
+            bottom-=this.FooterHeight;
+        }
+
         //左右边框
         this.Canvas.moveTo(left, top);
         this.Canvas.lineTo(right, top);
@@ -2118,6 +2149,12 @@ class ChartOrderList
         }
     }
 
+
+    DrawFooter()
+    {
+
+    }
+
  
     GetFontHeight(font,word)
     {

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -35991,7 +35991,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];
@@ -36027,35 +36027,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;
@@ -36095,6 +36101,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()
     {
@@ -94947,25 +94965,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;
@@ -94977,39 +95014,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;
@@ -160855,7 +160881,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15815";
+var HQCHART_VERSION="1.1.15820";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.15815";
+var HQCHART_VERSION="1.1.15820";
 
 function PrintHQChartVersion()
 {

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

@@ -36035,7 +36035,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];
@@ -36071,35 +36071,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;
@@ -36139,6 +36145,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()
     {
@@ -94991,25 +95009,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;
@@ -95021,39 +95058,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;
@@ -177301,7 +177327,7 @@ function ChartScrollText()
 
 
 
-var HQCHART_VERSION="1.1.15815";
+var HQCHART_VERSION="1.1.15820";
 
 function PrintHQChartVersion()
 {