hqchart 1.1.12433 → 1.1.12442

package/lib/umychart.vue.js

@@ -1924,7 +1924,8 @@ this.Tooltip.style.position="absolute";this.Tooltip.style.left=left+"px";this.To
 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轴使用主图指标， 最大最小值
 for(var i=0;i<this.Frame.SubFrame.length;++i){var subFrame=this.Frame.SubFrame[i];for(var j=0;j<subFrame.OverlayIndex.length;++j){var overlayItem=subFrame.OverlayIndex[j];var overlayFrame=overlayItem.Frame;if(overlayFrame.IsShareY!=true)continue;if(!overlayFrame.MainFrame)continue;if(!mapFrame.has(overlayFrame.MainFrame.Identify))continue;var frameItem=mapFrame.get(overlayFrame.MainFrame.Identify);if(!frameItem)continue;frameItem.OverlayFrame.push(overlayFrame);if(overlayFrame.IsCalculateYMaxMin===false)continue;//叠加坐标Y轴不调整
-for(var k=0;k<overlayItem.ChartPaint.length;++k){var paint=overlayItem.ChartPaint[k];var range=paint.GetMaxMin();if(range==null||range.Max==null||range.Min==null)continue;if(frameItem.Range.Max<range.Max)frameItem.Range.Max=range.Max;if(frameItem.Range.Min>range.Min)frameItem.Range.Min=range.Min;}}}for(var i=0;i<frameMaxMinData.length;++i){var item=frameMaxMinData[i];if(!item.Frame||!item.Range)continue;if(item.Range.Max==null||item.Range.Min==null)continue;if(item.Frame.YSpecificMaxMin){item.Frame.HorizontalMax=item.Frame.YSpecificMaxMin.Max;item.Frame.HorizontalMin=item.Frame.YSpecificMaxMin.Min;}else{item.Frame.HorizontalMax=item.Range.Max;item.Frame.HorizontalMin=item.Range.Min;}item.Frame.XYSplit=true;for(var j in item.OverlayFrame){item.OverlayFrame[j].XYSplit=true;}}//更新独立子坐标
+for(var k=0;k<overlayItem.ChartPaint.length;++k){var paint=overlayItem.ChartPaint[k];if(paint.IsShow==false)continue;//隐藏的图形不计算
+var range=paint.GetMaxMin();if(range==null||range.Max==null||range.Min==null)continue;if(frameItem.Range.Max<range.Max)frameItem.Range.Max=range.Max;if(frameItem.Range.Min>range.Min)frameItem.Range.Min=range.Min;}}}for(var i=0;i<frameMaxMinData.length;++i){var item=frameMaxMinData[i];if(!item.Frame||!item.Range)continue;if(item.Range.Max==null||item.Range.Min==null)continue;if(item.Frame.YSpecificMaxMin){item.Frame.HorizontalMax=item.Frame.YSpecificMaxMin.Max;item.Frame.HorizontalMin=item.Frame.YSpecificMaxMin.Min;}else{item.Frame.HorizontalMax=item.Range.Max;item.Frame.HorizontalMin=item.Range.Min;}item.Frame.XYSplit=true;for(var j in item.OverlayFrame){item.OverlayFrame[j].XYSplit=true;}}//更新独立子坐标
 for(var i=0;i<this.Frame.SubFrame.length;++i){var subFrame=this.Frame.SubFrame[i];for(var j=0;j<subFrame.OverlayIndex.length;++j){var overlayItem=subFrame.OverlayIndex[j];if(overlayItem.Frame.IsShareY===true)continue;overlayItem.UpdateFrameMaxMin();}}};this.DataMoveLeft=function(){var data=null;if(!this.Frame.Data)data=this.Frame.Data;else data=this.Frame.SubFrame[0].Frame.Data;if(!data)return false;if(data.DataOffset<=0)return false;--data.DataOffset;return true;};this.DataMoveRight=function(){var data=null;if(!this.Frame.Data)data=this.Frame.Data;else data=this.Frame.SubFrame[0].Frame.Data;if(!data)return false;var xPointcount=0;if(this.Frame.XPointCount)xPointcount=this.Frame.XPointCount;else xPointcount=this.Frame.SubFrame[0].Frame.XPointCount;if(!xPointcount)return false;if(xPointcount+data.DataOffset>=data.Data.length)return false;++data.DataOffset;return true;};this.UpdataDataoffset=function(){var data=null;if(this.Frame.Data)data=this.Frame.Data;else data=this.Frame.SubFrame[0].Frame.Data;if(!data)return;for(var i in this.ChartPaint){var item=this.ChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=data.DataOffset;}for(var i in this.OverlayChartPaint){var item=this.OverlayChartPaint[i];if(!item.Data)continue;item.Data.DataOffset=data.DataOffset;}//叠加指标当前显示的数据偏移
 for(var i in this.Frame.SubFrame){var subFrame=this.Frame.SubFrame[i];for(var j in subFrame.OverlayIndex){var overlayItem=subFrame.OverlayIndex[j];for(var k in overlayItem.ChartPaint){var item=overlayItem.ChartPaint[k];if(!item.Data)continue;item.Data.DataOffset=data.DataOffset;}}}};this.GetMoveOneStepWidth=function(){if(IFrameSplitOperator.IsPlusNumber(this.StepPixel))return this.StepPixel;var pixelRatio=GetDevicePixelRatio();var mainFrame=this.Frame.SubFrame[0].Frame;var dataWidth=mainFrame.DataWidth;var distanceWidth=mainFrame.DistanceWidth;var oneStepWidth=this.StepPixel;var oneStepWidth=(dataWidth+distanceWidth)/pixelRatio;if(oneStepWidth<1)oneStepWidth=1;return oneStepWidth;};this.DataMove=function(step,isLeft){var oneStepWidth=this.GetMoveOneStepWidth();var moveStep=step;step=parseInt(step/oneStepWidth);//除以4个像素
 if(step<=0)return false;var data=null;if(!this.Frame.Data)data=this.Frame.Data;else data=this.Frame.SubFrame[0].Frame.Data;if(!data)return false;var xPointcount=0;if(this.Frame.XPointCount)xPointcount=this.Frame.XPointCount;else xPointcount=this.Frame.SubFrame[0].Frame.XPointCount;if(!xPointcount)return false;if(this.Frame.SubFrame&&this.Frame.SubFrame.length>0&&this.Frame.SubFrame[0].Frame){var fristFrame=this.Frame.SubFrame[0].Frame;if(fristFrame.DataWidth<=1||fristFrame.DistanceWidth<=1)//K线在缩放很小的时候 移动加速
@@ -4895,7 +4896,7 @@ return year.toString()+'-'+IFrameSplitOperator.NumberToString(month)+'-'+IFrameS
 IFrameSplitOperator.FormatReportDateString=function(value){var year=parseInt(value/10000);var month=parseInt(value/100)%100;var monthText;switch(month){case 3:monthText="一季度报";break;case 6:monthText="半年报";break;case 9:monthText="三季度报";break;case 12:monthText="年报";break;}return year.toString()+monthText;};IFrameSplitOperator.FormatDateTimeString=function(value,isShowDate,isShowTime){var aryValue=value.split(' ');if(aryValue.length<2)return"";var result="";if(isShowDate){var date=parseInt(aryValue[0]);var year=parseInt(date/10000);var month=parseInt(date%10000/100);var day=date%100;var text=year.toString()+'-'+(month<10?'0'+month.toString():month.toString())+'-'+(day<10?'0'+day.toString():day.toString());result+=text;}if(isShowTime){var time=parseInt(aryValue[1]);if(time<10000){var minute=time%100;var hour=parseInt(time/100);var text=IFrameSplitOperator.NumberToString(hour)+':'+IFrameSplitOperator.NumberToString(minute);if(result.length>0)result+=" ";result+=text;}else{var hour=parseInt(time/10000);var minute=parseInt(time%10000/100);var second=time%100;var text=IFrameSplitOperator.NumberToString(hour)+':'+IFrameSplitOperator.NumberToString(minute)+':'+IFrameSplitOperator.NumberToString(second);if(result.length>0)result+=" ";result+=text;}}return result;};//字段颜色格式化
 IFrameSplitOperator.FormatValueColor=function(value,value2){if(value!=null&&value2==null)//只传一个值的 就判断value正负
 {if(value==0)return'PriceNull';else if(value>0)return'PriceUp';else return'PriceDown';}//2个数值对比 返回颜色
-if(value==null||value2==null)return'PriceNull';if(value==value2)return'PriceNull';else if(value>value2)return'PriceUp';else return'PriceDown';};IFrameSplitOperator.IsNumber=function(value){if(value==null)return false;if(isNaN(value))return false;return true;};//判断是否是正数
+if(value==null||value2==null)return'PriceNull';if(value==value2)return'PriceNull';else if(value>value2)return'PriceUp';else return'PriceDown';};IFrameSplitOperator.IsNumber=function(value){if(value==null)return false;if(isNaN(value))return false;return typeof value=='number';};//判断是否是正数
 IFrameSplitOperator.IsPlusNumber=function(value){if(value==null)return false;if(isNaN(value))return false;return value>0;};//是否是整形
 IFrameSplitOperator.IsInteger=function(x){return typeof x==='number'&&x%1===0;};//判断字段是否存在
 IFrameSplitOperator.IsObjectExist=function(obj){if(obj===undefined)return false;if(obj==null)return false;return true;};//是否时bool
@@ -5044,7 +5045,7 @@ this.GetMultiDayBeforeOpenData=function(){if(!this.MultiDayBeforeOpenData||!IFra
 var range=item.GetMaxMin();if(range.Max&&range.Max>max)max=range.Max;if(range.Min&&range.Min<min)min=range.Min;}if(this.SplitType==1&&this.LimitPrice){if(max<this.LimitPrice.Max)max=this.LimitPrice.Max;if(min>this.LimitPrice.Min)min=this.LimitPrice.Min;}if(IFrameSplitOperator.IsNumber(this.High)&&IFrameSplitOperator.IsNumber(this.Low)){if(max<this.High)max=this.High;if(min>this.Low)min=this.Low;}var range={Max:null,Min:null};if(this.IsAfterData&&this.AfterCloseData){this.GetCallAuctionMaxMin(this.AfterCloseData,range);}if(this.IsBeforeData&&this.BeforeOpenData){this.GetCallAuctionMaxMin(this.BeforeOpenData,range);}var multiDayBeforeOpenData=this.GetMultiDayBeforeOpenData();if(multiDayBeforeOpenData&&this.ChartBorder.MultiDayMinute.Count>1&&this.ChartBorder.MultiDayMinute.Left>0){for(var i=0;i<multiDayBeforeOpenData.length;++i){var dayItem=multiDayBeforeOpenData[i];this.GetCallAuctionMaxMin(dayItem,range);}}var multiDayAfterCloseData=this.GetMultiDayAfterCloseData();if(multiDayAfterCloseData&&this.ChartBorder.MultiDayMinute.Count>1&&this.ChartBorder.MultiDayMinute.Right>0){for(var i=0;i<multiDayAfterCloseData.length;++i){var dayItem=multiDayAfterCloseData[i];this.GetCallAuctionMaxMin(dayItem,range);}}if(IFrameSplitOperator.IsNumber(range.Max)&&max<range.Max)max=range.Max;if(IFrameSplitOperator.IsNumber(range.Min)&&min>range.Min)min=range.Min;//叠加指标
 var overlayRange=this.GetOverlayMaxMin();if(overlayRange){if(IFrameSplitOperator.IsNumber(overlayRange.Max)&&overlayRange.Max>max)max=overlayRange.Max;if(IFrameSplitOperator.IsNumber(overlayRange.Min)&&overlayRange.Min<min)min=overlayRange.Min;}return{Max:max,Min:min};};//获取共享Y轴叠加指标最大，最小值
 this.GetOverlayMaxMin=function(){if(!this.HQChart)return null;if(!this.HQChart.Frame||!this.HQChart.Frame.SubFrame)return null;var subFrame=this.HQChart.Frame.SubFrame[0];if(!subFrame)return null;if(!IFrameSplitOperator.IsNonEmptyArray(subFrame.OverlayIndex))return null;var range={Max:null,Min:null};for(var i=0;i<subFrame.OverlayIndex.length;++i){var item=subFrame.OverlayIndex[i];if(!item||!item.Frame)continue;var overlayFrame=item.Frame;if(overlayFrame.IsShareY!=true)continue;if(overlayFrame.IsCalculateYMaxMin===false)continue;//叠加坐标Y轴不调整
-for(var j=0;j<item.ChartPaint.length;++j){var paint=item.ChartPaint[j];var value=paint.GetMaxMin();if(value==null||value.Max==null||value.Min==null)continue;if(range.Max==null||range.Max<value.Max)range.Max=value.Max;if(range.Min==null||range.Min>value.Min)range.Min=value.Min;}}return range;};this.USASplit=function(range){var max=range.Max;var min=range.Min;if(max==min){max=max+max*0.1;min=min-min*0.1;}else{var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
+for(var j=0;j<item.ChartPaint.length;++j){var paint=item.ChartPaint[j];if(paint.IsShow==false)continue;var value=paint.GetMaxMin();if(value==null||value.Max==null||value.Min==null)continue;if(range.Max==null||range.Max<value.Max)range.Max=value.Max;if(range.Min==null||range.Min>value.Min)range.Min=value.Min;}}return range;};this.USASplit=function(range){var max=range.Max;var min=range.Min;if(max==min){max=max+max*0.1;min=min-min*0.1;}else{var pixelTatio=GetDevicePixelRatio();//获取设备的分辨率
 var height=this.Frame.ChartBorder.GetHeight();//画布的高度
 var spacePrice=5*pixelTatio*(max-min)/height;max+=spacePrice;min-=spacePrice;if(min<0)min=range.Min;}var showCount=this.SplitCount;var distance=(max-min)/(showCount-1);var minDistance=[1,0.1,0.01,0.001,0.0001];var defaultfloatPrecision=GetfloatPrecision(this.Symbol);if(distance<minDistance[defaultfloatPrecision]){distance=minDistance[defaultfloatPrecision];max=min+distance*showCount;//min=this.YClose-(distance*(showCount-1)/2);
 }for(var i=0;i<showCount;++i){var price=min+distance*i;if(this.YClose&&price==this.YClose)continue;var coordinate=new CoordinateInfo();coordinate.Value=price;var strPrice=price.toFixed(defaultfloatPrecision);//价格刻度字符串
@@ -9373,41 +9374,41 @@ var result=[];if(!isNumber&&!isNumber2){var count=Math.max(data.length,data2.len
 if(_i53<data.length&&_i53<data2.length){if(this.IsNumber(data[_i53])&&this.IsDivideNumber(data2[_i53]))result[_i53]=data[_i53]/data2[_i53];}}return result;}if(isNumber)//单数据-数组
 {for(var _i54 in data2){result[_i54]=null;if(this.IsNumber(data)&&this.IsDivideNumber(data2[_i54]))result[_i54]=data/data2[_i54];}}else//数组-单数据
 {for(var _i55 in data){result[_i55]=null;if(this.IsNumber(data[_i55])&&this.IsDivideNumber(data2))result[_i55]=data[_i55]/data2;}}return result;};//大于
-this.GT=function(data,data2){var isNumber=typeof data=='number';var isNumber2=typeof data2=='number';//单数值比较
+this.GT=function(data,data2){var isNumber=IFrameSplitOperator.IsNumber(data);var isNumber2=IFrameSplitOperator.IsNumber(data2);//单数值比较
 if(isNumber&&isNumber2)return data>data2?1:0;//都是数组比较
-var result=[];if(!isNumber&&!isNumber2){var count=Math.max(data.length,data2.length);for(var _i56=0;_i56<count;++_i56){result[_i56]=null;//初始化
-if(_i56<data.length&&_i56<data2.length){if(!isNaN(data[_i56])&&!isNaN(data2[_i56]))result[_i56]=data[_i56]>data2[_i56]?1:0;}}return result;}if(isNumber)//单数据-数组
-{for(var _i57 in data2){result[_i57]=null;if(!isNaN(data)&&!isNaN(data2[_i57]))result[_i57]=data>data2[_i57]?1:0;}}else//数组-单数据
+var result=[];if(Array.isArray(data)&&Array.isArray(data2)){var count=Math.max(data.length,data2.length);for(var _i56=0;_i56<count;++_i56){result[_i56]=null;//初始化
+if(_i56<data.length&&_i56<data2.length){if(!isNaN(data[_i56])&&!isNaN(data2[_i56]))result[_i56]=data[_i56]>data2[_i56]?1:0;}}return result;}if(isNumber&&Array.isArray(data2))//单数据-数组
+{for(var _i57 in data2){result[_i57]=null;if(!isNaN(data)&&!isNaN(data2[_i57]))result[_i57]=data>data2[_i57]?1:0;}}else if(isNumber2&&Array.isArray(data))//数组-单数据
 {for(var _i58 in data){result[_i58]=null;if(!isNaN(data[_i58])&&!isNaN(data2))result[_i58]=data[_i58]>data2?1:0;}}return result;};//大于等于
-this.GTE=function(data,data2){var isNumber=typeof data=='number';var isNumber2=typeof data2=='number';//单数值比较
+this.GTE=function(data,data2){var isNumber=IFrameSplitOperator.IsNumber(data);var isNumber2=IFrameSplitOperator.IsNumber(data2);//单数值比较
 if(isNumber&&isNumber2)return data>=data2?1:0;//都是数组比较
-var result=[];if(!isNumber&&!isNumber2){var count=Math.max(data.length,data2.length);for(var _i59=0;_i59<count;++_i59){result[_i59]=null;//初始化
-if(_i59<data.length&&_i59<data2.length){if(!isNaN(data[_i59])&&!isNaN(data2[_i59]))result[_i59]=data[_i59]>=data2[_i59]?1:0;}}return result;}if(isNumber)//单数据-数组
-{for(var _i60 in data2){result[_i60]=null;if(!isNaN(data)&&!isNaN(data2[_i60]))result[_i60]=data>=data2[_i60]?1:0;}}else//数组-单数据
+var result=[];if(Array.isArray(data)&&Array.isArray(data2)){var count=Math.max(data.length,data2.length);for(var _i59=0;_i59<count;++_i59){result[_i59]=null;//初始化
+if(_i59<data.length&&_i59<data2.length){if(!isNaN(data[_i59])&&!isNaN(data2[_i59]))result[_i59]=data[_i59]>=data2[_i59]?1:0;}}return result;}if(isNumber&&Array.isArray(data2))//单数据-数组
+{for(var _i60 in data2){result[_i60]=null;if(!isNaN(data)&&!isNaN(data2[_i60]))result[_i60]=data>=data2[_i60]?1:0;}}else if(isNumber2&&Array.isArray(data))//数组-单数据
 {for(var _i61 in data){result[_i61]=null;if(!isNaN(data[_i61])&&!isNaN(data2))result[_i61]=data[_i61]>=data2?1:0;}}return result;};//小于
-this.LT=function(data,data2){var isNumber=typeof data=='number';var isNumber2=typeof data2=='number';//单数值比较
+this.LT=function(data,data2){var isNumber=IFrameSplitOperator.IsNumber(data);var isNumber2=IFrameSplitOperator.IsNumber(data2);//单数值比较
 if(isNumber&&isNumber2)return data<data2?1:0;//都是数组比较
-var result=[];if(!isNumber&&!isNumber2){var count=Math.max(data.length,data2.length);for(var _i62=0;_i62<count;++_i62){result[_i62]=null;//初始化
-if(_i62<data.length&&_i62<data2.length){if(!isNaN(data[_i62])&&!isNaN(data2[_i62]))result[_i62]=data[_i62]<data2[_i62]?1:0;}}return result;}if(isNumber)//单数据-数组
-{for(var _i63 in data2){result[_i63]=null;if(!isNaN(data)&&!isNaN(data2[_i63]))result[_i63]=data<data2[_i63]?1:0;}}else//数组-单数据
+var result=[];if(Array.isArray(data)&&Array.isArray(data2)){var count=Math.max(data.length,data2.length);for(var _i62=0;_i62<count;++_i62){result[_i62]=null;//初始化
+if(_i62<data.length&&_i62<data2.length){if(!isNaN(data[_i62])&&!isNaN(data2[_i62]))result[_i62]=data[_i62]<data2[_i62]?1:0;}}return result;}if(isNumber&&Array.isArray(data2))//单数据-数组
+{for(var _i63 in data2){result[_i63]=null;if(!isNaN(data)&&!isNaN(data2[_i63]))result[_i63]=data<data2[_i63]?1:0;}}else if(isNumber2&&Array.isArray(data))//数组-单数据
 {for(var _i64 in data){result[_i64]=null;if(!isNaN(data[_i64])&&!isNaN(data2))result[_i64]=data[_i64]<data2?1:0;}}return result;};//小于等于
-this.LTE=function(data,data2){var isNumber=typeof data=='number';var isNumber2=typeof data2=='number';//单数值比较
+this.LTE=function(data,data2){var isNumber=IFrameSplitOperator.IsNumber(data);var isNumber2=IFrameSplitOperator.IsNumber(data2);//单数值比较
 if(isNumber&&isNumber2)return data>=data2?1:0;//都是数组比较
-var result=[];if(!isNumber&&!isNumber2){var count=Math.max(data.length,data2.length);for(var _i65=0;_i65<count;++_i65){result[_i65]=null;//初始化
-if(_i65<data.length&&_i65<data2.length){if(!isNaN(data[_i65])&&!isNaN(data2[_i65]))result[_i65]=data[_i65]<=data2[_i65]?1:0;}}return result;}if(isNumber)//单数据-数组
-{for(var _i66 in data2){result[_i66]=null;if(!isNaN(data)&&!isNaN(data2[_i66]))result[_i66]=data<=data2[_i66]?1:0;}}else//数组-单数据
+var result=[];if(Array.isArray(data)&&Array.isArray(data2)){var count=Math.max(data.length,data2.length);for(var _i65=0;_i65<count;++_i65){result[_i65]=null;//初始化
+if(_i65<data.length&&_i65<data2.length){if(!isNaN(data[_i65])&&!isNaN(data2[_i65]))result[_i65]=data[_i65]<=data2[_i65]?1:0;}}return result;}if(isNumber&&Array.isArray(data2))//单数据-数组
+{for(var _i66 in data2){result[_i66]=null;if(!isNaN(data)&&!isNaN(data2[_i66]))result[_i66]=data<=data2[_i66]?1:0;}}else if(isNumber2&&Array.isArray(data))//数组-单数据
 {for(var _i67 in data){result[_i67]=null;if(!isNaN(data[_i67])&&!isNaN(data2))result[_i67]=data[_i67]<=data2?1:0;}}return result;};//等于
-this.EQ=function(data,data2){var isNumber=typeof data=='number';var isNumber2=typeof data2=='number';//单数值比较
+this.EQ=function(data,data2){var isNumber=IFrameSplitOperator.IsNumber(data);var isNumber2=IFrameSplitOperator.IsNumber(data2);//单数值比较
 if(isNumber&&isNumber2)return data==data2?1:0;//都是数组比较
-var result=[];if(!isNumber&&!isNumber2){var count=Math.max(data.length,data2.length);for(var _i68=0;_i68<count;++_i68){result[_i68]=null;//初始化
-if(_i68<data.length&&_i68<data2.length){if(!isNaN(data[_i68])&&!isNaN(data2[_i68]))result[_i68]=data[_i68]==data2[_i68]?1:0;}}return result;}if(isNumber)//单数据-数组
-{for(var _i69 in data2){result[_i69]=null;if(!isNaN(data)&&!isNaN(data2[_i69]))result[_i69]=data==data2[_i69]?1:0;}}else//数组-单数据
+var result=[];if(Array.isArray(data)&&Array.isArray(data2)){var count=Math.max(data.length,data2.length);for(var _i68=0;_i68<count;++_i68){result[_i68]=null;//初始化
+if(_i68<data.length&&_i68<data2.length){if(!isNaN(data[_i68])&&!isNaN(data2[_i68]))result[_i68]=data[_i68]==data2[_i68]?1:0;}}return result;}if(isNumber&&Array.isArray(data2))//单数据-数组
+{for(var _i69 in data2){result[_i69]=null;if(!isNaN(data)&&!isNaN(data2[_i69]))result[_i69]=data==data2[_i69]?1:0;}}else if(isNumber2&&Array.isArray(data))//数组-单数据
 {for(var _i70 in data){result[_i70]=null;if(!isNaN(data[_i70])&&!isNaN(data2))result[_i70]=data[_i70]==data2?1:0;}}return result;};//不等于
-this.NEQ=function(data,data2){var isNumber=typeof data=='number';var isNumber2=typeof data2=='number';//单数值比较
+this.NEQ=function(data,data2){var isNumber=IFrameSplitOperator.IsNumber(data);var isNumber2=IFrameSplitOperator.IsNumber(data2);//单数值比较
 if(isNumber&&isNumber2)return data!=data2?1:0;//都是数组比较
-var result=[];if(!isNumber&&!isNumber2){var count=Math.max(data.length,data2.length);for(var _i71=0;_i71<count;++_i71){result[_i71]=null;//初始化
-if(_i71<data.length&&_i71<data2.length){if(!isNaN(data[_i71])&&!isNaN(data2[_i71]))result[_i71]=data[_i71]!=data2[_i71]?1:0;}}return result;}if(isNumber)//单数据-数组
-{for(var _i72 in data2){result[_i72]=null;if(!isNaN(data)&&!isNaN(data2[_i72]))result[_i72]=data!=data2[_i72]?1:0;}}else//数组-单数据
+var result=[];if(Array.isArray(data)&&Array.isArray(data2)){var count=Math.max(data.length,data2.length);for(var _i71=0;_i71<count;++_i71){result[_i71]=null;//初始化
+if(_i71<data.length&&_i71<data2.length){if(!isNaN(data[_i71])&&!isNaN(data2[_i71]))result[_i71]=data[_i71]!=data2[_i71]?1:0;}}return result;}if(isNumber&&Array.isArray(data2))//单数据-数组
+{for(var _i72 in data2){result[_i72]=null;if(!isNaN(data)&&!isNaN(data2[_i72]))result[_i72]=data!=data2[_i72]?1:0;}}else if(isNumber2&&Array.isArray(data))//数组-单数据
 {for(var _i73 in data){result[_i73]=null;if(!isNaN(data[_i73])&&!isNaN(data2))result[_i73]=data[_i73]!=data2?1:0;}}return result;};//AND  &&
 this.And=function(data,data2){var isNumber=typeof data=='number';var isNumber2=typeof data2=='number';//单数值 &&
 if(isNumber&&isNumber2)return data&&data2?1:0;//都是数组 &&
@@ -12468,7 +12469,7 @@ this.AreaColor=g_JSChartResource.ScrollBar.BGChart.AreaColor;//面积图颜色
 };this.Draw=function(){if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return;this.Canvas.save();if(this.LineWidth>0)this.Canvas.lineWidth=this.LineWidth*GetDevicePixelRatio();var bottom=this.ChartBorder.GetBottom();this.Canvas.strokeStyle=this.Color;var bFirstPoint=true;var drawCount=0,x,y;var firstPoint={};for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];var value=item.Close;if(!IFrameSplitOperator.IsNumber(value))continue;x=this.ChartFrame.GetXFromIndex(i);y=this.ChartFrame.GetYFromData(value);if(bFirstPoint){this.Canvas.beginPath();this.Canvas.moveTo(x,y);bFirstPoint=false;firstPoint={X:x,Y:y};}else{this.Canvas.lineTo(x,y);}++drawCount;}if(drawCount>0){this.Canvas.stroke();this.Canvas.lineTo(x,bottom);this.Canvas.lineTo(firstPoint.X,bottom);this.Canvas.closePath();this.Canvas.fillStyle=this.AreaColor;this.Canvas.fill();}this.Canvas.restore();};this.GetMaxMin=function(){var range={Max:null,Min:null};if(!this.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return range;for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];var value=item.Close;if(!IFrameSplitOperator.IsNumber(value))continue;if(range.Max==null||range.Max<value)range.Max=value;if(range.Min==null||range.Min>value)range.Min=value;}return range;};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.12432";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.12441";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.12433",
+  "version": "1.1.12442",
   "main": "lib/main.js",
   "private": false,
   "license": "Apache License 2.0",

package/src/jscommon/umychart.complier.js

@@ -2411,15 +2411,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //大于
     this.GT=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -2435,7 +2435,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -2443,7 +2443,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data>data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -2458,15 +2458,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //大于等于
     this.GTE=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -2482,7 +2482,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -2490,7 +2490,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data>=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -2505,15 +2505,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //小于
     this.LT=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data<data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -2529,7 +2529,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -2537,7 +2537,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data<data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -2552,15 +2552,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //小于等于
     this.LTE=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -2576,7 +2576,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -2584,7 +2584,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data<=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -2599,15 +2599,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //等于
     this.EQ=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data==data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -2623,7 +2623,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -2631,7 +2631,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data==data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -2646,15 +2646,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //不等于
     this.NEQ=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data!=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -2670,7 +2670,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -2678,7 +2678,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data!=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {

package/src/jscommon/umychart.js

@@ -6692,6 +6692,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 for(var k=0; k<overlayItem.ChartPaint.length; ++k)
                 {
                     var paint=overlayItem.ChartPaint[k];
+                    if (paint.IsShow==false) 
+                        continue;   //隐藏的图形不计算
                     var range=paint.GetMaxMin();
                     if (range==null || range.Max==null || range.Min==null) continue;
 
@@ -42428,7 +42430,7 @@ IFrameSplitOperator.IsNumber=function(value)
     if (value==null) return false;
     if (isNaN(value)) return false;
 
-    return true;
+    return typeof(value)=='number';
 }
 
 //判断是否是正数
@@ -44290,13 +44292,13 @@ function FrameSplitMinutePriceY()
         if (IFrameSplitOperator.IsNumber(range.Max) && max<range.Max) max=range.Max;
         if (IFrameSplitOperator.IsNumber(range.Min) && min>range.Min) min=range.Min;
 
-         //叠加指标
-         var overlayRange=this.GetOverlayMaxMin();
-         if (overlayRange)
-         {
-             if (IFrameSplitOperator.IsNumber(overlayRange.Max) && overlayRange.Max>max) max=overlayRange.Max;
-             if (IFrameSplitOperator.IsNumber(overlayRange.Min) && overlayRange.Min<min) min=overlayRange.Min;
-         }
+        //叠加指标
+        var overlayRange=this.GetOverlayMaxMin();
+        if (overlayRange)
+        {
+            if (IFrameSplitOperator.IsNumber(overlayRange.Max) && overlayRange.Max>max) max=overlayRange.Max;
+            if (IFrameSplitOperator.IsNumber(overlayRange.Min) && overlayRange.Min<min) min=overlayRange.Min;
+        }
  
 
         return { Max:max, Min:min };
@@ -44322,6 +44324,8 @@ function FrameSplitMinutePriceY()
             for(var j=0;j<item.ChartPaint.length; ++j)
             {
                 var paint=item.ChartPaint[j];
+                if (paint.IsShow==false) continue;
+
                 var value=paint.GetMaxMin();
                 if (value==null || value.Max==null || value.Min==null) continue;
 

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

@@ -10772,6 +10772,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 for(var k=0; k<overlayItem.ChartPaint.length; ++k)
                 {
                     var paint=overlayItem.ChartPaint[k];
+                    if (paint.IsShow==false) 
+                        continue;   //隐藏的图形不计算
                     var range=paint.GetMaxMin();
                     if (range==null || range.Max==null || range.Min==null) continue;
 
@@ -46508,7 +46510,7 @@ IFrameSplitOperator.IsNumber=function(value)
     if (value==null) return false;
     if (isNaN(value)) return false;
 
-    return true;
+    return typeof(value)=='number';
 }
 
 //判断是否是正数
@@ -48370,13 +48372,13 @@ function FrameSplitMinutePriceY()
         if (IFrameSplitOperator.IsNumber(range.Max) && max<range.Max) max=range.Max;
         if (IFrameSplitOperator.IsNumber(range.Min) && min>range.Min) min=range.Min;
 
-         //叠加指标
-         var overlayRange=this.GetOverlayMaxMin();
-         if (overlayRange)
-         {
-             if (IFrameSplitOperator.IsNumber(overlayRange.Max) && overlayRange.Max>max) max=overlayRange.Max;
-             if (IFrameSplitOperator.IsNumber(overlayRange.Min) && overlayRange.Min<min) min=overlayRange.Min;
-         }
+        //叠加指标
+        var overlayRange=this.GetOverlayMaxMin();
+        if (overlayRange)
+        {
+            if (IFrameSplitOperator.IsNumber(overlayRange.Max) && overlayRange.Max>max) max=overlayRange.Max;
+            if (IFrameSplitOperator.IsNumber(overlayRange.Min) && overlayRange.Min<min) min=overlayRange.Min;
+        }
  
 
         return { Max:max, Min:min };
@@ -48402,6 +48404,8 @@ function FrameSplitMinutePriceY()
             for(var j=0;j<item.ChartPaint.length; ++j)
             {
                 var paint=item.ChartPaint[j];
+                if (paint.IsShow==false) continue;
+
                 var value=paint.GetMaxMin();
                 if (value==null || value.Max==null || value.Min==null) continue;
 
@@ -94500,15 +94504,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //大于
     this.GT=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94524,7 +94528,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94532,7 +94536,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data>data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94547,15 +94551,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //大于等于
     this.GTE=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94571,7 +94575,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94579,7 +94583,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data>=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94594,15 +94598,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //小于
     this.LT=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data<data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94618,7 +94622,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94626,7 +94630,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data<data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94641,15 +94645,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //小于等于
     this.LTE=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94665,7 +94669,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94673,7 +94677,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data<=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94688,15 +94692,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //等于
     this.EQ=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data==data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94712,7 +94716,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94720,7 +94724,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data==data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94735,15 +94739,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //不等于
     this.NEQ=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data!=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94759,7 +94763,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94767,7 +94771,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data!=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -127637,7 +127641,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12432";
+var HQCHART_VERSION="1.1.12441";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -10816,6 +10816,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 for(var k=0; k<overlayItem.ChartPaint.length; ++k)
                 {
                     var paint=overlayItem.ChartPaint[k];
+                    if (paint.IsShow==false) 
+                        continue;   //隐藏的图形不计算
                     var range=paint.GetMaxMin();
                     if (range==null || range.Max==null || range.Min==null) continue;
 
@@ -46552,7 +46554,7 @@ IFrameSplitOperator.IsNumber=function(value)
     if (value==null) return false;
     if (isNaN(value)) return false;
 
-    return true;
+    return typeof(value)=='number';
 }
 
 //判断是否是正数
@@ -48414,13 +48416,13 @@ function FrameSplitMinutePriceY()
         if (IFrameSplitOperator.IsNumber(range.Max) && max<range.Max) max=range.Max;
         if (IFrameSplitOperator.IsNumber(range.Min) && min>range.Min) min=range.Min;
 
-         //叠加指标
-         var overlayRange=this.GetOverlayMaxMin();
-         if (overlayRange)
-         {
-             if (IFrameSplitOperator.IsNumber(overlayRange.Max) && overlayRange.Max>max) max=overlayRange.Max;
-             if (IFrameSplitOperator.IsNumber(overlayRange.Min) && overlayRange.Min<min) min=overlayRange.Min;
-         }
+        //叠加指标
+        var overlayRange=this.GetOverlayMaxMin();
+        if (overlayRange)
+        {
+            if (IFrameSplitOperator.IsNumber(overlayRange.Max) && overlayRange.Max>max) max=overlayRange.Max;
+            if (IFrameSplitOperator.IsNumber(overlayRange.Min) && overlayRange.Min<min) min=overlayRange.Min;
+        }
  
 
         return { Max:max, Min:min };
@@ -48446,6 +48448,8 @@ function FrameSplitMinutePriceY()
             for(var j=0;j<item.ChartPaint.length; ++j)
             {
                 var paint=item.ChartPaint[j];
+                if (paint.IsShow==false) continue;
+
                 var value=paint.GetMaxMin();
                 if (value==null || value.Max==null || value.Min==null) continue;
 
@@ -94544,15 +94548,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //大于
     this.GT=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94568,7 +94572,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94576,7 +94580,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data>data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94591,15 +94595,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //大于等于
     this.GTE=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94615,7 +94619,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94623,7 +94627,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data>=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94638,15 +94642,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //小于
     this.LT=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data<data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94662,7 +94666,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94670,7 +94674,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data<data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94685,15 +94689,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //小于等于
     this.LTE=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data>=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94709,7 +94713,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94717,7 +94721,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data<=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94732,15 +94736,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //等于
     this.EQ=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data==data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94756,7 +94760,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94764,7 +94768,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data==data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -94779,15 +94783,15 @@ function JSAlgorithm(errorHandler,symbolData)
     //不等于
     this.NEQ=function(data,data2)
     {
-        let isNumber=typeof(data)=='number';
-        let isNumber2=typeof(data2)=='number';
+        let isNumber=IFrameSplitOperator.IsNumber(data);
+        let isNumber2=IFrameSplitOperator.IsNumber(data2);
 
         //单数值比较
         if (isNumber && isNumber2) return (data!=data2 ? 1 : 0);
 
         //都是数组比较
         let result=[];
-        if (!isNumber && !isNumber2)
+        if (Array.isArray(data) && Array.isArray(data2))
         {
             let count=Math.max(data.length, data2.length);
             for(let i=0;i<count;++i)
@@ -94803,7 +94807,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94811,7 +94815,7 @@ function JSAlgorithm(errorHandler,symbolData)
                 if ( !isNaN(data) && !isNaN(data2[i]) ) result[i]=(data!=data2[i] ? 1 : 0);
             }
         }
-        else            //数组-单数据
+        else if (isNumber2 && Array.isArray(data))          //数组-单数据
         {
             for(let i in data)
             {
@@ -127681,7 +127685,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12432";
+var HQCHART_VERSION="1.1.12441";
 
 function PrintHQChartVersion()
 {

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

@@ -2499,13 +2499,27 @@ function JSAlgorithm(errorHandler, symbolData)
         let result=[];
         if (typeof(n)=='number')
         {
-            if (data.length<=0) return result;
-            if (n>=data.length) return result;
-
-            result=data.slice(0,data.length-n);
-
-            for(let i=0;i<n;++i)
-                result.unshift(null);
+            if (IFrameSplitOperator.IsNumber(data)) //单数值
+            {
+                if (n<0) return result;
+                var kData=this.SymbolData.Data.Data;
+                if (!kData || kData.length<=0) return result;
+                var count=kData.length;
+                for(var i=n;i<count;++i)
+                {
+                    result[i]=data;
+                }
+            }
+            else
+            {
+                if (data.length<=0) return result;
+                if (n>=data.length) return result;
+    
+                result=data.slice(0,data.length-n);
+    
+                for(let i=0;i<n;++i)
+                    result.unshift(null);
+            }
         }
         else    //n 为数组的情况
         {
@@ -3674,9 +3688,21 @@ function JSAlgorithm(errorHandler, symbolData)
         { 
             if (n==0)
             {
-                result[0]=data[0];
+                var start=-1;
+                for(var i=0; i<data.length; ++i)    //取第1个有效数
+                {
+                    if (IFrameSplitOperator.IsNumber(data[i]))
+                    {
+                        start=i;
+                        break;
+                    }
+                }
+
+                if (start<0) return result;
+
+                result[start]=data[start];
         
-                for (var i=1; i<data.length; ++i)
+                for (var i=start+1; i<data.length; ++i)
                 {
                     result[i] = result[i-1]+data[i];
                 }

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

@@ -1253,9 +1253,50 @@ function FrameSplitMinutePriceY()
             if (min > this.Low) min = this.Low;
         }
 
+        //叠加指标
+        var overlayRange=this.GetOverlayMaxMin();
+        if (overlayRange)
+        {
+            if (IFrameSplitOperator.IsNumber(overlayRange.Max) && overlayRange.Max>max) max=overlayRange.Max;
+            if (IFrameSplitOperator.IsNumber(overlayRange.Min) && overlayRange.Min<min) min=overlayRange.Min;
+        }
+
         return { Max: max, Min: min };
     }
 
+    //获取共享Y轴叠加指标最大，最小值
+    this.GetOverlayMaxMin=function()
+    {
+        if (!this.HQChart) return null;
+        if (!this.HQChart.Frame || !this.HQChart.Frame.SubFrame) return null;
+        var subFrame=this.HQChart.Frame.SubFrame[0];
+        if (!subFrame) return null;
+        if (!IFrameSplitOperator.IsNonEmptyArray(subFrame.OverlayIndex)) return null;
+
+        var range={ Max:null, Min:null };
+        for(var i=0;i<subFrame.OverlayIndex.length;++i)
+        {
+            var item=subFrame.OverlayIndex[i];
+            if (!item || !item.Frame) continue;
+            var overlayFrame=item.Frame;
+            if (overlayFrame.IsShareY!=true) continue;
+            if (overlayFrame.IsCalculateYMaxMin===false) continue;  //叠加坐标Y轴不调整
+            for(var j=0;j<item.ChartPaint.length; ++j)
+            {
+                var paint=item.ChartPaint[j];
+                if (paint.IsShow==false) continue;
+
+                var value=paint.GetMaxMin();
+                if (value==null || value.Max==null || value.Min==null) continue;
+
+                if (range.Max==null || range.Max<value.Max) range.Max=value.Max;
+                if (range.Min==null || range.Min>value.Min ) range.Min=value.Min;
+            }
+        }
+
+        return range;
+    }
+
     this.USASplit=function(range)
     {
         var max=range.Max;

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

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

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

@@ -8368,6 +8368,7 @@ function MinuteChartContainer(uielement)
                 frame.YSplitOperator = new FrameSplitMinutePriceY();
                 frame.YSplitOperator.FrameSplitData = this.FrameSplitData.get('price');
                 frame.YSplitOperator.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
+                frame.YSplitOperator.HQChart=this;
             }
             else 
             {