hqchart 1.1.14956 → 1.1.14962

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 +11 -9
  2. package/package.json +1 -1
  3. package/src/jscommon/umychart.NetworkFilterTest.js +44 -16
  4. package/src/jscommon/umychart.TReport.js +5 -4
  5. package/src/jscommon/umychart.js +12 -0
  6. package/src/jscommon/umychart.report.js +49 -0
  7. package/src/jscommon/umychart.testdata.js +44 -16
  8. package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +62 -1
  9. package/src/jscommon/umychart.version.js +1 -1
  10. package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js +44 -16
  11. package/src/jscommon/umychart.vue/umychart.vue.js +67 -5
package/lib/umychart.vue.js CHANGED
@@ -9050,7 +9050,7 @@ this.ClearOverlaySymbol=function(){for(var i in this.OverlayChartPaint){var item
9050
9050
  this.UpdateFrameMaxMin();this.Draw();};this.ShowBeforeData=function(isShow,option){this.ShowCallAuctionData({Left:isShow},option);};//集合竞价设置 obj={ Left:, Right: }
9051
9051
  this.ShowCallAuctionData=function(obj,option){if(!obj)return;var optionChanged=false;//配置修改
9052
9052
  if(IFrameSplitOperator.IsBool(obj.Left)&&this.IsShowBeforeData!=obj.Left){this.IsShowBeforeData=obj.Left;optionChanged=true;}if(IFrameSplitOperator.IsBool(obj.Right)&&this.IsShowAfterData!=obj.Right){this.IsShowAfterData=obj.Right;optionChanged=true;}if(obj.MultiDay){var item=obj.MultiDay;if(IFrameSplitOperator.IsBool(item.Left)&&this.IsShowMultiDayBeforeData!=item.Left){this.IsShowMultiDayBeforeData=item.Left;optionChanged=true;}if(IFrameSplitOperator.IsBool(item.Right)&&this.IsShowMultiDayAfterData!=item.Right){this.IsShowMultiDayAfterData=item.Right;optionChanged=true;}}if(option){if(option.BeforeOpen){var item=option.BeforeOpen;if(IFrameSplitOperator.IsNumber(item.Left)&&this.ExtendWidth.Left!=item.Left){this.ExtendWidth.Left=item.Left;optionChanged=true;}}if(option.AfterClose){var item=option.AfterClose;if(IFrameSplitOperator.IsNumber(item.Right)&&this.ExtendWidth.Right!=item.Right){this.ExtendWidth.Right=item.Right;optionChanged=true;}}if(option.MultiDay){var item=option.MultiDay;if(IFrameSplitOperator.IsNumber(item.Left)&&this.MultiDayExtendWidth.Left!=item.Left){this.MultiDayExtendWidth.Left=item.Left;optionChanged=true;}if(IFrameSplitOperator.IsNumber(item.Right)&&this.MultiDayExtendWidth.Right!=item.Right){this.MultiDayExtendWidth.Right=item.Right;optionChanged=true;}}}if(optionChanged){this.Frame.ClearYCoordinateMaxMin();this.RequestData();}};//option={ ClearYCoordinateMaxMin:true }
9053
- this.RequestData=function(option){if(option){if(option.ClearYCoordinateMaxMin===true)this.Frame.ClearYCoordinateMaxMin();}if(this.DayCount<=1)this.RequestMinuteData();else this.RequestHistoryMinuteData();};this.ChangeDrawType=function(type){if(this.ChartPaint.length<=0)return;if(type==0)this.ChartPaint[0].IsDrawArea=true;else if(type==1)this.ChartPaint[0].IsDrawArea=false;else return;this.Draw();};this.UpdateDataOffset=function(){this.SourceData.DataOffset=this.DayOffset.DataOffset;for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;if(item.ClassName=="ChartMinuteVolumBar"||item.ClassName=="ChartMinutePriceLine")item.DayOffset=this.DayOffset;}for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;}//叠加指标当前显示的数据偏移
9053
+ this.RequestData=function(option){if(option){if(option.ClearYCoordinateMaxMin===true)this.Frame.ClearYCoordinateMaxMin();}this.ResetDataStatus();this.ClearIndexPaint();this.ClearIndexRunCount();this.ClearStockCache();if(this.DayCount<=1)this.RequestMinuteData();else this.RequestHistoryMinuteData();};this.ChangeDrawType=function(type){if(this.ChartPaint.length<=0)return;if(type==0)this.ChartPaint[0].IsDrawArea=true;else if(type==1)this.ChartPaint[0].IsDrawArea=false;else return;this.Draw();};this.UpdateDataOffset=function(){this.SourceData.DataOffset=this.DayOffset.DataOffset;for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;if(item.ClassName=="ChartMinuteVolumBar"||item.ClassName=="ChartMinutePriceLine")item.DayOffset=this.DayOffset;}for(var i=0;i<this.OverlayChartPaint.length;++i){var item=this.OverlayChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;}//叠加指标当前显示的数据偏移
9054
9054
  for(var i=0;i<this.Frame.SubFrame.length;++i){var subFrame=this.Frame.SubFrame[i];for(var j=0;j<subFrame.OverlayIndex.length;++j){var overlayItem=subFrame.OverlayIndex[j];for(var k=0;k<overlayItem.ChartPaint.length;++k){var item=overlayItem.ChartPaint[k];if(!item.Data)continue;item.Data.DataOffset=this.DayOffset.DataOffset;}}}};//请求历史分钟数据
9055
9055
  this.RequestHistoryMinuteData=function(){var self=this;this.IsBeforeData=false;this.IsAfterData=false;this.ChartSplashPaint.SetTitle(this.LoadDataSplashTitle);this.ChartSplashPaint.EnableSplash(true);this.Draw();if(this.NetworkFilter){var callCation={Before:this.IsShowMultiDayBeforeData,After:this.IsShowMultiDayAfterData//集合竞价
9056
9056
  };var bBuySellBar=this.IsShowMinuteBuySellBar();var obj={Name:'MinuteChartContainer::RequestHistoryMinuteData',//类名::函数
@@ -9094,7 +9094,8 @@ this.MultiDayBeforeOpenData[this.MultiDayBeforeOpenData.length-1]=beforeOpenData
9094
9094
  this.MultiDayBeforeOpenData.push(beforeOpenData);}if(afterCloseData&&IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)){var lastItem=this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1];if(lastItem.Date==afterCloseData.Date)this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1]=afterCloseData;else if(lastItem.Date<afterCloseData.Date)this.MultiDayAfterCloseData.push(afterCloseData);}}this.CaclutateCallCationYRange();};//增量更新
9095
9095
  this.RecvUpdateMinuteData=function(data){var minuteData=MinuteChartContainer.JsonDataToUpdateMinuteData(data);var aryColorData=MinuteChartContainer.JsonDataToMinuteLineColorData(data);var beforeOpenData=MinuteChartContainer.JsonDataToBeforeOpenData(data);var afterCloseData=MinuteChartContainer.JsonDataToAfterCloseData(data);var updateTime=MinuteChartContainer.JsonDataToMinuteLastUpdateTime(data);//数据最后的更新时间
9096
9096
  if(data.LatestPointFlash)//最新数据闪烁
9097
- {var item=data.LatestPointFlash;if(IFrameSplitOperator.IsNumber(item.FlashCount))this.SetLatestPointFlash(item.FlashCount);}if(this.DayCount>1)//多日走势图
9097
+ {var item=data.LatestPointFlash;if(IFrameSplitOperator.IsNumber(item.FlashCount))this.SetLatestPointFlash(item.FlashCount);}if(IFrameSplitOperator.IsNonEmptyArray(data.stock)&&data.stock[0]){this.DataStatus.LatestDate=data.stock[0].date;//保存下最后一天的日期
9098
+ this.RecvBuySellData(data.stock[0].BuySellData);}if(this.DayCount>1)//多日走势图
9098
9099
  {this.UpdateCallCationData(beforeOpenData,afterCloseData,{DataType:1});this.UpdateLineColorData(aryColorData,minuteData.date);this.UpdateLatestMinuteDataV2(minuteData);this.UpdateHistoryMinuteUI(updateTime);this.RecvMinuteDataEvent({FunctionName:"RecvUpdateMinuteData"});this.RequestOverlayMinuteData();//请求叠加数据 (主数据下载完再下载)
9099
9100
  this.BindAllOverlayIndexData(this.SourceData,{SyncExecute:false});this.AutoUpdateEvent(true,"MinuteChartContainer::RecvUpdateMinuteData");this.AutoUpdate();return;}//if (this.IsBeforeData && beforeOpenData) this.BeforeOpenData=beforeOpenData;
9100
9101
  //if (this.IsAfterData && afterCloseData) this.AfterCloseData=afterCloseData;
@@ -9319,7 +9320,7 @@ IsShowCorss:this.ChartCorssCursor.IsShowCorss,//是否显示十字线
9319
9320
  MinItem:minuteItem,Symbol:this.Symbol,Name:this.Name,LastValue:this.ChartCorssCursor.LastValue};this.DialogTooltip.Update(sendData);return true;};this.DrawSelectRectDialog=function(e){if(!this.DialogSelectRect)return;this.UpdateSelectRectDialog(e);};this.UpdateSelectRectDialog=function(e){if(!this.DialogSelectRect)return false;var data=e.data;//区间统计数据
9320
9321
  var x,y;if(data&&IFrameSplitOperator.IsNumber(data.X)&&IFrameSplitOperator.IsNumber(data.Y)){var pixelRatio=GetDevicePixelRatio();var rtClient=this.UIElement.getBoundingClientRect();var rtScroll=GetScrollPosition();x=data.X;y=data.Y;x+=rtClient.left+rtScroll.Left;y+=rtClient.top+rtScroll.Top;}var sendData={Symbol:this.Symbol,Name:this.Name,SelectData:data.SelectData,X:x,Y:y,e:e};this.DialogSelectRect.Update(sendData);};this.GetKData=function(){if(!this.SourceData)return null;var data=this.SourceData;if(!data)return null;return data;};//获取最新的一条盘前数据
