hqchart 1.1.15076 → 1.1.15084

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

@@ -4912,6 +4912,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;
@@ -5467,6 +5468,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;
@@ -7120,6 +7122,7 @@ var JSCHART_BUTTON_ID=
     ADD_INDEX_WINDOW:44,    //增加指标窗口
 
     CHIP_CLOSE:45,          //关闭筹码图
+    INDEX_HELP:46,          //指标帮助
 }
 
 var JSCHART_DATA_FIELD_ID=
@@ -14457,6 +14460,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             if (IFrameSplitOperator.IsBool(windowItem.Close)) frame.CloseIndex=windowItem.Close;
             if (IFrameSplitOperator.IsBool(windowItem.Overlay)) frame.OverlayIndex=windowItem.Overlay;
             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;
 
@@ -14520,6 +14524,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;
@@ -17588,6 +17593,7 @@ function IChartFramePainting()
 
         if (lockData.Callback) this.LockPaint.Callback=lockData.Callback;       //回调
         if (lockData.IndexName) this.LockPaint.IndexName=lockData.IndexName;    //指标名字
+        if (lockData.IndexID)  this.LockPaint.IndexID=lockData.IndexID;    //指标ID
         if (lockData.ID) this.LockPaint.LockID=lockData.ID;                     //锁ID
         if (lockData.BG) this.LockPaint.BGColor=lockData.BG;                    //背景色 
         if (lockData.Text) this.LockPaint.Title= lockData.Text;   
@@ -17730,6 +17736,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);
 
@@ -17768,6 +17775,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);
@@ -20423,6 +20431,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; //是否显示持仓标题
 
@@ -20579,6 +20588,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))
@@ -22747,6 +22757,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;
 
@@ -22946,6 +22957,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))
         {
@@ -51858,6 +51870,7 @@ function ChartLock()
     this.LockID;        //锁ID
     this.Callback;      //回调
     this.IndexName;     //指标名字
+    this.IndexID;       //指标ID
     this.MinWidth=null;  //最小宽度
 
     this.Draw=function(isDraw)
@@ -51876,6 +51889,7 @@ function ChartLock()
         }
 
         var xOffset = this.ChartBorder.GetRight();
+        var border=this.ChartBorder.GetBorder();
         var lOffsetWidth = 0;
         if (this.ChartFrame.Data != null)
         {
@@ -51902,7 +51916,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) 
@@ -51912,19 +51925,19 @@ function ChartLock()
             if (lLeft < this.ChartBorder.GetLeft()) lLeft = this.ChartBorder.GetLeft();
         }
 
+        var rtBG={ Left:lLeft, Top:border.TopTitle, Bottom:border.Bottom, Width:lWidth };
+        rtBG.Right=rtBG.Width+rtBG.Left;
+        rtBG.Height=rtBG.Bottom-rtBG.Top;
+
         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 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;
+            var yCenter = rtBG.Top + rtBG.Height / 2;
             this.Canvas.textAlign = 'center';
             this.Canvas.textBaseline = 'middle';
             this.Canvas.fillStyle = this.TextColor;
@@ -51932,7 +51945,7 @@ function ChartLock()
             this.Canvas.fillText(this.Title, xCenter, yCenter);
         }
 
-        this.LockRect={Left:lLeft,Top:this.ChartBorder.GetTop(),Width:lWidth,Heigh:lHeight};    //保存上锁区域
+        this.LockRect=rtBG;    //保存上锁区域
     }
 
     this.HScreenDraw=function(isDraw)
@@ -51993,10 +52006,10 @@ 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 };
+            tooltip.Data={ ID:this.LockID, Callback:this.Callback, IndexName:this.IndexName, IndexID:this.IndexID };
             tooltip.ChartPaint=this;
             return true;
         }
@@ -65899,7 +65912,7 @@ function DynamicMinuteTitlePainting()
                 if (this.TimeFormat)    //指定时间格式
                 {
                     var strDate=null, strTime=null, text=null;
-                    if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString("YYYY-MM-DD", item.Date);
+                    if (this.IsShowDate) strDate=IFrameSplitOperator.FormatDateString(item.Date, "YYYY-MM-DD");
                     if (this.IsShowTime) strTime=IFrameSplitOperator.FormatTimeString(item.Time,this.TimeFormat);
                     if (strDate && strTime) text=`${strDate} ${strTime}`;
                     else if (strDate) text=strDate;
@@ -80923,6 +80936,7 @@ function JSChartResource()
         TitleWindow:true,   //标题模式
         ExportData:false,   //数据导出
         AddIndexWindow:false,   //增加指标窗口
+        IndexHelp:false,        //指标帮助
 
         IsShowOverlayToolbar:true,      //是否显示叠加坐标工具栏按钮
         IsShowOverlayFrame:true,        //是否显示右侧叠加坐标
@@ -80939,6 +80953,7 @@ function JSChartResource()
         TitleWindow:true,   //标题模式
         ExportData:false,   //数据导出
         AddIndexWindow:false,   //增加指标窗口
+        IndexHelp:false,    //指标帮助
     }
 
     this.TooltipBGColor="rgb(255, 255, 255)"; //背景色
@@ -81543,6 +81558,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 微软雅黑",
@@ -83445,6 +83470,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)
             {
@@ -84244,6 +84271,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;
@@ -84261,6 +84289,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;
     }
 
 
@@ -84596,6 +84625,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:"关闭叠加指标"}],
@@ -130470,7 +130500,7 @@ function ScriptIndex(name,script,args,option)
         }
         else    //上锁
         {
-            let lockData={ IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name ,ID:param.Self.LockID,
+            let lockData={ IsLocked:true,Callback:param.Self.LockCallback,IndexName:param.Self.Name,IndexID:param.Self.ID, ID:param.Self.LockID,
                 BG:param.Self.LockBG,Text:param.Self.LockText,TextColor:param.Self.LockTextColor, Font:param.Self.LockFont, Count:param.Self.LockCount, MinWidth:param.Self.LockMinWidth };
             param.HQChart.Frame.SubFrame[windowIndex].Frame.SetLock(lockData);
         }
@@ -136998,6 +137028,12 @@ function GetBlackStyle()
                 Color:"rgb(156,156,156)"
             },
 
+            IndexHelp:
+            {
+                MoveOnColor:"rgb(255,255,255)",
+                Color:"rgb(156,156,156)"
+            },
+
             Tooltip:
             {
                 //Font:12*GetDevicePixelRatio() +"px 微软雅黑",
@@ -165588,7 +165624,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15075";
+var HQCHART_VERSION="1.1.15083";
 
 function PrintHQChartVersion()
 {