hqchart 1.1.15084 → 1.1.15091

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

@@ -4660,8 +4660,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsNumber(subItem.Formula)) chart.ChartCorssCursor.StringFormatX.RangeIncrease.Formula=subItem.Formula;
 
             }
-           
-           
         }
 
         //保存十字光标文字高度
@@ -4680,8 +4678,11 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             {
                 var item=option.Frame[i];
                 if (!chart.Frame.SubFrame[i]) continue;
-                var subFrame=chart.Frame.SubFrame[i].Frame;
 
+                chart.SetSubFrameAttribute(chart.Frame.SubFrame[i], null, item);
+
+                /* 窗口设置全部移动到 SetSubFrameAttribute
+                var subFrame=chart.Frame.SubFrame[i].Frame;
                 if (IFrameSplitOperator.IsNumber(item.SplitCount)) chart.Frame.SubFrame[i].Frame.YSplitOperator.SplitCount=item.SplitCount;
                 if (item.StringFormat) chart.Frame.SubFrame[i].Frame.YSplitOperator.StringFormat=item.StringFormat;
                 if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) chart.Frame.SubFrame[i].Frame.YSplitOperator.FloatPrecision=item.FloatPrecision;
@@ -4727,6 +4728,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.IsShowNameArrow)) chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;
 
                 if (item.ClientBGColor) subFrame.ClientBGColor=item.ClientBGColor;
+                */
             }
         }
 
@@ -4859,6 +4861,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
 
             }
 
+            chart.SetSubFrameAttribute(chart.Frame.SubFrame[i],item, null)
+
+            /* 窗口设置全部移动到 SetSubFrameAttribute
             var frame=chart.Frame.SubFrame[i].Frame;
             if (IFrameSplitOperator.IsBool(item.Modify)) frame.ModifyIndex=item.Modify;
             if (IFrameSplitOperator.IsBool(item.Change)) frame.ChangeIndex=item.Change;
@@ -4888,6 +4893,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.Position)) chart.Frame.SubFrame[i].Frame.OverlayIndexType.Position=item.OverlayIndexType.Position;
                 if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.LineSpace)) chart.Frame.SubFrame[i].Frame.OverlayIndexType.LineSpace=item.OverlayIndexType.LineSpace;
             }
+            */
         }
         
         //叠加指标宽度
@@ -5243,6 +5249,10 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             {
                 var item=option.Frame[i];
                 if (!chart.Frame.SubFrame[i]) continue;
+
+                chart.SetSubFrameAttribute(chart.Frame.SubFrame[i],null,item);
+
+                /*
                 var subFrame=chart.Frame.SubFrame[i].Frame;
 
                 if (IFrameSplitOperator.IsNumber(item.SplitCount)) chart.Frame.SubFrame[i].Frame.YSplitOperator.SplitCount=item.SplitCount;
@@ -5300,6 +5310,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                         if (subItem.Percentage && IFrameSplitOperator.IsNumber(subItem.Percentage.Dec)) subFrame.YSplitOperator.RightTextConfig.Percentage.Dec=subItem.Percentage.Dec;
                     }
                 }
+                */
             }
 
             chart.UpdateXShowText();
@@ -5415,6 +5426,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                     }
                 }
 
+                chart.SetSubFrameAttribute(chart.Frame.SubFrame[index],item, null);
+
+                /*
                 var frame=chart.Frame.SubFrame[index].Frame;
                 if (IFrameSplitOperator.IsBool(item.Modify)) frame.ModifyIndex=item.Modify;
                 if (IFrameSplitOperator.IsBool(item.Change)) frame.ChangeIndex=item.Change;
@@ -5437,6 +5451,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (item.IsShowIndexName==false) chart.Frame.SubFrame[index].Frame.IsShowIndexName=false;
                 if (item.IsShowOverlayIndexName==false) chart.Frame.SubFrame[index].Frame.IsShowOverlayIndexName=false;
                 if (!IFrameSplitOperator.IsUndefined(item.HorizontalReserved)) frame.HorizontalReserved=item.HorizontalReserved;
+                */
             }
         }
 
