hqchart 1.1.15080 → 1.1.15089

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.15080",
+  "version": "1.1.15089",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -564,8 +564,6 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsNumber(subItem.Formula)) chart.ChartCorssCursor.StringFormatX.RangeIncrease.Formula=subItem.Formula;
 
             }
-           
-           
         }
 
         //保存十字光标文字高度
@@ -584,8 +582,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;
@@ -631,6 +632,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;
+                */
             }
         }
 
@@ -763,6 +765,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;
@@ -772,6 +777,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
             if (IFrameSplitOperator.IsBool(item.MaxMin)) chart.Frame.SubFrame[i].Frame.MaxMinWindow=item.MaxMin;
             if (IFrameSplitOperator.IsBool(item.TitleWindow)) chart.Frame.SubFrame[i].Frame.TitleWindow=item.TitleWindow;
             if (IFrameSplitOperator.IsBool(item.AddIndexWindow)) frame.AddIndexWindow=item.AddIndexWindow;
+            if (IFrameSplitOperator.IsBool(item.IndexHelp)) frame.IndexHelp=item.IndexHelp;
 
             if (item.IsDrawTitleBG==true)  chart.Frame.SubFrame[i].Frame.IsDrawTitleBG=item.IsDrawTitleBG;
             if (IFrameSplitOperator.IsBool(item.IsShowNameArrow))  chart.Frame.SubFrame[i].Frame.IsShowNameArrow=item.IsShowNameArrow;
@@ -791,6 +797,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;
             }
+            */
         }
         
         //叠加指标宽度
@@ -1146,6 +1153,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;
@@ -1203,6 +1214,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                         if (subItem.Percentage && IFrameSplitOperator.IsNumber(subItem.Percentage.Dec)) subFrame.YSplitOperator.RightTextConfig.Percentage.Dec=subItem.Percentage.Dec;
                     }
                 }
+                */
             }
 
             chart.UpdateXShowText();
@@ -1318,6 +1330,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;
@@ -1327,6 +1342,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 if (IFrameSplitOperator.IsBool(item.MaxMin)) frame.MaxMinWindow=item.MaxMin;
                 if (IFrameSplitOperator.IsBool(item.TitleWindow)) frame.TitleWindow=item.TitleWindow;
                 if (IFrameSplitOperator.IsBool(item.AddIndexWindow)) frame.AddIndexWindow=item.AddIndexWindow;
+                if (IFrameSplitOperator.IsBool(item.IndexHelp)) frame.IndexHelp=item.IndexHelp;
 
                 if (IFrameSplitOperator.IsNumber(item.YSplitType)) chart.Frame.SubFrame[index].Frame.YSplitOperator.SplitType=item.YSplitType;
                 if (IFrameSplitOperator.IsNumber(item.FilterType)) chart.Frame.SubFrame[index].Frame.YSplitOperator.FilterType=item.FilterType;
@@ -1339,6 +1355,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;
+                */
             }
         }
 
@@ -2980,6 +2997,7 @@ var JSCHART_BUTTON_ID=
     ADD_INDEX_WINDOW:44,    //增加指标窗口
 
     CHIP_CLOSE:45,          //关闭筹码图
+    INDEX_HELP:46,          //指标帮助
 }
 
 var JSCHART_DATA_FIELD_ID=
@@ -10316,9 +10334,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;
@@ -10326,21 +10349,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;
 
@@ -10358,6 +10393,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;
+                }
+            }
         }
 
     }
@@ -10380,6 +10450,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(item.MaxMin)) frame.MaxMinWindow=item.MaxMin;
             if (IFrameSplitOperator.IsBool(item.TitleWindow)) frame.TitleWindow=item.TitleWindow;
             if (IFrameSplitOperator.IsBool(item.AddIndexWindow)) frame.AddIndexWindow=item.AddIndexWindow;
