hqchart 1.1.14457 → 1.1.14460

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (11) hide show
  1. package/lib/umychart.vue.js +15 -12
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.TReport.js +4 -4
  4. package/src/jscommon/umychart.deal.js +9 -1
  5. package/src/jscommon/umychart.js +47 -0
  6. package/src/jscommon/umychart.keyboard.js +4 -4
  7. package/src/jscommon/umychart.report.js +4 -4
  8. package/src/jscommon/umychart.scrollbar.js +4 -4
  9. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +69 -14
  10. package/src/jscommon/umychart.version.js +1 -1
  11. package/src/jscommon/umychart.vue/umychart.vue.js +73 -18
package/lib/umychart.vue.js CHANGED
@@ -8283,7 +8283,10 @@ var aryOverlaySymbol=[];//叠加的股票列表
8283
8283
  for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(item&&item.Symbol)aryOverlaySymbol.push(item.Symbol);}var bShowCorss=false;//十字光标十字线
8284
8284
  var bCorssDrawCloseLine=false;//十字光标只能画在走势图价格线上
8285
8285
  var bCorssDrawVaildTime=false;var bCorssDrawPoint=false;if(this.ChartCorssCursor){bShowCorss=this.ChartCorssCursor.IsShowCorss;bCorssDrawCloseLine=this.ChartCorssCursor.IsOnlyDrawMinute;bCorssDrawVaildTime=this.ChartCorssCursor.IsFixXLastTime;bCorssDrawPoint=this.ChartCorssCursor.CorssPointConfig.Enable;}var minItem=null;if(frameID>=0&&option&&IFrameSplitOperator.IsNumber(option.CursorIndex)){var kData=this.GetKData();if(kData&&IFrameSplitOperator.IsNonEmptyArray(kData.Data)){var dataIndex=kData.DataOffset+parseInt(option.CursorIndex.toFixed(0));if(dataIndex>=0&&dataIndex<kData.Data.length)minItem=kData.Data[dataIndex];}}var aryMenu=[{Name:"叠加品种",SubMenu:[{Name:"上证指数",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["000001.sh",!aryOverlaySymbol.includes("000001.sh")]},Checked:aryOverlaySymbol.includes("000001.sh")},{Name:"深证成指",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["399001.sz",!aryOverlaySymbol.includes("399001.sz")]},Checked:aryOverlaySymbol.includes("399001.sz")},{Name:"中小板指",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["399005.sz",!aryOverlaySymbol.includes("399005.sz")]},Checked:aryOverlaySymbol.includes("399005.sz")},{Name:"创业板指",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["399006.sz",!aryOverlaySymbol.includes("399006.sz")]},Checked:aryOverlaySymbol.includes("399006.sz")},{Name:"沪深300",Data:{ID:JSCHART_MENU_ID.CMD_OVERLAY_SYMBOL_ID,Args:["000300.sh",!aryOverlaySymbol.includes("000300.sh")]},Checked:aryOverlaySymbol.includes("000300.sh")}]},{Name:"多日分时图",SubMenu:[{Name:"当日分时图",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID,Args:[1]},Checked:this.DayCount==1},{Name:"最近2日",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID,Args:[2]},Checked:this.DayCount==2},{Name:"最近3日",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID,Args:[3]},Checked:this.DayCount==3},{Name:"最近4日",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID,Args:[4]},Checked:this.DayCount==4},{Name:"最近5日",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DAY_COUNT_ID,Args:[5]},Checked:this.DayCount==5},{Name:"基准线选择",SubMenu:[{Name:"最新昨收价",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_BASELINE_ID,Args:[0]},Checked:this.BaselineType===0},{Name:"多日前昨收价",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_BASELINE_ID,Args:[1]},Checked:this.BaselineType===1}]}]},{Name:"指标窗口个数",SubMenu:[{Name:"1个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[2]},Checked:3==windowCount},{Name:"2个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[3]},Checked:4==windowCount},{Name:"3个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[4]},Checked:5==windowCount},{Name:"4个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[5]},Checked:6==windowCount},{Name:"5个窗口",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_WINDOW_COUNT_ID,Args:[6]},Checked:7==windowCount}]},{Name:"指标切换",SubMenu:[{Name:"MACD",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"MACD"]}},{Name:"DMI",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"DMI"]}},{Name:"DMA",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"DMA"]}},{Name:"BRAR",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"BRAR"]}},{Name:"KDJ",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"KDJ"]}},{Name:"RSI",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"RSI"]}},{Name:"WR",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"WR"]}},{Name:"CCI",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"CCI"]}},{Name:"TRIX",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_INDEX_ID,Args:[frameID,"TRIX"]}}]},{Name:"区间选择",Data:{ID:JSCHART_MENU_ID.CMD_ENABLE_SELECT_RECT_ID,Args:[!this.EnableSelectRect]},Checked:this.EnableSelectRect},{Name:"十字光标",SubMenu:[{Name:"显示",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_CORSS_LINE_ID,Args:[!bShowCorss]},Checked:bShowCorss},{Name:"画在价格线上",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_ON_CLOSE_LINE_ID,Args:[!bCorssDrawCloseLine]},Checked:bCorssDrawCloseLine},{Name:"画在有效X轴上",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_ON_VAILD_TIME_ID,Args:[!bCorssDrawVaildTime]},Checked:bCorssDrawVaildTime},{Name:"画圆点",Data:{ID:JSCHART_MENU_ID.CMD_CORSS_POINT_ID,Args:[!bCorssDrawPoint]},Checked:bCorssDrawPoint}]},{Name:"其他设置",SubMenu:[{Name:"画图工具",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_DRAWTOOL_ID,Args:[]},Checked:this.IsShowDrawToolDialog()},{Name:JSPopMenu.SEPARATOR_LINE_NAME},{Name:"语言设置",SubMenu:[{Name:"中文",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID,Args:["CN"]},Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID},{Name:"英语",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID,Args:["EN"]},Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID},{Name:"繁体",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_LANGUAGE_ID,Args:["TC"]},Checked:this.LanguageID==JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID}]},{Name:"区间选择样式",SubMenu:[{Name:"样式1(默认)",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID,Args:[0]},Checked:0==this.ChartDragSelectRect.ShowMode},{Name:"样式2",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID,Args:[1]},Checked:1==this.ChartDragSelectRect.ShowMode},{Name:"样式3",Data:{ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID,Args:[2]},Checked:2==this.ChartDragSelectRect.ShowMode}]},{Name:"K线浮动框",SubMenu:[{Name:"禁用",Data:{ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE,Args:[{Enable:false}]},Checked:!this.DialogTooltip},{Name:"样式1",Data:{ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE,Args:[{Enable:true,Style:0}]},Checked:this.DialogTooltip&&this.DialogTooltip.Style===0},{Name:"样式2",Data:{ID:JSCHART_MENU_ID.CMD_DIALOG_TOOLTIP_ATTRIBUTE,Args:[{Enable:true,Style:1}]},Checked:this.DialogTooltip&&this.DialogTooltip.Style===1}]}]}];if(MARKET_SUFFIX_NAME.IsSHSZStockA(this.Symbol)){var item={Name:"集合竞价",Data:{ID:JSCHART_MENU_ID.CMD_SHOW_BEFORE_DATA_ID,Args:[!this.IsShowBeforeData]},Checked:this.IsShowBeforeData};aryMenu.splice(4,0,item);}for(var i=0;i<aryMenu.length;++i){var item=aryMenu[i];if(item.Name=="叠加品种")//删除菜单
8286
- {for(var j=0;j<item.SubMenu.length;++j){if(item.SubMenu[j].Checked){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"取消叠加",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_ALL_OVERLAY_SYMBOL_ID}});break;}}}else if(item.Name=="十字光标"){if(minItem){var bLocked=this.IsLockCorssCursor();if(bLocked)item.SubMenu.push({Name:"锁十字光标",Data:{ID:JSCHART_MENU_ID.CMD_UNLOCK_CROSSCURSOR},Checked:bLocked});else item.SubMenu.push({Name:"锁十字光标",Data:{ID:JSCHART_MENU_ID.CMD_LOCK_CROSSCURSOR,Args:[{KItem:{Date:minItem.Date,Time:minItem.Time},Draw:true}]},Checked:bLocked});}}}return aryMenu;};this.OnWheel=function(e){JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);};this.OnDoubleClick=function(x,y,e){JSConsole.Chart.Log("[MinuteChartContainer::OnDoubleClick]",e);if(this.EnableYDrag&&(this.EnableYDrag.Left||this.EnableYDrag.Right)&&this.Frame&&this.Frame.PtInFrameY){var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;var dragY=this.Frame.PtInFrameY(x,y);if(dragY&&dragY.Index>=0){this.CancelZoomUpDownFrameY(dragY);}}if(this.ClickChartTimer!=null){clearTimeout(this.ClickChartTimer);this.ClickChartTimer=null;}var selectedChart;//图形选中
8286
+ {for(var j=0;j<item.SubMenu.length;++j){if(item.SubMenu[j].Checked){item.SubMenu.push({Name:JSPopMenu.SEPARATOR_LINE_NAME});item.SubMenu.push({Name:"取消叠加",Data:{ID:JSCHART_MENU_ID.CMD_DELETE_ALL_OVERLAY_SYMBOL_ID}});break;}}}else if(item.Name=="十字光标"){if(minItem){var bLocked=this.IsLockCorssCursor();if(bLocked)item.SubMenu.push({Name:"锁十字光标",Data:{ID:JSCHART_MENU_ID.CMD_UNLOCK_CROSSCURSOR},Checked:bLocked});else item.SubMenu.push({Name:"锁十字光标",Data:{ID:JSCHART_MENU_ID.CMD_LOCK_CROSSCURSOR,Args:[{KItem:{Date:minItem.Date,Time:minItem.Time},Draw:true}]},Checked:bLocked});}}}return aryMenu;};this.OnWheel=function(e){JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;var isInClient=false;var rtClient={Left:this.Frame.ChartBorder.GetLeft(),Right:this.Frame.ChartBorder.GetRight(),Top:this.Frame.ChartBorder.GetTop(),Bottom:this.Frame.ChartBorder.GetBottom(),Width:this.Frame.ChartBorder.GetWidth(),Height:this.Frame.ChartBorder.GetHeight()};if(x>=rtClient.Left&&x<=rtClient.Right&&y>=rtClient.Top&&y<=rtClient.Bottom)isInClient=true;if(!this.OnWheel_ZoomUpDownFrameY(e,x,y))return;if(e.preventDefault)e.preventDefault();else e.returnValue=false;};//通过滚轴缩放Y轴
8287
+ this.OnWheel_ZoomUpDownFrameY=function(e,x,y){if(!this.EnableYDrag.Wheel)return false;var frameID=this.Frame.PtInFrame(x,y);if(frameID<0)return false;var frame=this.Frame.SubFrame[frameID].Frame;var splitOper=frame.YSplitOperator;if(!splitOper||!splitOper.FixedYMaxMin)return false;//Y轴缩放状态下才有效
8288
+ var wheelValue=e.wheelDelta;if(!IFrameSplitOperator.IsObjectExist(e.wheelDelta))wheelValue=e.deltaY*-0.01;var yMove=this.EnableYDrag.WheelYMove;if(wheelValue>0)yMove*=-1;var dragY={Position:0,Index:frameID,Right:false,Left:false};//只能两边缩放
8289
+ if(!this.Frame.OnZoomUpDownFrameY(dragY,yMove))return false;this.Frame.SetSizeChage(true);this.Draw();return true;};this.OnDoubleClick=function(x,y,e){JSConsole.Chart.Log("[MinuteChartContainer::OnDoubleClick]",e);if(this.EnableYDrag&&(this.EnableYDrag.Left||this.EnableYDrag.Right)&&this.Frame&&this.Frame.PtInFrameY){var pixelTatio=GetDevicePixelRatio();var x=(e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;var y=(e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;var dragY=this.Frame.PtInFrameY(x,y);if(dragY&&dragY.Index>=0){this.CancelZoomUpDownFrameY(dragY);}}if(this.ClickChartTimer!=null){clearTimeout(this.ClickChartTimer);this.ClickChartTimer=null;}var selectedChart;//图形选中
8287
8290
  if(this.SelectedChart.EnableSelected){selectedChart=this.PtInChart(x,y);}var dbClickInfo={SelectedChart:selectedChart};this.DBClickEvent(dbClickInfo,e);//没有图形选中,双击缩放窗口
8288
8291
  if(!selectedChart&&this.EnableZoomIndexWindow){var frameId=this.Frame.PtInFrame(x,y);JSConsole.Chart.Log("[MinuteChartContainer::OnDoubleClick] frameId",frameId);if(frameId>=this.Frame.ZoomStartWindowIndex){if(this.ZoomIndexWindow(frameId,{X:x,Y:y})){this.Frame.SetSizeChage(true);this.Draw();}}}};this.GetDataItem=function(pointInfo){if(!pointInfo)return null;if(!IFrameSplitOperator.IsNumber(pointInfo.Index))return null;if(!this.SourceData||!this.SourceData.Data)return null;var data=this.SourceData;var clientPos=pointInfo.ClientPos;if(clientPos==2||clientPos==3||clientPos>=200&&clientPos<=299||clientPos>=300&&clientPos<=399){if(!this.ChartCorssCursor||!this.ChartCorssCursor.CallAcutionXOperator)return null;var isHScreen=this.Frame.IsHScreen===true;var callAcutionXOper=this.ChartCorssCursor.CallAcutionXOperator;callAcutionXOper.Value=isHScreen?pointInfo.Point.Y:pointInfo.Point.X;callAcutionXOper.Point={X:pointInfo.Point.X,Y:pointInfo.Point.Y};callAcutionXOper.ClientPos=clientPos;if(clientPos==2){if(!this.BeforeOpenData)return null;}else if(clientPos==3){if(!this.AfterCloseData)return null;}else if(clientPos>=200&&clientPos<=299){if(!this.MultiDayBeforeOpenData||!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayBeforeOpenData))return;}else if(clientPos>=300&&tclientPos<=399){if(!this.MultiDayAfterCloseData||!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData))return;}if(callAcutionXOper.Operator()){var item=callAcutionXOper.Item;return{Type:clientPos,Item:item,Index:callAcutionXOper.DataIndex};}return null;}var index=parseInt(pointInfo.Index.toFixed(0));var dataIndex=index+data.DataOffset;if(dataIndex>=data.Data.length)return null;var item=data.Data[dataIndex];return{Type:clientPos,Item:item,Index:dataIndex};};this.UpdatePointByCursorIndex=function(){this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);var index=this.CursorIndex;index=parseInt(index.toFixed(0));var data=this.Frame.SourceData;if(data.DataOffset+index>=data.Data.length){return;}var item=data.Data[data.DataOffset+index];var close=null;if(item.Before)close=item.Before.Close;else close=item.Close;this.LastPoint.Y=this.Frame.GetYFromData(close);};//创建
