hqchart 1.1.13921 → 1.1.13933

package/src/jscommon/umychart.js

@@ -1721,7 +1721,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (option.EnableModifyDrawDialogV2===true) chart.InitalModifyDrawDialog();
 
         //K线tooltip
-        if (option.EnableTooltipDialog===true) chart.InitalTooltipDialog();
+        if (option.TooltipDialog && option.TooltipDialog.Enable)
+            chart.InitalTooltipDialog(option.TooltipDialog);
 
         //注册事件
         if (option.EventCallback)
@@ -2627,6 +2628,8 @@ var JSCHART_EVENT_ID=
     ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156,   //日盘夜盘的分界线
     ON_CUSTOM_MINUTE_BG:157,                    //自定义分时图背景颜色
     ON_CLICK_HORIZONTAL_LABEL:158,              //点击Y轴刻度标签
+
+    ON_FORMAT_DIALOG_TOOLTIP_TEXT:159,          //格式化Tooltip对话框显示文字
 }
 
 var JSCHART_OPERATOR_ID=
@@ -2801,6 +2804,8 @@ var JSCHART_MENU_ID=
     CMD_REPORT_COLUMN_DEL_ID:62,        //报价列表 删除列
     CMD_REPORT_COLUMN_MOVE_ID:63,       //报价列表 列移动
     CMD_REPORT_COLUMN_FILTER_ID:64,     //报价列表 筛选
+
+    CMD_DIALOG_TOOLTIP_ATTRIBUTE:65,    //修改K线信息框属性 Ary:[{ Enable:, Style:}, ]
 }
 
 
@@ -3049,12 +3054,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogDrawTool.Create();
     }
 
-    this.InitalTooltipDialog=function()
+    this.InitalTooltipDialog=function(option)
     {
         if (this.DialogTooltip) return;
 
         this.DialogTooltip=new JSDialogTooltip();
-        this.DialogTooltip.Inital(this);
+        this.DialogTooltip.Inital(this, option);
         this.DialogTooltip.Create();
     }
 
@@ -3128,6 +3133,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.DialogTooltip.Close();
     }
 
+    this.DestroyTooltipDialog=function()
+    {
+        if (!this.DialogTooltip) return;
+
+        this.DialogTooltip.Destroy();
+        this.DialogTooltip=null;
+    }
+
 
 
     //obj={ Element:, Canvas: }
@@ -3179,6 +3192,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
+        this.DestroyTooltipDialog();
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
@@ -9755,6 +9769,20 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 klineChart.InfoPosition=param;
                 this.Draw();
                 break;
+            case JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE:
+                if (!aryArgs[0]) return false;
+                var option=aryArgs[0];
+                if (!IFrameSplitOperator.IsBool(option.Enable)) return false;
+                if (option.Enable===false)
+                {
+                    this.DestroyTooltipDialog();
+                }
+                else
+                {
+                    this.DestroyTooltipDialog();
+                    this.InitalTooltipDialog(option);
+                }
+                break;
         }
     }
 
@@ -10057,6 +10085,71 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
         }
     }
+
+    this.UpdateWindowIndexV2=function(aryIndex)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryIndex)) return false;
+
+        var aryID=[];
+        for(var i=0;i<this.WindowIndex.length;++i)
+        {
+            var item=this.WindowIndex[i];
+            if (!item) continue;
+            if (!item.ID) continue;
+
+            if (aryIndex.find((element)=>{ return element.ID==item.ID;} ))
+            {
+                aryID.push(i);
+            }
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryID)) return false;
+
+        if (this.IsKLineContainer())    //K线
+        {
+            var bindData=new ChartData();
+            bindData.Data=this.SourceData.Data;
+            bindData.Period=this.Period;
+            bindData.Right=this.Right;
+
+            if (this.IsApiPeriod)
+            {
+    
+            }
+            else
+            {
+                if (bindData.Right>0)    //复权
+                {
+                    var rightData=bindData.GetRightData(bindData.Right, { AlgorithmType: this.RightFormula });
+                    bindData.Data=rightData;
+                }
+    
+                if (ChartData.IsDayPeriod(bindData.Period,false) || ChartData.IsMinutePeriod(bindData.Period,false))   //周期数据
+                {
+                    var periodData=bindData.GetPeriodData(bindData.Period);
+                    bindData.Data=periodData;
+                }
+            }
+        }
+        else if (this.IsMinuteContainer()) //分时图
+        {
+            var bindData=this.SourceData;
+        }
+        else
+        {
+            return;
+        }
+
+       
+        for(var i=0;i<aryID.length;++i)
+        {
+            this.BindIndexData(aryID[i],bindData)
+        }
+
+        this.UpdataDataoffset();           //更新数据偏移
+        this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+        this.Draw();
+    }
 }
 
 function GetDevicePixelRatio()
