hqchart 1.1.12939 → 1.1.12943
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
|
@@ -7344,8 +7344,8 @@ if(item.Script)//自定义指标脚本
|
|
|
7344
7344
|
{var apiItem=item.API;this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexID=item.Index;var indexItem=JSIndexMap.Get(indexID);if(indexItem){this.WindowIndex[i]=indexItem.Create();this.CreateWindowIndex(windowIndex);}else{var systemScript=new JSIndexScript();var indexInfo=systemScript.Get(indexID);if(indexInfo){JSIndexScript.ModifyAttribute(indexInfo,item);this.WindowIndex[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
|
|
7345
7345
|
}}}this.SetSubFrameAttribute(frame,item,frameItem);}//最后一个显示X轴坐标
|
|
7346
7346
|
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;}//叠加指标
|
|
7347
|
-
var aryOverlayIndex=[];if(IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex)){for(var i=0;i<option.OverlayIndex.length;++i){var item=option.OverlayIndex[i];if(item.Index)item.IndexName=item.Index;if(item.Windows>=0)item.WindowIndex=item.Windows;var overlay=this.CreateOverlayWindowsIndex(item);if(!overlay)continue;aryOverlayIndex.push(overlay);}}if(!bRefreshData){var bindData=this.ChartPaint[0].Data;for(var i=0;i<count;++i)//请求指标
|
|
7348
|
-
{this.BindIndexData(i,bindData);}for(var i=0;i<aryOverlayIndex.length;++i){var item=aryOverlayIndex[i];this.BindOverlayIndexData(item,item.
|
|
7347
|
+
var aryOverlayIndex=[];if(IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex)){for(var i=0;i<option.OverlayIndex.length;++i){var item=option.OverlayIndex[i];if(item.Index)item.IndexName=item.Index;if(item.Windows>=0)item.WindowIndex=item.Windows;var overlay=this.CreateOverlayWindowsIndex(item);if(!overlay)continue;aryOverlayIndex.push({WindowsIndex:item.WindowIndex,Overlay:overlay});}}if(!bRefreshData){var bindData=this.ChartPaint[0].Data;for(var i=0;i<count;++i)//请求指标
|
|
7348
|
+
{this.BindIndexData(i,bindData);}for(var i=0;i<aryOverlayIndex.length;++i){var item=aryOverlayIndex[i];this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);}this.UpdataDataoffset();//更新数据偏移
|
|
7349
7349
|
this.Frame.SetSizeChage(true);this.ResetFrameXYSplit();this.UpdateFrameMaxMin();//调整坐标最大 最小值
|
|
7350
7350
|
this.Draw();}else{if(!symbol)symbol=this.Symbol;var optionData={KLine:{}};if(IFrameSplitOperator.IsNumber(period))optionData.KLine.Period=period;if(IFrameSplitOperator.IsNumber(right))optionData.KLine.Right=right;this.ChangeSymbol(symbol,optionData);}};this.RemoveIndexWindow=function(id,option){JSConsole.Chart.Log('[KLineChartContainer::RemoveIndexWindow] remove id',id);if(id==0){if(option&&option.DeleteMainIndex)//删除指标
|
|
7351
7351
|
{this.DeleteIndexPaint(id);this.WindowIndex[id]=null;this.Frame.SetSizeChage(true);this.UpdateFrameMaxMin();this.ResetFrameXYSplit();this.Draw();}return;}if(!this.Frame.SubFrame)return;if(id>=this.Frame.SubFrame.length)return;this.Frame.RestoreIndexWindows();var delFrame=this.Frame.SubFrame[id].Frame;this.DeleteIndexPaint(id);this.Frame.SubFrame[id].Frame.ClearToolbar();var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DELETE_FRAME);if(event&&event.Callback){var sendData={SubFrame:this.Frame.SubFrame[id],WindowIndex:id};event.Callback(event,sendData,this);}this.Frame.SubFrame.splice(id,1);this.WindowIndex.splice(id,1);this.TitlePaint.splice(id+1,1);//删除对应的动态标题
|
|
@@ -7856,14 +7856,16 @@ for(var i=0;i<this.Frame.SubFrame.length;++i){var item=this.Frame.SubFrame[i].Fr
|
|
|
7856
7856
|
this.Draw();};this.ChangeIndexTemplate=function(option)//切换指标模板 可以设置指标窗口个数 每个窗口的指标, 只能从第3个指标窗口开始设置,前面2个指标窗口固定无法设置
|
|
7857
7857
|
{var _this32=this;if(!Array.isArray(option.Windows))return;var count=option.Windows.length;var currentLength=this.Frame.SubFrame.length;var startWindowIndex=2;count+=startWindowIndex;var dayCount=null;if(IFrameSplitOperator.IsNumber(option.DayCount)&&option.DayCount!=this.DayCount)dayCount=option.DayCount;//天数
|
|
7858
7858
|
var bRefreshData=dayCount!=null;//清空所有的指标图型
|
|
7859
|
-
for(var i=startWindowIndex;i<currentLength;++i){this.DeleteIndexPaint(i);var frame=this.Frame.SubFrame[i];frame.YSpecificMaxMin=null;frame.IsLocked=false;frame.YSplitScale=null;}if(currentLength>count){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DELETE_FRAME);for(var i=currentLength-1;i>=count;--i){this.Frame.SubFrame[i].Frame.ClearToolbar();if(event&&event.Callback){var sendData={SubFrame:this.Frame.SubFrame[i],WindowIndex:i};event.Callback(event,sendData,this);}}this.Frame.SubFrame.splice(count,currentLength-count);this.WindowIndex.splice(count,currentLength-count);}else{for(var i=currentLength;i<count;++i)//创建新的指标窗口
|
|
7859
|
+
for(var i=startWindowIndex;i<currentLength;++i){this.DeleteIndexPaint(i);var frame=this.Frame.SubFrame[i];frame.YSpecificMaxMin=null;frame.IsLocked=false;frame.YSplitScale=null;}if(currentLength>count){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DELETE_FRAME);for(var i=currentLength-1;i>=count;--i){this.Frame.SubFrame[i].Frame.ClearToolbar();if(event&&event.Callback){var sendData={SubFrame:this.Frame.SubFrame[i],WindowIndex:i};event.Callback(event,sendData,this);}}this.Frame.SubFrame.splice(count,currentLength-count);this.WindowIndex.splice(count,currentLength-count);this.TitlePaint.splice(count+1,currentLength-count);}else{for(var i=currentLength;i<count;++i)//创建新的指标窗口
|
|
7860
7860
|
{var subFrame=this.CreateSubFrameItem(i);this.Frame.SubFrame[i]=subFrame;var titlePaint=new DynamicChartTitlePainting();titlePaint.Frame=this.Frame.SubFrame[i].Frame;titlePaint.Canvas=this.Canvas;titlePaint.LanguageID=this.LanguageID;titlePaint.GetEventCallback=function(id){return _this32.GetEventCallback(id);};titlePaint.SelectedChart=this.SelectedChart;this.TitlePaint[i+1]=titlePaint;}}for(var i=0;i<count;++i){var windowIndex=i;var item=null,frameItem=null;if(option.Frame&&option.Frame.length>i)frameItem=option.Frame[windowIndex];if(windowIndex>=startWindowIndex)item=option.Windows[windowIndex-startWindowIndex];var titleIndex=windowIndex+1;this.TitlePaint[titleIndex].Data=[];this.TitlePaint[titleIndex].Title=null;if(item){if(item.Script)//自定义指标脚本
|
|
7861
7861
|
{this.WindowIndex[windowIndex]=new ScriptIndex(item.Name,item.Script,item.Args,item);//脚本执行
|
|
7862
7862
|
}else if(item.API)//后台指标
|
|
7863
7863
|
{var apiItem=item.API;this.WindowIndex[windowIndex]=new APIScriptIndex(apiItem.Name,apiItem.Script,apiItem.Args,item);}else{var indexID=item.Index;var indexItem=JSIndexMap.Get(indexID);if(indexItem){this.WindowIndex[windowIndex]=indexItem.Create();this.CreateWindowIndex(windowIndex);}else{var systemScript=new JSIndexScript();var indexInfo=systemScript.Get(indexID);if(indexInfo){JSIndexScript.ModifyAttribute(indexInfo,item);this.WindowIndex[windowIndex]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);//脚本执行
|
|
7864
|
-
}}}}this.SetSubFrameAttribute(this.Frame.SubFrame[windowIndex],item,frameItem);}
|
|
7865
|
-
for(var i=0;i<this.Frame.SubFrame.length;++i){
|
|
7866
|
-
|
|
7864
|
+
}}}}this.SetSubFrameAttribute(this.Frame.SubFrame[windowIndex],item,frameItem);}//清空叠加指标
|
|
7865
|
+
for(var i=0;i<this.Frame.SubFrame.length;++i){this.DeleteWindowsOverlayIndex(i);}//最后一个显示X轴坐标
|
|
7866
|
+
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;}//叠加指标
|
|
7867
|
+
var aryOverlayIndex=[];if(IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex)){for(var i=0;i<option.OverlayIndex.length;++i){var item=option.OverlayIndex[i];if(item.Index)item.IndexName=item.Index;if(item.Windows>=0)item.WindowIndex=item.Windows;var overlay=this.CreateOverlayWindowsIndex(item);if(!overlay)continue;aryOverlayIndex.push({WindowsIndex:item.WindowIndex,Overlay:overlay});}}if(!bRefreshData){var bindData=this.SourceData;for(var i=0;i<count;++i){this.BindIndexData(i,bindData);//执行脚本
|
|
7868
|
+
}for(var i=0;i<aryOverlayIndex.length;++i){var item=aryOverlayIndex[i];this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);}this.UpdataDataoffset();//更新数据偏移
|
|
7867
7869
|
this.Frame.SetSizeChage(true);if(this.UpdateXShowText)this.UpdateXShowText();this.ResetFrameXYSplit();this.UpdateFrameMaxMin();//调整坐标最大 最小值
|
|
7868
7870
|
this.Draw();}else{this.Frame.SetSizeChage(true);if(dayCount!=null)this.ChangeDayCount(dayCount);}};this.RemoveIndexWindow=function(id){JSConsole.Chart.Log('[MinuteChartContainer::RemoveIndexWindow] remove id',id);if(id<2)return;if(!this.Frame.SubFrame)return;if(id>=this.Frame.SubFrame.length)return;this.Frame.RestoreIndexWindows();var delFrame=this.Frame.SubFrame[id].Frame;this.DeleteIndexPaint(id);this.Frame.SubFrame[id].Frame.ClearToolbar();var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DELETE_FRAME);if(event&&event.Callback){var sendData={SubFrame:this.Frame.SubFrame[id],WindowIndex:id};event.Callback(event,sendData,this);}this.Frame.SubFrame.splice(id,1);this.WindowIndex.splice(id,1);this.TitlePaint.splice(id+1,1);//删除对应的动态标题
|
|
7869
7871
|
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;item.Identify=i;}/*
|
|
@@ -12808,7 +12810,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
|
|
|
12808
12810
|
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);};}/********************************************************************************
|
|
12809
12811
|
* 版本信息输出
|
|
12810
12812
|
*
|
|
12811
|
-
*/var HQCHART_VERSION="1.1.
|
|
12813
|
+
*/var HQCHART_VERSION="1.1.12942";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();//把给外界调用的方法暴露出来
|
|
12812
12814
|
exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
|
|
12813
12815
|
// BaseIndex:BaseIndex,
|
|
12814
12816
|
// ChartLine:ChartLine,
|
package/package.json
CHANGED
package/src/jscommon/umychart.js
CHANGED
|
@@ -68449,7 +68449,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
68449
68449
|
var overlay=this.CreateOverlayWindowsIndex(item);
|
|
68450
68450
|
if (!overlay) continue;
|
|
68451
68451
|
|
|
68452
|
-
aryOverlayIndex.push(overlay);
|
|
68452
|
+
aryOverlayIndex.push({ WindowsIndex:item.WindowIndex, Overlay:overlay });
|
|
68453
68453
|
}
|
|
68454
68454
|
}
|
|
68455
68455
|
|
|
@@ -68464,7 +68464,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
68464
68464
|
for(var i=0;i<aryOverlayIndex.length;++i)
|
|
68465
68465
|
{
|
|
68466
68466
|
var item=aryOverlayIndex[i];
|
|
68467
|
-
this.BindOverlayIndexData(item,item.
|
|
68467
|
+
this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);
|
|
68468
68468
|
}
|
|
68469
68469
|
|
|
68470
68470
|
this.UpdataDataoffset(); //更新数据偏移
|
|
@@ -73817,6 +73817,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
73817
73817
|
|
|
73818
73818
|
this.Frame.SubFrame.splice(count,currentLength-count);
|
|
73819
73819
|
this.WindowIndex.splice(count,currentLength-count);
|
|
73820
|
+
this.TitlePaint.splice(count+1,currentLength-count);
|
|
73820
73821
|
}
|
|
73821
73822
|
else
|
|
73822
73823
|
{
|
|
@@ -73834,8 +73835,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
73834
73835
|
}
|
|
73835
73836
|
}
|
|
73836
73837
|
|
|
73837
|
-
|
|
73838
|
-
|
|
73839
73838
|
for(var i=0;i<count;++i)
|
|
73840
73839
|
{
|
|
73841
73840
|
var windowIndex=i;
|
|
@@ -73883,6 +73882,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
73883
73882
|
this.SetSubFrameAttribute(this.Frame.SubFrame[windowIndex], item, frameItem);
|
|
73884
73883
|
}
|
|
73885
73884
|
|
|
73885
|
+
//清空叠加指标
|
|
73886
|
+
for(var i=0;i<this.Frame.SubFrame.length;++i)
|
|
73887
|
+
{
|
|
73888
|
+
this.DeleteWindowsOverlayIndex(i);
|
|
73889
|
+
}
|
|
73890
|
+
|
|
73886
73891
|
//最后一个显示X轴坐标
|
|
73887
73892
|
for(var i=0;i<this.Frame.SubFrame.length;++i)
|
|
73888
73893
|
{
|
|
@@ -73891,6 +73896,23 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
73891
73896
|
else item.XSplitOperator.ShowText=false;
|
|
73892
73897
|
}
|
|
73893
73898
|
|
|
73899
|
+
//叠加指标
|
|
73900
|
+
var aryOverlayIndex=[];
|
|
73901
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex))
|
|
73902
|
+
{
|
|
73903
|
+
for(var i=0;i<option.OverlayIndex.length;++i)
|
|
73904
|
+
{
|
|
73905
|
+
var item=option.OverlayIndex[i];
|
|
73906
|
+
if (item.Index) item.IndexName=item.Index;
|
|
73907
|
+
if (item.Windows>=0) item.WindowIndex=item.Windows;
|
|
73908
|
+
|
|
73909
|
+
var overlay=this.CreateOverlayWindowsIndex(item);
|
|
73910
|
+
if (!overlay) continue;
|
|
73911
|
+
|
|
73912
|
+
aryOverlayIndex.push({ WindowsIndex:item.WindowIndex, Overlay:overlay });
|
|
73913
|
+
}
|
|
73914
|
+
}
|
|
73915
|
+
|
|
73894
73916
|
if (!bRefreshData)
|
|
73895
73917
|
{
|
|
73896
73918
|
var bindData=this.SourceData;
|
|
@@ -73898,6 +73920,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
73898
73920
|
{
|
|
73899
73921
|
this.BindIndexData(i,bindData); //执行脚本
|
|
73900
73922
|
}
|
|
73923
|
+
|
|
73924
|
+
for(var i=0;i<aryOverlayIndex.length;++i)
|
|
73925
|
+
{
|
|
73926
|
+
var item=aryOverlayIndex[i];
|
|
73927
|
+
this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);
|
|
73928
|
+
}
|
|
73929
|
+
|
|
73901
73930
|
this.UpdataDataoffset(); //更新数据偏移
|
|
73902
73931
|
this.Frame.SetSizeChage(true);
|
|
73903
73932
|
if (this.UpdateXShowText) this.UpdateXShowText();
|
|
@@ -72641,7 +72641,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
72641
72641
|
var overlay=this.CreateOverlayWindowsIndex(item);
|
|
72642
72642
|
if (!overlay) continue;
|
|
72643
72643
|
|
|
72644
|
-
aryOverlayIndex.push(overlay);
|
|
72644
|
+
aryOverlayIndex.push({ WindowsIndex:item.WindowIndex, Overlay:overlay });
|
|
72645
72645
|
}
|
|
72646
72646
|
}
|
|
72647
72647
|
|
|
@@ -72656,7 +72656,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
72656
72656
|
for(var i=0;i<aryOverlayIndex.length;++i)
|
|
72657
72657
|
{
|
|
72658
72658
|
var item=aryOverlayIndex[i];
|
|
72659
|
-
this.BindOverlayIndexData(item,item.
|
|
72659
|
+
this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);
|
|
72660
72660
|
}
|
|
72661
72661
|
|
|
72662
72662
|
this.UpdataDataoffset(); //更新数据偏移
|
|
@@ -78009,6 +78009,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78009
78009
|
|
|
78010
78010
|
this.Frame.SubFrame.splice(count,currentLength-count);
|
|
78011
78011
|
this.WindowIndex.splice(count,currentLength-count);
|
|
78012
|
+
this.TitlePaint.splice(count+1,currentLength-count);
|
|
78012
78013
|
}
|
|
78013
78014
|
else
|
|
78014
78015
|
{
|
|
@@ -78026,8 +78027,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78026
78027
|
}
|
|
78027
78028
|
}
|
|
78028
78029
|
|
|
78029
|
-
|
|
78030
|
-
|
|
78031
78030
|
for(var i=0;i<count;++i)
|
|
78032
78031
|
{
|
|
78033
78032
|
var windowIndex=i;
|
|
@@ -78075,6 +78074,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78075
78074
|
this.SetSubFrameAttribute(this.Frame.SubFrame[windowIndex], item, frameItem);
|
|
78076
78075
|
}
|
|
78077
78076
|
|
|
78077
|
+
//清空叠加指标
|
|
78078
|
+
for(var i=0;i<this.Frame.SubFrame.length;++i)
|
|
78079
|
+
{
|
|
78080
|
+
this.DeleteWindowsOverlayIndex(i);
|
|
78081
|
+
}
|
|
78082
|
+
|
|
78078
78083
|
//最后一个显示X轴坐标
|
|
78079
78084
|
for(var i=0;i<this.Frame.SubFrame.length;++i)
|
|
78080
78085
|
{
|
|
@@ -78083,6 +78088,23 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78083
78088
|
else item.XSplitOperator.ShowText=false;
|
|
78084
78089
|
}
|
|
78085
78090
|
|
|
78091
|
+
//叠加指标
|
|
78092
|
+
var aryOverlayIndex=[];
|
|
78093
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex))
|
|
78094
|
+
{
|
|
78095
|
+
for(var i=0;i<option.OverlayIndex.length;++i)
|
|
78096
|
+
{
|
|
78097
|
+
var item=option.OverlayIndex[i];
|
|
78098
|
+
if (item.Index) item.IndexName=item.Index;
|
|
78099
|
+
if (item.Windows>=0) item.WindowIndex=item.Windows;
|
|
78100
|
+
|
|
78101
|
+
var overlay=this.CreateOverlayWindowsIndex(item);
|
|
78102
|
+
if (!overlay) continue;
|
|
78103
|
+
|
|
78104
|
+
aryOverlayIndex.push({ WindowsIndex:item.WindowIndex, Overlay:overlay });
|
|
78105
|
+
}
|
|
78106
|
+
}
|
|
78107
|
+
|
|
78086
78108
|
if (!bRefreshData)
|
|
78087
78109
|
{
|
|
78088
78110
|
var bindData=this.SourceData;
|
|
@@ -78090,6 +78112,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78090
78112
|
{
|
|
78091
78113
|
this.BindIndexData(i,bindData); //执行脚本
|
|
78092
78114
|
}
|
|
78115
|
+
|
|
78116
|
+
for(var i=0;i<aryOverlayIndex.length;++i)
|
|
78117
|
+
{
|
|
78118
|
+
var item=aryOverlayIndex[i];
|
|
78119
|
+
this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);
|
|
78120
|
+
}
|
|
78121
|
+
|
|
78093
78122
|
this.UpdataDataoffset(); //更新数据偏移
|
|
78094
78123
|
this.Frame.SetSizeChage(true);
|
|
78095
78124
|
if (this.UpdateXShowText) this.UpdateXShowText();
|
|
@@ -129356,7 +129385,7 @@ function ScrollBarBGChart()
|
|
|
129356
129385
|
|
|
129357
129386
|
|
|
129358
129387
|
|
|
129359
|
-
var HQCHART_VERSION="1.1.
|
|
129388
|
+
var HQCHART_VERSION="1.1.12942";
|
|
129360
129389
|
|
|
129361
129390
|
function PrintHQChartVersion()
|
|
129362
129391
|
{
|
|
@@ -72685,7 +72685,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
72685
72685
|
var overlay=this.CreateOverlayWindowsIndex(item);
|
|
72686
72686
|
if (!overlay) continue;
|
|
72687
72687
|
|
|
72688
|
-
aryOverlayIndex.push(overlay);
|
|
72688
|
+
aryOverlayIndex.push({ WindowsIndex:item.WindowIndex, Overlay:overlay });
|
|
72689
72689
|
}
|
|
72690
72690
|
}
|
|
72691
72691
|
|
|
@@ -72700,7 +72700,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
|
|
|
72700
72700
|
for(var i=0;i<aryOverlayIndex.length;++i)
|
|
72701
72701
|
{
|
|
72702
72702
|
var item=aryOverlayIndex[i];
|
|
72703
|
-
this.BindOverlayIndexData(item,item.
|
|
72703
|
+
this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);
|
|
72704
72704
|
}
|
|
72705
72705
|
|
|
72706
72706
|
this.UpdataDataoffset(); //更新数据偏移
|
|
@@ -78053,6 +78053,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78053
78053
|
|
|
78054
78054
|
this.Frame.SubFrame.splice(count,currentLength-count);
|
|
78055
78055
|
this.WindowIndex.splice(count,currentLength-count);
|
|
78056
|
+
this.TitlePaint.splice(count+1,currentLength-count);
|
|
78056
78057
|
}
|
|
78057
78058
|
else
|
|
78058
78059
|
{
|
|
@@ -78070,8 +78071,6 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78070
78071
|
}
|
|
78071
78072
|
}
|
|
78072
78073
|
|
|
78073
|
-
|
|
78074
|
-
|
|
78075
78074
|
for(var i=0;i<count;++i)
|
|
78076
78075
|
{
|
|
78077
78076
|
var windowIndex=i;
|
|
@@ -78119,6 +78118,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78119
78118
|
this.SetSubFrameAttribute(this.Frame.SubFrame[windowIndex], item, frameItem);
|
|
78120
78119
|
}
|
|
78121
78120
|
|
|
78121
|
+
//清空叠加指标
|
|
78122
|
+
for(var i=0;i<this.Frame.SubFrame.length;++i)
|
|
78123
|
+
{
|
|
78124
|
+
this.DeleteWindowsOverlayIndex(i);
|
|
78125
|
+
}
|
|
78126
|
+
|
|
78122
78127
|
//最后一个显示X轴坐标
|
|
78123
78128
|
for(var i=0;i<this.Frame.SubFrame.length;++i)
|
|
78124
78129
|
{
|
|
@@ -78127,6 +78132,23 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78127
78132
|
else item.XSplitOperator.ShowText=false;
|
|
78128
78133
|
}
|
|
78129
78134
|
|
|
78135
|
+
//叠加指标
|
|
78136
|
+
var aryOverlayIndex=[];
|
|
78137
|
+
if (IFrameSplitOperator.IsNonEmptyArray(option.OverlayIndex))
|
|
78138
|
+
{
|
|
78139
|
+
for(var i=0;i<option.OverlayIndex.length;++i)
|
|
78140
|
+
{
|
|
78141
|
+
var item=option.OverlayIndex[i];
|
|
78142
|
+
if (item.Index) item.IndexName=item.Index;
|
|
78143
|
+
if (item.Windows>=0) item.WindowIndex=item.Windows;
|
|
78144
|
+
|
|
78145
|
+
var overlay=this.CreateOverlayWindowsIndex(item);
|
|
78146
|
+
if (!overlay) continue;
|
|
78147
|
+
|
|
78148
|
+
aryOverlayIndex.push({ WindowsIndex:item.WindowIndex, Overlay:overlay });
|
|
78149
|
+
}
|
|
78150
|
+
}
|
|
78151
|
+
|
|
78130
78152
|
if (!bRefreshData)
|
|
78131
78153
|
{
|
|
78132
78154
|
var bindData=this.SourceData;
|
|
@@ -78134,6 +78156,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
|
|
|
78134
78156
|
{
|
|
78135
78157
|
this.BindIndexData(i,bindData); //执行脚本
|
|
78136
78158
|
}
|
|
78159
|
+
|
|
78160
|
+
for(var i=0;i<aryOverlayIndex.length;++i)
|
|
78161
|
+
{
|
|
78162
|
+
var item=aryOverlayIndex[i];
|
|
78163
|
+
this.BindOverlayIndexData(item.Overlay,item.WindowsIndex,bindData);
|
|
78164
|
+
}
|
|
78165
|
+
|
|
78137
78166
|
this.UpdataDataoffset(); //更新数据偏移
|
|
78138
78167
|
this.Frame.SetSizeChage(true);
|
|
78139
78168
|
if (this.UpdateXShowText) this.UpdateXShowText();
|
|
@@ -129514,7 +129543,7 @@ function HQChartScriptWorker()
|
|
|
129514
129543
|
|
|
129515
129544
|
|
|
129516
129545
|
|
|
129517
|
-
var HQCHART_VERSION="1.1.
|
|
129546
|
+
var HQCHART_VERSION="1.1.12942";
|
|
129518
129547
|
|
|
129519
129548
|
function PrintHQChartVersion()
|
|
129520
129549
|
{
|