hqchart 1.1.15111 → 1.1.15126

package/package.json

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

package/src/jscommon/umychart.DialogSearchIndex.js

@@ -307,7 +307,7 @@ function JSDialogSearchIndex()
             var indexItem=cellItem.IndexItem;
             if (indexItem.Type==0 )  //系统指标 
             {
-                this.HQChart.ChangeIndex(this.OpData.WindowIndex, indexItem.ID );
+                this.HQChart.ChangeIndex(this.OpData.WindowIndex, indexItem.ID, indexItem);
             }
             else if(indexItem.Type==4 || indexItem.Type==5) //五彩K线
             {
@@ -338,6 +338,7 @@ function JSDialogSearchIndex()
             if (indexItem.Type==0)  //系统指标
             {
                 var obj={ WindowIndex:this.OpData.WindowIndex, IndexName:indexItem.ID };
+                if (indexItem.Lock) obj.Lock=indexItem.Lock;
                 this.HQChart.AddOverlayIndex(obj);
             }
             else if (indexItem.Type==1) //自定义脚本指标
@@ -802,11 +803,7 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
                 [
                     { Name:"收盘线(后台指标)", ID:"API-DRAWTEXTREL", Type:2, Args:null },
                     { Name:"高低均价(自定义脚本)", ID:"HIGH_LOW_AV", Type:1, Script:"均价:(H+L)/2;高:H;低:L;", Args:[ { Name:'N', Value:20}, { Name:'M', Value:6}]},
-                    { 
-                        Name:"波段量能跟庄-波段量能", ID:"TEST_INDEX_4AE0_1", Type:1, Args:null,
-                        Script:TEST_INDEX_4AE0_1,
-                        Lock:{ IsLocked:true }
-                    }
+                    { Name:"指标异常(后台指标)", ID:"API_ERRORMESSAGE", Type:2, Args:null,}
                 ]
             },
             {
@@ -814,11 +811,8 @@ JSDialogSearchIndex.GetDefaultIndexData=function()
                 AryIndex:
                 [
                     { Name:"面积图(后台指标)", ID:"API-DRAWBAND", Type:2, Args:null, Lock:{ IsLocked:true } },
-                    { 
-                        Name:"波段量能跟庄-波段量能", ID:"TEST_INDEX_4AE0_1", Type:1, Args:null,
-                        Script:TEST_INDEX_4AE0_1,
-                        Lock:{ IsLocked:true }
-                    }
+                    { Name:"波段量能跟庄-波段量能", ID:"TEST_INDEX_4AE0_1", Type:0, Lock:{ IsLocked:true } },
+                    { Name:"飞龙八级进-主图", ID:"TEST_INDEX_4AE0_2", Type:0, Lock:{ IsLocked:true } }
                 ]
             },
             {
@@ -1321,6 +1315,7 @@ function JSDialogModifyIndexParam()
 /////////////////////////////////////////////////////////////////////////////////////////////
 //测试指标
 
+
 var TEST_INDEX_4AE0_1=`能量:=SQRT(VOL)*(((C-(H+L)/2))/((H+L)/2));
 平滑能量:=EMA(能量,16);
 能量惯性:EMA(平滑能量,16);
@@ -1337,5 +1332,110 @@ STICKLINE(能量惯性<0,(能量惯性-能量惯性*0.6),(能量惯性-能量惯
 STICKLINE(能量惯性<0,(能量惯性-能量惯性*0.8),(能量惯性-能量惯性*0.95),3,0), COLORFFFF00;`
 
 
+var TEST_INDEX_4AE0_2=`
+MA3:MA(CLOSE,3),COLORWHITE;
+MA17:MA(CLOSE,17),COLORYELLOW;
+QQ:=0,COLORWHITE;
+MA1:=MA(CLOSE,3);
+MA2:=MA(CLOSE,17);
+JG:=CROSS(MA1,MA2);
+VOLUME:=VOL,VOLSTICK;
+MAVOL1:=MA(VOLUME,3);
+MAVOL2:=MA(VOLUME,17);
+NL:=CROSS(MAVOL1,MAVOL2);
+DIF:=EMA(CLOSE,12)-EMA(CLOSE,26);
+DEA:=EMA(DIF,9);
+MACD:=(DIF-DEA)*2,COLORSTICK;
+NA:=CROSS(DIF,DEA);
+RSV:=(CLOSE-LLV(LOW,9))/(HHV(HIGH,9)-LLV(LOW,9))*100;
+K:=SMA(RSV,9,1);
+D:=SMA(K,9,1);
+J:=3*K-2*D;
+KD:=CROSS(K,D) AND CROSS(J,D);
+飞龙八级进:DRAWTEXT((JG AND NL AND NA) OR (JG AND NL AND KD) OR
+(JG AND NA AND KD) OR (NL AND NA AND KD),L*0.95,' 飞龙八级进'),COLORYELLOW;
+X:=LLV(J,2)=LLV(J,8);
+Y:=IF(CROSS(J,REF(J+0.01,1)) AND X AND J<20,30,0);
+DRAWTEXT(CROSS(J,REF(J+0.01,1)) AND X AND J<20,LOW*0.98,''),COLORLIMAGENTA;
+空:=EMA(C,5);
+均衡:=EMA(空,5),COLORWHITE;
+中轨:=HHV(MA(H,13),13),COLORRED,LINETHICK2;
+VAR5:=FILTER(均衡>REF(均衡,1)AND 中轨<REF(中轨,1)AND C>REF(C,1),11);
+DRAWTEXT(VAR5,L*0.98,''),COLORYELLOW;
+PT:=XMA(H,20);
+PAN:=XMA(CLOSE,7),COLORBROWN;
+RUO:=MEMA(CLOSE,3),COLORLIBLUE;
+STICKLINE(CLOSE> REF(CLOSE,1) ,HIGH,LOW,0,1 ),COLORRED;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,3,0 ),COLOR000055;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,2.7,0 ),COLOR000077;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,2.1,0 ),COLOR000099;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,1.5,0 ),COLOR0000BB;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,0.9,0 ),COLOR0000DD;
+STICKLINE(CLOSE> REF(CLOSE,1) ,OPEN,CLOSE,0.3,0 ),COLOR0000FF;
+STICKLINE(CLOSE= REF(CLOSE,1) ,HIGH,LOW,0,1 ),COLORWHITE;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,3,0 ),COLOR555555;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,2.7,0 ),COLOR777777;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,2.1,0 ),COLOR999999;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,1.5,0 ),COLORBBBBBB;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,0.9,0 ),COLORDDDDDD;
+STICKLINE(CLOSE= REF(CLOSE,1) ,OPEN,CLOSE,0.3,0 ),COLORFFFFFF;
+STICKLINE(CLOSE< REF(CLOSE,1) ,HIGH,LOW,0,1 ),COLORCYAN;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,3,0 ),COLOR990000;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,2.7,0 ),COLORCC0000;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,2.1,0 ),COLORFF4400;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,1.5,0 ),COLORFF8800;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,0.9,0 ),COLORFFCC00;
+STICKLINE(CLOSE< REF(CLOSE,1) ,OPEN,CLOSE,0.3,0 ),COLORCYAN;
+高:=REF(HHV(H,80),3);
+低:=REF(LLV(L,80),3);
+H19:=高-(高-低)*0.191;
+H38:=高-(高-低)*0.382;
+H中:=高-(高-低)*0.5;
+H61:=高-(高-低)*0.618;
+H80:=高-(高-低)*0.809;
+顶点:REFDATE(高,DATE),COLORWHITE;
+REFDATE(H19,DATE),COLORYELLOW;
+REFDATE(H38,DATE),COLORMAGENTA;
+REFDATE(H中,DATE),COLORRED;
+REFDATE(H61,DATE),COLORMAGENTA;
+REFDATE(H80,DATE),COLORYELLOW;
+低点:REFDATE(低,DATE),COLORWHITE;
+DRAWTEXT(ISLASTBAR,低点,''),COLORWHITE;
+`
+
+
+//添加测试系统指标
+AddTestSystemIndex=function()
+{
+    var aryIndex=[];
+
+    aryIndex.push(
+    { 
+        ID:"TEST_INDEX_4AE0_1",   
+        Name: '波段量能跟庄-波段量能', 
+        Script:TEST_INDEX_4AE0_1,
+        Args: null,
+       
+    });
+
+    
+    aryIndex.push(
+    {   
+        ID:"TEST_INDEX_4AE0_2",              //指标ID                    
+        Name:'飞龙八级进-主图',               //指标名称                    
+        Description:'飞龙八级进',            //描述信息                    
+        IsMainIndex:true,                  //是否是主图指标    
+        Condition: { Period:[CONDITION_PERIOD.KLINE_DAY_ID], Message:"指标(飞龙八级进-主图)只支持日线周期" },                
+        Args:null,                          //指标参数                                      
+        Script:TEST_INDEX_4AE0_2,                
+    });
+
+    JSIndexScript.AddIndex(aryIndex);
+}
+
+
+AddTestSystemIndex();
+
+
 
 

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -55865,7 +55865,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
         }
 
         //盘中
