hqchart 1.1.13928 → 1.1.13933

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13928",
+  "version": "1.1.13933",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.DialogTooltip.js

@@ -16,6 +16,7 @@ function JSDialogTooltip()
     this.DivDialog=null;
     this.DragTitle=null;
     this.TitleBox=null; //{ DivTitle, DivName, DivName }
+    this.Style=0;       //0=一行一个， 1=2行一个
 
     this.HQChart=null;
 
@@ -42,9 +43,13 @@ function JSDialogTooltip()
     this.KItemCache=null;
     this.KItemCacheID=null;
 
-    this.Inital=function(hqchart)
+    this.Inital=function(hqchart, option)
     {
-       this.HQChart=hqchart;
+        this.HQChart=hqchart;
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
+        }
     }
 
     this.Destroy=function()
@@ -107,36 +112,78 @@ function JSDialogTooltip()
         table.appendChild(tbody);
 
         this.AryData=[];
-        for(var i=0;i<this.MaxRowCount;++i)
+        if (this.Style==1)
         {
-            var rowItem={ Tr:null, TitleSpan:null, TextSpan:null };
-
-            var trDom=document.createElement("tr");
-            trDom.className='UMyChart_Tooltip_Group_Tr';
-            tbody.appendChild(trDom);
-            rowItem.Tr=trDom;
-
-            var tdDom=document.createElement("td");
-            tdDom.className="UMyChart_Tooltip_Title_Td";   //标题
-            trDom.appendChild(tdDom);
-
-            var spanDom=document.createElement("span");
-            spanDom.className='UMyChart_Tooltip_Title_Span';
-            spanDom.innerText='标题';
-            tdDom.appendChild(spanDom);
-            rowItem.TitleSpan=spanDom;
-
-            var tdDom=document.createElement("td");
-            tdDom.className="UMyChart_Tooltip_Text_Td";    //数值
-            trDom.appendChild(tdDom);
-
-            var spanDom=document.createElement("span");
-            spanDom.className='UMyChart_Tooltip_Text_Span';
-            spanDom.innerText='数值';
-            tdDom.appendChild(spanDom);
-            rowItem.TextSpan=spanDom;
-
-            this.AryData.push(rowItem);
+            for(var i=0;i<this.MaxRowCount;++i)
+            {
+                var rowItem={ Tr:null, TitleSpan:null, TextSpan:null, Tr2:null };
+
+                var trDom=document.createElement("tr");
+                trDom.className='UMyChart_Tooltip_Group_Tr';
+                tbody.appendChild(trDom);
+                rowItem.Tr=trDom;
+
+                var tdDom=document.createElement("td");
+                tdDom.className="UMyChart_Tooltip_Text_Sinlge_Td";   //标题
+                trDom.appendChild(tdDom);
+
+                var spanDom=document.createElement("span");
+                spanDom.className='UMyChart_Tooltip_Title_Left_Span';
+                spanDom.innerText='标题';
+                tdDom.appendChild(spanDom);
+                rowItem.TitleSpan=spanDom;
+
+                var trDom=document.createElement("tr");
+                trDom.className='UMyChart_Tooltip_Group_Tr';
+                tbody.appendChild(trDom);
+                rowItem.Tr2=trDom;
+
+                var tdDom=document.createElement("td");
+                tdDom.className="UMyChart_Tooltip_Text_Sinlge_Td";    //数值
+                trDom.appendChild(tdDom);
+
+                var spanDom=document.createElement("span");
+                spanDom.className='UMyChart_Tooltip_Text_Span';
+                spanDom.innerText='数值';
+                tdDom.appendChild(spanDom);
+                rowItem.TextSpan=spanDom;
+
+                this.AryData.push(rowItem);
+            }
+        }
+        else
+        {
+            for(var i=0;i<this.MaxRowCount;++i)
+            {
+                var rowItem={ Tr:null, TitleSpan:null, TextSpan:null };
+
+                var trDom=document.createElement("tr");
+                trDom.className='UMyChart_Tooltip_Group_Tr';
+                tbody.appendChild(trDom);
+                rowItem.Tr=trDom;
+
+                var tdDom=document.createElement("td");
+                tdDom.className="UMyChart_Tooltip_Title_Td";   //标题
+                trDom.appendChild(tdDom);
+
+                var spanDom=document.createElement("span");
+                spanDom.className='UMyChart_Tooltip_Title_Span';
+                spanDom.innerText='标题';
+                tdDom.appendChild(spanDom);
+                rowItem.TitleSpan=spanDom;
+
+                var tdDom=document.createElement("td");
+                tdDom.className="UMyChart_Tooltip_Text_Td";    //数值
+                trDom.appendChild(tdDom);
+
+                var spanDom=document.createElement("span");
+                spanDom.className='UMyChart_Tooltip_Text_Span';
+                spanDom.innerText='数值';
+                tdDom.appendChild(spanDom);
+                rowItem.TextSpan=spanDom;
+
+                this.AryData.push(rowItem);
+            }
         }
         
 
