hqchart 1.1.12505 → 1.1.12516

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

@@ -5712,6 +5712,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
         this.JSChartContainer=chart;
 
+        if (option.DefaultCursor) chart.DefaultCursor=option.DefaultCursor;
         if (option.OnCreatedCallback) option.OnCreatedCallback(chart);
 
         //是否自动更新
@@ -6817,6 +6818,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.IsClickShowCorssCursor=false;              //手势点击显示十字光标
     this.ChartSplashPaint=null;                     //等待提示
     this.LoadDataSplashTitle="数据加载中";           //下载数据提示信息
+    this.DefaultCursor="default"; //crosshair , default  默认手型
 
     //绘图缓存
     this.CacheCanvas=null;   
@@ -7296,7 +7298,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         event.Callback(event, sendData, this);
         this.CustomChartDrag=sendData.ChartDrag;
 
-        if (sendData.Cusrsor) this.UIElement.style.cursor=sendData.Cusrsor;
+        this.SetCursor(sendData);
     }
 
     this.TryDragMove_CustomChartDrag=function(sendData)
@@ -7375,7 +7377,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             {
                 if (item.Type==4) 
                 {
-                    this.UIElement.style.cursor="pointer";
+                    //this.UIElement.style.cursor="pointer";
+                    this.SetCursor({Cursor:"pointer"});
                     var obj={ X:e.clientX };
                     if (this.GetXDataIndex(obj))
                     {
@@ -7385,7 +7388,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 }
                 else 
                 {
-                    this.UIElement.style.cursor="ew-resize";
+                    //this.UIElement.style.cursor="ew-resize";
+                    this.SetCursor({Cursor:"ew-resize"});
                     this.RectSelectDrag={ Index:item.PointIndex, Type:item.Type };
                     JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] drag rect select ",item);
                 }
@@ -7399,7 +7403,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var dragBorder=this.Frame.PtInFrameBorder(x,y);
             if (dragBorder && dragBorder.Index>=0)
             {
-                this.UIElement.style.cursor="n-resize";
+                //this.UIElement.style.cursor="n-resize";
+                this.SetCursor({Cursor:"n-resize"});
                 this.BorderDrag={ Index:dragBorder.Index };
                 JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] DragBorder ",dragBorder);
             }
@@ -7411,7 +7416,9 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var dragY=this.TryYDrag(x,y);
             if (dragY)
             {
-                this.UIElement.style.cursor=dragY.Position==0 ? "n-resize":"row-resize";
+                //this.UIElement.style.cursor=dragY.Position==0 ? "n-resize":"row-resize";
+                var cursor=dragY.Position==0 ? "n-resize":"row-resize";
+                this.SetCursor({Cursor:cursor});
                 this.YDrag=dragY;
                 JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] dragY ",dragY);
             }
@@ -7420,7 +7427,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var dragUpDown=this.TryUpDownDrag(x,y);
                 if (dragUpDown)
                 {
-                    this.UIElement.style.cursor="pointer";
+                    //this.UIElement.style.cursor="pointer";
+                    this.SetCursor({Cursor:"pointer"});
                     this.UpDownDrag=dragUpDown;
                     JSConsole.Chart.Log("[JSChartContainer::UIOnMouseDown] dragUpDown ",dragUpDown);
                 }
@@ -7743,8 +7751,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
             if (moveSetp<5 && yMoveSetp<5) return;
 
-            this.UIElement.style.cursor="default";
-
+            //this.UIElement.style.cursor="default";
+            this.SetCursor({Cursor:"default"});
             var x=drag.Click.X-uielement.getBoundingClientRect().left;
             var y=drag.Click.Y-uielement.getBoundingClientRect().top;
             var x2=e.clientX-uielement.getBoundingClientRect().left;
