hqchart 1.1.15455 → 1.1.15480

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

@@ -6840,6 +6840,15 @@ JSChart.GetShortSymbol=function(symbol)
     return symbol.slice(0,pos);
 }
 
+JSChart.CancelEvent=function(e)
+{
+    if (!e) return;
+
+    if (e.preventDefault) e.preventDefault();
+    if (e.stopPropagation) e.stopPropagation();
+    e.returnValue=false;
+}
+
 
 var JSCHART_EVENT_ID=
 {
@@ -6928,9 +6937,6 @@ var JSCHART_EVENT_ID=
     ON_DRAG_SUB_SELECT_RECT:66,              //拖拽区间选择子区域
     ON_DRAG_SUB_SELECT_RECT_MOUSEUP:67,       //拖拽区间选择子区域鼠标松开
 
-    ON_KEYBOARD_SELECTED:68,        //键盘精灵选中回车
-    ON_KEYBOARD_MOUSEUP:69,
-
     ON_CLICK_DRAWPICTURE_BUTTON:70,  //画图工具按钮
     ON_FINISH_MOVE_DRAWPICTURE:71,   //画图工具移动完成
 
@@ -7076,6 +7082,15 @@ var JSCHART_EVENT_ID=
 
     //工具条
     ON_CLICK_STATUSBAR_ITEM:301,
+    ON_RCLICK_STATUSBAR_ITEM:302,
+
+    //5档买卖
+    ON_CLICK_STOCKINFO_ITEM:350,
+    ON_RCLICK_STOCKINFO_ITEM:351,
+
+    ON_KEYBOARD_SHOW:350,            //显示键盘精灵
+    ON_KEYBOARD_SELECTED:351,        //键盘精灵选中回车
+    ON_KEYBOARD_MOUSEUP:352,
 }
 
 var JSCHART_OPERATOR_ID=
@@ -31518,6 +31533,7 @@ function IChartPainting()
         if (!this.IsShow || this.ChartFrame.IsMinSize) return;
         var bHScreen=(this.ChartFrame.IsHScreen===true);
         if (bHScreen) return;
+        if (!this.Data) return;
 
         var isMinute=this.IsMinuteFrame();
         var dataWidth=this.ChartFrame.DataWidth;
@@ -31658,6 +31674,7 @@ function IChartPainting()
         if (!this.IsShow || this.ChartFrame.IsMinSize) return null;
         var bHScreen=(this.ChartFrame.IsHScreen===true);
         if (bHScreen) return null;
+        if (!this.Data) return null;
 
         var dataWidth=this.ChartFrame.DataWidth;
         var distanceWidth=this.ChartFrame.DistanceWidth;
@@ -107195,6 +107212,24 @@ var MARKET_SUFFIX_NAME=
         return false;
     },
 
+    //是否包含前缀
+    IsPrefixIncludes:function(symbol, aryPrefix)
+    {
+        if (!symbol) return false;
+        var shortSymbol=this.GetShortSymbol(symbol);
+        if (!shortSymbol) return false;
+        shortSymbol=shortSymbol.toUpperCase();
+
+        for(var i=0;i<aryPrefix.length;++i)
+        {
+            var strValue=aryPrefix[i];
+            if (!strValue) continue;
+            if (shortSymbol.search(strValue)===0) return true;
+        }
+
+        return false;
+    },
+
     IsChinaFutures:function(upperSymbol)   //是否是国内期货 /期权
     {
         if (!upperSymbol) return false;
@@ -107309,15 +107344,26 @@ var MARKET_SUFFIX_NAME=
         return false;
     },
 
+    //北交所股票代码全面启用“920”开头的六位数编码规则（如 920XXX），已于 2025 年 10 月 9 日完成存量与增量股票的统一切换，标志着其与新三板代码的脱钩。
+    // 新代码通常将原 43、83、87 开头的旧代码前三位变更为 920，后三位保持不变
     IsBJStock:function(symbol)  //北交所股票
     {
         if (!symbol) return false;
         var upperSymbol=symbol.toUpperCase();
         if (!this.IsBJ(upperSymbol)) return false;
 
-        var value=upperSymbol.charAt(0);
+        if (upperSymbol.charAt(0)=='9' && upperSymbol.charAt(1)=='2' && upperSymbol.charAt(2)=='0') return true;
+
+        return false;
+    },
+
+    IsBJIndex:function(symbol)  //北交所指数 北交所指数代码通常以“899”开头，采用6位数字序列
+    {
+        if (!symbol) return false;
+        var upperSymbol=symbol.toUpperCase();
+        if (!this.IsBJ(upperSymbol)) return false;
 
-        if (value=='4' || value=='8') return true;
+        if (upperSymbol.charAt(0)=='8' && upperSymbol.charAt(1)=='9' && upperSymbol.charAt(2)=='9') return true;
 
         return false;
     },
