hqchart 1.1.14276 → 1.1.14283

package/src/jscommon/umychart.testdata.js

@@ -1854,6 +1854,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_MULTI_LINE(data, callback);
     else if (request.Data.indexname=="API-MULTI_SVGICON")
         HQData.APIIndex_MULTI_SVGICON(data, callback);
+    else if (request.Data.indexname=="API-DRAWTEXT_LINE")
+        HQData.APIIndex_DRAWTEXT_LINE(data, callback);
 }
 
 
@@ -2240,3 +2242,40 @@ HQData.APIIndex_MULTI_SVGICON=function(data, callback)
 }
 
 
+HQData.APIIndex_DRAWTEXT_LINE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var lastItem=kData.Data[kData.Data.length-1];
+    var price=(lastItem.High+lastItem.Low)/2;
+
+    var lineData= 
+    { 
+        name:'DRAWTEXT_LINE', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAWTEXT_LINE', 
+            DrawData: 
+            {
+                Price:price,
+                Text:{ Title:`价格:${price.toFixed(2)}`, Color:"rgb(255, 165, 0)" }, 
+                Line:{ Type:1, Color:"rgb(200,200,0)" },    //Type 0=不画 1=直线 2=虚线
+            }
+        } 
+    };
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate() , outvar:[lineData] } 
+    };
+
+    
+    console.log('[HQData.APIIndex_DRAWTEXT_LINE] apiData ', apiData);
+    callback(apiData);
+}
+
+

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

@@ -35426,6 +35426,225 @@ function ChartKLineTable()
     }
 }
 
