hqchart 1.1.13743 → 1.1.13754

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

@@ -34590,6 +34590,7 @@ function ChartLine()
     this.LineWidth;                 //线段宽度
     this.DrawType=0;                //画图方式  0=无效数平滑  1=无效数不画断开
     this.IsDotLine=false;           //虚线
+    this.LineDash=g_JSChartResource.DOTLINE.LineDash;
     this.BreakPoint;                //断开的点索引 Set();
 
 
@@ -34635,7 +34636,7 @@ function ChartLine()
         
         this.Canvas.save();
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
-        if (this.IsDotLine) this.Canvas.setLineDash(g_JSChartResource.DOTLINE.LineDash); //画虚线
+        if (this.IsDotLine) this.Canvas.setLineDash(this.LineDash); //画虚线
         var bFirstPoint=true;
         var drawCount=0;
         for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j)
@@ -34702,7 +34703,7 @@ function ChartLine()
         this.ClipClient(bHScreen);
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
         this.Canvas.strokeStyle=this.Color;
-        if (this.IsDotLine) this.Canvas.setLineDash(g_JSChartResource.DOTLINE.LineDash); //画虚线
+        if (this.IsDotLine) this.Canvas.setLineDash(this.LineDash); //画虚线
 
         var bFirstPoint=true;
         var ptFirst=null;;    //第1个点
@@ -34799,7 +34800,7 @@ function ChartLine()
         this.ClipClient(bHScreen);
         if (this.LineWidth>0) this.Canvas.lineWidth=this.LineWidth * GetDevicePixelRatio();
         this.Canvas.strokeStyle=this.Color;
-        if (this.IsDotLine) this.Canvas.setLineDash(g_JSChartResource.DOTLINE.LineDash); //画虚线
+        if (this.IsDotLine) this.Canvas.setLineDash(this.LineDash); //画虚线
 
         var bFirstPoint=true;
         var ptFirst=null;;    //第1个点
@@ -39971,16 +39972,38 @@ function ChartClipColorStick()
     this.UpColor=g_JSChartResource.UpBarColor;
     this.DownColor=g_JSChartResource.DownBarColor;
     this.LineWidth=1;
+    this.Style=0; //1=同方向  0=上下两个方向
+
     //差值线
     this.DownDiffColor=g_JSChartResource.DownBarColor;
     this.UpDiffColor=g_JSChartResource.UpBarColor;
 
+    //文字
+    this.TextLabelConfig=
+    {
+        Font:`${12*GetDevicePixelRatio()}px 微软雅黑`,
+        TextMargin:{ Left:2, Right:2, Bottom:2, Top:2 },
+        TextColor:"rgb(230,230,230)",
+        UpColor:"rgb(137,16,19)",
+        DownColor:"rgb(44,104,57)",
+        UnchangeColor:"rgb(111,112,115)",
+        BorderColor:"rgb(0,0,0)",
+
+        //缓存
+        LabelWidth:0,
+        TextHeight:0,
+        MaxTextWidth:0,
+    }
+
     this.BaseLineColor; //基准线
 
     this.BaseValue=0;
     this.Super_GetMaxMin=this.GetMaxMin;    //父类的方法
     this.ValueRange;    //{ Max:, Min: }    //固定最大最小值
 
+    this.IsShowText=false;
+    
+
     this.SetOption=function(option)
     {
         if (!option) return;
@@ -39991,11 +40014,18 @@ function ChartClipColorStick()
         if (option.UpDiffColor) this.UpDiffColor=option.UpDiffColor;
         if (option.BaseLineColor) this.BaseLineColor=option.BaseLineColor;
         if (IFrameSplitOperator.IsNumber(option.BaseValue)) this.BaseValue=option.BaseValue;
+        if (IFrameSplitOperator.IsNumber(option.Style)) this.Style=option.Style;
         if (option.ValueRange) this.ValueRange=option.ValueRange;
+
     }
 
     this.Draw=function()
     {
+        this.IsShowText=false;
+        this.TextLabelConfig.LabelWidth=0;
+        this.TextLabelConfig.TextHeight=0;
+        this.TextLabelConfig.MaxTextWidth=0;
+
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
@@ -40006,23 +40036,44 @@ function ChartClipColorStick()
             return;
         }
 
-        this.Canvas.save();
         var dataWidth=this.ChartFrame.DataWidth;
