Skip to content

Commit

Permalink
ver 14163
Browse files Browse the repository at this point in the history 
14162 修正小程序分时图不显示标题栏
14158 报价列表键盘操作时隐藏分时图提示信息
14157 T型报价键盘操作时隐藏分时图提示信息
14155 JSTReportChart::GetReportChart() 改成 GetTReportChart()
14153 T型报价增加onmouseout， onmouseleave
  • Loading branch information
@jones2000
jones2000 committed Nov 21, 2024
1 parent 746f06e commit 04a401e
Show file tree
Hide file tree
Showing 19 changed files with 119 additions and 61 deletions.
10 changes: 8 additions & 2 deletions umychart_uniapp_h5/umychart.uniapp.h5.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88972,6 +88972,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;
frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;
frame.YSplitOperator.FloatPrecision=0; //持仓量 整数

var chart=new ChartMinutePositionLine();
chart.Canvas=this.Canvas
Expand Down Expand Up @@ -124822,7 +124823,7 @@ function GetBlackStyle()
PriceColor: "rgb(25,180,231)",
AreaPriceColor:"rgba(63,158,255,.3)",
AvPriceColor: "rgb(255,236,0)",
PositionColor:'rgb(218,165,32)',
PositionColor:'rgb(201, 9, 224)',
VolTitleColor:"rgb(190,190,190)",
Before:
{
Expand Down Expand Up @@ -128843,6 +128844,7 @@ function JSReportChartContainer(uielement)
if (wheelValue<0) //下
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextItem(1))
{
this.Draw();
Expand All @@ -128852,6 +128854,7 @@ function JSReportChartContainer(uielement)
else if (wheelValue>0) //上
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextItem(-1))
{
this.Draw();
Expand All @@ -128864,6 +128867,7 @@ function JSReportChartContainer(uielement)
if (wheelValue<0) //下一页
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextPage(this.PageUpDownCycle))
{
this.Draw();
Expand All @@ -128873,6 +128877,7 @@ function JSReportChartContainer(uielement)
else if (wheelValue>0) //上一页
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoPreviousPage(this.PageUpDownCycle))
{
this.Draw();
Expand All @@ -128894,6 +128899,7 @@ function JSReportChartContainer(uielement)
var keyID = e.keyCode ? e.keyCode :e.which;
if (keyID==116) return; //F15刷新不处理

this.HideMinuteChartTooltip();
switch(keyID)
{
case 33: //page up
Expand Down Expand Up @@ -139523,7 +139529,7 @@ function ScrollBarBGChart()



var HQCHART_VERSION="1.1.14151";
var HQCHART_VERSION="1.1.14160";

function PrintHQChartVersion()
{
Expand Down
31 changes: 19 additions & 12 deletions vuehqchart/src/jscommon/umychart.TReport.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -470,14 +470,13 @@ function JSTReportChartContainer(uielement)
this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
this.UIElement.onmousedown=(e)=> { this.UIOnMouseDown(e); }
this.UIElement.onmousemove=(e)=>{ this.UIOnMouseMove(e);}
this.UIElement.onmouseout=(e)=>{ this.UIOnMounseOut(e); }
this.UIElement.onmouseleave=(e)=>{ this.UIOnMouseleave(e); }

/*
this.UIElement.onmouseup=(e)=>{ this.UIOnMounseUp(e); }
this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }
this.UIElement.onmouseout=(e)=>{ this.UIOnMounseOut(e); }
this.UIElement.onmouseleave=(e)=>{ this.UIOnMouseleave(e); }
//手机拖拽
this.UIElement.ontouchstart=(e)=> { this.OnTouchStart(e); }
Expand Down Expand Up @@ -1042,10 +1041,10 @@ function JSTReportChartContainer(uielement)
//document.onmouseup=(e)=> { this.DocOnMouseUp(e); }
}

this.GetReportChart=function()
this.GetTReportChart=function()
{
var chart=this.ChartPaint[0];
if (!chart) return;
if (!chart) return null;

return chart;
}
Expand All @@ -1068,7 +1067,7 @@ function JSTReportChartContainer(uielement)

this.LastMouseStatus.OnMouseMove={ X:x, Y:y };
var mouseStatus={ Cursor:"default", Name:"Default"};; //鼠标状态
var report=this.GetReportChart();
var report=this.GetTReportChart();
var bDraw=false;

if (report)
Expand Down Expand Up @@ -1115,6 +1114,16 @@ function JSTReportChartContainer(uielement)
}
}

this.UIOnMounseOut=function(e)
{
this.HideMinuteChartTooltip();
}

this.UIOnMouseleave=function(e)
{
this.HideMinuteChartTooltip();
}

//点表头
this.OnClickHeader=function(clickData, e)
{
Expand Down Expand Up @@ -1291,12 +1300,6 @@ function JSTReportChartContainer(uielement)
}
}

this.GetTReportChart=function()
{
var chart=this.ChartPaint[0];
return chart;
}

this.OnWheel=function(e) //滚轴
{
JSConsole.Chart.Log('[JSTReportChartContainer::OnWheel]',e);
Expand All @@ -1322,6 +1325,7 @@ function JSTReportChartContainer(uielement)
if (wheelValue<0) //下
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
var result=this.MoveSelectedRow(1,{ EnablePageCycle:this.EnablePageCycle })
if (result)
{
Expand All @@ -1332,6 +1336,7 @@ function JSTReportChartContainer(uielement)
else if (wheelValue>0) //上
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
var result=this.MoveSelectedRow(-1,{ EnablePageCycle:this.EnablePageCycle} );
if (result)
{
Expand All @@ -1353,6 +1358,8 @@ function JSTReportChartContainer(uielement)
var keyID = e.keyCode ? e.keyCode :e.which;
if (keyID==116) return; //F15刷新不处理

this.HideMinuteChartTooltip();

switch(keyID)
{
/*
Expand Down
1 change: 1 addition & 0 deletions vuehqchart/src/jscommon/umychart.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85047,6 +85047,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;
frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;
frame.YSplitOperator.FloatPrecision=0; //持仓量 整数

var chart=new ChartMinutePositionLine();
chart.Canvas=this.Canvas
Expand Down
5 changes: 5 additions & 0 deletions vuehqchart/src/jscommon/umychart.report.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1737,6 +1737,7 @@ function JSReportChartContainer(uielement)
if (wheelValue<0) //下
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextItem(1))
{
this.Draw();
Expand All @@ -1746,6 +1747,7 @@ function JSReportChartContainer(uielement)
else if (wheelValue>0) //上
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextItem(-1))
{
this.Draw();
Expand All @@ -1758,6 +1760,7 @@ function JSReportChartContainer(uielement)
if (wheelValue<0) //下一页
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextPage(this.PageUpDownCycle))
{
this.Draw();
Expand All @@ -1767,6 +1770,7 @@ function JSReportChartContainer(uielement)
else if (wheelValue>0) //上一页
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoPreviousPage(this.PageUpDownCycle))
{
this.Draw();
Expand All @@ -1788,6 +1792,7 @@ function JSReportChartContainer(uielement)
var keyID = e.keyCode ? e.keyCode :e.which;
if (keyID==116) return; //F15刷新不处理

this.HideMinuteChartTooltip();
switch(keyID)
{
case 33: //page up
Expand Down
2 changes: 1 addition & 1 deletion vuehqchart/src/jscommon/umychart.style.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function GetBlackStyle()
PriceColor: "rgb(25,180,231)",
AreaPriceColor:"rgba(63,158,255,.3)",
AvPriceColor: "rgb(255,236,0)",
PositionColor:'rgb(218,165,32)',
PositionColor:'rgb(201, 9, 224)',
VolTitleColor:"rgb(190,190,190)",
Before:
{
Expand Down
2 changes: 1 addition & 1 deletion vuehqchart/src/jscommon/umychart.version.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@



var HQCHART_VERSION="1.1.14151";
var HQCHART_VERSION="1.1.14160";

function PrintHQChartVersion()
{
Expand Down
41 changes: 27 additions & 14 deletions vuehqchart/src/jscommon/umychart.vue/umychart.vue.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89016,6 +89016,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
frame.YSplitOperator.SplitCount=subFrame.Frame.YSplitOperator.SplitCount;
frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); };
frame.YSplitOperator.OverlayIdentify=overlayFrame.Identify;
frame.YSplitOperator.FloatPrecision=0; //持仓量 整数

var chart=new ChartMinutePositionLine();
chart.Canvas=this.Canvas
Expand Down Expand Up @@ -124866,7 +124867,7 @@ function GetBlackStyle()
PriceColor: "rgb(25,180,231)",
AreaPriceColor:"rgba(63,158,255,.3)",
AvPriceColor: "rgb(255,236,0)",
PositionColor:'rgb(218,165,32)',
PositionColor:'rgb(201, 9, 224)',
VolTitleColor:"rgb(190,190,190)",
Before:
{
Expand Down Expand Up @@ -128887,6 +128888,7 @@ function JSReportChartContainer(uielement)
if (wheelValue<0) //下
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextItem(1))
{
this.Draw();
Expand All @@ -128896,6 +128898,7 @@ function JSReportChartContainer(uielement)
else if (wheelValue>0) //上
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextItem(-1))
{
this.Draw();
Expand All @@ -128908,6 +128911,7 @@ function JSReportChartContainer(uielement)
if (wheelValue<0) //下一页
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoNextPage(this.PageUpDownCycle))
{
this.Draw();
Expand All @@ -128917,6 +128921,7 @@ function JSReportChartContainer(uielement)
else if (wheelValue>0) //上一页
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
if (this.GotoPreviousPage(this.PageUpDownCycle))
{
this.Draw();
Expand All @@ -128938,6 +128943,7 @@ function JSReportChartContainer(uielement)
var keyID = e.keyCode ? e.keyCode :e.which;
if (keyID==116) return; //F15刷新不处理

this.HideMinuteChartTooltip();
switch(keyID)
{
case 33: //page up
Expand Down Expand Up @@ -136698,14 +136704,13 @@ function JSTReportChartContainer(uielement)
this.UIElement.ondblclick=(e)=>{ this.UIOnDblClick(e); }
this.UIElement.onmousedown=(e)=> { this.UIOnMouseDown(e); }
this.UIElement.onmousemove=(e)=>{ this.UIOnMouseMove(e);}
this.UIElement.onmouseout=(e)=>{ this.UIOnMounseOut(e); }
this.UIElement.onmouseleave=(e)=>{ this.UIOnMouseleave(e); }

/*
this.UIElement.onmouseup=(e)=>{ this.UIOnMounseUp(e); }
this.UIElement.oncontextmenu=(e)=> { this.UIOnContextMenu(e); }

this.UIElement.onmouseout=(e)=>{ this.UIOnMounseOut(e); }
this.UIElement.onmouseleave=(e)=>{ this.UIOnMouseleave(e); }


//手机拖拽
this.UIElement.ontouchstart=(e)=> { this.OnTouchStart(e); }
Expand Down Expand Up @@ -137270,10 +137275,10 @@ function JSTReportChartContainer(uielement)
//document.onmouseup=(e)=> { this.DocOnMouseUp(e); }
}

this.GetReportChart=function()
this.GetTReportChart=function()
{
var chart=this.ChartPaint[0];
if (!chart) return;
if (!chart) return null;

return chart;
}
Expand All @@ -137296,7 +137301,7 @@ function JSTReportChartContainer(uielement)

this.LastMouseStatus.OnMouseMove={ X:x, Y:y };
var mouseStatus={ Cursor:"default", Name:"Default"};; //鼠标状态
var report=this.GetReportChart();
var report=this.GetTReportChart();
var bDraw=false;

if (report)
Expand Down Expand Up @@ -137343,6 +137348,16 @@ function JSTReportChartContainer(uielement)
}
}

this.UIOnMounseOut=function(e)
{
this.HideMinuteChartTooltip();
}

this.UIOnMouseleave=function(e)
{
this.HideMinuteChartTooltip();
}

//点表头
this.OnClickHeader=function(clickData, e)
{
Expand Down Expand Up @@ -137519,12 +137534,6 @@ function JSTReportChartContainer(uielement)
}
}

this.GetTReportChart=function()
{
var chart=this.ChartPaint[0];
return chart;
}

this.OnWheel=function(e) //滚轴
{
JSConsole.Chart.Log('[JSTReportChartContainer::OnWheel]',e);
Expand All @@ -137550,6 +137559,7 @@ function JSTReportChartContainer(uielement)
if (wheelValue<0) //下
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
var result=this.MoveSelectedRow(1,{ EnablePageCycle:this.EnablePageCycle })
if (result)
{
Expand All @@ -137560,6 +137570,7 @@ function JSTReportChartContainer(uielement)
else if (wheelValue>0) //上
{
this.LastMouseStatus.TooltipStatus=null;
this.HideMinuteChartTooltip();
var result=this.MoveSelectedRow(-1,{ EnablePageCycle:this.EnablePageCycle} );
if (result)
{
Expand All @@ -137581,6 +137592,8 @@ function JSTReportChartContainer(uielement)
var keyID = e.keyCode ? e.keyCode :e.which;
if (keyID==116) return; //F15刷新不处理

this.HideMinuteChartTooltip();

switch(keyID)
{
/*
Expand Down Expand Up @@ -149010,7 +149023,7 @@ function HQChartScriptWorker()



var HQCHART_VERSION="1.1.14151";
var HQCHART_VERSION="1.1.14160";

function PrintHQChartVersion()
{
Expand Down
Loading

0 comments on commit 04a401e

Please sign in to comment.