hqchart 1.1.12453 → 1.1.12459

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.
Files changed (10) hide show
  1. package/lib/umychart.vue.js +31 -28
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.js +42 -14
  4. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +43 -15
  5. package/src/jscommon/umychart.version.js +1 -1
  6. package/src/jscommon/umychart.vue/umychart.vue.js +43 -15
  7. package/src/jscommon/umychart.wechat/umychart.charttitle.wechat.js +3 -3
  8. package/src/jscommon/umychart.wechat/umychart.data.wechat.js +1 -0
  9. package/src/jscommon/umychart.wechat/umychart.extendchart.wechat.js +1 -0
  10. package/src/jscommon/umychart.wechat/umychart.wechat.3.0.js +2 -0
package/lib/umychart.vue.js CHANGED
@@ -1425,7 +1425,7 @@ this.CreateDepthChartContainer=function(option){var chart=null;chart=new DepthCh
1425
1425
  }if(item.IsShowXLine==false)chart.Frame.IsShowXLine=item.IsShowXLine;if(item.IsShowYLine==false)chart.Frame.IsShowYLine=item.IsShowYLine;if(IFrameSplitOperator.IsNumber(item.XSplitCount))chart.Frame.XSplitOperator.SplitCount=item.XSplitCount;//X轴刻度个数 半边的
1426
1426
  }return chart;};//根据option内容绘制图形
1427
1427
  this.SetOption=function(option){//toolbar按钮风格
1428
- if(IFrameSplitOperator.IsNumber(option.ToolbarButtonStyle))g_JSChartResource.ToolbarButtonStyle=option.ToolbarButtonStyle;var chart=null;switch(option.Type){case"历史K线图":case'历史K线图横屏':chart=this.CreateKLineChartContainer(option);break;case"自定义指数历史K线图":chart=this.CreateCustomKLineChartContainer(option);break;case"分钟走势图":case"分钟走势图横屏":chart=this.CreateMinuteChartContainer(option);break;case"迷你分钟走势图":chart=this.CreateMinMinuteChartContainer(option);break;case"历史分钟走势图":chart=this.CreateHistoryMinuteChartContainer(option);break;case'K线训练':case'K线训练横屏':case"简单K线训练":case"简单K线训练横屏":chart=this.CreateKLineTrainChartContainer(option);break;case"深度图":chart=this.CreateDepthChartContainer(option);break;case"简单图形":return this.CreateSimpleChart(option);case"饼图":case'雷达图':return this.CreatePieChart(option);case'地图':return this.CreateMapChart(option);default:return false;}if(!chart)return false;if(option.OnCreatedCallback)option.OnCreatedCallback(chart);//是否自动更新
1428
+ if(IFrameSplitOperator.IsNumber(option.ToolbarButtonStyle))g_JSChartResource.ToolbarButtonStyle=option.ToolbarButtonStyle;var chart=null;switch(option.Type){case"历史K线图":case'历史K线图横屏':chart=this.CreateKLineChartContainer(option);break;case"自定义指数历史K线图":chart=this.CreateCustomKLineChartContainer(option);break;case"分钟走势图":case"分钟走势图横屏":chart=this.CreateMinuteChartContainer(option);break;case"迷你分钟走势图":chart=this.CreateMinMinuteChartContainer(option);break;case"历史分钟走势图":chart=this.CreateHistoryMinuteChartContainer(option);break;case'K线训练':case'K线训练横屏':case"简单K线训练":case"简单K线训练横屏":chart=this.CreateKLineTrainChartContainer(option);break;case"深度图":chart=this.CreateDepthChartContainer(option);break;case"简单图形":return this.CreateSimpleChart(option);case"饼图":case'雷达图':return this.CreatePieChart(option);case'地图':return this.CreateMapChart(option);default:return false;}if(!chart)return false;this.JSChartContainer=chart;if(option.OnCreatedCallback)option.OnCreatedCallback(chart);//是否自动更新
1429
1429
  if(option.IsAutoUpdate!=null)chart.IsAutoUpdate=option.IsAutoUpdate;if(option.AutoUpdateFrequency>0)chart.AutoUpdateFrequency=option.AutoUpdateFrequency;//注册事件
1430
1430
  if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}//设置股票代码
1431
1431
  if(!option.Symbol){chart.DrawEmpty();this.JSChartContainer=chart;this.DivElement.JSChart=this;//div中保存一份
@@ -2859,17 +2859,20 @@ this.Time;//时间
2859
2859
  this.Date;//日期
2860
2860
  this.Position=null;//持仓量
2861
2861
  this.YClearing;//昨结算价
2862
+ this.YClose;//昨收价
2862
2863
  this.ExtendData;//扩展数据
2863
2864
  }//盘前集合竞价
2864
2865
  function BeforeOpenData(){this.Time;this.Date;this.Price;//匹配的价格
2865
2866
  this.AvPrice;//均价
2866
2867
  this.Vol=[];//[0]=匹配量 [1]=未匹配量
2867
- this.ColorID;//0=平盘 1=红 2=绿 3 ...自定义颜色
2868
+ this.ColorID;//0=平盘 1=红 2=绿 3 ...自定义颜色
2869
+ this.YClose;//昨收价
2868
2870
  }//收盘集合竞价
2869
2871
  function AfterCloseData(){this.Time;this.Date;this.Price;//匹配的价格
2870
2872
  this.AvPrice;//均价
2871
2873
  this.Vol=[];//[0]=匹配量 [1]=未匹配量
2872
- this.ColorID;//0=平盘 1=红 2=绿 3 ...自定义颜色
2874
+ this.ColorID;//0=平盘 1=红 2=绿 3 ...自定义颜色
2875
+ this.YClose;//昨收价
2873
2876
  }//单指标数据
