hqchart 1.1.14834 → 1.1.14843

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -57669,6 +57669,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_KLINE_TABLE(data, callback);
     else if (request.Data.indexname=="API_DRAWSVG")
         HQData.APIIndex_DRAWSVG(data, callback); 
+    else if (request.Data.indexname=="API_BASELINE_BAR")
+        HQData.APIIndex_BASELINE_BAR(data, callback);
 }
 
 
@@ -59017,3 +59019,41 @@ HQData.RequestVolumeProfileData=function(data, callback)
 }
 
 
+HQData.APIIndex_BASELINE_BAR=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var pointData=
+    { 
+        name:"BASELINE_BAR", type:1, 
+        Draw:
+        { 
+            Name:"BASELINE_BAR",
+            DrawType:"BASELINE_BAR",
+            DrawData:[],
+            Config:{  },
+        },
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        
+        var item={ Date:kItem.Date, Time:kItem.Time, Up:kItem.Vol*0.2, Down:(kItem.Vol*0.35)*-1 };
+        pointData.Draw.DrawData.push(item);
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[ pointData] },
+    };
+
+    console.log('[HQData.APIIndex_BASELINE_BAR] apiData ', apiData);
+    callback(apiData);
+}
+
+

package/src/jscommon/umychart.complier.js

@@ -20260,7 +20260,8 @@ var SCRIPT_CHART_NAME=
 
     CLIP_COLOR_STICK:"CLIP_COLOR_STICK",  //上下柱子 裁剪
 
-    DRAW_KLINE:"DRAWKLINE"
+    DRAW_KLINE:"DRAWKLINE",
+    BASELINE_BAR:"BASELINE_BAR"
 }
 
 
@@ -22323,6 +22324,31 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateBaseLineBar=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=new ChartBaseLineBar();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+        chart.HQChart=hqChart;
+        chart.Identify=this.Guid;
+
+        chart.Data=hqChart.GetKData();      //绑定K线
+        chart.AryData=varItem.Draw.DrawData;
+
+        var config=varItem.Draw.Config;
+        if (config)
+        {
+            if (config.UpColor) chart.UpColor=config.UpColor;
+            if (config.DownColor) chart.DownColor=config.DownColor;
+        }
+        
+        chart.BuildCacheData();
+        this.SetChartIndexName(chart);
+        hqChart.ChartPaint.push(chart);
+    }
+
 
     this.CreateClipColorStick=function(hqChart,windowIndex,varItem,id)
     {
@@ -22695,6 +22721,9 @@ function ScriptIndex(name,script,args,option)
                     case SCRIPT_CHART_NAME.CLIP_COLOR_STICK:
                         this.CreateClipColorStick(hqChart,windowIndex,item,i);
                         break;
+                    case SCRIPT_CHART_NAME.BASELINE_BAR:
+                        this.CreateBaseLineBar(hqChart,windowIndex,item,i);
+                        break;
                     default:
                         {
                             var find=g_ScriptIndexChartFactory.Get(item.Draw.DrawType);  //外部挂接
@@ -23048,6 +23077,9 @@ function OverlayScriptIndex(name,script,args,option)
                     case SCRIPT_CHART_NAME.OVERLAY_BARS:
                         this.CreateStackedBar(hqChart,windowIndex,item,i);
                         break;
+                    case SCRIPT_CHART_NAME.BASELINE_BAR:
+                        this.CreateBaseLineBar(hqChart,windowIndex,item,i);
+                        break;
                     case "DRAWCOLORKLINE":
                         this.CreateDrawColorKLine(hqChart,windowIndex,item,i);
                         break;
@@ -23860,6 +23892,32 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateBaseLineBar=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartBaseLineBar();
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.HQChart=hqChart;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+
+        chart.Data=hqChart.GetKData();      //绑定K线
+        chart.AryData=varItem.Draw.DrawData;
+
+        var config=varItem.Draw.Config;
+        if (config)
+        {
+            if (config.UpColor) chart.UpColor=config.UpColor;
+            if (config.DownColor) chart.DownColor=config.DownColor;
+        }
+        
+        chart.BuildCacheData();
+        frame.ChartPaint.push(chart);
+    }
+
 
     //创建通道
     this.CreateChannel=function(hqChart,windowIndex,varItem,id)
@@ -25769,6 +25827,17 @@ function APIScriptIndex(name,script,args,option, isOverlay)
                     if (draw.Option) outVarItem.Option=draw.Option;
                     result.push(outVarItem);
                 }
+                else if (draw.DrawType==SCRIPT_CHART_NAME.BASELINE_BAR)
+                {
+                    drawItem.Name=draw.Name;
+                    drawItem.Type=draw.Type;
+                    drawItem.DrawType=draw.DrawType;
+                    drawItem.DrawData=draw.DrawData;
+                    drawItem.Config=draw.Config;
+
+                    outVarItem.Draw=drawItem;
+                    result.push(outVarItem);
+                }
                 else if (draw.DrawType=='MULTI_LINE')
                 {
                     drawItem.Text=draw.Text;

package/src/jscommon/umychart.deal.js

@@ -1144,7 +1144,7 @@ JSDealChartContainer.JsonDataToDealData=function(data)
 
         if (item[11]) dealItem.Symbol=item[11];     //股票代码
         if (item[12]) dealItem.Name=item[12];       //股票名称
-        if (item[13]) dealItem.BGColor=item[13];    //整行颜色
+        if (item[13] || item[13]===null) dealItem.BGColor=item[13];    //整行颜色
 
         if (item[100]) dealItem.Guid=item[100];
 

package/src/jscommon/umychart.js

@@ -41447,6 +41447,199 @@ function ChartMACD()
     }
 }
 
