hqchart 1.1.12627 → 1.1.12633

package/lib/umychart.vue.js

@@ -5889,8 +5889,41 @@ this.newMethod();delete this.newMethod;this.Super_SetOption=this.SetOption;//父
 this.Super_ExportStorageData=this.ExportStorageData;this.Label;//{Text:文本, Position: 0=左, 1=右 }
 this.SetOption=function(option){if(this.Super_SetOption)this.Super_SetOption(option);if(option){if(option.Label)this.Label=option.Label;}};this.ExportStorageData=function(){var storageData;if(this.Super_ExportStorageData){storageData=this.Super_ExportStorageData();if(this.Label)storageData.Label=this.Label;}return storageData;};this.PointCount=1;this.ClassName='ChartDrawPictureHorizontalLine';this.IsPointIn=this.IsPointIn_XYValue_Line;this.Font=16*GetDevicePixelRatio()+"px 微软雅黑";this.GetXYCoordinate=function(){if(this.IsFrameMinSize())return null;var drawPoint=this.CalculateDrawPoint();return this.PointRange(drawPoint);};this.Draw=function(){this.LinePoint=[];if(this.IsFrameMinSize())return;var drawPoint=this.CalculateDrawPoint();if(!drawPoint||drawPoint.length!=1)return;if(!this.Frame)return;if(this.Value.length!=1)return;if(!this.IsYValueInFrame(this.Value[0].YValue))return null;var isHScreen=this.Frame.IsHScreen;var left=this.Frame.ChartBorder.GetLeft();var right=this.Frame.ChartBorder.GetRight();if(isHScreen){left=this.Frame.ChartBorder.GetTop();right=this.Frame.ChartBorder.GetBottom();}this.ClipFrame();this.Canvas.strokeStyle=this.LineColor;this.SetLineWidth();this.Canvas.beginPath();if(isHScreen){this.Canvas.moveTo(drawPoint[0].X,left);this.Canvas.lineTo(drawPoint[0].X,right);}else{this.Canvas.moveTo(left,drawPoint[0].Y);this.Canvas.lineTo(right,drawPoint[0].Y);}this.Canvas.stroke();this.RestoreLineWidth();var line={Start:new Point(),End:new Point()};if(isHScreen){line.Start.X=drawPoint[0].X;line.Start.Y=left;line.End.X=drawPoint[0].X;line.End.Y=right;}else{line.Start.X=left;line.Start.Y=drawPoint[0].Y;line.End.X=right;line.End.Y=drawPoint[0].Y;}this.LinePoint.push(line);//画点
 this.DrawPoint(drawPoint);//显示价格
-this.Canvas.fillStyle=this.LineColor;this.Canvas.font=this.Font;if(isHScreen){this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var xText=drawPoint[0].X;var yText=left;this.Canvas.translate(xText,yText);this.Canvas.rotate(90*Math.PI/180);//数据和框子旋转180度
-var yValue=this.Frame.GetYData(drawPoint[0].X);var text=yValue.toFixed(2);if(this.Label){if(this.Label.Position==0)text=this.Label.Text+yValue.toFixed(2);else if(this.Label.Position==1)text=yValue.toFixed(2)+this.Label.Text;}this.Canvas.fillText(text,0,0);}else{this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var yValue=this.Frame.GetYData(drawPoint[0].Y);var text=yValue.toFixed(2);if(this.Label){if(this.Label.Position==0)text=this.Label.Text+yValue.toFixed(2);else if(this.Label.Position==1)text=yValue.toFixed(2)+this.Label.Text;}this.Canvas.fillText(text,left,drawPoint[0].Y);}this.Canvas.restore();};}//水平线2
+this.LineText(drawPoint[0]);/*
+        this.Canvas.fillStyle=this.LineColor;
+        this.Canvas.font=this.Font;
+        if (isHScreen)
+        {
+            this.Canvas.textAlign="left";
+            this.Canvas.textBaseline="bottom";
+            var xText=drawPoint[0].X;
+            var yText=left;
+            this.Canvas.translate(xText, yText);
+            this.Canvas.rotate(90 * Math.PI / 180); //数据和框子旋转180度
+            var yValue=this.Frame.GetYData(drawPoint[0].X);
+            var text=yValue.toFixed(2);
+            if (this.Label)
+            {
+                if (this.Label.Position==0) text=this.Label.Text+yValue.toFixed(2);
+                else if (this.Label.Position==1) text=yValue.toFixed(2)+this.Label.Text;
+            }
+            this.Canvas.fillText(text,0,0);
+        }
+        else
+        {
+            this.Canvas.textAlign="left";
+            this.Canvas.textBaseline="bottom";
+            var yValue=this.Frame.GetYData(drawPoint[0].Y);
+            var text=yValue.toFixed(2);
+            if (this.Label)
+            {
+                if (this.Label.Position==0) text=this.Label.Text+yValue.toFixed(2);
+                else if (this.Label.Position==1) text=yValue.toFixed(2)+this.Label.Text;
+            }
+            this.Canvas.fillText(text,left,drawPoint[0].Y);
+        }
+        */this.Canvas.restore();};this.LineText=function(point){if(!point)return;var isHScreen=this.Frame.IsHScreen;var left=this.Frame.ChartBorder.GetLeft();this.Canvas.fillStyle=this.LineColor;this.Canvas.font=this.Font;if(isHScreen){left=this.Frame.ChartBorder.GetTop();this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var xText=point.X;var yText=left;this.Canvas.translate(xText,yText);this.Canvas.rotate(90*Math.PI/180);//数据和框子旋转180度
+var yValue=this.Frame.GetYData(point.X);var text=yValue.toFixed(2);if(this.Label){if(this.Label.Position==0)text=this.Label.Text+yValue.toFixed(2);else if(this.Label.Position==1)text=yValue.toFixed(2)+this.Label.Text;}this.Canvas.fillText(text,2,0);}else{this.Canvas.textAlign="left";this.Canvas.textBaseline="bottom";var yValue=this.Frame.GetYData(point.Y);var text=yValue.toFixed(2);if(this.Label){if(this.Label.Position==0)text=this.Label.Text+yValue.toFixed(2);else if(this.Label.Position==1)text=yValue.toFixed(2)+this.Label.Text;}this.Canvas.fillText(text,left,point.Y);}};}//水平线2
 function ChartDrawHLine(){this.newMethod=IChartDrawPicture;//派生
 this.newMethod();delete this.newMethod;this.Super_SetOption=this.SetOption;//父类函数
 this.Super_ExportStorageData=this.ExportStorageData;//this.Label;         //{Text:文本, Position: 0=左, 1=右 2=中间 }
@@ -7778,7 +7811,13 @@ this.ResetOverlaySymbolStatus();this.ReloadChartDrawPicture();this.ClearIndexRun
 {var systemScript=new JSIndexScript();for(var i=0;i<option.Windows.length;++i){var index=2+i;if(index>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
 var item=option.Windows[i];if(!item)continue;if(item.Script){this.WindowIndex[index]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
 }else if(item.API){var apiItem=item.API;this.WindowIndex[index]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexID=item.Index;var indexInfo=systemScript.Get(indexID);if(indexInfo){var args=indexInfo.Args;if(item.Args)indexInfo.Args=item.Args;indexInfo.ID=indexID;this.WindowIndex[index]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
-}}}}}if(!symbol||this.DayCount<=0){this.DrawEmpty();}else{this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);//增加下载动画
+}}}}//清空叠加股票
+if(option.ClearOverlay===true){for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];item.IsDelete=true;}this.OverlayChartPaint=[];this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint;//绑定叠加
+}//叠加股票
+if(option.Overlay&&IFrameSplitOperator.IsNonEmptyArray(option.Overlay)){var setSymbol=new _set2.default();for(var i=0;i<this.OverlayChartPaint.length;++i)//已有的叠加
+{var item=this.OverlayChartPaint[j];setSymbol.add(item.Symbol);}for(var i=0;i<option.Overlay.length;++i){var item=option.Overlay[i];if(setSymbol.has(item.Symbol))continue;var paint=new ChartOverlayMinutePriceLine();paint.Canvas=this.Canvas;paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;paint.ChartFrame=this.Frame.SubFrame[0].Frame;paint.Name="Overlay-Minute";paint.Symbol=item.Symbol;paint.Identify='Overlay-Minute-'+item.Symbol;if(item.Color)paint.Color=item.Color;//外部设置颜色
+else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];++g_JSChartResource.OverlaySymbol.Random;paint.MainData=this.SourceData;//绑定主图数据
+if(paint.SetOption)paint.SetOption(item);this.OverlayChartPaint.push(paint);}}}if(!symbol||this.DayCount<=0){this.DrawEmpty();}else{this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);//增加下载动画
 this.Draw();this.RequestData();}};this.SetPageInfo=function(pageInfo){if(!pageInfo)return;if(IFrameSplitOperator.IsBool(pageInfo.Enable))this.PageInfo.Enable=pageInfo.Enable;if(IFrameSplitOperator.IsNumber(pageInfo.Offset))this.PageInfo.Offset=pageInfo.Offset;if(IFrameSplitOperator.IsNumber(pageInfo.ShowDayCount))this.PageInfo.ShowDayCount=pageInfo.ShowDayCount;};this.ClearMinuteData=function(){this.SourceData=null;this.DayData=null;this.BeforeOpenData=null;this.AfterCloseData=null;this.MultiDayBeforeOpenData=null;this.MultiDayAfterCloseData=null;};this.ChangeDayCount=function(count,option){if(count<0)return;this.StopDisplayLatest();this.CancelAutoUpdate();this.AutoUpdateEvent(false,"MinuteChartContainer::ChangeDayCount");this.DayCount=count;this.ClearMinuteData();if(option&&option.PageInfo){this.SetPageInfo(option.PageInfo);this.ResetDayOffset();}if(this.DayCount>1){this.ChartDrawPicture=[];}else{this.ReloadChartDrawPicture();}this.ResetDataStatus();this.ClearIndexPaint();//清空指标
 this.ResetOverlaySymbolStatus();this.RequestData();};//叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
 this.OverlaySymbol=function(symbol,option){var arySymbol=null;if(IFrameSplitOperator.IsString(symbol))arySymbol=[symbol];else if(Array.isArray(symbol))arySymbol=symbol;if(!IFrameSplitOperator.IsNonEmptyArray(arySymbol))return false;var aryNewSymbol=[];for(var i=0,j=0;i<arySymbol.length;++i){var strSymbol=arySymbol[i];var bFind=false;for(j=0;j<this.OverlayChartPaint.length;++j){var item=this.OverlayChartPaint[j];if(item.Symbol==strSymbol){bFind=true;console.warn('[MinuteChartContainer::OverlaySymbol] overlay symbol='+strSymbol+' exist.');break;}}if(!bFind)aryNewSymbol.push(strSymbol);}if(!IFrameSplitOperator.IsNonEmptyArray(arySymbol))return true;for(var i=0;i<aryNewSymbol.length;++i){var strSymbol=aryNewSymbol[i];var paint=new ChartOverlayMinutePriceLine();paint.Canvas=this.Canvas;paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;paint.ChartFrame=this.Frame.SubFrame[0].Frame;paint.Name="Overlay-Minute";paint.Symbol=strSymbol;paint.Identify='Overlay-Minute-'+strSymbol;if(option&&option.Color)paint.Color=option.Color;//外部设置颜色
@@ -12734,7 +12773,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12627";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12632";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12627",
+  "version": "1.1.12633",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -52981,7 +52981,8 @@ function ChartDrawPictureHorizontalLine()
         this.DrawPoint(drawPoint);
 
         //显示价格
-        
+        this.LineText(drawPoint[0])
+        /*
         this.Canvas.fillStyle=this.LineColor;
         this.Canvas.font=this.Font;
         if (isHScreen)
@@ -53014,9 +53015,53 @@ function ChartDrawPictureHorizontalLine()
             }
             this.Canvas.fillText(text,left,drawPoint[0].Y);
         }
+        */
         
         this.Canvas.restore();
     }
+
+    this.LineText=function(point)
+    {
+        if (!point) return;
+
+        var isHScreen=this.Frame.IsHScreen;
+        var left=this.Frame.ChartBorder.GetLeft();
+
+        this.Canvas.fillStyle=this.LineColor;
+        this.Canvas.font=this.Font;
+
+        if (isHScreen)
+        {
+            left=this.Frame.ChartBorder.GetTop();
+            this.Canvas.textAlign="left";
+            this.Canvas.textBaseline="bottom";
+            var xText=point.X;
+            var yText=left;
+            this.Canvas.translate(xText, yText);
+            this.Canvas.rotate(90 * Math.PI / 180); //数据和框子旋转180度
+            var yValue=this.Frame.GetYData(point.X);
+            var text=yValue.toFixed(2);
+            if (this.Label)
+            {
+                if (this.Label.Position==0) text=this.Label.Text+yValue.toFixed(2);
+                else if (this.Label.Position==1) text=yValue.toFixed(2)+this.Label.Text;
+            }
+            this.Canvas.fillText(text,2,0);
+        }
+        else
+        {
+            this.Canvas.textAlign="left";
+            this.Canvas.textBaseline="bottom";
+            var yValue=this.Frame.GetYData(point.Y);
+            var text=yValue.toFixed(2);
+            if (this.Label)
+            {
+                if (this.Label.Position==0) text=this.Label.Text+yValue.toFixed(2);
+                else if (this.Label.Position==1) text=yValue.toFixed(2)+this.Label.Text;
+            }
+            this.Canvas.fillText(text,left,point.Y);
+        }
+    }
 }
 
 //水平线2
