hqchart 1.1.15273 → 1.1.15292

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

@@ -44206,7 +44206,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
@@ -44281,8 +44282,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);
@@ -53132,6 +53134,7 @@ function KLineTooltipPaint()
     this.ExtendLineWidth=2;
 
     this.Font=[g_JSChartResource.TooltipPaint.TitleFont];
+    
 
     this.HQChart;
     this.KLineTitlePaint;
@@ -53251,6 +53254,8 @@ function KLineTooltipPaint()
                 lineWidth+=textWidth;
             }
 
+            if (IFrameSplitOperator.IsNumber(item.Space)) lineWidth+=item.Space;
+
             if (maxLineWidth<lineWidth) maxLineWidth=lineWidth;
 
             height+=this.LineHeight;
@@ -53442,20 +53447,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;
         }
 
@@ -57623,6 +57641,8 @@ function LatestPointFlashPaint()
     this.ClassName='LatestPointFlashPaint';
     this.HQChart;
 
+    this.FlashType=0;   //0=数据更新了闪烁, 1=一直显示
+    //闪烁
     this.Status=0;
     this.UpdateTime=new Date();
     this.FlashCount=0;  //闪烁次数
@@ -57647,6 +57667,7 @@ function LatestPointFlashPaint()
         if (option)
         {
             if (IFrameSplitOperator.IsNumber(option.Frequency)) this.Frequency=option.Frequency;
+            if (IFrameSplitOperator.IsNumber(option.FlashType)) this.FlashType=option.FlashType;
         }
     }
 
@@ -57681,18 +57702,32 @@ function LatestPointFlashPaint()
         if (!this.HQChart) return;
         this.HQChart.ClearCanvas(this.FlashCanvas);
 
-        if (this.FlashCount<=0) return;
-        if (this.IsStatusChange())
+        if (this.FlashType===1)
         {
-            this.Status=(this.Status+1)%2;
-            --this.FlashCount;
+
         }
+        else
+        {
+            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;
@@ -82826,7 +82861,7 @@ function JSChartResource()
     //虚线配置
     this.DOTLINE=
     {
-        LineDash:[3,5]  //虚线配置
+        LineDash:[2*GetDevicePixelRatio(),2*GetDevicePixelRatio()]  //虚线配置
     }
 
     this.DRAWSL=
@@ -120228,6 +120263,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;
@@ -120254,6 +120300,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)
@@ -120265,13 +120321,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);//右延长线
 
@@ -120288,12 +120339,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);
+
             }
         }
 
@@ -120810,7 +120858,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;
 
@@ -121196,6 +121250,12 @@ function JSDraw(errorHandler,symbolData)
         return rgba;
     }
 
+    //设置字体
+    this.CSSFONT=function(strFont)
+    {
+        return strFont;
+    }
+
     this.UPCOLOR=function(color)
     {
         return color;
@@ -128241,6 +128301,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];
@@ -128357,6 +128418,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;
@@ -128559,6 +128624,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;
@@ -129059,6 +129125,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;
@@ -131773,6 +131842,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;
 
@@ -131928,6 +131998,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;
@@ -134162,6 +134238,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;
@@ -134360,6 +134437,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;
@@ -166907,7 +166990,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15272";
+var HQCHART_VERSION="1.1.15291";
 
 function PrintHQChartVersion()
 {