+//基准线上下柱子
+function ChartBaseLineBar()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName="ChartBaseLineBar";
+    this.UpColor=g_JSChartResource.ChartBaseLineBar.UpColor;
+    this.DownColor=g_JSChartResource.ChartBaseLineBar.DownColor;
+    this.LineWidth=1;
+    this.IsDrawFirst=true;
+    this.AryData=[];    //{ Date, Time, Up, Down }
+
+    this.MaxValue;
+    this.YBaseLine;
+    this.BarMaxHeight; //{ Up:, Down: }
+
+    this.Draw=function()
+    {
+        this.YBaseLine=null;
+        this.BarMaxHeight=null;
+        if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+        if (!this.HQChart) return;
+        if(!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+        if (!IFrameSplitOperator.IsNumber(this.MaxValue)) return;
+        this.CalculateBaseLine();
+
+        if (!IFrameSplitOperator.IsNumber(this.YBaseLine)) return;
+        if (!IFrameSplitOperator.IsPlusNumber(this.BarMaxHeight)) return;
+
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var bMinute=this.IsMinuteFrame();
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xPointCount=this.ChartFrame.XPointCount;
+        var border=this.ChartFrame.GetBorder();
+
+        if (bHScreen)
+        {
+            var chartright=border.BottomEx;
+            var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+        else
+        {
+            var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+            var chartright=border.RightEx;
+        }
+
+        var yCenter=this.YBaseLine;
+        var aryUpBar=[], aryDownBar=[];
+        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var kItem=this.Data.Data[i];
+            if (!kItem) continue;
+            var key=this.BuildKey(kItem);
+            if (!this.MapCache.has(key)) continue;
+
+            var item=this.MapCache.get(key);
+
+            if (bMinute)
+            {
+                var x=this.ChartFrame.GetXFromIndex(j);
+            }
+            else
+            {
+                var left=xOffset;
+                var right=xOffset+dataWidth;
+                if (right>chartright) break;
+                var x=left+(right-left)/2;
+            }
+
+            if (IFrameSplitOperator.IsNumber(item.Up))
+            {
+                var y=yCenter-(item.Up*this.BarMaxHeight/this.MaxValue);
+                aryUpBar.push({ X:x, Y:y});
+            }
+            
+            if (IFrameSplitOperator.IsNumber(item.Down))
+            {
+                var y=yCenter+(Math.abs(item.Down)*this.BarMaxHeight/this.MaxValue);
+                aryDownBar.push({X:x, Y:y});
+            }
+        }
+
+        this.DrawBars(aryUpBar, this.UpColor);
+        this.DrawBars(aryDownBar,this.DownColor);
+    }
+
+    this.CalculateBaseLine=function()
+    {
+        if (!this.HQChart) return;
+
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var bMinute=this.IsMinuteFrame();
+        var border=this.ChartFrame.GetBorder();
+
+        if (bMinute)
+        {
+            var chart=this.HQChart.ChartPaint[0];
+            if (!chart || !IFrameSplitOperator.IsNumber(chart.YClose)) return;
+
+            this.YBaseLine=this.ChartFrame.GetYFromData(chart.YClose);
+            if (bHScreen)
+            {
+                this.BarMaxHeight=(border.RightEx-this.YBaseLine)/3;
+            }
+            else
+            {
+                this.BarMaxHeight=(this.YBaseLine-border.TopEx)/3;
+            }
+        }
+        else
+        {
+            //TODO:K线
+        }
+    }
+
+    this.DrawBars=function(aryBar, barColor)
+    {
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        var yCenter=this.YBaseLine;
+        this.Canvas.strokeStyle=barColor;
+        this.Canvas.beginPath();
+        var barCount=0;
+        for (var i=0;i<aryBar.length;++i)
+        {
+            var item=aryBar[i];
+            var x=ToFixedPoint(item.X)
+            if (bHScreen)
+            {
+                this.Canvas.moveTo(yCenter,x);
+                this.Canvas.lineTo(item.Y,x);
+            }
+            else
+            {
+                this.Canvas.moveTo(x,yCenter);
+                this.Canvas.lineTo(x,item.Y);
+            }
+            ++barCount;
+        }
+        if (barCount>0) this.Canvas.stroke();
+    }
+
+    this.BuildCacheData=function()
+    {
+        this.MaxValue=null;
+        var mapData=new Map();
+        this.MapCache=mapData;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryData)) return;
+
+        var max=null, min=null;
+        for(var i=0;i<this.AryData.length;++i)
+        {
+            var item=this.AryData[i];
+            if (!item) continue;
+
+            var key=this.BuildKey(item);
+            mapData.set(key,item);
+            
+            if (IFrameSplitOperator.IsNumber(item.Up))
+            {
+                if (!max) max={ Value:item.Up };
+                else if (max.Value<item.Up) max.Value=item.Up;
+
+                if (!min) min={ Value:item.Up };
+                else if (min.Value>item.Up) min.Value=item.Up;
+            }
+
+            if (IFrameSplitOperator.IsNumber(item.Down))
+            {
+                if (!max) max={ Value:item.Down };
+                else if (max.Value<item.Down) max.Value=item.Down;
+
+                if (!min) min={ Value:item.Down };
+                else if (min.Value>item.Down) min.Value=item.Down;
+            }
+        }
+
+        if (max && min)
+        {
+            this.MaxValue=Math.max(Math.abs(max.Value),Math.abs(min.Value));
+        }
+    }
+
+    this.GetMaxMin=function()
+    {
+        return {Min:null, Max:null};
+    }
+}
+
 function ChartClipColorStick()
 {
     this.newMethod=IChartPainting;   //派生
@@ -75534,6 +75727,12 @@ function JSChartResource()
         ],
     }
 