@@ -74088,6 +74133,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     }
                 }
             }
+
+            //清空叠加股票
+            if (option.ClearOverlay===true)
+            {
+                for(var i=0; i<this.OverlayChartPaint.length; ++i)
+                {
+                    var item=this.OverlayChartPaint[i];
+                    item.IsDelete=true;
+                }
+
+                this.OverlayChartPaint=[];
+                this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
+                this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint;    //绑定叠加
+            }
+
+            //叠加股票
+            if (option.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
+            {
+                var setSymbol=new Set();
+                for(var i=0;i<this.OverlayChartPaint.length;++i)    //已有的叠加
+                {
+                    var item=this.OverlayChartPaint[j];
+                    setSymbol.add(item.Symbol);
+                }
+
+                for(var i=0;i<option.Overlay.length;++i)
+                {
+                    var item=option.Overlay[i];
+                    if (setSymbol.has(item.Symbol)) continue;
+
+                    var paint=new ChartOverlayMinutePriceLine();
+                    paint.Canvas=this.Canvas;
+                    paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
+                    paint.ChartFrame=this.Frame.SubFrame[0].Frame;
+                    paint.Name="Overlay-Minute";
+                    paint.Symbol=item.Symbol;
+                    paint.Identify=`Overlay-Minute-${item.Symbol}`;
+                    if (item.Color) paint.Color=item.Color; //外部设置颜色
+                    else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
+                    ++g_JSChartResource.OverlaySymbol.Random;
+                    paint.MainData=this.SourceData; //绑定主图数据
+            
+                    if (paint.SetOption) paint.SetOption(item);
+            
+                    this.OverlayChartPaint.push(paint);
+                }
+            }
         }
 
         if (!symbol || this.DayCount<=0)

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -57061,7 +57061,8 @@ function ChartDrawPictureHorizontalLine()
         this.DrawPoint(drawPoint);
 
         //显示价格
