hqchart 1.1.14283 → 1.1.14289

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

@@ -6978,12 +6978,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         IsDisplayLatest:false, 
         SelectedBorder:{ Mode:0, SelFrame:0 },          //边框选中模式  Mode:0=禁用 1=右侧标记选中 2=指标窗口标记选中
         SelectedXBorder: { Mode:0, Date:null },         //X边框选中模式 Mode:0=禁用 分时图图有效
-         //XDateFormat (多日分时图x轴底部日期格式)
+        //XDateFormat (多日分时图x轴底部日期格式)
+
+        //右侧框架外部坐标和间距
         RightHorizontal:
         { 
             //Show:true, 
             //Width:5 
-        }          //右侧框架外部坐标和间距
+        },          
+
+        //锁十字光标
+        LockCorssCursor:{ X:{ Enable:false } }
     };  
 
     this.VerticalDrag;              //通过X轴左右拖动数据(手势才有)
@@ -8389,7 +8394,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     this.UIOnMounseOut=function(e)
     {
         JSConsole.Chart.Log('[KLineChartContainer::UIOnMounseOut]',e);
-        this.UIOnMouseMove(e);
+        if (!this.IsLockCorssCursor()) this.UIOnMouseMove(e);   //锁十字光标时， 始终显示十字光标
     }
 
     this.UIOnMouseleave=function(e)
@@ -9610,15 +9615,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         
         var bDrawDialogTooltip=false;
         var ptPosition=null;    //鼠标位置 null 无效 -1 在外面 >=0 对应的指标窗口中ID
