hqchart 1.1.12928 → 1.1.12939

package/src/jscommon/umychart.js

@@ -554,7 +554,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         }
 
         //创建子窗口的指标
-        let scriptData = new JSIndexScript();
+        var scriptData = new JSIndexScript();
 
         if (option.ColorIndex)    //五彩K线
         {
@@ -609,27 +609,15 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                 }
                 else
                 {
+                    var scriptData = new JSIndexScript();
                     let indexInfo = scriptData.Get(item.Index);
                     if (!indexInfo) continue;
-
-                    if (item.Lock) indexInfo.Lock=item.Lock;
+                    JSIndexScript.ModifyAttribute(indexInfo, item);
                     indexInfo.ID=item.Index;
-                    var args=indexInfo.Args;
-                    if (item.Args) args=item.Args;
-                    if (item.IsShortTitle) indexInfo.IsShortTitle=item.IsShortTitle;
-                    if (item.TitleFont) indexInfo.TitleFont=item.TitleFont;
-                    if (IFrameSplitOperator.IsBool(item.IsSync)) indexInfo.IsSync=item.IsSync;
-                    chart.WindowIndex[i] = new ScriptIndex(indexInfo.Name, indexInfo.Script, args,indexInfo);    //脚本执行
+                   
+                    chart.WindowIndex[i] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo);    //脚本执行
                     if (item.StringFormat>0) chart.WindowIndex[i].StringFormat=item.StringFormat;
                     if (item.FloatPrecision>=0) chart.WindowIndex[i].FloatPrecision=item.FloatPrecision;
-
-                    if (item.YAxis)
-                    {
-                        if (!indexInfo.YAxis) indexInfo.YAxis={ };
-                        if (IFrameSplitOperator.IsNumber(item.YAxis.FloatPrecision)) indexInfo.YAxis.FloatPrecision=item.YAxis.FloatPrecision;
-                        if (IFrameSplitOperator.IsNumber(item.YAxis.StringFormat)) indexInfo.YAxis.StringFormat=item.YAxis.StringFormat;
-                        if (IFrameSplitOperator.IsBool(item.YAxis.EnableRemoveZero)) indexInfo.YAxis.EnableRemoveZero=item.YAxis.EnableRemoveZero;
-                    }
                 }
 
             }
@@ -1463,7 +1451,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (IFrameSplitOperator.IsNonEmptyArray(option.Windows))
         {
             //创建子窗口的指标
-            let scriptData = new JSIndexScript();
+            
             for(var i=0;i<option.Windows.length;++i)
             {
                 var item=option.Windows[i];
@@ -1481,6 +1469,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                     }
                     else
                     {
+                        var scriptData = new JSIndexScript();
                         let indexInfo = scriptData.Get(item.Index);
                         if (!indexInfo) continue;
 
@@ -8117,20 +8106,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.RemoveMinSizeWindows();    //清空隐藏的指标
         var index=this.AddNewSubFrame(option);
 
-        if (option)
-        {
-            if (option.FloatPrecision>=0) indexInfo.FloatPrecision=option.FloatPrecision;
-            if (option.StringFormat>0) indexInfo.StringFormat=option.StringFormat;
-            if (option.Args) indexInfo.Args=option.Args;
-            if (option.Lock) indexInfo.Lock=option.Lock;
-            if (option.YAxis)
-            {
-                indexInfo.YAxis={ };
-                if (IFrameSplitOperator.IsNumber(option.YAxis.FloatPrecision)) indexInfo.YAxis.FloatPrecision=option.YAxis.FloatPrecision;
-                if (IFrameSplitOperator.IsNumber(option.YAxis.StringFormat)) indexInfo.YAxis.StringFormat=option.YAxis.StringFormat;
-                if (IFrameSplitOperator.IsBool(option.YAxis.EnableRemoveZero)) indexInfo.YAxis.EnableRemoveZero=option.YAxis.EnableRemoveZero;
-            }
-        }
+        JSIndexScript.ModifyAttribute(indexInfo, option);
 
         this.WindowIndex[index] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo);    //脚本执行
         if (this.ClassName=="MinuteChartContainer" || this.ClassName=="MinuteChartHScreenContainer")
@@ -8280,6 +8256,45 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return paint.ClearPoint();
     }
 
+    //删除指定窗口的所有叠加指标
+    this.DeleteWindowsOverlayIndex=function(windowIndex)
+    {
+        if (!IFrameSplitOperator.IsNumber(windowIndex)) return;
+        if (windowIndex<0 || windowIndex>=this.Frame.SubFrame.length) return;
+            
+        var subFrame=this.Frame.SubFrame[windowIndex];
+        if (!IFrameSplitOperator.IsNonEmptyArray(subFrame.OverlayIndex)) return;
+
+        var aryIndexID=[];
+        for(var i=0; i<subFrame.OverlayIndex.length; ++i)
+        {
+            var overlayItem=subFrame.OverlayIndex[i];
+            aryIndexID.push(overlayItem.Identify);
+
+            for(var j=0;j<overlayItem.ChartPaint.length;++j)    //图形销毁事件
+            {
+                var overlayChart=overlayItem.ChartPaint[j];
+                if (overlayChart && overlayChart.OnDestroy) overlayChart.OnDestroy();
+            }
+
+            overlayItem.ChartPaint=[];
+        }
+
+        subFrame.OverlayIndex=[];
+
+        var titlePaint=this.TitlePaint[windowIndex+1];
+        for(var i=0;i<aryIndexID.length;++i)
+        {
+            var identify=aryIndexID[i];
+
+            if (titlePaint.OverlayIndex.has(identify))
+                titlePaint.OverlayIndex.delete(identify);
+    
+            if (titlePaint.OverlayDynamicTitle.has(identify))
+                titlePaint.OverlayDynamicTitle.delete(identify);
+        }
+    }
+
     //删除叠加指标, 没有重绘
     this.DeleteOverlayIndex=function(identify, windowIndex)
     {
@@ -17416,7 +17431,7 @@ function HQTradeFrame()
                     if (IFrameSplitOperator.IsNumber(this.OverlayBlankWidth)) overlayItem.Frame.BlankWidth=this.OverlayBlankWidth;
                     
                     overlayItem.Frame.Draw();
-                    rightOffset+=overlayItem.RightWidth.Width;
+                    if (overlayItem.RightWidth) rightOffset+=overlayItem.RightWidth.Width;
                     if (overlayItem.Frame.IsShow) ++index;
                 }
             }
@@ -43130,6 +43145,8 @@ function IFrameSplitOperator()
     {
 
     }
+
+    this.SetOption=function(option) { }
 }
 
 //字符串格式化 千分位分割
@@ -44396,7 +44413,7 @@ function FrameSplitY()
     this.DefaultSplitType=0;
     this.Custom=[];         //[{Type:0}]; 定制刻度
     this.DefaultYMaxMin;    //{ Max:null, Min:null };    //指定最大,最小, Y轴范围必须比最大值大， 比最小值小
-    this.EnableRemoveZero=true;
+    this.EnableRemoveZero=g_JSChartResource.Frame.EnableRemoveZero;
     this.LineType=null;     //线段样式
     this.IgnoreYValue = null;                 //在这个数组里的数字不显示在刻度上 
     this.FixedYMaxMin;      //{ Max, Min} 固定Y轴最大最小值
@@ -44421,6 +44438,22 @@ function FrameSplitY()
         return true;
     }
 
+
+    this.Reset=function()   //重置
+    {
+        this.EnableRemoveZero=g_JSChartResource.Frame.EnableRemoveZero;
+        this.StringFormat=g_JSChartResource.Frame.StringFormat;
+    }
+
+    this.SetOption=function(option)
+    {
+        if (!option) return;
+
+        if (IFrameSplitOperator.IsNumber(option.FloatPrecision)) this.FloatPrecision=option.FloatPrecision;
+        if (IFrameSplitOperator.IsNumber(option.StringFormat)) this.StringFormat=option.StringFormat;
+        if (IFrameSplitOperator.IsBool(option.EnableRemoveZero)) this.EnableRemoveZero=option.EnableRemoveZero;
+    }
+
     this.GetFloatPrecision=function(value,floatPrecision)
     {
         if (value>this.FLOATPRECISION_RANGE[0]) return floatPrecision;
@@ -61832,7 +61865,9 @@ function JSChartResource()
     this.Frame={ 
         XBottomOffset:2*GetDevicePixelRatio(),  //X轴文字向下偏移
         YTopOffset:2*GetDevicePixelRatio(),      //Y轴顶部文字向下偏移
-        YTextPadding:[2,2]
+        YTextPadding:[2,2],
+        EnableRemoveZero:true,                  //移除小数点后面的0
+        StringFormat:0
     };
     this.ToolbarButtonStyle=0;
 
@@ -67861,18 +67896,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             {
                 if (windowIndex == 0) windowIndex = 1;  //幅图指标,不能再主图显示
             }
-            let indexData = indexInfo;
-            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;
-                if (option.TitleFont) indexData.TitleFont=option.TitleFont;
-                if (option.IsShortTitle) indexData.IsShortTitle=option.IsShortTitle;
-                if (option.Lock) indexData.Lock=option.Lock;
-            }
-            
-            return this.ChangeScriptIndex(windowIndex, indexData,option);
+
+            JSIndexScript.ModifyAttribute(indexInfo, option)
+            return this.ChangeScriptIndex(windowIndex, indexInfo, option);
         }
 
         //主图指标
@@ -68018,18 +68044,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (indexInfo)
         {
-            if (obj.Args) indexInfo.Args=obj.Args;    //外部可以设置参数
-            if (IFrameSplitOperator.IsNumber(obj.FloatPrecision)) indexInfo.FloatPrecision=obj.FloatPrecision;
-            if (IFrameSplitOperator.IsNumber(obj.StringFormat)) indexInfo.StringFormat=obj.StringFormat;
-            if (IFrameSplitOperator.IsBool(obj.IsSync)) indexInfo.IsSync=obj.IsSync;
-            if (obj.YAxis)
-            {
-                if (!indexInfo.YAxis) indexInfo.YAxis={ };
-                if (IFrameSplitOperator.IsNumber(obj.YAxis.FloatPrecision)) indexInfo.YAxis.FloatPrecision=obj.YAxis.FloatPrecision;
-                if (IFrameSplitOperator.IsNumber(obj.YAxis.StringFormat)) indexInfo.YAxis.StringFormat=obj.YAxis.StringFormat;
-                if (IFrameSplitOperator.IsBool(obj.YAxis.EnableRemoveZero)) indexInfo.YAxis.EnableRemoveZero=obj.YAxis.EnableRemoveZero;
-            }
-
+            JSIndexScript.ModifyAttribute(indexInfo, obj);
             var scriptIndex=new OverlayScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);    //脚本执行
             scriptIndex.OverlayIndex={ IsOverlay:true, Identify:overlayFrame.Identify, WindowIndex:windowIndex, Frame:overlayFrame };    //叠加指标信息
             overlayFrame.Script=scriptIndex;
@@ -68313,14 +68328,15 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (count<=0) return;
         var currentLength=this.Frame.SubFrame.length;
 
-        var period=null, right=null;
+        var period=null, right=null, symbol=null;
+        if (option.Symbol) symbol=option.Symbol;
         if (option.KLine)
         {
             if (IFrameSplitOperator.IsNumber(option.KLine.Period) && option.KLine.Period!=this.Period) period=option.KLine.Period;  //周期
             if (IFrameSplitOperator.IsNumber(option.KLine.Right) && option.KLine.Right!=this.Right) right=option.KLine.Right;       //复权
         }
 