@@ -69441,7 +69534,8 @@ function JSChartResource()
             Font:{ Size:15, Name:"微软雅黑"},
             BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 },//单元格字体
             NameFont:{ Size:14, Name:"微软雅黑" },
-            SymbolFont:{ Size:12, Name:"微软雅黑" }
+            SymbolFont:{ Size:12, Name:"微软雅黑" },
+
         },
 
         //固定行
@@ -69456,6 +69550,13 @@ function JSChartResource()
             Mergin:{ Top:1, Bottom:1,Left:0, Right:0 },
         },
 
+
+        NameSymbolV2:
+        {
+            Name:{ Size:14, Name:"微软雅黑", Color: "rgb(60,60,60)"},
+            Symbol:{ Size:10, Name:"微软雅黑", Color: "rgb(105 105 105)"},
+        },
+
         //涨停 跌停背景色
         LimitColor:
         {
@@ -70612,6 +70713,26 @@ function JSChartResource()
             }
         }
 
+        if (item.NameSymbolV2)
+        {
+            var nameSymbol=item.NameSymbolV2;
+            if (nameSymbol.Name)
+            {
+                var subItem=nameSymbol.Name;
+                if (IFrameSplitOperator.IsNumber(subItem.Size)) this.Report.NameSymbolV2.Name.Size=subItem.Size;
+                if (subItem.Name) this.Report.NameSymbolV2.Name.Name=subItem.Name;
+                if (subItem.Color) this.Report.NameSymbolV2.Name.Color=subItem.Color;
+            }
+
+            if (nameSymbol.Symbol)
+            {
+                var subItem=nameSymbol.Symbol;
+                if (IFrameSplitOperator.IsNumber(subItem.Size)) this.Report.NameSymbolV2.Symbol.Size=subItem.Size;
+                if (subItem.Name) this.Report.NameSymbolV2.Symbol.Name=subItem.Name;
+                if (subItem.Color) this.Report.NameSymbolV2.Symbol.Color=subItem.Color;
+            }
+        }
+
         if (item.Tab)
         {
             var tab=item.Tab;
@@ -70969,7 +71090,7 @@ function JSChartLocalization()
         ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
         ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
         ['DialogTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
-        ['DialogTooltip-YClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
+        ['DialogTooltip-FClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
         ['DialogTooltip-Amplitude', {CN:'振幅', EN:'amplitude', TC:'價格'}],
         ['DialogTooltip-AC-Price', {CN:'匹配价', EN:'Price', TC:'匹配價'}],
         ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],
@@ -77635,6 +77756,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                             { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID, Args:[1]}, Checked:1==this.ChartDragSelectRect.ShowMode },
                             { Name:"样式3", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID, Args:[2]}, Checked:2==this.ChartDragSelectRect.ShowMode },
                         ]
+                    },
+                    {
+                        Name:"K线浮动框",
+                        SubMenu:
+                        [
+                            { Name:"禁用", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:false}]}, Checked:!this.DialogTooltip },
+                            { Name:"样式1", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:0}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===0) },
+                            { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:1}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===1) },
+                        ]
                     }
                 ]
             }
@@ -81307,6 +81437,15 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                         ]
                     },
 
+                    {
+                        Name:"K线浮动框",
+                        SubMenu:
+                        [
+                            { Name:"禁用", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:false}]}, Checked:!this.DialogTooltip },
+                            { Name:"样式1", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:0}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===0) },
+                            { Name:"样式2", Data:{ ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE, Args:[{Enable:true, Style:1}]}, Checked:(this.DialogTooltip && this.DialogTooltip.Style===1) },
+                        ]
+                    }
                     
                 ]
             }

package/src/jscommon/umychart.report.js

@@ -3968,7 +3968,8 @@ var REPORT_COLUMN_ID=
     RISING_SPEED_10M_ID:63,
     RISING_SPEED_15M_ID:64,
 
-    SYMBOL_NAME_ID:99,
+    SYMBOL_NAME_V2_ID:98,   //单行
+    SYMBOL_NAME_ID:99,      //两行
 
     CUSTOM_STRING_TEXT_ID:100,      //自定义字符串文本
     CUSTOM_NUMBER_TEXT_ID:101,      //自定义数值型
@@ -4169,6 +4170,9 @@ function ChartReport()
     this.ItemSymbolFontConfig={Size:g_JSChartResource.Report.Item.SymbolFont.Size, Name:g_JSChartResource.Report.Item.SymbolFont.Name};
     this.ItemNameFontConfg={Size:g_JSChartResource.Report.Item.NameFont.Size, Name:g_JSChartResource.Report.Item.NameFont.Name};
 