+        var distanceWidth=this.ChartFrame.DistanceWidth;
+        var xPointCount=this.ChartFrame.XPointCount;
+        var bHScreen=this.ChartFrame.IsHScreen===true;
+
         var lineWidth=this.LineWidth*GetDevicePixelRatio();
         if (this.LineWidth==50) lineWidth=dataWidth;
         else if (lineWidth>dataWidth) lineWidth=dataWidth;
-        
+
+        if (!bHScreen)
+        {
+            var itemWidth=dataWidth+distanceWidth;
+            var bMinute=this.IsMinuteFrame();
+            if (bMinute) 
+            {
+                var border=this.ChartBorder.GetBorder();
+                itemWidth=(border.Right-border.Left)/(xPointCount-1);
+            }
+
+            this.Canvas.font=this.TextLabelConfig.Font;
+            this.TextLabelConfig.MaxTextWidth=this.Canvas.measureText("-888").width;
+            this.TextLabelConfig.LabelWidth=this.TextLabelConfig.MaxTextWidth+this.TextLabelConfig.TextMargin.Left+this.TextLabelConfig.TextMargin.Right;
+            this.IsShowText=itemWidth>this.TextLabelConfig.LabelWidth;
+            this.TextLabelConfig.TextHeight=this.Canvas.measureText("擎").width;
+        }
+
+        this.Canvas.save();
         if (IFrameSplitOperator.IsNumber(this.BaseValue) && this.BaseValue!=0)
         {
             this.DrawBaseLine();
 
-            if (this.BaseValue>0)  this.DrawBars(lineWidth, true);
-            else this.DrawBars(lineWidth, false);
+            if (this.BaseValue>0)  this.DrawBars(lineWidth, true, true);
+            else this.DrawBars(lineWidth, false, true);
         }
         else
         {
             //上下分开画
-            this.DrawBars(lineWidth, true);
+            this.DrawBars(lineWidth, true, true);
             this.DrawBars(lineWidth, false);
         }
 
@@ -40030,15 +40081,15 @@ function ChartClipColorStick()
         this.Canvas.restore();
     }
 
-    this.DrawBars=function(lineWidth, bUpBar)
+    this.DrawBars=function(lineWidth, bUpBar, bDrawLabel)
     {
         var isMinute=this.IsMinuteFrame();
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
         var xPointCount=this.ChartFrame.XPointCount;
-        var isHSCreen=this.ChartFrame.IsHScreen===true;
+        var bHScreen=this.ChartFrame.IsHScreen===true;
 
-        if (isHSCreen)
+        if (bHScreen)
         {
             var border=this.ChartBorder.GetHScreenBorder();
             var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
@@ -40057,19 +40108,14 @@ function ChartClipColorStick()
         }
 
         var yBottom=this.ChartFrame.GetYFromData(this.BaseValue);
-        var aryBar=[], aryDiffBar=[];
-        for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
+        var aryBar=[], aryDiffBar=[], aryText=[];
+        var preValue=null;
+        var start=this.Data.DataOffset;
+        if (start-1>0) preValue=this.Data.Data[start-1];    //上一个数值
+        for(var i=start,j=0;i<this.Data.Data.length && j<xPointCount;++i,++j,xOffset+=(dataWidth+distanceWidth))
         {
             var value=this.Data.Data[i];
             if (value==null) continue;
-            if (bUpBar)
-            {
-                if (value<0) continue;
-            }
-            else
-            {
-                if (value>=0) continue;
-            }
 
             if (isMinute)
             {
@@ -40085,6 +40131,21 @@ function ChartClipColorStick()
 
             if (x>chartright) break;
 
+            var textItem={ X:x, Value:value };
+            if (IFrameSplitOperator.IsNumber(preValue)) textItem.DiffValue=value-preValue;
+            aryText.push(textItem);
+
+            preValue=value;
+
+            if (bUpBar)
+            {
+                if (value<0) continue;
+            }
+            else
+            {
+                if (value>=0) continue;
+            }
+
             var bDiffBar=false;
             var diffValue=null;
             if (this.BaseValue>0)
@@ -40092,7 +40153,10 @@ function ChartClipColorStick()
                 if (value<this.BaseValue)
                 {
                     bDiffBar=true;
-                    diffValue=this.BaseValue-(this.BaseValue-value);
+                    if (this.Style==1)
+                        diffValue=this.BaseValue+(this.BaseValue-value);
+                    else
+                        diffValue=this.BaseValue-(this.BaseValue-value);
                 }
             }
             else if (this.BaseValue<0)
@@ -40100,19 +40164,22 @@ function ChartClipColorStick()
                 if (value>this.BaseValue)
                 {
                     bDiffBar=true;
-                    diffValue=this.BaseValue+(value-this.BaseValue)
+                    if (this.Style==1)
+                        diffValue=this.BaseValue-(value-this.BaseValue);
+                    else
+                        diffValue=this.BaseValue+(value-this.BaseValue)
                 }
             }
             
             if (!bDiffBar)
             {
                 var y=this.ChartFrame.GetYFromData(value);
-                aryBar.push({X:x, Y:y});
+                aryBar.push({X:x, Y:y });
             }
             else
             {
                 var y=this.ChartFrame.GetYFromData(diffValue);
-                aryDiffBar.push({X:x, Y:y});
+                aryDiffBar.push({X:x, Y:y });
             }
         }
 
