hqchart 1.1.15002 → 1.1.15006

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 (10) hide show
  1. package/lib/umychart.vue.js +14 -9
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.NetworkFilterTest.js +197 -78
  4. package/src/jscommon/umychart.js +1 -0
  5. package/src/jscommon/umychart.report.js +23 -6
  6. package/src/jscommon/umychart.testdata.js +197 -78
  7. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +25 -7
  8. package/src/jscommon/umychart.version.js +1 -1
  9. package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js +197 -78
  10. package/src/jscommon/umychart.vue/umychart.vue.js +25 -7
package/lib/umychart.vue.js CHANGED
@@ -2622,7 +2622,7 @@ this.FrameData={SubFrameItem:null};//窗口框架信息
2622
2622
  this.DrawPicture={BGColor:g_JSChartResource.DrawPicture.XYCoordinate.BGColor,TextBGColor:g_JSChartResource.DrawPicture.XYCoordinate.TextBGColor,TextColor:g_JSChartResource.DrawPicture.XYCoordinate.TextColor,Font:g_JSChartResource.DrawPicture.XYCoordinate.Font};this.IChartFramePainting_ReloadResource=this.ReloadResource;this.ReloadResource=function(resource){this.IChartFramePainting_ReloadResource(resource);if(!resource){this.ToolbarButtonStyle=g_JSChartResource.ToolbarButtonStyle;this.CloseWindowButton=CloneData(g_JSChartResource.Buttons.CloseWindow);this.OverlayIndexButton=CloneData(g_JSChartResource.Buttons.OverlayIndex);this.ChangeIndexButton=CloneData(g_JSChartResource.Buttons.ChangeIndex);this.ModifyIndexParamButton=CloneData(g_JSChartResource.Buttons.ModifyIndexParam);this.MaxMinWindowButton=CloneData(g_JSChartResource.Buttons.MaxMinWindow);this.TitleWindowButton=CloneData(g_JSChartResource.Buttons.TitleWindow);this.ButtonTooltip=CloneData(g_JSChartResource.Buttons.Tooltip);this.AddIndexWindowButton=CloneData(g_JSChartResource.Buttons.AddIndexWindow);}};this.DrawFrame=function(){if(this.XPointCount>0){var dInterval=this.ChartBorder.GetWidth()/(6*this.XPointCount);//分6份, 数据4 间距2
2623
2623
  this.DistanceWidth=2*dInterval;this.DataWidth=4*dInterval;}this.DrawHorizontal();this.DrawVertical();};this.DrawTitleButton=function(aryButton,moveonPoint,mouseStatus){var border=this.GetBorder();if(this.IsHScreen){var y=border.Bottom-3;var x=border.RightTitle+this.ChartBorder.TitleHeight/2;this.Canvas.save();this.Canvas.translate(x,y);this.Canvas.rotate(90*Math.PI/180);//底部开始画
2624
2624
  var yButton=0,xButton=0,bottom=0;for(var i=0;i<aryButton.length;++i){var item=aryButton[i];var size=item.Style.Size;var xButton=bottom-size-item.Style.MerginLeft;var font=size+'px '+item.Style.Family;var color=item.Style.Color;this.Canvas.fillStyle=color;this.Canvas.font=font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(item.Style.Text,xButton,0);var rtButton={Left:x-size/2,Right:x+size/2,Bottom:y,Width:size,Height:size+item.Style.MerginLeft};rtButton.Top=rtButton.Bottom-size-item.Style.MerginLeft;this.Buttons.push({ID:item.ID,Rect:rtButton});bottom=xButton;y=rtButton.Top;}this.Canvas.restore();}else{var right=border.RightEx-3;var left=border.Left;var yButton=border.Top+this.ChartBorder.TitleHeight/2;this.ToolbarCacheSize={RToolbar:{Right:right,Left:right}//右往左绘制
2625
- };for(var i=0;i<aryButton.length;++i){var item=aryButton[i];var size=item.Style.Size;var xBotton=right-size-item.Style.MerginLeft;var font=size+'px '+item.Style.Family;var rtButton={Left:xBotton,Top:yButton-size/2,Right:xBotton+size+item.Style.MerginLeft,Bottom:yButton+size/2,Width:size+item.Style.MerginLeft,Height:size};var color=item.Style.Color;if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){color=item.Style.MoveOnColor;if(mouseStatus)mouseStatus.MouseOnToolbar={Rect:rtButton,Item:item,Frame:this,Point:{X:moveonPoint.X,Y:moveonPoint.Y}};}this.Canvas.fillStyle=color;this.Canvas.font=font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(item.Style.Text,xBotton,yButton);this.Buttons.push({ID:item.ID,Rect:rtButton});this.ToolbarCacheSize.RToolbar.Left=rtButton.Left;right=xBotton;}}};this.DrawToolbarTooltip=function(mouseOnToolbar){if(!mouseOnToolbar)return;var border=this.GetBorder();var text=null;if(mouseOnToolbar.Item.TooltipText){text=mouseOnToolbar.Item.TooltipText;}else{var key='Toolbar-'+mouseOnToolbar.Item.ID;text=g_JSChartLocalization.GetText(key,0);}if(!text)return;var pixelRatio=GetDevicePixelRatio();var canvas=this.Canvas;if(this.GetExtraCanvas){var finder=this.GetExtraCanvas(JSChart.TooltipCursorCanvasKey);if(finder)canvas=finder.Canvas;}var xCenter=mouseOnToolbar.Rect.Left+mouseOnToolbar.Rect.Width/2;canvas.font=this.ButtonTooltip.Font;canvas.textAlign="left";canvas.textBaseline="bottom";var mergin=this.ButtonTooltip.Mergin;var textWidth=canvas.measureText(text).width+mergin.Left+mergin.Right;var textHeight=this.GetFontHeight();var bgHeight=textHeight+mergin.Top+mergin.Bottom;if(mouseOnToolbar.ID=="TitleButton"){var x=mouseOnToolbar.Point.X;var y=mouseOnToolbar.Point.Y+20;}else if(JSCHART_BUTTON_ID.CLOSE_BEFOREOPEN_ID==mouseOnToolbar.Item.ID){var x=mouseOnToolbar.Rect.Right+5;var y=mouseOnToolbar.Rect.Top;}else if(JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE==mouseOnToolbar.Item.ID||JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING==mouseOnToolbar.Item.ID||mouseOnToolbar.Item.ID>=JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_1&&mouseOnToolbar.Item.ID<=JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_18){var x=mouseOnToolbar.Point.X;var y=mouseOnToolbar.Point.Y+20;if(x+textWidth>=border.ChartWidth)x=border.ChartWidth-textWidth-2;}else{var x=xCenter-textWidth/2;var y=border.Top-bgHeight;if(y<0)y=border.TopEx+1;if(x+textWidth>border.ChartWidth)x=border.ChartWidth-textWidth-2;}if(IFrameSplitOperator.IsNumber(this.ButtonTooltip.BorderRadius))//圆角
2625
+ };for(var i=0;i<aryButton.length;++i){var item=aryButton[i];var size=item.Style.Size;var xBotton=right-size-item.Style.MerginLeft;var font=size+'px '+item.Style.Family;var rtButton={Left:xBotton,Top:yButton-size/2,Right:xBotton+size+item.Style.MerginLeft,Bottom:yButton+size/2,Width:size+item.Style.MerginLeft,Height:size};var color=item.Style.Color;if(moveonPoint&&moveonPoint.X>=rtButton.Left&&moveonPoint.X<rtButton.Right&&moveonPoint.Y>=rtButton.Top&&moveonPoint.Y<=rtButton.Bottom){color=item.Style.MoveOnColor;if(mouseStatus)mouseStatus.MouseOnToolbar={Rect:rtButton,Item:item,Frame:this,Point:{X:moveonPoint.X,Y:moveonPoint.Y}};}this.Canvas.fillStyle=color;this.Canvas.font=font;this.Canvas.textAlign="left";this.Canvas.textBaseline="middle";this.Canvas.fillText(item.Style.Text,xBotton,yButton);this.Buttons.push({ID:item.ID,Rect:rtButton});this.ToolbarCacheSize.RToolbar.Left=rtButton.Left;right=xBotton;}}};this.DrawToolbarTooltip=function(mouseOnToolbar){if(!mouseOnToolbar)return;var border=this.GetBorder();var text=null;if(mouseOnToolbar.Item.TooltipText){text=mouseOnToolbar.Item.TooltipText;}else{var key='Toolbar-'+mouseOnToolbar.Item.ID;text=g_JSChartLocalization.GetText(key,0);}if(!text)return;var pixelRatio=GetDevicePixelRatio();var canvas=this.Canvas;if(this.GetExtraCanvas){var finder=this.GetExtraCanvas(JSChart.TooltipCursorCanvasKey);if(finder)canvas=finder.Canvas;}var xCenter=mouseOnToolbar.Rect.Left+mouseOnToolbar.Rect.Width/2;canvas.font=this.ButtonTooltip.Font;canvas.textAlign="left";canvas.textBaseline="bottom";var mergin=this.ButtonTooltip.Mergin;var textWidth=canvas.measureText(text).width+mergin.Left+mergin.Right;var textHeight=this.GetFontHeight();var bgHeight=textHeight+mergin.Top+mergin.Bottom;if(mouseOnToolbar.ID=="TitleButton"){var x=mouseOnToolbar.Point.X;var y=mouseOnToolbar.Point.Y+20;if(y+textHeight>border.ChartHeight)y=mouseOnToolbar.Point.Y-5-textHeight;}else if(JSCHART_BUTTON_ID.CLOSE_BEFOREOPEN_ID==mouseOnToolbar.Item.ID){var x=mouseOnToolbar.Rect.Right+5;var y=mouseOnToolbar.Rect.Top;}else if(JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE==mouseOnToolbar.Item.ID||JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING==mouseOnToolbar.Item.ID||mouseOnToolbar.Item.ID>=JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_1&&mouseOnToolbar.Item.ID<=JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_18){var x=mouseOnToolbar.Point.X;var y=mouseOnToolbar.Point.Y+20;if(x+textWidth>=border.ChartWidth)x=border.ChartWidth-textWidth-2;}else{var x=xCenter-textWidth/2;var y=border.Top-bgHeight;if(y<0)y=border.TopEx+1;if(x+textWidth>border.ChartWidth)x=border.ChartWidth-textWidth-2;}if(IFrameSplitOperator.IsNumber(this.ButtonTooltip.BorderRadius))//圆角
2626
2626
  {var roundRadius=this.ButtonTooltip.BorderRadius;canvas.beginPath();canvas.roundRect(ToFixedPoint(x),ToFixedPoint(y),ToFixedRect(textWidth),ToFixedRect(bgHeight),[roundRadius]);canvas.closePath();canvas.fillStyle=this.ButtonTooltip.ColorBG;canvas.fill();canvas.strokeStyle=this.ButtonTooltip.ColorBorder;canvas.stroke();canvas.fillStyle=this.ButtonTooltip.Color;canvas.fillText(text,x+mergin.Left,y+bgHeight-mergin.Bottom);}else{canvas.fillStyle=this.ButtonTooltip.ColorBG;canvas.fillRect(x,y,textWidth,bgHeight);//画一个背景色, 不然是一个黑的背景
2627
2627
  canvas.fillStyle=this.ButtonTooltip.Color;canvas.fillText(text,x+mergin.Left,y+bgHeight-mergin.Bottom);}};//isLimit 是否限制在当前坐标下