8289
8292
  //windowCount 窗口个数
@@ -12364,7 +12367,7 @@ chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTat
12364
12367
  this.ChangeSymbol=function(symbol,option){if(this.JSChartContainer)this.JSChartContainer.ChangeSymbol(symbol,option);};this.SetColumn=function(aryColumn,option){if(this.JSChartContainer)this.JSChartContainer.SetColumn(aryColumn,option);};this.EnableFilter=function(bEnable,option)//启动|关闭筛选
12365
12368
  {if(this.JSChartContainer)this.JSChartContainer.EnableFilter(bEnable,option);};//事件回调
12366
12369
  this.AddEventCallback=function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.AddEventCallback=='function'){JSConsole.Chart.Log('[JSDealChart:AddEventCallback] obj=',obj);this.JSChartContainer.AddEventCallback(obj);}};//重新加载配置
12367
- this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSDealChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};}JSDealChart.Init=function(divElement){var jsChartControl=new JSDealChart(divElement);jsChartControl.OnSize();return jsChartControl;};function JSDealChartContainer(uielement){this.ClassName='JSDealChartContainer';this.Frame;//框架画法
12370
+ this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSDealChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestroy=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestroy=='function'){this.JSChartContainer.ChartDestroy();}};}JSDealChart.Init=function(divElement){var jsChartControl=new JSDealChart(divElement);jsChartControl.OnSize();return jsChartControl;};function JSDealChartContainer(uielement){this.ClassName='JSDealChartContainer';this.Frame;//框架画法
12368
12371
  this.ChartPaint=[];//图形画法
12369
12372
  this.ChartSplashPaint=null;//等待提示
12370
12373
  this.LoadDataSplashTitle="数据加载中";//下载数据提示信息
@@ -12379,7 +12382,7 @@ this.AutoUpdateTimer=null;this.AutoUpdateFrequency=15000;//更新频率
12379
12382
  this.LoadDataSplashTitle="数据加载中";//下载数据提示信息
12380
12383
  this.UIElement=uielement;this.LastPoint=new Point();//鼠标位置
12381
12384
  this.IsDestroy=false;//是否已经销毁了
12382
- this.ChartDestory=function()//销毁
12385
+ this.ChartDestroy=function()//销毁
12383
12386
  {this.IsDestroy=true;this.StopAutoUpdate();};this.EnableFilterData=false;//是否启动筛选
12384
12387
  //筛选数据
12385
12388
  this.FilterData=function(aryDeal){if(!this.EnableFilterData)return aryDeal;//过滤由外部处理
@@ -12509,7 +12512,7 @@ chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTat
12509
12512
  this.ChangeSymbol=function(symbol,option){if(this.JSChartContainer)this.JSChartContainer.ChangeSymbol(symbol,option);};this.SetColumn=function(aryColumn,option){if(this.JSChartContainer)this.JSChartContainer.SetColumn(aryColumn,option);};this.SetSelectedRow=function(option){if(this.JSChartContainer)this.JSChartContainer.SetSelectedRow(option);};this.EnableFilter=function(bEnable,option)//启动|关闭筛选
12510
12513
  {if(this.JSChartContainer)this.JSChartContainer.EnableFilter(bEnable,option);};//事件回调
12511
12514
  this.AddEventCallback=function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.AddEventCallback=='function'){JSConsole.Chart.Log('[JSReportChart:AddEventCallback] obj=',obj);this.JSChartContainer.AddEventCallback(obj);}};//重新加载配置
