hqchart 1.1.13915 → 1.1.13921

package/lib/umychart.NetworkFilterTest.vue.js

@@ -127,9 +127,9 @@ extendData[0]="行业X";//地区
 extendData[1]="地区X";//PE|PB
 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;//周涨幅
 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:[],index:[],filedindex:column.index,sort:sortType,symbol:blockID};var _iteratorNormalCompletion2=true;var _didIteratorError2=false;var _iteratorError2=undefined;try{for(var _iterator2=(0,_getIterator3.default)(mapStock),_step2;!(_iteratorNormalCompletion2=(_step2=_iterator2.next()).done);_iteratorNormalCompletion2=true){var mapItem=_step2.value;var item=mapItem[1];if(!item.Data)continue;hqchartData.data.push(item.Data);hqchartData.index.push(item.Index);}}catch(err){_didIteratorError2=true;_iteratorError2=err;}finally{try{if(!_iteratorNormalCompletion2&&_iterator2.return){_iterator2.return();}}finally{if(_didIteratorError2){throw _iteratorError2;}}}callback(hqchartData);};HQData.Keyboard_RequestSymbolList=function(data,callback){//加载数据
-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:"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,0,255)",Data:{Index:"MACD",Type:1}});arySymbol.push({Symbol:"RSI",Name:"相对强弱指标",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"RSI",Type:1}});arySymbol.push({Symbol:"MA",Name:"均线",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"MA",Type:1}});arySymbol.push({Symbol:"BOLL",Name:"布林线",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"BOLL",Type:1}});callback(arySymbol);};HQData.GetRandomTestData=function(min,max)//测试数据
+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:"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,0,255)",Data:{Index:"MACD",Type:1}});arySymbol.push({Symbol:"RSI",Name:"相对强弱指标",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"RSI",Type:1}});arySymbol.push({Symbol:"MA",Name:"均线",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"MA",Type:1}});arySymbol.push({Symbol:"BOLL",Name:"布林线",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"BOLL",Type:1}});arySymbol.push({Symbol:"KDJ",Name:"随机指标",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"KDJ",Type:1}});arySymbol.push({Symbol:"SKDJ",Name:"慢速随机指标",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"SKDJ",Type:1}});arySymbol.push({Symbol:"KD",Name:"随机指标KD",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"KD",Type:1}});arySymbol.push({Symbol:"MARSI",Name:"相对强弱平均线",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"MARSI",Type:1}});arySymbol.push({Symbol:"VMACD",Name:"量平滑异同平均",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"VMACD",Type:1}});arySymbol.push({Symbol:"AMO",Name:"成交金额",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"AMO",Type:1}});arySymbol.push({Symbol:"SQJZ",Name:"神奇九转",TypeName:"指标",Priority:2,Color:"rgb(0,0,255)",Data:{Index:"SQJZ",Type:1}});callback(arySymbol);};HQData.GetRandomTestData=function(min,max)//测试数据
 {min=Math.ceil(min);max=Math.floor(max);return Math.floor(Math.random()*(max-min+1))+min;//含最大值，含最小值 
-};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;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;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;/*
+};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;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;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;/*
     var aryMinute=[];
     for(var i=0;i<data.stock[0].minute.length;++i)
     {

package/lib/umychart.vue.js

@@ -6799,7 +6799,7 @@ TitleColor:'rgb(0,0,0)',//标题颜色
 VolColor:"rgb(255, 185, 15)",//标题成交量
 AmountColor:"rgb(79, 79, 79)",//成交金额
 DateTimeColor:'rgb(60,60,60)',TurnoverRateColor:'rgb(43,54,69)',//换手率
-PositionColor:"rgb(43,54,69)"//持仓
+PositionColor:"rgb(255,0,255)"//持仓
 //弹幕
 };this.Barrage={Font:16*GetDevicePixelRatio()+'px 微软雅黑',//字体
 Height:20,Color:'RGB(109,109,109)'//走势图 信息地雷
@@ -6924,7 +6924,7 @@ var JSCHART_LANGUAGE_ID={LANGUAGE_CHINESE_ID:0,//简体中文 CN
 LANGUAGE_ENGLISH_ID:1,//英文 EN
 LANGUAGE_TRADITIONAL_CHINESE_ID:2//繁体中文 TC
 };function JSChartLocalization(){this.TextResource=new _map2.default([//内部tooltip
-['Tooltip-Open',{CN:'开:',EN:'O:',TC:'開'}],['Tooltip-High',{CN:'高:',EN:'H:',TC:'高'}],['Tooltip-Low',{CN:'低:',EN:'L:',TC:'低'}],['Tooltip-Close',{CN:'收:',EN:'C:',TC:'收'}],['Tooltip-Increase',{CN:'幅:',EN:'I:',TC:'幅'}],['Tooltip-Vol',{CN:'量:',EN:'V:',TC:'量'}],['Tooltip-Amount',{CN:'额:',EN:'A:',TC:'額'}],['Tooltip-AvPrice',{CN:'均:',EN:'AP:',TC:'均'}],['Tooltip-Price',{CN:'价:',EN:'P:',TC:'價'}],['Tooltip-Exchange',{CN:'换:',EN:'E:',TC:'換'}],['Tooltip-Position',{CN:'持:',EN:'P:',TC:'持'}],['DivTooltip-Open',{CN:'开盘:',EN:'Open:',TC:'開盤'}],['DivTooltip-High',{CN:'最高:',EN:'High:',TC:'最高'}],['DivTooltip-Low',{CN:'最低:',EN:'Low:',TC:'最低'}],['DivTooltip-Close',{CN:'收盘:',EN:'Close:',TC:'收盤'}],['DivTooltip-Increase',{CN:'涨幅:',EN:'Increase:',TC:'漲幅'}],['DivTooltip-Vol',{CN:'数量:',EN:'Volume:',TC:'數量'}],['DivTooltip-Amount',{CN:'金额:',EN:'Amount:',TC:'金額'}],['DivTooltip-Exchange',{CN:'换手:',EN:'Exchange:',TC:'換手'}],['DivTooltip-Position',{CN:'持仓:',EN:'Position:',TC:'持倉'}],['DivTooltip-Price',{CN:'价格:',EN:'Price:',TC:'價格'}],['DialogTooltip-Date',{CN:'日期',EN:'Date',TC:'日期'}],['DialogTooltip-Time',{CN:'时间',EN:'Time',TC:'時間'}],['DialogTooltip-Open',{CN:'开盘价',EN:'Open',TC:'開盤價'}],['DialogTooltip-High',{CN:'最高价',EN:'High',TC:'最高價'}],['DialogTooltip-Low',{CN:'最低价',EN:'Low',TC:'最低價'}],['DialogTooltip-Close',{CN:'收盘价',EN:'Close',TC:'收盤價'}],['DialogTooltip-Increase',{CN:'涨幅',EN:'Increase',TC:'漲幅'}],['DialogTooltip-Risefall',{CN:'涨跌',EN:'Risefall',TC:'漲跌'}],['DialogTooltip-Vol',{CN:'成交量',EN:'Volume',TC:'數量'}],['DialogTooltip-Amount',{CN:'成交额',EN:'Amount',TC:'金額'}],['DialogTooltip-Exchange',{CN:'换手率',EN:'Exchange',TC:'換手'}],['DialogTooltip-Position',{CN:'持仓量',EN:'Position',TC:'持倉'}],['DialogTooltip-Price',{CN:'价格',EN:'Price',TC:'價格'}],['DialogTooltip-Amplitude',{CN:'振幅',EN:'amplitude',TC:'價格'}],['DialogTooltip-AC-Price',{CN:'匹配价',EN:'Price',TC:'匹配價'}],['DialogTooltip-AC-AvPrice',{CN:'匹配均价',EN:'AVPrice',TC:'匹配均價'}],['DialogTooltip-AC-Increase',{CN:'竞价涨幅',EN:'Increase',TC:'競價漲幅'}],['DialogTooltip-AC-Vol',{CN:'匹配量',EN:'Vol',TC:'匹配量'}],//走势图PC tooltip
+['Tooltip-Open',{CN:'开:',EN:'O:',TC:'開'}],['Tooltip-High',{CN:'高:',EN:'H:',TC:'高'}],['Tooltip-Low',{CN:'低:',EN:'L:',TC:'低'}],['Tooltip-Close',{CN:'收:',EN:'C:',TC:'收'}],['Tooltip-Increase',{CN:'幅:',EN:'I:',TC:'幅'}],['Tooltip-Vol',{CN:'量:',EN:'V:',TC:'量'}],['Tooltip-Amount',{CN:'额:',EN:'A:',TC:'額'}],['Tooltip-AvPrice',{CN:'均:',EN:'AP:',TC:'均'}],['Tooltip-Price',{CN:'价:',EN:'P:',TC:'價'}],['Tooltip-Exchange',{CN:'换:',EN:'E:',TC:'換'}],['Tooltip-Position',{CN:'持:',EN:'P:',TC:'持'}],['DivTooltip-Open',{CN:'开盘:',EN:'Open:',TC:'開盤'}],['DivTooltip-High',{CN:'最高:',EN:'High:',TC:'最高'}],['DivTooltip-Low',{CN:'最低:',EN:'Low:',TC:'最低'}],['DivTooltip-Close',{CN:'收盘:',EN:'Close:',TC:'收盤'}],['DivTooltip-Increase',{CN:'涨幅:',EN:'Increase:',TC:'漲幅'}],['DivTooltip-Vol',{CN:'数量:',EN:'Volume:',TC:'數量'}],['DivTooltip-Amount',{CN:'金额:',EN:'Amount:',TC:'金額'}],['DivTooltip-Exchange',{CN:'换手:',EN:'Exchange:',TC:'換手'}],['DivTooltip-Position',{CN:'持仓:',EN:'Position:',TC:'持倉'}],['DivTooltip-Price',{CN:'价格:',EN:'Price:',TC:'價格'}],['DialogTooltip-Date',{CN:'日期',EN:'Date',TC:'日期'}],['DialogTooltip-Time',{CN:'时间',EN:'Time',TC:'時間'}],['DialogTooltip-Open',{CN:'开盘价',EN:'Open',TC:'開盤價'}],['DialogTooltip-High',{CN:'最高价',EN:'High',TC:'最高價'}],['DialogTooltip-Low',{CN:'最低价',EN:'Low',TC:'最低價'}],['DialogTooltip-Close',{CN:'收盘价',EN:'Close',TC:'收盤價'}],['DialogTooltip-Increase',{CN:'涨幅',EN:'Increase',TC:'漲幅'}],['DialogTooltip-Risefall',{CN:'涨跌',EN:'Risefall',TC:'漲跌'}],['DialogTooltip-Vol',{CN:'成交量',EN:'Volume',TC:'數量'}],['DialogTooltip-Amount',{CN:'成交额',EN:'Amount',TC:'金額'}],['DialogTooltip-Exchange',{CN:'换手率',EN:'Exchange',TC:'換手'}],['DialogTooltip-Position',{CN:'持仓量',EN:'Position',TC:'持倉'}],['DialogTooltip-Price',{CN:'价格',EN:'Price',TC:'價格'}],['DialogTooltip-YClose',{CN:"结算价",EN:'Settlement',TC:'結算價'}],['DialogTooltip-Amplitude',{CN:'振幅',EN:'amplitude',TC:'價格'}],['DialogTooltip-AC-Price',{CN:'匹配价',EN:'Price',TC:'匹配價'}],['DialogTooltip-AC-AvPrice',{CN:'匹配均价',EN:'AVPrice',TC:'匹配均價'}],['DialogTooltip-AC-Increase',{CN:'竞价涨幅',EN:'Increase',TC:'競價漲幅'}],['DialogTooltip-AC-Vol',{CN:'匹配量',EN:'Vol',TC:'匹配量'}],//走势图PC tooltip
 ['PCTooltip-Date',{CN:'日期',EN:'Date',TC:"日期"}],['PCTooltip-Time',{CN:'时间',EN:'Time',TC:"時間"}],['PCTooltip-Price',{CN:'价格',EN:'Price:',TC:'價格'}],['PCTooltip-AvPrice',{CN:'均价',EN:'AVPrice:',TC:'均價'}],['PCTooltip-Increase',{CN:'涨幅',EN:'Increase:',TC:'漲幅'}],['PCTooltip-Vol',{CN:'成交量',EN:'Volume:',TC:'成交量'}],['PCTooltip-Amount',{CN:'成交额',EN:'Amount:',TC:'成交額'}],['PCTooltip-AC-Price',{CN:'匹配价:',EN:'Price:',TC:'匹配價'}],['PCTooltip-AC-Increase',{CN:'竞价涨幅:',EN:'Increase:',TC:'競價漲幅'}],['PCTooltip-AC-Vol',{CN:'匹配量:',EN:'V:',TC:'匹配量'}],['PCTooltip-AC-NotMatchVol',{CN:'未匹配量:',EN:'NV:',TC:'未匹配量'}],//K线动态标题
 ['KTitle-Open',{CN:'开:',EN:'O:',TC:'開'}],['KTitle-High',{CN:'高:',EN:'H:',TC:'高'}],['KTitle-Low',{CN:'低:',EN:'L:',TC:'低'}],['KTitle-Close',{CN:'收:',EN:'C:',TC:'收'}],['KTitle-Increase',{CN:'幅:',EN:'I:',TC:'幅'}],['KTitle-Vol',{CN:'量:',EN:'V:',TC:'量'}],['KTitle-Amount',{CN:'额:',EN:'A:',TC:'額'}],['KTitle-Exchange',{CN:'换:',EN:'E:',TC:'換'}],['KTitle-Position',{CN:'持:',EN:'P:',TC:'持'}],['KTitle-Price',{CN:'价:',EN:'Price:',TC:'價'}],//走势图动态标题
 ['MTitle-AC-Price',{CN:'匹配价:',EN:'C:',TC:'匹配價'}],['MTitle-AC-AvPrice',{CN:'匹配均价:',EN:'C:',TC:'匹配均價'}],['MTitle-AC-Increase',{CN:'竞价涨幅:',EN:'I:',TC:'競價漲幅'}],['MTitle-AC-Vol',{CN:'匹配量:',EN:'V:',TC:'匹配量'}],['MTitle-AC-NotMatchVol',{CN:'未匹配量:',EN:'NV:',TC:'未匹配量'}],['MTitle-AC-Amount',{CN:'匹配量金额:',EN:'A:',TC:'匹配量金额'}],['MTitle-AC-NotMatchAmount',{CN:'未匹配量金额:',EN:'NA:',TC:'未匹配量金额'}],//走势图标题
@@ -12300,7 +12300,7 @@ TitleColor:'rgb(210,210,210)',//标题颜色
 VolColor:"rgb(255, 185, 15)",//标题成交量
 AmountColor:"rgb(210,210,210)",//成交金额
 DateTimeColor:'rgb(210,210,210)',TurnoverRateColor:'rgb(43,54,69)',//换手率
-PositionColor:"rgb(43,54,69)"//持仓
+PositionColor:"rgb(255,0,255)"//持仓
 },//走势图 信息地雷
 MinuteInfo:{TextColor:'rgb(84,143,255)',Font:14*GetDevicePixelRatio()+'px 微软雅黑',PointColor:'rgb(38,113,254)',LineColor:'rgb(120,167,255)',TextBGColor:'rgba(255,255,255,1)'},DepthMapPaint:{LineColor:"rgba(255,185,15)",AreaColor:"rgba(255,185,15,0.8)",TextColor:"rgba(255,255,255)",TextBGColor:'rgb(43,54,69)'},KLineYAxisBGPaint:{Font:12*GetDevicePixelRatio()+'px 微软雅黑',TextColor:"rgb(255,255,255)",LineColor:"rgb(255,255,255)"},//筹码分布图
 StockChip:{InfoColor:'rgb(255,255,255)',//文字颜色
@@ -13799,16 +13799,19 @@ Column:[{Type:KEYBOARD_COLUMN_ID.SHORT_SYMBOL_ID,Title:"代码",TextAlign:"left"
 
    内置K线提示信息
 */function JSDialogTooltip(){this.DivDialog=null;this.DragTitle=null;this.TitleBox=null;//{ DivTitle, DivName, DivName }
-this.HQChart=null;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.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;this.MaxRowCount=10;this.AryData=[];this.AryText=[];this.KItemCache=null;this.KItemCacheID=null;this.Inital=function(hqchart){this.HQChart=hqchart;};this.Destroy=function(){this.AryData=[];this.AryText=[];this.KItemCache=null;this.KItemCacheID=null;if(this.DivDialog){document.body.removeChild(this.DivDialog);this.DivDialog=null;}};this.OnClickColseButton=function(e){this.Close(e);if(this.HQChart&&this.HQChart.ChartCorssCursor){var chart=this.HQChart.ChartCorssCursor;if(!chart.IsShowCorss)return;chart.IsShowCorss=false;this.HQChart.Draw();this.HQChart.SetFocus();}};this.Create=function(){var _this89=this;var divDom=document.createElement("div");divDom.className='UMyChart_Tooltip_Dialog_Div';var divTitle=document.createElement("div");divTitle.className='UMyChart_Tooltip_Title_Div';divTitle.onmousedown=function(e){_this89.OnMouseDownTitle(e);};var divName=document.createElement("div");divName.className='UMyChart_Tooltip_Name_Div';divName.innerText="----";divTitle.appendChild(divName);var divClose=document.createElement("div");divClose.className='UMyChart_Tooltip_Close_Div';divClose.innerText="x";divClose.onmousedown=function(e){_this89.OnClickColseButton(e);};divTitle.appendChild(divClose);divDom.appendChild(divTitle);var table=document.createElement("table");table.className="UMyChart_Tooltip_Table";divDom.appendChild(table);var tbody=document.createElement("tbody");tbody.className="UMyChart_Tooltip_Tbody";table.appendChild(tbody);this.AryData=[];for(var i=0;i<this.MaxRowCount;++i){var rowItem={Tr:null,TitleSpan:null,TextSpan:null};var trDom=document.createElement("tr");trDom.className='UMyChart_Tooltip_Group_Tr';tbody.appendChild(trDom);rowItem.Tr=trDom;var tdDom=document.createElement("td");tdDom.className="UMyChart_Tooltip_Title_Td";//标题
+this.HQChart=null;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.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;this.MaxRowCount=18;this.AryData=[];this.AryText=[];this.KItemCache=null;this.KItemCacheID=null;this.Inital=function(hqchart){this.HQChart=hqchart;};this.Destroy=function(){this.AryData=[];this.AryText=[];this.KItemCache=null;this.KItemCacheID=null;if(this.DivDialog){document.body.removeChild(this.DivDialog);this.DivDialog=null;}};this.OnClickColseButton=function(e){this.Close(e);if(this.HQChart&&this.HQChart.ChartCorssCursor){var chart=this.HQChart.ChartCorssCursor;if(!chart.IsShowCorss)return;chart.IsShowCorss=false;this.HQChart.Draw();this.HQChart.SetFocus();}};this.Create=function(){var _this89=this;var divDom=document.createElement("div");divDom.className='UMyChart_Tooltip_Dialog_Div';var divTitle=document.createElement("div");divTitle.className='UMyChart_Tooltip_Title_Div';divTitle.onmousedown=function(e){_this89.OnMouseDownTitle(e);};var divName=document.createElement("div");divName.className='UMyChart_Tooltip_Name_Div';divName.innerText="----";divTitle.appendChild(divName);var divClose=document.createElement("div");divClose.className='UMyChart_Tooltip_Close_Div';divClose.innerText="x";divClose.onmousedown=function(e){_this89.OnClickColseButton(e);};divTitle.appendChild(divClose);divDom.appendChild(divTitle);var table=document.createElement("table");table.className="UMyChart_Tooltip_Table";divDom.appendChild(table);var tbody=document.createElement("tbody");tbody.className="UMyChart_Tooltip_Tbody";table.appendChild(tbody);this.AryData=[];for(var i=0;i<this.MaxRowCount;++i){var rowItem={Tr:null,TitleSpan:null,TextSpan:null};var trDom=document.createElement("tr");trDom.className='UMyChart_Tooltip_Group_Tr';tbody.appendChild(trDom);rowItem.Tr=trDom;var tdDom=document.createElement("td");tdDom.className="UMyChart_Tooltip_Title_Td";//标题
 trDom.appendChild(tdDom);var spanDom=document.createElement("span");spanDom.className='UMyChart_Tooltip_Title_Span';spanDom.innerText='标题';tdDom.appendChild(spanDom);rowItem.TitleSpan=spanDom;var tdDom=document.createElement("td");tdDom.className="UMyChart_Tooltip_Text_Td";//数值
 trDom.appendChild(tdDom);var spanDom=document.createElement("span");spanDom.className='UMyChart_Tooltip_Text_Span';spanDom.innerText='数值';tdDom.appendChild(spanDom);rowItem.TextSpan=spanDom;this.AryData.push(rowItem);}document.body.appendChild(divDom);this.DivName=divName;this.DivDialog=divDom;this.TitleBox={DivTitle:divTitle,DivName:divName,DivColor:divClose};this.UpdateStyle();};this.Update=function(data){if(!this.DivDialog||!this.TitleBox)return;if(!data.KItem&&!data.MinItem||!data.IsShowCorss||data.ClientPos<0)return;this.LanguageID=this.HQChart.LanguageID;if(this.HQChart.ClassName=='KLineChartContainer'){var strKItem=(0,_stringify2.default)(data.KItem);if(this.KItemCacheID!=strKItem)//数据变动的才更新
 {this.KItemCache=JSON.parse(strKItem);this.KItemCacheID=strKItem;this.UpdateTableDOM();}else{//JSConsole.Chart.Log(`[JSDialogTooltip::Update] save as KItemCache and  KItem`);
 }}else if(this.HQChart.ClassName=='MinuteChartContainer'){var strKItem=(0,_stringify2.default)(data.MinItem);if(this.KItemCacheID!=strKItem)//数据变动的才更新
 {this.KItemCache=JSON.parse(strKItem);this.KItemCacheID=strKItem;this.UpdateTableDOM();}}else{return;}this.TitleBox.DivName.innerText=data.Name;if(!this.IsShow())this.Show();};this.UpdateTableDOM=function(){if(!this.KItemCache)return;if(this.HQChart.ClassName=='KLineChartContainer')this.AryText=this.GetFormatKlineTooltipText(this.KItemCache);else if(this.HQChart.ClassName=='MinuteChartContainer')this.AryText=this.GetFormatMinuteTooltipText(this.KItemCache);else return;var index=0;for(index=0;index<this.AryText.length&&index<this.MaxRowCount;++index){var outItem=this.AryText[index];var item=this.AryData[index];item.TitleSpan.innerText=outItem.Title;item.TitleSpan.style.color=this.TitleColor;item.TextSpan.innerText=outItem.Text;item.TextSpan.style.color=outItem.Color;item.Tr.style.display="";}for(;index<this.MaxRowCount;++index){var item=this.AryData[index];item.Tr.style.display="none";}};this.Close=function(e){if(!this.DivDialog)return;this.DivDialog.style.visibility='hidden';};this.OnMouseDownTitle=function(e){var _this90=this;if(!this.DivDialog)return;var dragData={X:e.clientX,Y:e.clientY};dragData.YOffset=e.clientX-this.DivDialog.offsetLeft;dragData.XOffset=e.clientY-this.DivDialog.offsetTop;this.DragTitle=dragData;document.onmousemove=function(e){_this90.DocOnMouseMoveTitle(e);};document.onmouseup=function(e){_this90.DocOnMouseUpTitle(e);};};this.DocOnMouseMoveTitle=function(e){if(!this.DragTitle)return;var left=e.clientX-this.DragTitle.YOffset;var top=e.clientY-this.DragTitle.XOffset;var right=left+this.DivDialog.offsetWidth;var bottom=top+this.DivDialog.offsetHeight;if(right+5>=window.innerWidth)left=window.innerWidth-this.DivDialog.offsetWidth-5;if(bottom+5>=window.innerHeight)top=window.innerHeight-this.DivDialog.offsetHeight-5;this.DivDialog.style.left=left+'px';this.DivDialog.style.top=top+'px';if(e.preventDefault)e.preventDefault();};this.DocOnMouseUpTitle=function(e){this.DragTitle=null;this.onmousemove=null;this.onmouseup=null;};this.Show=function(){if(!this.DivDialog)return;if(!this.HQChart)return;if(!this.DivDialog.style.top||!this.DivDialog.style.left)//上一次显示的位置
 {var top=this.HQChart.Frame.ChartBorder.GetTop();var left=this.HQChart.Frame.ChartBorder.GetLeft();var rtClient=this.HQChart.UIElement.getBoundingClientRect();var x=left+rtClient.left+5;var y=top+rtClient.top+10;this.DivDialog.style.top=y+"px";this.DivDialog.style.left=x+"px";}this.DivDialog.style.visibility='visible';};this.IsShow=function(){if(!this.DivDialog)return false;return this.DivDialog.style.visibility==='visible';};this.GetFormatKlineTooltipText=function(data){var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
-//日期
+var upperSymbol=this.HQChart.Symbol.toUpperCase();//日期
 var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'DialogTooltip-Date');//时间
-var timeItem=null;if(IFrameSplitOperator.IsNumber(data.Time))timeItem=this.FormatTime(data.Time,this.HQChart.Period,null,'DialogTooltip-Time');var aryText=[this.ForamtPrice(data.Open,data.YClose,defaultfloatPrecision,'DialogTooltip-Open'),this.ForamtPrice(data.High,data.YClose,defaultfloatPrecision,'DialogTooltip-High'),this.ForamtPrice(data.Low,data.YClose,defaultfloatPrecision,'DialogTooltip-Low'),this.ForamtPrice(data.Close,data.YClose,defaultfloatPrecision,'DialogTooltip-Close'),this.FormatVol(data.Vol,'DialogTooltip-Vol'),this.FormatAmount(data.Amount,'DialogTooltip-Amount'),this.FormatIncrease(data.Close,data.YClose,'DialogTooltip-Increase'),this.FormatAmplitude(data.High,data.Low,data.YClose,'DialogTooltip-Amplitude')];if(timeItem)aryText.unshift(timeItem);aryText.unshift(dateItem);return aryText;},this.GetFormatMinuteTooltipText=function(data){var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
+var timeItem=null;if(IFrameSplitOperator.IsNumber(data.Time))timeItem=this.FormatTime(data.Time,this.HQChart.Period,null,'DialogTooltip-Time');var yClose=data.YClose;//昨收价|昨结算价
+var aryText=[this.ForamtPrice(data.Open,yClose,defaultfloatPrecision,'DialogTooltip-Open'),this.ForamtPrice(data.High,yClose,defaultfloatPrecision,'DialogTooltip-High'),this.ForamtPrice(data.Low,yClose,defaultfloatPrecision,'DialogTooltip-Low'),this.ForamtPrice(data.Close,yClose,defaultfloatPrecision,'DialogTooltip-Close'),this.FormatVol(data.Vol,'DialogTooltip-Vol'),this.FormatAmount(data.Amount,'DialogTooltip-Amount'),this.FormatIncrease(data.Close,yClose,'DialogTooltip-Increase'),this.FormatAmplitude(data.High,data.Low,yClose,'DialogTooltip-Amplitude')];if(timeItem)aryText.unshift(timeItem);aryText.unshift(dateItem);//换手率
+if(MARKET_SUFFIX_NAME.IsSHSZStockA(upperSymbol)&&data.FlowCapital>0){aryText.push(this.FormatExchange(data.Vol,data.FlowCapital,'DialogTooltip-Exchange'));}//持仓量
+if(MARKET_SUFFIX_NAME.IsFutures(upperSymbol)){aryText.push(this.FormatPosition(data.Position,'DialogTooltip-Position'));aryText.push(this.ForamtYClose(data.YClose,defaultfloatPrecision,'DialogTooltip-YClose'));}return aryText;},this.GetFormatMinuteTooltipText=function(data){var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
 if(data.Type==0)//连续交易
 {var item=data.Data;if(!item)item={};var aryText=[this.ForamtDate(item.Date,"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,"HH:MM",'DialogTooltip-Time'),this.ForamtPrice(item.Close,item.YClose,defaultfloatPrecision,'DialogTooltip-Price'),this.FormatRisefall(item.Close,item.YClose,defaultfloatPrecision,'DialogTooltip-Risefall'),this.FormatIncrease(item.Close,item.YClose,'DialogTooltip-Increase'),this.FormatVol(item.Vol,'DialogTooltip-Vol'),this.FormatAmount(item.Amount,'DialogTooltip-Amount')];return aryText;}else if(data.Type==1)//集合竞价
 {var item=data.Data.Data;if(!item)item={Vol:[]};var timeForamt="HH:MM:SS";if(item.Ver===1)timeForamt="HH:MM";var aryText=[this.ForamtDate(item.Date,"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,timeForamt,'DialogTooltip-Time'),this.ForamtPrice(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Price'),this.FormatIncrease(item.Price,item.YClose,'DialogTooltip-AC-Increase'),this.FormatVol(item.Vol[0],'DialogTooltip-AC-Vol')];return aryText;}return[];};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;};//配色修改
@@ -13820,7 +13823,12 @@ var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.
 var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.TitleColor};if(!IFrameSplitOperator.IsNumber(high)||!IFrameSplitOperator.IsNumber(low)||!IFrameSplitOperator.IsNumber(yClose))return item;var value=(high-low)/yClose;item.Text=(value*100).toFixed(2)+'%';item.Color=this.GetColor(value,0);return item;};this.ForamtDate=function(date,format,TitleID){//日期
 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){//时间
 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))timeFormat='HH:MM';// 分钟周期
-else if(ChartData.IsSecondPeriod(period))timeFormat='HH:MM:SS';else if(ChartData.IsMilliSecondPeriod(period))timeFormat='HH:MM:SS.fff';}item.Text=IFrameSplitOperator.FormatTimeString(time,format);return item;};}///////////////////////////////////////////////////////////////////////////////////
+else if(ChartData.IsSecondPeriod(period))timeFormat='HH:MM:SS';else if(ChartData.IsMilliSecondPeriod(period))timeFormat='HH:MM:SS.fff';}item.Text=IFrameSplitOperator.FormatTimeString(time,format);return item;};//换手率 成交量/流通股本
+this.FormatExchange=function(vol,flowCapital,TitleID){//换手率
+var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--.--',Color:this.DateTimeColor};if(!IFrameSplitOperator.IsNumber(vol)||!IFrameSplitOperator.IsNumber(flowCapital)||flowCapital==0)return item;var value=vol/flowCapital*100;item.Text=value.toFixed(2)+'%';return item;};//持仓
+this.FormatPosition=function(position,TitleID){//持仓
+var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--.--',Color:this.PositionColor};if(!IFrameSplitOperator.IsNumber(position))return item;item.Text=position.toFixed(0);return item;};//结算价
+this.ForamtYClose=function(value,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--.--',Color:this.DateTimeColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=value.toFixed(defaultfloatPrecision);return item;};}///////////////////////////////////////////////////////////////////////////////////
 //  工作线程计算指标示例
 //
 //
@@ -13832,7 +13840,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 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);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.13914";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();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.13920";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();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.13915",
+  "version": "1.1.13921",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.DialogTooltip.js

@@ -34,7 +34,7 @@ function JSDialogTooltip()
     this.PositionColor=g_JSChartResource.DialogTooltip.PositionColor;
     this.DateTimeColor=g_JSChartResource.DialogTooltip.DateTimeColor;
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
-    this.MaxRowCount=10;
+    this.MaxRowCount=18;
 
     this.AryData=[];
     this.AryText=[];
@@ -299,7 +299,7 @@ function JSDialogTooltip()
     this.GetFormatKlineTooltipText=function(data)
     {
         var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
-
+        var upperSymbol=this.HQChart.Symbol.toUpperCase();
         //日期
         var dateItem=this.ForamtDate(data.Date,"YYYY/MM/DD/W",'DialogTooltip-Date' );
 
@@ -307,21 +307,35 @@ function JSDialogTooltip()
         var timeItem=null;
         if (IFrameSplitOperator.IsNumber(data.Time)) timeItem=this.FormatTime(data.Time, this.HQChart.Period, null, 'DialogTooltip-Time');
         
+        var yClose=data.YClose; //昨收价|昨结算价
         var aryText=
         [
-            this.ForamtPrice(data.Open,data.YClose, defaultfloatPrecision,'DialogTooltip-Open'),
-            this.ForamtPrice(data.High,data.YClose, defaultfloatPrecision,'DialogTooltip-High'),
-            this.ForamtPrice(data.Low,data.YClose, defaultfloatPrecision,'DialogTooltip-Low'),
-            this.ForamtPrice(data.Close,data.YClose, defaultfloatPrecision,'DialogTooltip-Close'),
+            this.ForamtPrice(data.Open,yClose, defaultfloatPrecision,'DialogTooltip-Open'),
+            this.ForamtPrice(data.High,yClose, defaultfloatPrecision,'DialogTooltip-High'),
+            this.ForamtPrice(data.Low,yClose, defaultfloatPrecision,'DialogTooltip-Low'),
+            this.ForamtPrice(data.Close,yClose, defaultfloatPrecision,'DialogTooltip-Close'),
             this.FormatVol(data.Vol,'DialogTooltip-Vol' ),
             this.FormatAmount(data.Amount,'DialogTooltip-Amount' ),
-            this.FormatIncrease(data.Close,data.YClose,'DialogTooltip-Increase'),
-            this.FormatAmplitude(data.High,data.Low,data.YClose,'DialogTooltip-Amplitude'),
+            this.FormatIncrease(data.Close,yClose,'DialogTooltip-Increase'),
+            this.FormatAmplitude(data.High,data.Low,yClose,'DialogTooltip-Amplitude'),
         ];
 
         if (timeItem) aryText.unshift(timeItem);
         aryText.unshift(dateItem);
 
+        //换手率
+        if (MARKET_SUFFIX_NAME.IsSHSZStockA(upperSymbol) && data.FlowCapital>0)
+        {
+            aryText.push(this.FormatExchange(data.Vol,data.FlowCapital,'DialogTooltip-Exchange' ));
+        }
+
+        //持仓量
+        if (MARKET_SUFFIX_NAME.IsFutures(upperSymbol))
+        {
+            aryText.push(this.FormatPosition(data.Position,'DialogTooltip-Position'));
+            aryText.push(this.ForamtYClose(data.YClose, defaultfloatPrecision, 'DialogTooltip-YClose'));
+        }
+
         return aryText;
     },
 
@@ -568,4 +582,60 @@ function JSDialogTooltip()
         return item;
     }
 
+    //换手率 成交量/流通股本
+    this.FormatExchange=function(vol, flowCapital, TitleID)
+    {
+        //换手率
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.DateTimeColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(vol) || !IFrameSplitOperator.IsNumber(flowCapital) || flowCapital==0) return item;
+
+        var value=vol/flowCapital*100;
+        item.Text=value.toFixed(2)+'%';
+
+        return item;
+    }
+
+
+    //持仓
+    this.FormatPosition=function(position, TitleID)
+    {
+        //持仓
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.PositionColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(position)) return item;
+
+        item.Text=position.toFixed(0);
+
+        return item;
+    }
+
+    //结算价
+    this.ForamtYClose=function(value, defaultfloatPrecision, TitleID)
+    {
+        var item=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID), 
+            Text:'--.--',
+            Color:this.DateTimeColor
+        };
+
+        if (!IFrameSplitOperator.IsNumber(value)) return item;
+
+        item.Text=value.toFixed(defaultfloatPrecision);
+
+        return item;
+    }
+
+
 }

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -56845,6 +56845,8 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
         arySymbol.push(symbolItem);
     }
 
