hqchart 1.1.13210 → 1.1.13215
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
|
@@ -1893,7 +1893,8 @@ drawPicture.PointToValue();if(this.ChartDrawStorage)this.ChartDrawStorage.SaveDr
|
|
|
1893
1893
|
{var dargInfo=this.SelectChartDrawPicture.DragInfo;if(dargInfo.Click&&dargInfo.Move){if(dargInfo.Click.X!=dargInfo.Move.X||dargInfo.Click.Y!=dargInfo.Move.Y){//通知上层画好了
|
|
1894
1894
|
var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_FINISH_MOVE_DRAWPICTURE);//完成画图工具事件
|
|
1895
1895
|
if(event&&event.Callback){var sendData={DrawPicture:drawPicture};event.Callback(event,sendData,this);}if(drawPicture.OnMoveFinish)drawPicture.OnMoveFinish();}}}return true;};//清空所有的画线工具 option={ Draw:false/true }
|
|
1896
|
-
this.ClearChartDrawPicture=function(drawPicture,option){var bDraw=true;if(!drawPicture){this.ChartDrawPicture=[];if(this.ChartDrawStorage)this.ChartDrawStorage.Clear();if(option&&option.Draw==false)bDraw=false;if(bDraw)this.Draw();}else{for(var i
|
|
1896
|
+
this.ClearChartDrawPicture=function(drawPicture,option){var bDraw=true;if(!drawPicture){this.ChartDrawPicture=[];if(this.ChartDrawStorage)this.ChartDrawStorage.Clear();this.SelectChartDrawPicture=null;if(option&&option.Draw==false)bDraw=false;if(bDraw)this.Draw();}else{for(var i=0;i<this.ChartDrawPicture.length;++i){var item=this.ChartDrawPicture[i];if(item.Guid==drawPicture.Guid||item==drawPicture){if(this.ChartDrawStorage)this.ChartDrawStorage.DeleteDrawData(drawPicture);this.ChartDrawPicture.splice(i,1);if(this.SelectChartDrawPicture)//去掉选中
|
|
1897
|
+
{if(this.SelectChartDrawPicture.Guid==drawPicture.Guid||this.SelectChartDrawPicture==drawPicture)this.SelectChartDrawPicture=null;}if(option&&option.Draw==false)bDraw=false;if(bDraw)this.Draw();}}}};//获取画图工具当前选中图形的Guid
|
|
1897
1898
|
this.GetActiveDrawPicture=function(){var result={Move:{Guid:null},Select:{Guid:null},MoveOn:{Guid:null}};if(this.CurrentChartDrawPicture)result.Move={Guid:this.CurrentChartDrawPicture.Guid};if(this.SelectChartDrawPicture)result.Select={Guid:this.SelectChartDrawPicture.Guid,Chart:this.SelectChartDrawPicture};if(this.MoveOnChartDrawPicture)result.MoveOn={Guid:this.MoveOnChartDrawPicture.Guid};return result;};this.SetChartDrawOption=function(option){if(IFrameSplitOperator.IsBool(option.IsLockScreen))this.ChartDrawOption.IsLockScreen=option.IsLockScreen;if(IFrameSplitOperator.IsNumber(option.Zoom)&&option.Zoom>=0)this.ChartDrawOption.Zoom=option.Zoom;if(option.Magnet){var item=option.Magnet;if(!this.ChartDrawOption.Magnet)this.ChartDrawOption.Magnet={Type:0,Distance:20*GetDevicePixelRatio(),Enable:false};if(IFrameSplitOperator.IsBool(item.Enable))this.ChartDrawOption.Magnet.Enable=item.Enable;if(IFrameSplitOperator.IsNumber(item.Type))this.ChartDrawOption.Magnet.Type=item.Type;if(IFrameSplitOperator.IsNumber(item.Distance))this.ChartDrawOption.Magnet.Distance=opitemion.Distance;}};//是否显示十字光标的十字线
|
|
1898
1899
|
this.EnableShowCorssCursorLine=function(bShow){if(!this.ChartCorssCursor)return;this.ChartCorssCursor.IsShowCorss=bShow;};//获取扩展画法
|
|
1899
1900
|
this.GetExtendChartByClassName=function(name){for(var i=0;i<this.ExtendChartPaint.length;++i){var item=this.ExtendChartPaint[i];if(item.ClassName==name)return{Index:i,Chart:item};}return null;};//获取多个扩展画法
|
|
@@ -1904,7 +1905,8 @@ this.DeleteExtendChartByID=function(id){for(var i=0;i<this.ExtendChartPaint.leng
|
|
|
1904
1905
|
this.EnableSplashScreen=function(enable,option){if(!this.ChartSplashPaint)return;this.ChartSplashPaint.EnableSplash(enable);if(option&&option.Draw===false)return;if(enable)this.DrawSplashScreen(option);else this.Draw();};//设置指标窗口属性 windowItem=SetOption.Windows[i], frameItem=SetOption.Frames[i];
|
|
1905
1906
|
this.SetSubFrameAttribute=function(subFrame,windowItem,frameItem){if(!subFrame||!subFrame.Frame)return;var frame=subFrame.Frame;if(windowItem){if(IFrameSplitOperator.IsBool(windowItem.Modify))frame.ModifyIndex=windowItem.Modify;if(IFrameSplitOperator.IsBool(windowItem.Change))frame.ChangeIndex=windowItem.Change;if(IFrameSplitOperator.IsBool(windowItem.Close))frame.CloseIndex=windowItem.Close;if(IFrameSplitOperator.IsBool(windowItem.Overlay))frame.OverlayIndex=windowItem.Overlay;if(IFrameSplitOperator.IsBool(windowItem.IsDrawTitleBG))frame.IsDrawTitleBG=windowItem.IsDrawTitleBG;if(IFrameSplitOperator.IsNumber(windowItem.TitleHeight))frame.ChartBorder.TitleHeight=windowItem.TitleHeight;else windowItem.TitleHeight=frame.ChartBorder.TitleHeight;if(IFrameSplitOperator.IsBool(windowItem.IsShowTitleArrow))frame.IsShowTitleArrow=windowItem.IsShowTitleArrow;if(IFrameSplitOperator.IsBool(windowItem.IsShowIndexName))frame.IsShowIndexName=windowItem.IsShowIndexName;if(IFrameSplitOperator.IsNumber(windowItem.IndexParamSpace))frame.IndexParamSpace=windowItem.IndexParamSpace;if(IFrameSplitOperator.IsNumber(windowItem.IndexTitleSpace))frame.IndexTitleSpace=windowItem.IndexTitleSpace;}if(frameItem){if(frameItem.SplitCount)frame.YSplitOperator.SplitCount=frameItem.SplitCount;if(IFrameSplitOperator.IsBool(frameItem.IsShowXLine))frame.IsShowXLine=frameItem.IsShowXLine;if(IFrameSplitOperator.IsBool(frameItem.IsShowYLine))frame.IsShowYLine=frameItem.IsShowYLine;if(IFrameSplitOperator.IsBool(frameItem.IsShowLeftText)){frame.IsShowYText[0]=frameItem.IsShowLeftText;frame.YSplitOperator.IsShowLeftText=frameItem.IsShowLeftText;//显示左边刻度
|
|
1906
1907
|
}if(IFrameSplitOperator.IsBool(frameItem.IsShowRightText)){frame.IsShowYText[1]=frameItem.IsShowRightText;frame.YSplitOperator.IsShowRightText=frameItem.IsShowRightText;//显示右边刻度
|
|
1907
|
-
}if(IFrameSplitOperator.IsNumber(frameItem.Height)&&frameItem.Height>=0)subFrame.Height=frameItem.Height;}};this.SetSubFrameOption=function(subFrame,option){if(!option)return;var frame=subFrame.Frame;if(option.Window){var item=option.Window;if(IFrameSplitOperator.IsBool(item.Modify))frame.ModifyIndex=item.Modify;if(IFrameSplitOperator.IsBool(item.Change))frame.ChangeIndex=item.Change;if(IFrameSplitOperator.IsBool(item.Close))frame.CloseIndex=item.Close;if(IFrameSplitOperator.IsBool(item.Overlay))frame.OverlayIndex=item.Overlay;if(IFrameSplitOperator.IsBool(item.Export))frame.ExportData=item.Export;if(IFrameSplitOperator.IsBool(item.MaxMin))frame.MaxMinWindow=item.MaxMin;if(IFrameSplitOperator.IsBool(item.TitleWindow))frame.TitleWindow=item.TitleWindow;if(IFrameSplitOperator.IsBool(item.IsDrawTitleBG))frame.IsDrawTitleBG=item.IsDrawTitleBG;if(IFrameSplitOperator.IsBool(item.IsShowNameArrow))frame.IsShowNameArrow=item.IsShowNameArrow;if(item.OverlayIndexType){if(IFrameSplitOperator.IsNumber(item.OverlayIndexType.Position))frame.OverlayIndexType.Position=item.OverlayIndexType.Position;if(IFrameSplitOperator.IsNumber(item.OverlayIndexType.LineSpace))frame.OverlayIndexType.LineSpace=item.OverlayIndexType.LineSpace;}
|
|
1908
|
+
}if(IFrameSplitOperator.IsNumber(frameItem.Height)&&frameItem.Height>=0)subFrame.Height=frameItem.Height;}};this.SetSubFrameOption=function(subFrame,option){if(!option)return;var frame=subFrame.Frame;if(option.Window){var item=option.Window;if(IFrameSplitOperator.IsBool(item.Modify))frame.ModifyIndex=item.Modify;if(IFrameSplitOperator.IsBool(item.Change))frame.ChangeIndex=item.Change;if(IFrameSplitOperator.IsBool(item.Close))frame.CloseIndex=item.Close;if(IFrameSplitOperator.IsBool(item.Overlay))frame.OverlayIndex=item.Overlay;if(IFrameSplitOperator.IsBool(item.Export))frame.ExportData=item.Export;if(IFrameSplitOperator.IsBool(item.MaxMin))frame.MaxMinWindow=item.MaxMin;if(IFrameSplitOperator.IsBool(item.TitleWindow))frame.TitleWindow=item.TitleWindow;if(IFrameSplitOperator.IsBool(item.IsDrawTitleBG))frame.IsDrawTitleBG=item.IsDrawTitleBG;if(IFrameSplitOperator.IsBool(item.IsShowNameArrow))frame.IsShowNameArrow=item.IsShowNameArrow;if(item.OverlayIndexType){if(IFrameSplitOperator.IsNumber(item.OverlayIndexType.Position))frame.OverlayIndexType.Position=item.OverlayIndexType.Position;if(IFrameSplitOperator.IsNumber(item.OverlayIndexType.LineSpace))frame.OverlayIndexType.LineSpace=item.OverlayIndexType.LineSpace;}if(IFrameSplitOperator.IsNonEmptyArray(item.CustomToolbar))//自定义工具按钮
|
|
1909
|
+
{frame.CustomToolbar=item.CustomToolbar.slice();}}if(IFrameSplitOperator.IsNumber(option.SplitCount))subFrame.Frame.YSplitOperator.SplitCount=option.SplitCount;if(IFrameSplitOperator.IsNumber(option.TitleHeight))subFrame.Frame.ChartBorder.TitleHeight=option.TitleHeight;if(IFrameSplitOperator.IsBool(option.IsShowTitleArrow))subFrame.Frame.IsShowTitleArrow=option.IsShowTitleArrow;if(IFrameSplitOperator.IsBool(option.IsShowIndexName))subFrame.Frame.IsShowIndexName=option.IsShowIndexName;if(IFrameSplitOperator.IsBool(option.IsShowOverlayIndexName))subFrame.Frame.IsShowOverlayIndexName=option.IsShowOverlayIndexName;if(IFrameSplitOperator.IsNumber(option.IndexParamSpace))subFrame.Frame.IndexParamSpace=option.IndexParamSpace;if(IFrameSplitOperator.IsBool(option.IsShowXLine))subFrame.Frame.IsShowXLine=option.IsShowXLine;if(IFrameSplitOperator.IsBool(option.IsShowYLine))subFrame.Frame.IsShowYLine=option.IsShowYLine;if(IFrameSplitOperator.IsBool(option.IsShowIndexTitle))subFrame.Frame.IsShowIndexTitle=option.IsShowIndexTitle;if(IFrameSplitOperator.IsBool(option.IsShowLeftText)){subFrame.Frame.IsShowYText[0]=option.IsShowLeftText;subFrame.Frame.YSplitOperator.IsShowLeftText=option.IsShowLeftText;//显示左边刻度
|
|
1908
1910
|
}if(IFrameSplitOperator.IsBool(option.IsShowRightText)){subFrame.Frame.IsShowYText[1]=option.IsShowRightText;subFrame.Frame.YSplitOperator.IsShowRightText=option.IsShowRightText;//显示右边刻度
|
|
1909
1911
|
}};this.AddNewSubFrame=function(option){var _this12=this;var index=this.Frame.SubFrame.length;var subFrame=this.CreateSubFrameItem(index);var pixelRatio=GetDevicePixelRatio();subFrame.Frame.ChartBorder.TitleHeight*=pixelRatio;this.Frame.SubFrame[index]=subFrame;var titlePaint=new DynamicChartTitlePainting();titlePaint.Frame=this.Frame.SubFrame[index].Frame;titlePaint.Canvas=this.Canvas;titlePaint.LanguageID=this.LanguageID;titlePaint.GetEventCallback=function(id){return _this12.GetEventCallback(id);};this.TitlePaint[index+1]=titlePaint;this.SetSubFrameOption(subFrame,option);//最后一个显示X轴坐标
|
|
1910
1912
|
for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i].Frame;if(i==this.Frame.SubFrame.length-1)item.XSplitOperator.ShowText=true;else item.XSplitOperator.ShowText=false;}this.UpdataDataoffset();//更新数据偏移
|
|
@@ -6024,7 +6026,7 @@ this.AryShowButton=[];//需要显示的按钮 { Data:, Width }
|
|
|
6024
6026
|
this.AryButton=[];this.ExtendData;//扩展数据
|
|
6025
6027
|
this.ShowPriceTextConfig={IsShow:[false,false,true],//[0]=left内 [1]=right内 [2]=right外
|
|
6026
6028
|
Font:[12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1',12*GetDevicePixelRatio()+'px \u5FAE\u8F6F\u96C5\u9ED1']};//内部变量
|
|
6027
|
-
this.ColseButtonSize=0;this.SettingButtonSize=0;this.ButtonBGWidth=0;this.SetOption=function(option){if(this.Super_SetOption)this.Super_SetOption(option);if(option){if(option.GetLabelCallback){this.GetLabelCallback=option.GetLabelCallback;}if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(option.Font)this.Font=option.Font;if(option.ValueTextColor)this.ValueTextColor=option.ValueTextColor;if(IFrameSplitOperator.IsNumber(option.ButtonPosition))this.ButtonPosition=option.ButtonPosition;if(IFrameSplitOperator.IsNumber(option.RightSpaceWidth))this.RightSpaceWidth=option.RightSpaceWidth;if(option.Button){var item=option.Button;if(item.CloseIcon)this.Button.CloseIcon=CloneData(item.CloseIcon);else if(item.CloseIcon===null)this.Button.CloseIcon=null;if(item.SettingIcon)this.Button.SettingIcon=CloneData(item.SettingIcon);else if(item.SettingIcon===null)this.Button.SettingIcon=null;}if(option.ExtendData)this.ExtendData=option.ExtendData;if(IFrameSplitOperator.IsNonEmptyArray(option.IsShowPriceText)){for(var i=0;i<option.IsShowPriceText.length&&i<3;++i){var value=option.IsShowPriceText[i];if(IFrameSplitOperator.IsBool(value))this.ShowPriceTextConfig.IsShow[i]=value;}}if(option.TextMargin){var item=option.TextMargin;if(IFrameSplitOperator.IsNumber(item.Left))this.TextMargin.Left=item.Left;if(IFrameSplitOperator.IsNumber(item.Right))this.TextMargin.Right=item.Right;}}};this.ExportStorageData=function(){var storageData;if(this.Super_ExportStorageData){storageData=this.Super_ExportStorageData();if(this.Label)storageData.Label=this.Label;}return storageData;};this.IsPointIn=this.IsPointIn_XYValue_Line;/*
|
|
6029
|
+
this.ColseButtonSize=0;this.SettingButtonSize=0;this.ButtonBGWidth=0;this.SetOption=function(option){if(this.Super_SetOption)this.Super_SetOption(option);if(option){if(option.GetLabelCallback){this.GetLabelCallback=option.GetLabelCallback;}if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(IFrameSplitOperator.IsNumber(option.Precision))this.Precision=option.Precision;if(option.Font)this.Font=option.Font;if(option.ValueTextColor)this.ValueTextColor=option.ValueTextColor;if(IFrameSplitOperator.IsNumber(option.ButtonPosition))this.ButtonPosition=option.ButtonPosition;if(IFrameSplitOperator.IsNumber(option.RightSpaceWidth))this.RightSpaceWidth=option.RightSpaceWidth;if(option.Button){var item=option.Button;if(item.CloseIcon){this.Button.CloseIcon=CloneData(item.CloseIcon);if(!this.Button.CloseIcon.ID)this.Button.CloseIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE;}else if(item.CloseIcon===null){this.Button.CloseIcon=null;}if(item.SettingIcon){this.Button.SettingIcon=CloneData(item.SettingIcon);if(!this.Button.SettingIcon.ID)this.Button.SettingIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING;}else if(item.SettingIcon===null){this.Button.SettingIcon=null;}}if(option.ExtendData)this.ExtendData=option.ExtendData;if(IFrameSplitOperator.IsNonEmptyArray(option.IsShowPriceText)){for(var i=0;i<option.IsShowPriceText.length&&i<3;++i){var value=option.IsShowPriceText[i];if(IFrameSplitOperator.IsBool(value))this.ShowPriceTextConfig.IsShow[i]=value;}}if(option.TextMargin){var item=option.TextMargin;if(IFrameSplitOperator.IsNumber(item.Left))this.TextMargin.Left=item.Left;if(IFrameSplitOperator.IsNumber(item.Right))this.TextMargin.Right=item.Right;}}};this.ExportStorageData=function(){var storageData;if(this.Super_ExportStorageData){storageData=this.Super_ExportStorageData();if(this.Label)storageData.Label=this.Label;}return storageData;};this.IsPointIn=this.IsPointIn_XYValue_Line;/*
|
|
6028
6030
|
this.GetXYCoordinate=function()
|
|
6029
6031
|
{
|
|
6030
6032
|
if (this.IsFrameMinSize()) return null;
|
|
@@ -13182,7 +13184,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
13182
13184
|
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);};}/********************************************************************************
|
|
13183
13185
|
* 版本信息输出
|
|
13184
13186
|
*
|
|
13185
|
-
*/var HQCHART_VERSION="1.1.
|
|
13187
|
+
*/var HQCHART_VERSION="1.1.13214";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n* HQChart Ver: '+HQCHART_VERSION+' \n* \n* License: Apache License 2.0 \n* Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
|
|
13186
13188
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
13187
13189
|
// BaseIndex:BaseIndex,
|
|
13188
13190
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -8011,19 +8011,27 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
8011
8011
|
{
|
|
8012
8012
|
this.ChartDrawPicture=[];
|
|
8013
8013
|
if (this.ChartDrawStorage) this.ChartDrawStorage.Clear();
|
|
8014
|
+
this.SelectChartDrawPicture=null;
|
|
8014
8015
|
|
|
8015
8016
|
if (option && option.Draw==false) bDraw=false;
|
|
8016
8017
|
if (bDraw) this.Draw();
|
|
8017
8018
|
}
|
|
8018
8019
|
else
|
|
8019
8020
|
{
|
|
8020
|
-
for(var i
|
|
8021
|
+
for(var i=0; i<this.ChartDrawPicture.length; ++i)
|
|
8021
8022
|
{
|
|
8022
|
-
|
|
8023
|
+
var item=this.ChartDrawPicture[i];
|
|
8024
|
+
if (item.Guid==drawPicture.Guid || item==drawPicture)
|
|
8023
8025
|
{
|
|
8024
8026
|
if (this.ChartDrawStorage) this.ChartDrawStorage.DeleteDrawData(drawPicture);
|
|
8025
8027
|
this.ChartDrawPicture.splice(i,1);
|
|
8026
8028
|
|
|
8029
|
+
if (this.SelectChartDrawPicture) //去掉选中
|
|
8030
|
+
{
|
|
8031
|
+
if (this.SelectChartDrawPicture.Guid==drawPicture.Guid || this.SelectChartDrawPicture==drawPicture)
|
|
8032
|
+
this.SelectChartDrawPicture=null;
|
|
8033
|
+
}
|
|
8034
|
+
|
|
8027
8035
|
if (option && option.Draw==false) bDraw=false;
|
|
8028
8036
|
if (bDraw) this.Draw();
|
|
8029
8037
|
}
|
|
@@ -8225,6 +8233,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
8225
8233
|
if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.Position)) frame.OverlayIndexType.Position=item.OverlayIndexType.Position;
|
|
8226
8234
|
if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.LineSpace)) frame.OverlayIndexType.LineSpace=item.OverlayIndexType.LineSpace;
|
|
8227
8235
|
}
|
|
8236
|
+
|
|
8237
|
+
if (IFrameSplitOperator.IsNonEmptyArray(item.CustomToolbar)) //自定义工具按钮
|
|
8238
|
+
{
|
|
8239
|
+
frame.CustomToolbar=item.CustomToolbar.slice();
|
|
8240
|
+
}
|
|
8228
8241
|
}
|
|
8229
8242
|
|
|
8230
8243
|
if (IFrameSplitOperator.IsNumber(option.SplitCount)) subFrame.Frame.YSplitOperator.SplitCount=option.SplitCount;
|
|
@@ -56127,10 +56140,25 @@ function ChartDrawHLine()
|
|
|
56127
56140
|
if (option.Button)
|
|
56128
56141
|
{
|
|
56129
56142
|
var item=option.Button;
|
|
56130
|
-
if (item.CloseIcon)
|
|
56131
|
-
|
|
56132
|
-
|
|
56133
|
-
|
|
56143
|
+
if (item.CloseIcon)
|
|
56144
|
+
{
|
|
56145
|
+
this.Button.CloseIcon=CloneData(item.CloseIcon);
|
|
56146
|
+
if (!this.Button.CloseIcon.ID) this.Button.CloseIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE;
|
|
56147
|
+
}
|
|
56148
|
+
else if (item.CloseIcon===null)
|
|
56149
|
+
{
|
|
56150
|
+
this.Button.CloseIcon=null;
|
|
56151
|
+
}
|
|
56152
|
+
|
|
56153
|
+
if (item.SettingIcon)
|
|
56154
|
+
{
|
|
56155
|
+
this.Button.SettingIcon=CloneData(item.SettingIcon);
|
|
56156
|
+
if (!this.Button.SettingIcon.ID) this.Button.SettingIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING;
|
|
56157
|
+
}
|
|
56158
|
+
else if (item.SettingIcon===null)
|
|
56159
|
+
{
|
|
56160
|
+
this.Button.SettingIcon=null;
|
|
56161
|
+
}
|
|
56134
56162
|
}
|
|
56135
56163
|
|
|
56136
56164
|
if (option.ExtendData) this.ExtendData=option.ExtendData;
|
|
@@ -11903,19 +11903,27 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11903
11903
|
{
|
|
11904
11904
|
this.ChartDrawPicture=[];
|
|
11905
11905
|
if (this.ChartDrawStorage) this.ChartDrawStorage.Clear();
|
|
11906
|
+
this.SelectChartDrawPicture=null;
|
|
11906
11907
|
|
|
11907
11908
|
if (option && option.Draw==false) bDraw=false;
|
|
11908
11909
|
if (bDraw) this.Draw();
|
|
11909
11910
|
}
|
|
11910
11911
|
else
|
|
11911
11912
|
{
|
|
11912
|
-
for(var i
|
|
11913
|
+
for(var i=0; i<this.ChartDrawPicture.length; ++i)
|
|
11913
11914
|
{
|
|
11914
|
-
|
|
11915
|
+
var item=this.ChartDrawPicture[i];
|
|
11916
|
+
if (item.Guid==drawPicture.Guid || item==drawPicture)
|
|
11915
11917
|
{
|
|
11916
11918
|
if (this.ChartDrawStorage) this.ChartDrawStorage.DeleteDrawData(drawPicture);
|
|
11917
11919
|
this.ChartDrawPicture.splice(i,1);
|
|
11918
11920
|
|
|
11921
|
+
if (this.SelectChartDrawPicture) //去掉选中
|
|
11922
|
+
{
|
|
11923
|
+
if (this.SelectChartDrawPicture.Guid==drawPicture.Guid || this.SelectChartDrawPicture==drawPicture)
|
|
11924
|
+
this.SelectChartDrawPicture=null;
|
|
11925
|
+
}
|
|
11926
|
+
|
|
11919
11927
|
if (option && option.Draw==false) bDraw=false;
|
|
11920
11928
|
if (bDraw) this.Draw();
|
|
11921
11929
|
}
|
|
@@ -12117,6 +12125,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
12117
12125
|
if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.Position)) frame.OverlayIndexType.Position=item.OverlayIndexType.Position;
|
|
12118
12126
|
if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.LineSpace)) frame.OverlayIndexType.LineSpace=item.OverlayIndexType.LineSpace;
|
|
12119
12127
|
}
|
|
12128
|
+
|
|
12129
|
+
if (IFrameSplitOperator.IsNonEmptyArray(item.CustomToolbar)) //自定义工具按钮
|
|
12130
|
+
{
|
|
12131
|
+
frame.CustomToolbar=item.CustomToolbar.slice();
|
|
12132
|
+
}
|
|
12120
12133
|
}
|
|
12121
12134
|
|
|
12122
12135
|
if (IFrameSplitOperator.IsNumber(option.SplitCount)) subFrame.Frame.YSplitOperator.SplitCount=option.SplitCount;
|
|
@@ -60019,10 +60032,25 @@ function ChartDrawHLine()
|
|
|
60019
60032
|
if (option.Button)
|
|
60020
60033
|
{
|
|
60021
60034
|
var item=option.Button;
|
|
60022
|
-
if (item.CloseIcon)
|
|
60023
|
-
|
|
60024
|
-
|
|
60025
|
-
|
|
60035
|
+
if (item.CloseIcon)
|
|
60036
|
+
{
|
|
60037
|
+
this.Button.CloseIcon=CloneData(item.CloseIcon);
|
|
60038
|
+
if (!this.Button.CloseIcon.ID) this.Button.CloseIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE;
|
|
60039
|
+
}
|
|
60040
|
+
else if (item.CloseIcon===null)
|
|
60041
|
+
{
|
|
60042
|
+
this.Button.CloseIcon=null;
|
|
60043
|
+
}
|
|
60044
|
+
|
|
60045
|
+
if (item.SettingIcon)
|
|
60046
|
+
{
|
|
60047
|
+
this.Button.SettingIcon=CloneData(item.SettingIcon);
|
|
60048
|
+
if (!this.Button.SettingIcon.ID) this.Button.SettingIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING;
|
|
60049
|
+
}
|
|
60050
|
+
else if (item.SettingIcon===null)
|
|
60051
|
+
{
|
|
60052
|
+
this.Button.SettingIcon=null;
|
|
60053
|
+
}
|
|
60026
60054
|
}
|
|
60027
60055
|
|
|
60028
60056
|
if (option.ExtendData) this.ExtendData=option.ExtendData;
|
|
@@ -131953,7 +131981,7 @@ function ScrollBarBGChart()
|
|
|
131953
131981
|
|
|
131954
131982
|
|
|
131955
131983
|
|
|
131956
|
-
var HQCHART_VERSION="1.1.
|
|
131984
|
+
var HQCHART_VERSION="1.1.13214";
|
|
131957
131985
|
|
|
131958
131986
|
function PrintHQChartVersion()
|
|
131959
131987
|
{
|
|
@@ -11947,19 +11947,27 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
11947
11947
|
{
|
|
11948
11948
|
this.ChartDrawPicture=[];
|
|
11949
11949
|
if (this.ChartDrawStorage) this.ChartDrawStorage.Clear();
|
|
11950
|
+
this.SelectChartDrawPicture=null;
|
|
11950
11951
|
|
|
11951
11952
|
if (option && option.Draw==false) bDraw=false;
|
|
11952
11953
|
if (bDraw) this.Draw();
|
|
11953
11954
|
}
|
|
11954
11955
|
else
|
|
11955
11956
|
{
|
|
11956
|
-
for(var i
|
|
11957
|
+
for(var i=0; i<this.ChartDrawPicture.length; ++i)
|
|
11957
11958
|
{
|
|
11958
|
-
|
|
11959
|
+
var item=this.ChartDrawPicture[i];
|
|
11960
|
+
if (item.Guid==drawPicture.Guid || item==drawPicture)
|
|
11959
11961
|
{
|
|
11960
11962
|
if (this.ChartDrawStorage) this.ChartDrawStorage.DeleteDrawData(drawPicture);
|
|
11961
11963
|
this.ChartDrawPicture.splice(i,1);
|
|
11962
11964
|
|
|
11965
|
+
if (this.SelectChartDrawPicture) //去掉选中
|
|
11966
|
+
{
|
|
11967
|
+
if (this.SelectChartDrawPicture.Guid==drawPicture.Guid || this.SelectChartDrawPicture==drawPicture)
|
|
11968
|
+
this.SelectChartDrawPicture=null;
|
|
11969
|
+
}
|
|
11970
|
+
|
|
11963
11971
|
if (option && option.Draw==false) bDraw=false;
|
|
11964
11972
|
if (bDraw) this.Draw();
|
|
11965
11973
|
}
|
|
@@ -12161,6 +12169,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
|
|
|
12161
12169
|
if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.Position)) frame.OverlayIndexType.Position=item.OverlayIndexType.Position;
|
|
12162
12170
|
if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.LineSpace)) frame.OverlayIndexType.LineSpace=item.OverlayIndexType.LineSpace;
|
|
12163
12171
|
}
|
|
12172
|
+
|
|
12173
|
+
if (IFrameSplitOperator.IsNonEmptyArray(item.CustomToolbar)) //自定义工具按钮
|
|
12174
|
+
{
|
|
12175
|
+
frame.CustomToolbar=item.CustomToolbar.slice();
|
|
12176
|
+
}
|
|
12164
12177
|
}
|
|
12165
12178
|
|
|
12166
12179
|
if (IFrameSplitOperator.IsNumber(option.SplitCount)) subFrame.Frame.YSplitOperator.SplitCount=option.SplitCount;
|
|
@@ -60063,10 +60076,25 @@ function ChartDrawHLine()
|
|
|
60063
60076
|
if (option.Button)
|
|
60064
60077
|
{
|
|
60065
60078
|
var item=option.Button;
|
|
60066
|
-
if (item.CloseIcon)
|
|
60067
|
-
|
|
60068
|
-
|
|
60069
|
-
|
|
60079
|
+
if (item.CloseIcon)
|
|
60080
|
+
{
|
|
60081
|
+
this.Button.CloseIcon=CloneData(item.CloseIcon);
|
|
60082
|
+
if (!this.Button.CloseIcon.ID) this.Button.CloseIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE;
|
|
60083
|
+
}
|
|
60084
|
+
else if (item.CloseIcon===null)
|
|
60085
|
+
{
|
|
60086
|
+
this.Button.CloseIcon=null;
|
|
60087
|
+
}
|
|
60088
|
+
|
|
60089
|
+
if (item.SettingIcon)
|
|
60090
|
+
{
|
|
60091
|
+
this.Button.SettingIcon=CloneData(item.SettingIcon);
|
|
60092
|
+
if (!this.Button.SettingIcon.ID) this.Button.SettingIcon.ID=JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING;
|
|
60093
|
+
}
|
|
60094
|
+
else if (item.SettingIcon===null)
|
|
60095
|
+
{
|
|
60096
|
+
this.Button.SettingIcon=null;
|
|
60097
|
+
}
|
|
60070
60098
|
}
|
|
60071
60099
|
|
|
60072
60100
|
if (option.ExtendData) this.ExtendData=option.ExtendData;
|
|
@@ -134866,7 +134894,7 @@ function HQChartScriptWorker()
|
|
|
134866
134894
|
|
|
134867
134895
|
|
|
134868
134896
|
|
|
134869
|
-
var HQCHART_VERSION="1.1.
|
|
134897
|
+
var HQCHART_VERSION="1.1.13214";
|
|
134870
134898
|
|
|
134871
134899
|
function PrintHQChartVersion()
|
|
134872
134900
|
{
|