hqchart 1.1.14746 → 1.1.14752

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

@@ -133852,6 +133852,8 @@ function JSDealChart(divElement)
             }
         }
 
+        if (option.MinuteChartTooltip && option.MinuteChartTooltip.Enable) chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);
+
         if (!option.Symbol) 
         {
             chart.Draw();
@@ -133992,10 +133994,15 @@ function JSDealChartContainer(uielement)
     this.AutoUpdateFrequency=15000; //更新频率
 
     this.LoadDataSplashTitle="数据加载中";           //下载数据提示信息
+
+    this.TooltipMinuteChart;    //分时图
     
     this.UIElement=uielement;
     this.LastPoint=new Point();     //鼠标位置
 
+     //MouseOnStatus:{ RowIndex:行, ColumnIndex:列} 
+    this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
+
     this.IsDestroy=false;        //是否已经销毁了
 
     this.ChartDestroy=function()    //销毁
@@ -134006,6 +134013,51 @@ function JSDealChartContainer(uielement)
 
     this.EnableFilterData=false;    //是否启动筛选
 
+    this.InitalMinuteChartTooltip=function(option)
+    {
+        if (this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart=new JSTooltipMinuteChart();
+        this.TooltipMinuteChart.Inital(this, option);
+        this.TooltipMinuteChart.Create();
+    }
+
+    this.DestroyMinuteChartTooltip=function()
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart.Destroy();
+        this.TooltipMinuteChart=null;
+    }
+
+    //data={ Symbol }
+    this.ShowMinuteChartTooltip=function(x,y, data)
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+
+        data.Offset={ Left:offsetLeft, Top:offsetTop };
+
+        this.TooltipMinuteChart.Show(data, x,y);
+    }
+
+    this.HideMinuteChartTooltip=function()
+    {
+        if (!this.TooltipMinuteChart) return;
+
+        this.TooltipMinuteChart.Hide();
+    }
+
+    this.HideAllTooltip=function()
+    {
+        this.HideMinuteChartTooltip();
+    }
+
     //筛选数据
     this.FilterData=function(aryDeal)
     {
@@ -134114,6 +134166,7 @@ function JSDealChartContainer(uielement)
         this.UIElement.onmousedown=(e)=> { this.UIOnMouseDown(e); }
         this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
         this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }
+        this.UIElement.onmousemove=(e)=>{ this.UIOnMouseMove(e);}
     }
 
     this.Draw=function()
@@ -134456,10 +134509,12 @@ function JSDealChartContainer(uielement)
 
         if (wheelValue<0)   //下一页
         {
+            this.HideAllTooltip();
             if (this.GotoNextPage()) this.Draw();
         }
         else if (wheelValue>0)  //上一页
         {
+            this.HideAllTooltip();
             if (this.GotoPreviousPage()) this.Draw();
         }
 
@@ -134475,9 +134530,11 @@ function JSDealChartContainer(uielement)
         switch(keyID)
         {
             case 38:    //up
+                this.HideAllTooltip();
                 if (this.GotoPreviousPage()) this.Draw();
                 break;
             case 40:    //down
+                this.HideAllTooltip();
                 if (this.GotoNextPage()) this.Draw();
                 break;
         }
@@ -134487,6 +134544,12 @@ function JSDealChartContainer(uielement)
         else e.returnValue = false;
     }
 
+    this.GetReportChart=function()
+    {
+        var chart=this.ChartPaint[0];
+        return chart;
+    }
+
     this.UIOnMouseDown=function(e)
     {
         var pixelTatio = GetDevicePixelRatio();
@@ -134506,6 +134569,67 @@ function JSDealChartContainer(uielement)
         }
     }
 
