Skip to content

hqchart
hqchart

bluefrankey / hqchart
与 Fork 源项目一致

从无法访问的项目Fork

通知 5
Star 0
Fork 0
hqchart
hqchart

前往新版Gitcode，体验更适合开发者的 AI 搜索 >>

提交 13cb64e2 编写于 作者: HQChart's avatar HQChart
浏览文件
操作

ver 8655 

8654 调整郑州期货交易所夜盘交易时间
8651 ChangeSymbol() 增加空代码是只绘制框架
8650 DrawEmpty() 修正没有清空缓存图片
8649 SetOption() 支持空的股票代码
8648 分时图增加键盘和上下滚动事件配置
8647 K线图增加键盘，滚动条事件是否注册属性
上级 52e5c116
隐藏空白更改
内联 并排
Showing with 475 addition and 135 deletion
umychart_uniapp_h5/umychart.uniapp.h5.js
浏览文件 @ 13cb64e2
......@@ -3851,7 +3851,7 @@ function JSChart(divElement)
if (!option.Windows || option.Windows.length<=0) return null;
//创建子窗口
chart.Create(option.Windows.length);
chart.Create(option.Windows.length, option.Listener);
if (option.Border)
{
......@@ -4200,7 +4200,7 @@ function JSChart(divElement)
if (option.Info && option.Info.length>0) chart.SetMinuteInfo(option.Info,false);
chart.Create(windowsCount); //创建子窗口
chart.Create(windowsCount,option.Listener); //创建子窗口
if (option.CorssCursorInfo)
{
......@@ -4595,13 +4595,21 @@ function JSChart(divElement)
if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
//设置股票代码
if (!option.Symbol) return false;
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
if (!option.Symbol)
{
chart.DrawEmpty();
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
}
else
{
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
}
}
this.CreateSimpleChart=function(option)
......@@ -5933,6 +5941,17 @@ function JSChartContainer(uielement)
this.OnMouseMove(x,y,e);
}
this.DrawEmpty=function()
{
if (this.UIElement.width<=0 || this.UIElement.height<=0) return;
this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);
if (this.Frame)
{
this.Frame.ScreenImageData=null;
this.Frame.Draw();
}
}
this.Draw=function()
{
if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
......@@ -30174,7 +30193,7 @@ function KLineChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount, option)
{
this.UIElement.JSChartContainer=this;
......@@ -30215,8 +30234,26 @@ function KLineChartContainer(uielement)
this.TitlePaint.push(titlePaint);
}
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -33034,6 +33071,12 @@ function KLineChartContainer(uielement)
this.CancelAutoUpdate(); //先停止定时器
this.AutoUpdateEvent(false,'KLineChartContainer::ChangeSymbol');
this.Symbol=symbol;
if (!symbol)
{
this.DrawEmpty();
return;
}
if (MARKET_SUFFIX_NAME.IsSHSZIndex(symbol)) this.Right=0; //指数没有复权
//清空指标
......@@ -35113,7 +35156,7 @@ function MinuteChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount,option)
{
this.UIElement.JSChartContainer=this;
......@@ -35155,8 +35198,26 @@ function MinuteChartContainer(uielement)
this.ChartCorssCursor.StringFormatX.Frame=this.Frame.SubFrame[0].Frame;
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -35506,9 +35567,16 @@ function MinuteChartContainer(uielement)
this.Symbol=symbol;
this.ResetOverlaySymbolStatus();
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
if (symbol)
{
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
}
else
{
this.DrawEmpty();
}
}
this.ChangeDayCount=function(count)
......@@ -45285,15 +45353,15 @@ function FuturesTimeData()
[MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:5,Decimal:1}],
[MARKET_SUFFIX_NAME.SHFE + '-SC', {Time:5,Decimal:1}],
//郑州期货交易所
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:3,Decimal:1}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:6,Decimal:0,Name:"油菜籽"}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:6,Decimal:0,Name:"甲醇"}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:6,Decimal:1,Name:'动力煤'}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:6,Decimal:0,Name:"精对苯二甲酸(PTA)"}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:6,Decimal:0,Name:'菜籽粕'}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:6,Decimal:0,Name:"菜籽油"}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0,Name:"甲醇(老)"}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:6,Decimal:0,Name:'平板玻璃'}],
[MARKET_SUFFIX_NAME.CZCE + '-WS', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-WT', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-GN', {Time:0,Decimal:0}],
vuehqchart/src/jscommon/umychart.js
浏览文件 @ 13cb64e2
......@@ -176,7 +176,7 @@ function JSChart(divElement)
if (!option.Windows || option.Windows.length<=0) return null;
//创建子窗口
chart.Create(option.Windows.length);
chart.Create(option.Windows.length, option.Listener);
if (option.Border)
{
......@@ -525,7 +525,7 @@ function JSChart(divElement)
if (option.Info && option.Info.length>0) chart.SetMinuteInfo(option.Info,false);
chart.Create(windowsCount); //创建子窗口
chart.Create(windowsCount,option.Listener); //创建子窗口
if (option.CorssCursorInfo)
{
......@@ -920,13 +920,21 @@ function JSChart(divElement)
if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
//设置股票代码
if (!option.Symbol) return false;
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
if (!option.Symbol)
{
chart.DrawEmpty();
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
}
else
{
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
}
}
this.CreateSimpleChart=function(option)
......@@ -2258,6 +2266,17 @@ function JSChartContainer(uielement)
this.OnMouseMove(x,y,e);
}
this.DrawEmpty=function()
{
if (this.UIElement.width<=0 || this.UIElement.height<=0) return;
this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);
if (this.Frame)
{
this.Frame.ScreenImageData=null;
this.Frame.Draw();
}
}
this.Draw=function()
{
if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
......@@ -26499,7 +26518,7 @@ function KLineChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount, option)
{
this.UIElement.JSChartContainer=this;
......@@ -26540,8 +26559,26 @@ function KLineChartContainer(uielement)
this.TitlePaint.push(titlePaint);
}
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -29359,6 +29396,12 @@ function KLineChartContainer(uielement)
this.CancelAutoUpdate(); //先停止定时器
this.AutoUpdateEvent(false,'KLineChartContainer::ChangeSymbol');
this.Symbol=symbol;
if (!symbol)
{
this.DrawEmpty();
return;
}
if (MARKET_SUFFIX_NAME.IsSHSZIndex(symbol)) this.Right=0; //指数没有复权
//清空指标
......@@ -31438,7 +31481,7 @@ function MinuteChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount,option)
{
this.UIElement.JSChartContainer=this;
......@@ -31480,8 +31523,26 @@ function MinuteChartContainer(uielement)
this.ChartCorssCursor.StringFormatX.Frame=this.Frame.SubFrame[0].Frame;
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -31831,9 +31892,16 @@ function MinuteChartContainer(uielement)
this.Symbol=symbol;
this.ResetOverlaySymbolStatus();
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
if (symbol)
{
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
}
else
{
this.DrawEmpty();
}
}
this.ChangeDayCount=function(count)
......@@ -41610,15 +41678,15 @@ function FuturesTimeData()
[MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:5,Decimal:1}],
[MARKET_SUFFIX_NAME.SHFE + '-SC', {Time:5,Decimal:1}],
//郑州期货交易所
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:3,Decimal:1}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:6,Decimal:0,Name:"油菜籽"}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:6,Decimal:0,Name:"甲醇"}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:6,Decimal:1,Name:'动力煤'}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:6,Decimal:0,Name:"精对苯二甲酸(PTA)"}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:6,Decimal:0,Name:'菜籽粕'}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:6,Decimal:0,Name:"菜籽油"}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0,Name:"甲醇(老)"}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:6,Decimal:0,Name:'平板玻璃'}],
[MARKET_SUFFIX_NAME.CZCE + '-WS', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-WT', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-GN', {Time:0,Decimal:0}],
vuehqchart/src/jscommon/umychart.vue/umychart.vue.js
浏览文件 @ 13cb64e2
......@@ -3895,7 +3895,7 @@ function JSChart(divElement)
if (!option.Windows || option.Windows.length<=0) return null;
//创建子窗口
chart.Create(option.Windows.length);
chart.Create(option.Windows.length, option.Listener);
if (option.Border)
{
......@@ -4244,7 +4244,7 @@ function JSChart(divElement)
if (option.Info && option.Info.length>0) chart.SetMinuteInfo(option.Info,false);
chart.Create(windowsCount); //创建子窗口
chart.Create(windowsCount,option.Listener); //创建子窗口
if (option.CorssCursorInfo)
{
......@@ -4639,13 +4639,21 @@ function JSChart(divElement)
if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
//设置股票代码
if (!option.Symbol) return false;
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
if (!option.Symbol)
{
chart.DrawEmpty();
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
}
else
{
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
}
}
this.CreateSimpleChart=function(option)
......@@ -5977,6 +5985,17 @@ function JSChartContainer(uielement)
this.OnMouseMove(x,y,e);
}
this.DrawEmpty=function()
{
if (this.UIElement.width<=0 || this.UIElement.height<=0) return;
this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);
if (this.Frame)
{
this.Frame.ScreenImageData=null;
this.Frame.Draw();
}
}
this.Draw=function()
{
if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
......@@ -30218,7 +30237,7 @@ function KLineChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount, option)
{
this.UIElement.JSChartContainer=this;
......@@ -30259,8 +30278,26 @@ function KLineChartContainer(uielement)
this.TitlePaint.push(titlePaint);
}
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -33078,6 +33115,12 @@ function KLineChartContainer(uielement)
this.CancelAutoUpdate(); //先停止定时器
this.AutoUpdateEvent(false,'KLineChartContainer::ChangeSymbol');
this.Symbol=symbol;
if (!symbol)
{
this.DrawEmpty();
return;
}
if (MARKET_SUFFIX_NAME.IsSHSZIndex(symbol)) this.Right=0; //指数没有复权
//清空指标
......@@ -35157,7 +35200,7 @@ function MinuteChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount,option)
{
this.UIElement.JSChartContainer=this;
......@@ -35199,8 +35242,26 @@ function MinuteChartContainer(uielement)
this.ChartCorssCursor.StringFormatX.Frame=this.Frame.SubFrame[0].Frame;
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -35550,9 +35611,16 @@ function MinuteChartContainer(uielement)
this.Symbol=symbol;
this.ResetOverlaySymbolStatus();
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
if (symbol)
{
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
}
else
{
this.DrawEmpty();
}
}
this.ChangeDayCount=function(count)
......@@ -45329,15 +45397,15 @@ function FuturesTimeData()
[MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:5,Decimal:1}],
[MARKET_SUFFIX_NAME.SHFE + '-SC', {Time:5,Decimal:1}],
//郑州期货交易所
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:3,Decimal:1}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:6,Decimal:0,Name:"油菜籽"}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:6,Decimal:0,Name:"甲醇"}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:6,Decimal:1,Name:'动力煤'}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:6,Decimal:0,Name:"精对苯二甲酸(PTA)"}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:6,Decimal:0,Name:'菜籽粕'}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:6,Decimal:0,Name:"菜籽油"}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0,Name:"甲醇(老)"}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:6,Decimal:0,Name:'平板玻璃'}],
[MARKET_SUFFIX_NAME.CZCE + '-WS', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-WT', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-GN', {Time:0,Decimal:0}],
webhqchart.demo/jscommon/umychart.js
浏览文件 @ 13cb64e2
......@@ -176,7 +176,7 @@ function JSChart(divElement)
if (!option.Windows || option.Windows.length<=0) return null;
//创建子窗口
chart.Create(option.Windows.length);
chart.Create(option.Windows.length, option.Listener);
if (option.Border)
{
......@@ -525,7 +525,7 @@ function JSChart(divElement)
if (option.Info && option.Info.length>0) chart.SetMinuteInfo(option.Info,false);
chart.Create(windowsCount); //创建子窗口
chart.Create(windowsCount,option.Listener); //创建子窗口
if (option.CorssCursorInfo)
{
......@@ -920,13 +920,21 @@ function JSChart(divElement)
if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
//设置股票代码
if (!option.Symbol) return false;
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
if (!option.Symbol)
{
chart.DrawEmpty();
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
}
else
{
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
}
}
this.CreateSimpleChart=function(option)
......@@ -2258,6 +2266,17 @@ function JSChartContainer(uielement)
this.OnMouseMove(x,y,e);
}
this.DrawEmpty=function()
{
if (this.UIElement.width<=0 || this.UIElement.height<=0) return;
this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);
if (this.Frame)
{
this.Frame.ScreenImageData=null;
this.Frame.Draw();
}
}
this.Draw=function()
{
if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
......@@ -26499,7 +26518,7 @@ function KLineChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount, option)
{
this.UIElement.JSChartContainer=this;
......@@ -26540,8 +26559,26 @@ function KLineChartContainer(uielement)
this.TitlePaint.push(titlePaint);
}
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -29359,6 +29396,12 @@ function KLineChartContainer(uielement)
this.CancelAutoUpdate(); //先停止定时器
this.AutoUpdateEvent(false,'KLineChartContainer::ChangeSymbol');
this.Symbol=symbol;
if (!symbol)
{
this.DrawEmpty();
return;
}
if (MARKET_SUFFIX_NAME.IsSHSZIndex(symbol)) this.Right=0; //指数没有复权
//清空指标
......@@ -31438,7 +31481,7 @@ function MinuteChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount,option)
{
this.UIElement.JSChartContainer=this;
......@@ -31480,8 +31523,26 @@ function MinuteChartContainer(uielement)
this.ChartCorssCursor.StringFormatX.Frame=this.Frame.SubFrame[0].Frame;
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -31831,9 +31892,16 @@ function MinuteChartContainer(uielement)
this.Symbol=symbol;
this.ResetOverlaySymbolStatus();
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
if (symbol)
{
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
}
else
{
this.DrawEmpty();
}
}
this.ChangeDayCount=function(count)
......@@ -41610,15 +41678,15 @@ function FuturesTimeData()
[MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:5,Decimal:1}],
[MARKET_SUFFIX_NAME.SHFE + '-SC', {Time:5,Decimal:1}],
//郑州期货交易所
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:3,Decimal:1}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:6,Decimal:0,Name:"油菜籽"}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:6,Decimal:0,Name:"甲醇"}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:6,Decimal:1,Name:'动力煤'}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:6,Decimal:0,Name:"精对苯二甲酸(PTA)"}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:6,Decimal:0,Name:'菜籽粕'}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:6,Decimal:0,Name:"菜籽油"}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0,Name:"甲醇(老)"}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:6,Decimal:0,Name:'平板玻璃'}],
[MARKET_SUFFIX_NAME.CZCE + '-WS', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-WT', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-GN', {Time:0,Decimal:0}],
webhqchart/umychart.js
浏览文件 @ 13cb64e2
......@@ -176,7 +176,7 @@ function JSChart(divElement)
if (!option.Windows || option.Windows.length<=0) return null;
//创建子窗口
chart.Create(option.Windows.length);
chart.Create(option.Windows.length, option.Listener);
if (option.Border)
{
......@@ -525,7 +525,7 @@ function JSChart(divElement)
if (option.Info && option.Info.length>0) chart.SetMinuteInfo(option.Info,false);
chart.Create(windowsCount); //创建子窗口
chart.Create(windowsCount,option.Listener); //创建子窗口
if (option.CorssCursorInfo)
{
......@@ -920,13 +920,21 @@ function JSChart(divElement)
if (option.AutoUpdateFrequency>0) chart.AutoUpdateFrequency=option.AutoUpdateFrequency;
//设置股票代码
if (!option.Symbol) return false;
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
if (!option.Symbol)
{
chart.DrawEmpty();
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
}
else
{
chart.Draw();
chart.ChangeSymbol(option.Symbol);
this.JSChartContainer=chart;
this.DivElement.JSChart=this; //div中保存一份
this.JSChartContainer.Draw();
}
}
this.CreateSimpleChart=function(option)
......@@ -2258,6 +2266,17 @@ function JSChartContainer(uielement)
this.OnMouseMove(x,y,e);
}
this.DrawEmpty=function()
{
if (this.UIElement.width<=0 || this.UIElement.height<=0) return;
this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);
if (this.Frame)
{
this.Frame.ScreenImageData=null;
this.Frame.Draw();
}
}
this.Draw=function()
{
if (this.ChartCorssCursor) this.ChartCorssCursor.Status=0;
......@@ -26499,7 +26518,7 @@ function KLineChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount, option)
{
this.UIElement.JSChartContainer=this;
......@@ -26540,8 +26559,26 @@ function KLineChartContainer(uielement)
this.TitlePaint.push(titlePaint);
}
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[KLineChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e); }, true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -29359,6 +29396,12 @@ function KLineChartContainer(uielement)
this.CancelAutoUpdate(); //先停止定时器
this.AutoUpdateEvent(false,'KLineChartContainer::ChangeSymbol');
this.Symbol=symbol;
if (!symbol)
{
this.DrawEmpty();
return;
}
if (MARKET_SUFFIX_NAME.IsSHSZIndex(symbol)) this.Right=0; //指数没有复权
//清空指标
......@@ -31438,7 +31481,7 @@ function MinuteChartContainer(uielement)
//创建
//windowCount 窗口个数
this.Create=function(windowCount)
this.Create=function(windowCount,option)
{
this.UIElement.JSChartContainer=this;
......@@ -31480,8 +31523,26 @@ function MinuteChartContainer(uielement)
this.ChartCorssCursor.StringFormatX.Frame=this.Frame.SubFrame[0].Frame;
this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
var bRegisterKeydown=true;
var bRegisterWheel=true;
if (option)
{
if (option.KeyDown===false)
{
bRegisterKeydown=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register keydown event.');
}
if (option.Wheel===false)
{
bRegisterWheel=false;
JSConsole.Chart.Log('[MinuteChartContainer::Create] not register wheel event.');
}
}
if (bRegisterKeydown) this.UIElement.addEventListener("keydown", (e)=>{ this.OnKeyDown(e);} , true); //键盘消息
if (bRegisterWheel) this.UIElement.addEventListener("wheel", (e)=>{ this.OnWheel(e); }, true); //上下滚动消息
}
//创建子窗口
......@@ -31831,9 +31892,16 @@ function MinuteChartContainer(uielement)
this.Symbol=symbol;
this.ResetOverlaySymbolStatus();
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
if (symbol)
{
this.ChartSplashPaint.IsEnableSplash = true; //增加下载动画
this.Draw();
this.RequestData();
}
else
{
this.DrawEmpty();
}
}
this.ChangeDayCount=function(count)
......@@ -41610,15 +41678,15 @@ function FuturesTimeData()
[MARKET_SUFFIX_NAME.SHFE + '-NR', {Time:5,Decimal:1}],
[MARKET_SUFFIX_NAME.SHFE + '-SC', {Time:5,Decimal:1}],
//郑州期货交易所
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:3,Decimal:1}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:3,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
[MARKET_SUFFIX_NAME.CZCE + '-SR', {Time:6,Decimal:0,Name:"油菜籽"}],
[MARKET_SUFFIX_NAME.CZCE + '-MA', {Time:6,Decimal:0,Name:"甲醇"}],
[MARKET_SUFFIX_NAME.CZCE + '-ZC', {Time:6,Decimal:1,Name:'动力煤'}],
[MARKET_SUFFIX_NAME.CZCE + '-TA', {Time:6,Decimal:0,Name:"精对苯二甲酸(PTA)"}],
[MARKET_SUFFIX_NAME.CZCE + '-RM', {Time:6,Decimal:0,Name:'菜籽粕'}],
[MARKET_SUFFIX_NAME.CZCE + '-OI', {Time:6,Decimal:0,Name:"菜籽油"}],
[MARKET_SUFFIX_NAME.CZCE + '-ME', {Time:3,Decimal:0,Name:"甲醇(老)"}],
[MARKET_SUFFIX_NAME.CZCE + '-FG', {Time:6,Decimal:0,Name:'平板玻璃'}],
[MARKET_SUFFIX_NAME.CZCE + '-WS', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-WT', {Time:0,Decimal:0}],
[MARKET_SUFFIX_NAME.CZCE + '-GN', {Time:0,Decimal:0}],
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或