+            if (IFrameSplitOperator.IsBool(item.IndexHelp)) frame.IndexHelp=item.IndexHelp;
 
             if (IFrameSplitOperator.IsBool(item.IsDrawTitleBG))  frame.IsDrawTitleBG=item.IsDrawTitleBG;
             if (IFrameSplitOperator.IsBool(item.IsShowNameArrow)) frame.IsShowNameArrow=item.IsShowNameArrow;
@@ -13591,6 +13662,7 @@ function AverageWidthFrame()
     this.TitleWindowButton=CloneData(g_JSChartResource.Buttons.TitleWindow);
     this.ExportDataButton=CloneData(g_JSChartResource.Buttons.ExportData);
     this.AddIndexWindowButton=CloneData(g_JSChartResource.Buttons.AddIndexWindow);
+    this.IndexHelpButton=CloneData(g_JSChartResource.Buttons.IndexHelp);
 
     this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);
 
@@ -13629,6 +13701,7 @@ function AverageWidthFrame()
             this.TitleWindowButton=CloneData(g_JSChartResource.Buttons.TitleWindow);
             this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);
             this.AddIndexWindowButton=CloneData(g_JSChartResource.Buttons.AddIndexWindow);
+            this.IndexHelpButton=CloneData(g_JSChartResource.Buttons.IndexHelp);
         }
 
         if (this.DivFrameToolbar) this.DivFrameToolbar.ReloadResource(resource);
@@ -16284,6 +16357,7 @@ function MinuteFrame()
     this.ExportData=g_JSChartResource.MinuteToolbar.ExportData;         //是否显示'导出数据'菜单
     this.OverlayIndex=g_JSChartResource.MinuteToolbar.OverlayIndex;    //是否显示叠加指标
     this.AddIndexWindow=g_JSChartResource.MinuteToolbar.AddIndexWindow;  //是否显示'增加指标窗口'菜单
+    this.IndexHelp=g_JSChartResource.MinuteToolbar.IndexHelp;
 
     this.IsShowPositionTitle=false; //是否显示持仓标题
 
@@ -16440,6 +16514,7 @@ function MinuteFrame()
             if (this.ChangeIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.CHANGE_INDEX, Style:this.ChangeIndexButton });
             if (this.ModifyIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, Style:this.ModifyIndexParamButton });
             if (this.AddIndexWindow) aryButton.push({ ID:JSCHART_BUTTON_ID.ADD_INDEX_WINDOW, Style:this.AddIndexWindowButton} );
+            if (this.IndexHelp) aryButton.push({ ID:JSCHART_BUTTON_ID.INDEX_HELP, Style:this.IndexHelpButton} );
         }
 
         if (IFrameSplitOperator.IsNonEmptyArray(this.CustomToolbar))
@@ -18608,6 +18683,7 @@ function KLineFrame()
     this.TitleWindow=g_JSChartResource.KLineToolbar.TitleWindow;
     this.ExportData=g_JSChartResource.KLineToolbar.ExportData;      //是否显示'导出数据'菜单
     this.AddIndexWindow=g_JSChartResource.KLineToolbar.AddIndexWindow;  //是否显示'增加指标窗口'菜单
+    this.IndexHelp=g_JSChartResource.KLineToolbar.IndexHelp;
 
     this.SelBorderColor=g_JSChartResource.SelFrameBorderColor;
 
@@ -18807,6 +18883,7 @@ function KLineFrame()
         if (this.ChangeIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.CHANGE_INDEX, Style:this.ChangeIndexButton });
         if (this.ModifyIndex) aryButton.push( { ID:JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM, Style:this.ModifyIndexParamButton });
         if (this.AddIndexWindow) aryButton.push({ ID:JSCHART_BUTTON_ID.ADD_INDEX_WINDOW, Style:this.AddIndexWindowButton} );
