hqchart 1.1.12505 → 1.1.12513

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -10414,6 +10414,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return false;
     }
 
+    this.IsMinuteContainer=function()
+    {
+        if (this.ClassName=="MinuteChartContainer" || this.ClassName=="MinuteChartHScreenContainer") return true;
+
+        return false;
+    }
+
     this.UpdatePointByCursorIndex=function(type)    //type 1=根据十字光标更新 2=强制取消十字光标
     {
         var pt={X:null, Y:null};
@@ -24989,9 +24996,12 @@ function IChartPainting()
             }
             else if (valueType==3)
             {
-                var price=this.Data.Data[i].Close;
-                if (price==null) continue;
-                value=price/this.YClose*this.MainYClose;
+                var minItem=this.Data.Data[i];
+                var mainItem=this.MainData.Data[i];
+                if (!minItem || !IFrameSplitOperator.IsNumber(minItem.Close) || !IFrameSplitOperator.IsNumber(minItem.YClose)) continue;
+                if (!mainItem || !IFrameSplitOperator.IsNumber(mainItem.Close) || !IFrameSplitOperator.IsNumber(mainItem.YClose)) continue;
+                var price=minItem.Close;
+                var value=price/minItem.YClose*mainItem.YClose;
             }
             else if (valueType==4)
             {
@@ -25111,9 +25121,12 @@ function IChartPainting()
             }
             else if (valueType==3)
             {
-                var price=this.Data.Data[i].Close;
-                if (price==null) continue;
-                var value=price/this.YClose*this.MainYClose;
+                var minItem=this.Data.Data[i];
+                var mainItem=this.MainData.Data[i];
+                if (!minItem || !IFrameSplitOperator.IsNumber(minItem.Close) || !IFrameSplitOperator.IsNumber(minItem.YClose)) continue;
+                if (!mainItem || !IFrameSplitOperator.IsNumber(mainItem.Close) || !IFrameSplitOperator.IsNumber(mainItem.YClose)) continue;
+                var price=minItem.Close;
+                var value=price/minItem.YClose*mainItem.YClose;
             }
             else
             {
@@ -35763,19 +35776,16 @@ function ChartOverlayMinutePriceLine()
 
     this.Color="rgb(65,105,225)";
     this.MainData;                  //主图数据
-    this.MainYClose;                //主图股票的前收盘价
     this.SourceData;                //原始数据
 
     this.ClassName="ChartOverlayMinutePriceLine";
     this.Title;
     this.Symbol;                    //叠加的股票代码
-    this.YClose;                    //叠加的股票前收盘
     this.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;
 
     this.OverlayType=0; //叠加方式 0=百分比叠加  1=绝对叠加
     this.IsCalcuateMaxMin=true; //是否参与计算Y轴的最大最小值
 
-
     this.SetOption=function(option)
     {
         if (option)
@@ -35787,19 +35797,21 @@ function ChartOverlayMinutePriceLine()
 
     this.PtInChart=function(x,y)
     {
-        var option={ MinuteOverlayPrice:true, YClose:this.YClose, MainYClose:this.MainYClose, OverlayType:this.OverlayType };
+        var option={ MinuteOverlayPrice:true, OverlayType:this.OverlayType };
         return this.PtInLine(x, y, option);
     }
 
     this.DrawSelectedStatus=function()
     {
-        var option={ MinuteOverlayPrice:true, YClose:this.YClose, MainYClose:this.MainYClose, OverlayType:this.OverlayType };
+        var option={ MinuteOverlayPrice:true, OverlayType:this.OverlayType };
         this.DrawLinePoint(option);
     }
 
     this.Draw=function()
     {
         if (!this.Data) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return;
+
         if (this.NotSupportMessage)
         {
             this.DrawNotSupportmessage();
@@ -35820,37 +35832,53 @@ function ChartOverlayMinutePriceLine()
         var bFirstPoint=true;
         var drawCount=0;
         var xOffset=0, showValue=0;
+        var yClose=null, mainYClose=null;
+        var pointCount=0;
         for(var i=this.Data.DataOffset+xOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
         {
-            var value=this.Data.Data[i].Close;
-            if (value==null) continue;
+            var item=this.Data.Data[i];
+            if (item && IFrameSplitOperator.IsNumber(item.Close)) 
+            {
+                if (bFirstPoint)    //百分比使用每天的昨收计算
+                {
+                    yClose=item.YClose;
+                    var minItem=this.MainData.Data[i];
+                    mainYClose=minItem.YClose;
+                }
 
-            showValue=value;           //绝对叠加
-            if (this.OverlayType==0) showValue=value/this.YClose*this.MainYClose;   //百分比
+                var value=item.Close;
+                showValue=value;           //绝对叠加
 
-            var x=this.ChartFrame.GetXFromIndex(j);
-            var y=this.ChartFrame.GetYFromData(showValue, false);
+                if (this.OverlayType==0) 
+                    showValue=value/yClose*mainYClose;   //百分比
 
-            if (bFirstPoint)
-            {
-                this.Canvas.strokeStyle=this.Color;
-                this.Canvas.beginPath();
-                if (isHScreen) this.Canvas.moveTo(y,x);
-                else this.Canvas.moveTo(x,y);
-                bFirstPoint=false;
-            }
-            else
-            {
-                if (isHScreen) this.Canvas.lineTo(y,x);
-                else this.Canvas.lineTo(x,y);
+                var x=this.ChartFrame.GetXFromIndex(j);
+                var y=this.ChartFrame.GetYFromData(showValue, false);
+
+                if (bFirstPoint)
+                {
+                    this.Canvas.strokeStyle=this.Color;
+                    this.Canvas.beginPath();
+                    if (isHScreen) this.Canvas.moveTo(y,x);
+                    else this.Canvas.moveTo(x,y);
+                    bFirstPoint=false;
+                }
+                else
+                {
+                    if (isHScreen) this.Canvas.lineTo(y,x);
+                    else this.Canvas.lineTo(x,y);
+                }
+
+                ++drawCount;
             }
 
-            ++drawCount;
+            ++pointCount;
 
-            if (drawCount>=minuteCount) //上一天的数据和这天地数据线段要断开
+            if (pointCount>=minuteCount) //上一天的数据和这天地数据线段要断开
             {
                 bFirstPoint=true;
-                this.Canvas.stroke();
+                pointCount=0;
+                if (drawCount>0) this.Canvas.stroke();
                 drawCount=0;
             }
         }
@@ -35863,24 +35891,46 @@ function ChartOverlayMinutePriceLine()
     this.GetMaxMin=function()
     {
         var xPointCount=this.ChartFrame.XPointCount;
-        var range={};
+        var range={ Min:null, Max:null };
         if (!this.IsCalcuateMaxMin) return range;
-        if (this.YClose==null) return range;
 
-        range.Min=this.MainYClose;
-        range.Max=this.MainYClose;
+        var minuteCount=this.ChartFrame.MinuteCount;
+        var yClose=null, mainYClose=null;
+        var bFirstPoint=true;
+        var pointCount=0;
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
         {
-            var value=this.Data.Data[i].Close;
-            if (value==null) continue;
+            var item=this.Data.Data[i];
+            if (!item || !IFrameSplitOperator.IsNumber(item.Close)) 
+            {
+                ++pointCount;
+                continue;
+            }
 
-            if (this.OverlayType==0) value=value/this.YClose*this.MainYClose;
+            if (bFirstPoint)
+            {
+                yClose=item.YClose;
+                var minItem=this.MainData.Data[i];
+                mainYClose=minItem.YClose;
+                bFirstPoint=false;
+            }
+
+            var value=item.Close;
+            if (this.OverlayType==0) value=value/yClose*mainYClose;
 
             if (range.Max==null) range.Max=value;
             if (range.Min==null) range.Min=value;
 
             if (range.Max<value) range.Max=value;
             if (range.Min>value) range.Min=value;
+
+            ++pointCount;
+
+            if (pointCount>=minuteCount)
+            {
+                bFirstPoint=true;
+                pointCount=0;
+            }
         }
 
         //JSConsole.Chart.Log(`[ChartOverlayMinutePriceLine::GetMaxMin] max=${range.Max} min=${range.Min}`);
@@ -77008,7 +77058,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     //叠加股票
     this.OverlaySymbol=function(symbol,option)
     {
-        for(var i in this.OverlayChartPaint)
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
             var item=this.OverlayChartPaint[i];
             if (item.Symbol==symbol)
@@ -77028,11 +77078,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (option && option.Color) paint.Color=option.Color; //外部设置颜色
         else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
         ++g_JSChartResource.OverlaySymbol.Random;
-        if (this.ChartPaint[0].YClose>0 && this.ChartPaint[0].Data) //绑定主图数据
-        {
-            paint.MainData=this.ChartPaint[0].Data; 
-            paint.MainYClose=this.ChartPaint[0].YClose;        
-        }
+        paint.MainData=this.SourceData; //绑定主图数据
 
         if (paint.SetOption) paint.SetOption(option);
 
@@ -78000,7 +78046,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
             let item=this.OverlayChartPaint[i];
-            if (!item.MainData || !(item.MainYClose>0) ) continue;
+            if (!item.MainData) continue;
             if (item.Status!=OVERLAY_STATUS_ID.STATUS_NONE_ID) continue;
             var symbol=item.Symbol;
             if (!symbol) continue;
@@ -78061,7 +78107,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             for(var j=0; j<this.OverlayChartPaint.length; ++j)
             {
                 var item=this.OverlayChartPaint[j];
-                if (!item.MainData || !(item.MainYClose>0) ) continue;
+                if (!item.MainData) continue;
                 if (overlayData.symbol==item.Symbol)
                 {
                     this.RecvOverlayMinuteData(overlayData, item, { Redraw:false });
@@ -78222,6 +78268,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             {
                 var empytData=new ChartData();
                 empytData.Date=item.Date;
+                empytData.Data.length=item.Data.length;
                 overlayDayData.push(empytData);
             }
         }
@@ -78455,11 +78502,10 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             this.ExtendChartPaint[0].Name=this.Name;
         }
 
-        for(var i in this.OverlayChartPaint)
+        for(var i=0; i<this.OverlayChartPaint.length; ++i)
         {
             var item=this.OverlayChartPaint[i];
-            item.MainData=this.ChartPaint[0].Data;         //叠加股票
-            item.MainYClose=yClose;
+            item.MainData=minuteData;           //绑定主图数据
         }
     }
 
@@ -102245,6 +102291,36 @@ function JSDraw(errorHandler,symbolData)
         return result;
     }
 
+    //叠加一个K线
+    this.DRAWOVERLAYKLINE=function(open, high, low, close)
+    {
+        var drawData=[];
+        var result={DrawData:drawData, DrawType:'DRAWOVERLAYKLINE'};
+        var count=Math.max(high.length, open.length,low.length,close.length);
+
+        var kData=this.SymbolData.Data.Data;
+        for(var i=0;i<count;++i)
+        {
+            var item={Open:null,High:null, Low:null, Close:null};
+            var kItem=kData[i];
+            if (i<high.length && i<open.length && i<low.length && i<close.length && 
+                IFrameSplitOperator.IsNumber(open[i]) && IFrameSplitOperator.IsNumber(high[i]) && IFrameSplitOperator.IsNumber(low[i]) && IFrameSplitOperator.IsNumber(low[i]))
+            {
+
+                item.Open=open[i];
+                item.High=high[i];
+                item.Low=low[i];
+                item.Close=close[i];
+                item.Date=kItem.Date;
+                if (IFrameSplitOperator.IsNumber(kItem.Time)) item.Time=kItem.Time;
+            }
+
+            drawData[i]=item;
+        }
+
+        return result;
+    }
+
     /*
     DRAWCOLORKLINE 绘制K线
     用法：
@@ -103752,7 +103828,7 @@ JSDraw.prototype.IsDrawFunction=function(name)
 {
     let setFunctionName=new Set(
     [
-        "STICKLINE","DRAWTEXT",'SUPERDRAWTEXT','DRAWLINE','DRAWBAND','DRAWKLINE',"DRAWKLINE1",'DRAWKLINE_IF',"DRAWCOLORKLINE",'PLOYLINE',
+        "STICKLINE","DRAWTEXT",'SUPERDRAWTEXT','DRAWLINE','DRAWBAND','DRAWKLINE',"DRAWKLINE1",'DRAWKLINE_IF',"DRAWCOLORKLINE",'PLOYLINE',"DRAWOVERLAYKLINE",
         'POLYLINE','DRAWNUMBER',"DRAWNUMBER_FIX",'DRAWICON','DRAWCHANNEL','PARTLINE','DRAWTEXT_FIX','DRAWGBK','DRAWTEXT_LINE','DRAWRECTREL',"DRAWTEXTABS","DRAWTEXTREL",
         'DRAWOVERLAYLINE',"FILLRGN", "FILLRGN2","FILLTOPRGN", "FILLBOTTOMRGN", "FILLVERTICALRGN","FLOATRGN","DRAWSL", "DRAWGBK2","DRAWGBK_DIV",
         "VERTLINE","HORLINE","TIPICON"
@@ -110036,6 +110112,10 @@ function JSExecute(ast,option)
                 node.Draw=this.Draw.DRAWKLINE_IF(args[0],args[1],args[2],args[3],args[4]);
                 node.Out=[];
                 break;
+            case "DRAWOVERLAYKLINE":
+                node.Draw=this.Draw.DRAWOVERLAYKLINE(args[0],args[1],args[2],args[3]);
+                node.Out=[];
+                break;
             case "DRAWCOLORKLINE":
                 node.Draw=this.Draw.DRAWCOLORKLINE(args[0],args[1],args[2]);
                 node.Out=[];
@@ -112657,6 +112737,28 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chart);
     }
 
+    this.CreateOverlayKLine=function(hqChart,windowIndex,varItem,id)
+    {
+        var chart=null;
+        if (hqChart.IsKLineContainer()) chart=new ChartOverlayKLine();
+        else if (hqChart.IsMinuteContainer()) chart=new ChartOverlayMinutePriceLine();
+        else return;
+
+        chart.Canvas=hqChart.Canvas;
+        chart.Name=varItem.Name;
+        chart.Identify=this.Guid;
+        chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+
+        if (varItem.Color) chart.Color=this.GetColor(varItem.Color);    //如果设置了颜色,使用外面设置的颜色
+        else chart.Color=this.GetDefaultColor(id);
+
+        chart.Data.Data=varItem.Draw.DrawData;
+        chart.MainData=hqChart.ChartPaint[0].Data;//绑定K线
+
+        hqChart.ChartPaint.push(chart);
+    }
+
     this.CreateDrawColorKLine=function(hqChart,windowIndex,varItem,i)
     {
         let chart=new ChartColorKline();
@@ -113497,6 +113599,9 @@ function ScriptIndex(name,script,args,option)
                     case "DRAWKLINE1":
                         this.CreateKLine(hqChart,windowIndex,item,i);
                         break;
+                    case "DRAWOVERLAYKLINE":
+                        this.CreateOverlayKLine(hqChart,windowIndex,item,i);
+                        break;
                     case "DRAWCOLORKLINE":
                         this.CreateDrawColorKLine(hqChart,windowIndex,item,i);
                         break;
@@ -128475,7 +128580,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12504";
+var HQCHART_VERSION="1.1.12512";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.wechat/umychart.complier.wechat.js

@@ -8574,7 +8574,7 @@ function JSDraw(errorHandler, symbolData)
     例如:
     DRAWICON(CLOSE>OPEN,LOW,1)表示当收阳时在最低价位置画1号图标.
     */
-    this.DRAWICON = function (condition, data, type) 
+    this.DRAWICON = function (condition, data, type, markID) 
     {
         if (IFrameSplitOperator.IsString(type)) //把ICO1=>1
         {
@@ -8586,6 +8586,7 @@ function JSDraw(errorHandler, symbolData)
         if (!icon) icon = { Symbol: '●', Color: 'rgb(0,139,69)'};
         let drawData = [];
         let result = { DrawData: drawData, DrawType: 'DRAWICON', Icon: icon , IconID:type};
+        if (markID) result.MarkID=markID;
         if (condition.length <= 0) return result;
 
         var IsNumber = typeof (data) == "number";
@@ -13254,7 +13255,7 @@ function JSExecute(ast,option)
                 node.Out=[];
                 break;
             case 'DRAWICON':
-                node.Draw = this.Draw.DRAWICON(args[0], args[1], args[2]);
+                node.Draw = this.Draw.DRAWICON(args[0], args[1], args[2], args[3]);
                 node.Out = [];
                 break;
             case "ICON":

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

@@ -2191,6 +2191,7 @@ export
     CUSTOM_SECOND_PERIOD_END,
     Rect,
     DataPlus,
+    g_DataPlus,
     Guid,
     ToFixedPoint,
     ToFixedRect,

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

@@ -935,6 +935,8 @@ function ScriptIndex(name, script, args, option)
         if (varItem.Color) chart.Color = this.GetColor(varItem.Color);
         else chart.Color = 'rgb(0,0,0)';
 
+        if (varItem.Draw.MarkID) chart.MarkID=varItem.Draw.MarkID;  //外部指定ID
+
         if (varItem.DrawVAlign>=0)
         {
             if (varItem.DrawVAlign==0) chart.TextBaseline="top";
@@ -961,6 +963,7 @@ function ScriptIndex(name, script, args, option)
         if (event && event.Callback)
         {
             var sendData={ FrameID:windowIndex, ID:id, Data:varItem, Callback:null };
+            if (varItem.Draw.MarkID) sendData.MarkID=varItem.Draw.MarkID;  //外部指定ID
             event.Callback(event, sendData,this);
             if (sendData.Callback)
             {
@@ -972,6 +975,7 @@ function ScriptIndex(name, script, args, option)
         let chartText = new ChartSingleText();
         chartText.Canvas = hqChart.Canvas;
         chartText.TextAlign = 'center';
+       
 
         chartText.Name = varItem.Name;
         chartText.ChartBorder = hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
@@ -984,6 +988,8 @@ function ScriptIndex(name, script, args, option)
         else if (varItem.Draw.Icon.Color) chartText.Color = varItem.Draw.Icon.Color;
         else chartText.Color = 'rgb(0,0,0)';
 
+       
+
         if (varItem.DrawVAlign>=0)
         {
             if (varItem.DrawVAlign==0) chartText.Direction=1;

package/src/jscommon/umychart.wechat/umychart.version.wechat.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.12500";
+var HQCHART_VERSION="1.1.12508";
 
 function PrintHQChartVersion()
 {