hqchart 1.1.12900 → 1.1.12920

package/src/jscommon/umychart.testdata.js

@@ -43,10 +43,17 @@ HQData.NetworkFilter=function(data, callback)
             HQData.RequestIndexVariantData(data,callback);
             break;
 
+        case "JSSymbolData::GetOtherSymbolData":
+            HQData.RequestOtherSymbolData(data, callback);
+            break;
+
         case "AnnouncementInfo::RequestData":
             HQData.AnnouncementInfo_RequestData(data,callback);
             break;
 
+       
+
+
         case "PforecastInfo::RequestData":
             HQData.PforecastInfo_RequestData(data,callback);
             break;
@@ -191,6 +198,20 @@ HQData.RequestIndexVariantData=function(data,callback)
 
 }
 
+HQData.RequestOtherSymbolData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol;
+    var period=data.Request.Data.period;
+    var right=data.Request.Data.right;
+    var hqchartData=null;
+    if (ChartData.IsDayPeriod(period,true)) hqchartData=KLINE_DAY_DATA2;
+    else if (ChartData.IsMinutePeriod(period,true)) hqchartData=KLINE_MINUTE_DATA2;
+    hqchartData.name=symbol;
+    hqchartData.symbol=symbol;
+    callback(hqchartData);
+}
+
 HQData.AnnouncementInfo_RequestData=function(data,callback)
 {
     data.PreventDefault=true;

package/src/jscommon/umychart.uniapp.h5/umychart.uniapp.h5.js

@@ -10073,7 +10073,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         var sendData={ MouseStatus:null, X:x, Y:y, FrameID:frameID, e:e };
         if (this.TryMouseMove_CustomChartDrag(sendData))
         {
-            if (sendData.MouseStatus) mouseStatus=sendData.MouseStatus;
+            if (sendData.MouseStatus) 
+                mouseStatus=sendData.MouseStatus;
         }
         
         var bDrawPicture=false; //是否正在画图
@@ -10123,7 +10124,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
             else 
             {
-                if (!this.MouseDrag) this.SetCursor({Cursor:"default"}); //this.UIElement.style.cursor="default";
+                if (!this.MouseDrag) 
+                    this.SetCursor({Cursor:"default"}); //this.UIElement.style.cursor="default";
             }
         }
 
@@ -18542,8 +18544,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;
         }
 
@@ -44899,6 +44903,8 @@ function RectSelectPaint()
     };
 
     this.BorderCache;
+    this.IsOnlyOnePoint=false;   //空格选中区间，单点模式
+    this.IsFullFrame=false;       //区间选择包含子窗口
 
     //设置参数接口
     this.SetOption=function(option)
@@ -45229,6 +45235,12 @@ function RectSelectPaint()
         }
         else
         {
+            if (this.IsOnlyOnePoint)
+            {
+                this.FirstPoint={ Date:kItem.Date, Time:kItem.Time, DataIndex:dataIndex };
+                return true;
+            }
+
             if (!this.FirstPoint) 
             {
                 this.FirstPoint={ Date:kItem.Date, Time:kItem.Time, DataIndex:dataIndex };
@@ -45303,6 +45315,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();
@@ -48273,6 +48286,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();
@@ -73182,7 +73205,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
-    //增加叠加股票 只支持日线数据
+    //增加叠加股票
     this.OverlaySymbol=function(symbol,option)
     {
         for(var i in this.OverlayChartPaint)
@@ -88898,8 +88921,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',        //郑州期货交易所
@@ -129259,7 +129282,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12899";
+var HQCHART_VERSION="1.1.12919";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

@@ -5,7 +5,7 @@
 
 
 
-var HQCHART_VERSION="1.1.12899";
+var HQCHART_VERSION="1.1.12919";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.vue/umychart.NetworkFilterTest.vue.js

@@ -48718,10 +48718,17 @@ HQData.NetworkFilter=function(data, callback)
             HQData.RequestIndexVariantData(data,callback);
             break;
 
+        case "JSSymbolData::GetOtherSymbolData":
+            HQData.RequestOtherSymbolData(data, callback);
+            break;
+
         case "AnnouncementInfo::RequestData":
             HQData.AnnouncementInfo_RequestData(data,callback);
             break;
 
+       
+
+
         case "PforecastInfo::RequestData":
             HQData.PforecastInfo_RequestData(data,callback);
             break;
@@ -48866,6 +48873,20 @@ HQData.RequestIndexVariantData=function(data,callback)
 
 }
 
+HQData.RequestOtherSymbolData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol;
+    var period=data.Request.Data.period;
+    var right=data.Request.Data.right;
+    var hqchartData=null;
+    if (ChartData.IsDayPeriod(period,true)) hqchartData=KLINE_DAY_DATA2;
+    else if (ChartData.IsMinutePeriod(period,true)) hqchartData=KLINE_MINUTE_DATA2;
+    hqchartData.name=symbol;
+    hqchartData.symbol=symbol;
+    callback(hqchartData);
+}
+
 HQData.AnnouncementInfo_RequestData=function(data,callback)
 {
     data.PreventDefault=true;

package/src/jscommon/umychart.vue/umychart.vue.js

@@ -10117,7 +10117,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         var sendData={ MouseStatus:null, X:x, Y:y, FrameID:frameID, e:e };
         if (this.TryMouseMove_CustomChartDrag(sendData))
         {
-            if (sendData.MouseStatus) mouseStatus=sendData.MouseStatus;
+            if (sendData.MouseStatus) 
+                mouseStatus=sendData.MouseStatus;
         }
         
         var bDrawPicture=false; //是否正在画图
@@ -10167,7 +10168,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             }
             else 
             {
-                if (!this.MouseDrag) this.SetCursor({Cursor:"default"}); //this.UIElement.style.cursor="default";
+                if (!this.MouseDrag) 
+                    this.SetCursor({Cursor:"default"}); //this.UIElement.style.cursor="default";
             }
         }
 
@@ -18586,8 +18588,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;
         }
 
@@ -44943,6 +44947,8 @@ function RectSelectPaint()
     };
 
     this.BorderCache;
+    this.IsOnlyOnePoint=false;   //空格选中区间，单点模式
+    this.IsFullFrame=false;       //区间选择包含子窗口
 
     //设置参数接口
     this.SetOption=function(option)
@@ -45273,6 +45279,12 @@ function RectSelectPaint()
         }
         else
         {
+            if (this.IsOnlyOnePoint)
+            {
+                this.FirstPoint={ Date:kItem.Date, Time:kItem.Time, DataIndex:dataIndex };
+                return true;
+            }
+
             if (!this.FirstPoint) 
             {
                 this.FirstPoint={ Date:kItem.Date, Time:kItem.Time, DataIndex:dataIndex };
@@ -45347,6 +45359,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();
@@ -48317,6 +48330,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();
@@ -73226,7 +73249,7 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         this.Draw();
     }
 
-    //增加叠加股票 只支持日线数据
+    //增加叠加股票
     this.OverlaySymbol=function(symbol,option)
     {
         for(var i in this.OverlayChartPaint)
@@ -88942,8 +88965,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',        //郑州期货交易所
@@ -129417,7 +129440,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12899";
+var HQCHART_VERSION="1.1.12919";
 
 function PrintHQChartVersion()
 {