-        if (this.LastPoint.X!=null || this.LastPoint.Y!=null)
+        var corssCursorPos=this.GetCorssCursorPosition()
+        if (corssCursorPos.LastPoint.X!=null || corssCursorPos.LastPoint.Y!=null)
         {
             if (this.ChartCorssCursor)
             {
-                this.ChartCorssCursor.LastPoint=this.LastPoint;
-                this.ChartCorssCursor.CursorIndex=this.CursorIndex;
+                this.ChartCorssCursor.LastPoint=corssCursorPos.LastPoint;
+                this.ChartCorssCursor.CursorIndex=corssCursorPos.CursorIndex;
                 if (this.EnableNewIndex)
                 {
-                    this.ChartCorssCursor.CorssCursorIndex=this.CorssCursorIndex;
+                    this.ChartCorssCursor.CorssCursorIndex=corssCursorPos.CorssCursorIndex;
                     this.ChartCorssCursor.EnableNewIndex=this.EnableNewIndex;
                 }
 
@@ -9668,8 +9674,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var item=this.TitlePaint[i];
             if (!item.IsDynamic) continue;
 
-            item.CursorIndex=this.CursorIndex;
-            item.LastPoint=this.LastPoint;
+            item.CursorIndex=corssCursorPos.CursorIndex;
+            item.LastPoint=corssCursorPos.LastPoint;
             if (item.ClassName=='DynamicChartTitlePainting')  item.OnDrawEvent=eventIndexTitleDraw
             else item.OnDrawEvent=eventTitleDraw;
 
@@ -9986,6 +9992,25 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    //十字光标坐标 
+    this.GetCorssCursorPosition=function()
+    {
+        var position=
+        { 
+            LastPoint:{ X:this.LastPoint.X, Y:this.LastPoint.Y },
+            CursorIndex:this.CursorIndex,
+        };
+
+        return position;
+    }
+
+    this.IsLockCorssCursor=function()
+    {
+        if (!this.GlobalOption || !this.GlobalOption.LockCorssCursor) return false;
+
+        return this.GlobalOption.LockCorssCursor.X.Enable;
+    }
+
     //画动态信息
     this.DrawDynamicInfo=function(option)
     {
@@ -10063,13 +10088,14 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
         this.DrawDrawPictureXYCoordinate();
         var bDrawDialogTooltip=false;
+        var corssCursorPos=this.GetCorssCursorPosition(); //十字光标的位置
         if (this.ChartCorssCursor)
         {
-            this.ChartCorssCursor.LastPoint=this.LastPoint;
-            this.ChartCorssCursor.CursorIndex=this.CursorIndex;
+            this.ChartCorssCursor.LastPoint=corssCursorPos.LastPoint;
+            this.ChartCorssCursor.CursorIndex=corssCursorPos.CursorIndex;
             if (this.EnableNewIndex)
             {
-                this.ChartCorssCursor.CorssCursorIndex=this.CorssCursorIndex;
+                this.ChartCorssCursor.CorssCursorIndex=corssCursorPos.CorssCursorIndex;
                 this.ChartCorssCursor.EnableNewIndex=this.EnableNewIndex;
             }
 
@@ -10123,7 +10149,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var item=this.TitlePaint[i];
             if (!item.IsDynamic) continue;
 
-            item.CursorIndex=this.CursorIndex;
+            item.CursorIndex=corssCursorPos.CursorIndex;
             item.LastPoint=this.LastPoint;
             if (item.OnDrawEvent) 
             {
@@ -10134,7 +10160,16 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
             var pointInfo=null;
             if (option && IFrameSplitOperator.IsNumber(option.ClientPos) && option.Point)   //当前鼠标所在位置的详细信息 包含盘前盘后
+            {
                 pointInfo={ ClientPos:option.ClientPos, Point:{ X:option.Point.X, Y:option.Point.Y }};
+                /*
+                if (this.IsLockCorssCursor())
+                {
+                    if (pointInfo.ClientPos<=0) pointInfo.ClientPos=1;
+                }
+                */
+            }
+                
             item.PointInfo=pointInfo;
 
             item.Draw(moveonPoint, this.LastMouseStatus);
@@ -35602,7 +35637,7 @@ function ChartSimpleTable()
             var colItem=this.AryColumnCache[i];
 
             var rtBG={Left:x, Top:rtRow.Top, Bottom:rtRow.Bottom, Height:this.RowHeight, Width:colItem.Width };
-            rtBG.Right=rtBG.Top+rtBG.Height;
+            rtBG.Right=rtBG.Left+rtBG.Width;
 
             if (item)
             {
@@ -60024,6 +60059,9 @@ function DynamicMinuteTitlePainting()
             isShowLastData=true;
         }
 
+        //十字光标锁定状态 禁用显示最后一个数据
+        if (this.GlobalOption && this.GlobalOption.LockCorssCursor && this.GlobalOption.LockCorssCursor.X.Enable) isShowLastData=false;
+
         var isLastOne=false;
         if (isShowLastData)
         {
@@ -80865,6 +80903,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Frame.ClearUpDonwFrameYData();
         this.ClearCustomKLine();
         this.ClearKLineCaluate();
+        this.UnlockCorssCursor();
        
 
         var kLineDrawType=this.GetKLineDrawType();
@@ -80902,6 +80941,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
             this.Frame.ClearYCoordinateMaxMin();
+            this.UnlockCorssCursor();
             this.RequestHistoryData();                  //请求日线数据
             //this.ReqeustKLineInfoData();
         }
@@ -80913,6 +80953,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             this.ResetOverlaySymbolStatus();
             this.ClearIndexRunCount();
             this.Frame.ClearYCoordinateMaxMin();
+            this.UnlockCorssCursor();
             this.RequestHistoryMinuteData();            //请求分钟数据
         }  
         else if (ChartData.IsTickPeriod(this.Period))
@@ -80922,6 +80963,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             this.ResetScrollBar();
             this.ClearIndexRunCount();
             this.Frame.ClearYCoordinateMaxMin();
+            this.UnlockCorssCursor();
             this.RequestTickData();                     //请求分笔数据
         }
     }
@@ -80962,6 +81004,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else    //API周期数据 重新请求数据
         {
+            
+
             if (ChartData.IsDayPeriod(this.Period,true))
             {
                 this.CancelAutoUpdate();                    //先停止定时器
@@ -80969,6 +81013,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 this.ClearIndexPaint();
                 this.ResetOverlaySymbolStatus();
                 this.ResetScrollBar();
+                this.Frame.ClearYCoordinateMaxMin();
+                this.UnlockCorssCursor();
                 this.RequestHistoryData();                  //请求日线数据
             }
             else if (ChartData.IsMinutePeriod(this.Period,true) || ChartData.IsSecondPeriod(this.Period) || ChartData.IsMilliSecondPeriod(this.Period))
@@ -80978,6 +81024,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 this.ClearIndexPaint();
                 this.ResetOverlaySymbolStatus();
                 this.ResetScrollBar();
+                this.Frame.ClearYCoordinateMaxMin();
+                this.UnlockCorssCursor();
                 this.RequestHistoryMinuteData();            //请求分钟数据
             }  
         }
@@ -82322,6 +82370,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.HideTooltip();
         this.ResetScrollBar();
         this.ClearIndexRunCount();
+        this.UnlockCorssCursor();
         this.Frame.ClearYCoordinateMaxMin();
         
         
@@ -85081,6 +85130,40 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         return data;
     }