9321
9322
  this.GetLatestBeforeOpenItem=function(){var lastItem=null;if(this.DayCount>1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayBeforeOpenData))return null;var dayItem=this.MultiDayBeforeOpenData[this.MultiDayBeforeOpenData.length-1];if(!dayItem||!IFrameSplitOperator.IsNonEmptyArray(dayItem.Data))return null;var finder=dayItem.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}else{if(!this.BeforeOpenData||!IFrameSplitOperator.IsNonEmptyArray(this.BeforeOpenData.Data))return null;var finder=this.BeforeOpenData.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}return lastItem;};//获取最新的一条盘后数据
9322
- this.GetLatestAfterCloseItem=function(){if(this.DayCount>1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData))return null;var dayItem=this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1];if(!dayItem||!IFrameSplitOperator.IsNonEmptyArray(dayItem.Data))return null;var finder=dayItem.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}else{if(!this.AfterCloseData||!IFrameSplitOperator.IsNonEmptyArray(this.AfterCloseData.Data))return null;var finder=this.AfterCloseData.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}return lastItem;};this.IsCallAuctionFrame=function(frameID){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaintEx))return false;if(!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return false;if(frameID<0||frameID>=this.Frame.SubFrame.length)return false;var subItem=this.Frame.SubFrame[frameID];if(!subItem||!subItem.Frame)return false;var subFrame=subItem.Frame;for(var i=0;i<this.ChartPaintEx.length;++i){var item=this.ChartPaintEx[i];if(item.ChartFrame&&item.ChartFrame.Guid==subFrame.Guid)return true;}return false;};}//盘前数据
9323
+ this.GetLatestAfterCloseItem=function(){var lastItem=null;if(this.DayCount>1){if(!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData))return null;var dayItem=this.MultiDayAfterCloseData[this.MultiDayAfterCloseData.length-1];if(!dayItem||!IFrameSplitOperator.IsNonEmptyArray(dayItem.Data))return null;var finder=dayItem.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}else{if(!this.AfterCloseData||!IFrameSplitOperator.IsNonEmptyArray(this.AfterCloseData.Data))return null;var finder=this.AfterCloseData.Data.findLast(function(element){return element&&IFrameSplitOperator.IsNumber(element.Price);});if(finder)lastItem=finder;}return lastItem;};this.IsCallAuctionFrame=function(frameID){if(!IFrameSplitOperator.IsNonEmptyArray(this.ChartPaintEx))return false;if(!IFrameSplitOperator.IsNonEmptyArray(this.Frame.SubFrame))return false;if(frameID<0||frameID>=this.Frame.SubFrame.length)return false;var subItem=this.Frame.SubFrame[frameID];if(!subItem||!subItem.Frame)return false;var subFrame=subItem.Frame;for(var i=0;i<this.ChartPaintEx.length;++i){var item=this.ChartPaintEx[i];if(item.ChartFrame&&item.ChartFrame.Guid==subFrame.Guid)return true;}return false;};}//盘前数据
9323
9324
  MinuteChartContainer.JsonDataToBeforeOpenData=function(data){var symbol=data.stock[0].symbol;var upperSymbol=symbol.toUpperCase();var isSHSZ=MARKET_SUFFIX_NAME.IsSHSZ(upperSymbol);var unit=MARKET_SUFFIX_NAME.GetVolUnit(upperSymbol);var yClose=data.stock[0].yclose;var preClose=data.stock[0].yclose;//前一个数据价格
9324
9325
  var stockData=data.stock[0];var date=stockData.date;//日期
9325
9326
  var beforeOpenData={Data:[],TotalCount:15,Ver:1.0,Date:date,YClose:stockData.yclose,YClearing:stockData.yclearing};var extendDataIndex=JSCHART_DATA_FIELD_ID.MINUTE_BEFOREOPEN_EXTENDDATA;//扩展数据序号
@@ -13272,7 +13273,7 @@ var _iteratorNormalCompletion23=true;var _didIteratorError23=false;var _iterator
13272
13273
  if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}if(option.EnableResize==true)this.CreateResizeListener();if(option.EnablePopMenuV2===true)chart.InitalPopMenu();if(option.FloatTooltip&&option.FloatTooltip.Enable)chart.InitalFloatTooltip(option.FloatTooltip);//提示信息
13273
13274
  if(option.MinuteChartTooltip&&option.MinuteChartTooltip.Enable)chart.InitalMinuteChartTooltip(option.MinuteChartTooltip);if(option.KLineChartTooltip&&option.KLineChartTooltip.Enable)chart.InitalKLineChartTooltip(option.KLineChartTooltip);if(option.Symbol)chart.Symbol=option.Symbol;if(option.Name)chart.Name=option.Name;var requestOption={Callback:null};if(chart.Symbol)requestOption.Callback=function(){chart.RequestMemberListData();};if(option.LoadStockList===false){chart.ChartSplashPaint.IsEnableSplash=false;chart.Draw();}else{chart.RequestStockListData(requestOption);//下载码表
13274
13275
  }};this.CreateJSReportChartContainer=function(option){var _this56=this;var chart=new JSReportChartContainer(this.CanvasElement);chart.GetExtraCanvas=function(name){return _this56.GetExtraCanvas(name);};chart.Create(option);if(option.NetworkFilter)chart.NetworkFilter=option.NetworkFilter;if(IFrameSplitOperator.IsNonEmptyArray(option.Column))chart.SetColumn(option.Column);if(IFrameSplitOperator.IsNonEmptyArray(option.Tab))chart.SetTab(option.Tab);if(IFrameSplitOperator.IsNumber(option.TabSelected))chart.SetSelectedTab(option.TabSelected);if(IFrameSplitOperator.IsBool(option.EnableDragRow))chart.EnableDragRow=option.EnableDragRow;if(IFrameSplitOperator.IsNumber(option.DragRowType))chart.DragRowType=option.DragRowType;if(IFrameSplitOperator.IsBool(option.EnableDragHeader))chart.EnableDragHeader=option.EnableDragHeader;if(IFrameSplitOperator.IsNumber(option.WheelPageType))chart.WheelPageType=option.WheelPageType;if(IFrameSplitOperator.IsBool(option.PageUpDownCycle))chart.PageUpDownCycle=option.PageUpDownCycle;//数据下载提示信息
13275
- if(IFrameSplitOperator.IsObject(option.SplashTitle)){var item=option.SplashTitle;if(item)chart.SplashTitle.StockList=item.StockList;if(item)chart.SplashTitle.MemberList=item.MemberList;}if(option.VScrollbar)chart.SetVScrollbar(option.VScrollbar);if(option.SortInfo){var item=option.SortInfo;if(IFrameSplitOperator.IsNumber(item.Field))chart.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))chart.SortInfo.Sort=item.Sort;}if(option.VirtualTable){var item=option.VirtualTable;if(IFrameSplitOperator.IsBool(item.Enable))chart.Data.Virtual.Enable=item.Enable;}var reportChart=chart.GetReportChart();if(reportChart){if(IFrameSplitOperator.IsNumber(option.TextOverflowStyle))reportChart.TextOverflowStyle=option.TextOverflowStyle;if(IFrameSplitOperator.IsNumber(option.MultiSelectModel))reportChart.MultiSelectModel=option.MultiSelectModel;if(IFrameSplitOperator.IsNumber(option.SelectedStyle))reportChart.SelectedStyle=option.SelectedStyle;}this.SetChartBorder(chart,option);//是否自动更新
13276
+ if(IFrameSplitOperator.IsObject(option.SplashTitle)){var item=option.SplashTitle;if(item)chart.SplashTitle.StockList=item.StockList;if(item)chart.SplashTitle.MemberList=item.MemberList;}if(option.VScrollbar)chart.SetVScrollbar(option.VScrollbar);if(option.SortInfo){var item=option.SortInfo;if(item.Search)chart.SortInfo.Field=chart.FindFiledIndex(item.Search);if(IFrameSplitOperator.IsNumber(item.Field))chart.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))chart.SortInfo.Sort=item.Sort;}if(option.VirtualTable){var item=option.VirtualTable;if(IFrameSplitOperator.IsBool(item.Enable))chart.Data.Virtual.Enable=item.Enable;}var reportChart=chart.GetReportChart();if(reportChart){if(IFrameSplitOperator.IsNumber(option.TextOverflowStyle))reportChart.TextOverflowStyle=option.TextOverflowStyle;if(IFrameSplitOperator.IsNumber(option.MultiSelectModel))reportChart.MultiSelectModel=option.MultiSelectModel;if(IFrameSplitOperator.IsNumber(option.SelectedStyle))reportChart.SelectedStyle=option.SelectedStyle;}this.SetChartBorder(chart,option);//是否自动更新
13276
13277
  if(option.IsAutoUpdate!=null)chart.IsAutoUpdate=option.IsAutoUpdate;if(option.AutoUpdateFrequency>0)chart.AutoUpdateFrequency=option.AutoUpdateFrequency;//数据筛选
