hqchart 1.1.15258 → 1.1.15292

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

@@ -7445,6 +7445,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.IsPress=false;             //是否长按
     this.IsPressKeyboard=false;     //是否键盘按键
     this.PressKeyboardConfig={ PauseUpdate:false, }; //按键以后 是否涨停数据更新
+    this.DrawStatusData={ LatestTime:{ Draw:null, DrawDynamicInfo:null } };
 
     this.NetworkFilter;         //网络请求回调 function(data, callback);
     this.LastMouseStatus={ MouseOnToolbar:null }; // MouseOnToolbar={ Rect:{}, Title: }
@@ -7650,6 +7651,24 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return unit;
     }
 
+    this.ClearDrawStatusData=function()
+    {
+        this.DrawStatusData.LatestTime.Draw=null;
+        this.DrawStatusData.LatestTime.DrawDynamicInfo=null;
+    }
+
+    this.UpdateDrawStatusData=function(funName)
+    {
+        if (funName=="Draw")
+        {
+            this.DrawStatusData.LatestTime.Draw=new Date();
+        }
+        else if (funName=="DrawDynamicInfo")
+        {
+            this.DrawStatusData.LatestTime.DrawDynamicInfo=new Date();
+        }
+    }
+
     this.ClearStockCache=function()
     {
         this.StockCache.Data=null;
@@ -10962,6 +10981,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         ++this.TouchDrawCount;
 
         this.UpdateCorssCursorStatus();
+        this.UpdateDrawStatusData("Draw");
     }
 
     this.DrawExtendChartPaint=function(level, option)
@@ -11190,7 +11210,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             IsOnTouch:this.IsOnTouch,
             CorssCursorTouchEnd:this.CorssCursorTouchEnd,
             IsTitleShowLatestData:this.IsTitleShowLatestData,
-            IsMinuteChart:(this.ClassName=="MinuteChartContainer" || this.ClassName=="MinuteChartHScreenContainer") ? true:false
+            IsMinuteChart:(this.ClassName=="MinuteChartContainer" || this.ClassName=="MinuteChartHScreenContainer") ? true:false,
+            DrawStatusData:this.DrawStatusData,
         };
 
         status.FrameID=this.Frame.PtInFrame(this.LastPoint.X, this.LastPoint.Y);
@@ -11485,6 +11506,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         ++this.TouchDrawCount;
 
         this.UpdateCorssCursorStatus();
+        this.UpdateDrawStatusData("DrawDynamicInfo");
+
     }
 
     this.DrawAnimation=function()   //绘制动画 如弹幕
@@ -43716,6 +43739,294 @@ function ChartSingleText()
     }
 }
 