-        stockItem.minute.length=50;
+        //stockItem.minute.length=50;
          //测试用 这里可以修改数据
         //var lastItem=srcStock.minute[srcStock.minute.length-1];
         //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
@@ -57481,6 +57481,9 @@ HQData.Report_RequestStockData=function(data, callback)
                 var testDate=new Date();
                 testDate.setHours(testDate.getHours() + i*2)
                 newItem[401]={ DateTime:testDate } ;
+
+
+                newItem[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]={ Value:"ddddd" };
                 
 
                 item.Data=newItem;
@@ -58198,6 +58201,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_SCATTER_PLOT_V2(data, callback);
     else if (request.Data.indexname=="API_KLINE_TABLE")
         HQData.APIIndex_KLINE_TABLE(data, callback);
+    else if (request.Data.indexname=="API_MINUTE_TABLE")
+        HQData.APIIndex_MINUTE_TABLE(data, callback);
     else if (request.Data.indexname=="API_DRAWSVG")
         HQData.APIIndex_DRAWSVG(data, callback); 
     else if (request.Data.indexname=="API_BASELINE_BAR")
@@ -58205,6 +58210,9 @@ HQData.Report_APIIndex=function(data, callback)
     else if (request.Data.indexname=="API_VERTLINE")
         HQData.APIIndex_VERTLINE(data, callback);
 
