hqchart 1.1.14843 → 1.1.14846

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 (11) hide show
  1. package/lib/umychart.vue.js +9 -7
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.DialogTooltip.js +30 -13
  4. package/src/jscommon/umychart.NetworkFilterTest.js +145 -23
  5. package/src/jscommon/umychart.complier.js +2 -0
  6. package/src/jscommon/umychart.js +3 -0
  7. package/src/jscommon/umychart.testdata.js +145 -23
  8. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +6 -1
  9. package/src/jscommon/umychart.version.js +1 -1
  10. package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js +145 -23
  11. package/src/jscommon/umychart.vue/umychart.vue.js +36 -14
package/lib/umychart.vue.js CHANGED
@@ -4590,9 +4590,10 @@ if(isHSCreen){this.Canvas.moveTo(yBottom,ToFixedPoint(x));this.Canvas.lineTo(y,T
4590
4590
  this.DrawBars(lineWidth,true);this.DrawBars(lineWidth,false);this.Canvas.lineWidth=backupLineWidth;};this.GetItemData=function(indexData){if(!indexData)return null;if(!IFrameSplitOperator.IsNumber(indexData.Index))return null;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return null;var index=indexData.Index;if(index<0||index>=this.Data.Data.length)return null;var item=this.Data.Data[index];return[{Value:item,Color:item>0?this.UpColor:this.DownColor,Name:this.Name}];};}//基准线上下柱子