@@ -107333,11 +107379,11 @@ var MARKET_SUFFIX_NAME=
         return false;
     },
 
-    IsSHGEM:function(symbol)    //创业板(growth enterprise market) 30开头
+    IsSZGEM:function(symbol)    //创业板(growth enterprise market) 30开头
     {
         if (!symbol) return false;
         var upperSymbol=symbol.toUpperCase();
-        if (!this.IsSH(upperSymbol)) return false;
+        if (!this.IsSZ(upperSymbol)) return false;
         if (upperSymbol.charAt(0)=='3' && upperSymbol.charAt(1)=='0')
             return true;
         
@@ -107481,7 +107527,7 @@ var MARKET_SUFFIX_NAME=
     {
         if (!this.IsSHSZStockA(symbol)) return null;
         if (this.IsSHStockSTAR(symbol)) return {Max:0.2 , Min:-0.2};    //科创板 [20% - -20%]
-        if (this.IsSHGEM(symbol)) return { Max:0.2 , Min:-0.2};         //创业板 [20% - -20%]
+        if (this.IsSZGEM(symbol)) return { Max:0.2 , Min:-0.2};         //创业板 [20% - -20%]
         
         if (!name) return null;
         if (name.indexOf('ST')>=0) return { Max:0.05, Min:-0.05 }; //ST 股票 [5% - -5%]
@@ -109398,6 +109444,7 @@ function FuturesTimeData()
         [MARKET_SUFFIX_NAME.SHFE + '-AO', {Time:4,Decimal:0,Name:'氧化铝'}],
         [MARKET_SUFFIX_NAME.SHFE + '-BR', {Time:6,Decimal:0,Name:'合成橡胶'}],
         [MARKET_SUFFIX_NAME.SHFE + '-AD', {Time:4,Decimal:0,Name:"铝合金"}],
+        [MARKET_SUFFIX_NAME.SHFE + '-OP', {Time:6,Decimal:0,Name:"胶版印刷纸"}],
 
         //上期所-能源
         [MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
@@ -110959,59 +111006,6 @@ function GetfloatPrecision(symbol)  //获取小数位数
     return defaultfloatPrecision;
 }
 
-//把不连续的分时数据转成连续的分时数据
-function GenerateMinuteStockJsonData(data)
-{
-    var stock =
-    { 
-        symbol:data.symbol, name:data.name,time:data.time, date:data.date,
-        price:data.price, open:data.open, yclose:data.yclose, high:data.high, low:data.low, vol:data.vol,amount:data.amount,
-        minute:[]
-    };
-
-    var mapMinute=new Map();
-    for(var i in data.minute)
-    {
-        var item=data.minute[i];
-        mapMinute.set(item.time,item);
-    }
-
-    var timeData=g_MinuteTimeStringData.GetTimeData(stock.symbol);
-    for(var i in timeData)  //根据交易时间产生数据
-    {
-        var time=timeData[i];
-        var minuteItem={ time:time, vaild:false };
-        if (mapMinute.has(time))
-        {
-            var find=mapMinute.get(time);
-            minuteItem.vaild=true;
-            minuteItem.price=find.price;
-            minuteItem.open=find.open;
-            minuteItem.high=find.high;
-            minuteItem.low=find.low;
-            minuteItem.avprice=find.avprice;
-            minuteItem.vol=find.vol;
-            minuteItem.amount=find.amount;
-            if (IFrameSplitOperator.IsNumber(find.increase)) minuteItem.increase=find.increase;
-            if (IFrameSplitOperator.IsNumber(find.risefall)) minuteItem.risefall=find.risefall;
-            if (IFrameSplitOperator.IsNumber(find.position)) minuteItem.position=find.position;
-        }
-        stock.minute.push(minuteItem);
-    }
-
-    var vaildCount=0;
-    for(var i=stock.minute.length-1;i>=0;--i)
-    {
-        vaildCount=i+1;
-        var item=stock.minute[i];
-        if (item.vaild==true) break;
-    }
-
-    stock.minute=stock.minute.slice(0,vaildCount);  //去掉最后无用的数据
-
-    return stock;
-}
-
 function GetLocalTime(i)    //得到标准时区的时间的函数
 {
     if (typeof i !== 'number') return;
@@ -111859,8 +111853,8 @@ var Character =
             (cp >= 0x41 && cp <= 0x5A) ||
             (cp >= 0x61 && cp <= 0x7A) ||
             (cp === 0x5C) ||
-            //【】▲▼
-            (cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
+            //【】▲▼ ↓↑←→
+            (cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
             ((cp >= 0x80) && Regex.NonAsciiIdentifierStart.test(Character.FromCodePoint(cp)));
     },
 
@@ -111871,8 +111865,8 @@ var Character =
             (cp >= 0x61 && cp <= 0x7A) ||
             (cp >= 0x30 && cp <= 0x39) ||
             (cp === 0x5C) || (cp===0x23) ||
-            //【】▲▼
-            (cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) ||
+            //【】▲▼   ↓↑←→
+            (cp===0x3010 || cp===0x3011 || cp===0x25B2 || cp===0x25BC) || (cp>=0x2190 && cp<=0x2193) ||
             ((cp >= 0x80) && Regex.NonAsciiIdentifierPart.test(Character.FromCodePoint(cp)));
     },
 
@@ -143122,6 +143116,7 @@ function JSReportChartContainer(uielement)
         this.DestroyMinuteChartTooltip();
         this.DestroyKLineChartTooltip();
         this.DestroyFloatTooltip();
+        this.DestroyPopMenu();
     }
 
     this.StopAutoDragScrollTimer=function()
@@ -143143,6 +143138,14 @@ function JSReportChartContainer(uielement)
         this.JSPopMenu.Inital();
     }
 
+    this.DestroyPopMenu=function()
+    {
+        if (!this.JSPopMenu) return;
+        
+        this.JSPopMenu.Destroy();
+        this.JSPopMenu=null;
+    }
+
     this.InitalMinuteChartTooltip=function(option)
     {
         if (this.TooltipMinuteChart) return;
@@ -144454,61 +144457,75 @@ function JSReportChartContainer(uielement)
         if (item[80] || item[80]===null) stock.BGColor=item[80];       //整行背景色
         if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];  //扩展数据2
 
+        function __Temp_IsNumberOrObject(value)
+        {
+            if (IFrameSplitOperator.IsNumber(value)) return true;
+            if (IFrameSplitOperator.IsObject(value)) return true;
+            return false;
+        }
+
+        function __Temp_IsStringOrObject(value)
+        {
+            if (IFrameSplitOperator.IsString(value)) return true;
+            if (IFrameSplitOperator.IsObject(value)) return true;
+            return false;
+        }
+
         //10个数值型 101-199
-        if (IFrameSplitOperator.IsNumber(item[101])) stock.ReserveNumber1=item[101];
-        if (IFrameSplitOperator.IsNumber(item[102])) stock.ReserveNumber2=item[102];
-        if (IFrameSplitOperator.IsNumber(item[103])) stock.ReserveNumber3=item[103];
-        if (IFrameSplitOperator.IsNumber(item[104])) stock.ReserveNumber4=item[104];
-        if (IFrameSplitOperator.IsNumber(item[105])) stock.ReserveNumber5=item[105];
-        if (IFrameSplitOperator.IsNumber(item[106])) stock.ReserveNumber6=item[106];
-        if (IFrameSplitOperator.IsNumber(item[107])) stock.ReserveNumber7=item[107];
-        if (IFrameSplitOperator.IsNumber(item[108])) stock.ReserveNumber8=item[108];
-        if (IFrameSplitOperator.IsNumber(item[109])) stock.ReserveNumber9=item[109];
-        if (IFrameSplitOperator.IsNumber(item[110])) stock.ReserveNumber10=item[110];
-        if (IFrameSplitOperator.IsNumber(item[111])) stock.ReserveNumber11=item[111];
-        if (IFrameSplitOperator.IsNumber(item[112])) stock.ReserveNumber12=item[112];
-        if (IFrameSplitOperator.IsNumber(item[113])) stock.ReserveNumber13=item[113];
-        if (IFrameSplitOperator.IsNumber(item[114])) stock.ReserveNumber14=item[114];
-        if (IFrameSplitOperator.IsNumber(item[115])) stock.ReserveNumber15=item[115];
-        if (IFrameSplitOperator.IsNumber(item[116])) stock.ReserveNumber16=item[116];
-        if (IFrameSplitOperator.IsNumber(item[117])) stock.ReserveNumber17=item[117];
-        if (IFrameSplitOperator.IsNumber(item[118])) stock.ReserveNumber18=item[118];
-        if (IFrameSplitOperator.IsNumber(item[119])) stock.ReserveNumber19=item[119];
-        if (IFrameSplitOperator.IsNumber(item[120])) stock.ReserveNumber20=item[120];
+        if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
+        if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
+        if (__Temp_IsNumberOrObject(item[103])) stock.ReserveNumber3=item[103];
+        if (__Temp_IsNumberOrObject(item[104])) stock.ReserveNumber4=item[104];
+        if (__Temp_IsNumberOrObject(item[105])) stock.ReserveNumber5=item[105];
+        if (__Temp_IsNumberOrObject(item[106])) stock.ReserveNumber6=item[106];
+        if (__Temp_IsNumberOrObject(item[107])) stock.ReserveNumber7=item[107];
+        if (__Temp_IsNumberOrObject(item[108])) stock.ReserveNumber8=item[108];
+        if (__Temp_IsNumberOrObject(item[109])) stock.ReserveNumber9=item[109];
+        if (__Temp_IsNumberOrObject(item[110])) stock.ReserveNumber10=item[110];
+        if (__Temp_IsNumberOrObject(item[111])) stock.ReserveNumber11=item[111];
+        if (__Temp_IsNumberOrObject(item[112])) stock.ReserveNumber12=item[112];
+        if (__Temp_IsNumberOrObject(item[113])) stock.ReserveNumber13=item[113];
+        if (__Temp_IsNumberOrObject(item[114])) stock.ReserveNumber14=item[114];
+        if (__Temp_IsNumberOrObject(item[115])) stock.ReserveNumber15=item[115];
+        if (__Temp_IsNumberOrObject(item[116])) stock.ReserveNumber16=item[116];
+        if (__Temp_IsNumberOrObject(item[117])) stock.ReserveNumber17=item[117];
+        if (__Temp_IsNumberOrObject(item[118])) stock.ReserveNumber18=item[118];
+        if (__Temp_IsNumberOrObject(item[119])) stock.ReserveNumber19=item[119];
+        if (__Temp_IsNumberOrObject(item[120])) stock.ReserveNumber20=item[120];
 
         //10个字符型 201-299
-        if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) stock.ReserveString1=item[201];
-        if (IFrameSplitOperator.IsString(item[202]) || IFrameSplitOperator.IsObject(item[202])) stock.ReserveString2=item[202];
-        if (IFrameSplitOperator.IsString(item[203]) || IFrameSplitOperator.IsObject(item[203])) stock.ReserveString3=item[203];
-        if (IFrameSplitOperator.IsString(item[204]) || IFrameSplitOperator.IsObject(item[204])) stock.ReserveString4=item[204];
-        if (IFrameSplitOperator.IsString(item[205]) || IFrameSplitOperator.IsObject(item[205])) stock.ReserveString5=item[205];
-        if (IFrameSplitOperator.IsString(item[206]) || IFrameSplitOperator.IsObject(item[206])) stock.ReserveString6=item[206];
-        if (IFrameSplitOperator.IsString(item[207]) || IFrameSplitOperator.IsObject(item[207])) stock.ReserveString7=item[207];
-        if (IFrameSplitOperator.IsString(item[208]) || IFrameSplitOperator.IsObject(item[208])) stock.ReserveString8=item[208];
-        if (IFrameSplitOperator.IsString(item[209]) || IFrameSplitOperator.IsObject(item[209])) stock.ReserveString9=item[209];
-        if (IFrameSplitOperator.IsString(item[210]) || IFrameSplitOperator.IsObject(item[210])) stock.ReserveString10=item[210];
-        if (IFrameSplitOperator.IsString(item[211]) || IFrameSplitOperator.IsObject(item[211])) stock.ReserveString11=item[211];
-        if (IFrameSplitOperator.IsString(item[212]) || IFrameSplitOperator.IsObject(item[212])) stock.ReserveString12=item[212];
-        if (IFrameSplitOperator.IsString(item[213]) || IFrameSplitOperator.IsObject(item[213])) stock.ReserveString13=item[213];
-        if (IFrameSplitOperator.IsString(item[214]) || IFrameSplitOperator.IsObject(item[214])) stock.ReserveString14=item[214];
-        if (IFrameSplitOperator.IsString(item[215]) || IFrameSplitOperator.IsObject(item[215])) stock.ReserveString15=item[215];
-        if (IFrameSplitOperator.IsString(item[216]) || IFrameSplitOperator.IsObject(item[216])) stock.ReserveString16=item[216];
-        if (IFrameSplitOperator.IsString(item[217]) || IFrameSplitOperator.IsObject(item[217])) stock.ReserveString17=item[217];
-        if (IFrameSplitOperator.IsString(item[218]) || IFrameSplitOperator.IsObject(item[218])) stock.ReserveString18=item[218];
-        if (IFrameSplitOperator.IsString(item[219]) || IFrameSplitOperator.IsObject(item[219])) stock.ReserveString19=item[219];
-        if (IFrameSplitOperator.IsString(item[220]) || IFrameSplitOperator.IsObject(item[220])) stock.ReserveString20=item[220];
+        if (__Temp_IsStringOrObject(item[201])) stock.ReserveString1=item[201];
+        if (__Temp_IsStringOrObject(item[202])) stock.ReserveString2=item[202];
+        if (__Temp_IsStringOrObject(item[203])) stock.ReserveString3=item[203];
+        if (__Temp_IsStringOrObject(item[204])) stock.ReserveString4=item[204];
+        if (__Temp_IsStringOrObject(item[205])) stock.ReserveString5=item[205];
+        if (__Temp_IsStringOrObject(item[206])) stock.ReserveString6=item[206];
+        if (__Temp_IsStringOrObject(item[207])) stock.ReserveString7=item[207];
+        if (__Temp_IsStringOrObject(item[208])) stock.ReserveString8=item[208];
+        if (__Temp_IsStringOrObject(item[209])) stock.ReserveString9=item[209];
+        if (__Temp_IsStringOrObject(item[210])) stock.ReserveString10=item[210];
+        if (__Temp_IsStringOrObject(item[211])) stock.ReserveString11=item[211];
+        if (__Temp_IsStringOrObject(item[212])) stock.ReserveString12=item[212];
+        if (__Temp_IsStringOrObject(item[213])) stock.ReserveString13=item[213];
+        if (__Temp_IsStringOrObject(item[214])) stock.ReserveString14=item[214];
+        if (__Temp_IsStringOrObject(item[215])) stock.ReserveString15=item[215];
+        if (__Temp_IsStringOrObject(item[216])) stock.ReserveString16=item[216];
+        if (__Temp_IsStringOrObject(item[217])) stock.ReserveString17=item[217];
+        if (__Temp_IsStringOrObject(item[218])) stock.ReserveString18=item[218];
+        if (__Temp_IsStringOrObject(item[219])) stock.ReserveString19=item[219];
+        if (__Temp_IsStringOrObject(item[220])) stock.ReserveString20=item[220];
 
         //10个进度条 301-350  { Value:, BGColor: }