+    //名称+代码
+    this.NameSymbolV2Config=CloneData(g_JSChartResource.Report.NameSymbolV2);
+
     //缓存
     this.HeaderFont=12*GetDevicePixelRatio() +"px 微软雅黑";
     this.SortFont=null,
@@ -4177,6 +4181,7 @@ function ChartReport()
     this.ItemSymbolFont=12*GetDevicePixelRatio() +"px 微软雅黑";
     this.ItemNameFont=15*GetDevicePixelRatio() +"px 微软雅黑";
     this.ItemNameHeight=0;
+    this.NameSymbolFont={ Symbol:null, Name:null };
     this.RowCount=0;            //一屏显示行数
     this.HeaderHeight=0;        //表头高度
     this.FixedRowHeight=0;      //固定行高度
@@ -4321,6 +4326,8 @@ function ChartReport()
             if (item.TextColor) colItem.TextColor=item.TextColor;
             if (item.HeaderColor) colItem.HeaderColor=item.HeaderColor;
             if (item.MaxText) colItem.MaxText=item.MaxText;
+            if (item.MaxText2) colItem.MaxText=item.MaxText2;
+            if (IFrameSplitOperator.IsNumber(item.Space)) colItem.Space=item.Space;
             if (item.ID) colItem.ID=item.ID;
             if (item.FullColBGColor) colItem.FullColBGColor=item.FullColBGColor;    //整列背景色
             if (item.HeaderBGColor) colItem.HeaderBGColor=item.HeaderBGColor;       //表头背景色
@@ -4481,6 +4488,7 @@ function ChartReport()
             { Type:REPORT_COLUMN_ID.NAME_ID, Title:"名称", TextAlign:"left", Width:null, TextColor:g_JSChartResource.Report.FieldColor.Name, MaxText:"擎擎擎擎0" },
             { Type:REPORT_COLUMN_ID.NAME_EX_ID, Title:"名称", TextAlign:"left", Width:null, TextColor:g_JSChartResource.Report.FieldColor.Name, MaxText:"擎擎擎擎擎擎" },
             { Type:REPORT_COLUMN_ID.SYMBOL_NAME_ID, Title:"股票名称", TextAlign:"left", Width:null, TextColor:g_JSChartResource.Report.FieldColor.Name, MaxText:"擎擎擎擎0"},
+            { Type:REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID, Title:"名称/代码", TextAlign:"left", Width:null, TextColor:g_JSChartResource.Report.NameSymbolV2.Name.Color, MaxText:"擎擎擎擎*", MaxText2:"999999", Space:5, TextColor2:g_JSChartResource.Report.NameSymbolV2.Symbol.Color },
 
             { Type:REPORT_COLUMN_ID.INCREASE_ID, Title:"涨幅%", TextAlign:"right", Width:null, MaxText:"-888.88" },
             { Type:REPORT_COLUMN_ID.PRICE_ID, Title:"现价", TextAlign:"right", Width:null, MaxText:"88888.88" },
@@ -4674,6 +4682,9 @@ function ChartReport()
         this.ItemSymbolFont=`${this.ItemSymbolFontConfig.Size*pixelRatio}px ${ this.ItemSymbolFontConfig.Name}`;
         this.ItemNameFont=`${this.ItemNameFontConfg.Size*pixelRatio}px ${ this.ItemNameFontConfg.Name}`;
 
+        this.NameSymbolFont.Symbol=`${this.NameSymbolV2Config.Symbol.Size*pixelRatio}px ${this.NameSymbolV2Config.Symbol.Name}`;
+        this.NameSymbolFont.Name=`${this.ItemSymbolFontConfig.Name.Size*pixelRatio}px ${this.NameSymbolV2Config.Name.Name}`;
+
         this.RowHeight=this.GetFontHeight(this.ItemFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
         this.FixedRowHeight=this.GetFontHeight(this.ItemFixedFont,"擎")+ this.ItemMergin.Top+ this.ItemMergin.Bottom;
         this.SortFont=`${this.SortConfig.Size*pixelRatio}px ${ this.SortConfig.Family}`;
@@ -4703,6 +4714,25 @@ function ChartReport()
                 if (rowHeight>this.RowHeight) this.RowHeight=rowHeight;
                 if (rowHeight>this.FixedRowHeight) this.FixedRowHeight=rowHeight;
             }
