hqchart 1.1.13288 → 1.1.13290

package/lib/umychart.vue.js

@@ -8239,8 +8239,8 @@ this.GetSelectRectData=function(selectData){if(Math.abs(selectData.XStart-select
 {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);//选中画图工具事件
 if(event){var sendData={PreventDefault:false};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}this.CursorIndex=null;this.LastPoint.X=0;this.LastPoint.Y=0;this.GlobalOption.IsDisplayLatest=true;this.DrawDynamicInfo();};this.TryClickIndexTitle=function(x,y){for(var i=0;i<this.TitlePaint.length;++i){var item=this.TitlePaint[i];if(!item.IsClickTitle)continue;if(!item.IsClickTitle(x,y))continue;var data={Point:{X:x,Y:y},Title:item.Title,FrameID:item.Frame.Identify};JSConsole.Chart.Log('[MinuteChartContainer::TryClickIndexTitle] click title ',data);var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEXTITLE);if(event&&event.Callback)event.Callback(event,data,this);return true;}return false;};this.ClearSelectedXBorder=function(){if(!this.GlobalOption||!this.GlobalOption.SelectedXBorder)return;var item=this.GlobalOption.SelectedXBorder;item.Date=null;};this.DrawSelectedXBorder=function(){if(this.DayCount<=1)return null;if(this.Frame.IsHScreen===true)return null;if(!this.GlobalOption||!this.GlobalOption.SelectedXBorder)return;var item=this.GlobalOption.SelectedXBorder;if(!IFrameSplitOperator.IsPlusNumber(item.Mode))return;if(!IFrameSplitOperator.IsPlusNumber(item.Date))return;if(!IFrameSplitOperator.IsNonEmptyArray(this.DayData))return;var rtSelected=null;var dayIndex=item.DayIndex;var border=this.Frame.ChartBorder.GetBorder();var rtClient={Left:border.Left,Top:border.Top,Right:border.Right,Bottom:border.Bottom};rtClient.Width=rtClient.Right-rtClient.Left;var mainFrame=this.Frame.SubFrame[0].Frame;//主图框架
-var xPointCount=mainFrame.XPointCount;var minuteCount=mainFrame.MinuteCount;var lDayCount=xPointCount/minuteCount;var dayWidth=rtClient.Width/lDayCount;if(border.DayBorder){}else{var dayIndex=-1;for(var i=0;i<this.DayData.length;++i){var dayItem=this.DayData[i];if(dayItem.Date==item.Date){dayIndex=this.DayData.length-1-i;break;}}if(dayIndex<0)return;rtSelected={Left:border.Left+dayIndex*dayWidth,Width:dayWidth,Top:border.Bottom,Bottom:border.ChartHeight};rtSelected.Right=rtSelected.Left+rtSelected.Width;rtSelected.Height=rtSelected.Bottom-rtSelected.Top;}mainFrame.Canvas.strokeStyle=g_JSChartResource.SelFrameBorderColor;mainFrame.Canvas.strokeRect(ToFixedPoint(rtSelected.Left),ToFixedPoint(rtSelected.Top),ToFixedRect(rtSelected.Width),ToFixedRect(rtSelected.Height)-1);};this.PtInMulitDayMinute=function(x,y){if(this.DayCount<=1)return null;if(this.Frame.IsHScreen===true)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.DayData))return null;var border=this.Frame.ChartBorder.GetBorder();var rtClient={Left:border.Left,Top:border.Top,Right:border.Right,Bottom:border.Bottom};rtClient.Width=rtClient.Right-rtClient.Left;if(!(x>rtClient.Left&&x<rtClient.Right&&y>rtClient.Top&&y<rtClient.Bottom))return null;//不在窗口里面
-if(border.DayBorder){}else{var mainFrame=this.Frame.SubFrame[0].Frame;//主图框架
+var xPointCount=mainFrame.XPointCount;var minuteCount=mainFrame.MinuteCount;var lDayCount=xPointCount/minuteCount;var dayWidth=rtClient.Width/lDayCount;if(border.DayBorder){var dayIndex=-1;for(var i=0;i<this.DayData.length;++i){var dayItem=this.DayData[i];if(dayItem.Date==item.Date){dayIndex=this.DayData.length-1-i;break;}}if(dayIndex<0)return;var item=border.DayBorder[dayIndex];if(!item)return;rtSelected={Left:item.LeftEx,Right:item.RightEx,Top:border.Bottom,Bottom:border.ChartHeight};rtSelected.Width=rtSelected.Right-rtSelected.Left;rtSelected.Height=rtSelected.Bottom-rtSelected.Top;}else{var dayIndex=-1;for(var i=0;i<this.DayData.length;++i){var dayItem=this.DayData[i];if(dayItem.Date==item.Date){dayIndex=this.DayData.length-1-i;break;}}if(dayIndex<0)return;rtSelected={Left:border.Left+dayIndex*dayWidth,Width:dayWidth,Top:border.Bottom,Bottom:border.ChartHeight};rtSelected.Right=rtSelected.Left+rtSelected.Width;rtSelected.Height=rtSelected.Bottom-rtSelected.Top;}mainFrame.Canvas.strokeStyle=g_JSChartResource.SelFrameBorderColor;mainFrame.Canvas.strokeRect(ToFixedPoint(rtSelected.Left),ToFixedPoint(rtSelected.Top),ToFixedRect(rtSelected.Width),ToFixedRect(rtSelected.Height)-1);};this.PtInMulitDayMinute=function(x,y){if(this.DayCount<=1)return null;if(this.Frame.IsHScreen===true)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.DayData))return null;var border=this.Frame.ChartBorder.GetBorder();var rtClient={Left:border.Left,Top:border.Top,Right:border.Right,Bottom:border.Bottom};rtClient.Width=rtClient.Right-rtClient.Left;if(!(x>rtClient.Left&&x<rtClient.Right&&y>rtClient.Top&&y<rtClient.Bottom))return null;//不在窗口里面
+if(border.DayBorder){for(var i=0;i<border.DayBorder.length;++i){var item=border.DayBorder[i];var rtDay={Left:item.LeftEx,Right:item.RightEx};if(x>=rtDay.Left&&x<=rtDay.Right){var dayItem=this.DayData[this.DayData.length-1-i];if(!dayItem)return null;return dayItem.Date;}}}else{var mainFrame=this.Frame.SubFrame[0].Frame;//主图框架
 var xPointCount=mainFrame.XPointCount;var minuteCount=mainFrame.MinuteCount;var lDayCount=xPointCount/minuteCount;var dayWidth=rtClient.Width/lDayCount;var rtDay={Left:rtClient.Left,Right:dayWidth+rtClient.Left};for(var i=0;i<lDayCount;++i){if(x>=rtDay.Left&&x<=rtDay.Right){var dayItem=this.DayData[this.DayData.length-1-i];if(!dayItem)return null;return dayItem.Date;}rtDay.Left+=dayWidth;rtDay.Right+=dayWidth;}}return null;};}//盘前数据
 MinuteChartContainer.JsonDataToBeforeOpenData=function(data){var symbol=data.stock[0].symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var yClose=data.stock[0].yclose;var preClose=data.stock[0].yclose;//前一个数据价格
 var stockData=data.stock[0];var date=stockData.date;//日期
@@ -13231,7 +13231,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.13287";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.13289";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.13288",
+  "version": "1.1.13290",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -80429,7 +80429,25 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (border.DayBorder)
         {
+            var dayIndex=-1;
+            for(var i=0;i<this.DayData.length;++i)
+            {
+                var dayItem=this.DayData[i];
+                if (dayItem.Date==item.Date)
+                {
+                    dayIndex=this.DayData.length-1-i;
+                    break;
+                }
+            }
+
+            if (dayIndex<0) return;
 
+            var item=border.DayBorder[dayIndex];
+            if (!item) return;
+
+            rtSelected={ Left:item.LeftEx, Right:item.RightEx, Top:border.Bottom, Bottom:border.ChartHeight };
+            rtSelected.Width=rtSelected.Right-rtSelected.Left;
+            rtSelected.Height=rtSelected.Bottom-rtSelected.Top;
         }
         else
         {
@@ -80469,7 +80487,18 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (border.DayBorder)
         {
+            for(var i=0;i<border.DayBorder.length;++i)
+            {
+                var item=border.DayBorder[i];
+                var rtDay={ Left:item.LeftEx, Right:item.RightEx };
+                if (x>=rtDay.Left && x<=rtDay.Right)
+                {
+                    var dayItem=this.DayData[this.DayData.length-1-i];
+                    if (!dayItem) return null;
 
+                    return dayItem.Date;
+                }
+            }
         }
         else
         {

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

@@ -84321,7 +84321,25 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (border.DayBorder)
         {
+            var dayIndex=-1;
+            for(var i=0;i<this.DayData.length;++i)
+            {
+                var dayItem=this.DayData[i];
+                if (dayItem.Date==item.Date)
+                {
+                    dayIndex=this.DayData.length-1-i;
+                    break;
+                }
+            }
+
+            if (dayIndex<0) return;
 
+            var item=border.DayBorder[dayIndex];
+            if (!item) return;
+
+            rtSelected={ Left:item.LeftEx, Right:item.RightEx, Top:border.Bottom, Bottom:border.ChartHeight };
+            rtSelected.Width=rtSelected.Right-rtSelected.Left;
+            rtSelected.Height=rtSelected.Bottom-rtSelected.Top;
         }
         else
         {
@@ -84361,7 +84379,18 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (border.DayBorder)
         {
+            for(var i=0;i<border.DayBorder.length;++i)
+            {
+                var item=border.DayBorder[i];
+                var rtDay={ Left:item.LeftEx, Right:item.RightEx };
+                if (x>=rtDay.Left && x<=rtDay.Right)
+                {
+                    var dayItem=this.DayData[this.DayData.length-1-i];
+                    if (!dayItem) return null;
 
+                    return dayItem.Date;
+                }
+            }
         }
         else
         {
@@ -132355,7 +132384,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13287";
+var HQCHART_VERSION="1.1.13289";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -84365,7 +84365,25 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (border.DayBorder)
         {
+            var dayIndex=-1;
+            for(var i=0;i<this.DayData.length;++i)
+            {
+                var dayItem=this.DayData[i];
+                if (dayItem.Date==item.Date)
+                {
+                    dayIndex=this.DayData.length-1-i;
+                    break;
+                }
+            }
+
+            if (dayIndex<0) return;
 
+            var item=border.DayBorder[dayIndex];
+            if (!item) return;
+
+            rtSelected={ Left:item.LeftEx, Right:item.RightEx, Top:border.Bottom, Bottom:border.ChartHeight };
+            rtSelected.Width=rtSelected.Right-rtSelected.Left;
+            rtSelected.Height=rtSelected.Bottom-rtSelected.Top;
         }
         else
         {
@@ -84405,7 +84423,18 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (border.DayBorder)
         {
+            for(var i=0;i<border.DayBorder.length;++i)
+            {
+                var item=border.DayBorder[i];
+                var rtDay={ Left:item.LeftEx, Right:item.RightEx };
+                if (x>=rtDay.Left && x<=rtDay.Right)
+                {
+                    var dayItem=this.DayData[this.DayData.length-1-i];
+                    if (!dayItem) return null;
 
+                    return dayItem.Date;
+                }
+            }
         }
         else
         {
@@ -135822,7 +135851,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13287";
+var HQCHART_VERSION="1.1.13289";
 
 function PrintHQChartVersion()
 {