hqchart 1.1.12570 → 1.1.12572

package/lib/umychart.vue.js

@@ -2430,8 +2430,8 @@ for(var i=0;i<this.CustomToolbar.length;++i){var item=this.CustomToolbar[i];if(i
 }}return aryLeftButton;};this.DrawFrame=function(){if(!this.IsMinSize){this.SplitXYCoordinate();if(this.SizeChange==true){this.CalculateDataWidth();if(this.Logarithmic)this.SplitLogarithmicXYCoordinate();}if(this.BeforeDrawXYCallback)this.BeforeDrawXYCallback(this);this.DrawTitleBG();this.DrawHorizontal();this.DrawVertical();}if(this.SizeChange==true||this.ReDrawToolbar==true){this.DrawToolbar();//大小变动才画工具条
 this.ReDrawToolbar=false;}};//isLimit 是否限制在当前屏坐标下
 this.GetXFromIndex=function(index,isLimit){if(isLimit===false){if(index>=0){var offset=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin+this.DistanceWidth/2+this.DataWidth/2;for(var i=1;i<=index;++i){offset+=this.DistanceWidth+this.DataWidth;}}else{var offset=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin-(this.DistanceWidth/2+this.DataWidth+this.DistanceWidth);var absIndex=Math.abs(index);for(var i=1;i<absIndex;++i){offset-=this.DistanceWidth+this.DataWidth;}}}else{if(index<0)index=0;if(index>this.xPointCount-1)index=this.xPointCount-1;var offset=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin+this.DistanceWidth/2+this.DataWidth/2;for(var i=1;i<=index;++i){offset+=this.DistanceWidth+this.DataWidth;}}return offset;};//X坐标转x轴数值 isLimit=是否限制在当前屏坐标下
-this.GetXData=function(x,isLimit){var distanceWidth=this.DistanceWidth;var dataWidth=this.DataWidth;var left=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin;if(isLimit==false){if(x<this.ChartBorder.GetLeft()){var index=-1;var xPoint=this.ChartBorder.GetLeft()-(distanceWidth/2+dataWidth+distanceWidth);while(index>-10000){if(xPoint<=x)break;xPoint-=dataWidth+distanceWidth;--index;}return index;}else{var index=0;var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;while(index<10000)//自己算x的数值
-{if(xPoint>=x)break;xPoint+=dataWidth+distanceWidth;++index;}return index;}}else{if(x<=this.ChartBorder.GetLeft())return 0;if(x>=this.ChartBorder.GetRight())return this.XPointCount-1;var right=this.ChartBorder.GetRight()-g_JSChartResource.FrameRightMargin;var index=0;var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;while(xPoint<right&&index<10000&&index+1<this.XPointCount)//自己算x的数值
+this.GetXData=function(x,isLimit){var distanceWidth=this.DistanceWidth;var dataWidth=this.DataWidth;var left=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin;var maxDataCount=10000*50;if(isLimit==false){if(x<this.ChartBorder.GetLeft()){var index=-1;var xPoint=this.ChartBorder.GetLeft()-(distanceWidth/2+dataWidth+distanceWidth);while(index>-maxDataCount){if(xPoint<=x)break;xPoint-=dataWidth+distanceWidth;--index;}return index;}else{var index=0;var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;while(index<maxDataCount)//自己算x的数值
+{if(xPoint>=x)break;xPoint+=dataWidth+distanceWidth;++index;}return index;}}else{if(x<=this.ChartBorder.GetLeft())return 0;if(x>=this.ChartBorder.GetRight())return this.XPointCount-1;var right=this.ChartBorder.GetRight()-g_JSChartResource.FrameRightMargin;var index=0;var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;while(xPoint<right&&index<maxDataCount&&index+1<this.XPointCount)//自己算x的数值
 {if(xPoint>=x)break;xPoint+=dataWidth+distanceWidth;++index;}//var test=(x-this.ChartBorder.GetLeft())*(this.XPointCount*1.0/this.ChartBorder.GetWidth());
 return index;}};//计算数据宽度
 this.CalculateDataWidth=function(){if(this.XPointCount<2)return;//JSConsole.Chart.Log(`[KLineFrame::CalculateDataWidth] ZoomIndex=${this.ZoomIndex}, XPointCount=${this.XPointCount}, DataWidth=${this.DataWidth}, DistanceWidth=${this.DistanceWidth}`);
@@ -2541,7 +2541,7 @@ this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(x));this.Canvas.lin
 this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(x));this.Canvas.lineTo(right,ToFixedPoint(x));this.Canvas.stroke();this.Canvas.setLineDash([]);}else//实线
 {this.Canvas.beginPath();this.Canvas.moveTo(left,ToFixedPoint(x));this.Canvas.lineTo(right,ToFixedPoint(x));this.Canvas.stroke();}}if(this.VerticalInfo[i].Message[0]!=null){if(this.VerticalInfo[i].Font!=null)this.Canvas.font=this.VerticalInfo[i].Font;this.Canvas.fillStyle=this.VerticalInfo[i].TextColor;var testWidth=this.Canvas.measureText(this.VerticalInfo[i].Message[0]).width;if(x<testWidth/2){this.Canvas.textAlign="left";this.Canvas.textBaseline="top";}else{this.Canvas.textAlign="center";this.Canvas.textBaseline="top";}var xText=left,yText=x;this.Canvas.save();this.Canvas.translate(xText,yText);this.Canvas.rotate(90*Math.PI/180);this.Canvas.fillText(this.VerticalInfo[i].Message[0],0,this.XBottomOffset);this.Canvas.restore();}xPrev=x;}};//Y坐标转y轴数值
 this.GetYData=function(x,isLimit){var border=this.ChartBorder.GetHScreenBorder();if(isLimit===false){var width=border.RightEx-border.LeftEx;return(x-border.LeftEx)/width*(this.HorizontalMax-this.HorizontalMin)+this.HorizontalMin;}else{if(x<border.LeftEx)return this.HorizontalMin;if(x>border.RightEx)return this.HorizontalMax;var width=border.RightEx-border.LeftEx;return(x-border.LeftEx)/width*(this.HorizontalMax-this.HorizontalMin)+this.HorizontalMin;}};//X坐标转x轴数值