2628
2628
  this.GetYFromData=function(value,isLimit){if(this.Logarithmic&&this.GetYLogarithmicFromData){return this.GetYLogarithmicFromData(value,isLimit);}if(isLimit===false){if(this.CoordinateType==1){var height=this.ChartBorder.GetHeightEx()*(value-this.HorizontalMin)/(this.HorizontalMax-this.HorizontalMin);return this.ChartBorder.GetTopEx()+height;}else{var height=this.ChartBorder.GetHeightEx()*(value-this.HorizontalMin)/(this.HorizontalMax-this.HorizontalMin);return this.ChartBorder.GetBottomEx()-height;}}else{if(this.CoordinateType==1){if(value<=this.HorizontalMin)return this.ChartBorder.GetTopEx();if(value>=this.HorizontalMax)return this.ChartBorder.GetBottomEx();var height=this.ChartBorder.GetHeightEx()*(value-this.HorizontalMin)/(this.HorizontalMax-this.HorizontalMin);return this.ChartBorder.GetTopEx()+height;}else{if(value<=this.HorizontalMin)return this.ChartBorder.GetBottomEx();if(value>=this.HorizontalMax)return this.ChartBorder.GetTopEx();var height=this.ChartBorder.GetHeightEx()*(value-this.HorizontalMin)/(this.HorizontalMax-this.HorizontalMin);return this.ChartBorder.GetBottomEx()-height;}}};this.IsShowRightHorizontal=function(){var borderRight=this.ChartBorder.Right;if(borderRight<=10)return false;if(this.YTextPosition[1]==2)return false;if(this.IsShowYText[1]===false)return false;if(this.GlobalOption&&this.GlobalOption.RightHorizontal){var item=this.GlobalOption.RightHorizontal;if(item.Show===false)return false;}return true;};//画Y轴