+
+    //十字光标解锁
+    this.UnlockCorssCursor=function()
+    {
+        var xItem=this.GlobalOption.LockCorssCursor.X;
+        xItem.Enable=false;
+        xItem.KLine=null;
+    }
+
+    this.LockCorssCursor=function()
+    {
+        var xItem=this.GlobalOption.LockCorssCursor.X;
+        xItem.KLine={ DataIndex:null, Date:null, Time:null };
+        xItem.Enable=true;
+    }
+
+    this.GetCorssCursorPosition=function()
+    {
+        var position=
+        { 
+            LastPoint:{ X:this.LastPoint.X, Y:this.LastPoint.Y },
+            CursorIndex:this.CursorIndex,
+        };
+
+        if (!this.GlobalOption || !this.GlobalOption.LockCorssCursor) return position;
+
+        var xItem=this.GlobalOption.LockCorssCursor.X;
+        if (xItem.Enable && xItem.KLine)
+        {
+            position.CursorIndex=xItem.KLine.CursorIndex;
+        }
+
+        return position;
+    }
 }
 
 //API 返回数据 转化为array[]
@@ -85512,7 +85595,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.ColorLineData;    //主图价格线颜色自定义配置
     this.EnableSelectRect=false;    //是否可以区间选择
 
-    this.CorssCursorIndex={ DayIndex:-1, DataIndex:-1, Point:{X:-1, Y:-1} ,Type:-1 };
+    this.CorssCursorIndex={ DayIndex:-1, DataIndex:-1, Point:{X:-1, Y:-1} ,Type:-1 };   //Type: 单日(1=主图 2=盘前 3=盘后)  多日(10=主图 20=盘前 30=盘后)
     this.EnableNewIndex=false  //是否使用新的索引版本
 
     this.DayOffset={ Offset:0, ShowDayCount:-1, DataOffset:0, DayCount:1,  }; //Offset 日期偏移 , DataOffset数据偏移
@@ -86269,6 +86352,118 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         }
     }
 
