hqchart 1.1.14258 → 1.1.14274

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.14258",
+  "version": "1.1.14274",
   "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

@@ -55692,6 +55692,10 @@ HQData.NetworkFilter=function(data, callback)
             HQData.Report_RequestVirtualStockData(data, callback);         //股票数据 虚拟表格
             break;
 
+        case "APIScriptIndex::ExecuteScript":   //测试指标
+            HQData.Report_APIIndex(data, callback);
+            break;
+
     }
 }
 
@@ -56756,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`;
 
 
@@ -57349,3 +57353,404 @@ HQData.GetMulitDayMinuteDataByDate=function(aryDay, aryDate)
 }
 
 
+HQData.Report_APIIndex=function(data, callback)
+{
+    var request=data.Request;
+    if (request.Data.indexname=='API-MULTI_POINT')
+        HQData.APIIndex_MULTI_POINT(data, callback);
+    else if (request.Data.indexname=="API-DRAWTEXTREL")
+        HQData.APIIndex_DRAWTEXTREL(data, callback);
+    else if (request.Data.indexname=="API-DRAWCOLORKLINE")
+        HQData.APIIndex_DRAWCOLORKLINE(data, callback);
+    else if (request.Data.indexname=="API-DRAWBAND")
+        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);
+}
+
+
+HQData.APIIndex_MULTI_POINT=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var pointData= 
+    { 
+        name:'MULTI_POINT', type:1, 
+        Draw: 
+        { 
+            DrawType:'MULTI_POINT', 
+            DrawData:[],
+        } 
+    };
+
+    var point=
+    { 
+        Color:'rgb(211,211,211)', 
+        BGColor:"rgb(255,215,0)",
+        PointRadius:10,
+        LineWidth:2,
+        Point:[ ] 
+    };
+
+    for(var i=kData.Data.length-1, j=0; i>=0 && j<6; i-=5, ++j)
+    {
+        var item=kData.Data[i];
+        point.Point.push({Date:item.Date, Time:item.Time, Value:item.Low});
+    }
+
+    pointData.Draw.DrawData.push(point);
+    
+
+    var point=
+    { 
+        Color:'rgb(148,0,211)', 
+        BGColor:"rgb(30,144,255)",
+        PointRadius:5,
+        LineWidth:1,
+        Point:[ ] 
+    };
+
+    for(var i=kData.Data.length-3, j=0; i>=0 && j<5; i-=6, ++j)
+    {
+        var item=kData.Data[i];
+        point.Point.push({Date:item.Date, Time:item.Time, Value:(item.High+item.Low)/2});
+    }
+
+    pointData.Draw.DrawData.push(point);
+
+    var apiData=
+    { 
+        code:0, stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(),  outvar: [pointData] } 
+    };
+               
+    console.log('[HQData.APIIndex_MULTI_POINT] apiData ', apiData);
+    callback(apiData);
+}
+
+HQData.APIIndex_DRAWTEXTREL=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var closeLine={ name:'价', type:0, data:kData.GetClose(), color:"rgb(255, 52, 179)" };
+
+    var divText=
+    { 
+        name:'DRAWTEXTREL', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAWTEXTREL', 
+            DrawData: 
+            {
+                Point: {X: 500, Y: 500 },
+                Text: "!!!!前方高能!!!!"
+            },
+
+            Font:"20px 微软雅黑"
+        },
+        color:"rgb(255,0,0)",
+
+        DrawVAlign:1,
+        DrawAlign:1,
+    }
+
+    var divText2=
+    { 
+        name:'DRAWTEXTABS', type:1, 
+        Draw: 
+        { 
+            DrawType:'DRAWTEXTABS', 
+            DrawData: 
+            {
+                Point: {X: 5, Y: 5 },
+                Text: "后台指标示例"
+            },
+
+            Font:"24px 微软雅黑"
+        },
+        color:"rgb(255,200,0)",
+
+        DrawVAlign:2,
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate() ,time:kData.GetTime(), outvar:[closeLine,divText, divText2] } 
+    };
+   
+    console.log('[HQData::APIIndex_DRAWTEXTREL] apiData ', apiData);
+    callback(apiData);
+}
+
+
+HQData.APIIndex_DRAWCOLORKLINE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var aryTestKData=[];
+    var aryTestkData2=[];
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var item=kData.Data[i];
+        if (i%5==3) aryTestKData[i]={ Open:item.Open, High:item.High, Low:item.Low, Close:item.Close };
+        else aryTestKData[i]=null;
+
+        if (i%13==5) aryTestkData2[i]={ Open:item.Open, High:item.High, Low:item.Low, Close:item.Close };
+        else aryTestkData2[i]=null;
+    }
+
+    var varKLine={ type:1, name:"条件K线", Draw:{ DrawData:aryTestKData, DrawType:'DRAWCOLORKLINE', IsEmptyBar:false, Color:"rgb(100,0,100)"} }; 
+    var varKLine2={ type:1, name:"条件K线2", Draw:{ DrawData:aryTestkData2, DrawType:'DRAWCOLORKLINE', IsEmptyBar:false, Color:"rgb(255, 140, 0)"} }; 
+
+    var hqchartData=
+    { 
+        outdata:
+        { 
+            date:kData.GetDate(), time:kData.GetTime(), 
+            outvar:[ varKLine, varKLine2] 
+        } , 
+        code:0
+    };
+
+    console.log("[HQData.APIIndex_DRAWCOLORKLINE] DRAWCOLORKLINE=",hqchartData);
+
+    callback(hqchartData);
+}
+
+
+HQData.APIIndex_DRAWBAND=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+
+    var bandData=
+    { 
+        name:"DRAWBAND", type:1, 
+        Draw:
+        { 
+            Name:"DRAWBAND",
+            DrawType:"DRAWBAND",
+            DrawData:[],
+            Color:["rgb(220,20,60)","rgb(34,139,34)"]
+        }
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        bandData.Draw.DrawData[i]={ Value:kItem.Close, Value2:kItem.Open };
+    }
+
+    //var closeLine={ Name:'收', Type:0, Data:aryClose };
+    //var openLine={ Name:'开', Type:0, Data:aryOpen};
+
+    var hqchartData=
+    { 
+        outdata:{ date:kData.GetDate(), time:kData.GetTime(), outvar:[ bandData, ] } , 
+        code:0
+    };
+
+    callback(hqchartData);
+}
+
+
+HQData.APIIndex_MULTI_LINE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var line3= 
+    { 
+        name:'MULTI_LINE', type:1, 
+        
+        Draw: 
+        { 
+            DrawType:'MULTI_LINE', DrawData:[],
+            LineWidth:5,
+            Arrow: 
+            { 
+                Start:true,     //是否绘制开始箭头 <-
+                End:true,       //是否绘制结束箭头 ->
+                Angle:30,       //三角斜边一直线夹角
+                Length:10,      //三角斜边长度
+                LineWidth:4,    //箭头粗细
+            }
+        }, //绘制线段数组
+
+        IsShowTitle:false
+    };
+
+    var point3=
+    {
+        Color:'rgb(255,0,255)', 
+        Point:[]
+    }
+
+    for(var i=kData.Data.length-10;i<kData.Data.length;++i)
+    {
+        var item=kData.Data[i];
+        point3.Point.push({Date:item.Date, Time:item.Time, Value:item.High});
+    }
+    line3.Draw.DrawData.push(point3);
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[line3] } 
+    };
+    
+    console.log('[HQData.APIIndex_MULTI_LINE] apiData ', apiData);
+    callback(apiData);
+}
+
+
+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: