ver 8710

8709 ChangeIndexWindowCount() 增加指定新增窗口默认指标设置

umychart_uniapp_h5/umychart.uniapp.h5.js

@@ -4810,9 +4810,11 @@ function JSChart(divElement)
     }
 	
 	//指标窗口个数
-    this.ChangeIndexWindowCount = function(count){
-        if(this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndexWindowCount) == 'function'){
-            this.JSChartContainer.ChangeIndexWindowCount(count);
+    this.ChangeIndexWindowCount = function(count, option)
+    {
+        if(this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndexWindowCount) == 'function')
+        {
+            this.JSChartContainer.ChangeIndexWindowCount(count,option);
         }
     }
 	
@@ -32689,7 +32691,7 @@ function KLineChartContainer(uielement)
     }
 
     //设置指标窗口个数
-    this.ChangeIndexWindowCount=function(count)
+    this.ChangeIndexWindowCount=function(count,option)
     {
         if (count<=0) return;
         if (this.Frame.SubFrame.length==count) return;
@@ -32729,13 +32731,27 @@ function KLineChartContainer(uielement)
             }
 
             //创建指标
-            const indexName=["RSI","MACD","VOL","UOS","CHO","BRAR"];
+            var indexName= [ {Index:"RSI"}, {Index:"MACD"}, {Index:"VOL"}, {Index:"UOS"}, {Index:"CHO"}, {Index:"BRAR"} ];  //增加的指标名字
+            if (option && option.Windows.length>0)
+                indexName=option.Windows;   //外部设置增加窗口的默认指标
+
             let scriptData = new JSIndexScript();
             for(var i=currentLength;i<count;++i)
             {
-                var name=indexName[i%indexName.length];
+                var item=indexName[i%indexName.length];
+                var name=item.Index;
                 let indexInfo = scriptData.Get(name);
-                this.WindowIndex[i] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo);    //脚本执行
+                var args=indexInfo.Args;
+                if (item.Args) args=item.Args;
+                let indexData = 
+                { 
+                    Name:indexInfo.Name, Script:indexInfo.Script, Args: args, ID:item.Index,
+                    //扩展属性 可以是空
+                    KLineType:indexInfo.KLineType,  YSpecificMaxMin:indexInfo.YSpecificMaxMin,  YSplitScale:indexInfo.YSplitScale,
+                    FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition
+                };
+    
+                this.WindowIndex[i]=new ScriptIndex(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
                 var bindData=this.ChartPaint[0].Data;
                 this.BindIndexData(i,bindData);   //执行脚本
             }

vuehqchart/src/jscommon/umychart.js

@@ -1135,9 +1135,11 @@ function JSChart(divElement)
     }
 	
 	//指标窗口个数
-    this.ChangeIndexWindowCount = function(count){
-        if(this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndexWindowCount) == 'function'){
-            this.JSChartContainer.ChangeIndexWindowCount(count);
+    this.ChangeIndexWindowCount = function(count, option)
+    {
+        if(this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndexWindowCount) == 'function')
+        {
+            this.JSChartContainer.ChangeIndexWindowCount(count,option);
         }
     }
 	
@@ -29014,7 +29016,7 @@ function KLineChartContainer(uielement)
     }
 
     //设置指标窗口个数
-    this.ChangeIndexWindowCount=function(count)
+    this.ChangeIndexWindowCount=function(count,option)
     {
         if (count<=0) return;
         if (this.Frame.SubFrame.length==count) return;
@@ -29054,13 +29056,27 @@ function KLineChartContainer(uielement)
             }
 
             //创建指标
-            const indexName=["RSI","MACD","VOL","UOS","CHO","BRAR"];
+            var indexName= [ {Index:"RSI"}, {Index:"MACD"}, {Index:"VOL"}, {Index:"UOS"}, {Index:"CHO"}, {Index:"BRAR"} ];  //增加的指标名字
+            if (option && option.Windows.length>0)
+                indexName=option.Windows;   //外部设置增加窗口的默认指标
+
             let scriptData = new JSIndexScript();
             for(var i=currentLength;i<count;++i)
             {
-                var name=indexName[i%indexName.length];
+                var item=indexName[i%indexName.length];
+                var name=item.Index;
                 let indexInfo = scriptData.Get(name);
-                this.WindowIndex[i] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo);    //脚本执行
+                var args=indexInfo.Args;
+                if (item.Args) args=item.Args;
+                let indexData = 
+                { 
+                    Name:indexInfo.Name, Script:indexInfo.Script, Args: args, ID:item.Index,
+                    //扩展属性 可以是空
+                    KLineType:indexInfo.KLineType,  YSpecificMaxMin:indexInfo.YSpecificMaxMin,  YSplitScale:indexInfo.YSplitScale,
+                    FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition
+                };
+    
+                this.WindowIndex[i]=new ScriptIndex(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
                 var bindData=this.ChartPaint[0].Data;
                 this.BindIndexData(i,bindData);   //执行脚本
             }

vuehqchart/src/jscommon/umychart.vue/umychart.vue.js

@@ -4854,9 +4854,11 @@ function JSChart(divElement)
     }
 	
 	//指标窗口个数
-    this.ChangeIndexWindowCount = function(count){
-        if(this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndexWindowCount) == 'function'){
-            this.JSChartContainer.ChangeIndexWindowCount(count);
+    this.ChangeIndexWindowCount = function(count, option)
+    {
+        if(this.JSChartContainer && typeof(this.JSChartContainer.ChangeIndexWindowCount) == 'function')
+        {
+            this.JSChartContainer.ChangeIndexWindowCount(count,option);
         }
     }
 	
@@ -32733,7 +32735,7 @@ function KLineChartContainer(uielement)
     }
 
     //设置指标窗口个数
-    this.ChangeIndexWindowCount=function(count)
+    this.ChangeIndexWindowCount=function(count,option)
     {
         if (count<=0) return;
         if (this.Frame.SubFrame.length==count) return;
@@ -32773,13 +32775,27 @@ function KLineChartContainer(uielement)
             }
 
             //创建指标
-            const indexName=["RSI","MACD","VOL","UOS","CHO","BRAR"];
+            var indexName= [ {Index:"RSI"}, {Index:"MACD"}, {Index:"VOL"}, {Index:"UOS"}, {Index:"CHO"}, {Index:"BRAR"} ];  //增加的指标名字
+            if (option && option.Windows.length>0)
+                indexName=option.Windows;   //外部设置增加窗口的默认指标
+
             let scriptData = new JSIndexScript();
             for(var i=currentLength;i<count;++i)
             {
-                var name=indexName[i%indexName.length];
+                var item=indexName[i%indexName.length];
+                var name=item.Index;
                 let indexInfo = scriptData.Get(name);
-                this.WindowIndex[i] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo);    //脚本执行
+                var args=indexInfo.Args;
+                if (item.Args) args=item.Args;
+                let indexData = 
+                { 
+                    Name:indexInfo.Name, Script:indexInfo.Script, Args: args, ID:item.Index,
+                    //扩展属性 可以是空
+                    KLineType:indexInfo.KLineType,  YSpecificMaxMin:indexInfo.YSpecificMaxMin,  YSplitScale:indexInfo.YSplitScale,
+                    FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition
+                };
+    
+                this.WindowIndex[i]=new ScriptIndex(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
                 var bindData=this.ChartPaint[0].Data;
                 this.BindIndexData(i,bindData);   //执行脚本
             }