hqchart 1.1.12622 → 1.1.12631

package/lib/umychart.vue.js

@@ -5770,7 +5770,7 @@ this.PointToValue=function(){if(!this.Frame)return false;if(this.Frame.ClassName
 this.ValueToPoint=function(){if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;//this.UpdateXValue();
 var isHScreen=this.Frame.IsHScreen;this.Point=[];for(var i=0;i<this.Value.length;++i){var item=this.Value[i];var pt=new Point();if(isHScreen){pt.Y=this.Frame.GetXFromIndex(item.XValue-data.DataOffset,false);pt.X=this.Frame.GetYFromData(item.YValue,false);}else{pt.X=this.Frame.GetXFromIndex(item.XValue-data.DataOffset,false);pt.Y=this.Frame.GetYFromData(item.YValue,false);}this.Point[i]=pt;}};this.UpdateXValue=function()//通过datetime更新x的索引
 {if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;var aryDateTime=[];for(var i=0;i<this.Value.length;++i){var item=this.Value[i];if(!item.DateTime)break;var dateTime={Date:item.DateTime.Date};if(IFrameSplitOperator.IsNumber(item.DateTime.Time))dateTime.Time=item.DateTime.Time;aryDateTime[i]=dateTime;}data.FindDataIndexByDateTime(aryDateTime);for(var i in aryDateTime){var findItem=aryDateTime[i];var valueItem=this.Value[i];if(findItem.Index>=0)valueItem.XValue=findItem.Index;}};//xStep,yStep 移动的偏移量
-this.Move=function(xStep,yStep){if(this.Status!=20)return fasle;if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;if(this.MovePointIndex==null)return false;var index=parseInt(this.MovePointIndex);if(index===100)//整体移动
+this.Move=function(xStep,yStep){if(this.Status!=20)return false;if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;if(this.MovePointIndex==null)return false;var index=parseInt(this.MovePointIndex);if(index===100)//整体移动
 {if(this.IsMoveOutOfBounds(this.Point,xStep,yStep))return false;for(var i in this.Point){this.Point[i].X+=xStep;this.Point[i].Y+=yStep;}}else if(index===0||index===1||index===2||index===3||index===4||index===5){if(index<this.Point.length){this.Point[index].X+=xStep;this.Point[index].Y+=yStep;}}else{return false;}};//是否超出边界了
 this.IsMoveOutOfBounds=function(aryPoint,xStep,yStep){if(!this.EnableMoveCheck)return false;if(!this.Frame)return false;if(this.Frame.ClassName=="MinuteFrame"||this.Frame.Class=="MinuteHScreenFrame")return false;var data=this.Frame.Data;if(!data)return false;if(!IFrameSplitOperator.IsNonEmptyArray(data.Data))return false;if(!IFrameSplitOperator.IsNonEmptyArray(aryPoint))return false;var isHScreen=this.Frame.IsHScreen;if(isHScreen){//TODO:横屏以后再做
 return false;}else{var offset=data.DataOffset;var startIndex=0-offset;var endIndex=data.Data.length-offset;if(xStep>0){var xEnd=this.Frame.GetXFromIndex(endIndex-1,false);for(var i=0;i<aryPoint.length;++i){var item=aryPoint[i];if(item.X+xStep>xEnd)return true;}}else if(xStep<0){var xStart=this.Frame.GetXFromIndex(startIndex,false);for(var i=0;i<aryPoint.length;++i){var item=aryPoint[i];if(item.X+xStep<xStart)return true;}}return false;}};this.ClipFrame=function(){if(this.Frame.IsHScreen){var left=this.Frame.ChartBorder.GetLeftEx();var top=this.Frame.ChartBorder.GetTop();var width=this.Frame.ChartBorder.GetWidthEx();var height=this.Frame.ChartBorder.GetHeight();}else{var left=this.Frame.ChartBorder.GetLeft();var top=this.Frame.ChartBorder.GetTopEx();var width=this.Frame.ChartBorder.GetWidth();var height=this.Frame.ChartBorder.GetHeightEx();}this.Canvas.save();this.Canvas.beginPath();this.Canvas.rect(left,top,width,height);this.Canvas.clip();};//计算需要画的点的坐标option:{IsCheckX:是否检测X值, IsCheckY:是否检测Y值}
@@ -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=中间 }
@@ -5987,7 +6020,7 @@ this.CalculateDrawPoint=function(){if(this.Status<2)return null;if(!this.Point.l
 linePoint={Start:new Point(),End:new Point()};linePoint.Start.X=drawPoint[0].X;linePoint.Start.Y=drawPoint[0].Y-yMove;linePoint.End.X=drawPoint[1].X;linePoint.End.Y=drawPoint[1].Y-yMove;this.LinePoint.push(linePoint);var ptCenter=new Point();ptCenter.X=linePoint.Start.X+(linePoint.End.X-linePoint.Start.X)/2;ptCenter.Y=linePoint.Start.Y+(linePoint.End.Y-linePoint.Start.Y)/2;drawPoint[2]=ptCenter;this.Point[2]=ptCenter;var xValue=parseInt(this.Frame.GetXData(ptCenter.X))+data.DataOffset;var yValue=this.Frame.GetYData(ptCenter.Y);this.Value[2]={XValue:xValue,YValue:yValue};this.PointCount=this.Point.length;//完成以后是3个点
 linePoint={Start:new Point(),End:new Point()};linePoint.Start.X=drawPoint[0].X;linePoint.Start.Y=drawPoint[0].Y-yMove/2;linePoint.End.X=drawPoint[1].X;linePoint.End.Y=drawPoint[1].Y-yMove/2;this.CenterLine.Line=linePoint;}}return drawPoint;};this.DrawArea=function(pt,pt2,pt3,pt4){this.Canvas.fillStyle=this.AreaColor;this.Canvas.beginPath();this.Canvas.moveTo(pt.X,pt.Y);this.Canvas.lineTo(pt2.X,pt2.Y);this.Canvas.lineTo(pt3.X,pt3.Y);this.Canvas.lineTo(pt4.X,pt4.Y);this.Canvas.closePath();this.Canvas.fill();};this.Draw=function(){this.LinePoint=[];if(this.IsFrameMinSize())return;var drawPoint=this.CalculateDrawPoint();if(!drawPoint)return;this.AreaColor=IChartDrawPicture.ColorToRGBA(this.LineColor,0.3);this.ClipFrame();if(this.LinePoint.length==2){this.DrawArea(this.LinePoint[0].Start,this.LinePoint[0].End,this.LinePoint[1].End,this.LinePoint[1].Start);}for(var i=0;i<this.LinePoint.length;++i){var item=this.LinePoint[i];this.DrawLine(item.Start,item.End);}if(this.CenterLine.IsShow&&this.CenterLine.Line){var item=this.CenterLine.Line;this.Canvas.setLineDash(this.CenterLine.LineDash);this.DrawLine(item.Start,item.End);this.Canvas.setLineDash([]);}this.Canvas.restore();this.DrawPoint(drawPoint);//画点
 };//xStep,yStep 移动的偏移量
-this.Move=function(xStep,yStep){if(this.Status!=20)return fasle;if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;if(this.MovePointIndex==100)//整体移动
+this.Move=function(xStep,yStep){if(this.Status!=20)return false;if(!this.Frame)return false;var data=this.Frame.Data;if(!data)return false;if(this.MovePointIndex==100)//整体移动
 {for(var i=0;i<this.Point.length;++i){this.Point[i].X+=xStep;this.Point[i].Y+=yStep;}}else if(this.MovePointIndex==0||this.MovePointIndex==1){if(this.MovePointIndex<this.Point.length){this.Point[this.MovePointIndex].X+=xStep;this.Point[this.MovePointIndex].Y+=yStep;}}else if(this.MovePointIndex==2)//宽度的点要计算
 {this.Point[this.MovePointIndex].X+=xStep;this.Point[this.MovePointIndex].Y+=yStep;var x=this.Point[1].X-this.Point[0].X;var y=this.Point[1].Y-this.Point[0].Y;var angle=Math.atan(Math.abs(x/y));var yMove=this.ChannelWidth/Math.sin(angle)-yStep;this.ChannelWidth=Math.sin(angle)*yMove;}};//0-10 鼠标对应的点索引   100=鼠标在正个图形上  -1 鼠标不在图形上
 this.IsPointIn=function(x,y){if(!this.Frame||this.Status!=10)return-1;var data=this.Frame.Data;if(!data)return-1;//是否在点上
@@ -7279,7 +7312,12 @@ this.ClearIndexPaint();//清空指标
 if(option){if(option.Windows&&Array.isArray(option.Windows)&&option.Windows.length>0){var windows=option.Windows;var systemScript=new JSIndexScript();for(var i in windows){if(i>=this.WindowIndex.length)break;//暂时不支持 动态增加/减少
 var item=windows[i];if(!item)continue;if(item.Script){this.WindowIndex[i]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
 }else if(item.API){var apiItem=item.API;this.WindowIndex[i]=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[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
-}}}}}this.ReloadChartDrawPicture();this.Frame.ClearUpDonwFrameYData();if(ChartData.IsDayPeriod(this.Period,true)){this.ClearStockCache();this.RequestHistoryData();//请求日线数据
+}}}}//清空叠加股票
+if(option.ClearOverlay===true){for(var i in this.OverlayChartPaint){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(open.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);}}}this.ReloadChartDrawPicture();this.Frame.ClearUpDonwFrameYData();if(ChartData.IsDayPeriod(this.Period,true)){this.ClearStockCache();this.RequestHistoryData();//请求日线数据
 //this.ReqeustKLineInfoData();
 }else if(ChartData.IsMinutePeriod(this.Period,true)||ChartData.IsSecondPeriod(this.Period)||ChartData.IsMilliSecondPeriod(this.Period)){this.ClearStockCache();this.ReqeustHistoryMinuteData();//请求分钟数据
 }else if(ChartData.IsTickPeriod(this.Period)){this.ClearStockCache();this.RequestTickData();}};this.ReqeustKLineInfoData=function(obj){if(obj&&obj.FunctionName=="RecvDragDayData")//增量更新
@@ -7780,10 +7818,10 @@ var item=option.Windows[i];if(!item)continue;if(item.Script){this.WindowIndex[in
 }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);//增加下载动画
 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();};//叠加股票
