hqchart 1.1.15917 → 1.1.15923

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.
@@ -15971,11 +15971,12 @@ for(var i=0;i<aryData.length;++i){var item=aryData[i];if(!item.Text&&!item.Title
15971
15971
  this.FormatDefaultKLineInfoText=function(data,aryOut){var title;var strDate=IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD");if(IFrameSplitOperator.IsNumber(data.Time)){var strTime=IFrameSplitOperator.FormatTimeString(data.Time);title="".concat(strDate," ").concat(strTime);}else{title=strDate;}var item={Title:title,//日期
15972
15972
  Text:data.Title,//标题
15973
15973
  Color:this.ValueColor,ClassName:this.ValueAlign.MarginLeft};aryOut.push(item);var extendata=data.ExtendData;if(extendata){this.FormatKLineInfoArrayText(aryOut,extendata.AryText);}};//大宗交易
15974
- this.FormatBlockTradingText=function(data,floatPrecision,aryOut){var item={Title:"",Text:"大宗交易",Color:this.TextColor,ClassName:this.ValueAlign.Left};aryOut.push(item);var item={Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var extendata=data.ExtendData;if(extendata){if(IFrameSplitOperator.IsNumber(extendata.Price)){var item={Title:"成交价:",Text:extendata.Price.toFixed(floatPrecision),Color:this.ValueColor};aryOut.push(item);}if(IFrameSplitOperator.IsNumber(extendata.ClosePrice)){var item={Title:"收盘价:",Text:extendata.ClosePrice.toFixed(floatPrecision),Color:this.ValueColor};aryOut.push(item);}if(IFrameSplitOperator.IsNumber(extendata.Premium)){var item={Title:"溢折价率:",Text:"".concat(extendata.Premium.toFixed(2),"%"),Color:this.GetColor(extendata.Premium,0)};aryOut.push(item);}if(IFrameSplitOperator.IsNumber(extendata.Vol)){var item={Title:"成交量:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.Vol,0,2,this.LanguageID),Color:this.VolColor};aryOut.push(item);}this.FormatKLineInfoArrayText(aryOut,extendata.AryText);}};//龙虎榜
15975
- this.FormatDragonTigerText=function(data,floatPrecision,aryOut){var item={Title:"",Text:"龙虎榜",Color:this.TextColor,ClassName:this.ValueAlign.Left};aryOut.push(item);var item={Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var item={Title:"上榜原因:",Text:data.Title,Color:this.ValueColor};aryOut.push(item);var extendata=data.ExtendData;if(extendata){if(IFrameSplitOperator.IsNumber(extendata.BuyAmount))aryOut.push({Title:"机构买入总额:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.BuyAmount,0,2),Color:this.GetColor(extendata.BuyAmount,0)});if(IFrameSplitOperator.IsNumber(extendata.SellAmount))aryOut.push({Title:"机构卖出总额:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.SellAmount,0,2),Color:this.GetColor(Math.abs(extendata.SellAmount)*-1,0)});if(IFrameSplitOperator.IsNumber(extendata.NetBuyAmount))aryOut.push({Title:"机构买入净额:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.NetBuyAmount,0,2),Color:this.GetColor(extendata.NetBuyAmount,0)});if(IFrameSplitOperator.IsNumber(extendata.Amount))aryOut.push({Title:"市场总成交额:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.Amount,0,2),Color:this.ValueColor});if(IFrameSplitOperator.IsNumber(extendata.NetBuyRatio))aryOut.push({Title:"净买额占总成交比:",Text:"".concat(extendata.NetBuyRatio.toFixed(2),"%"),Color:this.GetColor(extendata.NetBuyRatio,0)});this.FormatKLineInfoArrayText(aryOut,extendata.AryText);}};this.FormatKLineInfoArrayText=function(aryOut,aryText){if(!IFrameSplitOperator.IsNonEmptyArray(aryText))return;for(var i=0;i<aryText.length;++i){var item=aryText[i];if(item.Type===1)//涨幅
15974
+ this.FormatBlockTradingText=function(data,floatPrecision,aryOut){var item={Title:"大宗交易",TitleColor:this.TextColor,IsMergeCell:true,TitleClassName:this.TitleAlign.Center};aryOut.push(item);var item={Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var extendata=data.ExtendData;if(extendata){if(IFrameSplitOperator.IsNumber(extendata.Price)){var item={Title:"成交价:",Text:extendata.Price.toFixed(floatPrecision),Color:this.ValueColor};aryOut.push(item);}if(IFrameSplitOperator.IsNumber(extendata.ClosePrice)){var item={Title:"收盘价:",Text:extendata.ClosePrice.toFixed(floatPrecision),Color:this.ValueColor};aryOut.push(item);}if(IFrameSplitOperator.IsNumber(extendata.Premium)){var item={Title:"溢折价率:",Text:"".concat(extendata.Premium.toFixed(2),"%"),Color:this.GetColor(extendata.Premium,0)};aryOut.push(item);}if(IFrameSplitOperator.IsNumber(extendata.Vol)){var item={Title:"成交量:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.Vol,0,2,this.LanguageID),Color:this.VolColor};aryOut.push(item);}this.FormatKLineInfoArrayText(aryOut,extendata.AryText);}};//龙虎榜
15975
+ this.FormatDragonTigerText=function(data,floatPrecision,aryOut){var item={Title:"龙虎榜",TitleColor:this.TextColor,IsMergeCell:true,TitleClassName:this.TitleAlign.Center};aryOut.push(item);var item={Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var item={Title:"上榜原因:",Text:data.Title,Color:this.ValueColor};aryOut.push(item);var extendata=data.ExtendData;if(extendata){if(IFrameSplitOperator.IsNumber(extendata.BuyAmount))aryOut.push({Title:"机构买入总额:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.BuyAmount,0,2),Color:this.GetColor(extendata.BuyAmount,0)});if(IFrameSplitOperator.IsNumber(extendata.SellAmount))aryOut.push({Title:"机构卖出总额:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.SellAmount,0,2),Color:this.GetColor(Math.abs(extendata.SellAmount)*-1,0)});if(IFrameSplitOperator.IsNumber(extendata.NetBuyAmount))aryOut.push({Title:"机构买入净额:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.NetBuyAmount,0,2),Color:this.GetColor(extendata.NetBuyAmount,0)});if(IFrameSplitOperator.IsNumber(extendata.Amount))aryOut.push({Title:"市场总成交额:",Text:IFrameSplitOperator.FormatValueStringV2(extendata.Amount,0,2),Color:this.ValueColor});if(IFrameSplitOperator.IsNumber(extendata.NetBuyRatio))aryOut.push({Title:"净买额占总成交比:",Text:"".concat(extendata.NetBuyRatio.toFixed(2),"%"),Color:this.GetColor(extendata.NetBuyRatio,0)});this.FormatKLineInfoArrayText(aryOut,extendata.AryText);}};this.FormatKLineInfoArrayText=function(aryOut,aryText){if(!IFrameSplitOperator.IsNonEmptyArray(aryText))return;for(var i=0;i<aryText.length;++i){var item=aryText[i];if(item.Type==-1)continue;//不显示
15976
+ if(item.Type===1)//涨幅
15976
15977
  {var outItem={Title:item.Name,Text:"".concat(item.Value.toFixed(2),"%"),Color:this.GetColor(item.Value,0)};}else if(item.Type==2)//单行
15977
- {var outItem={Title:"",Text:item.Name,Color:this.TextColor,ClassName:this.ValueAlign.Left};}else{var outItem={Title:item.Name,Text:item.Text,Color:item.Color};}aryOut.push(outItem);}};//调研
15978
- this.FormatResearchText=function(data,aryOut){var item={Title:"",Text:"机构调研",Color:this.TextColor,ClassName:this.ValueAlign.Left};aryOut.push(item);var item={Title:"公告日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var item={Title:"接待方式",Text:data.Title,Color:this.ValueColor};aryOut.push(item);var extendata=data.ExtendData;if(extendata){if(extendata.Researcher)aryOut.push({Title:"参与人员",Text:"".concat(extendata.Researcher),Color:this.ValueColor});if(IFrameSplitOperator.IsNumber(extendata.Count))aryOut.push({Title:"接待机构数量",Text:"".concat(extendata.Count),Color:this.ValueColor});if(extendata.Place)aryOut.push({Title:"接待地点",Text:"".concat(extendata.Place),Color:this.ValueColor});if(extendata.Receptionist)aryOut.push({Title:"接待人员",Text:"".concat(extendata.Receptionist),Color:this.ValueColor});if(IFrameSplitOperator.IsNumber(extendata.Date))aryOut.push({Title:"接待日期",Text:IFrameSplitOperator.FormatDateString(extendata.Date,"YYYY-MM-DD"),Color:this.ValueColor});this.FormatKLineInfoArrayText(aryOut,extendata.AryText);}};//业绩预告
15978
+ {var outItem={Title:item.Name,TitleColor:this.TextColor,IsMergeCell:true,TitleClassName:this.TitleAlign.Center};}else{var outItem={Title:item.Name,Text:item.Text,Color:item.Color};}aryOut.push(outItem);}};//调研
15979
+ this.FormatResearchText=function(data,aryOut){var item={Title:"机构调研",TitleColor:this.TextColor,IsMergeCell:true,TitleClassName:this.TitleAlign.Center};aryOut.push(item);var item={Title:"公告日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var item={Title:"接待方式",Text:data.Title,Color:this.ValueColor};aryOut.push(item);var extendata=data.ExtendData;if(extendata){if(extendata.Researcher)aryOut.push({Title:"参与人员",Text:"".concat(extendata.Researcher),Color:this.ValueColor});if(IFrameSplitOperator.IsNumber(extendata.Count))aryOut.push({Title:"接待机构数量",Text:"".concat(extendata.Count),Color:this.ValueColor});if(extendata.Place)aryOut.push({Title:"接待地点",Text:"".concat(extendata.Place),Color:this.ValueColor});if(extendata.Receptionist)aryOut.push({Title:"接待人员",Text:"".concat(extendata.Receptionist),Color:this.ValueColor});if(IFrameSplitOperator.IsNumber(extendata.Date))aryOut.push({Title:"接待日期",Text:IFrameSplitOperator.FormatDateString(extendata.Date,"YYYY-MM-DD"),Color:this.ValueColor});this.FormatKLineInfoArrayText(aryOut,extendata.AryText);}};//业绩预告
15979
15980
  this.FormatPerformanceForecastText=function(data,aryOut){var item={Title:"业绩预告",Color:this.TextColor,IsMergeCell:true,TitleClassName:this.TitleAlign.Center};aryOut.push(item);var item={Title:"公告日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var item={Title:"报告期:",Text:IFrameSplitOperator.FormatDateString(data.ReportDate,"YYYY-MM-DD"),Color:this.ValueColor};aryOut.push(item);var extendata=data.ExtendData;if(extendata){if(IFrameSplitOperator.IsNonEmptyArray(extendata.AryData)){var item={Title:"预测指标",Text:"预告类型",Color:this.ValueColor};aryOut.push(item);for(var i=0;i<extendata.AryData.length;++i){var dataItem=extendata.AryData[i];aryOut.push({Title:dataItem.Name,Text:dataItem.Text,Color:this.ValueColor});}}this.FormatKLineInfoArrayText(aryOut,extendata.AryText);}};/////////////////////////////////////////////////////////////////////////////////////////////
15980
15981
  //数据格式化
15981
15982
  this.ForamtPrice=function(price,yClose,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;item.Text=price.toFixed(defaultfloatPrecision);item.Color=this.GetColor(price,yClose);return item;};this.ForamtPriceV2=function(price,yClose,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;item.Text=this.HQChart.FormatPriceString(price,this.DecimalConfig,"--");item.Color=this.GetColor(price,yClose);return item;};this.ForamtValue=function(value,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(value,defaultfloatPrecision,2,this.LanguageID);return item;};this.FormatVol=function(vol,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.VolColor};if(!IFrameSplitOperator.IsNumber(vol))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(vol,0,2,this.LanguageID);return item;};this.FormatAmount=function(amount,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.AmountColor};if(!IFrameSplitOperator.IsNumber(amount))return item;item.Text=IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);return item;};this.FormatIncrease=function(price,yClose,defaultfloatPrecision,TitleID){//涨幅
@@ -16012,7 +16013,10 @@ for(var i=0;i<tooltipData.AryData.length;++i){var item=tooltipData.AryData[i];va
16012
16013
  jones_2000@163.com
16013
16014
 
16014
16015
  内置区间统计框 设置框
16015
- */function JSDialogSelectRect(){this.DivDialog=null;this.DragTitle=null;this.HQChart=null;this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchangeColor=g_JSChartResource.UnchagneTextColor;this.TitleColor=g_JSChartResource.DialogSelectRect.TitleColor;this.TitleBGColor=g_JSChartResource.DialogSelectRect.TitleBGColor;this.BGColor=g_JSChartResource.DialogSelectRect.BGColor;this.BorderColor=g_JSChartResource.DialogSelectRect.BorderColor;this.TextColor=g_JSChartResource.DialogSelectRect.TextColor;this.ValueColor=g_JSChartResource.DialogSelectRect.ValueColor;this.VolColor=g_JSChartResource.DialogSelectRect.VolColor;this.AmountColor=g_JSChartResource.DialogSelectRect.AmountColor;this.TurnoverRateColor=g_JSChartResource.DialogSelectRect.TurnoverRateColor;this.PositionColor=g_JSChartResource.DialogSelectRect.PositionColor;this.MaxRowCount=10;this.AryData=[];this.DateTimeBox={Start:{SpanText:null,SpanValue:null},End:{SpanText:null,SpanValue:null}};this.ShowData;this.SelectData;this.RestoreFocusDelay=800;this.Inital=function(hqchart,option){this.HQChart=hqchart;if(option){}};this.Destroy=function(){this.AryData=[];this.ShowData=null;this.DateTimeBox={Start:{SpanText:null,SpanValue:null},End:{SpanText:null,SpanValue:null}};if(this.DivDialog){if(document&&document.body&&document.body.removeChild)document.body.removeChild(this.DivDialog);this.DivDialog=null;}};this.Create=function(){var _this109=this;var divDom=document.createElement("div");divDom.className='UMyChart_SelectRect_Dialog_Div';var divTitle=document.createElement("div");divTitle.className='UMyChart_SelectRect_Title_Div';divTitle.onmousedown=function(e){_this109.OnMouseDownTitle(e);};var divName=document.createElement("div");divName.className='UMyChart_SelectRect_Name_Div';divName.innerText="区间统计";divTitle.appendChild(divName);var divClose=document.createElement("div");divClose.className='UMyChart_SelectRect_Close_Div';divClose.innerText="x";divClose.onmousedown=function(e){_this109.Close(e);};divTitle.appendChild(divClose);divDom.appendChild(divTitle);var divDateTime=document.createElement("div");divDateTime.className='UMyChart_SelectRect_DateTime_Div';//起始日期
16016
+ */function JSDialogSelectRect(){this.DivDialog=null;this.DragTitle=null;this.HQChart=null;this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchangeColor=g_JSChartResource.UnchagneTextColor;this.TitleColor=g_JSChartResource.DialogSelectRect.TitleColor;this.TitleBGColor=g_JSChartResource.DialogSelectRect.TitleBGColor;this.BGColor=g_JSChartResource.DialogSelectRect.BGColor;this.BorderColor=g_JSChartResource.DialogSelectRect.BorderColor;this.TextColor=g_JSChartResource.DialogSelectRect.TextColor;this.ValueColor=g_JSChartResource.DialogSelectRect.ValueColor;this.VolColor=g_JSChartResource.DialogSelectRect.VolColor;this.AmountColor=g_JSChartResource.DialogSelectRect.AmountColor;this.TurnoverRateColor=g_JSChartResource.DialogSelectRect.TurnoverRateColor;this.PositionColor=g_JSChartResource.DialogSelectRect.PositionColor;this.MaxRowCount=10;this.AryData=[];this.DateTimeBox={Start:{SpanText:null,SpanValue:null},End:{SpanText:null,SpanValue:null}};this.ShowData;this.SelectData;this.RestoreFocusDelay=800;//计算公式配置
16017
+ // Increase=涨幅 0=(收-昨收)/昨收 1=(收-今开)/今开 2=(区间末尾收盘价 − 区间起始收盘价) ÷ 区间起始收盘价
16018
+ // Amplitude=振幅 0= (当日最高价 − 当日最低价) ÷ 昨日收盘价 1=(当日最高价 − 当日最低价) ÷ 今开价 2=(区间内最高价 − 区间内最低价) ÷ 区间起始 K 收盘价
16019
+ this.FormualConfig={Increase:0,Amplitude:0};this.Inital=function(hqchart,option){this.HQChart=hqchart;if(option){if(option.Formual){var item=option.Formual;if(IFrameSplitOperator.IsNumber(item.Increase))this.FormualConfig.Increase=item.Increase;if(IFrameSplitOperator.IsNumber(item.Amplitude))this.FormualConfig.Amplitude=item.Amplitude;}}};this.Destroy=function(){this.AryData=[];this.ShowData=null;this.DateTimeBox={Start:{SpanText:null,SpanValue:null},End:{SpanText:null,SpanValue:null}};if(this.DivDialog){if(document&&document.body&&document.body.removeChild)document.body.removeChild(this.DivDialog);this.DivDialog=null;}};this.Create=function(){var _this109=this;var divDom=document.createElement("div");divDom.className='UMyChart_SelectRect_Dialog_Div';var divTitle=document.createElement("div");divTitle.className='UMyChart_SelectRect_Title_Div';divTitle.onmousedown=function(e){_this109.OnMouseDownTitle(e);};var divName=document.createElement("div");divName.className='UMyChart_SelectRect_Name_Div';divName.innerText="区间统计";divTitle.appendChild(divName);var divClose=document.createElement("div");divClose.className='UMyChart_SelectRect_Close_Div';divClose.innerText="x";divClose.onmousedown=function(e){_this109.Close(e);};divTitle.appendChild(divClose);divDom.appendChild(divTitle);var divDateTime=document.createElement("div");divDateTime.className='UMyChart_SelectRect_DateTime_Div';//起始日期
16016
16020
  var divStartDate=document.createElement("div");divDateTime.append(divStartDate);var spanText=document.createElement("span");spanText.className="UMyChart_SelectRect_DateTitle_Span";spanText.innerText="开始:";divStartDate.appendChild(spanText);this.DateTimeBox.Start.SpanText=spanText;var spanDate=document.createElement("span");spanDate.className="UMyChart_SelectRect_DateValue_Span";spanDate.innerText="--/--";divStartDate.appendChild(spanDate);this.DateTimeBox.Start.SpanValue=spanDate;var spanArrow=document.createElement("span");spanArrow.className="UMyChart_SelectRect_ArrowButton_Span";spanArrow.innerText="<";spanArrow.onmousedown=function(e){_this109.MoveStartDate(-1);};divStartDate.appendChild(spanArrow);var spanArrow=document.createElement("span");spanArrow.className="UMyChart_SelectRect_ArrowButton_Span";spanArrow.innerText=">";spanArrow.onmousedown=function(e){_this109.MoveStartDate(1);};divStartDate.appendChild(spanArrow);//结束日期
16017
16021
  var divEndDate=document.createElement("div");divDateTime.append(divEndDate);var spanText=document.createElement("span");spanText.className="UMyChart_SelectRect_DateTitle_Span";spanText.innerText="结束:";divEndDate.appendChild(spanText);this.DateTimeBox.End.SpanText=spanText;var spanDate=document.createElement("span");spanDate.className="UMyChart_SelectRect_DateValue_Span";spanDate.innerText="--/--";divEndDate.appendChild(spanDate);this.DateTimeBox.SpanEnd=spanDate;this.DateTimeBox.End.SpanValue=spanDate;var spanArrow=document.createElement("span");spanArrow.className="UMyChart_SelectRect_ArrowButton_Span";spanArrow.innerText="<";spanArrow.onmousedown=function(e){_this109.MoveEndDate(-1);};divEndDate.appendChild(spanArrow);var spanArrow=document.createElement("span");spanArrow.className="UMyChart_SelectRect_ArrowButton_Span";spanArrow.innerText=">";spanArrow.onmousedown=function(e){_this109.MoveEndDate(1);};divEndDate.appendChild(spanArrow);divDom.appendChild(divDateTime);var table=document.createElement("table");table.className="UMyChart_SelectRect_Table";divDom.appendChild(table);var tbody=document.createElement("tbody");tbody.className="UMyChart_SelectRect_Tbody";table.appendChild(tbody);for(var i=0;i<this.MaxRowCount;++i){var rowItem={Tr:null,AryItem:[]};var trDom=document.createElement("tr");trDom.className='UMyChart_SelectRect_Tr';tbody.appendChild(trDom);rowItem.Tr=trDom;for(var j=0;j<3;++j){var item={Td:null,LeftSpan:null,RightSpan:null};var tdDom=document.createElement("td");tdDom.className="UMyChart_SelectRect_Td";//标题+数值
16018
16022
  item.Td=tdDom;trDom.appendChild(tdDom);var spanDom=document.createElement("span");spanDom.className='UMyChart_SelectRect_Item_Left_Span';spanDom.innerText='数值';item.LeftSpan=spanDom;tdDom.appendChild(spanDom);var spanDom=document.createElement("span");spanDom.className='UMyChart_SelectRect_Item_Right_Span';spanDom.innerText='--';item.RightSpan=spanDom;tdDom.appendChild(spanDom);rowItem.AryItem.push(item);}this.AryData.push(rowItem);}document.body.appendChild(divDom);this.DivDialog=divDom;this.UpdateStyle();};this.Close=function(e){if(!this.DivDialog)return;this.DivDialog.style.visibility='hidden';this.ShowData=null;this.SelectData=null;if(this.HQChart)this.HQChart.RestoreFocus(this.RestoreFocusDelay);};this.MoveStartDate=function(step){if(!this.DivDialog||!this.HQChart)return;if(step==0)return;if(!this.SelectData)return;var selectData=this.SelectData;var bUpdate=false;if(step>0){var index=selectData.Start;var endIndex=selectData.End;for(i=0;i<step&&index<endIndex;++i){++index;}if(selectData.Start!=index){selectData.Start=index;bUpdate=true;}}else{step=Math.abs(step);var index=selectData.Start;var endIndex=selectData.End;for(var i=0;i<step&&index>0;++i){--index;}if(selectData.Start!=index){selectData.Start=index;bUpdate=true;}}if(bUpdate)this.UpdateSelectRect(selectData);};this.MoveEndDate=function(step){if(!this.DivDialog)return;if(step==0)return;if(!this.SelectData)return;var selectData=this.SelectData;var bUpdate=false;if(step>0){var index=selectData.End;var startIndex=selectData.Start;for(i=0;i<step&&index<this.ShowData.DataCount;++i){++index;}if(selectData.End!=index){selectData.End=index;bUpdate=true;}}else{step=Math.abs(step);var index=selectData.End;var startIndex=selectData.Start;for(var i=0;i<step&&index>startIndex;++i){--index;}if(selectData.End!=index){selectData.End=index;bUpdate=true;}}if(bUpdate)this.UpdateSelectRect(selectData);};this.Show=function(x,y){if(!this.DivDialog)return;if(!this.HQChart)return;/*
@@ -16029,9 +16033,11 @@ item.Td=tdDom;trDom.appendChild(tdDom);var spanDom=document.createElement("span"
16029
16033
  }
16030
16034
  */if(this.HQChart)this.HQChart.ClearRestoreFocusTimer();var top=this.HQChart.Frame.ChartBorder.GetTop();var left=this.HQChart.Frame.ChartBorder.GetLeft();var rtClient=this.HQChart.UIElement.getBoundingClientRect();left=left+rtClient.left+5;top=top+rtClient.top+10;if(IFrameSplitOperator.IsNumber(x)&&IFrameSplitOperator.IsNumber(y)){left=x;top=y;}var right=x+this.DivDialog.offsetWidth;var bottom=y+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.top=top+"px";this.DivDialog.style.left=left+"px";this.DivDialog.style.visibility='visible';};this.IsShow=function(){if(!this.DivDialog)return false;return this.DivDialog.style.visibility==='visible';};this.OnMouseDownTitle=function(e){var _this110=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){_this110.DocOnMouseMoveTitle(e);};document.onmouseup=function(e){_this110.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;document.onmousemove=null;document.onmouseup=null;};//配色修改
16031
16035
  this.ReloadResource=function(option){this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchangeColor=g_JSChartResource.UnchagneTextColor;this.TitleColor=g_JSChartResource.DialogSelectRect.TitleColor;this.TitleBGColor=g_JSChartResource.DialogSelectRect.TitleBGColor;this.BGColor=g_JSChartResource.DialogSelectRect.BGColor;this.BorderColor=g_JSChartResource.DialogSelectRect.BorderColor;this.TextColor=g_JSChartResource.DialogSelectRect.TextColor;this.ValueColor=g_JSChartResource.DialogSelectRect.ValueColor;this.VolColor=g_JSChartResource.DialogSelectRect.VolColor;this.AmountColor=g_JSChartResource.DialogSelectRect.AmountColor;this.TurnoverRateColor=g_JSChartResource.DialogSelectRect.TurnoverRateColor;this.PositionColor=g_JSChartResource.DialogSelectRect.PositionColor;if(!this.DivDialog)return;this.UpdateStyle();if(this.SelectData){var selectData=this.SelectData;this.HQChart.UpdateSelectRect(selectData.Start,selectData.End);var showData=this.CalculateKLineData({SelectData:selectData});this.FormatKLineText(showData);this.ShowData=showData;this.UpdateTableDOM(showData);}};this.UpdateStyle=function(){if(!this.DivDialog)return;if(this.BGColor)this.DivDialog.style['background-color']=this.BGColor;if(this.BorderColor)this.DivDialog.style['border-color']=this.BorderColor;if(this.DateTimeBox.Start){var item=this.DateTimeBox.Start;item.SpanText.style["color"]=this.TextColor;item.SpanValue.style["color"]=this.ValueColor;}if(this.DateTimeBox.End){var item=this.DateTimeBox.End;item.SpanText.style["color"]=this.TextColor;item.SpanValue.style["color"]=this.ValueColor;}//if (this.TitleBGColor) this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;
16032
- };this.UpdateTableDOM=function(showData){var index=0;for(var index=0,j=0,dataIndex=0;index<this.AryData.length&&dataIndex<showData.AryText.length;++index){var rowItem=this.AryData[index];for(j=0;j<rowItem.AryItem.length;++j,++dataIndex){if(dataIndex>=showData.AryText.length)break;var item=rowItem.AryItem[j];var outItem=showData.AryText[dataIndex];item.LeftSpan.innerText=outItem.Title;item.LeftSpan.style.color=this.TextColor;item.RightSpan.innerText=outItem.Text;item.RightSpan.style.color=outItem.Color;}rowItem.Tr.style.display="";}for(;index<this.AryData.length;++index){var rowItem=this.AryData[index];rowItem.Tr.style.display="none";}if(this.DateTimeBox.Start.SpanValue)this.DateTimeBox.Start.SpanValue.innerText=showData.Date.Start.Text;if(this.DateTimeBox.End.SpanValue)this.DateTimeBox.End.SpanValue.innerText=showData.Date.End.Text;};this.UpdateSelectRect=function(selectData){this.HQChart.UpdateSelectRect(selectData.Start,selectData.End);var showData=null;if(this.HQChart.ClassName=='KLineChartContainer'){showData=this.CalculateKLineData({SelectData:selectData});this.FormatKLineText(showData);}else if(this.HQChart.ClassName=='MinuteChartContainer'){showData=this.CalculateMinuteData({SelectData:selectData});this.FormatMinuteText(showData);}if(showData){this.ShowData=showData;this.UpdateTableDOM(showData);}};this.Update=function(data){if(!this.DivDialog)return;var showData;if(this.HQChart.ClassName=='KLineChartContainer'){showData=this.CalculateKLineData(data);this.FormatKLineText(showData);}else if(this.HQChart.ClassName=='MinuteChartContainer'){showData=this.CalculateMinuteData(data);this.FormatMinuteText(showData);}if(!showData)return;this.ShowData=showData;this.SelectData=data.SelectData;this.UpdateTableDOM(showData);if(!this.IsShow())this.Show(data.X,data.Y);};this.CreateEmptyShowData=function(){var showData={Open:null,Close:null,High:null,Low:null,YClose:null,Vol:0,Amount:0,Date:{Start:{Time:null,Date:null,Text:""},End:{Time:null,Date:null,Text:""}},Count:0,KLine:{Up:0,Down:0,Unchanged:0},//阳线|阴线|平线
16033
- AryText:[],DataCount:0};return showData;};this.CalculateKLineData=function(data){var selectData=data.SelectData;var hisData=selectData.Data;var start=selectData.Start;var end=selectData.End;var showData=this.CreateEmptyShowData();showData.DataCount=hisData.Data.length;for(var i=start;i<hisData.Data.length&&i<=end;++i){var item=hisData.Data[i];++showData.Count;if(!IFrameSplitOperator.IsNumber(showData.Open)&&IFrameSplitOperator.IsNumber(item.Open))showData.Open=item.Open;if(IFrameSplitOperator.IsNumber(item.Close))showData.Close=item.Close;if(IFrameSplitOperator.IsNumber(item.Vol))showData.Vol+=item.Vol;if(IFrameSplitOperator.IsNumber(item.Amount))showData.Amount+=item.Amount;if(IFrameSplitOperator.IsNumber(item.High)){if(!IFrameSplitOperator.IsNumber(showData.High)||showData.High<item.High)showData.High=item.High;}if(IFrameSplitOperator.IsNumber(item.Low)){if(!IFrameSplitOperator.IsNumber(showData.Low)||showData.Low>item.Low)showData.Low=item.Low;}if(IFrameSplitOperator.IsNumber(item.Open)&&IFrameSplitOperator.IsNumber(item.Close)){if(item.Close>item.Open)++showData.KLine.Up;else if(item.Close<item.Open)++showData.KLine.Down;else++showData.KLine.Unchanged;}if(IFrameSplitOperator.IsNumber(item.Date)){showData.Date.End.Date=item.Date;if(!IFrameSplitOperator.IsNumber(showData.Date.Start.Date))showData.Date.Start.Date=item.Date;}if(IFrameSplitOperator.IsNumber(item.Time)){showData.Date.End.Time=item.Time;if(!IFrameSplitOperator.IsNumber(showData.Date.Start.Time))showData.Date.Start.Time=item.Time;}}return showData;};//格式化K线数据
16034
- this.FormatKLineText=function(showData){if(!showData)return;var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);if(ChartData.IsMinutePeriod(this.HQChart.Period,true)){showData.Date.Start.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.Start.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM"));showData.Date.End.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.End.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM"));}else if(ChartData.IsSecondPeriod(this.HQChart.Period)||ChartData.IsTickPeriod(this.HQChart.Period)){showData.Date.Start.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.Start.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM:SS"));showData.Date.End.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.End.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM:SS"));}else{showData.Date.Start.Text=IFrameSplitOperator.FormatDateString(showData.Date.Start.Date);showData.Date.End.Text=IFrameSplitOperator.FormatDateString(showData.Date.End.Date);}showData.AryText.push(this.ForamtPrice(showData.Open,showData.Open,defaultfloatPrecision,'DialogSelectRect-StartPrice'));showData.AryText.push(this.ForamtPrice(showData.Close,showData.Open,defaultfloatPrecision,'DialogSelectRect-EndPrice'));showData.AryText.push(this.FormatIncrease(showData.Close,showData.Open,'DialogSelectRect-Increase'));showData.AryText.push(this.ForamtPrice(showData.High,showData.Open,defaultfloatPrecision,'DialogSelectRect-High'));showData.AryText.push(this.ForamtPrice(showData.Low,showData.Open,defaultfloatPrecision,'DialogSelectRect-Low'));showData.AryText.push(this.FormatAmplitude(showData.High,showData.Low,showData.Open,'DialogSelectRect-Amplitude'));showData.AryText.push(this.FormatVol(showData.Vol,'DialogSelectRect-Vol'));showData.AryText.push(this.FormatAmount(showData.Amount,'DialogSelectRect-Amount'));showData.AryText.push(this.FormatNumber(showData.Count,null,0,"DialogSelectRect-DataCount"));showData.AryText.push(this.FormatNumber(showData.KLine.Up,this.UpColor,0,'DialogSelectRect-Up'));showData.AryText.push(this.FormatNumber(showData.KLine.Down,this.DownColor,0,'DialogSelectRect-Down'));showData.AryText.push(this.FormatNumber(showData.KLine.Unchanged,this.UnchangeColor,0,'DialogSelectRect-Unchanged'));};this.CalculateMinuteData=function(data){var selectData=data.SelectData;var hisData=selectData.Data;var start=selectData.Start;var end=selectData.End;var showData=this.CreateEmptyShowData();showData.DataCount=hisData.Data.length;for(var i=start;i<hisData.Data.length&&i<=end;++i){var item=hisData.Data[i];++showData.Count;if(!IFrameSplitOperator.IsNumber(showData.Open)&&IFrameSplitOperator.IsNumber(item.Open))showData.Open=item.Open;if(IFrameSplitOperator.IsNumber(item.Close))showData.Close=item.Close;if(IFrameSplitOperator.IsNumber(item.Vol))showData.Vol+=item.Vol;if(IFrameSplitOperator.IsNumber(item.Amount))showData.Amount+=item.Amount;if(IFrameSplitOperator.IsNumber(item.High)){if(!IFrameSplitOperator.IsNumber(showData.High)||showData.High<item.High)showData.High=item.High;}if(IFrameSplitOperator.IsNumber(item.Low)){if(!IFrameSplitOperator.IsNumber(showData.Low)||showData.Low>item.Low)showData.Low=item.Low;}if(IFrameSplitOperator.IsNumber(item.Open)&&IFrameSplitOperator.IsNumber(item.Close)){if(item.Close>item.Open)++showData.KLine.Up;else if(item.Close<item.Open)++showData.KLine.Down;else++showData.KLine.Unchanged;}if(IFrameSplitOperator.IsNumber(item.Date)){showData.Date.End.Date=item.Date;if(!IFrameSplitOperator.IsNumber(showData.Date.Start.Date))showData.Date.Start.Date=item.Date;}if(IFrameSplitOperator.IsNumber(item.Time)){showData.Date.End.Time=item.Time;if(!IFrameSplitOperator.IsNumber(showData.Date.Start.Time))showData.Date.Start.Time=item.Time;}}return showData;};this.FormatMinuteText=function(showData){if(!showData)return;var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);showData.Date.Start.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.Start.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM"));showData.Date.End.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.End.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM"));showData.AryText.push(this.ForamtPrice(showData.Open,showData.Open,defaultfloatPrecision,'DialogSelectRect-StartPrice'));showData.AryText.push(this.ForamtPrice(showData.Close,showData.Open,defaultfloatPrecision,'DialogSelectRect-EndPrice'));showData.AryText.push(this.FormatIncrease(showData.Close,showData.Open,'DialogSelectRect-Increase'));showData.AryText.push(this.ForamtPrice(showData.High,showData.Open,defaultfloatPrecision,'DialogSelectRect-High'));showData.AryText.push(this.ForamtPrice(showData.Low,showData.Open,defaultfloatPrecision,'DialogSelectRect-Low'));showData.AryText.push(this.FormatAmplitude(showData.High,showData.Low,showData.Open,'DialogSelectRect-Amplitude'));showData.AryText.push(this.FormatVol(showData.Vol,'DialogSelectRect-Vol'));showData.AryText.push(this.FormatAmount(showData.Amount,'DialogSelectRect-Amount'));showData.AryText.push(this.FormatNumber(showData.Count,null,0,"DialogSelectRect-DataCount"));};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;};this.FormatEmpty=function(){var item={Title:"",Text:"",Color:this.ValueColor};return item;};this.FormatNumber=function(value,color,defaultfloatPrecision,TitleID,format){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"----",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=value.toFixed(defaultfloatPrecision);if(color)item.Color=color;return item;};this.ForamtPrice=function(price,yClose,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;item.Text=price.toFixed(defaultfloatPrecision);item.Color=this.GetColor(price,yClose);return item;};this.FormatIncrease=function(price,yClose,TitleID){//涨幅
16036
+ };this.UpdateTableDOM=function(showData){var index=0;for(var index=0,j=0,dataIndex=0;index<this.AryData.length&&dataIndex<showData.AryText.length;++index){var rowItem=this.AryData[index];for(j=0;j<rowItem.AryItem.length;++j,++dataIndex){if(dataIndex>=showData.AryText.length)break;var item=rowItem.AryItem[j];var outItem=showData.AryText[dataIndex];item.LeftSpan.innerText=outItem.Title;item.LeftSpan.style.color=this.TextColor;item.RightSpan.innerText=outItem.Text;item.RightSpan.style.color=outItem.Color;}rowItem.Tr.style.display="";}for(;index<this.AryData.length;++index){var rowItem=this.AryData[index];rowItem.Tr.style.display="none";}if(this.DateTimeBox.Start.SpanValue)this.DateTimeBox.Start.SpanValue.innerText=showData.Date.Start.Text;if(this.DateTimeBox.End.SpanValue)this.DateTimeBox.End.SpanValue.innerText=showData.Date.End.Text;};this.UpdateSelectRect=function(selectData){this.HQChart.UpdateSelectRect(selectData.Start,selectData.End);var showData=null;if(this.HQChart.ClassName=='KLineChartContainer'){showData=this.CalculateKLineData({SelectData:selectData});this.FormatKLineText(showData);}else if(this.HQChart.ClassName=='MinuteChartContainer'){showData=this.CalculateMinuteData({SelectData:selectData});this.FormatMinuteText(showData);}if(showData){this.ShowData=showData;this.UpdateTableDOM(showData);}};this.Update=function(data){if(!this.DivDialog)return;var showData;if(this.HQChart.ClassName=='KLineChartContainer'){showData=this.CalculateKLineData(data);this.FormatKLineText(showData);}else if(this.HQChart.ClassName=='MinuteChartContainer'){showData=this.CalculateMinuteData(data);this.FormatMinuteText(showData);}if(!showData)return;this.ShowData=showData;this.SelectData=data.SelectData;this.UpdateTableDOM(showData);if(!this.IsShow())this.Show(data.X,data.Y);};this.CreateEmptyShowData=function(){var showData={Open:null,Close:null,High:null,Low:null,YClose:null,//起始K昨价
16037
+ StartClose:null,//起始K收盘价
16038
+ Vol:0,Amount:0,Date:{Start:{Time:null,Date:null,Text:""},End:{Time:null,Date:null,Text:""}},Count:0,KLine:{Up:0,Down:0,Unchanged:0},//阳线|阴线|平线
16039
+ AryText:[],DataCount:0};return showData;};this.CalculateKLineData=function(data){var selectData=data.SelectData;var hisData=selectData.Data;var start=selectData.Start;var end=selectData.End;var showData=this.CreateEmptyShowData();showData.DataCount=hisData.Data.length;for(var i=start;i<hisData.Data.length&&i<=end;++i){var item=hisData.Data[i];++showData.Count;if(!IFrameSplitOperator.IsNumber(showData.Open)&&IFrameSplitOperator.IsNumber(item.Open))showData.Open=item.Open;if(IFrameSplitOperator.IsNumber(item.Close))showData.Close=item.Close;if(IFrameSplitOperator.IsNumber(item.Vol))showData.Vol+=item.Vol;if(IFrameSplitOperator.IsNumber(item.Amount))showData.Amount+=item.Amount;if(IFrameSplitOperator.IsNumber(item.High)){if(!IFrameSplitOperator.IsNumber(showData.High)||showData.High<item.High)showData.High=item.High;}if(IFrameSplitOperator.IsNumber(item.Low)){if(!IFrameSplitOperator.IsNumber(showData.Low)||showData.Low>item.Low)showData.Low=item.Low;}if(IFrameSplitOperator.IsNumber(item.Open)&&IFrameSplitOperator.IsNumber(item.Close)){if(item.Close>item.Open)++showData.KLine.Up;else if(item.Close<item.Open)++showData.KLine.Down;else++showData.KLine.Unchanged;}if(IFrameSplitOperator.IsNumber(item.Date)){showData.Date.End.Date=item.Date;if(!IFrameSplitOperator.IsNumber(showData.Date.Start.Date))showData.Date.Start.Date=item.Date;}if(IFrameSplitOperator.IsNumber(item.Time)){showData.Date.End.Time=item.Time;if(!IFrameSplitOperator.IsNumber(showData.Date.Start.Time))showData.Date.Start.Time=item.Time;}if(i==start){if(IFrameSplitOperator.IsNumber(item.YClose))showData.YClose=item.YClose;if(IFrameSplitOperator.IsNumber(item.Close))showData.StartClose=item.Close;}}return showData;};this.FormatKLineIncrease=function(showData){var value=null;switch(this.FormualConfig.Increase){case 1:value=showData.Open;break;case 2:value=showData.StartClose;break;default:value=showData.YClose;break;}return this.FormatIncrease(showData.Close,value,'DialogSelectRect-Increase');};this.FormatKLineAmplitude=function(showData){var value=null;switch(this.FormualConfig.Increase){case 1:value=showData.Open;break;case 2:value=showData.StartClose;break;default:value=showData.YClose;break;}return this.FormatAmplitude(showData.High,showData.Low,value,'DialogSelectRect-Amplitude');};//格式化K线数据
16040
+ this.FormatKLineText=function(showData){if(!showData)return;var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);if(ChartData.IsMinutePeriod(this.HQChart.Period,true)){showData.Date.Start.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.Start.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM"));showData.Date.End.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.End.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM"));}else if(ChartData.IsSecondPeriod(this.HQChart.Period)||ChartData.IsTickPeriod(this.HQChart.Period)){showData.Date.Start.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.Start.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM:SS"));showData.Date.End.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.End.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM:SS"));}else{showData.Date.Start.Text=IFrameSplitOperator.FormatDateString(showData.Date.Start.Date);showData.Date.End.Text=IFrameSplitOperator.FormatDateString(showData.Date.End.Date);}showData.AryText.push(this.ForamtPrice(showData.Open,showData.Open,defaultfloatPrecision,'DialogSelectRect-StartPrice'));showData.AryText.push(this.ForamtPrice(showData.Close,showData.Open,defaultfloatPrecision,'DialogSelectRect-EndPrice'));showData.AryText.push(this.FormatKLineIncrease(showData));showData.AryText.push(this.ForamtPrice(showData.High,showData.Open,defaultfloatPrecision,'DialogSelectRect-High'));showData.AryText.push(this.ForamtPrice(showData.Low,showData.Open,defaultfloatPrecision,'DialogSelectRect-Low'));showData.AryText.push(this.FormatKLineAmplitude(showData));showData.AryText.push(this.FormatVol(showData.Vol,'DialogSelectRect-Vol'));showData.AryText.push(this.FormatAmount(showData.Amount,'DialogSelectRect-Amount'));showData.AryText.push(this.FormatNumber(showData.Count,null,0,"DialogSelectRect-DataCount"));showData.AryText.push(this.FormatNumber(showData.KLine.Up,this.UpColor,0,'DialogSelectRect-Up'));showData.AryText.push(this.FormatNumber(showData.KLine.Down,this.DownColor,0,'DialogSelectRect-Down'));showData.AryText.push(this.FormatNumber(showData.KLine.Unchanged,this.UnchangeColor,0,'DialogSelectRect-Unchanged'));};this.CalculateMinuteData=function(data){var selectData=data.SelectData;var hisData=selectData.Data;var start=selectData.Start;var end=selectData.End;var showData=this.CreateEmptyShowData();showData.DataCount=hisData.Data.length;for(var i=start;i<hisData.Data.length&&i<=end;++i){var item=hisData.Data[i];++showData.Count;if(!IFrameSplitOperator.IsNumber(showData.Open)&&IFrameSplitOperator.IsNumber(item.Open))showData.Open=item.Open;if(IFrameSplitOperator.IsNumber(item.Close))showData.Close=item.Close;if(IFrameSplitOperator.IsNumber(item.Vol))showData.Vol+=item.Vol;if(IFrameSplitOperator.IsNumber(item.Amount))showData.Amount+=item.Amount;if(IFrameSplitOperator.IsNumber(item.High)){if(!IFrameSplitOperator.IsNumber(showData.High)||showData.High<item.High)showData.High=item.High;}if(IFrameSplitOperator.IsNumber(item.Low)){if(!IFrameSplitOperator.IsNumber(showData.Low)||showData.Low>item.Low)showData.Low=item.Low;}if(IFrameSplitOperator.IsNumber(item.Open)&&IFrameSplitOperator.IsNumber(item.Close)){if(item.Close>item.Open)++showData.KLine.Up;else if(item.Close<item.Open)++showData.KLine.Down;else++showData.KLine.Unchanged;}if(IFrameSplitOperator.IsNumber(item.Date)){showData.Date.End.Date=item.Date;if(!IFrameSplitOperator.IsNumber(showData.Date.Start.Date))showData.Date.Start.Date=item.Date;}if(IFrameSplitOperator.IsNumber(item.Time)){showData.Date.End.Time=item.Time;if(!IFrameSplitOperator.IsNumber(showData.Date.Start.Time))showData.Date.Start.Time=item.Time;}}return showData;};this.FormatMinuteText=function(showData){if(!showData)return;var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);showData.Date.Start.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.Start.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.Start.Time,"HH:MM"));showData.Date.End.Text="".concat(IFrameSplitOperator.FormatDateString(showData.Date.End.Date)," ").concat(IFrameSplitOperator.FormatTimeString(showData.Date.End.Time,"HH:MM"));showData.AryText.push(this.ForamtPrice(showData.Open,showData.Open,defaultfloatPrecision,'DialogSelectRect-StartPrice'));showData.AryText.push(this.ForamtPrice(showData.Close,showData.Open,defaultfloatPrecision,'DialogSelectRect-EndPrice'));showData.AryText.push(this.FormatIncrease(showData.Close,showData.Open,'DialogSelectRect-Increase'));showData.AryText.push(this.ForamtPrice(showData.High,showData.Open,defaultfloatPrecision,'DialogSelectRect-High'));showData.AryText.push(this.ForamtPrice(showData.Low,showData.Open,defaultfloatPrecision,'DialogSelectRect-Low'));showData.AryText.push(this.FormatAmplitude(showData.High,showData.Low,showData.Open,'DialogSelectRect-Amplitude'));showData.AryText.push(this.FormatVol(showData.Vol,'DialogSelectRect-Vol'));showData.AryText.push(this.FormatAmount(showData.Amount,'DialogSelectRect-Amount'));showData.AryText.push(this.FormatNumber(showData.Count,null,0,"DialogSelectRect-DataCount"));};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;};this.FormatEmpty=function(){var item={Title:"",Text:"",Color:this.ValueColor};return item;};this.FormatNumber=function(value,color,defaultfloatPrecision,TitleID,format){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"----",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=value.toFixed(defaultfloatPrecision);if(color)item.Color=color;return item;};this.ForamtPrice=function(price,yClose,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;item.Text=price.toFixed(defaultfloatPrecision);item.Color=this.GetColor(price,yClose);return item;};this.FormatIncrease=function(price,yClose,TitleID){//涨幅
16035
16041
  var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price)||!IFrameSplitOperator.IsNumber(yClose))return item;var diffValue=price-yClose;var value=diffValue/yClose;item.Text="".concat((value*100).toFixed(2),"%");item.Color=this.GetColor(value,0);return item;};this.FormatAmplitude=function(high,low,yClose,TitleID){//振幅
16036
16042
  var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(high)||!IFrameSplitOperator.IsNumber(low)||!IFrameSplitOperator.IsNumber(yClose))return item;var diffValue=high-low;var value=diffValue/yClose;item.Text="".concat((value*100).toFixed(2),"%");item.Color=this.GetColor(value,0);return item;};this.FormatVol=function(vol,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.VolColor};if(!IFrameSplitOperator.IsNumber(vol))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(vol,0,2,this.LanguageID);return item;};this.FormatAmount=function(amount,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.AmountColor};if(!IFrameSplitOperator.IsNumber(amount))return item;item.Text=IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);return item;};}/*
16037
16043
  Copyright (c) 2018 jones
@@ -16798,7 +16804,7 @@ if(dayItem.Text){var textWidth=this.Canvas.measureText(dayItem.Text).width;xText
16798
16804
  {yCell=rtCell.Bottom;xCell=left;}++j;}}},{key:"DrawMarkDay",value:function DrawMarkDay(dayItem,markItem,rtCell,yText){var config=this.MarkDayConfig;var radius=config.Dots.Radius;var yOffset=config.Dots.YOffset;var color=config.Dots.Color;if(markItem.Color)color=markItem.Color;if(IFrameSplitOperator.IsNumber(markItem.YOffset))yOffset=markItem.YOffset;if(IFrameSplitOperator.IsNumber(markItem.Radius))radius=markItem.Radius;var x=rtCell.Left+rtCell.Width/2;var y=yText+yOffset;this.Canvas.fillStyle=color;this.Canvas.beginPath();this.Canvas.arc(x,y,radius,0,Math.PI*2);this.Canvas.fill();}},{key:"PtInCell",value:function PtInCell(x,y){if(!IFrameSplitOperator.IsNonEmptyArray(this.AryCellRect))return null;for(var i=0;i<this.AryCellRect.length;++i){var item=this.AryCellRect[i];var rtCell=item.Rect;if(x>=rtCell.Left&&x<=rtCell.Right&&y>=rtCell.Top&&y<=rtCell.Bottom){var data={Rect:rtCell,Type:item.Type,Data:item.Data};return data;}}return null;}},{key:"OnMouseOn",value:function OnMouseOn(x,y,e){var pixelTatio=GetDevicePixelRatio();var insidePoint={X:x/pixelTatio,Y:y/pixelTatio};var uiElement;if(this.UIElement)uiElement={Left:this.UIElement.getBoundingClientRect().left,Top:this.UIElement.getBoundingClientRect().top};else uiElement={Left:null,Top:null};var bDraw=false;var cell=this.PtInCell(x,y);if(cell){bDraw=false;var selData=this.MoveOnData.Data;if(selData&&cell.Type==selData.Type){if(cell.Type===JSCHART_CALENDAR_BUTTON_ID.DAY_CELL_ID||cell.Type===JSCHART_CALENDAR_BUTTON_ID.MONTH_CELL_ID){if(cell.Data.Date!=selData.Data.Date){this.MoveOnData.Data={Type:cell.Type,Data:cell.Data};bDraw=true;}}}else{this.MoveOnData.Data={Type:cell.Type,Data:cell.Data};bDraw=true;}return{Redraw:bDraw,Cell:cell};}if(this.MoveOnData.Data){this.MoveOnData.Data=null;bDraw=true;}return{Redraw:bDraw,Cell:null};}},{key:"OnMouseDown",value:function OnMouseDown(x,y,e){var cell=this.PtInCell(x,y);if(!cell)return null;var bDraw=false;return{Type:cell.Type,Redraw:bDraw,Data:cell.Data};}},{key:"SetSelectedDay",value:function SetSelectedDay(aryData){this.ArySelectedDay=[];if(IFrameSplitOperator.IsNonEmptyArray(aryData))this.ArySelectedDay=aryData.slice();}}]);}();/********************************************************************************
16799
16805
  * 版本信息输出
16800
16806
  *
16801
- */var HQCHART_VERSION="1.1.15916";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: ".concat(HQCHART_VERSION," \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ");console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
16807
+ */var HQCHART_VERSION="1.1.15922";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: ".concat(HQCHART_VERSION," \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ");console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
16802
16808
  var _default=exports["default"]=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
