hqchart 1.1.13976 → 1.1.13983

package/src/jscommon/umychart.DialogTooltip.js

@@ -345,22 +345,23 @@ function JSDialogTooltip()
         this.onmouseup = null;
     }
 
-    this.Show=function()
+    this.Show=function(x, y)
     {
+        if (this.IsShow()) return;
+
         if (!this.DivDialog) return;
         if (!this.HQChart) return;
 
-        if (!this.DivDialog.style.top || !this.DivDialog.style.left)    //上一次显示的位置
-        {
-            var top=this.HQChart.Frame.ChartBorder.GetTop();
-            var left=this.HQChart.Frame.ChartBorder.GetLeft();
-            var rtClient=this.HQChart.UIElement.getBoundingClientRect();
-    
-            var x=left+rtClient.left+5;
-            var y=top+rtClient.top+10;
-            this.DivDialog.style.top = y + "px";
-            this.DivDialog.style.left = x + "px";
-        }
+       
+        var top=this.HQChart.Frame.ChartBorder.GetTop();
+        var left=this.HQChart.Frame.ChartBorder.GetLeft();
+        var rtClient=this.HQChart.UIElement.getBoundingClientRect();
+
+        var x=left+rtClient.left+5;
+        var y=top+rtClient.top+10;
+        this.DivDialog.style.top = y + "px";
+        this.DivDialog.style.left = x + "px";
+        
 
         this.DivDialog.style.visibility='visible';
     }

package/src/jscommon/umychart.PopKeyboard.js

@@ -18,6 +18,7 @@ function JSPopKeyboard()
     this.Title="HQChart 键盘精灵"
     this.ID=Guid();
     this.ActiveDOM=null;    //启动键盘精灵是的控件
+    this.InputStatus=0;     //0=空闲  1=输入中 
 
     this.Keyboard=
     {
@@ -74,6 +75,10 @@ function JSPopKeyboard()
         input.addEventListener("keydown", (event)=>{ this.OnKeydown(event); });
         input.addEventListener("keyup", (event)=>{ this.OnKeyup(event); });
 
+        input.addEventListener("compositionstart", (event)=>{ this.OnCompositionStart(event); });
+        input.addEventListener("compositionupdate", (event)=>{ this.OnCompositionUpdate(event);} );
+        input.addEventListener("compositionend", (event)=>{ this.OnCompositionEnd(event);} );
+
         divInput.appendChild(input);
        
         var divChart=document.createElement("div");
@@ -104,8 +109,26 @@ function JSPopKeyboard()
 
     }
 
+
+    this.OnCompositionStart=function(event)
+    {
+        this.InputStatus=1;
+    }
+
+    this.OnCompositionUpdate=function(event)
+    {
+
+    }
+
+    this.OnCompositionEnd=function(event)
+    {
+        this.InputStatus=0;
+    }
+
     this.OnKeydown=function(event)
     {
+        if (this.InputStatus!=0) return;
+
         var aryKey=new Set([
             40, 
             38, 
@@ -127,20 +150,26 @@ function JSPopKeyboard()
 
     this.OnKeyup=function(event)
     {
+        if (this.InputStatus!=0) return;
+        
         var code=event.keyCode;
-        if ((code>=48 && code<=57) || (code>=65 && code<=90) || (code>=97 && code<=122) || code==8)
+
+        if (code==8)   //删除
         {
             var strText=this.InputDOM.value;
-            strText=strText.toUpperCase();
-            if (strText.length==0)
-            {
-                this.Hide();
-            }
-            else
+            if (strText.length==0)  
             {
-                this.Keyboard.JSChart.Search(strText);
+                this.Hide();    //只有按了删除 才能隐藏
+                return;
             }
         }
+    
+        if ((code>=48 && code<=57) || (code>=65 && code<=90) || (code>=97 && code<=122) || code==8)
+        {
+            var strText=this.InputDOM.value;
+            strText=strText.toUpperCase();
+            this.Keyboard.JSChart.Search(strText);
+        }
     }
 
 

package/src/jscommon/umychart.TReport.js

@@ -599,10 +599,11 @@ function JSTReportChartContainer(uielement)
 
     this.RecvStockListData=function(data)
     {
+        this.MapExePriceData=new Map();
+        this.MapStockData=new Map();
+
         if (IFrameSplitOperator.IsNonEmptyArray(data.data))
         {
-            this.MapExePriceData=new Map();
-            this.MapStockData=new Map();
             //0=行权价格 1=左边期权代码 2=右侧期权代码 3=左侧期权名称 4=右侧期权名称
             for(var i=0;i<data.data.length;++i)
             {