-this.OverlaySymbol=function(symbol,option){for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(item.Symbol==symbol){console.warn('[MinuteChartContainer::OverlaySymbol] overlay symbol='+symbol+' exist.');return false;}}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=symbol;paint.Identify='Overlay-Minute-'+symbol;if(option&&option.Color)paint.Color=option.Color;//外部设置颜色
+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;//外部设置颜色
 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(option);this.OverlayChartPaint.push(paint);if(this.DayCount<=1)this.RequestOverlayMinuteData();//请求数据
+if(paint.SetOption)paint.SetOption(option);this.OverlayChartPaint.push(paint);}if(this.DayCount<=1)this.RequestOverlayMinuteData();//请求数据
 else this.RequestOverlayHistoryMinuteData();return true;};this.ResetOverlaySymbolStatus=function(){for(var i in this.OverlayChartPaint){var item=this.OverlayChartPaint[i];item.Status=OVERLAY_STATUS_ID.STATUS_NONE_ID;}};//删除一个叠加股票
 this.DeleteOverlaySymbol=function(symbol){for(var i in this.OverlayChartPaint){var item=this.OverlayChartPaint[i];if(item.Symbol===symbol){item.IsDelete=true;this.OverlayChartPaint.splice(i,1);this.UpdateFrameMaxMin();this.Draw();return true;}}console.warn('[MinuteChartContainer::DeleteOverlaySymbol] overlay symbol='+symbol+' not exist.');return false;};//取消叠加股票
 this.ClearOverlaySymbol=function(){for(var i in this.OverlayChartPaint){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;//绑定叠加
@@ -10351,10 +10389,10 @@ this.ALL=function(data,n){if(n<=0)n=1;var result=[];if(Array.isArray(data)){if(n
     SUMBARS(X,A):将X向前累加直到大于等于A,返回这个区间的周期数,若所有的数据都累加后还不能达到A,则返回此时前面的总周期数.
     例如:SUMBARS(VOL,CAPITAL)求完全换手到现在的周期数
     */this.SUMBARS=function(data,data2){var isArray=Array.isArray(data);var isArray2=Array.isArray(data2);var isNumber=IFrameSplitOperator.IsNumber(data);var isNumber2=IFrameSplitOperator.IsNumber(data2);var result=[];if(isArray&&isNumber2){for(var i=0,n=0;i<data.length;++i){var sum=0;var n=0;for(var j=i-1;j>=0;--j,++n){var item=data[i];if(!IFrameSplitOperator.IsNumber(item))continue;sum+=data[j];if(sum>data2){break;}}result[i]=n;}}else if(isArray&&isArray2){var count=Math.max(data.length,data2.length);for(var i=0;i<count;++i){result[i]=null;var sum=0;var n=0;var value=data2[i];if(!IFrameSplitOperator.IsNumber(value))continue;for(var j=i-1;j>=0;--j,++n){var item=data[i];if(!IFrameSplitOperator.IsNumber(item))continue;sum+=data[j];if(sum>value){break;}}result[i]=n;}}else if(isNumber&&isArray2){for(var i=0;i<data2.length;++i){result[i]=null;var sum=0;var n=0;var value=data2[i];if(!IFrameSplitOperator.IsNumber(value))continue;for(var j=i-1;j>=0;--j,++n){sum+=data;if(sum>value){break;}}result[i]=n;}}else if(isNumber&&isNumber2){//TODO: 后面再写吧
-}return result;};//格式化字符串 "{0}-{1}", C, O;
-this.STRFORMAT=function(strFormat,args,node){var aryParam=strFormat.match(/{\d+}/g);if(!IFrameSplitOperator.IsNonEmptyArray(aryParam))return null;var mapParam=new _map2.default();//key=index, value={Text}
-var maxIndex=-1;for(var i=0;i<aryParam.length;++i){var item=aryParam[i];if(item.length<3)continue;var value=item.slice(1,item.length-1);var index=parseInt(value);var paramItem={Src:item,Index:index,Text:null};if(maxIndex<index)maxIndex=index;mapParam.set(index,paramItem);}var isArray=false;//是否输出数组字符串
-var maxCount=0;for(var i=1;i<args.length;++i){var item=args[i];if(Array.isArray(item)){isArray=true;if(maxCount<item.length)maxCount=item.length;}}if(isArray){var result=[];for(var i=0;i<maxCount;++i){var strItem=strFormat;var _iteratorNormalCompletion19=true;var _didIteratorError19=false;var _iteratorError19=undefined;try{for(var _iterator19=(0,_getIterator3.default)(mapParam),_step19;!(_iteratorNormalCompletion19=(_step19=_iterator19.next()).done);_iteratorNormalCompletion19=true){var item=_step19.value;var paramInfo=item[1];var paramItem=args[paramInfo.Index+1];var text="null";if(paramItem){if(Array.isArray(paramItem)){var value=paramItem[i];if(value)text=''+value;}else{text=''+paramItem;}}strItem=strItem.replace(paramInfo.Src,text);}}catch(err){_didIteratorError19=true;_iteratorError19=err;}finally{try{if(!_iteratorNormalCompletion19&&_iterator19.return){_iterator19.return();}}finally{if(_didIteratorError19){throw _iteratorError19;}}}result[i]=strItem;}return result;}else{var result=strFormat;var _iteratorNormalCompletion20=true;var _didIteratorError20=false;var _iteratorError20=undefined;try{for(var _iterator20=(0,_getIterator3.default)(mapParam),_step20;!(_iteratorNormalCompletion20=(_step20=_iterator20.next()).done);_iteratorNormalCompletion20=true){var item=_step20.value;var paramInfo=item[1];var paramItem=args[paramInfo.Index+1];var text="null";if(paramItem){text=''+paramItem;}result=result.replace(paramInfo.Src,text);}}catch(err){_didIteratorError20=true;_iteratorError20=err;}finally{try{if(!_iteratorNormalCompletion20&&_iterator20.return){_iterator20.return();}}finally{if(_didIteratorError20){throw _iteratorError20;}}}return result;}};//函数调用
+}return result;};//格式化字符串 "{0}-{1}", C, O;  小数位数 {0:0.00}
+this.STRFORMAT=function(strFormat,args,node){var aryParam=strFormat.match(/{[0-9.:]+}/g);if(!IFrameSplitOperator.IsNonEmptyArray(aryParam))return null;var mapParam=new _map2.default();//key=index, value={Text}
+var maxIndex=-1;for(var i=0;i<aryParam.length;++i){var item=aryParam[i];if(item.length<3)continue;var value=item.slice(1,item.length-1);var index=-1,decimal=-1;if(value.indexOf(":")>0){var aryTemp=value.split(":");if(aryTemp){if(aryTemp[0])index=parseInt(aryTemp[0]);if(aryTemp[1]){if(aryTemp[1].indexOf(".")>=0){var zeroCount=0;var strTemp=aryTemp[1];for(var j=strTemp.length-1;j>=0;--j){if(strTemp[j]=="0")++zeroCount;else break;}if(zeroCount>0)decimal=zeroCount;}else if(aryTemp[1]=="0"){decimal=0;}}}}else{index=parseInt(value);}if(index<0)continue;var paramItem={Src:item,Index:index,Text:null,Decimal:null};if(decimal>=0)paramItem.Decimal=decimal;if(maxIndex<index)maxIndex=index;mapParam.set(index,paramItem);}var isArray=false;//是否输出数组字符串
+var maxCount=0;for(var i=1;i<args.length;++i){var item=args[i];if(Array.isArray(item)){isArray=true;if(maxCount<item.length)maxCount=item.length;}}if(isArray){var result=[];for(var i=0;i<maxCount;++i){var strItem=strFormat;var _iteratorNormalCompletion19=true;var _didIteratorError19=false;var _iteratorError19=undefined;try{for(var _iterator19=(0,_getIterator3.default)(mapParam),_step19;!(_iteratorNormalCompletion19=(_step19=_iterator19.next()).done);_iteratorNormalCompletion19=true){var item=_step19.value;var paramInfo=item[1];var paramItem=args[paramInfo.Index+1];var text="null";if(paramItem){if(Array.isArray(paramItem)){var value=paramItem[i];if(value){if(IFrameSplitOperator.IsNumber(paramInfo.Decimal))text=''+value.toFixed(paramInfo.Decimal);else text=''+value;}}else{text=''+paramItem;}}strItem=strItem.replace(paramInfo.Src,text);}}catch(err){_didIteratorError19=true;_iteratorError19=err;}finally{try{if(!_iteratorNormalCompletion19&&_iterator19.return){_iterator19.return();}}finally{if(_didIteratorError19){throw _iteratorError19;}}}result[i]=strItem;}return result;}else{var result=strFormat;var _iteratorNormalCompletion20=true;var _didIteratorError20=false;var _iteratorError20=undefined;try{for(var _iterator20=(0,_getIterator3.default)(mapParam),_step20;!(_iteratorNormalCompletion20=(_step20=_iterator20.next()).done);_iteratorNormalCompletion20=true){var item=_step20.value;var paramInfo=item[1];var paramItem=args[paramInfo.Index+1];var text="null";if(paramItem){text=''+paramItem;}result=result.replace(paramInfo.Src,text);}}catch(err){_didIteratorError20=true;_iteratorError20=err;}finally{try{if(!_iteratorNormalCompletion20&&_iterator20.return){_iterator20.return();}}finally{if(_didIteratorError20){throw _iteratorError20;}}}return result;}};//函数调用
 this.CallFunction=function(name,args,node,symbolData){switch(name){case'MAX':case"MAX6":return this.MAX(args,node);case'MIN':case"MIN6":return this.MIN(args,node);case'REF':return this.REF(args[0],args[1]);case"REFV":return this.REFV(args[0],args[1]);case'REFX':return this.REFX(args[0],args[1]);case"REFXV":return this.REFXV(args[0],args[1]);case"REFX1"://文华函数
 return this.REFX(args[0],args[1]);case'ABS':return this.ABS(args[0]);case'MA':return this.MA(args[0],args[1]);case"EMA":return this.EMA(args[0],args[1]);case"SMA":return this.SMA(args[0],args[1],args[2]);case"DMA":return this.DMA(args[0],args[1]);case"XMA":return this.XMA(args[0],args[1]);case'EXPMA':return this.EXPMA(args[0],args[1]);case'EXPMEMA':return this.EXPMEMA(args[0],args[1]);case'COUNT':return this.COUNT(args[0],args[1]);case'LLV':return this.LLV(args[0],args[1]);case"LV":return this.LV(args[0],args[1]);case'LLVBARS':return this.LLVBARS(args[0],args[1]);case'HHV':return this.HHV(args[0],args[1]);case'HV':return this.HV(args[0],args[1]);case'HHVBARS':return this.HHVBARS(args[0],args[1]);case'MULAR':return this.MULAR(args[0],args[1]);case'CROSS':return this.CROSS(args[0],args[1]);case'LONGCROSS':return this.LONGCROSS(args[0],args[1],args[2]);case"ISVALID":return this.ISVALID(args[0]);case"CROSSDOWN":return this.CROSSDOWN(args[0],args[1]);case"CROSSUP":return this.CROSSUP(args[0],args[1]);case'AVEDEV':return this.AVEDEV(args[0],args[1]);case'STD':return this.STD(args[0],args[1]);case'IF':case'IFF':case"IFELSE":return this.IF(args[0],args[1],args[2]);case'IFN':return this.IFN(args[0],args[1],args[2]);case'NOT':return this.NOT(args[0]);case'SUM':return this.SUM(args[0],args[1]);case'RANGE':return this.RANGE(args[0],args[1],args[2]);case'EXIST':return this.EXIST(args[0],args[1]);case'EXISTR':return this.EXISTR(args[0],args[1],args[2]);case'FILTER':return this.FILTER(args[0],args[1]);case'TFILTER':return this.TFILTER(args[0],args[1],args[2]);case'SLOPE':return this.SLOPE(args[0],args[1]);case'BARSLAST':return this.BARSLAST(args[0]);case'BARSCOUNT':return this.BARSCOUNT(args[0]);case'BARSSINCEN':return this.BARSSINCEN(args[0],args[1]);case'BARSSINCE':return this.BARSSINCE(args[0]);case'LAST':return this.LAST(args[0],args[1],args[2]);case'EVERY':return this.EVERY(args[0],args[1]);case'DEVSQ':return this.DEVSQ(args[0],args[1]);case'ZIG':return this.ZIG(args[0],args[1]);case'TROUGHBARS':return this.TROUGHBARS(args[0],args[1],args[2]);case"TROUGH":return this.TROUGH(args[0],args[1],args[2]);case'PEAKBARS':return this.PEAKBARS(args[0],args[1],args[2]);case'PEAK':return this.PEAK(args[0],args[1],args[2]);case'COST':return this.COST(args[0]);case'WINNER':return this.WINNER(args[0],node);case'PPART':return this.PPART(args[0],node);case"COSTEX":return this.COSTEX(args[0],args[1],node);case"LWINNER":return this.LWINNER(args[0],args[1],node);case"PWINNER":return this.PWINNER(args[0],args[1],node);case'FORCAST':return this.FORCAST(args[0],args[1]);case"TSMA":return this.TSMA(args[0],args[1]);case'STDP':return this.STDP(args[0],args[1]);case'VAR':return this.VAR(args[0],args[1]);case'VARP':return this.VARP(args[0],args[1]);case'UPNDAY':return this.UPNDAY(args[0],args[1]);case'DOWNNDAY':return this.DOWNNDAY(args[0],args[1]);case'NDAY':return this.NDAY(args[0],args[1],args[2]);case'RELATE':return this.RELATE(args[0],args[1],args[2]);case'COVAR':return this.COVAR(args[0],args[1],args[2]);case'BETA':return this.BETA(args[0]);case'BETA2':return this.BETA2(args[0],args[1],args[2]);case'WMA':return this.WMA(args[0],args[1]);case'MEMA':return this.MEMA(args[0],args[1]);case'SUMBARS':return this.SUMBARS(args[0],args[1]);case'REVERSE':return this.REVERSE(args[0]);case'SAR':return this.SAR(args[0],args[1],args[2]);case'SARTURN':return this.SARTURN(args[0],args[1],args[2]);case'BACKSET':return this.BACKSET(args[0],args[1]);case'BETWEEN':return this.BETWEEN(args[0],args[1],args[2]);case'STRCAT':return this.STRCAT(args[0],args[1]);case'CON2STR':return this.CON2STR(args[0],args[1]);case"VAR2STR":return this.VAR2STR(args[0],args[1]);case"VARCAT":return this.VARCAT(args[0],args[1]);case"STRSPACE":return this.STRSPACE(args[0]);case"FINDSTR":return this.FINDSTR(args[0],args[1]);case"STRCMP":return this.STRCMP(args[0],args[1]);case"STRLEN":return this.STRLEN(args[0]);case"STRFORMAT":return this.STRFORMAT(args[0],args,node);case'DTPRICE':return this.DTPRICE(args[0],args[1]);case'ZTPRICE':return this.ZTPRICE(args[0],args[1]);case'MOD':return this.MOD(args[0],args[1]);case'POW':return this.POW(args[0],args[1]);case'CEILING':return this.CEILING(args[0]);case'FLOOR':return this.FLOOR(args[0]);case'FRACPART':return this.FRACPART(args[0]);case"SIGN":return this.SIGN(args[0]);case'BARSLASTCOUNT':return this.BARSLASTCOUNT(args[0]);case'INTPART':return this.INTPART(args[0]);case"CONST":return this.CONST(args[0]);case"TOPRANGE":return this.TOPRANGE(args[0]);case"LOWRANGE":return this.LOWRANGE(args[0]);case"FINDLOW":return this.FINDLOW(args[0],args[1],args[2],args[3]);case"FINDLOWBARS":return this.FINDLOWBARS(args[0],args[1],args[2],args[3]);case"FINDHIGH":return this.FINDHIGH(args[0],args[1],args[2],args[3]);case"FINDHIGHBARS":return this.FINDHIGHBARS(args[0],args[1],args[2],args[3]);case"BARSNEXT":return this.BARSNEXT(args[0]);case"HOD":return this.HOD(args[0],args[1]);case"LOD":return this.LOD(args[0],args[1]);case"AMA":return this.AMA(args[0],args[1]);case"TMA":return this.TMA(args[0],args[1],args[2]);case"ROUND":return this.ROUND(args[0]);case"ROUND2":return this.ROUND2(args[0],args[1]);case"TRMA":return this.TRMA(args[0],args[1]);case"VALUEWHEN":return this.VALUEWHEN(args[0],args[1]);case"HARMEAN":return this.HARMEAN(args[0],args[1]);case"DATETODAY":return this.DATETODAY(args[0]);case"DAYTODATE":return this.DAYTODATE(args[0]);case"TIMETOSEC":return this.TIMETOSEC(args[0]);case"SECTOTIME":return this.SECTOTIME(args[0]);case"ANY":return this.ANY(args[0],args[1]);case"ALL":return this.ALL(args[0],args[1]);case"TESTSKIP":return this.TESTSKIP(args[0],node);case"SUMBARS":return this.SUMBARS(args[0],args[1]);case"ALIGNRIGHT":return this.ALIGNRIGHT(args[0]);//三角函数
 case'ATAN':return this.Trigonometric(args[0],Math.atan);case'ACOS':return this.ACOS(args[0]);case'ASIN':return this.ASIN(args[0]);case'COS':return this.Trigonometric(args[0],Math.cos);case'SIN':return this.Trigonometric(args[0],Math.sin);case'TAN':return this.Trigonometric(args[0],Math.tan);case'LN':return this.Trigonometric(args[0],Math.log);case'LOG':return this.Trigonometric(args[0],_log2.default);case'EXP':return this.Trigonometric(args[0],Math.exp);case'SQRT':return this.Trigonometric(args[0],Math.sqrt);case"RAND":return this.RAND(args[0]);default:this.ThrowUnexpectedNode(node,'函数'+name+'不存在',name);}};//调用自定义函数 返回数据格式{Out:输出数据, Draw:绘图数据(可选)}
@@ -12734,7 +12772,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.12621";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.12630";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.12622",
+  "version": "1.1.12631",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.complier.js

@@ -8611,10 +8611,10 @@ function JSAlgorithm(errorHandler,symbolData)
     }
 
 
-    //格式化字符串 "{0}-{1}", C, O;
+    //格式化字符串 "{0}-{1}", C, O;  小数位数 {0:0.00}
     this.STRFORMAT=function(strFormat,args,node)
     {
-        var aryParam=strFormat.match(/{\d+}/g);
+        var aryParam=strFormat.match(/{[0-9.:]+}/g);
 
         if (!IFrameSplitOperator.IsNonEmptyArray(aryParam)) return null;
 
@@ -8626,9 +8626,47 @@ function JSAlgorithm(errorHandler,symbolData)
             if (item.length<3) continue;
 
             var value=item.slice(1, item.length-1);
-            var index=parseInt(value);
+            var index=-1,decimal=-1;
+            if (value.indexOf(":")>0)
+            {
+                var aryTemp=value.split(":");
+                if (aryTemp)
+                {
+                    if (aryTemp[0])
+                        index=parseInt(aryTemp[0]);
 
-            var paramItem={ Src:item, Index:index, Text:null};
+                    if (aryTemp[1])
+                    {
+                        if (aryTemp[1].indexOf(".")>=0)
+                        {
+                            var zeroCount=0;
+                            var strTemp=aryTemp[1];
+                            for(var j=strTemp.length-1; j>=0; --j)
+                            {
+                                if (strTemp[j]=="0") ++zeroCount;
+                                else break;
+                            }
+    
+                            if (zeroCount>0) decimal=zeroCount;
+                        }
+                        else if (aryTemp[1]=="0")
+                        {
+                            decimal=0;
+                        }
+                    }
+                    
+                }
+                
+            }
+            else
+            {
+                index=parseInt(value);
+            }
+
+            if (index<0) continue;
+
+            var paramItem={ Src:item, Index:index, Text:null, Decimal:null };
+            if (decimal>=0) paramItem.Decimal=decimal;
 
             if (maxIndex<index) maxIndex=index;
 
@@ -8665,7 +8703,13 @@ function JSAlgorithm(errorHandler,symbolData)
                         if (Array.isArray(paramItem))
                         {
                             var value=paramItem[i];
-                            if (value) text=`${value}`;
+                            if (value) 
+                            {
+                                if (IFrameSplitOperator.IsNumber(paramInfo.Decimal))
+                                    text=`${value.toFixed(paramInfo.Decimal)}`;
+                                else
+                                    text=`${value}`;
+                            }
                         }
                         else
                         {

package/src/jscommon/umychart.js

@@ -51289,7 +51289,7 @@ function IChartDrawPicture()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -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
@@ -54714,7 +54759,7 @@ function ChartDrawPictureParallelChannel()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -68992,6 +69037,53 @@ function KLineChartContainer(uielement,OffscreenElement)
                     }
                 }
             }
+
+            //清空叠加股票
+            if (option.ClearOverlay===true)
+            {
+                for(var i in this.OverlayChartPaint)
+                {
+                    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 (open.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);
+                }
+            }
         }
 
         this.ReloadChartDrawPicture();