@@ -40121,6 +40188,7 @@ function ChartClipColorStick()
         else this.Canvas.strokeStyle=this.DownColor;
 
         this.DrawStick(aryBar,lineWidth,yBottom);
+        
 
         if (this.BaseValue>0)
         {
@@ -40133,13 +40201,14 @@ function ChartClipColorStick()
             this.DrawStick(aryDiffBar,lineWidth,yBottom);
         }
 
+        if (this.IsShowText && bDrawLabel) this.DrawStickText(aryText);
     }
 
     this.DrawStick=function(aryData, lineWidth, yBottom)
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(aryData)) return;
 
-        var isHSCreen=this.ChartFrame.IsHScreen===true;
+        var bHScreen=this.ChartFrame.IsHScreen===true;
         var drawCount=0;
         this.Canvas.beginPath();
         for(var i=0; i<aryData.length; ++i)
@@ -40148,7 +40217,7 @@ function ChartClipColorStick()
             var y=item.Y;
             var xFix=ToFixedPoint2(lineWidth, item.X); //毛边修正
 
-            if (isHSCreen)
+            if (bHScreen)
             {
                 this.Canvas.moveTo(yBottom,ToFixedPoint(x));
                 this.Canvas.lineTo(y,ToFixedPoint(x));
@@ -40170,14 +40239,14 @@ function ChartClipColorStick()
         if (!IFrameSplitOperator.IsNumber(this.BaseValue) || this.BaseValue==0) return;
         if (!this.BaseLineColor) return;
 
-        var isHSCreen=this.ChartFrame.IsHScreen===true;
+        var bHScreen=this.ChartFrame.IsHScreen===true;
         var border=this.ChartFrame.GetBorder();
         var y=this.ChartFrame.GetYFromData(this.BaseValue);
 
         this.Canvas.strokeStyle=this.BaseLineColor;
         this.Canvas.lineWidth=1*GetDevicePixelRatio();
 
-        if (isHSCreen)
+        if (bHScreen)
         {
 
         }
@@ -40191,6 +40260,107 @@ function ChartClipColorStick()
         }
     }
 