+    arySymbol.push( { Symbol:"ICL8.cfe", Name:"中证主连", ShortSymbol:"ICL8", Spell:"ICL8", Type:"期货", TypeName:"期货", Data:{ Symbol:"ICL8.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 }} );
@@ -56853,6 +56855,13 @@ HQData.Keyboard_RequestSymbolList=function(data, callback)
     arySymbol.push( { Symbol:"RSI", Name:"相对强弱指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)",Data:{ Index:"RSI", Type:1 }}  );
     arySymbol.push( { Symbol:"MA", Name:"均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MA", Type:1 } } );
     arySymbol.push( { Symbol:"BOLL", Name:"布林线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"BOLL", Type:1 } } );
+    arySymbol.push( { Symbol:"KDJ", Name:"随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"KDJ", Type:1 } } );
+    arySymbol.push( { Symbol:"SKDJ", Name:"慢速随机指标", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"SKDJ", Type:1 } } );
+    arySymbol.push( { Symbol:"KD", Name:"随机指标KD", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"KD", Type:1 } } );
+    arySymbol.push( { Symbol:"MARSI", Name:"相对强弱平均线", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"MARSI", Type:1 } } );
+    arySymbol.push( { Symbol:"VMACD", Name:"量平滑异同平均", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"VMACD", Type:1 } } );
+    arySymbol.push( { Symbol:"AMO", Name:"成交金额", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"AMO", Type:1 } } );
+    arySymbol.push( { Symbol:"SQJZ", Name:"神奇九转", TypeName:"指标", Priority:2, Color:"rgb(0,0,255)" ,Data:{ Index:"SQJZ", Type:1 } } );
     
     callback(arySymbol);
 }
