hqchart 1.1.14370 → 1.1.14375

package/package.json

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

package/src/jscommon/umychart.DialogDrawTool.js

@@ -162,6 +162,8 @@ function JSDialogDrawTool()
 
     this.DragTitle=null;
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart)
     {
        this.LineColor=g_JSChartResource.DrawPicture.LineColor[0];
@@ -501,6 +503,8 @@ function JSDialogDrawTool()
         if (!this.DivDialog) return;
 
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.IsShow=function()
@@ -637,6 +641,8 @@ function JSDialogModifyDraw()
         { Title:"删除图形", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID }},
 
     ];
+
+    this.RestoreFocusDelay=800;
    
     this.Inital=function(hqchart)
     {
@@ -776,6 +782,8 @@ function JSDialogModifyDraw()
 
         this.ChartPicture=null;
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.IsShow=function()

package/src/jscommon/umychart.DialogSearchIndex.js

@@ -41,6 +41,8 @@ function JSDialogSearchIndex()
     this.AryGroup=[];   //分类
     this.IndexData=JSDialogSearchIndex.GetDefaultIndexData();
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
@@ -84,6 +86,8 @@ function JSDialogSearchIndex()
         if (!this.DivDialog) return;
 
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.OnMouseDownTitle=function(e)
@@ -129,6 +133,8 @@ function JSDialogSearchIndex()
     {
         if (!this.DivDialog) return;
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+        
         if (!groupID) groupID=this.IndexData.Data[0].Group.ID;
         
         this.UpdateGroupData();
@@ -724,6 +730,8 @@ function JSDialogModifyIndexParam()
     this.IndexData=null;    //指标数据 { WindowsIndex:, Type:1=主图 2=叠加, Identify, IndexScript: }
     this.Arguments=[];           //参数备份
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
@@ -750,7 +758,8 @@ function JSDialogModifyIndexParam()
     this.Show=function(x,y)
     {
         if (!this.DivDialog) return;
-        //if (!this.HQChart) return;
+
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
 
         this.UpdateParam();
 
@@ -794,6 +803,8 @@ function JSDialogModifyIndexParam()
         if (!this.DivDialog) return;
 
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.SetIndexData=function(data)

package/src/jscommon/umychart.DialogSelectRect.js

@@ -43,6 +43,8 @@ function JSDialogSelectRect()
     this.ShowData;
     this.SelectData;
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
@@ -207,6 +209,8 @@ function JSDialogSelectRect()
         this.DivDialog.style.visibility='hidden';
         this.ShowData=null;
         this.SelectData=null;
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.MoveStartDate=function(step)
@@ -315,6 +319,8 @@ function JSDialogSelectRect()
         }
         */
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+        
         var top=this.HQChart.Frame.ChartBorder.GetTop();
         var left=this.HQChart.Frame.ChartBorder.GetLeft();
         var rtClient=this.HQChart.UIElement.getBoundingClientRect();

package/src/jscommon/umychart.DialogTooltip.js

@@ -49,6 +49,8 @@ function JSDialogTooltip()
     this.LastValueCacheID=null;     //鼠标信息
     this.DataID=null;               //当前显示的数据时间{ Symbol:, Date:, Time: }
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
@@ -414,6 +416,8 @@ function JSDialogTooltip()
         if (!this.DivDialog) return;
 
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.OnMouseDownTitle=function(e)

package/src/jscommon/umychart.js

@@ -3097,6 +3097,29 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DialogModifyIndexParam;    //指标参数修改
 
 
+    this.RestoreFocusTimer=null;    //恢复焦点定时器
+
+    this.RestoreFocus=function(delay)
+    {
+        var value=1000;
+        if (IFrameSplitOperator.IsNumber(delay)) value=delay;
+
+        this.ClearRestoreFocusTimer();
+        this.RestoreFocusTimer=setTimeout(()=>
+        {
+            this.SetFocus();
+        }, value);
+    }
+
+    this.ClearRestoreFocusTimer=function()
+    {
+        if (this.RestoreFocusTimer) 
+        {
+            clearTimeout(this.RestoreFocusTimer);
+            this.RestoreFocusTimer = null;
+        }
+    }
+
     this.GetVolUnit=function()  //成交量单位
     {
         var upperSymbol=this.Symbol?this.Symbol.toUpperCase():null;
@@ -3114,7 +3137,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.JSPopMenu) return;
 
         this.JSPopMenu=new JSPopMenu();     //内置菜单
-        this.JSPopMenu.Inital();
+        this.JSPopMenu.Inital(this);
     }
 
     this.InitalDrawToolDialog=function()
@@ -11118,7 +11141,7 @@ function ChartFrameFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[ChartFrameFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[ChartFrameFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -24419,7 +24442,7 @@ function ChartPaintFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[ChartPaintFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[ChartPaintFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -93141,7 +93164,7 @@ function DialogFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[DialogFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[DialogFactory::Create] can't find class=${name}.`);
             return null;
         }
 

package/src/jscommon/umychart.popMenu.js

@@ -19,10 +19,13 @@ function JSPopMenu()
     this.ArySubRootDOM=[];
 
     this.ClickCallback=null;        //点击回调
+    this.RestoreFocusCallback=null;
     this.CheckedClassName="UMyChart_MenuItem_Span_Checked  iconfont icon-checked";   //选中图标
     this.RightArrowClassName="UMyChart_MenuItem_Span_Arrow  iconfont icon-menu_arraw_right";  //右侧箭头
     this.SelectedClassName="UMyChart_MenuItem_Tr_Selected";
 
+    this.RestoreFocusDelay=1000;
+
     this.AryTDClassName=
     [
         "UMyChart_MenuItem_Td_Status",      //图标
@@ -31,8 +34,9 @@ function JSPopMenu()
         "UMyChart_MenuItem_Td_Arrow"        //箭头
     ];
 
-    this.Inital=function()
+    this.Inital=function(hqchart, option)
     {
+        this.HQChart=hqchart;
         window.addEventListener('mousedown', (e)=>{ this.OnWindowMouseDown(e)});
     }
 
@@ -77,6 +81,7 @@ function JSPopMenu()
 
         if (IFrameSplitOperator.IsNumber(data.Position)) this.Data.Position=data.Position;
         if (data.ClickCallback) this.ClickCallback=data.ClickCallback;
+        if (data.RestoreFocusCallback) this.RestoreFocusCallback=data.RestoreFocusCallback;
        
     }
 
@@ -226,6 +231,8 @@ function JSPopMenu()
         if (!this.RootDOM) return;  
         if (!rtTab) return;
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+
         var xLeft=rtTab.Left;
         var yTop=rtTab.Top-this.RootDOM.offsetHeight;
 
@@ -240,6 +247,8 @@ function JSPopMenu()
         if (!this.RootDOM) return;  
         if (!IFrameSplitOperator.IsNumber(x) || !IFrameSplitOperator.IsNumber(y)) return;
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+
         //菜单在当前屏幕无法显示需要调整
         var menuHeight=this.RootDOM.offsetHeight;
         var yMenuBottom=y+menuHeight;
@@ -262,6 +271,8 @@ function JSPopMenu()
         if (!this.RootDOM) return;  
         if (!rtButton) return;
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+
         var xLeft=rtButton.Left;
         var yTop=rtButton.Bottom;
         var menuHeight=this.RootDOM.offsetHeight;
@@ -369,6 +380,8 @@ function JSPopMenu()
         console.log("[JSPopMenu::OnWindowMouseDown] e=", e);
 
         this.Clear();
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 }
 

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

@@ -7022,6 +7022,29 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DialogModifyIndexParam;    //指标参数修改
 
 
+    this.RestoreFocusTimer=null;    //恢复焦点定时器
+
+    this.RestoreFocus=function(delay)
+    {
+        var value=1000;
+        if (IFrameSplitOperator.IsNumber(delay)) value=delay;
+
+        this.ClearRestoreFocusTimer();
+        this.RestoreFocusTimer=setTimeout(()=>
+        {
+            this.SetFocus();
+        }, value);
+    }
+
+    this.ClearRestoreFocusTimer=function()
+    {
+        if (this.RestoreFocusTimer) 
+        {
+            clearTimeout(this.RestoreFocusTimer);
+            this.RestoreFocusTimer = null;
+        }
+    }
+
     this.GetVolUnit=function()  //成交量单位
     {
         var upperSymbol=this.Symbol?this.Symbol.toUpperCase():null;
@@ -7039,7 +7062,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.JSPopMenu) return;
 
         this.JSPopMenu=new JSPopMenu();     //内置菜单
-        this.JSPopMenu.Inital();
+        this.JSPopMenu.Inital(this);
     }
 
     this.InitalDrawToolDialog=function()
@@ -15043,7 +15066,7 @@ function ChartFrameFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[ChartFrameFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[ChartFrameFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -28344,7 +28367,7 @@ function ChartPaintFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[ChartPaintFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[ChartPaintFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -97066,7 +97089,7 @@ function DialogFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[DialogFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[DialogFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -143049,7 +143072,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14369";
+var HQCHART_VERSION="1.1.14374";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -7066,6 +7066,29 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.DialogModifyIndexParam;    //指标参数修改
 
 
+    this.RestoreFocusTimer=null;    //恢复焦点定时器
+
+    this.RestoreFocus=function(delay)
+    {
+        var value=1000;
+        if (IFrameSplitOperator.IsNumber(delay)) value=delay;
+
+        this.ClearRestoreFocusTimer();
+        this.RestoreFocusTimer=setTimeout(()=>
+        {
+            this.SetFocus();
+        }, value);
+    }
+
+    this.ClearRestoreFocusTimer=function()
+    {
+        if (this.RestoreFocusTimer) 
+        {
+            clearTimeout(this.RestoreFocusTimer);
+            this.RestoreFocusTimer = null;
+        }
+    }
+
     this.GetVolUnit=function()  //成交量单位
     {
         var upperSymbol=this.Symbol?this.Symbol.toUpperCase():null;
@@ -7083,7 +7106,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         if (this.JSPopMenu) return;
 
         this.JSPopMenu=new JSPopMenu();     //内置菜单
-        this.JSPopMenu.Inital();
+        this.JSPopMenu.Inital(this);
     }
 
     this.InitalDrawToolDialog=function()
@@ -15087,7 +15110,7 @@ function ChartFrameFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[ChartFrameFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[ChartFrameFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -28388,7 +28411,7 @@ function ChartPaintFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[ChartPaintFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[ChartPaintFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -97110,7 +97133,7 @@ function DialogFactory()
     {
         if (!this.DataMap.has(name)) 
         {
-            JSConsole.Warn(`[DialogFactory::Create] can't find class=${name}.`);
+            JSConsole.Chart.Warn(`[DialogFactory::Create] can't find class=${name}.`);
             return null;
         }
 
@@ -146268,10 +146291,13 @@ function JSPopMenu()
     this.ArySubRootDOM=[];
 
     this.ClickCallback=null;        //点击回调
+    this.RestoreFocusCallback=null;
     this.CheckedClassName="UMyChart_MenuItem_Span_Checked  iconfont icon-checked";   //选中图标
     this.RightArrowClassName="UMyChart_MenuItem_Span_Arrow  iconfont icon-menu_arraw_right";  //右侧箭头
     this.SelectedClassName="UMyChart_MenuItem_Tr_Selected";
 
+    this.RestoreFocusDelay=1000;
+
     this.AryTDClassName=
     [
         "UMyChart_MenuItem_Td_Status",      //图标
@@ -146280,8 +146306,9 @@ function JSPopMenu()
         "UMyChart_MenuItem_Td_Arrow"        //箭头
     ];
 
-    this.Inital=function()
+    this.Inital=function(hqchart, option)
     {
+        this.HQChart=hqchart;
         window.addEventListener('mousedown', (e)=>{ this.OnWindowMouseDown(e)});
     }
 
@@ -146326,6 +146353,7 @@ function JSPopMenu()
 
         if (IFrameSplitOperator.IsNumber(data.Position)) this.Data.Position=data.Position;
         if (data.ClickCallback) this.ClickCallback=data.ClickCallback;
+        if (data.RestoreFocusCallback) this.RestoreFocusCallback=data.RestoreFocusCallback;
        
     }
 
@@ -146475,6 +146503,8 @@ function JSPopMenu()
         if (!this.RootDOM) return;  
         if (!rtTab) return;
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+
         var xLeft=rtTab.Left;
         var yTop=rtTab.Top-this.RootDOM.offsetHeight;
 
@@ -146489,6 +146519,8 @@ function JSPopMenu()
         if (!this.RootDOM) return;  
         if (!IFrameSplitOperator.IsNumber(x) || !IFrameSplitOperator.IsNumber(y)) return;
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+
         //菜单在当前屏幕无法显示需要调整
         var menuHeight=this.RootDOM.offsetHeight;
         var yMenuBottom=y+menuHeight;
@@ -146511,6 +146543,8 @@ function JSPopMenu()
         if (!this.RootDOM) return;  
         if (!rtButton) return;
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+
         var xLeft=rtButton.Left;
         var yTop=rtButton.Bottom;
         var menuHeight=this.RootDOM.offsetHeight;
@@ -146618,6 +146652,8 @@ function JSPopMenu()
         console.log("[JSPopMenu::OnWindowMouseDown] e=", e);
 
         this.Clear();
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 }
 
@@ -146792,6 +146828,8 @@ function JSDialogDrawTool()
 
     this.DragTitle=null;
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart)
     {
        this.LineColor=g_JSChartResource.DrawPicture.LineColor[0];
@@ -147131,6 +147169,8 @@ function JSDialogDrawTool()
         if (!this.DivDialog) return;
 
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.IsShow=function()
@@ -147267,6 +147307,8 @@ function JSDialogModifyDraw()
         { Title:"删除图形", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID }},
 
     ];
+
+    this.RestoreFocusDelay=800;
    
     this.Inital=function(hqchart)
     {
@@ -147406,6 +147448,8 @@ function JSDialogModifyDraw()
 
         this.ChartPicture=null;
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.IsShow=function()
@@ -148669,6 +148713,8 @@ function JSDialogTooltip()
     this.LastValueCacheID=null;     //鼠标信息
     this.DataID=null;               //当前显示的数据时间{ Symbol:, Date:, Time: }
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
@@ -149034,6 +149080,8 @@ function JSDialogTooltip()
         if (!this.DivDialog) return;
 
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.OnMouseDownTitle=function(e)
@@ -150752,6 +150800,8 @@ function JSDialogSelectRect()
     this.ShowData;
     this.SelectData;
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
@@ -150916,6 +150966,8 @@ function JSDialogSelectRect()
         this.DivDialog.style.visibility='hidden';
         this.ShowData=null;
         this.SelectData=null;
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.MoveStartDate=function(step)
@@ -151024,6 +151076,8 @@ function JSDialogSelectRect()
         }
         */
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+        
         var top=this.HQChart.Frame.ChartBorder.GetTop();
         var left=this.HQChart.Frame.ChartBorder.GetLeft();
         var rtClient=this.HQChart.UIElement.getBoundingClientRect();
@@ -151615,6 +151669,8 @@ function JSDialogSearchIndex()
     this.AryGroup=[];   //分类
     this.IndexData=JSDialogSearchIndex.GetDefaultIndexData();
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
@@ -151658,6 +151714,8 @@ function JSDialogSearchIndex()
         if (!this.DivDialog) return;
 
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.OnMouseDownTitle=function(e)
@@ -151703,6 +151761,8 @@ function JSDialogSearchIndex()
     {
         if (!this.DivDialog) return;
 
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
+        
         if (!groupID) groupID=this.IndexData.Data[0].Group.ID;
         
         this.UpdateGroupData();
@@ -152298,6 +152358,8 @@ function JSDialogModifyIndexParam()
     this.IndexData=null;    //指标数据 { WindowsIndex:, Type:1=主图 2=叠加, Identify, IndexScript: }
     this.Arguments=[];           //参数备份
 
+    this.RestoreFocusDelay=800;
+
     this.Inital=function(hqchart, option)
     {
         this.HQChart=hqchart;
@@ -152324,7 +152386,8 @@ function JSDialogModifyIndexParam()
     this.Show=function(x,y)
     {
         if (!this.DivDialog) return;
-        //if (!this.HQChart) return;
+
+        if (this.HQChart) this.HQChart.ClearRestoreFocusTimer();
 
         this.UpdateParam();
 
@@ -152368,6 +152431,8 @@ function JSDialogModifyIndexParam()
         if (!this.DivDialog) return;
 
         this.DivDialog.style.visibility='hidden';
+
+        if (this.HQChart) this.HQChart.RestoreFocus(this.RestoreFocusDelay);
     }
 
     this.SetIndexData=function(data)
@@ -152802,7 +152867,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.14369";
+var HQCHART_VERSION="1.1.14374";
 
 function PrintHQChartVersion()
 {