12512
- this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSReportChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestory=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestory=='function'){this.JSChartContainer.ChartDestory();}};this.Draw=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSReportChart:Draw] ');this.JSChartContainer.Draw();}};}JSReportChart.Init=function(divElement){var jsChartControl=new JSReportChart(divElement);jsChartControl.OnSize();return jsChartControl;};//自定义风格
12515
+ this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSReportChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestroy=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestroy=='function'){this.JSChartContainer.ChartDestroy();}};this.Draw=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSReportChart:Draw] ');this.JSChartContainer.Draw();}};}JSReportChart.Init=function(divElement){var jsChartControl=new JSReportChart(divElement);jsChartControl.OnSize();return jsChartControl;};//自定义风格
12513
12516
  JSReportChart.SetStyle=function(option){if(option)g_JSChartResource.SetStyle(option);};//获取颜色配置 (设置配必须啊在JSChart.Init()之前)
12514
12517
  JSReportChart.GetResource=function(){return g_JSChartResource;};function HQReportItem(){this.OriginalSymbol;//原始代码
12515
12518
  this.Symbol;this.Name;this.YClose;this.Open;this.Price;this.High;this.Low;this.Amount;this.Vol;this.Increase;//涨幅
@@ -12568,7 +12571,7 @@ this.JSPopMenu;//内置菜单
12568
12571
  this.IsShowRightMenu=true;//
12569
12572
  this.TooltipMinuteChart;//分时图
12570
12573
  //MouseOnStatus:{ RowIndex:行, ColumnIndex:列}
12571
- this.LastMouseStatus={MoveStatus:null,TooltipStatus:null,MouseOnStatus:null};this.ChartDestory=function()//销毁
12574
+ this.LastMouseStatus={MoveStatus:null,TooltipStatus:null,MouseOnStatus:null};this.ChartDestroy=function()//销毁
12572
12575
  {this.IsDestroy=true;this.StopAutoUpdate();this.DestroyMinuteChartTooltip();this.DestroyFloatTooltip();};this.StopAutoDragScrollTimer=function(){JSConsole.Chart.Log("[JSReportChartContainer::StopAutoDragScrollTimer] stop ");this.EnablePageScroll=false;if(this.AutoDragScrollTimer!=null){clearTimeout(this.AutoDragScrollTimer);this.AutoDragScrollTimer=null;}};this.InitalPopMenu=function()//初始化弹出窗口
12573
12576
  {if(this.JSPopMenu)return;this.JSPopMenu=new JSPopMenu();//内置菜单
12574
12577
  this.JSPopMenu.Inital();};this.InitalMinuteChartTooltip=function(option){if(this.TooltipMinuteChart)return;this.TooltipMinuteChart=new JSTooltipMinuteChart();this.TooltipMinuteChart.Inital(this,option);this.TooltipMinuteChart.Create();};this.DestroyMinuteChartTooltip=function(){if(!this.TooltipMinuteChart)return;this.TooltipMinuteChart.Destroy();this.TooltipMinuteChart=null;};this.InitalFloatTooltip=function(option){if(this.FloatTooltip)return;this.FloatTooltip=new JSFloatTooltip();this.FloatTooltip.Inital(this,option);this.FloatTooltip.Create();};this.HideFloatTooltip=function(){if(!this.FloatTooltip)return;this.FloatTooltip.Hide();};this.DestroyFloatTooltip=function(){if(!this.FloatTooltip)return;this.FloatTooltip.Destroy();this.FloatTooltip=null;};this.DrawFloatTooltip=function(point,toolTip){if(!this.FloatTooltip)return;this.UpdateFloatTooltip(point,toolTip);};this.UpdateFloatTooltip=function(point,toolTip){if(!this.FloatTooltip)return;var sendData={Tooltip:toolTip,Point:point,DataType:3};this.FloatTooltip.Update(sendData);};//data={ Symbol }
@@ -13338,7 +13341,7 @@ chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTat
13338
13341
  //切换股票代码接口
13339
13342
  this.ChangeSymbol=function(symbol,option){if(this.JSChartContainer)this.JSChartContainer.ChangeSymbol(symbol,option);};this.SetColumn=function(aryColumn,option){if(this.JSChartContainer)this.JSChartContainer.SetColumn(aryColumn,option);};//事件回调
13340
13343
  this.AddEventCallback=function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.AddEventCallback=='function'){JSConsole.Chart.Log('[JSTReportChart:AddEventCallback] obj=',obj);this.JSChartContainer.AddEventCallback(obj);}};//重新加载配置
