hqchart 1.1.13191 → 1.1.13197

package/package.json

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

package/src/jscommon/umychart.js

@@ -2119,10 +2119,19 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     {
         if(this.JSChartContainer && typeof(this.JSChartContainer.PopupMenuByTab)=='function')
         {
-            JSConsole.Chart.Log('[JSChart:ChangePriceGap] ');
+            JSConsole.Chart.Log('[JSChart:PopupMenuByTab] ');
             return this.JSChartContainer.PopupMenuByTab(menuData, rtTab);
         }
     }
+
+    this.PopupMenuByDrapdown=function(menuData, rtButton)
+    {
+        if(this.JSChartContainer && typeof(this.JSChartContainer.PopupMenuByDrapdown)=='function')
+        {
+            JSConsole.Chart.Log('[JSChart:PopupMenuByDrapdown] ');
+            return this.JSChartContainer.PopupMenuByDrapdown(menuData, rtButton);
+        }
+    }
 }
 
 JSChart.LastVersion=null;   //最新的版本号
@@ -2506,7 +2515,9 @@ var JSCHART_EVENT_ID=
     ON_CLICK_TREPORT_ROW:127,                 //左键点击点击T型报价列表
 
 
-    ON_CHANGE_INDEX:150,    //切换指标
+    ON_CHANGE_INDEX:150,        //切换指标
+    ON_MENU_COMMAND:151,        //菜单时间回调
+    ON_CREATE_RIGHT_MENU:152,   //创建右键菜单
 }
 
 var JSCHART_OPERATOR_ID=
@@ -9006,6 +9017,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    //点tab弹菜单
     this.PopupMenuByTab=function(menuData, rtTab)
     {
         if (!this.JSPopMenu) return;
@@ -9029,7 +9041,32 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.JSPopMenu.PopupMenuByTab(rtCell);
     }
 
-    this.PopuMenuByRClick=function(menuData, x, y)
+    //下拉菜单
+    this.PopupMenuByDrapdown=function(menuData, rtButton)
+    {
+        if (!this.JSPopMenu) return;
+
+        var pixelRatio=GetDevicePixelRatio();
+        var rtCell={ Left:rtButton.Left/pixelRatio, Right:rtButton.Right/pixelRatio, Bottom:rtButton.Bottom/pixelRatio, Top:rtButton.Top/pixelRatio };
+        rtCell.Width=rtCell.Right-rtCell.Left;
+        rtCell.Height=rtCell.Bottom-rtCell.Top;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+        rtCell.Left+=offsetLeft;
+        rtCell.Right+=offsetLeft;
+        rtCell.Top+=offsetTop;
+        rtCell.Bottom+=offsetTop;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByDrapdown(rtCell);
+    }
+
+    //右键菜单
+    this.PopupMenuByRClick=function(menuData, x, y)
     {
         var rtClient=this.UIElement.getBoundingClientRect();
         var rtScroll=GetScrollPosition();
@@ -9041,14 +9078,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.JSPopMenu.PopupMenuByRight(x,y);
     }
 
-    //点击右键菜单
-    this.OnClickRightMenu=function(data)
+    //菜单命令
+    this.ExecuteMenuCommand=function(cmdID, aryArgs)
     {
-        JSConsole.Chart.Log('[JSChartContainer::OnClickRightMenu] ',data);
-        if (!data || !data.Data) return;
+        JSConsole.Chart.Log('[JSChartContainer::ExecuteMenuCommand] cmdID=, aryArgs=', cmdID,aryArgs);
 
-        var cmdID=data.Data.ID;     //命令ID
-        var aryArgs=data.Data.Args; //参数
         var param=null, srcParam=null;  //原始值
         if (IFrameSplitOperator.IsNonEmptyArray(aryArgs))
         {
@@ -9224,6 +9258,44 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 break;
         }
     }