+    this.UIOnMouseMove=function(e)
+    {
+        var pixelTatio = GetDevicePixelRatio();
+        var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
+        var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
+        
+        var oldMouseOnStatus=this.LastMouseStatus.MouseOnStatus;
+        this.LastMouseStatus.OnMouseMove=null;
+
+        var bDrawTooltip=false;
+        if (this.LastMouseStatus.TooltipStatus) bDrawTooltip=true;
+        this.LastMouseStatus.TooltipStatus=null;
+
+        var bShowMinuteTooltip=false;
+        var chartTooltipData=null;
+
+        this.LastMouseStatus.OnMouseMove={ X:x, Y:y };
+        var mouseStatus={ Cursor:"default", Name:"Default"};;   //鼠标状态
+        var report=this.GetReportChart();
+        var bDraw=false;
+        
+        if (report)
+        {
+            var tooltipData=report.GetTooltipData(x,y);  //单元格提示信息
+            if (tooltipData)
+            {
+                if (tooltipData.Type==20)
+                {
+                    if (tooltipData.Data && tooltipData.Data.Symbol)
+                    {
+                        bShowMinuteTooltip=true;
+                        chartTooltipData={ Symbol:tooltipData.Data.Symbol, Rect:tooltipData.Rect };
+                    }
+                }
+                /*
+                else if (tooltipData.Type==21)
+                {
+                    if (tooltipData.Stock && tooltipData.Stock.Symbol)
+                    {
+                        bShowKLineTooltip=true;
+                        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;
+                }
+                */
+                
+            }
+        }
+
+        if (mouseStatus) this.UIElement.style.cursor=mouseStatus.Cursor;
+
+        if (bDraw) this.Draw();
+
+        if (!bShowMinuteTooltip) this.HideMinuteChartTooltip();
+        if (bShowMinuteTooltip) this.ShowMinuteChartTooltip(null, null, chartTooltipData);
+    }
+
     this.UIOnDblClick=function(e)
     {
         var pixelTatio = GetDevicePixelRatio();
@@ -134620,6 +134744,33 @@ 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];   //股票名称
+
+         //10个数值型 101-199
+         if (IFrameSplitOperator.IsNumber(item[101])) dealItem.ReserveNumber1=item[101];
+         if (IFrameSplitOperator.IsNumber(item[102])) dealItem.ReserveNumber2=item[102];
+         if (IFrameSplitOperator.IsNumber(item[103])) dealItem.ReserveNumber3=item[103];
+         if (IFrameSplitOperator.IsNumber(item[104])) dealItem.ReserveNumber4=item[104];
+         if (IFrameSplitOperator.IsNumber(item[105])) dealItem.ReserveNumber5=item[105];
+         if (IFrameSplitOperator.IsNumber(item[106])) dealItem.ReserveNumber6=item[106];
+         if (IFrameSplitOperator.IsNumber(item[107])) dealItem.ReserveNumber7=item[107];
+         if (IFrameSplitOperator.IsNumber(item[108])) dealItem.ReserveNumber8=item[108];
+         if (IFrameSplitOperator.IsNumber(item[109])) dealItem.ReserveNumber9=item[109];
+         if (IFrameSplitOperator.IsNumber(item[110])) dealItem.ReserveNumber10=item[110];
+
+        //10个字符型 201-299
+        if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) dealItem.ReserveString1=item[201];
+        if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) dealItem.ReserveString2=item[202];
+        if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) dealItem.ReserveString3=item[203];
+        if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) dealItem.ReserveString4=item[204];
+        if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) dealItem.ReserveString5=item[205];
+        if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) dealItem.ReserveString6=item[206];
+        if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) dealItem.ReserveString7=item[207];
+        if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) dealItem.ReserveString8=item[208];
+        if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) dealItem.ReserveString9=item[209];
+        if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) dealItem.ReserveString10=item[210];
+
         result.push(dealItem);
     }
 
@@ -134719,9 +134870,66 @@ var DEAL_COLUMN_ID=
     INDEX_ID:7,         //序号 从1开始
     MULTI_BAR_ID:8,     //多颜色柱子 
     CENTER_BAR_ID:9,    //中心柱子
-    CUSTOM_TEXT_ID:10   //自定义文本
+    CUSTOM_TEXT_ID:10,   //自定义文本
+
+    SYMBOL_ID:11,       //股票代码
+    NAME_ID:12,         //股票名称
+
+
+    //预留数值类型 10个
+    RESERVE_NUMBER1_ID:201,         //ReserveNumber1:
+    RESERVE_NUMBER2_ID:202,
+    RESERVE_NUMBER3_ID:203,
+    RESERVE_NUMBER4_ID:204,
+    RESERVE_NUMBER5_ID:205,
+    RESERVE_NUMBER6_ID:206,
+    RESERVE_NUMBER7_ID:207,
+    RESERVE_NUMBER8_ID:208,
+    RESERVE_NUMBER9_ID:209,
+    RESERVE_NUMBER10_ID:210,
+
+    //预留字符串类型 10个  301-399
+    RESERVE_STRING1_ID:301,         //ReserveString1:
+    RESERVE_STRING2_ID:302,
+    RESERVE_STRING3_ID:303,
+    RESERVE_STRING4_ID:304,
+    RESERVE_STRING5_ID:305,
+    RESERVE_STRING6_ID:306,
+    RESERVE_STRING7_ID:307,
+    RESERVE_STRING8_ID:308,
+    RESERVE_STRING9_ID:309,
+    RESERVE_STRING10_ID:310,
 }
 
