hqchart 1.1.14533 → 1.1.14538
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.
- package/lib/umychart.vue.js +12 -11
- package/package.json +1 -1
- package/src/jscommon/umychart.PopKLineChart.js +6 -4
- package/src/jscommon/umychart.PopMinuteChart.js +6 -3
- package/src/jscommon/umychart.js +9 -1
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +10 -2
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +22 -9
package/lib/umychart.vue.js
CHANGED
|
@@ -7531,7 +7531,9 @@ var bindData=new ChartData();bindData.Data=aryDayData;bindData.Right=this.Right;
|
|
|
7531
7531
|
{var rightData=bindData.GetRightData(bindData.Right,{AlgorithmType:this.RightFormula});bindData.Data=rightData;}if(ChartData.IsDayPeriod(bindData.Period,false)&&!this.IsApiPeriod)//周期数据
|
|
7532
7532
|
{var periodData=bindData.GetPeriodData(bindData.Period);bindData.Data=periodData;}var kLineCalculate=this.GetKLineCalulate();if(kLineCalculate)//额外的K线图形计算
|
|
7533
7533
|
{var newBindData=kLineCalculate.RecvHistoryData(bindData,{Symbol:this.Symbol,Function:"RecvHistoryData"});bindData=newBindData;this.FlowCapitalReady=true;}//绑定数据
|
|
7534
|
-
this.Symbol=data.symbol;this.Name=data.name;
|
|
7534
|
+
this.Symbol=data.symbol;this.Name=data.name;var chartOperator=null;//额外的图形控制
|
|
7535
|
+
if(data&&data.ChartOperator){var item=data.ChartOperator;chartOperator={};if(item.IsShowAll===true)chartOperator.IsShowAll=true;//全部显示
|
|
7536
|
+
}this.BindMainData(bindData,this.PageSize,chartOperator);if(this.AfterBindMainData)this.AfterBindMainData("RecvHistoryData");this.Frame.SetSizeChage(true);var firstSubFrame;if(this.Frame.SubFrame[0])firstSubFrame=this.Frame.SubFrame[0].Frame;if(firstSubFrame&&firstSubFrame.YSplitOperator){firstSubFrame.YSplitOperator.Symbol=this.Symbol;firstSubFrame.YSplitOperator.Data=this.ChartPaint[0].Data;//K线数据
|
|
7535
7537
|
firstSubFrame.YSplitOperator.Period=this.Period;//周期
|
|
7536
7538
|
}var page=this.Page.Day;if(page.Enable==false||page.Enable==true&&page.Finish==true)//分页下载 这些数据迁移到分页下载完以后下载
|
|
7537
7539
|
{this.ReqeustKLineInfoData({FunctionName:"RecvHistoryData"});//请求信息地雷
|
|
@@ -14263,8 +14265,8 @@ Top:25,Bottom:25,AutoLeft:{Blank:10,MinWidth:60},AutoRight:{Blank:10,MinWidth:60
|
|
|
14263
14265
|
// 分时图提示信息
|
|
14264
14266
|
//
|
|
14265
14267
|
//////////////////////////////////////////////////////
|
|
14266
|
-
function JSTooltipMinuteChart(){this.DivDialog=null;this.HQChart=null;this.ID=Guid();this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;this.
|
|
14267
|
-
this.Minute.Option=(0,_assign2.default)(this.Minute.Option,item);}if(option.
|
|
14268
|
+
function JSTooltipMinuteChart(){this.DivDialog=null;this.HQChart=null;this.ID=Guid();this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;this.OnCreatedCallback;this.Minute={Option:JSTooltipMinuteChart.GetMinuteOption(),JSChart:null,Symbol:null,Date:null};this.Inital=function(hqchart,option){this.HQChart=hqchart;if(option){if(IFrameSplitOperator.IsObject(option.Option)){var item=CloneData(option.Option);//复制一份出来
|
|
14269
|
+
this.Minute.Option=(0,_assign2.default)(this.Minute.Option,item);if(IFrameSplitOperator.IsNonEmptyArray(option.Option.EventCallback))this.Minute.Option.EventCallback=option.Option.EventCallback;}if(option.OnCreatedCallback)this.OnCreatedCallback=option.OnCreatedCallback;}};this.Create=function(){var _this92=this;var divDom=document.createElement('div');divDom.className='UMyChart_Tooltip_Minute_Div';divDom.id=this.ID;var divChart=document.createElement('div');divChart.className='UMyChart_Tooltip_Minute_Chart_Div';divDom.appendChild(divChart);this.DivDialog=divDom;var chart=JSChart.Init(divChart);this.Minute.JSChart=chart;//语言跟主图保持一致
|
|
14268
14270
|
if(this.HQChart)this.Minute.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);this.Minute.Option.OnCreatedCallback=function(chart){_this92.OnCreateHQChart(chart);};this.Minute.Option.NetworkFilter=function(data,callback){_this92.NetworkFilter(data,callback);};chart.SetOption(this.Minute.Option);//设置K线配置
|
|
14269
14271
|
document.body.appendChild(divDom);this.UpdateStyle();};this.UpdateStyle=function(){if(!this.DivDialog)return;if(this.BGColor)this.DivDialog.style['background-color']=this.BGColor;if(this.BorderColor)this.DivDialog.style['border-color']=this.BorderColor;};this.NetworkFilter=function(data,callback){if(!this.HQChart||!this.HQChart.NetworkFilter)return;/*
|
|
14270
14272
|
if (data) data.PopMinuteData={ Date:this.Date }; //弹出分时图额外数据
|
|
@@ -14275,7 +14277,7 @@ document.body.appendChild(divDom);this.UpdateStyle();};this.UpdateStyle=function
|
|
|
14275
14277
|
data.Name="MinuteChartContainer::RequestPopMinuteData";
|
|
14276
14278
|
data.Explain="指定日期分时数据"
|
|
14277
14279
|
};
|
|
14278
|
-
*/this.HQChart.NetworkFilter(data,callback);};this.OnCreateHQChart=function(chart){if(this.
|
|
14280
|
+
*/this.HQChart.NetworkFilter(data,callback);};this.OnCreateHQChart=function(chart){if(this.OnCreatedCallback)this.OnCreatedCallback(chart);};this.Destroy=function(){if(this.DivDialog)document.body.removeChild(this.DivDialog);this.DivDialog=null;this.TitleBox=null;if(!this.Minute.JSChart)this.Minute.JSChart.ChartDestory();this.Minute.JSChart=null;};this.IsShow=function(){if(!this.DivDialog)return false;return this.DivDialog.style.visibility==='visible';};this.Show=function(data,x,y){if(!this.DivDialog)this.Create();if(!data||!data.Symbol)return;var symbol=data.Symbol;var date=null;if(IFrameSplitOperator.IsPlusNumber(data.Date))date=data.Date;if(this.Minute.JSChart){if(this.Minute.Symbol!=symbol||this.Minute.Date!=date){this.Minute.Symbol=symbol;this.Minute.Date=date;this.Minute.JSChart.ChangeSymbol(symbol);}}if(IFrameSplitOperator.IsNumberV2(x,y)){}else if(data.Rect){var rtCell=data.Rect;var pixelRatio=GetDevicePixelRatio();var rtItem={Left:rtCell.Left/pixelRatio,Right:rtCell.Right/pixelRatio,Bottom:rtCell.Bottom/pixelRatio,Top:rtCell.Top/pixelRatio};rtItem.Width=rtItem.Right-rtItem.Left;rtItem.Height=rtItem.Bottom-rtItem.Top;//超出窗口调整位置
|
|
14279
14281
|
var height=this.DivDialog.offsetHeight;var width=this.DivDialog.offsetWidth;var x=rtItem.Right+data.Offset.Left;var y=rtItem.Bottom+data.Offset.Top;var xRight=window.innerWidth-5;var ybottom=window.innerHeight-5;if(x+width>xRight)x=rtItem.Left+data.Offset.Left-width;if(y+height>ybottom)y=rtItem.Top+data.Offset.Top-height;this.DivDialog.style.visibility='visible';this.DivDialog.style.top=y+"px";this.DivDialog.style.left=x+"px";}};this.Hide=function(){if(!this.DivDialog)return;if(this.DivDialog.style.visibility!='hidden')this.DivDialog.style.visibility='hidden';};this.ReloadResource=function(option){this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;if(!this.DivDialog)return;this.UpdateStyle();if(this.Minute.JSChart)this.Minute.JSChart.ReloadResource(option);};}JSTooltipMinuteChart.GetMinuteOption=function(){var option={Type:'分钟走势图',//创建图形类型
|
|
14280
14282
|
Windows://窗口指标
|
|
14281
14283
|
[//{ Index:"VOL" },
|
|
@@ -14305,10 +14307,10 @@ Top:25,Bottom:25,AutoLeft:{Blank:10,MinWidth:40},AutoRight:{Blank:10,MinWidth:40
|
|
|
14305
14307
|
// K线图提示信息
|
|
14306
14308
|
//
|
|
14307
14309
|
//////////////////////////////////////////////////////
|
|
14308
|
-
function JSTooltipKLineChart(){this.DivDialog=null;this.HQChart=null;this.ID=Guid();this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;this.
|
|
14309
|
-
this.KLine.Option=(0,_assign2.default)(this.KLine.Option,item);}if(option.
|
|
14310
|
+
function JSTooltipKLineChart(){this.DivDialog=null;this.HQChart=null;this.ID=Guid();this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;this.OnCreatedCallback=null;this.KLine={Option:JSTooltipKLineChart.GetKLineOption(),JSChart:null,Symbol:null};this.Inital=function(hqchart,option){this.HQChart=hqchart;if(option){if(IFrameSplitOperator.IsObject(option.Option)){var item=CloneData(option.Option);//复制一份出来
|
|
14311
|
+
this.KLine.Option=(0,_assign2.default)(this.KLine.Option,item);if(IFrameSplitOperator.IsNonEmptyArray(option.Option.EventCallback))this.KLine.Option.EventCallback=option.Option.EventCallback;}if(option.OnCreatedCallback)this.OnCreatedCallback=option.OnCreatedCallback;}};this.Create=function(){var _this93=this;var divDom=document.createElement('div');divDom.className='UMyChart_Tooltip_KLine_Div';divDom.id=this.ID;var divChart=document.createElement('div');divChart.className='UMyChart_Tooltip_KLine_Chart_Div';divDom.appendChild(divChart);this.DivDialog=divDom;var chart=JSChart.Init(divChart);this.KLine.JSChart=chart;//语言跟主图保持一致
|
|
14310
14312
|
if(this.HQChart)this.KLine.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);this.KLine.Option.OnCreatedCallback=function(chart){_this93.OnCreateHQChart(chart);};this.KLine.Option.NetworkFilter=function(data,callback){_this93.NetworkFilter(data,callback);};chart.SetOption(this.KLine.Option);//设置K线配置
|
|
14311
|
-
document.body.appendChild(divDom);this.UpdateStyle();};this.UpdateStyle=function(){if(!this.DivDialog)return;if(this.BGColor)this.DivDialog.style['background-color']=this.BGColor;if(this.BorderColor)this.DivDialog.style['border-color']=this.BorderColor;};this.NetworkFilter=function(data,callback){if(!this.HQChart||!this.HQChart.NetworkFilter)return;this.HQChart.NetworkFilter(data,callback);};this.OnCreateHQChart=function(chart){if(this.
|
|
14313
|
+
document.body.appendChild(divDom);this.UpdateStyle();};this.UpdateStyle=function(){if(!this.DivDialog)return;if(this.BGColor)this.DivDialog.style['background-color']=this.BGColor;if(this.BorderColor)this.DivDialog.style['border-color']=this.BorderColor;};this.NetworkFilter=function(data,callback){if(!this.HQChart||!this.HQChart.NetworkFilter)return;this.HQChart.NetworkFilter(data,callback);};this.OnCreateHQChart=function(chart){if(this.OnCreatedCallback)this.OnCreatedCallback(chart);};this.Destroy=function(){if(this.DivDialog)document.body.removeChild(this.DivDialog);this.DivDialog=null;this.TitleBox=null;if(!this.KLine.JSChart)this.KLine.JSChart.ChartDestory();this.KLine.JSChart=null;};this.IsShow=function(){if(!this.DivDialog)return false;return this.DivDialog.style.visibility==='visible';};this.Show=function(data,x,y){if(!this.DivDialog)this.Create();if(!data||!data.Symbol)return;var symbol=data.Symbol;if(this.KLine.JSChart){if(this.KLine.Symbol!=symbol){this.KLine.Symbol=symbol;this.KLine.JSChart.ChangeSymbol(symbol);}}if(!this.KLine.Option.EnableResize){if(this.KLine.JSChart)this.KLine.JSChart.OnSize({Type:1});}if(IFrameSplitOperator.IsNumberV2(x,y)){}else if(data.Rect){var rtCell=data.Rect;var pixelRatio=GetDevicePixelRatio();var rtItem={Left:rtCell.Left/pixelRatio,Right:rtCell.Right/pixelRatio,Bottom:rtCell.Bottom/pixelRatio,Top:rtCell.Top/pixelRatio};rtItem.Width=rtItem.Right-rtItem.Left;rtItem.Height=rtItem.Bottom-rtItem.Top;//超出窗口调整位置
|
|
14312
14314
|
var height=this.DivDialog.offsetHeight;var width=this.DivDialog.offsetWidth;var x=rtItem.Right+data.Offset.Left;var y=rtItem.Bottom+data.Offset.Top;var xRight=window.innerWidth-5;var ybottom=window.innerHeight-5;if(x+width>xRight)x=rtItem.Left+data.Offset.Left-width;if(y+height>ybottom)y=rtItem.Top+data.Offset.Top-height;this.DivDialog.style.visibility='visible';this.DivDialog.style.top=y+"px";this.DivDialog.style.left=x+"px";}};this.Hide=function(){if(!this.DivDialog)return;if(this.DivDialog.style.visibility!='hidden')this.DivDialog.style.visibility='hidden';};this.ReloadResource=function(option){this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;if(!this.DivDialog)return;this.UpdateStyle();if(this.KLine.JSChart)this.KLine.JSChart.ReloadResource(option);};}JSTooltipKLineChart.GetKLineOption=function(){var option={Type:'历史K线图',//创建图形类型
|
|
14313
14315
|
Windows://窗口指标
|
|
14314
14316
|
[{Index:"MA",Change:false,Modify:false},{Index:"MACD",Close:false,Change:false,Modify:false,MaxMin:false,TitleWindow:false}],//Language:'EN',
|
|
@@ -14326,9 +14328,8 @@ DrawType:0,//K线类型 0=实心K线柱子 1=收盘价线 2=美国线 3=空心K
|
|
|
14326
14328
|
KLineDoubleClick:false,//禁止双击弹框
|
|
14327
14329
|
RightSpaceCount:0,ZoomType:0,DataWidth:2},StepPixel:0,Listener:{KeyDown:false,Wheel:false},KLineTitle://标题设置
|
|
14328
14330
|
{IsShowName:true,//不显示股票名称
|
|
14329
|
-
IsShowSettingInfo:true
|
|
14330
|
-
|
|
14331
|
-
},Border://边框
|
|
14331
|
+
IsShowSettingInfo:true,//不显示周期/复权
|
|
14332
|
+
IsTitleShowLatestData:true},Border://边框
|
|
14332
14333
|
{Left:1,//左边间距
|
|
14333
14334
|
Right:20,//右边间距
|
|
14334
14335
|
Bottom:25,//底部间距
|
|
@@ -14616,7 +14617,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
14616
14617
|
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);};}/********************************************************************************
|
|
14617
14618
|
* 版本信息输出
|
|
14618
14619
|
*
|
|
14619
|
-
*/var HQCHART_VERSION="1.1.
|
|
14620
|
+
*/var HQCHART_VERSION="1.1.14536";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();//把给外界调用的方法暴露出来
|
|
14620
14621
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
14621
14622
|
// BaseIndex:BaseIndex,
|
|
14622
14623
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -24,7 +24,7 @@ function JSTooltipKLineChart()
|
|
|
24
24
|
|
|
25
25
|
this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
|
|
26
26
|
this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
|
|
27
|
-
this.
|
|
27
|
+
this.OnCreatedCallback=null;
|
|
28
28
|
|
|
29
29
|
this.KLine=
|
|
30
30
|
{
|
|
@@ -43,8 +43,10 @@ function JSTooltipKLineChart()
|
|
|
43
43
|
{
|
|
44
44
|
var item=CloneData(option.Option); //复制一份出来
|
|
45
45
|
this.KLine.Option=Object.assign(this.KLine.Option,item);
|
|
46
|
+
|
|
47
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.Option.EventCallback)) this.KLine.Option.EventCallback=option.Option.EventCallback;
|
|
46
48
|
}
|
|
47
|
-
if (option.
|
|
49
|
+
if (option.OnCreatedCallback) this.OnCreatedCallback=option.OnCreatedCallback;
|
|
48
50
|
}
|
|
49
51
|
}
|
|
50
52
|
|
|
@@ -91,7 +93,7 @@ function JSTooltipKLineChart()
|
|
|
91
93
|
|
|
92
94
|
this.OnCreateHQChart=function(chart)
|
|
93
95
|
{
|
|
94
|
-
if (this.
|
|
96
|
+
if (this.OnCreatedCallback) this.OnCreatedCallback(chart);
|
|
95
97
|
}
|
|
96
98
|
|
|
97
99
|
this.Destroy=function()
|
|
@@ -232,7 +234,7 @@ JSTooltipKLineChart.GetKLineOption=function()
|
|
|
232
234
|
{
|
|
233
235
|
IsShowName:true, //不显示股票名称
|
|
234
236
|
IsShowSettingInfo:true, //不显示周期/复权
|
|
235
|
-
|
|
237
|
+
IsTitleShowLatestData:true,
|
|
236
238
|
},
|
|
237
239
|
|
|
238
240
|
Border: //边框
|
|
@@ -326,7 +326,7 @@ function JSTooltipMinuteChart()
|
|
|
326
326
|
|
|
327
327
|
this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
|
|
328
328
|
this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
|
|
329
|
-
this.
|
|
329
|
+
this.OnCreatedCallback;
|
|
330
330
|
|
|
331
331
|
this.Minute=
|
|
332
332
|
{
|
|
@@ -346,8 +346,11 @@ function JSTooltipMinuteChart()
|
|
|
346
346
|
{
|
|
347
347
|
var item=CloneData(option.Option); //复制一份出来
|
|
348
348
|
this.Minute.Option=Object.assign(this.Minute.Option,item);
|
|
349
|
+
|
|
350
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.Option.EventCallback)) this.Minute.Option.EventCallback=option.Option.EventCallback;
|
|
349
351
|
}
|
|
350
|
-
if (option.
|
|
352
|
+
if (option.OnCreatedCallback) this.OnCreatedCallback=option.OnCreatedCallback;
|
|
353
|
+
|
|
351
354
|
}
|
|
352
355
|
}
|
|
353
356
|
|
|
@@ -405,7 +408,7 @@ function JSTooltipMinuteChart()
|
|
|
405
408
|
|
|
406
409
|
this.OnCreateHQChart=function(chart)
|
|
407
410
|
{
|
|
408
|
-
if (this.
|
|
411
|
+
if (this.OnCreatedCallback) this.OnCreatedCallback(chart);
|
|
409
412
|
}
|
|
410
413
|
|
|
411
414
|
this.Destroy=function()
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -77914,7 +77914,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
77914
77914
|
this.Symbol=data.symbol;
|
|
77915
77915
|
this.Name=data.name;
|
|
77916
77916
|
|
|
77917
|
-
|
|
77917
|
+
var chartOperator=null; //额外的图形控制
|
|
77918
|
+
if (data && data.ChartOperator)
|
|
77919
|
+
{
|
|
77920
|
+
var item=data.ChartOperator;
|
|
77921
|
+
chartOperator={ };
|
|
77922
|
+
if (item.IsShowAll===true) chartOperator.IsShowAll=true; //全部显示
|
|
77923
|
+
}
|
|
77924
|
+
|
|
77925
|
+
this.BindMainData(bindData,this.PageSize,chartOperator);
|
|
77918
77926
|
if (this.AfterBindMainData) this.AfterBindMainData("RecvHistoryData");
|
|
77919
77927
|
this.Frame.SetSizeChage(true);
|
|
77920
77928
|
|
|
@@ -81839,7 +81839,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
81839
81839
|
this.Symbol=data.symbol;
|
|
81840
81840
|
this.Name=data.name;
|
|
81841
81841
|
|
|
81842
|
-
|
|
81842
|
+
var chartOperator=null; //额外的图形控制
|
|
81843
|
+
if (data && data.ChartOperator)
|
|
81844
|
+
{
|
|
81845
|
+
var item=data.ChartOperator;
|
|
81846
|
+
chartOperator={ };
|
|
81847
|
+
if (item.IsShowAll===true) chartOperator.IsShowAll=true; //全部显示
|
|
81848
|
+
}
|
|
81849
|
+
|
|
81850
|
+
this.BindMainData(bindData,this.PageSize,chartOperator);
|
|
81843
81851
|
if (this.AfterBindMainData) this.AfterBindMainData("RecvHistoryData");
|
|
81844
81852
|
this.Frame.SetSizeChage(true);
|
|
81845
81853
|
|
|
@@ -144512,7 +144520,7 @@ function ScrollBarBGChart()
|
|
|
144512
144520
|
|
|
144513
144521
|
|
|
144514
144522
|
|
|
144515
|
-
var HQCHART_VERSION="1.1.
|
|
144523
|
+
var HQCHART_VERSION="1.1.14536";
|
|
144516
144524
|
|
|
144517
144525
|
function PrintHQChartVersion()
|
|
144518
144526
|
{
|
|
@@ -81883,7 +81883,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
81883
81883
|
this.Symbol=data.symbol;
|
|
81884
81884
|
this.Name=data.name;
|
|
81885
81885
|
|
|
81886
|
-
|
|
81886
|
+
var chartOperator=null; //额外的图形控制
|
|
81887
|
+
if (data && data.ChartOperator)
|
|
81888
|
+
{
|
|
81889
|
+
var item=data.ChartOperator;
|
|
81890
|
+
chartOperator={ };
|
|
81891
|
+
if (item.IsShowAll===true) chartOperator.IsShowAll=true; //全部显示
|
|
81892
|
+
}
|
|
81893
|
+
|
|
81894
|
+
this.BindMainData(bindData,this.PageSize,chartOperator);
|
|
81887
81895
|
if (this.AfterBindMainData) this.AfterBindMainData("RecvHistoryData");
|
|
81888
81896
|
this.Frame.SetSizeChage(true);
|
|
81889
81897
|
|
|
@@ -149630,7 +149638,7 @@ function JSTooltipMinuteChart()
|
|
|
149630
149638
|
|
|
149631
149639
|
this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
|
|
149632
149640
|
this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
|
|
149633
|
-
this.
|
|
149641
|
+
this.OnCreatedCallback;
|
|
149634
149642
|
|
|
149635
149643
|
this.Minute=
|
|
149636
149644
|
{
|
|
@@ -149650,8 +149658,11 @@ function JSTooltipMinuteChart()
|
|
|
149650
149658
|
{
|
|
149651
149659
|
var item=CloneData(option.Option); //复制一份出来
|
|
149652
149660
|
this.Minute.Option=Object.assign(this.Minute.Option,item);
|
|
149661
|
+
|
|
149662
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.Option.EventCallback)) this.Minute.Option.EventCallback=option.Option.EventCallback;
|
|
149653
149663
|
}
|
|
149654
|
-
if (option.
|
|
149664
|
+
if (option.OnCreatedCallback) this.OnCreatedCallback=option.OnCreatedCallback;
|
|
149665
|
+
|
|
149655
149666
|
}
|
|
149656
149667
|
}
|
|
149657
149668
|
|
|
@@ -149709,7 +149720,7 @@ function JSTooltipMinuteChart()
|
|
|
149709
149720
|
|
|
149710
149721
|
this.OnCreateHQChart=function(chart)
|
|
149711
149722
|
{
|
|
149712
|
-
if (this.
|
|
149723
|
+
if (this.OnCreatedCallback) this.OnCreatedCallback(chart);
|
|
149713
149724
|
}
|
|
149714
149725
|
|
|
149715
149726
|
this.Destroy=function()
|
|
@@ -149901,7 +149912,7 @@ function JSTooltipKLineChart()
|
|
|
149901
149912
|
|
|
149902
149913
|
this.BGColor=g_JSChartResource.PopMinuteChart.BGColor;
|
|
149903
149914
|
this.BorderColor=g_JSChartResource.PopMinuteChart.BorderColor;
|
|
149904
|
-
this.
|
|
149915
|
+
this.OnCreatedCallback=null;
|
|
149905
149916
|
|
|
149906
149917
|
this.KLine=
|
|
149907
149918
|
{
|
|
@@ -149920,8 +149931,10 @@ function JSTooltipKLineChart()
|
|
|
149920
149931
|
{
|
|
149921
149932
|
var item=CloneData(option.Option); //复制一份出来
|
|
149922
149933
|
this.KLine.Option=Object.assign(this.KLine.Option,item);
|
|
149934
|
+
|
|
149935
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.Option.EventCallback)) this.KLine.Option.EventCallback=option.Option.EventCallback;
|
|
149923
149936
|
}
|
|
149924
|
-
if (option.
|
|
149937
|
+
if (option.OnCreatedCallback) this.OnCreatedCallback=option.OnCreatedCallback;
|
|
149925
149938
|
}
|
|
149926
149939
|
}
|
|
149927
149940
|
|
|
@@ -149968,7 +149981,7 @@ function JSTooltipKLineChart()
|
|
|
149968
149981
|
|
|
149969
149982
|
this.OnCreateHQChart=function(chart)
|
|
149970
149983
|
{
|
|
149971
|
-
if (this.
|
|
149984
|
+
if (this.OnCreatedCallback) this.OnCreatedCallback(chart);
|
|
149972
149985
|
}
|
|
149973
149986
|
|
|
149974
149987
|
this.Destroy=function()
|
|
@@ -150109,7 +150122,7 @@ JSTooltipKLineChart.GetKLineOption=function()
|
|
|
150109
150122
|
{
|
|
150110
150123
|
IsShowName:true, //不显示股票名称
|
|
150111
150124
|
IsShowSettingInfo:true, //不显示周期/复权
|
|
150112
|
-
|
|
150125
|
+
IsTitleShowLatestData:true,
|
|
150113
150126
|
},
|
|
150114
150127
|
|
|
150115
150128
|
Border: //边框
|
|
@@ -154773,7 +154786,7 @@ function HQChartScriptWorker()
|
|
|
154773
154786
|
|
|
154774
154787
|
|
|
154775
154788
|
|
|
154776
|
-
var HQCHART_VERSION="1.1.
|
|
154789
|
+
var HQCHART_VERSION="1.1.14536";
|
|
154777
154790
|
|
|
154778
154791
|
function PrintHQChartVersion()
|
|
154779
154792
|
{
|