+
+    //点击右键菜单
+    this.OnClickRightMenu=function(data)
+    {
+        JSConsole.Chart.Log('[JSChartContainer::OnClickRightMenu] ',data);
+        if (!data || !data.Data) return;
+
+        var cmdID=data.Data.ID;     //命令ID
+        var aryArgs=data.Data.Args; //参数
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);  //回调通知外部
+        if (event && event.Callback)
+        {
+            var data={ PreventDefault:false, CommandID:cmdID, Args:aryArgs, SrcData:data };
+            event.Callback(event,data,this);
+            if (data.PreventDefault) return;
+        }
+
+        this.ExecuteMenuCommand(cmdID, aryArgs);
+    }
+
+    this.PopupRightMenuV2=function(data,e)
+    {
+        if (!this.JSPopMenu) return;
+        var x=data.X, y=data.Y;
+        var frameID=data.FrameID;
+        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_RIGHT_MENU);
+        if (event && event.Callback)
+        {
+            var sendData={ MenuData:menuData, FrameID:frameID };
+            event.Callback(event, sendData, this);
+        }
+
+        this.PopupMenuByRClick(menuData, x, y);
+    }
 }
 
 function GetDevicePixelRatio()
@@ -12450,7 +12522,7 @@ function MinuteFrame()
             for(var i=0;i<this.CustomToolbar.length;++i)
             {
                 var item=this.CustomToolbar[i];
-                if (item.ID && item.Style) aryButton.push({ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText });
+                if (item.ID && item.Style) aryButton.push({ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText, Data:item.Data });
             }
         }
 
@@ -14580,7 +14652,7 @@ function KLineFrame()
                 var item=this.CustomToolbar[i];
                 if (item.ID && item.Style) 
                 {
-                    var btnItem={ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText};
+                    var btnItem={ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText, Data:item.Data };
                     
                     if (item.IsLeft===true) //左侧按钮
                     { 
@@ -14646,7 +14718,7 @@ function KLineFrame()
             var item=this.CustomToolbar[i];
             if (item.ID && item.Style) 
             {
-                var btnItem={ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText};
+                var btnItem={ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText, Data:item.Data };
                 if (item.IsLeft===true) aryLeftButton.push(btnItem);     //左侧按钮
             }
         }
@@ -53652,7 +53724,7 @@ function DynamicChartTitlePainting()
                 var rtButton={ Left:left, YCenter:yCenter };
                 this.DrawButton(item, rtButton, moveonPoint, mouseStatus);
                 
-                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:0 });  //Type 0=主图按钮 1=附图按钮 2=主图指标名字按钮
+                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:0, Data:item.Data });  //Type 0=主图按钮 1=附图按钮 2=主图指标名字按钮
 
                 left=rtButton.Right;
 
@@ -53713,7 +53785,7 @@ function DynamicChartTitlePainting()
             var rect=item.Rect;
             if (x>rect.Left && x<rect.Right && y>rect.Top && y<rect.Bottom)
             {
-                var result= { ID:item.ID, Rect:rect, FrameID:item.FrameID, Type:item.Type };
+                var result= { ID:item.ID, Rect:rect, FrameID:item.FrameID, Type:item.Type, Data:item.Data };
                 if (item.Type==1)
                 {
                     result.Title=item.Title;
@@ -55963,8 +56035,11 @@ function ChartDrawHLine()
             {
                 var item=option.Button;
                 if (item.CloseIcon) this.Button.CloseIcon=CloneData(item.CloseIcon);
+                else if (item.CloseIcon===null) this.Button.CloseIcon=null;
                 if (item.SettingIcon) this.Button.SettingIcon=CloneData(item.SettingIcon);
+                else if (item.SettingIcon===null) this.Button.SettingIcon=null;
             }
+
             if (option.ExtendData) this.ExtendData=option.ExtendData;
 
             if (IFrameSplitOperator.IsNonEmptyArray(option.IsShowPriceText))
@@ -72610,6 +72685,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"均线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "均线"]}},
                     { Name:"BOLL", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "BOLL"]}},
                     { Name:"MACD", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "MACD"]}},