4591
4591
  function ChartBaseLineBar(){this.newMethod=IChartPainting;//派生
4592
4592
  this.newMethod();delete this.newMethod;this.ClassName="ChartBaseLineBar";this.UpColor=g_JSChartResource.ChartBaseLineBar.UpColor;this.DownColor=g_JSChartResource.ChartBaseLineBar.DownColor;this.LineWidth=1;this.IsDrawFirst=true;this.AryData=[];//{ Date, Time, Up, Down }
4593
+ this.DefaultMax;//默认最大值
4593
4594
  this.MaxValue;this.YBaseLine;this.BarMaxHeight;//{ Up:, Down: }
4594
4595
  this.Draw=function(){this.YBaseLine=null;this.BarMaxHeight=null;if(!this.IsShow||this.ChartFrame.IsMinSize||!this.IsVisible)return;if(this.IsShowIndexTitleOnly())return;if(this.IsHideScriptIndex())return;if(!this.HQChart)return;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;if(!IFrameSplitOperator.IsNumber(this.MaxValue))return;this.CalculateBaseLine();if(!IFrameSplitOperator.IsNumber(this.YBaseLine))return;if(!IFrameSplitOperator.IsPlusNumber(this.BarMaxHeight))return;var bHScreen=this.ChartFrame.IsHScreen===true;var bMinute=this.IsMinuteFrame();var dataWidth=this.ChartFrame.DataWidth;var distanceWidth=this.ChartFrame.DistanceWidth;var xPointCount=this.ChartFrame.XPointCount;var border=this.ChartFrame.GetBorder();if(bHScreen){var chartright=border.BottomEx;var xOffset=border.TopEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;}else{var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;var chartright=border.RightEx;}var yCenter=this.YBaseLine;var aryUpBar=[],aryDownBar=[];for(var i=this.Data.DataOffset,j=0;i<this.Data.Data.length&&j<xPointCount;++i,++j,xOffset+=dataWidth+distanceWidth){var kItem=this.Data.Data[i];if(!kItem)continue;var key=this.BuildKey(kItem);if(!this.MapCache.has(key))continue;var item=this.MapCache.get(key);if(bMinute){var x=this.ChartFrame.GetXFromIndex(j);}else{var left=xOffset;var right=xOffset+dataWidth;if(right>chartright)break;var x=left+(right-left)/2;}if(IFrameSplitOperator.IsNumber(item.Up)){var y=yCenter-item.Up*this.BarMaxHeight/this.MaxValue;aryUpBar.push({X:x,Y:y});}if(IFrameSplitOperator.IsNumber(item.Down)){var y=yCenter+Math.abs(item.Down)*this.BarMaxHeight/this.MaxValue;aryDownBar.push({X:x,Y:y});}}this.DrawBars(aryUpBar,this.UpColor);this.DrawBars(aryDownBar,this.DownColor);};this.CalculateBaseLine=function(){if(!this.HQChart)return;var bHScreen=this.ChartFrame.IsHScreen===true;var bMinute=this.IsMinuteFrame();var border=this.ChartFrame.GetBorder();if(bMinute){var chart=this.HQChart.ChartPaint[0];if(!chart||!IFrameSplitOperator.IsNumber(chart.YClose))return;this.YBaseLine=this.ChartFrame.GetYFromData(chart.YClose);if(bHScreen){this.BarMaxHeight=(border.RightEx-this.YBaseLine)/3;}else{this.BarMaxHeight=(this.YBaseLine-border.TopEx)/3;}}else{//TODO:K线
4595
- }};this.DrawBars=function(aryBar,barColor){var bHScreen=this.ChartFrame.IsHScreen===true;var yCenter=this.YBaseLine;this.Canvas.strokeStyle=barColor;this.Canvas.beginPath();var barCount=0;for(var i=0;i<aryBar.length;++i){var item=aryBar[i];var x=ToFixedPoint(item.X);if(bHScreen){this.Canvas.moveTo(yCenter,x);this.Canvas.lineTo(item.Y,x);}else{this.Canvas.moveTo(x,yCenter);this.Canvas.lineTo(x,item.Y);}++barCount;}if(barCount>0)this.Canvas.stroke();};this.BuildCacheData=function(){this.MaxValue=null;var mapData=new _map2.default();this.MapCache=mapData;if(!IFrameSplitOperator.IsNonEmptyArray(this.AryData))return;var max=null,min=null;for(var i=0;i<this.AryData.length;++i){var item=this.AryData[i];if(!item)continue;var key=this.BuildKey(item);mapData.set(key,item);if(IFrameSplitOperator.IsNumber(item.Up)){if(!max)max={Value:item.Up};else if(max.Value<item.Up)max.Value=item.Up;if(!min)min={Value:item.Up};else if(min.Value>item.Up)min.Value=item.Up;}if(IFrameSplitOperator.IsNumber(item.Down)){if(!max)max={Value:item.Down};else if(max.Value<item.Down)max.Value=item.Down;if(!min)min={Value:item.Down};else if(min.Value>item.Down)min.Value=item.Down;}}if(max&&min){this.MaxValue=Math.max(Math.abs(max.Value),Math.abs(min.Value));}};this.GetMaxMin=function(){return{Min:null,Max:null};};}function ChartClipColorStick(){this.newMethod=IChartPainting;//派生
4596
+ }};this.DrawBars=function(aryBar,barColor){var bHScreen=this.ChartFrame.IsHScreen===true;var yCenter=this.YBaseLine;this.Canvas.strokeStyle=barColor;this.Canvas.beginPath();var barCount=0;for(var i=0;i<aryBar.length;++i){var item=aryBar[i];var x=ToFixedPoint(item.X);if(bHScreen){this.Canvas.moveTo(yCenter,x);this.Canvas.lineTo(item.Y,x);}else{this.Canvas.moveTo(x,yCenter);this.Canvas.lineTo(x,item.Y);}++barCount;}if(barCount>0)this.Canvas.stroke();};this.BuildCacheData=function(){this.MaxValue=null;var mapData=new _map2.default();this.MapCache=mapData;if(!IFrameSplitOperator.IsNonEmptyArray(this.AryData))return;var max=null,min=null;for(var i=0;i<this.AryData.length;++i){var item=this.AryData[i];if(!item)continue;var key=this.BuildKey(item);mapData.set(key,item);if(IFrameSplitOperator.IsNumber(item.Up)){if(!max)max={Value:item.Up};else if(max.Value<item.Up)max.Value=item.Up;if(!min)min={Value:item.Up};else if(min.Value>item.Up)min.Value=item.Up;}if(IFrameSplitOperator.IsNumber(item.Down)){if(!max)max={Value:item.Down};else if(max.Value<item.Down)max.Value=item.Down;if(!min)min={Value:item.Down};else if(min.Value>item.Down)min.Value=item.Down;}}if(max&&min){this.MaxValue=Math.max(Math.abs(max.Value),Math.abs(min.Value));if(IFrameSplitOperator.IsNumber(this.DefaultMax))this.MaxValue=Math.max(this.DefaultMax,this.MaxValue);}};this.GetMaxMin=function(){return{Min:null,Max:null};};}function ChartClipColorStick(){this.newMethod=IChartPainting;//派生
4596
4597
  this.newMethod();delete this.newMethod;this.ClassName="ChartClipColorStick";this.UpColor=g_JSChartResource.UpBarColor;this.DownColor=g_JSChartResource.DownBarColor;this.LineWidth=1;this.Style=0;//1=同方向 0=上下两个方向
4597
4598
  //差值线
4598
4599
  this.DownDiffColor=g_JSChartResource.DownBarColor;this.UpDiffColor=g_JSChartResource.UpBarColor;//文字
@@ -7391,7 +7392,7 @@ var JSCHART_LANGUAGE_ID={LANGUAGE_CHINESE_ID:0,//简体中文 CN
7391
7392
  LANGUAGE_ENGLISH_ID:1,//英文 EN
7392
7393
  LANGUAGE_TRADITIONAL_CHINESE_ID:2//繁体中文 TC
7393
7394
  };function JSChartLocalization(){this.TextResource=new _map2.default([//内部tooltip
7394
- ['Tooltip-Open',{CN:'开:',EN:'O:',TC:'開'}],['Tooltip-High',{CN:'高:',EN:'H:',TC:'高'}],['Tooltip-Low',{CN:'低:',EN:'L:',TC:'低'}],['Tooltip-Close',{CN:'收:',EN:'C:',TC:'收'}],['Tooltip-Increase',{CN:'幅:',EN:'I:',TC:'幅'}],['Tooltip-Vol',{CN:'量:',EN:'V:',TC:'量'}],['Tooltip-Amount',{CN:'额:',EN:'A:',TC:'額'}],['Tooltip-AvPrice',{CN:'均:',EN:'AP:',TC:'均'}],['Tooltip-Price',{CN:'价:',EN:'P:',TC:'價'}],['Tooltip-Exchange',{CN:'换:',EN:'E:',TC:'換'}],['Tooltip-Position',{CN:'持:',EN:'P:',TC:'持'}],['DivTooltip-Open',{CN:'开盘:',EN:'Open:',TC:'開盤'}],['DivTooltip-High',{CN:'最高:',EN:'High:',TC:'最高'}],['DivTooltip-Low',{CN:'最低:',EN:'Low:',TC:'最低'}],['DivTooltip-Close',{CN:'收盘:',EN:'Close:',TC:'收盤'}],['DivTooltip-Increase',{CN:'涨幅:',EN:'Increase:',TC:'漲幅'}],['DivTooltip-Vol',{CN:'数量:',EN:'Volume:',TC:'數量'}],['DivTooltip-Amount',{CN:'金额:',EN:'Amount:',TC:'金額'}],['DivTooltip-Exchange',{CN:'换手:',EN:'Exchange:',TC:'換手'}],['DivTooltip-Position',{CN:'持仓:',EN:'Position:',TC:'持倉'}],['DivTooltip-Price',{CN:'价格:',EN:'Price:',TC:'價格'}],['DialogTooltip-Date',{CN:'日期',EN:'Date',TC:'日期'}],['DialogTooltip-Time',{CN:'时间',EN:'Time',TC:'時間'}],['DialogTooltip-Open',{CN:'开盘价',EN:'Open',TC:'開盤價'}],['DialogTooltip-High',{CN:'最高价',EN:'High',TC:'最高價'}],['DialogTooltip-Low',{CN:'最低价',EN:'Low',TC:'最低價'}],['DialogTooltip-Close',{CN:'收盘价',EN:'Close',TC:'收盤價'}],['DialogTooltip-Increase',{CN:'涨幅',EN:'Increase',TC:'漲幅'}],['DialogTooltip-Risefall',{CN:'涨跌',EN:'Risefall',TC:'漲跌'}],['DialogTooltip-Vol',{CN:'成交量',EN:'Volume',TC:'數量'}],['DialogTooltip-Amount',{CN:'成交额',EN:'Amount',TC:'金額'}],['DialogTooltip-Exchange',{CN:'换手率',EN:'Exchange',TC:'換手'}],['DialogTooltip-Position',{CN:'持仓量',EN:'Position',TC:'持倉'}],['DialogTooltip-Price',{CN:'价格',EN:'Price',TC:'價格'}],['DialogTooltip-AvPrice',{CN:'均价',EN:'AVPrice:',TC:'均價'}],['DialogTooltip-FClose',{CN:"结算价",EN:'Settlement',TC:'結算價'}],['DialogTooltip-Amplitude',{CN:'振幅',EN:'amplitude',TC:'振幅'}],['DialogTooltip-AC-Price',{CN:'匹配价',EN:'Price',TC:'匹配價'}],['DialogTooltip-AC-AvPrice',{CN:'匹配均价',EN:'AVPrice',TC:'匹配均價'}],['DialogTooltip-AC-Increase',{CN:'竞价涨幅',EN:'Increase',TC:'競價漲幅'}],['DialogTooltip-AC-Vol',{CN:'匹配量',EN:'Vol',TC:'匹配量'}],['DialogTooltip-Value',{CN:'数值',EN:'Value',TC:'数值'}],['FloatTooltip-Date',{CN:'日期',EN:'Date',TC:'日期'}],['FloatTooltip-Time',{CN:'时间',EN:'Time',TC:'時間'}],['FloatTooltip-Open',{CN:'开盘价',EN:'Open',TC:'開盤價'}],['FloatTooltip-High',{CN:'最高价',EN:'High',TC:'最高價'}],['FloatTooltip-Low',{CN:'最低价',EN:'Low',TC:'最低價'}],['FloatTooltip-Close',{CN:'收盘价',EN:'Close',TC:'收盤價'}],['FloatTooltip-YClose',{CN:'昨收价',EN:'YClose',TC:'昨收價'}],['FloatTooltip-Increase',{CN:'涨幅',EN:'Increase',TC:'漲幅'}],['FloatTooltip-Risefall',{CN:'涨跌',EN:'Risefall',TC:'漲跌'}],['FloatTooltip-Vol',{CN:'成交量',EN:'Volume',TC:'數量'}],['FloatTooltip-Amount',{CN:'成交额',EN:'Amount',TC:'金額'}],['FloatTooltip-Exchange',{CN:'换手率',EN:'Exchange',TC:'換手'}],['FloatTooltip-Position',{CN:'持仓量',EN:'Position',TC:'持倉'}],['FloatTooltip-Price',{CN:'价格',EN:'Price',TC:'價格'}],['FloatTooltip-AvPrice',{CN:'均价',EN:'AVPrice:',TC:'均價'}],['FloatTooltip-FClose',{CN:"结算价",EN:'Settlement',TC:'結算價'}],['FloatTooltip-YSettlePrice',{CN:"昨结算",EN:'YSettlement',TC:'昨結算'}],['FloatTooltip-Amplitude',{CN:'振幅',EN:'amplitude',TC:'振幅'}],['DialogSelectRect-StartPrice',{CN:'起始价:',EN:'Start Price:',TC:'起始價'}],['DialogSelectRect-EndPrice',{CN:'最终价:',EN:"End Price:",TC:'最终價'}],['DialogSelectRect-High',{CN:'最高价:',EN:'High:',TC:'最高價'}],['DialogSelectRect-Low',{CN:'最低价:',EN:"Low:",TC:'最低價'}],['DialogSelectRect-Increase',{CN:'区间涨幅:',EN:'Increase',TC:'漲幅'}],['DialogSelectRect-Amplitude',{CN:'区间振幅:',EN:'amplitude',TC:'振幅'}],['DialogSelectRect-Vol',{CN:'成交量:',EN:'Volume',TC:'數量'}],['DialogSelectRect-Amount',{CN:'成交额:',EN:'Amount',TC:'金額'}],['DialogSelectRect-Up',{CN:'阳线:',EN:'Up',TC:'阳线'}],['DialogSelectRect-Down',{CN:'阴线:',EN:'Down',TC:'阴线'}],['DialogSelectRect-Unchanged',{CN:'平线:',EN:'Unchanged',TC:'平线'}],['DialogSelectRect-DataCount',{CN:'数据个数:',EN:'Data Count:',TC:'数据个数'}],//走势图PC tooltip
7395
+ ['Tooltip-Open',{CN:'开:',EN:'O:',TC:'開'}],['Tooltip-High',{CN:'高:',EN:'H:',TC:'高'}],['Tooltip-Low',{CN:'低:',EN:'L:',TC:'低'}],['Tooltip-Close',{CN:'收:',EN:'C:',TC:'收'}],['Tooltip-Increase',{CN:'幅:',EN:'I:',TC:'幅'}],['Tooltip-Vol',{CN:'量:',EN:'V:',TC:'量'}],['Tooltip-Amount',{CN:'额:',EN:'A:',TC:'額'}],['Tooltip-AvPrice',{CN:'均:',EN:'AP:',TC:'均'}],['Tooltip-Price',{CN:'价:',EN:'P:',TC:'價'}],['Tooltip-Exchange',{CN:'换:',EN:'E:',TC:'換'}],['Tooltip-Position',{CN:'持:',EN:'P:',TC:'持'}],['DivTooltip-Open',{CN:'开盘:',EN:'Open:',TC:'開盤'}],['DivTooltip-High',{CN:'最高:',EN:'High:',TC:'最高'}],['DivTooltip-Low',{CN:'最低:',EN:'Low:',TC:'最低'}],['DivTooltip-Close',{CN:'收盘:',EN:'Close:',TC:'收盤'}],['DivTooltip-Increase',{CN:'涨幅:',EN:'Increase:',TC:'漲幅'}],['DivTooltip-Vol',{CN:'数量:',EN:'Volume:',TC:'數量'}],['DivTooltip-Amount',{CN:'金额:',EN:'Amount:',TC:'金額'}],['DivTooltip-Exchange',{CN:'换手:',EN:'Exchange:',TC:'換手'}],['DivTooltip-Position',{CN:'持仓:',EN:'Position:',TC:'持倉'}],['DivTooltip-Price',{CN:'价格:',EN:'Price:',TC:'價格'}],['DialogTooltip-Date',{CN:'日期',EN:'Date',TC:'日期'}],['DialogTooltip-Time',{CN:'时间',EN:'Time',TC:'時間'}],['DialogTooltip-Open',{CN:'开盘价',EN:'Open',TC:'開盤價'}],['DialogTooltip-High',{CN:'最高价',EN:'High',TC:'最高價'}],['DialogTooltip-Low',{CN:'最低价',EN:'Low',TC:'最低價'}],['DialogTooltip-Close',{CN:'收盘价',EN:'Close',TC:'收盤價'}],['DialogTooltip-Increase',{CN:'涨幅',EN:'Increase',TC:'漲幅'}],['DialogTooltip-Risefall',{CN:'涨跌',EN:'Risefall',TC:'漲跌'}],['DialogTooltip-Vol',{CN:'成交量',EN:'Volume',TC:'數量'}],['DialogTooltip-Amount',{CN:'成交额',EN:'Amount',TC:'金額'}],['DialogTooltip-Exchange',{CN:'换手率',EN:'Exchange',TC:'換手'}],['DialogTooltip-Position',{CN:'持仓量',EN:'Position',TC:'持倉'}],['DialogTooltip-Price',{CN:'价格',EN:'Price',TC:'價格'}],['DialogTooltip-AvPrice',{CN:'均价',EN:'AVPrice:',TC:'均價'}],['DialogTooltip-FClose',{CN:"结算价",EN:'Settlement',TC:'結算價'}],['DialogTooltip-Amplitude',{CN:'振幅',EN:'amplitude',TC:'振幅'}],['DialogTooltip-AC-Price',{CN:'匹配价',EN:'Price',TC:'匹配價'}],['DialogTooltip-AC-AvPrice',{CN:'匹配均价',EN:'AVPrice',TC:'匹配均價'}],['DialogTooltip-AC-Increase',{CN:'竞价涨幅',EN:'Increase',TC:'競價漲幅'}],['DialogTooltip-AC-Vol',{CN:'匹配量',EN:'Vol',TC:'匹配量'}],['DialogTooltip-AC-NotMatchVol',{CN:'未匹配量:',EN:'NV:',TC:'未匹配量'}],['DialogTooltip-Value',{CN:'数值',EN:'Value',TC:'数值'}],['FloatTooltip-Date',{CN:'日期',EN:'Date',TC:'日期'}],['FloatTooltip-Time',{CN:'时间',EN:'Time',TC:'時間'}],['FloatTooltip-Open',{CN:'开盘价',EN:'Open',TC:'開盤價'}],['FloatTooltip-High',{CN:'最高价',EN:'High',TC:'最高價'}],['FloatTooltip-Low',{CN:'最低价',EN:'Low',TC:'最低價'}],['FloatTooltip-Close',{CN:'收盘价',EN:'Close',TC:'收盤價'}],['FloatTooltip-YClose',{CN:'昨收价',EN:'YClose',TC:'昨收價'}],['FloatTooltip-Increase',{CN:'涨幅',EN:'Increase',TC:'漲幅'}],['FloatTooltip-Risefall',{CN:'涨跌',EN:'Risefall',TC:'漲跌'}],['FloatTooltip-Vol',{CN:'成交量',EN:'Volume',TC:'數量'}],['FloatTooltip-Amount',{CN:'成交额',EN:'Amount',TC:'金額'}],['FloatTooltip-Exchange',{CN:'换手率',EN:'Exchange',TC:'換手'}],['FloatTooltip-Position',{CN:'持仓量',EN:'Position',TC:'持倉'}],['FloatTooltip-Price',{CN:'价格',EN:'Price',TC:'價格'}],['FloatTooltip-AvPrice',{CN:'均价',EN:'AVPrice:',TC:'均價'}],['FloatTooltip-FClose',{CN:"结算价",EN:'Settlement',TC:'結算價'}],['FloatTooltip-YSettlePrice',{CN:"昨结算",EN:'YSettlement',TC:'昨結算'}],['FloatTooltip-Amplitude',{CN:'振幅',EN:'amplitude',TC:'振幅'}],['DialogSelectRect-StartPrice',{CN:'起始价:',EN:'Start Price:',TC:'起始價'}],['DialogSelectRect-EndPrice',{CN:'最终价:',EN:"End Price:",TC:'最终價'}],['DialogSelectRect-High',{CN:'最高价:',EN:'High:',TC:'最高價'}],['DialogSelectRect-Low',{CN:'最低价:',EN:"Low:",TC:'最低價'}],['DialogSelectRect-Increase',{CN:'区间涨幅:',EN:'Increase',TC:'漲幅'}],['DialogSelectRect-Amplitude',{CN:'区间振幅:',EN:'amplitude',TC:'振幅'}],['DialogSelectRect-Vol',{CN:'成交量:',EN:'Volume',TC:'數量'}],['DialogSelectRect-Amount',{CN:'成交额:',EN:'Amount',TC:'金額'}],['DialogSelectRect-Up',{CN:'阳线:',EN:'Up',TC:'阳线'}],['DialogSelectRect-Down',{CN:'阴线:',EN:'Down',TC:'阴线'}],['DialogSelectRect-Unchanged',{CN:'平线:',EN:'Unchanged',TC:'平线'}],['DialogSelectRect-DataCount',{CN:'数据个数:',EN:'Data Count:',TC:'数据个数'}],//走势图PC tooltip
7395
7396
  ['PCTooltip-Date',{CN:'日期',EN:'Date',TC:"日期"}],['PCTooltip-Time',{CN:'时间',EN:'Time',TC:"時間"}],['PCTooltip-Price',{CN:'价格',EN:'Price:',TC:'價格'}],['PCTooltip-AvPrice',{CN:'均价',EN:'AVPrice:',TC:'均價'}],['PCTooltip-Increase',{CN:'涨幅',EN:'Increase:',TC:'漲幅'}],['PCTooltip-Vol',{CN:'成交量',EN:'Volume:',TC:'成交量'}],['PCTooltip-Amount',{CN:'成交额',EN:'Amount:',TC:'成交額'}],["PCTooltip-Position",{CN:'持仓量',EN:'Position:',TC:'持倉'}],['PCTooltip-AC-Price',{CN:'匹配价:',EN:'Price:',TC:'匹配價'}],['PCTooltip-AC-Increase',{CN:'竞价涨幅:',EN:'Increase:',TC:'競價漲幅'}],['PCTooltip-AC-Vol',{CN:'匹配量:',EN:'V:',TC:'匹配量'}],['PCTooltip-AC-NotMatchVol',{CN:'未匹配量:',EN:'NV:',TC:'未匹配量'}],//K线动态标题
7396
7397
  ['KTitle-Open',{CN:'开:',EN:'O:',TC:'開'}],['KTitle-High',{CN:'高:',EN:'H:',TC:'高'}],['KTitle-Low',{CN:'低:',EN:'L:',TC:'低'}],['KTitle-Close',{CN:'收:',EN:'C:',TC:'收'}],['KTitle-Increase',{CN:'幅:',EN:'I:',TC:'幅'}],['KTitle-Vol',{CN:'量:',EN:'V:',TC:'量'}],['KTitle-Amount',{CN:'额:',EN:'A:',TC:'額'}],['KTitle-Exchange',{CN:'换:',EN:'E:',TC:'換'}],['KTitle-Position',{CN:'持:',EN:'P:',TC:'持'}],['KTitle-Price',{CN:'价:',EN:'Price:',TC:'價'}],//走势图动态标题
7397
7398
  ['MTitle-AC-Price',{CN:'匹配价:',EN:'C:',TC:'匹配價'}],['MTitle-AC-AvPrice',{CN:'匹配均价:',EN:'C:',TC:'匹配均價'}],['MTitle-AC-Increase',{CN:'竞价涨幅:',EN:'I:',TC:'競價漲幅'}],['MTitle-AC-Vol',{CN:'匹配量:',EN:'V:',TC:'匹配量'}],['MTitle-AC-NotMatchVol',{CN:'未匹配量:',EN:'NV:',TC:'未匹配量'}],['MTitle-AC-Amount',{CN:'匹配量金额:',EN:'A:',TC:'匹配量金额'}],['MTitle-AC-NotMatchAmount',{CN:'未匹配量金额:',EN:'NA:',TC:'未匹配量金额'}],//走势图标题
@@ -12345,7 +12346,7 @@ chart.Family=varItem.Draw.DrawData.Family;chart.AryIcon=varItem.Draw.DrawData.Ic
12345
12346
  chart.Texts=varItem.Draw.DrawData;chart.DrawCallback=varItem.Draw.Callback;hqChart.ChartPaint.push(chart);};this.CreateStackedBar=function(hqChart,windowIndex,varItem,i){var chart=new ChartStackedBar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data.Data=varItem.Draw.DrawData;if(IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.BarColor))chart.BarColor=varItem.Draw.BarColor;if(IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.BarName))chart.BarName=varItem.Draw.BarName;if(IFrameSplitOperator.IsNumber(varItem.Draw.LineWidth))chart.LineWidth=varItem.Draw.LineWidth;if(IFrameSplitOperator.IsNumber(varItem.Draw.BarType))chart.BarType=varItem.Draw.BarType;hqChart.ChartPaint.push(chart);var titleIndex=windowIndex+1;var titleData=new DynamicTitleData(chart.Data,chart.BarName,chart.BarColor);titleData.DataType="ChartStackedBar";hqChart.TitlePaint[titleIndex].Data[i]=titleData;};this.CreateKLineTable=function(hqChart,windowIndex,varItem,i){var chart=new ChartKLineTable();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data=hqChart.GetKData();//绑定K线
12346
12347
  chart.AryTableData=varItem.Draw.DrawData;if(IFrameSplitOperator.IsNumber(varItem.Draw.RowCount))chart.RowCount=varItem.Draw.RowCount;if(IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.RowName))chart.RowName=varItem.Draw.RowName;var config=varItem.Draw.Config;if(config){if(config.BGColor)chart.BGColor=config.BGColor;if(config.TextColor)chart.TextColor=config.TextColor;if(config.BorderColor)chart.BorderColor=config.BorderColor;if(IFrameSplitOperator.IsNumber(config.RowNamePosition))chart.RowNamePosition=config.RowNamePosition;if(IFrameSplitOperator.IsNumber(config.RowHeightType))chart.RowHeightType=config.RowHeightType;if(config.ItemMergin){var subItem=config.ItemMergin;if(IFrameSplitOperator.IsNumber(subItem.Left))chart.ItemMergin.Left=subItem.Left;if(IFrameSplitOperator.IsNumber(subItem.Top))chart.ItemMergin.Top=subItem.Top;if(IFrameSplitOperator.IsNumber(subItem.Bottom))chart.ItemMergin.Bottom=subItem.Bottom;if(IFrameSplitOperator.IsNumber(subItem.Right))chart.ItemMergin.Right=subItem.Right;if(IFrameSplitOperator.IsNumber(subItem.YOffset))chart.ItemMergin.YOffset=subItem.YOffset;}if(config.TextFont){var subItem=config.TextFont;if(IFrameSplitOperator.IsNumber(subItem.FontMaxSize))chart.TextFontConfig.FontMaxSize=subItem.FontMaxSize;if(subItem.Family)chart.TextFontConfig.Family=subItem.Family;}}chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);var titleIndex=windowIndex+1;var titleData=new DynamicTitleData(chart.Data,chart.BarName,chart.BarColor);titleData.DataType="ChartKLineTable";hqChart.TitlePaint[titleIndex].Data[i]=titleData;};this.CreateScatterPlot=function(hqChart,windowIndex,varItem,i){var chart=new ChartScatterPlot();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data.Data=varItem.Draw.DrawData;chart.Color=varItem.Draw.Color;chart.Radius=varItem.Draw.Radius;hqChart.ChartPaint.push(chart);};this.CreateScatterPlotV2=function(hqChart,windowIndex,varItem,i){var chart=new ChartScatterPlotV2();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data=hqChart.GetKData();//绑定K线
12347
12348
  chart.AryPoint=varItem.Draw.DrawData;var config=varItem.Draw.Config;if(config){if(config.Color)chart.Color=config.Color;if(IFrameSplitOperator.IsNumber(config.Radius))chart.Radius=config.Radius;if(config.TextColor)chart.TextColor=config.TextColor;if(config.Font)chart.Font=config.Font;}chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateBaseLineBar=function(hqChart,windowIndex,varItem,id){var chart=new ChartBaseLineBar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data=hqChart.GetKData();//绑定K线
12348
- chart.AryData=varItem.Draw.DrawData;var config=varItem.Draw.Config;if(config){if(config.UpColor)chart.UpColor=config.UpColor;if(config.DownColor)chart.DownColor=config.DownColor;}chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateClipColorStick=function(hqChart,windowIndex,varItem,id){var chart=new ChartClipColorStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data.Data=varItem.Draw.DrawData;if(varItem.Option&&chart.SetOption)chart.SetOption(varItem.Option);hqChart.ChartPaint.push(chart);var titleIndex=windowIndex+1;if(varItem.IsShowTitle===false){}else{var clrTitle=this.GetDefaultColor(id);if(varItem.Option&&varItem.Option.TitleColor)clrTitle=this.GetColor(varItem.Option.TitleColor);hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(chart.Data,varItem.Name,clrTitle);}};this.CreateColorKLine=function(hqChart,windowIndex,varItem,i){var chart=new ChartColorKline();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
12349
+ chart.AryData=varItem.Draw.DrawData;var config=varItem.Draw.Config;if(config){if(config.UpColor)chart.UpColor=config.UpColor;if(config.DownColor)chart.DownColor=config.DownColor;if(IFrameSplitOperator.IsNumber(config.DefaultMax))chart.DefaultMax=config.DefaultMax;}chart.BuildCacheData();this.SetChartIndexName(chart);hqChart.ChartPaint.push(chart);};this.CreateClipColorStick=function(hqChart,windowIndex,varItem,id){var chart=new ChartClipColorStick();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.HQChart=hqChart;chart.Identify=this.Guid;chart.Data.Data=varItem.Draw.DrawData;if(varItem.Option&&chart.SetOption)chart.SetOption(varItem.Option);hqChart.ChartPaint.push(chart);var titleIndex=windowIndex+1;if(varItem.IsShowTitle===false){}else{var clrTitle=this.GetDefaultColor(id);if(varItem.Option&&varItem.Option.TitleColor)clrTitle=this.GetColor(varItem.Option.TitleColor);hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(chart.Data,varItem.Name,clrTitle);}};this.CreateColorKLine=function(hqChart,windowIndex,varItem,i){var chart=new ChartColorKline();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
12349
12350
  chart.KLineColor=varItem.Draw.DrawData.KLine;if(varItem.Color)chart.Color=varItem.Color;hqChart.ChartPaint.push(chart);};this.CreateRectangle=function(hqChart,windowIndex,varItem,i){var chart=new ChartRectangle();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Color=[varItem.Draw.DrawData.Color];chart.Rect=varItem.Draw.DrawData.Rect;if(varItem.Color)chart.BorderColor=this.GetColor(varItem.Color);hqChart.ChartPaint.push(chart);};this.CreateScriptOverlayLine=function(hqChart,windowIndex,varItem,i){var chart=new ChartOverlayLine();chart.Canvas=hqChart.Canvas;chart.DrawType=1;chart.Name=varItem.Name;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;if(varItem.Color)chart.Color=this.GetColor(varItem.Color);else chart.Color=this.GetDefaultColor(i);if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(!isNaN(width)&&width>0)chart.LineWidth=width;}if(varItem.IsDotLine)chart.IsDotLine=true;//虚线
12350
12351
  if(varItem.IsShow==false)chart.IsShow=false;var titleIndex=windowIndex+1;chart.Data.Data=varItem.Draw.DrawData.Data;chart.MainData.Data=varItem.Draw.DrawData.MainData;if(varItem.Draw.DrawData.Title)hqChart.TitlePaint[titleIndex].Data[i]=new DynamicTitleData(chart.Data,varItem.Draw.DrawData.Title,chart.Color);hqChart.ChartPaint.push(chart);};//创建K线
12351
12352
  this.CreateSelfKLine=function(hqChart,windowIndex,hisData){var chart=new ChartKLine();chart.Canvas=hqChart.Canvas;chart.Name="Self Kline";chart.Identify=this.Guid;chart.ChartBorder=hqChart.Frame.SubFrame[windowIndex].Frame.ChartBorder;chart.ChartFrame=hqChart.Frame.SubFrame[windowIndex].Frame;chart.Data=hisData;chart.IsShowMaxMinPrice=false;chart.IsShowKTooltip=false;chart.DrawType=this.KLineType;hqChart.ChartPaint.push(chart);};this.BindInstructionData=function(hqChart,windowIndex,hisData)//绑定指示指标
@@ -12459,7 +12460,7 @@ this.CreateIcon=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.O
12459
12460
  //hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
12460
12461
  this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateTipIcon=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartDrawSVG();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hqChart.GetKData();chart.Family=varItem.Draw.Icon.Family;chart.TextFont=g_JSChartResource.TIPICON.TextFont;var svgSize=g_JSChartResource.TIPICON.Size;var svgColor=g_JSChartResource.TIPICON.Color;var svgYOffset=0;var svgVAlign=2;//上下对齐方式
12461
12462
  if(IFrameSplitOperator.IsNumber(varItem.YOffset))svgYOffset=varItem.YOffset;if(varItem.Color)svgColor=this.GetColor(varItem.Color);if(varItem.DrawFontSize>0)svgSize=varItem.DrawFontSize;if(varItem.DrawVAlign>=0)svgVAlign=varItem.DrawVAlign;if(varItem.Draw&&IFrameSplitOperator.IsNonEmptyArray(varItem.Draw.DrawData)&&varItem.Draw.Icon){var drawData=varItem.Draw.DrawData;var aryData=[];var isArrayTip=Array.isArray(varItem.Draw.Text);var singleTip=null;if(!isArrayTip&&varItem.Draw.Text)singleTip={Text:varItem.Draw.Text};for(var j=0;j<drawData.length;++j){var item=drawData[j];var kItem=chart.Data.Data[j];if(!IFrameSplitOperator.IsNumber(item))continue;var svgItem={Value:item,Date:kItem.Date,Time:kItem.Time,SVG:{Symbol:varItem.Draw.Icon.Symbol,Size:svgSize,Color:svgColor,YOffset:svgYOffset,VAlign:svgVAlign}};if(isArrayTip){var text=varItem.Draw.Text[j];if(text)svgItem.Tooltip={Text:text};}else{svgItem.Tooltip=singleTip;}aryData.push(svgItem);}chart.Texts=aryData;}chart.BuildCacheData();frame.ChartPaint.push(chart);};this.CreateBaseLineBar=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartBaseLineBar();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.HQChart=hqChart;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hqChart.GetKData();//绑定K线