-        if (IFrameSplitOperator.IsNumber(item[301]) || IFrameSplitOperator.IsObject(item[301])) stock.ReserveProgressBar1=item[301];
-        if (IFrameSplitOperator.IsNumber(item[302]) || IFrameSplitOperator.IsObject(item[302])) stock.ReserveProgressBar2=item[302];
-        if (IFrameSplitOperator.IsNumber(item[303]) || IFrameSplitOperator.IsObject(item[303])) stock.ReserveProgressBar3=item[303];
-        if (IFrameSplitOperator.IsNumber(item[304]) || IFrameSplitOperator.IsObject(item[304])) stock.ReserveProgressBar4=item[304];
-        if (IFrameSplitOperator.IsNumber(item[305]) || IFrameSplitOperator.IsObject(item[305])) stock.ReserveProgressBar5=item[305];
-        if (IFrameSplitOperator.IsNumber(item[306]) || IFrameSplitOperator.IsObject(item[306])) stock.ReserveProgressBar6=item[306];
-        if (IFrameSplitOperator.IsNumber(item[307]) || IFrameSplitOperator.IsObject(item[307])) stock.ReserveProgressBar7=item[307];
-        if (IFrameSplitOperator.IsNumber(item[308]) || IFrameSplitOperator.IsObject(item[308])) stock.ReserveProgressBar8=item[308];
-        if (IFrameSplitOperator.IsNumber(item[309]) || IFrameSplitOperator.IsObject(item[309])) stock.ReserveProgressBar9=item[309];
-        if (IFrameSplitOperator.IsNumber(item[310]) || IFrameSplitOperator.IsObject(item[310])) stock.ReserveProgressBar10=item[310];
+        if (__Temp_IsNumberOrObject(item[301])) stock.ReserveProgressBar1=item[301];
+        if (__Temp_IsNumberOrObject(item[302])) stock.ReserveProgressBar2=item[302];
+        if (__Temp_IsNumberOrObject(item[303])) stock.ReserveProgressBar3=item[303];
+        if (__Temp_IsNumberOrObject(item[304])) stock.ReserveProgressBar4=item[304];
+        if (__Temp_IsNumberOrObject(item[305])) stock.ReserveProgressBar5=item[305];
+        if (__Temp_IsNumberOrObject(item[306])) stock.ReserveProgressBar6=item[306];
+        if (__Temp_IsNumberOrObject(item[307])) stock.ReserveProgressBar7=item[307];
+        if (__Temp_IsNumberOrObject(item[308])) stock.ReserveProgressBar8=item[308];
+        if (__Temp_IsNumberOrObject(item[309])) stock.ReserveProgressBar9=item[309];
+        if (__Temp_IsNumberOrObject(item[310])) stock.ReserveProgressBar10=item[310];
 
         //10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
         if (IFrameSplitOperator.IsObject(item[351])) stock.ReserveButton1=item[351];