13277
13278
  if(option.DataFilter){var item=option.DataFilter;if(IFrameSplitOperator.IsBool(item.Enable))chart.DataFilterConfig.Enable=item.Enable;}//注册事件
13278
13279
  if(option.EventCallback){for(var i=0;i<option.EventCallback.length;++i){var item=option.EventCallback[i];chart.AddEventCallback(item);}}return chart;};this.SetChartBorder=function(chart,option){if(!option.Border)return;var item=option.Border;if(IFrameSplitOperator.IsNumber(option.Border.Left))chart.Frame.ChartBorder.Left=option.Border.Left;if(IFrameSplitOperator.IsNumber(option.Border.Right))chart.Frame.ChartBorder.Right=option.Border.Right;if(IFrameSplitOperator.IsNumber(option.Border.Top))chart.Frame.ChartBorder.Top=option.Border.Top;if(IFrameSplitOperator.IsNumber(option.Border.Bottom))chart.Frame.ChartBorder.Bottom=option.Border.Bottom;var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
@@ -13369,7 +13370,7 @@ this.UIElement.ontouchstart=function(e){_this59.OnTouchStart(e);};this.UIElement
13369
13370
  this.Canvas.lineWidth=pixelTatio;//手机端需要根据分辨率比调整线段宽度
13370
13371
  this.LastMouseStatus.MouseOnStatus=null;if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash){this.Frame.Draw({IsEnableSplash:this.ChartSplashPaint.IsEnableSplash});this.ChartSplashPaint.Draw();return;}this.Frame.Draw();this.Frame.DrawLogo();//框架内图形
13371
13372
  for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsDrawFirst)item.Draw(this.LastMouseStatus);}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw(this.LastMouseStatus);}if(this.GlobalOption.FlashBGCount>0){this.DelayDraw(500);}};this.DelayDraw=function(frequency){var _this60=this;if(typeof this.FlashBGTimer=='number'){clearTimeout(this.FlashBGTimer);this.FlashBGTimer=null;}this.FlashBGTimer=setTimeout(function(){_this60.Draw();},frequency);};this.ResetReportStatus=function(){this.Data.XOffset=0;this.Data.YOffset=0;};this.ResetReportSelectStatus=function(){var chart=this.GetReportChart();if(chart){chart.SelectedRow=-1;chart.SelectedFixedRow=-1;chart.MultiSelectedRow=[];}};this.ClearData=function(){this.SourceData.Data=[];this.Data.Data=[];this.Data.Virtual.Count=0;this.BlockData=new _map2.default();};this.ClearMapStockData=function(){this.MapStockData=new _map2.default();};this.ResetSortStatus=function(){this.SortInfo.Field=-1;this.SortInfo.Sort=0;};this.SetSelectedRow=function(option){var reportChart=this.GetReportChart();if(!reportChart)return false;if(!reportChart.SetSelectedRow(option))return false;this.Draw();};//设置股票列表
13372
- this.SetSymbolList=function(arySymbol,option){this.ClearData();this.ResetReportStatus();this.ResetSortStatus();if(IFrameSplitOperator.IsNonEmptyArray(arySymbol)){for(var i=0;i<arySymbol.length;++i){this.Data.Data.push(arySymbol[i]);}}var chart=this.ChartPaint[0];if(chart)chart.Data=this.Data;this.Draw();};this.ChangeSymbol=function(symbol,option){var _this61=this;this.Symbol=symbol;this.ClearData();this.ResetReportStatus();this.ResetSortStatus();this.ResetReportSelectStatus();if(option){if(IFrameSplitOperator.IsNumber(option.TabSelected)){var chartTab=this.GetTabChart();if(chartTab)chartTab.SelectedTabIndex=option.TabSelected;}if(Array.isArray(option.FixedSymbol)){var chart=this.GetReportChart();if(chart){chart.FixedRowCount=0;this.FixedRowData.Type=1;this.FixedRowData.Symbol=[];var aryData=option.FixedSymbol;for(var i=0;i<aryData.length;++i){var item=aryData[i];this.FixedRowData.Symbol.push(item.Symbol);++chart.FixedRowCount;}this.SetSizeChange(true);}}if(option.SortInfo){var item=option.SortInfo;if(IFrameSplitOperator.IsNumber(item.Field))this.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))this.SortInfo.Sort=item.Sort;}if(IFrameSplitOperator.IsNonEmptyArray(option.Column))//字段重新设置
13373
+ this.SetSymbolList=function(arySymbol,option){this.ClearData();this.ResetReportStatus();this.ResetSortStatus();if(IFrameSplitOperator.IsNonEmptyArray(arySymbol)){for(var i=0;i<arySymbol.length;++i){this.Data.Data.push(arySymbol[i]);}}var chart=this.ChartPaint[0];if(chart)chart.Data=this.Data;this.Draw();};this.ChangeSymbol=function(symbol,option){var _this61=this;this.Symbol=symbol;this.ClearData();this.ResetReportStatus();this.ResetSortStatus();this.ResetReportSelectStatus();if(option){if(IFrameSplitOperator.IsNumber(option.TabSelected)){var chartTab=this.GetTabChart();if(chartTab)chartTab.SelectedTabIndex=option.TabSelected;}if(Array.isArray(option.FixedSymbol)){var chart=this.GetReportChart();if(chart){chart.FixedRowCount=0;this.FixedRowData.Type=1;this.FixedRowData.Symbol=[];var aryData=option.FixedSymbol;for(var i=0;i<aryData.length;++i){var item=aryData[i];this.FixedRowData.Symbol.push(item.Symbol);++chart.FixedRowCount;}this.SetSizeChange(true);}}if(option.SortInfo){var item=option.SortInfo;if(item.Search)this.SortInfo.Field=this.FindFiledIndex(item.Search);if(IFrameSplitOperator.IsNumber(item.Field))this.SortInfo.Field=item.Field;if(IFrameSplitOperator.IsNumber(item.Sort))this.SortInfo.Sort=item.Sort;}if(IFrameSplitOperator.IsNonEmptyArray(option.Column))//字段重新设置
13373
13374
  {this.SetColumn(option.Column,{Draw:false});}if(IFrameSplitOperator.IsBool(option.IsReloadStockList)&&option.IsReloadStockList){var requestOption={Callback:null};if(this.Symbol)requestOption.Callback=function(){_this61.RequestMemberListData();};this.MapStockData=new _map2.default();this.RequestStatus.IsFinishStockList=false;this.RequestStatus.IsFinishMemberList=false;this.RequestStockListData(requestOption);return;}}this.RequestMemberListData();};//更新数据