@@ -13298,7 +13298,7 @@ var _iteratorNormalCompletion23=true;var _didIteratorError23=false;var _iterator
13298
13298
  //注册事件
13299
13299
  if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}if(option.EnableResize==true)this.CreateResizeListener();if(option.EnablePopMenuV2===true)chart.InitalPopMenu();if(option.FloatTooltip&&option.FloatTooltip.Enable)chart.InitalFloatTooltip(option.FloatTooltip);//提示信息
13300
13300
  if(option.MinuteChartTooltip&&option.MinuteChartTooltip.Enable)chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);if(option.KLineChartTooltip&&option.KLineChartTooltip.Enable)chart.InitalKLineChartTooltip(option.KLineChartTooltip);if(option.Symbol)chart.Symbol=option.Symbol;if(option.Name)chart.Name=option.Name;var requestOption={Callback:null};if(chart.Symbol)requestOption.Callback=function(){chart.RequestMemberListData();};if(option.LoadStockList===false){chart.ChartSplashPaint.IsEnableSplash=false;chart.Draw();}else{chart.RequestStockListData(requestOption);//下载码表
13301
- }};this.CreateJSReportChartContainer=function(option){var _this56=this;var chart=new JSReportChartContainer(this.CanvasElement);chart.GetExtraCanvas=function(name){return _this56.GetExtraCanvas(name);};chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);if(IFrameSplitOperator.IsNonEmptyArray(option.Tab))chart.SetTab(option.Tab);if(IFrameSplitOperator.IsNumber(option.TabSelected))chart.SetSelectedTab(option.TabSelected);if(IFrameSplitOperator.IsBool(option.EnableDragRow))chart.EnableDragRow=option.EnableDragRow;if(IFrameSplitOperator.IsNumber(option.DragRowType))chart.DragRowType=option.DragRowType;if(IFrameSplitOperator.IsBool(option.EnableDragHeader))chart.EnableDragHeader=option.EnableDragHeader;if(IFrameSplitOperator.IsNumber(option.WheelPageType))chart.WheelPageType=option.WheelPageType;if(IFrameSplitOperator.IsBool(option.PageUpDownCycle))chart.PageUpDownCycle=option.PageUpDownCycle;if(IFrameSplitOperator.IsBool(option.EnablePageUpdate))chart.EnablePageUpdate=option.EnablePageUpdate;//数据下载提示信息
13301
+ }};this.CreateJSReportChartContainer=function(option){var _this56=this;var chart=new JSReportChartContainer(this.CanvasElement);chart.GetExtraCanvas=function(name){return _this56.GetExtraCanvas(name);};chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);if(IFrameSplitOperator.IsNonEmptyArray(option.Tab))chart.SetTab(option.Tab);if(IFrameSplitOperator.IsNumber(option.TabSelected))chart.SetSelectedTab(option.TabSelected);if(IFrameSplitOperator.IsBool(option.EnableDragRow))chart.EnableDragRow=option.EnableDragRow;if(IFrameSplitOperator.IsNumber(option.DragRowType))chart.DragRowType=option.DragRowType;if(IFrameSplitOperator.IsBool(option.EnableDragHeader))chart.EnableDragHeader=option.EnableDragHeader;if(IFrameSplitOperator.IsNumber(option.WheelPageType))chart.WheelPageConfig.Type=option.WheelPageType;if(IFrameSplitOperator.IsBool(option.PageUpDownCycle))chart.PageUpDownCycle=option.PageUpDownCycle;if(IFrameSplitOperator.IsBool(option.EnablePageUpdate))chart.EnablePageUpdate=option.EnablePageUpdate;if(option.WheelPage){var item=option.WheelPage;if(IFrameSplitOperator.IsNumber(item.Type))chart.WheelPageConfig.Type=item.Type;if(IFrameSplitOperator.IsPlusNumber(item.RowStep))chart.WheelPageConfig.RowStep=item.RowStep;if(IFrameSplitOperator.IsBool(item.EnableCtrlTurn))chart.WheelPageConfig.EnableCtrlTurn=item.EnableCtrlTurn;}//数据下载提示信息
13302
13302
  if(IFrameSplitOperator.IsObject(option.SplashTitle)){var item=option.SplashTitle;if(item)chart.SplashTitle.StockList=item.StockList;if(item)chart.SplashTitle.MemberList=item.MemberList;}if(option.VScrollbar)chart.SetVScrollbar(option.VScrollbar);if(option.SortInfo){var item=option.SortInfo;if(item.Search)chart.SortInfo.Field=chart.FindFiledIndex(item.Search);if(IFrameSplitOperator.IsNumber(item.Field))chart.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))chart.SortInfo.Sort=item.Sort;}if(option.VirtualTable){var item=option.VirtualTable;if(IFrameSplitOperator.IsBool(item.Enable))chart.Data.Virtual.Enable=item.Enable;}var reportChart=chart.GetReportChart();if(reportChart){if(IFrameSplitOperator.IsNumber(option.TextOverflowStyle))reportChart.TextOverflowStyle=option.TextOverflowStyle;if(IFrameSplitOperator.IsNumber(option.MultiSelectModel))reportChart.MultiSelectModel=option.MultiSelectModel;if(IFrameSplitOperator.IsNumber(option.SelectedStyle))reportChart.SelectedStyle=option.SelectedStyle;}this.SetChartBorder(chart,option);//是否自动更新