+function ChartDrawText_Fix()
+{
+    this.newMethod=IChartPainting;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartDrawText_Fix';    //类名
+
+    this.Color="rgb(255,193,37)";           //字颜色
+    this.TextFont=g_JSChartResource.DRAWTEXT_FIX.Font;
+    this.PtPercentage=null;                         //{ X:, Y: }   百分比坐标
+    this.TextBaseline="top";
+    this.TextAlign='center';
+    this.ShowOffset={ X:0, Y:0 };   //显示偏移 
+    this.MapCache;
+    this.HQChart;
+    this.AryText;
+    
+    this.BuildCacheData=function(kData, data)
+    {
+        var mapData=new Map();
+        this.MapCache=mapData;
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Value) || !IFrameSplitOperator.IsNonEmptyArray(data.Text)) return;
+
+        for(var i=0;i<kData.Data.length;++i)
+        {
+            var value=data.Value[i];
+            if (value!==1) continue;
+
+            var text=data.Text[i];
+            if (!text) continue;
+
+            var kItem=kData.Data[i];
+            var item={ Value:value, Text:text, Date:kItem.Date, Time:kItem.Time };
+            var key=this.BuildKey(item);
+
+            /* //测试
+            item.Text=
+            [
+                { Name:`日期`, Text:`${item.Date}`, Margin:{ Bottom:10 }},
+                { Name:`日期2`, Text:`${item.Date}-2`},
+            ]
+            */
+
+            mapData.set(key,item);
+        }
+    }
+
+    this.ReloadResource=function(resource)
+    {
+        this.TextFont=g_JSChartResource.DRAWTEXT_FIX.Font;
+    }
+
+    this.Draw=function()
+    {
+        this.AryText=null;
+        if (!this.IsShow || this.ChartFrame.IsMinSize) return;
+        if (this.IsShowIndexTitleOnly()) return;
+        if (this.IsHideScriptIndex()) return;
+        if (!this.MapCache || this.MapCache.size<=0) return;
+        if (!this.PtPercentage || !IFrameSplitOperator.IsNumber(this.PtPercentage.X) || !IFrameSplitOperator.IsNumber(this.PtPercentage.Y)) return;
+        if (!this.IsDrawText()) return;
+        
+        var bHScreen=(this.ChartFrame.IsHScreen===true)
+        this.Canvas.save();
+        this.ClipClient(bHScreen);
+
+        this.DrawText();
+
+        this.Canvas.restore();
+        this.AryText=null;
+    }
+
+    //当前屏是否要绘制文字
+    this.IsDrawText=function()
+    {
+        if (!this.HQChart) return false;
+        var kData=this.HQChart.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+
+        var bHScreen=(this.ChartFrame.IsHScreen===true)
+        var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xPointCount=this.ChartFrame.XPointCount;
+        var xOffset=this.ChartBorder.GetLeft()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        var chartright=this.ChartBorder.GetRight();
+        var top=this.ChartBorder.GetTopEx();
+        var bottom=this.ChartBorder.GetBottomEx();
+
+        if (bHScreen) 
+        {
+            chartright=this.ChartBorder.GetBottom();
+            top=this.ChartBorder.GetRightEx();
+            bottom=this.ChartBorder.GetLeftEx();
+            xOffset=this.ChartBorder.GetTop()+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
+        }
+
+        for(var i=kData.DataOffset,j=0;i<kData.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        {
+            var kItem=kData.Data[i];
+            if (kItem==null) continue;
+
+            var key=this.BuildKey(kItem);
+            if (!this.MapCache.has(key)) continue;
+
+            var item=this.MapCache.get(key);
+            if (Array.isArray(item.Text)) this.AryText=item.Text;
+            else this.AryText=[{ Name:item.Text }];
+            return true;
+        }
+
+        return false;
+    }
+
+    this.DrawText=function()
+    {
+        var bHScreen=(this.ChartFrame.IsHScreen===true);
+        if (bHScreen)
+        {
+            var x=this.ChartBorder.GetRightEx()-this.ChartBorder.GetWidthEx()*this.PtPercentage.Y;
+            var y=this.ChartBorder.GetTop()+this.ChartBorder.GetHeight()*this.PtPercentage.X;
+        }
+        else
+        {
+            var x=this.ChartBorder.GetLeft()+this.ChartBorder.GetWidth()*this.PtPercentage.X;
+            var y=this.ChartBorder.GetTopEx()+this.ChartBorder.GetHeightEx()*this.PtPercentage.Y;
+        }
+
+        var drawInfo=this.CalculateComplexTextSize(this.AryText, { Font:this.TextFont, Color:this.Color });
+        if (!drawInfo) return;
+
+        drawInfo.IsHScreen=bHScreen;
+
+        if (bHScreen)
+        {
+            if (this.TextBaseline=="middle") x=x-drawInfo.Height/2;         //上下居中
+            else if (this.TextBaseline=="bottom") x=x-drawInfo.Height;      //底部
+
+            if (this.TextAlign=="center") y=y-drawInfo.Width/2;            //左右居中
+            else if (this.TextAlign=='right') y=y-drawInfo.Width;          //右对齐
+
+            this.DrawComplexText(x,y, drawInfo);
+        }
+        else
+        {
+            if (this.TextBaseline=="middle") y=y-drawInfo.Height/2;         //上下居中
+            else if (this.TextBaseline=="bottom") y=y-drawInfo.Height;      //底部
+
+            if (this.TextAlign=="center") x=x-drawInfo.Width/2;             //左右居中
+            else if (this.TextAlign=='right') x=x-drawInfo.Width;           //右对齐
+
+            this.DrawComplexText(x,y, drawInfo);
+        }
+    }
+
+    this.DrawComplexText=function(x, y, drawInfo)
+    {
+        var left=x;
+        var lineTop=y;
+        if (drawInfo.IsHScreen)
+        {
+            left=0;
+            lineTop=0;
+            this.Canvas.save(); 
+            this.Canvas.translate(x, y);
+            this.Canvas.rotate(90 * Math.PI / 180);
+        }
+
+        this.Canvas.textBaseline="bottom";
+        this.Canvas.textAlign="left";
+        for(var i=0;i<drawInfo.AryData.length;++i)
+        {
+            var item=drawInfo.AryData[i];
+            var margin=item.Margin;
+            var xText=left+margin.Left;
+            var yText=lineTop+item.Height-margin.Bottom;
+
+            if (item.Name)
+            {
+                this.Canvas.font=item.Font;
+                this.Canvas.fillStyle=item.NameColor;
+                this.Canvas.fillText(item.Name,xText,yText);
+                xText+=item.NameWidth+item.Space;
+            }
+
+            if (item.Text)
+            {
+                this.Canvas.font=item.Font;
+                this.Canvas.fillStyle=item.TextColor;
+                this.Canvas.fillText(item.Text,xText,yText);
+                xText+=item.TextWidth;
+            }
+
+            lineTop+=item.Height;
+        }
+
+        if (drawInfo.IsHScreen) this.Canvas.restore();
+    }
+
+    //计算复杂文本长度高度 defaultOption:{ Font:, }
+    this.CalculateComplexTextSize=function(aryText, defaultOption)
+    {
+        if (!defaultOption) return null;
+        if (!aryText || !IFrameSplitOperator.IsNonEmptyArray(aryText)) return null;
+
+        this.Canvas.font=defaultOption.Font;
+        var lineHeight=this.Canvas.measureText("擎").width;
+        var maxNameWidth=0, maxTextWidth=0;
+        var result={ AryData:[], Width:0, Height:0 }
+        for(var i=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            var newItem={ NameWidth:0, TextWidth:0, Margin:{ Left:0, Top:0, Right:0, Bottom:0 }, Font:defaultOption.Font, Space:0, YOffset:0, Width:0, Height:0 };
+            if (item.Name) 
+            {
+                newItem.NameWidth=this.Canvas.measureText(item.Name).width;
+                newItem.Name=item.Name;
+                if (maxNameWidth<item.NameWidth) maxNameWidth=newItem.NameWidth;
+                if (IFrameSplitOperator.IsNumber(item.Space)) newItem.Space=item.Space;
+                if (item.NameColor) newItem.NameColor=item.NameColor;
+                else newItem.NameColor=defaultOption.Color;
+            }
+
+            if (item.Text) 
+            {
+                newItem.TextWidth=this.Canvas.measureText(item.Text).width;
+                newItem.Text=item.Text;
+                if (maxTextWidth<item.TextWidth) maxTextWidth=newItem.TextWidth;
+                if (item.TextColor) newItem.TextColor=item.TextColor;
+                else newItem.TextColor=defaultOption.Color;
+            }
+            
+
+            CopyMarginConfig(newItem.Margin, item.Margin);
+
+            if (IFrameSplitOperator.IsNumber(item.YOffset)) newItem.YOffset=item.YOffset;
+
+            newItem.Width=newItem.NameWidth+newItem.TextWidth;
+            newItem.Width+=newItem.Margin.Left+newItem.Margin.Right+newItem.Space;
+            newItem.Height=(lineHeight+newItem.Margin.Top+newItem.Margin.Bottom);
+
+            result.AryData.push(newItem);
+            result.Height+=newItem.Height;
+            if (result.Width<newItem.Width) result.Width=newItem.Width;
+        }
+
+        return result;
+    }
+
+}
+
+function ChartDrawNumber_Fix()
+{
+    this.newMethod=ChartDrawText_Fix;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartDrawNumber_Fix';    //类名
+    this.TextFont=g_JSChartResource.DRAWNUMBER_FIX.Font;
+
+    this.BuildCacheData=function(kData, data)
+    {
+        var mapData=new Map();
+        this.MapCache=mapData;
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Value) || !IFrameSplitOperator.IsNonEmptyArray(data.Text)) return;
+
+        for(var i=0;i<kData.Data.length;++i)
+        {
+            var value=data.Value[i];
+            var text=data.Text[i];
+            if (!text) continue;
+
+            var kItem=kData.Data[i];
+            var item={ Value:value, Text:text, Date:kItem.Date, Time:kItem.Time };
+            var key=this.BuildKey(item);
+
+            mapData.set(key,item);
+        }
+    }
+
+    this.ReloadResource=function(resource)
+    {
+        this.TextFont=g_JSChartResource.DRAWNUMBER_FIX.Font;
+    }
+}
+
 
 function ChartTradeIcon()
 {
@@ -43851,7 +44162,8 @@ function ChartDrawText()
 
     this.ClassName='ChartDrawText';         //类名
     this.Color="rgb(255,193,37)";           //线段颜色
-    this.TextFont="14px 微软雅黑";           //线段宽度
+    this.Font;                              //固定字体
+    this.TextFont="14px 微软雅黑";           //输出使用的字体
     this.TextBaseline="middle";
     this.TextAlign='left';
     this.Text
@@ -43882,6 +44194,12 @@ function ChartDrawText()
         }
     }
 