+        if (this.IndexHelp) aryButton.push({ ID:JSCHART_BUTTON_ID.INDEX_HELP, Style:this.IndexHelpButton} );
 
         if (IFrameSplitOperator.IsNonEmptyArray(this.CustomToolbar))
         {
@@ -47722,6 +47799,31 @@ 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;
+            if (width<textWidth) width=textWidth;
+            out.AryText.push({ Text:item.Text, Width:textWidth, Height:lineHeight, Color:item.Color });
+            height+=lineHeight;
+        }
+
+        out.Width=width;
+        out.Height=height;
+
+        return true;
+    }
+
     this.Draw=function(isDraw)
     {
         this.LockRect=null;
@@ -47738,6 +47840,7 @@ function ChartLock()
         }
 
         var xOffset = this.ChartBorder.GetRight();
+        var border=this.ChartBorder.GetBorder();
         var lOffsetWidth = 0;
         if (this.ChartFrame.Data != null)
         {
@@ -47764,7 +47867,6 @@ function ChartLock()
         var lLeft = xOffset - lOffsetWidth;
         if (lLeft < this.ChartBorder.GetLeft())
             lLeft = this.ChartBorder.GetLeft();
-        var lHeight = this.ChartBorder.GetBottom() - this.ChartBorder.GetTop();
         var lWidth = this.ChartBorder.GetRight() - lLeft;
 
         if (this.MinWidth>10 && lWidth<this.MinWidth) 
@@ -47774,27 +47876,42 @@ function ChartLock()
             if (lLeft < this.ChartBorder.GetLeft()) lLeft = this.ChartBorder.GetLeft();
         }
 
-        if (isDraw)
-        {
-            var rtBG={ Left:lLeft, Top:this.ChartBorder.GetTop(), Width:lWidth, Height:lHeight };
-            rtBG.Right=rtBG.Width+rtBG.Left;
-            rtBG.Bottom=rtBG.Height+rtBG.Top;
+        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;    //保存上锁区域
 
-            //上下渐变
-            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 + lHeight / 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;
+
+        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.LockRect={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Heigh:lHeight};    //保存上锁区域
+        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);
+        } 
     }
 
     this.HScreenDraw=function(isDraw)
@@ -47855,7 +47972,7 @@ function ChartLock()
         if (this.LockRect==null) return false;
 
         this.Canvas.beginPath();
-        this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Heigh);
+        this.Canvas.rect(this.LockRect.Left,this.LockRect.Top,this.LockRect.Width,this.LockRect.Height);
         if (this.Canvas.isPointInPath(x,y))
         {
             tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID };
@@ -50232,6 +50349,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()
     {
@@ -50646,6 +50777,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)
@@ -76785,6 +76918,7 @@ function JSChartResource()
         TitleWindow:true,   //标题模式
         ExportData:false,   //数据导出
         AddIndexWindow:false,   //增加指标窗口
+        IndexHelp:false,        //指标帮助
 
         IsShowOverlayToolbar:true,      //是否显示叠加坐标工具栏按钮
         IsShowOverlayFrame:true,        //是否显示右侧叠加坐标
@@ -76801,6 +76935,7 @@ function JSChartResource()
         TitleWindow:true,   //标题模式
         ExportData:false,   //数据导出
         AddIndexWindow:false,   //增加指标窗口
+        IndexHelp:false,    //指标帮助
     }
 
     this.TooltipBGColor="rgb(255, 255, 255)"; //背景色
@@ -77405,6 +77540,16 @@ function JSChartResource()
             MerginLeft:4
         },
 
+        IndexHelp:
+        {
+            Color:"rgb(0,0,0)",
+            MoveOnColor:'rgb(30,144,255)',
+            Family:"iconfont",
+            Text:"\ue6ca",
+            Size:13*GetDevicePixelRatio(),
+            MerginLeft:4
+        },
+
         Tooltip:
         {
             Font:13*GetDevicePixelRatio() +"px 微软雅黑",
@@ -77975,7 +78120,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,
         }
     }
 
@@ -79037,6 +79183,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;
@@ -79307,6 +79454,8 @@ function JSChartResource()
             T_SetButtonStyle(buttons.TitleWindow, this.Buttons.TitleWindow);
             T_SetButtonStyle(buttons.ExportData, this.Buttons.ExportData);
             T_SetButtonStyle(buttons.AddIndexWindow, this.Buttons.AddIndexWindow);
