hqchart 1.1.13654 → 1.1.13658
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 +8 -6
- package/package.json +1 -1
- package/src/jscommon/umychart.PopMinuteChart.js +11 -0
- package/src/jscommon/umychart.js +18 -1
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +19 -2
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +30 -2
package/lib/umychart.vue.js
CHANGED
|
@@ -1962,7 +1962,7 @@ for(var i in this.ChartPaint)//框架内图形
|
|
|
1962
1962
|
for(var i=0;i<data.length;++i){var item=data[i];strRow+='"'+item.Name+'"';if(i==data.length-1)strRow+="\r\n";else strRow+=",";if(IFrameSplitOperator.IsNonEmptyArray(item.Data))rowCount=Math.max(rowCount,item.Data.length);}strCSV+=strRow;for(var i=0,j=0;i<rowCount;++i){strRow="";for(j=0;j<data.length;++j){var item=data[j];var value=null;if(item.Data&&i<item.Data.length)value=item.Data[i];strRow+='"'+value+'"';if(j==data.length-1)strRow+="\r\n";else strRow+=",";}strCSV+=strRow;}strCSV='\uFEFF'+strCSV;return strCSV;};this.SetLanguage=function(language){var languageID=g_JSChartLocalization.GetLanguageID(language);if(!IFrameSplitOperator.IsNumber(languageID)){console.warn('[JSChartContainer::SetLanguage] language='+language+' error');return;}if(this.LanguageID==languageID)return;this.LanguageID=languageID;if(this.ChartCorssCursor&&this.ChartCorssCursor.StringFormatY)this.ChartCorssCursor.StringFormatY.LanguageID=this.LanguageID;for(var i=0;i<this.TitlePaint.length;++i)//标题
|
|
1963
1963
|
{var item=this.TitlePaint[i];if(item)item.LanguageID=this.LanguageID;}for(var i=0;i<this.ExtendChartPaint.length;++i)//tooltip 等扩展图形
|
|
1964
1964
|
{var item=this.ExtendChartPaint[i];if(item)item.LanguageID=this.LanguageID;}if(this.Frame&&this.Frame.SetLanguage)this.Frame.SetLanguage(this.LanguageID);//this.Frame.ClearYCoordinateMaxMin();
|
|
1965
|
-
this.ResetFrameXYSplit();this.Frame.SetSizeChage(true);this.Draw();};this.ReloadTiltePaintResource=function(resource)//重新加载配置
|
|
1965
|
+
this.ResetFrameXYSplit();this.Frame.SetSizeChage(true);this.Draw();if(this.PopMinuteChart)this.PopMinuteChart.SetLanguage(language);};this.ReloadTiltePaintResource=function(resource)//重新加载配置
|
|
1966
1966
|
{for(var i in this.TitlePaint){var item=this.TitlePaint[i];if(item.ReloadResource)item.ReloadResource(resource);}};this.ReloadExtendChartPaintResource=function(resource)//扩展画法重新加载配置
|
|
1967
1967
|
{for(var i=0;i<this.ExtendChartPaint.length;++i){var item=this.ExtendChartPaint[i];if(item.ReloadResource)item.ReloadResource(resource);}if(this.ChartDragSelectRect&&this.ChartDragSelectRect.ReloadResource)this.ChartDragSelectRect.ReloadResource(resource);};this.ReloadChartDrawPictureResource=function(resource){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartDrawPicture))return;for(var i=0;i<this.ChartDrawPicture.length;++i){var item=this.ChartDrawPicture[i];if(item.ReloadResource)item.ReloadResource(resource);}};this.ReloadResource=function(option){this.ReloadBorder(option);this.ReloadTiltePaintResource(option.Resource);this.ReloadChartPaint(option.Resource);this.ReloadFrame(option.Resource);this.ReloadExtendChartPaintResource(option.Resource);this.ReloadChartCorssCursor(option,option.Resource);this.ReloadChartDrawPictureResource(option.Resource);if(option.Update&&this.Update)this.Update({UpdateCursorIndexType:2});//是否立即更新并重绘
|
|
1968
1968
|
else if(option.Draw==true)this.Draw();//是否立即重绘
|
|
@@ -6830,7 +6830,7 @@ LANGUAGE_TRADITIONAL_CHINESE_ID:2//繁体中文 TC
|
|
|
6830
6830
|
['日',{CN:'日',EN:'Sun.',TC:'日'}],['一',{CN:'一',EN:'Mon.',TC:'壹'}],['二',{CN:'二',EN:'Tues.',TC:'貳'}],['三',{CN:'三',EN:'Wed.',TC:'叁'}],['四',{CN:'四',EN:'Thur.',TC:'肆'}],['五',{CN:'五',EN:'Fri.',TC:'伍'}],['六',{CN:'六',EN:'Sat.',TC:'陸'}],['1月',{CN:'1月',EN:'Jan',TC:'1月'}],['2月',{CN:'2月',EN:'Feb',TC:'2月'}],['3月',{CN:'3月',EN:'Mar',TC:'3月'}],['4月',{CN:'4月',EN:'Apr',TC:'4月'}],['5月',{CN:'5月',EN:'May',TC:'5月'}],['6月',{CN:'6月',EN:'Jun',TC:'6月'}],['7月',{CN:'7月',EN:'Jul',TC:'7月'}],['8月',{CN:'8月',EN:'Aug',TC:'8月'}],['9月',{CN:'9月',EN:'Sept',TC:'9月'}],['10月',{CN:'10月',EN:'Oct',TC:'10月'}],['11月',{CN:'11月',EN:'Nov',TC:'11月'}],['12月',{CN:'12月',EN:'Dec',TC:'12月'}],['自定义分钟',{CN:'分',EN:'Min',TC:'分'}],['自定义日线',{CN:'日',EN:'D',TC:'日'}],['自定义秒',{CN:'秒',EN:'S',TC:'秒'}],['自定义毫秒',{CN:'毫秒',EN:'MS',TC:'毫秒'}],["MVol-Vol",{CN:"成交量",EN:"Volume",TC:'成交量'}],["MVol-Position",{CN:"持仓量",EN:"Position",TC:'持倉量'}],//深度图
|
|
6831
6831
|
["Depth-Price",{CN:"委托价",EN:"Price",TC:'委托價'}],["Depth-Sum",{CN:"累计",EN:"Sum",TC:'累計'}],//工具栏提示信息
|
|
6832
6832
|
["Toolbar-"+JSCHART_BUTTON_ID.MODIFY_INDEX_PARAM,{CN:"调整指标参数",EN:"Change indicator parameters",TC:"调整指标参数"}],["Toolbar-"+JSCHART_BUTTON_ID.CHANGE_INDEX,{CN:"选择指标",EN:"Change indicator",TC:"切换指标"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_INDEX_WINDOW,{CN:"关闭窗口",EN:"Delete window",TC:"关闭指标窗口"}],["Toolbar-"+JSCHART_BUTTON_ID.OVERLAY_INDEX,{CN:"叠加指标",EN:"Overlay indicator",TC:"叠加指标"}],["Toolbar-"+JSCHART_BUTTON_ID.MODIFY_OVERLAY_INDEX_PARAM,{CN:"调整叠加指标参数",EN:"Change overlay indicator parameters",TC:"调整叠加指标参数"}],["Toolbar-"+JSCHART_BUTTON_ID.MAX_MIN_WINDOW,{CN:"最大化",EN:"Maximize",TC:"最大化"}],["Toolbar-"+JSCHART_BUTTON_ID.TITLE_WINDOW,{CN:"折叠窗口",EN:"Collapse window",TC:"折叠窗口"}],["Toolbar-"+JSCHART_BUTTON_ID.EXPORT_DATA,{CN:"数据导出",EN:"Export data",TC:"数据导出"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_BEFOREOPEN_ID,{CN:"关闭集合竞价",EN:"Close call auction",TC:"关闭集合竞价"}],["Toolbar-"+JSCHART_BUTTON_ID.CLOSE_OVERLAY_INDEX,{CN:"关闭叠加指标",EN:"Delte overlay indicator",TC:"关闭叠加指标"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_RECENT,{CN:"近期成本分布",EN:"Recent chip",TC:"近期成本分布"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_LONG,{CN:"远期成本分布",EN:"Long chip",TC:"远期成本分布"}],["Toolbar-"+JSCHART_BUTTON_ID.CHIP_DEFULT,{CN:"默认筹码分布",EN:"Default chip",TC:"默认筹码分布"}],["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE,{CN:"删除",EN:"Delete",TC:"删除"}],["Toolbar-"+JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING,{CN:"设置",EN:"Setting",TC:"设置"}],//日盘|夜盘
|
|
6833
|
-
["日盘",{CN:'日盘',EN:'Day',TC:'日盤'}],["夜盘",{CN:'夜盘',EN:'Night',TC:'夜盤'}]]);this.GetText=function(key,language){var item=this.TextResource.get(key);if(!item)return'';switch(language){case JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID:return item.CN;case JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID:return item.EN;case JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID:return item.TC;default:return item.CN;}};this.SetTextResource=function(key,value){this.TextResource.set(key,value);};this.GetLanguageID=function(languageName){var languageID=null;switch(languageName){case'EN':languageID=JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID;break;case'CN':languageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;break;case"TC":languageID=JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID;break;default:break;}return languageID;};};var g_JSChartLocalization=new JSChartLocalization();/*
|
|
6833
|
+
["日盘",{CN:'日盘',EN:'Day',TC:'日盤'}],["夜盘",{CN:'夜盘',EN:'Night',TC:'夜盤'}]]);this.GetText=function(key,language){var item=this.TextResource.get(key);if(!item)return'';switch(language){case JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID:return item.CN;case JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID:return item.EN;case JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID:return item.TC;default:return item.CN;}};this.SetTextResource=function(key,value){this.TextResource.set(key,value);};this.GetLanguageID=function(languageName){var languageID=null;switch(languageName){case'EN':languageID=JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID;break;case'CN':languageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;break;case"TC":languageID=JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID;break;default:break;}return languageID;};this.GetLanguageName=function(id){switch(id){case JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID:return"EN";case JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID:return"CN";case JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID:return"TC";default:return null;}};};var g_JSChartLocalization=new JSChartLocalization();/*
|
|
6834
6834
|
指标列表 指标信息都在这里,不够后面再加字段
|
|
6835
6835
|
*/function JSIndexMap(){}JSIndexMap.Get=function(id){var indexMap=new _map2.default([['CJL',{IsMainIndex:false,Create:function Create(){return new JSIndex_CJL();}}],//期货指标
|
|
6836
6836
|
["OX",{IsMainIndex:false,Create:function Create(){return new JSIndex_OX();}}],["可视范围成交量分布图",{IsMainIndex:true,Create:function Create(option){return new VolProfileVisibleRangeIndex(option);}}]]);return indexMap.get(id);};// 定制K线计算
|
|
@@ -13639,10 +13639,12 @@ this.HQChart.Draw();};this.Show=function(x,y){if(!this.DivDialog)this.Create();t
|
|
|
13639
13639
|
jones_2000@163.com
|
|
13640
13640
|
|
|
13641
13641
|
K线点击弹出指定日期分时图
|
|
13642
|
-
*/function JSPopMinuteChart(){this.DivDialog=null;this.DivInfoText=null;this.HQChart=null;this.DragTitle=null;this.Date=null;this.ID=Guid();this.Minute={Option:JSPopMinuteChart.GetMinuteOption(),JSChart:null,Date:null};this.Inital=function(hqchart){this.HQChart=hqchart;};this.Create=function(){var _this85=this;var divDom=document.createElement('div');divDom.className='jchart_pop_minute_dailog';divDom.id=this.ID;divDom.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;divDom.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;var divTitle=document.createElement("div");divTitle.className='jschart_pop_minute_chart_Title_Div';divTitle.onmousedown=function(e){_this85.OnMouseDownTitle(e);};divDom.appendChild(divTitle);var divInfoText=document.createElement("div");divInfoText.className="";divInfoText.innerText="分时图";this.DivInfoText=divInfoText;divTitle.appendChild(divInfoText);var divClose=document.createElement("div");divClose.className='jschart_pop_minute_chart_Close_Div';divClose.innerText="x";divClose.onmousedown=function(e){_this85.Close(e);};divTitle.appendChild(divClose);var divChart=document.createElement('div');divChart.className='jschart_pop_minute_chart';divDom.appendChild(divChart);this.DivDialog=divDom;var chart=JSChart.Init(divChart);this.Minute.JSChart=chart
|
|
13643
|
-
|
|
13642
|
+
*/function JSPopMinuteChart(){this.DivDialog=null;this.DivInfoText=null;this.HQChart=null;this.DragTitle=null;this.Date=null;this.ID=Guid();this.Minute={Option:JSPopMinuteChart.GetMinuteOption(),JSChart:null,Date:null};this.Inital=function(hqchart){this.HQChart=hqchart;};this.Create=function(){var _this85=this;var divDom=document.createElement('div');divDom.className='jchart_pop_minute_dailog';divDom.id=this.ID;divDom.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;divDom.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;var divTitle=document.createElement("div");divTitle.className='jschart_pop_minute_chart_Title_Div';divTitle.onmousedown=function(e){_this85.OnMouseDownTitle(e);};divDom.appendChild(divTitle);var divInfoText=document.createElement("div");divInfoText.className="";divInfoText.innerText="分时图";this.DivInfoText=divInfoText;divTitle.appendChild(divInfoText);var divClose=document.createElement("div");divClose.className='jschart_pop_minute_chart_Close_Div';divClose.innerText="x";divClose.onmousedown=function(e){_this85.Close(e);};divTitle.appendChild(divClose);var divChart=document.createElement('div');divChart.className='jschart_pop_minute_chart';divDom.appendChild(divChart);this.DivDialog=divDom;var chart=JSChart.Init(divChart);this.Minute.JSChart=chart;//语言跟主图保持一致
|
|
13643
|
+
if(this.HQChart)this.Minute.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);this.Minute.Option.OnCreatedCallback=function(chart){_this85.OnCreateHQChart(chart);};this.Minute.Option.NetworkFilter=function(data,callback){_this85.NetworkFilter(data,callback);};chart.SetOption(this.Minute.Option);//设置K线配置
|
|
13644
|
+
document.body.appendChild(divDom);};this.NetworkFilter=function(data,callback){if(!this.HQChart||!this.HQChart.NetworkFilter)return;if(data)data.PopMinuteData={Date:this.Date};//弹出分时图额外数据
|
|
13645
|
+
if(data.Name=='MinuteChartContainer::RequestMinuteData')//分时图数据对接
|
|
13644
13646
|
{data.Request.Data.date=this.Date;data.Name="MinuteChartContainer::RequestPopMinuteData";data.Explain="指定日期分时数据";};this.HQChart.NetworkFilter(data,callback);};this.OnCreateHQChart=function(chart){};this.Destroy=function(){if(this.DivDialog)document.body.removeChild(this.DivDialog);this.DivDialog=null;this.DivInfoText=null;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.Symbol||!IFrameSplitOperator.IsPlusNumber(data.Date));this.Date=data.Date;var name=data.Symbol;if(data.Name)name=data.Name;var title=name+' '+IFrameSplitOperator.FormatDateString(data.Date)+' \u5206\u65F6\u56FE';this.DivInfoText.innerText=title;if(this.Minute.JSChart){this.Minute.JSChart.ChangeSymbol(data.Symbol);}//超出窗口调整位置
|
|
13645
|
-
var height=this.DivDialog.offsetHeight;var width=this.DivDialog.offsetWidth;var xRight=window.innerWidth-5;var ybottom=window.innerHeight-5;if(x+width>xRight)x=xRight-width;if(y+height>ybottom)y=ybottom-height;this.DivDialog.style.visibility='visible';this.DivDialog.style.top=y+"px";this.DivDialog.style.left=x+"px";};this.Close=function(e){if(!this.DivDialog)return;this.DivDialog.style.visibility='hidden';};this.OnMouseDownTitle=function(e){var _this86=this;if(!this.DivDialog)return;var dragData={X:e.clientX,Y:e.clientY};dragData.YOffset=e.clientX-this.DivDialog.offsetLeft;dragData.XOffset=e.clientY-this.DivDialog.offsetTop;this.DragTitle=dragData;document.onmousemove=function(e){_this86.DocOnMouseMoveTitle(e);};document.onmouseup=function(e){_this86.DocOnMouseUpTitle(e);};};this.DocOnMouseMoveTitle=function(e){if(!this.DragTitle)return;var left=e.clientX-this.DragTitle.YOffset;var top=e.clientY-this.DragTitle.XOffset;var right=left+this.DivDialog.offsetWidth;var bottom=top+this.DivDialog.offsetHeight;if(right+5>=window.innerWidth)left=window.innerWidth-this.DivDialog.offsetWidth-5;if(bottom+5>=window.innerHeight)top=window.innerHeight-this.DivDialog.offsetHeight-5;this.DivDialog.style.left=left+'px';this.DivDialog.style.top=top+'px';if(e.preventDefault)e.preventDefault();};this.DocOnMouseUpTitle=function(e){this.DragTitle=null;this.onmousemove=null;this.onmouseup=null;};this.ReloadResource=function(option){if(!this.DivDialog)return;this.DivDialog.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;this.DivDialog.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;if(this.Minute.JSChart)this.Minute.JSChart.ReloadResource(option);};}JSPopMinuteChart.GetMinuteOption=function(){var option={Type:'分钟走势图',//创建图形类型
|
|
13647
|
+
var height=this.DivDialog.offsetHeight;var width=this.DivDialog.offsetWidth;var xRight=window.innerWidth-5;var ybottom=window.innerHeight-5;if(x+width>xRight)x=xRight-width;if(y+height>ybottom)y=ybottom-height;this.DivDialog.style.visibility='visible';this.DivDialog.style.top=y+"px";this.DivDialog.style.left=x+"px";};this.Close=function(e){if(!this.DivDialog)return;this.DivDialog.style.visibility='hidden';};this.OnMouseDownTitle=function(e){var _this86=this;if(!this.DivDialog)return;var dragData={X:e.clientX,Y:e.clientY};dragData.YOffset=e.clientX-this.DivDialog.offsetLeft;dragData.XOffset=e.clientY-this.DivDialog.offsetTop;this.DragTitle=dragData;document.onmousemove=function(e){_this86.DocOnMouseMoveTitle(e);};document.onmouseup=function(e){_this86.DocOnMouseUpTitle(e);};};this.DocOnMouseMoveTitle=function(e){if(!this.DragTitle)return;var left=e.clientX-this.DragTitle.YOffset;var top=e.clientY-this.DragTitle.XOffset;var right=left+this.DivDialog.offsetWidth;var bottom=top+this.DivDialog.offsetHeight;if(right+5>=window.innerWidth)left=window.innerWidth-this.DivDialog.offsetWidth-5;if(bottom+5>=window.innerHeight)top=window.innerHeight-this.DivDialog.offsetHeight-5;this.DivDialog.style.left=left+'px';this.DivDialog.style.top=top+'px';if(e.preventDefault)e.preventDefault();};this.DocOnMouseUpTitle=function(e){this.DragTitle=null;this.onmousemove=null;this.onmouseup=null;};this.ReloadResource=function(option){if(!this.DivDialog)return;this.DivDialog.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;this.DivDialog.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;if(this.Minute.JSChart)this.Minute.JSChart.ReloadResource(option);};this.SetLanguage=function(language){if(!this.DivDialog)return;if(this.Minute.JSChart)this.Minute.JSChart.SetLanguage(language);};}JSPopMinuteChart.GetMinuteOption=function(){var option={Type:'分钟走势图',//创建图形类型
|
|
13646
13648
|
Windows://窗口指标
|
|
13647
13649
|
[//{ Index:"VOL" },
|
|
13648
13650
|
//{ Index:"RSI" }
|
|
@@ -13671,7 +13673,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13671
13673
|
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);};}/********************************************************************************
|
|
13672
13674
|
* 版本信息输出
|
|
13673
13675
|
*
|
|
13674
|
-
*/var HQCHART_VERSION="1.1.
|
|
13676
|
+
*/var HQCHART_VERSION="1.1.13657";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();//把给外界调用的方法暴露出来
|
|
13675
13677
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13676
13678
|
// BaseIndex:BaseIndex,
|
|
13677
13679
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -66,6 +66,8 @@ function JSPopMinuteChart()
|
|
|
66
66
|
|
|
67
67
|
var chart=JSChart.Init(divChart);
|
|
68
68
|
this.Minute.JSChart=chart;
|
|
69
|
+
//语言跟主图保持一致
|
|
70
|
+
if (this.HQChart) this.Minute.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);
|
|
69
71
|
this.Minute.Option.OnCreatedCallback=(chart)=>{ this.OnCreateHQChart(chart); }
|
|
70
72
|
this.Minute.Option.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback); }
|
|
71
73
|
chart.SetOption(this.Minute.Option); //设置K线配置
|
|
@@ -76,6 +78,8 @@ function JSPopMinuteChart()
|
|
|
76
78
|
this.NetworkFilter=function(data, callback)
|
|
77
79
|
{
|
|
78
80
|
if (!this.HQChart || !this.HQChart.NetworkFilter) return;
|
|
81
|
+
|
|
82
|
+
if (data) data.PopMinuteData={ Date:this.Date }; //弹出分时图额外数据
|
|
79
83
|
|
|
80
84
|
if (data.Name== 'MinuteChartContainer::RequestMinuteData') //分时图数据对接
|
|
81
85
|
{
|
|
@@ -191,6 +195,13 @@ function JSPopMinuteChart()
|
|
|
191
195
|
|
|
192
196
|
if (this.Minute.JSChart) this.Minute.JSChart.ReloadResource(option);
|
|
193
197
|
}
|
|
198
|
+
|
|
199
|
+
this.SetLanguage=function(language)
|
|
200
|
+
{
|
|
201
|
+
if (!this.DivDialog) return;
|
|
202
|
+
|
|
203
|
+
if (this.Minute.JSChart) this.Minute.JSChart.SetLanguage(language);
|
|
204
|
+
}
|
|
194
205
|
}
|
|
195
206
|
|
|
196
207
|
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -7838,7 +7838,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7838
7838
|
if (!IFrameSplitOperator.IsNumber(languageID))
|
|
7839
7839
|
{
|
|
7840
7840
|
console.warn(`[JSChartContainer::SetLanguage] language=${language} error`);
|
|
7841
|
-
|
|
7841
|
+
return;
|
|
7842
7842
|
}
|
|
7843
7843
|
|
|
7844
7844
|
if (this.LanguageID==languageID) return;
|
|
@@ -7864,6 +7864,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
7864
7864
|
this.ResetFrameXYSplit();
|
|
7865
7865
|
this.Frame.SetSizeChage(true);
|
|
7866
7866
|
this.Draw();
|
|
7867
|
+
|
|
7868
|
+
if (this.PopMinuteChart) this.PopMinuteChart.SetLanguage(language);
|
|
7867
7869
|
}
|
|
7868
7870
|
|
|
7869
7871
|
this.ReloadTiltePaintResource=function(resource) //重新加载配置
|
|
@@ -69662,6 +69664,21 @@ function JSChartLocalization()
|
|
|
69662
69664
|
|
|
69663
69665
|
return languageID;
|
|
69664
69666
|
}
|
|
69667
|
+
|
|
69668
|
+
this.GetLanguageName=function(id)
|
|
69669
|
+
{
|
|
69670
|
+
switch(id)
|
|
69671
|
+
{
|
|
69672
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID:
|
|
69673
|
+
return "EN";
|
|
69674
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID:
|
|
69675
|
+
return "CN";
|
|
69676
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID:
|
|
69677
|
+
return "TC"
|
|
69678
|
+
default:
|
|
69679
|
+
return null;
|
|
69680
|
+
}
|
|
69681
|
+
}
|
|
69665
69682
|
};
|
|
69666
69683
|
|
|
69667
69684
|
var g_JSChartLocalization=new JSChartLocalization();
|
|
@@ -11763,7 +11763,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11763
11763
|
if (!IFrameSplitOperator.IsNumber(languageID))
|
|
11764
11764
|
{
|
|
11765
11765
|
console.warn(`[JSChartContainer::SetLanguage] language=${language} error`);
|
|
11766
|
-
|
|
11766
|
+
return;
|
|
11767
11767
|
}
|
|
11768
11768
|
|
|
11769
11769
|
if (this.LanguageID==languageID) return;
|
|
@@ -11789,6 +11789,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11789
11789
|
this.ResetFrameXYSplit();
|
|
11790
11790
|
this.Frame.SetSizeChage(true);
|
|
11791
11791
|
this.Draw();
|
|
11792
|
+
|
|
11793
|
+
if (this.PopMinuteChart) this.PopMinuteChart.SetLanguage(language);
|
|
11792
11794
|
}
|
|
11793
11795
|
|
|
11794
11796
|
this.ReloadTiltePaintResource=function(resource) //重新加载配置
|
|
@@ -73587,6 +73589,21 @@ function JSChartLocalization()
|
|
|
73587
73589
|
|
|
73588
73590
|
return languageID;
|
|
73589
73591
|
}
|
|
73592
|
+
|
|
73593
|
+
this.GetLanguageName=function(id)
|
|
73594
|
+
{
|
|
73595
|
+
switch(id)
|
|
73596
|
+
{
|
|
73597
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID:
|
|
73598
|
+
return "EN";
|
|
73599
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID:
|
|
73600
|
+
return "CN";
|
|
73601
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID:
|
|
73602
|
+
return "TC"
|
|
73603
|
+
default:
|
|
73604
|
+
return null;
|
|
73605
|
+
}
|
|
73606
|
+
}
|
|
73590
73607
|
};
|
|
73591
73608
|
|
|
73592
73609
|
var g_JSChartLocalization=new JSChartLocalization();
|
|
@@ -137399,7 +137416,7 @@ function ScrollBarBGChart()
|
|
|
137399
137416
|
|
|
137400
137417
|
|
|
137401
137418
|
|
|
137402
|
-
var HQCHART_VERSION="1.1.
|
|
137419
|
+
var HQCHART_VERSION="1.1.13657";
|
|
137403
137420
|
|
|
137404
137421
|
function PrintHQChartVersion()
|
|
137405
137422
|
{
|
|
@@ -11807,7 +11807,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11807
11807
|
if (!IFrameSplitOperator.IsNumber(languageID))
|
|
11808
11808
|
{
|
|
11809
11809
|
console.warn(`[JSChartContainer::SetLanguage] language=${language} error`);
|
|
11810
|
-
|
|
11810
|
+
return;
|
|
11811
11811
|
}
|
|
11812
11812
|
|
|
11813
11813
|
if (this.LanguageID==languageID) return;
|
|
@@ -11833,6 +11833,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11833
11833
|
this.ResetFrameXYSplit();
|
|
11834
11834
|
this.Frame.SetSizeChage(true);
|
|
11835
11835
|
this.Draw();
|
|
11836
|
+
|
|
11837
|
+
if (this.PopMinuteChart) this.PopMinuteChart.SetLanguage(language);
|
|
11836
11838
|
}
|
|
11837
11839
|
|
|
11838
11840
|
this.ReloadTiltePaintResource=function(resource) //重新加载配置
|
|
@@ -73631,6 +73633,21 @@ function JSChartLocalization()
|
|
|
73631
73633
|
|
|
73632
73634
|
return languageID;
|
|
73633
73635
|
}
|
|
73636
|
+
|
|
73637
|
+
this.GetLanguageName=function(id)
|
|
73638
|
+
{
|
|
73639
|
+
switch(id)
|
|
73640
|
+
{
|
|
73641
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_ENGLISH_ID:
|
|
73642
|
+
return "EN";
|
|
73643
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID:
|
|
73644
|
+
return "CN";
|
|
73645
|
+
case JSCHART_LANGUAGE_ID.LANGUAGE_TRADITIONAL_CHINESE_ID:
|
|
73646
|
+
return "TC"
|
|
73647
|
+
default:
|
|
73648
|
+
return null;
|
|
73649
|
+
}
|
|
73650
|
+
}
|
|
73634
73651
|
};
|
|
73635
73652
|
|
|
73636
73653
|
var g_JSChartLocalization=new JSChartLocalization();
|
|
@@ -141304,6 +141321,8 @@ function JSPopMinuteChart()
|
|
|
141304
141321
|
|
|
141305
141322
|
var chart=JSChart.Init(divChart);
|
|
141306
141323
|
this.Minute.JSChart=chart;
|
|
141324
|
+
//语言跟主图保持一致
|
|
141325
|
+
if (this.HQChart) this.Minute.Option.Language=g_JSChartLocalization.GetLanguageName(this.HQChart.LanguageID);
|
|
141307
141326
|
this.Minute.Option.OnCreatedCallback=(chart)=>{ this.OnCreateHQChart(chart); }
|
|
141308
141327
|
this.Minute.Option.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback); }
|
|
141309
141328
|
chart.SetOption(this.Minute.Option); //设置K线配置
|
|
@@ -141314,6 +141333,8 @@ function JSPopMinuteChart()
|
|
|
141314
141333
|
this.NetworkFilter=function(data, callback)
|
|
141315
141334
|
{
|
|
141316
141335
|
if (!this.HQChart || !this.HQChart.NetworkFilter) return;
|
|
141336
|
+
|
|
141337
|
+
if (data) data.PopMinuteData={ Date:this.Date }; //弹出分时图额外数据
|
|
141317
141338
|
|
|
141318
141339
|
if (data.Name== 'MinuteChartContainer::RequestMinuteData') //分时图数据对接
|
|
141319
141340
|
{
|
|
@@ -141429,6 +141450,13 @@ function JSPopMinuteChart()
|
|
|
141429
141450
|
|
|
141430
141451
|
if (this.Minute.JSChart) this.Minute.JSChart.ReloadResource(option);
|
|
141431
141452
|
}
|
|
141453
|
+
|
|
141454
|
+
this.SetLanguage=function(language)
|
|
141455
|
+
{
|
|
141456
|
+
if (!this.DivDialog) return;
|
|
141457
|
+
|
|
141458
|
+
if (this.Minute.JSChart) this.Minute.JSChart.SetLanguage(language);
|
|
141459
|
+
}
|
|
141432
141460
|
}
|
|
141433
141461
|
|
|
141434
141462
|
|
|
@@ -141625,7 +141653,7 @@ function HQChartScriptWorker()
|
|
|
141625
141653
|
|
|
141626
141654
|
|
|
141627
141655
|
|
|
141628
|
-
var HQCHART_VERSION="1.1.
|
|
141656
|
+
var HQCHART_VERSION="1.1.13657";
|
|
141629
141657
|
|
|
141630
141658
|
function PrintHQChartVersion()
|
|
141631
141659
|
{
|