hqchart 1.1.12905 → 1.1.12928

package/src/jscommon/umychart.js

@@ -622,6 +622,14 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
                     chart.WindowIndex[i] = new ScriptIndex(indexInfo.Name, indexInfo.Script, 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;
+                    }
                 }
 
             }
@@ -8062,7 +8070,6 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             subFrame.Frame.IsShowYText[1]=option.IsShowRightText;
             subFrame.Frame.YSplitOperator.IsShowRightText=option.IsShowRightText;         //显示右边刻度
         }
-
     }
 
     this.AddNewSubFrame=function(option)
@@ -8110,24 +8117,22 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.RemoveMinSizeWindows();    //清空隐藏的指标
         var index=this.AddNewSubFrame(option);
 
-        var 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
-        };
-
         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.Lock) indexData.Lock=option.Lock;
+            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;
+            }
         }
 
-        this.WindowIndex[index] = new ScriptIndex(indexData.Name, indexData.Script, indexData.Args,indexData);    //脚本执行
+        this.WindowIndex[index] = new ScriptIndex(indexInfo.Name, indexInfo.Script, indexInfo.Args,indexInfo);    //脚本执行
         if (this.ClassName=="MinuteChartContainer" || this.ClassName=="MinuteChartHScreenContainer")
             var bindData=this.SourceData;
         else 
@@ -14377,8 +14382,10 @@ function KLineFrame()
         {
             if (this.XSplit)
             {
-                if (this.XSplitOperator!=null) this.XSplitOperator.Operator();
+                if (this.XSplitOperator) this.XSplitOperator.Operator();
+                if (this.YSplitOperator && this.YSplitOperator.CustomCoordinate) this.YSplitOperator.CustomCoordinate();
             }
+           
             return;
         }
 
@@ -40734,7 +40741,8 @@ function RectSelectPaint()
     };
 
     this.BorderCache;
-    this.IsOnlyOnePoint=false;   //单点模式
+    this.IsOnlyOnePoint=false;   //空格选中区间，单点模式
+    this.IsFullFrame=false;       //区间选择包含子窗口
 
     //设置参数接口
     this.SetOption=function(option)
@@ -41145,6 +41153,7 @@ function RectSelectPaint()
         else
         {
             var border=subFrame.GetBorder();
+            if (this.IsFullFrame)  border=this.ChartFrame.ChartBorder.GetBorder();  //全部指标窗口选中
             var xOffset=border.LeftEx+distanceWidth/2.0+g_JSChartResource.FrameLeftMargin;
             var chartright=border.RightEx;
             var drawHeight=border.ChartHeight-border.TopTitle-5*GetDevicePixelRatio();
@@ -42773,7 +42782,7 @@ function IFrameSplitOperator()
     this.Frame;                         //框架信息
     this.FrameSplitData;                //坐标轴分割方法
     this.SplitCount=5;                  //刻度个数
-    this.StringFormat=0;                //刻度字符串格式
+    this.StringFormat=0;                //刻度字符串格式    2=原始格式
     this.IsShowLeftText=true;           //显示左边刻度 
     this.IsShowRightText=true;          //显示右边刻度
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
@@ -43116,6 +43125,11 @@ function IFrameSplitOperator()
 
         return data;
     }
+
+    this.Reset=function()   //重置
+    {
+
+    }
 }
 
 //字符串格式化 千分位分割
@@ -44115,6 +44129,16 @@ function FrameSplitKLinePriceY()
 
     this.CustomCoordinate=function(floatPrecision)
     {
+        if (!IFrameSplitOperator.IsNumber(floatPrecision))
+        {
+            var pixelTatio = GetDevicePixelRatio();             //获取设备的分辨率
+            var width=this.Frame.ChartBorder.GetChartWidth();   //画布的宽度
+            var isPhoneModel=width<450*pixelTatio;
+            floatPrecision=GetfloatPrecision(this.Symbol);
+            if (isPhoneModel && MARKET_SUFFIX_NAME.IsSHSZIndex(this.Symbol)) floatPrecision = 0;    //手机端指数不显示小数位数,太长了
+            if (this.FloatPrecision!=null) floatPrecision=this.FloatPrecision;
+        }
+
         this.Frame.CustomHorizontalInfo=[];
 
         var data=this.InvokeCustomYCoordinateCallback();
@@ -44580,6 +44604,10 @@ function FrameSplitY()
             if (IFrameSplitOperator.IsNumber(value) && Math.abs(value) > 1000) floatPrecision=0;
             text=IFrameSplitOperator.FormatValueString(value,floatPrecision,this.LanguageID);
         }
+        else if (this.StringFormat==2)   //原始数据输出
+        {
+            text=`${value.toFixed(this.FloatPrecision)}`;
+        }
         else
         {
             var absValue=Math.abs(value);
@@ -67764,6 +67792,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
+
     this.OnKLinePageChange=function(eventid)
     {
         if (!this.ChartPaint[0]) return;
@@ -67989,21 +68018,19 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         }
         else if (indexInfo)
         {
-            var args=indexInfo.Args;
-            if (obj.Args) args=obj.Args;    //外部可以设置参数
-            let indexData = 
-            { 
-                Name:indexInfo.Name, Script:indexInfo.Script, Args: args, ID:indexName,
-                //扩展属性 可以是空
-                KLineType:indexInfo.KLineType,  YSpecificMaxMin:indexInfo.YSpecificMaxMin,  YSplitScale:indexInfo.YSplitScale,
-                FloatPrecision:indexInfo.FloatPrecision, Condition:indexInfo.Condition,
-                OutName:indexInfo.OutName
-            };
+            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;
+            }
 
-            if (IFrameSplitOperator.IsNumber(obj.FloatPrecision)) indexData.FloatPrecision=obj.FloatPrecision;
-            if (IFrameSplitOperator.IsNumber(obj.StringFormat)) indexData.StringFormat=obj.StringFormat;
-            if (IFrameSplitOperator.IsBool(obj.IsSync)) indexData.IsSync=obj.IsSync;
-            var scriptIndex=new OverlayScriptIndex(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
+            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;
         }
@@ -68374,17 +68401,18 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                     {
                         var args=indexInfo.Args;
                         if (option.Windows[i].Args) args=option.Windows[i].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;
+                        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(indexData.Name,indexData.Script,indexData.Args,indexData);    //脚本执行
+                        this.WindowIndex[i]=new ScriptIndex(indexInfo.Name,indexInfo.Script,args,indexInfo);    //脚本执行
                     }
                 }
             }
@@ -69024,7 +69052,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
-    //增加叠加股票 只支持日线数据
+    //增加叠加股票
     this.OverlaySymbol=function(symbol,option)
     {
         for(var i in this.OverlayChartPaint)
@@ -84740,8 +84768,8 @@ var MARKET_SUFFIX_NAME=
     SZO:".SZO",          //深证交易所 股票期权
     HK:'.HK',            //港股
     FHK:'.FHK',          //港股期货            
-    SHFE: '.SHF',        //上期所 (Shanghai Futures Exchange)
-    SHFE2:'.SHFE',       //上期所 (Shanghai Futures Exchange)
+    SHFE: '.SHF',        //上期所 (Shanghai Futures Exchange) | 上期所-能源
+    SHFE2:'.SHFE',       //上期所 (Shanghai Futures Exchange) | 上期所-能源
     CFFEX: '.CFE',       //中期所 (China Financial Futures Exchange)
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所