12462
- chart.AryData=varItem.Draw.DrawData;var config=varItem.Draw.Config;if(config){if(config.UpColor)chart.UpColor=config.UpColor;if(config.DownColor)chart.DownColor=config.DownColor;}chart.BuildCacheData();frame.ChartPaint.push(chart);};//创建通道
12463
+ chart.AryData=varItem.Draw.DrawData;var config=varItem.Draw.Config;if(config){if(config.UpColor)chart.UpColor=config.UpColor;if(config.DownColor)chart.DownColor=config.DownColor;if(IFrameSplitOperator.IsNumber(config.DefaultMax))chart.DefaultMax=config.DefaultMax;}chart.BuildCacheData();frame.ChartPaint.push(chart);};//创建通道
12463
12464
  this.CreateChannel=function(hqChart,windowIndex,varItem,id){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartChannel();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.Draw.AreaColor)chart.AreaColor=varItem.Draw.AreaColor;else if(varItem.Color)chart.AreaColor=this.GetColor(varItem.Color);else chart.AreaColor=this.GetDefaultColor(id);if(varItem.Draw.Border.Color)chart.LineColor=varItem.Draw.Border.Color;else chart.LineColor=null;if(varItem.Draw.Border.Dotted)chart.LineDotted=varItem.Draw.Border.Dotted;if(varItem.Draw.Border.Width>0)chart.LineWidth=varItem.Draw.Border.Width;//let titleIndex=windowIndex+1;