+                    { Name:"MACD(粗)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "MACD2"]}},
                     { Name:"KDJ", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "KDJ"]}},
                     { Name:"VOL", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "VOL"]}},
                     { Name:"RSI", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "RSI"]}},
@@ -72804,16 +72880,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         return aryMenu;
     }
 
-    this.PopupRightMenuV2=function(data,e)
-    {
-        if (!this.JSPopMenu) return;
-        var x=data.X, y=data.Y;
-        var frameID=data.FrameID;
-        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
-        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
 
-        this.PopuMenuByRClick(menuData, x, y);
-    }
 
     this.PopupSelectRectMenuV2=function(data, e)
     {
@@ -72826,7 +72893,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var menuData={ Menu:aryMenu, Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
         menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
         var x=data.X, y=data.Y;
-        this.PopuMenuByRClick(menuData, x, y);
+        this.PopupMenuByRClick(menuData, x, y);
     }
 
     //重新加载画图工具(切换股票|周期)
@@ -74215,7 +74282,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_TITLE_BUTTON);
         if (event && event.Callback)
         {
-            var data={ Info:button, PreventDefault:false  };    //PreventDefault 是否阻止内置的点击处理
+            var data={ Info:button, PreventDefault:false, e:e };    //PreventDefault 是否阻止内置的点击处理
             event.Callback(event,data,this);
             if (data.PreventDefault) return;
         }
@@ -76312,17 +76379,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return aryMenu;
     }
 
-    this.PopupRightMenuV2=function(data,e)
-    {
-        if (!this.JSPopMenu) return;
-        var x=data.X, y=data.Y;
-        var frameID=data.FrameID;
-        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
-        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
-
-        this.PopuMenuByRClick(menuData, x, y);
-    }
-
     this.OnWheel=function(e)
     {
         JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);

package/src/jscommon/umychart.popMenu.js

@@ -41,6 +41,8 @@ function JSPopMenu()
     {
         this.Clear();
 
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.Menu)) return;
+
         var root=document.createElement("div");
         root.className="UMyChart_PopMenu";
 
@@ -57,6 +59,13 @@ function JSPopMenu()
         for(var i=0;i<data.Menu.length;++i)
         {
             var item=data.Menu[i];
+            if (item.Name==JSPopMenu.SEPARATOR_LINE_NAME)
+            {
+                var trSeparator=this.CreateSeparatorTr();
+                if (trSeparator) tbody.appendChild(trSeparator);
+                continue;
+            }
+
             var trDom=this.CreateMenu(rootData, item);
             tbody.appendChild(trDom);
         }
@@ -153,21 +162,8 @@ function JSPopMenu()
                 var subItem=item.SubMenu[i];
                 if (subItem.Name==JSPopMenu.SEPARATOR_LINE_NAME)
                 {
-                    var trSeparator=document.createElement("tr");
-                    trSeparator.className='UMyChart_MenuItem_Tr_Separator';
-                    var tdDom=document.createElement("td");
-                    tdDom.className="UMyChart_MenuItem_Td_Status_Separator";
-                    trSeparator.appendChild(tdDom);
-                    var tdDom=document.createElement("td");
-                    tdDom.className="UMyChart_MenuItem_Td_Separator";
-                    trSeparator.appendChild(tdDom);
-                    var tdDom=document.createElement("td");
-                    tdDom.className="UMyChart_MenuItem_Td_Separator";
-                    trSeparator.appendChild(tdDom);
-                    var tdDom=document.createElement("td");
-                    tdDom.className="UMyChart_MenuItem_Td_Separator";
-                    trSeparator.appendChild(tdDom);
-                    subTbody.appendChild(trSeparator);
+                    var trSeparator=this.CreateSeparatorTr();
+                    if (trSeparator) subTbody.appendChild(trSeparator);
                     continue;
                 }
                 
@@ -189,6 +185,30 @@ function JSPopMenu()
         return trDom;
     }
 