@@ -14415,10 +14430,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(windowItem.Change)) frame.ChangeIndex=windowItem.Change;
             if (IFrameSplitOperator.IsBool(windowItem.Close)) frame.CloseIndex=windowItem.Close;
             if (IFrameSplitOperator.IsBool(windowItem.Overlay)) frame.OverlayIndex=windowItem.Overlay;
+            if (IFrameSplitOperator.IsBool(windowItem.Export)) frame.ExportData=windowItem.Export;
+            if (IFrameSplitOperator.IsBool(windowItem.MaxMin)) frame.MaxMinWindow=windowItem.MaxMin;
+            if (IFrameSplitOperator.IsBool(windowItem.TitleWindow)) frame.TitleWindow=windowItem.TitleWindow;
             if (IFrameSplitOperator.IsBool(windowItem.AddIndexWindow)) frame.AddIndexWindow=windowItem.AddIndexWindow;
             if (IFrameSplitOperator.IsBool(windowItem.IndexHelp)) frame.IndexHelp=windowItem.IndexHelp;
 
             if (IFrameSplitOperator.IsBool(windowItem.IsDrawTitleBG))  frame.IsDrawTitleBG=windowItem.IsDrawTitleBG;
+            if (IFrameSplitOperator.IsBool(windowItem.IsShowNameArrow)) frame.IsShowNameArrow=windowItem.IsShowNameArrow;
 
             if (IFrameSplitOperator.IsNumber(windowItem.TitleHeight)) frame.ChartBorder.TitleHeight=windowItem.TitleHeight;
             else windowItem.TitleHeight=frame.ChartBorder.TitleHeight;
@@ -14426,21 +14445,33 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(windowItem.IsShowTitleArrow)) frame.IsShowTitleArrow=windowItem.IsShowTitleArrow;
             if (IFrameSplitOperator.IsNumber(windowItem.TitleArrowType)) frame.TitleArrowType=windowItem.TitleArrowType;
             if (IFrameSplitOperator.IsBool(windowItem.IsShowIndexName)) frame.IsShowIndexName=windowItem.IsShowIndexName;
+            if (IFrameSplitOperator.IsBool(windowItem.IsShowOverlayIndexName)) frame.IsShowOverlayIndexName=windowItem.IsShowOverlayIndexName;
             if (IFrameSplitOperator.IsNumber(windowItem.IndexParamSpace)) frame.IndexParamSpace=windowItem.IndexParamSpace;
             if (IFrameSplitOperator.IsNumber(windowItem.IndexTitleSpace)) frame.IndexTitleSpace=windowItem.IndexTitleSpace;
             if (!IFrameSplitOperator.IsUndefined(windowItem.HorizontalReserved)) frame.HorizontalReserved=windowItem.HorizontalReserved;    //Y轴上下预留
-            if (IFrameSplitOperator.IsBool(windowItem.IsShowNameArrow)) frame.IsShowNameArrow=windowItem.IsShowNameArrow;
+           
+            if (windowItem.OverlayIndexType)
+            {
+                if (IFrameSplitOperator.IsNumber(windowItem.OverlayIndexType.Position)) frame.OverlayIndexType.Position=windowItem.OverlayIndexType.Position;
+                if (IFrameSplitOperator.IsNumber(windowItem.OverlayIndexType.LineSpace)) frame.OverlayIndexType.LineSpace=windowItem.OverlayIndexType.LineSpace;
+            }
         }
 
         if (frameItem)
         {
-            if (frameItem.SplitCount) frame.YSplitOperator.SplitCount=frameItem.SplitCount;
+            if (frameItem.SplitCount) frame.YSplitOperator.SplitCount=frameItem.SplitCount;         //Y轴刻度线个数
+            if (frameItem.StringFormat) frame.YSplitOperator.StringFormat=frameItem.StringFormat;   //Y轴文字格式
+            if (IFrameSplitOperator.IsNumber(frameItem.FloatPrecision)) frame.YSplitOperator.FloatPrecision=frameItem.FloatPrecision;   //Y轴小数位数
+            if (frameItem.Custom) frame.YSplitOperator.Custom=frameItem.Custom;     //Y轴自定义刻度
+
             if (IFrameSplitOperator.IsNumber(frameItem.SplitType)) 
             {
                 frame.YSplitOperator.SplitType=frameItem.SplitType;
                 frame.YSplitOperator.DefaultSplitType=frameItem.SplitType;
             }
 
+            if (IFrameSplitOperator.IsNumber(frameItem.FilterType)) frame.YSplitOperator.FilterType=frameItem.FilterType;
+
             if (IFrameSplitOperator.IsBool(frameItem.IsShowXLine)) frame.IsShowXLine=frameItem.IsShowXLine;
             if (IFrameSplitOperator.IsBool(frameItem.IsShowYLine)) frame.IsShowYLine=frameItem.IsShowYLine;
 
@@ -14458,6 +14489,41 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsNumber(frameItem.Height) && frameItem.Height>=0) subFrame.Height = frameItem.Height;
             if (IFrameSplitOperator.IsNumber(frameItem.TopSpace)) frame.ChartBorder.TopSpace=frameItem.TopSpace*pixelRatio;
             if (IFrameSplitOperator.IsNumber(frameItem.BottomSpace)) frame.ChartBorder.BottomSpace=frameItem.BottomSpace*pixelRatio;