12464
12465
  chart.Data.Data=varItem.Draw.DrawData;frame.ChartPaint.push(chart);};//
12465
12466
  this.CreatePartLine=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartPartLine();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;if(varItem.LineWidth){var width=parseInt(varItem.LineWidth.replace("LINETHICK",""));if(IFrameSplitOperator.IsPlusNumber(width))chart.LineWidth=width;}if(IFrameSplitOperator.IsBool(varItem.IsDotLine))chart.IsDotLine=varItem.IsDotLine;if(IFrameSplitOperator.IsNonEmptyArray(varItem.LineDash))chart.LineDash=varItem.LineDash;chart.Data.Data=varItem.Draw.DrawData;this.SetChartIndexName(chart);frame.ChartPaint.push(chart);};this.CreateMultiLine=function(hqChart,windowIndex,varItem,i){var overlayIndex=this.OverlayIndex;var frame=overlayIndex.Frame;var chart=new ChartMultiLine();chart.Canvas=hqChart.Canvas;chart.Name=varItem.Name;chart.ChartBorder=frame.Frame.ChartBorder;chart.ChartFrame=frame.Frame;chart.Identify=overlayIndex.Identify;chart.Data=hqChart.ChartPaint[0].Data;//绑定K线
@@ -14838,10 +14839,11 @@ value=item.Data.Data[dataIndex];var text="--";if(value)text=titleChart.FormatVal
14838
14839
  if(dyTitle)title=dyTitle;var tooltipItem={Title:title,Text:text,Color:item.Color};aryText.push(tooltipItem);}++k;}return aryText;};this.GetFormatMinuteTooltipText=function(data){var defaultfloatPrecision=GetfloatPrecision(this.HQChart.Symbol);//价格小数位数
14839
14840
  var upperSymbol=this.HQChart.Symbol.toUpperCase();var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);var aryText=[];if(data.Type==0)//连续交易