@@ -150478,6 +150495,14 @@ function ChartReport()
         if (!data || !fieldName) return;
 
         var value=data[fieldName];
+        var compareValue=null;
+        if (IFrameSplitOperator.IsObject(data[fieldName]))
+        {
+            var item=data[fieldName];
+            if (IFrameSplitOperator.IsNumber(item.Value)) value=item.Value;
+            if (IFrameSplitOperator.IsNumber(item.CompareValue)) compareValue=item.CompareValue;
+        }
+
         if (!IFrameSplitOperator.IsNumber(value)) return;
 
         if (IFrameSplitOperator.IsNumber(column.ColorType))
@@ -150494,6 +150519,11 @@ function ChartReport()
             {
                 drawInfo.TextColor=this.GetUpDownColor(value,data.YClose);
             }
+            else if (column.ColorType==4)
+            {
+                if (IFrameSplitOperator.IsNumber(compareValue))
+                    drawInfo.TextColor=this.GetUpDownColor(value,compareValue);
+            }
         }
 
         var text=value.toFixed(column.FloatPrecision);
@@ -160818,6 +160848,7 @@ function JSDialogDrawTool()
     this.Close=function(e)
     {
         if (!this.DivDialog) return;
+        if (!this.IsShow()) return;
 
         this.DivDialog.style.visibility='hidden';
 
@@ -161163,6 +161194,8 @@ function JSDialogModifyDraw()
         if (!this.DivDialog) return;
 
         this.ChartPicture=null;
+        if (!this.IsShow()) return;
+
         this.DivDialog.style.visibility='hidden';
 
         if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
@@ -163308,6 +163341,21 @@ function JSPopKeyboard()
         var x=xRight-width;
         var y=ybottom-height;
 
+        if (this.Keyboard.JSChart && this.Keyboard.JSChart.JSChartContainer)
+        {
+            var event=this.Keyboard.JSChart.JSChartContainer.GetEventCallback(JSCHART_EVENT_ID.ON_KEYBOARD_SHOW);
+            if (event && event.Callback)
+            {
+                var data={ PreventDefault:false, Y:y, X:x, Height:height, Width:width };
+                event.Callback(event, data, this);
+                if (data.PreventDefault) return;
+
+                //修改显示位置
+                x=data.X;
+                y=data.Y;
+            }
+        }
+
         this.DivDialog.style.visibility='visible';
         this.DivDialog.style.top = y + "px";
         this.DivDialog.style.left = x + "px";
@@ -163333,6 +163381,19 @@ function JSPopKeyboard()
         return this.DivDialog.style.visibility==='visible';
     }
 