13374
13375
  this.UpdateFullData=function(data){var arySymbol=[];if(IFrameSplitOperator.IsNonEmptyArray(data.data)){//0=证券代码 1=股票名称
13375
13376
  for(var i=0;i<data.data.length;++i){var item=data.data[i];var symbol=item[0];var stock=null;if(this.MapStockData.has(symbol)){stock=this.MapStockData.get(symbol);}else{stock=new HQReportItem();stock.OriginalSymbol=symbol;this.MapStockData.set(symbol,stock);}stock.Symbol=this.GetSymbolNoSuffix(symbol);stock.Name=item[1];this.ReadStockJsonData(stock,item);arySymbol.push(symbol);}}//设置显示数据
@@ -13581,7 +13582,8 @@ var oneStep=this.YStepPixel;if(oneStep<=0)oneStep=5;var step=parseInt(moveUpDown
13581
13582
  var oneStep=this.XStepPixel;if(oneStep<=0)oneStep=5;var step=parseInt(moveLeftRight/oneStep);//除以4个像素
13582
13583
  if(step<=0)return false;if(!isLeft)step*=-1;if(this.MoveXOffset(step)){drag.IsXMove=true;this.Draw();}return true;};this.OnTouchMove=function(e){if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;var reportChart=this.GetReportChart();if(!reportChart)return;var touches=this.GetTouchData(e);if(this.IsPhoneDragging(e)){var drag=this.TouchDrag;this.TouchInfo.Move={X:touches[0].clientX,Y:touches[0].clientY};if(drag){this.PreventTouchEvent(e);var moveAngle=this.GetMoveAngle(drag.LastMove,{X:touches[0].clientX,Y:touches[0].clientY});var moveLeftRight=Math.abs(drag.LastMove.X-touches[0].clientX);var moveUpDown=Math.abs(drag.LastMove.Y-touches[0].clientY);if(drag.IsYMove==true){this.ShowPageInfo(true);if(!this.OnDragYOffset(drag,touches,moveUpDown,e))return;}else if(drag.IsXMove==true){if(!this.OnDragXOffset(drag,touches,moveLeftRight,e))return;}else if(moveUpDown>0&&moveAngle<this.TouchMoveMinAngle){this.ShowPageInfo(true);if(!this.OnDragYOffset(drag,touches,moveUpDown,e))return;}else if(moveLeftRight>0&&moveAngle>=this.TouchMoveMinAngle){if(!this.OnDragXOffset(drag,touches,moveLeftRight,e))return;}else{return;}drag.LastMove.X=touches[0].clientX;drag.LastMove.Y=touches[0].clientY;}}};this.OnTouchEnd=function(e){JSConsole.Chart.Log('[JSReportChartContainer:OnTouchEnd]',e);if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash==true)return;this.ShowPageInfo(false);this.OnTouchClick(this.TouchInfo,e);this.IsOnTouch=false;this.TouchDrag=null;this.TouchInfo=null;};this.OnTouchClick=function(touchInfo,e){if(!touchInfo||!touchInfo.Click)return false;if(touchInfo.Move)return false;var clickPoint=touchInfo.InsideClick;var reportChart=this.GetReportChart();if(!reportChart)return false;var clickData=reportChart.OnMouseDown(clickPoint.X,clickPoint.Y,e);if(!clickData)return false;if(clickData.Type==2||clickData.Type==4)//点击行
13583
13584
  {if(clickData.Redraw==true)this.Draw();}else if(clickData.Type==3)//表头
13584
- {this.OnClickHeader(clickData,e);}JSConsole.Chart.Log('[JSReportChartContainer:OnTouchClick] clickData',clickData);};this.GetTabChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart.Tab;};this.GetVScrollbarChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart.VScrollbar;};this.GetReportChart=function(){var chart=this.ChartPaint[0];return chart;};this.GotoNextItem=function(step){if(step==0)return false;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return false;var chart=this.ChartPaint[0];if(!chart)return false;var pageSize=chart.GetPageSize();if(pageSize>this.Data.Data.length)return false;var moveCount=0;if(step>0){for(var i=0;i<step;++i){if(this.Data.YOffset+pageSize>=this.Data.Data.length)break;++this.Data.YOffset;++moveCount;}}else if(step<0){step=Math.abs(step);for(var i=0;i<step;++i){if(this.Data.YOffset<=0)break;--this.Data.YOffset;++moveCount;}}return moveCount>0;};this.GotoNextPage=function(bCycle)//bCycle 是否循环
13585
+ {this.OnClickHeader(clickData,e);}JSConsole.Chart.Log('[JSReportChartContainer:OnTouchClick] clickData',clickData);};this.GetTabChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart.Tab;};this.GetVScrollbarChart=function(){var chart=this.ChartPaint[0];if(!chart)return null;return chart.VScrollbar;};this.GetReportChart=function(){var chart=this.ChartPaint[0];return chart;};//获取列索引
13586
+ this.FindFiledIndex=function(search){if(!search)return-1;var chart=this.GetReportChart();if(!chart)return-1;if(!IFrameSplitOperator.IsNonEmptyArray(chart.Column))return-1;if(search.ID){for(var i=0;i<chart.Column.length;++i){var item=chart.Column[i];if(!item)continue;if(item.ID==search.ID)return i;}return-1;}if(search.Title){for(var i=0;i<chart.Column.length;++i){var item=chart.Column[i];if(!item)continue;if(item.Title==search.Title)return i;}return-1;}if(search.Type){for(var i=0;i<chart.Column.length;++i){var item=chart.Column[i];if(!item)continue;if(item.Type==search.Type)return i;}return-1;}return-1;};this.GotoNextItem=function(step){if(step==0)return false;if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return false;var chart=this.ChartPaint[0];if(!chart)return false;var pageSize=chart.GetPageSize();if(pageSize>this.Data.Data.length)return false;var moveCount=0;if(step>0){for(var i=0;i<step;++i){if(this.Data.YOffset+pageSize>=this.Data.Data.length)break;++this.Data.YOffset;++moveCount;}}else if(step<0){step=Math.abs(step);for(var i=0;i<step;++i){if(this.Data.YOffset<=0)break;--this.Data.YOffset;++moveCount;}}return moveCount>0;};this.GotoNextPage=function(bCycle)//bCycle 是否循环
13585
13587
  {if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return false;var chart=this.ChartPaint[0];if(!chart)return false;var pageSize=chart.GetPageSize();var dataCount=chart.GetAllRowCount();if(pageSize>dataCount)return false;if(this.Data.YOffset+pageSize>=dataCount){if(bCycle===true){this.Data.YOffset=0;//循环到第1页
13586
13588
  return true;}else{return false;}}this.Data.YOffset+=pageSize;var showDataCount=dataCount-this.Data.YOffset;if(chart.SelectedModel==0){if(chart.SelectedRow>showDataCount-1)chart.SelectedRow=showDataCount-1;}return true;};this.GotoPreviousPage=function(bCycle)//bCycle 是否循环
