hqchart 1.1.12680 → 1.1.12685

package/package.json

@@ -2,7 +2,7 @@
   "name": "hqchart",
   "description": "stock chart",
   "author": "jones2000",
-  "version": "1.1.12680",
+  "version": "1.1.12685",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.js

@@ -5995,6 +5995,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.ShowTooltipByKeyDown();
                     this.OnKLinePageChange("keydown");
@@ -6023,6 +6024,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.ShowTooltipByKeyDown();
                     this.OnKLinePageChange("keydown");
@@ -6051,6 +6053,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.UpdatePointByCursorIndex();
                 this.UpdataDataoffset();
                 this.UpdateFrameMaxMin();
+                this.ResetFrameXSplit();
                 this.Draw();
                 this.ShowTooltipByKeyDown();
                 this.OnKLinePageChange("keydown");
@@ -6064,6 +6067,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.UpdataDataoffset();
                 this.UpdatePointByCursorIndex();
                 this.UpdateFrameMaxMin();
+                this.ResetFrameXSplit();
                 this.Draw();
                 this.ShowTooltipByKeyDown();
                 this.OnKLinePageChange("keydown");
@@ -6671,6 +6675,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Frame.ResetXYSplit();
     }
 
+    this.ResetFrameXSplit=function()
+    {
+        if (typeof(this.Frame.ResetXSplit)=='function')
+            this.Frame.ResetXSplit();
+    }
+
     this.UpdateFrameMaxMinV2=function()
     {
         var mapFrame=new Map(); //key=frameid, value:{ ChartPaint:[] }
@@ -9170,6 +9180,7 @@ function IChartFramePainting()
     this.IsShow=true;                   //是否显示
     this.SizeChange=true;               //大小是否改变
     this.XYSplit=true;                  //XY轴坐标信息改变
+    this.XSplit=true;                   //X轴变化
 
     this.HorizontalMax;                 //Y轴最大值
     this.HorizontalMin;                 //Y轴最小值
@@ -9242,6 +9253,7 @@ function IChartFramePainting()
 
         this.SizeChange=false;
         this.XYSplit=false;
+        this.XSplit=false;
     }
 
     this.DrawFrame=function() { }
@@ -13927,7 +13939,15 @@ function KLineFrame()
     //分割x,y轴坐标信息
     this.SplitXYCoordinate=function()
     {
-        if (this.XYSplit==false) return;
+        if (this.XYSplit==false) 
+        {
+            if (this.XSplit)
+            {
+                if (this.XSplitOperator!=null) this.XSplitOperator.Operator();
+            }
+            return;
+        }
+
         if (this.YSplitOperator!=null) this.YSplitOperator.Operator();
         if (this.XSplitOperator!=null) this.XSplitOperator.Operator();
         if (this.Logarithmic) this.SplitLogarithmicXYCoordinate();
@@ -14603,6 +14623,7 @@ function OverlayKLineFrame()
         
         this.SizeChange=false;
         this.XYSplit=false;
+        this.XSplit=false;
     }
 
     this.DrawTitle=function()   //画标题
@@ -17141,6 +17162,14 @@ function HQTradeFrame()
         }
     }
 
+    this.ResetXSplit=function()
+    {
+        for(let i in this.SubFrame)
+        {
+            this.SubFrame[i].Frame.XSplit=true;
+        }
+    }
+
     this.SetLanguage=function(languageID)
     {
         for(let i in this.SubFrame)
@@ -65516,6 +65545,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.OnKLinePageChange("wheel");
                 }
@@ -65532,6 +65562,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                     this.UpdatePointByCursorIndex();
                     this.UpdataDataoffset();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.OnKLinePageChange("wheel");
                 }
@@ -68425,6 +68456,7 @@ function KLineChartContainer(uielement,OffscreenElement)
     {
         if (!this.DeleteOverlayIndex(identify, null)) return;
 
+        this.UpdateFrameMaxMin();   //重新计算坐标范围
         this.Frame.ResetXYSplit(true);
         this.Draw();
     }

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

@@ -10139,6 +10139,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.ShowTooltipByKeyDown();
                     this.OnKLinePageChange("keydown");
@@ -10167,6 +10168,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.ShowTooltipByKeyDown();
                     this.OnKLinePageChange("keydown");
@@ -10195,6 +10197,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.UpdatePointByCursorIndex();
                 this.UpdataDataoffset();
                 this.UpdateFrameMaxMin();
+                this.ResetFrameXSplit();
                 this.Draw();
                 this.ShowTooltipByKeyDown();
                 this.OnKLinePageChange("keydown");
@@ -10208,6 +10211,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.UpdataDataoffset();
                 this.UpdatePointByCursorIndex();
                 this.UpdateFrameMaxMin();
