hqchart 1.1.12446 → 1.1.12450

package/lib/umychart.vue.js

@@ -7714,7 +7714,9 @@ drawPicture.Symbol=this.Symbol;drawPicture.Period=888888888;if(obj.Value)drawPic
 {if(!this.ChartDrawStorageCache||this.ChartDrawStorageCache.length<=0)return;for(var i in this.ChartDrawStorageCache){var item=this.ChartDrawStorageCache[i];if(item.FrameID<0||!this.Frame.SubFrame||this.Frame.SubFrame.length<item.FrameID)continue;var drawPicture=IChartDrawPicture.CreateChartDrawPicture(item);if(!drawPicture)continue;drawPicture.Canvas=this.Canvas;drawPicture.Status=10;drawPicture.Frame=this.Frame.SubFrame[item.FrameID].Frame;//绑定框架坐标
 drawPicture.UpdateXValue();drawPicture.ValueToPoint();if(drawPicture.ClassName==='ChartDrawPictureText')drawPicture.IsInitialized=true;this.ChartDrawPicture.push(drawPicture);}this.ChartDrawStorageCache=null;//清空缓存
 };this.SetSizeChange=function(bChanged){this.Frame.SetSizeChage(bChanged);for(var i in this.ExtendChartPaint){var item=this.ExtendChartPaint[i];item.SizeChange=bChanged;}};this.SetSizeChage=this.SetSizeChange;//根据X坐标获取数据索引
-this.GetDataIndexByPoint=function(x){var frame=this.Frame;if(this.Frame.SubFrame&&this.Frame.SubFrame.length>0)frame=this.Frame.SubFrame[0].Frame;if(!frame)return;var value=frame.GetXData(x);var index=parseInt(value.toFixed(0));return index;};//获取主数据
+this.GetDataIndexByPoint=function(x){var frame=this.Frame;if(this.Frame.SubFrame&&this.Frame.SubFrame.length>0)frame=this.Frame.SubFrame[0].Frame;if(!frame)return;var value=frame.GetXData(x);var index=parseInt(value.toFixed(0));return index;};//不支持未来时间 目前只支持主图
+this.GetDateTimeByPoint=function(x,y){var clientPos=this.PtInClient_V2(x,y);// 100-199=多日分时主图  200-299=盘前  300-399=盘后  1=主图 2=盘前 3=盘后
+if(clientPos<=0)return null;if(!this.Frame.SubFrame[0]||!this.Frame.SubFrame[0].Frame)return null;var frame=this.Frame.SubFrame[0].Frame;var data=this.Frame.SourceData;if(!data||!IFrameSplitOperator.IsNonEmptyArray(data.Data))return null;var index=-1;var result={ClientPos:clientPos};if(clientPos==1){var value=frame.GetXData(x);index=parseInt(value.toFixed(0));}else if(clientPos>=100&&clientPos<=199){var dayIndex=clientPos-100;var value=frame.GetXData(x);index=parseInt(value.toFixed(0));var dataIndex=index%frame.MinuteCount;result.DayIndex=dayIndex;result.DataIndex=dataIndex;}else{return null;}if(index<0||index>=data.Data.length)return null;result.Index=index;var item=data.Data[index];if(!item)return null;result.Date=item.Date;result.Time=item.Time;return result;};//获取主数据
 this.GetSelectRectData=function(selectData){if(Math.abs(selectData.XStart-selectData.XEnd)<5)return false;var startClientPos=this.PtInClient(selectData.XStart,selectData.YStart);var endClientPos=this.PtInClient(selectData.XEnd,selectData.YEnd);selectData.StartClientPos=startClientPos;selectData.EndClientPos=endClientPos;var data=this.SourceData;if(!data)return false;if(!IFrameSplitOperator.IsNonEmptyArray(data.Data))return false;var start=this.GetDataIndexByPoint(selectData.XStart);var end=this.GetDataIndexByPoint(selectData.XEnd);if(Math.abs(start-end)<2)return false;selectData.Data=data;var offset=data.DataOffset;start+=offset;end+=offset;if(start>end){selectData.Start=end;selectData.End=start;}else{selectData.Start=start;selectData.End=end;}var count=data.Data.length;if(selectData.End>=count)selectData.End=count-1;return true;};this.Super_UpdateFrameMaxMin=this.UpdateFrameMaxMin;this.UpdateFrameMaxMin=function(){this.Super_UpdateFrameMaxMin();if(this.DayCount==1)//集合竞价多坐标,Y轴强制都计算
 {var subFrame=this.Frame.SubFrame[1];if(subFrame.Frame)subFrame.Frame.XYSplit=true;}};this.ExportMainData=function(data,option){var aryData=data.ExportMinuteData(option);//导出K线
 return aryData;};this.DisplayLatest=function(){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DISPLAY_LATEST);//选中画图工具事件