+var MAP_DEAL_COLUMN_FIELD=new Map(
+[
+    [DEAL_COLUMN_ID.SYMBOL_ID, "Symbol"],
+    [DEAL_COLUMN_ID.NAME_ID, "Name"],
+    [DEAL_COLUMN_ID.PRICE_ID, "Price"],
+
+    [DEAL_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],
+    [DEAL_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],
+
+    [DEAL_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],
+    [DEAL_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],
+    [DEAL_COLUMN_ID.RESERVE_STRING3_ID,"ReserveString3"],
+    [DEAL_COLUMN_ID.RESERVE_STRING4_ID,"ReserveString4"],
+    [DEAL_COLUMN_ID.RESERVE_STRING5_ID,"ReserveString5"],
+    [DEAL_COLUMN_ID.RESERVE_STRING6_ID,"ReserveString6"],
+    [DEAL_COLUMN_ID.RESERVE_STRING7_ID,"ReserveString7"],
+    [DEAL_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],
+    [DEAL_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],
+    [DEAL_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],
+]);
+
 function ChartDealList()
 {
     this.Canvas;                        //画布
@@ -134747,7 +134955,7 @@ function ChartDealList()
     //涨跌颜色
     this.UpColor=g_JSChartResource.DealList.UpTextColor;
     this.DownColor=g_JSChartResource.DealList.DownTextColor;
-    this.UnchagneColor=g_JSChartResource.DealList.UnchagneTextColor; 
+    this.UnchangeColor=g_JSChartResource.DealList.UnchagneTextColor; 
 
     this.BorderColor=g_JSChartResource.DealList.BorderColor;    //边框线
 
@@ -134794,11 +135002,15 @@ function ChartDealList()
     this.RectClient={};
     this.AryCellRect=[];    //{ Rect:, Type: 1=单行 }
 
+    //Type:20=分时图
+    //{ Rect, Data, Index, Column, Type }}
+    this.TooltipRect=[];
+
     this.ReloadResource=function(resource)
     {
         this.UpColor=g_JSChartResource.DealList.UpTextColor;
         this.DownColor=g_JSChartResource.DealList.DownTextColor;
-        this.UnchagneColor=g_JSChartResource.DealList.UnchagneTextColor; 
+        this.UnchangeColor=g_JSChartResource.DealList.UnchagneTextColor; 
     
         this.BorderColor=g_JSChartResource.DealList.BorderColor;    //边框线
 
@@ -134848,6 +135060,8 @@ function ChartDealList()
             if (item.TextColor) colItem.TextColor=item.TextColor;
             if (item.MaxText) colItem.MaxText=item.MaxText;
 
+            if (item.ChartTooltip) colItem.ChartTooltip={ Enable:item.ChartTooltip.Enable, Type:item.ChartTooltip.Type };   //图形提示信息
+
             if (item.Type==DEAL_COLUMN_ID.MULTI_BAR_ID || item.Type==DEAL_COLUMN_ID.CENTER_BAR_ID)
             {
                 if (!IFrameSplitOperator.IsNumber(item.DataIndex)) continue;
@@ -134857,6 +135071,11 @@ function ChartDealList()
             {
                 if (IFrameSplitOperator.IsString(item.Foramt)) colItem.Foramt=item.Foramt;  //设置时间格式
             }
+            else if (this.IsReserveNumber(item.Type))
+            {
+                if (item.Format) colItem.Format=item.Format;        //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
+                if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
+            }
 
             this.Column.push(colItem);
         }
@@ -134878,6 +135097,31 @@ function ChartDealList()
             { Type:DEAL_COLUMN_ID.MULTI_BAR_ID, Title:"柱子", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
             { Type:DEAL_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
             { Type:DEAL_COLUMN_ID.CUSTOM_TEXT_ID, Title:"自定义", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎擎" },
+
+            { Type:DEAL_COLUMN_ID.NAME_ID, Title:"股票名称", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎*" },
+
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER1_ID, Title:"数值1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER2_ID, Title:"数值2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER3_ID, Title:"数值3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER4_ID, Title:"数值4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER5_ID, Title:"数值5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER6_ID, Title:"数值6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER7_ID, Title:"数值7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER8_ID, Title:"数值8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER9_ID, Title:"数值9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+            { Type:DEAL_COLUMN_ID.RESERVE_NUMBER10_ID, Title:"数值10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
+
+
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING1_ID, Title:"文字1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING2_ID, Title:"文字2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING3_ID, Title:"文字3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING4_ID, Title:"文字4", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING5_ID, Title:"文字5", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING6_ID, Title:"文字6", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING7_ID, Title:"文字7", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING8_ID, Title:"文字8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING9_ID, Title:"文字9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+            { Type:DEAL_COLUMN_ID.RESERVE_STRING10_ID, Title:"文字10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
             
         ];
 
@@ -134894,6 +135138,7 @@ function ChartDealList()
     this.Draw=function()
     {
         this.AryCellRect=[];
+        this.TooltipRect=[];
         if (this.SizeChange) this.CalculateSize();
         else this.UpdateCacheData();
 
@@ -135099,6 +135344,19 @@ function ChartDealList()
 
             if (i==this.Column.length-1) itemWidth=this.TableWidth-(left-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;
 
+            var drawInfo=
+            { 
+                Text:null, TextColor:item.TextColor , TextAlign:item.TextAlign, Tooltip:null, 
+                Index:dataIndex, ColumnIndex:i
+            };
+
+            var rtItem={ Left:left, Top:top,  Width:itemWidth, Height:this.RowHeight };
+            rtItem.Right=rtItem.Left+rtItem.Width;
+            rtItem.Bottom=rtItem.Top+rtItem.Height;
+            drawInfo.Rect=rtItem;
+
+            var bDrawV2=false;
+
             if (item.Type==DEAL_COLUMN_ID.TIME_ID)
             {
                 text=IFrameSplitOperator.FormatTimeString(data.Time,item.Foramt);
@@ -135111,7 +135369,7 @@ function ChartDealList()
             {
                 if (data.Price>this.YClose) textColor=this.UpColor;
                 else if (data.Price<this.YClose) textColor=this.DownColor;
-                else textColor=this.UnchagneColor;
+                else textColor=this.UnchangeColor;
 
                 text=data.Price.toFixed(this.Decimal);
             }
@@ -135146,7 +135404,7 @@ function ChartDealList()
 
                     if (value>0) textColor=this.UpColor;
                     else if (value<0) textColor=this.DownColor;
-                    else textColor=this.UnchagneColor;
+                    else textColor=this.UnchangeColor;
                 }
             }
             else if (item.Type==DEAL_COLUMN_ID.INDEX_ID)
@@ -135174,13 +135432,115 @@ function ChartDealList()
                     if (out.TextAlign) textAlign=out.TextAlign;
                 }
             }
- 
-            this.DrawItemText(text, textColor, textAlign, left, top, itemWidth);
+            else if (this.IsReserveString(item.Type))
+            {
+                this.FormatReserveString(item, data, drawInfo);
+                bDrawV2=true;
+            }
+            else if (this.IsReserveNumber(item.Type))
+            {
+                this.FormatReserveNumber(item, data, drawInfo);
+                bDrawV2=true;
+            }
+
+            
+            if (bDrawV2)
+            {
+                this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, rtItem.Left, rtItem.Top, rtItem.Width, drawInfo.BGColor);
+            }
+            else
+            {
+                this.DrawItemText(text, textColor, textAlign, left, top, itemWidth);
+            }
+
+            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);
+            }
 
             left+=item.Width;
         }
     }
 