13303
13303
  if(option.IsAutoUpdate!=null)chart.IsAutoUpdate=option.IsAutoUpdate;if(option.AutoUpdateFrequency>0)chart.AutoUpdateFrequency=option.AutoUpdateFrequency;//数据筛选
13304
13304
  if(option.DataFilter){var item=option.DataFilter;if(IFrameSplitOperator.IsBool(item.Enable))chart.DataFilterConfig.Enable=item.Enable;}//注册事件
@@ -13361,9 +13361,13 @@ this.UIElement=uielement;this.LastPoint=new Point();//鼠标位置
13361
13361
  this.IsOnTouch=false;this.TouchDrag;this.TouchMoveMinAngle=70;//左右移动最小角度
13362
13362
  this.YStepPixel=5*GetDevicePixelRatio();this.XStepPixel=10*GetDevicePixelRatio();this.PageUpDownCycle=true;//翻页循环
13363
13363
  this.DragPageCycle=true;//手机翻页循环
13364
- this.WheelPageType=0;//鼠标滚轴翻页模式 0=一页一页翻 1=一条一条翻
13365
- //拖拽滚动条
13366
- this.DragXScroll=null;//{Start:{x,y}, End:{x, y}}
13364
+ //this.WheelPageType=0; //鼠标滚轴翻页模式 0=一页一页翻 1=一条一条翻
13365
+ //鼠标滚轴配置
13366
+ // Type:0=一页一页翻 1=一条一条翻,
13367
+ // RowStep:单条数据滚动步长
13368
+ // EnableCtrlTurn Ctrl+滚轴翻页
13369
+ this.WheelPageConfig={Type:0,RowStep:1,EnableCtrlTurn:false//拖拽滚动条
13370
+ };this.DragXScroll=null;//{Start:{x,y}, End:{x, y}}
13367
13371
  this.DragYScroll=null;this.IsShowVScrollbar=false;this.IsDestroy=false;//是否已经销毁了
13368
13372
  this.JSPopMenu;//内置菜单
13369
13373
  this.IsShowRightMenu=true;//
@@ -13541,9 +13545,10 @@ var frequency=this.AutoUpdateFrequency;if(marketStatus==1)//盘前
13541
13545
  //{event:事件id, callback:回调函数}
13542
13546
  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)//获取事件回调
13543
13547
  {if(!this.mapEvent.has(id))return null;var item=this.mapEvent.get(id);return item;};this.OnSize=function(){if(!this.Frame)return;this.SetSizeChange(true);this.Draw();this.DelayUpdateStockData();};this.SetSizeChange=function(bChanged){for(var i=0;i<this.ChartPaint.length;++i){var chart=this.ChartPaint[i];if(chart)chart.SizeChange=bChanged;}};this.OnWheel=function(e)//滚轴
