hqchart 1.1.14269 → 1.1.14276

package/package.json

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

package/src/jscommon/umychart.DialogTooltip.js

@@ -1178,11 +1178,26 @@ function JSFloatTooltip()
             {
                 this.UpdateChartDrawSVGV2Tooltip(data);
             }
+           
         }
         else if (data.DataType==2)  //更新实时行情数据
         {
             this.UpdateRealtimeHQTooltip(data);
         }
+        else if (data.DataType==3)  //报价列表
+        {
+            var tooltipData=data.Tooltip;
+            if (!tooltipData) return;
+
+            if (tooltipData.Type==2)  //报价列表表头图标提示信息
+            {
+                this.ReportHeaderIconTooltip(data);
+            }
+            else if (tooltipData.Type==1)   //单元格截断内容
+            {
+                this.ReportCellTruncateTooltip(data);
+            }
+        }
     }
 
     this.UpdateRealtimeHQTooltip=function(data)
@@ -1422,6 +1437,34 @@ function JSFloatTooltip()
 
         this.ShowTooltip(data);
     }
+
+    //表头图标
+    this.ReportHeaderIconTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !IFrameSplitOperator.IsNonEmptyArray(tooltipData.Data.AryText)) return;
+        
+        this.AryText=tooltipData.Data.AryText;
+        this.UpdateTableDOM();
+
+        this.ShowTooltip(data);
+    }
+
+    //表格单元格截断内容
+    this.ReportCellTruncateTooltip=function(data)
+    {
+        var tooltipData=data.Tooltip;
+        if (!tooltipData.Data || !IFrameSplitOperator.IsNonEmptyArray(tooltipData.Data.AryText)) return;
+        
+        var item=tooltipData.Data.AryText[0];
+        if (!item.Text) return;
+        
+        this.AryText=[ { Title:item.Text, IsMergeCell:true } ];
+
+        this.UpdateTableDOM();
+
+        this.ShowTooltip(data);
+    }
  
     this.UpdateTableDOM=function()
     {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -56760,7 +56760,7 @@ HQData.Report_RequestStockData=function(data, callback)
                 newItem[33]=kData;
 
 
-                newItem[101]=105.0;
+                newItem[101]=HQData.GetRandomTestData(-90,1000);
                 newItem[201]=`A-[${HQData.GetRandomTestData(-90,90)}]-B`;
 
 
@@ -57366,6 +57366,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_DRAWBAND(data, callback);
     else if (request.Data.indexname=="API-MULTI_LINE")
         HQData.APIIndex_MULTI_LINE(data, callback);
+    else if (request.Data.indexname=="API-MULTI_SVGICON")
+        HQData.APIIndex_MULTI_SVGICON(data, callback);
 }
 
 
@@ -57616,3 +57618,139 @@ HQData.APIIndex_MULTI_LINE=function(data, callback)
 }
 
 