13587
13589
  {if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return false;var chart=this.ChartPaint[0];if(!chart)return false;var pageSize=chart.GetPageSize();var dataCount=chart.GetAllRowCount();if(pageSize>dataCount)return false;if(this.Data.YOffset<=0){if(bCycle===true){this.Data.YOffset=dataCount-pageSize;//循环到最后一页
@@ -14420,8 +14422,8 @@ case TREPORT_COLUMN_ID.BUY_VOL_ID://买量
14420
14422
  case TREPORT_COLUMN_ID.POSITION_ID://持仓量
14421
14423
  case TREPORT_COLUMN_ID.VOL_ID://成交量
14422
14424
  case TREPORT_COLUMN_ID.AMOUNT_ID://成交金额
14423
- var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName)drawInfo.Text=this.FormatVolString(data[fieldName]);break;case TREPORT_COLUMN_ID.INCREASE_ID:case TREPORT_COLUMN_ID.UPDOWN_ID:case TREPORT_COLUMN_ID.AMPLITUDE_ID:var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName){var value=data[fieldName];if(IFrameSplitOperator.IsNumber(value)){drawInfo.Text=value.toFixed(2);drawInfo.TextColor=this.GetUpDownColor(value,0);}else{this.GetNullDrawInfo(drawInfo);}}break;case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:this.FormatReserveNumber(column,data,drawInfo);break;case TREPORT_COLUMN_ID.RESERVE_STRING1_ID:case TREPORT_COLUMN_ID.RESERVE_STRING2_ID:case TREPORT_COLUMN_ID.RESERVE_STRING3_ID:case TREPORT_COLUMN_ID.RESERVE_STRING4_ID:case TREPORT_COLUMN_ID.RESERVE_STRING5_ID:case TREPORT_COLUMN_ID.RESERVE_STRING6_ID:case TREPORT_COLUMN_ID.RESERVE_STRING7_ID:case TREPORT_COLUMN_ID.RESERVE_STRING8_ID:case TREPORT_COLUMN_ID.RESERVE_STRING9_ID:case TREPORT_COLUMN_ID.RESERVE_STRING10_ID:this.FormatReserveString(column,data,drawInfo);break;default:drawInfo.Text='-----';}this.GetMarkBorderData(drawInfo,exePriceData.ExePrice,column.Type,cellType);this.GetFlashBGData(drawInfo,exePriceData,column.Type,cellType);}this.DrawCell(drawInfo,exePriceData,column.Type,cellType);if(column.EnableChartTooltip){var tooltipData={Rect:rtItem,Data:data,Index:index,Column:column,CellType:cellType,Type:20};this.TooltipRect.push(tooltipData);}};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}}//TODO: 不同类型的 格式化输出
14424
- drawInfo.Text=value.toFixed(column.FloatPrecision);};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}};this.GetFlashBGData=function(drawInfo,exePriceData,columnType,cellType){if(!exePriceData.TData)return;var data=null;if(cellType==1)data=exePriceData.TData.LeftFlashBG;else if(cellType==2)data=exePriceData.TData.RightFlashBG;if(!data||!data.Data)return;if(data.Data.has(columnType)){var item=data.Data.get(columnType);drawInfo.FlashBGColor=item.Color;--item.Count;if(this.GlobalOption)++this.GlobalOption.FlashBGCount;}};this.GetMarkBorderData=function(drawInfo,exePrice,columnType,cellType){if(!this.BorderData||!this.BorderData.MapData)return;if(!this.BorderData.MapData.has(columnType))return;var borderData=this.BorderData.MapData.get(columnType);if(!IFrameSplitOperator.IsNonEmptyArray(borderData.Data))return;if(cellType==1){var leftBorder=borderData.Data[1];if(!leftBorder)return;if(leftBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}else if(cellType==2){var rightBorder=borderData.Data[2];if(!rightBorder)return;if(rightBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}};this.GetNullDrawInfo=function(drawInfo){drawInfo.Text="--";drawInfo.TextColor=this.UnchangeColor;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo){if(!IFrameSplitOperator.IsNumber(price)){this.GetNullDrawInfo(drawInfo);return;}drawInfo.Text=price.toFixed(data.Decimal);if(!IFrameSplitOperator.IsNumber(stock.YClose))drawInfo.TextColor=this.UnchangeColor;else drawInfo.TextColor=this.GetUpDownColor(price,stock.YClose);};//单独处理成交量显示
14425
+ var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName)drawInfo.Text=this.FormatVolString(data[fieldName]);break;case TREPORT_COLUMN_ID.INCREASE_ID:case TREPORT_COLUMN_ID.UPDOWN_ID:case TREPORT_COLUMN_ID.AMPLITUDE_ID:var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(fieldName){var value=data[fieldName];if(IFrameSplitOperator.IsNumber(value)){drawInfo.Text=value.toFixed(2);drawInfo.TextColor=this.GetUpDownColor(value,0);}else{this.GetNullDrawInfo(drawInfo);}}break;case TREPORT_COLUMN_ID.RESERVE_NUMBER1_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER2_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER3_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER4_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER5_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER6_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER7_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER8_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER9_ID:case TREPORT_COLUMN_ID.RESERVE_NUMBER10_ID:this.FormatReserveNumber(column,data,drawInfo);break;case TREPORT_COLUMN_ID.RESERVE_STRING1_ID:case TREPORT_COLUMN_ID.RESERVE_STRING2_ID:case TREPORT_COLUMN_ID.RESERVE_STRING3_ID:case TREPORT_COLUMN_ID.RESERVE_STRING4_ID:case TREPORT_COLUMN_ID.RESERVE_STRING5_ID:case TREPORT_COLUMN_ID.RESERVE_STRING6_ID:case TREPORT_COLUMN_ID.RESERVE_STRING7_ID:case TREPORT_COLUMN_ID.RESERVE_STRING8_ID:case TREPORT_COLUMN_ID.RESERVE_STRING9_ID:case TREPORT_COLUMN_ID.RESERVE_STRING10_ID:this.FormatReserveString(column,data,drawInfo);break;default:drawInfo.Text='-----';}this.GetMarkBorderData(drawInfo,exePriceData.ExePrice,column.Type,cellType);this.GetFlashBGData(drawInfo,exePriceData,column.ID,cellType);}this.DrawCell(drawInfo,exePriceData,column.Type,cellType);if(column.EnableChartTooltip){var tooltipData={Rect:rtItem,Data:data,Index:index,Column:column,CellType:cellType,Type:20};this.TooltipRect.push(tooltipData);}};this.FormatReserveNumber=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var value=data[fieldName];if(!IFrameSplitOperator.IsNumber(value))return;if(IFrameSplitOperator.IsNumber(column.ColorType)){if(column.ColorType==1){drawInfo.TextColor=this.GetUpDownColor(value,0);}else if(column.ColorType==2){drawInfo.TextColor=this.GetUpDownColorV2(value,0);}}//TODO: 不同类型的 格式化输出
14426
+ drawInfo.Text=value.toFixed(column.FloatPrecision);};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_TREPORT_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}};this.GetFlashBGData=function(drawInfo,exePriceData,id,cellType){if(!exePriceData.TData)return;if(!id)return;var data=null;if(cellType==1)data=exePriceData.TData.LeftFlashBG;else if(cellType==2)data=exePriceData.TData.RightFlashBG;if(!data||!data.Data)return;if(data.Data.has(id)){var item=data.Data.get(id);drawInfo.FlashBGColor=item.Color;--item.Count;if(this.GlobalOption)++this.GlobalOption.FlashBGCount;}};this.GetMarkBorderData=function(drawInfo,exePrice,columnType,cellType){if(!this.BorderData||!this.BorderData.MapData)return;if(!this.BorderData.MapData.has(columnType))return;var borderData=this.BorderData.MapData.get(columnType);if(!IFrameSplitOperator.IsNonEmptyArray(borderData.Data))return;if(cellType==1){var leftBorder=borderData.Data[1];if(!leftBorder)return;if(leftBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}else if(cellType==2){var rightBorder=borderData.Data[2];if(!rightBorder)return;if(rightBorder.ExePrice==exePrice){drawInfo.BorderColor=this.MarkBorderConfig.MaxPositionColor;}}};this.GetNullDrawInfo=function(drawInfo){drawInfo.Text="--";drawInfo.TextColor=this.UnchangeColor;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo){if(!IFrameSplitOperator.IsNumber(price)){this.GetNullDrawInfo(drawInfo);return;}drawInfo.Text=price.toFixed(data.Decimal);if(!IFrameSplitOperator.IsNumber(stock.YClose))drawInfo.TextColor=this.UnchangeColor;else drawInfo.TextColor=this.GetUpDownColor(price,stock.YClose);};//单独处理成交量显示
14425
14427
  this.FormatVolString=function(value,languageID){if(!IFrameSplitOperator.IsNumber(value))return null;return IFrameSplitOperator.FormatVolString(value,languageID);};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};this.DrawCell=function(drawInfo){var rtText=drawInfo.RectText;var yCenter=rtText.Top+rtText.Height/2;var fontBackup=null;//字体备份
14426
14428
  if(drawInfo.BGColor)//背景
14427
14429
  {var rtItem=drawInfo.Rect;this.Canvas.fillStyle=drawInfo.BGColor;this.Canvas.fillRect(rtItem.Left,rtItem.Top,rtItem.Width,rtItem.Height);}if(drawInfo.FlashBGColor)//闪动背景
@@ -15237,7 +15239,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
15237
15239
  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);};}/********************************************************************************
15238
15240
  * 版本信息输出
15239
15241
  *
15240
- */var HQCHART_VERSION="1.1.14955";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();//把给外界调用的方法暴露出来
15242
+ */var HQCHART_VERSION="1.1.14961";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();//把给外界调用的方法暴露出来
15241
15243
  exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
15242
15244
  // BaseIndex:BaseIndex,
15243
15245
  // ChartLine:ChartLine,
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "hqchart",
3
- "version": "1.1.14956",
3
+ "version": "1.1.14962",
4
4
  "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
5
5
  "main": "lib/main.js",
6
6
  "scripts": {
package/src/jscommon/umychart.NetworkFilterTest.js CHANGED
@@ -55964,6 +55964,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
55964
55964
  var srcStock=fullData[0];
55965
55965
  var stockItem={ date:srcStock.date, minute:[], yclose:srcStock.yclose, symbol:symbol, name:symbol };
55966
55966
 
55967
+ var lastItem=null;
55967
55968
  for(var i=0;i<srcStock.minute.length;++i)
55968
55969
  {
55969
55970
  var item=srcStock.minute[i];
@@ -55972,6 +55973,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
55972
55973
  //0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌
55973
55974
  var minItem=[srcStock.date, item.time, item.open, item.high, item.low, item.price, item.avprice , item.vol, item.amount ];
55974
55975
  stockItem.minute.push(minItem);
55976
+ lastItem=minItem;
55975
55977
  if (stockItem.minute.length>3) break;
55976
55978
  }
55977
55979
  }
@@ -55997,28 +55999,54 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
55997
55999
  if (callcation.After)
55998
56000
  {
55999
56001
  var afterInfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
56002
+ var afterData=[];
56000
56003
 
56001
- var afterData=
56002
- [
56003
- [145708,price+0.01, 400, 300, 1, 800],
56004
- [145718,price+0.02, 550, 600, 0, 1500],
56005
- [145738,price+0.02, 150, 800, 0, 1500],
56006
- [145748,price+0.02, 150, 800, 0, 1500],
56007
- [145803,price+0.03, 300, 600, 1, 3600],
56008
- [145815,price+0.03, 350, 210, 2, 1600],
56009
- [145826,price+0.02, 1210, 350, 2, 2700],
56010
- [145833,price+0.01, 260, 550, 2, 1000],
56011
- [145845,price+0.02, 160, 750, 2, 1000],
56012
- [145858,price-0.01, 460, 650, 2, 1500],
56013
- [145905,price-0.02, 160, 450, 1, 1500],
56014
- [145928,price-0.02, 260, 250, 1, 1500],
56015
- [145948,price-0.02, 860, 150, 1, 1500],
56016
- ];
56004
+ if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
56005
+ {
56006
+ var price=lastItem[5];
56007
+ afterData=
56008
+ [
56009
+ [145708,price+0.01, 400, 300, 1, 800],
56010
+ [145718,price+0.02, 550, 600, 0, 1500],
56011
+ [145738,price+0.02, 150, 800, 0, 1500],
56012
+ [145748,price+0.02, 150, 800, 0, 1500],
56013
+ [145803,price+0.03, 300, 600, 1, 3600],
56014
+ [145815,price+0.03, 350, 210, 2, 1600],
56015
+ [145826,price+0.02, 1210, 350, 2, 2700],
56016
+ [145833,price+0.01, 260, 550, 2, 1000],
56017
+ [145845,price+0.02, 160, 750, 2, 1000],
56018
+ [145858,price-0.01, 460, 650, 2, 1500],
56019
+ [145905,price-0.02, 160, 450, 1, 1500],
56020
+ [145928,price-0.02, 260, 250, 1, 1500],
56021
+ [145948,price-0.02, 860, 150, 1, 1500],
56022
+ ];
56023
+ }
56017
56024
 
56018
56025
  stockItem.after=afterData;
56019
56026
  stockItem.afterinfo=afterInfo;
56020
56027
  }