2874
2877
  function SingleData(){this.Date;//日期
2875
2878
  this.Time;//时间
@@ -4476,7 +4479,7 @@ this.newMethod();delete this.newMethod;this.ClassName='MinuteTooltipPaint';this.
4476
4479
  this.TitlePaint;this.GetTop=function(){if(this.IsHScreen){var border=this.ChartBorder.GetHScreenBorder();if(this.ShowPosition==0)return border.TopEx+this.Left;else return border.BottomEx-this.Width-this.Left;}else{var border=this.ChartBorder.GetBorder();return border.Top+this.Top;}};this.GetLeft=function(){if(this.IsHScreen){var border=this.ChartBorder.GetHScreenBorder();return border.Right-this.Height-this.Top;}else{var border=this.ChartBorder.GetBorder();if(this.ShowPosition==0)return border.LeftEx+this.Left;else return border.RightEx-this.Width-this.Left;}};this.Draw=function(){if(!this.IsEnableDraw())return;this.IsHScreen=this.ChartFrame.IsHScreen===true;this.TitlePaint=this.HQChart.TitlePaint[0];if(!this.TitlePaint)return;var drawData;//{ Type:0=连续交易 1=集合竞价, Data:数据 }
4477
4480
  var pointInfo=this.TitlePaint.PointInfo;if(pointInfo&&(pointInfo.ClientPos==2||pointInfo.ClientPos==3||pointInfo.ClientPos>=200&&pointInfo.ClientPos<=299||pointInfo.ClientPos>=300&&pointInfo.ClientPos<=399)){var auctionData=this.TitlePaint.GetCurrentAuctionData();if(!auctionData)return;drawData={Type:1,Data:auctionData};}else{var minuteData=this.TitlePaint.GetCurrentKLineData();if(!minuteData)return;drawData={Type:0,Data:minuteData};}var titleData=this.GetFormatTitle(drawData);if(!titleData||!IFrameSplitOperator.IsNonEmptyArray(titleData.AryText))return;this.CalculateTooltipSize(titleData);this.CalculateShowPosition();this.DrawBG();this.DrawTooltipData(titleData);this.DrawBorder();};this.GetFormatTitle=function(data){if(!data||!data.Data)return;var item;var close,vol,amount;if(data.Type==0)//盘中
4478
4481
  {item=data.Data;close=item.Close;vol=item.Vol;amount=item.Amount;}else if(data.Type==1)//盘前 盘后
4479
- {item=data.Data.Data;if(!item)return;close=item.Price;}var upperSymbol;this.YClose=this.TitlePaint.YClose;if(this.HQChart.Symbol)upperSymbol=this.HQChart.Symbol.toUpperCase();var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
4482
+ {item=data.Data.Data;if(!item)return;close=item.Price;}var upperSymbol;this.YClose=this.TitlePaint.YClose;this.YClose=item.YClose;if(this.HQChart.Symbol)upperSymbol=this.HQChart.Symbol.toUpperCase();var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
4480
4483
  var aryText=[];var result={AryText:aryText};var text,title,color;if(IFrameSplitOperator.IsNumber(item.Date)){text=IFrameSplitOperator.FormatDateString(item.Date);aryText.push({Text:text,Color:this.DateTimeColor});}if(IFrameSplitOperator.IsNumber(item.Time)){text=IFrameSplitOperator.FormatTimeString(item.Time);aryText.push({Text:text,Color:this.DateTimeColor});}if(IFrameSplitOperator.IsNumber(close))//最新
4481
4484
  {title=g_JSChartLocalization.GetText('Tooltip-Price',this.LanguageID);color=this.TitlePaint.GetColor(close,this.YClose);text=close.toFixed(defaultfloatPrecision);aryText.push({Title:title,TitleColor:this.TitleColor,Text:text,Color:color});}var isShowAvPrice=true;if(MARKET_SUFFIX_NAME.IsForeignExchange(upperSymbol))isShowAvPrice=false;//外汇没有均价
4482
4485
  else if(MARKET_SUFFIX_NAME.IsET(upperSymbol)&&!MARKET_SUFFIX_NAME.IsETShowAvPrice(upperSymbol))isShowAvPrice=false;else if(MARKET_SUFFIX_NAME.IsShowAvPrice&&!MARKET_SUFFIX_NAME.IsShowAvPrice(upperSymbol))isShowAvPrice=false;//均价
@@ -4624,8 +4627,8 @@ this.SetOption=function(option){if(option.BGColor)this.BGColor=option.BGColor;if
4624
4627
  if(pointInfo&&(pointInfo.ClientPos==2||pointInfo.ClientPos==3||pointInfo.ClientPos>=200&&pointInfo.ClientPos<=299||pointInfo.ClientPos>=300&&pointInfo.ClientPos<=399)){var auctionData=this.TitlePaint.GetCurrentAuctionData();if(!auctionData)return;drawData={Type:1,Data:auctionData};}else{var minuteData=this.TitlePaint.GetCurrentKLineData();if(!minuteData)return;drawData={Type:0,Data:minuteData};}this.YClose=this.TitlePaint.YClose;var aryText=this.GetForamtTitle(drawData);if(!IFrameSplitOperator.IsNonEmptyArray(aryText))return;this.Canvas.font=this.Font;this.Canvas.textBaseline='top';this.LineHeight=GetFontHeight(this.Canvas,null,"擎");var border=this.ChartBorder.GetBorder();var height=this.LineHeight*aryText.length*2;var rtBorder={Left:1,Top:1,Right:border.Left};rtBorder.Bottom=rtBorder.Top+height;rtBorder.Width=rtBorder.Right-rtBorder.Left;rtBorder.Height=rtBorder.Bottom-rtBorder.Top;rtBorder.Height+=this.Mergin.Top+this.Mergin.Bottom;rtBorder.Bottom=rtBorder.Top+rtBorder.Height;if(IFrameSplitOperator.IsNumber(this.FixedWidth))rtBorder.Width=this.FixedWidth;this.Canvas.fillStyle=this.BGColor;this.Canvas.fillRect(rtBorder.Left,rtBorder.Top,rtBorder.Width,rtBorder.Height);this.Canvas.strokeStyle=this.BorderColor;this.Canvas.strokeRect(ToFixedPoint(rtBorder.Left),ToFixedPoint(rtBorder.Top),ToFixedRect(rtBorder.Width),ToFixedRect(rtBorder.Height));var right=rtBorder.Left+rtBorder.Width-this.Mergin.Right;var left=this.Mergin.Left+rtBorder.Left;var top=this.Mergin.Top+rtBorder.Top;var rtItem={Left:left,Top:top,Right:right};rtItem.Width=rtItem.Right-rtItem.Left;for(var i=0;i<aryText.length;++i){var item=aryText[i];this.DrawText(item,rtItem);}};this.DrawText=function(item,rtItem){this.Canvas.fillStyle=item.TitleColor;this.Canvas.textAlign='left';this.Canvas.fillText(item.Title,rtItem.Left,rtItem.Top);rtItem.Top+=this.LineHeight;rtItem.Bottom=rtItem.Top+this.LineHeight;this.Canvas.textAlign='right';this.Canvas.fillStyle=item.TextColor;this.Canvas.fillText(item.Text,rtItem.Right,rtItem.Top);rtItem.Top+=this.LineHeight;rtItem.Bottom=rtItem.Top+this.LineHeight;};//{ Title:, Text:, Color: }
4625
4628
  this.GetForamtTitle=function(drawData){if(!drawData||!drawData.Data)return null;var aryText=[];var upperSymbol;if(this.HQChart.Symbol)upperSymbol=this.HQChart.Symbol.toUpperCase();var defaultfloatPrecision=GetfloatPrecision(upperSymbol);//价格小数位数
4626
4629
  if(drawData.Type==0)//连续交易
4627
- {var item=drawData.Data;var titleItem=this.FormatDate(item.Date);if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtTime(item.Time,"HH:MM",'PCTooltip-Time');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtPrice(item.Close,defaultfloatPrecision,'PCTooltip-Price');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtPrice(item.AvPrice,defaultfloatPrecision,'PCTooltip-AvPrice');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtIncrease(item.Close,"PCTooltip-Increase");if(titleItem)aryText.push(titleItem);var titleItem=this.FormatVol(item.Vol,'PCTooltip-Vol');if(titleItem)aryText.push(titleItem);if(IFrameSplitOperator.IsNumber(item.Amount)){var titleItem={Title:g_JSChartLocalization.GetText('PCTooltip-Amount',this.LanguageID),TitleColor:this.TitleColor,Text:IFrameSplitOperator.FromatIntegerString(item.Amount,2,this.LanguageID),TextColor:this.AmountColor};aryText.push(titleItem);}}else if(drawData.Type==1)//集合竞价
4628
- {var item=drawData.Data.Data;if(!item)return;var titleItem=this.FormatDate(item.Date);if(titleItem)aryText.push(titleItem);var timeForamt="HH:MM:SS";if(item.Ver===1)timeForamt="HH:MM";var titleItem=this.ForamtTime(item.Time,timeForamt,'PCTooltip-Time');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtPrice(item.Price,defaultfloatPrecision,'PCTooltip-AC-Price');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtIncrease(item.Price,"PCTooltip-AC-Increase");if(titleItem)aryText.push(titleItem);if(IFrameSplitOperator.IsNonEmptyArray(item.Vol)){var titleItem=this.FormatVol(item.Vol[0],'PCTooltip-AC-Vol');if(titleItem)aryText.push(titleItem);var titleItem=this.FormatVol(item.Vol[1],'PCTooltip-AC-NotMatchVol');if(titleItem)aryText.push(titleItem);}}return aryText;};this.GetColor=function(price,yclse){if(price>yclse)return this.UpColor;else if(price<yclse)return this.DownColor;else return this.UnchagneColor;};this.FormatDate=function(date){if(!IFrameSplitOperator.IsNumber(date))return null;var titleItem={Title:g_JSChartLocalization.GetText('PCTooltip-Date',this.LanguageID),TitleColor:this.TitleColor,Text:IFrameSplitOperator.FormatDateString(date,"MM-DD",this.LanguageID),TextColor:this.DateTimeColor};return titleItem;};this.ForamtTime=function(time,format,TitleID){if(!IFrameSplitOperator.IsNumber(time))return null;var titleItem={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),TitleColor:this.TitleColor,Text:IFrameSplitOperator.FormatTimeString(time,format,this.LanguageID),TextColor:this.DateTimeColor};return titleItem;};this.ForamtPrice=function(price,defaultfloatPrecision,TitleID){if(!IFrameSplitOperator.IsNumber(price))return null;var titleItem={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),TitleColor:this.TitleColor,Text:price.toFixed(defaultfloatPrecision),TextColor:this.GetColor(price,this.YClose)};return titleItem;};this.ForamtIncrease=function(price,TitleID){if(!IFrameSplitOperator.IsNumber(price)||price==0)return null;var value=(price-this.YClose)/this.YClose*100;var titleItem={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),TitleColor:this.TitleColor,Text:value.toFixed(2)+'%',TextColor:this.GetColor(value,0)};return titleItem;};this.FormatVol=function(vol,TitleID){if(!IFrameSplitOperator.IsNumber(vol))return null;var titleItem={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),TitleColor:this.TitleColor,Text:IFrameSplitOperator.FromatIntegerString(vol,2,this.LanguageID),TextColor:this.VolColor};return titleItem;};}//股票信息
4630
+ {var item=drawData.Data;if(!item)return;this.YClose=item.YClose;var titleItem=this.FormatDate(item.Date);if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtTime(item.Time,"HH:MM",'PCTooltip-Time');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtPrice(item.Close,defaultfloatPrecision,'PCTooltip-Price');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtPrice(item.AvPrice,defaultfloatPrecision,'PCTooltip-AvPrice');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtIncrease(item.Close,"PCTooltip-Increase");if(titleItem)aryText.push(titleItem);var titleItem=this.FormatVol(item.Vol,'PCTooltip-Vol');if(titleItem)aryText.push(titleItem);if(IFrameSplitOperator.IsNumber(item.Amount)){var titleItem={Title:g_JSChartLocalization.GetText('PCTooltip-Amount',this.LanguageID),TitleColor:this.TitleColor,Text:IFrameSplitOperator.FromatIntegerString(item.Amount,2,this.LanguageID),TextColor:this.AmountColor};aryText.push(titleItem);}}else if(drawData.Type==1)//集合竞价
4631
+ {var item=drawData.Data.Data;if(!item)return;this.YClose=item.YClose;var titleItem=this.FormatDate(item.Date);if(titleItem)aryText.push(titleItem);var timeForamt="HH:MM:SS";if(item.Ver===1)timeForamt="HH:MM";var titleItem=this.ForamtTime(item.Time,timeForamt,'PCTooltip-Time');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtPrice(item.Price,defaultfloatPrecision,'PCTooltip-AC-Price');if(titleItem)aryText.push(titleItem);var titleItem=this.ForamtIncrease(item.Price,"PCTooltip-AC-Increase");if(titleItem)aryText.push(titleItem);if(IFrameSplitOperator.IsNonEmptyArray(item.Vol)){var titleItem=this.FormatVol(item.Vol[0],'PCTooltip-AC-Vol');if(titleItem)aryText.push(titleItem);var titleItem=this.FormatVol(item.Vol[1],'PCTooltip-AC-NotMatchVol');if(titleItem)aryText.push(titleItem);}}return aryText;};this.GetColor=function(price,yclse){if(price>yclse)return this.UpColor;else if(price<yclse)return this.DownColor;else return this.UnchagneColor;};this.FormatDate=function(date){if(!IFrameSplitOperator.IsNumber(date))return null;var titleItem={Title:g_JSChartLocalization.GetText('PCTooltip-Date',this.LanguageID),TitleColor:this.TitleColor,Text:IFrameSplitOperator.FormatDateString(date,"MM-DD",this.LanguageID),TextColor:this.DateTimeColor};return titleItem;};this.ForamtTime=function(time,format,TitleID){if(!IFrameSplitOperator.IsNumber(time))return null;var titleItem={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),TitleColor:this.TitleColor,Text:IFrameSplitOperator.FormatTimeString(time,format,this.LanguageID),TextColor:this.DateTimeColor};return titleItem;};this.ForamtPrice=function(price,defaultfloatPrecision,TitleID){if(!IFrameSplitOperator.IsNumber(price))return null;var titleItem={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),TitleColor:this.TitleColor,Text:price.toFixed(defaultfloatPrecision),TextColor:this.GetColor(price,this.YClose)};return titleItem;};this.ForamtIncrease=function(price,TitleID){if(!IFrameSplitOperator.IsNumber(price)||price==0)return null;var value=(price-this.YClose)/this.YClose*100;var titleItem={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),TitleColor:this.TitleColor,Text:value.toFixed(2)+'%',TextColor:this.GetColor(value,0)};return titleItem;};this.FormatVol=function(vol,TitleID){if(!IFrameSplitOperator.IsNumber(vol))return null;var titleItem={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),TitleColor:this.TitleColor,Text:IFrameSplitOperator.FromatIntegerString(vol,2,this.LanguageID),TextColor:this.VolColor};return titleItem;};}//股票信息
4629
4632
  function StockInfoExtendChartPaint(){this.newMethod=IExtendChartPainting;//派生
4630
4633
  this.newMethod();delete this.newMethod;this.Left=80;this.Right=1;this.Top=1;this.Bottom=1;this.BorderColor=g_JSChartResource.FrameBorderPen;this.Symbol;this.Name;this.TitleFont=["14px 微软雅黑"];this.Draw=function(){var left=this.ChartBorder.GetRight()+this.Left;var right=this.ChartBorder.GetChartWidth()-this.Right;var y=this.Top+18;var middle=left+(right-left)/2;if(this.Symbol&&this.Name){this.Canvas.font=this.TitleFont[0];this.Canvas.textAlign="right";this.Canvas.textBaseline="bottom";this.Canvas.fillText(this.Symbol,middle-2,y);this.Canvas.textAlign="left";this.Canvas.fillText(this.Name,middle+2,y);};this.Canvas.strokeStyle=this.BorderColor;this.Canvas.moveTo(left,y);this.Canvas.lineTo(right,y);this.Canvas.stroke();y+=30;this.DrawBorder();};this.DrawBorder=function(){var left=this.ChartBorder.GetRight()+this.Left;var right=this.ChartBorder.GetChartWidth()-this.Right;var top=this.Top;var bottom=this.ChartBorder.GetChartHeight()-this.Bottom;this.Canvas.strokeStyle=this.BorderColor;this.Canvas.strokeRect(left,top,right-left,bottom-top);};}//筹码分布
4631
4634
  function StockChip(){this.newMethod=IExtendChartPainting;//派生
@@ -5338,7 +5341,7 @@ var emptyData={ClientPos:this.PointInfo.ClientPos,X:this.PointInfo.Point.X,Y:thi
5338
5341
  var item=data.Data;var isLastOne=data.IsLastOne;var aryText=[];//{Color:, Text: }
5339
5342
  if(this.IsShowName)aryText.push({Text:this.Name,Color:this.NameColor});if(this.IsShowDate||this.IsShowTime){var bShowUpdateTime=false;//是否显示了更新时间
5340
5343
  if(isLastOne&&this.ShowLastDataFormat==1){if(this.Data&&this.Data.UpdateTime&&IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Date)&&IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Time)){var text=IFrameSplitOperator.FormatTimeString(this.Data.UpdateTime.Time,"HH:MM:SS");aryText.push({Text:text,Color:this.DateTimeColor});bShowUpdateTime=true;}}if(!bShowUpdateTime){if(this.TimeFormat)//指定时间格式
5341
- {var strDate=null,strTime=null,text=null;if(this.IsShowDate)strDate=IFrameSplitOperator.FormatDateString("YYYY-MM-DD",item.Date);if(this.IsShowTime)strTime=IFrameSplitOperator.FormatTimeString(item.Time,this.TimeFormat);if(strDate&&strTime)text=strDate+' '+strTime;else if(strDate)text=strDate;else if(strTime)text=strTime;if(text)aryText.push({Text:text,Color:this.DateTimeColor});}else{var text=IFrameSplitOperator.FormatDateTimeString(item.DateTime,this.IsShowDate,this.IsShowTime);aryText.push({Text:text,Color:this.DateTimeColor});}}}var close=item.Close;var increase=item.Increase;var vol=item.Vol;var amount=item.Amount;if(IFrameSplitOperator.IsNumber(close)){var color=this.GetColor(close,this.YClose);var text=g_JSChartLocalization.GetText('MTitle-Close',this.LanguageID)+close.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}if(IFrameSplitOperator.IsNumber(increase)){var color=this.GetColor(increase,0);var text=g_JSChartLocalization.GetText('MTitle-Increase',this.LanguageID)+increase.toFixed(2)+'%';aryText.push({Text:text,Color:color});}var isShowAvPrice=true;var upperSymbol=this.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsET(upperSymbol)&&!MARKET_SUFFIX_NAME.IsETShowAvPrice(upperSymbol))isShowAvPrice=false;else if(MARKET_SUFFIX_NAME.IsShowAvPrice&&!MARKET_SUFFIX_NAME.IsShowAvPrice(upperSymbol))isShowAvPrice=false;if(IFrameSplitOperator.IsNumber(item.AvPrice)&&isShowAvPrice&&this.IsShowAveragePrice){var color=this.GetColor(item.AvPrice,this.YClose);var text=g_JSChartLocalization.GetText('MTitle-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}if(IFrameSplitOperator.IsNumber(vol)){var text=g_JSChartLocalization.GetText('MTitle-Vol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(vol,2,this.LanguageID);aryText.push({Text:text,Color:this.VolColor});}if(IFrameSplitOperator.IsNumber(amount)){var text=g_JSChartLocalization.GetText('MTitle-Amount',this.LanguageID)+IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);aryText.push({Text:text,Color:this.AmountColor});}if(IFrameSplitOperator.IsNumber(item.Position)){var text=g_JSChartLocalization.GetText('MTitle-Position',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Position,2,this.LanguageID);aryText.push({Text:text,Color:this.VolColor});}if(isLastOne&&this.ShowLastDataFormat==0)//显示数据最后的更新时间
5344
+ {var strDate=null,strTime=null,text=null;if(this.IsShowDate)strDate=IFrameSplitOperator.FormatDateString("YYYY-MM-DD",item.Date);if(this.IsShowTime)strTime=IFrameSplitOperator.FormatTimeString(item.Time,this.TimeFormat);if(strDate&&strTime)text=strDate+' '+strTime;else if(strDate)text=strDate;else if(strTime)text=strTime;if(text)aryText.push({Text:text,Color:this.DateTimeColor});}else{var text=IFrameSplitOperator.FormatDateTimeString(item.DateTime,this.IsShowDate,this.IsShowTime);aryText.push({Text:text,Color:this.DateTimeColor});}}}var close=item.Close;var increase=item.Increase;var vol=item.Vol;var amount=item.Amount;var yClose=item.YClose;if(!IFrameSplitOperator.IsNumber(yClose))yClose=this.YClose;if(IFrameSplitOperator.IsNumber(close)){var color=this.GetColor(close,yClose);var text=g_JSChartLocalization.GetText('MTitle-Close',this.LanguageID)+close.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}if(IFrameSplitOperator.IsNumber(increase)){var color=this.GetColor(increase,0);var text=g_JSChartLocalization.GetText('MTitle-Increase',this.LanguageID)+increase.toFixed(2)+'%';aryText.push({Text:text,Color:color});}var isShowAvPrice=true;var upperSymbol=this.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsET(upperSymbol)&&!MARKET_SUFFIX_NAME.IsETShowAvPrice(upperSymbol))isShowAvPrice=false;else if(MARKET_SUFFIX_NAME.IsShowAvPrice&&!MARKET_SUFFIX_NAME.IsShowAvPrice(upperSymbol))isShowAvPrice=false;if(IFrameSplitOperator.IsNumber(item.AvPrice)&&isShowAvPrice&&this.IsShowAveragePrice){var color=this.GetColor(item.AvPrice,yClose);var text=g_JSChartLocalization.GetText('MTitle-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}if(IFrameSplitOperator.IsNumber(vol)){var text=g_JSChartLocalization.GetText('MTitle-Vol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(vol,2,this.LanguageID);aryText.push({Text:text,Color:this.VolColor});}if(IFrameSplitOperator.IsNumber(amount)){var text=g_JSChartLocalization.GetText('MTitle-Amount',this.LanguageID)+IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);aryText.push({Text:text,Color:this.AmountColor});}if(IFrameSplitOperator.IsNumber(item.Position)){var text=g_JSChartLocalization.GetText('MTitle-Position',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Position,2,this.LanguageID);aryText.push({Text:text,Color:this.VolColor});}if(isLastOne&&this.ShowLastDataFormat==0)//显示数据最后的更新时间
5342
5345
  {if(this.Data&&this.Data.UpdateTime&&IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Date)&&IFrameSplitOperator.IsNumber(this.Data.UpdateTime.Time)){var text=g_JSChartLocalization.GetText('MTitle-UpdateTime',this.LanguageID)+IFrameSplitOperator.FormatTimeString(this.Data.UpdateTime.Time,"HH:MM:SS");aryText.push({Text:text,Color:this.DateTimeColor});}}//叠加股票的名字