+    this.FormatReserveNumber=function(column, data, drawInfo)
+    {
+        if (column.DefaultText) drawInfo.Text=column.DefaultText;
+
+        var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);
+        if (!data || !fieldName) return;
+
+        var value=data[fieldName];
+        if (!IFrameSplitOperator.IsNumber(value)) return;
+
+        if (IFrameSplitOperator.IsNumber(column.ColorType))
+        {
+            if (column.ColorType==1)
+            {
+               drawInfo.TextColor=this.GetUpDownColor(value,0);
+            }
+            else if (column.ColorType==2)
+            {
+                drawInfo.TextColor=this.GetUpDownColorV2(value,0);
+            }
+        }
+
+        var text=value.toFixed(column.FloatPrecision);
+        if (column.Format && IFrameSplitOperator.IsNumber(column.Format.Type))
+        {
+            var format=column.Format;
+            switch(format.Type)
+            {
+                case 1: //原始数据
+                    text=value.toFixed(column.FloatPrecision);
+                    break;
+                case 2: //千分位分割
+                    text=IFrameSplitOperator.FormatValueThousandsString(value, column.FloatPrecision);
+                    break;
+                case 3:
+                    var exfloatPrecision=1;
+                    if (IFrameSplitOperator.IsNumber(format.ExFloatPrecision)) exfloatPrecision=format.ExFloatPrecision;
+                    text=IFrameSplitOperator.FormatValueStringV2(value, column.FloatPrecision,exfloatPrecision);
+                    break;
+            }
+        }
+        
+        drawInfo.Text=text;
+    }
+
+    this.FormatReserveString=function(column, data, drawInfo)
+    {
+        if (column.DefaultText) drawInfo.Text=column.DefaultText;
+
+        var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);
+        if (!data || !fieldName) return;
+
+        var item=data[fieldName];
+        if (IFrameSplitOperator.IsObject(item))
+        {
+            if (item.Text) drawInfo.Text=item.Text;
+            if (item.TextColor) drawInfo.TextColor=item.TextColor;
+            if (item.BGColor) drawInfo.BGColor=item.BGColor;
+        }
+        else if (IFrameSplitOperator.IsString(item))
+        {
+            drawInfo.Text=item;
+        }
+    }
+
+    this.GetUpDownColor=function(price, price2)
+    {
+        if (price>price2) return this.UpColor;
+        else if (price<price2) return this.DownColor;
+        else return this.UnchangeColor;
+    }
+
+    this.GetUpDownColorV2=function(price, price2)
+    {
+        if (price>=price2) return this.UpColor;
+        else return this.DownColor;
+    }
+
     this.DrawSelectedRow=function(data, index, rtRow)
     {
         if (!this.SelectedData) return;
@@ -135392,6 +135752,49 @@ function ChartDealList()
             event.Callback(event,data,this);
         }
     }
