ver 10123

10122 修正分时图区间选择最后的结束时间点超出当前交易时间报错
jones2000 · Jul 12, 2021 · e86f3a9 · e86f3a9
1 parent 3377123
commit e86f3a9
Show file tree

Hide file tree

Showing 5 changed files with 35 additions and 0 deletions.
diff --git a/umychart_uniapp_h5/umychart.uniapp.h5.js b/umychart_uniapp_h5/umychart.uniapp.h5.js
@@ -47516,7 +47516,10 @@ function MinuteChartContainer(uielement)
         if (!paint) return;
 
         var data=this.SourceData;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return;
+        var count=data.Data.length;
         var startItem=data.Data[start];
+        if (end>=count) end=count-1;
         var endItem=data.Data[end];
 
         JSConsole.Chart.Log('[MinuteChartContainer::UpdateSelectRect]',startItem,endItem);
@@ -50082,6 +50085,7 @@ function MinuteChartContainer(uielement)
 
         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);
@@ -50100,6 +50104,9 @@ function MinuteChartContainer(uielement)
             selectData.End=end;
         }
 
+        var count=data.Data.length;
+        if (selectData.End>=count) selectData.End=count-1;
+
         return true;
     }
 

diff --git a/vuehqchart/src/jscommon/umychart.js b/vuehqchart/src/jscommon/umychart.js
@@ -43550,7 +43550,10 @@ function MinuteChartContainer(uielement)
         if (!paint) return;
 
         var data=this.SourceData;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return;
+        var count=data.Data.length;
         var startItem=data.Data[start];
+        if (end>=count) end=count-1;
         var endItem=data.Data[end];
 
         JSConsole.Chart.Log('[MinuteChartContainer::UpdateSelectRect]',startItem,endItem);
@@ -46116,6 +46119,7 @@ function MinuteChartContainer(uielement)
 
         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);
@@ -46134,6 +46138,9 @@ function MinuteChartContainer(uielement)
             selectData.End=end;
         }
 
+        var count=data.Data.length;
+        if (selectData.End>=count) selectData.End=count-1;
+
         return true;
     }
 

diff --git a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js
@@ -47560,7 +47560,10 @@ function MinuteChartContainer(uielement)
         if (!paint) return;
 
         var data=this.SourceData;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return;
+        var count=data.Data.length;
         var startItem=data.Data[start];
+        if (end>=count) end=count-1;
         var endItem=data.Data[end];
 
         JSConsole.Chart.Log('[MinuteChartContainer::UpdateSelectRect]',startItem,endItem);
@@ -50126,6 +50129,7 @@ function MinuteChartContainer(uielement)
 
         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);
@@ -50144,6 +50148,9 @@ function MinuteChartContainer(uielement)
             selectData.End=end;
         }
 
+        var count=data.Data.length;
+        if (selectData.End>=count) selectData.End=count-1;
+
         return true;
     }
 

diff --git a/webhqchart.demo/jscommon/umychart.js b/webhqchart.demo/jscommon/umychart.js
@@ -43550,7 +43550,10 @@ function MinuteChartContainer(uielement)
         if (!paint) return;
 
         var data=this.SourceData;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return;
+        var count=data.Data.length;
         var startItem=data.Data[start];
+        if (end>=count) end=count-1;
         var endItem=data.Data[end];
 
         JSConsole.Chart.Log('[MinuteChartContainer::UpdateSelectRect]',startItem,endItem);
@@ -46116,6 +46119,7 @@ function MinuteChartContainer(uielement)
 
         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);
@@ -46134,6 +46138,9 @@ function MinuteChartContainer(uielement)
             selectData.End=end;
         }
 
+        var count=data.Data.length;
+        if (selectData.End>=count) selectData.End=count-1;
+
         return true;
     }
 

diff --git a/webhqchart/umychart.js b/webhqchart/umychart.js
@@ -43550,7 +43550,10 @@ function MinuteChartContainer(uielement)
         if (!paint) return;
 
         var data=this.SourceData;
+        if (!data || !IFrameSplitOperator.IsNonEmptyArray(data.Data)) return;
+        var count=data.Data.length;
         var startItem=data.Data[start];
+        if (end>=count) end=count-1;
         var endItem=data.Data[end];
 
         JSConsole.Chart.Log('[MinuteChartContainer::UpdateSelectRect]',startItem,endItem);
@@ -46116,6 +46119,7 @@ function MinuteChartContainer(uielement)
 
         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);
@@ -46134,6 +46138,9 @@ function MinuteChartContainer(uielement)
             selectData.End=end;
         }
 
+        var count=data.Data.length;
+        if (selectData.End>=count) selectData.End=count-1;
+
         return true;
     }