+    this.CreateSeparatorTr=function()
+    {
+        var trSeparator=document.createElement("tr");
+        trSeparator.className='UMyChart_MenuItem_Tr_Separator';
+
+        var tdDom=document.createElement("td");
+        tdDom.className="UMyChart_MenuItem_Td_Status_Separator";
+        trSeparator.appendChild(tdDom);
+
+        var tdDom=document.createElement("td");
+        tdDom.className="UMyChart_MenuItem_Td_Separator";
+        trSeparator.appendChild(tdDom);
+
+        var tdDom=document.createElement("td");
+        tdDom.className="UMyChart_MenuItem_Td_Separator";
+        trSeparator.appendChild(tdDom);
+
+        var tdDom=document.createElement("td");
+        tdDom.className="UMyChart_MenuItem_Td_Separator";
+        trSeparator.appendChild(tdDom);
+
+        return trSeparator;
+    }
+
     //弹tab菜单
     this.PopupMenuByTab=function(rtTab)
     {
@@ -225,6 +245,24 @@ function JSPopMenu()
         this.RootDOM.style.left = x + "px";
     }
 
+    //下拉菜单
+    this.PopupMenuByDrapdown=function(rtButton)
+    {
+        if (!this.RootDOM) return;  
+        if (!rtButton) return;
+
+        var xLeft=rtButton.Left;
+        var yTop=rtButton.Bottom;
+        var menuHeight=this.RootDOM.offsetHeight;
+        var yMenuBottom=yTop+menuHeight;
+        var yBottom=window.innerHeight-15;
+        if (yMenuBottom>yBottom) yTop=rtButton.Top-menuHeight;
+
+        this.RootDOM.style.visibility='visible';
+        this.RootDOM.style.top = yTop + "px";
+        this.RootDOM.style.left = xLeft + "px";
+    }
+
     this.OnClickMenu=function(e, item, bSubMenu)
     {
         console.log("[JSPopMenu::OnClickMenu] e=, item=, bSubMenu", e, item, bSubMenu);

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

@@ -6011,10 +6011,19 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
     {
         if(this.JSChartContainer && typeof(this.JSChartContainer.PopupMenuByTab)=='function')
         {
-            JSConsole.Chart.Log('[JSChart:ChangePriceGap] ');
+            JSConsole.Chart.Log('[JSChart:PopupMenuByTab] ');
             return this.JSChartContainer.PopupMenuByTab(menuData, rtTab);
         }
     }
+
+    this.PopupMenuByDrapdown=function(menuData, rtButton)
+    {
+        if(this.JSChartContainer && typeof(this.JSChartContainer.PopupMenuByDrapdown)=='function')
+        {
+            JSConsole.Chart.Log('[JSChart:PopupMenuByDrapdown] ');
+            return this.JSChartContainer.PopupMenuByDrapdown(menuData, rtButton);
+        }
+    }
 }
 
 JSChart.LastVersion=null;   //最新的版本号
@@ -6398,7 +6407,9 @@ var JSCHART_EVENT_ID=
     ON_CLICK_TREPORT_ROW:127,                 //左键点击点击T型报价列表
 
 
-    ON_CHANGE_INDEX:150,    //切换指标
+    ON_CHANGE_INDEX:150,        //切换指标
+    ON_MENU_COMMAND:151,        //菜单时间回调
+    ON_CREATE_RIGHT_MENU:152,   //创建右键菜单
 }
 
 var JSCHART_OPERATOR_ID=
@@ -12898,6 +12909,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    //点tab弹菜单
     this.PopupMenuByTab=function(menuData, rtTab)
     {
         if (!this.JSPopMenu) return;
@@ -12921,7 +12933,32 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.JSPopMenu.PopupMenuByTab(rtCell);
     }
 