-        
+        this.LineText(drawPoint[0])
+        /*
         this.Canvas.fillStyle=this.LineColor;
         this.Canvas.font=this.Font;
         if (isHScreen)
@@ -57094,9 +57095,53 @@ function ChartDrawPictureHorizontalLine()
             }
             this.Canvas.fillText(text,left,drawPoint[0].Y);
         }
+        */
         
         this.Canvas.restore();
     }
+
+    this.LineText=function(point)
+    {
+        if (!point) return;
+
+        var isHScreen=this.Frame.IsHScreen;
+        var left=this.Frame.ChartBorder.GetLeft();
+
+        this.Canvas.fillStyle=this.LineColor;
+        this.Canvas.font=this.Font;
+
+        if (isHScreen)
+        {
+            left=this.Frame.ChartBorder.GetTop();
+            this.Canvas.textAlign="left";
+            this.Canvas.textBaseline="bottom";
+            var xText=point.X;
+            var yText=left;
+            this.Canvas.translate(xText, yText);
+            this.Canvas.rotate(90 * Math.PI / 180); //数据和框子旋转180度
+            var yValue=this.Frame.GetYData(point.X);
+            var text=yValue.toFixed(2);
+            if (this.Label)
+            {
+                if (this.Label.Position==0) text=this.Label.Text+yValue.toFixed(2);
+                else if (this.Label.Position==1) text=yValue.toFixed(2)+this.Label.Text;
+            }
+            this.Canvas.fillText(text,2,0);
+        }
+        else
+        {
+            this.Canvas.textAlign="left";
+            this.Canvas.textBaseline="bottom";
+            var yValue=this.Frame.GetYData(point.Y);
+            var text=yValue.toFixed(2);
+            if (this.Label)
+            {
+                if (this.Label.Position==0) text=this.Label.Text+yValue.toFixed(2);
+                else if (this.Label.Position==1) text=yValue.toFixed(2)+this.Label.Text;
+            }
+            this.Canvas.fillText(text,left,point.Y);
+        }
+    }
 }
 
 //水平线2