+                this.ResetFrameXSplit();
                 this.Draw();
                 this.ShowTooltipByKeyDown();
                 this.OnKLinePageChange("keydown");
@@ -10815,6 +10819,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Frame.ResetXYSplit();
     }
 
+    this.ResetFrameXSplit=function()
+    {
+        if (typeof(this.Frame.ResetXSplit)=='function')
+            this.Frame.ResetXSplit();
+    }
+
     this.UpdateFrameMaxMinV2=function()
     {
         var mapFrame=new Map(); //key=frameid, value:{ ChartPaint:[] }
@@ -13314,6 +13324,7 @@ function IChartFramePainting()
     this.IsShow=true;                   //是否显示
     this.SizeChange=true;               //大小是否改变
     this.XYSplit=true;                  //XY轴坐标信息改变
+    this.XSplit=true;                   //X轴变化
 
     this.HorizontalMax;                 //Y轴最大值
     this.HorizontalMin;                 //Y轴最小值
@@ -13386,6 +13397,7 @@ function IChartFramePainting()
 
         this.SizeChange=false;
         this.XYSplit=false;
+        this.XSplit=false;
     }
 
     this.DrawFrame=function() { }
@@ -18071,7 +18083,15 @@ function KLineFrame()
     //分割x,y轴坐标信息
     this.SplitXYCoordinate=function()
     {
-        if (this.XYSplit==false) return;
+        if (this.XYSplit==false) 
+        {
+            if (this.XSplit)
+            {
+                if (this.XSplitOperator!=null) this.XSplitOperator.Operator();
+            }
+            return;
+        }
+
         if (this.YSplitOperator!=null) this.YSplitOperator.Operator();
         if (this.XSplitOperator!=null) this.XSplitOperator.Operator();
         if (this.Logarithmic) this.SplitLogarithmicXYCoordinate();
@@ -18747,6 +18767,7 @@ function OverlayKLineFrame()
         
         this.SizeChange=false;
         this.XYSplit=false;
+        this.XSplit=false;
     }
 
     this.DrawTitle=function()   //画标题
@@ -21285,6 +21306,14 @@ function HQTradeFrame()
         }
     }
 
+    this.ResetXSplit=function()
+    {
+        for(let i in this.SubFrame)
+        {
+            this.SubFrame[i].Frame.XSplit=true;
+        }
+    }
+
     this.SetLanguage=function(languageID)
     {
         for(let i in this.SubFrame)
@@ -69660,6 +69689,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.OnKLinePageChange("wheel");
                 }
@@ -69676,6 +69706,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                     this.UpdatePointByCursorIndex();
                     this.UpdataDataoffset();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.OnKLinePageChange("wheel");
                 }
@@ -72569,6 +72600,7 @@ function KLineChartContainer(uielement,OffscreenElement)
     {
         if (!this.DeleteOverlayIndex(identify, null)) return;
 
+        this.UpdateFrameMaxMin();   //重新计算坐标范围
         this.Frame.ResetXYSplit(true);
         this.Draw();
     }
@@ -130534,7 +130566,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12679";
+var HQCHART_VERSION="1.1.12684";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -10183,6 +10183,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.ShowTooltipByKeyDown();
                     this.OnKLinePageChange("keydown");
@@ -10211,6 +10212,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.ShowTooltipByKeyDown();
                     this.OnKLinePageChange("keydown");
@@ -10239,6 +10241,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.UpdatePointByCursorIndex();
                 this.UpdataDataoffset();
                 this.UpdateFrameMaxMin();
+                this.ResetFrameXSplit();
                 this.Draw();
                 this.ShowTooltipByKeyDown();
                 this.OnKLinePageChange("keydown");
@@ -10252,6 +10255,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 this.UpdataDataoffset();
                 this.UpdatePointByCursorIndex();
                 this.UpdateFrameMaxMin();
+                this.ResetFrameXSplit();
                 this.Draw();
                 this.ShowTooltipByKeyDown();
                 this.OnKLinePageChange("keydown");
@@ -10859,6 +10863,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             this.Frame.ResetXYSplit();
     }
 
+    this.ResetFrameXSplit=function()
+    {
+        if (typeof(this.Frame.ResetXSplit)=='function')
+            this.Frame.ResetXSplit();
+    }
+
     this.UpdateFrameMaxMinV2=function()
     {
         var mapFrame=new Map(); //key=frameid, value:{ ChartPaint:[] }
@@ -13358,6 +13368,7 @@ function IChartFramePainting()
     this.IsShow=true;                   //是否显示
     this.SizeChange=true;               //大小是否改变
     this.XYSplit=true;                  //XY轴坐标信息改变
+    this.XSplit=true;                   //X轴变化
 
     this.HorizontalMax;                 //Y轴最大值
     this.HorizontalMin;                 //Y轴最小值
@@ -13430,6 +13441,7 @@ function IChartFramePainting()
 
         this.SizeChange=false;
         this.XYSplit=false;
+        this.XSplit=false;
     }
 
     this.DrawFrame=function() { }