+//表格
+function ChartSimpleTable()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartSimpleTable';    //类名
+    //this.Data;
+
+    this.TextFontConfig=CloneData(g_JSChartResource.ChartSimpleTable.TextFont);
+    this.ItemMargin=CloneData(g_JSChartResource.ChartSimpleTable.ItemMargin);
+    this.TextColor=g_JSChartResource.ChartSimpleTable.TextColor;        //默认颜色
+    this.BGColor=g_JSChartResource.ChartSimpleTable.BGColor;            //背景色
+    this.BorderColor=g_JSChartResource.ChartSimpleTable.BorderColor;   //边框颜色
+    this.Offset={ X:-3, Y:0 },   //位置偏移
+
+    
+    this.DefaultCellWidth=30;
+
+    this.RectClient={ };
+    this.AryColumnCache=[]; //列缓存
+    this.TextFontHeight;
+    this.TextFont;
+    this.RowHeight;         //行高
+
+    this.ReloadResource=function(resource)
+    {
+        this.TextFontConfig=CloneData(g_JSChartResource.ChartSimpleTable.TextFont);
+        this.ItemMargin=CloneData(g_JSChartResource.ChartSimpleTable.ItemMargin);
+        this.TextColor=g_JSChartResource.ChartSimpleTable.TextColor;        //默认颜色
+        this.BGColor=g_JSChartResource.ChartSimpleTable.BGColor;            //背景色
+        this.BorderColor=g_JSChartResource.ChartSimpleTable.BorderColor;   //边框颜色
+    }
+
+    this.CalculateSize=function()
+    {
+        this.AryColumnCache=[];
+
+        var pixelRatio=GetDevicePixelRatio();
+        this.TextFont=`${this.TextFontConfig.Size*pixelRatio}px ${ this.TextFontConfig.Name}`;
+        this.TextFontHeight=this.GetFontHeight(this.TextFont,"擎");
+        this.RowHeight=this.TextFontHeight+this.ItemMargin.Top+this.ItemMargin.Bottom;
+
+        var rowCount=this.Data.Data.length;
+        for(var i=0, j=0;i<rowCount;++i)
+        {
+            var rowItem=this.Data.Data[i];
+            for(j=0;j<rowItem.AryCell.length;++j)
+            {
+                if (!this.AryColumnCache[j]) this.AryColumnCache[j]={ Width:this.DefaultCellWidth };
+                var colItem=this.AryColumnCache[j];
+
+                var cellItem=rowItem.AryCell[j];
+                var textWidth=this.Canvas.measureText(cellItem.Text).width;
+                if (colItem.Width<textWidth) colItem.Width=textWidth;
+            }
+        }
+
+        var tableWidth=0;
+        for(var i=0;i<this.AryColumnCache.length;++i)
+        {
+            var item=this.AryColumnCache[i];
+            item.Width+=(this.ItemMargin.Left+this.ItemMargin.Right);   //增加左右间距
+
+            tableWidth+=item.Width;
+        }
+
+        this.RectClient={ Width:tableWidth, Height:this.RowHeight*rowCount };
+
+        var border=this.ChartFrame.GetBorder();
+        this.RectClient.Right=border.Right+this.Offset.X;
+        this.RectClient.Top=border.TopEx+this.Offset.Y;
+        this.RectClient.Left=this.RectClient.Right-this.RectClient.Width;
+        this.RectClient.Bottom=this.RectClient.Top+this.RectClient.Height;
+    }
+
+    this.Draw=function()
+    {
+        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+
+        var isHScreen=(this.ChartFrame.IsHScreen===true);
+        if (isHScreen) return;
+        
+        this.CalculateSize();
+
+        if (this.BGColor)
+        {
+            this.Canvas.fillStyle=this.BGColor;
+            this.Canvas.fillRect(this.RectClient.Left, this.RectClient.Top, this.RectClient.Width, this.RectClient.Height);
+        }
+
+        var itemHeight=this.RowHeight;
+        this.Canvas.font=this.TextFont;
+        this.Canvas.textBaseline='bottom';
+        this.Canvas.textAlign='left';
+        var rtRow={ Left:this.RectClient.Left, Top:this.RectClient.Top, Width:this.RectClient.Width, Height:itemHeight };
+        rtRow.Right=rtRow.Left+rtRow.Width;
+        rtRow.Bottom=rtRow.Top+rtRow.Height;
+        var rowCount=this.Data.Data.length;
+        for(var i=0;i<rowCount;++i)
+        {
+            var rowItem=this.Data.Data[i];
+            this.DrawRow(rowItem, rtRow);
+
+            rtRow.Top+=itemHeight;
+            rtRow.Bottom+=itemHeight;
+        }
+
+        this.DrawBorder();
+    }
+
+    this.DrawBorder=function()
+    {
+        if (!this.BorderColor) return;
+
+        var rowCount=this.Data.Data.length;
+        var colCount=this.AryColumnCache.length;
+        this.Canvas.strokeStyle=this.BorderColor;
+        this.Canvas.beginPath();
+       
+        //横线
+        var rowTop=this.RectClient.Top;
+        var left=this.RectClient.Left, right=this.RectClient.Right;
+        var bottom=this.RectClient.Bottom, top=this.RectClient.Top;
+        for(var i=0;i<rowCount;++i)
+        {
+            if (i==0)
+            {
+                var drawTop=ToFixedPoint(rowTop);
+                this.Canvas.moveTo(left,drawTop);
+                this.Canvas.lineTo(right,drawTop);
+            }
+
+            var drawTop=ToFixedPoint(rowTop+this.RowHeight);
+            this.Canvas.moveTo(left,drawTop);
+            this.Canvas.lineTo(right,drawTop);
+
+            rowTop+=this.RowHeight;
+        }
+
+        //竖线
+        var columnLeft=this.RectClient.Left;
+        for(var i=0;i<colCount; ++i)
+        {
+            var item=this.AryColumnCache[i];
+
+            if (i==0)
+            {
+                var drawLeft=ToFixedPoint(columnLeft);
+                this.Canvas.moveTo(drawLeft,top);
+                this.Canvas.lineTo(drawLeft,bottom);
+            }   
+
+            var drawLeft=ToFixedPoint(columnLeft+item.Width);
+            this.Canvas.moveTo(drawLeft,top);
+            this.Canvas.lineTo(drawLeft,bottom);
+
+            columnLeft+=item.Width;
+        }
+
+        this.Canvas.stroke();
+    }
+
+    this.DrawRow=function(data, rtRow)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.AryCell)) return;
+
+        var x=rtRow.Left,y=rtRow.Top, width=rtRow.Width;
+        for(var i=0;i<data.AryCell.length;++i)
+        {
+            var item=data.AryCell[i];
+            var colItem=this.AryColumnCache[i];
+
+            var rtBG={Left:x, Top:rtRow.Top, Bottom:rtRow.Bottom, Height:this.RowHeight, Width:colItem.Width };
+            rtBG.Right=rtBG.Top+rtBG.Height;
+
+            if (item)
+            {
+                if (item.BGColor)
+                {
+                    this.Canvas.fillStyle=item.BGColor;
+                    this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+                }
+
+                if (item.Text && rtBG.Width>10)
+                {
+                    if (item.Color) this.Canvas.fillStyle=item.Color;
+                    else this.Canvas.fillStyle=this.TextColor
+    
+                    var xText=x+this.ItemMargin.Left;
+                    var yText=rtBG.Bottom-this.ItemMargin.Bottom;
+    
+                    if (item.TextAlign=='right')
+                    {
+                        var textWidth=this.Canvas.measureText(item.Text).width;
+                        xText=rtBG.Right-this.ItemMargin.Right-textWidth;
+                    }
+                    else if (item.TextAlign=='center')
+                    {
+                        var textWidth=this.Canvas.measureText(item.Text).width;
+                        xText=rtBG.Left+rtBG.Width/2-textWidth/2;
+                    }
+    
+                    this.Canvas.fillText(item.Text,xText,yText);
+                }
+            }
+
+            x+=rtBG.Width;
+        }
+    }
+
+    this.GetMaxMin=function()
+    {
+        return { Min:null, Max:null };
+    }
+}
+
 //分钟成交量 支持横屏
 function ChartMinuteVolumBar()
 {
@@ -74022,6 +74241,15 @@ function JSChartResource()
         ItemMergin:{ Left:5, Right:5, Top:4, Bottom:2 },
     };
 
