diff --git a/umychart_uniapp_h5/umychart.uniapp.h5.js b/umychart_uniapp_h5/umychart.uniapp.h5.js index a5a6555e435af37551a6650403618a93b967a047..09ab96459b22bf5166fb922dd4721c1a8a317833 100644 --- a/umychart_uniapp_h5/umychart.uniapp.h5.js +++ b/umychart_uniapp_h5/umychart.uniapp.h5.js @@ -5545,9 +5545,10 @@ function JSChartContainer(uielement) this.UpdatePointByCursorIndex=function() { this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex); - var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; if (data.DataOffset+index>=data.Data.length) { @@ -5562,8 +5563,9 @@ function JSChartContainer(uielement) { var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); - var data=this.Frame.Data; + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; var toolTip=new TooltipData(); toolTip.Data=data.Data[data.DataOffset+index]; toolTip.ChartPaint=this.ChartPaint[0]; @@ -8924,7 +8926,7 @@ function ChartData() ++j; continue; } - if (minData.Time == 925 || minData.Time == 930 ) + if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数 { } @@ -18675,10 +18677,10 @@ function HQDateStringFormat() this.Operator=function() { - if (!this.Value) return false; + if (!IFrameSplitOperator.IsNumber(this.Value)) return false; if (!this.Data) return false; - var index=Math.abs(this.Value-0.5); + var index=this.Value; index=parseInt(index.toFixed(0)); if (this.Data.DataOffset+index>=this.Data.Data.length) return false; var currentData = this.Data.Data[this.Data.DataOffset+index]; diff --git a/vuehqchart/src/jscommon/umychart.js b/vuehqchart/src/jscommon/umychart.js index a59857ed21f85d3e06b5941ab63c53b288730c3e..674c0efa52ab8cfaaf7b0cea8c0b1c67451a48bb 100644 --- a/vuehqchart/src/jscommon/umychart.js +++ b/vuehqchart/src/jscommon/umychart.js @@ -2227,9 +2227,10 @@ function JSChartContainer(uielement) this.UpdatePointByCursorIndex=function() { this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex); - var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; if (data.DataOffset+index>=data.Data.length) { @@ -2244,8 +2245,9 @@ function JSChartContainer(uielement) { var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); - var data=this.Frame.Data; + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; var toolTip=new TooltipData(); toolTip.Data=data.Data[data.DataOffset+index]; toolTip.ChartPaint=this.ChartPaint[0]; @@ -5606,7 +5608,7 @@ function ChartData() ++j; continue; } - if (minData.Time == 925 || minData.Time == 930 ) + if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数 { } @@ -15357,10 +15359,10 @@ function HQDateStringFormat() this.Operator=function() { - if (!this.Value) return false; + if (!IFrameSplitOperator.IsNumber(this.Value)) return false; if (!this.Data) return false; - var index=Math.abs(this.Value-0.5); + var index=this.Value; index=parseInt(index.toFixed(0)); if (this.Data.DataOffset+index>=this.Data.Data.length) return false; var currentData = this.Data.Data[this.Data.DataOffset+index]; diff --git a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js index df79e2d9a9c4b3180c646ad778becd844f721c10..8191706a4b273f9fcc1082095df71c7756b221a5 100644 --- a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js +++ b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js @@ -5586,9 +5586,10 @@ function JSChartContainer(uielement) this.UpdatePointByCursorIndex=function() { this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex); - var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; if (data.DataOffset+index>=data.Data.length) { @@ -5603,8 +5604,9 @@ function JSChartContainer(uielement) { var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); - var data=this.Frame.Data; + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; var toolTip=new TooltipData(); toolTip.Data=data.Data[data.DataOffset+index]; toolTip.ChartPaint=this.ChartPaint[0]; @@ -8965,7 +8967,7 @@ function ChartData() ++j; continue; } - if (minData.Time == 925 || minData.Time == 930 ) + if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数 { } @@ -18716,10 +18718,10 @@ function HQDateStringFormat() this.Operator=function() { - if (!this.Value) return false; + if (!IFrameSplitOperator.IsNumber(this.Value)) return false; if (!this.Data) return false; - var index=Math.abs(this.Value-0.5); + var index=this.Value; index=parseInt(index.toFixed(0)); if (this.Data.DataOffset+index>=this.Data.Data.length) return false; var currentData = this.Data.Data[this.Data.DataOffset+index]; diff --git a/webhqchart.demo/jscommon/umychart.js b/webhqchart.demo/jscommon/umychart.js index a59857ed21f85d3e06b5941ab63c53b288730c3e..674c0efa52ab8cfaaf7b0cea8c0b1c67451a48bb 100644 --- a/webhqchart.demo/jscommon/umychart.js +++ b/webhqchart.demo/jscommon/umychart.js @@ -2227,9 +2227,10 @@ function JSChartContainer(uielement) this.UpdatePointByCursorIndex=function() { this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex); - var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; if (data.DataOffset+index>=data.Data.length) { @@ -2244,8 +2245,9 @@ function JSChartContainer(uielement) { var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); - var data=this.Frame.Data; + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; var toolTip=new TooltipData(); toolTip.Data=data.Data[data.DataOffset+index]; toolTip.ChartPaint=this.ChartPaint[0]; @@ -5606,7 +5608,7 @@ function ChartData() ++j; continue; } - if (minData.Time == 925 || minData.Time == 930 ) + if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数 { } @@ -15357,10 +15359,10 @@ function HQDateStringFormat() this.Operator=function() { - if (!this.Value) return false; + if (!IFrameSplitOperator.IsNumber(this.Value)) return false; if (!this.Data) return false; - var index=Math.abs(this.Value-0.5); + var index=this.Value; index=parseInt(index.toFixed(0)); if (this.Data.DataOffset+index>=this.Data.Data.length) return false; var currentData = this.Data.Data[this.Data.DataOffset+index]; diff --git a/webhqchart/umychart.js b/webhqchart/umychart.js index a59857ed21f85d3e06b5941ab63c53b288730c3e..674c0efa52ab8cfaaf7b0cea8c0b1c67451a48bb 100644 --- a/webhqchart/umychart.js +++ b/webhqchart/umychart.js @@ -2227,9 +2227,10 @@ function JSChartContainer(uielement) this.UpdatePointByCursorIndex=function() { this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex); - var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; if (data.DataOffset+index>=data.Data.length) { @@ -2244,8 +2245,9 @@ function JSChartContainer(uielement) { var index=Math.abs(this.CursorIndex-0.5); index=parseInt(index.toFixed(0)); - var data=this.Frame.Data; + if (this.ClassName=='KLineChartContainer') index=this.CursorIndex; + var data=this.Frame.Data; var toolTip=new TooltipData(); toolTip.Data=data.Data[data.DataOffset+index]; toolTip.ChartPaint=this.ChartPaint[0]; @@ -5606,7 +5608,7 @@ function ChartData() ++j; continue; } - if (minData.Time == 925 || minData.Time == 930 ) + if ( (preTime!=null && minData.Time == 925 && preTime!=924) || (preTime!=null && minData.Time == 930 && preTime!=929)) //9:25, 9:30 不连续就不算个数 { } @@ -15357,10 +15359,10 @@ function HQDateStringFormat() this.Operator=function() { - if (!this.Value) return false; + if (!IFrameSplitOperator.IsNumber(this.Value)) return false; if (!this.Data) return false; - var index=Math.abs(this.Value-0.5); + var index=this.Value; index=parseInt(index.toFixed(0)); if (this.Data.DataOffset+index>=this.Data.Data.length) return false; var currentData = this.Data.Data[this.Data.DataOffset+index];