@@ -78168,6 +78213,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     }
                 }
             }
+
+            //清空叠加股票
+            if (option.ClearOverlay===true)
+            {
+                for(var i=0; i<this.OverlayChartPaint.length; ++i)
+                {
+                    var item=this.OverlayChartPaint[i];
+                    item.IsDelete=true;
+                }
+
+                this.OverlayChartPaint=[];
+                this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
+                this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint;    //绑定叠加
+            }
+
+            //叠加股票
+            if (option.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
+            {
+                var setSymbol=new Set();
+                for(var i=0;i<this.OverlayChartPaint.length;++i)    //已有的叠加
+                {
+                    var item=this.OverlayChartPaint[j];
+                    setSymbol.add(item.Symbol);
+                }
+
+                for(var i=0;i<option.Overlay.length;++i)
+                {
+                    var item=option.Overlay[i];
+                    if (setSymbol.has(item.Symbol)) continue;
+
+                    var paint=new ChartOverlayMinutePriceLine();
+                    paint.Canvas=this.Canvas;
+                    paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
+                    paint.ChartFrame=this.Frame.SubFrame[0].Frame;
+                    paint.Name="Overlay-Minute";
+                    paint.Symbol=item.Symbol;
+                    paint.Identify=`Overlay-Minute-${item.Symbol}`;
+                    if (item.Color) paint.Color=item.Color; //外部设置颜色
+                    else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
+                    ++g_JSChartResource.OverlaySymbol.Random;
+                    paint.MainData=this.SourceData; //绑定主图数据
+            
+                    if (paint.SetOption) paint.SetOption(item);
+            
+                    this.OverlayChartPaint.push(paint);
+                }
+            }
         }
 
         if (!symbol || this.DayCount<=0)