16803
16809
  // BaseIndex:BaseIndex,
16804
16810
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.15917",
3
+ "version": "1.1.15923",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
@@ -171059,7 +171059,7 @@ function JSFloatTooltip()
171059
171059
  //大宗交易
171060
171060
  this.FormatBlockTradingText=function(data, floatPrecision, aryOut)
171061
171061
  {
171062
- var item={ Title:"", Text:"大宗交易", Color:this.TextColor, ClassName:this.ValueAlign.Left };
171062
+ var item={ Title:"大宗交易", TitleColor:this.TextColor, IsMergeCell:true, TitleClassName:this.TitleAlign.Center };
171063
171063
  aryOut.push(item);
171064
171064
 
171065
171065
  var item={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor };
@@ -171099,7 +171099,7 @@ function JSFloatTooltip()
171099
171099
  //龙虎榜
171100
171100
  this.FormatDragonTigerText=function(data, floatPrecision, aryOut)
171101
171101
  {
171102
- var item={ Title:"", Text:"龙虎榜", Color:this.TextColor, ClassName:this.ValueAlign.Left };
171102
+ var item={ Title:"龙虎榜", TitleColor:this.TextColor, IsMergeCell:true, TitleClassName:this.TitleAlign.Center };
171103
171103
  aryOut.push(item);
171104
171104
 
171105
171105
  var item={ Title:"日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor};
@@ -171137,13 +171137,15 @@ function JSFloatTooltip()
171137
171137
  for(var i=0;i<aryText.length;++i)
171138
171138
  {
171139
171139
  var item=aryText[i];
171140
+ if (item.Type==-1) continue; //不显示
171141
+
171140
171142
  if (item.Type===1) //涨幅
171141
171143
  {
171142
171144
  var outItem={ Title:item.Name, Text:`${item.Value.toFixed(2)}%`, Color:this.GetColor(item.Value,0) };
171143
171145
  }
171144
171146
  else if (item.Type==2) //单行
171145
171147
  {
171146
- var outItem={ Title:"", Text:item.Name, Color:this.TextColor, ClassName:this.ValueAlign.Left };
171148
+ var outItem={ Title:item.Name, TitleColor:this.TextColor, IsMergeCell:true, TitleClassName:this.TitleAlign.Center };
171147
171149
  }
171148
171150
  else
171149
171151
  {
@@ -171157,7 +171159,7 @@ function JSFloatTooltip()
171157
171159
  //调研
171158
171160
  this.FormatResearchText=function(data,aryOut)
171159
171161
  {
171160
- var item={ Title:"", Text:"机构调研", Color:this.TextColor, ClassName:this.ValueAlign.Left };
171162
+ var item={ Title:"机构调研", TitleColor:this.TextColor, IsMergeCell:true, TitleClassName:this.TitleAlign.Center };
171161
171163
  aryOut.push(item);
171162
171164
 
171163
171165
  var item={ Title:"公告日期",Text:IFrameSplitOperator.FormatDateString(data.Date,"YYYY-MM-DD"), Color:this.ValueColor };
@@ -171964,12 +171966,23 @@ function JSDialogSelectRect()
171964
171966
 
171965
171967
  this.RestoreFocusDelay=800;
171966
171968
 
171969
+ //计算公式配置
171970
+ // Increase=涨幅 0=(收-昨收)/昨收 1=(收-今开)/今开 2=(区间末尾收盘价 − 区间起始收盘价) ÷ 区间起始收盘价
171971
+ // Amplitude=振幅 0= (当日最高价 − 当日最低价) ÷ 昨日收盘价 1=(当日最高价 − 当日最低价) ÷ 今开价 2=(区间内最高价 − 区间内最低价) ÷ 区间起始 K 收盘价
171972
+ this.FormualConfig={ Increase:0, Amplitude:0 };
171973
+
171974
+
171967
171975
  this.Inital=function(hqchart, option)
171968
171976
  {
171969
171977
  this.HQChart=hqchart;
171970
171978
  if (option)
171971
171979
  {
171972
-
171980
+ if (option.Formual)
171981
+ {
171982
+ var item=option.Formual;
171983
+ if (IFrameSplitOperator.IsNumber(item.Increase)) this.FormualConfig.Increase=item.Increase;
171984
+ if (IFrameSplitOperator.IsNumber(item.Amplitude)) this.FormualConfig.Amplitude=item.Amplitude;
171985
+ }
171973
171986
  }
171974
171987
  }
171975
171988
 
@@ -172455,7 +172468,9 @@ function JSDialogSelectRect()
172455
172468
  {
172456
172469
  var showData=
172457
172470
  {
172458
- Open:null,Close:null,High:null,Low:null, YClose:null,
172471
+ Open:null, Close:null, High:null, Low:null,
172472
+ YClose:null, //起始K昨价
172473
+ StartClose:null, //起始K收盘价
172459
172474
  Vol:0, Amount:0,
172460
172475
  Date:
172461
172476
  {
@@ -172524,11 +172539,55 @@ function JSDialogSelectRect()
172524
172539
  showData.Date.End.Time=item.Time;
172525
172540
  if (!IFrameSplitOperator.IsNumber(showData.Date.Start.Time)) showData.Date.Start.Time=item.Time;
172526
172541
  }
172542
+
172543
+ if (i==start)
172544
+ {
172545
+ if (IFrameSplitOperator.IsNumber(item.YClose)) showData.YClose=item.YClose;
172546
+ if (IFrameSplitOperator.IsNumber(item.Close)) showData.StartClose=item.Close;
172547
+ }
172527
172548
  }
172528
172549
 
172529
172550
  return showData;
172530
172551
  }
172531
172552
 
172553
+ this.FormatKLineIncrease=function(showData)
172554
+ {
172555
+ var value=null;
172556
+ switch(this.FormualConfig.Increase)
172557
+ {
172558
+ case 1:
172559
+ value=showData.Open;
172560
+ break;
172561
+ case 2:
172562
+ value=showData.StartClose;
172563
+ break;
172564
+ default:
172565
+ value=showData.YClose;
172566
+ break;
172567
+ }
172568
+
172569
+ return this.FormatIncrease(showData.Close, value, 'DialogSelectRect-Increase')
172570
+ }
172571
+
172572
+ this.FormatKLineAmplitude=function(showData)
172573
+ {
172574
+ var value=null;
172575
+ switch(this.FormualConfig.Increase)
172576
+ {
172577
+ case 1:
172578
+ value=showData.Open;
172579
+ break;
172580
+ case 2:
172581
+ value=showData.StartClose;
172582
+ break;
172583
+ default:
172584
+ value=showData.YClose;
172585
+ break;
172586
+ }
172587
+
172588
+ return this.FormatAmplitude(showData.High, showData.Low, value, 'DialogSelectRect-Amplitude')
172589
+ }
172590
+
172532
172591
  //格式化K线数据
172533
172592
  this.FormatKLineText=function(showData)
172534
172593
  {
@@ -172554,11 +172613,11 @@ function JSDialogSelectRect()
172554
172613
 
172555
172614
  showData.AryText.push(this.ForamtPrice(showData.Open, showData.Open,defaultfloatPrecision, 'DialogSelectRect-StartPrice'));
172556
172615
  showData.AryText.push(this.ForamtPrice(showData.Close, showData.Open,defaultfloatPrecision, 'DialogSelectRect-EndPrice'));
172557
- showData.AryText.push(this.FormatIncrease(showData.Close, showData.Open, 'DialogSelectRect-Increase'));
172616
+ showData.AryText.push(this.FormatKLineIncrease(showData));
172558
172617
 
172559
172618
  showData.AryText.push(this.ForamtPrice(showData.High, showData.Open,defaultfloatPrecision, 'DialogSelectRect-High'));
172560
172619
  showData.AryText.push(this.ForamtPrice(showData.Low, showData.Open,defaultfloatPrecision, 'DialogSelectRect-Low'));
172561
- showData.AryText.push(this.FormatAmplitude(showData.High, showData.Low, showData.Open, 'DialogSelectRect-Amplitude'));
172620
+ showData.AryText.push(this.FormatKLineAmplitude(showData));
172562
172621
 
172563
172622
  showData.AryText.push(this.FormatVol(showData.Vol, 'DialogSelectRect-Vol'));
172564
172623
  showData.AryText.push(this.FormatAmount(showData.Amount, 'DialogSelectRect-Amount'));
@@ -178442,7 +178501,7 @@ function ChartScrollText()
178442
178501
 
178443
178502
 
178444
178503
 
178445
- var HQCHART_VERSION="1.1.15916";
178504
+ var HQCHART_VERSION="1.1.15922";
178446
178505
 
178447
178506
  function PrintHQChartVersion()
178448
178507
  {