+    this.PopKeyboard=function(search)
+    {
+        if (!this.DivDialog) return;
+        if (this.IsShow()) return;
+
+        this.Show();
+        this.InputDOM.focus();
+        if (this.InputDOM.value=="") 
+        {
+            if (search) this.InputDOM.value=search;
+        }
+    }
+
     this.OnGlobalKeydown=function(event)
     {
         if (!this.DivDialog) return;
@@ -169094,10 +169155,19 @@ function JSStatusBarChartContainer(uielement)
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
         var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
 
-        if (e && e.button==0)   //左键点击
+        if (e)   
         {
-            var ptClick={ X:this.ClickDownPoint.X, Y:this.ClickDownPoint.Y };
-            this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICK_STATUSBAR_ITEM, ptClick, e);
+            if (e.button==0)        //左键点击
+            {
+                var ptClick={ X:this.ClickDownPoint.X, Y:this.ClickDownPoint.Y };
+                this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICK_STATUSBAR_ITEM, ptClick, e);
+            }
+            else if (e.button==2)   //右键点击
+            {
+                this.HideAllTooltip();
+                var ptClick={ X:this.ClickDownPoint.X, Y:this.ClickDownPoint.Y };
+                this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_RCLICK_STATUSBAR_ITEM, ptClick, e);
+            }
         }
     }
 