-        var bRefreshData= (period!=null || right!=null);
+        var bRefreshData= (period!=null || right!=null || symbol!=null);
 
         //清空所有的指标图型
         for(var i=0;i<currentLength;++i)
@@ -68348,6 +68364,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
             this.Frame.SubFrame.splice(count,currentLength-count);
             this.WindowIndex.splice(count,currentLength-count);
+            this.TitlePaint.splice(count+1,currentLength-count);
         }
         else
         {
@@ -68364,8 +68381,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 this.TitlePaint[i+1]=titlePaint;
             } 
         }
-
-        var systemScript = new JSIndexScript();
+        
         for(var i=0;i<count;++i)
         {
             var windowIndex=i;
@@ -68375,7 +68391,10 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             var titleIndex=windowIndex+1;
             this.TitlePaint[titleIndex].Data=[];
             this.TitlePaint[titleIndex].Title=null;
+            var frame=this.Frame.SubFrame[i];
 
+            this.DeleteWindowsOverlayIndex(i);  //清空叠加指标
+           
             if (item.Script)    //自定义指标脚本
             {
                 this.WindowIndex[i]=new ScriptIndex(item.Name,item.Script,item.Args,item);    //脚本执行
@@ -68396,28 +68415,17 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 }
                 else
                 {
+                    var systemScript = new JSIndexScript();
                     var indexInfo = systemScript.Get(indexID);
                     if (indexInfo)
                     {
-                        var args=indexInfo.Args;
-                        if (option.Windows[i].Args) args=option.Windows[i].Args;
-                        if (item.TitleFont) indexInfo.TitleFont=item.TitleFont;
-                        if (item.IsShortTitle) indexInfo.IsShortTitle=item.IsShortTitle;
-                        if (IFrameSplitOperator.IsBool(item.IsSync)) indexInfo.IsSync=item.IsSync;
-
-                        if (item.YAxis)
-                        {
-                            if (!indexInfo.YAxis) indexInfo.YAxis={ };
-                            if (IFrameSplitOperator.IsNumber(item.YAxis.FloatPrecision)) indexInfo.YAxis.FloatPrecision=item.YAxis.FloatPrecision;
-                            if (IFrameSplitOperator.IsNumber(item.YAxis.StringFormat)) indexInfo.YAxis.StringFormat=item.YAxis.StringFormat;
-                        }
-    
-                        this.WindowIndex[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,args,indexInfo);    //脚本执行
+                        JSIndexScript.ModifyAttribute(indexInfo,item);
+                        this.WindowIndex[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);    //脚本执行
                     }
                 }
             }
 
-            this.SetSubFrameAttribute(this.Frame.SubFrame[i], item, frameItem);
+            this.SetSubFrameAttribute(frame, item, frameItem);
         }
 
         //最后一个显示X轴坐标
@@ -68428,6 +68436,23 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             else item.XSplitOperator.ShowText=false;
         }
 
+        //叠加指标
+        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;
@@ -68436,6 +68461,12 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 this.BindIndexData(i,bindData);
             }
 
+            for(var i=0;i<aryOverlayIndex.length;++i)
+            {
+                var item=aryOverlayIndex[i];
+                this.BindOverlayIndexData(item,item.WindowIndex,bindData);
+            }
+
             this.UpdataDataoffset();           //更新数据偏移
             this.Frame.SetSizeChage(true);
             this.ResetFrameXYSplit();
@@ -68444,9 +68475,13 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else
         {
-            this.Frame.SetSizeChage(true);
-            if (period!=null) this.ChangePeriod(period, option);
-            else if (right!=null) this.ChangeRight(right);
+           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);
         }
     }
 
