hqchart 1.1.14340 → 1.1.14354

package/package.json

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

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -57378,6 +57378,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_DRAW_SIMPLE_PIE(data, callback);
     else if (request.Data.indexname=="API_DRAW_SIMPLE_RADAR")
         HQData.APIIndex_DRAW_SIMPLE_RADAR(data, callback);
+    else if (request.Data.indexname=="API_MULTI_BAR")
+        HQData.APIIndex_MULTI_BAR(data, callback);
     
 }
 
@@ -57976,3 +57978,70 @@ HQData.APIIndex_DRAW_SIMPLE_RADAR=function(data, callback)
 }
 
 
+HQData.APIIndex_MULTI_BAR=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var barData= 
+    { 
+        name:'MULTI_BAR', type:1, 
+        Draw: 
+        { 
+            DrawType:'MULTI_BAR', 
+            DrawData:[] 
+        } //绘制柱子数组
+    };
+
+    //第一组柱子
+    var point=
+    { 
+        Color:'rgb(148,0,211)', //颜色
+        Type:0,
+        Name:"柱子上部",
+        Point:
+        [
+            //{Date:20190916, Time: Value:15.5, Value2:0 },
+        ],
+        Width:10
+    };
+
+    var point2=
+    { 
+        Color:'rgb(55,228,181)', //颜色
+        Type:1,
+        Name:"柱子下部",
+        Point:
+        [
+            //{Date:20190916, Time: Value:15.5, Value2:0 },
+        ],
+        Width:20
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var item=kData.Data[i];
+        point.Point.push({Date:item.Date, Time:item.Time, Value:(item.High+item.Low)/2, Value2:item.High});
+        point2.Point.push({Date:item.Date, Time:item.Time, Value:(item.High+item.Low)/2, Value2:item.Low});
+    }
+
+
+
+    barData.Draw.DrawData.push(point);
+    barData.Draw.DrawData.push(point2);
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime() , outvar:[barData] } 
+    };
+
+    
+    console.log('[HQData.APIIndex_MULTI_BAR] apiData ', apiData);
+    callback(apiData);
+
+}
+
+

package/src/jscommon/umychart.complier.js

@@ -21992,7 +21992,7 @@ 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.GetKData();      //绑定K线
         chart.PointGroup=varItem.Draw.DrawData; 
         if (varItem.Draw.Name) chart.Name=varItem.Draw.Name;
         chart.BuildCacheData();
@@ -22015,17 +22015,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.GetKData();//绑定K线
         chart.Bars=varItem.Draw.DrawData; 
-
-        var titleIndex=windowIndex+1;
-        var titleData=new DynamicTitleData({ KData:chart.Data, BarData:chart.Bars },varItem.Name,null);
-        titleData.IsShow=false;
-        titleData.DataType="MULTI_BAR";
-        hqChart.TitlePaint[titleIndex].Data[id]=titleData;
+        chart.BuildCacheData();
 
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
+
+        var titleIndex=windowIndex+1;
+        var titleData=new DynamicTitleData(chart.Data,varItem.Name,null);
+        titleData.DataType="ChartMultiBar";
+        titleData.GetItemCallback=(kItem)=>{ return chart.GetItem(kItem); }
+        hqChart.TitlePaint[titleIndex].Data[id]=titleData;
     }
 
     this.CreateMultiText=function(hqChart,windowIndex,varItem,i)
@@ -22036,8 +22037,10 @@ 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.GetKData();//绑定K线
         chart.Texts=varItem.Draw.DrawData; 
+        chart.BuildCacheData();
+
         this.SetChartIndexName(chart);
         hqChart.ChartPaint.push(chart);
     }
@@ -22050,7 +22053,7 @@ 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.GetKData();//绑定K线
         chart.Family=varItem.Draw.DrawData.Family;
         chart.AryIcon= varItem.Draw.DrawData.Icon;
         chart.BuildCacheData();
@@ -22066,10 +22069,8 @@ function ScriptIndex(name,script,args,option)
         chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
         chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
 
-        if (hqChart.ChartPaint[0].IsMinuteFrame())
-            chart.Data=hqChart.SourceData;
-        else
-            chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+        
+        chart.Data=hqChart.GetKData()
         if (IFrameSplitOperator.IsBool(varItem.Draw.DrawData.EnableTooltip)) chart.EnableTooltip=varItem.Draw.DrawData.EnableTooltip;
         if (IFrameSplitOperator.IsBool(varItem.Draw.DrawData.IsDrawFirst)) chart.IsDrawFirst=varItem.Draw.DrawData.IsDrawFirst;
         if (varItem.Draw.BuildKeyCallback) chart.BuildKeyCallback=varItem.Draw.BuildKeyCallback;