13544
- {JSConsole.Chart.Log('[JSReportChartContainer::OnWheel]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;var isInClient=false;this.Canvas.beginPath();this.Canvas.rect(this.Frame.ChartBorder.GetLeft(),this.Frame.ChartBorder.GetTop(),this.Frame.ChartBorder.GetWidth(),this.Frame.ChartBorder.GetHeight());isInClient=this.Canvas.isPointInPath(x,y);if(!isInClient)return;var chart=this.ChartPaint[0];if(!chart)return;var wheelValue=e.wheelDelta;if(!IFrameSplitOperator.IsObjectExist(e.wheelDelta))wheelValue=e.deltaY*-0.01;if(this.WheelPageType==1){console.log('[OnWheel] wheelValue='+wheelValue);if(wheelValue<0)//下
13545
- {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoNextItem(1)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上
13546
- {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoNextItem(-1)){this.Draw();this.DelayUpdateStockData();}}}else{if(wheelValue<0)//下一页
13548
+ {JSConsole.Chart.Log('[JSReportChartContainer::OnWheel]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;var x=e.clientX-this.UIElement.getBoundingClientRect().left;var y=e.clientY-this.UIElement.getBoundingClientRect().top;var isInClient=false;this.Canvas.beginPath();this.Canvas.rect(this.Frame.ChartBorder.GetLeft(),this.Frame.ChartBorder.GetTop(),this.Frame.ChartBorder.GetWidth(),this.Frame.ChartBorder.GetHeight());isInClient=this.Canvas.isPointInPath(x,y);if(!isInClient)return;var chart=this.ChartPaint[0];if(!chart)return;var wheelValue=e.wheelDelta;if(!IFrameSplitOperator.IsObjectExist(e.wheelDelta))wheelValue=e.deltaY*-0.01;var type=this.WheelPageConfig.Type;if(this.WheelPageConfig.EnableCtrlTurn&&e&&e.ctrlKey)type=0;//ctrl 翻页
13549
+ if(type){var step=this.WheelPageConfig.RowStep;if(wheelValue<0)//下
13550
+ {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoNextItem(step)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上
13551
+ {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoNextItem(step*-1)){this.Draw();this.DelayUpdateStockData();}}}else{if(wheelValue<0)//下一页
13547
13552
  {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoNextPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}else if(wheelValue>0)//上一页
13548
13553
  {this.LastMouseStatus.TooltipStatus=null;this.HideAllTooltip();if(this.GotoPreviousPage(this.PageUpDownCycle)){this.Draw();this.DelayUpdateStockData();}}}if(e.preventDefault)e.preventDefault();else e.returnValue=false;};this.OnKeyDown=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetReportChart();if(!reportChart)return;var keyID=e.keyCode?e.keyCode:e.which;//回调事件
13549
13554
  var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYDOWN);if(event&&event.Callback){var sendData={e:e,KeyID:keyID,PreventDefault:false,ReportChart:reportChart};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}if(keyID==116)return;//F15刷新不处理
@@ -15275,7 +15280,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
15275
15280
  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);};}/********************************************************************************
15276
15281
  * 版本信息输出
15277
15282
  *
15278
- */var HQCHART_VERSION="1.1.15001";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();//把给外界调用的方法暴露出来
15283
+ */var HQCHART_VERSION="1.1.15005";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();//把给外界调用的方法暴露出来
15279
15284
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
15280
15285
  // BaseIndex:BaseIndex,
15281
15286
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.15002",
3
+ "version": "1.1.15006",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.NetworkFilterTest.js CHANGED
@@ -55796,35 +55796,69 @@ HQData.Minute_RequestMinuteData=function(data, callback)
55796
55796
  }
55797
55797
  */
55798
55798
 