-    this.PopuMenuByRClick=function(menuData, x, y)
+    //下拉菜单
+    this.PopupMenuByDrapdown=function(menuData, rtButton)
+    {
+        if (!this.JSPopMenu) return;
+
+        var pixelRatio=GetDevicePixelRatio();
+        var rtCell={ Left:rtButton.Left/pixelRatio, Right:rtButton.Right/pixelRatio, Bottom:rtButton.Bottom/pixelRatio, Top:rtButton.Top/pixelRatio };
+        rtCell.Width=rtCell.Right-rtCell.Left;
+        rtCell.Height=rtCell.Bottom-rtCell.Top;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+        rtCell.Left+=offsetLeft;
+        rtCell.Right+=offsetLeft;
+        rtCell.Top+=offsetTop;
+        rtCell.Bottom+=offsetTop;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByDrapdown(rtCell);
+    }
+
+    //右键菜单
+    this.PopupMenuByRClick=function(menuData, x, y)
     {
         var rtClient=this.UIElement.getBoundingClientRect();
         var rtScroll=GetScrollPosition();
@@ -12933,14 +12970,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.JSPopMenu.PopupMenuByRight(x,y);
     }
 
-    //点击右键菜单
-    this.OnClickRightMenu=function(data)
+    //菜单命令
+    this.ExecuteMenuCommand=function(cmdID, aryArgs)
     {
-        JSConsole.Chart.Log('[JSChartContainer::OnClickRightMenu] ',data);
-        if (!data || !data.Data) return;
+        JSConsole.Chart.Log('[JSChartContainer::ExecuteMenuCommand] cmdID=, aryArgs=', cmdID,aryArgs);
 
-        var cmdID=data.Data.ID;     //命令ID
-        var aryArgs=data.Data.Args; //参数
         var param=null, srcParam=null;  //原始值
         if (IFrameSplitOperator.IsNonEmptyArray(aryArgs))
         {
@@ -13116,6 +13150,44 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 break;
         }
     }
+
+    //点击右键菜单
+    this.OnClickRightMenu=function(data)
+    {
+        JSConsole.Chart.Log('[JSChartContainer::OnClickRightMenu] ',data);
+        if (!data || !data.Data) return;
+
+        var cmdID=data.Data.ID;     //命令ID
+        var aryArgs=data.Data.Args; //参数
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);  //回调通知外部
+        if (event && event.Callback)
+        {
+            var data={ PreventDefault:false, CommandID:cmdID, Args:aryArgs, SrcData:data };
+            event.Callback(event,data,this);
+            if (data.PreventDefault) return;
+        }
+
+        this.ExecuteMenuCommand(cmdID, aryArgs);
+    }
+
+    this.PopupRightMenuV2=function(data,e)
+    {
+        if (!this.JSPopMenu) return;
+        var x=data.X, y=data.Y;
+        var frameID=data.FrameID;
+        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
+        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CREATE_RIGHT_MENU);
+        if (event && event.Callback)
+        {
+            var sendData={ MenuData:menuData, FrameID:frameID };
+            event.Callback(event, sendData, this);
+        }
+
+        this.PopupMenuByRClick(menuData, x, y);
+    }
 }
 
 function GetDevicePixelRatio()
@@ -16342,7 +16414,7 @@ function MinuteFrame()
             for(var i=0;i<this.CustomToolbar.length;++i)
             {
                 var item=this.CustomToolbar[i];
-                if (item.ID && item.Style) aryButton.push({ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText });
+                if (item.ID && item.Style) aryButton.push({ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText, Data:item.Data });
             }
         }
 
@@ -18472,7 +18544,7 @@ function KLineFrame()
                 var item=this.CustomToolbar[i];
                 if (item.ID && item.Style) 
                 {
-                    var btnItem={ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText};
+                    var btnItem={ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText, Data:item.Data };
                     
                     if (item.IsLeft===true) //左侧按钮
                     { 
@@ -18538,7 +18610,7 @@ function KLineFrame()
             var item=this.CustomToolbar[i];
             if (item.ID && item.Style) 
             {
-                var btnItem={ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText};
+                var btnItem={ ID:item.ID, Style:item.Style, TooltipText:item.TooltipText, Data:item.Data };
                 if (item.IsLeft===true) aryLeftButton.push(btnItem);     //左侧按钮
             }
         }
@@ -57544,7 +57616,7 @@ function DynamicChartTitlePainting()
                 var rtButton={ Left:left, YCenter:yCenter };
                 this.DrawButton(item, rtButton, moveonPoint, mouseStatus);
                 
-                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:0 });  //Type 0=主图按钮 1=附图按钮 2=主图指标名字按钮
+                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:0, Data:item.Data });  //Type 0=主图按钮 1=附图按钮 2=主图指标名字按钮
 
                 left=rtButton.Right;
 