13341
- this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSTReportChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestory=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestory=='function'){this.JSChartContainer.ChartDestory();}};this.Draw=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSTReportChart:Draw] ');this.JSChartContainer.Draw();}};}JSTReportChart.Init=function(divElement){var jsChartControl=new JSTReportChart(divElement);jsChartControl.OnSize();return jsChartControl;};//自定义风格
13344
+ this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSTReportChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestroy=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestroy=='function'){this.JSChartContainer.ChartDestroy();}};this.Draw=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSTReportChart:Draw] ');this.JSChartContainer.Draw();}};}JSTReportChart.Init=function(divElement){var jsChartControl=new JSTReportChart(divElement);jsChartControl.OnSize();return jsChartControl;};//自定义风格
13342
13345
  JSTReportChart.SetStyle=function(option){if(option)g_JSChartResource.SetStyle(option);};//获取颜色配置 (设置配必须啊在JSChart.Init()之前)
13343
13346
  JSTReportChart.GetResource=function(){return g_JSChartResource;};JSTReportChart.GetfloatPrecision=function(symbol){return GetfloatPrecision(symbol);};function HQTReportItem(){this.Symbol;this.Name;this.YClose;this.Open;this.Price;this.High;this.Low;this.Amount;this.Vol;this.Positon;//持仓量
13344
13347
  this.Increase;//涨幅
@@ -13379,7 +13382,7 @@ this.EnablePageCycle=false;//是否循环翻页
13379
13382
  this.TooltipMinuteChart;//分时图
13380
13383
  this.FloatTooltip;//浮框提示
13381
13384
  this.LastMouseStatus={MoveStatus:null,TooltipStatus:null,MouseOnStatus:null};this.IsDestroy=false;//是否已经销毁了
13382
- this.ChartDestory=function()//销毁
13385
+ this.ChartDestroy=function()//销毁
13383
13386
  {this.IsDestroy=true;this.StopAutoUpdate();this.DestroyMinuteChartTooltip();this.DestroyFloatTooltip();};this.InitalMinuteChartTooltip=function(option){if(this.TooltipMinuteChart)return;this.TooltipMinuteChart=new JSTooltipMinuteChart();this.TooltipMinuteChart.Inital(this,option);this.TooltipMinuteChart.Create();};this.DestroyMinuteChartTooltip=function(){if(!this.TooltipMinuteChart)return;this.TooltipMinuteChart.Destroy();this.TooltipMinuteChart=null;};//data={ Symbol }
13384
13387
  this.ShowMinuteChartTooltip=function(x,y,data){if(!this.TooltipMinuteChart)return;var rtClient=this.UIElement.getBoundingClientRect();var rtScroll=GetScrollPosition();var offsetLeft=rtClient.left+rtScroll.Left;var offsetTop=rtClient.top+rtScroll.Top;data.Offset={Left:offsetLeft,Top:offsetTop};this.TooltipMinuteChart.Show(data,x,y);};this.HideMinuteChartTooltip=function(){if(!this.TooltipMinuteChart)return;this.TooltipMinuteChart.Hide();};this.InitalFloatTooltip=function(option){if(this.FloatTooltip)return;this.FloatTooltip=new JSFloatTooltip();this.FloatTooltip.Inital(this,option);this.FloatTooltip.Create();};this.HideFloatTooltip=function(){if(!this.FloatTooltip)return;this.FloatTooltip.Hide();};this.DestroyFloatTooltip=function(){if(!this.FloatTooltip)return;this.FloatTooltip.Destroy();this.FloatTooltip=null;};this.DrawFloatTooltip=function(point,toolTip){if(!this.FloatTooltip)return;this.UpdateFloatTooltip(point,toolTip);};this.UpdateFloatTooltip=function(point,toolTip){if(!this.FloatTooltip)return;var sendData={Tooltip:toolTip,Point:point,DataType:4};this.FloatTooltip.Update(sendData);};//清空固定行数据
13385
13388
  this.ClearFixedRowData=function(){this.FixedRowData.Data=[];};//设置固定行
@@ -13645,7 +13648,7 @@ chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTat
13645
13648
  //对外接口
13646
13649
  this.SetColumn=function(aryColumn,option){if(this.JSChartContainer)this.JSChartContainer.SetColumn(aryColumn,option);};//事件回调
13647
13650
  this.AddEventCallback=function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.AddEventCallback=='function'){JSConsole.Chart.Log('[JSKeyboardChart:AddEventCallback] obj=',obj);this.JSChartContainer.AddEventCallback(obj);}};//重新加载配置
