From da624ddfde408b09c1f18f3acfd97e7500135813 Mon Sep 17 00:00:00 2001 From: jones2000 Date: Wed, 16 Oct 2019 22:33:28 +0800 Subject: [PATCH] ver 7172 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 7171 ChangeIndex（） 增加指标参数变量设置 --- umychart_uniapp_h5/umychart.uniapp.h5.js | 26 ++++++++++++++----- vuehqchart/src/jscommon/umychart.js | 2 ++ .../src/jscommon/umychart.vue/umychart.vue.js | 26 ++++++++++++++----- webhqchart.demo/jscommon/umychart.js | 2 ++ webhqchart/umychart.js | 2 ++ 5 files changed, 46 insertions(+), 12 deletions(-) diff --git a/umychart_uniapp_h5/umychart.uniapp.h5.js b/umychart_uniapp_h5/umychart.uniapp.h5.js index 6a37241..6c385af 100644 --- a/umychart_uniapp_h5/umychart.uniapp.h5.js +++ b/umychart_uniapp_h5/umychart.uniapp.h5.js @@ -4210,10 +4210,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) @@ -25626,7 +25626,7 @@ function KLineChartContainer(uielement) } //切换指标 指定切换窗口指标 - this.ChangeIndex=function(windowIndex,indexName) + this.ChangeIndex=function(windowIndex,indexName,option) { var indexItem=JSIndexMap.Get(indexName); if (!indexItem) @@ -25648,8 +25648,15 @@ 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; + if (option.Args) indexData.Args=option.Args; + } return this.ChangeScriptIndex(windowIndex, indexData); } @@ -28329,7 +28336,7 @@ function MinuteChartContainer(uielement) this.Draw(); } - this.ChangeIndex=function(windowIndex,indexName) + this.ChangeIndex=function(windowIndex,indexName,option) { if (this.Frame.SubFrame.length<3) return; @@ -28345,8 +28352,15 @@ 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; + if (option.Args) indexData.Args=option.Args; + } return this.ChangeScriptIndex(windowIndex, indexData); } diff --git a/vuehqchart/src/jscommon/umychart.js b/vuehqchart/src/jscommon/umychart.js index 91f35fe..f6512be 100644 --- a/vuehqchart/src/jscommon/umychart.js +++ b/vuehqchart/src/jscommon/umychart.js @@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement) { 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); @@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement) { 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); diff --git a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js index 35b5023..14f64d9 100644 --- a/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js +++ b/vuehqchart/src/jscommon/umychart.vue/umychart.vue.js @@ -4251,10 +4251,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) @@ -25667,7 +25667,7 @@ function KLineChartContainer(uielement) } //切换指标 指定切换窗口指标 - this.ChangeIndex=function(windowIndex,indexName) + this.ChangeIndex=function(windowIndex,indexName,option) { var indexItem=JSIndexMap.Get(indexName); if (!indexItem) @@ -25689,8 +25689,15 @@ 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; + if (option.Args) indexData.Args=option.Args; + } return this.ChangeScriptIndex(windowIndex, indexData); } @@ -28370,7 +28377,7 @@ function MinuteChartContainer(uielement) this.Draw(); } - this.ChangeIndex=function(windowIndex,indexName) + this.ChangeIndex=function(windowIndex,indexName,option) { if (this.Frame.SubFrame.length<3) return; @@ -28386,8 +28393,15 @@ 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; + if (option.Args) indexData.Args=option.Args; + } return this.ChangeScriptIndex(windowIndex, indexData); } diff --git a/webhqchart.demo/jscommon/umychart.js b/webhqchart.demo/jscommon/umychart.js index 91f35fe..f6512be 100644 --- a/webhqchart.demo/jscommon/umychart.js +++ b/webhqchart.demo/jscommon/umychart.js @@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement) { 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); @@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement) { 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); diff --git a/webhqchart/umychart.js b/webhqchart/umychart.js index 91f35fe..f6512be 100644 --- a/webhqchart/umychart.js +++ b/webhqchart/umychart.js @@ -22337,6 +22337,7 @@ function KLineChartContainer(uielement) { 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); @@ -25040,6 +25041,7 @@ function MinuteChartContainer(uielement) { 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); -- GitLab