+    this.ChartSimpleTable=
+    {
+        TextFont:{ Family:'微软雅黑' , Size:14 },
+        ItemMargin:{ Left:5, Right:5, Top:4, Bottom:2 },
+        TextColor:"rgb(0,0,0)",
+        BGColor:"rgba(255,255,255,0.95)",
+        BorderColor:"rgb(217,217,217)",
+    }
+
     //手机端tooltip
     this.TooltipPaint = {
         BGColor:'rgba(250,250,250,0.8)',    //背景色
@@ -75250,6 +75478,8 @@ function JSChartResource()
             if (style.Title.PositionColor) this.Title.PositionColor=style.Title.PositionColor;
         }
 
+        if (style.ChartSimpleTable) this.SetChartSimpleTable(style.ChartSimpleTable);
+        
         if (style.DRAWICON) 
         {
             if (style.DRAWICON.Icon)
@@ -75509,7 +75739,7 @@ function JSChartResource()
                 {
                     var mergin=header.Mergin;
                     if (IFrameSplitOperator.IsNumber(mergin.Left)) this.DealList.Header.Mergin.Left=mergin.Left;
-                    if (IFrameSplitOperator.IsNumber(mergin.Right)) this.DealList.Header.Mergin.Left=mergin.Right;
+                    if (IFrameSplitOperator.IsNumber(mergin.Right)) this.DealList.Header.Mergin.Right=mergin.Right;
                     if (IFrameSplitOperator.IsNumber(mergin.Top)) this.DealList.Header.Mergin.Top=mergin.Top;
                     if (IFrameSplitOperator.IsNumber(mergin.Bottom)) this.DealList.Header.Mergin.Bottom=mergin.Bottom;
                 }
@@ -76295,6 +76525,32 @@ function JSChartResource()
         if (IFrameSplitOperator.IsBool(style.AddIndexWindow)) dest.AddIndexWindow=style.AddIndexWindow;
     }
 
+
+    this.SetChartSimpleTable=function(style)
+    {
+        var dest=this.ChartSimpleTable;
+
+        if (style.TextColor) dest.TextColor=style.TextColor;
+        if (style.BGColor) dest.BGColor=style.BGColor;
+        if (style.BorderColor) dest.BorderColor=style.BorderColor;
+
+        if (style.TextFont)
+        {
+            var item=style.TextFont;
+            if (item.Name) dest.TextFont.Name=item.Name;
+            if (IFrameSplitOperator.IsNumber(item.Size)) dest.TextFont.Size=item.Size;
+        }
+
+        if (style.ItemMargin)
+        {
+            var margin=style.ItemMargin;
+            if (IFrameSplitOperator.IsNumber(margin.Left)) dest.ItemMargin.Left=margin.Left;
+            if (IFrameSplitOperator.IsNumber(margin.Right))  dest.ItemMargin.Right=margin.Right;
+            if (IFrameSplitOperator.IsNumber(margin.Top))  dest.ItemMargin.Top=margin.Top;
+            if (IFrameSplitOperator.IsNumber(margin.Bottom))  dest.ItemMargin.Bottom=margin.Bottom;
+        }
+    }
+
 }
 
 var g_JSChartResource=new JSChartResource();