+HQData.APIIndex_MULTI_SVGICON=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var iconData= 
+    { 
+        name:'MULTI_SVGICON', type:1, 
+        Draw: 
+        { 
+            DrawType:'MULTI_SVGICON', 
+            DrawData: 
+            {
+                Family:'iconfont', 
+                Icon:
+                [
+                    //{ Date:20190916, Value:"High", Symbol:'\ue611', Color:'rgb(240,0,0)', Baseline:2 , YMove:-5},  //0 居中 1 上 2 下
+                    //{ Date:20190919, Value:15.3, Symbol:'\ue615', Color:'rgb(240,240,0)', Baseline:2 },
+                    //{ Date:20190909, Value:15.4, Symbol:'\ue615', Color:'rgb(240,100,30)'}
+                ] 
+            }
+        } //绘制图标数组
+    };
+
+    var TEST_ICON_SYMBOL=['\ue678', '\ue66e', "\ue66b"];
+    var TEST_ICON_COLOR=["'rgb(240,0,0)", "rgb(240,100,30)", "rgb(138,43, 226)", "rgb(151,255,255)", "rgb(255, 20, 147)"];
+
+    for(var i=kData.Data.length-20, j=0;i<kData.Data.length;++i)
+    {
+        var item=kData.Data[i];
+
+        if (i%3!=1) continue;
+
+        var iconIndex=Math.ceil(Math.random()*10) % TEST_ICON_SYMBOL.length;
+        var colorIndex=Math.ceil(Math.random()*10) % TEST_ICON_COLOR.length;
+
+        if (j==2)
+        {
+            var iconItem=
+            {
+                Date:item.Date, Time:item.Time, 
+                Value:item.High,
+                Symbol:TEST_ICON_SYMBOL[iconIndex], 
+                Color:TEST_ICON_COLOR[colorIndex], 
+                Baseline:2,
+                YMove:-35,
+                Line:{ Color:"rgb(153,50,204)", KData:"H", Width:1, Offset:[3,10], Dash:[5,5] },
+            };
+
+            var iconItem2=
+            {
+                Date:item.Date, Time:item.Time, 
+                Value:item.Low,
+                Symbol:TEST_ICON_SYMBOL[iconIndex], 
+                Color:TEST_ICON_COLOR[colorIndex], 
+                Baseline:2,
+                YMove:50,
+            };
+
+            iconData.Draw.DrawData.Icon.push(iconItem2);
+        }
+        else if (j==3)
+        {
+            var iconItem=
+            {
+                Date:item.Date, Time:item.Time, 
+                Value:"L",
+                Symbol:TEST_ICON_SYMBOL[iconIndex], 
+                Color:TEST_ICON_COLOR[colorIndex], 
+                Baseline:1,
+                YMove:5,
+            };
+        }
+        else if (j==4)
+        {
+            var iconItem=
+            {
+                Date:item.Date, Time:item.Time, 
+                Value:item.Low*0.95,
+                Symbol:TEST_ICON_SYMBOL[iconIndex], 
+                Color:TEST_ICON_COLOR[colorIndex], 
+                Baseline:1,
+                YMove:5,
+                Line:{ Color:"rgb(153,50,204)", KData:"L", Width:1, Offset:[3,10], Dash:[5,5] },
+                Text:"提示信息:<br>这个是提示信息"
+            };
+        }
+        else
+        {
+            var iconItem=
+            {
+                Date:item.Date, Time:item.Time, 
+                Value:item.High,
+                Symbol:TEST_ICON_SYMBOL[iconIndex], 
+                Color:TEST_ICON_COLOR[colorIndex], 
+                Baseline:2,
+                YMove:-20,
+                Text:
+                { 
+                    AryText:
+                    [
+                        { Title:"日期:", Text:`${item.Date}`, Color:"rgb(230,230,230)", Align:"Left"},
+                        { Title:"提示:", Text:"提示信息xxxxx", Color:"rgb(250,0,0)",Align:"Left"}
+                    ] 
+                },
+
+                //Line:{ Color:"rgb(153,50,204)", KData:"H", Width:1, Offset:[3,10], Dash:[5,5] },
+            };
+
+
+            /*
+            if (j%5==1)
+                iconItem.Image={ Data:image1, Width:32, Height:32 };
+            else if (j%5==3)
+                iconItem.Image={ Data:image2, Width:32, Height:32 };
+            */
+        }
+
+        iconData.Draw.DrawData.Icon.push(iconItem);
+        ++j;
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate() , outvar:[iconData] } 
+    };
+
+    
+    console.log('[HQData.APIIndex_MULTI_SVGICON] apiData ', apiData);
+    callback(apiData);
+}
+
+

package/src/jscommon/umychart.complier.js

@@ -16889,9 +16889,6 @@ function JSExecute(ast,option)
 
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_OTHER_SYMBOL_DATA:  //指定股票数据
                 return this.SymbolData.GetOtherSymbolData(jobItem);
-            
-            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_RELEASE_DATE_DATA:
-                return this.SymbolData.GetCompanyReleaseDate(jobItem.ID);
 
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_BALANCE:
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_MARGIN_RATE:

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:6 }
+            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;