@@ -7773,7 +7781,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             {
                 var yMove=e.clientY-drag.LastMove.Y;
                 JSConsole.Chart.Log("[JSChartContainer::OnDragMode_One] UpDownDrag ",this.UpDownDrag,yMove);
-                this.UIElement.style.cursor="pointer";
+                //this.UIElement.style.cursor="pointer";
+                this.SetCursor({Cursor:"pointer"});
                 if (this.OnUpDonwFrameY(this.UpDownDrag, yMove)) 
                 {
                     bNeedDraw=true;
@@ -7820,7 +7829,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var oneStepWidth=this.GetMoveOneStepWidth();
                 if (moveSetp<oneStepWidth)
                 {
-                    this.UIElement.style.cursor=cursorStatus;
+                    //this.UIElement.style.cursor=cursorStatus;
+                    this.SetCursor({Cursor:cursorStatus});
                     if (bNeedDraw) this.Draw();
                     return;
                 }
@@ -7850,7 +7860,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         if (this.DragDownloadData) this.DragDownloadData();
                     }
                 }
-                this.UIElement.style.cursor=cursorStatus;
+                //this.UIElement.style.cursor=cursorStatus;
+                this.SetCursor({Cursor:cursorStatus});
             }
             drag.LastMove.X=e.clientX;
         }
@@ -7918,7 +7929,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var chartMove=this.GetExtendChartByClassName("DragMovePaint");
             if (chartMove && chartMove.Chart) chartMove.Chart.Clear();
             if (!this.OnDragChart(this.IndexChartDrag)) this.DrawDynamicInfo();
-            this.UIElement.style.cursor="default";
+            //this.UIElement.style.cursor="default";
+            this.SetCursor({Cursor:"default"});
         }
         else if (this.CustomChartDrag)
         {
@@ -8008,7 +8020,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         //清空数据
         JSConsole.Chart.Log('[KLineChartContainer::document.onmouseup]',e);
         if (this.SelectChartDrawPicture) this.SelectChartDrawPicture.DragInfo=null;
-        this.UIElement.style.cursor="default";
+        //this.UIElement.style.cursor="default";
+        this.SetCursor({Cursor:"default"});
         this.MouseDrag=null;
         this.ClickDownPoint=null;
         this.IsOnTouch=false;
@@ -9843,7 +9856,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         var frameID=this.Frame.PtInFrame(x,y);
         if (IFrameSplitOperator.IsNumber(frameID) && frameID>=0)    //在K线内部移动,调整K线索引
             this.CursorIndex=this.Frame.GetXData(x);
-
         
 
         if (this.EnableBorderDrag && this.Frame && !this.CurrentChartDrawPicture)
@@ -9966,13 +9978,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 
                 if (drawPictrueData.PointIndex===100) 
                 {
-                    if (drawPictrueData.Cursor) this.UIElement.style.cursor=drawPictrueData.Cursor;
-                    else this.UIElement.style.cursor="move";
+                    if (drawPictrueData.Cursor) this.SetCursor(drawPictrueData); //this.UIElement.style.cursor=drawPictrueData.Cursor;
+                    else this.SetCursor({Cursor:"move"}); //this.UIElement.style.cursor="move";
                 }
                 else 
                 {
-                    if (drawPictrueData.Cursor) this.UIElement.style.cursor=drawPictrueData.Cursor
-                    else this.UIElement.style.cursor="pointer";
+                    if (drawPictrueData.Cursor) this.SetCursor(drawPictrueData); //this.UIElement.style.cursor=drawPictrueData.Cursor
+                    else this.SetCursor({Cursor:"pointer"}); //this.UIElement.style.cursor="pointer";
                 }
 
                 bDrawPicture=true;
@@ -9980,7 +9992,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
             else 
             {
-                if (!this.MouseDrag) this.UIElement.style.cursor="default";
+                if (!this.MouseDrag) this.SetCursor({Cursor:"default"}); //this.UIElement.style.cursor="default";
             }
         }
 
@@ -10003,7 +10015,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.DrawDynamicInfo(option);
         }
        