14840
14841
  {var item=data.Data;if(!item)item={};aryText=[this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,"HH:MM",'DialogTooltip-Time'),this.ForamtPrice(item.Close,item.YClose,defaultfloatPrecision,'DialogTooltip-Price',1),this.ForamtPrice(item.AvPrice,item.YClose,defaultfloatPrecision,'DialogTooltip-AvPrice',1),this.FormatRisefall(item.Close,item.YClose,defaultfloatPrecision,'DialogTooltip-Risefall'),this.FormatIncrease(item.Close,item.YClose,defaultfloatPrecision,'DialogTooltip-Increase',1),this.FormatVol(item.Vol/unit,'DialogTooltip-Vol'),this.FormatAmount(item.Amount,'DialogTooltip-Amount')];if(this.LastValueCache&&this.LastValueCache.Y){var item=this.LastValueCache.Y;var rowItem=null;if(item.Extend.FrameID==0){rowItem=this.ForamtPrice(item.Value,null,defaultfloatPrecision,'DialogTooltip-Value',2);}else{rowItem=this.ForamtValue(item.Value,2,'DialogTooltip-Value');}if(rowItem)aryText.splice(2,0,rowItem);}}else if(data.Type==1)//集合竞价
14841
- {var item=data.Data.Data;if(!item)item={Vol:[]};var timeForamt="HH:MM:SS";if(item.Ver===1)timeForamt="HH:MM";aryText=[this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,timeForamt,'DialogTooltip-Time'),this.ForamtPrice(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Price',1),this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol')];}else{}var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP);if(event&&event.Callback){var sendData={AryText:aryText,Data:data,Symbol:this.HQChart.Symbol,HQChart:this.HQChart,IsMinute:true};event.Callback(event,sendData,this);}return aryText;};this.GetColor=function(price,yClose){if(price>yClose)return this.UpColor;else if(price<yClose)return this.DownColor;else return this.UnchangeColor;};this.GetPriceColor=function(price,yClose){var color=this.GetColor(price,yClose);return color;};//配色修改
14842
+ {var item=data.Data.Data;if(!item)item={Vol:[]};if(data.Data.Ver===1){var timeForamt="HH:MM";aryText=[this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,timeForamt,'DialogTooltip-Time'),this.ForamtPrice(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Price',1),this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol')];}else{var timeForamt="HH:MM:SS";aryText=[this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date'),this.FormatTime(item.Time,null,timeForamt,'DialogTooltip-Time'),this.ForamtPrice(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Price',1),this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol',2),this.FormatVol(item.Vol[1]/unit,'DialogTooltip-AC-NotMatchVol',2)];}}else{}var event=this.HQChart.GetEventCallback(JSCHART_EVENT_ID.ON_FORMAT_DIALOG_TOOLTIP);if(event&&event.Callback){var sendData={AryText:aryText,Data:data,Symbol:this.HQChart.Symbol,HQChart:this.HQChart,IsMinute:true};event.Callback(event,sendData,this);}return aryText;};this.GetColor=function(price,yClose){if(price>yClose)return this.UpColor;else if(price<yClose)return this.DownColor;else return this.UnchangeColor;};this.GetPriceColor=function(price,yClose){var color=this.GetColor(price,yClose);return color;};//配色修改
14842
14843
  this.ReloadResource=function(option){this.UpColor=g_JSChartResource.UpTextColor;this.DownColor=g_JSChartResource.DownTextColor;this.UnchangeColor=g_JSChartResource.UnchagneTextColor;this.TitleColor=g_JSChartResource.DialogTooltip.TitleColor;this.TitleBGColor=g_JSChartResource.DialogTooltip.TitleBGColor;this.BGColor=g_JSChartResource.DialogTooltip.BGColor;this.BorderColor=g_JSChartResource.DialogTooltip.BorderColor;this.VolColor=g_JSChartResource.DialogTooltip.VolColor;this.AmountColor=g_JSChartResource.DialogTooltip.AmountColor;this.TurnoverRateColor=g_JSChartResource.DialogTooltip.TurnoverRateColor;this.PositionColor=g_JSChartResource.DialogTooltip.PositionColor;this.DateTimeColor=g_JSChartResource.DialogTooltip.DateTimeColor;this.TextColor=g_JSChartResource.DialogTooltip.TextColor;this.ValueColor=g_JSChartResource.DialogTooltip.ValueColor;if(!this.DivDialog)return;this.UpdateStyle();};this.UpdateStyle=function(){if(!this.DivDialog)return;if(this.BGColor)this.DivDialog.style['background-color']=this.BGColor;if(this.BorderColor)this.DivDialog.style['border-color']=this.BorderColor;if(this.TitleBGColor)this.TitleBox.DivTitle.style['background-color']=this.TitleBGColor;if(this.TitleColor)this.TitleBox.DivName.style['color']=this.TitleColor;this.UpdateTableDOM();};/////////////////////////////////////////////////////////////////////////////////////////////
14843
14844
  //数据格式化 format=0 点差+涨幅 1=涨幅
14844
- this.ForamtPrice=function(price,yClose,defaultfloatPrecision,TitleID,format){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;if(format==2){item.Text=price.toFixed(defaultfloatPrecision);item.Color=this.ValueColor;return item;}if(IFrameSplitOperator.IsNumber(yClose)&&format!=1){var value=(price-yClose)/yClose*100;item.Text=price.toFixed(defaultfloatPrecision)+'('+value.toFixed(2)+'%)';}else{item.Text=price.toFixed(defaultfloatPrecision);}item.Color=this.GetColor(price,yClose);return item;};this.ForamtValue=function(value,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(value,defaultfloatPrecision,2,this.LanguageID);return item;};this.FormatVol=function(vol,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.VolColor};if(!IFrameSplitOperator.IsNumber(vol))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(vol,0,2,this.LanguageID);return item;};this.FormatAmount=function(amount,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.AmountColor};if(!IFrameSplitOperator.IsNumber(amount))return item;item.Text=IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);return item;};this.FormatIncrease=function(price,yClose,defaultfloatPrecision,TitleID,fromat){//涨幅
14845
+ this.ForamtPrice=function(price,yClose,defaultfloatPrecision,TitleID,format){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price))return item;if(format==2){item.Text=price.toFixed(defaultfloatPrecision);item.Color=this.ValueColor;return item;}if(IFrameSplitOperator.IsNumber(yClose)&&format!=1){var value=(price-yClose)/yClose*100;item.Text=price.toFixed(defaultfloatPrecision)+'('+value.toFixed(2)+'%)';}else{item.Text=price.toFixed(defaultfloatPrecision);}item.Color=this.GetColor(price,yClose);return item;};this.ForamtValue=function(value,defaultfloatPrecision,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(value))return item;item.Text=IFrameSplitOperator.FormatValueStringV2(value,defaultfloatPrecision,2,this.LanguageID);return item;};this.FormatVol=function(vol,TitleID,floatPrecision){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.VolColor};if(!IFrameSplitOperator.IsNumber(vol))return item;var decimal=0;//小数位数
14846
+ if(IFrameSplitOperator.IsNumber(floatPrecision))decimal=floatPrecision;item.Text=IFrameSplitOperator.FormatValueStringV2(vol,decimal,2,this.LanguageID);return item;};this.FormatAmount=function(amount,TitleID){var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:'--',Color:this.AmountColor};if(!IFrameSplitOperator.IsNumber(amount))return item;item.Text=IFrameSplitOperator.FormatValueString(amount,2,this.LanguageID);return item;};this.FormatIncrease=function(price,yClose,defaultfloatPrecision,TitleID,fromat){//涨幅
14845
14847
  var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price)||!IFrameSplitOperator.IsNumber(yClose))return item;var diffValue=price-yClose;var value=(price-yClose)/yClose;if(fromat==1){item.Text=(value*100).toFixed(2)+'%';}else{item.Text=diffValue.toFixed(defaultfloatPrecision)+'('+(value*100).toFixed(2)+'%)';}item.Color=this.GetColor(value,0);return item;};this.FormatRisefall=function(price,yClose,defaultfloatPrecision,TitleID){//涨跌
14846
14848
  var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(price)||!IFrameSplitOperator.IsNumber(yClose))return item;var value=price-yClose;item.Text=''+value.toFixed(defaultfloatPrecision);item.Color=this.GetColor(value,0);return item;};this.FormatAmplitude=function(high,low,yClose,defaultfloatPrecision,TitleID,fromat){//振幅
14847
14849
  var item={Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),Text:"--.--",Color:this.ValueColor};if(!IFrameSplitOperator.IsNumber(high)||!IFrameSplitOperator.IsNumber(low)||!IFrameSplitOperator.IsNumber(yClose))return item;var diffValue=high-low;var value=(high-low)/yClose;if(fromat==1)item.Text=(value*100).toFixed(2)+'%';else item.Text=diffValue.toFixed(defaultfloatPrecision)+'('+(value*100).toFixed(2)+'%)';item.Color=this.GetColor(value,0);return item;};this.ForamtDate=function(date,format,TitleID){//日期
@@ -15044,7 +15046,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
15044
15046
  this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
15045
15047
  * 版本信息输出
15046
15048
  *
15047
- */var HQCHART_VERSION="1.1.14842";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
15049
+ */var HQCHART_VERSION="1.1.14845";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n* \n* :%@@- \n* :@@@@- \n* =@@@@ :#@@@ .:+#@@@#=: :=*@@@@@@#+-. *@@@@. \n* :@@@@@ .@@@@@ .#@@@@@@@@@@@- +@@@@@@@@@@@@@+ @@@@@ -%@@* \n* +@@@@% #@@@@# *@@@@@@@@@@@@@@%. =@@@@@@@@@@@@@@@- @@@@@ -@@@@+ \n* %@@@@* @@@@@+ .%@@@@@@@@@@@@@@@@%: #@@@@@@@@@@@@@@@% @@@@# *@@@@= \n* @@@@@= @@@@@- .%@@@@@@@*++*%@@@@@@% .%@@@@@@@%*+==+**= -@@@@+ #@@@@- \n* @@@@@. @@@@@. #@@@@@%= =@@@@@@* %@@@@@@#: *@@@@- :::. .-+*###+: ::: .+##+: -%%@@@@@%%%% \n* .@@@@@ .@@@@@. +@@@@@% .@@@@@@ *@@@@@@: %@@@@: +@@@@@%. :%@@@@@@@@@@: *@@@ :@@@@@* @@@@@@@@@@@@ \n* :@@@@@ :@@@@@ @@@@@% :@@@@@+ @@@@@@: %@@@@-@@@@@@@@@. @@@@@@@@@@@@@. :@@@%-@@@@@@.:@@@@@@@@@@@# \n* -@@@@% -@@@@@ =@@@@@. %@@@@% %@@@@@- %@@@@@@@@@@@@@@* %@@@@@@@@@@@@+ -@@@@@@@@@@# -@@@@@@@@@@@. \n* +@@@@%=========#@@@@% @@@@@# :@@@@@ .@@@@@% @@@@@@@@%@@@@@@@ -%+:. .#@@@@* +@@@@@@@%%@. .::+@@@@#:: \n* #@@@@@@@@@@@@@@@@@@@# .@@@@@ .@@@@@ :@@@@@. @@@@@@#. #@@@@@. -@@@@* #@@@@@@: *@@@@+ \n* %@@@@@@@@@@@@@@@@@@@+ :@@@@@ .@@@@@ -@@@@@ @@@@@+ @@@@@. :@@@@* @@@@@% #@@@@- \n* @@@@@@@@@@@@@@@@@@@@: :@@@@% :@@@@@ +@@@@% -@@@@+ @@@@@ -@@@@+ @@@@@. @@@@@. \n* .@@@@@@@@@@@@@@@@@@@@ :@@@@% -@@@@% *@@@@% #@@@@. @@@@@ .=*#%%%@@@@@= :@@@@# @@@@@. \n* -@@@@@:::::::::=@@@@@ :@@@@@ @@@@@* +@@@@% @@@@@ @@@@% -#@@@@@@@@@@@@: -@@@@* @@@@@ \n* =@@@@% =@@@@% .@@@@@ :@@@@@. -@@@@% @@@@@ .@@@@* +@@@@@@@@@@@@@@. =@@@@+ .@@@@@ \n* +@@@@# +@@@@# @@@@@# %@@@@% :@@@@@ .@@@@% =@@@@= -@@@@@*-:..%@@@@ +@@@@= :@@@@# \n* *@@@@* *@@@@* +@@@@@: #@@@@@+ .@@@@@@ :@@@@% *@@@@- @@@@@. @@@@% #@@@@: =@@@@+ \n* %@@@@= %@@@@+ @@@@@@- .%@@@@@# #@@@@@# :@@@@% #@@@@: @@@@% @@@@* %@@@@. #@@@@- \n* @@@@@- @@@@@= =@@@@@@#=...-*@@@@@@@: @@@@@@%=. :+**. :@@@@* %@@@@. .@@@@* *@@@@= @@@@@ %@@@@+ \n* .@@@@@: .@@@@@: *@@@@@@@@@@@@@@@@@@@# =@@@@@@@@%%%@@@@@@ +@@@@- @@@@@ .@@@@@: :%@@@@@- .@@@@% %@@@@@*+- \n* :@@@@@ :@@@@@ +@@@@@@@@@@@@@@@@@@@# =@@@@@@@@@@@@@@@@% %@@@@ @@@@@ @@@@@@@@@@@@@@@: -@@@@* *@@@@@@@@- \n* =@@@@@ -@@@@@ :@@@@@@@@@@@@@@@@@@@# :@@@@@@@@@@@@@@@% @@@@@ %@@@% #@@@@@@@@@#@@@@. +@@@@- .@@@@@@@@# \n* *@@@@# =@@@@% :#@@@@@@@#: :@@@@@= =@@@@@@@@@@@+. @@@@@ :@@@+ *@@@@@@@- %@@@ *@@@= =@@@@@@@* \n* =++++- -++++= .:::. .=*+: :-=+++=:. ****= .=+. .-++=: :+++ -+=: .-=+=:. \n* \n* \n* HQChart \n* Ver: '+HQCHART_VERSION+' \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n************************************************************************************************************************************************************************** \n ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
15048
15050
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
15049
15051
  // BaseIndex:BaseIndex,
15050
15052
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.14843",
3
+ "version": "1.1.14846",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.DialogTooltip.js CHANGED
@@ -744,17 +744,31 @@ function JSDialogTooltip()
744
744
  {
745
745
  var item=data.Data.Data;
746
746
  if (!item) item={ Vol:[] };
747
-
748
- var timeForamt="HH:MM:SS";
749
- if (item.Ver===1) timeForamt="HH:MM"
750
- aryText=
751
- [
752
- this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
753
- this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
754
- this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
755
- this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
756
- this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol' ),
757
- ];
747
+ if (data.Data.Ver===1)
748
+ {
749
+ var timeForamt="HH:MM"
750
+ aryText=
751
+ [
752
+ this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
753
+ this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
754
+ this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
755
+ this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
756
+ this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol'),
757
+ ];
758
+ }
759
+ else
760
+ {
761
+ var timeForamt="HH:MM:SS";
762
+ aryText=
763
+ [
764
+ this.ForamtDate(item.Date,this.Style==1?"MM/DD/W":"YYYY/MM/DD/W",'DialogTooltip-Date' ),
765
+ this.FormatTime(item.Time, null, timeForamt, 'DialogTooltip-Time'),
766
+ this.ForamtPrice(item.Price,item.YClose, defaultfloatPrecision,'DialogTooltip-AC-Price',1),
767
+ this.FormatIncrease(item.Price,item.YClose,defaultfloatPrecision,'DialogTooltip-AC-Increase',1),
768
+ this.FormatVol(item.Vol[0]/unit,'DialogTooltip-AC-Vol', 2),
769
+ this.FormatVol(item.Vol[1]/unit,'DialogTooltip-AC-NotMatchVol', 2),
770
+ ];
771
+ }
758
772
  }
759
773
  else
760
774
  {
@@ -875,7 +889,7 @@ function JSDialogTooltip()
875
889
  return item;
876
890
  }
877
891
 
878
- this.FormatVol=function(vol, TitleID)
892
+ this.FormatVol=function(vol, TitleID, floatPrecision)
879
893
  {
880
894
  var item=
881
895
  {
@@ -886,7 +900,10 @@ function JSDialogTooltip()
886
900
 
887
901
  if (!IFrameSplitOperator.IsNumber(vol)) return item;
888
902
 
889
- item.Text=IFrameSplitOperator.FormatValueStringV2(vol,0,2,this.LanguageID);
903
+ var decimal=0; //小数位数
904
+ if (IFrameSplitOperator.IsNumber(floatPrecision)) decimal=floatPrecision;
905
+
906
+ item.Text=IFrameSplitOperator.FormatValueStringV2(vol,decimal,2,this.LanguageID);
890
907
 
891
908
  return item;
892
909
  }
package/src/jscommon/umychart.NetworkFilterTest.js CHANGED
@@ -55718,8 +55718,11 @@ HQData.Minute_RequestMinuteData=function(data, callback)
55718
55718
  var fullData=HQData.GetDayMinuteDataBySymbol(symbol);
55719
55719
  var srcStock=fullData[0];
55720
55720
  var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:symbol, name:symbol };
55721
+
55722
+ //盘前
55721
55723
  if (callcation.Before)
55722
55724
  {
55725
+ /*
55723
55726
  var before=
55724
55727
  [
55725
55728
  //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
@@ -55738,14 +55741,74 @@ HQData.Minute_RequestMinuteData=function(data, callback)
55738
55741
 
55739
55742
  var beforeinfo={ totalcount:11, ver:1.0 };
55740
55743
 
55744
+ stockItem.before=before;
55745
+ stockItem.beforeinfo=beforeinfo;
55746
+ */
55747
+
55748
+ var before=[];
55749
+ var beforeinfo={ totalcount:60*10, ver:2.0 }; //9:15-9:25 集合竞价15分钟 1s一个数据
55750
+ var price=srcStock.yclose+0.01;
55751
+
55752
+ var date=new Date(2021,5,2, 9,15, 0);
55753
+ var mapTest=new Map(
55754
+ [
55755
+ [91505, [91505,price+0.01, 400, 300, 1, 800]],
55756
+ [91550, [91550,price+0.02, 550, 600, 0, 1500]],
55757
+ [91603, [91603,price+0.03, 300, 600, 1, 3600]],
55758
+ [91613, [91613,price+0.03, 150, 320, 1, 3600]],
55759
+ [91623, [91623,price+0.04, 200, 400, 1, 3600]],
55760
+ [91635, [91635,price+0.05, 100, 100, 1, 3600]],
55761
+ [91640, [91640,price+0.03, 350, 210, 2, 1600]],
55762
+ [91711, [91711,price+0.02, 3210, 350, 2, 3700]],
55763
+ [91731, [91731,price+0.04, 110, 450, 1, 3700]],
55764
+ [91825, [91825,price-0.01, 210, 650, 2, 3700]],
55765
+ [91855, [91855,price-0.02, 330, 440, 1, 1000]],
55766
+ [91915, [91915,price-0.03, 630, 640, 1, 1200]],
55767
+ [92022, [92022,price+0.01, 260, 550, 2, 1000]],
55768
+ [92304, [92304,price-0.02, 300, 100, 2, 1000]],
55769
+ [92314, [92314,price-0.03, 550, 150, 2, 1000]],
55770
+ [92344, [92344,price-0.04, 550, 150, 1, 1000]],
55771
+ [92357, [92357,price-0.05, 250, 750, 1, 1500]],
55772
+ [92405, [92405,price-0.07, 450, 50, 2, 1000]],
55773
+ [92435, [92435,price-0.08, 650, 250, 1, 1000]],
55774
+ [92458, [92458,price-0.12, 350, 350, 2, 1000]],
55775
+ ])
55776
+
55777
+ for(var i=0;i<beforeinfo.totalcount; ++i) //1s一个数据
55778
+ {
55779
+ var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
55780
+
55781
+ var item=[ time, null, null, null, null, null ];
55782
+ if (mapTest.has(time))
55783
+ {
55784
+ item=mapTest.get(time);
55785
+ }
55786
+
55787
+ date.setSeconds(date.getSeconds()+1);
55788
+ before.push(item);
55789
+ }
55790
+
55741
55791
  stockItem.before=before;
55742
55792
  stockItem.beforeinfo=beforeinfo;
55743
55793
  }
55744
55794
 
55745
- var lastPrice=stockItem.minute[stockItem.minute.length-1].price;
55795
+ //盘中
55796
+ //stockItem.minute.length=2;
55797
+ //测试用 这里可以修改数据
55798
+ //var lastItem=srcStock.minute[srcStock.minute.length-1];
55799
+ //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
55800
+ /*
55801
+ for(var i=0;i<srcStock.minute.length;++i)
55802
+ {
55803
+ var item=srcStock.minute[i];
55804
+ if (item.amount<1000000) item.amount*=100000;
55805
+ }
55806
+ */
55746
55807
 
55747
55808
  if (bBuySellBar) //盘口分析
55748
55809
  {
55810
+ var lastPrice=srcStock.yclose;
55811
+ if (stockItem.minute.length>0) lastPrice=stockItem.minute[stockItem.minute.length-1].price;
55749
55812
  var aryBuy=[];
55750
55813
  var value=lastPrice+0.01;
55751
55814
  for(var i=0;i<10;++i)
@@ -55764,20 +55827,54 @@ HQData.Minute_RequestMinuteData=function(data, callback)
55764
55827
  stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
55765
55828
  }
55766
55829
 
55767
- //测试用 这里可以修改数据
55768
- //var lastItem=srcStock.minute[srcStock.minute.length-1];
55769
- //lastItem.price+=Math.ceil(Math.random()*10)/1000*lastItem.price;
55770
- /*
55771
- for(var i=0;i<srcStock.minute.length;++i)
55830
+ //盘后
55831
+ if (callcation.After && stockItem.minute.length>=240)
55772
55832
  {
55773
- var item=srcStock.minute[i];
55774
- if (item.amount<1000000) item.amount*=100000;
55775
- }
55776
- */
55833
+ var price=stockItem.minute[stockItem.minute.length-1].price;
55834
+ var afterData=[]
55835
+ var afterInfo={ ver:2.0, totalcount:60*3 } //14:57-15:00
55836
+ var date=new Date(2021,5,2, 14,57, 0);
55837
+ var mapTest=new Map(
55838
+ [
55839
+ [145708, [145708,price+0.01, 400, 300, 1, 800]],
55840
+ [145718, [145718,price+0.02, 550, 600, 0, 1500]],
55841
+ [145738, [145738,price+0.02, 150, 800, 0, 1500]],
55842
+ [145748, [145748,price+0.02, 150, 800, 0, 1500]],
55843
+ [145803, [145803,price+0.03, 300, 600, 1, 3600]],
55844
+ [145815, [145815,price+0.03, 350, 210, 2, 1600]],
55845
+ [145826, [145826,price+0.02, 1210, 350, 2, 2700]],
55846
+ [145833, [145833,price+0.01, 260, 550, 2, 1000]],
55847
+ [145845, [145845,price+0.02, 160, 750, 2, 1000]],
55848
+ [145858, [145858,price-0.01, 460, 650, 2, 1500]],
55849
+ [145905, [145905,price-0.02, 160, 450, 1, 1500]],
55850
+ [145928, [145928,price-0.02, 260, 250, 1, 1500]],
55851
+ [145948, [145948,price-0.02, 860, 150, 1, 1500]],
55852
+ ])
55853
+
55854
+ for(var i=0;i<afterInfo.totalcount; ++i) //1s一个数据
55855
+ {
55856
+ var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
55857
+
55858
+ var item=[ time, null, null, null, null, null ];
55777
55859
 
55778
- stockItem.minute.length=50;
55860
+ if (mapTest.has(time))
55861
+ {
55862
+ item=mapTest.get(time);
55863
+ }
55864
+
55865
+ date.setSeconds(date.getSeconds()+1);
55866
+ afterData.push(item);
55867
+ }
55868
+
55869
+ stockItem.after=afterData;
55870
+ stockItem.afterinfo=afterInfo;
55871
+ }
55779
55872
 