@@ -18115,7 +18127,15 @@ function KLineFrame()
     //分割x,y轴坐标信息
     this.SplitXYCoordinate=function()
     {
-        if (this.XYSplit==false) return;
+        if (this.XYSplit==false) 
+        {
+            if (this.XSplit)
+            {
+                if (this.XSplitOperator!=null) this.XSplitOperator.Operator();
+            }
+            return;
+        }
+
         if (this.YSplitOperator!=null) this.YSplitOperator.Operator();
         if (this.XSplitOperator!=null) this.XSplitOperator.Operator();
         if (this.Logarithmic) this.SplitLogarithmicXYCoordinate();
@@ -18791,6 +18811,7 @@ function OverlayKLineFrame()
         
         this.SizeChange=false;
         this.XYSplit=false;
+        this.XSplit=false;
     }
 
     this.DrawTitle=function()   //画标题
@@ -21329,6 +21350,14 @@ function HQTradeFrame()
         }
     }
 
+    this.ResetXSplit=function()
+    {
+        for(let i in this.SubFrame)
+        {
+            this.SubFrame[i].Frame.XSplit=true;
+        }
+    }
+
     this.SetLanguage=function(languageID)
     {
         for(let i in this.SubFrame)
@@ -69704,6 +69733,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                     this.UpdataDataoffset();
                     this.UpdatePointByCursorIndex();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.OnKLinePageChange("wheel");
                 }
@@ -69720,6 +69750,7 @@ function KLineChartContainer(uielement,OffscreenElement)
                     this.UpdatePointByCursorIndex();
                     this.UpdataDataoffset();
                     this.UpdateFrameMaxMin();
+                    this.ResetFrameXSplit();
                     this.Draw();
                     this.OnKLinePageChange("wheel");
                 }
@@ -72613,6 +72644,7 @@ function KLineChartContainer(uielement,OffscreenElement)
     {
         if (!this.DeleteOverlayIndex(identify, null)) return;
 
+        this.UpdateFrameMaxMin();   //重新计算坐标范围
         this.Frame.ResetXYSplit(true);
         this.Draw();
     }
@@ -130692,7 +130724,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12679";
+var HQCHART_VERSION="1.1.12684";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.wechat/umychart.framesplit.wechat.js

@@ -555,6 +555,17 @@ function FrameSplitKLinePriceY()
         splitData.Max = this.Frame.HorizontalMax;
         splitData.Min = this.Frame.HorizontalMin;
         splitData.Count = this.SplitCount;
+
+        if (this.Frame.YMaxMin) //原始的数据范围
+        {
+            var item=this.Frame.YMaxMin;
+            if (IFrameSplitOperator.IsNumber(item.Max) && IFrameSplitOperator.IsNumber(item.Min))
+            {
+                splitData.Max=item.Max;
+                splitData.Min=item.Min;
+            }
+        }
+
         if (splitData.Max==splitData.Min)   //如果一样上下扩大下
 		{
 			splitData.Max+=splitData.Max*0.01;
@@ -795,6 +806,16 @@ function FrameSplitY()
         splitData.Max = this.Frame.HorizontalMax;
         splitData.Min = this.Frame.HorizontalMin;
 
+        if (this.Frame.YMaxMin) //原始的数据范围
+        {
+            var item=this.Frame.YMaxMin;
+            if (IFrameSplitOperator.IsNumber(item.Max) && IFrameSplitOperator.IsNumber(item.Min))
+            {
+                splitData.Max=item.Max;
+                splitData.Min=item.Min;
+            }
+        }
+
         if (splitData.Max==splitData.Min)   //如果一样上下扩大下
 		{
             if (splitData.Max==0)

package/src/jscommon/umychart.wechat/umychart.version.wechat.js

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

package/src/jscommon/umychart.wechat/umychart.wechat.3.0.js

@@ -2738,13 +2738,13 @@ function JSChartContainer(uielement)
     
                 frame.HorizontalMax=max;
                 frame.HorizontalMin=min;  
-    
-                for(var j=0;j<item.OverlayFrame.length;++j)
-                {
-                    item.OverlayFrame[j].XYSplit=true;
-                }
             }
 
+            //共享Y轴叠加指标坐标同步
+            for(var j=0;j<item.OverlayFrame.length;++j)
+            {
+                item.OverlayFrame[j].XYSplit=true;
+            }
 
             //独立坐标叠加指标
             for(var i=0;i<item.SingleOverlay.length;++i)