13648
- this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSKeyboardChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestory=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestory=='function'){this.JSChartContainer.ChartDestory();}};this.Draw=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSKeyboardChart:Draw] ');this.JSChartContainer.Draw();}};this.SetSymbolData=function(arySymbol){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSKeyboardChart:SetSymbolData] ',arySymbol);this.JSChartContainer.SetSymbolData(arySymbol);}};this.Search=function(strText){if(this.JSChartContainer&&typeof this.JSChartContainer.Search=='function'){JSConsole.Chart.Log('[JSKeyboardChart:Search] ',strText);this.JSChartContainer.Search(strText);}};this.OnKeyDown=function(event){if(this.JSChartContainer&&typeof this.JSChartContainer.OnKeyDown=='function'){JSConsole.Chart.Log('[JSKeyboardChart:OnKeyDown] ',event);this.JSChartContainer.OnKeyDown(event);}};this.ClearSearch=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ClearSearch=='function'){JSConsole.Chart.Log('[JSKeyboardChart:ClearSearch] ',option);this.JSChartContainer.ClearSearch(option);}};}JSKeyboardChart.Init=function(divElement){var jsChartControl=new JSKeyboardChart(divElement);jsChartControl.OnSize();return jsChartControl;};//自定义风格
13651
+ this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSKeyboardChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestroy=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestroy=='function'){this.JSChartContainer.ChartDestroy();}};this.Draw=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSKeyboardChart:Draw] ');this.JSChartContainer.Draw();}};this.SetSymbolData=function(arySymbol){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSKeyboardChart:SetSymbolData] ',arySymbol);this.JSChartContainer.SetSymbolData(arySymbol);}};this.Search=function(strText){if(this.JSChartContainer&&typeof this.JSChartContainer.Search=='function'){JSConsole.Chart.Log('[JSKeyboardChart:Search] ',strText);this.JSChartContainer.Search(strText);}};this.OnKeyDown=function(event){if(this.JSChartContainer&&typeof this.JSChartContainer.OnKeyDown=='function'){JSConsole.Chart.Log('[JSKeyboardChart:OnKeyDown] ',event);this.JSChartContainer.OnKeyDown(event);}};this.ClearSearch=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ClearSearch=='function'){JSConsole.Chart.Log('[JSKeyboardChart:ClearSearch] ',option);this.JSChartContainer.ClearSearch(option);}};}JSKeyboardChart.Init=function(divElement){var jsChartControl=new JSKeyboardChart(divElement);jsChartControl.OnSize();return jsChartControl;};//自定义风格
13649
13652
  JSKeyboardChart.SetStyle=function(option){if(option)g_JSChartResource.SetStyle(option);};function JSKeyboardChartContainer(uielement){this.ClassName='JSKeyboardChartContainer';this.Frame;//框架画法
13650
13653
  this.ChartPaint=[];//图形画法
13651
13654
  this.Canvas=uielement.getContext("2d");//画布
@@ -13659,7 +13662,7 @@ this.UIElement=uielement;this.LastPoint=new Point();//鼠标位置
13659
13662
  //拖拽滚动条
13660
13663
  this.DragYScroll=null;//{Start:{x,y}, End:{x, y}}
13661
13664
  this.IsDestroy=false;//是否已经销毁了
13662
- this.ChartDestory=function()//销毁
13665
+ this.ChartDestroy=function()//销毁
13663
13666
  {this.IsDestroy=true;};this.ClearSearch=function(option){this.Data.Data=[];this.Data.XOffset=0;this.Data.YOffset=0;if(option&&option.Redraw==true)this.Draw();};this.SearchFunctionKeyData=function(strSearch){if(strSearch.length<=0)return null;if(!IFrameSplitOperator.IsNonEmptyArray(this.FunctionKeyData))return null;var aryData=[];for(var i=0;i<this.FunctionKeyData.length;++i){var groupData=this.FunctionKeyData[i];if(!groupData)continue;if(!IFrameSplitOperator.IsNonEmptyArray(groupData.Data))continue;var aryExactQuery=[];//精确查询
13664
13667
  var aryFuzzyQuery=[];//模糊查询
13665
13668
  var aryEqualQuery=[];//相等
@@ -13798,7 +13801,7 @@ chart.Frame.ChartBorder.Left*=pixelTatio;chart.Frame.ChartBorder.Right*=pixelTat
13798
13801
  //对外接口
13799
13802
  //事件回调
13800
13803
  this.AddEventCallback=function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.AddEventCallback=='function'){JSConsole.Chart.Log('[JSScrollBarChart:AddEventCallback] obj=',obj);this.JSChartContainer.AddEventCallback(obj);}};//重新加载配置
13801
- this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSScrollBarChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestory=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestory=='function'){this.JSChartContainer.ChartDestory();}};this.Draw=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSScrollBarChart:Draw] ');this.JSChartContainer.Draw();}};this.RecvData=function(data,option){if(this.JSChartContainer&&typeof this.JSChartContainer.RecvData=='function'){JSConsole.Chart.Log('[JSScrollBarChart:RecvData] ');this.JSChartContainer.RecvData(data,option);}};this.UpdateSlider=function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.UpdateSlider=='function'){JSConsole.Chart.Log('[JSScrollBarChart:UpdateSlider] ');this.JSChartContainer.UpdateSlider(obj);}};this.Reset=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.Reset=='function'){JSConsole.Chart.Log('[JSScrollBarChart:Reset] ');this.JSChartContainer.Reset(option);}};//重新加载配置
13804
+ this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSScrollBarChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};this.ChartDestroy=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.ChartDestroy=='function'){this.JSChartContainer.ChartDestroy();}};this.Draw=function(){if(this.JSChartContainer&&typeof this.JSChartContainer.Draw=='function'){JSConsole.Chart.Log('[JSScrollBarChart:Draw] ');this.JSChartContainer.Draw();}};this.RecvData=function(data,option){if(this.JSChartContainer&&typeof this.JSChartContainer.RecvData=='function'){JSConsole.Chart.Log('[JSScrollBarChart:RecvData] ');this.JSChartContainer.RecvData(data,option);}};this.UpdateSlider=function(obj){if(this.JSChartContainer&&typeof this.JSChartContainer.UpdateSlider=='function'){JSConsole.Chart.Log('[JSScrollBarChart:UpdateSlider] ');this.JSChartContainer.UpdateSlider(obj);}};this.Reset=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.Reset=='function'){JSConsole.Chart.Log('[JSScrollBarChart:Reset] ');this.JSChartContainer.Reset(option);}};//重新加载配置
13802
13805
  this.ReloadResource=function(option){if(this.JSChartContainer&&typeof this.JSChartContainer.ReloadResource=='function'){JSConsole.Chart.Log('[JSScrollBarChart:ReloadResource] ');this.JSChartContainer.ReloadResource(option);}};}JSScrollBarChart.Init=function(divElement){var jsChartControl=new JSScrollBarChart(divElement);jsChartControl.OnSize();return jsChartControl;};//自定义风格
13803
13806
  JSScrollBarChart.SetStyle=function(option){if(option)g_JSChartResource.SetStyle(option);};//获取颜色配置 (设置配必须啊在JSChart.Init()之前)
13804
13807
  JSScrollBarChart.GetResource=function(){return g_JSChartResource;};//////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -13822,7 +13825,7 @@ this.mapEvent=new _map2.default();//通知外部调用 key:JSCHART_EVENT_ID valu
13822
13825
  this.UIElement=uielement;this.LastPoint=new Point();//鼠标位置
13823
13826
  //this.XStepPixel=10*GetDevicePixelRatio();
13824
13827
  this.IsDestroy=false;//是否已经销毁了
13825
- this.HQChart=null;this.ChartDestory=function()//销毁
13828
+ this.HQChart=null;this.ChartDestroy=function()//销毁
13826
13829
  {this.IsDestroy=true;};this.GetHQChart=function(){return this.HQChart;};//设置事件回调
13827
13830
  //{event:事件id, callback:回调函数}
13828
13831
  this.AddEventCallback=function(object){if(!object||!object.event||!object.callback)return;var data={Callback:object.callback,Source:object};this.mapEvent.set(object.event,data);};this.RemoveEventCallback=function(eventid){if(!this.mapEvent.has(eventid))return;this.mapEvent.delete(eventid);};this.GetEventCallback=function(id)//获取事件回调
