hqchart 1.1.14330 → 1.1.14336

package/package.json

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

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -57404,13 +57404,14 @@ HQData.APIIndex_MULTI_POINT=function(data, callback)
         BGColor:"rgb(255,215,0)",
         PointRadius:10,
         LineWidth:2,
+        Name:"最低价",
         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});
+        point.Point.push({Date:item.Date, Time:item.Time, Value:"LOW"});
     }
 
     pointData.Draw.DrawData.push(point);
@@ -57422,6 +57423,7 @@ HQData.APIIndex_MULTI_POINT=function(data, callback)
         BGColor:"rgb(30,144,255)",
         PointRadius:5,
         LineWidth:1,
+        Name:"中间价",
         Point:[ ] 
     };
 

package/src/jscommon/umychart.complier.js

@@ -21992,16 +21992,18 @@ function ScriptIndex(name,script,args,option)
         chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
         chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
 
-        chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+        chart.Data=hqChart.ChartPaint[0].Data;      //绑定K线
         chart.PointGroup=varItem.Draw.DrawData; 
         if (varItem.Draw.Name) chart.Name=varItem.Draw.Name;
+        chart.BuildCacheData();
+
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
 
-         var titleIndex=windowIndex+1;
+        var titleIndex=windowIndex+1;
         var titleData=new DynamicTitleData(chart.Data,chart.Name, null);
         titleData.DataType="ChartMultiPoint";
-        titleData.PointGroup=chart.PointGroup;
+        titleData.GetItemCallback=(kItem)=>{ return chart.GetItem(kItem); }
         hqChart.TitlePaint[titleIndex].Data[i]=titleData;
     }
 
@@ -23716,7 +23718,7 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
-    this.CreateMultiPoint=function(hqChart,windowIndex,varItem,i)
+    this.CreateMultiPoint=function(hqChart,windowIndex,varItem,id)
     {
         var overlayIndex=this.OverlayIndex;
         var frame=overlayIndex.Frame;
@@ -23729,6 +23731,17 @@ function OverlayScriptIndex(name,script,args,option)
 
         chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
         chart.PointGroup=varItem.Draw.DrawData; 
+        chart.BuildCacheData();
+
+        var titleIndex=windowIndex+1;
+        var titlePaint=hqChart.TitlePaint[titleIndex];
+        var titleData=new DynamicTitleData(chart.Data,varItem.Name,null);
+        titleData.DataType="ChartMultiPoint";
+        titleData.GetItemCallback=(kItem)=>{ return chart.GetItem(kItem); }
+        titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;
+
+        this.SetChartIndexName(chart);
+        
         frame.ChartPaint.push(chart);
     }
 
@@ -24925,14 +24938,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Text=draw.Text;
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
-                    drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);
-                    if (IFrameSplitOperator.IsNonEmptyArray(drawItem.DrawData))
-                    {
-                        for(var k=0; k<drawItem.DrawData.length; ++k)
-                        {
-                            this.GetKLineData(drawItem.DrawData[k].Point, hqChart);
-                        }
-                    }
+                    drawItem.DrawData=draw.DrawData;
                     
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
@@ -25479,14 +25485,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Text=draw.Text;
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
-                    drawItem.DrawData=this.FittingMultiLine(draw.DrawData,date,time,hqChart);
-                    if (IFrameSplitOperator.IsNonEmptyArray(drawItem.DrawData))
-                    {
-                        for(var k=0; k<drawItem.DrawData.length; ++k)
-                        {
-                            this.GetKLineData(drawItem.DrawData[k].Point, hqChart);
-                        }
-                    }
+                    drawItem.DrawData=draw.DrawData;
                     
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);