+    this.GetMaxMin=function()
+    {
+        var range={ Min:null, Max:null };
+        return range;
+    }
+
     this.Draw=function()
     {
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
@@ -43920,8 +44238,9 @@ function ChartDrawText()
         var isArrayText=Array.isArray(this.Text);
         var drawTextInfo={ Text:{ Color:this.Color, Align:this.TextAlign, Baseline:this.TextBaseline }, Font:{ } };
         
-
-        if (this.FixedFontSize>0)  //固定字体大小模式
+        if (this.Font) 
+            this.TextFont=this.Font; 
+        else if (this.FixedFontSize>0)  //固定字体大小模式
             this.TextFont=`${this.FixedFontSize}px ${this.TextSize.FontName}`;
         else    //动态字体大小
             this.TextFont=this.GetDynamicFont(dataWidth,distanceWidth,this.TextSize.Max,this.TextSize.Min,this.TextSize.Zoom,this.TextSize.FontName);
@@ -52771,6 +53090,7 @@ function KLineTooltipPaint()
     this.ExtendLineWidth=2;
 
     this.Font=[g_JSChartResource.TooltipPaint.TitleFont];
+    
 
     this.HQChart;
     this.KLineTitlePaint;
@@ -52890,6 +53210,8 @@ function KLineTooltipPaint()
                 lineWidth+=textWidth;
             }
 
+            if (IFrameSplitOperator.IsNumber(item.Space)) lineWidth+=item.Space;
+
             if (maxLineWidth<lineWidth) maxLineWidth=lineWidth;
 
             height+=this.LineHeight;
@@ -53081,20 +53403,33 @@ function KLineTooltipPaint()
         {
             var item=titleData.AryText[i];
 
+            var titleWidth=0;
             if (item.Title)
             {
                 this.Canvas.textAlign="left";
                 this.Canvas.fillStyle=item.TitleColor;
                 this.Canvas.fillText(item.Title,left,top);
+                var titleWidth=this.Canvas.measureText(item.Title).width+2;
             }
 
             if (item.Text)
             {
-                this.Canvas.textAlign="right";
-                this.Canvas.fillStyle=item.Color;
-                this.Canvas.fillText(item.Text,right,top);
+                if (item.TextAlign==1)  //1=左对齐 0=右对齐
+                {
+                    var yText=left+titleWidth+2;
+                    if (IFrameSplitOperator.IsNumber(item.Space)) yText+=item.Space; //标题和数据内容间距
+                    this.Canvas.textAlign="left";
+                    this.Canvas.fillStyle=item.Color;
+                    this.Canvas.fillText(item.Text,yText,top);
+                }
+                else
+                {
+                    this.Canvas.textAlign="right";
+                    this.Canvas.fillStyle=item.Color;
+                    this.Canvas.fillText(item.Text,right,top);
+                }
             }
-
+                
             top+=this.LineHeight+this.LineSpace;
         }
 
@@ -57262,6 +57597,8 @@ function LatestPointFlashPaint()
     this.ClassName='LatestPointFlashPaint';
     this.HQChart;
 
+    this.FlashType=0;   //0=数据更新了闪烁, 1=一直显示
+    //闪烁
     this.Status=0;
     this.UpdateTime=new Date();
     this.FlashCount=0;  //闪烁次数
@@ -57286,6 +57623,7 @@ function LatestPointFlashPaint()
         if (option)
         {
             if (IFrameSplitOperator.IsNumber(option.Frequency)) this.Frequency=option.Frequency;
+            if (IFrameSplitOperator.IsNumber(option.FlashType)) this.FlashType=option.FlashType;
         }
     }
 