+
+            if (IFrameSplitOperator.IsNumber(frameItem.RightTextPosition)) frame.YTextPosition[1]=frameItem.RightTextPosition;
+            if (IFrameSplitOperator.IsNumber(frameItem.LeftTextPosition)) frame.YTextPosition[0]=frameItem.LeftTextPosition;
+            if (IFrameSplitOperator.IsNumber(frameItem.YTextBaseline)) frame.YTextBaseline=frameItem.YTextBaseline;
+
+            if (IFrameSplitOperator.IsNumber(frameItem.YCoordinateType)) frame.YSplitOperator.CoordinateType=frameItem.YCoordinateType; //坐标类型
+            if (frameItem.IsYReverse===true) frame.CoordinateType=1;  //反转坐标
+
+            if (IFrameSplitOperator.IsNumber(frameItem.PercentageTextFormat)) frame.YSplitOperator.PercentageTextFormat=frameItem.PercentageTextFormat;    //百分比坐标格式
+            if (frameItem.DefaultYMaxMin) frame.YSplitOperator.DefaultYMaxMin=frameItem.DefaultYMaxMin; //指定最大最小值
+            if (IFrameSplitOperator.IsBool(frameItem.EnableRemoveZero)) frame.YSplitOperator.EnableRemoveZero=frameItem.EnableRemoveZero;   //Y轴文字小数位是否自动抹0
+            if (IFrameSplitOperator.IsPlusNumber(frameItem.MinYDistance)) frame.MinYDistance=frameItem.MinYDistance;
+            if (IFrameSplitOperator.IsNumber(frameItem.BorderLine)) frame.BorderLine=frameItem.BorderLine;
+            if (IFrameSplitOperator.IsBool(frameItem.IsDrawTitleBottomLine)) frame.IsDrawTitleBottomLine=frameItem.IsDrawTitleBottomLine;
+            if (IFrameSplitOperator.IsBool(frameItem.IsShowIndexTitle)) frame.IsShowIndexTitle=frameItem.IsShowIndexTitle;
+            if (frameItem.ClientBGColor) frame.ClientBGColor=frameItem.ClientBGColor;
+
+            //分时图属性
+            if (IFrameSplitOperator.IsBool(frameItem.CloseBeforeButton)) frameItem.IsShowCloseButton=frameItem.CloseBeforeButton;
+            if (frame.YSplitOperator.RightTextConfig)   //主图右侧坐标设置
+            {
+                if (IFrameSplitOperator.IsNumber(frameItem.RightTextFormat))     //废弃(兼容版本)
+                {
+                    frame.YSplitOperator.RightTextConfig.Format=frameItem.RightTextFormat;
+                    if (frameItem.RightTextFormat==2) frame.MultiTextFormat=1;
+                }
+
+                if (frameItem.RightText) //主图右侧坐标设置(新版本)
+                {
+                    var subItem=frameItem.RightText;
+                    if (IFrameSplitOperator.IsNumber(subItem.Format)) frame.YSplitOperator.RightTextConfig.Format=subItem.Format;
+                    if (subItem.Format==2) frame.MultiTextFormat=1;
+                    if (subItem.Percentage && IFrameSplitOperator.IsNumber(subItem.Percentage.Dec)) frame.YSplitOperator.RightTextConfig.Percentage.Dec=subItem.Percentage.Dec;
+                }
+            }
         }
 
     }