5343
5346
  if(IFrameSplitOperator.IsNonEmptyArray(this.OverlayChartPaint)){for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Symbol||!item.Title)continue;var clrText=item.Color;var text='['+item.Title+']';aryText.push({Text:text,Color:clrText});}}return{AryText:aryText};};this.DrawItem=function(item,isLastOne)//isLastOne 是否是最后一个数据
5344
5347
  {if(!item)return;var pixelRatio=GetDevicePixelRatio();var isHScreen=this.Frame.IsHScreen===true;var border=this.Frame.GetBorder();var left=border.Left;var bottom=border.Top-this.Frame.ChartBorder.Top/2;var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
@@ -5350,11 +5353,11 @@ var xText=border.ChartWidth;var yText=border.Top;this.Canvas.translate(xText,yTe
5350
5353
  this.FormatCallAuctionTitle=function(data){var aryText=[];//{ Color: Text: }
5351
5354
  var defaultfloatPrecision=GetfloatPrecision(this.Symbol);//价格小数位数
5352
5355
  //股票名称
5353
- if(this.IsShowName)aryText.push({Text:this.Name,Color:this.NameColor});if(data&&data.Data){var item=data.Data;var text,strTime,strDate;strDate=IFrameSplitOperator.FormatDateString(item.Date);//时间
5356
+ if(this.IsShowName)aryText.push({Text:this.Name,Color:this.NameColor});if(data&&data.Data){var item=data.Data;var text,strTime,strDate;strDate=IFrameSplitOperator.FormatDateString(item.Date);var yClose=item.YClose;//时间
5354
5357
  if(data.Ver==1.0)strTime=IFrameSplitOperator.FormatTimeString(item.Time,"HH:MM");else strTime=IFrameSplitOperator.FormatTimeString(item.Time,"HH:MM:SS");if(data.Explain=="MultiDayBeforeOpen"||data.Explain=="MultiDayAfterClose")text=strDate+' '+strTime;else text=strTime;aryText.push({Text:text,Color:this.DateTimeColor});//匹配价
5355
- if(IFrameSplitOperator.IsNumber(item.Price)&&this.CallAuctionShowTitle.has("MTitle-AC-Price")){var color=this.GetColor(item.Price,this.YClose);var filedName='MTitle-AC-Price';if(data.Ver==1.0)filedName="MTitle-Close";var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+item.Price.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}//竞价涨幅
5356
- if(IFrameSplitOperator.IsPlusNumber(this.YClose)&&IFrameSplitOperator.IsNumber(item.Price)&&this.CallAuctionShowTitle.has("MTitle-AC-Increase")){var value=(item.Price-this.YClose)/this.YClose*100;var color=this.GetColor(value,0);var filedName='MTitle-AC-Increase';if(data.Ver==1.0)filedName="MTitle-Increase";var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+value.toFixed(2)+"%";aryText.push({Text:text,Color:color});}//均价
5357
- if(IFrameSplitOperator.IsNumber(item.AvPrice)&&this.CallAuctionShowTitle.has("MTitle-AC-AvPrice")){var color=this.GetColor(item.AvPrice,this.YClose);var text=g_JSChartLocalization.GetText('MTitle-AC-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}//匹配量
5358
+ if(IFrameSplitOperator.IsNumber(item.Price)&&this.CallAuctionShowTitle.has("MTitle-AC-Price")){var color=this.GetColor(item.Price,yClose);var filedName='MTitle-AC-Price';if(data.Ver==1.0)filedName="MTitle-Close";var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+item.Price.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}//竞价涨幅
5359
+ if(IFrameSplitOperator.IsPlusNumber(yClose)&&IFrameSplitOperator.IsNumber(item.Price)&&this.CallAuctionShowTitle.has("MTitle-AC-Increase")){var value=(item.Price-yClose)/yClose*100;var color=this.GetColor(value,0);var filedName='MTitle-AC-Increase';if(data.Ver==1.0)filedName="MTitle-Increase";var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+value.toFixed(2)+"%";aryText.push({Text:text,Color:color});}//均价
5360
+ if(IFrameSplitOperator.IsNumber(item.AvPrice)&&this.CallAuctionShowTitle.has("MTitle-AC-AvPrice")){var color=this.GetColor(item.AvPrice,yClose);var text=g_JSChartLocalization.GetText('MTitle-AC-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);aryText.push({Text:text,Color:color});}//匹配量
5358
5361
  if(IFrameSplitOperator.IsNumber(item.Vol[0])&&this.CallAuctionShowTitle.has("MTitle-AC-Vol")){var filedName='MTitle-AC-Vol';if(data.Ver==1.0)filedName="MTitle-Vol";var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Vol[0],2);aryText.push({Text:text,Color:this.VolColor});}//未匹配量
5359
5362
  if(IFrameSplitOperator.IsNumber(item.Vol[1])&&this.CallAuctionShowTitle.has("MTitle-AC-NotMatchVol")){var text=g_JSChartLocalization.GetText('MTitle-AC-NotMatchVol',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(item.Vol[1],2);aryText.push({Text:text,Color:this.VolColor});}if(item.ExtendData&&IFrameSplitOperator.IsNonEmptyArray(item.ExtendData.Amount)){var aryAmount=item.ExtendData.Amount;if(IFrameSplitOperator.IsNumber(aryAmount[0])&&this.CallAuctionShowTitle.has("MTitle-AC-Amount"))//匹配量金额
5360
5363
  {var text=g_JSChartLocalization.GetText('MTitle-AC-Amount',this.LanguageID)+IFrameSplitOperator.FromatIntegerString(aryAmount[0],2);aryText.push({Text:text,Color:this.AmountColor});}if(IFrameSplitOperator.IsNumber(aryAmount[1])&&this.CallAuctionShowTitle.has("MTitle-AC-NotMatchAmount"))//未匹配量金额
@@ -7425,7 +7428,7 @@ if(this.IsPhoneDragging(e)){var drag={Click:{},LastMove:{}};//LastMove=最后移
7425
7428
  var touches=this.GetToucheData(e,this.IsForceLandscape);var pt=this.PointAbsoluteToRelative(touches[0].clientX,touches[0].clientY,true);if(this.TryClickLock||this.TryClickIndexTitle)//指标枷锁区域 , 指标标题点击
7426
7429
  {var x=pt.X;var y=pt.Y;if(this.TryClickLock&&this.TryClickLock(x,y))return;if(this.TryClickIndexTitle&&this.TryClickIndexTitle(x,y))return;}if(this.ClickFrameButton){var button=this.Frame.PtInButtons(pt.X,pt.Y);if(button){this.ClickFrameButton(button,e);return;}}drag.Click.X=touches[0].clientX;drag.Click.Y=touches[0].clientY;drag.LastMove.X=touches[0].clientX;drag.LastMove.Y=touches[0].clientY;var self=this;var T_ShowCorssCursor=function T_ShowCorssCursor()//临时函数(Temp_) T_开头
7427
7430
  {if(self.ChartCorssCursor.IsShow===true)//移动十字光标
7428
- {var pixelTatio=GetDevicePixelRatio();var x=drag.Click.X-uielement.getBoundingClientRect().left*pixelTatio;var y=drag.Click.Y-uielement.getBoundingClientRect().top*pixelTatio;self.OnMouseMove(x,y,e);}};if(this.ChartDrawOption.IsLockScreen){this.MouseDrag=drag;if(this.SelectChartDrawPicture)this.SelectChartDrawPicture.IsSelected=false;this.SelectChartDrawPicture=null;if(this.CurrentChartDrawPicture)//画图工具模式
7431
+ {var pt=self.PointAbsoluteToRelative(drag.Click.X,drag.Click.Y,true);var x=pt.X;var y=pt.Y;self.OnMouseMove(x,y,e);}};if(this.ChartDrawOption.IsLockScreen){this.MouseDrag=drag;if(this.SelectChartDrawPicture)this.SelectChartDrawPicture.IsSelected=false;this.SelectChartDrawPicture=null;if(this.CurrentChartDrawPicture)//画图工具模式
7429
7432
  {var drawPicture=this.CurrentChartDrawPicture;if(drawPicture.Status==2)this.SetChartDrawPictureThirdPoint(drag.Click.X,drag.Click.Y,true);else{this.SetChartDrawPictureFirstPoint(drag.Click.X,drag.Click.Y,true);//只有1个点 直接完成
7430
7433
  if(this.FinishChartDrawPicturePoint())this.DrawDynamicInfo({Corss:false,Tooltip:false});}if(e.cancelable)e.preventDefault();return;}else{var drawPictrueData={};var pixelTatio=GetDevicePixelRatio();//鼠标移动坐标是原始坐标 需要乘以放大倍速
7431
7434
  drawPictrueData.X=touches[0].clientX-uielement.getBoundingClientRect().left;drawPictrueData.Y=touches[0].clientY-uielement.getBoundingClientRect().top;if(this.GetChartDrawPictureByPoint(drawPictrueData)){drawPictrueData.ChartDrawPicture.Status=20;drawPictrueData.ChartDrawPicture.ValueToPoint();drawPictrueData.ChartDrawPicture.MovePointIndex=drawPictrueData.PointIndex;drawPictrueData.ChartDrawPicture.IsSelected=true;this.CurrentChartDrawPicture=drawPictrueData.ChartDrawPicture;this.SelectChartDrawPicture=drawPictrueData.ChartDrawPicture;var _event2=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_DRAWPICTURE);//选中画图工具事件
@@ -7725,27 +7728,27 @@ this.GetSelectRectData=function(selectData){if(Math.abs(selectData.XStart-select
7725
7728
  {var subFrame=this.Frame.SubFrame[1];if(subFrame.Frame)subFrame.Frame.XYSplit=true;}};this.ExportMainData=function(data,option){var aryData=data.ExportMinuteData(option);//导出K线
7726
7729
  return aryData;};this.DisplayLatest=function(){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DISPLAY_LATEST);//选中画图工具事件
7727
7730
  if(event){var sendData={PreventDefault:false};event.Callback(event,sendData,this);if(sendData.PreventDefault)return;}this.CursorIndex=null;this.LastPoint.X=0;this.LastPoint.Y=0;this.GlobalOption.IsDisplayLatest=true;this.DrawDynamicInfo();};this.TryClickIndexTitle=function(x,y){for(var i=0;i<this.TitlePaint.length;++i){var item=this.TitlePaint[i];if(!item.IsClickTitle)continue;if(!item.IsClickTitle(x,y))continue;var data={Point:{X:x,Y:y},Title:item.Title,FrameID:item.Frame.Identify};JSConsole.Chart.Log('[MinuteChartContainer::TryClickIndexTitle] click title ',data);var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_INDEXTITLE);if(event&&event.Callback)event.Callback(event,data,this);return true;}return false;};}//盘前数据
7728
- MinuteChartContainer.JsonDataToBeforeOpenData=function(data){var symbol=data.stock[0].symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var preClose=data.stock[0].yclose;//前一个数据价格
7731
+ MinuteChartContainer.JsonDataToBeforeOpenData=function(data){var symbol=data.stock[0].symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var yClose=data.stock[0].yclos;var preClose=data.stock[0].yclose;//前一个数据价格
7729
7732
  var stockData=data.stock[0];var date=stockData.date;//日期
7730
7733
  var beforeOpenData={Data:[],TotalCount:15,Ver:1.0,Date:date};var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA;//扩展数据序号
7731
- if(stockData.beforeinfo){if(IFrameSplitOperator.IsNumber(stockData.beforeinfo.totalcount))beforeOpenData.TotalCount=stockData.beforeinfo.totalcount;if(IFrameSplitOperator.IsNumber(stockData.beforeinfo.ver))beforeOpenData.Ver=stockData.beforeinfo.ver;}if(beforeOpenData.Ver==1.0){if(IFrameSplitOperator.IsNonEmptyArray(stockData.before)){for(var i=0;i<stockData.before.length;++i){var item=new BeforeOpenData();var jsData=stockData.before[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];if(!item.Price)item.Price=preClose;else preClose=item.Price;if(isSHSZ)item.Vol[0]=jsData[2]/100;//沪深股票原始单位股
7734
+ if(stockData.beforeinfo){if(IFrameSplitOperator.IsNumber(stockData.beforeinfo.totalcount))beforeOpenData.TotalCount=stockData.beforeinfo.totalcount;if(IFrameSplitOperator.IsNumber(stockData.beforeinfo.ver))beforeOpenData.Ver=stockData.beforeinfo.ver;}if(beforeOpenData.Ver==1.0){if(IFrameSplitOperator.IsNonEmptyArray(stockData.before)){for(var i=0;i<stockData.before.length;++i){var item=new BeforeOpenData();var jsData=stockData.before[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];if(!item.Price)item.Price=preClose;else preClose=item.Price;if(isSHSZ)item.Vol[0]=jsData[2]/100;//沪深股票原始单位股
7732
7735
  else item.Vol[0]=jsData[2];item.Amount=jsData[3];if(IFrameSplitOperator.IsNumber(jsData[4])&&jsData[4]>19000101)//日期
7733
- item.Date=jsData[4];item.DateTime=item.Date+' '+item.Time;beforeOpenData.Data.push(item);}}}else if(beforeOpenData.Ver==2.0){var max=0;for(var i in stockData.before){var item=new BeforeOpenData();var jsData=stockData.before[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.Vol[0]=jsData[2];//匹配量
7736
+ item.Date=jsData[4];item.DateTime=item.Date+' '+item.Time;beforeOpenData.Data.push(item);}}}else if(beforeOpenData.Ver==2.0){var max=0;for(var i in stockData.before){var item=new BeforeOpenData();var jsData=stockData.before[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.Vol[0]=jsData[2];//匹配量
7734
7737
  item.Vol[1]=jsData[3];//未匹配量
7735
7738
  item.ColorID=jsData[4];//柱子颜色ID
7736
7739
  if(IFrameSplitOperator.IsNumber(jsData[6]))item.Date=jsData[6];//日期
7737
- item.DateTime=item.Date+' '+item.Time+')';var totalVol=item.Vol[0]+item.Vol[1];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];beforeOpenData.Data.push(item);}beforeOpenData.VolMax=max;beforeOpenData.VolMin=0;}else if(beforeOpenData.Ver==3.0){var max=0;for(var i in stockData.before){var item=new BeforeOpenData();var jsData=stockData.before[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.AvPrice=jsData[2];//均价
7740
+ item.DateTime=item.Date+' '+item.Time+')';var totalVol=item.Vol[0]+item.Vol[1];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];beforeOpenData.Data.push(item);}beforeOpenData.VolMax=max;beforeOpenData.VolMin=0;}else if(beforeOpenData.Ver==3.0){var max=0;for(var i in stockData.before){var item=new BeforeOpenData();var jsData=stockData.before[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.AvPrice=jsData[2];//均价
7738
7741
  item.Vol[0]=jsData[3];//匹配量
7739
7742
  item.ColorID=jsData[4];//柱子颜色ID
7740
7743
  item.DateTime=date.toString()+" "+item.Time.toString();var totalVol=item.Vol[0];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];beforeOpenData.Data.push(item);}beforeOpenData.VolMax=max;beforeOpenData.VolMin=0;}return beforeOpenData;};//收盘集合竞价
7741
- MinuteChartContainer.JsonDataToAfterCloseData=function(data){var preClose=data.stock[0].yclose;//前一个数据价格
7744
+ MinuteChartContainer.JsonDataToAfterCloseData=function(data){var yClose=data.stock[0].yclose;var preClose=data.stock[0].yclose;//前一个数据价格
7742
7745
  var stockData=data.stock[0];var date=stockData.date;//日期
7743
7746
  if(!stockData.afterinfo)return null;var afterCloseData={Data:[],TotalCount:3*60,Ver:2.0,Date:date};var item=stockData.afterinfo;if(IFrameSplitOperator.IsNumber(item.totalcount))afterCloseData.TotalCount=item.totalcount;if(IFrameSplitOperator.IsNumber(item.ver))afterCloseData.Ver=item.ver;var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_AFTERCLOSE_EXTENDDATA;//扩展数据序号
7744
- if(afterCloseData.Ver==1.0){for(var i=0;i<stockData.after.length;++i){var item=new AfterCloseData();var jsData=stockData.after[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.Vol[0]=jsData[2];item.Amount=jsData[3];if(IFrameSplitOperator.IsNumber(jsData[4]))//日期
7745
- item.Date=jsData[4];item.DateTime=item.Date+' '+item.Time;afterCloseData.Data.push(item);}}else if(afterCloseData.Ver==2.0){var max=0;for(var i in stockData.after){var item=new AfterCloseData();var jsData=stockData.after[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.Vol[0]=jsData[2];//匹配量
7747
+ if(afterCloseData.Ver==1.0){for(var i=0;i<stockData.after.length;++i){var item=new AfterCloseData();var jsData=stockData.after[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.Vol[0]=jsData[2];item.Amount=jsData[3];if(IFrameSplitOperator.IsNumber(jsData[4]))//日期
7748
+ item.Date=jsData[4];item.DateTime=item.Date+' '+item.Time;afterCloseData.Data.push(item);}}else if(afterCloseData.Ver==2.0){var max=0;for(var i in stockData.after){var item=new AfterCloseData();var jsData=stockData.after[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.Vol[0]=jsData[2];//匹配量
7746
7749
  item.Vol[1]=jsData[3];//未匹配量
7747
7750
  item.ColorID=jsData[4];//柱子颜色ID
7748
- item.DateTime=date.toString()+" "+item.Time.toString();var totalVol=item.Vol[0]+item.Vol[1];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];afterCloseData.Data.push(item);}afterCloseData.VolMax=max;afterCloseData.VolMin=0;}else if(afterCloseData.Ver==3.0){var max=0;for(var i in stockData.after){var item=new AfterCloseData();var jsData=stockData.after[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.AvPrice=jsData[2];//均价
7751
+ item.DateTime=date.toString()+" "+item.Time.toString();var totalVol=item.Vol[0]+item.Vol[1];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];afterCloseData.Data.push(item);}afterCloseData.VolMax=max;afterCloseData.VolMin=0;}else if(afterCloseData.Ver==3.0){var max=0;for(var i in stockData.after){var item=new AfterCloseData();var jsData=stockData.after[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.AvPrice=jsData[2];//均价
7749
7752
  item.Vol[0]=jsData[3];//匹配量
7750
7753
  item.ColorID=jsData[4];//柱子颜色ID
7751
7754
  item.DateTime=date.toString()+" "+item.Time.toString();var totalVol=item.Vol[0];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];afterCloseData.Data.push(item);}afterCloseData.VolMax=max;afterCloseData.VolMin=0;}return afterCloseData;};//API 返回数据 转化为array[]
@@ -7756,7 +7759,7 @@ var aryMinuteData=[];var preClose=data.stock[0].yclose;//前一个数据价格
7756
7759
  var preAvPrice=data.stock[0].yclose;//前一个均价
7757
7760
  var yClose=data.stock[0].yclose;if(isFutures&&data.stock[0].yclearing)yClose=preClose=preAvPrice=data.stock[0].yclearing;//期货使用昨结算价
7758
7761
  if(!IFrameSplitOperator.IsNonEmptyArray(data.stock[0].minute))return aryMinuteData;var date=data.stock[0].date;//默认使用外部日期, 但跨天的 走势图使用内部的日期
7759
- for(var i=0;i<data.stock[0].minute.length;++i){var jsData=data.stock[0].minute[i];var item=new MinuteData();item.Close=jsData.price;item.Open=jsData.open;item.High=jsData.high;item.Low=jsData.low;if(isSHSZ)item.Vol=jsData.vol/100;//沪深股票原始单位股
7762
+ for(var i=0;i<data.stock[0].minute.length;++i){var jsData=data.stock[0].minute[i];var item=new MinuteData();item.YClose=yClose;item.Close=jsData.price;item.Open=jsData.open;item.High=jsData.high;item.Low=jsData.low;if(isSHSZ)item.Vol=jsData.vol/100;//沪深股票原始单位股
7760
7763
  else item.Vol=jsData.vol;item.Amount=jsData.amount;if(jsData.date>0)date=jsData.date;//分钟数据中有日期 优先使用
7761
7764
  item.DateTime=date.toString()+" "+jsData.time.toString();item.Date=date;item.Time=jsData.time;if(isFutures||isSHO||isSZO)item.Position=jsData.position;//期货 期权有持仓
7762
7765
  else if(IFrameSplitOperator.IsNumber(jsData.position))item.Position=jsData.position;item.Increase=jsData.increase;item.Risefall=jsData.risefall;item.AvPrice=jsData.avprice;if(IFrameSplitOperator.IsNumber(jsData.lead))item.Lead=jsData.lead;//领先指标 指数才有
@@ -7789,7 +7792,7 @@ var preAvPrice=null;//上一个均价
7789
7792
  var yClearing=dayData.yclearing;//昨结算价
7790
7793
  //var preAvPrice=data.stock[0].yclose; //前一个均价
7791
7794
  for(var j in dayData.minute){var jsData=dayData.minute[j];if(jsData[2])preClose=jsData[2];//保存上一个收盘数据
7792
- var item=new MinuteData();item.Close=jsData[2];item.Open=jsData[1];item.High=jsData[3];item.Low=jsData[4];if(isSHSZ)item.Vol=jsData[5]/100;//原始单位股
7795
+ var item=new MinuteData();item.YClose=yClose;item.Close=jsData[2];item.Open=jsData[1];item.High=jsData[3];item.Low=jsData[4];if(isSHSZ)item.Vol=jsData[5]/100;//原始单位股
7793
7796
  else item.Vol=jsData[5];item.Amount=jsData[6];if(7<jsData.length&&jsData[7]>0)item.AvPrice=jsData[7];//均价
7794
7797
  item.DateTime=date.toString()+" "+jsData[0].toString();item.Date=date;item.Time=jsData[0];if(8<jsData.length&&jsData[8]>0){item.Date=jsData[8];//日期
7795
7798
  item.DateTime=item.Date.toString()+" "+jsData[0].toString();}if((isFutures||isSHO||isSZO)&&9<jsData.length)item.Position=jsData[9];//持仓
@@ -7802,16 +7805,16 @@ if(!IFrameSplitOperator.IsNumber(item.Close))//当前没有价格 使用上一
7802
7805
  //if (item.Low<=0) item.Low=null;
7803
7806
  //if (item.AvPrice<=0) item.AvPrice=null;
7804
7807
  //均价太大 可能是后台算错了
7805
- if(item.AvPrice&&isSHSZ){var checkValue=Math.abs(item.AvPrice-item.Close);if(checkValue>item.Close*0.13)item.AvPrice=preAvPrice;}if(jsData.length>7&&jsData[7]>0&&item.AvPrice===jsData[7])preAvPrice=jsData[7];if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];minuteData[j]=item;}var newData=new ChartData();newData.Data=minuteData;newData.YClose=yClose;newData.Close=dayData.close;newData.Date=date;if(IFrameSplitOperator.IsNumber(yClearing))newData.YClearing=yClearing;result.push(newData);}return result;};MinuteChartContainer.JsonDataToHistoryMinuteLineColorData=function(data){if(!data)return null;var aryLineColor=[];for(var i in data.data){var dayData=data.data[i];if(!dayData.linecolor)continue;for(var j in dayData.linecolor.data){var item=dayData.linecolor.data[j];if(!IFrameSplitOperator.IsNumber(item.type)||!IFrameSplitOperator.IsNumber(item.date)||!IFrameSplitOperator.IsNumber(item.start)||!IFrameSplitOperator.IsNumber(item.end)||!item.color)continue;if(item.start>=item.end)continue;var newItem={Type:item.type,Date:item.date,Start:item.start,End:item.end,Color:item.color};if(IFrameSplitOperator.IsPlusNumber(item.linewidth))newItem.LineWidth=item.linewidth;aryLineColor.push(newItem);}}return aryLineColor.length>0?aryLineColor:null;};MinuteChartContainer.JsonDataToCallAuctionItem=function(data,callAuctionData,isBeforeOpen,symbol){var isSHSZ=false;if(symbol){var upperSymbol=symbol.toUpperCase();isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);}var date=callAuctionData.Date;var extendDataIndex=isBeforeOpen?JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA:JSCHART_DATA_FIELD_ID.MINUTE_AFTERCLOSE_EXTENDDATA;//扩展数据序号
7806
- if(callAuctionData.Ver==1.0){var preClose=null;for(var i in data){var item=isBeforeOpen?new BeforeOpenData():new AfterCloseData();var jsData=data[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];if(!item.Price)item.Price=preClose;else preClose=item.Price;item.Vol[0]=isSHSZ?jsData[2]/100:jsData[2];//沪深股票原始单位股
7808
+ if(item.AvPrice&&isSHSZ){var checkValue=Math.abs(item.AvPrice-item.Close);if(checkValue>item.Close*0.13)item.AvPrice=preAvPrice;}if(jsData.length>7&&jsData[7]>0&&item.AvPrice===jsData[7])preAvPrice=jsData[7];if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];minuteData[j]=item;}var newData=new ChartData();newData.Data=minuteData;newData.YClose=yClose;newData.Close=dayData.close;newData.Date=date;if(IFrameSplitOperator.IsNumber(yClearing))newData.YClearing=yClearing;result.push(newData);}return result;};MinuteChartContainer.JsonDataToHistoryMinuteLineColorData=function(data){if(!data)return null;var aryLineColor=[];for(var i in data.data){var dayData=data.data[i];if(!dayData.linecolor)continue;for(var j in dayData.linecolor.data){var item=dayData.linecolor.data[j];if(!IFrameSplitOperator.IsNumber(item.type)||!IFrameSplitOperator.IsNumber(item.date)||!IFrameSplitOperator.IsNumber(item.start)||!IFrameSplitOperator.IsNumber(item.end)||!item.color)continue;if(item.start>=item.end)continue;var newItem={Type:item.type,Date:item.date,Start:item.start,End:item.end,Color:item.color};if(IFrameSplitOperator.IsPlusNumber(item.linewidth))newItem.LineWidth=item.linewidth;aryLineColor.push(newItem);}}return aryLineColor.length>0?aryLineColor:null;};MinuteChartContainer.JsonDataToCallAuctionItem=function(data,callAuctionData,isBeforeOpen,symbol){var isSHSZ=false;if(symbol){var upperSymbol=symbol.toUpperCase();isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);}var date=callAuctionData.Date;var yClose=callAuctionData.YClose;var extendDataIndex=isBeforeOpen?JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA:JSCHART_DATA_FIELD_ID.MINUTE_AFTERCLOSE_EXTENDDATA;//扩展数据序号
7809
+ if(callAuctionData.Ver==1.0){var preClose=null;for(var i in data){var item=isBeforeOpen?new BeforeOpenData():new AfterCloseData();var jsData=data[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];if(!item.Price)item.Price=preClose;else preClose=item.Price;item.Vol[0]=isSHSZ?jsData[2]/100:jsData[2];//沪深股票原始单位股
7807
7810
  item.Amount=jsData[3];if(IFrameSplitOperator.IsNumber(jsData[4]))//日期
7808
- item.Date=jsData[4];item.DateTime=item.Date+' '+item.Time;callAuctionData.Data.push(item);}}else if(callAuctionData.Ver==2.0){var max=0;for(var i in data){var item=isBeforeOpen?new BeforeOpenData():new AfterCloseData();var jsData=data[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.Vol[0]=jsData[2];//匹配量
7811
+ item.Date=jsData[4];item.DateTime=item.Date+' '+item.Time;callAuctionData.Data.push(item);}}else if(callAuctionData.Ver==2.0){var max=0;for(var i in data){var item=isBeforeOpen?new BeforeOpenData():new AfterCloseData();var jsData=data[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.Vol[0]=jsData[2];//匹配量
7809
7812
  item.Vol[1]=jsData[3];//未匹配量
7810
7813
  item.ColorID=jsData[4];//柱子颜色ID
7811
- item.DateTime=date.toString()+" "+item.Time.toString();var totalVol=item.Vol[0]+item.Vol[1];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];callAuctionData.Data.push(item);}callAuctionData.VolMax=max;callAuctionData.VolMin=0;}else if(beforeOpenData.Ver==3.0){var max=0;for(var i in data){var item=isBeforeOpen?new BeforeOpenData():new AfterCloseData();var jsData=data[i];item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.AvPrice=jsData[2];//均价
7814
+ item.DateTime=date.toString()+" "+item.Time.toString();var totalVol=item.Vol[0]+item.Vol[1];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];callAuctionData.Data.push(item);}callAuctionData.VolMax=max;callAuctionData.VolMin=0;}else if(beforeOpenData.Ver==3.0){var max=0;for(var i in data){var item=isBeforeOpen?new BeforeOpenData():new AfterCloseData();var jsData=data[i];item.YClose=yClose;item.Time=jsData[0];item.Date=date;item.Price=jsData[1];item.AvPrice=jsData[2];//均价
7812
7815
  item.Vol[0]=jsData[3];//匹配量
7813
7816
  item.ColorID=jsData[4];//柱子颜色ID
7814
- item.DateTime=date.toString()+" "+item.Time.toString();var totalVol=item.Vol[0];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];callAuctionData.Data.push(item);}callAuctionData.VolMax=max;callAuctionData.VolMin=0;}};MinuteChartContainer.JosnDataToBeforeOpenDataArray=function(data){if(!data||!data.data)return null;var aryDay=[];for(var i in data.data){var dayItem=data.data[i];var beforeOpenData={Data:[],TotalCount:15,Ver:1.0,Date:dayItem.date};if(dayItem.beforeinfo){if(IFrameSplitOperator.IsNumber(dayItem.beforeinfo.totalcount))beforeOpenData.TotalCount=dayItem.beforeinfo.totalcount;if(IFrameSplitOperator.IsNumber(dayItem.beforeinfo.ver))beforeOpenData.Ver=dayItem.beforeinfo.ver;}MinuteChartContainer.JsonDataToCallAuctionItem(dayItem.before,beforeOpenData,true,data.symbol);aryDay.push(beforeOpenData);}aryDay.sort(function(left,right){return left.Date-right.Date;});return aryDay;};MinuteChartContainer.JosnDataToAfterCloseDataArray=function(data){if(!data||!data.data)return null;var aryDay=[];for(var i in data.data){var dayItem=data.data[i];var afterCloseData={Data:[],TotalCount:15,Ver:1.0,Date:dayItem.date};if(dayItem.afterinfo){if(IFrameSplitOperator.IsNumber(dayItem.afterinfo.totalcount))afterCloseData.TotalCount=dayItem.afterinfo.totalcount;if(IFrameSplitOperator.IsNumber(dayItem.afterinfo.ver))afterCloseData.Ver=dayItem.afterinfo.ver;}MinuteChartContainer.JsonDataToCallAuctionItem(dayItem.after,afterCloseData,false,data.symbol);aryDay.push(afterCloseData);}aryDay.sort(function(left,right){return left.Date-right.Date;});return aryDay;};/*
7817
+ item.DateTime=date.toString()+" "+item.Time.toString();var totalVol=item.Vol[0];if(IFrameSplitOperator.IsNumber(jsData[5]))totalVol=jsData[5];if(totalVol>max)max=totalVol;if(jsData[extendDataIndex])item.ExtendData=jsData[extendDataIndex];callAuctionData.Data.push(item);}callAuctionData.VolMax=max;callAuctionData.VolMin=0;}};MinuteChartContainer.JosnDataToBeforeOpenDataArray=function(data){if(!data||!data.data)return null;var aryDay=[];for(var i in data.data){var dayItem=data.data[i];var beforeOpenData={Data:[],TotalCount:15,Ver:1.0,Date:dayItem.date,YClose:dayItem.yclose};if(dayItem.beforeinfo){if(IFrameSplitOperator.IsNumber(dayItem.beforeinfo.totalcount))beforeOpenData.TotalCount=dayItem.beforeinfo.totalcount;if(IFrameSplitOperator.IsNumber(dayItem.beforeinfo.ver))beforeOpenData.Ver=dayItem.beforeinfo.ver;}MinuteChartContainer.JsonDataToCallAuctionItem(dayItem.before,beforeOpenData,true,data.symbol);aryDay.push(beforeOpenData);}aryDay.sort(function(left,right){return left.Date-right.Date;});return aryDay;};MinuteChartContainer.JosnDataToAfterCloseDataArray=function(data){if(!data||!data.data)return null;var aryDay=[];for(var i in data.data){var dayItem=data.data[i];var afterCloseData={Data:[],TotalCount:15,Ver:1.0,Date:dayItem.date,YClose:dayItem.yclose};if(dayItem.afterinfo){if(IFrameSplitOperator.IsNumber(dayItem.afterinfo.totalcount))afterCloseData.TotalCount=dayItem.afterinfo.totalcount;if(IFrameSplitOperator.IsNumber(dayItem.afterinfo.ver))afterCloseData.Ver=dayItem.afterinfo.ver;}MinuteChartContainer.JsonDataToCallAuctionItem(dayItem.after,afterCloseData,false,data.symbol);aryDay.push(afterCloseData);}aryDay.sort(function(left,right){return left.Date-right.Date;});return aryDay;};/*
7815
7818
  历史分钟走势图
7816
7819
  */function HistoryMinuteChartContainer(uielement){this.newMethod=MinuteChartContainer;//派生
7817
7820
  this.newMethod(uielement);delete this.newMethod;this.HistoryMinuteApiUrl="http://127.0.0.1:8080/cache/minuteday/day/";this.ClassName='HistoryMinuteChartContainer';//创建主图K线画法
@@ -12475,7 +12478,7 @@ this.AreaColor=g_JSChartResource.ScrollBar.BGChart.AreaColor;//面积图颜色
12475
12478
  };this.Draw=function(){if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;this.Canvas.save();if(this.LineWidth>0)this.Canvas.lineWidth=this.LineWidth*GetDevicePixelRatio();var bottom=this.ChartBorder.GetBottom();this.Canvas.strokeStyle=this.Color;var bFirstPoint=true;var drawCount=0,x,y;var firstPoint={};for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];var value=item.Close;if(!IFrameSplitOperator.IsNumber(value))continue;x=this.ChartFrame.GetXFromIndex(i);y=this.ChartFrame.GetYFromData(value);if(bFirstPoint){this.Canvas.beginPath();this.Canvas.moveTo(x,y);bFirstPoint=false;firstPoint={X:x,Y:y};}else{this.Canvas.lineTo(x,y);}++drawCount;}if(drawCount>0){this.Canvas.stroke();this.Canvas.lineTo(x,bottom);this.Canvas.lineTo(firstPoint.X,bottom);this.Canvas.closePath();this.Canvas.fillStyle=this.AreaColor;this.Canvas.fill();}this.Canvas.restore();};this.GetMaxMin=function(){var range={Max:null,Min:null};if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return range;for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];var value=item.Close;if(!IFrameSplitOperator.IsNumber(value))continue;if(range.Max==null||range.Max<value)range.Max=value;if(range.Min==null||range.Min>value)range.Min=value;}return range;};}/********************************************************************************
12476
12479
  * 版本信息输出
12477
12480
  *
12478
- */var HQCHART_VERSION="1.1.12452";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n* HQChart Ver: '+HQCHART_VERSION+' \n* \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
12481
+ */var HQCHART_VERSION="1.1.12458";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n* HQChart Ver: '+HQCHART_VERSION+' \n* \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
12479
12482
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
12480
12483
  // BaseIndex:BaseIndex,
12481
12484
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -2,7 +2,7 @@
2
2
  "name": "hqchart",
3
3
  "description": "stock chart",
4
4
  "author": "jones2000",
5
- "version": "1.1.12453",
5
+ "version": "1.1.12459",
6
6
  "main": "lib/main.js",
7
7
  "private": false,
8
8
  "license": "Apache License 2.0",
package/src/jscommon/umychart.js CHANGED
@@ -1586,6 +1586,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
1586
1586
 
1587
1587
  if (!chart) return false;
1588
1588
 
1589
+ this.JSChartContainer=chart;
1590
+
1589
1591
  if (option.OnCreatedCallback) option.OnCreatedCallback(chart);
1590
1592
 
1591
1593
  //是否自动更新
@@ -17645,6 +17647,7 @@ function MinuteData()
17645
17647
  this.Date; //日期
17646
17648
  this.Position=null; //持仓量
17647
17649
  this.YClearing; //昨结算价
17650
+ this.YClose; //昨收价
17648
17651
 
17649
17652
  this.ExtendData; //扩展数据
17650
17653
  }
@@ -17657,7 +17660,8 @@ function BeforeOpenData()
17657
17660
  this.Price; //匹配的价格
17658
17661
  this.AvPrice; //均价
17659
17662
  this.Vol=[]; //[0]=匹配量 [1]=未匹配量
17660
- this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
17663
+ this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
17664
+ this.YClose; //昨收价
17661
17665
  }
17662
17666
 
17663
17667
  //收盘集合竞价
@@ -17668,7 +17672,8 @@ function AfterCloseData()
17668
17672
  this.Price; //匹配的价格
17669
17673
  this.AvPrice; //均价
17670
17674
  this.Vol=[]; //[0]=匹配量 [1]=未匹配量
17671
- this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
17675
+ this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
17676
+ this.YClose; //昨收价
17672
17677
  }
17673
17678
 
17674
17679
  //单指标数据
@@ -38011,6 +38016,7 @@ function MinuteTooltipPaint()
38011
38016
 
38012
38017
  var upperSymbol;
38013
38018
  this.YClose=this.TitlePaint.YClose;
38019
+ this.YClose=item.YClose;
38014
38020
  if (this.HQChart.Symbol) upperSymbol=this.HQChart.Symbol.toUpperCase();
38015
38021
  var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
38016
38022
 
@@ -38354,6 +38360,9 @@ function MinuteLeftTooltipPaint()
38354
38360
  if (drawData.Type==0) //连续交易
38355
38361
  {
38356
38362
  var item=drawData.Data;
38363
+ if (!item) return;
38364
+
38365
+ this.YClose=item.YClose;
38357
38366
  var titleItem=this.FormatDate(item.Date);
38358
38367
  if (titleItem) aryText.push(titleItem);
38359
38368
 
@@ -38389,6 +38398,8 @@ function MinuteLeftTooltipPaint()
38389
38398
  {
38390
38399
  var item=drawData.Data.Data;
38391
38400
  if (!item) return;
38401
+
38402
+ this.YClose=item.YClose;
38392
38403
  var titleItem=this.FormatDate(item.Date);
38393
38404
  if (titleItem) aryText.push(titleItem);
38394
38405
 
@@ -48124,10 +48135,12 @@ function DynamicMinuteTitlePainting()
48124
48135
  var increase=item.Increase;
48125
48136
  var vol=item.Vol;
48126
48137
  var amount=item.Amount;
48138
+ var yClose=item.YClose;
48139
+ if (!IFrameSplitOperator.IsNumber(yClose)) yClose=this.YClose;
48127
48140
 
48128
48141
  if (IFrameSplitOperator.IsNumber(close))
48129
48142
  {
48130
- var color=this.GetColor(close,this.YClose);
48143
+ var color=this.GetColor(close,yClose);
48131
48144
  var text=g_JSChartLocalization.GetText('MTitle-Close',this.LanguageID)+close.toFixed(defaultfloatPrecision);
48132
48145
  aryText.push({Text:text, Color:color});
48133
48146
  }
@@ -48146,7 +48159,7 @@ function DynamicMinuteTitlePainting()
48146
48159
 
48147
48160
  if (IFrameSplitOperator.IsNumber(item.AvPrice) && isShowAvPrice && this.IsShowAveragePrice)
48148
48161
  {
48149
- var color=this.GetColor(item.AvPrice,this.YClose);
48162
+ var color=this.GetColor(item.AvPrice,yClose);
48150
48163
  var text=g_JSChartLocalization.GetText('MTitle-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);
48151
48164
  aryText.push({Text:text, Color:color});
48152
48165
  }
@@ -48269,6 +48282,7 @@ function DynamicMinuteTitlePainting()
48269
48282
  var item=data.Data;
48270
48283
  var text, strTime, strDate;
48271
48284
  strDate=IFrameSplitOperator.FormatDateString(item.Date);
48285
+ var yClose=item.YClose;
48272
48286
 
48273
48287
  //时间
48274
48288
  if (data.Ver==1.0) strTime=IFrameSplitOperator.FormatTimeString(item.Time,"HH:MM");
@@ -48280,17 +48294,17 @@ function DynamicMinuteTitlePainting()
48280
48294
  //匹配价
48281
48295
  if(IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Price"))
48282
48296
  {
48283
- var color=this.GetColor(item.Price,this.YClose);
48297
+ var color=this.GetColor(item.Price,yClose);
48284
48298
  var filedName='MTitle-AC-Price';
48285
48299
  if (data.Ver==1.0) filedName="MTitle-Close";
48286
48300
  var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+item.Price.toFixed(defaultfloatPrecision);
48287
48301
  aryText.push({Text:text, Color:color});
48288
48302
  }
48289
48303
 
48290
- //竞价涨幅
48291
- if (IFrameSplitOperator.IsPlusNumber(this.YClose) && IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Increase"))
48304
+ //竞价涨幅
48305
+ if (IFrameSplitOperator.IsPlusNumber(yClose) && IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Increase"))
48292
48306
  {
48293
- var value=(item.Price-this.YClose)/this.YClose*100;
48307
+ var value=(item.Price-yClose)/yClose*100;
48294
48308
  var color=this.GetColor(value,0);
48295
48309
  var filedName='MTitle-AC-Increase';
48296
48310
  if (data.Ver==1.0) filedName="MTitle-Increase";
@@ -48301,7 +48315,7 @@ function DynamicMinuteTitlePainting()
48301
48315
  //均价
48302
48316
  if (IFrameSplitOperator.IsNumber(item.AvPrice) && this.CallAuctionShowTitle.has("MTitle-AC-AvPrice"))
48303
48317
  {
48304
- var color=this.GetColor(item.AvPrice,this.YClose);
48318
+ var color=this.GetColor(item.AvPrice,yClose);
48305
48319
  var text=g_JSChartLocalization.GetText('MTitle-AC-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);
48306
48320
  aryText.push({Text:text, Color:color});
48307
48321
  }
@@ -70918,9 +70932,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
70918
70932
  {
70919
70933
  if (self.ChartCorssCursor.IsShow === true) //移动十字光标
70920
70934
  {
70921
- var pixelTatio = GetDevicePixelRatio();
70922
- var x = drag.Click.X-uielement.getBoundingClientRect().left*pixelTatio;
70923
- var y = drag.Click.Y-uielement.getBoundingClientRect().top*pixelTatio;
70935
+ var pt=self.PointAbsoluteToRelative(drag.Click.X, drag.Click.Y, true);
70936
+ var x = pt.X;
70937
+ var y = pt.Y
70924
70938
  self.OnMouseMove(x, y, e);
70925
70939
  }
70926
70940
  }
@@ -74726,6 +74740,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
74726
74740
  var upperSymbol=symbol.toUpperCase();
74727
74741
  var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);
74728
74742
 
74743
+ var yClose=data.stock[0].yclos;
74729
74744
  var preClose=data.stock[0].yclose; //前一个数据价格
74730
74745
  var stockData=data.stock[0];
74731
74746
  var date=stockData.date; //日期
@@ -74745,6 +74760,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
74745
74760
  {
74746
74761
  var item=new BeforeOpenData();
74747
74762
  var jsData=stockData.before[i];
74763
+ item.YClose=yClose;
74748
74764
  item.Time=jsData[0];
74749
74765
  item.Date=date;
74750
74766
  item.Price=jsData[1];
@@ -74769,6 +74785,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
74769
74785
  {
74770
74786
  var item=new BeforeOpenData();
74771
74787
  var jsData=stockData.before[i];
74788
+ item.YClose=yClose;
74772
74789
  item.Time=jsData[0];
74773
74790
  item.Date=date;
74774
74791
  item.Price=jsData[1];
@@ -74797,6 +74814,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
74797
74814
  {
74798
74815
  var item=new BeforeOpenData();
74799
74816
  var jsData=stockData.before[i];
74817
+ item.YClose=yClose;
74800
74818
  item.Time=jsData[0];
74801
74819
  item.Date=date;
74802
74820
  item.Price=jsData[1];
@@ -74823,6 +74841,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
74823
74841
  //收盘集合竞价
74824
74842
  MinuteChartContainer.JsonDataToAfterCloseData=function(data)
74825
74843
  {
74844
+ var yClose=data.stock[0].yclose;
74826
74845
  var preClose=data.stock[0].yclose; //前一个数据价格
74827
74846
  var stockData=data.stock[0];
74828
74847
  var date=stockData.date; //日期
@@ -74840,6 +74859,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
74840
74859
  {
74841
74860
  var item=new AfterCloseData();
74842
74861
  var jsData=stockData.after[i];
74862
+ item.YClose=yClose;
74843
74863
  item.Time=jsData[0];
74844
74864
  item.Date=date;
74845
74865
  item.Price=jsData[1];
@@ -74860,6 +74880,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
74860
74880
  {
74861
74881
  var item=new AfterCloseData();
74862
74882
  var jsData=stockData.after[i];
74883
+ item.YClose=yClose;
74863
74884
  item.Time=jsData[0];
74864
74885
  item.Date=date;
74865
74886
  item.Price=jsData[1];
@@ -74886,6 +74907,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
74886
74907
  {
74887
74908
  var item=new AfterCloseData();
74888
74909
  var jsData=stockData.after[i];
74910
+ item.YClose=yClose;
74889
74911
  item.Time=jsData[0];
74890
74912
  item.Date=date;
74891
74913
  item.Price=jsData[1];
@@ -74932,6 +74954,7 @@ MinuteChartContainer.JsonDataToMinuteData=function(data,isBeforeData)
74932
74954
  var jsData=data.stock[0].minute[i];
74933
74955
  var item=new MinuteData();
74934
74956
 
74957
+ item.YClose=yClose;
74935
74958
  item.Close=jsData.price;
74936
74959
  item.Open=jsData.open;
74937
74960
  item.High=jsData.high;
@@ -75113,6 +75136,7 @@ MinuteChartContainer.JsonDataToMinuteDataArray=function(data)
75113
75136
  var jsData=dayData.minute[j];
75114
75137
  if (jsData[2]) preClose=jsData[2]; //保存上一个收盘数据
75115
75138
  var item=new MinuteData();
75139
+ item.YClose=yClose;
75116
75140
  item.Close=jsData[2];
75117
75141
  item.Open=jsData[1];
75118
75142
  item.High=jsData[3];
@@ -75216,6 +75240,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
75216
75240
  }
75217
75241
 
75218
75242
  var date=callAuctionData.Date;
75243
+ var yClose=callAuctionData.YClose;
75219
75244
  var extendDataIndex=isBeforeOpen? JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA:JSCHART_DATA_FIELD_ID.MINUTE_AFTERCLOSE_EXTENDDATA; //扩展数据序号
75220
75245
  if (callAuctionData.Ver==1.0)
75221
75246
  {
@@ -75224,6 +75249,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
75224
75249
  {
75225
75250
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
75226
75251
  var jsData=data[i];
75252
+ item.YClose=yClose;
75227
75253
  item.Time=jsData[0];
75228
75254
  item.Date=date;
75229
75255
  item.Price=jsData[1];
@@ -75246,6 +75272,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
75246
75272
  {
75247
75273
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
75248
75274
  var jsData=data[i];
75275
+ item.YClose=yClose;
75249
75276
  item.Time=jsData[0];
75250
75277
  item.Date=date;
75251
75278
  item.Price=jsData[1];
@@ -75272,6 +75299,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
75272
75299
  {
75273
75300
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
75274
75301
  var jsData=data[i];
75302
+ item.YClose=yClose;
75275
75303
  item.Time=jsData[0];
75276
75304
  item.Date=date;
75277
75305
  item.Price=jsData[1];
@@ -75301,7 +75329,7 @@ MinuteChartContainer.JosnDataToBeforeOpenDataArray=function(data)
75301
75329
  for(var i in data.data)
75302
75330
  {
75303
75331
  var dayItem=data.data[i];
75304
- var beforeOpenData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date };
75332
+ var beforeOpenData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose };
75305
75333
  if (dayItem.beforeinfo)
75306
75334
  {
75307
75335
  if (IFrameSplitOperator.IsNumber(dayItem.beforeinfo.totalcount)) beforeOpenData.TotalCount=dayItem.beforeinfo.totalcount;
@@ -75326,7 +75354,7 @@ MinuteChartContainer.JosnDataToAfterCloseDataArray=function(data)
75326
75354
  for(var i in data.data)
75327
75355
  {
75328
75356
  var dayItem=data.data[i];
75329
- var afterCloseData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date };
75357
+ var afterCloseData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose };
75330
75358
 
75331
75359
  if (dayItem.afterinfo)
75332
75360
  {
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -5666,6 +5666,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
5666
5666
 
5667
5667
  if (!chart) return false;
5668
5668
 
5669
+ this.JSChartContainer=chart;
5670
+
5669
5671
  if (option.OnCreatedCallback) option.OnCreatedCallback(chart);
5670
5672
 
5671
5673
  //是否自动更新
@@ -21725,6 +21727,7 @@ function MinuteData()
21725
21727
  this.Date; //日期
21726
21728
  this.Position=null; //持仓量
21727
21729
  this.YClearing; //昨结算价
21730
+ this.YClose; //昨收价
21728
21731
 
21729
21732
  this.ExtendData; //扩展数据
21730
21733
  }
@@ -21737,7 +21740,8 @@ function BeforeOpenData()
21737
21740
  this.Price; //匹配的价格
21738
21741
  this.AvPrice; //均价
21739
21742
  this.Vol=[]; //[0]=匹配量 [1]=未匹配量
21740
- this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
21743
+ this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
21744
+ this.YClose; //昨收价
21741
21745
  }
21742
21746
 
21743
21747
  //收盘集合竞价
@@ -21748,7 +21752,8 @@ function AfterCloseData()
21748
21752
  this.Price; //匹配的价格
21749
21753
  this.AvPrice; //均价
21750
21754
  this.Vol=[]; //[0]=匹配量 [1]=未匹配量
21751
- this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
21755
+ this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
21756
+ this.YClose; //昨收价
21752
21757
  }
21753
21758
 
21754
21759
  //单指标数据
@@ -42091,6 +42096,7 @@ function MinuteTooltipPaint()
42091
42096
 
42092
42097
  var upperSymbol;
42093
42098
  this.YClose=this.TitlePaint.YClose;
42099
+ this.YClose=item.YClose;
42094
42100
  if (this.HQChart.Symbol) upperSymbol=this.HQChart.Symbol.toUpperCase();
42095
42101
  var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
42096
42102
 
@@ -42434,6 +42440,9 @@ function MinuteLeftTooltipPaint()
42434
42440
  if (drawData.Type==0) //连续交易
42435
42441
  {
42436
42442
  var item=drawData.Data;
42443
+ if (!item) return;
42444
+
42445
+ this.YClose=item.YClose;
42437
42446
  var titleItem=this.FormatDate(item.Date);
42438
42447
  if (titleItem) aryText.push(titleItem);
42439
42448
 
@@ -42469,6 +42478,8 @@ function MinuteLeftTooltipPaint()
42469
42478
  {
42470
42479
  var item=drawData.Data.Data;
42471
42480
  if (!item) return;
42481
+
42482
+ this.YClose=item.YClose;
42472
42483
  var titleItem=this.FormatDate(item.Date);
42473
42484
  if (titleItem) aryText.push(titleItem);
42474
42485
 
@@ -52204,10 +52215,12 @@ function DynamicMinuteTitlePainting()
52204
52215
  var increase=item.Increase;
52205
52216
  var vol=item.Vol;
52206
52217
  var amount=item.Amount;
52218
+ var yClose=item.YClose;
52219
+ if (!IFrameSplitOperator.IsNumber(yClose)) yClose=this.YClose;
52207
52220
 
52208
52221
  if (IFrameSplitOperator.IsNumber(close))
52209
52222
  {
52210
- var color=this.GetColor(close,this.YClose);
52223
+ var color=this.GetColor(close,yClose);
52211
52224
  var text=g_JSChartLocalization.GetText('MTitle-Close',this.LanguageID)+close.toFixed(defaultfloatPrecision);
52212
52225
  aryText.push({Text:text, Color:color});
52213
52226
  }
@@ -52226,7 +52239,7 @@ function DynamicMinuteTitlePainting()
52226
52239
 
52227
52240
  if (IFrameSplitOperator.IsNumber(item.AvPrice) && isShowAvPrice && this.IsShowAveragePrice)
52228
52241
  {
52229
- var color=this.GetColor(item.AvPrice,this.YClose);
52242
+ var color=this.GetColor(item.AvPrice,yClose);
52230
52243
  var text=g_JSChartLocalization.GetText('MTitle-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);
52231
52244
  aryText.push({Text:text, Color:color});
52232
52245
  }
@@ -52349,6 +52362,7 @@ function DynamicMinuteTitlePainting()
52349
52362
  var item=data.Data;
52350
52363
  var text, strTime, strDate;
52351
52364
  strDate=IFrameSplitOperator.FormatDateString(item.Date);
52365
+ var yClose=item.YClose;
52352
52366
 
52353
52367
  //时间
52354
52368
  if (data.Ver==1.0) strTime=IFrameSplitOperator.FormatTimeString(item.Time,"HH:MM");
@@ -52360,17 +52374,17 @@ function DynamicMinuteTitlePainting()
52360
52374
  //匹配价
52361
52375
  if(IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Price"))
52362
52376
  {
52363
- var color=this.GetColor(item.Price,this.YClose);
52377
+ var color=this.GetColor(item.Price,yClose);
52364
52378
  var filedName='MTitle-AC-Price';
52365
52379
  if (data.Ver==1.0) filedName="MTitle-Close";
52366
52380
  var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+item.Price.toFixed(defaultfloatPrecision);
52367
52381
  aryText.push({Text:text, Color:color});
52368
52382
  }
52369
52383
 
52370
- //竞价涨幅
52371
- if (IFrameSplitOperator.IsPlusNumber(this.YClose) && IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Increase"))
52384
+ //竞价涨幅
52385
+ if (IFrameSplitOperator.IsPlusNumber(yClose) && IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Increase"))
52372
52386
  {
52373
- var value=(item.Price-this.YClose)/this.YClose*100;
52387
+ var value=(item.Price-yClose)/yClose*100;
52374
52388
  var color=this.GetColor(value,0);
52375
52389
  var filedName='MTitle-AC-Increase';
52376
52390
  if (data.Ver==1.0) filedName="MTitle-Increase";
@@ -52381,7 +52395,7 @@ function DynamicMinuteTitlePainting()
52381
52395
  //均价
52382
52396
  if (IFrameSplitOperator.IsNumber(item.AvPrice) && this.CallAuctionShowTitle.has("MTitle-AC-AvPrice"))
52383
52397
  {
52384
- var color=this.GetColor(item.AvPrice,this.YClose);
52398
+ var color=this.GetColor(item.AvPrice,yClose);
52385
52399
  var text=g_JSChartLocalization.GetText('MTitle-AC-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);
52386
52400
  aryText.push({Text:text, Color:color});
52387
52401
  }
@@ -74998,9 +75012,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
74998
75012
  {
74999
75013
  if (self.ChartCorssCursor.IsShow === true) //移动十字光标
75000
75014
  {
75001
- var pixelTatio = GetDevicePixelRatio();
75002
- var x = drag.Click.X-uielement.getBoundingClientRect().left*pixelTatio;
75003
- var y = drag.Click.Y-uielement.getBoundingClientRect().top*pixelTatio;
75015
+ var pt=self.PointAbsoluteToRelative(drag.Click.X, drag.Click.Y, true);
75016
+ var x = pt.X;
75017
+ var y = pt.Y
75004
75018
  self.OnMouseMove(x, y, e);
75005
75019
  }
75006
75020
  }
@@ -78806,6 +78820,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78806
78820
  var upperSymbol=symbol.toUpperCase();
78807
78821
  var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);
78808
78822
 
78823
+ var yClose=data.stock[0].yclos;
78809
78824
  var preClose=data.stock[0].yclose; //前一个数据价格
78810
78825
  var stockData=data.stock[0];
78811
78826
  var date=stockData.date; //日期
@@ -78825,6 +78840,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78825
78840
  {
78826
78841
  var item=new BeforeOpenData();
78827
78842
  var jsData=stockData.before[i];
78843
+ item.YClose=yClose;
78828
78844
  item.Time=jsData[0];
78829
78845
  item.Date=date;
78830
78846
  item.Price=jsData[1];
@@ -78849,6 +78865,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78849
78865
  {
78850
78866
  var item=new BeforeOpenData();
78851
78867
  var jsData=stockData.before[i];
78868
+ item.YClose=yClose;
78852
78869
  item.Time=jsData[0];
78853
78870
  item.Date=date;
78854
78871
  item.Price=jsData[1];
@@ -78877,6 +78894,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78877
78894
  {
78878
78895
  var item=new BeforeOpenData();
78879
78896
  var jsData=stockData.before[i];
78897
+ item.YClose=yClose;
78880
78898
  item.Time=jsData[0];
78881
78899
  item.Date=date;
78882
78900
  item.Price=jsData[1];
@@ -78903,6 +78921,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78903
78921
  //收盘集合竞价
78904
78922
  MinuteChartContainer.JsonDataToAfterCloseData=function(data)
78905
78923
  {
78924
+ var yClose=data.stock[0].yclose;
78906
78925
  var preClose=data.stock[0].yclose; //前一个数据价格
78907
78926
  var stockData=data.stock[0];
78908
78927
  var date=stockData.date; //日期
@@ -78920,6 +78939,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
78920
78939
  {
78921
78940
  var item=new AfterCloseData();
78922
78941
  var jsData=stockData.after[i];
78942
+ item.YClose=yClose;
78923
78943
  item.Time=jsData[0];
78924
78944
  item.Date=date;
78925
78945
  item.Price=jsData[1];
@@ -78940,6 +78960,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
78940
78960
  {
78941
78961
  var item=new AfterCloseData();
78942
78962
  var jsData=stockData.after[i];
78963
+ item.YClose=yClose;
78943
78964
  item.Time=jsData[0];
78944
78965
  item.Date=date;
78945
78966
  item.Price=jsData[1];
@@ -78966,6 +78987,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
78966
78987
  {
78967
78988
  var item=new AfterCloseData();
78968
78989
  var jsData=stockData.after[i];
78990
+ item.YClose=yClose;
78969
78991
  item.Time=jsData[0];
78970
78992
  item.Date=date;
78971
78993
  item.Price=jsData[1];
@@ -79012,6 +79034,7 @@ MinuteChartContainer.JsonDataToMinuteData=function(data,isBeforeData)
79012
79034
  var jsData=data.stock[0].minute[i];
79013
79035
  var item=new MinuteData();
79014
79036
 
79037
+ item.YClose=yClose;
79015
79038
  item.Close=jsData.price;
79016
79039
  item.Open=jsData.open;
79017
79040
  item.High=jsData.high;
@@ -79193,6 +79216,7 @@ MinuteChartContainer.JsonDataToMinuteDataArray=function(data)
79193
79216
  var jsData=dayData.minute[j];
79194
79217
  if (jsData[2]) preClose=jsData[2]; //保存上一个收盘数据
79195
79218
  var item=new MinuteData();
79219
+ item.YClose=yClose;
79196
79220
  item.Close=jsData[2];
79197
79221
  item.Open=jsData[1];
79198
79222
  item.High=jsData[3];
@@ -79296,6 +79320,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
79296
79320
  }
79297
79321
 
79298
79322
  var date=callAuctionData.Date;
79323
+ var yClose=callAuctionData.YClose;
79299
79324
  var extendDataIndex=isBeforeOpen? JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA:JSCHART_DATA_FIELD_ID.MINUTE_AFTERCLOSE_EXTENDDATA; //扩展数据序号
79300
79325
  if (callAuctionData.Ver==1.0)
79301
79326
  {
@@ -79304,6 +79329,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
79304
79329
  {
79305
79330
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
79306
79331
  var jsData=data[i];
79332
+ item.YClose=yClose;
79307
79333
  item.Time=jsData[0];
79308
79334
  item.Date=date;
79309
79335
  item.Price=jsData[1];
@@ -79326,6 +79352,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
79326
79352
  {
79327
79353
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
79328
79354
  var jsData=data[i];
79355
+ item.YClose=yClose;
79329
79356
  item.Time=jsData[0];
79330
79357
  item.Date=date;
79331
79358
  item.Price=jsData[1];
@@ -79352,6 +79379,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
79352
79379
  {
79353
79380
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
79354
79381
  var jsData=data[i];
79382
+ item.YClose=yClose;
79355
79383
  item.Time=jsData[0];
79356
79384
  item.Date=date;
79357
79385
  item.Price=jsData[1];
@@ -79381,7 +79409,7 @@ MinuteChartContainer.JosnDataToBeforeOpenDataArray=function(data)
79381
79409
  for(var i in data.data)
79382
79410
  {
79383
79411
  var dayItem=data.data[i];
79384
- var beforeOpenData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date };
79412
+ var beforeOpenData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose };
79385
79413
  if (dayItem.beforeinfo)
79386
79414
  {
79387
79415
  if (IFrameSplitOperator.IsNumber(dayItem.beforeinfo.totalcount)) beforeOpenData.TotalCount=dayItem.beforeinfo.totalcount;
@@ -79406,7 +79434,7 @@ MinuteChartContainer.JosnDataToAfterCloseDataArray=function(data)
79406
79434
  for(var i in data.data)
79407
79435
  {
79408
79436
  var dayItem=data.data[i];
79409
- var afterCloseData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date };
79437
+ var afterCloseData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose };
79410
79438
 
79411
79439
  if (dayItem.afterinfo)
79412
79440
  {
@@ -127775,7 +127803,7 @@ function ScrollBarBGChart()
127775
127803
 
127776
127804
 
127777
127805
 
127778
- var HQCHART_VERSION="1.1.12452";
127806
+ var HQCHART_VERSION="1.1.12458";
127779
127807
 
127780
127808
  function PrintHQChartVersion()
127781
127809
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.12452";
8
+ var HQCHART_VERSION="1.1.12458";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -5710,6 +5710,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
5710
5710
 
5711
5711
  if (!chart) return false;
5712
5712
 
5713
+ this.JSChartContainer=chart;
5714
+
5713
5715
  if (option.OnCreatedCallback) option.OnCreatedCallback(chart);
5714
5716
 
5715
5717
  //是否自动更新
@@ -21769,6 +21771,7 @@ function MinuteData()
21769
21771
  this.Date; //日期
21770
21772
  this.Position=null; //持仓量
21771
21773
  this.YClearing; //昨结算价
21774
+ this.YClose; //昨收价
21772
21775
 
21773
21776
  this.ExtendData; //扩展数据
21774
21777
  }
@@ -21781,7 +21784,8 @@ function BeforeOpenData()
21781
21784
  this.Price; //匹配的价格
21782
21785
  this.AvPrice; //均价
21783
21786
  this.Vol=[]; //[0]=匹配量 [1]=未匹配量
21784
- this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
21787
+ this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
21788
+ this.YClose; //昨收价
21785
21789
  }
21786
21790
 
21787
21791
  //收盘集合竞价
@@ -21792,7 +21796,8 @@ function AfterCloseData()
21792
21796
  this.Price; //匹配的价格
21793
21797
  this.AvPrice; //均价
21794
21798
  this.Vol=[]; //[0]=匹配量 [1]=未匹配量
21795
- this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
21799
+ this.ColorID; //0=平盘 1=红 2=绿 3 ...自定义颜色
21800
+ this.YClose; //昨收价
21796
21801
  }
21797
21802
 
21798
21803
  //单指标数据
@@ -42135,6 +42140,7 @@ function MinuteTooltipPaint()
42135
42140
 
42136
42141
  var upperSymbol;
42137
42142
  this.YClose=this.TitlePaint.YClose;
42143
+ this.YClose=item.YClose;
42138
42144
  if (this.HQChart.Symbol) upperSymbol=this.HQChart.Symbol.toUpperCase();
42139
42145
  var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
42140
42146
 
@@ -42478,6 +42484,9 @@ function MinuteLeftTooltipPaint()
42478
42484
  if (drawData.Type==0) //连续交易
42479
42485
  {
42480
42486
  var item=drawData.Data;
42487
+ if (!item) return;
42488
+
42489
+ this.YClose=item.YClose;
42481
42490
  var titleItem=this.FormatDate(item.Date);
42482
42491
  if (titleItem) aryText.push(titleItem);
42483
42492
 
@@ -42513,6 +42522,8 @@ function MinuteLeftTooltipPaint()
42513
42522
  {
42514
42523
  var item=drawData.Data.Data;
42515
42524
  if (!item) return;
42525
+
42526
+ this.YClose=item.YClose;
42516
42527
  var titleItem=this.FormatDate(item.Date);
42517
42528
  if (titleItem) aryText.push(titleItem);
42518
42529
 
@@ -52248,10 +52259,12 @@ function DynamicMinuteTitlePainting()
52248
52259
  var increase=item.Increase;
52249
52260
  var vol=item.Vol;
52250
52261
  var amount=item.Amount;
52262
+ var yClose=item.YClose;
52263
+ if (!IFrameSplitOperator.IsNumber(yClose)) yClose=this.YClose;
52251
52264
 
52252
52265
  if (IFrameSplitOperator.IsNumber(close))
52253
52266
  {
52254
- var color=this.GetColor(close,this.YClose);
52267
+ var color=this.GetColor(close,yClose);
52255
52268
  var text=g_JSChartLocalization.GetText('MTitle-Close',this.LanguageID)+close.toFixed(defaultfloatPrecision);
52256
52269
  aryText.push({Text:text, Color:color});
52257
52270
  }
@@ -52270,7 +52283,7 @@ function DynamicMinuteTitlePainting()
52270
52283
 
52271
52284
  if (IFrameSplitOperator.IsNumber(item.AvPrice) && isShowAvPrice && this.IsShowAveragePrice)
52272
52285
  {
52273
- var color=this.GetColor(item.AvPrice,this.YClose);
52286
+ var color=this.GetColor(item.AvPrice,yClose);
52274
52287
  var text=g_JSChartLocalization.GetText('MTitle-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);
52275
52288
  aryText.push({Text:text, Color:color});
52276
52289
  }
@@ -52393,6 +52406,7 @@ function DynamicMinuteTitlePainting()
52393
52406
  var item=data.Data;
52394
52407
  var text, strTime, strDate;
52395
52408
  strDate=IFrameSplitOperator.FormatDateString(item.Date);
52409
+ var yClose=item.YClose;
52396
52410
 
52397
52411
  //时间
52398
52412
  if (data.Ver==1.0) strTime=IFrameSplitOperator.FormatTimeString(item.Time,"HH:MM");
@@ -52404,17 +52418,17 @@ function DynamicMinuteTitlePainting()
52404
52418
  //匹配价
52405
52419
  if(IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Price"))
52406
52420
  {
52407
- var color=this.GetColor(item.Price,this.YClose);
52421
+ var color=this.GetColor(item.Price,yClose);
52408
52422
  var filedName='MTitle-AC-Price';
52409
52423
  if (data.Ver==1.0) filedName="MTitle-Close";
52410
52424
  var text=g_JSChartLocalization.GetText(filedName,this.LanguageID)+item.Price.toFixed(defaultfloatPrecision);
52411
52425
  aryText.push({Text:text, Color:color});
52412
52426
  }
52413
52427
 
52414
- //竞价涨幅
52415
- if (IFrameSplitOperator.IsPlusNumber(this.YClose) && IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Increase"))
52428
+ //竞价涨幅
52429
+ if (IFrameSplitOperator.IsPlusNumber(yClose) && IFrameSplitOperator.IsNumber(item.Price) && this.CallAuctionShowTitle.has("MTitle-AC-Increase"))
52416
52430
  {
52417
- var value=(item.Price-this.YClose)/this.YClose*100;
52431
+ var value=(item.Price-yClose)/yClose*100;
52418
52432
  var color=this.GetColor(value,0);
52419
52433
  var filedName='MTitle-AC-Increase';
52420
52434
  if (data.Ver==1.0) filedName="MTitle-Increase";
@@ -52425,7 +52439,7 @@ function DynamicMinuteTitlePainting()
52425
52439
  //均价
52426
52440
  if (IFrameSplitOperator.IsNumber(item.AvPrice) && this.CallAuctionShowTitle.has("MTitle-AC-AvPrice"))
52427
52441
  {
52428
- var color=this.GetColor(item.AvPrice,this.YClose);
52442
+ var color=this.GetColor(item.AvPrice,yClose);
52429
52443
  var text=g_JSChartLocalization.GetText('MTitle-AC-AvPrice',this.LanguageID)+item.AvPrice.toFixed(defaultfloatPrecision);
52430
52444
  aryText.push({Text:text, Color:color});
52431
52445
  }
@@ -75042,9 +75056,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
75042
75056
  {
75043
75057
  if (self.ChartCorssCursor.IsShow === true) //移动十字光标
75044
75058
  {
75045
- var pixelTatio = GetDevicePixelRatio();
75046
- var x = drag.Click.X-uielement.getBoundingClientRect().left*pixelTatio;
75047
- var y = drag.Click.Y-uielement.getBoundingClientRect().top*pixelTatio;
75059
+ var pt=self.PointAbsoluteToRelative(drag.Click.X, drag.Click.Y, true);
75060
+ var x = pt.X;
75061
+ var y = pt.Y
75048
75062
  self.OnMouseMove(x, y, e);
75049
75063
  }
75050
75064
  }
@@ -78850,6 +78864,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78850
78864
  var upperSymbol=symbol.toUpperCase();
78851
78865
  var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);
78852
78866
 
78867
+ var yClose=data.stock[0].yclos;
78853
78868
  var preClose=data.stock[0].yclose; //前一个数据价格
78854
78869
  var stockData=data.stock[0];
78855
78870
  var date=stockData.date; //日期
@@ -78869,6 +78884,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78869
78884
  {
78870
78885
  var item=new BeforeOpenData();
78871
78886
  var jsData=stockData.before[i];
78887
+ item.YClose=yClose;
78872
78888
  item.Time=jsData[0];
78873
78889
  item.Date=date;
78874
78890
  item.Price=jsData[1];
@@ -78893,6 +78909,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78893
78909
  {
78894
78910
  var item=new BeforeOpenData();
78895
78911
  var jsData=stockData.before[i];
78912
+ item.YClose=yClose;
78896
78913
  item.Time=jsData[0];
78897
78914
  item.Date=date;
78898
78915
  item.Price=jsData[1];
@@ -78921,6 +78938,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78921
78938
  {
78922
78939
  var item=new BeforeOpenData();
78923
78940
  var jsData=stockData.before[i];
78941
+ item.YClose=yClose;
78924
78942
  item.Time=jsData[0];
78925
78943
  item.Date=date;
78926
78944
  item.Price=jsData[1];
@@ -78947,6 +78965,7 @@ MinuteChartContainer.JsonDataToBeforeOpenData=function(data)
78947
78965
  //收盘集合竞价
78948
78966
  MinuteChartContainer.JsonDataToAfterCloseData=function(data)
78949
78967
  {
78968
+ var yClose=data.stock[0].yclose;
78950
78969
  var preClose=data.stock[0].yclose; //前一个数据价格
78951
78970
  var stockData=data.stock[0];
78952
78971
  var date=stockData.date; //日期
@@ -78964,6 +78983,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
78964
78983
  {
78965
78984
  var item=new AfterCloseData();
78966
78985
  var jsData=stockData.after[i];
78986
+ item.YClose=yClose;
78967
78987
  item.Time=jsData[0];
78968
78988
  item.Date=date;
78969
78989
  item.Price=jsData[1];
@@ -78984,6 +79004,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
78984
79004
  {
78985
79005
  var item=new AfterCloseData();
78986
79006
  var jsData=stockData.after[i];
79007
+ item.YClose=yClose;
78987
79008
  item.Time=jsData[0];
78988
79009
  item.Date=date;
78989
79010
  item.Price=jsData[1];
@@ -79010,6 +79031,7 @@ MinuteChartContainer.JsonDataToAfterCloseData=function(data)
79010
79031
  {
79011
79032
  var item=new AfterCloseData();
79012
79033
  var jsData=stockData.after[i];
79034
+ item.YClose=yClose;
79013
79035
  item.Time=jsData[0];
79014
79036
  item.Date=date;
79015
79037
  item.Price=jsData[1];
@@ -79056,6 +79078,7 @@ MinuteChartContainer.JsonDataToMinuteData=function(data,isBeforeData)
79056
79078
  var jsData=data.stock[0].minute[i];
79057
79079
  var item=new MinuteData();
79058
79080
 
79081
+ item.YClose=yClose;
79059
79082
  item.Close=jsData.price;
79060
79083
  item.Open=jsData.open;
79061
79084
  item.High=jsData.high;
@@ -79237,6 +79260,7 @@ MinuteChartContainer.JsonDataToMinuteDataArray=function(data)
79237
79260
  var jsData=dayData.minute[j];
79238
79261
  if (jsData[2]) preClose=jsData[2]; //保存上一个收盘数据
79239
79262
  var item=new MinuteData();
79263
+ item.YClose=yClose;
79240
79264
  item.Close=jsData[2];
79241
79265
  item.Open=jsData[1];
79242
79266
  item.High=jsData[3];
@@ -79340,6 +79364,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
79340
79364
  }
79341
79365
 
79342
79366
  var date=callAuctionData.Date;
79367
+ var yClose=callAuctionData.YClose;
79343
79368
  var extendDataIndex=isBeforeOpen? JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA:JSCHART_DATA_FIELD_ID.MINUTE_AFTERCLOSE_EXTENDDATA; //扩展数据序号
79344
79369
  if (callAuctionData.Ver==1.0)
79345
79370
  {
@@ -79348,6 +79373,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
79348
79373
  {
79349
79374
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
79350
79375
  var jsData=data[i];
79376
+ item.YClose=yClose;
79351
79377
  item.Time=jsData[0];
79352
79378
  item.Date=date;
79353
79379
  item.Price=jsData[1];
@@ -79370,6 +79396,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
79370
79396
  {
79371
79397
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
79372
79398
  var jsData=data[i];
79399
+ item.YClose=yClose;
79373
79400
  item.Time=jsData[0];
79374
79401
  item.Date=date;
79375
79402
  item.Price=jsData[1];
@@ -79396,6 +79423,7 @@ MinuteChartContainer.JsonDataToCallAuctionItem=function(data, callAuctionData, i
79396
79423
  {
79397
79424
  var item=isBeforeOpen? new BeforeOpenData() : new AfterCloseData();
79398
79425
  var jsData=data[i];
79426
+ item.YClose=yClose;
79399
79427
  item.Time=jsData[0];
79400
79428
  item.Date=date;
79401
79429
  item.Price=jsData[1];
@@ -79425,7 +79453,7 @@ MinuteChartContainer.JosnDataToBeforeOpenDataArray=function(data)
79425
79453
  for(var i in data.data)
79426
79454
  {
79427
79455
  var dayItem=data.data[i];
79428
- var beforeOpenData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date };
79456
+ var beforeOpenData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose };
79429
79457
  if (dayItem.beforeinfo)
79430
79458
  {
79431
79459
  if (IFrameSplitOperator.IsNumber(dayItem.beforeinfo.totalcount)) beforeOpenData.TotalCount=dayItem.beforeinfo.totalcount;
@@ -79450,7 +79478,7 @@ MinuteChartContainer.JosnDataToAfterCloseDataArray=function(data)
79450
79478
  for(var i in data.data)
79451
79479
  {
79452
79480
  var dayItem=data.data[i];
79453
- var afterCloseData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date };
79481
+ var afterCloseData={ Data:[], TotalCount:15, Ver:1.0, Date:dayItem.date, YClose:dayItem.yclose };
79454
79482
 
79455
79483
  if (dayItem.afterinfo)
79456
79484
  {
@@ -127819,7 +127847,7 @@ function ScrollBarBGChart()
127819
127847
 
127820
127848
 
127821
127849
 
127822
- var HQCHART_VERSION="1.1.12452";
127850
+ var HQCHART_VERSION="1.1.12458";
127823
127851
 
127824
127852
  function PrintHQChartVersion()
127825
127853
  {
package/src/jscommon/umychart.wechat/umychart.charttitle.wechat.js CHANGED
@@ -1000,7 +1000,7 @@ function DynamicMinuteTitlePainting()
1000
1000
  var item=data.Data;
1001
1001
  var defaultfloatPrecision = this.GetDecimal(this.Symbol); //价格小数位数
1002
1002
  var aryText=[];
1003
-
1003
+ var yClose=item.YClose;
1004
1004
  if (this.IsShowName) aryText.push({ Text:this.Name, Color:this.NameColor });
1005
1005
 
1006
1006
  var text = IFrameSplitOperator.FormatDateTimeString(item.DateTime, this.IsShowDate ? 'YYYY-MM-DD HH-MM' : 'HH-MM');
@@ -1008,7 +1008,7 @@ function DynamicMinuteTitlePainting()
1008
1008
 
1009
1009
  if (IFrameSplitOperator.IsNumber(item.Close))
1010
1010
  {
1011
- var color = this.GetColor(item.Close, this.YClose);
1011
+ var color = this.GetColor(item.Close, yClose);
1012
1012
  var text = g_JSChartLocalization.GetText('MTitle-Close', this.LanguageID) + item.Close.toFixed(defaultfloatPrecision);
1013
1013
  aryText.push({ Text:text, Color:color });
1014
1014
  }
@@ -1022,7 +1022,7 @@ function DynamicMinuteTitlePainting()
1022
1022
 
1023
1023
  if (IFrameSplitOperator.IsNumber(item.AvPrice) && this.IsShowAveragePrice==true)
1024
1024
  {
1025
- var color = this.GetColor(item.AvPrice, this.YClose);
1025
+ var color = this.GetColor(item.AvPrice, yClose);
1026
1026
  var text = g_JSChartLocalization.GetText('MTitle-AvPrice', this.LanguageID) + item.AvPrice.toFixed(defaultfloatPrecision);
1027
1027
  aryText.push({ Text:text, Color:color });
1028
1028
  }
package/src/jscommon/umychart.wechat/umychart.data.wechat.js CHANGED
@@ -169,6 +169,7 @@ function MinuteData()
169
169
  this.Time;
170
170
  this.Position = null; //持仓量
171
171
  this.YClearing; //昨结算价
172
+ this.YClose; //昨收
172
173
 
173
174
  this.ExtendData; //扩展数据
174
175
  }
package/src/jscommon/umychart.wechat/umychart.extendchart.wechat.js CHANGED
@@ -456,6 +456,7 @@ function MinuteTooltipPaint()
456
456
  if (this.HQChart.Symbol) upperSymbol=this.HQChart.Symbol.toUpperCase();
457
457
  var defaultfloatPrecision = JSCommonCoordinateData.GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
458
458
  this.YClose = this.KLineTitlePaint.YClose;
459
+ this.YClose=item.YClose;
459
460
 
460
461
  var aryText=[];
461
462
  var result={ AryText:aryText };
package/src/jscommon/umychart.wechat/umychart.wechat.3.0.js CHANGED
@@ -9808,6 +9808,7 @@ MinuteChartContainer.JsonDataToMinuteData = function (data)
9808
9808
  if (jsData.price) preClose = jsData.price;
9809
9809
  if (jsData.avprice) preAvPrice = jsData.avprice;
9810
9810
 
9811
+ item.YClose=yClose;
9811
9812
  item.Close = jsData.price;
9812
9813
  item.Open = jsData.open;
9813
9814
  item.High = jsData.high;
@@ -9877,6 +9878,7 @@ MinuteChartContainer.JsonDataToMinuteDataArray = function (data)
9877
9878
  var jsData = dayData.minute[j];
9878
9879
  if (jsData[2]) preClose = jsData[2]; //保存上一个收盘数据
9879
9880
  var item = new MinuteData();
9881
+ item.YClose=yClose;
9880
9882
  item.Close = jsData[2];
9881
9883
  item.Open = jsData[1];
9882
9884
  item.High = jsData[3];