+    this.LockCorssCursor=function()
+    {
+        var xItem=this.GlobalOption.LockCorssCursor.X;
+        
+        if (this.EnableNewIndex)
+        {
+            if (this.CorssCursorIndex.Type!=1 && this.CorssCursorIndex.Type!=10) return;    //目前只支持连续交易时间段
+
+            xItem.Minute=
+            { 
+                DayIndex:this.CorssCursorIndex.DayIndex,  
+                DataIndex:this.CorssCursorIndex.DataIndex, 
+                Type:this.CorssCursorIndex.Type,
+                CursorIndex:this.CursorIndex,
+            };
+        }
+        else
+        {
+            xItem.Minute={ CursorIndex:this.CursorIndex };
+        }
+
+        xItem.Enable=true;
+    }
+
+    this.UnlockCorssCursor=function()
+    {
+        var xItem=this.GlobalOption.LockCorssCursor.X;
+        xItem.Enable=false;
+        xItem.Minute=null;
+    }
+
+    this.GetCorssCursorPosition=function()
+    {
+        var position=
+        { 
+            LastPoint:{ X:this.LastPoint.X, Y:this.LastPoint.Y },
+            CursorIndex:this.CursorIndex,
+            CorssCursorIndex:this.CorssCursorIndex,
+        };
+
+        if (!this.GlobalOption || !this.GlobalOption.LockCorssCursor) return position;
+
+        var xItem=this.GlobalOption.LockCorssCursor.X;
+        if (xItem.Enable && xItem.Minute)
+        {
+            if (this.EnableNewIndex)
+            {
+                var type=xItem.Minute.Type;
+                position.CorssCursorIndex={ DayIndex:xItem.Minute.DayIndex, DataIndex:xItem.Minute.DataIndex, Type:type };
+                position.CursorIndex=xItem.Minute.CursorIndex;
+                position.LastPoint.X=this.GetXPointByCorssCursorIndex(position.CorssCursorIndex);
+            }
+            else
+            {
+                var index=xItem.Minute.CursorIndex;
+                var x=this.Frame.GetXFromIndex(index,false);
+                position.LastPoint.X=x;
+                position.CursorIndex=xItem.Minute.CursorIndex;
+            }
+
+            var border=this.Frame.ChartBorder.GetBorder();
+            if (position.LastPoint.Y<border.Top || position.LastPoint.Y>border.Bottom)  //超出图形框子, 调整为收盘价
+            {
+                var kData=this.GetKData();
+                if (kData && IFrameSplitOperator.IsNonEmptyArray(kData.Data))
+                {
+                    var index=parseInt(position.CursorIndex.toFixed(0));
+                    var item=kData.Data[index];
+                    if (item && IFrameSplitOperator.IsNumber(item.Close))
+                    {
+                        var y = this.Frame.SubFrame[0].Frame.GetYFromData(item.Close);
+                        position.LastPoint.Y=y;
+                    }
+                }
+            }
+        }
+        
+        return position;
+    }
+
+    this.GetXPointByCorssCursorIndex=function(corssCursorIndex)
+    {
+        if (!corssCursorIndex) return;
+
+        var x=null;
+        var dayIndex=corssCursorIndex.DayIndex;
+        var dataIndex=corssCursorIndex.DataIndex;
+        switch(corssCursorIndex.Type)   //单日  1=主图 2=盘前 3=盘后  //多日  10=主图 20=盘前 30=盘后
+        {
+            case 1:     //单日  1=主图
+            case 10:    //多日  10=主图
+                x=this.Frame.GetXFromIndex(dataIndex)
+                break;
+                /*
+            case 2:     //单日  2=盘前
+                x=this.Frame.SubFrame[0].Frame.GetLeftExtendXFromIndex(dataIndex,this.GetBeforeOpenData());
+                break;
+            case 20:    //多日  20=盘前
+                x=this.Frame.SubFrame[0].Frame.GetLeftExtendXFromIndex(dataIndex,{ Data:this.MultiDayBeforeOpenData, });
+                break;
+            case 3:     //单日  3=盘后 
+                x=this.Frame.SubFrame[0].Frame.GetRightExtendXFromIndex(dataIndex,this.GetAfterCloseData());
+                break;
+            case 30:    //多日  30=盘后
+                x=this.Frame.SubFrame[0].Frame.GetRightExtendXFromIndex(dataIndex,{ Data:this.MultiDayAfterCloseData} );
+                break;
+                */
+        }
+
+        return x;
+    }
+
     this.SetCorssCursorIndex=function(option)
     {
         if (!this.EnableNewIndex) return;
@@ -88162,6 +88357,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ReloadChartDrawPicture();
         this.ClearIndexRunCount();
         this.ClearStockCache();
+        this.UnlockCorssCursor();
         this.Frame.ClearYCoordinateMaxMin();
 
         if (option)
@@ -88297,6 +88493,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.AutoUpdateEvent(false, "MinuteChartContainer::ChangeDayCount");
         this.DayCount=count;
         this.ClearMinuteData();
+        this.UnlockCorssCursor();
 
         if (option && option.PageInfo)
         {
@@ -111536,6 +111733,45 @@ function JSDraw(errorHandler,symbolData)
 
         return result;
     }
+
+    //表格
+    this.TABLE_CELL=function(text, color, textAlign)
+    {
+        var cellItem={ Text:text };
+        if (color) cellItem.Color=color;
+        if (IFrameSplitOperator.IsString(textAlign))
+        {
+            var strValue=textAlign.toLowerCase();   //转小写
+            cellItem.TextAlign=strValue;
+        }
+
+        return cellItem;
+    }
+
+    this.TABLE_ROW=function(aryData)
+    {
+        var aryCell=[];
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            aryCell.push(item)
+        }
+
+        return aryCell;
+    }
+
+    this.DRAWTABLE=function(aryData)
+    {
+        var tableData=[]
+        for(var i=0;i<aryData.length;++i)
+        {
+            var item=aryData[i];
+            tableData.push({ AryCell:item });
+        }
+
+
+        return result={ DrawData:{ TableData:tableData }, DrawType:'DRAW_SIMPLE_TABLE' };
+    }
 }
 
 
@@ -111590,7 +111826,7 @@ JSDraw.prototype.IsDrawFunction=function(name)
         'DRAWOVERLAYLINE',"FILLRGN", "FILLRGN2","FILLTOPRGN", "FILLBOTTOMRGN", "FILLVERTICALRGN","FLOATRGN","DRAWSL", "DRAWGBK2","DRAWGBK_DIV",
         "VERTLINE","HORLINE","TIPICON",
         "BUY","SELL","SELLSHORT","BUYSHORT",
-        "DRAWLASTBARICON","DRAWLASTBARNUMBER", "DRAWLASTBARTEXT",
+        "DRAWLASTBARICON","DRAWLASTBARNUMBER", "DRAWLASTBARTEXT","DRAWTABLE",
     ]);
     if (setFunctionName.has(name)) return true;
 
@@ -118460,6 +118696,18 @@ function JSExecute(ast,option)
                 node.Out=node.Draw.DrawData.Data;
                 break;
 
+            //表格函数
+            case "TABLE_CELL":
+                node.Out=this.Draw.TABLE_CELL(args[0],args[1],args[2]);
+                break;
+            case "TABLE_ROW":
+                node.Out=this.Draw.TABLE_ROW(args);
+                break;
+            case "DRAWTABLE":
+                node.Draw=this.Draw.DRAWTABLE(args);
+                node.Out=[];
+                break;
+
             default:
                 node.Out=this.Algorithm.CallFunction(funcName, args, node, this.SymbolData);
                 break;
@@ -141051,7 +141299,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14282";
+var HQCHART_VERSION="1.1.14288";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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