hqchart 1.1.14675 → 1.1.14688

package/package.json

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

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -55711,6 +55711,7 @@ HQData.Minute_RequestMinuteData=function(data, callback)
     data.PreventDefault=true;
     var symbol=data.Request.Data.symbol[0];             //请求的股票代码
     var callcation=data.Request.Data.callcation;        //集合竞价
+    var bBuySellBar=data.Request.Data.IsShowBuySellBar;
     console.log(`[HQData::RequestMinuteData] Symbol=${symbol}`);
 
     setTimeout(()=>{
@@ -55741,6 +55742,29 @@ HQData.Minute_RequestMinuteData=function(data, callback)
             stockItem.beforeinfo=beforeinfo;
         }
 
+        var lastPrice=stockItem.minute[stockItem.minute.length-1].price;
+
+
+        if (bBuySellBar)    //盘口分析
+        {
+            var aryBuy=[];
+            var value=lastPrice+0.01;
+            for(var i=0;i<10;++i)
+            {
+                aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+    
+            var arySell=[];
+            for(var i=0;i<10;++i)
+            {
+                arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
+                value+=0.02;
+            }
+
+            stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
+        }
+
         //测试用 这里可以修改数据
         //var lastItem=srcStock.minute[srcStock.minute.length-1];
         //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
@@ -55850,6 +55874,7 @@ HQData.Minute_RequestHistoryMinuteData=function(data, callback)
     var symbol=data.Request.Data.symbol;                //请求的股票代码
     var dayCount=data.Request.Data.daycount;
     var callcation=data.Request.Data.callcation;        //集合竞价
+    var bBuySellBar=data.Request.Data.IsShowBuySellBar;
   
     console.log(`[HQData::Minute_RequestHistoryMinuteData] Symbol=${symbol}`);
 
@@ -55886,6 +55911,29 @@ HQData.Minute_RequestHistoryMinuteData=function(data, callback)
             item.beforeinfo=beforeinfo;
         }
     }
+
+    if (bBuySellBar)    //盘口分析
+    {
+        var dayItem=aryDay[0];
+        var lastPrice=dayItem.minute[dayItem.minute.length-1][4];
+
+        var aryBuy=[];
+        var value=lastPrice+0.01;
+        for(var i=0;i<10;++i)
+        {
+            aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
+            value+=0.02;
+        }
+
+        var arySell=[];
+        for(var i=0;i<10;++i)
+        {
+            arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
+            value+=0.02;
+        }
+
+        dayItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
+    }
    
     var hqchartData={code:0, data:aryDay, name:symbol, symbol: symbol};
 
@@ -58499,24 +58547,38 @@ HQData.APIIndex_TITLE=function(data, callback)
     var textData={ name:"标题", type:10, color:"rgb(0,128,128)", data:[], };    //名字
     var closeData={ name:"收盘价", type:0, color:"rgb(255,165,0)", data:[] } ;    //
 
-    var aryDate=[];
-    var aryTime=[];
+    var titleData=
+    { 
+        name:"我的指标标题", type:1, 
+        Draw:
+        { 
+            Name:"指标标题测试",
+            DrawType:"DRAWTITLE",
+            DrawData:{ AryTitle:[] },
+        },
+    };
+
     for(var i=0;i<kData.Data.length-30;++i)
     {
         var kItem=kData.Data[i];
         
         closeData.data.push(kItem.Close);
 
-        textData.data.push(
-            [
-                { Name:`收`, Text:`${kItem.Close.toFixed(2)}`, Color:"rgb(200,10,10)",},
-                { Name:`开`, Text:`${kItem.Open.toFixed(2)}`, Color:"rgb(0,200,10)", LeftSpace:2 }
-            ]);
+        titleData.Draw.DrawData.AryTitle.push(
+            {
+                Date:kItem.Date, Time:kItem.Time,
 
-        //textData.data.push(`价格:${kItem.Close.toFixed(2)}`);
+                AryText:
+                [
+                    { Name:`收`, Text:`${kItem.Close.toFixed(2)}`, Color:"rgb(200,10,10)",},
+                    { Name:`开`, Text:`${kItem.Open.toFixed(2)}`, Color:"rgb(0,200,10)", LeftSpace:2 },
+                    { Name:"标题1", Text:"1xxxxx", Color:"rgb(100,200,10)", LeftSpace:2},
+                    { Name:"标题2", Text:"2xxxxx", Color:"rgb(200,200,10)", LeftSpace:2},
+                    { Name:"标题3", Text:"3xxxxx", Color:"rgb(100,70,80)", LeftSpace:2},
+                ]
+            });
 
-        aryDate.push(kItem.Date);
-        aryTime.push(kItem.Time);
+        //textData.data.push(`价格:${kItem.Close.toFixed(2)}`);
     }
 
 