56021
56028
 
56029
+ if (bBuySellBar && lastItem) //盘口分析
56030
+ {
56031
+ var lastPrice=lastItem[4];
56032
+ var aryBuy=[];
56033
+ var value=lastPrice+0.01;
56034
+ for(var i=0;i<10;++i)
56035
+ {
56036
+ aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
56037
+ value+=0.02;
56038
+ }
56039
+
56040
+ var arySell=[];
56041
+ for(var i=0;i<10;++i)
56042
+ {
56043
+ arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
56044
+ value+=0.02;
56045
+ }
56046
+
56047
+ stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
56048
+ }
56049
+
56022
56050
  var hqchartData={code:0, stock:[stockItem], dataType:1 };
56023
56051
  hqchartData.LatestPointFlash={ FlashCount:2 };
56024
56052
 
package/src/jscommon/umychart.TReport.js CHANGED
@@ -2716,7 +2716,7 @@ function ChartTReport()
2716
2716
  }
2717
2717
 
2718
2718
  this.GetMarkBorderData(drawInfo, exePriceData.ExePrice, column.Type, cellType);
2719
- this.GetFlashBGData(drawInfo, exePriceData, column.Type, cellType);
2719
+ this.GetFlashBGData(drawInfo, exePriceData, column.ID, cellType);
2720
2720
  }
2721
2721
 
2722
2722
  this.DrawCell(drawInfo, exePriceData, column.Type, cellType);
@@ -2774,9 +2774,10 @@ function ChartTReport()
2774
2774
  }
2775
2775
  }
2776
2776
 
2777
- this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)
2777
+ this.GetFlashBGData=function(drawInfo, exePriceData, id, cellType)
2778
2778
  {
2779
2779
  if (!exePriceData.TData) return;
2780
+ if (!id) return;
2780
2781
 
2781
2782
  var data=null;
2782
2783
  if (cellType==1) data=exePriceData.TData.LeftFlashBG;
@@ -2784,9 +2785,9 @@ function ChartTReport()
2784
2785
 
2785
2786
  if (!data || !data.Data) return;
2786
2787
 
2787
- if (data.Data.has(columnType))
2788
+ if (data.Data.has(id))
2788
2789
  {
2789
- var item=data.Data.get(columnType);
2790
+ var item=data.Data.get(id);
2790
2791
  drawInfo.FlashBGColor=item.Color;
2791
2792
  --item.Count;
2792
2793
 
package/src/jscommon/umychart.js CHANGED
@@ -92227,6 +92227,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
92227
92227
  if (option.ClearYCoordinateMaxMin===true) this.Frame.ClearYCoordinateMaxMin();
92228
92228
  }
92229
92229
 
92230
+ this.ResetDataStatus();
92231
+ this.ClearIndexPaint();
92232
+ this.ClearIndexRunCount();
92233
+ this.ClearStockCache();
92234
+
92230
92235
  if (this.DayCount<=1) this.RequestMinuteData();
92231
92236
  else this.RequestHistoryMinuteData();
92232
92237
  }
@@ -92842,6 +92847,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
92842
92847
  this.SetLatestPointFlash(item.FlashCount)
92843
92848
  }
92844
92849
 
92850
+ if (IFrameSplitOperator.IsNonEmptyArray(data.stock) && data.stock[0])
92851
+ {
92852
+ this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
92853
+ this.RecvBuySellData(data.stock[0].BuySellData);
92854
+ }
92855
+
92845
92856
  if (this.DayCount>1) //多日走势图
92846
92857
  {
92847
92858
  this.UpdateCallCationData(beforeOpenData,afterCloseData, { DataType:1});
@@ -94795,6 +94806,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
94795
94806
  //获取最新的一条盘后数据
94796
94807
  this.GetLatestAfterCloseItem=function()
94797
94808
  {
94809
+ var lastItem=null;
94798
94810
  if (this.DayCount>1)
94799
94811
  {
94800
94812
  if (!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)) return null;
package/src/jscommon/umychart.report.js CHANGED
@@ -206,6 +206,7 @@ function JSReportChart(divElement)
206
206
  if (option.SortInfo)
207
207
  {
208
208
  var item=option.SortInfo;
209
+ if (item.Search) chart.SortInfo.Field=chart.FindFiledIndex(item.Search);
209
210
  if (IFrameSplitOperator.IsNumber(item.Field)) chart.SortInfo.Field=item.Field;
210
211
  if (IFrameSplitOperator.IsNumber(item.Sort)) chart.SortInfo.Sort=item.Sort;
211
212
  }
@@ -1027,6 +1028,7 @@ function JSReportChartContainer(uielement)
1027
1028
  if (option.SortInfo)
1028
1029
  {
1029
1030
  var item=option.SortInfo;
1031
+ if (item.Search) this.SortInfo.Field=this.FindFiledIndex(item.Search);
1030
1032
  if (IFrameSplitOperator.IsNumber(item.Field)) this.SortInfo.Field=item.Field;
1031
1033
  if (IFrameSplitOperator.IsNumber(item.Sort)) this.SortInfo.Sort=item.Sort;
1032
1034
  }
@@ -3041,6 +3043,53 @@ function JSReportChartContainer(uielement)
3041
3043
  return chart;
3042
3044
  }
3043
3045
 
3046
+ //获取列索引
3047
+ this.FindFiledIndex=function(search)
3048
+ {
3049
+ if (!search) return -1;
3050
+ var chart=this.GetReportChart();
3051
+ if (!chart) return -1;
3052
+ if (!IFrameSplitOperator.IsNonEmptyArray(chart.Column)) return -1;
3053
+
3054
+ if (search.ID)
3055
+ {
3056
+ for(var i=0;i<chart.Column.length;++i)
3057
+ {
3058
+ var item=chart.Column[i];
3059
+ if (!item) continue;
3060
+ if (item.ID==search.ID) return i;
3061
+ }
3062
+
3063
+ return -1;
3064
+ }
3065
+
3066
+ if (search.Title)
3067
+ {
3068
+ for(var i=0;i<chart.Column.length;++i)
3069
+ {
3070
+ var item=chart.Column[i];
3071
+ if (!item) continue;
3072
+ if (item.Title==search.Title) return i;
3073
+ }
3074
+
3075
+ return -1;
3076
+ }
3077
+
3078
+ if (search.Type)
3079
+ {
3080
+ for(var i=0;i<chart.Column.length;++i)
3081
+ {
3082
+ var item=chart.Column[i];
3083
+ if (!item) continue;
3084
+ if (item.Type==search.Type) return i;
3085
+ }
3086
+
3087
+ return -1;
3088
+ }
3089
+
3090
+ return -1;
3091
+ }
3092
+
3044
3093
  this.GotoNextItem=function(step)
3045
3094
  {
3046
3095
  if (step==0) return false;
package/src/jscommon/umychart.testdata.js CHANGED
@@ -450,6 +450,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
450
450
  var srcStock=fullData[0];
451
451
  var stockItem={ date:srcStock.date, minute:[], yclose:srcStock.yclose, symbol:symbol, name:symbol };
452
452
 
453
+ var lastItem=null;
453
454
  for(var i=0;i<srcStock.minute.length;++i)
454
455
  {
455
456
  var item=srcStock.minute[i];
@@ -458,6 +459,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
458
459
  //0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌
459
460
  var minItem=[srcStock.date, item.time, item.open, item.high, item.low, item.price, item.avprice , item.vol, item.amount ];
460
461
  stockItem.minute.push(minItem);
462
+ lastItem=minItem;
461
463
  if (stockItem.minute.length>3) break;
462
464
  }
463
465
  }
@@ -483,28 +485,54 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
483
485
  if (callcation.After)
484
486
  {
485
487
  var afterInfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
488
+ var afterData=[];
486
489
 
487
- var afterData=
488
- [
489
- [145708,price+0.01, 400, 300, 1, 800],
490
- [145718,price+0.02, 550, 600, 0, 1500],
491
- [145738,price+0.02, 150, 800, 0, 1500],
492
- [145748,price+0.02, 150, 800, 0, 1500],
493
- [145803,price+0.03, 300, 600, 1, 3600],
494
- [145815,price+0.03, 350, 210, 2, 1600],
495
- [145826,price+0.02, 1210, 350, 2, 2700],
496
- [145833,price+0.01, 260, 550, 2, 1000],
497
- [145845,price+0.02, 160, 750, 2, 1000],
498
- [145858,price-0.01, 460, 650, 2, 1500],
499
- [145905,price-0.02, 160, 450, 1, 1500],
500
- [145928,price-0.02, 260, 250, 1, 1500],
501
- [145948,price-0.02, 860, 150, 1, 1500],
502
- ];
490
+ if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
491
+ {
492
+ var price=lastItem[5];
493
+ afterData=
494
+ [
495
+ [145708,price+0.01, 400, 300, 1, 800],
496
+ [145718,price+0.02, 550, 600, 0, 1500],
497
+ [145738,price+0.02, 150, 800, 0, 1500],
498
+ [145748,price+0.02, 150, 800, 0, 1500],
499
+ [145803,price+0.03, 300, 600, 1, 3600],
500
+ [145815,price+0.03, 350, 210, 2, 1600],
501
+ [145826,price+0.02, 1210, 350, 2, 2700],
502
+ [145833,price+0.01, 260, 550, 2, 1000],
503
+ [145845,price+0.02, 160, 750, 2, 1000],
504
+ [145858,price-0.01, 460, 650, 2, 1500],
505
+ [145905,price-0.02, 160, 450, 1, 1500],
506
+ [145928,price-0.02, 260, 250, 1, 1500],
507
+ [145948,price-0.02, 860, 150, 1, 1500],
508
+ ];
509
+ }
503
510
 
504
511
  stockItem.after=afterData;
505
512
  stockItem.afterinfo=afterInfo;
506
513
  }
507
514
 
515
+ if (bBuySellBar && lastItem) //盘口分析
516
+ {
517
+ var lastPrice=lastItem[4];
518
+ var aryBuy=[];
519
+ var value=lastPrice+0.01;
520
+ for(var i=0;i<10;++i)
521
+ {
522
+ aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
523
+ value+=0.02;
524
+ }
525
+
526
+ var arySell=[];
527
+ for(var i=0;i<10;++i)
528
+ {
529
+ arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
530
+ value+=0.02;
531
+ }
532
+
533
+ stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
534
+ }
535
+
508
536
  var hqchartData={code:0, stock:[stockItem], dataType:1 };
509
537
  hqchartData.LatestPointFlash={ FlashCount:2 };
510
538
 
package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js CHANGED
@@ -96323,6 +96323,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
96323
96323
  if (option.ClearYCoordinateMaxMin===true) this.Frame.ClearYCoordinateMaxMin();
96324
96324
  }