+            T_SetButtonStyle(buttons.IndexHelp, this.Buttons.IndexHelp);
+            
 
             if (buttons.Tooltip)
             {
@@ -80106,6 +80255,7 @@ function JSChartResource()
         if (IFrameSplitOperator.IsBool(style.TitleWindow)) dest.ModifyIndex=style.TitleWindow;
         if (IFrameSplitOperator.IsBool(style.ExportData)) dest.ModifyIndex=style.ExportData;
         if (IFrameSplitOperator.IsBool(style.AddIndexWindow)) dest.AddIndexWindow=style.AddIndexWindow;
+        if (IFrameSplitOperator.IsBool(style.IndexHelp)) dest.IndexHelp=style.IndexHelp;
 
         if (IFrameSplitOperator.IsBool(style.IsShowOverlayToolbar)) dest.IsShowOverlayToolbar=style.IsShowOverlayToolbar;
         if (IFrameSplitOperator.IsBool(style.IsShowOverlayFrame)) dest.IsShowOverlayFrame=style.IsShowOverlayFrame;
@@ -80123,6 +80273,7 @@ function JSChartResource()
         if (IFrameSplitOperator.IsBool(style.TitleWindow)) dest.ModifyIndex=style.TitleWindow;
         if (IFrameSplitOperator.IsBool(style.ExportData)) dest.ModifyIndex=style.ExportData;
         if (IFrameSplitOperator.IsBool(style.AddIndexWindow)) dest.AddIndexWindow=style.AddIndexWindow;
+        if (IFrameSplitOperator.IsBool(style.IndexHelp)) dest.IndexHelp=style.IndexHelp;
     }
 
 
@@ -80458,6 +80609,7 @@ function JSChartLocalization()
         ["Toolbar-"+JSCHART_BUTTON_ID.TITLE_WINDOW, {CN:"折叠窗口", EN:"Collapse window", TC:"折叠窗口"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.EXPORT_DATA, {CN:"数据导出", EN:"Export data", TC:"数据导出"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.ADD_INDEX_WINDOW, {CN:"增加指标窗口", EN:"Add index window", TC:"增加指标窗口"}],
+        ["Toolbar-"+JSCHART_BUTTON_ID.INDEX_HELP, {CN:"指标帮助", EN:"Help", TC:"指标帮助"}],
 
         ["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_BEFOREOPEN_ID, {CN:"关闭集合竞价", EN:"Close call auction", TC:"关闭集合竞价"}],
         ["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_OVERLAY_INDEX, {CN:"关闭叠加指标", EN:"Delte overlay indicator", TC:"关闭叠加指标"}],
@@ -105349,6 +105501,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);
         }
@@ -105552,7 +105705,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

package/src/jscommon/umychart.resource/font/iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "iconfont"; /* Project id 1040563 */
-  src: url('iconfont.woff2?t=1747303594987') format('woff2'),
-       url('iconfont.woff?t=1747303594987') format('woff'),
-       url('iconfont.ttf?t=1747303594987') format('truetype');
+  src: url('iconfont.woff2?t=1755154065744') format('woff2'),
+       url('iconfont.woff?t=1755154065744') format('woff'),
+       url('iconfont.ttf?t=1755154065744') format('truetype');
 }
 
 .iconfont {
@@ -13,6 +13,10 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-help:before {
+  content: "\e6ca";
+}
+
 .icon-tubiaoBchuang:before {
   content: "\e6c9";
 }

package/src/jscommon/umychart.style.js

@@ -401,6 +401,12 @@ function GetBlackStyle()
                 Color:"rgb(156,156,156)"
             },
 
+            IndexHelp:
+            {
+                MoveOnColor:"rgb(255,255,255)",
+                Color:"rgb(156,156,156)"
+            },
+
             Tooltip:
             {
                 //Font:12*GetDevicePixelRatio() +"px 微软雅黑",