hqchart 1.1.12437 → 1.1.12446

package/lib/umychart.vue.js

@@ -4896,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
@@ -9374,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;//都是数组 &&
@@ -10728,7 +10728,7 @@ var endWeek=endDate.getDay();if(endWeek==0)endWeek=7;var beginWeek=beginDate.get
 var millisDiff=endDate.getTime()-beginDate.getTime();var dayDiff=Math.floor((millisDiff+(beginWeek-endWeek)*(24*60*60*1000))/86400000);return Math.ceil(dayDiff/7)+1;};this.REFDATE=function(data,date){var result=null;var findDate=null;if(Array.isArray(date)){if(date.length>0)findDate=date[date.length-1];}else if(this.IsNumber(date)){findDate=date;}if(findDate==null)return null;if(findDate<5000000)findDate+=19000000;var index=null;for(var _i138 in this.Data.Data)//查找日期对应的索引
 {if(this.Data.Data[_i138].Date==findDate){index=parseInt(_i138);break;}}if(index==null||index>=data.length)return null;return data[index];};//用法:结果从0到11,依次分别是1/5/15/30/60分钟,日/周/月,多分钟,多日,季,年
 this.PERIOD=function(){//Period周期 0=日线 1=周线 2=月线 3=年线 9=季线 4=1分钟 5=5分钟 6=15分钟 7=30分钟 8=60分钟
-var PERIOD_MAP=[5,6,7,11,0,1,2,3,4,5,9];if(this.Period>=0&&this.Period<=PERIOD_MAP.length-1)return PERIOD_MAP[this.Period];return this.Period;};this.GetDrawNull=function(){var result=[];if(!this.Data||!this.Data.Data||!this.Data.Data.length)return result;for(var _i139 in this.Data.Data){result[_i139]=null;}return result;};/*
+var PERIOD_MAP=[5,6,7,11,0,1,2,3,4,5,9];if(this.Period>=0&&this.Period<=PERIOD_MAP.length-1)return PERIOD_MAP[this.Period];return this.Period;};this.GetDrawNull=function(){var result=[];if(!this.Data||!this.Data.Data||!this.Data.Data.length)return result;for(var _i139 in this.Data.Data){result[_i139]=null;}return result;};this.HOUR=function(){var result=[];if(!this.Data||!this.Data.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return result;for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];result[i]=0;if(IFrameSplitOperator.IsNumber(item.Time))result[i]=parseInt(item.Time/100);}return result;};this.MINUTE=function(){var result=[];if(!this.Data||!this.Data.Data||!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return result;for(var i=0;i<this.Data.Data.length;++i){var item=this.Data.Data[i];result[i]=0;if(IFrameSplitOperator.IsNumber(item.Time))result[i]=item.Time%100;}return result;};/*
     飞狐函数 SYSPARAM
     SYSPARAM(1)画面上光标位置(K线序号)
     SYSPARAM(2)主图可见K线最初位置
@@ -10861,7 +10861,7 @@ this.ConstVarTable=new _map2.default([//个股数据
 ["ZSTJJ",null],//分时图均价线,对于分时图周期指标有效.
 ["ISEQUAL",null],["ISUP",null],["ISDOWN"],//ISUP=收阳 ISEQUAL=平盘 ISDOWN=收阴
 //日期类
-['DATE',null],['YEAR',null],['MONTH',null],['PERIOD',null],['WEEK',null],['WEEKDAY',null],["TIME",null],["DAY",null],["DATETIME",null],["TIME2",null],["WEEKOFYEAR",null],["DAYSTOTODAY",null],//大盘数据
+['DATE',null],['YEAR',null],['MONTH',null],['PERIOD',null],['WEEK',null],['WEEKDAY',null],["TIME",null],["DAY",null],["DATETIME",null],["TIME2",null],["WEEKOFYEAR",null],["DAYSTOTODAY",null],["HOUR",null],["MINUTE",null],//大盘数据
 ['INDEXA',null],['INDEXC',null],['INDEXH',null],['INDEXL',null],['INDEXO',null],['INDEXV',null],['INDEXADV',null],['INDEXDEC',null],["ADVANCE",null],['DECLINE',null],['FROMOPEN',null],//已开盘有多长分钟
 ['TOTALFZNUM',null],//该品种的每天的总交易分钟数.
 ['CURRBARSCOUNT',null],//到最后交易日的周期数
@@ -10920,7 +10920,7 @@ return this.SymbolData.GetVariantData(jobItem);case JS_EXECUTE_JOB_ID.JOB_CUSTOM
 case"ISUP"://收阳
 case"ISDOWN"://收阴
 return this.SymbolData.GetSymbolCacheData(name);case'VOLR':return this.SymbolData.GetVolRateCacheData(node);//大盘数据
-case'INDEXA':case'INDEXC':case'INDEXH':case'INDEXH':case'INDEXO':case'INDEXV':case'INDEXL':case'INDEXADV':case'INDEXDEC':return this.SymbolData.GetIndexCacheData(name);case'CURRBARSCOUNT':return this.SymbolData.GetCurrBarsCount();case"BARPOS":return this.SymbolData.GetBarPos();case"TOTALBARSCOUNT":return this.SymbolData.GetTotalBarsCount();case"TOTALFZNUM":return this.SymbolData.GetTotalTradeMinuteCount();case'ISLASTBAR':return this.SymbolData.GetIsLastBar();case"BARSTATUS":return this.SymbolData.GetBarStatus();case"TOTALCAPITAL":case'CAPITAL':case'EXCHANGE':case"HYBLOCK":case"DYBLOCK":case"GNBLOCK":case"FGBLOCK":case"ZSBLOCK":case"ZHBLOCK":case"ZDBLOCK":case"HYZSCODE":case"GNBLOCKNUM":case"FGBLOCKNUM":case"ZSBLOCKNUM":case"ZHBLOCKNUM":case"ZDBLOCKNUM":case"HYSYL":case"HYSJL":return this.SymbolData.GetStockCacheData({VariantName:name,Node:node});case'SETCODE':return this.SymbolData.SETCODE();case'CODE':return this.SymbolData.GetSymbol();case'STKNAME':return this.SymbolData.GetName();case"TIME":return this.SymbolData.TIME();case"TIME2":return this.SymbolData.TIME2();case'DATE':return this.SymbolData.DATE();case"DATETIME":return this.SymbolData.DateTime();case'YEAR':return this.SymbolData.YEAR();case'MONTH':return this.SymbolData.MONTH();case'WEEK':case"WEEKDAY":return this.SymbolData.WEEK();case"DAY":return this.SymbolData.DAY();case'PERIOD':return this.SymbolData.PERIOD();case'FROMOPEN':return this.SymbolData.GetLatestIndexCacheData('FROMOPEN');case'DRAWNULL':case"NULL":return this.SymbolData.GetDrawNull();case'ADVANCE':case'DECLINE':return this.SymbolData.GetIndexIncreaseCacheData(name,this.SymbolData.Symbol,node);case"TQFLAG":return this.SymbolData.Right;case"MACHINEDATE":{var now=new Date();return now.getFullYear()*10000+now.getMonth()*1*100+now.getDate()-19000000;}case"MACHINETIME":{var now=new Date();return now.getHours()*10000+now.getMinutes()*1*100+now.getSeconds();}case"MACHINEWEEK":{var now=new Date();return now.getDay();}case"WEEKOFYEAR":return this.SymbolData.WEEKOFYEAR();case"DAYSTOTODAY":return this.SymbolData.DAYSTOTODAY();}};this.ReadCustomVariant=function(name,node){return this.SymbolData.GetStockCacheData({VariantName:name,Node:node});};//读取变量
+case'INDEXA':case'INDEXC':case'INDEXH':case'INDEXH':case'INDEXO':case'INDEXV':case'INDEXL':case'INDEXADV':case'INDEXDEC':return this.SymbolData.GetIndexCacheData(name);case'CURRBARSCOUNT':return this.SymbolData.GetCurrBarsCount();case"BARPOS":return this.SymbolData.GetBarPos();case"TOTALBARSCOUNT":return this.SymbolData.GetTotalBarsCount();case"TOTALFZNUM":return this.SymbolData.GetTotalTradeMinuteCount();case'ISLASTBAR':return this.SymbolData.GetIsLastBar();case"BARSTATUS":return this.SymbolData.GetBarStatus();case"TOTALCAPITAL":case'CAPITAL':case'EXCHANGE':case"HYBLOCK":case"DYBLOCK":case"GNBLOCK":case"FGBLOCK":case"ZSBLOCK":case"ZHBLOCK":case"ZDBLOCK":case"HYZSCODE":case"GNBLOCKNUM":case"FGBLOCKNUM":case"ZSBLOCKNUM":case"ZHBLOCKNUM":case"ZDBLOCKNUM":case"HYSYL":case"HYSJL":return this.SymbolData.GetStockCacheData({VariantName:name,Node:node});case'SETCODE':return this.SymbolData.SETCODE();case'CODE':return this.SymbolData.GetSymbol();case'STKNAME':return this.SymbolData.GetName();case"TIME":return this.SymbolData.TIME();case"TIME2":return this.SymbolData.TIME2();case'DATE':return this.SymbolData.DATE();case"DATETIME":return this.SymbolData.DateTime();case'YEAR':return this.SymbolData.YEAR();case'MONTH':return this.SymbolData.MONTH();case'WEEK':case"WEEKDAY":return this.SymbolData.WEEK();case"DAY":return this.SymbolData.DAY();case'PERIOD':return this.SymbolData.PERIOD();case'FROMOPEN':return this.SymbolData.GetLatestIndexCacheData('FROMOPEN');case"HOUR":return this.SymbolData.HOUR();case"MINUTE":return this.SymbolData.MINUTE();case'DRAWNULL':case"NULL":return this.SymbolData.GetDrawNull();case'ADVANCE':case'DECLINE':return this.SymbolData.GetIndexIncreaseCacheData(name,this.SymbolData.Symbol,node);case"TQFLAG":return this.SymbolData.Right;case"MACHINEDATE":{var now=new Date();return now.getFullYear()*10000+now.getMonth()*1*100+now.getDate()-19000000;}case"MACHINETIME":{var now=new Date();return now.getHours()*10000+now.getMinutes()*1*100+now.getSeconds();}case"MACHINEWEEK":{var now=new Date();return now.getDay();}case"WEEKOFYEAR":return this.SymbolData.WEEKOFYEAR();case"DAYSTOTODAY":return this.SymbolData.DAYSTOTODAY();}};this.ReadCustomVariant=function(name,node){return this.SymbolData.GetStockCacheData({VariantName:name,Node:node});};//读取变量
 this.ReadVariable=function(name,node){if(this.ConstVarTable.has(name)){var data=this.ConstVarTable.get(name);if(data==null)//动态加载,用到再加载
 {data=this.ReadSymbolData(name,node);this.ConstVarTable.set(name,data);}return data;}if(g_JSComplierResource.IsCustomVariant(name))return this.ReadCustomVariant(name,node);//读取自定义变量
 if(this.VarTable.has(name))return this.VarTable.get(name);if(name.indexOf('#')>0){var aryPeriod=name.split('#');return this.SymbolData.GetSymbolPeriodCacheData(aryPeriod[0],aryPeriod[1]);}if(name.indexOf("COLOR")==0){var colorValue=JSComplier.ColorVarToRGB(name);if(colorValue)return colorValue;}this.ThrowUnexpectedNode(node,'变量'+name+'不存在',name);return null;};this.ReadMemberVariable=function(node){var obj=node.Object;var member=node.Property;var maiObj=void 0;if(obj.Type==Syntax.BinaryExpression||obj.Type==Syntax.LogicalExpression)maiObj=this.VisitBinaryExpression(obj);else if(obj.Type==Syntax.CallExpression)maiObj=this.VisitCallExpression(obj);else maiObj=this.GetNodeValue(obj);if(!maiObj)return null;var value=maiObj[member.Name];if(value)return value;return null;};//单数据转成数组 个数和历史数据一致
@@ -12469,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.12436";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.12445";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.12437",
+  "version": "1.1.12446",
   "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)
             {
@@ -15699,6 +15699,38 @@ function JSSymbolData(ast,option,jsExecute)
         return result;
     }
 
+    this.HOUR=function()
+    {
+        var result=[];
+        if (!this.Data || !this.Data.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+
+            result[i]=0;
+            if (IFrameSplitOperator.IsNumber(item.Time)) result[i]=parseInt(item.Time/100);
+        }
+
+        return result;
+    }
+
+    this.MINUTE=function()
+    {
+        var result=[];
+        if (!this.Data || !this.Data.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+
+            result[i]=0;
+            if (IFrameSplitOperator.IsNumber(item.Time)) result[i]=item.Time%100;
+        }
+
+        return result;
+    }
+
     /*
     飞狐函数 SYSPARAM
     SYSPARAM(1)画面上光标位置(K线序号)
@@ -16071,6 +16103,8 @@ function JSExecute(ast,option)
         ['DATE',null],['YEAR',null],['MONTH',null],['PERIOD', null],['WEEK',null],['WEEKDAY',null],["TIME",null],["DAY",null],["DATETIME",null],["TIME2",null],
         ["WEEKOFYEAR", null],["DAYSTOTODAY", null],
 
+        ["HOUR",null],["MINUTE",null],
+
         //大盘数据
         ['INDEXA',null],['INDEXC',null],['INDEXH',null],['INDEXL',null],['INDEXO',null],['INDEXV',null],
         ['INDEXADV',null],['INDEXDEC',null],
@@ -16359,6 +16393,11 @@ function JSExecute(ast,option)
             case 'FROMOPEN':
                 return this.SymbolData.GetLatestIndexCacheData('FROMOPEN');
 
+            case "HOUR":
+                return this.SymbolData.HOUR();
+            case "MINUTE":
+                return this.SymbolData.MINUTE();
+
             case 'DRAWNULL':
             case "NULL":
                 return this.SymbolData.GetDrawNull();

package/src/jscommon/umychart.js

@@ -42430,7 +42430,7 @@ IFrameSplitOperator.IsNumber=function(value)
     if (value==null) return false;
     if (isNaN(value)) return false;
 
-    return true;
+    return typeof(value)=='number';
 }
 
 //判断是否是正数
@@ -44292,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 };
@@ -44325,7 +44325,7 @@ function FrameSplitMinutePriceY()
             {
                 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

@@ -46510,7 +46510,7 @@ IFrameSplitOperator.IsNumber=function(value)
     if (value==null) return false;
     if (isNaN(value)) return false;
 
-    return true;
+    return typeof(value)=='number';
 }
 
 //判断是否是正数
@@ -48372,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 };
@@ -48405,7 +48405,7 @@ function FrameSplitMinutePriceY()
             {
                 var paint=item.ChartPaint[j];
                 if (paint.IsShow==false) continue;
-                
+
                 var value=paint.GetMaxMin();
                 if (value==null || value.Max==null || value.Min==null) continue;
 
@@ -94504,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)
@@ -94528,7 +94528,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94536,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)
             {
@@ -94551,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)
@@ -94575,7 +94575,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94583,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)
             {
@@ -94598,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)
@@ -94622,7 +94622,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94630,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)
             {
@@ -94645,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)
@@ -94669,7 +94669,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94677,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)
             {
@@ -94692,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)
@@ -94716,7 +94716,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94724,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)
             {
@@ -94739,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)
@@ -94763,7 +94763,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94771,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)
             {
@@ -107792,6 +107792,38 @@ function JSSymbolData(ast,option,jsExecute)
         return result;
     }
 
+    this.HOUR=function()
+    {
+        var result=[];
+        if (!this.Data || !this.Data.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+
+            result[i]=0;
+            if (IFrameSplitOperator.IsNumber(item.Time)) result[i]=parseInt(item.Time/100);
+        }
+
+        return result;
+    }
+
+    this.MINUTE=function()
+    {
+        var result=[];
+        if (!this.Data || !this.Data.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+
+            result[i]=0;
+            if (IFrameSplitOperator.IsNumber(item.Time)) result[i]=item.Time%100;
+        }
+
+        return result;
+    }
+
     /*
     飞狐函数 SYSPARAM
     SYSPARAM(1)画面上光标位置(K线序号)
@@ -108164,6 +108196,8 @@ function JSExecute(ast,option)
         ['DATE',null],['YEAR',null],['MONTH',null],['PERIOD', null],['WEEK',null],['WEEKDAY',null],["TIME",null],["DAY",null],["DATETIME",null],["TIME2",null],
         ["WEEKOFYEAR", null],["DAYSTOTODAY", null],
 
+        ["HOUR",null],["MINUTE",null],
+
         //大盘数据
         ['INDEXA',null],['INDEXC',null],['INDEXH',null],['INDEXL',null],['INDEXO',null],['INDEXV',null],
         ['INDEXADV',null],['INDEXDEC',null],
@@ -108452,6 +108486,11 @@ function JSExecute(ast,option)
             case 'FROMOPEN':
                 return this.SymbolData.GetLatestIndexCacheData('FROMOPEN');
 
+            case "HOUR":
+                return this.SymbolData.HOUR();
+            case "MINUTE":
+                return this.SymbolData.MINUTE();
+
             case 'DRAWNULL':
             case "NULL":
                 return this.SymbolData.GetDrawNull();
@@ -127641,7 +127680,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12436";
+var HQCHART_VERSION="1.1.12445";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -46554,7 +46554,7 @@ IFrameSplitOperator.IsNumber=function(value)
     if (value==null) return false;
     if (isNaN(value)) return false;
 
-    return true;
+    return typeof(value)=='number';
 }
 
 //判断是否是正数
@@ -48416,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 };
@@ -48449,7 +48449,7 @@ function FrameSplitMinutePriceY()
             {
                 var paint=item.ChartPaint[j];
                 if (paint.IsShow==false) continue;
-                
+
                 var value=paint.GetMaxMin();
                 if (value==null || value.Max==null || value.Min==null) continue;
 
@@ -94548,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)
@@ -94572,7 +94572,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94580,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)
             {
@@ -94595,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)
@@ -94619,7 +94619,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94627,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)
             {
@@ -94642,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)
@@ -94666,7 +94666,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94674,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)
             {
@@ -94689,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)
@@ -94713,7 +94713,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94721,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)
             {
@@ -94736,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)
@@ -94760,7 +94760,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94768,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)
             {
@@ -94783,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)
@@ -94807,7 +94807,7 @@ function JSAlgorithm(errorHandler,symbolData)
             return result;
         }
 
-        if (isNumber)   //单数据-数组
+        if (isNumber && Array.isArray(data2))   //单数据-数组
         {
             for(let i in data2)
             {
@@ -94815,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)
             {
@@ -107836,6 +107836,38 @@ function JSSymbolData(ast,option,jsExecute)
         return result;
     }
 
+    this.HOUR=function()
+    {
+        var result=[];
+        if (!this.Data || !this.Data.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+
+            result[i]=0;
+            if (IFrameSplitOperator.IsNumber(item.Time)) result[i]=parseInt(item.Time/100);
+        }
+
+        return result;
+    }
+
+    this.MINUTE=function()
+    {
+        var result=[];
+        if (!this.Data || !this.Data.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+
+            result[i]=0;
+            if (IFrameSplitOperator.IsNumber(item.Time)) result[i]=item.Time%100;
+        }
+
+        return result;
+    }
+
     /*
     飞狐函数 SYSPARAM
     SYSPARAM(1)画面上光标位置(K线序号)
@@ -108208,6 +108240,8 @@ function JSExecute(ast,option)
         ['DATE',null],['YEAR',null],['MONTH',null],['PERIOD', null],['WEEK',null],['WEEKDAY',null],["TIME",null],["DAY",null],["DATETIME",null],["TIME2",null],
         ["WEEKOFYEAR", null],["DAYSTOTODAY", null],
 
+        ["HOUR",null],["MINUTE",null],
+
         //大盘数据
         ['INDEXA',null],['INDEXC',null],['INDEXH',null],['INDEXL',null],['INDEXO',null],['INDEXV',null],
         ['INDEXADV',null],['INDEXDEC',null],
@@ -108496,6 +108530,11 @@ function JSExecute(ast,option)
             case 'FROMOPEN':
                 return this.SymbolData.GetLatestIndexCacheData('FROMOPEN');
 
+            case "HOUR":
+                return this.SymbolData.HOUR();
+            case "MINUTE":
+                return this.SymbolData.MINUTE();
+
             case 'DRAWNULL':
             case "NULL":
                 return this.SymbolData.GetDrawNull();
@@ -127685,7 +127724,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.12436";
+var HQCHART_VERSION="1.1.12445";
 
 function PrintHQChartVersion()
 {

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

@@ -12054,6 +12054,38 @@ function JSSymbolData(ast,option,jsExecute)
 
         return result;
     }
+
+    this.HOUR=function()
+    {
+        var result=[];
+        if (!this.Data || !this.Data.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+
+            result[i]=0;
+            if (IFrameSplitOperator.IsNumber(item.Time)) result[i]=parseInt(item.Time/100);
+        }
+
+        return result;
+    }
+
+    this.MINUTE=function()
+    {
+        var result=[];
+        if (!this.Data || !this.Data.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return result;
+
+        for(var i=0;i<this.Data.Data.length;++i)
+        {
+            var item=this.Data.Data[i];
+
+            result[i]=0;
+            if (IFrameSplitOperator.IsNumber(item.Time)) result[i]=item.Time%100;
+        }
+
+        return result;
+    }
 }
 
 //是否有是有效的数字
@@ -12244,6 +12276,8 @@ function JSExecute(ast,option)
         ['DATE', null], ['YEAR', null], ['MONTH', null], ['PERIOD', null], ['WEEK', null],['WEEKDAY',null],["TIME",null],["DATETIME",null],["TIME2",null],
         ["WEEKOFYEAR", null],["DAYSTOTODAY", null],
 
+        ["HOUR",null],["MINUTE",null],
+        
         //大盘数据
         ['INDEXA',null],['INDEXC',null],['INDEXH',null],['INDEXL',null],['INDEXO',null],['INDEXV',null],
         ['INDEXADV', null], ['INDEXDEC', null],
@@ -12489,6 +12523,11 @@ function JSExecute(ast,option)
             case "NULL":
                 return this.SymbolData.GetDrawNull();
 
+            case "HOUR":
+                return this.SymbolData.HOUR();
+            case "MINUTE":
+                return this.SymbolData.MINUTE();
+
             case "TQFLAG":
                 return this.SymbolData.Right;
 

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.12434";
+var HQCHART_VERSION="1.1.12444";
 
 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 
             {