hqchart 1.1.13194 → 1.1.13199

package/package.json

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

package/src/jscommon/umychart.js

@@ -2515,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=
@@ -9076,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))
         {
@@ -9259,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()
@@ -55998,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))
@@ -72645,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"]}},
@@ -72839,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.PopupMenuByRClick(menuData, x, y);
-    }
 
     this.PopupSelectRectMenuV2=function(data, e)
     {
@@ -76347,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.PopupMenuByRClick(menuData, x, y);
-    }
-
     this.OnWheel=function(e)
     {
         JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);
@@ -78212,7 +78233,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (!this.mapEvent.has(JSCHART_EVENT_ID.RECV_MINUTE_DATA)) return;
 
         var event=this.mapEvent.get(JSCHART_EVENT_ID.RECV_MINUTE_DATA);
-        var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option };
+        var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option, DataStatus:this.DataStatus };
         event.Callback(event,data,this);
     }
 
@@ -78410,6 +78431,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (this.IsBeforeData) this.BeforeOpenData=beforeOpenData;
         if (this.IsAfterData) this.AfterCloseData=afterCloseData;
 
+        var bFirstData=(this.DataStatus.LatestDay==false);   //首条单日数据
         this.DataStatus.LatestDay=true;
             
         if (this.DayCount>1)    //多日走势图
@@ -78498,7 +78520,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var chartInfo=this.GetChartMinuteInfo();
         if (chartInfo) chartInfo.SourceData=this.SourceData;    //数据绑定到信息地雷上
 
-        this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData"} );
+        this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} } );
         this.RequestMinuteInfoData();
         this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
         this.CreateChartDrawPictureByStorage(); //创建画图工具

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)
     {

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

@@ -6407,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=
@@ -12968,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))
         {
@@ -13151,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()
@@ -59890,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))
@@ -76537,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"]}},
@@ -76731,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.PopupMenuByRClick(menuData, x, y);
-    }
 
     this.PopupSelectRectMenuV2=function(data, e)
     {
@@ -80239,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.PopupMenuByRClick(menuData, x, y);
-    }
-
     this.OnWheel=function(e)
     {
         JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);
@@ -82104,7 +82125,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (!this.mapEvent.has(JSCHART_EVENT_ID.RECV_MINUTE_DATA)) return;
 
         var event=this.mapEvent.get(JSCHART_EVENT_ID.RECV_MINUTE_DATA);
-        var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option };
+        var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option, DataStatus:this.DataStatus };
         event.Callback(event,data,this);
     }
 
@@ -82302,6 +82323,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (this.IsBeforeData) this.BeforeOpenData=beforeOpenData;
         if (this.IsAfterData) this.AfterCloseData=afterCloseData;
 
+        var bFirstData=(this.DataStatus.LatestDay==false);   //首条单日数据
         this.DataStatus.LatestDay=true;
             
         if (this.DayCount>1)    //多日走势图
@@ -82390,7 +82412,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var chartInfo=this.GetChartMinuteInfo();
         if (chartInfo) chartInfo.SourceData=this.SourceData;    //数据绑定到信息地雷上
 
-        this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData"} );
+        this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} } );
         this.RequestMinuteInfoData();
         this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
         this.CreateChartDrawPictureByStorage(); //创建画图工具
@@ -131824,7 +131846,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13193";
+var HQCHART_VERSION="1.1.13198";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -6451,7 +6451,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=
@@ -13012,14 +13014,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))
         {
@@ -13195,6 +13194,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()
@@ -59934,8 +59971,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))
@@ -76581,6 +76621,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"]}},
@@ -76775,16 +76816,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.PopupMenuByRClick(menuData, x, y);
-    }
 
     this.PopupSelectRectMenuV2=function(data, e)
     {
@@ -80283,17 +80315,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.PopupMenuByRClick(menuData, x, y);
-    }
-
     this.OnWheel=function(e)
     {
         JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);
@@ -82148,7 +82169,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (!this.mapEvent.has(JSCHART_EVENT_ID.RECV_MINUTE_DATA)) return;
 
         var event=this.mapEvent.get(JSCHART_EVENT_ID.RECV_MINUTE_DATA);
-        var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option };
+        var data={ MinuteData:this.SourceData, Stock:{ Symbol:this.Symbol, Name:this.Name }, Option:option, DataStatus:this.DataStatus };
         event.Callback(event,data,this);
     }
 
@@ -82346,6 +82367,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (this.IsBeforeData) this.BeforeOpenData=beforeOpenData;
         if (this.IsAfterData) this.AfterCloseData=afterCloseData;
 
+        var bFirstData=(this.DataStatus.LatestDay==false);   //首条单日数据
         this.DataStatus.LatestDay=true;
             
         if (this.DayCount>1)    //多日走势图
@@ -82434,7 +82456,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var chartInfo=this.GetChartMinuteInfo();
         if (chartInfo) chartInfo.SourceData=this.SourceData;    //数据绑定到信息地雷上
 
-        this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData"} );
+        this.RecvMinuteDataEvent( {FunctionName:"RecvMinuteData", Day:{ IsFirstData:bFirstData} } );
         this.RequestMinuteInfoData();
         this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
         this.CreateChartDrawPictureByStorage(); //创建画图工具
@@ -134310,6 +134332,8 @@ function JSPopMenu()
     {
         this.Clear();
 
+        if (!IFrameSplitOperator.IsNonEmptyArray(data.Menu)) return;
+
         var root=document.createElement("div");
         root.className="UMyChart_PopMenu";
 
@@ -134326,6 +134350,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);
         }
@@ -134422,21 +134453,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;
                 }
                 
@@ -134458,6 +134476,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)
     {
@@ -134717,7 +134759,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13193";
+var HQCHART_VERSION="1.1.13198";
 
 function PrintHQChartVersion()
 {