@@ -74153,34 +74245,55 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
-    //叠加股票
+    //叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
     this.OverlaySymbol=function(symbol,option)
     {
-        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        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 item=this.OverlayChartPaint[i];
-            if (item.Symbol==symbol)
+            var strSymbol=arySymbol[i];
+            var bFind=false;
+            for(j=0;j<this.OverlayChartPaint.length; ++j)
             {
-                console.warn(`[MinuteChartContainer::OverlaySymbol] overlay symbol=${symbol} exist.`);
-                return false;
+                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);
         }
 
-        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=symbol;
-        paint.Identify=`Overlay-Minute-${symbol}`;
-        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;
-        paint.MainData=this.SourceData; //绑定主图数据
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
 
-        if (paint.SetOption) paint.SetOption(option);
+        for(var i=0;i<aryNewSymbol.length;++i)
+        {
+            var strSymbol=aryNewSymbol[i];
 
-        this.OverlayChartPaint.push(paint);
+            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; //外部设置颜色
+            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(option);
+    
+            this.OverlayChartPaint.push(paint);
+        }
 
         if (this.DayCount<=1) this.RequestOverlayMinuteData();               //请求数据
         else this.RequestOverlayHistoryMinuteData();

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

@@ -55369,7 +55369,7 @@ function IChartDrawPicture()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -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
@@ -58794,7 +58839,7 @@ function ChartDrawPictureParallelChannel()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -73072,6 +73117,53 @@ function KLineChartContainer(uielement,OffscreenElement)
                     }
                 }
             }