@@ -51829,6 +51895,47 @@ function ChartLock()
     this.IndexID;       //指标ID
     this.MinWidth=null;  //最小宽度
 
+
+    this.CalculateTextSize=function(aryText, defaultFont, out)
+    {
+        if (!out || !IFrameSplitOperator.IsNonEmptyArray(aryText)) return false;
+
+        this.Canvas.font=defaultFont;
+        var lineHeight=this.Canvas.measureText("擎").width; //行高
+        var height=0, width=0;
+        out.AryText=[];
+        for(var i=0;i<aryText.length;++i)
+        {
+            var item=aryText[i];
+            if (!item || !item.Text) continue;
+            var textWidth=this.Canvas.measureText(item.Text).width;
+           
+            var lineItem={ Text:item.Text, Width:textWidth, Height:lineHeight, Color:item.Color, TextMargin:{ Top:0, Bottom:0, Left:0, Right:0 }, YOffset:0 };
+            if (IFrameSplitOperator.IsNumber(item.YOffset)) lineItem.YOffset=item.YOffset;
+            if (item.TextMargin)
+            {
+                var margin=item.TextMargin;
+                if (IFrameSplitOperator.IsNumber(margin.Top)) lineItem.TextMargin.Top=margin.Top;
+                if (IFrameSplitOperator.IsNumber(margin.Bottom)) lineItem.TextMargin.Bottom=margin.Bottom;
+                if (IFrameSplitOperator.IsNumber(margin.Left)) lineItem.TextMargin.Left=margin.Left;
+                if (IFrameSplitOperator.IsNumber(margin.Right)) lineItem.TextMargin.Right=margin.Right;
+            }
+
+            lineItem.Height+=lineItem.TextMargin.Top+lineItem.TextMargin.Bottom;
+            lineItem.Width+=lineItem.TextMargin.Left+lineItem.TextMargin.Right;
+
+            if (width<lineItem.Width) width=lineItem.Width;
+
+            out.AryText.push(lineItem);
+            height+=lineItem.Height;
+        }
+
+        out.Width=width;
+        out.Height=height;
+
+        return true;
+    }
+
     this.Draw=function(isDraw)
     {
         this.LockRect=null;
@@ -51884,24 +51991,39 @@ function ChartLock()
         var rtBG={ Left:lLeft, Top:border.TopTitle, Bottom:border.Bottom, Width:lWidth };
         rtBG.Right=rtBG.Width+rtBG.Left;
         rtBG.Height=rtBG.Bottom-rtBG.Top;
+        this.LockRect=rtBG;    //保存上锁区域
 
-        if (isDraw)
-        {
-            //上下渐变
-            var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
-            this.Canvas.fillStyle =bgColor;
-            this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
+        if (!isDraw) return;
+        
+        //上下渐变
+        var bgColor=this.SetFillStyle(this.BGColor, rtBG.Left, rtBG.Top, rtBG.Left, rtBG.Bottom);
+        this.Canvas.fillStyle =bgColor;
+        this.Canvas.fillRect(rtBG.Left, rtBG.Top, rtBG.Width, rtBG.Height);
 
-            var xCenter = rtBG.Left + rtBG.Width / 2;
-            var yCenter = rtBG.Top + rtBG.Height / 2;
-            this.Canvas.textAlign = 'center';
-            this.Canvas.textBaseline = 'middle';
-            this.Canvas.fillStyle = this.TextColor;
-            this.Canvas.font = this.Font;
-            this.Canvas.fillText(this.Title, xCenter, yCenter);
-        }
+        var aryText=null;
+        if (Array.isArray(this.Title)) aryText=this.Title;
+        else aryText=[{Text:this.Title}];
+            
+        var outSize={ };
+        if (!this.CalculateTextSize(aryText, this.Font, outSize)) return;
 
-        this.LockRect=rtBG;    //保存上锁区域
+        var left=rtBG.Left+(rtBG.Width-outSize.Width)/2;
+        if (outSize.Width>rtBG.Width) left=rtBG.Right-outSize.Width;
+        var top=rtBG.Top+(rtBG.Height-outSize.Height)/2;
+
+        this.Canvas.textAlign='left';
+        this.Canvas.textBaseline='bottom';
+        this.Canvas.font = this.Font;
+        var yText=top;
+        for(var i=0;i<outSize.AryText.length;++i)
+        {
+            var item=outSize.AryText[i];
+            if (item.Color)  this.Canvas.fillStyle=item.Color;
+            else this.Canvas.fillStyle=this.TextColor;
+
+            yText+=item.Height;
+            this.Canvas.fillText(item.Text, left, yText+item.YOffset);
+        } 
     }
 
     this.HScreenDraw=function(isDraw)