@@ -57320,18 +57658,32 @@ function LatestPointFlashPaint()
         if (!this.HQChart) return;
         this.HQChart.ClearCanvas(this.FlashCanvas);
 
-        if (this.FlashCount<=0) return;
-        if (this.IsStatusChange())
+        if (this.FlashType===1)
+        {
+
+        }
+        else
         {
-            this.Status=(this.Status+1)%2;
-            --this.FlashCount;
+            if (this.FlashCount<=0) return;
+            if (this.IsStatusChange())
+            {
+                this.Status=(this.Status+1)%2;
+                --this.FlashCount;
+            }
+            if (this.Status==0) return;
         }
+        
+
 
-        if (this.Status==0) return;
         if (!this.HQChart.GlobalOption || !this.HQChart.GlobalOption.LatestPoint) return;
         var point=this.HQChart.GlobalOption.LatestPoint;
         if (!IFrameSplitOperator.IsNumber(point.X) || !IFrameSplitOperator.IsNumber(point.Y)) return;
 
+        this.DrawPoint(point);
+    }
+
+    this.DrawPoint=function(point)
+    {
         if (this.Style==1) this.GetChartColor();
 
         this.FlashCanvas.fillStyle=this.BGColor;
@@ -82465,7 +82817,7 @@ function JSChartResource()
     //虚线配置
     this.DOTLINE=
     {
-        LineDash:[3,5]  //虚线配置
+        LineDash:[2*GetDevicePixelRatio(),2*GetDevicePixelRatio()]  //虚线配置
     }
 
     this.DRAWSL=
@@ -89721,7 +90073,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.ClearCustomKLine();
         this.ClearKLineCaluate();
         this.UnlockCorssCursor();
-       
+        this.ClearDrawStatusData();
 
         var kLineDrawType=this.GetKLineDrawType();
         if (kLineDrawType==10 || kLineDrawType==11 || kLineDrawType==12 || kLineDrawType==16) isDataTypeChange=true;
@@ -91126,7 +91478,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.UnlockCorssCursor();
         this.Frame.ClearYCoordinateMaxMin();
         this.ClosePopMinuteChart();
-        
+        this.ClearDrawStatusData();
         
         this.Symbol=symbol;
         if (!symbol)
@@ -97740,6 +98092,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ClearStockCache();
         this.UnlockCorssCursor();
         this.Frame.ClearYCoordinateMaxMin();
+        this.ClearDrawStatusData();
         
 
         if (option)
@@ -97908,6 +98261,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ClearStockCache();
         this.UnlockCorssCursor();
         this.Frame.ClearYCoordinateMaxMin();
+        this.ClearDrawStatusData();
 
         if (option && option.PageInfo)
         {
@@ -115161,22 +115515,50 @@ function JSAlgorithm(errorHandler,symbolData)
     this.FILTERX=function(data, n, node)
     {
         var result=[];
-        for(let i=0,j=0; i<data.length; ++i)
+        if (IFrameSplitOperator.IsNumber(n))
         {
-            if (data[i])
+            for(var i=data.length-1, j=0; i>=0; --i)
             {
-                result[i]=1;
-                for(j=0;j<n && i-j-1>=0;++j)
+                if (data[i])
                 {
-                    result[i-j-1]=0;
+                    result[i]=1;
+                    for(j=0;j<n && i-j-1>=0;++j)
+                    {
+                        result[i-j-1]=0;
+                    }
+                    i-=n;
+                }
+                else
+                {
+                    result[i]=0;
                 }
-                i+=n;
             }
-            else
+        }
+        else if (Array.isArray(n))
+        {
+            for(var i=data.length-1, j=0; i>=0; --i)
             {
-                result[i]=0;
+                if (data[i])
+                {
+                    result[i]=1;
+                    if (!IFrameSplitOperator.IsNumber(n[i])) continue;
+                    var period=parseInt(n[i]);
+                    if (period<=0) continue;
+                    
+                    for(j=0;j<period && i-j-1>=0;++j)
+                    {
+                        result[i-j-1]=0;
+                    }
+
+                    i-=period;
+                }
+                else
+                {
+                    result[i]=0;
+                }
             }
         }
+        
 
         return result;
     }
@@ -119614,6 +119996,7 @@ function JSDraw(errorHandler,symbolData)
         return result;
     }
 
+    //只有条件==1 才显示文字
     this.DRAWTEXT=function(condition,price,text)
     {
         let drawData=[];
@@ -119631,11 +120014,11 @@ function JSDraw(errorHandler,symbolData)
                 isFixedPosition=true;
             }
             
-            for(var i in condition)
+            for(var i=0;i<condition.length;++i)
             {
                 drawData[i]=null;
     
-                if (isNaN(condition[i]) || !condition[i]) continue;
+                if (condition[i]!==1) continue;
     
                 if (IsNumber || isFixedPosition) 
                 {
@@ -119647,7 +120030,7 @@ function JSDraw(errorHandler,symbolData)
                 }
             }
         }
-        else if (this.IsNumber(condition) && condition)
+        else if (this.IsNumber(condition) && condition===1)
         {
             var IsNumber=this.IsNumber(price);
             var isFixedPosition=false;
@@ -119673,20 +120056,21 @@ function JSDraw(errorHandler,symbolData)
         return result;
     }
 
