hqchart 1.1.14965 → 1.1.14975

package/src/jscommon/umychart.DialogDrawTool.js

@@ -78,6 +78,9 @@ function JSDialogDrawTool()
                 { Title: "线形回归线", ClassName:'hqchart_drawtool icon-linear_3',  Type:0, Data:{ ID:"线形回归线" }  },
                 { Title: "线形回归带", ClassName:'hqchart_drawtool icon-linear_1',  Type:0, Data:{ ID:"线形回归带" }  },
                 { Title: "延长线形回归带", ClassName:'hqchart_drawtool icon-linear_2',  Type:0, Data:{ ID:"延长线形回归带" }  },
+
+                { Title: "Long Position", ClassName:'hqchart_drawtool icon-chart-long-position',  Type:0, Data:{ ID:"TVLongPosition" }  },
+                { Title: "Short Position", ClassName:'hqchart_drawtool icon-chart-short-position',  Type:0, Data:{ ID:"TVShortPosition" }  },
             ]
         },
         { 

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -58063,8 +58063,7 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_MULTI_TEXT(data, callback);
     else if (request.Data.indexname=="API_PARTLINE")
         HQData.APIIndex_PARTLINE(data, callback);
-    else if (request.Data.indexname=="API_CHANNELV2")
-        HQData.APIIndex_CHANNEL_V2(data, callback);
+  
     else if (request.Data.indexname=="API_DRAWKLINE")
         HQData.APIIndex_DRAWKLINE(data, callback);
     else if (request.Data.indexname=="API_TITLE")
@@ -58079,6 +58078,13 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_BASELINE_BAR(data, callback);
     else if (request.Data.indexname=="API_VERTLINE")
         HQData.APIIndex_VERTLINE(data, callback);
+
+
+    //付费图形
+    else if (request.Data.indexname=="API_MARK_AREA_V2")
+        HQData.APIIndex_MARK_AREA_V2(data, callback);
+    else if (request.Data.indexname=="API_CHANNELV2")
+        HQData.APIIndex_CHANNEL_V2(data, callback);
 }
 
 
@@ -59505,3 +59511,71 @@ HQData.APIIndex_VERTLINE=function(data, callback)
 }
 
 
+HQData.APIIndex_MARK_AREA_V2=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var markData= 
+    { 
+        name:'区域标注', type:1, 
+        Draw: 
+        { 
+            DrawType:'JS_CHART_MARK_AREA_V2', 
+            DrawData:
+            {
+                AryData:[],  //[ { Start:{ }, End:{ }, AreaColor:, Text:"", BarColor:, TextColor:, ID: }]
+            },
+
+            Config:{ },
+        } 
+    };
+
+    var markItem=null;
+    for(var i=20;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        if (!markItem)
+        {
+            markItem=
+            {
+                Start:{ Date:kItem.Date, Time:kItem.Time },  //Value: 字符串 大写 
+                End:{ Date:kItem.Date, Time:kItem.Time },
+                AreaColor:"rgba(186,85,211,0.5)",
+                TextColor:"rgb(255,215,0)",
+                BarColor:"rgb(160,82,45)",
+                ID:i,
+                Text:`测试${i}`,
+                Count:1,
+                Value:"L",
+                YOffset:5,
+            }
+        }
+        else
+        {
+            markItem.End.Date=kItem.Date;
+            markItem.End.Date.Time=kItem.Time;
+            markItem.Count++;
+
+            if (markItem.Count>5) 
+            {
+                markData.Draw.DrawData.AryData.push(markItem);
+                markItem=null;
+            }
+        }
+
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[markData] } 
+    };
+
+    console.log('[HQData.APIIndex_MARK_AREA_V2] apiData ', apiData);
+    callback(apiData);
+}
+
+

package/src/jscommon/umychart.index.data.js

@@ -1236,7 +1236,7 @@ LONG := SUM(RC,0);\n\
 DIFF := SMA(LONG,10,1);\n\
 DEA := SMA(LONG,20,1);\n\
 LON : DIFF-DEA;\n\
-LONMA : MA(LON,10);\n\
+LONMA : MA(LON,N);\n\
 LONT : LON, COLORSTICK;'
 
     };