hqchart 1.1.13965 → 1.1.13969
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.
- package/lib/umychart.vue.js +5 -4
- package/package.json +1 -1
- package/src/jscommon/umychart.TReport.js +2 -0
- package/src/jscommon/umychart.js +28 -0
- package/src/jscommon/umychart.report.js +6 -0
- package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js +35 -1
- package/src/jscommon/umychart.version.js +1 -1
- package/src/jscommon/umychart.vue/umychart.vue.js +37 -1
package/lib/umychart.vue.js
CHANGED
|
@@ -4822,7 +4822,7 @@ this.ShowRangeText.Font=g_JSChartResource.RectSelect.RangeTextFont;this.ShowRang
|
|
|
4822
4822
|
else if(ChartData.IsMinutePeriod(period,true))return value.Date*10000+value.Time;//YYYYMMDDHHMM
|
|
4823
4823
|
else if(ChartData.IsSecondPeriod(period)||ChartData.IsTickPeriod(period))return value.Date*1000000+value.Time;//YYYYMMDDHHMMSS
|
|
4824
4824
|
else if(ChartData.IsMilliSecondPeriod(period))return value.Date*1000000000+value.Time;//YYYYMMDDHHMMSSFFF
|
|
4825
|
-
}return null;};this.GetSelectRectData=function(){if(!this.FirstPoint||!this.SecondPoint)return null;var data=this.GetKData();if(!data)return null;var isMinuteChart=this.IsMinuteChart();var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);var secondDate=this.DateToNumber(this.SecondPoint,isMinuteChart);var selectData={Start:null,End:null,Data:data};for(var i=0;i<data.Data.length;++i){var item=data.Data[i];if(!item)continue;var value=this.DateToNumber(item,isMinuteChart);if(firstDate==value)selectData.Start=i;if(secondDate==value)selectData.End=i;if(IFrameSplitOperator.IsNumber(selectData.Start)&&IFrameSplitOperator.IsNumber(selectData.End)){if(selectData.Start>selectData.End){var temp=selectData.Start;selectData.Start=selectData.End;selectData.End=temp;}return selectData;}}return null;};this.SortPoint=function(){var isMinuteChart=this.IsMinuteChart();this.CenterData=null;if(this.FirstPoint&&!this.SecondPoint){this.StartDate={Date:this.DateToNumber(this.FirstPoint,isMinuteChart),Index:0};}else if(this.FirstPoint&&this.SecondPoint){var firstValue=this.DateToNumber(this.FirstPoint,isMinuteChart);var secondValue=this.DateToNumber(this.SecondPoint,isMinuteChart);if(firstValue<secondValue){this.StartDate={Date:firstValue,Index:0};this.EndDate={Date:secondValue,Index:1};}else{this.StartDate={Date:secondValue,Index:1};this.EndDate={Date:firstValue,Index:0};}if(this.CenterPoint){var centerValue=this.DateToNumber(this.CenterPoint,isMinuteChart);this.CenterDate={Date:centerValue,Index:2};}//子区域
|
|
4825
|
+
}return null;};this.GetSelectRectDataByOnePoint=function(){if(!this.FirstPoint)return null;var data=this.GetKData();if(!data)return null;var isMinuteChart=this.IsMinuteChart();var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);var selectData={Start:null,End:null,Data:data};for(var i=0;i<data.Data.length;++i){var item=data.Data[i];if(!item)continue;var value=this.DateToNumber(item,isMinuteChart);if(firstDate==value){selectData.Start=i;selectData.End=i;return selectData;}}return null;};this.GetSelectRectData=function(){if(this.IsOnlyOnePoint)return this.GetSelectRectDataByOnePoint();if(!this.FirstPoint||!this.SecondPoint)return null;var data=this.GetKData();if(!data)return null;var isMinuteChart=this.IsMinuteChart();var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);var secondDate=this.DateToNumber(this.SecondPoint,isMinuteChart);var selectData={Start:null,End:null,Data:data};for(var i=0;i<data.Data.length;++i){var item=data.Data[i];if(!item)continue;var value=this.DateToNumber(item,isMinuteChart);if(firstDate==value)selectData.Start=i;if(secondDate==value)selectData.End=i;if(IFrameSplitOperator.IsNumber(selectData.Start)&&IFrameSplitOperator.IsNumber(selectData.End)){if(selectData.Start>selectData.End){var temp=selectData.Start;selectData.Start=selectData.End;selectData.End=temp;}return selectData;}}return null;};this.SortPoint=function(){var isMinuteChart=this.IsMinuteChart();this.CenterData=null;if(this.FirstPoint&&!this.SecondPoint){this.StartDate={Date:this.DateToNumber(this.FirstPoint,isMinuteChart),Index:0};}else if(this.FirstPoint&&this.SecondPoint){var firstValue=this.DateToNumber(this.FirstPoint,isMinuteChart);var secondValue=this.DateToNumber(this.SecondPoint,isMinuteChart);if(firstValue<secondValue){this.StartDate={Date:firstValue,Index:0};this.EndDate={Date:secondValue,Index:1};}else{this.StartDate={Date:secondValue,Index:1};this.EndDate={Date:firstValue,Index:0};}if(this.CenterPoint){var centerValue=this.DateToNumber(this.CenterPoint,isMinuteChart);this.CenterDate={Date:centerValue,Index:2};}//子区域
|
|
4826
4826
|
if(this.SubClient.FirstPoint&&this.SubClient.SecondPoint){var firstValue=this.DateToNumber(this.SubClient.FirstPoint,isMinuteChart);var secondValue=this.DateToNumber(this.SubClient.SecondPoint,isMinuteChart);if(firstValue<secondValue){this.SubClient.Start={Date:firstValue,Index:3};this.SubClient.End={Date:secondValue,Index:4};}else{this.SubClient.Start={Date:secondValue,Index:4};this.SubClient.End={Date:firstValue,Index:3};}//不能超出区间范围
|
|
4827
4827
|
if(this.SubClient.End.Date<=this.StartDate.Date||this.SubClient.Start.Date>=this.EndDate.Date){this.SubClient.Start=null;this.SubClient.End=null;}else{if(this.SubClient.Start.Date<this.StartDate.Date)this.SubClient.Start.Date=this.StartDate.Date;if(this.SubClient.End.Date>this.EndDate.Date)this.SubClient.End.Date=this.EndDate.Date;}}}};this.GetCenterPoint=function(){if(!this.FirstPoint||!this.SecondPoint)return null;if(!IFrameSplitOperator.IsNumber(this.FirstPoint.DataIndex))return null;if(!IFrameSplitOperator.IsNumber(this.SecondPoint.DataIndex))return null;var count=this.FirstPoint.DataIndex-this.SecondPoint.DataIndex;if(Math.abs(count)<3)return null;var centerIndex=parseInt(this.FirstPoint.DataIndex+(this.SecondPoint.DataIndex-this.FirstPoint.DataIndex)/2);if(centerIndex<0)return null;var data=this.GetKData();if(!data||!data.Data)return null;var kItem=data.Data[centerIndex];if(!kItem)return null;return{Date:kItem.Date,Time:kItem.Time,DataIndex:centerIndex};};this.MovePoint=function(offset){if(!this.FirstPoint||!this.SecondPoint)return false;var data=this.GetKData();if(!data||!data.Data)return false;var dataIndex=this.FirstPoint.DataIndex+offset;var kItem=data.Data[dataIndex];if(!kItem)return false;var firstPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};var dataIndex=this.SecondPoint.DataIndex+offset;var kItem=data.Data[dataIndex];if(!kItem)return false;var secondPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};var dataIndex=this.CenterPoint.DataIndex+offset;var kItem=data.Data[dataIndex];if(!kItem)return false;var centerPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};this.FirstPoint=firstPoint;this.SecondPoint=secondPoint;this.CenterPoint=centerPoint;return true;};this.MoveSubRect=function(step,isLeft){if(!this.FirstPoint||!this.SecondPoint)return false;if(!this.SubClient||!this.SubClient.FirstPoint||!this.SubClient.SecondPoint)return false;var data=this.GetKData();if(!data||!data.Data)return false;//区间范围
|
|
4828
4828
|
var startIndex=Math.min(this.FirstPoint.DataIndex,this.SecondPoint.DataIndex);var endIndex=Math.max(this.FirstPoint.DataIndex,this.SecondPoint.DataIndex);var subStartPoint=this.SubClient.FirstPoint;var subEndPoint=this.SubClient.SecondPoint;if(this.SubClient.FirstPoint.DataIndex>this.SubClient.SecondPoint.DataIndex){var subStartPoint=this.SubClient.SecondPoint;var subEndPoint=this.SubClient.FirstPoint;}var subStartIndex=subStartPoint.DataIndex;var subEndIndex=subEndPoint.DataIndex;if(isLeft){if(subStartIndex<=startIndex)return false;subStartIndex-=step;subEndIndex-=step;}else{if(subEndPoint.DataIndex>=endIndex)return false;subStartIndex+=step;subEndIndex+=step;}var bChanged=false;if(subStartIndex!=subStartPoint.DataIndex){subStartPoint.DataIndex=subStartIndex;var kItem=data.Data[subStartIndex];subStartPoint.Date=kItem.Date;subStartPoint.Time=kItem.Time;bChanged=true;}if(subEndIndex!=subStartPoint.DataIndex){subEndPoint.DataIndex=subEndIndex;var kItem=data.Data[subEndIndex];subEndPoint.Date=kItem.Date;subEndPoint.Time=kItem.Time;bChanged=true;}return bChanged;};this.SetPoint=function(kItem,option){var dataIndex=null;if(option){if(IFrameSplitOperator.IsNumber(option.DataIndex))dataIndex=option.DataIndex;}if(option&&IFrameSplitOperator.IsNumber(option.Index)){switch(option.Index){case 0:this.FirstPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};this.CenterPoint=this.GetCenterPoint();return true;case 1:this.SecondPoint={Date:kItem.Date,Time:kItem.Time,DataIndex:dataIndex};this.CenterPoint=this.GetCenterPoint();return true;case 2://中心偏移
|
|
@@ -12863,7 +12863,7 @@ Explain:'报价列表股票排序数据',Request:{Data:{range:{start:startIndex,
|
|
|
12863
12863
|
};this.RecvStockSortData=function(data){//更新股票数据
|
|
12864
12864
|
var arySymbol=[];if(IFrameSplitOperator.IsNonEmptyArray(data.data)){for(var i=0;i<data.data.length;++i){var item=data.data[i];//数据
|
|
12865
12865
|
var symbol=item[0];if(!symbol)continue;var stock=null;if(this.MapStockData.has(symbol)){stock=this.MapStockData.get(symbol);}else{stock=new HQReportItem();stock.OriginalSymbol=symbol;stock.Symbol=this.GetSymbolNoSuffix(symbol);this.MapStockData.set(symbol,stock);}this.ReadStockJsonData(stock,item);arySymbol.push(symbol);}}//更新股票顺序
|
|
12866
|
-
if(IFrameSplitOperator.IsNonEmptyArray(data.index)){for(var i=0;i<data.index.length;++i){var index=data.index[i];var newSymbol=arySymbol[i];var oldSymbol=this.Data.Data[index];if(newSymbol==oldSymbol)continue;this.Data.Data[index]=newSymbol;}}var chart=this.ChartPaint[0];if(!chart)return;//更新的股票在当前页面,需要重绘
|
|
12866
|
+
if(IFrameSplitOperator.IsNonEmptyArray(data.index)){for(var i=0;i<data.index.length;++i){var index=data.index[i];var newSymbol=arySymbol[i];var oldSymbol=this.Data.Data[index];if(newSymbol==oldSymbol)continue;this.Data.Data[index]=newSymbol;}}if(data.Virtual){var item=data.Virtual;if(IFrameSplitOperator.IsNumber(item.Count))this.Data.Virtual.Count=item.Count;}var chart=this.ChartPaint[0];if(!chart)return;//更新的股票在当前页面,需要重绘
|
|
12867
12867
|
var bUpdate=true;if(bUpdate)this.Draw();};//虚拟表格 请求序号 所有数据后台返回
|
|
12868
12868
|
this.RequestVirtualStockData=function(){var chart=this.ChartPaint[0];if(!chart)return;var self=this;var startIndex=this.Data.YOffset;var pageSize=chart.GetPageSize();var endIndex=startIndex+pageSize;var dataCount=chart.GetAllRowCount();if(endIndex>=dataCount)endIndex=dataCount-1;if(!this.NetworkFilter)return;var requestData={range:{start:startIndex,end:endIndex,count:chart.GetAllRowCount()},column:null,sort:0,symbol:this.Symbol,name:this.Name,pageSize:pageSize};if(this.SortInfo&&this.SortInfo.Field>=0&&this.SortInfo.Sort>0)//排序
|
|
12869
12869
|
{var column=chart.Column[this.SortInfo.Field];requestData.column={name:column.Title,type:column.Type,index:this.SortInfo.Field,ID:column.ID};requestData.sort=this.SortInfo.Sort;}var obj={Name:'JSDealChartContainer::RequestVirtualStockData',//类名::函数名
|
|
@@ -13228,7 +13228,8 @@ this.UIElement.ondblclick=function(e){_this64.UIOnDblClick(e);};this.UIElement.o
|
|
|
13228
13228
|
*/};this.Draw=function(){if(this.UIElement.width<=0||this.UIElement.height<=0)return;this.Canvas.clearRect(0,0,this.UIElement.width,this.UIElement.height);var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
|
|
13229
13229
|
this.Canvas.lineWidth=pixelTatio;//手机端需要根据分辨率比调整线段宽度
|
|
13230
13230
|
if(this.ChartSplashPaint&&this.ChartSplashPaint.IsEnableSplash){this.Frame.Draw({IsEnableSplash:this.ChartSplashPaint.IsEnableSplash});this.ChartSplashPaint.Draw();return;}this.Frame.Draw();this.Frame.DrawLogo();//框架内图形
|
|
13231
|
-
for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsDrawFirst)item.Draw();}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw();}if(this.GlobalOption.FlashBGCount>0){this.DelayDraw(500);}};this.DelayDraw=function(frequency){var _this65=this;if(typeof this.FlashBGTimer=='number'){clearTimeout(this.FlashBGTimer);this.FlashBGTimer=null;}this.FlashBGTimer=setTimeout(function(){_this65.Draw();},frequency);};this.ClearData=function(){this.SourceData.Data=[];this.Data.Data=[];this.Data.Price=null;this.
|
|
13231
|
+
for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsDrawFirst)item.Draw();}for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(!item.IsDrawFirst)item.Draw();}if(this.GlobalOption.FlashBGCount>0){this.DelayDraw(500);}};this.DelayDraw=function(frequency){var _this65=this;if(typeof this.FlashBGTimer=='number'){clearTimeout(this.FlashBGTimer);this.FlashBGTimer=null;}this.FlashBGTimer=setTimeout(function(){_this65.Draw();},frequency);};this.ClearData=function(){this.SourceData.Data=[];this.Data.Data=[];this.Data.Price=null;this.Data.XOffset=0;//清空偏移
|
|
13232
|
+
this.Data.YOffset=0;this.MapStockData=null;this.MapExePriceData=null;this.BorderData.MapData=null;};this.StopAutoUpdate=function(){this.CancelAutoUpdate();this.AutoUpdateEvent(false,'JSTReportChartContainer::StopAutoUpdate');if(!this.IsAutoUpdate)return;this.IsAutoUpdate=false;};//设置事件回调
|
|
13232
13233
|
//{event:事件id, callback:回调函数}
|
|
13233
13234
|
this.AddEventCallback=function(object){if(!object||!object.event||!object.callback)return;var data={Callback:object.callback,Source:object};this.mapEvent.set(object.event,data);};this.RemoveEventCallback=function(eventid){if(!this.mapEvent.has(eventid))return;this.mapEvent.delete(eventid);};this.GetEventCallback=function(id)//获取事件回调
|
|
13234
13235
|
{if(!this.mapEvent.has(id))return null;var item=this.mapEvent.get(id);return item;};this.OnSize=function(){if(!this.Frame)return;this.SetSizeChange(true);this.Draw();this.DelayUpdateStockData();};this.SetSizeChange=function(bChanged){for(var i=0;i<this.ChartPaint.length;++i){var chart=this.ChartPaint[i];if(chart)chart.SizeChange=bChanged;}};this.ChangeSymbol=function(symbol,option){this.CancelAutoUpdate();this.ClearData();this.Symbol=symbol;this.Name=symbol;if(option){if(option.Name)this.Name=option.Name;}this.RequestStockListData();};this.CancelAutoUpdate=function()//关闭停止更新
|
|
@@ -13883,7 +13884,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13883
13884
|
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);};}/********************************************************************************
|
|
13884
13885
|
* 版本信息输出
|
|
13885
13886
|
*
|
|
13886
|
-
*/var HQCHART_VERSION="1.1.
|
|
13887
|
+
*/var HQCHART_VERSION="1.1.13968";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();//把给外界调用的方法暴露出来
|
|
13887
13888
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13888
13889
|
// BaseIndex:BaseIndex,
|
|
13889
13890
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
|
@@ -473,6 +473,8 @@ function JSTReportChartContainer(uielement)
|
|
|
473
473
|
this.SourceData.Data=[];
|
|
474
474
|
this.Data.Data=[];
|
|
475
475
|
this.Data.Price=null;
|
|
476
|
+
this.Data.XOffset=0; //清空偏移
|
|
477
|
+
this.Data.YOffset=0;
|
|
476
478
|
this.MapStockData=null;
|
|
477
479
|
this.MapExePriceData=null;
|
|
478
480
|
this.BorderData.MapData=null;
|
package/src/jscommon/umychart.js
CHANGED
|
@@ -44628,8 +44628,36 @@ function RectSelectPaint()
|
|
|
44628
44628
|
return null;
|
|
44629
44629
|
}
|
|
44630
44630
|
|
|
44631
|
+
this.GetSelectRectDataByOnePoint=function()
|
|
44632
|
+
{
|
|
44633
|
+
if (!this.FirstPoint) return null;
|
|
44634
|
+
|
|
44635
|
+
var data=this.GetKData();
|
|
44636
|
+
if (!data) return null;
|
|
44637
|
+
var isMinuteChart=this.IsMinuteChart();
|
|
44638
|
+
var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);
|
|
44639
|
+
var selectData={ Start:null, End:null, Data:data };
|
|
44640
|
+
for(var i=0;i<data.Data.length;++i)
|
|
44641
|
+
{
|
|
44642
|
+
var item=data.Data[i];
|
|
44643
|
+
if (!item) continue;
|
|
44644
|
+
var value=this.DateToNumber(item,isMinuteChart);
|
|
44645
|
+
|
|
44646
|
+
if (firstDate==value)
|
|
44647
|
+
{
|
|
44648
|
+
selectData.Start=i;
|
|
44649
|
+
selectData.End=i;
|
|
44650
|
+
return selectData;
|
|
44651
|
+
}
|
|
44652
|
+
}
|
|
44653
|
+
|
|
44654
|
+
return null;
|
|
44655
|
+
}
|
|
44656
|
+
|
|
44631
44657
|
this.GetSelectRectData=function()
|
|
44632
44658
|
{
|
|
44659
|
+
if (this.IsOnlyOnePoint) return this.GetSelectRectDataByOnePoint();
|
|
44660
|
+
|
|
44633
44661
|
if (!this.FirstPoint || !this.SecondPoint) return null;
|
|
44634
44662
|
|
|
44635
44663
|
var data=this.GetKData();
|
|
@@ -3845,6 +3845,12 @@ function JSReportChartContainer(uielement)
|
|
|
3845
3845
|
}
|
|
3846
3846
|
}
|
|
3847
3847
|
|
|
3848
|
+
if (data.Virtual)
|
|
3849
|
+
{
|
|
3850
|
+
var item=data.Virtual;
|
|
3851
|
+
if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
|
|
3852
|
+
}
|
|
3853
|
+
|
|
3848
3854
|
var chart=this.ChartPaint[0];
|
|
3849
3855
|
if (!chart) return;
|
|
3850
3856
|
|
|
@@ -48553,8 +48553,36 @@ function RectSelectPaint()
|
|
|
48553
48553
|
return null;
|
|
48554
48554
|
}
|
|
48555
48555
|
|
|
48556
|
+
this.GetSelectRectDataByOnePoint=function()
|
|
48557
|
+
{
|
|
48558
|
+
if (!this.FirstPoint) return null;
|
|
48559
|
+
|
|
48560
|
+
var data=this.GetKData();
|
|
48561
|
+
if (!data) return null;
|
|
48562
|
+
var isMinuteChart=this.IsMinuteChart();
|
|
48563
|
+
var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);
|
|
48564
|
+
var selectData={ Start:null, End:null, Data:data };
|
|
48565
|
+
for(var i=0;i<data.Data.length;++i)
|
|
48566
|
+
{
|
|
48567
|
+
var item=data.Data[i];
|
|
48568
|
+
if (!item) continue;
|
|
48569
|
+
var value=this.DateToNumber(item,isMinuteChart);
|
|
48570
|
+
|
|
48571
|
+
if (firstDate==value)
|
|
48572
|
+
{
|
|
48573
|
+
selectData.Start=i;
|
|
48574
|
+
selectData.End=i;
|
|
48575
|
+
return selectData;
|
|
48576
|
+
}
|
|
48577
|
+
}
|
|
48578
|
+
|
|
48579
|
+
return null;
|
|
48580
|
+
}
|
|
48581
|
+
|
|
48556
48582
|
this.GetSelectRectData=function()
|
|
48557
48583
|
{
|
|
48584
|
+
if (this.IsOnlyOnePoint) return this.GetSelectRectDataByOnePoint();
|
|
48585
|
+
|
|
48558
48586
|
if (!this.FirstPoint || !this.SecondPoint) return null;
|
|
48559
48587
|
|
|
48560
48588
|
var data=this.GetKData();
|
|
@@ -131303,6 +131331,12 @@ function JSReportChartContainer(uielement)
|
|
|
131303
131331
|
}
|
|
131304
131332
|
}
|
|
131305
131333
|
|
|
131334
|
+
if (data.Virtual)
|
|
131335
|
+
{
|
|
131336
|
+
var item=data.Virtual;
|
|
131337
|
+
if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
|
|
131338
|
+
}
|
|
131339
|
+
|
|
131306
131340
|
var chart=this.ChartPaint[0];
|
|
131307
131341
|
if (!chart) return;
|
|
131308
131342
|
|
|
@@ -139281,7 +139315,7 @@ function ScrollBarBGChart()
|
|
|
139281
139315
|
|
|
139282
139316
|
|
|
139283
139317
|
|
|
139284
|
-
var HQCHART_VERSION="1.1.
|
|
139318
|
+
var HQCHART_VERSION="1.1.13968";
|
|
139285
139319
|
|
|
139286
139320
|
function PrintHQChartVersion()
|
|
139287
139321
|
{
|
|
@@ -48597,8 +48597,36 @@ function RectSelectPaint()
|
|
|
48597
48597
|
return null;
|
|
48598
48598
|
}
|
|
48599
48599
|
|
|
48600
|
+
this.GetSelectRectDataByOnePoint=function()
|
|
48601
|
+
{
|
|
48602
|
+
if (!this.FirstPoint) return null;
|
|
48603
|
+
|
|
48604
|
+
var data=this.GetKData();
|
|
48605
|
+
if (!data) return null;
|
|
48606
|
+
var isMinuteChart=this.IsMinuteChart();
|
|
48607
|
+
var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);
|
|
48608
|
+
var selectData={ Start:null, End:null, Data:data };
|
|
48609
|
+
for(var i=0;i<data.Data.length;++i)
|
|
48610
|
+
{
|
|
48611
|
+
var item=data.Data[i];
|
|
48612
|
+
if (!item) continue;
|
|
48613
|
+
var value=this.DateToNumber(item,isMinuteChart);
|
|
48614
|
+
|
|
48615
|
+
if (firstDate==value)
|
|
48616
|
+
{
|
|
48617
|
+
selectData.Start=i;
|
|
48618
|
+
selectData.End=i;
|
|
48619
|
+
return selectData;
|
|
48620
|
+
}
|
|
48621
|
+
}
|
|
48622
|
+
|
|
48623
|
+
return null;
|
|
48624
|
+
}
|
|
48625
|
+
|
|
48600
48626
|
this.GetSelectRectData=function()
|
|
48601
48627
|
{
|
|
48628
|
+
if (this.IsOnlyOnePoint) return this.GetSelectRectDataByOnePoint();
|
|
48629
|
+
|
|
48602
48630
|
if (!this.FirstPoint || !this.SecondPoint) return null;
|
|
48603
48631
|
|
|
48604
48632
|
var data=this.GetKData();
|
|
@@ -131347,6 +131375,12 @@ function JSReportChartContainer(uielement)
|
|
|
131347
131375
|
}
|
|
131348
131376
|
}
|
|
131349
131377
|
|
|
131378
|
+
if (data.Virtual)
|
|
131379
|
+
{
|
|
131380
|
+
var item=data.Virtual;
|
|
131381
|
+
if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
|
|
131382
|
+
}
|
|
131383
|
+
|
|
131350
131384
|
var chart=this.ChartPaint[0];
|
|
131351
131385
|
if (!chart) return;
|
|
131352
131386
|
|
|
@@ -136459,6 +136493,8 @@ function JSTReportChartContainer(uielement)
|
|
|
136459
136493
|
this.SourceData.Data=[];
|
|
136460
136494
|
this.Data.Data=[];
|
|
136461
136495
|
this.Data.Price=null;
|
|
136496
|
+
this.Data.XOffset=0; //清空偏移
|
|
136497
|
+
this.Data.YOffset=0;
|
|
136462
136498
|
this.MapStockData=null;
|
|
136463
136499
|
this.MapExePriceData=null;
|
|
136464
136500
|
this.BorderData.MapData=null;
|
|
@@ -144686,7 +144722,7 @@ function HQChartScriptWorker()
|
|
|
144686
144722
|
|
|
144687
144723
|
|
|
144688
144724
|
|
|
144689
|
-
var HQCHART_VERSION="1.1.
|
|
144725
|
+
var HQCHART_VERSION="1.1.13968";
|
|
144690
144726
|
|
|
144691
144727
|
function PrintHQChartVersion()
|
|
144692
144728
|
{
|