@@ -54339,6 +54461,20 @@ function StockChipPhone()
 
     this.CloseButtonConfig=CloneData(g_JSChartResource.StockChip.PhoneCloseButton);
     
+    this.Super_SetOption=this.SetOption;
+
+    this.SetOption=function(option)
+    {
+        this.Super_SetOption(option);
+
+        if (!option) return;
+
+        if (option.PhoneCloseButton)
+        {
+            var item=option.PhoneCloseButton;
+            if (IFrameSplitOperator.IsBool(item.IsShow))  this.CloseButtonConfig.IsShow=item.IsShow;
+        }
+    }
 
     this.Draw=function()
     {
@@ -54753,6 +54889,8 @@ function StockChipPhone()
     this.DrawCloseButton=function()
     {
         var config=this.CloseButtonConfig;
+        if (!config.IsShow) return;
+
         var font=`${config.Size}px ${config.Family}`;
         var rtButton=null;
         if (this.IsHScreen)
@@ -82094,7 +82232,8 @@ function JSChartResource()
             Size:16*GetDevicePixelRatio(), 
             Text:"\ue60c", 
             Color:"rgb(255,255,255)",
-            Border:{ BGColor:"rgb(169,169,169)" }
+            Border:{ BGColor:"rgb(169,169,169)" },
+            IsShow:true,
         }
     }
 
@@ -83156,6 +83295,7 @@ function JSChartResource()
                 if (subItem.Text) this.StockChip.PhoneCloseButton.Text=subItem.Text;
                 if (subItem.Color) this.StockChip.PhoneCloseButton.Color=subItem.Color;
                 if (IFrameSplitOperator.IsNumber(subItem.Size)) this.StockChip.PhoneCloseButton.Size=subItem.Size;
+                if (IFrameSplitOperator.IsBool(subItem.IsShow)) this.StockChip.PhoneCloseButton.IsShow=subItem.IsShow;
                 if (subItem.Border)
                 {
                     if (subItem.Border.BGColor) this.StockChip.PhoneCloseButton.Border.BGColor=subItem.Border.BGColor;
@@ -109473,6 +109613,7 @@ function JSDivFrameToolbar()
             if (item.ID==JSCHART_BUTTON_ID.CHANGE_INDEX && frame && frame.ChangeIndex===false) continue;
             if (item.ID==JSCHART_BUTTON_ID.OVERLAY_INDEX && frame && frame.OverlayIndex===false) continue;
             if (item.ID==JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW && frame && frame.CloseIndex===false) continue;
+            if (item.ID==JSCHART_BUTTON_ID.INDEX_HELP && frame && frame.IndexHelp===false) continue;
 
             aryButton.push(item);
         }
@@ -109676,7 +109817,10 @@ JSDivFrameToolbar.GetDfaultButtons=function()
 {
     var aryButton=
     [
-
+        { 
+            ID:JSCHART_BUTTON_ID.INDEX_HELP, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-help", Tooltip:{ Text:"帮助"},
+            Span:null, Div:null, TooltipSpan:null
+        },
         { 
             ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, ClassName:"UMyChart_FrameToolbar_Span_Button icon iconfont icon-index_param", Tooltip:{ Text:"修改参数"},
             Span:null, Div:null, TooltipSpan:null
@@ -153744,7 +153888,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15083";
+var HQCHART_VERSION="1.1.15090";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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