-this.GetXData=function(y,isLimit){var border=this.ChartBorder.GetHScreenBorder();var left=border.TopEx+g_JSChartResource.FrameLeftMargin;var right=border.BottomEx;var distanceWidth=this.DistanceWidth;var dataWidth=this.DataWidth;var maxDataCount=10000*50;if(isLimit==false){if(y<left){var index=-1;var xPoint=left-(distanceWidth/2+dataWidth+distanceWidth);while(index>-maxDataCount){if(xPoint<=y)break;xPoint-=dataWidth+distanceWidth;--index;}return index;}else{var index=0;var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;while(index<maxDataCount)//自己算x的数值
+this.GetXData=function(y,isLimit){var border=this.ChartBorder.GetHScreenBorder();var left=border.TopEx+g_JSChartResource.FrameLeftMargin;var right=border.BottomEx;var distanceWidth=this.DistanceWidth;var dataWidth=this.DataWidth;var maxDataCount=10000*10;if(isLimit==false){if(y<left){var index=-1;var xPoint=left-(distanceWidth/2+dataWidth+distanceWidth);while(index>-maxDataCount){if(xPoint<=y)break;xPoint-=dataWidth+distanceWidth;--index;}return index;}else{var index=0;var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;while(index<maxDataCount)//自己算x的数值
 {if(xPoint>=y)break;xPoint+=dataWidth+distanceWidth;++index;}return index;}}else{if(y<=border.TopEx)return 0;if(y>=border.BottomEx)return this.XPointCount-1;var index=0;var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;while(xPoint<right&&index<maxDataCount&&index+1<this.XPointCount)//自己算x的数值
 {if(xPoint>y)break;xPoint+=dataWidth+distanceWidth;++index;}return index;}//return (y-this.ChartBorder.GetTop())*(this.XPointCount*1.0/this.ChartBorder.GetHeight());
 };this.DrawBottons=function(){};//计算数据宽度
@@ -12657,7 +12657,7 @@ function HQChartScriptWorker(){this.Create=function(){var _this60=this;addEventL
 hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,Stock:{Symbol:message.Symbol},Request:{MaxDataCount:500,MaxMinuteDayCount:5},Period:message.Period,Right:message.Right,Data:hisData};if(IFrameSplitOperator.IsNumber(message.HQDataType))stockObj.HQDataType=message.HQDataType;indexConsole.ExecuteScript(stockObj);};this.OnRecvMessage=function(message){var data=message.data;if(!data)return;if(data.ID==JSCHART_WORKER_MESSAGE_ID.EXECUTE_SCRIPT){if(!IFrameSplitOperator.IsNonEmptyArray(data.AryIndex))return;for(var i=0;i<data.AryIndex.length;++i){var item=data.AryIndex[i];this.ExecuteScript(item,data);}}};this.OnExecuteFinish=function(data,indexInfo,jsExectute){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT};postMessage(message);};this.OnExecuteError=function(error,indexInfo){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12569";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.12571";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.12570",
+  "version": "1.1.12572",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -13563,14 +13563,14 @@ function KLineFrame()
         var distanceWidth=this.DistanceWidth;
         var dataWidth=this.DataWidth;
         var left=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin;
-
+        var maxDataCount=10000*50;
         if (isLimit==false)
         {
             if (x<this.ChartBorder.GetLeft())
             {
                 var index=-1;
                 var xPoint=this.ChartBorder.GetLeft()-(distanceWidth/2+dataWidth+distanceWidth);
-                while(index>-10000)
+                while(index>-maxDataCount)
                 {
                     if (xPoint<=x) 
                         break;
@@ -13584,7 +13584,7 @@ function KLineFrame()
             {
                 var index=0;
                 var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
-                while(index<10000)  //自己算x的数值
+                while(index<maxDataCount)  //自己算x的数值
                 {
                     if (xPoint>=x) break;
                     xPoint+=(dataWidth+distanceWidth);
@@ -13602,7 +13602,7 @@ function KLineFrame()
             var right=this.ChartBorder.GetRight()-g_JSChartResource.FrameRightMargin;
             var index=0;
             var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
-            while(xPoint<right && index<10000 && index+1<this.XPointCount)  //自己算x的数值
+            while(xPoint<right && index<maxDataCount && index+1<this.XPointCount)  //自己算x的数值
             {
                 if (xPoint>=x) break;
                 xPoint+=(dataWidth+distanceWidth);
@@ -15410,7 +15410,7 @@ function KLineHScreenFrame()
         var right=border.BottomEx;
         var distanceWidth=this.DistanceWidth;
         var dataWidth=this.DataWidth;
-        var maxDataCount=10000*50;
+        var maxDataCount=10000*10;
         if (isLimit==false)
         {
             if (y<left)

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

@@ -17643,14 +17643,14 @@ function KLineFrame()
         var distanceWidth=this.DistanceWidth;
         var dataWidth=this.DataWidth;
         var left=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin;
-
+        var maxDataCount=10000*50;
         if (isLimit==false)
         {
             if (x<this.ChartBorder.GetLeft())
             {
                 var index=-1;
                 var xPoint=this.ChartBorder.GetLeft()-(distanceWidth/2+dataWidth+distanceWidth);
-                while(index>-10000)
+                while(index>-maxDataCount)
                 {
                     if (xPoint<=x) 
                         break;
@@ -17664,7 +17664,7 @@ function KLineFrame()
             {
                 var index=0;
                 var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
-                while(index<10000)  //自己算x的数值
+                while(index<maxDataCount)  //自己算x的数值
                 {
                     if (xPoint>=x) break;
                     xPoint+=(dataWidth+distanceWidth);
@@ -17682,7 +17682,7 @@ function KLineFrame()
             var right=this.ChartBorder.GetRight()-g_JSChartResource.FrameRightMargin;
             var index=0;
             var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
-            while(xPoint<right && index<10000 && index+1<this.XPointCount)  //自己算x的数值
+            while(xPoint<right && index<maxDataCount && index+1<this.XPointCount)  //自己算x的数值
             {
                 if (xPoint>=x) break;
                 xPoint+=(dataWidth+distanceWidth);
@@ -19490,7 +19490,7 @@ function KLineHScreenFrame()
         var right=border.BottomEx;
         var distanceWidth=this.DistanceWidth;
         var dataWidth=this.DataWidth;
-        var maxDataCount=10000*50;
+        var maxDataCount=10000*10;
         if (isLimit==false)
         {
             if (y<left)
@@ -129451,7 +129451,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12569";
+var HQCHART_VERSION="1.1.12571";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -17687,14 +17687,14 @@ function KLineFrame()
         var distanceWidth=this.DistanceWidth;
         var dataWidth=this.DataWidth;
         var left=this.ChartBorder.GetLeft()+g_JSChartResource.FrameLeftMargin;
-
+        var maxDataCount=10000*50;
         if (isLimit==false)
         {
             if (x<this.ChartBorder.GetLeft())
             {
                 var index=-1;
                 var xPoint=this.ChartBorder.GetLeft()-(distanceWidth/2+dataWidth+distanceWidth);
-                while(index>-10000)
+                while(index>-maxDataCount)
                 {
                     if (xPoint<=x) 
                         break;
@@ -17708,7 +17708,7 @@ function KLineFrame()
             {
                 var index=0;
                 var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
-                while(index<10000)  //自己算x的数值
+                while(index<maxDataCount)  //自己算x的数值
                 {
                     if (xPoint>=x) break;
                     xPoint+=(dataWidth+distanceWidth);
@@ -17726,7 +17726,7 @@ function KLineFrame()
             var right=this.ChartBorder.GetRight()-g_JSChartResource.FrameRightMargin;
             var index=0;
             var xPoint=left+distanceWidth/2+dataWidth+distanceWidth;
-            while(xPoint<right && index<10000 && index+1<this.XPointCount)  //自己算x的数值
+            while(xPoint<right && index<maxDataCount && index+1<this.XPointCount)  //自己算x的数值
             {
                 if (xPoint>=x) break;
                 xPoint+=(dataWidth+distanceWidth);
@@ -19534,7 +19534,7 @@ function KLineHScreenFrame()
         var right=border.BottomEx;
         var distanceWidth=this.DistanceWidth;
         var dataWidth=this.DataWidth;
-        var maxDataCount=10000*50;
+        var maxDataCount=10000*10;
         if (isLimit==false)
         {
             if (y<left)
@@ -129604,7 +129604,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12569";
+var HQCHART_VERSION="1.1.12571";
 
 function PrintHQChartVersion()
 {