@@ -213,12 +260,14 @@ function JSDialogTooltip()
             item.TextSpan.innerText=outItem.Text;
             item.TextSpan.style.color=outItem.Color;
             item.Tr.style.display="";
+            if (item.Tr2) item.Tr2.style.display="";
         }
 
         for( ; index<this.MaxRowCount; ++index)
         {
             var item=this.AryData[index];
             item.Tr.style.display="none";
+            if (item.Tr2) item.Tr2.style.display="none";
         }
     }
 
@@ -300,6 +349,9 @@ function JSDialogTooltip()
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
         var upperSymbol=this.HQChart.Symbol.toUpperCase();
+        var priceFormat=0;
+        if (this.Style==1) priceFormat=1;
+
         //日期
         var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' );
 
@@ -310,18 +362,29 @@ function JSDialogTooltip()
         var yClose=data.YClose; //昨收价|昨结算价
         var aryText=
         [
-            this.ForamtPrice(data.Open,yClose, defaultfloatPrecision,'DialogTooltip-Open'),
-            this.ForamtPrice(data.High,yClose, defaultfloatPrecision,'DialogTooltip-High'),
-            this.ForamtPrice(data.Low,yClose, defaultfloatPrecision,'DialogTooltip-Low'),
-            this.ForamtPrice(data.Close,yClose, defaultfloatPrecision,'DialogTooltip-Close'),
+            this.ForamtPrice(data.Open,yClose, defaultfloatPrecision,'DialogTooltip-Open',priceFormat),
+            this.ForamtPrice(data.High,yClose, defaultfloatPrecision,'DialogTooltip-High',priceFormat),
+            this.ForamtPrice(data.Low,yClose, defaultfloatPrecision,'DialogTooltip-Low',priceFormat),
+            this.ForamtPrice(data.Close,yClose, defaultfloatPrecision,'DialogTooltip-Close',priceFormat),
             this.FormatVol(data.Vol,'DialogTooltip-Vol' ),
             this.FormatAmount(data.Amount,'DialogTooltip-Amount' ),
-            this.FormatIncrease(data.Close,yClose,'DialogTooltip-Increase'),
-            this.FormatAmplitude(data.High,data.Low,yClose,'DialogTooltip-Amplitude'),
+            this.FormatIncrease(data.Close,yClose,defaultfloatPrecision,'DialogTooltip-Increase',priceFormat),
+            this.FormatAmplitude(data.High,data.Low,yClose,defaultfloatPrecision,'DialogTooltip-Amplitude',priceFormat),
         ];
 
-        if (timeItem) aryText.unshift(timeItem);
-        aryText.unshift(dateItem);
+        if (this.Style==1)
+        {
+            if (timeItem) aryText.unshift(timeItem);
+            var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD",'DialogTooltip-Date' );
+            aryText.unshift(dateItem);
+        }
+        else
+        {
+            if (timeItem) aryText.unshift(timeItem);
+            aryText.unshift(dateItem);
+        }
+
+        
 
         //换手率
         if (MARKET_SUFFIX_NAME.IsSHSZStockA(upperSymbol) && data.FlowCapital>0)