55780
55873
  var hqchartData={code:0, stock:[stockItem] };
55874
+
55875
+ var time=new Date();
55876
+ if (time.getSeconds()%3==1)
55877
+ hqchartData.LatestPointFlash={ FlashCount:2 };
55781
55878
 
55782
55879
 
55783
55880
  callback(hqchartData);
@@ -55813,15 +55910,16 @@ HQData.Minute_RequestMinuteDataV2=function(data, callback)
55813
55910
  var date=new Date(parseInt(stockItem.date/10000),(stockItem.date/100%100-1),stockItem.date%100, 9, 15, 0);
55814
55911
  var count=10*60; //9:15-9:25
55815
55912
  var before=[];
55816
- for(var i=0;i<count;++i)
55913
+ for(var i=0, j=0;i<count;++i)
55817
55914
  {
55818
55915
  var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
55819
- var testIndex=Math.floor(Math.random()*10)%TEST_BEFORE_DATA.length;
55916
+ var testIndex=j%TEST_BEFORE_DATA.length;
55820
55917
  var testData=TEST_BEFORE_DATA[testIndex];
55821
55918
  var item=[ time, null, null, null, null, null ];
55822
55919
  if (i%20==0 || i==count-1)
55823
55920
  {
55824
55921
  item=[ time, testData[0], testData[1], testData[2], testData[3], (testData[1]+testData[2])*1.5 ];
55922
+ ++j;
55825
55923
  }
55826
55924
  before.push(item);
55827
55925
  date.setSeconds(date.getSeconds()+1);
@@ -55847,15 +55945,16 @@ HQData.Minute_RequestMinuteDataV2=function(data, callback)
55847
55945
  var date=new Date(parseInt(stockItem.date/10000),(stockItem.date/100%100-1),stockItem.date%100, 14, 57, 0);
55848
55946
  var count=3*60; //14:57-15:00
55849
55947
  var after=[];
55850
- for(var i=0;i<count;++i)
55948
+ for(var i=0,j=0;i<count;++i)
55851
55949
  {
55852
55950
  var time=date.getHours()*10000+date.getMinutes()*100+date.getSeconds();
55853
- var testIndex=Math.floor(Math.random()*10)%TEST_AFTER_DATA.length;
55951
+ var testIndex=j%TEST_AFTER_DATA.length;
55854
55952
  var testData=TEST_AFTER_DATA[testIndex];
55855
55953
  var item=[ time, null, null, null, null, null ];
55856
55954
  if (i%10==0 || i==count-1)
55857
55955
  {
55858
55956
  item=[ time, testData[0], testData[1], testData[2], testData[3], (testData[1]+testData[2])*1.5 ];
55957
+ ++j;
55859
55958
  }
55860
55959
  after.push(item);
55861
55960
  date.setSeconds(date.getSeconds()+1);
@@ -56917,11 +57016,11 @@ HQData.Report_RequestStockData=function(data, callback)
56917
57016
  //名字字段
56918
57017
  var symbolEx={ Text:name };
56919
57018
  if (i%20==5)
56920
- symbolEx.Symbol={ Family:'iconfont', Size:16, Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}, { Text:'\ue627', Color:'#1c65db'} ] };
57019
+ symbolEx.Symbol={ Family:'iconfont', Size:14, Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}, { Text:'\ue627', Color:'#1c65db'} ] };
56921
57020
  else if (i%20==9)