@@ -169183,7 +169253,7 @@ function JSStatusBarChartContainer(uielement)
                 {
                     if (toolTip.Data)
                     {
-                        var data= { X:e.clientX, Y:e.clientY, Tooltip:toolTip };
+                        var data= { X:e.clientX, Y:e.clientY, Tooltip:toolTip, e:e };
                         event.Callback(event, data, this);
                         return true;
                     }
@@ -169912,6 +169982,7 @@ function JSStockInfoChart(divElement)
         this.DivElement.JSChart=this;   //div中保存一份
 
         if (option.EnableResize==true) this.CreateResizeListener();
+        if (option.EnablePopMenuV2===true) chart.InitalPopMenu();
 
         if (option.Symbol)
         {
@@ -170113,6 +170184,8 @@ function JSStockInfoChartContainer(uielement)
     this.AutoUpdateTimer=null;
     this.AutoUpdateFrequency=15000;             //15秒更新一次数据
 
+    this.JSPopMenu;             //内置菜单
+
     this.UIElement=uielement;
    
     this.IsDestroy=false;        //是否已经销毁了
@@ -170121,6 +170194,8 @@ function JSStockInfoChartContainer(uielement)
     {
         this.IsDestroy=true;
         this.StopAutoUpdate();
+
+        this.DestroyPopMenu();
     }
 
     //设置事件回调
@@ -170133,6 +170208,37 @@ function JSStockInfoChartContainer(uielement)
         this.mapEvent.set(object.event,data);
     }
 
+    this.RemoveEventCallback=function(eventid)
+    {
+        if (!this.mapEvent.has(eventid)) return;
+
+        this.mapEvent.delete(eventid);
+    }
+
+    this.GetEventCallback=function(id)  //获取事件回调
+    {
+        if (!this.mapEvent.has(id)) return null;
+        var item=this.mapEvent.get(id);
+        return item;
+    }
+
+    this.InitalPopMenu=function()   //初始化弹出窗口
+    {
+        if (this.JSPopMenu) return;
+
+        this.JSPopMenu=new JSPopMenu();     //内置菜单
+        this.JSPopMenu.Inital();
+    }
+
+    this.DestroyPopMenu=function()
+    {
+        if (!this.JSPopMenu) return;
+        
+        this.JSPopMenu.Destroy();
+        this.JSPopMenu=null;
+    }
+
+
     this.ClearData=function()
     {
         this.Data.Name=null;
@@ -170174,14 +170280,15 @@ function JSStockInfoChartContainer(uielement)
     {
         this.CancelAutoUpdate();
         this.ClearData();
+        this.ChartClearMouseOnData();
         this.Symbol=symbol;
         this.Data.Symbol=symbol;
 
         if (option)
         {
-            if (IFrameSplitOperator.IsNonEmptyArray(option.Column)) this.SetColumn(option.Column);
+            if (IFrameSplitOperator.IsArray(option.Column)) this.SetColumn(option.Column);
             if (IFrameSplitOperator.IsNumber(option.BuySellCount)) this.SetBuySellCount(option.BuySellCount);
-            if (IFrameSplitOperator.IsNonEmptyArray(option.MouseOnKey)) this.SetMouseOnKey(option.MouseOnKey);
+            if (IFrameSplitOperator.IsArray(option.MouseOnKey)) this.SetMouseOnKey(option.MouseOnKey);
         }
 
         this.Draw();
@@ -170346,6 +170453,20 @@ function JSStockInfoChartContainer(uielement)
         this.ClickDownPoint={ X:e.clientX, Y:e.clientY };
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
         var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
+
+        if (e)   
+        {
+            if (e.button==0)        //左键点击
+            {
+                var ptClick={ X:this.ClickDownPoint.X, Y:this.ClickDownPoint.Y };
+                this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_CLICK_STOCKINFO_ITEM, ptClick, e);
+            }
+            else if (e.button==2)   //右键点击
+            {
+                var ptClick={ X:this.ClickDownPoint.X, Y:this.ClickDownPoint.Y };
+                this.TryClickPaintEvent(JSCHART_EVENT_ID.ON_RCLICK_STOCKINFO_ITEM, ptClick, e);
+            }
+        }
     }
 
     this.UIOnContextMenu=function(e)
@@ -170356,6 +170477,87 @@ function JSStockInfoChartContainer(uielement)
             if (e.stopPropagation) e.stopPropagation();
             e.returnValue=false;
         } 