@@ -14341,7 +14344,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
14341
14344
  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);};}/********************************************************************************
14342
14345
  * 版本信息输出
14343
14346
  *
14344
- */var HQCHART_VERSION="1.1.14456";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
14347
+ */var HQCHART_VERSION="1.1.14459";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
14345
14348
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
14346
14349
  // BaseIndex:BaseIndex,
14347
14350
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.14457",
3
+ "version": "1.1.14460",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.TReport.js CHANGED
@@ -193,11 +193,11 @@ function JSTReportChart(divElement)
193
193
  }
194
194
  }
195
195
 
196
- this.ChartDestory=function()
196
+ this.ChartDestroy=function()
197
197
  {
198
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
198
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
199
199
  {
200
- this.JSChartContainer.ChartDestory();
200
+ this.JSChartContainer.ChartDestroy();
201
201
  }
202
202
  }
203
203
 
@@ -333,7 +333,7 @@ function JSTReportChartContainer(uielement)
333
333
 
334
334
  this.IsDestroy=false; //是否已经销毁了
335
335
 
336
- this.ChartDestory=function() //销毁
336
+ this.ChartDestroy=function() //销毁
337
337
  {
338
338
  this.IsDestroy=true;
339
339
  this.StopAutoUpdate();
package/src/jscommon/umychart.deal.js CHANGED
@@ -155,6 +155,14 @@ function JSDealChart(divElement)
155
155
  this.JSChartContainer.ReloadResource(option);
156
156
  }
157
157
  }
158
+
159
+ this.ChartDestroy=function()
160
+ {
161
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
162
+ {
163
+ this.JSChartContainer.ChartDestroy();
164
+ }
165
+ }
158
166
  }
159
167
 
160
168
 
@@ -198,7 +206,7 @@ function JSDealChartContainer(uielement)
198
206
 
199
207
  this.IsDestroy=false; //是否已经销毁了
200
208
 
201
- this.ChartDestory=function() //销毁
209
+ this.ChartDestroy=function() //销毁
202
210
  {
203
211
  this.IsDestroy=true;
204
212
  this.StopAutoUpdate();
package/src/jscommon/umychart.js CHANGED
@@ -85358,6 +85358,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
85358
85358
  this.OnWheel=function(e)
85359
85359
  {
85360
85360
  JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);
85361
+ if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
85362
+
85363
+ var pixelTatio = GetDevicePixelRatio();
85364
+ var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
85365
+ var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
85366
+
85367
+ var isInClient=false;
85368
+ var rtClient=
85369
+ {
85370
+ Left:this.Frame.ChartBorder.GetLeft(), Right:this.Frame.ChartBorder.GetRight(),
85371
+ Top:this.Frame.ChartBorder.GetTop(), Bottom:this.Frame.ChartBorder.GetBottom(),
85372
+ Width:this.Frame.ChartBorder.GetWidth(), Height:this.Frame.ChartBorder.GetHeight()
85373
+ };
85374
+
85375
+ if (x>=rtClient.Left && x<=rtClient.Right && y>=rtClient.Top && y<=rtClient.Bottom ) isInClient=true;
85376
+
85377
+ if (!this.OnWheel_ZoomUpDownFrameY(e,x,y)) return;
85378
+
85379
+ if(e.preventDefault) e.preventDefault();
85380
+ else e.returnValue = false;
85381
+ }
85382
+
85383
+ //通过滚轴缩放Y轴
85384
+ this.OnWheel_ZoomUpDownFrameY=function(e, x, y)
85385
+ {
85386
+ if (!this.EnableYDrag.Wheel) return false;
85387
+
85388
+ var frameID=this.Frame.PtInFrame(x,y);
85389
+ if (frameID<0) return false;
85390
+
85391
+ var frame=this.Frame.SubFrame[frameID].Frame;
85392
+ var splitOper=frame.YSplitOperator;
85393
+ if (!splitOper || !splitOper.FixedYMaxMin) return false; //Y轴缩放状态下才有效
85394
+
85395
+ var wheelValue=e.wheelDelta;
85396
+ if (!IFrameSplitOperator.IsObjectExist(e.wheelDelta))
85397
+ wheelValue=e.deltaY* -0.01;
85398
+
85399
+ var yMove=this.EnableYDrag.WheelYMove;
85400
+ if (wheelValue>0) yMove*=-1;
85401
+ var dragY={ Position:0, Index:frameID, Right:false, Left:false }; //只能两边缩放
85402
+ if (!this.Frame.OnZoomUpDownFrameY(dragY, yMove)) return false;
85403
+
85404
+ this.Frame.SetSizeChage(true);
85405
+ this.Draw();
85406
+
85407
+ return true;
85361
85408
  }
85362
85409
 
85363
85410
  this.OnDoubleClick=function(x,y,e)
package/src/jscommon/umychart.keyboard.js CHANGED
@@ -167,11 +167,11 @@ function JSKeyboardChart(divElement)
167
167
  }
168
168
  }
169
169
 
170
- this.ChartDestory=function()
170
+ this.ChartDestroy=function()
171
171
  {
172
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
172
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
173
173
  {
174
- this.JSChartContainer.ChartDestory();
174
+ this.JSChartContainer.ChartDestroy();
175
175
  }
176
176
  }
177
177
 
@@ -261,7 +261,7 @@ function JSKeyboardChartContainer(uielement)
261
261
 
262
262
  this.IsDestroy=false; //是否已经销毁了
263
263
 
264
- this.ChartDestory=function() //销毁
264
+ this.ChartDestroy=function() //销毁
265
265
  {
266
266
  this.IsDestroy=true;
267
267
  }
package/src/jscommon/umychart.report.js CHANGED
@@ -308,11 +308,11 @@ function JSReportChart(divElement)
308
308
  }
309
309
  }
310
310
 
311
- this.ChartDestory=function()
311
+ this.ChartDestroy=function()
312
312
  {
313
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
313
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
314
314
  {
315
- this.JSChartContainer.ChartDestory();
315
+ this.JSChartContainer.ChartDestroy();
316
316
  }
317
317
  }
318
318
 
@@ -481,7 +481,7 @@ function JSReportChartContainer(uielement)
481
481
  //MouseOnStatus:{ RowIndex:行, ColumnIndex:列}
482
482
  this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
483
483
 
484
- this.ChartDestory=function() //销毁
484
+ this.ChartDestroy=function() //销毁
485
485
  {
486
486
  this.IsDestroy=true;
487
487
  this.StopAutoUpdate();
package/src/jscommon/umychart.scrollbar.js CHANGED
@@ -153,11 +153,11 @@ function JSScrollBarChart(divElement)
153
153
  }
154
154
  }
155
155
 
156
- this.ChartDestory=function()
156
+ this.ChartDestroy=function()
157
157
  {
158
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
158
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
159
159
  {
160
- this.JSChartContainer.ChartDestory();
160
+ this.JSChartContainer.ChartDestroy();
161
161
  }
162
162
  }
163
163
 
@@ -270,7 +270,7 @@ function JSScrollBarChartContainer(uielement)
270
270
 
271
271
  this.HQChart=null;
272
272
 