@@ -121169,6 +121425,29 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateSimpleTable=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=new ChartSimpleTable();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+
+        if (varItem.Draw && varItem.Draw.DrawData)
+        {
+            var drawData=varItem.Draw.DrawData;
+            if (drawData.TableData) chart.Data.Data=drawData.TableData;
+            if (drawData.BGColor) chart.BGColor=drawData.BGColor;
+            if (drawData.BorderColor) chart.BorderColor=drawData.BorderColor;
+            if (drawData.TextFont) chart.TextFontConfig=drawData.TextFont;
+            if (drawData.TextColor) chart.TextColor=drawData.TextColor;
+            if (IFrameSplitOperator.IsNumber(drawData.XOffset)) chart.Offset.X=drawData.XOffset;
+            if (IFrameSplitOperator.IsNumber(drawData.YOffset)) chart.Offset.Y=drawData.YOffset;
+        }
+
+        hqChart.ChartPaint.push(chart);
+    }
+
     this.CreateTradeIcon=function(hqChart,windowIndex,varItem,id)
     {
         var chart=new ChartTradeIcon();
@@ -122034,6 +122313,9 @@ function ScriptIndex(name,script,args,option)
                     case "MULTI_POINT_LINE":
                         this.CreateLineMultiData(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAW_SIMPLE_TABLE":
+                        this.CreateSimpleTable(hqChart,windowIndex,item,i);
+                        break;
                     case "BUY":
                     case "SELL":
                     case "SELLSHORT":
@@ -122381,6 +122663,10 @@ function OverlayScriptIndex(name,script,args,option)
                         this.CreateMulitHtmlDom(hqChart,windowIndex,item,i);
                         break;
 
+                    case "DRAW_SIMPLE_TABLE":
+                        this.CreateSimpleTable(hqChart,windowIndex,item,i);
+                        break;
+
                     case "KLINE_BG":
                         this.CreateBackgroud(hqChart,windowIndex,item,i);
                         break;
@@ -123390,6 +123676,33 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateSimpleTable=function(hqChart,windowIndex,varItem,i)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartSimpleTable();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+        chart.HQChart=hqChart;
+
+        if (varItem.Draw && varItem.Draw.DrawData)
+        {
+            var drawData=varItem.Draw.DrawData;
+            if (drawData.TableData) chart.Data.Data=drawData.TableData;
+            if (drawData.BGColor) chart.BGColor=drawData.BGColor;
+            if (drawData.BorderColor) chart.BorderColor=drawData.BorderColor;
+            if (drawData.TextFont) chart.TextFontConfig=drawData.TextFont;
+            if (drawData.TextColor) chart.TextColor=drawData.TextColor;
+            if (IFrameSplitOperator.IsNumber(drawData.XOffset)) chart.Offset.X=drawData.XOffset;
+            if (IFrameSplitOperator.IsNumber(drawData.YOffset)) chart.Offset.Y=drawData.YOffset;
+        }
+            
+        frame.ChartPaint.push(chart);
+    }
+
     this.CreateChartVericaltLine=function(hqChart,windowIndex,varItem,id)
     {
         var overlayIndex=this.OverlayIndex;
@@ -124568,6 +124881,30 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWTEXT_LINE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;    //{ Price:,  Text:{ Title:text, Color:textcolor }, Line:{ Type:linetype, Color:linecolor } };
+
+                    outVarItem.Draw=drawItem;
+                    if (draw.Font) outVarItem.Font=draw.Font;
+                    
+                    result.push(outVarItem);
+                }
+                else if (draw.DrawType=="DRAW_SIMPLE_TABLE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;    //{ TableData:[ [ {AryCell:[{Text:, Color: }]}, ], ], BGColor:， TextFont:{ Size:, Name: } };
+ 
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接
@@ -126172,6 +126509,13 @@ function GetBlackStyle()
             }
         },
 
