hqchart 1.1.14037 → 1.1.14045
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.NetworkFilterTest.vue.js +9 -3
- package/lib/umychart.vue.js +9 -8
- package/package.json +1 -1
- package/src/jscommon/umychart.NetworkFilterTest.js +23 -11
- package/src/jscommon/umychart.js +35 -12
- package/src/jscommon/umychart.testdata.js +23 -11
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +36 -13
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js +23 -11
- package/src/jscommon/umychart.vue/umychart.vue.js +36 -13
|
@@ -48,7 +48,13 @@ HQData.Report_RequestStockSortData(data,callback);break;case"JSDealChartContaine
|
|
|
48
48
|
break;}};HQData.Minute_RequestMinuteData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol[0];//请求的股票代码
|
|
49
49
|
var callcation=data.Request.Data.callcation;//集合竞价
|
|
50
50
|
console.log("[HQData::RequestMinuteData] Symbol="+symbol);setTimeout(function(){var fullData=HQData.GetDayMinuteDataBySymbol(symbol);var srcStock=fullData[0];var stockItem={date:srcStock.date,minute:srcStock.minute,yclose:srcStock.yclose,symbol:srcStock.symbol,name:srcStock.name};if(callcation.Before){var before=[//[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
|
|
51
|
-
[915,srcStock.yclose,0,0],[916,srcStock.yclose+0.01,0,0],[917,srcStock.yclose+0.03,0,0],[918,srcStock.yclose+0.02,0,0],[919,srcStock.yclose+0.02,0,0],[920,srcStock.yclose+0.01,0,0],[921,srcStock.yclose,0,0],[922,srcStock.yclose-0.02,0,0],[923,srcStock.yclose-0.03,0,0],[924,srcStock.yclose,0,0],[925,srcStock.yclose,0,0]];var beforeinfo={totalcount:11,ver:1.0};stockItem.before=before;stockItem.beforeinfo=beforeinfo;}
|
|
51
|
+
[915,srcStock.yclose,0,0],[916,srcStock.yclose+0.01,0,0],[917,srcStock.yclose+0.03,0,0],[918,srcStock.yclose+0.02,0,0],[919,srcStock.yclose+0.02,0,0],[920,srcStock.yclose+0.01,0,0],[921,srcStock.yclose,0,0],[922,srcStock.yclose-0.02,0,0],[923,srcStock.yclose-0.03,0,0],[924,srcStock.yclose,0,0],[925,srcStock.yclose,0,0]];var beforeinfo={totalcount:11,ver:1.0};stockItem.before=before;stockItem.beforeinfo=beforeinfo;}/* 测试用 这里可以修改数据
|
|
52
|
+
for(var i=0;i<srcStock.minute.length;++i)
|
|
53
|
+
{
|
|
54
|
+
var item=srcStock.minute[i];
|
|
55
|
+
if (item.amount<1000000) item.amount*=100000;
|
|
56
|
+
}
|
|
57
|
+
*/var hqchartData={code:0,stock:[stockItem]};callback(hqchartData);},50);};HQData.Minute_RequestPopMinuteData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol[0];//请求的股票代码
|
|
52
58
|
var date=data.Request.Data.date;var callcation=data.Request.Data.callcation;//集合竞价
|
|
53
59
|
console.log("[HQData::RequestPopMinuteData] Symbol="+symbol+" Date="+date);setTimeout(function(){var fullData=HQData.GetDayMinuteDataBySymbol(symbol);var srcStock=fullData[0];var stockItem={date:date,minute:[],yclose:srcStock.yclose,symbol:srcStock.symbol,name:srcStock.symbol,IsHistoryMinute:true};if(callcation.Before){var before=[//[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
|
|
54
60
|
[915,srcStock.yclose,0,0],[916,srcStock.yclose+0.01,0,0],[917,srcStock.yclose+0.03,0,0],[918,srcStock.yclose+0.02,0,0],[919,srcStock.yclose+0.02,0,0],[920,srcStock.yclose+0.01,0,0],[921,srcStock.yclose,0,0],[922,srcStock.yclose-0.02,0,0],[923,srcStock.yclose-0.03,0,0],[924,srcStock.yclose,0,0],[925,srcStock.yclose,0,0]];var beforeinfo={totalcount:11,ver:1.0};stockItem.before=before;stockItem.beforeinfo=beforeinfo;}for(var i=0;i<srcStock.minute.length;++i){var item=srcStock.minute[i];var newItem=CloneData(item);newItem.date=date;stockItem.minute.push(newItem);}var hqchartData={code:0,stock:[stockItem]};callback(hqchartData);},50);};HQData.Minute_RequestHistoryMinuteData=function(data,callback){data.PreventDefault=true;var symbol=data.Request.Data.symbol;//请求的股票代码
|
|
@@ -111,7 +117,7 @@ var extendData=[];newItem[30]=extendData;//行业
|
|
|
111
117
|
extendData[0]="行业X";//地区
|
|
112
118
|
extendData[1]="地区X";//PE|PB
|
|
113
119
|
extendData[2]=Math.round(Math.random()*60)/100;extendData[3]=Math.round(Math.random()*60)/100;extendData[4]=Math.round(Math.random()*60)/100;extendData[5]=Math.round(Math.random()*60)/100;//周涨幅
|
|
114
|
-
extendData[6]=Math.round(Math.random()*60)/100;extendData[7]=Math.round(Math.random()*60)/100;extendData[8]=Math.round(Math.random()*60)/100;item.Data=newItem;}}var hqchartData={data:[],code:0};var _iteratorNormalCompletion=true;var _didIteratorError=false;var _iteratorError=undefined;try{for(var _iterator=(0,_getIterator3.default)(mapStock),_step;!(_iteratorNormalCompletion=(_step=_iterator.next()).done);_iteratorNormalCompletion=true){var mapItem=_step.value;var item=mapItem[1];if(!item.Data)continue;hqchartData.data.push(item.Data);}}catch(err){_didIteratorError=true;_iteratorError=err;}finally{try{if(!_iteratorNormalCompletion&&_iterator.return){_iterator.return();}}finally{if(_didIteratorError){throw _iteratorError;}}}callback(hqchartData);};HQData.Report_RequestStockSortData=function(data,callback){var blockID=data.Request.Data.symbol;//板块代码
|
|
120
|
+
extendData[6]=Math.round(Math.random()*60)/100;extendData[7]=Math.round(Math.random()*60)/100;extendData[8]=Math.round(Math.random()*60)/100;newItem[101]=105.0;newItem[201]="A-["+HQData.GetRandomTestData(-90,90)+"]-B";item.Data=newItem;}}var hqchartData={data:[],code:0};var _iteratorNormalCompletion=true;var _didIteratorError=false;var _iteratorError=undefined;try{for(var _iterator=(0,_getIterator3.default)(mapStock),_step;!(_iteratorNormalCompletion=(_step=_iterator.next()).done);_iteratorNormalCompletion=true){var mapItem=_step.value;var item=mapItem[1];if(!item.Data)continue;hqchartData.data.push(item.Data);}}catch(err){_didIteratorError=true;_iteratorError=err;}finally{try{if(!_iteratorNormalCompletion&&_iterator.return){_iterator.return();}}finally{if(_didIteratorError){throw _iteratorError;}}}callback(hqchartData);};HQData.Report_RequestStockSortData=function(data,callback){var blockID=data.Request.Data.symbol;//板块代码
|
|
115
121
|
var range=data.Request.Data.range;//排序范围
|
|
116
122
|
var column=data.Request.Data.column;//排序列信息
|
|
117
123
|
var sortType=data.Request.Data.sort;//排序方向
|
|
@@ -149,7 +155,7 @@ extendData[0]="行业X";//地区
|
|
|
149
155
|
extendData[1]="地区X";//PE|PB
|
|
150
156
|
extendData[2]=Math.round(Math.random()*60)/100;extendData[3]=Math.round(Math.random()*60)/100;extendData[4]=Math.round(Math.random()*60)/100;extendData[5]=Math.round(Math.random()*60)/100;//周涨幅
|
|
151
157
|
extendData[6]=Math.round(Math.random()*60)/100;extendData[7]=Math.round(Math.random()*60)/100;extendData[8]=Math.round(Math.random()*60)/100;aryData.push(newItem);aryIndex.push(start+i);}}var hqchartData={data:aryData,index:aryIndex,filedindex:-1,sort:sortType,symbol:blockID};if(column)hqchartData.filedindex=column.index;callback(hqchartData);};HQData.Keyboard_RequestSymbolList=function(data,callback){//加载数据
|
|
152
|
-
var recv={symbollist:SYMBOL_LIST};var arySymbol=[];for(var i=0;i<recv.symbollist.length;++i){var item=recv.symbollist[i];var shortSymbol=item[0];shortSymbol=shortSymbol.replace(".sh","");shortSymbol=shortSymbol.replace(".sz","");var symbolItem={Symbol:item[0],Name:item[1],ShortSymbol:shortSymbol,Spell:item[3],Type:item[2],Data:{Symbol:item[0],Type:0}};if(symbolItem.Type=="EQA"){symbolItem.TypeName="股票";}else if(symbolItem.Type=="IDX"){symbolItem.TypeName="指数";symbolItem.Color="rgb(30,144,255)";}arySymbol.push(symbolItem);}arySymbol.push({Symbol:"ICL8.cfe",Name:"中证主连",ShortSymbol:"ICL8",Spell:"ICL8",Type:"期货",TypeName:"期货",Data:{Symbol:"ICL8.cfe",Type:0}});arySymbol.push({Symbol:"IML8.cfe",Name:"中千主连",ShortSymbol:"IML8",Spell:"IML8",Type:"期货",TypeName:"期货",Data:{Symbol:"IML8.cfe",Type:0}});arySymbol.push({Symbol:"IFL8.cfe",Name:"沪深主连",ShortSymbol:"IFL8",Spell:"IFL8",Type:"期货",TypeName:"期货",Data:{Symbol:"IFL8.cfe",Type:0}});arySymbol.push({Symbol:"01",Name:"分时成交明细",TypeName:"功能键",Priority:1,Color:"rgb(220,20,60)",Data:{PageName:"分时成交明细",Type:2}});arySymbol.push({Symbol:"02",Name:"分价表",TypeName:"功能键",Priority:1,Color:"rgb(220,20,60)",Data:{PageName:"分价表",Type:2}});arySymbol.push({Symbol:"06",Name:"自选股",TypeName:"功能键",Priority:1,Color:"rgb(220,20,60)",Data:{PageName:"自选股",Type:2}});arySymbol.push({Symbol:"MACD",Name:"平滑异同平均线",TypeName:"指标",Priority:2,Color:"rgb(0,
|
|
158
|
+
var recv={symbollist:SYMBOL_LIST};var arySymbol=[];for(var i=0;i<recv.symbollist.length;++i){var item=recv.symbollist[i];var shortSymbol=item[0];shortSymbol=shortSymbol.replace(".sh","");shortSymbol=shortSymbol.replace(".sz","");var symbolItem={Symbol:item[0],Name:item[1],ShortSymbol:shortSymbol,Spell:item[3],Type:item[2],Data:{Symbol:item[0],Type:0}};if(symbolItem.Type=="EQA"){symbolItem.TypeName="股票";}else if(symbolItem.Type=="IDX"){symbolItem.TypeName="指数";symbolItem.Color="rgb(30,144,255)";}arySymbol.push(symbolItem);}arySymbol.push({Symbol:"ICL8.cfe",Name:"中证主连",ShortSymbol:"ICL8",Spell:"ICL8",Type:"期货",TypeName:"期货",Data:{Symbol:"ICL8.cfe",Type:0}});arySymbol.push({Symbol:"IML8.cfe",Name:"中千主连",ShortSymbol:"IML8",Spell:"IML8",Type:"期货",TypeName:"期货",Data:{Symbol:"IML8.cfe",Type:0}});arySymbol.push({Symbol:"IFL8.cfe",Name:"沪深主连",ShortSymbol:"IFL8",Spell:"IFL8",Type:"期货",TypeName:"期货",Data:{Symbol:"IFL8.cfe",Type:0}});arySymbol.push({Symbol:"01",Name:"分时成交明细",TypeName:"功能键",Priority:1,Color:"rgb(220,20,60)",Data:{PageName:"分时成交明细",Type:2}});arySymbol.push({Symbol:"02",Name:"分价表",TypeName:"功能键",Priority:1,Color:"rgb(220,20,60)",Data:{PageName:"分价表",Type:2}});arySymbol.push({Symbol:"06",Name:"自选股",TypeName:"功能键",Priority:1,Color:"rgb(220,20,60)",Data:{PageName:"自选股",Type:2}});arySymbol.push({Symbol:"MACD",Name:"平滑异同平均线",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"MACD",Type:1}});arySymbol.push({Symbol:"RSI",Name:"相对强弱指标",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"RSI",Type:1}});arySymbol.push({Symbol:"MA",Name:"均线",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"MA",Type:1}});arySymbol.push({Symbol:"BOLL",Name:"布林线",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"BOLL",Type:1}});arySymbol.push({Symbol:"KDJ",Name:"随机指标",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"KDJ",Type:1}});arySymbol.push({Symbol:"SKDJ",Name:"慢速随机指标",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"SKDJ",Type:1}});arySymbol.push({Symbol:"KD",Name:"随机指标KD",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"KD",Type:1}});arySymbol.push({Symbol:"MARSI",Name:"相对强弱平均线",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"MARSI",Type:1}});arySymbol.push({Symbol:"VMACD",Name:"量平滑异同平均",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"VMACD",Type:1}});arySymbol.push({Symbol:"AMO",Name:"成交金额",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"AMO",Type:1}});arySymbol.push({Symbol:"SQJZ",Name:"神奇九转",TypeName:"指标",Priority:2,Color:"rgb(0,144,255)",Data:{Index:"SQJZ",Type:1}});callback(arySymbol);};HQData.GetRandomTestData=function(min,max)//测试数据
|
|
153
159
|
{min=Math.ceil(min);max=Math.floor(max);return Math.floor(Math.random()*(max-min+1))+min;//含最大值，含最小值
|
|
154
160
|
};HQData.GetM1KLineDataBySymbol=function(symbol){var data=null;switch(symbol){case"000001.sh":data=SH_000001_M1_KLINE;break;case"000300.sh":data=SH_000300_M1_KLINE;break;case"399001.sz":data=SZ_399001_M1_KLINE;break;case"000001.sz":data=SZ_000001_M1_KLINE;break;case"600000.sh":data=SH_600000_M1_KLINE;break;case"000151.sz":data=SZ_000151_M1_KLINE;break;case"399005.sz":data=SZ_399005_M1_KLINE;break;case"399006.sz":data=SZ_399006_M1_KLINE;break;case"ICL8.cfe":data=CFE_ICL8_M1_KLINE;break;case"IML8.cfe":data=CFE_IML8_M1_KLINE;break;case"IFL8.cfe":data=CFE_IFL8_M1_KLINE;break;default:data=SZ_000001_M1_KLINE;break;}if(!data)return null;return data.data;};HQData.GetDayKLineDataBySymbol=function(symbol){var data=null;switch(symbol){case"000001.sh":data=SH_000001_DAY_KLINE;break;case"000300.sh":data=SH_000300_DAY_KLINE;break;case"399001.sz":data=SZ_399001_DAY_KLINE;break;case"000001.sz":data=SZ_000001_DAY_KLINE;break;case"600000.sh":data=SH_600000_DAY_KLINE;break;case"000151.sz":data=SZ_000151_DAY_KLINE;break;case"399005.sz":data=SZ_399005_DAY_KLINE;break;case"399006.sz":data=SZ_399006_DAY_KLINE;break;case"ICL8.cfe":data=CFE_ICL8_DAY_KLINE;break;case"IML8.cfe":data=CFE_IML8_DAY_KLINE;break;case"IFL8.cfe":data=CFE_IFL8_DAY_KLINE;break;default:data=SZ_000001_DAY_KLINE;break;}if(!data)return null;return data.data;};HQData.GetKLineDataByDateTime=function(fullData,startDate,startTime,endDate,endTime){var start=startDate*10000+startTime;var end=endDate*10000+endTime;var aryData=[];for(var i=0;i<fullData.length;++i){var kItem=fullData[i];var date=kItem[0];var time=kItem[8];var dateTime=date*10000+time;if(dateTime>=start&&dateTime<=end)aryData.push(kItem);}return aryData;};HQData.GetKLineDataByDate=function(fullData,startDate,endDate){var aryData=[];for(var i=0;i<fullData.length;++i){var kItem=fullData[i];var date=kItem[0];if(date>=startDate&&date<=endDate)aryData.push(kItem);}return aryData;};HQData.GetDayMinuteDataBySymbol=function(symbol){var data=null;switch(symbol){case"000001.sz":data=SZ_000001_1DAY_MINUTE;break;case"600000.sh":data=SH_600000_1DAY_MINUTE;break;case"000151.sz":data=SZ_000151_1DAY_MINUTE;break;default:data=SZ_000151_1DAY_MINUTE;break;}if(!data)return null;/*
|
|
155
161
|
var aryMinute=[];
|
package/lib/umychart.vue.js
CHANGED
|
@@ -1221,7 +1221,7 @@ for(var i=0;i<chart.ExtendChartPaint.length;++i){var item=chart.ExtendChartPaint
|
|
|
1221
1221
|
if(IFrameSplitOperator.IsNonEmptyArray(option.Windows)){var scriptData=new JSIndexScript();for(var i=0;i<option.Windows.length;++i){var index=2+i;var item=option.Windows[i];if(item.Script){chart.WindowIndex[index]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
|
|
1222
1222
|
}else if(item.API)//使用API挂接指标数据 API:{ Name:指标名字, Script:指标脚本可以为空, Args:参数可以为空, Url:指标执行地址 }
|
|
1223
1223
|
{var apiItem=item.API;chart.WindowIndex[index]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexItem=JSIndexMap.Get(item.Index);if(indexItem){chart.WindowIndex[index]=indexItem.Create();//创建子窗口的指标
|
|
1224
|
-
chart.CreateWindowIndex(index);}else{var indexInfo=scriptData.Get(item.Index);if(!indexInfo)continue;
|
|
1224
|
+
chart.CreateWindowIndex(index);}else{var indexInfo=scriptData.Get(item.Index);if(!indexInfo)continue;JSIndexScript.ModifyAttribute(indexInfo,item);indexInfo.ID=item.Index;chart.WindowIndex[index]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
|
|
1225
1225
|
if(item.StringFormat>0)chart.WindowIndex[index].StringFormat=item.StringFormat;if(item.FloatPrecision>=0)chart.WindowIndex[index].FloatPrecision=item.FloatPrecision;}}var frame=chart.Frame.SubFrame[index].Frame;if(IFrameSplitOperator.IsBool(item.Modify))frame.ModifyIndex=item.Modify;if(IFrameSplitOperator.IsBool(item.Change))frame.ChangeIndex=item.Change;if(IFrameSplitOperator.IsBool(item.Close))frame.CloseIndex=item.Close;if(IFrameSplitOperator.IsBool(item.Overlay))frame.OverlayIndex=item.Overlay;if(IFrameSplitOperator.IsBool(item.Export))frame.ExportData=item.Export;if(IFrameSplitOperator.IsBool(item.MaxMin))frame.MaxMinWindow=item.MaxMin;if(IFrameSplitOperator.IsBool(item.TitleWindow))frame.TitleWindow=item.TitleWindow;if(IFrameSplitOperator.IsNumber(item.YSplitType))chart.Frame.SubFrame[index].Frame.YSplitOperator.SplitType=item.YSplitType;if(IFrameSplitOperator.IsNumber(item.FilterType))chart.Frame.SubFrame[index].Frame.YSplitOperator.FilterType=item.FilterType;if(!isNaN(item.TitleHeight))chart.Frame.SubFrame[index].Frame.ChartBorder.TitleHeight=item.TitleHeight;if(IFrameSplitOperator.IsBool(item.IsDrawTitleBG))chart.Frame.SubFrame[index].Frame.IsDrawTitleBG=item.IsDrawTitleBG;if(IFrameSplitOperator.IsBool(item.IsShowNameArrow))chart.Frame.SubFrame[index].Frame.IsShowNameArrow=item.IsShowNameArrow;if(IFrameSplitOperator.IsBool(item.IsShowTitleArrow))frame.IsShowTitleArrow=item.IsShowTitleArrow;if(IFrameSplitOperator.IsNumber(item.TitleArrowType))frame.TitleArrowType=item.TitleArrowType;if(item.IsShowIndexName==false)chart.Frame.SubFrame[index].Frame.IsShowIndexName=false;if(item.IsShowOverlayIndexName==false)chart.Frame.SubFrame[index].Frame.IsShowOverlayIndexName=false;if(!IFrameSplitOperator.IsUndefined(item.HorizontalReserved))frame.HorizontalReserved=item.HorizontalReserved;}}this.AdjustTitleHeight(chart);//叠加指标
|
|
1226
1226
|
if(IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex)){for(var i=0;i<option.OverlayIndex.length;++i){var item=option.OverlayIndex[i];if(item.Windows>=chart.Frame.SubFrame.length)continue;var itemString=(0,_stringify2.default)(item);var obj=JSON.parse(itemString);if(item.Index)obj.IndexName=item.Index;if(item.Windows>=0)obj.WindowIndex=item.Windows;chart.CreateOverlayWindowsIndex(obj);}}return chart;};this.CreateMinMinuteChartContainer=function(option){var chart=null;if(option.Type==="迷你分钟走势图横屏")chart=new MinuteChartHScreenContainer(this.CanvasElement);else chart=new MinuteChartContainer(this.CanvasElement);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;var windowsCount=2;if(option.BeforeOpen)//集合竞价
|
|
1227
1227
|
{var item=option.BeforeOpen;if(IFrameSplitOperator.IsBool(item.IsShow))chart.IsShowBeforeData=item.IsShow;if(IFrameSplitOperator.IsNumber(item.Width))chart.ExtendWidth.Left=item.Width;if(IFrameSplitOperator.IsBool(item.IsShowMultiDay))chart.IsShowMultiDayBeforeData=item.IsShowMultiDay;if(IFrameSplitOperator.IsNumber(item.MulitiDayWidth))chart.MultiDayExtendWidth.Left=item.MulitiDayWidth;}if(option.AfterClose)//收盘集合竞价
|
|
@@ -9304,7 +9304,8 @@ if(IFrameSplitOperator.IsPlusNumber(rightFormula))return true;//复权因子复
|
|
|
9304
9304
|
if(ChartData.IsMinutePeriod(period,true))return false;//内置分钟K线不支持复权
|
|
9305
9305
|
return true;}//走势图分钟数据对应的时间
|
|
9306
9306
|
};function MinuteTimeStringData(){this.SHSZ=null;//上海深证交易所时间
|
|
9307
|
-
this.BJ=null;this.SHO=null
|
|
9307
|
+
this.BJ=null;this.SHO=null;//上海期权交易时间
|
|
9308
|
+
this.SZO=null;//深证期权交易时间
|
|
9308
9309
|
this.HK=null;//香港交易所时间
|
|
9309
9310
|
this.Futures=new _map2.default();//期货交易时间 key=时间名称 Value=数据
|
|
9310
9311
|
this.USA=null;//美股交易时间
|
|
@@ -9322,8 +9323,8 @@ this.Initialize=function()//初始化 默认只初始化沪深的 其他市场
|
|
|
9322
9323
|
//this.HK = this.CreateHKData();
|
|
9323
9324
|
};this.GetET=function(upperSymbol)//当天所有的分钟
|
|
9324
9325
|
{throw{Name:'MinuteTimeStringData::GetET',Error:'not implement'};};this.GetSHSZ=function(upperSymbol)//动态创建
|
|
9325
|
-
{if(!this.SHSZ)this.SHSZ=this.CreateSHSZData();return this.SHSZ;};this.GetBJ=function(upperSymbol){if(!this.BJ)this.BJ=this.CreateBJData();return this.BJ;};this.GetSHO=function(){if(!this.SHO)this.SHO=this.CreateSHOData();return this.SHO;};this.GetHK=function(upperSymbol){if(!this.HK)this.HK=this.CreateHKData();return this.HK;};this.GetTW=function(upperSymbol){if(this.TW)this.TW=this.CreateTWData();return this.TW;};this.GetJP=function(upperSymbol){if(this.JP)this.JP=this.CreateJPData();return this.JP;};this.GetHSX=function(upperSymbol){if(this.HSX)this.HSX=this.CreateHSXData();return this.HSX;};this.GetHNX=function(upperSymbol){if(this.HNX)this.HSX=this.CreateHNXData();return this.HNX;};this.GetUPCOM=function(upperSymbol){if(this.UPCOM)this.UPCOM=this.CreateUPCOMData();return this.UPCOM;};this.GetFutures=function(splitData){if(!this.Futures.has(splitData.Name)){var data=this.CreateTimeData(splitData.Data);this.Futures.set(splitData.Name,data);}return this.Futures.get(splitData.Name);};// type=时间类型
|
|
9326
|
-
this.GetUSA=function(upperSymbol){if(!this.USA)this.USA=this.CreateUSAData(0);return this.USA;};this.GetFTSE=function(){if(!this.FTSE)this.FTSE=this.CreateFTSEData();return this.FTSE;};this.GetFHK=function(){if(!this.FHK)this.FHK=this.CreateFHKData();return this.FHK;};this.GetForeignExchange=function(upperSymbol){if(!this.ForeEx)this.ForeEx=this.CreateForeignExchangeData();return this.ForeEx;};this.GetBIT=function(upperSymbol){if(!this.BIT)this.BIT=this.CreateBITData();return this.BIT;};this.CreateSHSZData=function(){var TIME_SPLIT=[{Start:925,End:925},{Start:930,End:1130},{Start:1300,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateBJData=function(){var TIME_SPLIT=[{Start:925,End:925},{Start:930,End:1130},{Start:1300,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateSHOData=function(){var TIME_SPLIT=[{Start:930,End:1129},{Start:1300,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateHKData=function(){var TIME_SPLIT=[{Start:930,End:1200},{Start:1300,End:1600}];return this.CreateTimeData(TIME_SPLIT);};this.CreateTWData=function(){var TIME_SPLIT=[{Start:900,End:1330}];return this.CreateTimeData(TIME_SPLIT);};this.CreateJPData=function(){var TIME_SPLIT=[{Start:900,End:1130},{Start:1230,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateFTSEData=function(){var TIME_SPLIT=[{Start:1700,End:2359},{Start:0,End:445},{Start:900,End:1630}];return this.CreateTimeData(TIME_SPLIT);};this.CreateFHKData=function(){//港股指数期货 9:15-12:00 13:00-16:30 17:15-03:00
|
|
9326
|
+
{if(!this.SHSZ)this.SHSZ=this.CreateSHSZData();return this.SHSZ;};this.GetBJ=function(upperSymbol){if(!this.BJ)this.BJ=this.CreateBJData();return this.BJ;};this.GetSHO=function(upperSymbol){if(!this.SHO)this.SHO=this.CreateSHOData();return this.SHO;};this.GetSZO=function(upperSymbol){if(!this.SZO)this.SZO=this.CreateSZOData();return this.SZO;};this.GetHK=function(upperSymbol){if(!this.HK)this.HK=this.CreateHKData();return this.HK;};this.GetTW=function(upperSymbol){if(this.TW)this.TW=this.CreateTWData();return this.TW;};this.GetJP=function(upperSymbol){if(this.JP)this.JP=this.CreateJPData();return this.JP;};this.GetHSX=function(upperSymbol){if(this.HSX)this.HSX=this.CreateHSXData();return this.HSX;};this.GetHNX=function(upperSymbol){if(this.HNX)this.HSX=this.CreateHNXData();return this.HNX;};this.GetUPCOM=function(upperSymbol){if(this.UPCOM)this.UPCOM=this.CreateUPCOMData();return this.UPCOM;};this.GetFutures=function(splitData){if(!this.Futures.has(splitData.Name)){var data=this.CreateTimeData(splitData.Data);this.Futures.set(splitData.Name,data);}return this.Futures.get(splitData.Name);};// type=时间类型
|
|
9327
|
+
this.GetUSA=function(upperSymbol){if(!this.USA)this.USA=this.CreateUSAData(0);return this.USA;};this.GetFTSE=function(){if(!this.FTSE)this.FTSE=this.CreateFTSEData();return this.FTSE;};this.GetFHK=function(){if(!this.FHK)this.FHK=this.CreateFHKData();return this.FHK;};this.GetForeignExchange=function(upperSymbol){if(!this.ForeEx)this.ForeEx=this.CreateForeignExchangeData();return this.ForeEx;};this.GetBIT=function(upperSymbol){if(!this.BIT)this.BIT=this.CreateBITData();return this.BIT;};this.CreateSHSZData=function(){var TIME_SPLIT=[{Start:925,End:925},{Start:930,End:1130},{Start:1300,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateBJData=function(){var TIME_SPLIT=[{Start:925,End:925},{Start:930,End:1130},{Start:1300,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateSHOData=function(){var TIME_SPLIT=[{Start:930,End:1129},{Start:1300,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateSZOData=function(){var TIME_SPLIT=[{Start:930,End:1129},{Start:1300,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateHKData=function(){var TIME_SPLIT=[{Start:930,End:1200},{Start:1300,End:1600}];return this.CreateTimeData(TIME_SPLIT);};this.CreateTWData=function(){var TIME_SPLIT=[{Start:900,End:1330}];return this.CreateTimeData(TIME_SPLIT);};this.CreateJPData=function(){var TIME_SPLIT=[{Start:900,End:1130},{Start:1230,End:1500}];return this.CreateTimeData(TIME_SPLIT);};this.CreateFTSEData=function(){var TIME_SPLIT=[{Start:1700,End:2359},{Start:0,End:445},{Start:900,End:1630}];return this.CreateTimeData(TIME_SPLIT);};this.CreateFHKData=function(){//港股指数期货 9:15-12:00 13:00-16:30 17:15-03:00
|
|
9327
9328
|
var TIME_SPLIT=[{Start:1715,End:2359},{Start:0,End:300},{Start:915,End:1200},{Start:1300,End:1630}];return this.CreateTimeData(TIME_SPLIT);};this.CreateHSXData=function(){throw{Name:'MinuteTimeStringData::CreateHSXData',Error:'not implement'};};this.CreateHNXData=function(){throw{Name:'MinuteTimeStringData::CreateHNXData',Error:'not implement'};};this.CreateUPCOMData=function(){throw{Name:'MinuteTimeStringData::CreateUPCOMData',Error:'not implement'};};this.CreateUSAData=function(type){if(type==1)//美国夏令时
|
|
9328
9329
|
{var TIME_SPLIT=[{Start:2130,End:2359},{Start:0,End:400}];return this.CreateTimeData(TIME_SPLIT);}else if(type==2)//非夏令时
|
|
9329
9330
|
{var _TIME_SPLIT=[{Start:2230,End:2359},{Start:0,End:500}];return this.CreateTimeData(_TIME_SPLIT);}else//使用美国本地时间
|
|
@@ -9332,7 +9333,7 @@ var TIME_SPLIT=[{Start:1715,End:2359},{Start:0,End:300},{Start:915,End:1200},{St
|
|
|
9332
9333
|
var TIME_SPLIT=[{Start:600,End:2359},{Start:0,End:559}];return this.CreateTimeData(TIME_SPLIT);};this.CreateBITData=function(){//数字货币 7:00 - 6:59
|
|
9333
9334
|
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分钟的数据去掉
|
|
9334
9335
|
data.push(j);}}return data;};this.GetTimeData=function(symbol){if(!symbol)return this.SHSZ;var upperSymbol=symbol.toLocaleUpperCase();//转成大写
|
|
9335
|
-
if(MARKET_SUFFIX_NAME.IsSHO(upperSymbol)
|
|
9336
|
+
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.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);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);//越南股市
|
|
9336
9337
|
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))//纽约期货交易所
|
|
9337
9338
|
{var splitData=g_NYMEXTimeData.GetSplitData(upperSymbol);if(!splitData)return null;return this.GetFutures(splitData);}if(MARKET_SUFFIX_NAME.IsCOMEX(upperSymbol))//纽约期货交易所
|
|
9338
9339
|
{var splitData=g_COMEXTimeData.GetSplitData(upperSymbol);if(!splitData)return null;return this.GetFutures(splitData);}if(MARKET_SUFFIX_NAME.IsNYBOT(upperSymbol))//纽约期货交易所
|
|
@@ -9424,8 +9425,8 @@ var FTSE_MINUTE_X_COORDINATE={Full://完整模式
|
|
|
9424
9425
|
[[0,1,"RGB(200,200,200)","09:00"],[60,1,"RGB(200,200,200)","10:00"],[120,1,"RGB(200,200,200)","11:00"],[180,1,"RGB(200,200,200)","12:00"],[270,0,"RGB(200,200,200)","13:30"]],Min://最小模式
|
|
9425
9426
|
[[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;}};this.GetCoordinateData=function(symbol,width){var data=null;if(!symbol){data=SHZE_MINUTE_X_COORDINATE;//默认沪深股票
|
|
9426
9427
|
}else{var upperSymbol=symbol.toLocaleUpperCase();//转成大写
|
|
9427
|
-
if(MARKET_SUFFIX_NAME.
|
|
9428
|
-
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.GetFuturesData=function(upperSymbol,width,timeData){var splitData=timeData.GetSplitData(upperSymbol);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;/*
|
|
9428
|
+
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);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);
|
|
9429
|
+
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){var splitData=timeData.GetSplitData(upperSymbol);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;/*
|
|
9429
9430
|
if (splitData.Name =='21:00-1:00,9:00-10:15,10:30-11:30,13:30-15:00')
|
|
9430
9431
|
{
|
|
9431
9432
|
minWidth=250;
|
|
@@ -13934,7 +13935,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13934
13935
|
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);};}/********************************************************************************
|
|
13935
13936
|
* 版本信息输出
|
|
13936
13937
|
*
|
|
13937
|
-
*/var HQCHART_VERSION="1.1.
|
|
13938
|
+
*/var HQCHART_VERSION="1.1.14044";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();//把给外界调用的方法暴露出来
|
|
13938
13939
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13939
13940
|
// BaseIndex:BaseIndex,
|
|
13940
13941
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -55726,6 +55726,14 @@ HQData.Minute_RequestMinuteData=function(data, callback)
|
|
|
55726
55726
|
stockItem.beforeinfo=beforeinfo;
|
|
55727
55727
|
}
|
|
55728
55728
|
|
|
55729
|
+
/* 测试用 这里可以修改数据
|
|
55730
|
+
for(var i=0;i<srcStock.minute.length;++i)
|
|
55731
|
+
{
|
|
55732
|
+
var item=srcStock.minute[i];
|
|
55733
|
+
if (item.amount<1000000) item.amount*=100000;
|
|
55734
|
+
}
|
|
55735
|
+
*/
|
|
55736
|
+
|
|
55729
55737
|
var hqchartData={code:0, stock:[stockItem] };
|
|
55730
55738
|
|
|
55731
55739
|
|
|
@@ -56706,6 +56714,10 @@ HQData.Report_RequestStockData=function(data, callback)
|
|
|
56706
56714
|
extendData[6]=(Math.round(Math.random()*60))/100;
|
|
56707
56715
|
extendData[7]=(Math.round(Math.random()*60))/100;
|
|
56708
56716
|
extendData[8]=(Math.round(Math.random()*60))/100;
|
|
56717
|
+
|
|
56718
|
+
|
|
56719
|
+
newItem[101]=105.0;
|
|
56720
|
+
newItem[201]=`A-[${HQData.GetRandomTestData(-90,90)}]-B`
|
|
56709
56721
|
|
|
56710
56722
|
|
|
56711
56723
|
item.Data=newItem;
|
|
@@ -56996,17 +57008,17 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
|
|
|
56996
57008
|
arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
|
|
56997
57009
|
arySymbol.push( { Symbol:"06", Name:"自选股", TypeName:"功能键", Priority:1 , Color:"rgb(220,20,60)", Data:{ PageName:"自选股", Type:2 }} );
|
|
56998
57010
|
|
|
56999
|
-
arySymbol.push( { Symbol:"MACD", Name:"平滑异同平均线", TypeName:"指标", Priority:2 , Color:"rgb(0,
|
|
57000
|
-
arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57001
|
-
arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57002
|
-
arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57003
|
-
arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57004
|
-
arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57005
|
-
arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57006
|
-
arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57007
|
-
arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57008
|
-
arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57009
|
-
arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57011
|
+
arySymbol.push( { Symbol:"MACD", Name:"平滑异同平均线", TypeName:"指标", Priority:2 , Color:"rgb(0,144,255)", Data:{ Index:"MACD", Type:1 }} );
|
|
57012
|
+
arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)",Data:{ Index:"RSI", Type:1 }} );
|
|
57013
|
+
arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"MA", Type:1 } } );
|
|
57014
|
+
arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"BOLL", Type:1 } } );
|
|
57015
|
+
arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"KDJ", Type:1 } } );
|
|
57016
|
+
arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"SKDJ", Type:1 } } );
|
|
57017
|
+
arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"KD", Type:1 } } );
|
|
57018
|
+
arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"MARSI", Type:1 } } );
|
|
57019
|
+
arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"VMACD", Type:1 } } );
|
|
57020
|
+
arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"AMO", Type:1 } } );
|
|
57021
|
+
arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"SQJZ", Type:1 } } );
|
|
57010
57022
|
|
|
57011
57023
|
callback(arySymbol);
|
|
57012
57024
|
}
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -1136,13 +1136,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
1136
1136
|
{
|
|
1137
1137
|
let indexInfo = scriptData.Get(item.Index);
|
|
1138
1138
|
if (!indexInfo) continue;
|
|
1139
|
+
JSIndexScript.ModifyAttribute(indexInfo, item);
|
|
1139
1140
|
indexInfo.ID=item.Index;
|
|
1140
|
-
|
|
1141
|
-
if (item.Args) args=item.Args;
|
|
1142
|
-
if (item.IsShortTitle) indexInfo.IsShortTitle=item.IsShortTitle;
|
|
1143
|
-
if (item.TitleFont) indexInfo.TitleFont=item.TitleFont;
|
|
1144
|
-
if (IFrameSplitOperator.IsBool(item.IsSync)) indexInfo.IsSync=item.IsSync;
|
|
1145
|
-
chart.WindowIndex[index] = new ScriptIndex(indexInfo.Name, indexInfo.Script, args,indexInfo); //脚本执行
|
|
1141
|
+
chart.WindowIndex[index] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo); //脚本执行
|
|
1146
1142
|
if (item.StringFormat>0) chart.WindowIndex[index].StringFormat=item.StringFormat;
|
|
1147
1143
|
if (item.FloatPrecision>=0) chart.WindowIndex[index].FloatPrecision=item.FloatPrecision;
|
|
1148
1144
|
}
|
|
@@ -92042,7 +92038,8 @@ function MinuteTimeStringData()
|
|
|
92042
92038
|
{
|
|
92043
92039
|
this.SHSZ = null; //上海深证交易所时间
|
|
92044
92040
|
this.BJ=null;
|
|
92045
|
-
this.SHO=null;
|
|
92041
|
+
this.SHO=null; //上海期权交易时间
|
|
92042
|
+
this.SZO=null; //深证期权交易时间
|
|
92046
92043
|
this.HK = null; //香港交易所时间
|
|
92047
92044
|
this.Futures=new Map(); //期货交易时间 key=时间名称 Value=数据
|
|
92048
92045
|
this.USA = null; //美股交易时间
|
|
@@ -92079,12 +92076,18 @@ function MinuteTimeStringData()
|
|
|
92079
92076
|
return this.BJ;
|
|
92080
92077
|
}
|
|
92081
92078
|
|
|
92082
|
-
this.GetSHO=function()
|
|
92079
|
+
this.GetSHO=function(upperSymbol)
|
|
92083
92080
|
{
|
|
92084
92081
|
if (!this.SHO) this.SHO=this.CreateSHOData();
|
|
92085
92082
|
return this.SHO;
|
|
92086
92083
|
}
|
|
92087
92084
|
|
|
92085
|
+
this.GetSZO=function(upperSymbol)
|
|
92086
|
+
{
|
|
92087
|
+
if (!this.SZO) this.SZO=this.CreateSZOData();
|
|
92088
|
+
return this.SZO;
|
|
92089
|
+
}
|
|
92090
|
+
|
|
92088
92091
|
this.GetHK=function(upperSymbol)
|
|
92089
92092
|
{
|
|
92090
92093
|
if (!this.HK) this.HK = this.CreateHKData();
|
|
@@ -92198,6 +92201,17 @@ function MinuteTimeStringData()
|
|
|
92198
92201
|
return this.CreateTimeData(TIME_SPLIT);
|
|
92199
92202
|
}
|
|
92200
92203
|
|
|
92204
|
+
this.CreateSZOData=function()
|
|
92205
|
+
{
|
|
92206
|
+
const TIME_SPLIT =
|
|
92207
|
+
[
|
|
92208
|
+
{ Start: 930, End: 1129 },
|
|
92209
|
+
{ Start: 1300, End: 1500 }
|
|
92210
|
+
];
|
|
92211
|
+
|
|
92212
|
+
return this.CreateTimeData(TIME_SPLIT);
|
|
92213
|
+
}
|
|
92214
|
+
|
|
92201
92215
|
this.CreateHKData = function ()
|
|
92202
92216
|
{
|
|
92203
92217
|
const TIME_SPLIT =
|
|
@@ -92348,7 +92362,8 @@ function MinuteTimeStringData()
|
|
|
92348
92362
|
if (!symbol) return this.SHSZ;
|
|
92349
92363
|
|
|
92350
92364
|
var upperSymbol = symbol.toLocaleUpperCase(); //转成大写
|
|
92351
|
-
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol)
|
|
92365
|
+
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol)) return this.GetSHO();
|
|
92366
|
+
if (MARKET_SUFFIX_NAME.IsSZO(upperSymbol)) return this.GetSZO();
|
|
92352
92367
|
if (MARKET_SUFFIX_NAME.IsSH(upperSymbol) || MARKET_SUFFIX_NAME.IsSZ(upperSymbol)) return this.GetSHSZ(upperSymbol);
|
|
92353
92368
|
if (MARKET_SUFFIX_NAME.IsBJ(upperSymbol)) return this.GetBJ(upperSymbol);
|
|
92354
92369
|
if (MARKET_SUFFIX_NAME.IsHK(upperSymbol)) return this.GetHK(upperSymbol);
|
|
@@ -92833,12 +92848,14 @@ function MinuteCoordinateData()
|
|
|
92833
92848
|
else
|
|
92834
92849
|
{
|
|
92835
92850
|
var upperSymbol = symbol.toLocaleUpperCase(); //转成大写
|
|
92836
|
-
if (MARKET_SUFFIX_NAME.
|
|
92851
|
+
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol))
|
|
92852
|
+
data=this.GetSHOData(upperSymbol,width);
|
|
92853
|
+
else if (MARKET_SUFFIX_NAME.IsSZO(upperSymbol))
|
|
92854
|
+
data=this.GetSZOData(upperSymbol,width);
|
|
92855
|
+
else if (MARKET_SUFFIX_NAME.IsSH(upperSymbol) || MARKET_SUFFIX_NAME.IsSZ(upperSymbol) || MARKET_SUFFIX_NAME.IsSHSZIndex(upperSymbol))
|
|
92837
92856
|
data = this.GetSHSZData(upperSymbol,width);
|
|
92838
92857
|
else if (MARKET_SUFFIX_NAME.IsBJ(upperSymbol))
|
|
92839
92858
|
data=this.GetBJData(upperSymbol,width);
|
|
92840
|
-
else if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol) || MARKET_SUFFIX_NAME.IsSZO(upperSymbol))
|
|
92841
|
-
data=this.GetSHOData(upperSymbol,width);
|
|
92842
92859
|
else if (MARKET_SUFFIX_NAME.IsHK(upperSymbol))
|
|
92843
92860
|
data=this.GetHKData(upperSymbol,width);
|
|
92844
92861
|
else if (MARKET_SUFFIX_NAME.IsTW(upperSymbol))
|
|
@@ -92922,6 +92939,12 @@ function MinuteCoordinateData()
|
|
|
92922
92939
|
return result;
|
|
92923
92940
|
}
|
|
92924
92941
|
|
|
92942
|
+
this.GetSZOData=function(upperSymbol,width)
|
|
92943
|
+
{
|
|
92944
|
+
var result=SHO_MINUTE_X_COORDINATE;
|
|
92945
|
+
return result;
|
|
92946
|
+
}
|
|
92947
|
+
|
|
92925
92948
|
this.GetFuturesData = function (upperSymbol,width,timeData)
|
|
92926
92949
|
{
|
|
92927
92950
|
var splitData = timeData.GetSplitData(upperSymbol);
|
|
@@ -212,6 +212,14 @@ HQData.Minute_RequestMinuteData=function(data, callback)
|
|
|
212
212
|
stockItem.beforeinfo=beforeinfo;
|
|
213
213
|
}
|
|
214
214
|
|
|
215
|
+
/* 测试用 这里可以修改数据
|
|
216
|
+
for(var i=0;i<srcStock.minute.length;++i)
|
|
217
|
+
{
|
|
218
|
+
var item=srcStock.minute[i];
|
|
219
|
+
if (item.amount<1000000) item.amount*=100000;
|
|
220
|
+
}
|
|
221
|
+
*/
|
|
222
|
+
|
|
215
223
|
var hqchartData={code:0, stock:[stockItem] };
|
|
216
224
|
|
|
217
225
|
|
|
@@ -1192,6 +1200,10 @@ HQData.Report_RequestStockData=function(data, callback)
|
|
|
1192
1200
|
extendData[6]=(Math.round(Math.random()*60))/100;
|
|
1193
1201
|
extendData[7]=(Math.round(Math.random()*60))/100;
|
|
1194
1202
|
extendData[8]=(Math.round(Math.random()*60))/100;
|
|
1203
|
+
|
|
1204
|
+
|
|
1205
|
+
newItem[101]=105.0;
|
|
1206
|
+
newItem[201]=`A-[${HQData.GetRandomTestData(-90,90)}]-B`
|
|
1195
1207
|
|
|
1196
1208
|
|
|
1197
1209
|
item.Data=newItem;
|
|
@@ -1482,17 +1494,17 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
|
|
|
1482
1494
|
arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
|
|
1483
1495
|
arySymbol.push( { Symbol:"06", Name:"自选股", TypeName:"功能键", Priority:1 , Color:"rgb(220,20,60)", Data:{ PageName:"自选股", Type:2 }} );
|
|
1484
1496
|
|
|
1485
|
-
arySymbol.push( { Symbol:"MACD", Name:"平滑异同平均线", TypeName:"指标", Priority:2 , Color:"rgb(0,
|
|
1486
|
-
arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1487
|
-
arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1488
|
-
arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1489
|
-
arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1490
|
-
arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1491
|
-
arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1492
|
-
arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1493
|
-
arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1494
|
-
arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1495
|
-
arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
1497
|
+
arySymbol.push( { Symbol:"MACD", Name:"平滑异同平均线", TypeName:"指标", Priority:2 , Color:"rgb(0,144,255)", Data:{ Index:"MACD", Type:1 }} );
|
|
1498
|
+
arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)",Data:{ Index:"RSI", Type:1 }} );
|
|
1499
|
+
arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"MA", Type:1 } } );
|
|
1500
|
+
arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"BOLL", Type:1 } } );
|
|
1501
|
+
arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"KDJ", Type:1 } } );
|
|
1502
|
+
arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"SKDJ", Type:1 } } );
|
|
1503
|
+
arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"KD", Type:1 } } );
|
|
1504
|
+
arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"MARSI", Type:1 } } );
|
|
1505
|
+
arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"VMACD", Type:1 } } );
|
|
1506
|
+
arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"AMO", Type:1 } } );
|
|
1507
|
+
arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"SQJZ", Type:1 } } );
|
|
1496
1508
|
|
|
1497
1509
|
callback(arySymbol);
|
|
1498
1510
|
}
|
|
@@ -5061,13 +5061,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
5061
5061
|
{
|
|
5062
5062
|
let indexInfo = scriptData.Get(item.Index);
|
|
5063
5063
|
if (!indexInfo) continue;
|
|
5064
|
+
JSIndexScript.ModifyAttribute(indexInfo, item);
|
|
5064
5065
|
indexInfo.ID=item.Index;
|
|
5065
|
-
|
|
5066
|
-
if (item.Args) args=item.Args;
|
|
5067
|
-
if (item.IsShortTitle) indexInfo.IsShortTitle=item.IsShortTitle;
|
|
5068
|
-
if (item.TitleFont) indexInfo.TitleFont=item.TitleFont;
|
|
5069
|
-
if (IFrameSplitOperator.IsBool(item.IsSync)) indexInfo.IsSync=item.IsSync;
|
|
5070
|
-
chart.WindowIndex[index] = new ScriptIndex(indexInfo.Name, indexInfo.Script, args,indexInfo); //脚本执行
|
|
5066
|
+
chart.WindowIndex[index] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo); //脚本执行
|
|
5071
5067
|
if (item.StringFormat>0) chart.WindowIndex[index].StringFormat=item.StringFormat;
|
|
5072
5068
|
if (item.FloatPrecision>=0) chart.WindowIndex[index].FloatPrecision=item.FloatPrecision;
|
|
5073
5069
|
}
|
|
@@ -95967,7 +95963,8 @@ function MinuteTimeStringData()
|
|
|
95967
95963
|
{
|
|
95968
95964
|
this.SHSZ = null; //上海深证交易所时间
|
|
95969
95965
|
this.BJ=null;
|
|
95970
|
-
this.SHO=null;
|
|
95966
|
+
this.SHO=null; //上海期权交易时间
|
|
95967
|
+
this.SZO=null; //深证期权交易时间
|
|
95971
95968
|
this.HK = null; //香港交易所时间
|
|
95972
95969
|
this.Futures=new Map(); //期货交易时间 key=时间名称 Value=数据
|
|
95973
95970
|
this.USA = null; //美股交易时间
|
|
@@ -96004,12 +96001,18 @@ function MinuteTimeStringData()
|
|
|
96004
96001
|
return this.BJ;
|
|
96005
96002
|
}
|
|
96006
96003
|
|
|
96007
|
-
this.GetSHO=function()
|
|
96004
|
+
this.GetSHO=function(upperSymbol)
|
|
96008
96005
|
{
|
|
96009
96006
|
if (!this.SHO) this.SHO=this.CreateSHOData();
|
|
96010
96007
|
return this.SHO;
|
|
96011
96008
|
}
|
|
96012
96009
|
|
|
96010
|
+
this.GetSZO=function(upperSymbol)
|
|
96011
|
+
{
|
|
96012
|
+
if (!this.SZO) this.SZO=this.CreateSZOData();
|
|
96013
|
+
return this.SZO;
|
|
96014
|
+
}
|
|
96015
|
+
|
|
96013
96016
|
this.GetHK=function(upperSymbol)
|
|
96014
96017
|
{
|
|
96015
96018
|
if (!this.HK) this.HK = this.CreateHKData();
|
|
@@ -96123,6 +96126,17 @@ function MinuteTimeStringData()
|
|
|
96123
96126
|
return this.CreateTimeData(TIME_SPLIT);
|
|
96124
96127
|
}
|
|
96125
96128
|
|
|
96129
|
+
this.CreateSZOData=function()
|
|
96130
|
+
{
|
|
96131
|
+
const TIME_SPLIT =
|
|
96132
|
+
[
|
|
96133
|
+
{ Start: 930, End: 1129 },
|
|
96134
|
+
{ Start: 1300, End: 1500 }
|
|
96135
|
+
];
|
|
96136
|
+
|
|
96137
|
+
return this.CreateTimeData(TIME_SPLIT);
|
|
96138
|
+
}
|
|
96139
|
+
|
|
96126
96140
|
this.CreateHKData = function ()
|
|
96127
96141
|
{
|
|
96128
96142
|
const TIME_SPLIT =
|
|
@@ -96273,7 +96287,8 @@ function MinuteTimeStringData()
|
|
|
96273
96287
|
if (!symbol) return this.SHSZ;
|
|
96274
96288
|
|
|
96275
96289
|
var upperSymbol = symbol.toLocaleUpperCase(); //转成大写
|
|
96276
|
-
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol)
|
|
96290
|
+
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol)) return this.GetSHO();
|
|
96291
|
+
if (MARKET_SUFFIX_NAME.IsSZO(upperSymbol)) return this.GetSZO();
|
|
96277
96292
|
if (MARKET_SUFFIX_NAME.IsSH(upperSymbol) || MARKET_SUFFIX_NAME.IsSZ(upperSymbol)) return this.GetSHSZ(upperSymbol);
|
|
96278
96293
|
if (MARKET_SUFFIX_NAME.IsBJ(upperSymbol)) return this.GetBJ(upperSymbol);
|
|
96279
96294
|
if (MARKET_SUFFIX_NAME.IsHK(upperSymbol)) return this.GetHK(upperSymbol);
|
|
@@ -96758,12 +96773,14 @@ function MinuteCoordinateData()
|
|
|
96758
96773
|
else
|
|
96759
96774
|
{
|
|
96760
96775
|
var upperSymbol = symbol.toLocaleUpperCase(); //转成大写
|
|
96761
|
-
if (MARKET_SUFFIX_NAME.
|
|
96776
|
+
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol))
|
|
96777
|
+
data=this.GetSHOData(upperSymbol,width);
|
|
96778
|
+
else if (MARKET_SUFFIX_NAME.IsSZO(upperSymbol))
|
|
96779
|
+
data=this.GetSZOData(upperSymbol,width);
|
|
96780
|
+
else if (MARKET_SUFFIX_NAME.IsSH(upperSymbol) || MARKET_SUFFIX_NAME.IsSZ(upperSymbol) || MARKET_SUFFIX_NAME.IsSHSZIndex(upperSymbol))
|
|
96762
96781
|
data = this.GetSHSZData(upperSymbol,width);
|
|
96763
96782
|
else if (MARKET_SUFFIX_NAME.IsBJ(upperSymbol))
|
|
96764
96783
|
data=this.GetBJData(upperSymbol,width);
|
|
96765
|
-
else if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol) || MARKET_SUFFIX_NAME.IsSZO(upperSymbol))
|
|
96766
|
-
data=this.GetSHOData(upperSymbol,width);
|
|
96767
96784
|
else if (MARKET_SUFFIX_NAME.IsHK(upperSymbol))
|
|
96768
96785
|
data=this.GetHKData(upperSymbol,width);
|
|
96769
96786
|
else if (MARKET_SUFFIX_NAME.IsTW(upperSymbol))
|
|
@@ -96847,6 +96864,12 @@ function MinuteCoordinateData()
|
|
|
96847
96864
|
return result;
|
|
96848
96865
|
}
|
|
96849
96866
|
|
|
96867
|
+
this.GetSZOData=function(upperSymbol,width)
|
|
96868
|
+
{
|
|
96869
|
+
var result=SHO_MINUTE_X_COORDINATE;
|
|
96870
|
+
return result;
|
|
96871
|
+
}
|
|
96872
|
+
|
|
96850
96873
|
this.GetFuturesData = function (upperSymbol,width,timeData)
|
|
96851
96874
|
{
|
|
96852
96875
|
var splitData = timeData.GetSplitData(upperSymbol);
|
|
@@ -139261,7 +139284,7 @@ function ScrollBarBGChart()
|
|
|
139261
139284
|
|
|
139262
139285
|
|
|
139263
139286
|
|
|
139264
|
-
var HQCHART_VERSION="1.1.
|
|
139287
|
+
var HQCHART_VERSION="1.1.14044";
|
|
139265
139288
|
|
|
139266
139289
|
function PrintHQChartVersion()
|
|
139267
139290
|
{
|
|
@@ -55744,6 +55744,14 @@ HQData.Minute_RequestMinuteData=function(data, callback)
|
|
|
55744
55744
|
stockItem.beforeinfo=beforeinfo;
|
|
55745
55745
|
}
|
|
55746
55746
|
|
|
55747
|
+
/* 测试用 这里可以修改数据
|
|
55748
|
+
for(var i=0;i<srcStock.minute.length;++i)
|
|
55749
|
+
{
|
|
55750
|
+
var item=srcStock.minute[i];
|
|
55751
|
+
if (item.amount<1000000) item.amount*=100000;
|
|
55752
|
+
}
|
|
55753
|
+
*/
|
|
55754
|
+
|
|
55747
55755
|
var hqchartData={code:0, stock:[stockItem] };
|
|
55748
55756
|
|
|
55749
55757
|
|
|
@@ -56724,6 +56732,10 @@ HQData.Report_RequestStockData=function(data, callback)
|
|
|
56724
56732
|
extendData[6]=(Math.round(Math.random()*60))/100;
|
|
56725
56733
|
extendData[7]=(Math.round(Math.random()*60))/100;
|
|
56726
56734
|
extendData[8]=(Math.round(Math.random()*60))/100;
|
|
56735
|
+
|
|
56736
|
+
|
|
56737
|
+
newItem[101]=105.0;
|
|
56738
|
+
newItem[201]=`A-[${HQData.GetRandomTestData(-90,90)}]-B`
|
|
56727
56739
|
|
|
56728
56740
|
|
|
56729
56741
|
item.Data=newItem;
|
|
@@ -57014,17 +57026,17 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
|
|
|
57014
57026
|
arySymbol.push( { Symbol:"02", Name:"分价表", TypeName:"功能键", Priority:1, Color:"rgb(220,20,60)" ,Data:{ PageName:"分价表", Type:2 }} );
|
|
57015
57027
|
arySymbol.push( { Symbol:"06", Name:"自选股", TypeName:"功能键", Priority:1 , Color:"rgb(220,20,60)", Data:{ PageName:"自选股", Type:2 }} );
|
|
57016
57028
|
|
|
57017
|
-
arySymbol.push( { Symbol:"MACD", Name:"平滑异同平均线", TypeName:"指标", Priority:2 , Color:"rgb(0,
|
|
57018
|
-
arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57019
|
-
arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57020
|
-
arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57021
|
-
arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57022
|
-
arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57023
|
-
arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57024
|
-
arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57025
|
-
arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57026
|
-
arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57027
|
-
arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,
|
|
57029
|
+
arySymbol.push( { Symbol:"MACD", Name:"平滑异同平均线", TypeName:"指标", Priority:2 , Color:"rgb(0,144,255)", Data:{ Index:"MACD", Type:1 }} );
|
|
57030
|
+
arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)",Data:{ Index:"RSI", Type:1 }} );
|
|
57031
|
+
arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"MA", Type:1 } } );
|
|
57032
|
+
arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"BOLL", Type:1 } } );
|
|
57033
|
+
arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"KDJ", Type:1 } } );
|
|
57034
|
+
arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"SKDJ", Type:1 } } );
|
|
57035
|
+
arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"KD", Type:1 } } );
|
|
57036
|
+
arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"MARSI", Type:1 } } );
|
|
57037
|
+
arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"VMACD", Type:1 } } );
|
|
57038
|
+
arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"AMO", Type:1 } } );
|
|
57039
|
+
arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,144,255)" ,Data:{ Index:"SQJZ", Type:1 } } );
|
|
57028
57040
|
|
|
57029
57041
|
callback(arySymbol);
|
|
57030
57042
|
}
|
|
@@ -5105,13 +5105,9 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
5105
5105
|
{
|
|
5106
5106
|
let indexInfo = scriptData.Get(item.Index);
|
|
5107
5107
|
if (!indexInfo) continue;
|
|
5108
|
+
JSIndexScript.ModifyAttribute(indexInfo, item);
|
|
5108
5109
|
indexInfo.ID=item.Index;
|
|
5109
|
-
|
|
5110
|
-
if (item.Args) args=item.Args;
|
|
5111
|
-
if (item.IsShortTitle) indexInfo.IsShortTitle=item.IsShortTitle;
|
|
5112
|
-
if (item.TitleFont) indexInfo.TitleFont=item.TitleFont;
|
|
5113
|
-
if (IFrameSplitOperator.IsBool(item.IsSync)) indexInfo.IsSync=item.IsSync;
|
|
5114
|
-
chart.WindowIndex[index] = new ScriptIndex(indexInfo.Name, indexInfo.Script, args,indexInfo); //脚本执行
|
|
5110
|
+
chart.WindowIndex[index] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo); //脚本执行
|
|
5115
5111
|
if (item.StringFormat>0) chart.WindowIndex[index].StringFormat=item.StringFormat;
|
|
5116
5112
|
if (item.FloatPrecision>=0) chart.WindowIndex[index].FloatPrecision=item.FloatPrecision;
|
|
5117
5113
|
}
|
|
@@ -96011,7 +96007,8 @@ function MinuteTimeStringData()
|
|
|
96011
96007
|
{
|
|
96012
96008
|
this.SHSZ = null; //上海深证交易所时间
|
|
96013
96009
|
this.BJ=null;
|
|
96014
|
-
this.SHO=null;
|
|
96010
|
+
this.SHO=null; //上海期权交易时间
|
|
96011
|
+
this.SZO=null; //深证期权交易时间
|
|
96015
96012
|
this.HK = null; //香港交易所时间
|
|
96016
96013
|
this.Futures=new Map(); //期货交易时间 key=时间名称 Value=数据
|
|
96017
96014
|
this.USA = null; //美股交易时间
|
|
@@ -96048,12 +96045,18 @@ function MinuteTimeStringData()
|
|
|
96048
96045
|
return this.BJ;
|
|
96049
96046
|
}
|
|
96050
96047
|
|
|
96051
|
-
this.GetSHO=function()
|
|
96048
|
+
this.GetSHO=function(upperSymbol)
|
|
96052
96049
|
{
|
|
96053
96050
|
if (!this.SHO) this.SHO=this.CreateSHOData();
|
|
96054
96051
|
return this.SHO;
|
|
96055
96052
|
}
|
|
96056
96053
|
|
|
96054
|
+
this.GetSZO=function(upperSymbol)
|
|
96055
|
+
{
|
|
96056
|
+
if (!this.SZO) this.SZO=this.CreateSZOData();
|
|
96057
|
+
return this.SZO;
|
|
96058
|
+
}
|
|
96059
|
+
|
|
96057
96060
|
this.GetHK=function(upperSymbol)
|
|
96058
96061
|
{
|
|
96059
96062
|
if (!this.HK) this.HK = this.CreateHKData();
|
|
@@ -96167,6 +96170,17 @@ function MinuteTimeStringData()
|
|
|
96167
96170
|
return this.CreateTimeData(TIME_SPLIT);
|
|
96168
96171
|
}
|
|
96169
96172
|
|
|
96173
|
+
this.CreateSZOData=function()
|
|
96174
|
+
{
|
|
96175
|
+
const TIME_SPLIT =
|
|
96176
|
+
[
|
|
96177
|
+
{ Start: 930, End: 1129 },
|
|
96178
|
+
{ Start: 1300, End: 1500 }
|
|
96179
|
+
];
|
|
96180
|
+
|
|
96181
|
+
return this.CreateTimeData(TIME_SPLIT);
|
|
96182
|
+
}
|
|
96183
|
+
|
|
96170
96184
|
this.CreateHKData = function ()
|
|
96171
96185
|
{
|
|
96172
96186
|
const TIME_SPLIT =
|
|
@@ -96317,7 +96331,8 @@ function MinuteTimeStringData()
|
|
|
96317
96331
|
if (!symbol) return this.SHSZ;
|
|
96318
96332
|
|
|
96319
96333
|
var upperSymbol = symbol.toLocaleUpperCase(); //转成大写
|
|
96320
|
-
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol)
|
|
96334
|
+
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol)) return this.GetSHO();
|
|
96335
|
+
if (MARKET_SUFFIX_NAME.IsSZO(upperSymbol)) return this.GetSZO();
|
|
96321
96336
|
if (MARKET_SUFFIX_NAME.IsSH(upperSymbol) || MARKET_SUFFIX_NAME.IsSZ(upperSymbol)) return this.GetSHSZ(upperSymbol);
|
|
96322
96337
|
if (MARKET_SUFFIX_NAME.IsBJ(upperSymbol)) return this.GetBJ(upperSymbol);
|
|
96323
96338
|
if (MARKET_SUFFIX_NAME.IsHK(upperSymbol)) return this.GetHK(upperSymbol);
|
|
@@ -96802,12 +96817,14 @@ function MinuteCoordinateData()
|
|
|
96802
96817
|
else
|
|
96803
96818
|
{
|
|
96804
96819
|
var upperSymbol = symbol.toLocaleUpperCase(); //转成大写
|
|
96805
|
-
if (MARKET_SUFFIX_NAME.
|
|
96820
|
+
if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol))
|
|
96821
|
+
data=this.GetSHOData(upperSymbol,width);
|
|
96822
|
+
else if (MARKET_SUFFIX_NAME.IsSZO(upperSymbol))
|
|
96823
|
+
data=this.GetSZOData(upperSymbol,width);
|
|
96824
|
+
else if (MARKET_SUFFIX_NAME.IsSH(upperSymbol) || MARKET_SUFFIX_NAME.IsSZ(upperSymbol) || MARKET_SUFFIX_NAME.IsSHSZIndex(upperSymbol))
|
|
96806
96825
|
data = this.GetSHSZData(upperSymbol,width);
|
|
96807
96826
|
else if (MARKET_SUFFIX_NAME.IsBJ(upperSymbol))
|
|
96808
96827
|
data=this.GetBJData(upperSymbol,width);
|
|
96809
|
-
else if (MARKET_SUFFIX_NAME.IsSHO(upperSymbol) || MARKET_SUFFIX_NAME.IsSZO(upperSymbol))
|
|
96810
|
-
data=this.GetSHOData(upperSymbol,width);
|
|
96811
96828
|
else if (MARKET_SUFFIX_NAME.IsHK(upperSymbol))
|
|
96812
96829
|
data=this.GetHKData(upperSymbol,width);
|
|
96813
96830
|
else if (MARKET_SUFFIX_NAME.IsTW(upperSymbol))
|
|
@@ -96891,6 +96908,12 @@ function MinuteCoordinateData()
|
|
|
96891
96908
|
return result;
|
|
96892
96909
|
}
|
|
96893
96910
|
|
|
96911
|
+
this.GetSZOData=function(upperSymbol,width)
|
|
96912
|
+
{
|
|
96913
|
+
var result=SHO_MINUTE_X_COORDINATE;
|
|
96914
|
+
return result;
|
|
96915
|
+
}
|
|
96916
|
+
|
|
96894
96917
|
this.GetFuturesData = function (upperSymbol,width,timeData)
|
|
96895
96918
|
{
|
|
96896
96919
|
var splitData = timeData.GetSplitData(upperSymbol);
|
|
@@ -146006,7 +146029,7 @@ function HQChartScriptWorker()
|
|
|
146006
146029
|
|
|
146007
146030
|
|
|
146008
146031
|
|
|
146009
|
-
var HQCHART_VERSION="1.1.
|
|
146032
|
+
var HQCHART_VERSION="1.1.14044";
|
|
146010
146033
|
|
|
146011
146034
|
function PrintHQChartVersion()
|
|
146012
146035
|
{
|