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

ver 7170

7170 ChangeIndex() 分时图修正没有设置格式
7169 ChangeIndex() 增肌option参数,用来设置额外的设置
上级 2918b56c
......@@ -892,10 +892,10 @@ function JSChart(divElement)
}
//K线切换指标
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndex)=='function')
this.JSChartContainer.ChangeIndex(windowIndex,indexName);
this.JSChartContainer.ChangeIndex(windowIndex,indexName,option);
}
this.ChangeScriptIndex=function(windowIndex,indexData)
......@@ -22308,7 +22308,7 @@ function KLineChartContainer(uielement)
}
//切换指标 指定切换窗口指标
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
var indexItem=JSIndexMap.Get(indexName);
if (!indexItem)
......@@ -22330,8 +22330,14 @@ function KLineChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空
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;
}
return this.ChangeScriptIndex(windowIndex, indexData);
}
......@@ -25011,7 +25017,7 @@ function MinuteChartContainer(uielement)
this.Draw();
}
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
if (this.Frame.SubFrame.length<3) return;
......@@ -25027,8 +25033,14 @@ function MinuteChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空
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;
}
return this.ChangeScriptIndex(windowIndex, indexData);
}
......@@ -892,10 +892,10 @@ function JSChart(divElement)
}
//K线切换指标
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndex)=='function')
this.JSChartContainer.ChangeIndex(windowIndex,indexName);
this.JSChartContainer.ChangeIndex(windowIndex,indexName,option);
}
this.ChangeScriptIndex=function(windowIndex,indexData)
......@@ -22308,7 +22308,7 @@ function KLineChartContainer(uielement)
}
//切换指标 指定切换窗口指标
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
var indexItem=JSIndexMap.Get(indexName);
if (!indexItem)
......@@ -22330,8 +22330,14 @@ function KLineChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空
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;
}
return this.ChangeScriptIndex(windowIndex, indexData);
}
......@@ -25011,7 +25017,7 @@ function MinuteChartContainer(uielement)
this.Draw();
}
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
if (this.Frame.SubFrame.length<3) return;
......@@ -25027,8 +25033,14 @@ function MinuteChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空
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;
}
return this.ChangeScriptIndex(windowIndex, indexData);
}
......@@ -892,10 +892,10 @@ function JSChart(divElement)
}
//K线切换指标
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
if (this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndex)=='function')
this.JSChartContainer.ChangeIndex(windowIndex,indexName);
this.JSChartContainer.ChangeIndex(windowIndex,indexName,option);
}
this.ChangeScriptIndex=function(windowIndex,indexData)
......@@ -22308,7 +22308,7 @@ function KLineChartContainer(uielement)
}
//切换指标 指定切换窗口指标
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
var indexItem=JSIndexMap.Get(indexName);
if (!indexItem)
......@@ -22330,8 +22330,14 @@ function KLineChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空
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;
}
return this.ChangeScriptIndex(windowIndex, indexData);
}
......@@ -25011,7 +25017,7 @@ function MinuteChartContainer(uielement)
this.Draw();
}
this.ChangeIndex=function(windowIndex,indexName)
this.ChangeIndex=function(windowIndex,indexName,option)
{
if (this.Frame.SubFrame.length<3) return;
......@@ -25027,8 +25033,14 @@ function MinuteChartContainer(uielement)
Name:indexInfo.Name, Script:indexInfo.Script, Args: indexInfo.Args, ID:indexName ,
//扩展属性 可以是空
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;
}
return this.ChangeScriptIndex(windowIndex, indexData);
}
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册