-        if (mouseStatus) this.UIElement.style.cursor=mouseStatus.Cursor;
+        this.SetCursor(mouseStatus);
 
         if (this.IsShowTooltip && bDrawPicture==false)
         {
@@ -10031,6 +10043,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    //设置鼠标形状 {Cursor:鼠标形状 }
+    this.SetCursor=function(obj)
+    {
+        if (!obj || !obj.Cursor) return;
+
+        if (obj.Cursor=="default") 
+            this.UIElement.style.cursor=this.DefaultCursor;
+        else
+            this.UIElement.style.cursor=obj.Cursor;
+    }
+
     this.OnKeyDown=function(e)
     {
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
@@ -10414,6 +10437,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};
@@ -12777,6 +12807,7 @@ function CoordinateInfo()
     this.Value;                                                 //坐标数据
     this.Message=[];                                            //坐标输出文字信息 0=左 1=右 2=内左 3=内右
     this.TextColor=g_JSChartResource.FrameSplitTextColor        //文字颜色
+    this.TextBGColor;                                           //文字背景色
     this.TextColor2;                                            //右侧文字颜色,空使用TextColor
     this.Font=g_JSChartResource.FrameSplitTextFont;             //字体
     this.LineColor=g_JSChartResource.FrameSplitPen;             //线段颜色
@@ -14289,9 +14320,10 @@ function AverageWidthFrame()
                     this.Canvas.font=this.VerticalInfo[i].Font;
                 
                 var textLeft=0;
-                this.Canvas.fillStyle=item.TextColor;
+                
                 this.Canvas.strokeStyle=item.TextColor;
                 var testWidth=this.Canvas.measureText(this.VerticalInfo[i].Message[0]).width;
+                var textHeight=this.Canvas.measureText("擎").width;
                 if (x<testWidth/2)
                 {
                     this.Canvas.textAlign="left";
@@ -14325,6 +14357,15 @@ function AverageWidthFrame()
                         yText+=lineLength+2*pixelRatio;
                     }
 
+                    //item.TextBGColor="rgb(0,255,0)";
+                    if (item.TextBGColor)   //文字背景色
+                    {
+                        var rtText={ Left:textLeft, Top:yText+this.XBottomOffset, Width:testWidth, Height:textHeight };
+                        this.Canvas.fillStyle=item.TextBGColor;
+                        this.Canvas.fillRect(rtText.Left-1, rtText.Top, rtText.Width+2, rtText.Height);
+                    }
+
+                    this.Canvas.fillStyle=item.TextColor;
                     this.Canvas.fillText(this.VerticalInfo[i].Message[0],x,yText+this.XBottomOffset);
                     textRightPrev=textLeft+testWidth;
                 }
@@ -24989,9 +25030,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 +25155,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 +35810,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 +35831,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 +35866,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 +35925,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}`);
@@ -48796,6 +48880,7 @@ function FrameSplitMinuteX()
                 info.Value=item[0];
                 if (this.ShowText) info.Message[0]=item[3];
                 if (item[4]) info.LineColor=item[4];    //线段颜色
+                if (item[5]) info.TextBGColor=item[5];  //文字背景色
                 this.Frame.VerticalInfo[i]=info;
             }
         }
@@ -74872,7 +74957,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             if (moveSetp<5 && yMoveSetp<5) return;
             if (!this.EnableSelectRect) return;
 
-            this.UIElement.style.cursor="default";
+            //this.UIElement.style.cursor="default";
+            this.SetCursor({Cursor:"default"});
             var x=drag.Click.X-uielement.getBoundingClientRect().left;
             var y=drag.Click.Y-uielement.getBoundingClientRect().top;
             var x2=e.clientX-uielement.getBoundingClientRect().left;
@@ -77008,7 +77094,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 +77114,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 +78082,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 +78143,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 +78304,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 +78538,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;           //绑定主图数据
         }
     }
 
@@ -89818,7 +89900,7 @@ function MinuteCoordinateData()
         {
             Full:   //完整模式
             [
-                [0, 0, "rgb(200,200,200)", "09:30"],    //[0]=索引 [1]=线段类型 [2]=文字颜色(弃用) [3]=刻度文字 [4]=线段颜色
+                [0, 0, "rgb(200,200,200)", "09:30"],    //[0]=索引 [1]=线段类型 [2]=文字颜色(弃用) [3]=刻度文字 [4]=线段颜色 [5]=背景色
                 [31, 0, "RGB(200,200,200)", "10:00"],
                 [61, 0, "RGB(200,200,200)", "10:30"],
                 [91, 0, "RGB(200,200,200)", "11:00"],
@@ -102245,6 +102327,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 +103864,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 +110148,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 +112773,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 +113635,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 +128616,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12504";
+var HQCHART_VERSION="1.1.12515";
 
 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,