+    this.ChartBaseLineBar=
+    {
+        UpColor:"rgb(238,21,21)",
+        DownColor:"rgb(25,158,0)"
+    }
+
     //手机端tooltip
     this.TooltipPaint = {
         BGColor:'rgba(250,250,250,0.8)',    //背景色
@@ -76886,6 +77085,8 @@ function JSChartResource()
         if (style.ChartSimpleDoughnut) this.SetChartSimpleDoughnut(style.ChartSimpleDoughnut);
         
         if (style.ChartSimpleRadar) this.SetChartSimpleRadar(style.ChartSimpleRadar);
+
+        if (style.ChartBaseLineBar) this.SetChartBaseLineBar(style.ChartBaseLineBar);
         
         if (style.DRAWICON) 
         {
@@ -78043,6 +78244,14 @@ function JSChartResource()
         if (IFrameSplitOperator.IsNonEmptyArray(style.AryArea)) dest.AryArea=style.AryArea.slice();
     }
 
+    this.SetChartBaseLineBar=function(style)
+    {
+        var dest=this.ChartBaseLineBar;
+
+        if (style.UpColor) dest.UpColor=style.UpColor;
+        if (style.DownColor) dest.DownColor=style.DownColor;
+    }
+
     this.SetIndexLock=function(style)
     {
         var item=style;
@@ -81206,7 +81415,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 else
                 {
                     self.AutoUpdateEvent(true,'KLineChartContainer::RequestHistoryData');
-                    self.AutoUpdate();
+                    self.AutoUpdate(500);
                 }
             });
 
@@ -81526,7 +81735,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 else
                 {
                     self.AutoUpdateEvent(true,'KLineChartContainer::ReqeustHistoryMinuteData');
-                    self.AutoUpdate();
+                    self.AutoUpdate(500);
                 }
             });
 
@@ -86022,6 +86231,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
 
         var frequency=this.AutoUpdateFrequency;
+        if (IFrameSplitOperator.IsPlusNumber(waitTime)) frequency=waitTime;
         if (marketStatus==1) //盘前
         {
             this.AutoUpdateTimer=setTimeout(function() 

package/src/jscommon/umychart.testdata.js

@@ -2155,6 +2155,8 @@ HQData.Report_APIIndex=function(data, callback)
         HQData.APIIndex_KLINE_TABLE(data, callback);
     else if (request.Data.indexname=="API_DRAWSVG")
         HQData.APIIndex_DRAWSVG(data, callback); 
+    else if (request.Data.indexname=="API_BASELINE_BAR")
+        HQData.APIIndex_BASELINE_BAR(data, callback);
 }
 
 
@@ -3503,3 +3505,41 @@ HQData.RequestVolumeProfileData=function(data, callback)
 }
 
 
+HQData.APIIndex_BASELINE_BAR=function(data, callback)
+{
+    data.PreventDefault=true;
+    var hqchart=data.HQChart;
+    var kData=hqchart.GetKData();
+
+    var pointData=
+    { 
+        name:"BASELINE_BAR", type:1, 
+        Draw:
+        { 
+            Name:"BASELINE_BAR",
+            DrawType:"BASELINE_BAR",
+            DrawData:[],
+            Config:{  },
+        },
+    };
+
+    for(var i=0;i<kData.Data.length;++i)
+    {
+        var kItem=kData.Data[i];
+        
+        var item={ Date:kItem.Date, Time:kItem.Time, Up:kItem.Vol*0.2, Down:(kItem.Vol*0.35)*-1 };
+        pointData.Draw.DrawData.push(item);
+    }
+
+    var apiData=
+    {
+        code:0, 
+        stock:{ name:hqchart.Name, symbol:hqchart.Symbol }, 
+        outdata: { date:kData.GetDate(), time:kData.GetTime(), outvar:[ pointData] },
+    };
+
+    console.log('[HQData.APIIndex_BASELINE_BAR] apiData ', apiData);
+    callback(apiData);
+}
+
+