+
+    this.IsReserveString=function(value)
+    {
+        var ARARY_TYPE=
+        [
+            DEAL_COLUMN_ID.RESERVE_STRING1_ID,DEAL_COLUMN_ID.RESERVE_STRING2_ID,DEAL_COLUMN_ID.RESERVE_STRING3_ID,DEAL_COLUMN_ID.RESERVE_STRING4_ID,
+            DEAL_COLUMN_ID.RESERVE_STRING5_ID,DEAL_COLUMN_ID.RESERVE_STRING6_ID,DEAL_COLUMN_ID.RESERVE_STRING7_ID,DEAL_COLUMN_ID.RESERVE_STRING8_ID,
+            DEAL_COLUMN_ID.RESERVE_STRING9_ID,DEAL_COLUMN_ID.RESERVE_STRING10_ID
+        ];
+
+        return ARARY_TYPE.includes(value);
+    }
+
+    this.IsReserveNumber=function(value)
+    {
+        var ARARY_TYPE=
+        [
+            DEAL_COLUMN_ID.RESERVE_NUMBER1_ID,DEAL_COLUMN_ID.RESERVE_NUMBER2_ID,DEAL_COLUMN_ID.RESERVE_NUMBER3_ID,
+            DEAL_COLUMN_ID.RESERVE_NUMBER4_ID,DEAL_COLUMN_ID.RESERVE_NUMBER5_ID,DEAL_COLUMN_ID.RESERVE_NUMBER6_ID,DEAL_COLUMN_ID.RESERVE_NUMBER7_ID,
+            DEAL_COLUMN_ID.RESERVE_NUMBER8_ID,DEAL_COLUMN_ID.RESERVE_NUMBER9_ID,DEAL_COLUMN_ID.RESERVE_NUMBER10_ID
+        ];
+
+        return ARARY_TYPE.includes(value);
+    }
+
+    this.GetTooltipData=function(x,y)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.TooltipRect)) return null;
+
+        for(var i=0;i<this.TooltipRect.length;++i)
+        {
+            var item=this.TooltipRect[i];
+            var rt=item.Rect;
+            if (!rt) continue;
+
+            if (x>=rt.Left && x<=rt.Right && y>=rt.Top && y<=rt.Bottom)
+            {
+                return { Rect:item.Rect, Data:item.Data, Column:item.Column, Index:item.Index, Type:item.Type, Data:item.Data };
+            }
+        }
+
+        return null;
+    }
 }
 /*
    Copyright (c) 2018 jones
@@ -159214,7 +159617,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14745";
+var HQCHART_VERSION="1.1.14751";
 
 function PrintHQChartVersion()
 {