@@ -129946,7 +130038,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12627";
+var HQCHART_VERSION="1.1.12632";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -57105,7 +57105,8 @@ function ChartDrawPictureHorizontalLine()
         this.DrawPoint(drawPoint);
 
         //显示价格
-        
+        this.LineText(drawPoint[0])
+        /*
         this.Canvas.fillStyle=this.LineColor;
         this.Canvas.font=this.Font;
         if (isHScreen)
@@ -57138,9 +57139,53 @@ function ChartDrawPictureHorizontalLine()
             }
             this.Canvas.fillText(text,left,drawPoint[0].Y);
         }
+        */
         
         this.Canvas.restore();
     }
+
+    this.LineText=function(point)
+    {
+        if (!point) return;
+
+        var isHScreen=this.Frame.IsHScreen;
+        var left=this.Frame.ChartBorder.GetLeft();
+
+        this.Canvas.fillStyle=this.LineColor;
+        this.Canvas.font=this.Font;
+
+        if (isHScreen)
+        {
+            left=this.Frame.ChartBorder.GetTop();
+            this.Canvas.textAlign="left";
+            this.Canvas.textBaseline="bottom";
+            var xText=point.X;
+            var yText=left;
+            this.Canvas.translate(xText, yText);
+            this.Canvas.rotate(90 * Math.PI / 180); //数据和框子旋转180度
+            var yValue=this.Frame.GetYData(point.X);
+            var text=yValue.toFixed(2);
+            if (this.Label)
+            {
+                if (this.Label.Position==0) text=this.Label.Text+yValue.toFixed(2);
+                else if (this.Label.Position==1) text=yValue.toFixed(2)+this.Label.Text;
+            }
+            this.Canvas.fillText(text,2,0);
+        }
+        else
+        {
+            this.Canvas.textAlign="left";
+            this.Canvas.textBaseline="bottom";
+            var yValue=this.Frame.GetYData(point.Y);
+            var text=yValue.toFixed(2);
+            if (this.Label)
+            {
+                if (this.Label.Position==0) text=this.Label.Text+yValue.toFixed(2);
+                else if (this.Label.Position==1) text=yValue.toFixed(2)+this.Label.Text;
+            }
+            this.Canvas.fillText(text,left,point.Y);
+        }
+    }
 }
 
 //水平线2