+    //1.固定位置显示文字;2.在指标排序中显示字符串栏目.
+    //用法:DRAWTEXT_FIX(COND,X,Y,TYPE,TEXT),COND中一般需要加ISLASTBAR,当COND条件满足时,在当前指标窗口内(X,Y)位置书写文字TEXT,X,Y为书写点在窗口中相对于左上角的百分比,TYPE:0为左对齐,1为右对齐,2=居中.
+    //例如:DRAWTEXT_FIX(ISLASTBAR AND CLOSE/OPEN>1.08,0.5,0.5,0,'大阳线')表示最后一个交易日实体阳线大于8%时在窗口中间位置显示'大阳线'字样.若文字中含有&,则进行折行.最多只能显示250个字符
     this.DRAWTEXT_FIX=function(condition,x,y,type,text)
     {
         var drawData={ Value:[], Text:[]  };
         var result={DrawData:drawData, DrawType:'DRAWTEXT_FIX', Text:null, Position:{ X:x, Y:y, Type:type } };
-        if (condition.length<=0) return result;
-
+       
         if (Array.isArray(condition))
         {
-            
-            for(var i in condition)
+            for(var i=0; i<condition.length; ++i)
             {
                 drawData.Text[i]=null;
                 drawData.Value[i]=0;
-                if (isNaN(condition[i]) || !condition[i]) continue;
+                if (condition[i]!==1) continue;
     
                 drawData.Value[i]=1;
                 drawData.Text[i]=text;
@@ -119694,7 +120078,7 @@ function JSDraw(errorHandler,symbolData)
         }
         else
         {
-            if(condition) 
+            if(condition===1) 
             {
                 for(var i=0;i<this.SymbolData.Data.Data.length;++i)
                 {
@@ -119835,6 +120219,17 @@ function JSDraw(errorHandler,symbolData)
         let bSecondPont=false;
         let lineCache={Start:{ },End:{ }, List:new Array()};
 
+        function CopyLineData(aryDest, arySrc)
+        {
+            if (!IFrameSplitOperator.IsNonEmptyArray(arySrc)) return;
+
+            for(var j=0; j<arySrc.length; ++j)
+            {
+                var item=arySrc[j];
+                aryDest[item.ID]=item.Value;
+            }
+        }
+
         for(let i=0;i<count;++i)
         {
             drawData[i]=null;
@@ -119861,6 +120256,16 @@ function JSDraw(errorHandler,symbolData)
                     {
                         bSecondPont=true;
                         lineCache.End={ID:i, Value:data2[i]};   //第2个点
+                        
+                        if (condition[i])
+                        {
+                            var lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
+                            CopyLineData(drawData,lineData);
+
+                            bFirstPoint=true;
+                            bSecondPont=false;
+                            lineCache.Start={ID:i, Value:data[i]};  //第1个点
+                        }
                     }
                 }
                 else if (bFirstPoint==true && bSecondPont==true)
@@ -119872,13 +120277,8 @@ function JSDraw(errorHandler,symbolData)
                     }
                     else if (condition[i])  //条件1满足
                     {
-                        let lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
-
-                        for(let j in lineData)
-                        {
-                            let item=lineData[j];
-                            drawData[item.ID]=item.Value;
-                        }
+                        var lineData=this.CalculateDrawLine(lineCache);     //计算2个点的线上 其他点的数值
+                        CopyLineData(drawData,lineData);
 
                         if (expand==1) this.CalculateDrawDataExtendLine(drawData, lineCache.Start.ID-2);//右延长线
 
@@ -119895,12 +120295,9 @@ function JSDraw(errorHandler,symbolData)
             //最后一组线
             if (bFirstPoint==true && bSecondPont==true)
             {
-                let lineData=this.CalculateDrawLine(lineCache);     
-                for(let j in lineData)
-                {
-                    let item=lineData[j];
-                    drawData[item.ID]=item.Value;
-                }
+                var lineData=this.CalculateDrawLine(lineCache);     
+                CopyLineData(drawData,lineData);
+
             }
         }
 
@@ -120417,7 +120814,13 @@ function JSDraw(errorHandler,symbolData)
     {
         if (!numberData) return null;
 
-        if (numberData.DataType==1) return numberData.SingleValue;
+        if (numberData.DataType==1) 
+        {
+            var value=numberData.SingleValue;
+            if (IFrameSplitOperator.IsNumber(value)) return value.toFixed(decimal);
+            else if (value) return value.toString();
+            else return null;
+        }
 
         if (!IFrameSplitOperator.IsNonEmptyArray(numberData.ArrayValue)) return null;
 
@@ -120433,10 +120836,10 @@ function JSDraw(errorHandler,symbolData)
 
     /*
     固定位置显示数字.
-    用法: DRAWNUMBER_FIX(COND,X,Y,TYPE,NUMBER),当COND条件满足时,在当前指标窗口内(X,Y)位置书写数字NUMBER,X,Y为书写点在窗口中相对于左上角的百分比,TYPE:0为左对齐,1为右对齐.
+    用法: DRAWNUMBER_FIX(COND,X,Y,TYPE,NUMBER,decimal=2),当COND条件满足时,在当前指标窗口内(X,Y)位置书写数字NUMBER,X,Y为书写点在窗口中相对于左上角的百分比,TYPE:0为左对齐,1为右对齐 2=居中
     例如: DRAWNUMBER_FIX(CURRBARSCOUNT=1 AND CLOSE/OPEN>1.08,0.5,0.5,0,C)表示最后一个交易日实体阳线大于8%时在窗口中间位置显示收盘价.
     */
-    this.DRAWNUMBER_FIX=function(condition,x,y,align,data)
+    this.DRAWNUMBER_FIX=function(condition,x,y,align,data, decimal=2)
     {
         var drawData={ Value:[], Text:[],  };
         var result={ DrawData:drawData, DrawType:'DRAWNUMBER_FIX', Position:{ X:x, Y:y, Type:align } };
@@ -120444,15 +120847,15 @@ function JSDraw(errorHandler,symbolData)
 
         if (Array.isArray(condition))
         {
-            for(var i in condition)
+            for(var i=0; i<condition.length; ++i)
             {
                 drawData.Text[i]=null;
                 drawData.Value[i]=null;
-                if (!condition[i]) continue;
+                if (condition[i]!==1) continue;
 
                 if (isNumber) 
                 {
-                    drawData.Text[i]=this.RemoveZero(data.toFixed(2));
+                    drawData.Text[i]=this.RemoveZero(data.toFixed(decimal));
                     drawData.Value[i]=data;
                 }
                 else 
@@ -120460,14 +120863,14 @@ function JSDraw(errorHandler,symbolData)
                     if (i>=data.length || !IFrameSplitOperator.IsNumber(data[i])) continue;
 
                     var item=data[i];
-                    drawData.Text[i]=this.RemoveZero(item.toFixed(2));
+                    drawData.Text[i]=this.RemoveZero(item.toFixed(decimal));
                     drawData.Value[i]=item;
                 }
             }
         }
         else
         {
-            if(!condition)
+            if(condition!==1)
             {
                 
             }
@@ -120477,7 +120880,7 @@ function JSDraw(errorHandler,symbolData)
                 {
                     if (isNumber) 
                     {
-                        drawData.Text[i]=this.RemoveZero(data.toFixed(2));
+                        drawData.Text[i]=this.RemoveZero(data.toFixed(decimal));
                         drawData.Value[i]=data;
                     } 
                     else
@@ -120485,7 +120888,7 @@ function JSDraw(errorHandler,symbolData)
                         if (i>=data.length || !IFrameSplitOperator.IsNumber(data[i])) continue;
 
                         var item=data[i];
-                        drawData.Text[i]=this.RemoveZero(item.toFixed(2));
+                        drawData.Text[i]=this.RemoveZero(item.toFixed(decimal));
                         drawData.Value[i]=item;
                     }
                 }
@@ -120803,6 +121206,12 @@ function JSDraw(errorHandler,symbolData)
         return rgba;
     }
 
+    //设置字体
+    this.CSSFONT=function(strFont)
+    {
+        return strFont;
+    }
+
     this.UPCOLOR=function(color)
     {
         return color;
@@ -127848,6 +128257,7 @@ function JSExecute(ast,option)
                 let xOffset=null, yOffset=null;
                 var klineType=null;
                 var lineDash=null;
+                var font=null;
                 for(let j=0; j<item.Expression.Expression.length; ++j)
                 {
                     let itemExpression=item.Expression.Expression[j];
@@ -127964,6 +128374,10 @@ function JSExecute(ast,option)
                             {
                                 downColor=itemExpression.Out;
                             }
+                            else if (itemExpression.Callee.Name=="CSSFONT")
+                            {
+                                font=itemExpression.Out;
+                            }
                             else if (itemExpression.Callee.Name=="STICKTYPE")
                             {
                                 stickType=itemExpression.Out;
@@ -128166,6 +128580,7 @@ function JSExecute(ast,option)
                     if (drawAlign>=0) outVar.DrawAlign=drawAlign;
                     if (drawVAlign>=0) outVar.DrawVAlign=drawVAlign;
                     if (fontSize>0) outVar.DrawFontSize=fontSize;
+                    if (font) outVar.Font=font;
                     if (bgConfig) outVar.Background=bgConfig;
                     if (vLineConfig) outVar.VerticalLine=vLineConfig;
                     if (IFrameSplitOperator.IsNumber(xOffset)) outVar.XOffset=xOffset;
@@ -128647,7 +129062,7 @@ function JSExecute(ast,option)
                 node.Out=node.Draw.DrawData.Value;
                 break;
             case "DRAWNUMBER_FIX":
-                node.Draw=this.Draw.DRAWNUMBER_FIX(args[0],args[1],args[2],args[3],args[4]);
+                node.Draw=this.Draw.DRAWNUMBER_FIX(args[0],args[1],args[2],args[3],args[4], args[5]);
                 node.Out=node.Draw.DrawData.Value;
                 break;
             case "DRAWCHANNEL":
@@ -128666,6 +129081,9 @@ function JSExecute(ast,option)
             case "DOWNCOLOR":
                 node.Out=this.Draw.DOWNCOLOR(args[0]);
                 break;
+            case "CSSFONT":
+                node.Out=this.Draw.CSSFONT(args[0]);
+                break;
             case "STICKTYPE":   //柱子类型
                 node.Out=this.Draw.STICKTYPE(args[0]);
                 break;
@@ -131380,6 +131798,7 @@ function ScriptIndex(name,script,args,option)
         }
 
         if (varItem.DrawFontSize>0) chartText.FixedFontSize=varItem.DrawFontSize;
+        if (varItem.Font) chartText.Font=varItem.Font;
         if (varItem.Background) chartText.TextBG=varItem.Background;
         if (varItem.VerticalLine) chartText.VerticalLine=varItem.VerticalLine;
 
@@ -131535,6 +131954,12 @@ function ScriptIndex(name,script,args,option)
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
             if (!isNaN(width) && width>0) line.LineWidth=width;
         }
+
+        if (varItem.IsDotLine) 
+        {
+            line.IsDotLine=true; //虚线
+            line.LineDash=g_JSChartResource.DOTLINE.LineDash.slice();
+        }
         
         let titleIndex=windowIndex+1;
         line.Data.Data=varItem.Draw.DrawData;
@@ -132114,6 +132539,102 @@ function ScriptIndex(name,script,args,option)
         hqChart.ChartPaint.push(chartText);
     }
 
+    this.CreateDrawText_Fix=function(hqChart,windowIndex,varItem,id)
+    {
+        var chartText=new ChartDrawText_Fix();
+        chartText.Canvas=hqChart.Canvas;
+        chartText.Name=varItem.Name;
+        chartText.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chartText.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+        chartText.ReloadResource();
+        chartText.HQChart=hqChart;
+        
+        if (varItem.Draw.Position) 
+        {
+            var item=varItem.Draw.Position;
+            chartText.PtPercentage={ X:item.X, Y:item.Y }; //坐标
+           // TYPE:0为左对齐,1为右对齐 2=居中
+            if (item.Type===0) chartText.TextAlign="left";
+            else if (item.Type===1) chartText.TextAlign="right";
+            else if (item.Type===2) chartText.TextAlign="center";
+        }
+
+        //字体
+        if (varItem.DrawFontSize>0) chartText.TextFont=`${varItem.DrawFontSize*GetDevicePixelRatio()}px 微软雅黑`;    //临时用下吧
+        if (varItem.Font) chartText.TextFont=varItem.Font;
+        
+        //颜色
+        if (varItem.Color) chartText.Color=this.GetColor(varItem.Color);
+        else chartText.Color=this.GetDefaultColor(id);
+
+        if (varItem.DrawVAlign>=0)  //上下对齐
+        {
+            if (varItem.DrawVAlign==0) chartText.TextBaseline='top';
+            else if (varItem.DrawVAlign==1) chartText.TextBaseline='middle';
+            else if (varItem.DrawVAlign==2) chartText.TextBaseline='bottom';
+        }
+
+        if (varItem.DrawAlign>=0)   // 左右对齐
+        {
+            if (varItem.DrawAlign==0) chartText.TextAlign="left";
+            else if (varItem.DrawAlign==1) chartText.TextAlign="center";
+            else if (varItem.DrawAlign==2) chartText.TextAlign='right';
+        }
+
+        chartText.BuildCacheData(hqChart.GetKData(),varItem.Draw.DrawData);
+
+        this.SetChartIndexName(chartText);
+        hqChart.ChartPaint.push(chartText);
+    }
+
+    this.CreateDrawNumber_Fix=function(hqChart,windowIndex,varItem,id)
+    {
+        var chartText=new ChartDrawNumber_Fix();
+        chartText.Canvas=hqChart.Canvas;
+        chartText.Name=varItem.Name;
+        chartText.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;
+        chartText.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;
+        chartText.ReloadResource();
+        chartText.HQChart=hqChart;
+        
+        if (varItem.Draw.Position) 
+        {
+            var item=varItem.Draw.Position;
+            chartText.PtPercentage={ X:item.X, Y:item.Y }; //坐标
+           // TYPE:0为左对齐,1为右对齐 2=居中
+            if (item.Type===0) chartText.TextAlign="left";
+            else if (item.Type===1) chartText.TextAlign="right";
+            else if (item.Type===2) chartText.TextAlign="center";
+        }
+
+        //字体
+        if (varItem.DrawFontSize>0) chartText.TextFont=`${varItem.DrawFontSize*GetDevicePixelRatio()}px 微软雅黑`;    //临时用下吧
+        if (varItem.Font) chartText.TextFont=varItem.Font;
+        
+        //颜色
+        if (varItem.Color) chartText.Color=this.GetColor(varItem.Color);
+        else chartText.Color=this.GetDefaultColor(id);
+
+        if (varItem.DrawVAlign>=0)  //上下对齐
+        {
+            if (varItem.DrawVAlign==0) chartText.TextBaseline='top';
+            else if (varItem.DrawVAlign==1) chartText.TextBaseline='middle';
+            else if (varItem.DrawVAlign==2) chartText.TextBaseline='bottom';
+        }
+
+        if (varItem.DrawAlign>=0)   // 左右对齐
+        {
+            if (varItem.DrawAlign==0) chartText.TextAlign="left";
+            else if (varItem.DrawAlign==1) chartText.TextAlign="center";
+            else if (varItem.DrawAlign==2) chartText.TextAlign='right';
+        }
+
+        chartText.BuildCacheData(hqChart.GetKData(),varItem.Draw.DrawData);
+
+        this.SetChartIndexName(chartText);
+        hqChart.ChartPaint.push(chartText);
+    }
+
     this.CreateDrawText=function(hqChart,windowIndex,varItem,id)
     {
         let chartText=new ChartSingleText();
@@ -132930,8 +133451,10 @@ function ScriptIndex(name,script,args,option)
                         this.CreateDrawNumber(hqChart,windowIndex,item,i);
                         break;
                     case "DRAWNUMBER_FIX":
+                        this.CreateDrawNumber_Fix(hqChart,windowIndex,item,i);
+                        break;
                     case 'DRAWTEXT_FIX':
-                        this.CreateNumberText(hqChart,windowIndex,item,i);
+                        this.CreateDrawText_Fix(hqChart,windowIndex,item,i);
                         break;
                     case 'DRAWICON':
                         this.CreateIcon(hqChart,windowIndex,item,i);
@@ -133323,9 +133846,13 @@ function OverlayScriptIndex(name,script,args,option)
                         this.CreateBackgroud(hqChart,windowIndex,item,i);
                         break;
                     case 'DRAWNUMBER':
+                        this.CreateNumberText(hqChart,windowIndex,item,i);
+                        break;
                     case "DRAWNUMBER_FIX":  
+                        this.CreateDrawNumber_Fix(hqChart,windowIndex,item,i);
+                        break;
                     case 'DRAWTEXT_FIX':  
-                        this.CreateNumberText(hqChart,windowIndex,item,i);
+                        this.CreateDrawText_Fix(hqChart,windowIndex,item,i);
                         break;
                     case 'DRAWICON':
                         this.CreateIcon(hqChart,windowIndex,item,i);
@@ -133667,6 +134194,7 @@ function OverlayScriptIndex(name,script,args,option)
         }
 
         if (varItem.DrawFontSize>0) chartText.FixedFontSize=varItem.DrawFontSize;
+        if (varItem.Font) chartText.Font=varItem.Font;
         if (varItem.Background) chartText.TextBG=varItem.Background;
         if (varItem.VerticalLine) chartText.VerticalLine=varItem.VerticalLine;
         if (IFrameSplitOperator.IsNumber(varItem.XOffset)) chartText.ShowOffset.X=varItem.XOffset;
@@ -133865,6 +134393,12 @@ function OverlayScriptIndex(name,script,args,option)
             let width=parseInt(varItem.LineWidth.replace("LINETHICK",""));
             if (!isNaN(width) && width>0) chart.LineWidth=width;
         }
+
+        if (varItem.IsDotLine) 
+        {
+            chart.IsDotLine=true; //虚线
+            chart.LineDash=g_JSChartResource.DOTLINE.LineDash.slice();
+        }
         
         let titleIndex=windowIndex+1;
         chart.Data.Data=varItem.Draw.DrawData;
@@ -134034,6 +134568,110 @@ function OverlayScriptIndex(name,script,args,option)
         frame.ChartPaint.push(chart);
     }
 
+    this.CreateDrawText_Fix=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartDrawText_Fix();
+        chart.Canvas=hqChart.Canvas;
+
+        chart.Name=varItem.Name;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+        chart.ReloadResource();
+        chart.HQChart=hqChart;
+
+        if (varItem.Draw.Position) 
+        {
+            var item=varItem.Draw.Position;
+            chart.PtPercentage={ X:item.X, Y:item.Y }; //坐标
+           // TYPE:0为左对齐,1为右对齐 2=居中
+            if (item.Type===0) chart.TextAlign="left";
+            else if (item.Type===1) chart.TextAlign="right";
+            else if (item.Type===2) chart.TextAlign="center";
+        }
+
+        //字体
+        if (varItem.DrawFontSize>0) chart.TextFont=`${varItem.DrawFontSize*GetDevicePixelRatio()}px 微软雅黑`;    //临时用下吧
+        if (varItem.Font) chart.TextFont=varItem.Font;
+        
+        //颜色
+        if (varItem.Color) chart.Color=this.GetColor(varItem.Color);
+        else chart.Color=this.GetDefaultColor(id);
+
+        if (varItem.DrawVAlign>=0)  //上下对齐
+        {
+            if (varItem.DrawVAlign==0) chart.TextBaseline='top';
+            else if (varItem.DrawVAlign==1) chart.TextBaseline='middle';
+            else if (varItem.DrawVAlign==2) chart.TextBaseline='bottom';
+        }
+
+        if (varItem.DrawAlign>=0)   // 左右对齐
+        {
+            if (varItem.DrawAlign==0) chart.TextAlign="left";
+            else if (varItem.DrawAlign==1) chart.TextAlign="center";
+            else if (varItem.DrawAlign==2) chart.TextAlign='right';
+        }
+
+        chart.BuildCacheData(hqChart.GetKData(),varItem.Draw.DrawData);
+
+        this.SetChartIndexName(chart);
+        frame.ChartPaint.push(chart);
+    }
+
+    this.CreateDrawNumber_Fix=function(hqChart,windowIndex,varItem,id)
+    {
+        var overlayIndex=this.OverlayIndex;
+        var frame=overlayIndex.Frame;
+        var chart=new ChartDrawNumber_Fix();
+        chart.Canvas=hqChart.Canvas;
+
+        chart.Name=varItem.Name;
+        chart.ChartBorder=frame.Frame.ChartBorder;
+        chart.ChartFrame=frame.Frame;
+        chart.Identify=overlayIndex.Identify;
+        chart.ReloadResource();
+        chart.HQChart=hqChart;
+
+        if (varItem.Draw.Position) 
+        {
+            var item=varItem.Draw.Position;
+            chart.PtPercentage={ X:item.X, Y:item.Y }; //坐标
+           // TYPE:0为左对齐,1为右对齐 2=居中
+            if (item.Type===0) chart.TextAlign="left";
+            else if (item.Type===1) chart.TextAlign="right";
+            else if (item.Type===2) chart.TextAlign="center";
+        }
+
+        //字体
+        if (varItem.DrawFontSize>0) chart.TextFont=`${varItem.DrawFontSize*GetDevicePixelRatio()}px 微软雅黑`;    //临时用下吧
+        if (varItem.Font) chart.TextFont=varItem.Font;
+        
+        //颜色
+        if (varItem.Color) chart.Color=this.GetColor(varItem.Color);
+        else chart.Color=this.GetDefaultColor(id);
+
+        if (varItem.DrawVAlign>=0)  //上下对齐
+        {
+            if (varItem.DrawVAlign==0) chart.TextBaseline='top';
+            else if (varItem.DrawVAlign==1) chart.TextBaseline='middle';
+            else if (varItem.DrawVAlign==2) chart.TextBaseline='bottom';
+        }
+
+        if (varItem.DrawAlign>=0)   // 左右对齐
+        {
+            if (varItem.DrawAlign==0) chart.TextAlign="left";
+            else if (varItem.DrawAlign==1) chart.TextAlign="center";
+            else if (varItem.DrawAlign==2) chart.TextAlign='right';
+        }
+
+        chart.BuildCacheData(hqChart.GetKData(),varItem.Draw.DrawData);
+
+        this.SetChartIndexName(chart);
+        frame.ChartPaint.push(chart);
+    }
+
     this.CreateTextLine=function(hqChart,windowIndex,varItem,id)
     {
         var overlayIndex=this.OverlayIndex;
@@ -154293,7 +154931,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15257";
+var HQCHART_VERSION="1.1.15291";
 
 function PrintHQChartVersion()
 {