@@ -56935,6 +56944,9 @@ HQData.GetDayKLineDataBySymbol=function(symbol)
         case "399006.sz":
             data=SZ_399006_DAY_KLINE;
             break;
+        case "ICL8.cfe":
+            data=CFE_ICL8_DAY_KLINE;
+            break;
         default:
             data=SZ_000001_DAY_KLINE;
             break;

package/src/jscommon/umychart.js

@@ -69013,7 +69013,7 @@ function JSChartResource()
         AmountColor:"rgb(79, 79, 79)",      //成交金额
         DateTimeColor:'rgb(60,60,60)',
         TurnoverRateColor:'rgb(43,54,69)',       //换手率
-        PositionColor:"rgb(43,54,69)"            //持仓
+        PositionColor:"rgb(255,0,255)"            //持仓
     }
 
     //弹幕
@@ -70969,6 +70969,7 @@ function JSChartLocalization()
         ['DialogTooltip-Exchange', {CN:'换手率', EN:'Exchange', TC:'換手'}],
         ['DialogTooltip-Position', {CN:'持仓量', EN:'Position', TC:'持倉'}],
         ['DialogTooltip-Price', {CN:'价格', EN:'Price', TC:'價格'}],
+        ['DialogTooltip-YClose', {CN:"结算价", EN:'Settlement', TC:'結算價'}],
         ['DialogTooltip-Amplitude', {CN:'振幅', EN:'amplitude', TC:'價格'}],
         ['DialogTooltip-AC-Price', {CN:'匹配价', EN:'Price', TC:'匹配價'}],
         ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],

package/src/jscommon/umychart.style.js

@@ -402,7 +402,7 @@ function GetBlackStyle()
             AmountColor:"rgb(210,210,210)",      //成交金额
             DateTimeColor:'rgb(210,210,210)',
             TurnoverRateColor:'rgb(43,54,69)',       //换手率
-            PositionColor:"rgb(43,54,69)"            //持仓
+            PositionColor:"rgb(255,0,255)"            //持仓
         },
         
         //走势图 信息地雷