@@ -78212,6 +78257,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     }
                 }
             }
+
+            //清空叠加股票
+            if (option.ClearOverlay===true)
+            {
+                for(var i=0; i<this.OverlayChartPaint.length; ++i)
+                {
+                    var item=this.OverlayChartPaint[i];
+                    item.IsDelete=true;
+                }
+
+                this.OverlayChartPaint=[];
+                this.Frame.SubFrame[0].Frame.YSplitOperator.OverlayChartPaint=this.OverlayChartPaint;
+                this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint;    //绑定叠加
+            }
+
+            //叠加股票
+            if (option.Overlay && IFrameSplitOperator.IsNonEmptyArray(option.Overlay))
+            {
+                var setSymbol=new Set();
+                for(var i=0;i<this.OverlayChartPaint.length;++i)    //已有的叠加
+                {
+                    var item=this.OverlayChartPaint[j];
+                    setSymbol.add(item.Symbol);
+                }
+
+                for(var i=0;i<option.Overlay.length;++i)
+                {
+                    var item=option.Overlay[i];
+                    if (setSymbol.has(item.Symbol)) continue;
+
+                    var paint=new ChartOverlayMinutePriceLine();
+                    paint.Canvas=this.Canvas;
+                    paint.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;
+                    paint.ChartFrame=this.Frame.SubFrame[0].Frame;
+                    paint.Name="Overlay-Minute";
+                    paint.Symbol=item.Symbol;
+                    paint.Identify=`Overlay-Minute-${item.Symbol}`;
+                    if (item.Color) paint.Color=item.Color; //外部设置颜色
+                    else paint.Color=g_JSChartResource.OverlaySymbol.Color[g_JSChartResource.OverlaySymbol.Random%g_JSChartResource.OverlaySymbol.Color.length];
+                    ++g_JSChartResource.OverlaySymbol.Random;
+                    paint.MainData=this.SourceData; //绑定主图数据
+            
+                    if (paint.SetOption) paint.SetOption(item);
+            
+                    this.OverlayChartPaint.push(paint);
+                }
+            }
         }
 
         if (!symbol || this.DayCount<=0)
@@ -130104,7 +130196,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12627";
+var HQCHART_VERSION="1.1.12632";
 
 function PrintHQChartVersion()
 {