+            else if (item.Type==REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID) //单行显示
+            {
+                this.Canvas.font==this.NameSymbolFont.Name;
+                var nameWidth=this.Canvas.measureText(item.MaxText).width;
+                var nameHeight=this.GetFontHeight(this.ItemNameFont,"擎");
+                
+
+                this.Canvas.font==this.NameSymbolFont.Symbol;
+                var symbolWidth=this.Canvas.measureText(item.MaxText2).width;
+                var symboHeight=this.GetFontHeight(this.ItemSymbolFont,"擎");
+
+                this.ItemNameHeight=Math.abs(nameHeight,symboHeight);
+
+                var space=2;
+                if (IFrameSplitOperator.IsNumber(item.Space)) space=item.Space;
+                itemWidth=nameWidth+symbolWidth+space;
+                
+                item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;
+            }
             else
             {
                 if (IFrameSplitOperator.IsNumber(item.FixedWidth)) itemWidth=item.FixedWidth;
@@ -5297,6 +5327,11 @@ function ChartReport()
 
             this.FormatDrawInfo(column, stock, drawInfo, data);
         }
+        else if (column.Type==REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID)
+        {
+            this.DrawSymbolNameV2(data, column, left, top, rowType);
+            this.FormatDrawInfo(column, stock, drawInfo, data);
+        }
         else if (column.Type==REPORT_COLUMN_ID.NAME_ID)
         {
             if (stock && stock.Name) 
@@ -5747,6 +5782,72 @@ function ChartReport()
         this.Canvas.font=this.ItemFont; //还原字体
     }
 
+    this.DrawSymbolNameV2=function(data, column, left, top, rowType)
+    {
+        var stock=data.Stock;
+        var symbol=data.Symbol;
+        var name;
+        if (stock)
+        {
+            symbol=stock.Symbol;
+            name=stock.Name;
+        }
+
+        if (!symbol && !name) return;
+
+        var y=top+this.ItemMergin.Top+this.ItemNameHeight;
+        var textLeft=left+this.ItemMergin.Left;
+        var x=textLeft;
+        var width=column.Width-this.ItemMergin.Left-this.ItemMergin.Right;
+        var textAlign=column.TextAlign;
+        if (textAlign=='center')
+        {
+            x=textLeft+width/2;
+            this.Canvas.textAlign="center";
+        }
+        else if (textAlign=='right')
+        {
+            x=textLeft+width-2;
+            this.Canvas.textAlign="right";
+        }
+        else
+        {
+            x+=2;
+            this.Canvas.textAlign="left";
+        }
+
+        this.Canvas.textBaseline="bottom";
+
+        var textColor=column.TextColor;
+        var text=name;
+        if (text)
+        {
+            this.Canvas.fillStyle=textColor;
+            this.Canvas.font=this.NameSymbolFont.Name;
+            text=this.TextEllipsis(text, width, column.MaxText);
+            if (text) 
+            {
+                this.Canvas.fillText(text,x,y);
+                var textWidth=this.Canvas.measureText(text).width;
+                var space=2;
+                if (IFrameSplitOperator.IsNumber(column.Space)) space=column.Space;
+                x+=(textWidth+space);
+            }
+           
+        }
+       
+        var textColor=column.TextColor2;
+        text=symbol;
+        if (text)
+        {
+            this.Canvas.font=this.NameSymbolFont.Symbol;
+            this.Canvas.fillStyle=textColor;
+            this.Canvas.fillText(text,x,y);
+        }
+        
+        this.Canvas.font=this.ItemFont; //还原字体
+    }
+
     this.DrawLimitPriceBorder=function(value, stock, left, top, itemWidth)
     {
         if (!IFrameSplitOperator.IsNumber(value) || !stock) return;

package/src/jscommon/umychart.resource/css/tools.css

@@ -1685,8 +1685,18 @@ input[type="color"] {
     float: right;
 }
 
+.UMyChart_Tooltip_Text_Sinlge_Td
+{
+    min-width:80px;
+}
+
+.UMyChart_Tooltip_Title_Left_Span
+{
+
+}
+
 .UMyChart_Tooltip_Text_Span
 {
     float: right;
-    margin-right: 5px;
+    margin-right: 1px;
 }

package/src/jscommon/umychart.style.js

@@ -589,6 +589,12 @@ function GetBlackStyle()
                 Text:"rgb(245,245,245)",    //默认文本
             },
 
+            NameSymbolV2:
+            {
+                Name:{ Size:14, Name:"微软雅黑", Color: "rgb(250,250,250)"},
+                Symbol:{ Size:12, Name:"微软雅黑", Color: "rgb(190, 190, 190)"},
+            },
+
             CloseLine:
             {
                 CloseColor:"rgb(30,144,255)",