+    else if (request.Data.indexname=="API_ERRORMESSAGE")
+        HQData.APIIndex_ErrorMessage(data, callback);
+
 
     //付费图形
     else if (request.Data.indexname=="API_MARK_AREA_V2")
@@ -59400,6 +59408,114 @@ HQData.APIIndex_KLINE_TABLE=function(data, callback)
 }
 
 
+HQData.APIIndex_MINUTE_TABLE=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=data.HQChart.GetKData(); //hqchart图形的分钟数据
+
+    var tableData= 
+    { 
+        name:'JS_CHART_MINUTETABLE_9DFC', type:1, 
+        Draw: 
+        { 
+            DrawType:'JS_CHART_MINUTETABLE_9DFC', 
+            DrawData:[ ] ,                                      //数据  [ [ { Text, Color: BGColor }, ...... ], [],]
+
+            Config:
+            {
+                //BGColor:"rgba(238,232,205,0.5)",
+                //BorderColor:"rgb(220,220,220)",
+                TextColor:"rgb(250,250,250)",
+                ItemMergin:{ Left:1, Right:1, Top:0, Bottom:0, YOffset:0 },
+                TextFont:{ Family:'微软雅黑' , FontMaxSize:14*GetDevicePixelRatio(), },
+                Style:1,
+                CellWidth:18*GetDevicePixelRatio(),
+                CellHeight:14*GetDevicePixelRatio(),
+                RowCount:2,
+                LineColor:"rgb(5,105,225)",
+                LineDash:[5*GetDevicePixelRatio(),5*GetDevicePixelRatio()],
+            }
+        },
+        
+    };
+
+    for(var i=0;i<kData.Data.length;++i)   
+    {
+        var kItem=kData.Data[i];
+
+        //一列数据
+        var colItem={ Date:kItem.Date, Time:kItem.Time, Data:[ ] };
+
+        if (kItem.Time==1030 || kItem.Time==1035)
+        {
+            colItem.Data[0]= 
+            {
+                Text:"多", Color:"rgb(250,250,250)", BGColor:'rgb(250,0,0)', TextAlign:"center",
+                Tooltip:
+                {
+                    AryText:
+                    [
+                        {Title:"日期", Text:`${kItem.Date} ${kItem.Time}`},
+                        {Title:"买入价", Text:`${kItem.Close.toFixed(2)}`, TextColor:"rgb(250,0,0)"},
+                        {Title:"数量", Text:`${HQData.GetRandomTestData(100,400).toFixed(0)}`,TextColor:"rgb(255,165,0)" },
+                    ]
+                }
+            };
+        }
+        else if (kItem.Time==1033 || kItem.Time==1025)
+        {
+            colItem.Data[0]= 
+            {
+                Text:"空", Color:"rgb(250,250,250)", BGColor:'rgb(0,128,0)', TextAlign:"center",
+                Tooltip:
+                {
+                    AryText:
+                    [
+                        {Title:"日期", Text:`${kItem.Date} ${kItem.Time}`},
+                        {Title:"买入价", Text:`${kItem.Close.toFixed(2)}`, TextColor:"rgb(250,0,0)"},
+                        {Title:"数量", Text:`${HQData.GetRandomTestData(100,400).toFixed(0)}`,TextColor:"rgb(255,165,0)" },
+                    ]
+                }
+            };
+        }
+        else if (kItem.Time==1028 || kItem.Time==1032 || kItem.Time==1034 )
+        {
+            colItem.Data[1]= 
+            {
+                Text:"平", Color:"rgb(250,250,250)", BGColor:'rgb(255,165,0)', TextAlign:"center",
+                Tooltip:
+                {
+                    AryText:
+                    [
+                        {Title:"日期", Text:`${kItem.Date} ${kItem.Time}`},
+                        {Title:"卖入价", Text:`${kItem.Close.toFixed(2)}`, TextColor:"rgb(34,139,34)"},
+                        {Title:"数量", Text:`${HQData.GetRandomTestData(100,400).toFixed(0)}`,TextColor:"rgb(255,165,0)" },
+                    ]
+                }
+            };
+        }
+        else 
+        {
+            continue;
+        }
+        
+
+        tableData.Draw.DrawData.push(colItem);
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[tableData] } 
+    };
+
+    console.log('[KLineChart::APIIndex_KLINE_TABLE2] apiData ', apiData);
+    callback(apiData);
+}
+
+
 HQData.APIIndex_DRAWSVG=function(data, callback)
 {
     data.PreventDefault=true;
@@ -59788,3 +59904,11 @@ HQData.API_CHART_AREA_TEXT=function(data, callback)
 }
 
 
+HQData.APIIndex_ErrorMessage=function(data, callback)
+{
+    var hqchartData={ outdata:{ date:null, time:null, outvar:[] } , code:0};
+    hqchartData.error={ message:"错误提示信息" };
+    callback(hqchartData);
+}
+
+