56922
- symbolEx.Symbol={ Family:'iconfont', Size:16, Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}] } ;
57021
+ symbolEx.Symbol={ Family:'iconfont', Size:14, Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}] } ;
56923
57022
  else if (i%20==18)
56924
- symbolEx.Symbol={ Family:'iconfont', Size:16, Data:[ { Text:'\ue627', Color:'#1c65db'}] } ;
57023
+ symbolEx.Symbol={ Family:'iconfont', Size:14, Data:[ { Text:'\ue627', Color:'#1c65db'}] } ;
56925
57024
 
56926
57025
  newItem[27]=symbolEx;
56927
57026
 
@@ -57032,6 +57131,7 @@ HQData.Report_RequestStockSortData=function(data, callback)
57032
57131
  var column=data.Request.Data.column; //排序列信息
57033
57132
  var sortType=data.Request.Data.sort; //排序方向
57034
57133
  var pageSize=data.Request.Data.pageSize;
57134
+ var hqchart=data.Self;
57035
57135
  data.PreventDefault=true;
57036
57136
 
57037
57137
  var start=range.start;
@@ -57156,6 +57256,7 @@ HQData.Report_RequestVirtualStockData=function(data, callback)
57156
57256
  var column=data.Request.Data.column; //排序列信息
57157
57257
  var sortType=data.Request.Data.sort; //排序方向