@@ -58524,7 +58586,7 @@ HQData.APIIndex_TITLE=function(data, callback)
     {
         code:0, 
         stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
-        outdata: { date:aryDate, time:aryTime, outvar:[ textData, closeData] },
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[ titleData, closeData] },
 
         //error: { message:"无权限查看指标“测试指标1”" }
     };

package/src/jscommon/umychart.complier.js

@@ -20813,13 +20813,16 @@ function ScriptIndex(name,script,args,option)
         chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
         chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
         chart.Identify=this.Guid;
+        chart.Data=hqChart.GetKData();                  //绑定K线
         if (varItem.Color) chart.Color=this.GetColor(varItem.Color);
         else chart.Color=this.GetDefaultColor(id);
-        chart.Data.Data=varItem.Data;
+        chart.AryTitle=varItem.Draw.DrawData.AryTitle;
+        chart.BuildCacheData();
         
         var titleIndex=windowIndex+1;
         var titleData=new DynamicTitleData(chart.Data,varItem.Name,chart.Color);
         titleData.DataType="ChartIndexTitle";
+        titleData.Chart=chart;
         hqChart.TitlePaint[titleIndex].Data[id]=titleData;
 
         this.SetChartIndexName(chart);
@@ -22637,6 +22640,9 @@ function ScriptIndex(name,script,args,option)
                     case "DRAWSVG":
                         this.CreateChartDrawSVG(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAWTITLE":
+                        this.CreateTitle(hqChart,windowIndex,item,i);
+                        break;
                     case "MULTI_HTMLDOM":
                         this.CreateMulitHtmlDom(hqChart,windowIndex,item,i);
                         break;
@@ -22730,11 +22736,7 @@ function ScriptIndex(name,script,args,option)
             {
                 this.CreateArea(hqChart,windowIndex,item,i);
             }
-            else if (item.Type==10) //标题
-            {
-                this.CreateTitle(hqChart,windowIndex,item,i);
-            }
-
+        
             var titlePaint=hqChart.TitlePaint[windowIndex+1];
             if (titlePaint &&  titlePaint.Data && i<titlePaint.Data.length) //设置标题数值 小数位数和格式
             {
@@ -23011,6 +23013,9 @@ function OverlayScriptIndex(name,script,args,option)
                     case "DRAWSVG":
                         this.CreateChartDrawSVG(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAWTITLE":
+                        this.CreateTitle(hqChart,windowIndex,item,i);
+                        break;
                     case "MULTI_HTMLDOM":
                         this.CreateMulitHtmlDom(hqChart,windowIndex,item,i);
                         break;
@@ -23084,11 +23089,6 @@ function OverlayScriptIndex(name,script,args,option)
             {
                 this.CreateLine(hqChart,windowIndex,item,i, item.Type);
             }
-            else if (item.Type==10)
-            {
-                this.CreateTitle(hqChart,windowIndex,item,i);
-            }
-
             
 
             var titleData=titleInfo.Data[i];
@@ -23673,22 +23673,25 @@ function OverlayScriptIndex(name,script,args,option)
     {
         var overlayIndex=this.OverlayIndex;
         var frame=overlayIndex.Frame;
-        let chart=new ChartIndexTitle();
+        var chart=new ChartIndexTitle();
         chart.Canvas=hqChart.Canvas;
 
         chart.Name=varItem.Name;
         chart.ChartBorder=frame.Frame.ChartBorder;
         chart.ChartFrame=frame.Frame;
         chart.Identify=overlayIndex.Identify;
-        
+        chart.Data=hqChart.GetKData();                  //绑定K线
+
         if (varItem.Color) chart.Color=this.GetColor(varItem.Color);
         else chart.Color=this.GetDefaultColor(id);
-        chart.Data.Data=varItem.Data;
+        chart.AryTitle=varItem.Draw.DrawData.AryTitle;
+        chart.BuildCacheData();
 
         var titleIndex=windowIndex+1;
         var titlePaint=hqChart.TitlePaint[titleIndex];
         var titleData=new DynamicTitleData(chart.Data,chart.Name,chart.Color);
         titleData.DataType="ChartIndexTitle";
+        titleData.Chart=chart;
         titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=titleData;
         
         this.SetChartIndexName(chart);
@@ -25304,6 +25307,18 @@ function APIScriptIndex(name,script,args,option, isOverlay)
 
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWTITLE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+
+                    outVarItem.Draw=drawItem;
+                    
+                    result.push(outVarItem);
+                }
                 else if (draw.DrawType=="MULTI_HTMLDOM")    //外部自己创建dom
                 {
                     drawItem.Text=draw.Text;
@@ -25862,6 +25877,18 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType=="DRAWTITLE")
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+
+                    outVarItem.Draw=drawItem;
+                    
+                    result.push(outVarItem);
+                }
                 else
                 {
                     var find=g_ScriptIndexChartFactory.Get(draw.DrawType);  //外部挂接