hqchart 1.1.13951 → 1.1.13955
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 +6 -4
- package/package.json +1 -1
- package/src/jscommon/umychart.TReport.js +13 -4
- package/src/jscommon/umychart.js +4 -0
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +5 -1
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +18 -5
package/lib/umychart.vue.js
CHANGED
|
@@ -9261,6 +9261,7 @@ SHFE:'.SHF',//上期所 (Shanghai Futures Exchange) | 上期所-能源
|
|
|
9261
9261
|
SHFE2:'.SHFE',//上期所 (Shanghai Futures Exchange) | 上期所-能源
|
|
9262
9262
|
CFFEX:'.CFE',//中期所 (China Financial Futures Exchange)
|
|
9263
9263
|
CFFEX2:'.CFFEX',//中期所 (China Financial Futures Exchange)
|
|
9264
|
+
CFFEX3:'.CF',//中期所 (China Financial Futures Exchange)
|
|
9264
9265
|
DCE:'.DCE',//大连商品交易所(Dalian Commodity Exchange)
|
|
9265
9266
|
CZCE:'.CZC',//郑州期货交易所
|
|
9266
9267
|
GZFE:".GZFE",//广州期货交易所
|
|
@@ -9287,7 +9288,8 @@ IsET:function IsET(upperSymbol){if(!upperSymbol)return false;return upperSymbol.
|
|
|
9287
9288
|
{return false;},IsHSX:function IsHSX(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.HSX)>0;},IsHNX:function IsHNX(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.HNX)>0;},IsUPCOM:function IsUPCOM(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.UPCOM)>0;},IsNYMEX:function IsNYMEX(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.NYMEX)>0;},IsCOMEX:function IsCOMEX(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.COMEX)>0;},IsNYBOT:function IsNYBOT(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.NYBOT)>0;},IsCBOT:function IsCBOT(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.CBOT)>0;},IsLME:function IsLME(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.LME)>0;},IsTOCOM:function IsTOCOM(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.TOCOM)>0;},IsIPE:function IsIPE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.IPE)>0;},IsForeignExchange:function IsForeignExchange(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.FOREX)>0;},IsFTSE:function IsFTSE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.FTSE)>0;},IsFHK:function IsFHK(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.FHK)>0;},IsBIT:function IsBIT(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.BIT)>0)return true;if(upperSymbol.indexOf(this.BIZ)>0)return true;return false;},IsUSA:function IsUSA(upperSymbol)//是否是美股
|
|
9288
9289
|
{if(!upperSymbol)return false;return upperSymbol.indexOf(this.USA)>0;},IsSH:function IsSH(upperSymbol){//需要精确匹配最后3位
|
|
9289
9290
|
var pos=upperSymbol.length-this.SH.length;var find=upperSymbol.indexOf(this.SH);return find==pos;},IsSZ:function IsSZ(upperSymbol){var pos=upperSymbol.length-this.SZ.length;var find=upperSymbol.indexOf(this.SZ);return find==pos;},IsBJ:function IsBJ(upperSymbol){var pos=upperSymbol.length-this.BJ.length;var find=upperSymbol.indexOf(this.BJ);return find==pos;},//自定义指数
|
|
9290
|
-
IsSHSZCustomIndex:function IsSHSZCustomIndex(upperSymbol){var pos=upperSymbol.length-this.SHSZ_C_Index.length;var find=upperSymbol.indexOf(this.SHSZ_C_Index);return find==pos;},IsSHO:function IsSHO(upperSymbol){var pos=upperSymbol.length-this.SHO.length;var find=upperSymbol.indexOf(this.SHO);return find==pos;},IsSZO:function IsSZO(upperSymbol){var pos=upperSymbol.length-this.SZO.length;var find=upperSymbol.indexOf(this.SZO);return find==pos;},IsHK:function IsHK(upperSymbol){var pos=upperSymbol.length-this.HK.length;var find=upperSymbol.indexOf(this.HK);return find==pos;},IsTW:function IsTW(upperSymbol){var pos=upperSymbol.length-this.TW.length;var find=upperSymbol.indexOf(this.TW);return find==pos;},IsJP:function IsJP(upperSymbol){var pos=upperSymbol.length-this.JP.length;var find=upperSymbol.indexOf(this.JP);return find==pos;},IsSHFE:function IsSHFE(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.SHFE)>0)return true;if(upperSymbol.indexOf(this.SHFE2)>0)return true;return false;},IsCFFEX:function IsCFFEX(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.CFFEX)>0)return true;if(upperSymbol.indexOf(this.CFFEX2)>0)return true;
|
|
9291
|
+
IsSHSZCustomIndex:function IsSHSZCustomIndex(upperSymbol){var pos=upperSymbol.length-this.SHSZ_C_Index.length;var find=upperSymbol.indexOf(this.SHSZ_C_Index);return find==pos;},IsSHO:function IsSHO(upperSymbol){var pos=upperSymbol.length-this.SHO.length;var find=upperSymbol.indexOf(this.SHO);return find==pos;},IsSZO:function IsSZO(upperSymbol){var pos=upperSymbol.length-this.SZO.length;var find=upperSymbol.indexOf(this.SZO);return find==pos;},IsHK:function IsHK(upperSymbol){var pos=upperSymbol.length-this.HK.length;var find=upperSymbol.indexOf(this.HK);return find==pos;},IsTW:function IsTW(upperSymbol){var pos=upperSymbol.length-this.TW.length;var find=upperSymbol.indexOf(this.TW);return find==pos;},IsJP:function IsJP(upperSymbol){var pos=upperSymbol.length-this.JP.length;var find=upperSymbol.indexOf(this.JP);return find==pos;},IsSHFE:function IsSHFE(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.SHFE)>0)return true;if(upperSymbol.indexOf(this.SHFE2)>0)return true;return false;},IsCFFEX:function IsCFFEX(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.CFFEX)>0)return true;if(upperSymbol.indexOf(this.CFFEX2)>0)return true;var index=upperSymbol.indexOf(this.CFFEX3);//必须已.CF结尾
|
|
9292
|
+
if(index>0&&index+this.CFFEX3.length==upperSymbol.length)return true;return false;},IsDCE:function IsDCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.DCE)>0;},IsCZCE:function IsCZCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.CZCE)>0;},IsGZFE:function IsGZFE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.GZFE)>0;},IsChinaFutures:function IsChinaFutures(upperSymbol)//是否是国内期货 /期权
|
|
9291
9293
|
{return this.IsSHO(upperSymbol)||this.IsSZO(upperSymbol)||this.IsGZFE(upperSymbol)||this.IsCFFEX(upperSymbol)||this.IsCZCE(upperSymbol)||this.IsDCE(upperSymbol)||this.IsSHFE(upperSymbol);},IsFutures:function IsFutures(upperSymbol)//是否是期货 包含国外的
|
|
9292
9294
|
{if(!upperSymbol)return false;return this.IsChinaFutures(upperSymbol)||this.IsNYMEX(upperSymbol)||this.IsCOMEX(upperSymbol)||this.IsNYBOT(upperSymbol)||this.IsCBOT(upperSymbol)||this.IsLME(upperSymbol)||this.IsTOCOM(upperSymbol);},IsSHSZ:function IsSHSZ(upperSymbol)//是否是沪深的股票
|
|
9293
9295
|
{return this.IsSZ(upperSymbol)||this.IsSH(upperSymbol)||this.IsSHSZCustomIndex(upperSymbol);},IsSHSZFund:function IsSHSZFund(upperSymbol)//是否是交易所基金
|
|
@@ -13137,8 +13139,8 @@ this.Draw=function(){if(!this.Canvas)return;if(!this.Data||!IFrameSplitOperator.
|
|
|
13137
13139
|
*/function JSTReportChart(divElement){this.DivElement=divElement;this.JSChartContainer;//表格控件
|
|
13138
13140
|
this.ResizeListener;//大小变动监听
|
|
13139
13141
|
//h5 canvas
|
|
13140
|
-
this.CanvasElement=document.createElement("canvas");this.CanvasElement.className='jstreport-drawing';this.CanvasElement.id=Guid();this.CanvasElement.setAttribute("tabindex",0);if(this.CanvasElement.style)this.CanvasElement.style.outline='none';if(divElement.hasChildNodes()){JSConsole.Chart.Log("[JSTReportChart::JSReportChart] divElement hasChildNodes",divElement.childNodes);}divElement.appendChild(this.CanvasElement);this.OnSize=function(){//画布大小通过div获取
|
|
13141
|
-
var height=parseInt(this.DivElement.style.height.replace("px",""));this.
|
|
13142
|
+
this.CanvasElement=document.createElement("canvas");this.CanvasElement.className='jstreport-drawing';this.CanvasElement.id=Guid();this.CanvasElement.setAttribute("tabindex",0);if(this.CanvasElement.style)this.CanvasElement.style.outline='none';if(divElement.hasChildNodes()){JSConsole.Chart.Log("[JSTReportChart::JSReportChart] divElement hasChildNodes",divElement.childNodes);}divElement.appendChild(this.CanvasElement);this.OnSize=function(){//画布大小通过div获取 如果有style里的大小 使用style里的
|
|
13143
|
+
var height=this.DivElement.offsetHeight;var width=this.DivElement.offsetWidth;if(this.DivElement.style.height&&this.DivElement.style.width){if(this.DivElement.style.height.includes("px"))height=parseInt(this.DivElement.style.height.replace("px",""));if(this.DivElement.style.width.includes("px"))width=parseInt(this.DivElement.style.width.replace("px",""));}this.CanvasElement.height=height;this.CanvasElement.width=width;this.CanvasElement.style.width=this.CanvasElement.width+'px';this.CanvasElement.style.height=this.CanvasElement.height+'px';var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
|
|
13142
13144
|
this.CanvasElement.height*=pixelTatio;this.CanvasElement.width*=pixelTatio;JSConsole.Chart.Log('[JSTReportChart::OnSize] devicePixelRatio='+window.devicePixelRatio+', height='+this.CanvasElement.height+', width='+this.CanvasElement.width);if(this.JSChartContainer&&this.JSChartContainer.OnSize){this.JSChartContainer.OnSize();}};this.SetOption=function(option){var chart=this.CreateJSTReportChartContainer(option);if(!chart)return false;if(option.OnCreatedCallback)option.OnCreatedCallback(chart);this.JSChartContainer=chart;this.DivElement.JSChart=this;//div中保存一份
|
|
13143
13145
|
if(option.EnableResize==true)this.CreateResizeListener();if(option.Symbol){chart.Draw();var name=option.Symbol;if(option.Name)name=option.Name;chart.ChangeSymbol(option.Symbol,{Name:name});//下载列表码表
|
|
13144
13146
|
}};this.CreateJSTReportChartContainer=function(option){var chart=new JSTReportChartContainer(this.CanvasElement);chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);if(IFrameSplitOperator.IsNonEmptyArray(option.Tab))chart.SetTab(option.Tab);if(IFrameSplitOperator.IsNumber(option.TabSelected))chart.SetSelectedTab(option.TabSelected);if(IFrameSplitOperator.IsBool(option.EnableDragRow))chart.EnableDragRow=option.EnableDragRow;if(IFrameSplitOperator.IsNumber(option.DragRowType))chart.DragRowType=option.DragRowType;if(IFrameSplitOperator.IsBool(option.EnableDragHeader))chart.EnableDragHeader=option.EnableDragHeader;if(option.SortInfo){var item=option.SortInfo;if(IFrameSplitOperator.IsNumber(item.Field))chart.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))chart.SortInfo.Sort=item.Sort;}this.SetChartBorder(chart,option);//是否自动更新
|
|
@@ -13867,7 +13869,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13867
13869
|
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);};}/********************************************************************************
|
|
13868
13870
|
* 版本信息输出
|
|
13869
13871
|
*
|
|
13870
|
-
*/var HQCHART_VERSION="1.1.
|
|
13872
|
+
*/var HQCHART_VERSION="1.1.13954";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();//把给外界调用的方法暴露出来
|
|
13871
13873
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13872
13874
|
// BaseIndex:BaseIndex,
|
|
13873
13875
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -32,10 +32,19 @@ function JSTReportChart(divElement)
|
|
|
32
32
|
|
|
33
33
|
this.OnSize=function()
|
|
34
34
|
{
|
|
35
|
-
//画布大小通过div获取
|
|
36
|
-
var height=
|
|
35
|
+
//画布大小通过div获取 如果有style里的大小 使用style里的
|
|
36
|
+
var height=this.DivElement.offsetHeight;
|
|
37
|
+
var width=this.DivElement.offsetWidth;
|
|
38
|
+
if (this.DivElement.style.height && this.DivElement.style.width)
|
|
39
|
+
{
|
|
40
|
+
if (this.DivElement.style.height.includes("px"))
|
|
41
|
+
height=parseInt(this.DivElement.style.height.replace("px",""));
|
|
42
|
+
if (this.DivElement.style.width.includes("px"))
|
|
43
|
+
width=parseInt(this.DivElement.style.width.replace("px",""));
|
|
44
|
+
}
|
|
45
|
+
|
|
37
46
|
this.CanvasElement.height=height;
|
|
38
|
-
this.CanvasElement.width=
|
|
47
|
+
this.CanvasElement.width=width;
|
|
39
48
|
this.CanvasElement.style.width=this.CanvasElement.width+'px';
|
|
40
49
|
this.CanvasElement.style.height=this.CanvasElement.height+'px';
|
|
41
50
|
|
|
@@ -789,7 +798,7 @@ function JSTReportChartContainer(uielement)
|
|
|
789
798
|
if (IFrameSplitOperator.IsNumber(item[10])) stock.BuyVol=item[10];
|
|
790
799
|
if (IFrameSplitOperator.IsNumber(item[11])) stock.SellPrice=item[11];
|
|
791
800
|
if (IFrameSplitOperator.IsNumber(item[12])) stock.SellVol=item[12];
|
|
792
|
-
if (IFrameSplitOperator.IsNumber(item[13])) stock.AvPrice=item[13];
|
|
801
|
+
if (IFrameSplitOperator.IsNumber(item[13])) stock.AvPrice=item[13]; //均价
|
|
793
802
|
if (IFrameSplitOperator.IsNumber(item[14])) stock.Position=item[14]; //持仓
|
|
794
803
|
|
|
795
804
|
if (IFrameSplitOperator.IsNumber(item[16])) stock.LimitHigh=item[16]; //涨停价
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -91667,6 +91667,7 @@ var MARKET_SUFFIX_NAME=
|
|
|
91667
91667
|
SHFE2:'.SHFE', //上期所 (Shanghai Futures Exchange) | 上期所-能源
|
|
91668
91668
|
CFFEX: '.CFE', //中期所 (China Financial Futures Exchange)
|
|
91669
91669
|
CFFEX2:'.CFFEX', //中期所 (China Financial Futures Exchange)
|
|
91670
|
+
CFFEX3:'.CF', //中期所 (China Financial Futures Exchange)
|
|
91670
91671
|
DCE: '.DCE', //大连商品交易所(Dalian Commodity Exchange)
|
|
91671
91672
|
CZCE: '.CZC', //郑州期货交易所
|
|
91672
91673
|
GZFE:".GZFE", //广州期货交易所
|
|
@@ -91879,6 +91880,9 @@ var MARKET_SUFFIX_NAME=
|
|
|
91879
91880
|
if (!upperSymbol) return false;
|
|
91880
91881
|
if (upperSymbol.indexOf(this.CFFEX) > 0) return true;
|
|
91881
91882
|
if (upperSymbol.indexOf(this.CFFEX2) > 0) return true;
|
|
91883
|
+
|
|
91884
|
+
var index=upperSymbol.indexOf(this.CFFEX3); //必须已.CF结尾
|
|
91885
|
+
if (index > 0 && index+this.CFFEX3.length==upperSymbol.length) return true;
|
|
91882
91886
|
|
|
91883
91887
|
return false;
|
|
91884
91888
|
},
|
|
@@ -95592,6 +95592,7 @@ var MARKET_SUFFIX_NAME=
|
|
|
95592
95592
|
SHFE2:'.SHFE', //上期所 (Shanghai Futures Exchange) | 上期所-能源
|
|
95593
95593
|
CFFEX: '.CFE', //中期所 (China Financial Futures Exchange)
|
|
95594
95594
|
CFFEX2:'.CFFEX', //中期所 (China Financial Futures Exchange)
|
|
95595
|
+
CFFEX3:'.CF', //中期所 (China Financial Futures Exchange)
|
|
95595
95596
|
DCE: '.DCE', //大连商品交易所(Dalian Commodity Exchange)
|
|
95596
95597
|
CZCE: '.CZC', //郑州期货交易所
|
|
95597
95598
|
GZFE:".GZFE", //广州期货交易所
|
|
@@ -95804,6 +95805,9 @@ var MARKET_SUFFIX_NAME=
|
|
|
95804
95805
|
if (!upperSymbol) return false;
|
|
95805
95806
|
if (upperSymbol.indexOf(this.CFFEX) > 0) return true;
|
|
95806
95807
|
if (upperSymbol.indexOf(this.CFFEX2) > 0) return true;
|
|
95808
|
+
|
|
95809
|
+
var index=upperSymbol.indexOf(this.CFFEX3); //必须已.CF结尾
|
|
95810
|
+
if (index > 0 && index+this.CFFEX3.length==upperSymbol.length) return true;
|
|
95807
95811
|
|
|
95808
95812
|
return false;
|
|
95809
95813
|
},
|
|
@@ -139117,7 +139121,7 @@ function ScrollBarBGChart()
|
|
|
139117
139121
|
|
|
139118
139122
|
|
|
139119
139123
|
|
|
139120
|
-
var HQCHART_VERSION="1.1.
|
|
139124
|
+
var HQCHART_VERSION="1.1.13954";
|
|
139121
139125
|
|
|
139122
139126
|
function PrintHQChartVersion()
|
|
139123
139127
|
{
|
|
@@ -95636,6 +95636,7 @@ var MARKET_SUFFIX_NAME=
|
|
|
95636
95636
|
SHFE2:'.SHFE', //上期所 (Shanghai Futures Exchange) | 上期所-能源
|
|
95637
95637
|
CFFEX: '.CFE', //中期所 (China Financial Futures Exchange)
|
|
95638
95638
|
CFFEX2:'.CFFEX', //中期所 (China Financial Futures Exchange)
|
|
95639
|
+
CFFEX3:'.CF', //中期所 (China Financial Futures Exchange)
|
|
95639
95640
|
DCE: '.DCE', //大连商品交易所(Dalian Commodity Exchange)
|
|
95640
95641
|
CZCE: '.CZC', //郑州期货交易所
|
|
95641
95642
|
GZFE:".GZFE", //广州期货交易所
|
|
@@ -95848,6 +95849,9 @@ var MARKET_SUFFIX_NAME=
|
|
|
95848
95849
|
if (!upperSymbol) return false;
|
|
95849
95850
|
if (upperSymbol.indexOf(this.CFFEX) > 0) return true;
|
|
95850
95851
|
if (upperSymbol.indexOf(this.CFFEX2) > 0) return true;
|
|
95852
|
+
|
|
95853
|
+
var index=upperSymbol.indexOf(this.CFFEX3); //必须已.CF结尾
|
|
95854
|
+
if (index > 0 && index+this.CFFEX3.length==upperSymbol.length) return true;
|
|
95851
95855
|
|
|
95852
95856
|
return false;
|
|
95853
95857
|
},
|
|
@@ -135854,10 +135858,19 @@ function JSTReportChart(divElement)
|
|
|
135854
135858
|
|
|
135855
135859
|
this.OnSize=function()
|
|
135856
135860
|
{
|
|
135857
|
-
//画布大小通过div获取
|
|
135858
|
-
var height=
|
|
135861
|
+
//画布大小通过div获取 如果有style里的大小 使用style里的
|
|
135862
|
+
var height=this.DivElement.offsetHeight;
|
|
135863
|
+
var width=this.DivElement.offsetWidth;
|
|
135864
|
+
if (this.DivElement.style.height && this.DivElement.style.width)
|
|
135865
|
+
{
|
|
135866
|
+
if (this.DivElement.style.height.includes("px"))
|
|
135867
|
+
height=parseInt(this.DivElement.style.height.replace("px",""));
|
|
135868
|
+
if (this.DivElement.style.width.includes("px"))
|
|
135869
|
+
width=parseInt(this.DivElement.style.width.replace("px",""));
|
|
135870
|
+
}
|
|
135871
|
+
|
|
135859
135872
|
this.CanvasElement.height=height;
|
|
135860
|
-
this.CanvasElement.width=
|
|
135873
|
+
this.CanvasElement.width=width;
|
|
135861
135874
|
this.CanvasElement.style.width=this.CanvasElement.width+'px';
|
|
135862
135875
|
this.CanvasElement.style.height=this.CanvasElement.height+'px';
|
|
135863
135876
|
|
|
@@ -136611,7 +136624,7 @@ function JSTReportChartContainer(uielement)
|
|
|
136611
136624
|
if (IFrameSplitOperator.IsNumber(item[10])) stock.BuyVol=item[10];
|
|
136612
136625
|
if (IFrameSplitOperator.IsNumber(item[11])) stock.SellPrice=item[11];
|
|
136613
136626
|
if (IFrameSplitOperator.IsNumber(item[12])) stock.SellVol=item[12];
|
|
136614
|
-
if (IFrameSplitOperator.IsNumber(item[13])) stock.AvPrice=item[13];
|
|
136627
|
+
if (IFrameSplitOperator.IsNumber(item[13])) stock.AvPrice=item[13]; //均价
|
|
136615
136628
|
if (IFrameSplitOperator.IsNumber(item[14])) stock.Position=item[14]; //持仓
|
|
136616
136629
|
|
|
136617
136630
|
if (IFrameSplitOperator.IsNumber(item[16])) stock.LimitHigh=item[16]; //涨停价
|
|
@@ -144513,7 +144526,7 @@ function HQChartScriptWorker()
|
|
|
144513
144526
|
|
|
144514
144527
|
|
|
144515
144528
|
|
|
144516
|
-
var HQCHART_VERSION="1.1.
|
|
144529
|
+
var HQCHART_VERSION="1.1.13954";
|
|
144517
144530
|
|
|
144518
144531
|
function PrintHQChartVersion()
|
|
144519
144532
|
{
|