57158
57258
  var pageSize=data.Request.Data.pageSize;
57259
+ var hqchart=data.Self;
57159
57260
  data.PreventDefault=true;
57160
57261
 
57161
57262
  var start=range.start;
@@ -57215,6 +57316,21 @@ HQData.Report_RequestVirtualStockData=function(data, callback)
57215
57316
  //换手率
57216
57317
  newItem[23]=(Math.round(Math.random()*60))/100;
57217
57318
 
57319
+ //行业
57320
+ newItem[201]="行业X";
57321
+ if (i%10==4) newItem[201]={ Text:"金融", TextColor:"rgb(0,206,209)"};
57322
+ else if (i%10==9) newItem[201]={ Text:"航天", TextColor:"rgb(0,0,0)", BGColor:"rgb(45,222,179)"};
57323
+ //地区
57324
+ newItem[202]="地区X";
57325
+
57326
+ newItem[101]=(Math.round(Math.random()*60))/100;
57327
+ newItem[102]=(Math.round(Math.random()*60))/100;
57328
+ newItem[103]=(Math.round(Math.random()*60))/100;
57329
+
57330
+ //日期
57331
+ newItem[401]={ DateTime:new Date() };
57332
+ newItem[402]={ DateTime:new Date() };
57333
+
57218
57334
  //名字字段
57219
57335
  var symbolEx={ Text:name };
57220
57336
  if (i%20==5)
@@ -57231,10 +57347,7 @@ HQData.Report_RequestVirtualStockData=function(data, callback)
57231
57347
  var extendData=[];
57232
57348
  newItem[30]=extendData;
57233
57349
 
57234
- //行业
57235
- extendData[0]="行业X";
57236
- //地区
57237
- extendData[1]="地区X";
57350
+
57238
57351
 
57239
57352
  //PE|PB
57240
57353
  extendData[2]=(Math.round(Math.random()*60))/100;
@@ -57252,9 +57365,18 @@ HQData.Report_RequestVirtualStockData=function(data, callback)
57252
57365
  newItem[351]={Title:"启动"};
57253
57366
  newItem[352]={Title:"加入"};
57254
57367
 
57368
+ if (i%20==3) newItem[80]='rgb(132,112,255)';
57369
+ else newItem[80]=null;
57370
+
57255
57371
 
57256
57372
  aryData.push(newItem);
57257
57373
  aryIndex.push(start+i);
57374
+
57375
+
57376
+ if (i==0)
57377
+ {
57378
+ hqchart.SetFlashBGItem(symbol, { ID:-1 , Color:"rgb(200,0,200)" });
57379
+ }
57258
57380
  }
57259
57381
  }
57260
57382
 
@@ -59033,7 +59155,7 @@ HQData.APIIndex_BASELINE_BAR=function(data, callback)
59033
59155
  Name:"BASELINE_BAR",
59034
59156
  DrawType:"BASELINE_BAR",
59035
59157
  DrawData:[],
59036
- Config:{ },
59158
+ Config:{ UpColor:"rgb(255,0,255)", DownColor:"rgb(255,165,0)"},
59037
59159
  },
59038
59160
  };
59039
59161
 
package/src/jscommon/umychart.complier.js CHANGED
@@ -22342,6 +22342,7 @@ function ScriptIndex(name,script,args,option)
22342
22342
  {
22343
22343
  if (config.UpColor) chart.UpColor=config.UpColor;
22344
22344
  if (config.DownColor) chart.DownColor=config.DownColor;
22345
+ if (IFrameSplitOperator.IsNumber(config.DefaultMax)) chart.DefaultMax=config.DefaultMax;
22345
22346
  }
22346
22347
 
22347
22348
  chart.BuildCacheData();
@@ -23912,6 +23913,7 @@ function OverlayScriptIndex(name,script,args,option)
23912
23913
  {
23913
23914
  if (config.UpColor) chart.UpColor=config.UpColor;
23914
23915
  if (config.DownColor) chart.DownColor=config.DownColor;
23916
+ if (IFrameSplitOperator.IsNumber(config.DefaultMax)) chart.DefaultMax=config.DefaultMax;
23915
23917
  }
23916
23918
 
23917
23919
  chart.BuildCacheData();
package/src/jscommon/umychart.js CHANGED
@@ -41460,6 +41460,7 @@ function ChartBaseLineBar()
41460
41460
  this.LineWidth=1;
41461
41461
  this.IsDrawFirst=true;
41462
41462
  this.AryData=[]; //{ Date, Time, Up, Down }
41463
+ this.DefaultMax; //默认最大值
41463
41464
 
41464
41465
  this.MaxValue;
41465
41466
  this.YBaseLine;
@@ -41631,6 +41632,7 @@ function ChartBaseLineBar()
41631
41632
  if (max && min)
41632
41633
  {
41633
41634
  this.MaxValue=Math.max(Math.abs(max.Value),Math.abs(min.Value));
41635
+ if (IFrameSplitOperator.IsNumber(this.DefaultMax)) this.MaxValue=Math.max(this.DefaultMax,this.MaxValue);
41634
41636
  }
41635
41637
  }
41636
41638
 
@@ -78336,6 +78338,7 @@ function JSChartLocalization()
78336
78338
  ['DialogTooltip-AC-AvPrice', {CN:'匹配均价', EN:'AVPrice', TC:'匹配均價'}],
78337
78339
  ['DialogTooltip-AC-Increase', {CN:'竞价涨幅', EN:'Increase', TC:'競價漲幅'}],
78338
78340
  ['DialogTooltip-AC-Vol', {CN:'匹配量', EN:'Vol', TC:'匹配量'}],
78341
+ ['DialogTooltip-AC-NotMatchVol', {CN:'未匹配量:', EN:'NV:', TC:'未匹配量'}],
78339
78342
  ['DialogTooltip-Value', {CN:'数值', EN:'Value', TC:'数值'}],
78340
78343
 
78341
78344
  ['FloatTooltip-Date', {CN:'日期', EN:'Date', TC:'日期'}],