@@ -68891,11 +68926,11 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         
         if (option)
         {
-            if (option.Windows && Array.isArray(option.Windows) && option.Windows.length>0)
+            if (IFrameSplitOperator.IsNonEmptyArray(option.Windows))
             {
                 var windows=option.Windows;
-                var systemScript = new JSIndexScript();
-                for(var i in windows)
+                
+                for(var i=0; i<windows.length; ++i)
                 {
                     if (i>=this.WindowIndex.length) break; //暂时不支持 动态增加/减少
                     var item=windows[i];
@@ -68913,11 +68948,11 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     else
                     {
                         var indexID=item.Index;
+                        var systemScript = new JSIndexScript();
                         var indexInfo = systemScript.Get(indexID);
                         if (indexInfo)
                         {
-                            var args=indexInfo.Args;
-                            if (item.Args) indexInfo.Args=item.Args;
+                            JSIndexScript.ModifyAttribute(indexInfo,item);
                             indexInfo.ID=indexID;
                             this.WindowIndex[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);    //脚本执行
                         }
@@ -73666,25 +73701,9 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (windowIndex<2) windowIndex=2;
         if (windowIndex>=this.Frame.SubFrame.length) windowIndex=2;
 
-        let indexData = 
-        { 
-            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,StringFormat:indexInfo.StringFormat,
-            OutName:indexInfo.OutName
-        };
+        JSIndexScript.ModifyAttribute(indexInfo, option)
 
-        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;
-            if (IFrameSplitOperator.IsNumber(option.YSplitType)) indexData.YSplitType=option.YSplitType;
-            if (option.Lock) indexData.Lock=option.Lock;
-        }
-        
-        return this.ChangeScriptIndex(windowIndex, indexData,option);
+        return this.ChangeScriptIndex(windowIndex, indexInfo, option);
     }
 
     //设置指标窗口个数
@@ -73815,7 +73834,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
             } 
         }
 
-        var systemScript = new JSIndexScript();
+        
         
         for(var i=0;i<count;++i)
         {
@@ -73850,22 +73869,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     }
                     else
                     {
+                        var systemScript = new JSIndexScript();
                         var indexInfo = systemScript.Get(indexID);
                         if (indexInfo)
                         {
-                            var args=indexInfo.Args;
-                            if (item.Args) args=item.Args;
-                            let indexData = 
-                            { 
-                                Name:indexInfo.Name, Script:indexInfo.Script, Args: args, ID:indexID ,
-                                //扩展属性 可以是空
-                                KLineType:indexInfo.KLineType,  YSpecificMaxMin:indexInfo.YSpecificMaxMin,  YSplitScale:indexInfo.YSplitScale,
-                                FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition,
-                                OutName:indexInfo.OutName
-                            };
-                            if (item.TitleFont) indexData.TitleFont=item.TitleFont;
-        
-                            this.WindowIndex[windowIndex]=new ScriptIndex(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
+                            JSIndexScript.ModifyAttribute(indexInfo,item);
+                            this.WindowIndex[windowIndex]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);    //脚本执行
                         }
                     }
                 }
@@ -74063,7 +74072,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
             if (IFrameSplitOperator.IsNonEmptyArray(option.Windows))    //切换指标
             {
-                var systemScript = new JSIndexScript();
+                
                 for(var i=0; i<option.Windows.length; ++i)
                 {
                     var index=2+i;
@@ -74083,12 +74092,12 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     }
                     else
                     {
+                        var systemScript = new JSIndexScript();
                         var indexID=item.Index;
                         var indexInfo = systemScript.Get(indexID);
                         if (indexInfo)
                         {
-                            var args=indexInfo.Args;
-                            if (item.Args) indexInfo.Args=item.Args;
+                            JSIndexScript.ModifyAttribute(indexInfo,item);
                             indexInfo.ID=indexID;
                             this.WindowIndex[index]=new ScriptIndex(indexInfo.Name,indexInfo.Script,indexInfo.Args,indexInfo);    //脚本执行
                         }