55799
- var before=[];
55800
- var beforeinfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:91500, End:92459, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
55801
- var price=srcStock.yclose+0.01;
55799
+ if (symbol=="000001.sh") //指数
55800
+ {
55801
+ var before=[];
55802
+ var beforeinfo={ totalcount:60*10, ver:3.0, TimeConfig:{ AryTime:[{ Start:91500, End:92459, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
55803
+ var price=srcStock.yclose+0.01;
55804
+ var vol=0;
55802
55805
 
55803
- var date=new Date(2021,5,2, 9,15, 0);
55804
- before=
55805
- [
55806
- [91505,price+0.01, 400, 300, 1, 800],
55807
- [91550,price+0.02, 550, 600, 0, 1500],
55808
- [91603,price+0.03, 300, 600, 1, 3600],
55809
- [91613,price+0.03, 150, 320, 1, 3600],
55810
- [91623,price+0.04, 200, 400, 1, 3600],
55811
- [91635,price+0.05, 100, 100, 1, 3600],
55812
- [91640,price+0.03, 350, 210, 2, 1600],
55813
- [91711,price+0.02, 3210, 350, 2, 3700],
55814
- [91731,price+0.04, 110, 450, 1, 3700],
55815
- [91825,price-0.01, 210, 650, 2, 3700],
55816
- [91855,price-0.02, 330, 440, 1, 1000],
55817
- [91915,price-0.03, 630, 640, 1, 1200],
55818
- [92022,price+0.01, 260, 550, 2, 1000],
55819
- [92304,price-0.02, 300, 100, 2, 1000],
55820
- [92314,price-0.03, 550, 150, 2, 1000],
55821
- [92344,price-0.04, 550, 150, 1, 1000],
55822
- [92357,price-0.05, 250, 750, 1, 1500],
55823
- [92405,price-0.07, 450, 50, 2, 1000],
55824
- [92435,price-0.08, 650, 250, 1, 1000],
55825
- [92458,price-0.12, 350, 350, 2, 1000],
55826
- ];
55827
-
55806
+ var date=new Date(2021,5,2, 9,15, 0);
55807
+ var testData={ Up:1, Max:srcStock.yclose*1.02, Min:srcStock.yclose*0.98 };
55808
+
55809
+ for(var i=0;i<beforeinfo.totalcount; ++i) //3s一个数据
55810
+ {
55811
+ var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
55812
+ vol=HQData.GetRandomTestData(100,500)*1000;
55813
+ var item=[ time, price, price+0.04, vol, 3, vol*1.3 ];
55814
+ before.push(item);
55815
+
55816
+ if (price>testData.Max && testData.Up===1)
55817
+ testData.Up=0;
55818
+ else if (price<testData.Min && testData.Up===0)
55819
+ testData.Up=1;
55820
+
55821
+ var value=HQData.GetRandomTestData(1,10)/100;
55822
+ if (testData.Up==1) price+=value;
55823
+ else price-=value;
55824
+
55825
+ date.setSeconds(date.getSeconds()+3);
55826
+ time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
55827
+ if (time>92500) break;
55828
+ }
55829
+
55830
+ }
55831
+ else //股票
55832
+ {
55833
+ var before=[];
55834
+ var beforeinfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:91500, End:92459, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
55835
+ var price=srcStock.yclose+0.01;
55836
+
55837
+ var date=new Date(2021,5,2, 9,15, 0);
55838
+ before=
55839
+ [
55840
+ [91505,price+0.01, 400, 300, 1, 800],
55841
+ [91550,price+0.02, 550, 600, 0, 1500],
55842
+ [91603,price+0.03, 300, 600, 1, 3600],
55843
+ [91613,price+0.03, 150, 320, 1, 3600],
55844
+ [91623,price+0.04, 200, 400, 1, 3600],
55845
+ [91635,price+0.05, 100, 100, 1, 3600],
55846
+ [91640,price+0.03, 350, 210, 2, 1600],
55847
+ [91711,price+0.02, 3210, 350, 2, 3700],
55848
+ [91731,price+0.04, 110, 450, 1, 3700],
55849
+ [91825,price-0.01, 210, 650, 2, 3700],
55850
+ [91855,price-0.02, 330, 440, 1, 1000],
55851
+ [91915,price-0.03, 630, 640, 1, 1200],
55852
+ [92022,price+0.01, 260, 550, 2, 1000],
55853
+ [92304,price-0.02, 300, 100, 2, 1000],
55854
+ [92314,price-0.03, 550, 150, 2, 1000],
55855
+ [92344,price-0.04, 550, 150, 1, 1000],
55856
+ [92357,price-0.05, 250, 750, 1, 1500],
55857
+ [92405,price-0.07, 450, 50, 2, 1000],
55858
+ [92435,price-0.08, 650, 250, 1, 1000],
55859
+ [92458,price-0.12, 350, 350, 2, 1000],
55860
+ ];
55861
+ }
55828
55862
 
55829
55863
  stockItem.before=before;
55830
55864
  stockItem.beforeinfo=beforeinfo;
@@ -55907,27 +55941,51 @@ HQData.Minute_RequestMinuteData=function(data, callback)
55907
55941
  }
55908
55942
  */
55909
55943
 
55910
- var afterData=[]
55911
- var afterInfo={ ver:2.0, totalcount:60*3, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} } //14:57-15:00
55912
- if (stockItem.minute.length>=240)
55944
+ if (symbol=="000001.sh") //指数
55913
55945
  {
55914
- afterData=
55915
- [
55916
- [145708,price+0.01, 400, 300, 1, 800],
55917
- [145718,price+0.02, 550, 600, 0, 1500],
55918
- [145738,price+0.02, 150, 800, 0, 1500],
55919
- [145748,price+0.02, 150, 800, 0, 1500],
55920
- [145803,price+0.03, 300, 600, 1, 3600],
55921
- [145815,price+0.03, 350, 210, 2, 1600],
55922
- [145826,price+0.02, 1210, 350, 2, 2700],
55923
- [145833,price+0.01, 260, 550, 2, 1000],
55924
- [145845,price+0.02, 160, 750, 2, 1000],
55925
- [145858,price-0.01, 460, 650, 2, 1500],
55926
- [145905,price-0.02, 160, 450, 1, 1500],
55927
- [145928,price-0.02, 260, 250, 1, 1500],
55928
- [145948,price-0.02, 860, 150, 1, 1500],
55929
- ];
55946
+ var afterData=[]
55947
+ var afterInfo={ ver:3.0, totalcount:60*3, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} } //14:57-15:00
55948
+ var date=new Date(2021,5,2, 14,57, 0);
55949
+ var vol=0;
55950
+ for(var i=0;i<afterInfo.totalcount; ++i) //1s一个数据
55951
+ {
55952
+ var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
55953
+
55954
+ vol=HQData.GetRandomTestData(100,500)*1000;
55955
+ var item=[ time, price, price+0.04, vol, 3, vol*1.3 ];
55956
+
55957
+ afterData.push(item);
55958
+
55959
+ date.setSeconds(date.getSeconds()+3);
55960
+ var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
55961
+ if (time>145959) break;
55962
+ }
55963
+ }
55964
+ else
55965
+ {
55966
+ var afterData=[]
55967
+ var afterInfo={ ver:2.0, totalcount:60*3, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} } //14:57-15:00
55968
+ if (stockItem.minute.length>=240)
55969
+ {
55970
+ afterData=
55971
+ [
55972
+ [145708,price+0.01, 400, 300, 1, 800],
55973
+ [145718,price+0.02, 550, 600, 0, 1500],
55974
+ [145738,price+0.02, 150, 800, 0, 1500],
55975
+ [145748,price+0.02, 150, 800, 0, 1500],
55976
+ [145803,price+0.03, 300, 600, 1, 3600],
55977
+ [145815,price+0.03, 350, 210, 2, 1600],
55978
+ [145826,price+0.02, 1210, 350, 2, 2700],
55979
+ [145833,price+0.01, 260, 550, 2, 1000],
55980
+ [145845,price+0.02, 160, 750, 2, 1000],
55981
+ [145858,price-0.01, 460, 650, 2, 1500],
55982
+ [145905,price-0.02, 160, 450, 1, 1500],
55983
+ [145928,price-0.02, 260, 250, 1, 1500],
55984
+ [145948,price-0.02, 860, 150, 1, 1500],
55985
+ ];
55986
+ }
55930
55987
  }
55988
+
55931
55989
  stockItem.after=afterData;
55932
55990
  stockItem.afterinfo=afterInfo;
55933
55991
  }