@@ -349,7 +412,6 @@ function JSDialogTooltip()
     this.GetFormatMinuteTooltipText=function(data)
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
-
         var aryText=[];
         if (data.Type==0) //连续交易
         {
@@ -358,11 +420,11 @@ function JSDialogTooltip()
 
             aryText=
             [
-                this.ForamtDate(item.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' ),
+                this.ForamtDate(item.Date,this.Style==1?"YYYY/MM/DD":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
                 this.FormatTime(item.Time, null, "HH:MM", 'DialogTooltip-Time'),
-                this.ForamtPrice(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Price'),
+                this.ForamtPrice(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Price', 1),
                 this.FormatRisefall(item.Close,item.YClose, defaultfloatPrecision,'DialogTooltip-Risefall'),
-                this.FormatIncrease(item.Close,item.YClose,'DialogTooltip-Increase'),
+                this.FormatIncrease(item.Close,item.YClose,defaultfloatPrecision,'DialogTooltip-Increase', 1),
                 this.FormatVol(item.Vol,'DialogTooltip-Vol' ),
                 this.FormatAmount(item.Amount,'DialogTooltip-Amount' ),
             ];
@@ -376,10 +438,10 @@ function JSDialogTooltip()
             if (item.Ver===1) timeForamt="HH:MM"
             aryText=
             [
-                this.ForamtDate(item.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' ),
+                this.ForamtDate(item.Date,this.Style==1?"YYYY/MM/DD":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
                 this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
-                this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price'),
-                this.FormatIncrease(item.Price,item.YClose,'DialogTooltip-AC-Increase'),
+                this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
+                this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
                 this.FormatVol(item.Vol[0],'DialogTooltip-AC-Vol' ),
             ];
         }
@@ -449,7 +511,7 @@ function JSDialogTooltip()
 
     /////////////////////////////////////////////////////////////////////////////////////////////
     //数据格式化
-    this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID)
+    this.ForamtPrice=function(price, yClose, defaultfloatPrecision, TitleID, format)
     {
         var item=
         { 
@@ -460,7 +522,17 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(price)) return item;
 
-        item.Text=price.toFixed(defaultfloatPrecision);
+        if (IFrameSplitOperator.IsNumber(yClose) && format!=1)
+        {
+            var value=(price-yClose)/yClose*100;
+            item.Text=`${price.toFixed(defaultfloatPrecision)}(${value.toFixed(2)}%)`;
+        }
+        else
+        {
+            item.Text=price.toFixed(defaultfloatPrecision);
+        }
+
+        
         item.Color=this.GetColor(price, yClose);
 
         return item;
@@ -498,7 +570,7 @@ function JSDialogTooltip()
         return item;
     }
 
-    this.FormatIncrease=function(price, yClose, TitleID)
+    this.FormatIncrease=function(price, yClose, defaultfloatPrecision, TitleID, fromat)
     {
         //涨幅
         var item=
@@ -510,8 +582,19 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
 
+      
+
+        var diffValue=price-yClose;
         var value=(price-yClose)/yClose;
-        item.Text=`${(value*100).toFixed(2)}%`;
+        if (fromat==1)
+        {
+            item.Text=`${(value*100).toFixed(2)}%`;
+        }
+        else
+        {
+            item.Text=`${diffValue.toFixed(defaultfloatPrecision)}(${(value*100).toFixed(2)}%)`;
+        }
+       
         item.Color=this.GetColor(value,0);
 
         return item;
@@ -536,9 +619,9 @@ function JSDialogTooltip()
         return item;
     }
 
-    this.FormatAmplitude=function(high, low, yClose, TitleID)
+    this.FormatAmplitude=function(high, low, yClose, defaultfloatPrecision, TitleID, fromat)
     {
-        //涨幅
+        //振幅
         var item=
         {
             Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
@@ -549,8 +632,10 @@ function JSDialogTooltip()
 
         if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose)) return item;
 
+        var diffValue=high-low;
         var value=(high-low)/yClose;
-        item.Text=`${(value*100).toFixed(2)}%`;
+        if (fromat==1) item.Text=`${(value*100).toFixed(2)}%`;
+        else item.Text=`${diffValue.toFixed(defaultfloatPrecision)}(${(value*100).toFixed(2)}%)`;
         item.Color=this.GetColor(value,0);
         
         return item;

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)
@@ -2803,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:}, ]
 }
 
 
@@ -3051,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();
     }
 
@@ -3130,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: }
@@ -3181,12 +3192,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
-
-        if (this.DialogTooltip)
-        {
-            this.DialogTooltip.Destroy();
-            this.DialogTooltip=null;
-        }
+        this.DestroyTooltipDialog();
     }
 
     this.ChartDestory=this.ChartDestroy;    //老版本写错了,需要兼容下
@@ -9763,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;
         }
     }
 
@@ -69514,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:"微软雅黑" },
+
         },
 
         //固定行
@@ -69529,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:
         {
@@ -70685,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;
@@ -77708,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) },
+                        ]
                     }
                 ]
             }
@@ -81380,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;
 }