@@ -57605,7 +57677,7 @@ function DynamicChartTitlePainting()
             var rect=item.Rect;
             if (x>rect.Left && x<rect.Right && y>rect.Top && y<rect.Bottom)
             {
-                var result= { ID:item.ID, Rect:rect, FrameID:item.FrameID, Type:item.Type };
+                var result= { ID:item.ID, Rect:rect, FrameID:item.FrameID, Type:item.Type, Data:item.Data };
                 if (item.Type==1)
                 {
                     result.Title=item.Title;
@@ -59855,8 +59927,11 @@ function ChartDrawHLine()
             {
                 var item=option.Button;
                 if (item.CloseIcon) this.Button.CloseIcon=CloneData(item.CloseIcon);
+                else if (item.CloseIcon===null) this.Button.CloseIcon=null;
                 if (item.SettingIcon) this.Button.SettingIcon=CloneData(item.SettingIcon);
+                else if (item.SettingIcon===null) this.Button.SettingIcon=null;
             }
+
             if (option.ExtendData) this.ExtendData=option.ExtendData;
 
             if (IFrameSplitOperator.IsNonEmptyArray(option.IsShowPriceText))
@@ -76502,6 +76577,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     { Name:"均线", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "均线"]}},
                     { Name:"BOLL", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "BOLL"]}},
                     { Name:"MACD", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "MACD"]}},
+                    { Name:"MACD(粗)", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "MACD2"]}},
                     { Name:"KDJ", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "KDJ"]}},
                     { Name:"VOL", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "VOL"]}},
                     { Name:"RSI", Data:{ ID: JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID, Args:[frameID, "RSI"]}},
@@ -76696,16 +76772,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         return aryMenu;
     }
 
-    this.PopupRightMenuV2=function(data,e)
-    {
-        if (!this.JSPopMenu) return;
-        var x=data.X, y=data.Y;
-        var frameID=data.FrameID;
-        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
-        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
 
-        this.PopuMenuByRClick(menuData, x, y);
-    }
 
     this.PopupSelectRectMenuV2=function(data, e)
     {
@@ -76718,7 +76785,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var menuData={ Menu:aryMenu, Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
         menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
         var x=data.X, y=data.Y;
-        this.PopuMenuByRClick(menuData, x, y);
+        this.PopupMenuByRClick(menuData, x, y);
     }
 
     //重新加载画图工具(切换股票|周期)
@@ -78107,7 +78174,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_TITLE_BUTTON);
         if (event && event.Callback)
         {
-            var data={ Info:button, PreventDefault:false  };    //PreventDefault 是否阻止内置的点击处理
+            var data={ Info:button, PreventDefault:false, e:e };    //PreventDefault 是否阻止内置的点击处理
             event.Callback(event,data,this);
             if (data.PreventDefault) return;
         }
@@ -80204,17 +80271,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return aryMenu;
     }
 
-    this.PopupRightMenuV2=function(data,e)
-    {
-        if (!this.JSPopMenu) return;
-        var x=data.X, y=data.Y;
-        var frameID=data.FrameID;
-        var menuData={ Menu:this.GetRightMenuData(frameID), Position:JSPopMenu.POSITION_ID.RIGHT_MENU_ID };
-        menuData.ClickCallback=(data)=>{ this.OnClickRightMenu(data); }
-
-        this.PopuMenuByRClick(menuData, x, y);
-    }
-
     this.OnWheel=function(e)
     {
         JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);
@@ -131789,7 +131845,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13190";
+var HQCHART_VERSION="1.1.13196";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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