+
+            //清空叠加股票
+            if (option.ClearOverlay===true)
+            {
+                for(var i in this.OverlayChartPaint)
+                {
+                    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 (open.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);
+                }
+            }
         }
 
         this.ReloadChartDrawPicture();
@@ -78233,34 +78325,55 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
-    //叠加股票
+    //叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
     this.OverlaySymbol=function(symbol,option)
     {
-        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        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 item=this.OverlayChartPaint[i];
-            if (item.Symbol==symbol)
+            var strSymbol=arySymbol[i];
+            var bFind=false;
+            for(j=0;j<this.OverlayChartPaint.length; ++j)
             {
-                console.warn(`[MinuteChartContainer::OverlaySymbol] overlay symbol=${symbol} exist.`);
-                return false;
+                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);
         }
 
-        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=symbol;
-        paint.Identify=`Overlay-Minute-${symbol}`;
-        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;
-        paint.MainData=this.SourceData; //绑定主图数据
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
 
-        if (paint.SetOption) paint.SetOption(option);
+        for(var i=0;i<aryNewSymbol.length;++i)
+        {
+            var strSymbol=aryNewSymbol[i];
 
-        this.OverlayChartPaint.push(paint);
+            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; //外部设置颜色
+            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(option);
+    
+            this.OverlayChartPaint.push(paint);
+        }
 
         if (this.DayCount<=1) this.RequestOverlayMinuteData();               //请求数据
         else this.RequestOverlayHistoryMinuteData();