+        ChartSimpleTable:
+        {
+            TextColor:"rgb(250,250,250)",
+            BGColor:"rgba(0,0,0,0.85)",
+            BorderColor:"rgb(90,90,90)",
+        },
+
         ChartDrawVolProfile:
         {
             BGColor:"rgba(244,250,254,0.3)",
@@ -132391,6 +132735,8 @@ var REPORT_COLUMN_ID=
     CUSTOM_PROGRESS_ID:106,         //进度条
     CUSTOM_LINK_ID:107,              //链接
 
+    MULTI_LINE_CONTAINER:108,            //多行组合输出
+
 
     //预留数值类型 10个
     RESERVE_NUMBER1_ID:201,         //ReserveNumber1:
@@ -132952,6 +133298,10 @@ function ChartReport()
         {
             if (IFrameSplitOperator.IsNumber(item.FormatType)) colItem.FormatType=item.FormatType;
         }
+        else if (item.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER)
+        {
+            if (IFrameSplitOperator.IsNonEmptyArray(item.AryField)) colItem.AryField=item.AryField.slice();
+        }
 
         return colItem;
     }
@@ -133104,6 +133454,12 @@ function ChartReport()
             { Type:REPORT_COLUMN_ID.RISING_SPEED_10M_ID, Title:"10分涨速%", TextAlign:"right", Width:null, MaxText:"-888.88" },
             { Type:REPORT_COLUMN_ID.RISING_SPEED_15M_ID, Title:"15分涨速%", TextAlign:"right", Width:null, MaxText:"-888.88" },
 
