hqchart 1.1.14274 → 1.1.14280

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -57368,6 +57368,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);
 }
 
 
@@ -57754,3 +57756,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.complier.js

@@ -24775,6 +24775,19 @@ 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
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接

package/src/jscommon/umychart.js

@@ -70633,9 +70633,9 @@ function JSChartResource()
         SortIcon:
         {
             Size:12, Family:"iconfont",
-            Arrow:[null, "\ue6b2", "\ue6b1"],           //[0]=默认排序的图标背景色
-            Color:[null, "rgb(255,0,0)", "rgb(255,0,0)"],
-            Margin:{ Left:0, Bottom:2, Right:0,}
+            Arrow:["\ue704", "\ue81b", "\uf0c9"],           //[0]=默认排序的图标背景色
+            Color:['rgb(169,169,169)', "rgb(51,51,51)", "rgb(51,51,51)"],
+            Margin:{ Left:1*GetDevicePixelRatio(), Bottom:2, Right:0,}
         },
 
         Item:
@@ -71897,6 +71897,23 @@ function JSChartResource()
             }
         }
 
+        if (item.SortIcon)
+        {
+            var sort=item.SortIcon;
+            if (IFrameSplitOperator.IsNonEmptyArray(sort.Color)) this.Report.SortIcon.Color=sort.Color.slice();
+            if (IFrameSplitOperator.IsNumber(sort.Size)) this.Report.SortIcon.Size=sort.Size;
+            if (sort.Family) this.Report.SortIcon.Family=sort.Family;
+            if (IFrameSplitOperator.IsNonEmptyArray(sort.Arrow)) this.Report.SortIcon.Arrow=sort.Arrow.slice();
+            if (sort.Margin)
+            {
+                var margin=sort.Margin;
+                if (IFrameSplitOperator.IsNumber(margin.Left)) this.Report.SortIcon.Margin.Left=margin.Left;
+                if (IFrameSplitOperator.IsNumber(margin.Right)) this.Report.SortIcon.Margin.Right=margin.Right;
+                if (IFrameSplitOperator.IsNumber(margin.Top)) this.Report.SortIcon.Margin.Top=margin.Top;
+                if (IFrameSplitOperator.IsNumber(margin.Bottom)) this.Report.SortIcon.Margin.Bottom=margin.Bottom;
+            }
+        }
+
         if (item.Item)
         {
             var row=item.Item;

package/src/jscommon/umychart.report.js

@@ -4383,6 +4383,8 @@ var REPORT_COLUMN_ID=
     CUSTOM_PROGRESS_ID:106,         //进度条
     CUSTOM_LINK_ID:107,              //链接
 
+    MULTI_LINE_CONTAINER:108,            //多行组合输出
+
 
     //预留数值类型 10个
     RESERVE_NUMBER1_ID:201,         //ReserveNumber1:
@@ -4944,6 +4946,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;
     }
@@ -5096,6 +5102,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 },
@@ -5307,6 +5319,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;
@@ -5424,7 +5447,7 @@ function ChartReport()
         //排序
         var bDrawSortBG=this.IsDrawSortBGIcon();
         if (this.SortInfo && this.SortInfo.Field==index && this.SortInfo.Sort>0) lastItem.Sort={ Type:this.SortInfo.Sort };
-        else if (column.Sort>0 && bDrawSortBG) lastItem.Sort={ Type:0 };
+        else if (column.Sort>0 && bDrawSortBG && IFrameSplitOperator.IsNonEmptyArray(column.SortType) && column.SortType.length>=2) lastItem.Sort={ Type:0 };
 
         //图标
         if (column.Icon) lastItem.Icon=column.Icon;
@@ -5439,9 +5462,7 @@ function ChartReport()
 
         var pixelRatio=GetDevicePixelRatio();
         var cellWidth=drawInfo.Rect.Width;
-        
-        if (drawInfo.AryText.length>1)
-            var nnnn=10;
+        var bDrawSortBG=this.IsDrawSortBGIcon();
         
         var y=drawInfo.YText;
         for(var i=0;i<drawInfo.AryText.length;++i)
@@ -5495,11 +5516,21 @@ function ChartReport()
 
             if (sortWidth>1)    //排序
             {
+                this.Canvas.font=this.SortFont;
+                var xSort=x;
+                if (this.SortConfig.Margin && IFrameSplitOperator.IsNumber(this.SortConfig.Margin.Left)) xSort+=this.SortConfig.Margin.Left;
+                if (item.Sort.Type!=0 && bDrawSortBG)   //背景
+                {
+                    var sortText=this.SortConfig.Arrow[0];
+                    var sortColor=this.SortConfig.Color[0];
+                    this.Canvas.fillStyle=sortColor;
+                    this.Canvas.fillText(sortText,xSort,y-this.SortConfig.Margin.Bottom);
+                }
+
                 var sortText=this.SortConfig.Arrow[item.Sort.Type];
                 var sortColor=this.SortConfig.Color[item.Sort.Type];
-                this.Canvas.font=this.SortFont;
                 this.Canvas.fillStyle=sortColor;
-                this.Canvas.fillText(sortText,x,y-this.SortConfig.Margin.Bottom);
+                this.Canvas.fillText(sortText,xSort,y-this.SortConfig.Margin.Bottom);
                 x+=sortWidth;
             }
 
@@ -5892,6 +5923,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;
@@ -6217,6 +6329,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;
+                }
+            }
+        }
         
 
         //拖拽行颜色
@@ -6246,6 +6378,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
         {

package/src/jscommon/umychart.resource/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1040563 */
-  src: url('iconfont.woff2?t=1732508423204') format('woff2'),
-       url('iconfont.woff?t=1732508423204') format('woff'),
-       url('iconfont.ttf?t=1732508423204') format('truetype');
+  src: url('iconfont.woff2?t=1734955349527') format('woff2'),
+       url('iconfont.woff?t=1734955349527') format('woff'),
+       url('iconfont.ttf?t=1734955349527') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,18 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-sortup:before {
+  content: "\e81b";
+}
+
+.icon-sort1:before {
+  content: "\e704";
+}
+
+.icon-sort-down:before {
+  content: "\f0c9";
+}
+
 .icon-chicangzuheicon:before {
   content: "\e6b6";
 }

package/src/jscommon/umychart.style.js

@@ -630,6 +630,12 @@ function GetBlackStyle()
                 //Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
                 Font:{ Size:12, Name:"微软雅黑" }
             },
+
+             //排序图标
+            SortIcon:
+            {
+                Color:['rgb(105,105,105)', "rgb(255,255,255)", "rgb(255,255,255)"],
+            },
     
             Item:
             {

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);
+}
+
+