+
+        var x = e.clientX-this.UIElement.getBoundingClientRect().left;
+        var y = e.clientY-this.UIElement.getBoundingClientRect().top;
+
+        this.OnRightMenu(x, y, e);
+    }
+
+    this.OnRightMenu=function(x,y,e)
+    {
+        if (!this.JSPopMenu) return;
+
+        var pixelTatio = GetDevicePixelRatio();
+        var toolTip=new TooltipData();
+        var data=null;
+        for(var i=0;i<this.ChartPaint.length;++i)
+        {
+            var item=this.ChartPaint[i];
+            if (item.GetTooltipData(x*pixelTatio,y*pixelTatio,toolTip))
+            {
+                if (toolTip.Data)
+                {
+                    data= { Cell:toolTip.Data};
+                    break;
+                }
+            }
+        }
+
+        if (!data) return;
+
+        data.e=e;
+        var menuData={ Menu:null, 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, Data:data };
+            event.Callback(event, sendData, this);
+        }
+
+        if (menuData.Menu) this.PopupMenuByRClick(menuData, x, y);
+    }
+
+     //右键菜单
+    this.PopupMenuByRClick=function(menuData, x, y)
+    {
+        if (!this.JSPopMenu) return;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        x+=rtClient.left+rtScroll.Left;
+        y+=rtClient.top+rtScroll.Top;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByRight(x,y);
+    }
+
+    //点击右键菜单
+    this.OnClickRightMenu=function(data)
+    {
+        JSConsole.Chart.Log('[JSStockInfoChartContainer::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.ExecuteMenuCommand=function(cmdID, aryArgs)
+    {
+
     }
 
     this.UIOnMouseMove=function(e)
@@ -170385,6 +170587,36 @@ function JSStockInfoChartContainer(uielement)
         return false;
     }
 
+    this.TryClickPaintEvent=function(eventID, ptClick, e)
+    {
+        var event=this.GetEventCallback(eventID);
+        if (!event) return false;
+
+        if (ptClick.X==e.clientX && ptClick.Y==e.clientY)
+        {
+            var pixelTatio = GetDevicePixelRatio();
+            var x = (e.clientX-uielement.getBoundingClientRect().left)*pixelTatio;
+            var y = (e.clientY-uielement.getBoundingClientRect().top)*pixelTatio;
+
+            var toolTip=new TooltipData();
+            for(var i=0;i<this.ChartPaint.length;++i)
+            {
+                var item=this.ChartPaint[i];
+                if (item.GetTooltipData(x,y,toolTip))
+                {
+                    if (toolTip.Data)
+                    {
+                        var data= { X:e.clientX, Y:e.clientY, Tooltip:toolTip };
+                        event.Callback(event, data, this);
+                        return true;
+                    }
+                }
+            }
+        }
+
+        return false;
+    }
+
     this.UIOnMouseleave=function(e)
     {
         var option={ Update:false }
@@ -170670,7 +170902,7 @@ function ChartStockData()
 
     this.ClearMouseOnData=function(option)
     {
-        if (!this.MouseOnItem)
+        if (this.MouseOnItem)
         {
             this.MouseOnItem=null;
             if (option) option.Update=true; //需要更新
@@ -170749,6 +170981,26 @@ function ChartStockData()
         return false;
     }
 
+    this.GetTooltipData=function(x,y,tooltip)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryCellRect)) return false;
+
+        for(var i=0;i<this.AryCellRect.length;++i)
+        {
+            var item=this.AryCellRect[i];
+            var rect=item.Rect;
+            if (Path2DHelper.PtInRect(x,y, rect))
+            {
+                tooltip.Data=item;
+                tooltip.ChartPaint=this;
+                tooltip.Type=151;
+                return true;
+            }
+        }
+
+        return false;
+    }
+
     this.Draw=function()
     {
         this.AryCellRect=[];
@@ -171250,7 +171502,7 @@ function ChartStockData()
 
 
 
-var HQCHART_VERSION="1.1.15454";
+var HQCHART_VERSION="1.1.15479";
 
 function PrintHQChartVersion()
 {