+            //组合多行字段
+            { 
+                Type:REPORT_COLUMN_ID.MULTI_LINE_CONTAINER, Title:"涨幅",TextAlign:"right", MaxText:"1000.00%",
+                AryField:[ { Type:REPORT_COLUMN_ID.PRICE_ID},{ Type:REPORT_COLUMN_ID.INCREASE_ID, DynamicFormat:"{Value}%"} ] 
+            },
+
             { Type:REPORT_COLUMN_ID.RESERVE_NUMBER1_ID, Title:"数值1", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
             { Type:REPORT_COLUMN_ID.RESERVE_NUMBER2_ID, Title:"数值2", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
             { Type:REPORT_COLUMN_ID.RESERVE_NUMBER3_ID, Title:"数值3", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999.99", FloatPrecision:2 },
@@ -133315,6 +133671,17 @@ function ChartReport()
                 if (rowHeight>this.RowHeight) this.RowHeight=rowHeight;
                 if (rowHeight>this.FixedRowHeight) this.FixedRowHeight=rowHeight;
             }
+            else if (item.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER)
+            {
+                if (IFrameSplitOperator.IsNumber(item.FixedWidth)) itemWidth=item.FixedWidth;
+                else itemWidth=this.Canvas.measureText(item.MaxText).width;
+
+                item.Width=itemWidth+4+this.ItemMergin.Left+this.ItemMergin.Right;
+                this.ItemTextLines=item.AryField.length;
+                var rowHeight=(this.ItemFontHeight*item.AryField.length)+this.ItemMergin.Top+ this.ItemMergin.Bottom;
+                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;
@@ -133908,6 +134275,87 @@ function ChartReport()
         }
     }
 
+    this.BuildSubCellTextData=function(subItem, column, stock, drawInfo, data, option)
+    {
+        switch(subItem.Type)
+        {
+            case REPORT_COLUMN_ID.NAME_ID:
+                if (stock && stock.Name) drawInfo.Text=stock.Name;
+                else drawInfo.Text=data.Name;
+                break;
+            case REPORT_COLUMN_ID.SYMBOL_ID:
+                if (stock && stock.Symbol) drawInfo.Text=stock.Symbol;
+                else drawInfo.Text=data.Symbol;
+                break;
+
+            case REPORT_COLUMN_ID.PRICE_ID:
+            case REPORT_COLUMN_ID.OPEN_ID:
+            case REPORT_COLUMN_ID.HIGH_ID:
+            case REPORT_COLUMN_ID.LOW_ID:
+            case REPORT_COLUMN_ID.YCLOSE_ID:
+            case REPORT_COLUMN_ID.BUY_PRICE_ID:
+            case REPORT_COLUMN_ID.SELL_PRICE_ID:
+            case REPORT_COLUMN_ID.AVERAGE_PRICE_ID:
+            case REPORT_COLUMN_ID.FUTURES_CLOSE_ID:
+            case REPORT_COLUMN_ID.FUTURES_YCLOSE_ID:
+                var fieldName=MAP_COLUMN_FIELD.get(subItem.Type);
+                if (stock && IFrameSplitOperator.IsNumber(stock[fieldName])) this.GetPriceDrawInfo(stock[fieldName], stock, data, drawInfo, option);
+                break;
+
+            case REPORT_COLUMN_ID.INCREASE_ID:
+            case REPORT_COLUMN_ID.AMPLITUDE_ID:
+            case REPORT_COLUMN_ID.UPDOWN_ID:
+            case REPORT_COLUMN_ID.RISING_SPEED_1M_ID:
+            case REPORT_COLUMN_ID.RISING_SPEED_3M_ID:
+            case REPORT_COLUMN_ID.RISING_SPEED_5M_ID:
+            case REPORT_COLUMN_ID.RISING_SPEED_10M_ID:
+            case REPORT_COLUMN_ID.RISING_SPEED_15M_ID:
+                var fieldName=MAP_COLUMN_FIELD.get(subItem.Type);
+                if (stock && IFrameSplitOperator.IsNumber(stock[fieldName]))
+                {
+                    var value=stock[fieldName];
+                    var text=value.toFixed(2);
+                    if (subItem.DynamicFormat)
+                        text=subItem.DynamicFormat.replace('{Value}',text);
+                    
+                    drawInfo.Text=text
+                    drawInfo.TextColor=this.GetUpDownColor(value,0);
+                }
+                break;
+        }
+    }
+
+    this.DrawSubCellText=function(drawInfo, column, rtText)
+    {
+        if (!drawInfo.Text) return;
+
+        var text=drawInfo.Text;
+        var x=rtText.Left;
+        if (drawInfo.TextAlign=='center')
+        {
+            x=rtText.Left+rtText.Width/2;
+            this.Canvas.textAlign="center";
+        }
+        else if (drawInfo.TextAlign=='right')
+        {
+            x=rtText.Left+rtText.Width-2;
+            this.Canvas.textAlign="right";
+        }
+        else
+        {
+            x+=2;
+            this.Canvas.textAlign="left";
+        }
+
+        var bClip=false;
+
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.fillStyle=drawInfo.TextColor;
+        this.Canvas.fillText(text,x,rtText.Bottom);
+
+        if (bClip) this.Canvas.restore();
+    }
+
     this.DrawItem=function(index, data, column, left, top, rowType, columnIndex)
     {
         var itemWidth=column.Width;
@@ -134233,6 +134681,26 @@ function ChartReport()
         {
             this.FormatReserveButton(column, stock, drawInfo);
         }
+        else if (column.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER)
+        {
+            if (IFrameSplitOperator.IsNonEmptyArray(column.AryField))
+            {
+                var yBottom=rtItem.Bottom-this.ItemMergin.Bottom-(column.AryField.length-1)*this.ItemFontHeight;
+                var rtText={ Left:left+this.ItemMergin.Left, Width:textWidth, Height:this.ItemFontHeight, Bottom:yBottom };
+                rtText.Right=rtText.Left+rtText.Width;
+                rtText.Top=rtText.Bottom-rtText.Height;
+                for(var k=0;k<column.AryField.length;++k)
+                {
+                    drawInfo.Text=null;
+                    var subItem=column.AryField[k];
+                    this.BuildSubCellTextData(subItem, column, stock, drawInfo, data);
+                    this.DrawSubCellText(drawInfo, column, rtText);
+
+                    rtText.Bottom+=this.ItemFontHeight;
+                    rtText.Top+=this.ItemFontHeight;
+                }
+            }
+        }
         
 
         //拖拽行颜色
@@ -134262,6 +134730,10 @@ function ChartReport()
         else if (column.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID)
         {
             this.DrawLinkText(drawInfo, x, top, textWidth);
+        }
+        else if (column.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER)
+        {
+
         }
         else
         {
@@ -140579,7 +141051,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14275";
+var HQCHART_VERSION="1.1.14282";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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