273
- this.ChartDestory=function() //销毁
273
+ this.ChartDestroy=function() //销毁
274
274
  {
275
275
  this.IsDestroy=true;
276
276
  }
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -89283,6 +89283,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
89283
89283
  this.OnWheel=function(e)
89284
89284
  {
89285
89285
  JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);
89286
+ if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
89287
+
89288
+ var pixelTatio = GetDevicePixelRatio();
89289
+ var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
89290
+ var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
89291
+
89292
+ var isInClient=false;
89293
+ var rtClient=
89294
+ {
89295
+ Left:this.Frame.ChartBorder.GetLeft(), Right:this.Frame.ChartBorder.GetRight(),
89296
+ Top:this.Frame.ChartBorder.GetTop(), Bottom:this.Frame.ChartBorder.GetBottom(),
89297
+ Width:this.Frame.ChartBorder.GetWidth(), Height:this.Frame.ChartBorder.GetHeight()
89298
+ };
89299
+
89300
+ if (x>=rtClient.Left && x<=rtClient.Right && y>=rtClient.Top && y<=rtClient.Bottom ) isInClient=true;
89301
+
89302
+ if (!this.OnWheel_ZoomUpDownFrameY(e,x,y)) return;
89303
+
89304
+ if(e.preventDefault) e.preventDefault();
89305
+ else e.returnValue = false;
89306
+ }
89307
+
89308
+ //通过滚轴缩放Y轴
89309
+ this.OnWheel_ZoomUpDownFrameY=function(e, x, y)
89310
+ {
89311
+ if (!this.EnableYDrag.Wheel) return false;
89312
+
89313
+ var frameID=this.Frame.PtInFrame(x,y);
89314
+ if (frameID<0) return false;
89315
+
89316
+ var frame=this.Frame.SubFrame[frameID].Frame;
89317
+ var splitOper=frame.YSplitOperator;
89318
+ if (!splitOper || !splitOper.FixedYMaxMin) return false; //Y轴缩放状态下才有效
89319
+
89320
+ var wheelValue=e.wheelDelta;
89321
+ if (!IFrameSplitOperator.IsObjectExist(e.wheelDelta))
89322
+ wheelValue=e.deltaY* -0.01;
89323
+
89324
+ var yMove=this.EnableYDrag.WheelYMove;
89325
+ if (wheelValue>0) yMove*=-1;
89326
+ var dragY={ Position:0, Index:frameID, Right:false, Left:false }; //只能两边缩放
89327
+ if (!this.Frame.OnZoomUpDownFrameY(dragY, yMove)) return false;
89328
+
89329
+ this.Frame.SetSizeChage(true);
89330
+ this.Draw();
89331
+
89332
+ return true;
89286
89333
  }
89287
89334
 
89288
89335
  this.OnDoubleClick=function(x,y,e)
@@ -129546,6 +129593,14 @@ function JSDealChart(divElement)
129546
129593
  this.JSChartContainer.ReloadResource(option);
129547
129594
  }
129548
129595
  }
129596
+
129597
+ this.ChartDestroy=function()
129598
+ {
129599
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
129600
+ {
129601
+ this.JSChartContainer.ChartDestroy();
129602
+ }
129603
+ }
129549
129604
  }
129550
129605
 
129551
129606
 
@@ -129589,7 +129644,7 @@ function JSDealChartContainer(uielement)
129589
129644
 
129590
129645
  this.IsDestroy=false; //是否已经销毁了
129591
129646
 
129592
- this.ChartDestory=function() //销毁
129647
+ this.ChartDestroy=function() //销毁
129593
129648
  {
129594
129649
  this.IsDestroy=true;
129595
129650
  this.StopAutoUpdate();
@@ -131155,11 +131210,11 @@ function JSReportChart(divElement)
131155
131210
  }
131156
131211
  }
131157
131212
 
131158
- this.ChartDestory=function()
131213
+ this.ChartDestroy=function()
131159
131214
  {
131160
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
131215
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
131161
131216
  {
131162
- this.JSChartContainer.ChartDestory();
131217
+ this.JSChartContainer.ChartDestroy();
131163
131218
  }
131164
131219
  }
131165
131220
 
@@ -131328,7 +131383,7 @@ function JSReportChartContainer(uielement)
131328
131383
  //MouseOnStatus:{ RowIndex:行, ColumnIndex:列}
131329
131384
  this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
131330
131385
 
131331
- this.ChartDestory=function() //销毁
131386
+ this.ChartDestroy=function() //销毁
131332
131387
  {
131333
131388
  this.IsDestroy=true;
131334
131389
  this.StopAutoUpdate();
@@ -140425,11 +140480,11 @@ function JSKeyboardChart(divElement)
140425
140480
  }
140426
140481
  }
140427
140482
 
140428
- this.ChartDestory=function()
140483
+ this.ChartDestroy=function()
140429
140484
  {
140430
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
140485
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
140431
140486
  {
140432
- this.JSChartContainer.ChartDestory();
140487
+ this.JSChartContainer.ChartDestroy();
140433
140488
  }
140434
140489
  }
140435
140490
 
@@ -140519,7 +140574,7 @@ function JSKeyboardChartContainer(uielement)
140519
140574
 
140520
140575
  this.IsDestroy=false; //是否已经销毁了
140521
140576
 
140522
- this.ChartDestory=function() //销毁
140577
+ this.ChartDestroy=function() //销毁
140523
140578
  {
140524
140579
  this.IsDestroy=true;
140525
140580
  }
@@ -142270,11 +142325,11 @@ function JSScrollBarChart(divElement)
142270
142325
  }
142271
142326
  }
142272
142327
 
142273
- this.ChartDestory=function()
142328
+ this.ChartDestroy=function()
142274
142329
  {
142275
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
142330
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
142276
142331
  {
142277
- this.JSChartContainer.ChartDestory();
142332
+ this.JSChartContainer.ChartDestroy();
142278
142333
  }
142279
142334
  }
142280
142335
 
@@ -142387,7 +142442,7 @@ function JSScrollBarChartContainer(uielement)
142387
142442
 
142388
142443
  this.HQChart=null;
142389
142444
 
142390
- this.ChartDestory=function() //销毁
142445
+ this.ChartDestroy=function() //销毁
142391
142446
  {
142392
142447
  this.IsDestroy=true;
142393
142448
  }
@@ -143597,7 +143652,7 @@ function ScrollBarBGChart()
143597
143652
 
143598
143653
 
143599
143654
 
143600
- var HQCHART_VERSION="1.1.14456";
143655
+ var HQCHART_VERSION="1.1.14459";
143601
143656
 
143602
143657
  function PrintHQChartVersion()
143603
143658
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14456";
8
+ var HQCHART_VERSION="1.1.14459";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -89327,6 +89327,53 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
89327
89327
  this.OnWheel=function(e)