@@ -23577,11 +23578,7 @@ function OverlayScriptIndex(name,script,args,option)
         chart.ChartFrame=frame.Frame;
         chart.Identify=overlayIndex.Identify;
 
-        if (hqChart.ChartPaint[0].IsMinuteFrame())
-            chart.Data=hqChart.SourceData;
-        else
-            chart.Data=hqChart.ChartPaint[0].Data;  //绑定K线
-        
+        chart.Data=hqChart.GetKData();
         chart.Family=varItem.Draw.Icon.Family;
         chart.TextFont=g_JSChartResource.TIPICON.TextFont;
         
@@ -23729,7 +23726,7 @@ function OverlayScriptIndex(name,script,args,option)
         chart.ChartFrame=frame.Frame;
         chart.Identify=overlayIndex.Identify;
 
-        chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+        chart.Data=hqChart.GetKData();//绑定K线
         chart.PointGroup=varItem.Draw.DrawData; 
         chart.BuildCacheData();
 
@@ -23779,14 +23776,16 @@ function OverlayScriptIndex(name,script,args,option)
         chart.ChartFrame=frame.Frame;
         chart.Identify=overlayIndex.Identify;
 
-        chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+        chart.Data=hqChart.GetKData();//绑定K线
         chart.Bars=varItem.Draw.DrawData; 
+        chart.BuildCacheData();
 
         var titleIndex=windowIndex+1;
         var titlePaint=hqChart.TitlePaint[titleIndex];
-        var titleData=new DynamicTitleData({ KData:chart.Data, BarData:chart.Bars },varItem.Name,null);
-        titleData.IsShow=false;
-        titleData.DataType="MULTI_BAR";
+        var titleData=new DynamicTitleData(chart.Data,varItem.Name,null);
+        titleData.DataType="ChartMultiBar";
+        titleData.GetItemCallback=(kItem)=>{ return chart.GetItem(kItem); }
+
         titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;
 
         this.SetChartIndexName(chart);
@@ -23804,8 +23803,10 @@ function OverlayScriptIndex(name,script,args,option)
         chart.ChartFrame=frame.Frame;
         chart.Identify=overlayIndex.Identify;
 
-        chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+        chart.Data=hqChart.GetKData();//绑定K线
         chart.Texts=varItem.Draw.DrawData; 
+        chart.BuildCacheData();
+
         this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
@@ -23821,7 +23822,7 @@ function OverlayScriptIndex(name,script,args,option)
         chart.ChartFrame=frame.Frame;
         chart.Identify=overlayIndex.Identify;
 
-        chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+        chart.Data=hqChart.GetKData();//绑定K线
         chart.Family=varItem.Draw.DrawData.Family;
         chart.AryIcon= varItem.Draw.DrawData.Icon;
         chart.BuildCacheData();
@@ -23839,11 +23840,8 @@ function OverlayScriptIndex(name,script,args,option)
         chart.ChartBorder=frame.Frame.ChartBorder;
         chart.ChartFrame=frame.Frame;
         chart.Identify=overlayIndex.Identify;
-
-        if (hqChart.ChartPaint[0].IsMinuteFrame())
-            chart.Data=hqChart.SourceData;
-        else
-            chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
+        chart.Data=hqChart.GetKData();
+        
         
         if (IFrameSplitOperator.IsBool(varItem.Draw.DrawData.EnableTooltip)) chart.EnableTooltip=varItem.Draw.DrawData.EnableTooltip;
         if (IFrameSplitOperator.IsBool(varItem.Draw.DrawData.IsDrawFirst)) chart.IsDrawFirst=varItem.Draw.DrawData.IsDrawFirst;
@@ -24948,7 +24946,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);
+                    drawItem.DrawData=draw.DrawData;
                     outVarItem.Draw=drawItem;
 
                     result.push(outVarItem);
@@ -24999,8 +24997,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Text=draw.Text;
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
-                    drawItem.DrawData=this.FittingMultiText(draw.DrawData,date,time,hqChart);
-                    this.GetKLineData(drawItem.DrawData, hqChart);
+                    drawItem.DrawData=draw.DrawData;
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
                 }
@@ -25495,8 +25492,7 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     drawItem.Text=draw.Text;
                     drawItem.Name=draw.Name;
                     drawItem.DrawType=draw.DrawType;
-                    drawItem.DrawData=this.FittingMultiText(draw.DrawData,date,time,hqChart);
-                    this.GetKLineData(drawItem.DrawData, hqChart);
+                    drawItem.DrawData=draw.DrawData;
                     outVarItem.Draw=drawItem;
                     result.push(outVarItem);
                 }