@@ -102543,10 +102656,10 @@ function JSAlgorithm(errorHandler,symbolData)
     }
 
 
-    //格式化字符串 "{0}-{1}", C, O;
+    //格式化字符串 "{0}-{1}", C, O;  小数位数 {0:0.00}
     this.STRFORMAT=function(strFormat,args,node)
     {
-        var aryParam=strFormat.match(/{\d+}/g);
+        var aryParam=strFormat.match(/{[0-9.:]+}/g);
 
         if (!IFrameSplitOperator.IsNonEmptyArray(aryParam)) return null;
 
@@ -102558,9 +102671,47 @@ function JSAlgorithm(errorHandler,symbolData)
             if (item.length<3) continue;
 
             var value=item.slice(1, item.length-1);
-            var index=parseInt(value);
+            var index=-1,decimal=-1;
+            if (value.indexOf(":")>0)
+            {
+                var aryTemp=value.split(":");
+                if (aryTemp)
+                {
+                    if (aryTemp[0])
+                        index=parseInt(aryTemp[0]);
 
-            var paramItem={ Src:item, Index:index, Text:null};
+                    if (aryTemp[1])
+                    {
+                        if (aryTemp[1].indexOf(".")>=0)
+                        {
+                            var zeroCount=0;
+                            var strTemp=aryTemp[1];
+                            for(var j=strTemp.length-1; j>=0; --j)
+                            {
+                                if (strTemp[j]=="0") ++zeroCount;
+                                else break;
+                            }
+    
+                            if (zeroCount>0) decimal=zeroCount;
+                        }
+                        else if (aryTemp[1]=="0")
+                        {
+                            decimal=0;
+                        }
+                    }
+                    
+                }
+                
+            }
+            else
+            {
+                index=parseInt(value);
+            }
+
+            if (index<0) continue;
+
+            var paramItem={ Src:item, Index:index, Text:null, Decimal:null };
+            if (decimal>=0) paramItem.Decimal=decimal;
 
             if (maxIndex<index) maxIndex=index;
 
@@ -102597,7 +102748,13 @@ function JSAlgorithm(errorHandler,symbolData)
                         if (Array.isArray(paramItem))
                         {
                             var value=paramItem[i];
-                            if (value) text=`${value}`;
+                            if (value) 
+                            {
+                                if (IFrameSplitOperator.IsNumber(paramInfo.Decimal))
+                                    text=`${value.toFixed(paramInfo.Decimal)}`;
+                                else
+                                    text=`${value}`;
+                            }
                         }
                         else
                         {
@@ -129881,7 +130038,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12621";
+var HQCHART_VERSION="1.1.12630";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -55413,7 +55413,7 @@ function IChartDrawPicture()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -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
@@ -58838,7 +58883,7 @@ function ChartDrawPictureParallelChannel()
     //xStep,yStep 移动的偏移量
     this.Move=function(xStep,yStep)
     {
-        if (this.Status!=20) return fasle;
+        if (this.Status!=20) return false;
         if (!this.Frame) return false;
         var data=this.Frame.Data;
         if (!data) return false;
@@ -73116,6 +73161,53 @@ function KLineChartContainer(uielement,OffscreenElement)
                     }
                 }
             }
