提交 da624ddf 编写于 作者: HQChart's avatar HQChart

ver 7172

7171 ChangeIndex() 增加指标参数变量设置
上级 ba7d29d0
...@@ -4210,10 +4210,10 @@ function JSChart(divElement) ...@@ -4210,10 +4210,10 @@ function JSChart(divElement)
} }
//K线切换指标 //K线切换指标
this.ChangeIndex=function(windowIndex,indexName) this.ChangeIndex=function(windowIndex,indexName,option)
{ {
if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndex)=='function') if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndex)=='function')
this.JSChartContainer.ChangeIndex(windowIndex,indexName); this.JSChartContainer.ChangeIndex(windowIndex,indexName,option);
} }
this.ChangeScriptIndex=function(windowIndex,indexData) this.ChangeScriptIndex=function(windowIndex,indexData)
...@@ -25626,7 +25626,7 @@ function KLineChartContainer(uielement) ...@@ -25626,7 +25626,7 @@ function KLineChartContainer(uielement)
} }
//切换指标 指定切换窗口指标 //切换指标 指定切换窗口指标
this.ChangeIndex=function(windowIndex,indexName) this.ChangeIndex=function(windowIndex,indexName,option)
{ {
var indexItem=JSIndexMap.Get(indexName); var indexItem=JSIndexMap.Get(indexName);
if (!indexItem) if (!indexItem)
...@@ -25648,8 +25648,15 @@ function KLineChartContainer(uielement) ...@@ -25648,8 +25648,15 @@ function KLineChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName , Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空 //扩展属性 可以是空
KLineType:indexInfo.KLineType, YSpecificMaxMin:indexInfo.YSpecificMaxMin, YSplitScale:indexInfo.YSplitScale, KLineType:indexInfo.KLineType, YSpecificMaxMin:indexInfo.YSpecificMaxMin, YSplitScale:indexInfo.YSplitScale,
FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition, StringFormat:indexInfo.StringFormat
}; };
if (option)
{
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
}
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
} }
...@@ -28329,7 +28336,7 @@ function MinuteChartContainer(uielement) ...@@ -28329,7 +28336,7 @@ function MinuteChartContainer(uielement)
this.Draw(); this.Draw();
} }
this.ChangeIndex=function(windowIndex,indexName) this.ChangeIndex=function(windowIndex,indexName,option)
{ {
if (this.Frame.SubFrame.length<3) return; if (this.Frame.SubFrame.length<3) return;
...@@ -28345,8 +28352,15 @@ function MinuteChartContainer(uielement) ...@@ -28345,8 +28352,15 @@ function MinuteChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName , Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空 //扩展属性 可以是空
KLineType:indexInfo.KLineType, YSpecificMaxMin:indexInfo.YSpecificMaxMin, YSplitScale:indexInfo.YSplitScale, KLineType:indexInfo.KLineType, YSpecificMaxMin:indexInfo.YSpecificMaxMin, YSplitScale:indexInfo.YSplitScale,
FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition,StringFormat:indexInfo.StringFormat
}; };
if (option)
{
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
}
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
} }
...@@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement) ...@@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement)
{ {
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision; if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat; if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
} }
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
...@@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement) ...@@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement)
{ {
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision; if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat; if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
} }
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
...@@ -4251,10 +4251,10 @@ function JSChart(divElement) ...@@ -4251,10 +4251,10 @@ function JSChart(divElement)
} }
//K线切换指标 //K线切换指标
this.ChangeIndex=function(windowIndex,indexName) this.ChangeIndex=function(windowIndex,indexName,option)
{ {
if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndex)=='function') if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndex)=='function')
this.JSChartContainer.ChangeIndex(windowIndex,indexName); this.JSChartContainer.ChangeIndex(windowIndex,indexName,option);
} }
this.ChangeScriptIndex=function(windowIndex,indexData) this.ChangeScriptIndex=function(windowIndex,indexData)
...@@ -25667,7 +25667,7 @@ function KLineChartContainer(uielement) ...@@ -25667,7 +25667,7 @@ function KLineChartContainer(uielement)
} }
//切换指标 指定切换窗口指标 //切换指标 指定切换窗口指标
this.ChangeIndex=function(windowIndex,indexName) this.ChangeIndex=function(windowIndex,indexName,option)
{ {
var indexItem=JSIndexMap.Get(indexName); var indexItem=JSIndexMap.Get(indexName);
if (!indexItem) if (!indexItem)
...@@ -25689,8 +25689,15 @@ function KLineChartContainer(uielement) ...@@ -25689,8 +25689,15 @@ function KLineChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName , Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空 //扩展属性 可以是空
KLineType:indexInfo.KLineType, YSpecificMaxMin:indexInfo.YSpecificMaxMin, YSplitScale:indexInfo.YSplitScale, KLineType:indexInfo.KLineType, YSpecificMaxMin:indexInfo.YSpecificMaxMin, YSplitScale:indexInfo.YSplitScale,
FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition, StringFormat:indexInfo.StringFormat
}; };
if (option)
{
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
}
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
} }
...@@ -28370,7 +28377,7 @@ function MinuteChartContainer(uielement) ...@@ -28370,7 +28377,7 @@ function MinuteChartContainer(uielement)
this.Draw(); this.Draw();
} }
this.ChangeIndex=function(windowIndex,indexName) this.ChangeIndex=function(windowIndex,indexName,option)
{ {
if (this.Frame.SubFrame.length<3) return; if (this.Frame.SubFrame.length<3) return;
...@@ -28386,8 +28393,15 @@ function MinuteChartContainer(uielement) ...@@ -28386,8 +28393,15 @@ function MinuteChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName , Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空 //扩展属性 可以是空
KLineType:indexInfo.KLineType, YSpecificMaxMin:indexInfo.YSpecificMaxMin, YSplitScale:indexInfo.YSplitScale, KLineType:indexInfo.KLineType, YSpecificMaxMin:indexInfo.YSpecificMaxMin, YSplitScale:indexInfo.YSplitScale,
FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition,StringFormat:indexInfo.StringFormat
}; };
if (option)
{
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
}
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
} }
...@@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement) ...@@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement)
{ {
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision; if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat; if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
} }
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
...@@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement) ...@@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement)
{ {
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision; if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat; if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
} }
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
...@@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement) ...@@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement)
{ {
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision; if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat; if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
} }
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
...@@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement) ...@@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement)
{ {
if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision; if (option.FloatPrecision>=0) indexData.FloatPrecision=option.FloatPrecision;
if (option.StringFormat>0) indexData.StringFormat=option.StringFormat; if (option.StringFormat>0) indexData.StringFormat=option.StringFormat;
if (option.Args) indexData.Args=option.Args;
} }
return this.ChangeScriptIndex(windowIndex, indexData); return this.ChangeScriptIndex(windowIndex, indexData);
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册