@@ -12469,7 +12471,7 @@ this.AreaColor=g_JSChartResource.ScrollBar.BGChart.AreaColor;//面积图颜色
 };this.Draw=function(){if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;this.Canvas.save();if(this.LineWidth>0)this.Canvas.lineWidth=this.LineWidth*GetDevicePixelRatio();var bottom=this.ChartBorder.GetBottom();this.Canvas.strokeStyle=this.Color;var bFirstPoint=true;var drawCount=0,x,y;var firstPoint={};for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];var value=item.Close;if(!IFrameSplitOperator.IsNumber(value))continue;x=this.ChartFrame.GetXFromIndex(i);y=this.ChartFrame.GetYFromData(value);if(bFirstPoint){this.Canvas.beginPath();this.Canvas.moveTo(x,y);bFirstPoint=false;firstPoint={X:x,Y:y};}else{this.Canvas.lineTo(x,y);}++drawCount;}if(drawCount>0){this.Canvas.stroke();this.Canvas.lineTo(x,bottom);this.Canvas.lineTo(firstPoint.X,bottom);this.Canvas.closePath();this.Canvas.fillStyle=this.AreaColor;this.Canvas.fill();}this.Canvas.restore();};this.GetMaxMin=function(){var range={Max:null,Min:null};if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return range;for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];var value=item.Close;if(!IFrameSplitOperator.IsNumber(value))continue;if(range.Max==null||range.Max<value)range.Max=value;if(range.Min==null||range.Min>value)range.Min=value;}return range;};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12445";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12449";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12446",
+  "version": "1.1.12450",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -74527,6 +74527,51 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return index;
     }
 
+    //不支持未来时间 目前只支持主图
+    this.GetDateTimeByPoint=function(x,y)
+    {
+        var clientPos=this.PtInClient_V2(x,y);  // 100-199=多日分时主图  200-299=盘前  300-399=盘后  1=主图 2=盘前 3=盘后
+        if (clientPos<=0) return null;
+
+        if (!this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return null;
+        var frame=this.Frame.SubFrame[0].Frame;
+        var data=this.Frame.SourceData;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return null;
+
+        var index=-1;
+        var result={ ClientPos:clientPos };
+        if (clientPos==1)
+        {
+            var value=frame.GetXData(x);
+            index=parseInt(value.toFixed(0));
+        }
+        else if (clientPos>=100 && clientPos<=199)
+        {
+            var dayIndex=clientPos-100;
+            var value=frame.GetXData(x);
+            index=parseInt(value.toFixed(0));
+            var dataIndex=index%frame.MinuteCount;
+
+            result.DayIndex=dayIndex;
+            result.DataIndex=dataIndex;
+        }
+        else
+        {
+            return null;
+        }
+
+        if (index<0 || index>=data.Data.length) return null;
+
+        result.Index=index;
+        var item=data.Data[index];
+        if (!item) return null;
+
+        result.Date=item.Date;
+        result.Time=item.Time;
+
+        return result;
+    }
+
     //获取主数据
     this.GetSelectRectData=function(selectData)
     {

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

@@ -78607,6 +78607,51 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return index;
     }
 
+    //不支持未来时间 目前只支持主图
+    this.GetDateTimeByPoint=function(x,y)
+    {
+        var clientPos=this.PtInClient_V2(x,y);  // 100-199=多日分时主图  200-299=盘前  300-399=盘后  1=主图 2=盘前 3=盘后
+        if (clientPos<=0) return null;
+
+        if (!this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return null;
+        var frame=this.Frame.SubFrame[0].Frame;
+        var data=this.Frame.SourceData;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return null;
+
+        var index=-1;
+        var result={ ClientPos:clientPos };
+        if (clientPos==1)
+        {
+            var value=frame.GetXData(x);
+            index=parseInt(value.toFixed(0));
+        }
+        else if (clientPos>=100 && clientPos<=199)
+        {
+            var dayIndex=clientPos-100;
+            var value=frame.GetXData(x);
+            index=parseInt(value.toFixed(0));
+            var dataIndex=index%frame.MinuteCount;
+
+            result.DayIndex=dayIndex;
+            result.DataIndex=dataIndex;
+        }
+        else
+        {
+            return null;
+        }
+
+        if (index<0 || index>=data.Data.length) return null;
+
+        result.Index=index;
+        var item=data.Data[index];
+        if (!item) return null;
+
+        result.Date=item.Date;
+        result.Time=item.Time;
+
+        return result;
+    }
+
     //获取主数据
     this.GetSelectRectData=function(selectData)
     {
@@ -127680,7 +127725,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12445";
+var HQCHART_VERSION="1.1.12449";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -78651,6 +78651,51 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return index;
     }
 
+    //不支持未来时间 目前只支持主图
+    this.GetDateTimeByPoint=function(x,y)
+    {
+        var clientPos=this.PtInClient_V2(x,y);  // 100-199=多日分时主图  200-299=盘前  300-399=盘后  1=主图 2=盘前 3=盘后
+        if (clientPos<=0) return null;
+
+        if (!this.Frame.SubFrame[0] || !this.Frame.SubFrame[0].Frame) return null;
+        var frame=this.Frame.SubFrame[0].Frame;
+        var data=this.Frame.SourceData;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return null;
+
+        var index=-1;
+        var result={ ClientPos:clientPos };
+        if (clientPos==1)
+        {
+            var value=frame.GetXData(x);
+            index=parseInt(value.toFixed(0));
+        }
+        else if (clientPos>=100 && clientPos<=199)
+        {
+            var dayIndex=clientPos-100;
+            var value=frame.GetXData(x);
+            index=parseInt(value.toFixed(0));
+            var dataIndex=index%frame.MinuteCount;
+
+            result.DayIndex=dayIndex;
+            result.DataIndex=dataIndex;
+        }
+        else
+        {
+            return null;
+        }
+
+        if (index<0 || index>=data.Data.length) return null;
+
+        result.Index=index;
+        var item=data.Data[index];
+        if (!item) return null;
+
+        result.Date=item.Date;
+        result.Time=item.Time;
+
+        return result;
+    }
+
     //获取主数据
     this.GetSelectRectData=function(selectData)
     {
@@ -127724,7 +127769,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12445";
+var HQCHART_VERSION="1.1.12449";
 
 function PrintHQChartVersion()
 {