89328
89328
  {
89329
89329
  JSConsole.Chart.Log('[MinuteChartContainer::OnWheel]',e);
89330
+ if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
89331
+
89332
+ var pixelTatio = GetDevicePixelRatio();
89333
+ var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
89334
+ var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
89335
+
89336
+ var isInClient=false;
89337
+ var rtClient=
89338
+ {
89339
+ Left:this.Frame.ChartBorder.GetLeft(), Right:this.Frame.ChartBorder.GetRight(),
89340
+ Top:this.Frame.ChartBorder.GetTop(), Bottom:this.Frame.ChartBorder.GetBottom(),
89341
+ Width:this.Frame.ChartBorder.GetWidth(), Height:this.Frame.ChartBorder.GetHeight()
89342
+ };
89343
+
89344
+ if (x>=rtClient.Left && x<=rtClient.Right && y>=rtClient.Top && y<=rtClient.Bottom ) isInClient=true;
89345
+
89346
+ if (!this.OnWheel_ZoomUpDownFrameY(e,x,y)) return;
89347
+
89348
+ if(e.preventDefault) e.preventDefault();
89349
+ else e.returnValue = false;
89350
+ }
89351
+
89352
+ //通过滚轴缩放Y轴
89353
+ this.OnWheel_ZoomUpDownFrameY=function(e, x, y)
89354
+ {
89355
+ if (!this.EnableYDrag.Wheel) return false;
89356
+
89357
+ var frameID=this.Frame.PtInFrame(x,y);
89358
+ if (frameID<0) return false;
89359
+
89360
+ var frame=this.Frame.SubFrame[frameID].Frame;
89361
+ var splitOper=frame.YSplitOperator;
89362
+ if (!splitOper || !splitOper.FixedYMaxMin) return false; //Y轴缩放状态下才有效
89363
+
89364
+ var wheelValue=e.wheelDelta;
89365
+ if (!IFrameSplitOperator.IsObjectExist(e.wheelDelta))
89366
+ wheelValue=e.deltaY* -0.01;
89367
+
89368
+ var yMove=this.EnableYDrag.WheelYMove;
89369
+ if (wheelValue>0) yMove*=-1;
89370
+ var dragY={ Position:0, Index:frameID, Right:false, Left:false }; //只能两边缩放
89371
+ if (!this.Frame.OnZoomUpDownFrameY(dragY, yMove)) return false;
89372
+
89373
+ this.Frame.SetSizeChage(true);
89374
+ this.Draw();
89375
+
89376
+ return true;
89330
89377
  }
89331
89378
 
89332
89379
  this.OnDoubleClick=function(x,y,e)
@@ -129590,6 +129637,14 @@ function JSDealChart(divElement)
129590
129637
  this.JSChartContainer.ReloadResource(option);
129591
129638
  }
129592
129639
  }
129640
+
129641
+ this.ChartDestroy=function()
129642
+ {
129643
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
129644
+ {
129645
+ this.JSChartContainer.ChartDestroy();
129646
+ }
129647
+ }
129593
129648
  }
129594
129649
 
129595
129650
 
@@ -129633,7 +129688,7 @@ function JSDealChartContainer(uielement)
129633
129688
 
129634
129689
  this.IsDestroy=false; //是否已经销毁了
129635
129690
 
129636
- this.ChartDestory=function() //销毁
129691
+ this.ChartDestroy=function() //销毁
129637
129692
  {
129638
129693
  this.IsDestroy=true;
129639
129694
  this.StopAutoUpdate();
@@ -131199,11 +131254,11 @@ function JSReportChart(divElement)
131199
131254
  }
131200
131255
  }
131201
131256
 
131202
- this.ChartDestory=function()
131257
+ this.ChartDestroy=function()
131203
131258
  {
131204
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
131259
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
131205
131260
  {
131206
- this.JSChartContainer.ChartDestory();
131261
+ this.JSChartContainer.ChartDestroy();
131207
131262
  }
131208
131263
  }
131209
131264
 
@@ -131372,7 +131427,7 @@ function JSReportChartContainer(uielement)
131372
131427
  //MouseOnStatus:{ RowIndex:行, ColumnIndex:列}
131373
131428
  this.LastMouseStatus={ MoveStatus:null, TooltipStatus:null, MouseOnStatus:null };
131374
131429
 
131375
- this.ChartDestory=function() //销毁
131430
+ this.ChartDestroy=function() //销毁
131376
131431
  {
131377
131432
  this.IsDestroy=true;
131378
131433
  this.StopAutoUpdate();
@@ -140495,11 +140550,11 @@ function JSTReportChart(divElement)
140495
140550
  }
140496
140551
  }
140497
140552
 
140498
- this.ChartDestory=function()
140553
+ this.ChartDestroy=function()
140499
140554
  {
140500
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
140555
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
140501
140556
  {
140502
- this.JSChartContainer.ChartDestory();
140557
+ this.JSChartContainer.ChartDestroy();
140503
140558
  }
140504
140559
  }
140505
140560
 
@@ -140635,7 +140690,7 @@ function JSTReportChartContainer(uielement)
140635
140690
 
140636
140691
  this.IsDestroy=false; //是否已经销毁了
140637
140692
 
140638
- this.ChartDestory=function() //销毁
140693
+ this.ChartDestroy=function() //销毁
140639
140694
  {
140640
140695
  this.IsDestroy=true;
140641
140696
  this.StopAutoUpdate();
@@ -143630,11 +143685,11 @@ function JSKeyboardChart(divElement)
143630
143685
  }
143631
143686
  }
143632
143687
 
143633
- this.ChartDestory=function()
143688
+ this.ChartDestroy=function()
143634
143689
  {
143635
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
143690
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
143636
143691
  {
143637
- this.JSChartContainer.ChartDestory();
143692
+ this.JSChartContainer.ChartDestroy();
143638
143693
  }
143639
143694
  }
143640
143695
 
@@ -143724,7 +143779,7 @@ function JSKeyboardChartContainer(uielement)
143724
143779
 
143725
143780
  this.IsDestroy=false; //是否已经销毁了
143726
143781
 
143727
- this.ChartDestory=function() //销毁
143782
+ this.ChartDestroy=function() //销毁
143728
143783
  {
143729
143784
  this.IsDestroy=true;
143730
143785
  }
@@ -145475,11 +145530,11 @@ function JSScrollBarChart(divElement)
145475
145530
  }
145476
145531
  }
145477
145532
 
145478
- this.ChartDestory=function()
145533
+ this.ChartDestroy=function()
145479
145534
  {
145480
- if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestory) == 'function')
145535
+ if (this.JSChartContainer && typeof (this.JSChartContainer.ChartDestroy) == 'function')
145481
145536
  {
145482
- this.JSChartContainer.ChartDestory();
145537
+ this.JSChartContainer.ChartDestroy();
145483
145538
  }
145484
145539
  }
145485
145540
 
@@ -145592,7 +145647,7 @@ function JSScrollBarChartContainer(uielement)
145592
145647
 
145593
145648
  this.HQChart=null;
145594
145649
 
145595
- this.ChartDestory=function() //销毁
145650
+ this.ChartDestroy=function() //销毁
145596
145651
  {
145597
145652
  this.IsDestroy=true;
145598
145653
  }
@@ -153409,7 +153464,7 @@ function HQChartScriptWorker()
153409
153464
 
153410
153465
 
153411
153466
 
153412
- var HQCHART_VERSION="1.1.14456";
153467
+ var HQCHART_VERSION="1.1.14459";
153413
153468
 
153414
153469
  function PrintHQChartVersion()
153415
153470
  {