+    this.DrawStickText=function(aryData)
+    {
+        var config=this.TextLabelConfig;
+        this.Canvas.font=config.Font;
+        var border=this.ChartBorder.GetBorder();
+        var itemHeight=config.TextHeight*2+config.TextMargin.Bottom+config.TextMargin.Top;
+        for(var i=0; i<aryData.length; ++i)
+        {
+            var item=aryData[i];
+            var value=item.Value;
+            var xCenter=item.X;
+            var xLeft=xCenter-config.LabelWidth/2;
+
+            var rtDraw={ Left:xLeft, Width:config.LabelWidth, Top:border.BottomEx+1, Height:itemHeight };
+            rtDraw.Right=rtDraw.Left+rtDraw.Width;
+            rtDraw.Bottom=rtDraw.Top+rtDraw.Height;
+            if (IFrameSplitOperator.IsNumber(value))
+            {
+                var bgColor=config.UnchangeColor;
+                if (value>0) bgColor=config.UpColor;
+                else if (value<0) bgColor=config.DownColor;
+                this.DrawTextLabel(value, bgColor, config.BorderColor, config.TextColor, rtDraw, config.TextHeight, config.MaxTextWidth, config.TextMargin);
+            }
+
+            var value=item.DiffValue;
+            var rtDraw={ Left:xLeft, Width:config.LabelWidth, Bottom:border.TopEx-1, Height:itemHeight };
+            rtDraw.Right=rtDraw.Left+rtDraw.Width;
+            rtDraw.Top=rtDraw.Bottom-rtDraw.Height;
+            if (IFrameSplitOperator.IsNumber(value))
+            {
+                var bgColor=config.UnchangeColor;
+                if (value>0) bgColor=config.UpColor;
+                else if (value<0) bgColor=config.DownColor;
+                this.DrawTextLabel(value, bgColor, config.BorderColor, config.TextColor, rtDraw, config.TextHeight, config.MaxTextWidth, config.TextMargin);
+            }
+        }
+    }
+
+    //数值标签
+    this.DrawTextLabel=function(value, clrGB, clrBorder, clrText, rtDraw, textHeight, textWidth, textMargin)
+    {
+        if (clrGB)
+        {
+            this.Canvas.fillStyle=clrGB;
+            this.Canvas.fillRect(rtDraw.Left ,rtDraw.Top, (rtDraw.Width), (rtDraw.Height));
+        }
+        
+        if (clrBorder)
+        {
+            this.Canvas.lineWidth=2;
+            this.Canvas.strokeStyle=clrBorder;
+            this.Canvas.strokeRect(rtDraw.Left, rtDraw.Top, rtDraw.Width, rtDraw.Height);
+        }
+        else 
+        {
+            this.Canvas.lineWidth=1;
+            this.Canvas.strokeStyle="rgb(0,0,0)";
+            this.Canvas.strokeRect(rtDraw.Left, rtDraw.Top, rtDraw.Width, rtDraw.Height);
+        }
+
+        var aryText=[null, null];   //大于3位数的 2行输出
+        var sign="";   //负数
+        if (value<0)
+        {
+            value=Math.abs(value);
+            sign='-';
+        }
+        
+        if (value>999)
+        {
+            var thousand=parseInt(value/1000);
+            var hundred=parseInt(value%1000);
+
+            aryText[0]=`${sign}${thousand}`;
+            aryText[1]=`${hundred}`;
+            if (hundred<10) aryText[1]=`00${hundred}`;
+            else if (hundred<100) aryText[1]=`0${hundred}`;
+        }
+        else
+        {
+            aryText[1]=`${sign}${value.toFixed(0)}`;
+        }
+
+        this.Canvas.textAlign="right";
+        this.Canvas.textBaseline="top";
+        var xRight=rtDraw.Right-(rtDraw.Right-rtDraw.Left-textWidth)/2;
+
+        this.Canvas.fillStyle=clrText;
+        var yText=textMargin.Top+rtDraw.Top;
+        for(var i=0;i<aryText.length;++i)
+        {
+            var text=aryText[i];
+            if (text)
+            {
+                this.Canvas.fillText(text,xRight,yText);
+            }
+
+            yText+=textHeight;
+        }
+    }
+
     this.GetMaxMin=function()
     {
         if (!IFrameSplitOperator.IsNumber(this.BaseValue) || this.BaseValue==0)
@@ -40253,13 +40423,36 @@ function ChartClipColorStick()
 
         if (this.BaseValue>0)
         {
-            if (IFrameSplitOperator.IsNumber(maxDiffValue) && IFrameSplitOperator.IsNumber(range.Min))
-                range.Min-=maxDiffValue;
+            if (this.Style==1)
+            {
+                if (IFrameSplitOperator.IsNumber(maxDiffValue))
+                {
+                    var value=this.BaseValue+maxDiffValue;
+                    if (IFrameSplitOperator.IsNumber(range.Max) || range.Max<value) range.Max=value;
+                } 
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(maxDiffValue) && IFrameSplitOperator.IsNumber(range.Min))
+                    range.Min-=maxDiffValue;
+            }
+            
         }
         else
         {
-            if (IFrameSplitOperator.IsNumber(maxDiffValue) && IFrameSplitOperator.IsNumber(range.Max))
-                range.Max+=maxDiffValue;
+            if (this.Style==1)
+            {
+                if (IFrameSplitOperator.IsNumber(maxDiffValue))
+                {
+                    var value=this.BaseValue-maxDiffValue;
+                    if (IFrameSplitOperator.IsNumber(range.Min) || range.Min>value) range.Min=value;
+                } 
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(maxDiffValue) && IFrameSplitOperator.IsNumber(range.Max))
+                    range.Max+=maxDiffValue;
+            }
         }
 
         return range;
