hqchart 1.1.12717 → 1.1.12723

package/lib/umychart.vue.js

@@ -4083,7 +4083,9 @@ var drawCount=0;var pointCount=0;this.Canvas.save();if(IFrameSplitOperator.IsPlu
 {if(isHScreen){this.Canvas.lineTo(left,x);this.Canvas.lineTo(left,ptFirst.X);this.SetFillStyle(this.AreaColor,this.ChartBorder.GetRightEx(),bottom,this.ChartBorder.GetLeftEx(),bottom);}else{this.Canvas.lineTo(x,bottom);this.Canvas.lineTo(ptFirst.X,bottom);this.SetFillStyle(this.AreaColor,left,this.ChartBorder.GetTopEx(),left,bottom);}this.Canvas.fill();}pointCount=0;drawCount=0;}}if(drawCount>0){if(drawCount==1)//如果线段只有1个点 线段无法画出来 直接画点
 {this.Canvas.beginPath();if(isHScreen)this.Canvas.arc(ptFirst.Y,ptFirst.X,1,0,360,false);else this.Canvas.arc(ptFirst.X,ptFirst.Y,1,0,360,false);this.Canvas.closePath();this.Canvas.fillStyle=this.Color;this.Canvas.fill();}else{this.Canvas.stroke();if(this.IsDrawArea)//画面积
 {if(isHScreen){this.Canvas.lineTo(left,x);this.Canvas.lineTo(left,ptFirst.X);this.SetFillStyle(this.AreaColor,this.ChartBorder.GetRightEx(),bottom,this.ChartBorder.GetLeftEx(),bottom);}else{this.Canvas.lineTo(x,bottom);this.Canvas.lineTo(ptFirst.X,bottom);this.SetFillStyle(this.AreaColor,left,this.ChartBorder.GetTopEx(),left,bottom);}this.Canvas.fill();}}}this.Canvas.restore();this.DrawColorLine();this.DrawAfterClose();//收盘集合竞价