96325
96325
 
96326
+ this.ResetDataStatus();
96327
+ this.ClearIndexPaint();
96328
+ this.ClearIndexRunCount();
96329
+ this.ClearStockCache();
96330
+
96326
96331
  if (this.DayCount<=1) this.RequestMinuteData();
96327
96332
  else this.RequestHistoryMinuteData();
96328
96333
  }
@@ -96938,6 +96943,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
96938
96943
  this.SetLatestPointFlash(item.FlashCount)
96939
96944
  }
96940
96945
 
96946
+ if (IFrameSplitOperator.IsNonEmptyArray(data.stock) && data.stock[0])
96947
+ {
96948
+ this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
96949
+ this.RecvBuySellData(data.stock[0].BuySellData);
96950
+ }
96951
+
96941
96952
  if (this.DayCount>1) //多日走势图
96942
96953
  {
96943
96954
  this.UpdateCallCationData(beforeOpenData,afterCloseData, { DataType:1});
@@ -98891,6 +98902,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
98891
98902
  //获取最新的一条盘后数据
98892
98903
  this.GetLatestAfterCloseItem=function()
98893
98904
  {
98905
+ var lastItem=null;
98894
98906
  if (this.DayCount>1)
98895
98907
  {
98896
98908
  if (!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)) return null;
@@ -138209,6 +138221,7 @@ function JSReportChart(divElement)
138209
138221
  if (option.SortInfo)
138210
138222
  {
138211
138223
  var item=option.SortInfo;
138224
+ if (item.Search) chart.SortInfo.Field=chart.FindFiledIndex(item.Search);
138212
138225
  if (IFrameSplitOperator.IsNumber(item.Field)) chart.SortInfo.Field=item.Field;
138213
138226
  if (IFrameSplitOperator.IsNumber(item.Sort)) chart.SortInfo.Sort=item.Sort;
138214
138227
  }
@@ -139030,6 +139043,7 @@ function JSReportChartContainer(uielement)
139030
139043
  if (option.SortInfo)
139031
139044
  {
139032
139045
  var item=option.SortInfo;
139046
+ if (item.Search) this.SortInfo.Field=this.FindFiledIndex(item.Search);
139033
139047
  if (IFrameSplitOperator.IsNumber(item.Field)) this.SortInfo.Field=item.Field;
139034
139048
  if (IFrameSplitOperator.IsNumber(item.Sort)) this.SortInfo.Sort=item.Sort;
139035
139049
  }
@@ -141044,6 +141058,53 @@ function JSReportChartContainer(uielement)
141044
141058
  return chart;
141045
141059
  }
141046
141060
 
141061
+ //获取列索引
141062
+ this.FindFiledIndex=function(search)
141063
+ {
141064
+ if (!search) return -1;
141065
+ var chart=this.GetReportChart();
141066
+ if (!chart) return -1;
141067
+ if (!IFrameSplitOperator.IsNonEmptyArray(chart.Column)) return -1;
141068
+
141069
+ if (search.ID)
141070
+ {
141071
+ for(var i=0;i<chart.Column.length;++i)
141072
+ {
141073
+ var item=chart.Column[i];
141074
+ if (!item) continue;
141075
+ if (item.ID==search.ID) return i;
141076
+ }
141077
+
141078
+ return -1;
141079
+ }
141080
+
141081
+ if (search.Title)
141082
+ {
141083
+ for(var i=0;i<chart.Column.length;++i)
141084
+ {
141085
+ var item=chart.Column[i];
141086
+ if (!item) continue;
141087
+ if (item.Title==search.Title) return i;
141088
+ }
141089
+
141090
+ return -1;
141091
+ }
141092
+
141093
+ if (search.Type)
141094
+ {
141095
+ for(var i=0;i<chart.Column.length;++i)
141096
+ {
141097
+ var item=chart.Column[i];
141098
+ if (!item) continue;
141099
+ if (item.Type==search.Type) return i;
141100
+ }
141101
+
141102
+ return -1;
141103
+ }
141104
+
141105
+ return -1;
141106
+ }
141107
+
141047
141108
  this.GotoNextItem=function(step)
141048
141109
  {
141049
141110
  if (step==0) return false;
@@ -151464,7 +151525,7 @@ function ScrollBarBGChart()
151464
151525
 
151465
151526
 
151466
151527
 
151467
- var HQCHART_VERSION="1.1.14955";
151528
+ var HQCHART_VERSION="1.1.14961";
151468
151529
 
151469
151530
  function PrintHQChartVersion()
151470
151531
  {
package/src/jscommon/umychart.version.js CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
 
7
7
 
8
- var HQCHART_VERSION="1.1.14955";
8
+ var HQCHART_VERSION="1.1.14961";
9
9
 
10
10
  function PrintHQChartVersion()
11
11
  {
package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js CHANGED
@@ -55982,6 +55982,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
55982
55982
  var srcStock=fullData[0];
55983
55983
  var stockItem={ date:srcStock.date, minute:[], yclose:srcStock.yclose, symbol:symbol, name:symbol };
55984
55984
 
55985
+ var lastItem=null;
55985
55986
  for(var i=0;i<srcStock.minute.length;++i)
55986
55987
  {
55987
55988
  var item=srcStock.minute[i];
@@ -55990,6 +55991,7 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
55990
55991
  //0=日期 1=时间 2=开 3=高 4=低 5=收 6=均价 7=量 8=金额 9=涨幅 10=涨跌
55991
55992
  var minItem=[srcStock.date, item.time, item.open, item.high, item.low, item.price, item.avprice , item.vol, item.amount ];
55992
55993
  stockItem.minute.push(minItem);
55994
+ lastItem=minItem;
55993
55995
  if (stockItem.minute.length>3) break;
55994
55996
  }
55995
55997
  }
@@ -56015,28 +56017,54 @@ HQData.Minute_RequestMinuteUpdateData=function(data, callback)
56015
56017
  if (callcation.After)
56016
56018
  {
56017
56019
  var afterInfo={ totalcount:60*10, ver:2.0, TimeConfig:{ AryTime:[{ Start:145700, End:145959, Date:srcStock.date }]} }; //9:15-9:25 集合竞价15分钟 1s一个数据
56020
+ var afterData=[];
56018
56021
 
56019
- var afterData=
56020
- [
56021
- [145708,price+0.01, 400, 300, 1, 800],
56022
- [145718,price+0.02, 550, 600, 0, 1500],
56023
- [145738,price+0.02, 150, 800, 0, 1500],
56024
- [145748,price+0.02, 150, 800, 0, 1500],
56025
- [145803,price+0.03, 300, 600, 1, 3600],
56026
- [145815,price+0.03, 350, 210, 2, 1600],
56027
- [145826,price+0.02, 1210, 350, 2, 2700],
56028
- [145833,price+0.01, 260, 550, 2, 1000],
56029
- [145845,price+0.02, 160, 750, 2, 1000],
56030
- [145858,price-0.01, 460, 650, 2, 1500],
56031
- [145905,price-0.02, 160, 450, 1, 1500],
56032
- [145928,price-0.02, 260, 250, 1, 1500],
56033
- [145948,price-0.02, 860, 150, 1, 1500],
56034
- ];
56022
+ if (IFrameSplitOperator.IsNonEmptyArray(lastItem) && lastItem[1]>=1457)
56023
+ {
56024
+ var price=lastItem[5];
56025
+ afterData=
56026
+ [
56027
+ [145708,price+0.01, 400, 300, 1, 800],
56028
+ [145718,price+0.02, 550, 600, 0, 1500],
56029
+ [145738,price+0.02, 150, 800, 0, 1500],
56030
+ [145748,price+0.02, 150, 800, 0, 1500],
56031
+ [145803,price+0.03, 300, 600, 1, 3600],
56032
+ [145815,price+0.03, 350, 210, 2, 1600],
56033
+ [145826,price+0.02, 1210, 350, 2, 2700],
56034
+ [145833,price+0.01, 260, 550, 2, 1000],
56035
+ [145845,price+0.02, 160, 750, 2, 1000],
56036
+ [145858,price-0.01, 460, 650, 2, 1500],
56037
+ [145905,price-0.02, 160, 450, 1, 1500],
56038
+ [145928,price-0.02, 260, 250, 1, 1500],
56039
+ [145948,price-0.02, 860, 150, 1, 1500],
56040
+ ];
56041
+ }
56035
56042
 
56036
56043
  stockItem.after=afterData;
56037
56044
  stockItem.afterinfo=afterInfo;
56038
56045
  }
56039
56046
 
56047
+ if (bBuySellBar && lastItem) //盘口分析
56048
+ {
56049
+ var lastPrice=lastItem[4];
56050
+ var aryBuy=[];
56051
+ var value=lastPrice+0.01;
56052
+ for(var i=0;i<10;++i)
56053
+ {
56054
+ aryBuy.push({Price:value, Type:1, Vol:HQData.GetRandomTestData(1000,10000) });
56055
+ value+=0.02;
56056
+ }
56057
+
56058
+ var arySell=[];
56059
+ for(var i=0;i<10;++i)
56060
+ {
56061
+ arySell.push({Price:value, Type:2, Vol:HQData.GetRandomTestData(1000,10000) });
56062
+ value+=0.02;
56063
+ }
56064
+
56065
+ stockItem.BuySellData={ AryBuy:aryBuy, ArySell:arySell };
56066
+ }
56067
+
56040
56068
  var hqchartData={code:0, stock:[stockItem], dataType:1 };
56041
56069
  hqchartData.LatestPointFlash={ FlashCount:2 };
56042
56070
 
package/src/jscommon/umychart.vue/umychart.vue.js CHANGED
@@ -96367,6 +96367,11 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
96367
96367
  if (option.ClearYCoordinateMaxMin===true) this.Frame.ClearYCoordinateMaxMin();
96368
96368
  }
96369
96369
 
96370
+ this.ResetDataStatus();
96371
+ this.ClearIndexPaint();
96372
+ this.ClearIndexRunCount();
96373
+ this.ClearStockCache();
96374
+
96370
96375
  if (this.DayCount<=1) this.RequestMinuteData();
96371
96376
  else this.RequestHistoryMinuteData();
96372
96377
  }
@@ -96982,6 +96987,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
96982
96987
  this.SetLatestPointFlash(item.FlashCount)
96983
96988
  }
