hqchart 1.1.15349 → 1.1.15352
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
CHANGED
|
@@ -1187,7 +1187,7 @@ this.CreateKLineChartContainer=function(option){var _this=this;var chart=null;if
|
|
|
1187
1187
|
if(IFrameSplitOperator.IsBool(option.IsShowRightMenu))chart.IsShowRightMenu=option.IsShowRightMenu;if(option.ScriptError)chart.ScriptErrorCallback=option.ScriptError;if(option.EnableScrollUpDown==true)chart.EnableScrollUpDown=option.EnableScrollUpDown;if(option.DisableMouse==true)chart.DisableMouse=option.DisableMouse;if(option.TouchMoveMinAngle)chart.TouchMoveMinAngle=option.TouchMoveMinAngle;if(option.EnableZoomUpDown)chart.EnableZoomUpDown=option.EnableZoomUpDown;if(IFrameSplitOperator.IsString(option.SplashTitle))chart.LoadDataSplashTitle=option.SplashTitle;if(IFrameSplitOperator.IsBool(option.EnableZoomIndexWindow))chart.EnableZoomIndexWindow=option.EnableZoomIndexWindow;if(IFrameSplitOperator.IsBool(option.IsDrawPictureXY))chart.IsDrawPictureXY=option.IsDrawPictureXY;if(IFrameSplitOperator.IsNumber(option.CtrlMoveStep))chart.CtrlMoveStep=option.CtrlMoveStep;if(IFrameSplitOperator.IsNumber(option.ShiftMoveStep))chart.ShiftMoveStep=option.ShiftMoveStep;if(IFrameSplitOperator.IsBool(option.EnableIndexChartDrag))chart.EnableIndexChartDrag=option.EnableIndexChartDrag;if(IFrameSplitOperator.IsBool(option.EnableVerifyRecvData))chart.EnableVerifyRecvData=option.EnableVerifyRecvData;if(option.GlobalOption){var item=option.GlobalOption;if(IFrameSplitOperator.IsBool(item.IsValueFullRange))chart.GlobalOption.IsValueFullRange=item.IsValueFullRange;if(IFrameSplitOperator.IsBool(item.EnableXShortDate))chart.GlobalOption.EnableXShortDate=item.EnableXShortDate;if(item.SelectedBorder){var subItem=item.SelectedBorder;if(IFrameSplitOperator.IsNumber(subItem.Mode))chart.GlobalOption.SelectedBorder.Mode=subItem.Mode;}}if(option.EnableYDrag){var item=option.EnableYDrag;if(IFrameSplitOperator.IsBool(item.Left))chart.EnableYDrag.Left=item.Left;if(IFrameSplitOperator.IsBool(item.Right))chart.EnableYDrag.Right=item.Right;if(IFrameSplitOperator.IsBool(item.Wheel))chart.EnableYDrag.Wheel=item.Wheel;if(IFrameSplitOperator.IsNumber(item.WheelYMove))chart.EnableYDrag.WheelYMove=item.WheelYMove;}if(option.EnableXDrag){var item=option.EnableXDrag;if(IFrameSplitOperator.IsBool(item.Bottom))chart.EnableXDrag.Bottom=item.Bottom;if(item.LButton&&IFrameSplitOperator.IsNumber(item.LButton.Type))chart.EnableXDrag.LButton.Type=item.LButton.Type;if(item.RButton&&IFrameSplitOperator.IsNumber(item.RButton.Type))chart.EnableXDrag.RButton.Type=item.RButton.Type;}if(option.KLineTooltip){var item=option.KLineTooltip;if(IFrameSplitOperator.IsBool(item.Enable))chart.KLineTooltipConfig.Enable=item.Enable;if(IFrameSplitOperator.IsBool(item.EnableKeyDown))chart.KLineTooltipConfig.EnableKeyDown=item.EnableKeyDown;}if(option.KLine)//k线图的属性设置
|
|
1188
1188
|
{var item=option.KLine;if(option.KLine.DragMode>=0)chart.DragMode=option.KLine.DragMode;if(option.KLine.Right>=0)chart.Right=option.KLine.Right;if(option.KLine.Period>=0)chart.Period=option.KLine.Period;if(option.KLine.MaxReqeustDataCount>0)chart.MaxRequestDataCount=option.KLine.MaxReqeustDataCount;//兼容老版本
|
|
1189
1189
|
if(option.KLine.MaxRequestDataCount>0)chart.MaxRequestDataCount=option.KLine.MaxRequestDataCount;if(option.KLine.Info&&option.KLine.Info.length>0)chart.SetKLineInfo(option.KLine.Info,false);if(IFrameSplitOperator.IsBool(item.IsShowTooltip))chart.IsShowTooltip=item.IsShowTooltip;if(option.KLine.MaxRequestMinuteDayCount>0)chart.MaxRequestMinuteDayCount=option.KLine.MaxRequestMinuteDayCount;if(option.KLine.DrawType)chart.KLineDrawType=option.KLine.DrawType;if(option.KLine.FirstShowDate>19910101)chart.CustomShow={Date:option.KLine.FirstShowDate,PageSize:option.KLine.PageSize};//!!已弃用 新的格式"CustomShow"
|
|
1190
|
-
if(option.KLine.RightSpaceCount>0)chart.RightSpaceCount=option.KLine.RightSpaceCount;if(option.KLine.ZoomType>0)chart.ZoomType=option.KLine.ZoomType;if(option.KLine.DataWidth>=1)chart.KLineSize={DataWidth:option.KLine.DataWidth};if(IFrameSplitOperator.IsNumber(option.KLine.RightFormula))chart.RightFormula=option.KLine.RightFormula;}//自定义显示位置
|
|
1190
|
+
if(option.KLine.RightSpaceCount>0)chart.RightSpaceCount=option.KLine.RightSpaceCount;if(option.KLine.ZoomType>0)chart.ZoomType=option.KLine.ZoomType;if(IFrameSplitOperator.IsNumber(option.KLine.PageSizeV2))chart.KLineSize={PageSize:option.KLine.PageSizeV2};if(option.KLine.DataWidth>=1)chart.KLineSize={DataWidth:option.KLine.DataWidth};if(IFrameSplitOperator.IsNumber(option.KLine.RightFormula))chart.RightFormula=option.KLine.RightFormula;}//自定义显示位置
|
|
1191
1191
|
if(option.CustomShow&&IFrameSplitOperator.IsPlusNumber(option.CustomShow.Date)){var item=option.CustomShow;chart.CustomShow={Date:item.Date};if(IFrameSplitOperator.IsNumber(item.Time))chart.CustomShow.Time=item.Time;if(IFrameSplitOperator.IsPlusNumber(item.PageSize))chart.CustomShow.PageSize=item.PageSize;}if(option.EnableFlowCapital){var item=option.EnableFlowCapital;if(item.BIT==true)chart.EnableFlowCapital.BIT=item.BIT;}if(IFrameSplitOperator.IsBool(option.EnableBorderDrag)){chart.EnableBorderDrag=option.EnableBorderDrag;}if(option.Page){if(option.Page.Day&&option.Page.Day.Enable==true)chart.Page.Day.Enable=true;if(option.Page.Minute&&option.Page.Minute.Enable==true)chart.Page.Minute.Enable=true;}if(option.DragDownload){if(option.DragDownload.Day&&option.DragDownload.Day.Enable==true)chart.DragDownload.Day.Enable=true;if(option.DragDownload.Minute&&option.DragDownload.Minute.Enable==true)chart.DragDownload.Minute.Enable=true;}if(option.ZoomDownload){if(option.ZoomDownload.Day&&IFrameSplitOperator.IsBool(option.ZoomDownload.Day.Enable))chart.ZoomDownload.Day.Enable=option.ZoomDownload.Day.Enable;if(option.ZoomDownload.Minute&&IFrameSplitOperator.IsBool(option.ZoomDownload.Minute.Enable))chart.ZoomDownload.Minute.Enable=option.ZoomDownload.Minute.Enable;}if(option.Language){var value=g_JSChartLocalization.GetLanguageID(option.Language);if(IFrameSplitOperator.IsNumber(value))chart.LanguageID=value;}if(option.SourceDatatLimit)chart.SetSourceDatatLimit(option.SourceDatatLimit);if(option.DrawPicture)//画图工具
|
|
1192
1192
|
{if(option.DrawPicture.StorageKey&&chart.ChartDrawStorage)chart.ChartDrawStorage.SetKey(option.DrawPicture.StorageKey);}if(option.DrawTool)//画图工具
|
|
1193
1193
|
{var item=option.DrawTool;if(chart.ChartDrawStorage){if(item.StorageKey)chart.ChartDrawStorage.SetKey(item.StorageKey);if(IFrameSplitOperator.IsBool(item.EnableCrossPeriod))chart.ChartDrawStorage.EnableCrossPeriod=item.EnableCrossPeriod;}}if(chart.ChartDrawStorage)chart.ChartDrawStorage.Load();if(option.KeyboardMove){var item=option.KeyboardMove;if(IFrameSplitOperator.IsPlusNumber(item.Delay))chart.KeyboardMove.Delay=item.Delay;if(IFrameSplitOperator.IsPlusNumber(item.PressTime))chart.KeyboardMove.PressTime=item.PressTime;}if(IFrameSplitOperator.IsNumber(option.StepPixel))chart.StepPixel=option.StepPixel;if(option.ZoomStepPixel>0)chart.ZoomStepPixel=option.ZoomStepPixel;if(option.IsApiPeriod==true)chart.IsApiPeriod=option.IsApiPeriod;//图形选中
|
|
@@ -8052,7 +8052,7 @@ var xPointCouont=this.Frame.SubFrame[0].Frame.XPointCount;frame.XPointCount=xPoi
|
|
|
8052
8052
|
this.CreateMainKLine=function(){var _this28=this;var kline=g_ChartPaintFactory.Create("ChartKLine");kline.Canvas=this.Canvas;kline.ChartBorder=this.Frame.SubFrame[0].Frame.ChartBorder;kline.ChartFrame=this.Frame.SubFrame[0].Frame;kline.Name="Main-KLine";kline.DrawType=this.KLineDrawType;kline.Identify="Main-KLine";kline.HQChart=this;kline.GetEventCallback=function(id){return _this28.GetEventCallback(id);};this.ChartPaint[0]=kline;this.TitlePaint[0]=new DynamicKLineTitlePainting();this.TitlePaint[0].Frame=this.Frame.SubFrame[0].Frame;this.TitlePaint[0].Canvas=this.Canvas;this.TitlePaint[0].OverlayChartPaint=this.OverlayChartPaint;//绑定叠加
|
|
8053
8053
|
this.TitlePaint[0].LanguageID=this.LanguageID;this.TitlePaint[0].HQChart=this;this.TitlePaint[0].GetEventCallback=function(id){return _this28.GetEventCallback(id);};};this.BindKLineBreakPoint=function(data){var klineChart=this.ChartPaint[0];if(!klineChart)return;if(!IFrameSplitOperator.IsNonEmptyArray(data.AryBreakPoint))return;klineChart.AryBreakPoint=data.AryBreakPoint.slice();};//绑定主图K线数据
|
|
8054
8054
|
this.BindMainData=function(hisData,showCount,chartOperator){var isShowAll=false;//全部显示
|
|
8055
|
-
if(chartOperator&&chartOperator.IsShowAll===true)isShowAll=true;this.ChartPaint[0].Data=hisData;this.ChartPaint[0].Symbol=this.Symbol;if(this.KLineSize){if(
|
|
8055
|
+
if(chartOperator&&chartOperator.IsShowAll===true)isShowAll=true;this.ChartPaint[0].Data=hisData;this.ChartPaint[0].Symbol=this.Symbol;if(this.KLineSize){if(IFrameSplitOperator.IsNumber(this.KLineSize.DataWidth)){var obj=this.Frame.SetDataWidth(this.KLineSize.DataWidth);showCount=obj.XPointCount-this.RightSpaceCount;this.KLineSize.DataWidth=null;this.KLineSize.PageSize=null;}else if(IFrameSplitOperator.IsNumber(this.KLineSize.PageSize)){showCount=this.KLineSize.PageSize;this.KLineSize.PageSize=null;this.KLineSize.DataWidth=null;}else{showCount=this.Frame.SubFrame[0].Frame.XPointCount-this.RightSpaceCount;}}for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i].Frame;if(isShowAll)item.XPointCount=hisData.Data.length+this.RightSpaceCount;else item.XPointCount=showCount+this.RightSpaceCount;item.Data=this.ChartPaint[0].Data;item.XSplitOperator.Symbol=this.Symbol;item.XSplitOperator.Period=this.Period;}this.TitlePaint[0].Data=this.ChartPaint[0].Data;//动态标题
|
|
8056
8056
|
this.TitlePaint[0].Symbol=this.Symbol;this.TitlePaint[0].Name=this.Name;this.TitlePaint[0].Period=this.Period;this.ChartCorssCursor.StringFormatX.Data=this.ChartPaint[0].Data;//十字光标
|
|
8057
8057
|
this.Frame.Data=this.ChartPaint[0].Data;for(var i=0;i<this.OverlayChartPaint.length;++i)//K线叠加 主图股票数据绑定到叠加上
|
|
8058
8058
|
{var item=this.OverlayChartPaint[i];item.MainData=this.ChartPaint[0].Data;}if(isShowAll){var dataOffset=0;this.CursorIndex=0;}else{var dataOffset=hisData.Data.length-showCount;if(dataOffset<0)dataOffset=0;this.ChartPaint[0].Data.DataOffset=dataOffset;this.CursorIndex=showCount;if(this.CursorIndex+dataOffset>=hisData.Data.length)this.CursorIndex=hisData.Data.length-1-dataOffset;if(this.CursorIndex<0)this.CursorIndex=0;//不一定对啊
|
|
@@ -15760,7 +15760,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
15760
15760
|
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);};}/********************************************************************************
|
|
15761
15761
|
* 版本信息输出
|
|
15762
15762
|
*
|
|
15763
|
-
*/var HQCHART_VERSION="1.1.
|
|
15763
|
+
*/var HQCHART_VERSION="1.1.15351";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();//把给外界调用的方法暴露出来
|
|
15764
15764
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
15765
15765
|
// BaseIndex:BaseIndex,
|
|
15766
15766
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -368,6 +368,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
368
368
|
if (option.KLine.FirstShowDate>19910101) chart.CustomShow={ Date:option.KLine.FirstShowDate, PageSize:option.KLine.PageSize }; //!!已弃用 新的格式"CustomShow"
|
|
369
369
|
if (option.KLine.RightSpaceCount>0) chart.RightSpaceCount=option.KLine.RightSpaceCount;
|
|
370
370
|
if (option.KLine.ZoomType>0) chart.ZoomType=option.KLine.ZoomType;
|
|
371
|
+
if (IFrameSplitOperator.IsNumber(option.KLine.PageSizeV2)) chart.KLineSize={ PageSize:option.KLine.PageSizeV2 };
|
|
371
372
|
if (option.KLine.DataWidth>=1) chart.KLineSize={ DataWidth:option.KLine.DataWidth };
|
|
372
373
|
if (IFrameSplitOperator.IsNumber(option.KLine.RightFormula)) chart.RightFormula=option.KLine.RightFormula;
|
|
373
374
|
}
|
|
@@ -13425,7 +13426,7 @@ function IChartFramePainting()
|
|
|
13425
13426
|
this.HorizontalMax; //Y轴最大值
|
|
13426
13427
|
this.HorizontalMin; //Y轴最小值
|
|
13427
13428
|
this.HorizontalReserved=null; //Y轴预留高度 { Top:上, Bottom:下 }
|
|
13428
|
-
this.XPointCount=
|
|
13429
|
+
this.XPointCount=g_JSChartResource.Frame.XPointCount; //X轴数据个数
|
|
13429
13430
|
|
|
13430
13431
|
this.ClientBGColor; //客户区背景色
|
|
13431
13432
|
|
|
@@ -78191,7 +78192,8 @@ function JSChartResource()
|
|
|
78191
78192
|
YTopOffset:2*GetDevicePixelRatio(), //Y轴顶部文字向下偏移
|
|
78192
78193
|
YTextPadding:[2,2],
|
|
78193
78194
|
EnableRemoveZero:true, //移除小数点后面的0
|
|
78194
|
-
StringFormat:0
|
|
78195
|
+
StringFormat:0,
|
|
78196
|
+
XPointCount:10,
|
|
78195
78197
|
};
|
|
78196
78198
|
this.ToolbarButtonStyle=0;
|
|
78197
78199
|
|
|
@@ -79831,6 +79833,7 @@ function JSChartResource()
|
|
|
79831
79833
|
{
|
|
79832
79834
|
if (style.Frame.XBottomOffset) this.Frame.XBottomOffset=style.Frame.XBottomOffset;
|
|
79833
79835
|
if (style.Frame.YTopOffset) this.Frame.YTopOffset=style.Frame.YTopOffset;
|
|
79836
|
+
if (IFrameSplitOperator.IsNumber(style.Frame.XPointCount)) this.Frame.XPointCount=style.Frame.XPointCount;
|
|
79834
79837
|
if (style.Frame.PercentageText)
|
|
79835
79838
|
{
|
|
79836
79839
|
var item=style.Frame.PercentageText;
|
|
@@ -84092,21 +84095,32 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
84092
84095
|
this.BindMainData=function(hisData, showCount, chartOperator)
|
|
84093
84096
|
{
|
|
84094
84097
|
var isShowAll=false; //全部显示
|
|
84095
|
-
if (chartOperator
|
|
84098
|
+
if (chartOperator)
|
|
84099
|
+
{
|
|
84100
|
+
if (chartOperator.IsShowAll===true) isShowAll=true;
|
|
84101
|
+
if (IFrameSplitOperator.IsPlusNumber(chartOperator.PageSize)) showCount=chartOperator.PageSize;
|
|
84102
|
+
}
|
|
84096
84103
|
this.ChartPaint[0].Data=hisData;
|
|
84097
84104
|
this.ChartPaint[0].Symbol=this.Symbol;
|
|
84098
84105
|
|
|
84099
84106
|
if (this.KLineSize)
|
|
84100
84107
|
{
|
|
84101
|
-
if (
|
|
84102
|
-
{
|
|
84103
|
-
showCount=this.Frame.SubFrame[0].Frame.XPointCount-this.RightSpaceCount;
|
|
84104
|
-
}
|
|
84105
|
-
else
|
|
84108
|
+
if (IFrameSplitOperator.IsNumber(this.KLineSize.DataWidth))
|
|
84106
84109
|
{
|
|
84107
84110
|
var obj=this.Frame.SetDataWidth(this.KLineSize.DataWidth);
|
|
84108
84111
|
showCount=obj.XPointCount-this.RightSpaceCount;
|
|
84109
84112
|
this.KLineSize.DataWidth=null;
|
|
84113
|
+
this.KLineSize.PageSize=null;
|
|
84114
|
+
}
|
|
84115
|
+
else if (IFrameSplitOperator.IsNumber(this.KLineSize.PageSize))
|
|
84116
|
+
{
|
|
84117
|
+
showCount=this.KLineSize.PageSize;
|
|
84118
|
+
this.KLineSize.PageSize=null;
|
|
84119
|
+
this.KLineSize.DataWidth=null;
|
|
84120
|
+
}
|
|
84121
|
+
else
|
|
84122
|
+
{
|
|
84123
|
+
showCount=this.Frame.SubFrame[0].Frame.XPointCount-this.RightSpaceCount;
|
|
84110
84124
|
}
|
|
84111
84125
|
}
|
|
84112
84126
|
|
|
@@ -84770,7 +84784,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
84770
84784
|
{
|
|
84771
84785
|
var item=data.ChartOperator;
|
|
84772
84786
|
chartOperator={ };
|
|
84773
|
-
if (item.IsShowAll===true) chartOperator.IsShowAll=true;
|
|
84787
|
+
if (item.IsShowAll===true) chartOperator.IsShowAll=true;
|
|
84788
|
+
if (IFrameSplitOperator.IsNumber(item.PageSize)) chartOperator.PageSize=item.PageSize; //全部显示
|
|
84774
84789
|
}
|
|
84775
84790
|
|
|
84776
84791
|
this.BindMainData(bindData,this.PageSize,chartOperator);
|
|
@@ -4464,6 +4464,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4464
4464
|
if (option.KLine.FirstShowDate>19910101) chart.CustomShow={ Date:option.KLine.FirstShowDate, PageSize:option.KLine.PageSize }; //!!已弃用 新的格式"CustomShow"
|
|
4465
4465
|
if (option.KLine.RightSpaceCount>0) chart.RightSpaceCount=option.KLine.RightSpaceCount;
|
|
4466
4466
|
if (option.KLine.ZoomType>0) chart.ZoomType=option.KLine.ZoomType;
|
|
4467
|
+
if (IFrameSplitOperator.IsNumber(option.KLine.PageSizeV2)) chart.KLineSize={ PageSize:option.KLine.PageSizeV2 };
|
|
4467
4468
|
if (option.KLine.DataWidth>=1) chart.KLineSize={ DataWidth:option.KLine.DataWidth };
|
|
4468
4469
|
if (IFrameSplitOperator.IsNumber(option.KLine.RightFormula)) chart.RightFormula=option.KLine.RightFormula;
|
|
4469
4470
|
}
|
|
@@ -88194,15 +88195,22 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
88194
88195
|
|
|
88195
88196
|
if (this.KLineSize)
|
|
88196
88197
|
{
|
|
88197
|
-
if (
|
|
88198
|
-
{
|
|
88199
|
-
showCount=this.Frame.SubFrame[0].Frame.XPointCount-this.RightSpaceCount;
|
|
88200
|
-
}
|
|
88201
|
-
else
|
|
88198
|
+
if (IFrameSplitOperator.IsNumber(this.KLineSize.DataWidth))
|
|
88202
88199
|
{
|
|
88203
88200
|
var obj=this.Frame.SetDataWidth(this.KLineSize.DataWidth);
|
|
88204
88201
|
showCount=obj.XPointCount-this.RightSpaceCount;
|
|
88205
88202
|
this.KLineSize.DataWidth=null;
|
|
88203
|
+
this.KLineSize.PageSize=null;
|
|
88204
|
+
}
|
|
88205
|
+
else if (IFrameSplitOperator.IsNumber(this.KLineSize.PageSize))
|
|
88206
|
+
{
|
|
88207
|
+
showCount=this.KLineSize.PageSize;
|
|
88208
|
+
this.KLineSize.PageSize=null;
|
|
88209
|
+
this.KLineSize.DataWidth=null;
|
|
88210
|
+
}
|
|
88211
|
+
else
|
|
88212
|
+
{
|
|
88213
|
+
showCount=this.Frame.SubFrame[0].Frame.XPointCount-this.RightSpaceCount;
|
|
88206
88214
|
}
|
|
88207
88215
|
}
|
|
88208
88216
|
|
|
@@ -155386,7 +155394,7 @@ function ScrollBarBGChart()
|
|
|
155386
155394
|
|
|
155387
155395
|
|
|
155388
155396
|
|
|
155389
|
-
var HQCHART_VERSION="1.1.
|
|
155397
|
+
var HQCHART_VERSION="1.1.15351";
|
|
155390
155398
|
|
|
155391
155399
|
function PrintHQChartVersion()
|
|
155392
155400
|
{
|
|
@@ -4508,6 +4508,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
|
|
|
4508
4508
|
if (option.KLine.FirstShowDate>19910101) chart.CustomShow={ Date:option.KLine.FirstShowDate, PageSize:option.KLine.PageSize }; //!!已弃用 新的格式"CustomShow"
|
|
4509
4509
|
if (option.KLine.RightSpaceCount>0) chart.RightSpaceCount=option.KLine.RightSpaceCount;
|
|
4510
4510
|
if (option.KLine.ZoomType>0) chart.ZoomType=option.KLine.ZoomType;
|
|
4511
|
+
if (IFrameSplitOperator.IsNumber(option.KLine.PageSizeV2)) chart.KLineSize={ PageSize:option.KLine.PageSizeV2 };
|
|
4511
4512
|
if (option.KLine.DataWidth>=1) chart.KLineSize={ DataWidth:option.KLine.DataWidth };
|
|
4512
4513
|
if (IFrameSplitOperator.IsNumber(option.KLine.RightFormula)) chart.RightFormula=option.KLine.RightFormula;
|
|
4513
4514
|
}
|
|
@@ -88238,15 +88239,22 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
88238
88239
|
|
|
88239
88240
|
if (this.KLineSize)
|
|
88240
88241
|
{
|
|
88241
|
-
if (
|
|
88242
|
-
{
|
|
88243
|
-
showCount=this.Frame.SubFrame[0].Frame.XPointCount-this.RightSpaceCount;
|
|
88244
|
-
}
|
|
88245
|
-
else
|
|
88242
|
+
if (IFrameSplitOperator.IsNumber(this.KLineSize.DataWidth))
|
|
88246
88243
|
{
|
|
88247
88244
|
var obj=this.Frame.SetDataWidth(this.KLineSize.DataWidth);
|
|
88248
88245
|
showCount=obj.XPointCount-this.RightSpaceCount;
|
|
88249
88246
|
this.KLineSize.DataWidth=null;
|
|
88247
|
+
this.KLineSize.PageSize=null;
|
|
88248
|
+
}
|
|
88249
|
+
else if (IFrameSplitOperator.IsNumber(this.KLineSize.PageSize))
|
|
88250
|
+
{
|
|
88251
|
+
showCount=this.KLineSize.PageSize;
|
|
88252
|
+
this.KLineSize.PageSize=null;
|
|
88253
|
+
this.KLineSize.DataWidth=null;
|
|
88254
|
+
}
|
|
88255
|
+
else
|
|
88256
|
+
{
|
|
88257
|
+
showCount=this.Frame.SubFrame[0].Frame.XPointCount-this.RightSpaceCount;
|
|
88250
88258
|
}
|
|
88251
88259
|
}
|
|
88252
88260
|
|
|
@@ -167445,7 +167453,7 @@ function HQChartScriptWorker()
|
|
|
167445
167453
|
|
|
167446
167454
|
|
|
167447
167455
|
|
|
167448
|
-
var HQCHART_VERSION="1.1.
|
|
167456
|
+
var HQCHART_VERSION="1.1.15351";
|
|
167449
167457
|
|
|
167450
167458
|
function PrintHQChartVersion()
|
|
167451
167459
|
{
|