@@ -108900,6 +109093,12 @@ function JSDraw(errorHandler,symbolData)
         return offset;
     }
 
+    this.LINEDASH=function(aryData)
+    {
+        if (IFrameSplitOperator.IsNonEmptyArray(aryData)) return aryData.slice();
+        return [];
+    }
+
     this.KLINETYPE=function(type)
     {
         return type;
@@ -115771,6 +115970,7 @@ function JSExecute(ast,option)
                 var isFirstDraw=null;
                 let xOffset=null, yOffset=null;
                 var klineType=null;
+                var lineDash=null;
                 for(let j=0; j<item.Expression.Expression.length; ++j)
                 {
                     let itemExpression=item.Expression.Expression[j];
@@ -115899,6 +116099,11 @@ function JSExecute(ast,option)
                             {
                                 yOffset=itemExpression.Out;
                             }
+                            else if (itemExpression.Callee.Name=="LINEDASH")
+                            {
+                                if (IFrameSplitOperator.IsNonEmptyArray(itemExpression.Out))
+                                    lineDash=itemExpression.Out.slice();
+                            }
                             else if (itemExpression.Callee.Name=="FIRSTDRAW")
                             {
                                 if (itemExpression.Out===0) isFirstDraw=false;
@@ -116063,6 +116268,7 @@ function JSExecute(ast,option)
                     if (isShow == false) value.IsShow = false;
                     if (isExData==true) value.IsExData = true;
                     if (isDotLine==true) value.IsDotLine=true;
+                    if (IFrameSplitOperator.IsNonEmptyArray(lineDash)) value.LineDash=lineDash;
                     if (isOverlayLine==true) value.IsOverlayLine=true;
                     if (isSingleLine==true) value.IsSingleLine=true;
                     if (isNoneName==true) value.NoneName=true;
@@ -116075,6 +116281,7 @@ function JSExecute(ast,option)
                     var outVar={Name:draw.Name, Draw:draw, Type:1};
                     if (color) outVar.Color=color;
                     if (isDotLine==true) outVar.IsDotLine=true;
+                    if (IFrameSplitOperator.IsNonEmptyArray(lineDash)) outVar.LineDash=lineDash;
                     if (lineWidth) outVar.LineWidth=lineWidth;
                     if (isDrawAbove) outVar.IsDrawAbove=true;
                     if (isDrawCenter) outVar.IsDrawCenter=true;
@@ -116099,6 +116306,7 @@ function JSExecute(ast,option)
                     if (isShow==false) value.IsShow=false;
                     if (isExData==true) value.IsExData = true;
                     if (isDotLine==true) value.IsDotLine=true;
+                    if (IFrameSplitOperator.IsNonEmptyArray(lineDash)) value.LineDash=lineDash;
                     if (isOverlayLine==true) value.IsOverlayLine=true;
                     if (isSingleLine==true) value.IsSingleLine=true;
                     if (isShowTitle==false) value.IsShowTitle=false;
@@ -116586,6 +116794,9 @@ function JSExecute(ast,option)
             case "YMOVE":
                 node.Out=this.Draw.YMOVE(args[0]);
                 break;
+            case "LINEDASH":
+                node.Out=this.Draw.LINEDASH(args);
+                break;
             case "FIRSTDRAW":
                 node.Out=this.Draw.FIRSTDRAW(args[0]);
                 break;
@@ -118845,7 +119056,15 @@ function ScriptIndex(name,script,args,option)
             if (!isNaN(width) && width>0) line.LineWidth=width;
         }
 
-        if (varItem.IsDotLine) line.IsDotLine=true; //虚线
+        if (varItem.IsDotLine) 
+        {
+            line.IsDotLine=true; //虚线
+            line.LineDash=g_JSChartResource.DOTLINE.LineDash.slice();
+        }
+
+        //虚线设置
+        if (IFrameSplitOperator.IsNonEmptyArray(varItem.LineDash)) line.LineDash=varItem.LineDash;
+
         if (varItem.IsShow==false) line.IsShow=false;
         
         let titleIndex=windowIndex+1;
@@ -138395,7 +138614,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13742";
+var HQCHART_VERSION="1.1.13753";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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