96984
96989
 
96990
+ if (IFrameSplitOperator.IsNonEmptyArray(data.stock) && data.stock[0])
96991
+ {
96992
+ this.DataStatus.LatestDate=data.stock[0].date; //保存下最后一天的日期
96993
+ this.RecvBuySellData(data.stock[0].BuySellData);
96994
+ }
96995
+
96985
96996
  if (this.DayCount>1) //多日走势图
96986
96997
  {
96987
96998
  this.UpdateCallCationData(beforeOpenData,afterCloseData, { DataType:1});
@@ -98935,6 +98946,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
98935
98946
  //获取最新的一条盘后数据
98936
98947
  this.GetLatestAfterCloseItem=function()
98937
98948
  {
98949
+ var lastItem=null;
98938
98950
  if (this.DayCount>1)
98939
98951
  {
98940
98952
  if (!IFrameSplitOperator.IsNonEmptyArray(this.MultiDayAfterCloseData)) return null;
@@ -138253,6 +138265,7 @@ function JSReportChart(divElement)
138253
138265
  if (option.SortInfo)
138254
138266
  {
138255
138267
  var item=option.SortInfo;
138268
+ if (item.Search) chart.SortInfo.Field=chart.FindFiledIndex(item.Search);
138256
138269
  if (IFrameSplitOperator.IsNumber(item.Field)) chart.SortInfo.Field=item.Field;
138257
138270
  if (IFrameSplitOperator.IsNumber(item.Sort)) chart.SortInfo.Sort=item.Sort;
138258
138271
  }
@@ -139074,6 +139087,7 @@ function JSReportChartContainer(uielement)
139074
139087
  if (option.SortInfo)
139075
139088
  {
139076
139089
  var item=option.SortInfo;
139090
+ if (item.Search) this.SortInfo.Field=this.FindFiledIndex(item.Search);
139077
139091
  if (IFrameSplitOperator.IsNumber(item.Field)) this.SortInfo.Field=item.Field;
139078
139092
  if (IFrameSplitOperator.IsNumber(item.Sort)) this.SortInfo.Sort=item.Sort;
139079
139093
  }
@@ -141088,6 +141102,53 @@ function JSReportChartContainer(uielement)
141088
141102
  return chart;
141089
141103
  }
141090
141104
 
141105
+ //获取列索引
141106
+ this.FindFiledIndex=function(search)
141107
+ {
141108
+ if (!search) return -1;
141109
+ var chart=this.GetReportChart();
141110
+ if (!chart) return -1;
141111
+ if (!IFrameSplitOperator.IsNonEmptyArray(chart.Column)) return -1;
141112
+
141113
+ if (search.ID)
141114
+ {
141115
+ for(var i=0;i<chart.Column.length;++i)
141116
+ {
141117
+ var item=chart.Column[i];
141118
+ if (!item) continue;
141119
+ if (item.ID==search.ID) return i;
141120
+ }
141121
+
141122
+ return -1;
141123
+ }
141124
+
141125
+ if (search.Title)
141126
+ {
141127
+ for(var i=0;i<chart.Column.length;++i)
141128
+ {
141129
+ var item=chart.Column[i];
141130
+ if (!item) continue;
141131
+ if (item.Title==search.Title) return i;
141132
+ }
141133
+
141134
+ return -1;
141135
+ }
141136
+
141137
+ if (search.Type)
141138
+ {
141139
+ for(var i=0;i<chart.Column.length;++i)
141140
+ {
141141
+ var item=chart.Column[i];
141142
+ if (!item) continue;
141143
+ if (item.Type==search.Type) return i;
141144
+ }
141145
+
141146
+ return -1;
141147
+ }
141148
+
141149
+ return -1;
141150
+ }
141151
+
141091
141152
  this.GotoNextItem=function(step)
141092
141153
  {
141093
141154
  if (step==0) return false;
@@ -150885,7 +150946,7 @@ function ChartTReport()
150885
150946
  }
150886
150947
 
150887
150948
  this.GetMarkBorderData(drawInfo, exePriceData.ExePrice, column.Type, cellType);
150888
- this.GetFlashBGData(drawInfo, exePriceData, column.Type, cellType);
150949
+ this.GetFlashBGData(drawInfo, exePriceData, column.ID, cellType);
150889
150950
  }
150890
150951
 
150891
150952
  this.DrawCell(drawInfo, exePriceData, column.Type, cellType);
@@ -150943,9 +151004,10 @@ function ChartTReport()
150943
151004
  }
150944
151005
  }
150945
151006
 
150946
- this.GetFlashBGData=function(drawInfo, exePriceData, columnType, cellType)
151007
+ this.GetFlashBGData=function(drawInfo, exePriceData, id, cellType)
150947
151008
  {
150948
151009
  if (!exePriceData.TData) return;
151010
+ if (!id) return;
150949
151011
 
150950
151012
  var data=null;
150951
151013
  if (cellType==1) data=exePriceData.TData.LeftFlashBG;
@@ -150953,9 +151015,9 @@ function ChartTReport()
150953
151015
 
150954
151016
  if (!data || !data.Data) return;
150955
151017
 
150956
- if (data.Data.has(columnType))
151018
+ if (data.Data.has(id))
150957
151019
  {
150958
- var item=data.Data.get(columnType);
151020
+ var item=data.Data.get(id);
150959
151021
  drawInfo.FlashBGColor=item.Color;
150960
151022
  --item.Count;
150961
151023
 
@@ -162839,7 +162901,7 @@ function HQChartScriptWorker()
162839
162901
 
162840
162902
 
162841
162903
 
162842
- var HQCHART_VERSION="1.1.14955";
162904
+ var HQCHART_VERSION="1.1.14961";
162843
162905
 
162844
162906
  function PrintHQChartVersion()
162845
162907
  {