+
+            //清空叠加股票
+            if (option.ClearOverlay===true)
+            {
+                for(var i in this.OverlayChartPaint)
+                {
+                    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 (open.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);
+                }
+            }
         }
 
         this.ReloadChartDrawPicture();
@@ -78277,34 +78369,55 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.RequestData();
     }
 
-    //叠加股票
+    //叠加股票 symbol支持数据 ["600000.sh", "0000001.sz"]
     this.OverlaySymbol=function(symbol,option)
     {
-        for(var i=0; i<this.OverlayChartPaint.length; ++i)
+        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 item=this.OverlayChartPaint[i];
-            if (item.Symbol==symbol)
+            var strSymbol=arySymbol[i];
+            var bFind=false;
+            for(j=0;j<this.OverlayChartPaint.length; ++j)
             {
-                console.warn(`[MinuteChartContainer::OverlaySymbol] overlay symbol=${symbol} exist.`);
-                return false;
+                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);
         }
 
-        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=symbol;
-        paint.Identify=`Overlay-Minute-${symbol}`;
-        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;
-        paint.MainData=this.SourceData; //绑定主图数据
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return true;
 
-        if (paint.SetOption) paint.SetOption(option);
+        for(var i=0;i<aryNewSymbol.length;++i)
+        {
+            var strSymbol=aryNewSymbol[i];
 
-        this.OverlayChartPaint.push(paint);
+            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; //外部设置颜色
+            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(option);
+    
+            this.OverlayChartPaint.push(paint);
+        }
 
         if (this.DayCount<=1) this.RequestOverlayMinuteData();               //请求数据
         else this.RequestOverlayHistoryMinuteData();