@@ -55981,16 +56039,50 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
55981
56039
 
55982
56040
  if (callcation.Before)
55983
56041
  {
55984
- var beforeinfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:91500, End:92459, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
55985
- var price=srcStock.yclose-0.01;
55986
- var before=
55987
- [
55988
- [92344,price-0.03, 150, 150, 2, 1000],
55989
- [92357,price-0.04, 250, 250, 2, 1500],
55990
- [92405,price-0.05, 350, 350, 1, 1000],
55991
- [92435,price-0.06, 450, 450, 1, 1000],
55992
- [92458,price-0.07, 550, 550, 2, 1000],
55993
- ];
56042
+ if (symbol=="000001.sh") //指数
56043
+ {
56044
+ var before=[];
56045
+ var beforeinfo={ totalcount:60*10, ver:3.0, TimeConfig:{ AryTime:[{ Start:91500, End:92459, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
56046
+ var price=srcStock.yclose+0.01;
56047
+ var vol=0;
56048
+
56049
+ var date=new Date(2021,5,2, 9,15, 0);
56050
+ var testData={ Value:0.01, Up:1, Max:srcStock.yclose*1.02, Min:srcStock.yclose*0.98 };
56051
+
56052
+ for(var i=0;i<beforeinfo.totalcount; ++i) //3s一个数据
56053
+ {
56054
+ vol=HQData.GetRandomTestData(100,500)*1000;
56055
+ var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
56056
+ var item=[ time, price, price+0.04, vol, 3, vol*1.3 ];
56057
+ before.push(item);
56058
+
56059
+ if (price>testData.Max && testData.Up===1)
56060
+ testData.Up=0;
56061
+ else if (price<testData.Min && testData.Up===0)
56062
+ testData.Up=1;
56063
+
56064
+ var value=HQData.GetRandomTestData(1,10)/100;
56065
+ if (testData.Up==1) price+=value;
56066
+ else price-=value;
56067
+
56068
+ date.setSeconds(date.getSeconds()+3);
56069
+ time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
56070
+ if (time>92500) break;
56071
+ }
56072
+ }
56073
+ else
56074
+ {
56075
+ var beforeinfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:91500, End:92459, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
56076
+ var price=srcStock.yclose-0.01;
56077
+ var before=
56078
+ [
56079
+ [92344,price-0.03, 150, 150, 2, 1000],
56080
+ [92357,price-0.04, 250, 250, 2, 1500],
56081
+ [92405,price-0.05, 350, 350, 1, 1000],
56082
+ [92435,price-0.06, 450, 450, 1, 1000],
56083
+ [92458,price-0.07, 550, 550, 2, 1000],
56084
+ ];
56085
+ }
55994
56086
 
55995
56087
  stockItem.before=before;
55996
56088
  stockItem.beforeinfo=beforeinfo;
@@ -55998,30 +56090,57 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
55998
56090
 
55999
56091
  if (callcation.After)
56000
56092
  {
56001
- var afterInfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
56002
- var afterData=[];
56003
-
56004
- if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
56093
+ if (symbol=="000001.sh") //指数
56005
56094
  {
56006
- var price=lastItem[5];
56007
- afterData=
56008
- [
56009
- [145708,price+0.01, 400, 300, 1, 800],
56010
- [145718,price+0.02, 550, 600, 0, 1500],
56011
- [145738,price+0.02, 150, 800, 0, 1500],
56012
- [145748,price+0.02, 150, 800, 0, 1500],
56013
- [145803,price+0.03, 300, 600, 1, 3600],
56014
- [145815,price+0.03, 350, 210, 2, 1600],
56015
- [145826,price+0.02, 1210, 350, 2, 2700],
56016
- [145833,price+0.01, 260, 550, 2, 1000],
56017
- [145845,price+0.02, 160, 750, 2, 1000],
56018
- [145858,price-0.01, 460, 650, 2, 1500],
56019
- [145905,price-0.02, 160, 450, 1, 1500],
56020
- [145928,price-0.02, 260, 250, 1, 1500],
56021
- [145948,price-0.02, 860, 150, 1, 1500],
56022
- ];
56095
+ var afterData=[]
56096
+ var afterInfo={ ver:3.0, totalcount:60*3, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} } //14:57-15:00
56097
+ if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
56098
+ {
56099
+ var price=lastItem[5];
56100
+ var date=new Date(2021,5,2, 14,57, 0);
56101
+ var vol=0;
56102
+ for(var i=0;i<afterInfo.totalcount; ++i) //1s一个数据
56103
+ {
56104
+ var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
56105
+
56106
+ vol=HQData.GetRandomTestData(100,500)*1000;
56107
+ var item=[ time, price, price+0.04, vol, 3, vol*1.3 ];
56108
+
56109
+ afterData.push(item);
56110
+
56111
+ date.setSeconds(date.getSeconds()+3);
56112
+ var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
56113
+ if (time>145959) break;
56114
+ }
56115
+ }
56023
56116
  }
56117
+ else
56118
+ {
56119
+ var afterInfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
56120
+ var afterData=[];
56024
56121
 
56122
+ if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
56123
+ {
56124
+ var price=lastItem[5];
56125
+ afterData=
56126
+ [
56127
+ [145708,price+0.01, 400, 300, 1, 800],
56128
+ [145718,price+0.02, 550, 600, 0, 1500],
56129
+ [145738,price+0.02, 150, 800, 0, 1500],
56130
+ [145748,price+0.02, 150, 800, 0, 1500],
56131
+ [145803,price+0.03, 300, 600, 1, 3600],
56132
+ [145815,price+0.03, 350, 210, 2, 1600],
56133
+ [145826,price+0.02, 1210, 350, 2, 2700],
56134
+ [145833,price+0.01, 260, 550, 2, 1000],
56135
+ [145845,price+0.02, 160, 750, 2, 1000],
56136
+ [145858,price-0.01, 460, 650, 2, 1500],
56137
+ [145905,price-0.02, 160, 450, 1, 1500],
56138
+ [145928,price-0.02, 260, 250, 1, 1500],
56139
+ [145948,price-0.02, 860, 150, 1, 1500],
56140
+ ];
56141
+ }
56142
+ }
56143
+
56025
56144
  stockItem.after=afterData;
56026
56145
  stockItem.afterinfo=afterInfo;
56027
56146
  }
package/src/jscommon/umychart.js CHANGED
@@ -13525,6 +13525,7 @@ function AverageWidthFrame()
13525
13525
  {
13526
13526
  var x=mouseOnToolbar.Point.X;
13527
13527
  var y=mouseOnToolbar.Point.Y+20;
13528
+ if (y+textHeight>border.ChartHeight) y=mouseOnToolbar.Point.Y-5-textHeight;
13528
13529
  }
13529
13530
  else if (JSCHART_BUTTON_ID.CLOSE_BEFOREOPEN_ID==mouseOnToolbar.Item.ID)
13530
13531
  {
package/src/jscommon/umychart.report.js CHANGED
@@ -190,10 +190,18 @@ function JSReportChart(divElement)
190
190
  if (IFrameSplitOperator.IsBool(option.EnableDragRow)) chart.EnableDragRow=option.EnableDragRow;
191
191
  if (IFrameSplitOperator.IsNumber(option.DragRowType)) chart.DragRowType=option.DragRowType;
192
192
  if (IFrameSplitOperator.IsBool(option.EnableDragHeader)) chart.EnableDragHeader=option.EnableDragHeader;
193
- if (IFrameSplitOperator.IsNumber(option.WheelPageType)) chart.WheelPageType=option.WheelPageType;
193
+ if (IFrameSplitOperator.IsNumber(option.WheelPageType)) chart.WheelPageConfig.Type=option.WheelPageType;
194
194
  if (IFrameSplitOperator.IsBool(option.PageUpDownCycle)) chart.PageUpDownCycle=option.PageUpDownCycle;
195
195
  if (IFrameSplitOperator.IsBool(option.EnablePageUpdate)) chart.EnablePageUpdate=option.EnablePageUpdate;
196
196
 
197
+ if (option.WheelPage)
198
+ {
199
+ var item=option.WheelPage;
200
+ if (IFrameSplitOperator.IsNumber(item.Type)) chart.WheelPageConfig.Type=item.Type;
201
+ if (IFrameSplitOperator.IsPlusNumber(item.RowStep)) chart.WheelPageConfig.RowStep=item.RowStep;
202
+ if (IFrameSplitOperator.IsBool(item.EnableCtrlTurn)) chart.WheelPageConfig.EnableCtrlTurn=item.EnableCtrlTurn;
203
+ }
204
+
197
205
  //数据下载提示信息
198
206
  if (IFrameSplitOperator.IsObject(option.SplashTitle))
199
207
  {
@@ -484,7 +492,13 @@ function JSReportChartContainer(uielement)
484
492
 
485
493
  this.PageUpDownCycle=true; //翻页循环
486
494
  this.DragPageCycle=true; //手机翻页循环
487
- this.WheelPageType=0; //鼠标滚轴翻页模式 0=一页一页翻 1=一条一条翻
495
+ //this.WheelPageType=0; //鼠标滚轴翻页模式 0=一页一页翻 1=一条一条翻
496
+
497
+ //鼠标滚轴配置
498
+ // Type:0=一页一页翻 1=一条一条翻,
499
+ // RowStep:单条数据滚动步长
500
+ // EnableCtrlTurn Ctrl+滚轴翻页
501
+ this.WheelPageConfig={ Type:0, RowStep:1, EnableCtrlTurn:false }
488
502
 
489
503
  //拖拽滚动条
490
504
  this.DragXScroll=null; //{Start:{x,y}, End:{x, y}}
@@ -1999,14 +2013,17 @@ function JSReportChartContainer(uielement)
1999
2013
  if (!IFrameSplitOperator.IsObjectExist(e.wheelDelta))
2000
2014
  wheelValue=e.deltaY* -0.01;
2001
2015
 
2002
- if (this.WheelPageType==1)
2016
+ var type=this.WheelPageConfig.Type;
2017
+ if (this.WheelPageConfig.EnableCtrlTurn && e && e.ctrlKey) type=0; //ctrl 翻页
2018
+
2019
+ if (type)
2003
2020
  {
2004
- console.log(`[OnWheel] wheelValue=${wheelValue}`);
2021
+ var step=this.WheelPageConfig.RowStep;
2005
2022
  if (wheelValue<0) //下
2006
2023
  {
2007
2024
  this.LastMouseStatus.TooltipStatus=null;
2008
2025
  this.HideAllTooltip();
2009
- if (this.GotoNextItem(1))
2026
+ if (this.GotoNextItem(step))
2010
2027
  {
2011
2028
  this.Draw();
2012
2029
  this.DelayUpdateStockData();
@@ -2016,7 +2033,7 @@ function JSReportChartContainer(uielement)
2016
2033
  {
2017
2034
  this.LastMouseStatus.TooltipStatus=null;
2018
2035
  this.HideAllTooltip();
2019
- if (this.GotoNextItem(-1))
2036
+ if (this.GotoNextItem(step*-1))
2020
2037
  {
2021
2038
  this.Draw();
2022
2039
  this.DelayUpdateStockData();