hqchart 1.1.12678 → 1.1.12680

package/lib/umychart.vue.js

@@ -1979,7 +1979,8 @@ SingleOverlay:[]//独立坐标
 item.OverlayFrame.push(overlayFrame);for(var k=0;k<overlayItem.ChartPaint.length;++k){var chart=overlayItem.ChartPaint[k];item.ChartPaint.push(chart);}}else{item.SingleOverlay.push(overlayItem);}}mapFrame.set(key,item);}for(var i=0;i<this.ChartPaint.length;++i){var chart=this.ChartPaint[i];var key=chart.ChartFrame.Identify;if(!mapFrame.has(key))continue;var finder=mapFrame.get(key);finder.ChartPaint.push(chart);}for(var i=0;i<this.OverlayChartPaint.length;++i){var chart=this.OverlayChartPaint[i];if(!chart.ChartFrame)continue;var key=chart.ChartFrame.Identify;if(!mapFrame.has(key))continue;var finder=mapFrame.get(key);finder.ChartPaint.push(chart);}var _iteratorNormalCompletion3=true;var _didIteratorError3=false;var _iteratorError3=undefined;try{for(var _iterator3=(0,_getIterator3.default)(mapFrame),_step3;!(_iteratorNormalCompletion3=(_step3=_iterator3.next()).done);_iteratorNormalCompletion3=true){var mapItem=_step3.value;var item=mapItem[1];var frame=item.Frame;//计算主框架最大最小
 for(var i=0;i<item.ChartPaint.length;++i){var chart=item.ChartPaint[i];if(chart.IsShow==false)continue;//隐藏的图形不计算
 if(chart.NotSupportMessage)continue;if(!chart.ChartFrame)continue;var range=chart.GetMaxMin();if(range==null||range.Max==null||range.Min==null)continue;if(item.Max==null||item.Max<range.Max)item.Max=range.Max;if(item.Min==null||item.Min>range.Min)item.Min=range.Min;}if(item.Frame.YSpecificMaxMin)//固定坐标
-{item.Min=item.Frame.YSpecificMaxMin.Max;item.Max=item.Frame.YSpecificMaxMin.Min;}if(!IFrameSplitOperator.IsNumber(frame.YMaxMin.Max)||frame.YMaxMin.Max!=item.Max){frame.YMaxMin.Max=item.Max;frame.XYSplit=true;}if(!IFrameSplitOperator.IsNumber(frame.YMaxMin.Min)||frame.YMaxMin.Min!=item.Min){frame.YMaxMin.Min=item.Min;frame.XYSplit=true;}if(frame.XYSplit){var max=10,min=0;if(item.Max!=null)max=item.Max;if(item.Min!=null)min=item.Min;frame.HorizontalMax=max;frame.HorizontalMin=min;for(var j=0;j<item.OverlayFrame.length;++j){item.OverlayFrame[j].XYSplit=true;}}//独立坐标叠加指标
+{item.Min=item.Frame.YSpecificMaxMin.Max;item.Max=item.Frame.YSpecificMaxMin.Min;}if(!IFrameSplitOperator.IsNumber(frame.YMaxMin.Max)||frame.YMaxMin.Max!=item.Max){frame.YMaxMin.Max=item.Max;frame.XYSplit=true;}if(!IFrameSplitOperator.IsNumber(frame.YMaxMin.Min)||frame.YMaxMin.Min!=item.Min){frame.YMaxMin.Min=item.Min;frame.XYSplit=true;}if(frame.XYSplit){var max=10,min=0;if(item.Max!=null)max=item.Max;if(item.Min!=null)min=item.Min;frame.HorizontalMax=max;frame.HorizontalMin=min;}//共享Y轴叠加指标同步下坐标
+for(var j=0;j<item.OverlayFrame.length;++j){item.OverlayFrame[j].XYSplit=true;}//独立坐标叠加指标
 for(var i=0;i<item.SingleOverlay.length;++i){var overlayItem=item.SingleOverlay[i];overlayItem.UpdateFrameMaxMin();}}}catch(err){_didIteratorError3=true;_iteratorError3=err;}finally{try{if(!_iteratorNormalCompletion3&&_iterator3.return){_iterator3.return();}}finally{if(_didIteratorError3){throw _iteratorError3;}}}};this.UpdateFrameMaxMin=function(){this.UpdateFrameMaxMinV2();return;var frameMaxMinData=new Array();var chartPaint=new Array();for(var i=0;i<this.ChartPaint.length;++i){var item=this.ChartPaint[i];if(item.IsShow==false)continue;//隐藏的图形不计算
 chartPaint.push(this.ChartPaint[i]);}for(var i=0;i<this.OverlayChartPaint.length;++i){chartPaint.push(this.OverlayChartPaint[i]);}var aryNotSupport=[];for(var i=0;i<chartPaint.length;++i){var paint=chartPaint[i];if(paint.NotSupportMessage){aryNotSupport.push(paint);continue;}var range=paint.GetMaxMin();if(range==null||range.Max==null||range.Min==null)continue;var frameItem=null;for(var j=0;j<frameMaxMinData.length;++j){if(frameMaxMinData[j].Frame==paint.ChartFrame){frameItem=frameMaxMinData[j];break;}}if(frameItem){if(frameItem.Range.Max<range.Max)frameItem.Range.Max=range.Max;if(frameItem.Range.Min>range.Min)frameItem.Range.Min=range.Min;}else{frameItem={OverlayFrame:[]};frameItem.Frame=paint.ChartFrame;frameItem.Range=range;frameMaxMinData.push(frameItem);}}//当前计算
 for(var i=0;i<aryNotSupport.length;++i){var paint=aryNotSupport[i];var range={Max:10,Min:1};var frameItem=null;for(var j=0;j<frameMaxMinData.length;++j){if(frameMaxMinData[j].Frame==paint.ChartFrame){frameItem=frameMaxMinData[j];break;}}if(frameItem)continue;frameItem={OverlayFrame:[]};frameItem.Frame=paint.ChartFrame;frameItem.Range=range;frameMaxMinData.push(frameItem);}var mapFrame=new _map2.default();for(var i=0;i<frameMaxMinData.length;++i){var item=frameMaxMinData[i];mapFrame.set(item.Frame.Identify,item);}//叠加坐标Y轴使用主图指标， 最大最小值
@@ -5055,7 +5056,8 @@ this.FixedYMaxMin;//{ Max, Min} 固定Y轴最大最小值
 this.EnableZoomUpDown=false;//上下左右拖拽
 this.LastMaxMin;//当前显示的最高最低范围
 this.PercentageTextFormat=0;//0=显示第1行  1=显示2行 2=单行格式: 价格/百分比
-this.IsEnableDragY=function(){return this.CoordinateType==0||this.CoordinateType==1;};this.Operator=function(){var splitData={};splitData.Max=this.Frame.HorizontalMax;splitData.Min=this.Frame.HorizontalMin;splitData.Count=this.SplitCount;if(splitData.Max==splitData.Min)//如果一样上下扩大下
+this.IsEnableDragY=function(){return this.CoordinateType==0||this.CoordinateType==1;};this.Operator=function(){var splitData={};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;splitData.Min-=splitData.Min*0.01;}var isFixedMaxMin=this.FixedYMaxMin&&IFrameSplitOperator.IsNumber(this.FixedYMaxMin.Max)&&IFrameSplitOperator.IsNumber(this.FixedYMaxMin.Min);if(isFixedMaxMin){splitData.Max=this.FixedYMaxMin.Max;splitData.Min=this.FixedYMaxMin.Min;//JSConsole.Chart.Log(`[FrameSplitKLinePriceY::Operator] FixedYMaxMin.Max=${this.FixedYMaxMin.Max} FixedYMaxMin.Min=${this.FixedYMaxMin.Min} `);
 }else if(this.DefaultYMaxMin)//指定最小的Y轴范围
 {var range=this.DefaultYMaxMin;if(IFrameSplitOperator.IsNumber(range.Max)){if(splitData.Min>range.Max)splitData.Min=range.Max;else if(splitData.Max<range.Max)splitData.Max=range.Max;}if(IFrameSplitOperator.IsNumber(range.Min)){if(splitData.Max<range.Min)splitData.Max=range.Min;else if(splitData.Min>range.Min)splitData.Min=range.Min;}}splitData.Interval=(splitData.Max-splitData.Min)/(splitData.Count-1);var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
@@ -5129,7 +5131,8 @@ this.EnableRemoveZero=true;this.LineType=null;//线段样式
 this.IgnoreYValue=null;//在这个数组里的数字不显示在刻度上 
 this.FixedYMaxMin;//{ Max, Min} 固定Y轴最大最小值
 this.EnableZoomUpDown=false;this.IsBeforeData=false;this.BeforeOpenData;this.IsAfterData=false;this.AfterCloseData;this.ShareAfterVol=0;this.MultiDayBeforeOpenData;this.MultiDayAfterCloseData;this.OverlayIdentify;this.HQChart;this.OverlayIndex;//叠加指标信息
-this.IsEnableDragY=function(){return true;};this.GetFloatPrecision=function(value,floatPrecision){if(value>this.FLOATPRECISION_RANGE[0])return floatPrecision;if(floatPrecision<0)return 2;for(;floatPrecision<this.FLOATPRECISION_RANGE.length;++floatPrecision){if(value>this.FLOATPRECISION_RANGE[floatPrecision])break;}return floatPrecision;};this.Operator=function(){var splitData={};splitData.Max=this.Frame.HorizontalMax;splitData.Min=this.Frame.HorizontalMin;if(splitData.Max==splitData.Min)//如果一样上下扩大下
+this.IsEnableDragY=function(){return true;};this.GetFloatPrecision=function(value,floatPrecision){if(value>this.FLOATPRECISION_RANGE[0])return floatPrecision;if(floatPrecision<0)return 2;for(;floatPrecision<this.FLOATPRECISION_RANGE.length;++floatPrecision){if(value>this.FLOATPRECISION_RANGE[floatPrecision])break;}return floatPrecision;};this.Operator=function(){var splitData={};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){splitData.Max=1;splitData.Min=-1;}else{splitData.Max+=splitData.Max*0.01;splitData.Min-=splitData.Min*0.01;}}var isFixedMaxMin=false;if(this.FixedYMaxMin&&IFrameSplitOperator.IsNumber(this.FixedYMaxMin.Max)&&IFrameSplitOperator.IsNumber(this.FixedYMaxMin.Min))isFixedMaxMin=true;if(isFixedMaxMin){splitData.Max=this.FixedYMaxMin.Max;splitData.Min=this.FixedYMaxMin.Min;}else if(this.DefaultYMaxMin)//指定最小的Y轴范围
 {var range=this.DefaultYMaxMin;if(IFrameSplitOperator.IsNumber(range.Max)){if(splitData.Min>range.Max)splitData.Min=range.Max;else if(splitData.Max<range.Max)splitData.Max=range.Max;}if(IFrameSplitOperator.IsNumber(range.Min)){if(splitData.Max<range.Min)splitData.Max=range.Min;else if(splitData.Min>range.Min)splitData.Min=range.Min;}}if(this.Frame.YSpecificMaxMin){splitData.Count=this.Frame.YSpecificMaxMin.Count;splitData.Interval=(splitData.Max-splitData.Min)/(splitData.Count-1);}else if(this.SplitType==1||isFixedMaxMin){splitData.Count=this.SplitCount;splitData.Interval=(splitData.Max-splitData.Min)/(splitData.Count-1);}else if(this.SplitType==2){splitData.Max=100;splitData.Min=0;splitData.Count=this.SplitCount;splitData.Interval=(splitData.Max-splitData.Min)/(splitData.Count-1);}else{splitData.Count=this.SplitCount;splitData.Interval=(splitData.Max-splitData.Min)/(splitData.Count-1);this.IntegerCoordinateSplit(splitData);}this.Frame.HorizontalMax=splitData.Max;this.Frame.HorizontalMin=splitData.Min;this.Frame.HorizontalInfo=[];if(this.Frame.YSplitScale)//固定坐标
 {for(var i in this.Frame.YSplitScale){var value=this.Frame.YSplitScale[i];var coordinate=new CoordinateInfo();coordinate.Value=value;if(IFrameSplitOperator.IsNumber(this.LineType))coordinate.LineType=this.LineType;var absValue=Math.abs(value);if(absValue<0.0000000001){coordinate.Message[1]=0;}else if(absValue<this.FLOATPRECISION_RANGE[this.FLOATPRECISION_RANGE.length-1]){coordinate.Message[1]=value.toExponential(2).toString();}else{var floatPrecision=this.GetFloatPrecision(absValue,this.FloatPrecision);//数据比小数位数还小, 调整小数位数
@@ -12839,7 +12842,7 @@ hisData.Symbol=message.symbol;}var stockObj={HQDataType:HQ_DATA_TYPE.KLINE_ID,St
 this.ExecuteScript(item,data);}this.Status=0;}};this.OnExecuteFinish=function(data,indexInfo,jsExectute,jobInfo){var message={Data:data,IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.FINISH_EXECUTE_SCRIPT,JobInfo:jobInfo};postMessage(message);};this.OnExecuteError=function(error,indexInfo,jobData){var message={IndexInfo:indexInfo,ID:JSCHART_WORKER_MESSAGE_ID.ERROR_EXECUTE_SCRIPT,Error:error};postMessage(message);};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12677";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.12679";function PrintHQChartVersion(){var log='*************************************************************************************************************\n*\n*   HQChart                                             Ver: '+HQCHART_VERSION+' \n*                             \n*   License: Apache License 2.0                                                                              \n*   Source: https://github.com/jones2000/HQChart\n*\n*************************************************************************************************************\n';console.log(log);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

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

package/src/jscommon/umychart.js

@@ -6779,13 +6779,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     
                 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)
@@ -43221,6 +43221,15 @@ 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)   //如果一样上下扩大下
 		{
@@ -43995,6 +44004,16 @@ function FrameSplitY()
         var splitData={};
         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)   //如果一样上下扩大下
 		{

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

@@ -10923,13 +10923,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     
                 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)
@@ -47365,6 +47365,15 @@ 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)   //如果一样上下扩大下
 		{
@@ -48139,6 +48148,16 @@ function FrameSplitY()
         var splitData={};
         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)   //如果一样上下扩大下
 		{
@@ -130515,7 +130534,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12677";
+var HQCHART_VERSION="1.1.12679";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -10967,13 +10967,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
     
                 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)
@@ -47409,6 +47409,15 @@ 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)   //如果一样上下扩大下
 		{
@@ -48183,6 +48192,16 @@ function FrameSplitY()
         var splitData={};
         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)   //如果一样上下扩大下
 		{
@@ -130673,7 +130692,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.12677";
+var HQCHART_VERSION="1.1.12679";
 
 function PrintHQChartVersion()
 {