hqchart 1.1.15428 → 1.1.15438
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 +33 -27
- package/package.json +1 -1
- package/src/jscommon/umychart.DialogTooltip.js +3 -5
- package/src/jscommon/umychart.StockInfo.js +18 -5
- package/src/jscommon/umychart.deal.js +31 -9
- package/src/jscommon/umychart.js +27 -5
- package/src/jscommon/umychart.report.js +50 -12
- package/src/jscommon/umychart.style.js +2 -2
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +111 -29
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +114 -34
package/lib/umychart.vue.js
CHANGED
|
@@ -7728,7 +7728,7 @@ BGColor:"rgb(255,255,255)"//鼠标区间选中
|
|
|
7728
7728
|
LineWidth:1*GetDevicePixelRatio(),BGColor:"rgba(128,128,128,0.2)"//面积
|
|
7729
7729
|
};this.DragMovePaint={TextColor:"rgb(0,0,0)",Font:14*GetDevicePixelRatio()+"px 微软雅黑"};this.SessionBreaksPaint={BGColor:[null,"rgb(245,246,246)"],SplitLine:{Color:'rgb(73,133,231)',Width:1*GetDevicePixelRatio(),Dash:[5*GetDevicePixelRatio(),5*GetDevicePixelRatio()]}};this.KLineCountDownPaint={Font:14*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',TextMargin:{Left:0,Right:0,Bottom:2,Top:2,YOffset:0},LabelMargin:{Left:5,Right:5,Bottom:4,Top:2},Line:{IsShow:true,Width:1,Dash:[5*GetDevicePixelRatio(),5*GetDevicePixelRatio()]},Unchange:{BGColor:"rgb(0,0,0)",PriceColor:"rgb(250,250,250)",TimeColor:"rgb(190,190,190)"},Up:{BGColor:"rgb(238,21,21)",PriceColor:"rgb(250,250,250)",TimeColor:"rgb(190,190,190)"},Down:{BGColor:"rgb(25,158,0)",PriceColor:"rgb(250,250,250)",TimeColor:"rgb(190,190,190)"}//成交明细
|
|
7730
7730
|
};this.DealList={BorderColor:'rgb(192,192,192)',//边框线
|
|
7731
|
-
Header:{Color:"RGB(60,60,60)",Mergin:{Left:5,Right:5,Top:4,Bottom:2},Font:{Size:
|
|
7731
|
+
Header:{Color:"RGB(60,60,60)",Mergin:{Left:5,Right:5,Top:4,Bottom:2},Font:{Size:14,Name:"微软雅黑"}},Row:{Mergin:{Top:2,Bottom:2},Font:{Size:14,Name:"微软雅黑"},BarMergin:{Top:2,Left:3,Right:3,Bottom:2}},FieldColor:{Vol:"rgb(90,90,90)",//成交量
|
|
7732
7732
|
Time:"rgb(60,60,60)",//时间
|
|
7733
7733
|
Deal:"rgb(90,90,90)",//成交笔数
|
|
7734
7734
|
Index:"rgb(60,60,60)",//序号
|
|
@@ -10189,6 +10189,7 @@ CFFEX3:'.CF',//中期所 (China Financial Futures Exchange)
|
|
|
10189
10189
|
DCE:'.DCE',//大连商品交易所(Dalian Commodity Exchange)
|
|
10190
10190
|
CZCE:'.CZC',//郑州期货交易所
|
|
10191
10191
|
GZFE:".GZFE",//广州期货交易所
|
|
10192
|
+
INE:".INE",//上海国际能源交易中心
|
|
10192
10193
|
USA:'.USA',//美股
|
|
10193
10194
|
FTSE:'.FTSE',//富时中国
|
|
10194
10195
|
BIT:'.BIT',//数字货币 如比特币
|
|
@@ -10215,8 +10216,8 @@ var pos=upperSymbol.length-this.SH.length;var find=upperSymbol.indexOf(this.SH);
|
|
|
10215
10216
|
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){if(this.IsSH(upperSymbol))//10007211.sh
|
|
10216
10217
|
{if(upperSymbol.length==11&&upperSymbol[0]=='1')return true;}var pos=upperSymbol.length-this.SHO.length;var find=upperSymbol.indexOf(this.SHO);return find==pos;},IsSZO:function IsSZO(upperSymbol){if(this.IsSZ(upperSymbol))//90004047.sz
|
|
10217
10218
|
{if(upperSymbol.length==11&&upperSymbol[0]=='9')return true;}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结尾
|
|
10218
|
-
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)//是否是国内期货 /期权
|
|
10219
|
-
{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)//是否是期货 包含国外的
|
|
10219
|
+
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;},IsINE:function IsINE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.INE)>0;},IsChinaFutures:function IsChinaFutures(upperSymbol)//是否是国内期货 /期权
|
|
10220
|
+
{if(!upperSymbol)return false;return this.IsSHO(upperSymbol)||this.IsSZO(upperSymbol)||this.IsGZFE(upperSymbol)||this.IsINE(upperSymbol)||this.IsCFFEX(upperSymbol)||this.IsCZCE(upperSymbol)||this.IsDCE(upperSymbol)||this.IsSHFE(upperSymbol);},IsFutures:function IsFutures(upperSymbol)//是否是期货 包含国外的
|
|
10220
10221
|
{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)//是否是沪深的股票
|
|
10221
10222
|
{return this.IsSZ(upperSymbol)||this.IsSH(upperSymbol)||this.IsSHSZCustomIndex(upperSymbol);},IsSHSZETFOption:function IsSHSZETFOption(upperSymbol)//沪深ETF期权
|
|
10222
10223
|
{if(!upperSymbol)return false;if(this.IsSH(upperSymbol)){var shortSymbol=JSChart.GetShortSymbol(upperSymbol);if(shortSymbol.charAt(0)=="1"&&shortSymbol.length==8)return true;}else if(this.IsSZ(upperSymbol)){var shortSymbol=JSChart.GetShortSymbol(upperSymbol);if(shortSymbol.charAt(0)=="9"&&shortSymbol.length==8)return true;}return false;},IsSHSZFund:function IsSHSZFund(upperSymbol)//是否是交易所基金
|
|
@@ -10312,7 +10313,7 @@ var TIME_SPLIT=[{Start:1715,End:2359},{Start:0,End:300},{Start:915,End:1200},{St
|
|
|
10312
10313
|
var TIME_SPLIT=[{Start:600,End:2359},{Start:0,End:559}];return this.CreateTimeData(TIME_SPLIT);};this.CreateBITData=function(){//数字货币 7:00 - 6:59
|
|
10313
10314
|
var TIME_SPLIT=[{Start:600,End:2359},{Start:0,End:559}];return this.CreateTimeData(TIME_SPLIT);};this.CreateTimeData=function(timeSplit){var data=[];for(var i in timeSplit){var item=timeSplit[i];for(var j=item.Start;j<=item.End;++j){if(j%100>=60)continue;//大于60分钟的数据去掉
|
|
10314
10315
|
data.push(j);}}return data;};this.GetTimeData=function(symbol,option){if(!symbol)return this.SHSZ;var upperSymbol=symbol.toLocaleUpperCase();//转成大写
|
|
10315
|
-
if(MARKET_SUFFIX_NAME.IsSHO(upperSymbol))return this.GetSHO();if(MARKET_SUFFIX_NAME.IsSZO(upperSymbol))return this.GetSZO();if(MARKET_SUFFIX_NAME.IsSH(upperSymbol)||MARKET_SUFFIX_NAME.IsSZ(upperSymbol))return this.GetSHSZ(upperSymbol);if(MARKET_SUFFIX_NAME.IsSHSZCustomIndex(upperSymbol))return this.GetSHSZCustomIndex(upperSymbol);if(MARKET_SUFFIX_NAME.IsBJ(upperSymbol))return this.GetBJ(upperSymbol);if(MARKET_SUFFIX_NAME.IsHK(upperSymbol))return this.GetHK(upperSymbol);if(MARKET_SUFFIX_NAME.IsTW(upperSymbol))return this.GetTW(upperSymbol);if(MARKET_SUFFIX_NAME.IsJP(upperSymbol))return this.GetJP(upperSymbol);if(MARKET_SUFFIX_NAME.IsUSA(upperSymbol))return this.GetUSA(upperSymbol);if(MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol)||MARKET_SUFFIX_NAME.IsCZCE(upperSymbol)||MARKET_SUFFIX_NAME.IsDCE(upperSymbol)||MARKET_SUFFIX_NAME.IsSHFE(upperSymbol)||MARKET_SUFFIX_NAME.IsGZFE(upperSymbol)){var splitData=g_FuturesTimeData.GetSplitData(upperSymbol,option);if(!splitData)return null;return this.GetFutures(splitData);}if(MARKET_SUFFIX_NAME.IsFTSE(upperSymbol))return this.GetFTSE();if(MARKET_SUFFIX_NAME.IsFHK(upperSymbol))return this.GetFHK();if(MARKET_SUFFIX_NAME.IsForeignExchange(upperSymbol))return this.GetForeignExchange(upperSymbol);if(MARKET_SUFFIX_NAME.IsET(upperSymbol))return this.GetET(upperSymbol);if(MARKET_SUFFIX_NAME.IsBIT(upperSymbol))return this.GetBIT(upperSymbol);//越南股市
|
|
10316
|
+
if(MARKET_SUFFIX_NAME.IsSHO(upperSymbol))return this.GetSHO();if(MARKET_SUFFIX_NAME.IsSZO(upperSymbol))return this.GetSZO();if(MARKET_SUFFIX_NAME.IsSH(upperSymbol)||MARKET_SUFFIX_NAME.IsSZ(upperSymbol))return this.GetSHSZ(upperSymbol);if(MARKET_SUFFIX_NAME.IsSHSZCustomIndex(upperSymbol))return this.GetSHSZCustomIndex(upperSymbol);if(MARKET_SUFFIX_NAME.IsBJ(upperSymbol))return this.GetBJ(upperSymbol);if(MARKET_SUFFIX_NAME.IsHK(upperSymbol))return this.GetHK(upperSymbol);if(MARKET_SUFFIX_NAME.IsTW(upperSymbol))return this.GetTW(upperSymbol);if(MARKET_SUFFIX_NAME.IsJP(upperSymbol))return this.GetJP(upperSymbol);if(MARKET_SUFFIX_NAME.IsUSA(upperSymbol))return this.GetUSA(upperSymbol);if(MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol)||MARKET_SUFFIX_NAME.IsCZCE(upperSymbol)||MARKET_SUFFIX_NAME.IsDCE(upperSymbol)||MARKET_SUFFIX_NAME.IsSHFE(upperSymbol)||MARKET_SUFFIX_NAME.IsGZFE(upperSymbol)||MARKET_SUFFIX_NAME.IsINE(upperSymbol)){var splitData=g_FuturesTimeData.GetSplitData(upperSymbol,option);if(!splitData)return null;return this.GetFutures(splitData);}if(MARKET_SUFFIX_NAME.IsFTSE(upperSymbol))return this.GetFTSE();if(MARKET_SUFFIX_NAME.IsFHK(upperSymbol))return this.GetFHK();if(MARKET_SUFFIX_NAME.IsForeignExchange(upperSymbol))return this.GetForeignExchange(upperSymbol);if(MARKET_SUFFIX_NAME.IsET(upperSymbol))return this.GetET(upperSymbol);if(MARKET_SUFFIX_NAME.IsBIT(upperSymbol))return this.GetBIT(upperSymbol);//越南股市
|
|
10316
10317
|
if(MARKET_SUFFIX_NAME.IsHSX(upperSymbol))return this.GetHSX(upperSymbol);if(MARKET_SUFFIX_NAME.IsHNX(upperSymbol))return this.GetHNX(upperSymbol);if(MARKET_SUFFIX_NAME.IsUPCOM(upperSymbol))return this.GetUPCOM(upperSymbol);if(MARKET_SUFFIX_NAME.IsNYMEX(upperSymbol))//纽约期货交易所
|
|
10317
10318
|
{var splitData=g_NYMEXTimeData.GetSplitData(upperSymbol);if(!splitData)return null;return this.GetFutures(splitData);}if(MARKET_SUFFIX_NAME.IsCOMEX(upperSymbol))//纽约期货交易所
|
|
10318
10319
|
{var splitData=g_COMEXTimeData.GetSplitData(upperSymbol);if(!splitData)return null;return this.GetFutures(splitData);}if(MARKET_SUFFIX_NAME.IsNYBOT(upperSymbol))//纽约期货交易所
|
|
@@ -10405,7 +10406,7 @@ var FTSE_MINUTE_X_COORDINATE={Full://完整模式
|
|
|
10405
10406
|
[[0,1,"RGB(200,200,200)","09:00"],[60,1,"RGB(200,200,200)","11:00"],[270,0,"RGB(200,200,200)","13:30"]],Count:271,MiddleCount:151,GetData:function GetData(width){if(width<200)return this.Min;else if(width<450)return this.Simple;return this.Full;}// option=GlobalOption
|
|
10406
10407
|
};this.GetCoordinateData=function(symbol,width,option){var data=null;if(!symbol){data=SHZE_MINUTE_X_COORDINATE;//默认沪深股票
|
|
10407
10408
|
}else{var upperSymbol=symbol.toLocaleUpperCase();//转成大写
|
|
10408
|
-
if(MARKET_SUFFIX_NAME.IsSHO(upperSymbol))data=this.GetSHOData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsSZO(upperSymbol))data=this.GetSZOData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsSH(upperSymbol)||MARKET_SUFFIX_NAME.IsSZ(upperSymbol)||MARKET_SUFFIX_NAME.IsSHSZIndex(upperSymbol))data=this.GetSHSZData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsBJ(upperSymbol))data=this.GetBJData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsHK(upperSymbol))data=this.GetHKData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsTW(upperSymbol))data=this.GetTWData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsJP(upperSymbol))data=this.GetJPData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol)||MARKET_SUFFIX_NAME.IsCZCE(upperSymbol)||MARKET_SUFFIX_NAME.IsDCE(upperSymbol)||MARKET_SUFFIX_NAME.IsSHFE(upperSymbol)||MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))return this.GetChinatFuturesData(upperSymbol,width,option);else if(MARKET_SUFFIX_NAME.IsUSA(upperSymbol))data=this.GetUSAData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsFTSE(upperSymbol))data=this.GetFTSEData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsFHK(upperSymbol))data=this.GetFHKData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsForeignExchange(upperSymbol))data=this.GetForeignExchangeData(upperSymbol);else if(MARKET_SUFFIX_NAME.IsBIT(upperSymbol,width))data=this.GetBITData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsET(upperSymbol))data=this.GetETData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsNYMEX(upperSymbol))return data=this.GetNYMEXData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsCOMEX(upperSymbol))return data=this.GetCOMEXData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsNYBOT(upperSymbol))return data=this.GetNYBOTData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsCBOT(upperSymbol))return data=this.GetCBOTData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsLME(upperSymbol))return data=this.GetLMEData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsTOCOM(upperSymbol))return data=this.GetTOCOMData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsIPE(upperSymbol))return data=this.GetIPEData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsHSX(upperSymbol))return data=this.GetHSXData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsHNX(upperSymbol))return data=this.GetHNXData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsUPCOM(upperSymbol))return data=this.GetUPCOMData(upperSymbol,width);}//JSConsole.Chart.Log('[MiuteCoordinateData]', width);
|
|
10409
|
+
if(MARKET_SUFFIX_NAME.IsSHO(upperSymbol))data=this.GetSHOData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsSZO(upperSymbol))data=this.GetSZOData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsSH(upperSymbol)||MARKET_SUFFIX_NAME.IsSZ(upperSymbol)||MARKET_SUFFIX_NAME.IsSHSZIndex(upperSymbol))data=this.GetSHSZData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsBJ(upperSymbol))data=this.GetBJData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsHK(upperSymbol))data=this.GetHKData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsTW(upperSymbol))data=this.GetTWData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsJP(upperSymbol))data=this.GetJPData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol)||MARKET_SUFFIX_NAME.IsCZCE(upperSymbol)||MARKET_SUFFIX_NAME.IsDCE(upperSymbol)||MARKET_SUFFIX_NAME.IsSHFE(upperSymbol)||MARKET_SUFFIX_NAME.IsGZFE(upperSymbol)||MARKET_SUFFIX_NAME.IsINE(upperSymbol))return this.GetChinatFuturesData(upperSymbol,width,option);else if(MARKET_SUFFIX_NAME.IsUSA(upperSymbol))data=this.GetUSAData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsFTSE(upperSymbol))data=this.GetFTSEData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsFHK(upperSymbol))data=this.GetFHKData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsForeignExchange(upperSymbol))data=this.GetForeignExchangeData(upperSymbol);else if(MARKET_SUFFIX_NAME.IsBIT(upperSymbol,width))data=this.GetBITData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsET(upperSymbol))data=this.GetETData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsNYMEX(upperSymbol))return data=this.GetNYMEXData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsCOMEX(upperSymbol))return data=this.GetCOMEXData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsNYBOT(upperSymbol))return data=this.GetNYBOTData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsCBOT(upperSymbol))return data=this.GetCBOTData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsLME(upperSymbol))return data=this.GetLMEData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsTOCOM(upperSymbol))return data=this.GetTOCOMData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsIPE(upperSymbol))return data=this.GetIPEData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsHSX(upperSymbol))return data=this.GetHSXData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsHNX(upperSymbol))return data=this.GetHNXData(upperSymbol,width);else if(MARKET_SUFFIX_NAME.IsUPCOM(upperSymbol))return data=this.GetUPCOMData(upperSymbol,width);}//JSConsole.Chart.Log('[MiuteCoordinateData]', width);
|
|
10409
10410
|
var result={Count:data.Count,MiddleCount:data.MiddleCount,Data:data.GetData(width)};return result;};this.GetSHSZData=function(upperSymbol,width){var result=SHZE_MINUTE_X_COORDINATE;return result;};this.GetBJData=function(upperSymbol,width){var result=SHZE_MINUTE_X_COORDINATE;return result;};this.GetUSAData=function(upperSymbol,width){var result=USA_MINUTE_X_COORDINATE;return result;};this.GetHKData=function(upperSymbol,width){var result=HK_MINUTE_X_COORDINATE;return result;};this.GetTWData=function(upperSymbol,width){return TW_MINUTE_X_COORDINATE;};this.GetSHOData=function(upperSymbol,width){var result=SHO_MINUTE_X_COORDINATE;return result;};this.GetSZOData=function(upperSymbol,width){var result=SHO_MINUTE_X_COORDINATE;return result;};this.GetFuturesData=function(upperSymbol,width,timeData,option){var splitData=timeData.GetSplitData(upperSymbol,option);if(!splitData)return null;var stringData=g_MinuteTimeStringData.GetFutures(splitData);if(!stringData)return null;var result={Count:stringData.length};var coordinate=null;var minWidth=200,simpleWidth=480;/*
|
|
10410
10411
|
if (splitData.Name =='21:00-1:00,9:00-10:15,10:30-11:30,13:30-15:00')
|
|
10411
10412
|
{
|
|
@@ -10476,7 +10477,8 @@ function FuturesTimeData(){this.TIME_SPLIT=[//ID=0 9:00-10:15,10:31-11:30,13:31-
|
|
|
10476
10477
|
[{Value:931,Text:'9:30'},{Value:1301,Text:'13:00'},{Value:1500,Text:'15:00'}]}}];this.MAP_TWOWORDS=new _map2.default([//大连商品交易所
|
|
10477
10478
|
[MARKET_SUFFIX_NAME.DCE+'-JD',{Time:0,Decimal:0,Name:"鸡蛋"}],[MARKET_SUFFIX_NAME.DCE+'-FB',{Time:0,Decimal:2,Name:"纤板"}],[MARKET_SUFFIX_NAME.DCE+'-BB',{Time:0,Decimal:2,Name:"胶板"}],[MARKET_SUFFIX_NAME.DCE+'-PP',{Time:6,Decimal:0,Name:"丙烯"}],[MARKET_SUFFIX_NAME.DCE+'-JM',{Time:6,Decimal:1,Name:'焦煤'}],[MARKET_SUFFIX_NAME.DCE+'-EG',{Time:6,Decimal:0,Name:'乙二醇'}],[MARKET_SUFFIX_NAME.DCE+'-EB',{Time:6,Decimal:0,Name:'苯乙烯'}],[MARKET_SUFFIX_NAME.DCE+'-CS',{Time:6,Decimal:0,Name:'淀粉'}],[MARKET_SUFFIX_NAME.DCE+'-PG',{Time:6,Decimal:0,Name:'液化气'}],[MARKET_SUFFIX_NAME.DCE+'-RR',{Time:6,Decimal:0,Name:'梗米'}],[MARKET_SUFFIX_NAME.DCE+'-LH',{Time:0,Decimal:0,Name:'生猪'}],//上期所
|
|
10478
10479
|
[MARKET_SUFFIX_NAME.SHFE+'-CU',{Time:4,Decimal:0,Name:"沪铜"}],[MARKET_SUFFIX_NAME.SHFE+'-AL',{Time:4,Decimal:0,Name:"沪铝"}],[MARKET_SUFFIX_NAME.SHFE+'-NI',{Time:4,Decimal:0,Name:"沪镍"}],[MARKET_SUFFIX_NAME.SHFE+'-SN',{Time:4,Decimal:0,Name:'沪锡'}],[MARKET_SUFFIX_NAME.SHFE+'-ZN',{Time:4,Decimal:0,Name:"沪锌"}],[MARKET_SUFFIX_NAME.SHFE+'-PB',{Time:4,Decimal:0,Name:'沪铅'}],[MARKET_SUFFIX_NAME.SHFE+'-RU',{Time:6,Decimal:0,Name:"天然橡胶"}],[MARKET_SUFFIX_NAME.SHFE+'-FU',{Time:6,Decimal:0,Name:"燃料油"}],[MARKET_SUFFIX_NAME.SHFE+'-RB',{Time:6,Decimal:0,Name:"螺纹钢"}],[MARKET_SUFFIX_NAME.SHFE+'-BU',{Time:6,Decimal:0,Name:'石油沥青'}],[MARKET_SUFFIX_NAME.SHFE+'-HC',{Time:6,Decimal:0,Name:"热轧卷板"}],[MARKET_SUFFIX_NAME.SHFE+'-SP',{Time:6,Decimal:0,Name:"纸浆"}],[MARKET_SUFFIX_NAME.SHFE+'-WR',{Time:0,Decimal:0,Name:"线材"}],[MARKET_SUFFIX_NAME.SHFE+'-AG',{Time:5,Decimal:0,Name:"白银"}],[MARKET_SUFFIX_NAME.SHFE+'-AU',{Time:5,Decimal:2,Name:"黄金"}],[MARKET_SUFFIX_NAME.SHFE+'-SS',{Time:4,Decimal:0,Name:'不锈钢'}],[MARKET_SUFFIX_NAME.SHFE+'-AO',{Time:4,Decimal:0,Name:'氧化铝'}],[MARKET_SUFFIX_NAME.SHFE+'-BR',{Time:6,Decimal:0,Name:'合成橡胶'}],[MARKET_SUFFIX_NAME.SHFE+'-AD',{Time:4,Decimal:0,Name:"铝合金"}],//上期所-能源
|
|
10479
|
-
[MARKET_SUFFIX_NAME.SHFE+'-NR',{Time:6,Decimal:1,Name:'20号胶'}],[MARKET_SUFFIX_NAME.SHFE+'-SC',{Time:5,Decimal:1,Name:'原油'}],[MARKET_SUFFIX_NAME.SHFE+'-LU',{Time:6,Decimal:0,Name:'低硫燃油'}],[MARKET_SUFFIX_NAME.SHFE+'-BC',{Time:4,Decimal:0,Name:'国际铜'}],[MARKET_SUFFIX_NAME.SHFE+'-EC',{Time:0,Decimal:0,Name:'集运指数'}]
|
|
10480
|
+
[MARKET_SUFFIX_NAME.SHFE+'-NR',{Time:6,Decimal:1,Name:'20号胶'}],[MARKET_SUFFIX_NAME.SHFE+'-SC',{Time:5,Decimal:1,Name:'原油'}],[MARKET_SUFFIX_NAME.SHFE+'-LU',{Time:6,Decimal:0,Name:'低硫燃油'}],[MARKET_SUFFIX_NAME.SHFE+'-BC',{Time:4,Decimal:0,Name:'国际铜'}],[MARKET_SUFFIX_NAME.SHFE+'-EC',{Time:0,Decimal:0,Name:'集运指数'}],//上海国际能源交易中心 独立的一个市场
|
|
10481
|
+
[MARKET_SUFFIX_NAME.INE+'-NR',{Time:6,Decimal:1,Name:'20号胶'}],[MARKET_SUFFIX_NAME.INE+'-SC',{Time:5,Decimal:1,Name:'原油'}],[MARKET_SUFFIX_NAME.INE+'-LU',{Time:6,Decimal:0,Name:'低硫燃油'}],[MARKET_SUFFIX_NAME.INE+'-BC',{Time:4,Decimal:0,Name:'国际铜'}],[MARKET_SUFFIX_NAME.INE+'-EC',{Time:0,Decimal:0,Name:'集运指数'}],//郑州期货交易所
|
|
10480
10482
|
[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}],[MARKET_SUFFIX_NAME.CZCE+'-RO',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-RS',{Time:0,Decimal:0,Name:"菜籽"}],[MARKET_SUFFIX_NAME.CZCE+'-ER',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-RI',{Time:0,Decimal:0,Name:"早籼稻"}],[MARKET_SUFFIX_NAME.CZCE+'-WH',{Time:0,Decimal:0,Name:"强麦"}],[MARKET_SUFFIX_NAME.CZCE+'-AP',{Time:0,Decimal:0,Name:"苹果"}],[MARKET_SUFFIX_NAME.CZCE+'-PM',{Time:0,Decimal:0,Name:"普麦"}],[MARKET_SUFFIX_NAME.CZCE+'-QM',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-TC',{Time:0,Decimal:0}],[MARKET_SUFFIX_NAME.CZCE+'-JR',{Time:0,Decimal:0,Name:"粳稻"}],[MARKET_SUFFIX_NAME.CZCE+'-LR',{Time:0,Decimal:0,Name:"晚籼稻"}],[MARKET_SUFFIX_NAME.CZCE+'-SF',{Time:0,Decimal:0,Name:"硅铁"}],[MARKET_SUFFIX_NAME.CZCE+'-SM',{Time:0,Decimal:0,Name:"锰硅"}],[MARKET_SUFFIX_NAME.CZCE+'-CJ',{Time:0,Decimal:2,Name:"红枣"}],[MARKET_SUFFIX_NAME.CZCE+'-CY',{Time:6,Decimal:0,Name:"棉纱"}],[MARKET_SUFFIX_NAME.CZCE+'-UR',{Time:0,Decimal:0,Name:"尿素"}],[MARKET_SUFFIX_NAME.CZCE+'-SA',{Time:6,Decimal:0,Name:"纯碱"}],[MARKET_SUFFIX_NAME.CZCE+'-PF',{Time:6,Decimal:0,Name:"短纤"}],[MARKET_SUFFIX_NAME.CZCE+'-PK',{Time:0,Decimal:0,Name:"花生"}],[MARKET_SUFFIX_NAME.CZCE+'-PR',{Time:6,Decimal:0,Name:"瓶片"}],//中期所
|
|
10481
10483
|
[MARKET_SUFFIX_NAME.CFFEX+'-TF',{Time:1,Decimal:3,Name:"二债"}],[MARKET_SUFFIX_NAME.CFFEX+'-TS',{Time:1,Decimal:3,Name:"五债"}],[MARKET_SUFFIX_NAME.CFFEX+'-IH',{Time:2,Decimal:1,Name:'上证股指期货'}],[MARKET_SUFFIX_NAME.CFFEX+'-IC',{Time:2,Decimal:1,Name:'中证股指期货'}],[MARKET_SUFFIX_NAME.CFFEX+'-IF',{Time:2,Decimal:1,Name:'沪深股指期货'}],[MARKET_SUFFIX_NAME.CFFEX+'-IM',{Time:2,Decimal:1,Name:'中证1000股指期货'}],[MARKET_SUFFIX_NAME.CFFEX+'-IO',{Time:2,Decimal:1,Name:'沪深300股指期权'}],[MARKET_SUFFIX_NAME.CFFEX+'-MO',{Time:2,Decimal:1,Name:'中证1000股指期权'}],[MARKET_SUFFIX_NAME.CFFEX+'-HO',{Time:2,Decimal:1,Name:'上证50股指期权'}],//广州期货交易所
|
|
10482
10484
|
[MARKET_SUFFIX_NAME.GZFE+'-SI',{Time:0,Decimal:2,Name:"工业硅"}],[MARKET_SUFFIX_NAME.GZFE+'-LC',{Time:0,Decimal:2,Name:"碳酸锂"}]]);this.MAP_ONEWORD=new _map2.default([//大连商品交易所
|
|
@@ -10488,7 +10490,8 @@ this.AddNewFutures=function(obj)//{ Suffix:后缀, Symbol:品种代码, Time:交
|
|
|
10488
10490
|
{oneWordName=MARKET_SUFFIX_NAME.SHFE+'-'+oneWord;twoWordsName=MARKET_SUFFIX_NAME.SHFE+'-'+twoWords;}else if(MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol))//中期所
|
|
10489
10491
|
{oneWordName=MARKET_SUFFIX_NAME.CFFEX+'-'+oneWord;twoWordsName=MARKET_SUFFIX_NAME.CFFEX+'-'+twoWords;}else if(MARKET_SUFFIX_NAME.IsCZCE(upperSymbol))//郑州期货交易所
|
|
10490
10492
|
{oneWordName=MARKET_SUFFIX_NAME.CZCE+'-'+oneWord;twoWordsName=MARKET_SUFFIX_NAME.CZCE+'-'+twoWords;}else if(MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))//广州期货交易所
|
|
10491
|
-
{oneWordName=MARKET_SUFFIX_NAME.GZFE+'-'+oneWord;twoWordsName=MARKET_SUFFIX_NAME.GZFE+'-'+twoWords;}
|
|
10493
|
+
{oneWordName=MARKET_SUFFIX_NAME.GZFE+'-'+oneWord;twoWordsName=MARKET_SUFFIX_NAME.GZFE+'-'+twoWords;}else if(MARKET_SUFFIX_NAME.IsINE(upperSymbol))//上海国际能源交易中心
|
|
10494
|
+
{oneWordName=MARKET_SUFFIX_NAME.INE+'-'+oneWord;twoWordsName=MARKET_SUFFIX_NAME.INE+'-'+twoWords;}if(this.MAP_TWOWORDS.has(twoWordsName)){return this.MAP_TWOWORDS.get(twoWordsName);}if(this.MAP_ONEWORD.has(oneWordName)){return this.MAP_ONEWORD.get(oneWordName);}return null;};this.GetSplitData=function(upperSymbol,option){var data=this.GetData(upperSymbol,option);if(!data)return null;return this.TIME_SPLIT[data.Time];};this.GetDecimal=function(upperSymbol){var data=this.GetData(upperSymbol);if(!data)return 2;return data.Decimal;};}//纽约商业交易所 交易时间数据
|
|
10492
10495
|
function NYMEXTimeData(){//美国标准时间
|
|
10493
10496
|
this.TIME_SPLIT=[{Name:'6:00-5:00',Data:[//6:00 - 5:00
|
|
10494
10497
|
{Start:600,End:2359},{Start:0,End:500}],Coordinate:{Full://完整模式
|
|
@@ -13482,7 +13485,9 @@ LineWidth:1*GetDevicePixelRatio(),LineDotted:[3,3],AreaColor:"rgba(26,13,7,0.5)"
|
|
|
13482
13485
|
BGColor:"rgb(255,255,255)"},DragMovePaint:{TextColor:"rgb(255,255,255)"//Font:14*GetDevicePixelRatio() +"px 微软雅黑"
|
|
13483
13486
|
},SessionBreaksPaint:{BGColor:[null,"rgb(42,46,57)"],SplitLine:{Color:'rgb(73,133,231)',Width:1*GetDevicePixelRatio(),Dash:[5*GetDevicePixelRatio(),5*GetDevicePixelRatio()]}},KLineCountDownPaint:{Unchange:{BGColor:"rgb(190, 190 ,190)",PriceColor:"rgb(0,0,0)",TimeColor:"rgb(50,50,50)"},Up:{BGColor:"rgb(238,21,21)",PriceColor:"rgb(250,250,250)",TimeColor:"rgb(190,190,190)"},Down:{BGColor:"rgb(25,158,0)",PriceColor:"rgb(250,250,250)",TimeColor:"rgb(190,190,190)"}},//成交明细
|
|
13484
13487
|
DealList:{BorderColor:'rgb(38,38,41)',//边框线
|
|
13485
|
-
Header:{Color:"RGB(245,245,245)",Mergin:{Left:5,Right:5,Top:4,Bottom:2}
|
|
13488
|
+
Header:{Color:"RGB(245,245,245)",Mergin:{Left:5,Right:5,Top:4,Bottom:2}//Font:{ Size:12, Name:"微软雅黑" }
|
|
13489
|
+
},Row:{Mergin:{Top:2,Bottom:2},//Font:{ Size:15, Name:"微软雅黑"},
|
|
13490
|
+
BarMergin:{Top:2,Left:3,Right:3,Bottom:2}},FieldColor:{Vol:"rgb(192,192,0)",//成交量
|
|
13486
13491
|
Time:"rgb(245,245,245)",//时间
|
|
13487
13492
|
Deal:"rgb(111,128,112)",//成交笔数
|
|
13488
13493
|
Index:"rgb(245,245,245)",//序号
|
|
@@ -13619,7 +13624,7 @@ this.Canvas.lineWidth=pixelTatio;//手机端需要根据分辨率比调整线段
|
|
|
13619
13624
|
if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash){this.Frame.Draw({IsEnableSplash:this.ChartSplashPaint.IsEnableSplash});this.ChartSplashPaint.Draw();return;}this.Frame.Draw();this.Frame.DrawLogo();//框架内图形
|
|
13620
13625
|
for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsDrawFirst)item.Draw();}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw();}};this.ChangeSymbol=function(symbol,option){this.Symbol=symbol;this.Data={DataOffset:0,Data:[]};//分笔数据
|
|
13621
13626
|
this.SourceData={DataOffset:0,Data:[]};//原始分笔数据
|
|
13622
|
-
var chart=this.ChartPaint[0];if(chart)chart.Data=null;if(option
|
|
13627
|
+
var chart=this.ChartPaint[0];if(chart)chart.Data=null;if(option){if(IFrameSplitOperator.IsNumber(option.TradeDate))this.TradeDate=option.TradeDate;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))this.SetColumn(option.Column);}if(!this.Symbol){this.Draw();return;}this.RequestDealData();};this.CancelAutoUpdate=function()//关闭停止更新
|
|
13623
13628
|
{if(typeof this.AutoUpdateTimer=='number'){clearTimeout(this.AutoUpdateTimer);this.AutoUpdateTimer=null;}};this.AutoUpdateEvent=function(bStart,explain)//自定更新事件, 是给websocket使用
|
|
13624
13629
|
{var eventID=bStart?JSCHART_EVENT_ID.RECV_START_AUTOUPDATE:JSCHART_EVENT_ID.RECV_STOP_AUTOUPDATE;if(!this.mapEvent.has(eventID))return;var self=this;var event=this.mapEvent.get(eventID);var data={Stock:{Symbol:this.Symbol,Name:this.Name,DayCount:this.DayCount},Explain:explain};if(bStart){data.Callback=function(data)//数据到达更新回调
|
|
13625
13630
|
{self.RecvDealUpdateData(data);};}event.Callback(event,data,this);};//全量数据下载
|
|
@@ -13627,7 +13632,7 @@ this.RequestDealData=function(){this.ChartSplashPaint.SetTitle(this.LoadDataSpla
|
|
|
13627
13632
|
Explain:'成交明细',Request:{Data:{symbol:self.Symbol,tradeDate:self.TradeDate}},Self:this,PreventDefault:false};this.NetworkFilter(obj,function(data){self.ChartSplashPaint.EnableSplash(false);self.RecvDealData(data);self.AutoUpdateEvent(true,'JSDealChartContainer::RequestDealData');self.AutoUpdate();});if(obj.PreventDefault==true)return;//已被上层替换,不调用默认的网络请求
|
|
13628
13633
|
}var cacheUrl=g_JSChartResource.CacheDomain+'/cache/dealday/today/'+this.Symbol+'.json';JSNetwork.HttpRequest({url:cacheUrl,type:"get",dataType:"json",async:true,success:function success(data){self.ChartSplashPaint.EnableSplash(false);self.RecvDealData(data);self.AutoUpdate(1);},error:function error(http,e){self.ChartSplashPaint.EnableSplash(false);self.AutoUpdate();//self.RecvError(http,e,param);;
|
|
13629
13634
|
}});};this.RecvDealData=function(data){var chart=this.GetDealChart();if(!chart)return;var aryDeal=JSDealChartContainer.JsonDataToDealData(data);if(chart.ShowOrder===1&&IFrameSplitOperator.IsNonEmptyArray(aryDeal))//倒序
|
|
13630
|
-
aryDeal=aryDeal.reverse();this.SourceData={DataOffset:0,Data:aryDeal};this.Data={DataOffset:0,Data:this.FilterData(this.CloneArray(aryDeal))};this.Symbol=data.symbol;this.Name=data.name;var chart=this.ChartPaint[0];chart.Data=this.Data;chart.Symbol=this.Symbol;chart.YClose=data.yclose;chart.Open=data.open;if(this.IsShowLastPage)this.SetLastPageDataOffset();//显示最后一屏
|
|
13635
|
+
aryDeal=aryDeal.reverse();this.SourceData={DataOffset:0,Data:aryDeal};this.Data={DataOffset:0,Data:this.FilterData(this.CloneArray(aryDeal))};this.Symbol=data.symbol;this.Name=data.name;var chart=this.ChartPaint[0];chart.Data=this.Data;chart.Symbol=this.Symbol;chart.YClose=data.yclose;chart.YFClose=data.yfclose;chart.Open=data.open;if(this.IsShowLastPage)this.SetLastPageDataOffset();//显示最后一屏
|
|
13631
13636
|
this.Draw();};this.SetLastPageDataOffset=function(){var chart=this.GetDealChart();if(!chart)return;if(chart.ShowOrder===1){this.Data.DataOffset=0;}else{var dataCount=0;if(IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))dataCount=this.SourceData.Data.length;var pageSize=chart.GetPageSize(true);var offset=dataCount-pageSize;if(offset<0)offset=0;this.Data.DataOffset=offset;}};//增量数据下载
|
|
13632
13637
|
this.RequestDealUpdateData=function(){var self=this;if(this.NetworkFilter){var obj={Name:'JSDealChartContainer::RequestDealUpdateData',//类名::函数名
|
|
13633
13638
|
Explain:'增量成交明细',Request:{Data:{symbol:self.Symbol}},Self:this,PreventDefault:false};if(this.Data&&IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)){var lastItem=this.Data.Data[this.Data.Data.length-1];//最后一条数据
|
|
@@ -13701,6 +13706,7 @@ this.ClassName='ChartDealList';//类名
|
|
|
13701
13706
|
this.IsDrawFirst=false;this.GetEventCallback;this.Data;//数据 { Data:[ { Time:, Price:, Vol:, BS:, StrTime } ], Offset: }
|
|
13702
13707
|
//this.Data={Offset:0, Data:[ {Time:925, Price:20.1, Vol:10000050, BS:1, Deal:45 }, {Time:925, Price:18.2, Vol:1150, BS:1, Deal:5 }] };
|
|
13703
13708
|
this.Symbol;this.YClose;//昨收
|
|
13709
|
+
this.YFClose;//昨结算
|
|
13704
13710
|
this.Open;//开盘价
|
|
13705
13711
|
this.Decimal=2;//小数位数
|
|
13706
13712
|
this.IsSingleTable=false;//单表模式
|
|
@@ -13773,11 +13779,11 @@ if(this.IsSingleTable)this.TableCount=1;this.TableWidth=clientWidth/this.TableCo
|
|
|
13773
13779
|
}
|
|
13774
13780
|
}
|
|
13775
13781
|
else
|
|
13776
|
-
*/{for(var i=0,j=0;i<this.TableCount;++i){var tableLeft=left+this.TableWidth*i;var textLeft=tableLeft;var textTop=top;for(j=0;j<this.RowCount&&index<dataCount;++j,++index){var dataItem=this.Data.Data[index];var rtRow={Left:textLeft-this.HeaderMergin.Left,Top:textTop,Height:this.RowHeight,Width:this.TableWidth};rtRow.Right=rtRow.Left+rtRow.Width;rtRow.Bottom=rtRow.Top+rtRow.Height;if(dataItem.BGColor){this.Canvas.fillStyle=dataItem.BGColor;this.Canvas.fillRect(rtRow.Left+1,rtRow.Top+1,rtRow.Width-2,rtRow.Height-2);}if(this.DrawSelectedRow(dataItem,index,rtRow))selectedRowData={Rect:rtRow};this.DrawRow(dataItem,textLeft,textTop,index);this.AryCellRect.push({Rect:rtRow,Type:1,DataIndex:index});textTop+=this.RowHeight;}}if(selectedRowData&&this.SelectedStyle===2){var rtBG=selectedRowData.Rect;this.Canvas.fillStyle=this.SelectedConfig.LineColor;var lineWidth=this.SelectedConfig.LineWidth;this.Canvas.fillRect(rtBG.Left,rtBG.Bottom-lineWidth,rtBG.Width,lineWidth);}}};this.DrawRow=function(data,left,top,dataIndex,colIndex){var tableLeft=left;var tableRight=left+this.TableWidth;var borderRight=this.RectClient.Right;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];var textColor=item.TextColor;var text=null;var itemWidth=item.Width;var textAlign=item.TextAlign;if(left+itemWidth>tableRight)break;if(i==this.Column.length-1)itemWidth=this.TableWidth-(left-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;var drawInfo={Text:null,TextColor:item.TextColor,TextAlign:item.TextAlign,Tooltip:null,Index:dataIndex,ColumnIndex:i};var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;var bDrawV2=false;if(item.Type==DEAL_COLUMN_ID.TIME_ID){text=IFrameSplitOperator.FormatTimeString(data.Time,item.Foramt);}else if(item.Type==DEAL_COLUMN_ID.STRING_TIME_ID){text=data.StrTime;}else if(item.Type==DEAL_COLUMN_ID.PRICE_ID){
|
|
13782
|
+
*/{for(var i=0,j=0;i<this.TableCount;++i){var tableLeft=left+this.TableWidth*i;var textLeft=tableLeft;var textTop=top;for(j=0;j<this.RowCount&&index<dataCount;++j,++index){var dataItem=this.Data.Data[index];var rtRow={Left:textLeft-this.HeaderMergin.Left,Top:textTop,Height:this.RowHeight,Width:this.TableWidth};rtRow.Right=rtRow.Left+rtRow.Width;rtRow.Bottom=rtRow.Top+rtRow.Height;if(dataItem.BGColor){this.Canvas.fillStyle=dataItem.BGColor;this.Canvas.fillRect(rtRow.Left+1,rtRow.Top+1,rtRow.Width-2,rtRow.Height-2);}if(this.DrawSelectedRow(dataItem,index,rtRow))selectedRowData={Rect:rtRow};this.DrawRow(dataItem,textLeft,textTop,index);this.AryCellRect.push({Rect:rtRow,Type:1,DataIndex:index});textTop+=this.RowHeight;}}if(selectedRowData&&this.SelectedStyle===2){var rtBG=selectedRowData.Rect;this.Canvas.fillStyle=this.SelectedConfig.LineColor;var lineWidth=this.SelectedConfig.LineWidth;this.Canvas.fillRect(rtBG.Left,rtBG.Bottom-lineWidth,rtBG.Width,lineWidth);}}};this.DrawRow=function(data,left,top,dataIndex,colIndex){var tableLeft=left;var tableRight=left+this.TableWidth;var borderRight=this.RectClient.Right;for(var i=0;i<this.Column.length;++i){var item=this.Column[i];var textColor=item.TextColor;var text=null;var itemWidth=item.Width;var textAlign=item.TextAlign;if(left+itemWidth>tableRight)break;if(i==this.Column.length-1)itemWidth=this.TableWidth-(left-tableLeft)-this.HeaderMergin.Right-this.HeaderMergin.Left;var drawInfo={Text:null,TextColor:item.TextColor,TextAlign:item.TextAlign,Tooltip:null,Index:dataIndex,ColumnIndex:i};var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;var bDrawV2=false;if(item.Type==DEAL_COLUMN_ID.TIME_ID){text=IFrameSplitOperator.FormatTimeString(data.Time,item.Foramt);}else if(item.Type==DEAL_COLUMN_ID.STRING_TIME_ID){text=data.StrTime;}else if(item.Type==DEAL_COLUMN_ID.PRICE_ID){textColor=this.GetPriceColor(data.Price);text=data.Price.toFixed(this.Decimal);}else if(item.Type==DEAL_COLUMN_ID.VOL_ID){text=IFrameSplitOperator.FormatValueString(data.Vol,0);textColor=this.GetVolColor(item,data);}else if(item.Type==DEAL_COLUMN_ID.DEAL_ID){text=IFrameSplitOperator.FormatValueString(data.Deal,0);}else if(item.Type==DEAL_COLUMN_ID.BS_ID){if(data.BS==1){text="B";textColor=this.UpColor;}else if(data.BS==2){text="S";textColor=this.DownColor;}}else if(item.Type==DEAL_COLUMN_ID.UPDOWN_ID){if(IFrameSplitOperator.IsNumber(this.YClose)){var value=data.Price-this.YClose;text=value.toFixed(2);if(value>0)textColor=this.UpColor;else if(value<0)textColor=this.DownColor;else textColor=this.UnchangeColor;}}else if(item.Type==DEAL_COLUMN_ID.INDEX_ID){text=(dataIndex+1).toString();}else if(this.IsMulitBar(item.Type)){var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};this.DrawMultiBar(item,data,rtItem);}else if(item.Type==DEAL_COLUMN_ID.CENTER_BAR_ID){var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};this.DrawCenterBar(item,data,rtItem);}else if(item.Type==DEAL_COLUMN_ID.CUSTOM_TEXT_ID){var out={Text:null,TextColor:null,TextAlign:null};//输出
|
|
13777
13783
|
var rtItem={Left:left,Top:top,Width:itemWidth,Height:this.RowHeight};if(this.DrawCustomText(item,data,rtItem,dataIndex,i,out)){if(out.Text)text=out.Text;if(out.TextColor)textColor=out.TextColor;if(out.TextAlign)textAlign=out.TextAlign;}}else if(this.IsReserveString(item.Type)){this.FormatReserveString(item,data,drawInfo);bDrawV2=true;}else if(this.IsReserveNumber(item.Type)){this.FormatReserveNumber(item,data,drawInfo);bDrawV2=true;}if(bDrawV2){//this.DrawItemText(drawInfo.Text, drawInfo.TextColor, drawInfo.TextAlign, rtItem.Left, rtItem.Top, rtItem.Width, drawInfo.BGColor);
|
|
13778
13784
|
this.DrawItemTextV2(drawInfo,rtItem);}else{this.DrawItemText(text,textColor,textAlign,left,top,itemWidth);}if(drawInfo.Tooltip){//Type:2=数据提示信息
|
|
13779
13785
|
var tooltipData=(0,_defineProperty3.default)({Rect:rtItem,Data:data,Index:dataIndex,Column:item,Type:drawInfo.Tooltip.Type},'Data',drawInfo.Tooltip.Data);this.TooltipRect.push(tooltipData);}else if(item.ChartTooltip&&item.ChartTooltip.Enable&&IFrameSplitOperator.IsNumber(item.ChartTooltip.Type))//Type 20分时图 21K线图
|
|
13780
|
-
{var tooltipData={Rect:rtItem,Data:data,Index:dataIndex,Column:item,Type:item.ChartTooltip.Type};this.TooltipRect.push(tooltipData);}left+=item.Width;}};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}}var text=value.toFixed(column.FloatPrecision);if(column.Format&&IFrameSplitOperator.IsNumber(column.Format.Type)){var format=column.Format;switch(format.Type){case 1://原始数据
|
|
13786
|
+
{var tooltipData={Rect:rtItem,Data:data,Index:dataIndex,Column:item,Type:item.ChartTooltip.Type};this.TooltipRect.push(tooltipData);}left+=item.Width;}};this.GetPriceColor=function(price){var upperSymbol=null;if(this.Symbol)upperSymbol=this.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)){if(!IFrameSplitOperator.IsNumber(this.YFClose))return this.UnchangeColor;return this.GetUpDownColor(price,this.YFClose);}else{if(!IFrameSplitOperator.IsNumber(this.YClose))return this.UnchangeColor;return this.GetUpDownColor(price,this.YClose);}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}}var text=value.toFixed(column.FloatPrecision);if(column.Format&&IFrameSplitOperator.IsNumber(column.Format.Type)){var format=column.Format;switch(format.Type){case 1://原始数据
|
|
13781
13787
|
text=value.toFixed(column.FloatPrecision);break;case 2://千分位分割
|
|
13782
13788
|
text=IFrameSplitOperator.FormatValueThousandsString(value,column.FloatPrecision);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,column.FloatPrecision,exfloatPrecision);break;}}if(column.StringFormat&&text){text=column.StringFormat.replace("{0}",text);}drawInfo.Text=text;};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_DEAL_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}if(item&&item.Tooltip&&IFrameSplitOperator.IsNonEmptyArray(item.Tooltip.AryText)){drawInfo.Tooltip={Type:2,Data:{AryText:item.Tooltip.AryText}};}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};this.DrawSelectedRow=function(data,index,rtRow){if(!this.SelectedData)return false;if(!this.SelectedData.Enable)return false;if(!this.SelectedData.Guid||this.SelectedData.Guid!=data.Guid)return false;if(this.SelectedStyle==1){this.Canvas.fillStyle=this.SelectedConfig.BGColor;this.Canvas.fillRect(rtRow.Left+1,rtRow.Top+1,rtRow.Width-2,rtRow.Height-2);}return true;};this.DrawItemText=function(text,textColor,textAlign,left,top,width){var x=left;if(textAlign=='center'){x=left+width/2;this.Canvas.textAlign="center";}else if(textAlign=='right'){x=left+width;this.Canvas.textAlign="right";}else{this.Canvas.textAlign="left";}this.Canvas.textBaseline="bottom";this.Canvas.fillStyle=textColor;if(text)this.Canvas.fillText(text,x,top+this.RowHeight-2);};this.DrawItemTextV2=function(drawInfo,rtItem){if(drawInfo.BGColor){this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.Text){var text=drawInfo.Text;var x=rtItem.Left;if(drawInfo.TextAlign=='center'){x=rtItem.Left+rtItem.Width/2;this.Canvas.textAlign="center";}else if(drawInfo.TextAlign=='right'){x=rtItem.Left+rtItem.Width-2;this.Canvas.textAlign="right";}else{x+=2;this.Canvas.textAlign="left";}var textWidth=this.Canvas.measureText(text).width+1;this.Canvas.textBaseline="bottom";this.Canvas.fillStyle=drawInfo.TextColor;this.Canvas.fillText(text,x,rtItem.Top+this.RowHeight-2);}};this.DrawMultiBar=function(colunmInfo,data,rtItem){var fieldName=MAP_DEAL_COLUMN_FIELD.get(colunmInfo.Type);if(!data||!fieldName)return;var barData=data[fieldName];//{ Value:[0.4,0,2], Color:[0,1] };
|
|
13783
13789
|
if(!barData)return false;if(!IFrameSplitOperator.IsNonEmptyArray(barData.Value))return false;var width=rtItem.Width-this.BarMergin.Left-this.BarMergin.Right;var left=rtItem.Left+this.BarMergin.Left;var top=rtItem.Top+this.RowMergin.Top+this.BarMergin.Top;var height=rtItem.Height-this.RowMergin.Top-this.RowMergin.Bottom-this.BarMergin.Top-this.BarMergin.Bottom;var right=left+width;for(var i=0;i<barData.Value.length;++i){var value=barData.Value[i];if(value<=0)continue;if(left>=right)break;var barWidth=width*value;if(barWidth<1)barWidth=1;if(left+barWidth>right)barWidth=right-left;var colorIndex=i;if(IFrameSplitOperator.IsNonEmptyArray(barData.Color)&&i<barData.Color.length)colorIndex=barData.Color[i];this.Canvas.fillStyle=g_JSChartResource.DealList.FieldColor.Bar[colorIndex];this.Canvas.fillRect(left,top,barWidth,height);left+=barWidth;}return true;};this.DrawCenterBar=function(colunmInfo,data,rtItem){if(!data.Source||!IFrameSplitOperator.IsNonEmptyArray(data.Source))return false;var barData=data.Source[colunmInfo.DataIndex];//{ Value:[0.4,0,2], Color:[0,1] };
|
|
@@ -14006,7 +14012,7 @@ this.ReadStockJsonData=function(stock,item){//0=证券代码 1=股票名称 2=
|
|
|
14006
14012
|
//43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速% 47=15m涨速%
|
|
14007
14013
|
//80=整行背景色
|
|
14008
14014
|
//101-199=数值型 201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
|
|
14009
|
-
if(IFrameSplitOperator.IsString(item[1]))stock.Name=item[1];if(IFrameSplitOperator.IsNumber(item[2]))stock.YClose=item[2];if(IFrameSplitOperator.IsNumber(item[3]))stock.Open=item[3];if(IFrameSplitOperator.IsNumber(item[4]))stock.High=item[4];if(IFrameSplitOperator.IsNumber(item[5]))stock.Low=item[5];if(IFrameSplitOperator.IsNumber(item[6]))stock.Price=item[6];if(IFrameSplitOperator.IsNumber(item[7]))stock.Vol=item[7];if(IFrameSplitOperator.IsNumber(item[8]))stock.Amount=item[8];if(IFrameSplitOperator.IsNumber(item[9]))stock.BuyPrice=item[9];if(IFrameSplitOperator.IsNumber(item[10]))stock.BuyVol=item[10];if(IFrameSplitOperator.IsNumber(item[11]))stock.SellPrice=item[11];if(IFrameSplitOperator.IsNumber(item[12]))stock.SellVol=item[12];if(IFrameSplitOperator.IsNumber(item[13]))stock.AvPrice=item[13];//均价
|
|
14015
|
+
var upperSymbol=null;if(stock.Symbol)upperSymbol=stock.Symbol.toUpperCase();if(IFrameSplitOperator.IsString(item[1]))stock.Name=item[1];if(IFrameSplitOperator.IsNumber(item[2]))stock.YClose=item[2];if(IFrameSplitOperator.IsNumber(item[3]))stock.Open=item[3];if(IFrameSplitOperator.IsNumber(item[4]))stock.High=item[4];if(IFrameSplitOperator.IsNumber(item[5]))stock.Low=item[5];if(IFrameSplitOperator.IsNumber(item[6]))stock.Price=item[6];if(IFrameSplitOperator.IsNumber(item[7]))stock.Vol=item[7];if(IFrameSplitOperator.IsNumber(item[8]))stock.Amount=item[8];if(IFrameSplitOperator.IsNumber(item[9]))stock.BuyPrice=item[9];if(IFrameSplitOperator.IsNumber(item[10]))stock.BuyVol=item[10];if(IFrameSplitOperator.IsNumber(item[11]))stock.SellPrice=item[11];if(IFrameSplitOperator.IsNumber(item[12]))stock.SellVol=item[12];if(IFrameSplitOperator.IsNumber(item[13]))stock.AvPrice=item[13];//均价
|
|
14010
14016
|
if(IFrameSplitOperator.IsNumber(item[14]))stock.OutShares=item[14];//流通股
|
|
14011
14017
|
if(IFrameSplitOperator.IsNumber(item[15]))stock.TotalShares=item[15];//总股本
|
|
14012
14018
|
if(IFrameSplitOperator.IsNumber(item[16]))stock.LimitHigh=item[16];//涨停价
|
|
@@ -14021,12 +14027,17 @@ if(IFrameSplitOperator.IsNumber(item[24]))stock.Amplitude=item[24];//振幅%
|
|
|
14021
14027
|
if(IFrameSplitOperator.IsNumber(item[25]))stock.CircMarketValue=item[25];//流通市值
|
|
14022
14028
|
if(IFrameSplitOperator.IsNumber(item[26]))stock.MarketValue=item[26];//总市值
|
|
14023
14029
|
if(item[27])stock.NameEx=item[27];//扩展名字
|
|
14030
|
+
if(IFrameSplitOperator.IsNumber(item[38]))stock.Position=item[38];//持仓量
|
|
14031
|
+
if(IFrameSplitOperator.IsNumber(item[39]))stock.FClose=item[39];//结算价
|
|
14032
|
+
if(IFrameSplitOperator.IsNumber(item[40]))stock.YFClose=item[40];//昨结算价
|
|
14033
|
+
if(IFrameSplitOperator.IsNumber(item[41]))stock.OpenPosition=item[41];//开仓量
|
|
14034
|
+
if(IFrameSplitOperator.IsNumber(item[42]))stock.ClosePosition=item[42];//平仓量
|
|
14024
14035
|
//衍生数据计算
|
|
14025
14036
|
if(!IFrameSplitOperator.IsNumber(item[21]))//涨幅%
|
|
14026
|
-
{if(IFrameSplitOperator.IsNumber(stock.Price)&&IFrameSplitOperator.IsNumber(stock.YClose)&&stock.YClose!=0)stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;}if(!IFrameSplitOperator.IsNumber(item[22]))//涨跌
|
|
14027
|
-
{if(IFrameSplitOperator.IsNumber(stock.Price)&&IFrameSplitOperator.IsNumber(stock.YClose))stock.UpDown=stock.Price-stock.YClose;}if(!IFrameSplitOperator.IsNumber(item[23]))//换手率%
|
|
14037
|
+
{if(MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)){if(IFrameSplitOperator.IsNumber(stock.Price)&&IFrameSplitOperator.IsNumber(stock.YFClose)&&stock.YFClose!=0)stock.Increase=(stock.Price-stock.YFClose)/stock.YFClose*100;}else{if(IFrameSplitOperator.IsNumber(stock.Price)&&IFrameSplitOperator.IsNumber(stock.YClose)&&stock.YClose!=0)stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;}}if(!IFrameSplitOperator.IsNumber(item[22]))//涨跌
|
|
14038
|
+
{if(MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)){if(IFrameSplitOperator.IsNumber(stock.Price)&&IFrameSplitOperator.IsNumber(stock.YFClose))stock.UpDown=stock.Price-stock.YFClose;}else{if(IFrameSplitOperator.IsNumber(stock.Price)&&IFrameSplitOperator.IsNumber(stock.YClose))stock.UpDown=stock.Price-stock.YClose;}}if(!IFrameSplitOperator.IsNumber(item[23]))//换手率%
|
|
14028
14039
|
{if(IFrameSplitOperator.IsNumber(stock.Vol)&&IFrameSplitOperator.IsNumber(stock.OutShares)&&stock.OutShares>0)stock.Exchange=stock.Vol/stock.OutShares*100;}if(!IFrameSplitOperator.IsNumber(item[24]))//振幅%
|
|
14029
|
-
{if(IFrameSplitOperator.IsNumber(stock.High)&&IFrameSplitOperator.IsNumber(stock.Low)&&IFrameSplitOperator.IsNumber(stock.YClose)&&stock.YClose!=0)stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;}if(!IFrameSplitOperator.IsNumber(item[25]))//流通市值
|
|
14040
|
+
{if(MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)){if(IFrameSplitOperator.IsNumber(stock.High)&&IFrameSplitOperator.IsNumber(stock.Low)&&IFrameSplitOperator.IsNumber(stock.YFClose)&&stock.YFClose!=0)stock.Amplitude=(stock.High-stock.Low)/stock.YFClose*100;}else{if(IFrameSplitOperator.IsNumber(stock.High)&&IFrameSplitOperator.IsNumber(stock.Low)&&IFrameSplitOperator.IsNumber(stock.YClose)&&stock.YClose!=0)stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;}}if(!IFrameSplitOperator.IsNumber(item[25]))//流通市值
|
|
14030
14041
|
{if(IFrameSplitOperator.IsNumber(stock.OutShares)&&IFrameSplitOperator.IsNumber(stock.Price))stock.CircMarketValue=stock.OutShares*stock.Price;}if(!IFrameSplitOperator.IsNumber(item[26]))//总市值
|
|
14031
14042
|
{if(IFrameSplitOperator.IsNumber(stock.TotalShares)&&IFrameSplitOperator.IsNumber(stock.Price))stock.MarketValue=stock.TotalShares*stock.Price;}if(item[30])stock.ExtendData=item[30];//30=全局扩展数据
|
|
14032
14043
|
if(item[31])this.BlockData.set(stock.OriginalSymbol,item[31]);//31=当前板块数据
|
|
@@ -14034,12 +14045,7 @@ if(item[32])stock.CloseLine=item[32];//32=收盘价线
|
|
|
14034
14045
|
if(item[33])stock.KLine=item[33];//33=K线
|
|
14035
14046
|
if(IFrameSplitOperator.IsNumber(item[35]))stock.Time=item[35];//时间 hhmm / hhmmss / hhmmss.fff
|
|
14036
14047
|
if(IFrameSplitOperator.IsNumber(item[36]))stock.Date=item[36];//日期
|
|
14037
|
-
if(IFrameSplitOperator.IsBool(item[37]))stock.Checked=item[37]
|
|
14038
|
-
if(IFrameSplitOperator.IsNumber(item[39]))stock.FClose=item[39];//结算价
|
|
14039
|
-
if(IFrameSplitOperator.IsNumber(item[40]))stock.YFClose=item[40];//昨结算价
|
|
14040
|
-
if(IFrameSplitOperator.IsNumber(item[41]))stock.OpenPosition=item[41];//开仓量
|
|
14041
|
-
if(IFrameSplitOperator.IsNumber(item[42]))stock.ClosePosition=item[42];//平仓量
|
|
14042
|
-
//1,3,5,10,15 涨速%
|
|
14048
|
+
if(IFrameSplitOperator.IsBool(item[37]))stock.Checked=item[37];//1,3,5,10,15 涨速%
|
|
14043
14049
|
if(IFrameSplitOperator.IsNumber(item[43]))stock.RSpeed1M=item[43];if(IFrameSplitOperator.IsNumber(item[44]))stock.RSpeed3M=item[44];if(IFrameSplitOperator.IsNumber(item[45]))stock.RSpeed5M=item[45];if(IFrameSplitOperator.IsNumber(item[46]))stock.RSpeed10M=item[46];if(IFrameSplitOperator.IsNumber(item[47]))stock.RSpeed15M=item[47];if(item[80]||item[80]===null)stock.BGColor=item[80];//整行背景色
|
|
14044
14050
|
if(item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA])stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];//扩展数据2
|
|
14045
14051
|
//10个数值型 101-199
|
|
@@ -14421,7 +14427,7 @@ drawInfo.Data=item;if(IFrameSplitOperator.IsBool(item.Enable))drawInfo.Enable=it
|
|
|
14421
14427
|
{drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM");}else if(column.ValueType==1){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS");}else if(column.ValueType==2){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS.fff");}};this.FormaDateDrawInfo=function(column,stock,drawInfo,data){if(!stock||!IFrameSplitOperator.IsNumber(stock.Date))return;if(column.FormatType==0)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM-DD");else if(column.FormatType==1)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD");else if(column.FormatType==2)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD/W");else if(column.FormatType==3)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM/DD");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM-DD");};//自定义图标
|
|
14422
14428
|
this.GetCustomIconData=function(columnInfo,symbol,drawInfo,data){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAW_CUSTOM_ICON);if(!event||!event.Callback)return false;var sendData={Symbol:symbol,Column:columnInfo,Data:data,Out:{Text:null,TextColor:null,TextAlign:null,Font:null}};event.Callback(event,sendData,this);if(sendData.Out.Text)drawInfo.Text=sendData.Out.Text;if(sendData.Out.TextColor)drawInfo.TextColor=sendData.Out.TextColor;if(sendData.Out.TextAlign)drawInfo.TextAlign=sendData.Out.TextAlign;if(sendData.Out.BGColor)drawInfo.BGColor=sendData.Out.BGColor;if(sendData.Out.Font)drawInfo.Font=sendData.Out.Font;return true;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo,option){if(!IFrameSplitOperator.IsNumber(price))return false;drawInfo.Text=price.toFixed(data.Decimal);var yClose=null;if(stock.PriceColorType===1)//昨结算价 计算颜色
|
|
14423
14429
|
{if(IFrameSplitOperator.IsNumber(stock.YFClose))yClose=stock.YFClose;}else//昨收价 计算颜色
|
|
14424
|
-
{if(IFrameSplitOperator.IsNumber(stock.YClose))yClose=stock.YClose;}if(!IFrameSplitOperator.IsNumber(yClose))drawInfo.TextColor=this.UnchagneColor;else drawInfo.TextColor=this.GetUpDownColor(price,yClose);if(option&&option.LimitBG){if(IFrameSplitOperator.IsNumber(stock.LimitHigh)){if(price>=stock.LimitHigh){drawInfo.BGColor=this.LimitUpBGColor;drawInfo.TextColor=this.LimitTextColor;}}if(IFrameSplitOperator.IsNumber(stock.LimitLow)){if(price<=stock.LimitLow){drawInfo.BGColor=this.LimitDownBGColor;drawInfo.TextColor=this.LimitTextColor;}}}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchagneColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};//单独处理成交量显示
|
|
14430
|
+
{var upperSymbol=null;if(stock.Symbol)upperSymbol=stock.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)&&IFrameSplitOperator.IsNumber(stock.YFClose)){yClose=stock.YFClose;}else{if(IFrameSplitOperator.IsNumber(stock.YClose))yClose=stock.YClose;}}if(!IFrameSplitOperator.IsNumber(yClose))drawInfo.TextColor=this.UnchagneColor;else drawInfo.TextColor=this.GetUpDownColor(price,yClose);if(option&&option.LimitBG){if(IFrameSplitOperator.IsNumber(stock.LimitHigh)){if(price>=stock.LimitHigh){drawInfo.BGColor=this.LimitUpBGColor;drawInfo.TextColor=this.LimitTextColor;}}if(IFrameSplitOperator.IsNumber(stock.LimitLow)){if(price<=stock.LimitLow){drawInfo.BGColor=this.LimitDownBGColor;drawInfo.TextColor=this.LimitTextColor;}}}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchagneColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};//单独处理成交量显示
|
|
14425
14431
|
this.FormatVolString=function(value,languageID){return IFrameSplitOperator.FormatVolString(value,languageID);};this.DrawItemBG=function(drawInfo){if(!drawInfo.BGColor)return;var rtItem=drawInfo.Rect;//绘制背景色
|
|
14426
14432
|
if(drawInfo.RectBG)rtItem=drawInfo.RectBG;if(rtItem){this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);//画一个背景色, 不然是一个黑的背景
|
|
14427
14433
|
}};this.DrawItemText=function(text,textColor,textAlign,left,top,width,bgColor){if(!text)return;var x=left;if(textAlign=='center'){x=left+width/2;this.Canvas.textAlign="center";}else if(textAlign=='right'){x=left+width-2;this.Canvas.textAlign="right";}else{x+=2;this.Canvas.textAlign="left";}var textWidth=this.Canvas.measureText(text).width+1;var bClip=false;if(textWidth>=width)//长度超过单元格 裁剪
|
|
@@ -15586,11 +15592,11 @@ var upperSymbol=this.HQChart.Symbol.toUpperCase();var unit=MARKET_SUFFIX_NAME.Ge
|
|
|
15586
15592
|
{var item=data.Data.Data;if(!item)item={Vol:[]};if(data.Data.Ver===1){var timeForamt="HH:MM";aryText=[this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,timeForamt,'DialogTooltip-Time'),this.ForamtPrice(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Price',1),this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol')];}else if(data.Data.Ver===3){var timeForamt="HH:MM:SS";aryText=[this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,timeForamt,'DialogTooltip-Time'),this.ForamtPrice(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Price',1),this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol',2)];}else{var timeForamt="HH:MM:SS";aryText=[this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,timeForamt,'DialogTooltip-Time'),this.ForamtPrice(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Price',1),this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol',2),this.FormatVol(item.Vol[1]/unit,'DialogTooltip-AC-NotMatchVol',2)];}}else{}var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP);if(event&&event.Callback){var sendData={AryText:aryText,Data:data,Symbol:this.HQChart.Symbol,HQChart:this.HQChart,IsMinute:true};event.Callback(event,sendData,this);}return aryText;};this.GetColor=function(price,yClose){if(price>yClose)return this.UpColor;else if(price<yClose)return this.DownColor;else return this.UnchangeColor;};this.GetPriceColor=function(price,yClose){var color=this.GetColor(price,yClose);return color;};//配色修改
|
|
15587
15593
|
this.ReloadResource=function(option){this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchangeColor=g_JSChartResource.UnchagneTextColor;this.TitleColor=g_JSChartResource.DialogTooltip.TitleColor;this.TitleBGColor=g_JSChartResource.DialogTooltip.TitleBGColor;this.BGColor=g_JSChartResource.DialogTooltip.BGColor;this.BorderColor=g_JSChartResource.DialogTooltip.BorderColor;this.VolColor=g_JSChartResource.DialogTooltip.VolColor;this.AmountColor=g_JSChartResource.DialogTooltip.AmountColor;this.TurnoverRateColor=g_JSChartResource.DialogTooltip.TurnoverRateColor;this.PositionColor=g_JSChartResource.DialogTooltip.PositionColor;this.DateTimeColor=g_JSChartResource.DialogTooltip.DateTimeColor;this.TextColor=g_JSChartResource.DialogTooltip.TextColor;this.ValueColor=g_JSChartResource.DialogTooltip.ValueColor;if(!this.DivDialog)return;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;if(this.TitleBGColor)this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;if(this.TitleColor)this.TitleBox.DivName.style['color']=this.TitleColor;this.UpdateTableDOM();};/////////////////////////////////////////////////////////////////////////////////////////////
|
|
15588
15594
|
//数据格式化 format=0 点差+涨幅 1=涨幅
|
|
15589
|
-
this.ForamtPrice=function(price,yClose,defaultfloatPrecision,TitleID,format){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;if(format==2){item.Text=price.toFixed(defaultfloatPrecision);item.Color=this.ValueColor;return item;}if(IFrameSplitOperator.IsNumber(yClose)&&format!=1){var value=(price-yClose)/yClose*100;item.Text=price.toFixed(defaultfloatPrecision)+'('+value.toFixed(2)+'%)';}else{item.Text=price.toFixed(defaultfloatPrecision);}item.Color=this.GetColor(price,yClose);return item;};this.ForamtValue=function(value,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(value,defaultfloatPrecision,2,this.LanguageID);return item;};this.FormatVol=function(vol,TitleID,floatPrecision){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.VolColor};if(!IFrameSplitOperator.IsNumber(vol))return item;var decimal=0;//小数位数
|
|
15595
|
+
this.ForamtPrice=function(price,yClose,defaultfloatPrecision,TitleID,format){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;if(format==2){item.Text=price.toFixed(defaultfloatPrecision);item.Color=this.ValueColor;return item;}if(IFrameSplitOperator.IsNumber(yClose)&&format!=1&&yClose!=0){var value=(price-yClose)/yClose*100;item.Text=price.toFixed(defaultfloatPrecision)+'('+value.toFixed(2)+'%)';}else{item.Text=price.toFixed(defaultfloatPrecision);}item.Color=this.GetColor(price,yClose);return item;};this.ForamtValue=function(value,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(value,defaultfloatPrecision,2,this.LanguageID);return item;};this.FormatVol=function(vol,TitleID,floatPrecision){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.VolColor};if(!IFrameSplitOperator.IsNumber(vol))return item;var decimal=0;//小数位数
|
|
15590
15596
|
if(IFrameSplitOperator.IsNumber(floatPrecision))decimal=floatPrecision;item.Text=IFrameSplitOperator.FormatValueStringV2(vol,decimal,2,this.LanguageID);return item;};this.FormatAmount=function(amount,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.AmountColor};if(!IFrameSplitOperator.IsNumber(amount))return item;item.Text=IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);return item;};this.FormatIncrease=function(price,yClose,defaultfloatPrecision,TitleID,fromat){//涨幅
|
|
15591
|
-
var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price)||!IFrameSplitOperator.IsNumber(yClose))return item;var diffValue=price-yClose;var value=(price-yClose)/yClose;if(fromat==1){item.Text=(value*100).toFixed(2)+'%';}else{item.Text=diffValue.toFixed(defaultfloatPrecision)+'('+(value*100).toFixed(2)+'%)';}item.Color=this.GetColor(value,0);return item;};this.FormatRisefall=function(price,yClose,defaultfloatPrecision,TitleID){//涨跌
|
|
15597
|
+
var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price)||!IFrameSplitOperator.IsNumber(yClose)||yClose===0)return item;var diffValue=price-yClose;var value=(price-yClose)/yClose;if(fromat==1){item.Text=(value*100).toFixed(2)+'%';}else{item.Text=diffValue.toFixed(defaultfloatPrecision)+'('+(value*100).toFixed(2)+'%)';}item.Color=this.GetColor(value,0);return item;};this.FormatRisefall=function(price,yClose,defaultfloatPrecision,TitleID){//涨跌
|
|
15592
15598
|
var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price)||!IFrameSplitOperator.IsNumber(yClose))return item;var value=price-yClose;item.Text=''+value.toFixed(defaultfloatPrecision);item.Color=this.GetColor(value,0);return item;};this.FormatAmplitude=function(high,low,yClose,defaultfloatPrecision,TitleID,fromat){//振幅
|
|
15593
|
-
var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(high)||!IFrameSplitOperator.IsNumber(low)||!IFrameSplitOperator.IsNumber(yClose))return item;var diffValue=high-low;var value=(high-low)/yClose;if(fromat==1)item.Text=(value*100).toFixed(2)+'%';else item.Text=diffValue.toFixed(defaultfloatPrecision)+'('+(value*100).toFixed(2)+'%)';item.Color=this.GetColor(value,0);return item;};this.ForamtDate=function(date,format,TitleID){//日期
|
|
15599
|
+
var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(high)||!IFrameSplitOperator.IsNumber(low)||!IFrameSplitOperator.IsNumber(yClose)||yClose===0)return item;var diffValue=high-low;var value=(high-low)/yClose;if(fromat==1)item.Text=(value*100).toFixed(2)+'%';else item.Text=diffValue.toFixed(defaultfloatPrecision)+'('+(value*100).toFixed(2)+'%)';item.Color=this.GetColor(value,0);return item;};this.ForamtDate=function(date,format,TitleID){//日期
|
|
15594
15600
|
var item={Title:g_JSChartLocalization.GetText('DialogTooltip-Date',this.LanguageID),Text:"----/--/--",Color:this.DateTimeColor};if(!IFrameSplitOperator.IsNumber(date))return item;item.Text=IFrameSplitOperator.FormatDateString(date,format);return item;};this.FormatTime=function(time,period,format,TitleID){//时间
|
|
15595
15601
|
var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--:--',Color:this.DateTimeColor};if(!IFrameSplitOperator.IsNumber(time))return item;if(!format){format="HH:MM";if(ChartData.IsMinutePeriod(period,true))format='HH:MM';// 分钟周期
|
|
15596
15602
|
else if(ChartData.IsSecondPeriod(period))format='HH:MM:SS';else if(ChartData.IsMilliSecondPeriod(period))format='HH:MM:SS.fff';}item.Text=IFrameSplitOperator.FormatTimeString(time,format);return item;};//换手率 成交量/流通股本
|
|
@@ -15833,7 +15839,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15833
15839
|
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);};}/********************************************************************************
|
|
15834
15840
|
* 版本信息输出
|
|
15835
15841
|
*
|
|
15836
|
-
*/var HQCHART_VERSION="1.1.
|
|
15842
|
+
*/var HQCHART_VERSION="1.1.15437";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();//把给外界调用的方法暴露出来
|
|
15837
15843
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15838
15844
|
// BaseIndex:BaseIndex,
|
|
15839
15845
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -871,7 +871,7 @@ function JSDialogTooltip()
|
|
|
871
871
|
return item;
|
|
872
872
|
}
|
|
873
873
|
|
|
874
|
-
if (IFrameSplitOperator.IsNumber(yClose) && format!=1)
|
|
874
|
+
if (IFrameSplitOperator.IsNumber(yClose) && format!=1 && yClose!=0)
|
|
875
875
|
{
|
|
876
876
|
var value=(price-yClose)/yClose*100;
|
|
877
877
|
item.Text=`${price.toFixed(defaultfloatPrecision)}(${value.toFixed(2)}%)`;
|
|
@@ -947,9 +947,7 @@ function JSDialogTooltip()
|
|
|
947
947
|
Color:this.ValueColor
|
|
948
948
|
};
|
|
949
949
|
|
|
950
|
-
if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
|
|
951
|
-
|
|
952
|
-
|
|
950
|
+
if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose) || yClose===0) return item;
|
|
953
951
|
|
|
954
952
|
var diffValue=price-yClose;
|
|
955
953
|
var value=(price-yClose)/yClose;
|
|
@@ -997,7 +995,7 @@ function JSDialogTooltip()
|
|
|
997
995
|
};
|
|
998
996
|
|
|
999
997
|
|
|
1000
|
-
if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose)) return item;
|
|
998
|
+
if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose) || yClose===0) return item;
|
|
1001
999
|
|
|
1002
1000
|
var diffValue=high-low;
|
|
1003
1001
|
var value=(high-low)/yClose;
|
|
@@ -227,6 +227,7 @@ function JSStockInfoChartContainer(uielement)
|
|
|
227
227
|
{
|
|
228
228
|
Name:null,
|
|
229
229
|
YClose:null, //昨收盘
|
|
230
|
+
YFClose:null, //昨计算价
|
|
230
231
|
Symbol:null,
|
|
231
232
|
|
|
232
233
|
Buys:
|
|
@@ -294,6 +295,7 @@ function JSStockInfoChartContainer(uielement)
|
|
|
294
295
|
{
|
|
295
296
|
this.Data.Name=null;
|
|
296
297
|
this.Data.YClose=null;
|
|
298
|
+
this.Data.YFClose=null;
|
|
297
299
|
|
|
298
300
|
this.Data.Buys=
|
|
299
301
|
[
|
|
@@ -400,6 +402,8 @@ function JSStockInfoChartContainer(uielement)
|
|
|
400
402
|
|
|
401
403
|
if (recv.name) this.Data.Name=recv.Name;
|
|
402
404
|
if (IFrameSplitOperator.IsNumber(recv.yclose)) this.Data.YClose=recv.yclose;
|
|
405
|
+
if (IFrameSplitOperator.IsNumber(recv.yfclose)) this.Data.YFClose=recv.yfclose;
|
|
406
|
+
|
|
403
407
|
if (recv.name) this.Data.Name=recv.name;
|
|
404
408
|
|
|
405
409
|
if (IFrameSplitOperator.IsNonEmptyArray(recv.data))
|
|
@@ -759,7 +763,7 @@ function ChartStockData()
|
|
|
759
763
|
|
|
760
764
|
this.Draw=function()
|
|
761
765
|
{
|
|
762
|
-
this.Decimal=GetfloatPrecision(this.Symbol);
|
|
766
|
+
this.Decimal=GetfloatPrecision(this.Data.Symbol);
|
|
763
767
|
var border=this.ChartBorder.GetBorder();
|
|
764
768
|
var position = { Left:border.Left, Right:border.Right, Top:border.Top, Width:border.Right-border.Left, Border:border };
|
|
765
769
|
this.DrawHeader(position);
|
|
@@ -1171,16 +1175,25 @@ function ChartStockData()
|
|
|
1171
1175
|
|
|
1172
1176
|
this.GetPriceColor=function(price)
|
|
1173
1177
|
{
|
|
1174
|
-
|
|
1175
|
-
|
|
1176
|
-
|
|
1178
|
+
var upperSymbol=null;
|
|
1179
|
+
if (this.Data.Symbol) upperSymbol=this.Data.Symbol.toUpperCase();
|
|
1180
|
+
if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
|
|
1181
|
+
{
|
|
1182
|
+
if (!IFrameSplitOperator.IsNumber(this.Data.YFClose)) return this.UnchangeColor;
|
|
1183
|
+
return this.GetUpDownColor(price, this.Data.YFClose);
|
|
1184
|
+
}
|
|
1185
|
+
else
|
|
1186
|
+
{
|
|
1187
|
+
if (!IFrameSplitOperator.IsNumber(this.Data.YClose)) return this.UnchangeColor;
|
|
1188
|
+
return this.GetUpDownColor(price, this.Data.YClose);
|
|
1189
|
+
}
|
|
1177
1190
|
}
|
|
1178
1191
|
|
|
1179
1192
|
this.GetUpDownColor=function(price, price2)
|
|
1180
1193
|
{
|
|
1181
1194
|
if (price>price2) return this.UpColor;
|
|
1182
1195
|
else if (price<price2) return this.DownColor;
|
|
1183
|
-
else return this.
|
|
1196
|
+
else return this.UnchangeColor;
|
|
1184
1197
|
}
|
|
1185
1198
|
}
|
|
1186
1199
|
|
|
@@ -515,8 +515,11 @@ function JSDealChartContainer(uielement)
|
|
|
515
515
|
var chart=this.ChartPaint[0];
|
|
516
516
|
if (chart) chart.Data=null;
|
|
517
517
|
|
|
518
|
-
if (option
|
|
519
|
-
|
|
518
|
+
if (option)
|
|
519
|
+
{
|
|
520
|
+
if (IFrameSplitOperator.IsNumber(option.TradeDate)) this.TradeDate=option.TradeDate;
|
|
521
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.Column)) this.SetColumn(option.Column);
|
|
522
|
+
}
|
|
520
523
|
|
|
521
524
|
if (!this.Symbol)
|
|
522
525
|
{
|
|
@@ -624,6 +627,7 @@ function JSDealChartContainer(uielement)
|
|
|
624
627
|
chart.Data=this.Data;
|
|
625
628
|
chart.Symbol=this.Symbol;
|
|
626
629
|
chart.YClose=data.yclose;
|
|
630
|
+
chart.YFClose=data.yfclose;
|
|
627
631
|
chart.Open=data.open;
|
|
628
632
|
|
|
629
633
|
if (this.IsShowLastPage) this.SetLastPageDataOffset(); //显示最后一屏
|
|
@@ -1291,8 +1295,6 @@ var DEAL_COLUMN_ID=
|
|
|
1291
1295
|
SYMBOL_ID:11, //股票代码
|
|
1292
1296
|
NAME_ID:12, //股票名称
|
|
1293
1297
|
|
|
1294
|
-
|
|
1295
|
-
|
|
1296
1298
|
//预留数值类型 10个
|
|
1297
1299
|
RESERVE_NUMBER1_ID:201, //ReserveNumber1:
|
|
1298
1300
|
RESERVE_NUMBER2_ID:202,
|
|
@@ -1370,6 +1372,7 @@ function ChartDealList()
|
|
|
1370
1372
|
//this.Data={Offset:0, Data:[ {Time:925, Price:20.1, Vol:10000050, BS:1, Deal:45 }, {Time:925, Price:18.2, Vol:1150, BS:1, Deal:5 }] };
|
|
1371
1373
|
this.Symbol;
|
|
1372
1374
|
this.YClose; //昨收
|
|
1375
|
+
this.YFClose; //昨结算
|
|
1373
1376
|
this.Open; //开盘价
|
|
1374
1377
|
this.Decimal=2; //小数位数
|
|
1375
1378
|
this.IsSingleTable=false; //单表模式
|
|
@@ -1524,7 +1527,6 @@ function ChartDealList()
|
|
|
1524
1527
|
{ Type:DEAL_COLUMN_ID.STRING_TIME_ID, Title:"时间", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Time, MaxText:"88:88:88" },
|
|
1525
1528
|
{ Type:DEAL_COLUMN_ID.INDEX_ID, Title:"序号", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Index, MaxText:"88888" },
|
|
1526
1529
|
|
|
1527
|
-
|
|
1528
1530
|
{ Type:DEAL_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
|
|
1529
1531
|
{ Type:DEAL_COLUMN_ID.CUSTOM_TEXT_ID, Title:"自定义", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎擎" },
|
|
1530
1532
|
|
|
@@ -1853,10 +1855,7 @@ function ChartDealList()
|
|
|
1853
1855
|
}
|
|
1854
1856
|
else if (item.Type==DEAL_COLUMN_ID.PRICE_ID)
|
|
1855
1857
|
{
|
|
1856
|
-
|
|
1857
|
-
else if (data.Price<this.YClose) textColor=this.DownColor;
|
|
1858
|
-
else textColor=this.UnchangeColor;
|
|
1859
|
-
|
|
1858
|
+
textColor=this.GetPriceColor(data.Price);
|
|
1860
1859
|
text=data.Price.toFixed(this.Decimal);
|
|
1861
1860
|
}
|
|
1862
1861
|
else if (item.Type==DEAL_COLUMN_ID.VOL_ID)
|
|
@@ -1957,6 +1956,29 @@ function ChartDealList()
|
|
|
1957
1956
|
}
|
|
1958
1957
|
}
|
|
1959
1958
|
|
|
1959
|
+
this.GetPriceColor=function(price)
|
|
1960
|
+
{
|
|
1961
|
+
var upperSymbol=null;
|
|
1962
|
+
if (this.Symbol) upperSymbol=this.Symbol.toUpperCase();
|
|
1963
|
+
if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
|
|
1964
|
+
{
|
|
1965
|
+
if (!IFrameSplitOperator.IsNumber(this.YFClose)) return this.UnchangeColor;
|
|
1966
|
+
return this.GetUpDownColor(price, this.YFClose);
|
|
1967
|
+
}
|
|
1968
|
+
else
|
|
1969
|
+
{
|
|
1970
|
+
if (!IFrameSplitOperator.IsNumber(this.YClose)) return this.UnchangeColor;
|
|
1971
|
+
return this.GetUpDownColor(price, this.YClose);
|
|
1972
|
+
}
|
|
1973
|
+
}
|
|
1974
|
+
|
|
1975
|
+
this.GetUpDownColor=function(price, price2)
|
|
1976
|
+
{
|
|
1977
|
+
if (price>price2) return this.UpColor;
|
|
1978
|
+
else if (price<price2) return this.DownColor;
|
|
1979
|
+
else return this.UnchangeColor;
|
|
1980
|
+
}
|
|
1981
|
+
|
|
1960
1982
|
this.FormatReserveNumber=function(column, data, drawInfo)
|
|
1961
1983
|
{
|
|
1962
1984
|
if (column.DefaultText) drawInfo.Text=column.DefaultText;
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -79391,13 +79391,13 @@ function JSChartResource()
|
|
|
79391
79391
|
{
|
|
79392
79392
|
Color:"RGB(60,60,60)",
|
|
79393
79393
|
Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
|
|
79394
|
-
Font:{ Size:
|
|
79394
|
+
Font:{ Size:14, Name:"微软雅黑" }
|
|
79395
79395
|
},
|
|
79396
79396
|
|
|
79397
79397
|
Row:
|
|
79398
79398
|
{
|
|
79399
79399
|
Mergin:{ Top:2, Bottom:2 },
|
|
79400
|
-
Font:{ Size:
|
|
79400
|
+
Font:{ Size:14, Name:"微软雅黑"},
|
|
79401
79401
|
BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 }
|
|
79402
79402
|
},
|
|
79403
79403
|
|
|
@@ -102502,6 +102502,7 @@ var MARKET_SUFFIX_NAME=
|
|
|
102502
102502
|
DCE: '.DCE', //大连商品交易所(Dalian Commodity Exchange)
|
|
102503
102503
|
CZCE: '.CZC', //郑州期货交易所
|
|
102504
102504
|
GZFE:".GZFE", //广州期货交易所
|
|
102505
|
+
INE:".INE", //上海国际能源交易中心
|
|
102505
102506
|
|
|
102506
102507
|
USA:'.USA', //美股
|
|
102507
102508
|
FTSE:'.FTSE', //富时中国
|
|
@@ -102746,10 +102747,18 @@ var MARKET_SUFFIX_NAME=
|
|
|
102746
102747
|
return upperSymbol.indexOf(this.GZFE) > 0;
|
|
102747
102748
|
},
|
|
102748
102749
|
|
|
102750
|
+
IsINE:function(upperSymbol)
|
|
102751
|
+
{
|
|
102752
|
+
if (!upperSymbol) return false;
|
|
102753
|
+
return upperSymbol.indexOf(this.INE) > 0;
|
|
102754
|
+
},
|
|
102755
|
+
|
|
102749
102756
|
IsChinaFutures:function(upperSymbol) //是否是国内期货 /期权
|
|
102750
102757
|
{
|
|
102758
|
+
if (!upperSymbol) return false;
|
|
102759
|
+
|
|
102751
102760
|
return this.IsSHO(upperSymbol) || this.IsSZO(upperSymbol) ||
|
|
102752
|
-
this.IsGZFE(upperSymbol) ||
|
|
102761
|
+
this.IsGZFE(upperSymbol) || this.IsINE(upperSymbol) ||
|
|
102753
102762
|
this.IsCFFEX(upperSymbol) || this.IsCZCE(upperSymbol) || this.IsDCE(upperSymbol) || this.IsSHFE(upperSymbol);
|
|
102754
102763
|
},
|
|
102755
102764
|
|
|
@@ -103604,7 +103613,8 @@ function MinuteTimeStringData()
|
|
|
103604
103613
|
if (MARKET_SUFFIX_NAME.IsTW(upperSymbol)) return this.GetTW(upperSymbol);
|
|
103605
103614
|
if (MARKET_SUFFIX_NAME.IsJP(upperSymbol)) return this.GetJP(upperSymbol);
|
|
103606
103615
|
if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol)) return this.GetUSA(upperSymbol);
|
|
103607
|
-
if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) ||
|
|
103616
|
+
if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) ||
|
|
103617
|
+
MARKET_SUFFIX_NAME.IsGZFE(upperSymbol) || MARKET_SUFFIX_NAME.IsINE(upperSymbol))
|
|
103608
103618
|
{
|
|
103609
103619
|
var splitData = g_FuturesTimeData.GetSplitData(upperSymbol, option);
|
|
103610
103620
|
if (!splitData) return null;
|
|
@@ -104096,7 +104106,7 @@ function MinuteCoordinateData()
|
|
|
104096
104106
|
data=this.GetTWData(upperSymbol,width);
|
|
104097
104107
|
else if (MARKET_SUFFIX_NAME.IsJP(upperSymbol))
|
|
104098
104108
|
data=this.GetJPData(upperSymbol,width);
|
|
104099
|
-
else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
|
|
104109
|
+
else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol) || MARKET_SUFFIX_NAME.IsINE(upperSymbol))
|
|
104100
104110
|
return this.GetChinatFuturesData(upperSymbol, width, option);
|
|
104101
104111
|
else if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol))
|
|
104102
104112
|
data = this.GetUSAData(upperSymbol,width);
|
|
@@ -104943,6 +104953,13 @@ function FuturesTimeData()
|
|
|
104943
104953
|
[MARKET_SUFFIX_NAME.SHFE + '-LU', {Time:6,Decimal:0,Name:'低硫燃油'}],
|
|
104944
104954
|
[MARKET_SUFFIX_NAME.SHFE + '-BC', {Time:4,Decimal:0,Name:'国际铜'}],
|
|
104945
104955
|
[MARKET_SUFFIX_NAME.SHFE + '-EC', {Time:0,Decimal:0,Name:'集运指数'}],
|
|
104956
|
+
|
|
104957
|
+
//上海国际能源交易中心 独立的一个市场
|
|
104958
|
+
[MARKET_SUFFIX_NAME.INE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
|
|
104959
|
+
[MARKET_SUFFIX_NAME.INE + '-SC', {Time:5,Decimal:1,Name:'原油'}],
|
|
104960
|
+
[MARKET_SUFFIX_NAME.INE + '-LU', {Time:6,Decimal:0,Name:'低硫燃油'}],
|
|
104961
|
+
[MARKET_SUFFIX_NAME.INE + '-BC', {Time:4,Decimal:0,Name:'国际铜'}],
|
|
104962
|
+
[MARKET_SUFFIX_NAME.INE + '-EC', {Time:0,Decimal:0,Name:'集运指数'}],
|
|
104946
104963
|
|
|
104947
104964
|
//郑州期货交易所
|
|
104948
104965
|
[MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
|
|
@@ -105059,6 +105076,11 @@ function FuturesTimeData()
|
|
|
105059
105076
|
oneWordName = MARKET_SUFFIX_NAME.GZFE + '-' + oneWord;
|
|
105060
105077
|
twoWordsName = MARKET_SUFFIX_NAME.GZFE + '-' + twoWords;
|
|
105061
105078
|
}
|
|
105079
|
+
else if (MARKET_SUFFIX_NAME.IsINE(upperSymbol)) //上海国际能源交易中心
|
|
105080
|
+
{
|
|
105081
|
+
oneWordName = MARKET_SUFFIX_NAME.INE + '-' + oneWord;
|
|
105082
|
+
twoWordsName = MARKET_SUFFIX_NAME.INE + '-' + twoWords;
|
|
105083
|
+
}
|
|
105062
105084
|
|
|
105063
105085
|
if (this.MAP_TWOWORDS.has(twoWordsName))
|
|
105064
105086
|
{
|