@@ -102587,10 +102700,10 @@ function JSAlgorithm(errorHandler,symbolData)
     }
 
 
-    //格式化字符串 "{0}-{1}", C, O;
+    //格式化字符串 "{0}-{1}", C, O;  小数位数 {0:0.00}
     this.STRFORMAT=function(strFormat,args,node)
     {
-        var aryParam=strFormat.match(/{\d+}/g);
+        var aryParam=strFormat.match(/{[0-9.:]+}/g);
 
         if (!IFrameSplitOperator.IsNonEmptyArray(aryParam)) return null;
 
@@ -102602,9 +102715,47 @@ function JSAlgorithm(errorHandler,symbolData)
             if (item.length<3) continue;
 
             var value=item.slice(1, item.length-1);
-            var index=parseInt(value);
+            var index=-1,decimal=-1;
+            if (value.indexOf(":")>0)
+            {
+                var aryTemp=value.split(":");
+                if (aryTemp)
+                {
+                    if (aryTemp[0])
+                        index=parseInt(aryTemp[0]);
 
-            var paramItem={ Src:item, Index:index, Text:null};
+                    if (aryTemp[1])
+                    {
+                        if (aryTemp[1].indexOf(".")>=0)
+                        {
+                            var zeroCount=0;
+                            var strTemp=aryTemp[1];
+                            for(var j=strTemp.length-1; j>=0; --j)
+                            {
+                                if (strTemp[j]=="0") ++zeroCount;
+                                else break;
+                            }
+    
+                            if (zeroCount>0) decimal=zeroCount;
+                        }
+                        else if (aryTemp[1]=="0")
+                        {
+                            decimal=0;
+                        }
+                    }
+                    
+                }
+                
+            }
+            else
+            {
+                index=parseInt(value);
+            }
+
+            if (index<0) continue;
+
+            var paramItem={ Src:item, Index:index, Text:null, Decimal:null };
+            if (decimal>=0) paramItem.Decimal=decimal;
 
             if (maxIndex<index) maxIndex=index;
 
@@ -102641,7 +102792,13 @@ function JSAlgorithm(errorHandler,symbolData)
                         if (Array.isArray(paramItem))
                         {
                             var value=paramItem[i];
-                            if (value) text=`${value}`;
+                            if (value) 
+                            {
+                                if (IFrameSplitOperator.IsNumber(paramInfo.Decimal))
+                                    text=`${value.toFixed(paramInfo.Decimal)}`;
+                                else
+                                    text=`${value}`;
+                            }
                         }
                         else
                         {
@@ -130039,7 +130196,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12621";
+var HQCHART_VERSION="1.1.12630";
 
 function PrintHQChartVersion()
 {