-this.DrawMultiDayAfterClose();if(this.GetEventCallback){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_MINUTE_LAST_POINT);if(event){var data={LastPoint:{X:this.LastPoint.X,Y:this.LastPoint.Y},Price:this.LastPoint.Price,Data:this.LastPoint.Data};event.Callback(event,data,this);}}};//画领先指标
+this.DrawMultiDayAfterClose();if(this.GetEventCallback){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_MINUTE_LAST_POINT);if(event){var pixelRatio=GetDevicePixelRatio();var data={InterLastPoint:{X:this.LastPoint.X,Y:this.LastPoint.Y},//内部点 给画布用
+LastPoint:{X:this.LastPoint.X/pixelRatio,Y:this.LastPoint.Y/pixelRatio},//外部点 给DOM用
+Price:this.LastPoint.Price,Data:this.LastPoint.Data,PixelRatio:pixelRatio};event.Callback(event,data,this);}}};//画领先指标
 this.DrawLead=function(){if(!this.LeadData)return;var isHScreen=this.ChartFrame.IsHScreen===true;//if (isHScreen) return;
 //var dataWidth=this.ChartFrame.DataWidth;
 //var distanceWidth=this.ChartFrame.DistanceWidth;
@@ -5326,7 +5328,7 @@ if((this.ShowTextMode.Bottom==1||this.ShowTextMode.Bottom==2||this.ShowTextMode.
 var yCenter=bottom+2+this.TextHeight/2;var yTop=bottom+2;if(this.ShowTextMode.Bottom==2){yCenter=bottom-this.TextHeight/2-2;yTop=bottom-this.TextHeight-2;}else if(this.ShowTextMode.Bottom==10){var frame=this.Frame.SubFrame[0].Frame;if(frame.GetCorssCursorTop){var value=frame.GetCorssCursorTop();if(IFrameSplitOperator.IsNumber(value)){yCenter=value+this.TextHeight/2;yTop=value;}}}//JSConsole.Chart.Log('[ChartCorssCursor::Draw] ',yCenter);
 if(x-textWidth/2<3)//左边位置不够了, 顶着左边画
 {this.DrawTextBGRect(x-1,yTop,textWidth,this.TextHeight);this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=this.TextColor;this.Canvas.fillText(text,x+1,yCenter,textWidth);}else if(x+textWidth/2>=right){this.DrawTextBGRect(right-textWidth,yTop,textWidth,this.TextHeight);this.Canvas.textAlign="right";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=this.TextColor;this.Canvas.fillText(text,right-2,yCenter,textWidth);}else{this.DrawTextBGRect(x-textWidth/2,yTop,textWidth,this.TextHeight);this.Canvas.textAlign="center";this.Canvas.textBaseline="middle";this.Canvas.fillStyle=this.TextColor;this.Canvas.fillText(text,x,yCenter,textWidth);}}//子坐标Y轴
-if(yValueExtend.FrameID>=0){var frame=this.Frame.SubFrame[yValueExtend.FrameID];var overlayLeft=right;this.Canvas.font=this.Font;for(var i=0;i<frame.OverlayIndex.length;++i){var item=frame.OverlayIndex[i];if(item.Frame.IsShow===false)continue;overlayLeft=item.Frame.GetXHorizontal();//if (overlayLeft+30>chartRight) break;
+if(yValueExtend.FrameID>=0){var frame=this.Frame.SubFrame[yValueExtend.FrameID];var overlayLeft=right;this.Canvas.font=this.Font;for(var i=0;i<frame.OverlayIndex.length;++i){var item=frame.OverlayIndex[i];if(item.Frame.IsShow===false)continue;if(!item.Frame.GetXHorizontal)continue;overlayLeft=item.Frame.GetXHorizontal();//if (overlayLeft+30>chartRight) break;
 var yValue=item.Frame.GetYData(y);var text=IFrameSplitOperator.FormatValueString(yValue,2);var textWidth=this.Canvas.measureText(text).width+4;//前后各空2个像素
 /*
                 for(var j=2;j>=0;--j)
@@ -12893,7 +12895,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12715";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.12722";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

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.12717",
+  "version": "1.1.12723",
   "description": "stock chart",
   "main": "lib/main.js",
   "scripts": {

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

@@ -36082,7 +36082,14 @@ function ChartMinutePriceLine()
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_MINUTE_LAST_POINT);
             if (event)
             {
-                var data={ LastPoint:{X:this.LastPoint.X, Y:this.LastPoint.Y}, Price:this.LastPoint.Price, Data:this.LastPoint.Data };
+                var pixelRatio=GetDevicePixelRatio();
+                var data=
+                { 
+                    InterLastPoint:{X:this.LastPoint.X, Y:this.LastPoint.Y},    //内部点 给画布用
+                    LastPoint:{X:this.LastPoint.X/pixelRatio, Y:this.LastPoint.Y/pixelRatio},   //外部点 给DOM用
+                    Price:this.LastPoint.Price, Data:this.LastPoint.Data,
+                    PixelRatio:pixelRatio,
+                };
                 event.Callback(event,data,this);
             }
         }
@@ -50870,6 +50877,7 @@ function ChartCorssCursor()
             {
                 var item=frame.OverlayIndex[i];
                 if (item.Frame.IsShow===false) continue;
+                if (!item.Frame.GetXHorizontal) continue;
 
                 overlayLeft=item.Frame.GetXHorizontal();
 
@@ -130951,7 +130959,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12715";
+var HQCHART_VERSION="1.1.12722";
 
 function PrintHQChartVersion()
 {

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

@@ -36126,7 +36126,14 @@ function ChartMinutePriceLine()
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAW_MINUTE_LAST_POINT);
             if (event)
             {
-                var data={ LastPoint:{X:this.LastPoint.X, Y:this.LastPoint.Y}, Price:this.LastPoint.Price, Data:this.LastPoint.Data };
+                var pixelRatio=GetDevicePixelRatio();
+                var data=
+                { 
+                    InterLastPoint:{X:this.LastPoint.X, Y:this.LastPoint.Y},    //内部点 给画布用
+                    LastPoint:{X:this.LastPoint.X/pixelRatio, Y:this.LastPoint.Y/pixelRatio},   //外部点 给DOM用
+                    Price:this.LastPoint.Price, Data:this.LastPoint.Data,
+                    PixelRatio:pixelRatio,
+                };
                 event.Callback(event,data,this);
             }
         }
@@ -50914,6 +50921,7 @@ function ChartCorssCursor()
             {
                 var item=frame.OverlayIndex[i];
                 if (item.Frame.IsShow===false) continue;
+                if (!item.Frame.GetXHorizontal) continue;
 
                 overlayLeft=item.Frame.GetXHorizontal();
 
@@ -131109,7 +131117,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12715";
+var HQCHART_VERSION="1.1.12722";
 
 function PrintHQChartVersion()
 {