ver 6107

vuehqchart/src/jscommon/umychart.complier.js

@@ -9190,8 +9190,23 @@ function ScriptIndexConsole(obj)
     this.RecvResultData=function(outVar,param)
     {
         var self=param.Self;
+        var jsExec=param.JSExecute;
+
+        var date=[];
+        for(var i=0;i<jsExec.SymbolData.Data.Data.length;++i)
+        {
+            var item=jsExec.SymbolData.Data.Data[i];
+            date[i]=item.Date;
+        }
+        
+        var result=
+        { 
+            Out:outVar, 
+            Date:date,  //日期对应 上面的数据
+            Stock:{ Name:jsExec.SymbolData.Name, Symbol:jsExec.SymbolData.Symbol },
+        };
         //console.log('[ScriptIndexConsole::RecvResultData] outVar ', outVar);
-        if (self.FinishCallback) self.FinishCallback(outVar, param.JSExecute);
+        if (self.FinishCallback) self.FinishCallback(result, param.JSExecute);
     }
 }
 

vuehqchart/src/jscommon/umychart.js

@@ -20814,13 +20814,40 @@ function KLineTrainChartContainer(uielement, bHScreen)
 
     this.TrainStartEnd={};
 
-    //TODO: 鼠标键盘消息全部要禁掉
     this.OnKeyDown=function(e)
     {
         var keyID = e.keyCode ? e.keyCode :e.which;
         //只支持放大缩小
         switch(keyID)
         {
+            case 37: //left
+                if (this.CursorIndex>1) //十字光标只能在当前屏移动
+                {
+                    --this.CursorIndex;
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                }
+                break;
+            case 39: //right
+                var xPointcount=0;
+                if (this.Frame.XPointCount) xPointcount=this.Frame.XPointCount;
+                else xPointcount=this.Frame.SubFrame[0].Frame.XPointCount;
+                if (this.CursorIndex+1<xPointcount) //十字光标只能在当前屏移动
+                {
+                    //判断是否在最后一个数据上
+                    var data=null;
+                    if (this.Frame.Data) data=this.Frame.Data;
+                    else data=this.Frame.SubFrame[0].Frame.Data;
+                    if (!data) break;
+                    if (this.CursorIndex+data.DataOffset+1>=data.Data.length) break;
+
+                    ++this.CursorIndex;
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                }
+                break;
             case 38:    //up
                 var cursorIndex={};
                 cursorIndex.Index=parseInt(Math.abs(this.CursorIndex-0.5).toFixed(0));

webhqchart.demo/jscommon/umychart.complier.js

@@ -9190,8 +9190,23 @@ function ScriptIndexConsole(obj)
     this.RecvResultData=function(outVar,param)
     {
         var self=param.Self;
+        var jsExec=param.JSExecute;
+
+        var date=[];
+        for(var i=0;i<jsExec.SymbolData.Data.Data.length;++i)
+        {
+            var item=jsExec.SymbolData.Data.Data[i];
+            date[i]=item.Date;
+        }
+        
+        var result=
+        { 
+            Out:outVar, 
+            Date:date,  //日期对应 上面的数据
+            Stock:{ Name:jsExec.SymbolData.Name, Symbol:jsExec.SymbolData.Symbol },
+        };
         //console.log('[ScriptIndexConsole::RecvResultData] outVar ', outVar);
-        if (self.FinishCallback) self.FinishCallback(outVar, param.JSExecute);
+        if (self.FinishCallback) self.FinishCallback(result, param.JSExecute);
     }
 }
 

webhqchart.demo/jscommon/umychart.js

@@ -20814,13 +20814,40 @@ function KLineTrainChartContainer(uielement, bHScreen)
 
     this.TrainStartEnd={};
 
-    //TODO: 鼠标键盘消息全部要禁掉
     this.OnKeyDown=function(e)
     {
         var keyID = e.keyCode ? e.keyCode :e.which;
         //只支持放大缩小
         switch(keyID)
         {
+            case 37: //left
+                if (this.CursorIndex>1) //十字光标只能在当前屏移动
+                {
+                    --this.CursorIndex;
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                }
+                break;
+            case 39: //right
+                var xPointcount=0;
+                if (this.Frame.XPointCount) xPointcount=this.Frame.XPointCount;
+                else xPointcount=this.Frame.SubFrame[0].Frame.XPointCount;
+                if (this.CursorIndex+1<xPointcount) //十字光标只能在当前屏移动
+                {
+                    //判断是否在最后一个数据上
+                    var data=null;
+                    if (this.Frame.Data) data=this.Frame.Data;
+                    else data=this.Frame.SubFrame[0].Frame.Data;
+                    if (!data) break;
+                    if (this.CursorIndex+data.DataOffset+1>=data.Data.length) break;
+
+                    ++this.CursorIndex;
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                }
+                break;
             case 38:    //up
                 var cursorIndex={};
                 cursorIndex.Index=parseInt(Math.abs(this.CursorIndex-0.5).toFixed(0));

webhqchart/umychart.complier.js

@@ -9190,8 +9190,23 @@ function ScriptIndexConsole(obj)
     this.RecvResultData=function(outVar,param)
     {
         var self=param.Self;
+        var jsExec=param.JSExecute;
+
+        var date=[];
+        for(var i=0;i<jsExec.SymbolData.Data.Data.length;++i)
+        {
+            var item=jsExec.SymbolData.Data.Data[i];
+            date[i]=item.Date;
+        }
+        
+        var result=
+        { 
+            Out:outVar, 
+            Date:date,  //日期对应 上面的数据
+            Stock:{ Name:jsExec.SymbolData.Name, Symbol:jsExec.SymbolData.Symbol },
+        };
         //console.log('[ScriptIndexConsole::RecvResultData] outVar ', outVar);
-        if (self.FinishCallback) self.FinishCallback(outVar, param.JSExecute);
+        if (self.FinishCallback) self.FinishCallback(result, param.JSExecute);
     }
 }
 

webhqchart/umychart.js

@@ -20814,13 +20814,40 @@ function KLineTrainChartContainer(uielement, bHScreen)
 
     this.TrainStartEnd={};
 
-    //TODO: 鼠标键盘消息全部要禁掉
     this.OnKeyDown=function(e)
     {
         var keyID = e.keyCode ? e.keyCode :e.which;
         //只支持放大缩小
         switch(keyID)
         {
+            case 37: //left
+                if (this.CursorIndex>1) //十字光标只能在当前屏移动
+                {
+                    --this.CursorIndex;
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                }
+                break;
+            case 39: //right
+                var xPointcount=0;
+                if (this.Frame.XPointCount) xPointcount=this.Frame.XPointCount;
+                else xPointcount=this.Frame.SubFrame[0].Frame.XPointCount;
+                if (this.CursorIndex+1<xPointcount) //十字光标只能在当前屏移动
+                {
+                    //判断是否在最后一个数据上
+                    var data=null;
+                    if (this.Frame.Data) data=this.Frame.Data;
+                    else data=this.Frame.SubFrame[0].Frame.Data;
+                    if (!data) break;
+                    if (this.CursorIndex+data.DataOffset+1>=data.Data.length) break;
+
+                    ++this.CursorIndex;
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                }
+                break;
             case 38:    //up
                 var cursorIndex={};
                 cursorIndex.Index=parseInt(Math.abs(this.CursorIndex-0.5).toFixed(0));