hqchart 1.1.15503 → 1.1.15515

package/lib/umychart.vue.js

@@ -6151,7 +6151,7 @@ coordinate.TextColor=g_JSChartResource.UnchagneTextColor;if(g_JSChartResource.Fr
 this.newMethod();delete this.newMethod;this.ShowText=true;//是否显示坐标信息
 this.Symbol=null;//股票代码 x轴刻度根据股票类型来调整
 this.DayCount=1;this.DateFormat=0;//0=MM-DD 1=MM/DD 2=MM/DD/Week
-this.Operator=function(){this.Frame.VerticalInfo=[];var xPointCount=this.Frame.XPointCount;var width=this.Frame.ChartBorder.GetWidth();var isHScreen=this.Frame.IsHScreen===true;if(isHScreen)width=this.Frame.ChartBorder.GetHeight();width=width/GetDevicePixelRatio();var minuteCoordinate=g_MinuteCoordinateData;var xcoordinateData=minuteCoordinate.GetCoordinateData(this.Symbol,width,this.Frame.GlobalOption);var minuteCount=xcoordinateData.Count;var minuteMiddleCount=xcoordinateData.MiddleCount>0?xcoordinateData.MiddleCount:parseInt(minuteCount/2);var xcoordinate=xcoordinateData.Data;this.Frame.XPointCount=minuteCount*this.DayCount;//计算一共显示的数据个数
+this.Operator=function(){this.Frame.VerticalInfo=[];var xPointCount=this.Frame.XPointCount;var width=this.Frame.ChartBorder.GetWidth();var isHScreen=this.Frame.IsHScreen===true;if(isHScreen)width=this.Frame.ChartBorder.GetHeight();width=width/GetDevicePixelRatio();var minuteCoordinate=g_MinuteCoordinateData;var xcoordinateData=minuteCoordinate.GetCoordinateData(this.Symbol,width,this.Frame.GlobalOption);if(!xcoordinateData)return;var minuteCount=xcoordinateData.Count;var minuteMiddleCount=xcoordinateData.MiddleCount>0?xcoordinateData.MiddleCount:parseInt(minuteCount/2);var xcoordinate=xcoordinateData.Data;this.Frame.XPointCount=minuteCount*this.DayCount;//计算一共显示的数据个数
 this.Frame.MinuteCount=minuteCount;this.Frame.VerticalInfo=[];if(this.Frame.GlobalOption){var item=this.Frame.GlobalOption;if(IFrameSplitOperator.IsNumber(item.XDateFormat))this.DateFormat=item.XDateFormat;}if(this.DayCount<=1){//设置成1日的数据
 this.DayOffset.DataOffset=0;this.DayOffset.ShowDataCount=minuteCount;this.DayOffset.PageInfo=null;for(var i=0;i<xcoordinate.length;++i){var info=new CoordinateInfo();var item=xcoordinate[i];if(g_JSChartResource.Minute.FrameSplitTextColor)info.TextColor=g_JSChartResource.Minute.FrameSplitTextColor;info.Value=item[0];if(this.ShowText)info.Message[0]=item[3];if(item[4])info.LineColor=item[4];//线段颜色
 if(item[5])info.TextBGColor=item[5];//文字背景色
@@ -10219,7 +10219,9 @@ CFFEX2:'.CFFEX',//中期所 (China Financial Futures Exchange)
 CFFEX3:'.CF',//中期所 (China Financial Futures Exchange)
 DCE:'.DCE',//大连商品交易所(Dalian Commodity Exchange)
 CZCE:'.CZC',//郑州期货交易所
+CZCE2:".CZCE",//郑州期货交易所
 GZFE:".GZFE",//广州期货交易所
+GZFE2:"GFEX",//广州期货交易所
 INE:".INE",//上海国际能源交易中心
 USA:'.USA',//美股
 FTSE:'.FTSE',//富时中国
@@ -10246,10 +10248,15 @@ IsET:function IsET(upperSymbol){if(!upperSymbol)return false;return upperSymbol.
 var pos=upperSymbol.length-this.SH.length;var find=upperSymbol.indexOf(this.SH);return find==pos;},IsSZ:function IsSZ(upperSymbol){var pos=upperSymbol.length-this.SZ.length;var find=upperSymbol.indexOf(this.SZ);return find==pos;},IsBJ:function IsBJ(upperSymbol){var pos=upperSymbol.length-this.BJ.length;var find=upperSymbol.indexOf(this.BJ);return find==pos;},//自定义指数
 IsSHSZCustomIndex:function IsSHSZCustomIndex(upperSymbol){var pos=upperSymbol.length-this.SHSZ_C_Index.length;var find=upperSymbol.indexOf(this.SHSZ_C_Index);return find==pos;},IsSHO:function IsSHO(upperSymbol){if(this.IsSH(upperSymbol))//10007211.sh
 {if(upperSymbol.length==11&&upperSymbol[0]=='1')return true;}var pos=upperSymbol.length-this.SHO.length;var find=upperSymbol.indexOf(this.SHO);return find==pos;},IsSZO:function IsSZO(upperSymbol){if(this.IsSZ(upperSymbol))//90004047.sz
-{if(upperSymbol.length==11&&upperSymbol[0]=='9')return true;}var pos=upperSymbol.length-this.SZO.length;var find=upperSymbol.indexOf(this.SZO);return find==pos;},IsHK:function IsHK(upperSymbol){var pos=upperSymbol.length-this.HK.length;var find=upperSymbol.indexOf(this.HK);return find==pos;},IsTW:function IsTW(upperSymbol){var pos=upperSymbol.length-this.TW.length;var find=upperSymbol.indexOf(this.TW);return find==pos;},IsJP:function IsJP(upperSymbol){var pos=upperSymbol.length-this.JP.length;var find=upperSymbol.indexOf(this.JP);return find==pos;},IsSHFE:function IsSHFE(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.SHFE)>0)return true;if(upperSymbol.indexOf(this.SHFE2)>0)return true;return false;},IsCFFEX:function IsCFFEX(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.CFFEX)>0)return true;if(upperSymbol.indexOf(this.CFFEX2)>0)return true;var index=upperSymbol.indexOf(this.CFFEX3);//必须已.CF结尾
+{if(upperSymbol.length==11&&upperSymbol[0]=='9')return true;}var pos=upperSymbol.length-this.SZO.length;var find=upperSymbol.indexOf(this.SZO);return find==pos;},IsHK:function IsHK(upperSymbol){var pos=upperSymbol.length-this.HK.length;var find=upperSymbol.indexOf(this.HK);return find==pos;},IsTW:function IsTW(upperSymbol){var pos=upperSymbol.length-this.TW.length;var find=upperSymbol.indexOf(this.TW);return find==pos;},IsJP:function IsJP(upperSymbol){var pos=upperSymbol.length-this.JP.length;var find=upperSymbol.indexOf(this.JP);return find==pos;},IsSHFE:function IsSHFE(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.SHFE)>0)return true;if(upperSymbol.indexOf(this.SHFE2)>0)return true;return false;},IsSHFEOption:function IsSHFEOption(upperSymbol){if(!upperSymbol)return false;if(!this.IsSHFE(upperSymbol))return false;var shortSymbol=JSChart.GetShortSymbol(upperSymbol);//ZN2605-P-20600
+var aryValue=shortSymbol.split("-");if(!aryValue||aryValue.length!=3)return false;var strValue=aryValue[0];var regex=/([a-zA-Z]+)(\d+)/;var match=strValue.match(regex);if(!match||!match[1]||!match[2])return false;var prefix=match[1];return true;},IsCFFEX:function IsCFFEX(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.CFFEX)>0)return true;if(upperSymbol.indexOf(this.CFFEX2)>0)return true;var index=upperSymbol.indexOf(this.CFFEX3);//必须已.CF结尾
 if(index>0&&index+this.CFFEX3.length==upperSymbol.length)return true;return false;},IsCFFEXOption:function IsCFFEXOption(upperSymbol)//中金所股票期权
 {if(!upperSymbol)return false;if(!this.IsCFFEX(upperSymbol))return false;var shortSymbol=JSChart.GetShortSymbol(upperSymbol);//MO2602-C-6300.cffex
-var aryValue=shortSymbol.split("-");if(!aryValue||aryValue.length!=3)return false;var strValue=aryValue[0];var regex=/([a-zA-Z]+)(\d+)/;var match=strValue.match(regex);if(!match||!match[1]||!match[2])return false;var prefix=match[1];if(["IM","IO","MO","HO"].includes(prefix))return true;return true;},IsDCE:function IsDCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.DCE)>0;},IsCZCE:function IsCZCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.CZCE)>0;},IsGZFE:function IsGZFE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.GZFE)>0;},IsINE:function IsINE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.INE)>0;},//是否包含某一个市场的
+var aryValue=shortSymbol.split("-");if(!aryValue||aryValue.length!=3)return false;var strValue=aryValue[0];var regex=/([a-zA-Z]+)(\d+)/;var match=strValue.match(regex);if(!match||!match[1]||!match[2])return false;var prefix=match[1];if(["IM","IO","MO","HO"].includes(prefix))return true;return true;},IsDCE:function IsDCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.DCE)>0;},IsDCEOption:function IsDCEOption(upperSymbol){if(!upperSymbol)return false;if(!this.IsDCE(upperSymbol))return false;var shortSymbol=JSChart.GetShortSymbol(upperSymbol);//M2605-P-2400
+var aryValue=shortSymbol.split("-");if(!aryValue||aryValue.length!=3)return false;var strValue=aryValue[0];var regex=/([a-zA-Z]+)(\d+)/;var match=strValue.match(regex);if(!match||!match[1]||!match[2])return false;var prefix=match[1];return true;},IsCZCE:function IsCZCE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.CZCE)>0||upperSymbol.indexOf(this.CZCE2)>0;},IsCZCEOption:function IsCZCEOption(upperSymbol){if(!upperSymbol)return false;if(!this.IsCZCE(upperSymbol))return false;var shortSymbol=JSChart.GetShortSymbol(upperSymbol);//ZN2605-P-20600
+var aryValue=shortSymbol.split("-");if(!aryValue||aryValue.length!=3)return false;var strValue=aryValue[0];var regex=/([a-zA-Z]+)(\d+)/;var match=strValue.match(regex);if(!match||!match[1]||!match[2])return false;var prefix=match[1];return true;},IsGZFE:function IsGZFE(upperSymbol){if(!upperSymbol)return false;if(upperSymbol.indexOf(this.GZFE)>0)return true;if(upperSymbol.indexOf(this.GZFE2)>0)return true;return false;},IsGZFEOption:function IsGZFEOption(upperSymbol){if(!upperSymbol)return false;if(!this.IsGZFE(upperSymbol))return false;var shortSymbol=JSChart.GetShortSymbol(upperSymbol);//ZN2605-P-20600
+var aryValue=shortSymbol.split("-");if(!aryValue||aryValue.length!=3)return false;var strValue=aryValue[0];var regex=/([a-zA-Z]+)(\d+)/;var match=strValue.match(regex);if(!match||!match[1]||!match[2])return false;var prefix=match[1];return true;},IsINE:function IsINE(upperSymbol){if(!upperSymbol)return false;return upperSymbol.indexOf(this.INE)>0;},IsINEOption:function IsINEOption(upperSymbol){if(!upperSymbol)return false;if(!this.IsINE(upperSymbol))return false;var shortSymbol=JSChart.GetShortSymbol(upperSymbol);//ZN2605-P-20600
+var aryValue=shortSymbol.split("-");if(!aryValue||aryValue.length!=3)return false;var strValue=aryValue[0];var regex=/([a-zA-Z]+)(\d+)/;var match=strValue.match(regex);if(!match||!match[1]||!match[2])return false;var prefix=match[1];return true;},//是否包含某一个市场的
 IsIncludes:function IsIncludes(symbol,arySuffix){if(!symbol)return false;if(!IFrameSplitOperator.IsNonEmptyArray(arySuffix))return false;var upperSymbol=symbol.toUpperCase();var bMatch=false;for(var i=0;i<arySuffix.length;++i){var item=arySuffix[i];switch(item){case this.SHFE:case this.SHFE2:if(this.IsSHFE(upperSymbol))bMatch=true;break;case this.CFFEX2:case this.CFFEX:case this.CFFEX3:if(this.IsCFFEX(upperSymbol))bMatch=true;break;case this.DCE:if(this.IsDCE(upperSymbol))bMatch=true;break;case this.CZCE:if(this.IsCZCE(upperSymbol))bMatch=true;break;case this.GZFE:if(this.IsGZFE(upperSymbol))bMatch=true;break;case this.INE:if(this.IsINE(upperSymbol))bMatch=true;break;}if(bMatch)return true;}return false;},//是否包含前缀
 IsPrefixIncludes:function IsPrefixIncludes(symbol,aryPrefix){if(!symbol)return false;var shortSymbol=this.GetShortSymbol(symbol);if(!shortSymbol)return false;shortSymbol=shortSymbol.toUpperCase();for(var i=0;i<aryPrefix.length;++i){var strValue=aryPrefix[i];if(!strValue)continue;if(shortSymbol.search(strValue)===0)return true;}return false;},IsChinaFutures:function IsChinaFutures(upperSymbol)//是否是国内期货 /期权
 {if(!upperSymbol)return false;return this.IsSHO(upperSymbol)||this.IsSZO(upperSymbol)||this.IsGZFE(upperSymbol)||this.IsINE(upperSymbol)||this.IsCFFEX(upperSymbol)||this.IsCZCE(upperSymbol)||this.IsDCE(upperSymbol)||this.IsSHFE(upperSymbol);},IsFutures:function IsFutures(upperSymbol)//是否是期货 包含国外的
@@ -14068,7 +14075,7 @@ this.ReadStockJsonData=function(stock,item){//0=证券代码 1=股票名称 2=
 //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值 27=扩展名字
 //30=全局扩展数据  31=当前板块扩展数据 
 //32=收盘价线 33=K线  35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
-//43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速%
+//43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速% 48=交割日期 49=开始日期 50=过期时间
 //80=整行背景色
 //101-199=数值型  201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
 var upperSymbol=null;if(stock.Symbol)upperSymbol=stock.Symbol.toUpperCase();if(IFrameSplitOperator.IsString(item[1]))stock.Name=item[1];if(IFrameSplitOperator.IsNumber(item[2]))stock.YClose=item[2];if(IFrameSplitOperator.IsNumber(item[3]))stock.Open=item[3];if(IFrameSplitOperator.IsNumber(item[4]))stock.High=item[4];if(IFrameSplitOperator.IsNumber(item[5]))stock.Low=item[5];if(IFrameSplitOperator.IsNumber(item[6]))stock.Price=item[6];if(IFrameSplitOperator.IsNumber(item[7]))stock.Vol=item[7];if(IFrameSplitOperator.IsNumber(item[8]))stock.Amount=item[8];if(IFrameSplitOperator.IsNumber(item[9]))stock.BuyPrice=item[9];if(IFrameSplitOperator.IsNumber(item[10]))stock.BuyVol=item[10];if(IFrameSplitOperator.IsNumber(item[11]))stock.SellPrice=item[11];if(IFrameSplitOperator.IsNumber(item[12]))stock.SellVol=item[12];if(IFrameSplitOperator.IsNumber(item[13]))stock.AvPrice=item[13];//均价
@@ -14105,9 +14112,9 @@ if(item[33])stock.KLine=item[33];//33=K线
 if(IFrameSplitOperator.IsNumber(item[35]))stock.Time=item[35];//时间 hhmm / hhmmss / hhmmss.fff
 if(IFrameSplitOperator.IsNumber(item[36]))stock.Date=item[36];//日期
 if(IFrameSplitOperator.IsBool(item[37]))stock.Checked=item[37];//1,3,5,10,15 涨速%
-if(IFrameSplitOperator.IsNumber(item[43]))stock.RSpeed1M=item[43];if(IFrameSplitOperator.IsNumber(item[44]))stock.RSpeed3M=item[44];if(IFrameSplitOperator.IsNumber(item[45]))stock.RSpeed5M=item[45];if(IFrameSplitOperator.IsNumber(item[46]))stock.RSpeed10M=item[46];if(IFrameSplitOperator.IsNumber(item[47]))stock.RSpeed15M=item[47];if(item[80]||item[80]===null)stock.BGColor=item[80];//整行背景色
+if(IFrameSplitOperator.IsNumber(item[43]))stock.RSpeed1M=item[43];if(IFrameSplitOperator.IsNumber(item[44]))stock.RSpeed3M=item[44];if(IFrameSplitOperator.IsNumber(item[45]))stock.RSpeed5M=item[45];if(IFrameSplitOperator.IsNumber(item[46]))stock.RSpeed10M=item[46];if(IFrameSplitOperator.IsNumber(item[47]))stock.RSpeed15M=item[47];function __Temp_IsNumberOrObject(value){if(IFrameSplitOperator.IsNumber(value))return true;if(IFrameSplitOperator.IsObject(value))return true;return false;}function __Temp_IsStringOrObject(value){if(IFrameSplitOperator.IsString(value))return true;if(IFrameSplitOperator.IsObject(value))return true;return false;}if(__Temp_IsNumberOrObject(item[48]))stock.DeliveryDate=item[48];if(__Temp_IsNumberOrObject(item[49]))stock.OpenDate=item[49];if(__Temp_IsNumberOrObject(item[50]))stock.ExpireDate=item[50];if(item[80]||item[80]===null)stock.BGColor=item[80];//整行背景色
 if(item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA])stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];//扩展数据2
-function __Temp_IsNumberOrObject(value){if(IFrameSplitOperator.IsNumber(value))return true;if(IFrameSplitOperator.IsObject(value))return true;return false;}function __Temp_IsStringOrObject(value){if(IFrameSplitOperator.IsString(value))return true;if(IFrameSplitOperator.IsObject(value))return true;return false;}//10个数值型 101-199
+//10个数值型 101-199
 if(__Temp_IsNumberOrObject(item[101]))stock.ReserveNumber1=item[101];if(__Temp_IsNumberOrObject(item[102]))stock.ReserveNumber2=item[102];if(__Temp_IsNumberOrObject(item[103]))stock.ReserveNumber3=item[103];if(__Temp_IsNumberOrObject(item[104]))stock.ReserveNumber4=item[104];if(__Temp_IsNumberOrObject(item[105]))stock.ReserveNumber5=item[105];if(__Temp_IsNumberOrObject(item[106]))stock.ReserveNumber6=item[106];if(__Temp_IsNumberOrObject(item[107]))stock.ReserveNumber7=item[107];if(__Temp_IsNumberOrObject(item[108]))stock.ReserveNumber8=item[108];if(__Temp_IsNumberOrObject(item[109]))stock.ReserveNumber9=item[109];if(__Temp_IsNumberOrObject(item[110]))stock.ReserveNumber10=item[110];if(__Temp_IsNumberOrObject(item[111]))stock.ReserveNumber11=item[111];if(__Temp_IsNumberOrObject(item[112]))stock.ReserveNumber12=item[112];if(__Temp_IsNumberOrObject(item[113]))stock.ReserveNumber13=item[113];if(__Temp_IsNumberOrObject(item[114]))stock.ReserveNumber14=item[114];if(__Temp_IsNumberOrObject(item[115]))stock.ReserveNumber15=item[115];if(__Temp_IsNumberOrObject(item[116]))stock.ReserveNumber16=item[116];if(__Temp_IsNumberOrObject(item[117]))stock.ReserveNumber17=item[117];if(__Temp_IsNumberOrObject(item[118]))stock.ReserveNumber18=item[118];if(__Temp_IsNumberOrObject(item[119]))stock.ReserveNumber19=item[119];if(__Temp_IsNumberOrObject(item[120]))stock.ReserveNumber20=item[120];//10个字符型 201-299
 if(__Temp_IsStringOrObject(item[201]))stock.ReserveString1=item[201];if(__Temp_IsStringOrObject(item[202]))stock.ReserveString2=item[202];if(__Temp_IsStringOrObject(item[203]))stock.ReserveString3=item[203];if(__Temp_IsStringOrObject(item[204]))stock.ReserveString4=item[204];if(__Temp_IsStringOrObject(item[205]))stock.ReserveString5=item[205];if(__Temp_IsStringOrObject(item[206]))stock.ReserveString6=item[206];if(__Temp_IsStringOrObject(item[207]))stock.ReserveString7=item[207];if(__Temp_IsStringOrObject(item[208]))stock.ReserveString8=item[208];if(__Temp_IsStringOrObject(item[209]))stock.ReserveString9=item[209];if(__Temp_IsStringOrObject(item[210]))stock.ReserveString10=item[210];if(__Temp_IsStringOrObject(item[211]))stock.ReserveString11=item[211];if(__Temp_IsStringOrObject(item[212]))stock.ReserveString12=item[212];if(__Temp_IsStringOrObject(item[213]))stock.ReserveString13=item[213];if(__Temp_IsStringOrObject(item[214]))stock.ReserveString14=item[214];if(__Temp_IsStringOrObject(item[215]))stock.ReserveString15=item[215];if(__Temp_IsStringOrObject(item[216]))stock.ReserveString16=item[216];if(__Temp_IsStringOrObject(item[217]))stock.ReserveString17=item[217];if(__Temp_IsStringOrObject(item[218]))stock.ReserveString18=item[218];if(__Temp_IsStringOrObject(item[219]))stock.ReserveString19=item[219];if(__Temp_IsStringOrObject(item[220]))stock.ReserveString20=item[220];//10个进度条 301-350  { Value:, BGColor: }
 if(__Temp_IsNumberOrObject(item[301]))stock.ReserveProgressBar1=item[301];if(__Temp_IsNumberOrObject(item[302]))stock.ReserveProgressBar2=item[302];if(__Temp_IsNumberOrObject(item[303]))stock.ReserveProgressBar3=item[303];if(__Temp_IsNumberOrObject(item[304]))stock.ReserveProgressBar4=item[304];if(__Temp_IsNumberOrObject(item[305]))stock.ReserveProgressBar5=item[305];if(__Temp_IsNumberOrObject(item[306]))stock.ReserveProgressBar6=item[306];if(__Temp_IsNumberOrObject(item[307]))stock.ReserveProgressBar7=item[307];if(__Temp_IsNumberOrObject(item[308]))stock.ReserveProgressBar8=item[308];if(__Temp_IsNumberOrObject(item[309]))stock.ReserveProgressBar9=item[309];if(__Temp_IsNumberOrObject(item[310]))stock.ReserveProgressBar10=item[310];//10个按钮 351-400 { Title, Enable:, BGColor, TextColor: }
@@ -14285,7 +14292,8 @@ FUTURES_CLOSE_ID:35,//期货结算价
 FUTURES_YCLOSE_ID:36,//期货昨结算
 FUTURES_OPEN_POSITION_ID:37,//期货开仓量
 FUTURES_CLOSE_POSITION_ID:38,//期货平仓量
-//1,3,5,10,15分钟涨速
+DELIVERY_DATE_ID:39,//交割日期
+OPEN_DATE_ID:40,EXPIRE_DATE_ID:41,//1,3,5,10,15分钟涨速
 RISING_SPEED_1M_ID:60,RISING_SPEED_3M_ID:61,RISING_SPEED_5M_ID:62,RISING_SPEED_10M_ID:63,RISING_SPEED_15M_ID:64,SYMBOL_NAME_V2_ID:98,//单行
 SYMBOL_NAME_ID:99,//两行
 CUSTOM_STRING_TEXT_ID:100,//自定义字符串文本
@@ -14317,7 +14325,7 @@ RESERVE_BUTTON10_ID:460,//ReserveButton10:
 //预留日期时间类型 10个 501-599
 RESERVE_DATETIME1_ID:501,//ReserveDateTime1;
 RESERVE_DATETIME2_ID:502,RESERVE_DATETIME3_ID:503,RESERVE_DATETIME4_ID:504,RESERVE_DATETIME5_ID:505,RESERVE_DATETIME6_ID:506,RESERVE_DATETIME7_ID:507,RESERVE_DATETIME8_ID:508,RESERVE_DATETIME9_ID:509,RESERVE_DATETIME10_ID:510//数据对应字段名对照表
-};var MAP_COLUMN_FIELD=new _map2.default([[REPORT_COLUMN_ID.SYMBOL_ID,"Symbol"],[REPORT_COLUMN_ID.NAME_ID,"Name"],[REPORT_COLUMN_ID.PRICE_ID,"Price"],[REPORT_COLUMN_ID.INCREASE_ID,"Increase"],[REPORT_COLUMN_ID.UPDOWN_ID,"UpDown"],[REPORT_COLUMN_ID.VOL_ID,"Vol"],[REPORT_COLUMN_ID.BUY_PRICE_ID,"BuyPrice"],[REPORT_COLUMN_ID.SELL_PRICE_ID,"SellPrice"],[REPORT_COLUMN_ID.AMOUNT_ID,"Amount"],[REPORT_COLUMN_ID.BUY_VOL_ID,"BuyVol"],[REPORT_COLUMN_ID.SELL_VOL_ID,"SellVol"],[REPORT_COLUMN_ID.YCLOSE_ID,"YClose"],[REPORT_COLUMN_ID.OPEN_ID,"Open"],[REPORT_COLUMN_ID.HIGH_ID,"High"],[REPORT_COLUMN_ID.LOW_ID,"Low"],[REPORT_COLUMN_ID.AVERAGE_PRICE_ID,"AvPrice"],[REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID,"OutShares"],[REPORT_COLUMN_ID.TOTAL_SHARES_ID,"TotalShares"],[REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID,"CircMarketValue"],[REPORT_COLUMN_ID.MARKET_VALUE_ID,"MarketValue"],[REPORT_COLUMN_ID.EXCHANGE_RATE_ID,"Exchange"],[REPORT_COLUMN_ID.AMPLITUDE_ID,"Amplitude"],[REPORT_COLUMN_ID.LIMIT_HIGH_ID,"LimitHigh"],[REPORT_COLUMN_ID.LIMIT_LOW_ID,"LimitLow"],[REPORT_COLUMN_ID.VOL_IN_ID,"VolIn"],[REPORT_COLUMN_ID.VOL_OUT_ID,"VolOut"],[REPORT_COLUMN_ID.NAME_EX_ID,"NameEx"],[REPORT_COLUMN_ID.DATE_ID,"Date"],[REPORT_COLUMN_ID.FUTURES_POSITION_ID,"Position"],[REPORT_COLUMN_ID.FUTURES_CLOSE_ID,"FClose"],[REPORT_COLUMN_ID.FUTURES_YCLOSE_ID,"YFClose"],[REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID,"OpenPosition"],[REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID,"ClosePosition"],[REPORT_COLUMN_ID.RISING_SPEED_1M_ID,"RSpeed1M"],[REPORT_COLUMN_ID.RISING_SPEED_3M_ID,"RSpeed3M"],[REPORT_COLUMN_ID.RISING_SPEED_5M_ID,"RSpeed5M"],[REPORT_COLUMN_ID.RISING_SPEED_10M_ID,"RSpeed10M"],[REPORT_COLUMN_ID.RISING_SPEED_15M_ID,"RSpeed15M"],[REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],[REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],[REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],[REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],[REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],[REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],[REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],[REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],[REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],[REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],[REPORT_COLUMN_ID.RESERVE_NUMBER11_ID,"ReserveNumber11"],[REPORT_COLUMN_ID.RESERVE_NUMBER12_ID,"ReserveNumber12"],[REPORT_COLUMN_ID.RESERVE_NUMBER13_ID,"ReserveNumber13"],[REPORT_COLUMN_ID.RESERVE_NUMBER14_ID,"ReserveNumber14"],[REPORT_COLUMN_ID.RESERVE_NUMBER15_ID,"ReserveNumber15"],[REPORT_COLUMN_ID.RESERVE_NUMBER16_ID,"ReserveNumber16"],[REPORT_COLUMN_ID.RESERVE_NUMBER17_ID,"ReserveNumber17"],[REPORT_COLUMN_ID.RESERVE_NUMBER18_ID,"ReserveNumber18"],[REPORT_COLUMN_ID.RESERVE_NUMBER19_ID,"ReserveNumber19"],[REPORT_COLUMN_ID.RESERVE_NUMBER20_ID,"ReserveNumber20"],[REPORT_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],[REPORT_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],[REPORT_COLUMN_ID.RESERVE_STRING3_ID,"ReserveString3"],[REPORT_COLUMN_ID.RESERVE_STRING4_ID,"ReserveString4"],[REPORT_COLUMN_ID.RESERVE_STRING5_ID,"ReserveString5"],[REPORT_COLUMN_ID.RESERVE_STRING6_ID,"ReserveString6"],[REPORT_COLUMN_ID.RESERVE_STRING7_ID,"ReserveString7"],[REPORT_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],[REPORT_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],[REPORT_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],[REPORT_COLUMN_ID.RESERVE_STRING11_ID,"ReserveString11"],[REPORT_COLUMN_ID.RESERVE_STRING12_ID,"ReserveString12"],[REPORT_COLUMN_ID.RESERVE_STRING13_ID,"ReserveString13"],[REPORT_COLUMN_ID.RESERVE_STRING14_ID,"ReserveString14"],[REPORT_COLUMN_ID.RESERVE_STRING15_ID,"ReserveString15"],[REPORT_COLUMN_ID.RESERVE_STRING16_ID,"ReserveString16"],[REPORT_COLUMN_ID.RESERVE_STRING17_ID,"ReserveString17"],[REPORT_COLUMN_ID.RESERVE_STRING18_ID,"ReserveString18"],[REPORT_COLUMN_ID.RESERVE_STRING19_ID,"ReserveString19"],[REPORT_COLUMN_ID.RESERVE_STRING20_ID,"ReserveString20"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID,"ReserveProgressBar1"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID,"ReserveProgressBar2"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID,"ReserveProgressBar3"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID,"ReserveProgressBar4"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID,"ReserveProgressBar5"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID,"ReserveProgressBar6"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID,"ReserveProgressBar7"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID,"ReserveProgressBar8"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID,"ReserveProgressBar9"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID,"ReserveProgressBar10"],[REPORT_COLUMN_ID.RESERVE_BUTTON1_ID,"ReserveButton1"],[REPORT_COLUMN_ID.RESERVE_BUTTON2_ID,"ReserveButton2"],[REPORT_COLUMN_ID.RESERVE_BUTTON3_ID,"ReserveButton3"],[REPORT_COLUMN_ID.RESERVE_BUTTON4_ID,"ReserveButton4"],[REPORT_COLUMN_ID.RESERVE_BUTTON5_ID,"ReserveButton5"],[REPORT_COLUMN_ID.RESERVE_BUTTON6_ID,"ReserveButton6"],[REPORT_COLUMN_ID.RESERVE_BUTTON7_ID,"ReserveButton7"],[REPORT_COLUMN_ID.RESERVE_BUTTON8_ID,"ReserveButton8"],[REPORT_COLUMN_ID.RESERVE_BUTTON9_ID,"ReserveButton9"],[REPORT_COLUMN_ID.RESERVE_BUTTON10_ID,"ReserveButton10"],[REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,"ReserveDateTime1"],[REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,"ReserveDateTime2"],[REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,"ReserveDateTime3"],[REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,"ReserveDateTime4"],[REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,"ReserveDateTime5"],[REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,"ReserveDateTime6"],[REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,"ReserveDateTime7"],[REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,"ReserveDateTime8"],[REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,"ReserveDateTime9"],[REPORT_COLUMN_ID.RESERVE_DATETIME10_ID,"ReserveDateTime10"]]);function ChartReport(){this.Canvas;//画布
+};var MAP_COLUMN_FIELD=new _map2.default([[REPORT_COLUMN_ID.SYMBOL_ID,"Symbol"],[REPORT_COLUMN_ID.NAME_ID,"Name"],[REPORT_COLUMN_ID.PRICE_ID,"Price"],[REPORT_COLUMN_ID.INCREASE_ID,"Increase"],[REPORT_COLUMN_ID.UPDOWN_ID,"UpDown"],[REPORT_COLUMN_ID.VOL_ID,"Vol"],[REPORT_COLUMN_ID.BUY_PRICE_ID,"BuyPrice"],[REPORT_COLUMN_ID.SELL_PRICE_ID,"SellPrice"],[REPORT_COLUMN_ID.AMOUNT_ID,"Amount"],[REPORT_COLUMN_ID.BUY_VOL_ID,"BuyVol"],[REPORT_COLUMN_ID.SELL_VOL_ID,"SellVol"],[REPORT_COLUMN_ID.YCLOSE_ID,"YClose"],[REPORT_COLUMN_ID.OPEN_ID,"Open"],[REPORT_COLUMN_ID.HIGH_ID,"High"],[REPORT_COLUMN_ID.LOW_ID,"Low"],[REPORT_COLUMN_ID.AVERAGE_PRICE_ID,"AvPrice"],[REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID,"OutShares"],[REPORT_COLUMN_ID.TOTAL_SHARES_ID,"TotalShares"],[REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID,"CircMarketValue"],[REPORT_COLUMN_ID.MARKET_VALUE_ID,"MarketValue"],[REPORT_COLUMN_ID.EXCHANGE_RATE_ID,"Exchange"],[REPORT_COLUMN_ID.AMPLITUDE_ID,"Amplitude"],[REPORT_COLUMN_ID.LIMIT_HIGH_ID,"LimitHigh"],[REPORT_COLUMN_ID.LIMIT_LOW_ID,"LimitLow"],[REPORT_COLUMN_ID.VOL_IN_ID,"VolIn"],[REPORT_COLUMN_ID.VOL_OUT_ID,"VolOut"],[REPORT_COLUMN_ID.NAME_EX_ID,"NameEx"],[REPORT_COLUMN_ID.DATE_ID,"Date"],[REPORT_COLUMN_ID.FUTURES_POSITION_ID,"Position"],[REPORT_COLUMN_ID.FUTURES_CLOSE_ID,"FClose"],[REPORT_COLUMN_ID.FUTURES_YCLOSE_ID,"YFClose"],[REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID,"OpenPosition"],[REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID,"ClosePosition"],[REPORT_COLUMN_ID.DELIVERY_DATE_ID,"DeliveryDate"],[REPORT_COLUMN_ID.OPEN_DATE_ID,"OpenDate"],[REPORT_COLUMN_ID.EXPIRE_DATE_ID,"ExpireDate"],[REPORT_COLUMN_ID.RISING_SPEED_1M_ID,"RSpeed1M"],[REPORT_COLUMN_ID.RISING_SPEED_3M_ID,"RSpeed3M"],[REPORT_COLUMN_ID.RISING_SPEED_5M_ID,"RSpeed5M"],[REPORT_COLUMN_ID.RISING_SPEED_10M_ID,"RSpeed10M"],[REPORT_COLUMN_ID.RISING_SPEED_15M_ID,"RSpeed15M"],[REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],[REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],[REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],[REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,"ReserveNumber4"],[REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,"ReserveNumber5"],[REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,"ReserveNumber6"],[REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,"ReserveNumber7"],[REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,"ReserveNumber8"],[REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,"ReserveNumber9"],[REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,"ReserveNumber10"],[REPORT_COLUMN_ID.RESERVE_NUMBER11_ID,"ReserveNumber11"],[REPORT_COLUMN_ID.RESERVE_NUMBER12_ID,"ReserveNumber12"],[REPORT_COLUMN_ID.RESERVE_NUMBER13_ID,"ReserveNumber13"],[REPORT_COLUMN_ID.RESERVE_NUMBER14_ID,"ReserveNumber14"],[REPORT_COLUMN_ID.RESERVE_NUMBER15_ID,"ReserveNumber15"],[REPORT_COLUMN_ID.RESERVE_NUMBER16_ID,"ReserveNumber16"],[REPORT_COLUMN_ID.RESERVE_NUMBER17_ID,"ReserveNumber17"],[REPORT_COLUMN_ID.RESERVE_NUMBER18_ID,"ReserveNumber18"],[REPORT_COLUMN_ID.RESERVE_NUMBER19_ID,"ReserveNumber19"],[REPORT_COLUMN_ID.RESERVE_NUMBER20_ID,"ReserveNumber20"],[REPORT_COLUMN_ID.RESERVE_STRING1_ID,"ReserveString1"],[REPORT_COLUMN_ID.RESERVE_STRING2_ID,"ReserveString2"],[REPORT_COLUMN_ID.RESERVE_STRING3_ID,"ReserveString3"],[REPORT_COLUMN_ID.RESERVE_STRING4_ID,"ReserveString4"],[REPORT_COLUMN_ID.RESERVE_STRING5_ID,"ReserveString5"],[REPORT_COLUMN_ID.RESERVE_STRING6_ID,"ReserveString6"],[REPORT_COLUMN_ID.RESERVE_STRING7_ID,"ReserveString7"],[REPORT_COLUMN_ID.RESERVE_STRING8_ID,"ReserveString8"],[REPORT_COLUMN_ID.RESERVE_STRING9_ID,"ReserveString9"],[REPORT_COLUMN_ID.RESERVE_STRING10_ID,"ReserveString10"],[REPORT_COLUMN_ID.RESERVE_STRING11_ID,"ReserveString11"],[REPORT_COLUMN_ID.RESERVE_STRING12_ID,"ReserveString12"],[REPORT_COLUMN_ID.RESERVE_STRING13_ID,"ReserveString13"],[REPORT_COLUMN_ID.RESERVE_STRING14_ID,"ReserveString14"],[REPORT_COLUMN_ID.RESERVE_STRING15_ID,"ReserveString15"],[REPORT_COLUMN_ID.RESERVE_STRING16_ID,"ReserveString16"],[REPORT_COLUMN_ID.RESERVE_STRING17_ID,"ReserveString17"],[REPORT_COLUMN_ID.RESERVE_STRING18_ID,"ReserveString18"],[REPORT_COLUMN_ID.RESERVE_STRING19_ID,"ReserveString19"],[REPORT_COLUMN_ID.RESERVE_STRING20_ID,"ReserveString20"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID,"ReserveProgressBar1"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID,"ReserveProgressBar2"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID,"ReserveProgressBar3"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID,"ReserveProgressBar4"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID,"ReserveProgressBar5"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID,"ReserveProgressBar6"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID,"ReserveProgressBar7"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID,"ReserveProgressBar8"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID,"ReserveProgressBar9"],[REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID,"ReserveProgressBar10"],[REPORT_COLUMN_ID.RESERVE_BUTTON1_ID,"ReserveButton1"],[REPORT_COLUMN_ID.RESERVE_BUTTON2_ID,"ReserveButton2"],[REPORT_COLUMN_ID.RESERVE_BUTTON3_ID,"ReserveButton3"],[REPORT_COLUMN_ID.RESERVE_BUTTON4_ID,"ReserveButton4"],[REPORT_COLUMN_ID.RESERVE_BUTTON5_ID,"ReserveButton5"],[REPORT_COLUMN_ID.RESERVE_BUTTON6_ID,"ReserveButton6"],[REPORT_COLUMN_ID.RESERVE_BUTTON7_ID,"ReserveButton7"],[REPORT_COLUMN_ID.RESERVE_BUTTON8_ID,"ReserveButton8"],[REPORT_COLUMN_ID.RESERVE_BUTTON9_ID,"ReserveButton9"],[REPORT_COLUMN_ID.RESERVE_BUTTON10_ID,"ReserveButton10"],[REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,"ReserveDateTime1"],[REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,"ReserveDateTime2"],[REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,"ReserveDateTime3"],[REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,"ReserveDateTime4"],[REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,"ReserveDateTime5"],[REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,"ReserveDateTime6"],[REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,"ReserveDateTime7"],[REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,"ReserveDateTime8"],[REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,"ReserveDateTime9"],[REPORT_COLUMN_ID.RESERVE_DATETIME10_ID,"ReserveDateTime10"]]);function ChartReport(){this.Canvas;//画布
 this.ChartBorder;//边框信息
 this.ChartFrame;//框架画法
 this.Name;//名称
@@ -14414,7 +14422,7 @@ if(item.SubDateTimeFormat)colItem.SubDateTimeFormat=item.SubDateTimeFormat;}else
 if(IFrameSplitOperator.IsNumber(item.BlockIndex))colItem.BlockIndex=item.BlockIndex;if(item.ProgressBar)colItem.ProgressBar=CloneData(item.ProgressBar);else colItem.ProgressBar=this.ProgressBarConfig;}else if(this.IsReserveProgressBarColumn(item.Type)){if(item.ProgressBar)colItem.ProgressBar=CloneData(item.ProgressBar);else colItem.ProgressBar=this.ProgressBarConfig;}else if(item.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID){if(!IFrameSplitOperator.IsNumber(item.DataIndex)&&!IFrameSplitOperator.IsNumber(item.BlockIndex))return null;if(IFrameSplitOperator.IsNumber(item.DataIndex))colItem.DataIndex=item.DataIndex;//数据在扩展数据索引列
 if(IFrameSplitOperator.IsNumber(item.BlockIndex))colItem.BlockIndex=item.BlockIndex;if(item.Link)colItem.Link=CloneData(item.Link);else colItem.Link=this.LinkConfig;}else if(item.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID){}else if(item.Type==REPORT_COLUMN_ID.CLOSE_LINE_ID){if(IFrameSplitOperator.IsBool(item.IsDrawArea))colItem.IsDrawArea=item.IsDrawArea;if(IFrameSplitOperator.IsNumber(item.LineColorType))colItem.LineColorType=item.LineColorType;}else if(item.Type==REPORT_COLUMN_ID.TIME_ID){if(IFrameSplitOperator.IsNumber(item.ValueType))colItem.ValueType=item.ValueType;}else if(item.Type==REPORT_COLUMN_ID.DATE_ID){if(IFrameSplitOperator.IsNumber(item.FormatType))colItem.FormatType=item.FormatType;}else if(item.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER){if(IFrameSplitOperator.IsNonEmptyArray(item.AryField))colItem.AryField=item.AryField.slice();if(IFrameSplitOperator.IsNumber(item.SortSubField))colItem.SortSubField=item.SortSubField;}return colItem;};this.SetColumn=function(aryColumn){if(!IFrameSplitOperator.IsNonEmptyArray(aryColumn))return;this.Column=[];for(var i=0;i<aryColumn.length;++i){var item=aryColumn[i];var colItem=this.CreateColumnItem(item);if(!colItem)continue;this.Column.push(colItem);}};this.SwapColumn=function(leftIndex,rightIndex){if(!IFrameSplitOperator.IsNumber(leftIndex)||!IFrameSplitOperator.IsNumber(rightIndex))return false;var count=this.Column.length;if(leftIndex<0||leftIndex>=count)return false;if(rightIndex<0||rightIndex>=count)return false;if(leftIndex==rightIndex)return;var tempItem=this.Column[leftIndex];this.Column[leftIndex]=this.Column[rightIndex];this.Column[rightIndex]=tempItem;return true;};this.DeleteColumn=function(index){if(!IFrameSplitOperator.IsNonEmptyArray(this.Column))return false;if(index<0||index>=this.Column.length)return false;this.Column.splice(index,1);return true;};this.ChangeColumn=function(index,newColumn){if(index<0||index>=this.Column.length)return false;var colItem=this.CreateColumnItem(newColumn);if(!colItem)return false;this.Column[index]=colItem;return true;};this.GetXScrollPos=function(){return this.Data.XOffset;};this.GetXScrollRange=function(){var maxOffset=this.Column.length-this.FixedColumn-3;if(maxOffset<0)return 0;return maxOffset;};this.GetYScrollRange=function(){if(!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))return 0;var dataCount=this.GetAllRowCount();var maxOffset=dataCount-this.RowCount;return maxOffset;};this.GetDefaultColunm=function(id){var DEFAULT_COLUMN=[{Type:REPORT_COLUMN_ID.INDEX_ID,Title:"序号",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Index,MaxText:"8888"},{Type:REPORT_COLUMN_ID.SYMBOL_ID,Title:"代码",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Symbol,MaxText:"888888"},{Type:REPORT_COLUMN_ID.NAME_ID,Title:"名称",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Name,MaxText:"擎擎擎擎0"},{Type:REPORT_COLUMN_ID.NAME_EX_ID,Title:"名称",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Name,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.SYMBOL_NAME_ID,Title:"股票名称",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Name,MaxText:"擎擎擎擎0"},{Type:REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID,Title:"名称/代码",TextAlign:"left",Width:null,TextColor:g_JSChartResource.Report.NameSymbolV2.Name.Color,MaxText:"擎擎擎擎*",MaxText2:"999999",Space:5,TextColor2:g_JSChartResource.Report.NameSymbolV2.Symbol.Color},{Type:REPORT_COLUMN_ID.INCREASE_ID,Title:"涨幅%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.PRICE_ID,Title:"现价",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.UPDOWN_ID,Title:"涨跌",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.AMPLITUDE_ID,Title:"振幅%",TextAlign:"right",Width:null,MaxText:"888.88"},{Type:REPORT_COLUMN_ID.BUY_PRICE_ID,Title:"买价",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.SELL_PRICE_ID,Title:"卖价",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.AVERAGE_PRICE_ID,Title:"均价",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.OPEN_ID,Title:"今开",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.HIGH_ID,Title:"最高",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.LOW_ID,Title:"最低",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.YCLOSE_ID,Title:"昨收",TextAlign:"right",Width:null,MaxText:"88888.88"},{Type:REPORT_COLUMN_ID.VOL_ID,Title:"总量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.AMOUNT_ID,Title:"总金额",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Amount,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.EXCHANGE_RATE_ID,Title:"换手%",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"88.88擎"},{Type:REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID,Title:"流通股本",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.TOTAL_SHARES_ID,Title:"总股本",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID,Title:"流通市值",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.MARKET_VALUE_ID,Title:"总市值",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.VOL_IN_ID,Title:"内盘",TextAlign:"right",TextColor:g_JSChartResource.Report.DownTextColor,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.VOL_OUT_ID,Title:"外盘",TextAlign:"right",TextColor:g_JSChartResource.Report.UpTextColor,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.CLOSE_LINE_ID,Title:"走势",TextAlign:"center",TextColor:g_JSChartResource.Report.CloseLineColor,Width:null,MaxText:"88888.88888",LineColorType:0},{Type:REPORT_COLUMN_ID.BUY_VOL_ID,Title:"买量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888.8擎"},{Type:REPORT_COLUMN_ID.SELL_VOL_ID,Title:"卖量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888.8擎"},//{ Type:REPORT_COLUMN_ID.MULTI_BAR_ID, Title:"柱子", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
 //{ Type:REPORT_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
-{Type:REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.CUSTOM_ICON_ID,Title:"  ",TextAlign:"left",FixedWidth:20,TextColor:g_JSChartResource.Report.FieldColor.Text},{Type:REPORT_COLUMN_ID.KLINE_ID,Title:"K线",TextAlign:"left",FixedWidth:50,TextColor:g_JSChartResource.Report.FieldColor.Text},{Type:REPORT_COLUMN_ID.TIME_ID,Title:"时间",TextAlign:"left",ValueType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"99:99:99.999"},{Type:REPORT_COLUMN_ID.DATE_ID,Title:"日期",TextAlign:"left",FormatType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.CHECKBOX_ID,Title:"",TextAlign:"center",FixedWidth:20*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID,Title:"",TextAlign:"center",FixedWidth:20*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID,Title:"",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID,Title:"进度条",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_LINK_ID,Title:"链接地址",TextAlign:"center",MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.FUTURES_POSITION_ID,Title:"持仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_CLOSE_ID,Title:"结算价",TextAlign:"right",Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_YCLOSE_ID,Title:"昨结算价",TextAlign:"right",Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID,Title:"开仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID,Title:"平仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.RISING_SPEED_1M_ID,Title:"涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_3M_ID,Title:"3分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_5M_ID,Title:"5分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_10M_ID,Title:"10分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_15M_ID,Title:"15分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},//组合多行字段
+{Type:REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID,Title:"自定义",TextAlign:"center",Width:null,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.CUSTOM_ICON_ID,Title:"  ",TextAlign:"left",FixedWidth:20,TextColor:g_JSChartResource.Report.FieldColor.Text},{Type:REPORT_COLUMN_ID.KLINE_ID,Title:"K线",TextAlign:"left",FixedWidth:50,TextColor:g_JSChartResource.Report.FieldColor.Text},{Type:REPORT_COLUMN_ID.TIME_ID,Title:"时间",TextAlign:"left",ValueType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"99:99:99.999"},{Type:REPORT_COLUMN_ID.DATE_ID,Title:"日期",TextAlign:"left",FormatType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.DELIVERY_DATE_ID,Title:"交割日",TextAlign:"left",FormatType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.OPEN_DATE_ID,Title:"上市日",TextAlign:"left",FormatType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.EXPIRE_DATE_ID,Title:"到期日",TextAlign:"left",FormatType:0,TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99"},{Type:REPORT_COLUMN_ID.CHECKBOX_ID,Title:"",TextAlign:"center",FixedWidth:20*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID,Title:"",TextAlign:"center",FixedWidth:20*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_BUTTON_ID,Title:"",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID,Title:"进度条",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.CUSTOM_LINK_ID,Title:"链接地址",TextAlign:"center",MaxText:"擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.FUTURES_POSITION_ID,Title:"持仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Vol,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_CLOSE_ID,Title:"结算价",TextAlign:"right",Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_YCLOSE_ID,Title:"昨结算价",TextAlign:"right",Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID,Title:"开仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID,Title:"平仓量",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,Width:null,MaxText:"8888888"},{Type:REPORT_COLUMN_ID.RISING_SPEED_1M_ID,Title:"涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_3M_ID,Title:"3分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_5M_ID,Title:"5分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_10M_ID,Title:"10分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},{Type:REPORT_COLUMN_ID.RISING_SPEED_15M_ID,Title:"15分涨速%",TextAlign:"right",Width:null,MaxText:"-888.88"},//组合多行字段
 {Type:REPORT_COLUMN_ID.MULTI_LINE_CONTAINER,Title:"涨幅",TextAlign:"right",MaxText:"1000.00%",AryField:[{Type:REPORT_COLUMN_ID.PRICE_ID},{Type:REPORT_COLUMN_ID.INCREASE_ID,DynamicFormat:"{Value}%"}]},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER1_ID,Title:"数值1",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER2_ID,Title:"数值2",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER3_ID,Title:"数值3",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER4_ID,Title:"数值4",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER5_ID,Title:"数值5",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER6_ID,Title:"数值6",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER7_ID,Title:"数值7",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER8_ID,Title:"数值8",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER9_ID,Title:"数值9",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER10_ID,Title:"数值10",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER11_ID,Title:"数值11",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER12_ID,Title:"数值12",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER13_ID,Title:"数值13",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER14_ID,Title:"数值14",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER15_ID,Title:"数值15",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER16_ID,Title:"数值16",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER17_ID,Title:"数值17",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER18_ID,Title:"数值18",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER19_ID,Title:"数值19",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_NUMBER20_ID,Title:"数值20",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999.99",FloatPrecision:2},{Type:REPORT_COLUMN_ID.RESERVE_STRING1_ID,Title:"文字1",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING2_ID,Title:"文字2",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING3_ID,Title:"文字3",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING4_ID,Title:"文字4",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING5_ID,Title:"文字5",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING6_ID,Title:"文字6",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING7_ID,Title:"文字7",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING8_ID,Title:"文字8",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING9_ID,Title:"文字9",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING10_ID,Title:"文字10",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING11_ID,Title:"文字11",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING12_ID,Title:"文字12",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING13_ID,Title:"文字13",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING14_ID,Title:"文字14",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING15_ID,Title:"文字15",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING16_ID,Title:"文字16",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING17_ID,Title:"文字17",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING18_ID,Title:"文字18",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING19_ID,Title:"文字19",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_STRING20_ID,Title:"文字20",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"擎擎擎擎擎擎"},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR1_ID,Title:"进度条1",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR2_ID,Title:"进度条2",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR3_ID,Title:"进度条3",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR4_ID,Title:"进度条4",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR5_ID,Title:"进度条5",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR6_ID,Title:"进度条6",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR7_ID,Title:"进度条7",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR8_ID,Title:"进度条8",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR9_ID,Title:"进度条9",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_PROGRESS_BAR10_ID,Title:"进度条10",TextAlign:"center",FixedWidth:100*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON1_ID,Title:"按钮1",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON2_ID,Title:"按钮2",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON3_ID,Title:"按钮3",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON4_ID,Title:"按钮4",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON5_ID,Title:"按钮5",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON6_ID,Title:"按钮6",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON7_ID,Title:"按钮7",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON8_ID,Title:"按钮8",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON9_ID,Title:"按钮9",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_BUTTON10_ID,Title:"按钮10",TextAlign:"center",FixedWidth:50*GetDevicePixelRatio()},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME1_ID,Title:"日期1",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME2_ID,Title:"日期2",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME3_ID,Title:"日期3",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME4_ID,Title:"日期4",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME5_ID,Title:"日期5",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME6_ID,Title:"日期6",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME7_ID,Title:"日期7",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME8_ID,Title:"日期8",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME9_ID,Title:"日期9",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"},{Type:REPORT_COLUMN_ID.RESERVE_DATETIME10_ID,Title:"日期10",TextAlign:"right",TextColor:g_JSChartResource.Report.FieldColor.Text,MaxText:"9999-99-99",DateTimeFormat:"YYYY-MM-DD"}];for(var i=0;i<DEFAULT_COLUMN.length;++i){var item=DEFAULT_COLUMN[i];if(item.Type==id)return item;}return null;};this.ClipClient=function(){this.Canvas.save();this.Canvas.beginPath();this.Canvas.rect(this.RectClient.Left,this.RectClient.Top,this.RectClient.Right-this.RectClient.Left,this.RectClient.Bottom-this.RectClient.Top);//this.Canvas.stroke(); //调试用
 this.Canvas.clip();};this.CreateTempCache=function(){this.TempCache={MapReserveDateTime:new _map2.default()};//MapReserveDateTime:key=colindex, Value:{ PreDate }
 };this.Draw=function(lastMouseStatus){this.ShowSymbol=[];this.TooltipRect=[];this.ButtonRect=[];this.AryFullSelectedRow=[];this.DevicePixelRatio=GetDevicePixelRatio();this.LastMouseStatus=lastMouseStatus;this.DrawRowCount=0;this.CreateTempCache();if(this.GlobalOption)this.GlobalOption.FlashBGCount=0;if(this.SizeChange)this.CalculateSize();else this.UpdateCacheData();this.ClipClient();this.DrawDragHeaderBG();this.DrawHeader();this.DrawBody();this.Canvas.restore();if(this.Tab&&this.BottomToolbarHeight>0){var bottom=this.ChartBorder.GetBottom();this.Tab.DrawTab(this.RectClient.Left,bottom-this.BottomToolbarHeight,this.RectClient.Right,bottom);this.Tab.DrawScrollbar(this.RectClient.Left,bottom-this.BottomToolbarHeight,this.RectClient.Right,bottom);}this.ClipClient();this.DrawBorder();this.DrawSelectedRow();this.Canvas.restore();this.DrawDragRow();this.DrawDragHeader();if(this.VScrollbar){var bottom=this.ChartBorder.GetBottom();this.VScrollbar.DrawScrollbar(this.RectClient.Left,this.RectClient.Top+this.HeaderHeight,this.RectClient.Right,bottom-this.BottomToolbarHeight-4);}this.LastMouseStatus=null;this.SizeChange=false;this.AryFullSelectedRow=[];this.TempCache=null;};this.DrawDragHeaderBG=function(){if(!this.DragHeader)return;var left=this.RectClient.Left;var right=this.RectClient.Right;var top=this.RectClient.Top;var bottom=top+this.HeaderHeight+this.RowHeight*this.RowCount+this.FixedRowHeight*this.FixedRowCount;//竖线
@@ -14455,12 +14463,12 @@ if(this.SelectedModel==0)return null;//当前屏选中
 if(!this.SelectedRowData)return null;return this.SelectedRowData.Symbol;};this.DrawFixedSymbolRow=function(top,dataIndex){var left=this.RectClient.Left;var chartRight=this.RectClient.Right;if(!this.FixedRowData||!IFrameSplitOperator.IsNonEmptyArray(this.FixedRowData.Symbol))return;var symbol=this.FixedRowData.Symbol[dataIndex];if(!symbol)return;this.DrawRow(symbol,top,dataIndex,1);this.ShowSymbol.push({Index:dataIndex,Symbol:symbol,RowType:1});};this.DrawFixedRow=function(top,dataIndex){var left=this.RectClient.Left;var chartRight=this.RectClient.Right;for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];this.DrawFixedItem(dataIndex,i,item,left,top);left+=item.Width;if(left>=chartRight)break;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];this.DrawFixedItem(dataIndex,i,item,left,top);left+=item.Width;if(left>=chartRight)break;}};this.DrawFixedItem=function(dataIndex,colIndex,column,left,top){var x=left+this.ItemMergin.Left;var textWidth=column.Width-this.ItemMergin.Left-this.ItemMergin.Right;var drawInfo={Text:null,TextColor:column.TextColor,TextAlign:column.TextAlign};if(this.GetFixedRowTextDrawInfo(dataIndex,colIndex,column,drawInfo)){this.DrawItemText(drawInfo.Text,drawInfo.TextColor,drawInfo.TextAlign,x,top,textWidth);return;}if(!this.FixedRowData||!IFrameSplitOperator.IsNonEmptyArray(this.FixedRowData.Data))return;var data=this.FixedRowData.Data;var rowData=data[dataIndex];if(!IFrameSplitOperator.IsNonEmptyArray(rowData))return;var itemData=rowData[colIndex];if(!itemData||!itemData.Text)return;drawInfo.Text=itemData.Text;if(itemData.Color)drawInfo.TextColor=itemData.Color;if(itemData.TextAlign)drawInfo.TextAlign=itemData.TextAlign;this.DrawItemText(drawInfo.Text,drawInfo.TextColor,drawInfo.TextAlign,x,top,textWidth);};this.DrawRow=function(symbol,top,dataIndex,rowType)//rowType 0=表格行 1=顶部固定行 2=拖拽行
 {var left=this.RectClient.Left;var chartRight=this.RectClient.Right;var data={Symbol:symbol,Stock:null,Block:null};if(this.GetStockDataCallback)data.Stock=this.GetStockDataCallback(symbol);if(this.GetBlockDataCallback)data.Block=this.GetBlockDataCallback(symbol);if(this.GetFlashBGDataCallback)data.FlashBG=this.GetFlashBGDataCallback(symbol,Date.now());data.Decimal=GetfloatPrecision(symbol);//小数位数
 for(var i=0;i<this.FixedColumn&&i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,rowType,i);left+=item.Width;if(left>=chartRight)break;}for(var i=this.FixedColumn+this.Data.XOffset;i<this.Column.length;++i){var item=this.Column[i];this.DrawItem(dataIndex,data,item,left,top,rowType,i);left+=item.Width;if(left>=chartRight)break;}};this.BuildSubCellTextData=function(subItem,column,stock,drawInfo,data,option){switch(subItem.Type){case REPORT_COLUMN_ID.NAME_ID:if(stock&&stock.Name)drawInfo.Text=stock.Name;else drawInfo.Text=data.Name;break;case REPORT_COLUMN_ID.SYMBOL_ID:if(stock&&stock.Symbol)drawInfo.Text=stock.Symbol;else drawInfo.Text=data.Symbol;break;case REPORT_COLUMN_ID.PRICE_ID:case REPORT_COLUMN_ID.OPEN_ID:case REPORT_COLUMN_ID.HIGH_ID:case REPORT_COLUMN_ID.LOW_ID:case REPORT_COLUMN_ID.YCLOSE_ID:case REPORT_COLUMN_ID.BUY_PRICE_ID:case REPORT_COLUMN_ID.SELL_PRICE_ID:case REPORT_COLUMN_ID.AVERAGE_PRICE_ID:case REPORT_COLUMN_ID.FUTURES_CLOSE_ID:case REPORT_COLUMN_ID.FUTURES_YCLOSE_ID:var fieldName=MAP_COLUMN_FIELD.get(subItem.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName]))this.GetPriceDrawInfo(stock[fieldName],stock,data,drawInfo,option);break;case REPORT_COLUMN_ID.INCREASE_ID:case REPORT_COLUMN_ID.AMPLITUDE_ID:case REPORT_COLUMN_ID.UPDOWN_ID:case REPORT_COLUMN_ID.RISING_SPEED_1M_ID:case REPORT_COLUMN_ID.RISING_SPEED_3M_ID:case REPORT_COLUMN_ID.RISING_SPEED_5M_ID:case REPORT_COLUMN_ID.RISING_SPEED_10M_ID:case REPORT_COLUMN_ID.RISING_SPEED_15M_ID:var fieldName=MAP_COLUMN_FIELD.get(subItem.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];var text=value.toFixed(2);if(subItem.DynamicFormat)text=subItem.DynamicFormat.replace('{Value}',text);drawInfo.Text=text;drawInfo.TextColor=this.GetUpDownColor(value,0);}break;}};this.DrawSubCellText=function(drawInfo,column,rtText){if(!drawInfo.Text)return;var text=drawInfo.Text;var x=rtText.Left;if(drawInfo.TextAlign=='center'){x=rtText.Left+rtText.Width/2;this.Canvas.textAlign="center";}else if(drawInfo.TextAlign=='right'){x=rtText.Left+rtText.Width-2;this.Canvas.textAlign="right";}else{x+=2;this.Canvas.textAlign="left";}var bClip=false;this.Canvas.textBaseline="bottom";this.Canvas.fillStyle=drawInfo.TextColor;this.Canvas.fillText(text,x,rtText.Bottom);if(bClip)this.Canvas.restore();};this.DrawItem=function(index,data,column,left,top,rowType,columnIndex){var itemWidth=column.Width;var x=left+this.ItemMergin.Left;var textWidth=column.Width-this.ItemMergin.Left-this.ItemMergin.Right;var stock=data.Stock;var drawInfo={Text:null,TextColor:column.TextColor,TextAlign:column.TextAlign,Tooltip:null,Index:index,ColumnIndex:columnIndex};var rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;if(column.FullColBGColor){this.DrawItemBG({Rect:rtItem,BGColor:column.FullColBGColor});}if(column.Type==REPORT_COLUMN_ID.INDEX_ID){if(rowType==1)return;//固定行序号空
-drawInfo.Text=(index+1).toString();}else if(column.Type==REPORT_COLUMN_ID.SYMBOL_ID){if(stock&&stock.Symbol)drawInfo.Text=stock.Symbol;else drawInfo.Text=data.Symbol;this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SYMBOL_NAME_ID){this.DrawSymbolName(data,column,left,top,rowType);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID){this.DrawSymbolNameV2(data,column,left,top,rowType);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.NAME_ID){if(stock&&stock.Name){if(IFrameSplitOperator.IsString(stock.Name)){drawInfo.Text=this.TextEllipsis(stock.Name,textWidth,column.MaxText);drawInfo.TextColor=this.GetNameColor(column,data.Symbol,rowType);}}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.NAME_EX_ID){//复杂格式 { Text:, Symbol:{ Family:'iconfont', Size:,  Data:[ { Text:'\ue631', Color:'#1c65db'}, ...] } ]}
+drawInfo.Text=(index+1).toString();}else if(column.Type==REPORT_COLUMN_ID.SYMBOL_ID){if(stock&&stock.Symbol)drawInfo.Text=stock.Symbol;else drawInfo.Text=MARKET_SUFFIX_NAME.GetShortSymbol(data.Symbol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SYMBOL_NAME_ID){this.DrawSymbolName(data,column,left,top,rowType);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SYMBOL_NAME_V2_ID){this.DrawSymbolNameV2(data,column,left,top,rowType);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.NAME_ID){if(stock&&stock.Name){if(IFrameSplitOperator.IsString(stock.Name)){drawInfo.Text=this.TextEllipsis(stock.Name,textWidth,column.MaxText);drawInfo.TextColor=this.GetNameColor(column,data.Symbol,rowType);}}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.NAME_EX_ID){//复杂格式 { Text:, Symbol:{ Family:'iconfont', Size:,  Data:[ { Text:'\ue631', Color:'#1c65db'}, ...] } ]}
 if(stock&&stock.NameEx){var nameEx=stock.NameEx;drawInfo.Text=this.TextEllipsis(nameEx.Text,textWidth,column.MaxText);drawInfo.TextColor=this.GetNameColor(column,data.Symbol,rowType);if(nameEx.Symbol)drawInfo.Symbol=nameEx.Symbol;}}else if(column.Type==REPORT_COLUMN_ID.PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.Price,stock,data,drawInfo,{LimitBG:true});this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.OPEN_ID){//如果行情开盘价为涨停价或跌停价,则对内容加灰框
 if(stock){this.DrawLimitPriceBorder(stock.Open,stock,left,top,column.Width);this.GetPriceDrawInfo(stock.Open,stock,data,drawInfo,{LimitBG:true});}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.HIGH_ID){//如果行情最高价为涨停价,则对内容加灰框
 if(stock){this.DrawLimitPriceBorder(stock.High,stock,left,top,column.Width);this.GetPriceDrawInfo(stock.High,stock,data,drawInfo,{LimitBG:true});}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.LOW_ID){//如果行情最低价为跌停价,则对内容加灰框
 if(stock){this.DrawLimitPriceBorder(stock.Low,stock,left,top,column.Width);this.GetPriceDrawInfo(stock.Low,stock,data,drawInfo,{LimitBG:true});}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.YCLOSE_ID){if(stock)this.GetPriceDrawInfo(stock.YClose,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.BUY_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.BuyPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.FUTURES_CLOSE_ID||column.Type==REPORT_COLUMN_ID.FUTURES_YCLOSE_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];this.GetPriceDrawInfo(value,stock,data,drawInfo);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SELL_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.SellPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.AVERAGE_PRICE_ID){if(stock)this.GetPriceDrawInfo(stock.AvPrice,stock,data,drawInfo);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.EXCHANGE_RATE_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.Exchange))drawInfo.Text=stock.Exchange.toFixed(2);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.BUY_VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.BuyVol))drawInfo.Text=this.FormatVolString(stock.BuyVol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.SELL_VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.SellVol))drawInfo.Text=this.FormatVolString(stock.SellVol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.Vol))drawInfo.Text=this.FormatVolString(stock.Vol);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_IN_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.VolIn))drawInfo.Text=this.FormatVolString(stock.VolIn);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.VOL_OUT_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.VolOut))drawInfo.Text=this.FormatVolString(stock.VolOut);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.TOTAL_SHARES_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.TotalShares))drawInfo.Text=this.FormatVolString(stock.TotalShares);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.OUTSTANDING_SHARES_ID){if(stock&&IFrameSplitOperator.IsNumber(stock.OutShares))drawInfo.Text=this.FormatVolString(stock.OutShares);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.CIRC_MARKET_VALUE_ID||column.Type==REPORT_COLUMN_ID.MARKET_VALUE_ID||column.Type==REPORT_COLUMN_ID.AMOUNT_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName]))drawInfo.Text=this.FormatVolString(stock[fieldName]);this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.INCREASE_ID||column.Type==REPORT_COLUMN_ID.AMPLITUDE_ID||column.Type==REPORT_COLUMN_ID.UPDOWN_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_1M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_3M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_5M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_10M_ID||column.Type==REPORT_COLUMN_ID.RISING_SPEED_15M_ID){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];drawInfo.Text=value.toFixed(2);drawInfo.TextColor=this.GetUpDownColor(value,0);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.FUTURES_POSITION_ID||column.Type==REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID||column.Type==REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID){//持仓量原始值输出
-var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];drawInfo.Text=value.toFixed(0);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID){this.GetCustomStringDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID){this.GetCustomNumberDrawInfo(data,column,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID){this.GetCustomDateTimeDrawInfo(data,column,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID){this.GetCustomIconDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CLOSE_LINE_ID){var rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;if(stock)this.DrawLine(stock.CloseLine,column,rtItem);}else if(column.Type==REPORT_COLUMN_ID.KLINE_ID){var rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;this.DrawKLine(stock.KLine,column,rtItem,data);}else if(column.Type==REPORT_COLUMN_ID.TIME_ID){this.FormaTimeDrawInfo(column,stock,drawInfo,data);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.DATE_ID){this.FormaDateDrawInfo(column,stock,drawInfo,data);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CHECKBOX_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;drawInfo.Checked=false;drawInfo.Enable=true;drawInfo.CheckBox=this.CheckBoxConfig;drawInfo.Data=stock;if(stock&&IFrameSplitOperator.IsBool(stock.Checked))drawInfo.Checked=stock.Checked;}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomCheckBoxDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomButtonDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomProgressBarDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID){this.GetCustomLinkDrawInfo(data,column,drawInfo);}else if(this.IsReserveNumber(column.Type)){this.FormatReserveNumber(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveString(column.Type)){this.FormatReserveString(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveDateTime(column.Type)){this.FormatReserveDateTime(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveProgressBarColumn(column.Type)){this.FormatReserveProgressBar(column,stock,drawInfo);}else if(this.IsReserveButtonColumn(column.Type)){this.FormatReserveButton(column,stock,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER){if(IFrameSplitOperator.IsNonEmptyArray(column.AryField)){var yBottom=rtItem.Bottom-this.ItemMergin.Bottom-(column.AryField.length-1)*this.ItemFontHeight;var rtText={Left:left+this.ItemMergin.Left,Width:textWidth,Height:this.ItemFontHeight,Bottom:yBottom};rtText.Right=rtText.Left+rtText.Width;rtText.Top=rtText.Bottom-rtText.Height;for(var k=0;k<column.AryField.length;++k){drawInfo.Text=null;var subItem=column.AryField[k];this.BuildSubCellTextData(subItem,column,stock,drawInfo,data);this.DrawSubCellText(drawInfo,column,rtText);rtText.Bottom+=this.ItemFontHeight;rtText.Top+=this.ItemFontHeight;}}}//拖拽行颜色
+var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(stock&&IFrameSplitOperator.IsNumber(stock[fieldName])){var value=stock[fieldName];drawInfo.Text=value.toFixed(0);}this.FormatDrawInfo(column,stock,drawInfo,data);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID){this.GetCustomStringDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_NUMBER_TEXT_ID){this.GetCustomNumberDrawInfo(data,column,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_DATETIME_TEXT_ID){this.GetCustomDateTimeDrawInfo(data,column,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID){this.GetCustomIconDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CLOSE_LINE_ID){var rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;if(stock)this.DrawLine(stock.CloseLine,column,rtItem);}else if(column.Type==REPORT_COLUMN_ID.KLINE_ID){var rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;this.DrawKLine(stock.KLine,column,rtItem,data);}else if(column.Type==REPORT_COLUMN_ID.TIME_ID){this.FormaTimeDrawInfo(column,stock,drawInfo,data);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.DATE_ID||column.Type==REPORT_COLUMN_ID.DELIVERY_DATE_ID||column.Type==REPORT_COLUMN_ID.OPEN_DATE_ID||column.Type==REPORT_COLUMN_ID.EXPIRE_DATE_ID){this.FormaDateDrawInfo(column,stock,drawInfo,data);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CHECKBOX_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;drawInfo.Checked=false;drawInfo.Enable=true;drawInfo.CheckBox=this.CheckBoxConfig;drawInfo.Data=stock;if(stock&&IFrameSplitOperator.IsBool(stock.Checked))drawInfo.Checked=stock.Checked;}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomCheckBoxDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomButtonDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID){rtItem={Left:left,Top:top,Width:column.Width,Height:this.RowHeight};rtItem.Right=rtItem.Left+rtItem.Width;rtItem.Bottom=rtItem.Top+rtItem.Height;drawInfo.Rect=rtItem;this.GetCustomProgressBarDrawInfo(data,column,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID){this.GetCustomLinkDrawInfo(data,column,drawInfo);}else if(this.IsReserveNumber(column.Type)){this.FormatReserveNumber(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveString(column.Type)){this.FormatReserveString(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveDateTime(column.Type)){this.FormatReserveDateTime(column,stock,drawInfo);this.FormatDrawInfoEvent(stock,data,column,drawInfo);}else if(this.IsReserveProgressBarColumn(column.Type)){this.FormatReserveProgressBar(column,stock,drawInfo);}else if(this.IsReserveButtonColumn(column.Type)){this.FormatReserveButton(column,stock,drawInfo);}else if(column.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER){if(IFrameSplitOperator.IsNonEmptyArray(column.AryField)){var yBottom=rtItem.Bottom-this.ItemMergin.Bottom-(column.AryField.length-1)*this.ItemFontHeight;var rtText={Left:left+this.ItemMergin.Left,Width:textWidth,Height:this.ItemFontHeight,Bottom:yBottom};rtText.Right=rtText.Left+rtText.Width;rtText.Top=rtText.Bottom-rtText.Height;for(var k=0;k<column.AryField.length;++k){drawInfo.Text=null;var subItem=column.AryField[k];this.BuildSubCellTextData(subItem,column,stock,drawInfo,data);this.DrawSubCellText(drawInfo,column,rtText);rtText.Bottom+=this.ItemFontHeight;rtText.Top+=this.ItemFontHeight;}}}//拖拽行颜色
 if(rowType==3)drawInfo.TextColor=this.DragRowTextColor;if(drawInfo.Symbol){this.DrawItemTextEx(drawInfo,x,top,textWidth);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_ICON_ID){this.DrawIconItem(drawInfo,x,top,textWidth);}else if(column.Type==REPORT_COLUMN_ID.CHECKBOX_ID||column.Type==REPORT_COLUMN_ID.CUSTOM_CHECKBOX_ID){this.DrawCheckbox(drawInfo,left,top,itemWidth);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_BUTTON_ID||this.IsReserveButtonColumn(column.Type)){this.DrawButton(drawInfo,left,top,itemWidth);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_PROGRESS_ID||this.IsReserveProgressBarColumn(column.Type)){this.DrawProgressBar(drawInfo,left,top,itemWidth);}else if(column.Type==REPORT_COLUMN_ID.CUSTOM_LINK_ID){this.DrawLinkText(drawInfo,x,top,textWidth);}else if(column.Type==REPORT_COLUMN_ID.MULTI_LINE_CONTAINER){}else{if(data.FlashBG&&data.FlashBG.Data&&column.ID!=undefined){if(data.FlashBG.Data.has(column.ID)){var flashItem=data.FlashBG.Data.get(column.ID);var drawBG={Rect:drawInfo.Rect,BGColor:flashItem.Color};--flashItem.Count;this.DrawItemBG(drawBG);if(this.GlobalOption)++this.GlobalOption.FlashBGCount;}}this.DrawItemBG(drawInfo);if(column.Type==REPORT_COLUMN_ID.CUSTOM_STRING_TEXT_ID||this.IsReserveString(column.Type))this.DrawReserveString(drawInfo,column,x,top,textWidth);else this.DrawItemText(drawInfo.Text,drawInfo.TextColor,drawInfo.TextAlign,x,top,textWidth,drawInfo.BGColor);}//tooltip提示
 if(drawInfo.Tooltip){//Type:1=数据截断 4=提示信息
 var tooltipData={Rect:rtItem,Stock:stock,Index:index,Column:column,RowType:rowType,Type:drawInfo.Tooltip.Type,Data:drawInfo.Tooltip.Data};this.TooltipRect.push(tooltipData);}else if(column.ChartTooltip&&column.ChartTooltip.Enable&&IFrameSplitOperator.IsNumber(column.ChartTooltip.Type))//Type 20分时图 21K线图
@@ -14483,7 +14491,7 @@ text=value.toFixed(column.FloatPrecision);break;case 2://千分位分割
 text=IFrameSplitOperator.FormatValueThousandsString(value,column.FloatPrecision);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,column.FloatPrecision,exfloatPrecision);break;}}if(column.StringFormat&&text){text=column.StringFormat.replace("{0}",text);}drawInfo.Text=text;};this.FormatReserveString=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsObject(item)){if(item.Text)drawInfo.Text=item.Text;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;if(IFrameSplitOperator.IsNonEmptyArray(item.AryText))drawInfo.AryText=item.AryText;if(item.Tooltip&&IFrameSplitOperator.IsNonEmptyArray(item.Tooltip.AryText)){drawInfo.Tooltip={Type:4,Data:{AryText:item.Tooltip.AryText,EnableCallback:item.Tooltip.EnableCallback}};}}else if(IFrameSplitOperator.IsString(item)){drawInfo.Text=item;}};this.GetReserveDateTimePreItem=function(colIndex){if(!this.CreateTempCache)return null;if(!this.TempCache.MapReserveDateTime)return null;var mapData=this.TempCache.MapReserveDateTime;if(!mapData.has(colIndex))return null;return mapData.get(colIndex);};this.SetReserveDateTimePreItem=function(colIndex,data){if(!this.CreateTempCache)return false;if(!this.TempCache.MapReserveDateTime)return false;var mapData=this.TempCache.MapReserveDateTime;if(mapData.has(colIndex)){var item=mapData.get(colIndex);item.PreItem.Date=data.Date;}else{mapData.set(colIndex,{PreItem:{Date:data.Date}});}return true;};this.FormatReserveDateTime=function(column,data,drawInfo){if(column.DefaultText)drawInfo.Text=column.DefaultText;var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(!IFrameSplitOperator.IsObject(item))return;var cacheItem=this.GetReserveDateTimePreItem(drawInfo.ColumnIndex);if(item.DateTime){var date=item.DateTime.getFullYear()*10000+(item.DateTime.getMonth()+1)*100+item.DateTime.getDate();var format=column.DateTimeFormat;if(cacheItem&&cacheItem.PreItem&&date==cacheItem.PreItem.Date){if(column.SubDateTimeFormat)format=column.SubDateTimeFormat;}else{this.SetReserveDateTimePreItem(drawInfo.ColumnIndex,{Date:date});}drawInfo.Text=IFrameSplitOperator.FormatDateTimeStringV2(item.DateTime,format);}if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;};this.FormatReserveProgressBar=function(column,data,drawInfo){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(IFrameSplitOperator.IsNumber(item)){drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=item;//占比
 drawInfo.Data={Value:item};}else if(IFrameSplitOperator.IsObject(item)){if(item.Title)drawInfo.Text=item.Title;drawInfo.ProgressBar=column.ProgressBar;drawInfo.Enable=true;drawInfo.Value=item.Value;//占比
 drawInfo.Data=item;if(IFrameSplitOperator.IsBool(item.Enable))drawInfo.Enable=item.Enable;if(item.TextColor)drawInfo.TextColor=item.TextColor;if(item.BarColor)drawInfo.BarColor=item.BarColor;if(item.BGColor)drawInfo.BGColor=item.BGColor;}};this.FormatReserveButton=function(column,data,drawInfo){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!data||!fieldName)return;var item=data[fieldName];if(!item)return;drawInfo.Text=item.Title;drawInfo.Button=column.Button;drawInfo.Font=column.Button.Font;drawInfo.Enable=true;drawInfo.Data=item;if(IFrameSplitOperator.IsBool(item.Enable))drawInfo.Enable=item.Enable;};this.FormaTimeDrawInfo=function(column,stock,drawInfo,data){if(!stock||!IFrameSplitOperator.IsNumber(stock.Time))return;if(column.ValueType==0)//0=hhmm 1=hhmmss 2=hhmmss.fff
-{drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM");}else if(column.ValueType==1){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS");}else if(column.ValueType==2){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS.fff");}};this.FormaDateDrawInfo=function(column,stock,drawInfo,data){if(!stock||!IFrameSplitOperator.IsNumber(stock.Date))return;if(column.FormatType==0)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM-DD");else if(column.FormatType==1)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD");else if(column.FormatType==2)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD/W");else if(column.FormatType==3)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM/DD");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM-DD");};//自定义图标
+{drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM");}else if(column.ValueType==1){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS");}else if(column.ValueType==2){drawInfo.Text=IFrameSplitOperator.FormatTimeString(stock.Time,"HH:MM:SS.fff");}};this.FormaDateDrawInfo=function(column,stock,drawInfo,data){var fieldName=MAP_COLUMN_FIELD.get(column.Type);if(!stock||!fieldName)return;var date=stock[fieldName];if(!IFrameSplitOperator.IsNumber(date))return;if(column.FormatType==0)drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM-DD");else if(column.FormatType==1)drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY/MM/DD");else if(column.FormatType==2)drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY/MM/DD/W");else if(column.FormatType==3)drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM");else if(column.FormatType==4)drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"MM/DD");else if(column.FormatType==5)drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"MM-DD");else drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM-DD");};//自定义图标
 this.GetCustomIconData=function(columnInfo,symbol,drawInfo,data){var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_REPORT_DRAW_CUSTOM_ICON);if(!event||!event.Callback)return false;var sendData={Symbol:symbol,Column:columnInfo,Data:data,Out:{Text:null,TextColor:null,TextAlign:null,Font:null}};event.Callback(event,sendData,this);if(sendData.Out.Text)drawInfo.Text=sendData.Out.Text;if(sendData.Out.TextColor)drawInfo.TextColor=sendData.Out.TextColor;if(sendData.Out.TextAlign)drawInfo.TextAlign=sendData.Out.TextAlign;if(sendData.Out.BGColor)drawInfo.BGColor=sendData.Out.BGColor;if(sendData.Out.Font)drawInfo.Font=sendData.Out.Font;return true;};this.GetPriceDrawInfo=function(price,stock,data,drawInfo,option){if(!IFrameSplitOperator.IsNumber(price))return false;drawInfo.Text=price.toFixed(data.Decimal);var yClose=null;if(stock.PriceColorType===1)//昨结算价 计算颜色
 {if(IFrameSplitOperator.IsNumber(stock.YFClose))yClose=stock.YFClose;}else//昨收价 计算颜色
 {var upperSymbol=null;if(stock.Symbol)upperSymbol=stock.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)&&IFrameSplitOperator.IsNumber(stock.YFClose)){yClose=stock.YFClose;}else{if(IFrameSplitOperator.IsNumber(stock.YClose))yClose=stock.YClose;}}if(!IFrameSplitOperator.IsNumber(yClose))drawInfo.TextColor=this.UnchagneColor;else drawInfo.TextColor=this.GetUpDownColor(price,yClose);if(option&&option.LimitBG){if(IFrameSplitOperator.IsNumber(stock.LimitHigh)){if(price>=stock.LimitHigh){drawInfo.BGColor=this.LimitUpBGColor;drawInfo.TextColor=this.LimitTextColor;}}if(IFrameSplitOperator.IsNumber(stock.LimitLow)){if(price<=stock.LimitLow){drawInfo.BGColor=this.LimitDownBGColor;drawInfo.TextColor=this.LimitTextColor;}}}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchagneColor;};this.GetUpDownColorV2=function(price,price2){if(price>=price2)return this.UpColor;else return this.DownColor;};//单独处理成交量显示
@@ -16121,7 +16129,7 @@ text=value.toFixed(dec);break;case 2://千分位分割
 text=IFrameSplitOperator.FormatValueThousandsString(value,dec);break;case 3:var exfloatPrecision=1;if(IFrameSplitOperator.IsNumber(format.ExFloatPrecision))exfloatPrecision=format.ExFloatPrecision;text=IFrameSplitOperator.FormatValueStringV2(value,dec,exfloatPrecision);break;}}}if(column.StringFormat&&text)text=column.StringFormat.replace('{Value}',text);return text;};this.GetPriceColor=function(price){var upperSymbol=null;if(this.Data.Symbol)upperSymbol=this.Data.Symbol.toUpperCase();if(MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol)){if(!IFrameSplitOperator.IsNumber(this.Data.YFClose))return this.UnchangeColor;return this.GetUpDownColor(price,this.Data.YFClose);}else{if(!IFrameSplitOperator.IsNumber(this.Data.YClose))return this.UnchangeColor;return this.GetUpDownColor(price,this.Data.YClose);}};this.GetUpDownColor=function(price,price2){if(price>price2)return this.UpColor;else if(price<price2)return this.DownColor;else return this.UnchangeColor;};}/********************************************************************************
  *  版本信息输出
  * 
- */var HQCHART_VERSION="1.1.15502";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n*                                                                                                                                                                                                                                                                                                                                        \n*                                                                                           :%@@-                                                                        \n*                                                                                          :@@@@-                                                                        \n*            =@@@@          :#@@@           .:+#@@@#=:                    :=*@@@@@@#+-.    *@@@@.                                                                        \n*           :@@@@@         .@@@@@         .#@@@@@@@@@@@-                +@@@@@@@@@@@@@+    @@@@@                                                     -%@@*               \n*           +@@@@%         #@@@@#        *@@@@@@@@@@@@@@%.            =@@@@@@@@@@@@@@@-    @@@@@                                                    -@@@@+               \n*           %@@@@*         @@@@@+      .%@@@@@@@@@@@@@@@@%:          #@@@@@@@@@@@@@@@%     @@@@#                                                    *@@@@=               \n*           @@@@@=         @@@@@-     .%@@@@@@@*++*%@@@@@@%        .%@@@@@@@%*+==+**=     -@@@@+                                                    #@@@@-               \n*           @@@@@.         @@@@@.     #@@@@@%=      =@@@@@@*       %@@@@@@#:              *@@@@-   :::.           .-+*###+:          :::  .+##+: -%%@@@@@%%%%            \n*          .@@@@@         .@@@@@.    +@@@@@%         .@@@@@@      *@@@@@@:                %@@@@: +@@@@@%.       :%@@@@@@@@@@:       *@@@ :@@@@@* @@@@@@@@@@@@            \n*          :@@@@@         :@@@@@     @@@@@%           :@@@@@+     @@@@@@:                 %@@@@-@@@@@@@@@.      @@@@@@@@@@@@@.     :@@@%-@@@@@@.:@@@@@@@@@@@#            \n*          -@@@@%         -@@@@@    =@@@@@.            %@@@@%    %@@@@@-                  %@@@@@@@@@@@@@@*      %@@@@@@@@@@@@+     -@@@@@@@@@@# -@@@@@@@@@@@.            \n*          +@@@@%=========#@@@@%    @@@@@#             :@@@@@   .@@@@@%                   @@@@@@@@%@@@@@@@      -%+:.  .#@@@@*     +@@@@@@@%%@. .::+@@@@#::              \n*          #@@@@@@@@@@@@@@@@@@@#   .@@@@@              .@@@@@   :@@@@@.                   @@@@@@#.  #@@@@@.             -@@@@*     #@@@@@@:        *@@@@+                \n*          %@@@@@@@@@@@@@@@@@@@+   :@@@@@              .@@@@@   -@@@@@                    @@@@@+     @@@@@.             :@@@@*     @@@@@%          #@@@@-                \n*          @@@@@@@@@@@@@@@@@@@@:   :@@@@%              :@@@@@   +@@@@%                   -@@@@+      @@@@@              -@@@@+     @@@@@.          @@@@@.                \n*         .@@@@@@@@@@@@@@@@@@@@    :@@@@%              -@@@@%   *@@@@%                   #@@@@.      @@@@@       .=*#%%%@@@@@=    :@@@@#           @@@@@.                \n*         -@@@@@:::::::::=@@@@@    :@@@@@              @@@@@*   +@@@@%                   @@@@@       @@@@%     -#@@@@@@@@@@@@:    -@@@@*           @@@@@                 \n*         =@@@@%         =@@@@%    .@@@@@             :@@@@@.   -@@@@%                   @@@@@      .@@@@*    +@@@@@@@@@@@@@@.    =@@@@+          .@@@@@                 \n*         +@@@@#         +@@@@#     @@@@@#            %@@@@%    :@@@@@                  .@@@@%      =@@@@=   -@@@@@*-:..%@@@@     +@@@@=          :@@@@#                 \n*         *@@@@*         *@@@@*     +@@@@@:          #@@@@@+    .@@@@@@                 :@@@@%      *@@@@-   @@@@@.     @@@@%     #@@@@:          =@@@@+                 \n*         %@@@@=         %@@@@+      @@@@@@-       .%@@@@@#      #@@@@@#                :@@@@%      #@@@@:   @@@@%      @@@@*     %@@@@.          #@@@@-                 \n*         @@@@@-         @@@@@=      =@@@@@@#=...-*@@@@@@@:       @@@@@@%=.    :+**.    :@@@@*      %@@@@.  .@@@@*     *@@@@=     @@@@@           %@@@@+                 \n*        .@@@@@:        .@@@@@:       *@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@%%%@@@@@@    +@@@@-      @@@@@   .@@@@@:  :%@@@@@-    .@@@@%           %@@@@@*+-              \n*        :@@@@@         :@@@@@         +@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@@@@@@@@@%   %@@@@       @@@@@    @@@@@@@@@@@@@@@:    -@@@@*           *@@@@@@@@-             \n*        =@@@@@         -@@@@@          :@@@@@@@@@@@@@@@@@@@#       :@@@@@@@@@@@@@@@%   @@@@@       %@@@%    #@@@@@@@@@#@@@@.    +@@@@-           .@@@@@@@@#             \n*        *@@@@#         =@@@@%            :#@@@@@@@#: :@@@@@=         =@@@@@@@@@@@+.    @@@@@       :@@@+     *@@@@@@@- %@@@     *@@@=             =@@@@@@@*             \n*        =++++-         -++++=               .:::.     .=*+:            :-=+++=:.       ****=        .=+.      .-++=:   :+++     -+=:               .-=+=:.     \n*        \n*        \n*        HQChart       \n*        Ver: '+HQCHART_VERSION+'  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
+ */var HQCHART_VERSION="1.1.15514";function PrintHQChartVersion(){var logo='\n\n*************************************************************************************************************************************************************************** \n*                                                                                                                                                                                                                                                                                                                                        \n*                                                                                           :%@@-                                                                        \n*                                                                                          :@@@@-                                                                        \n*            =@@@@          :#@@@           .:+#@@@#=:                    :=*@@@@@@#+-.    *@@@@.                                                                        \n*           :@@@@@         .@@@@@         .#@@@@@@@@@@@-                +@@@@@@@@@@@@@+    @@@@@                                                     -%@@*               \n*           +@@@@%         #@@@@#        *@@@@@@@@@@@@@@%.            =@@@@@@@@@@@@@@@-    @@@@@                                                    -@@@@+               \n*           %@@@@*         @@@@@+      .%@@@@@@@@@@@@@@@@%:          #@@@@@@@@@@@@@@@%     @@@@#                                                    *@@@@=               \n*           @@@@@=         @@@@@-     .%@@@@@@@*++*%@@@@@@%        .%@@@@@@@%*+==+**=     -@@@@+                                                    #@@@@-               \n*           @@@@@.         @@@@@.     #@@@@@%=      =@@@@@@*       %@@@@@@#:              *@@@@-   :::.           .-+*###+:          :::  .+##+: -%%@@@@@%%%%            \n*          .@@@@@         .@@@@@.    +@@@@@%         .@@@@@@      *@@@@@@:                %@@@@: +@@@@@%.       :%@@@@@@@@@@:       *@@@ :@@@@@* @@@@@@@@@@@@            \n*          :@@@@@         :@@@@@     @@@@@%           :@@@@@+     @@@@@@:                 %@@@@-@@@@@@@@@.      @@@@@@@@@@@@@.     :@@@%-@@@@@@.:@@@@@@@@@@@#            \n*          -@@@@%         -@@@@@    =@@@@@.            %@@@@%    %@@@@@-                  %@@@@@@@@@@@@@@*      %@@@@@@@@@@@@+     -@@@@@@@@@@# -@@@@@@@@@@@.            \n*          +@@@@%=========#@@@@%    @@@@@#             :@@@@@   .@@@@@%                   @@@@@@@@%@@@@@@@      -%+:.  .#@@@@*     +@@@@@@@%%@. .::+@@@@#::              \n*          #@@@@@@@@@@@@@@@@@@@#   .@@@@@              .@@@@@   :@@@@@.                   @@@@@@#.  #@@@@@.             -@@@@*     #@@@@@@:        *@@@@+                \n*          %@@@@@@@@@@@@@@@@@@@+   :@@@@@              .@@@@@   -@@@@@                    @@@@@+     @@@@@.             :@@@@*     @@@@@%          #@@@@-                \n*          @@@@@@@@@@@@@@@@@@@@:   :@@@@%              :@@@@@   +@@@@%                   -@@@@+      @@@@@              -@@@@+     @@@@@.          @@@@@.                \n*         .@@@@@@@@@@@@@@@@@@@@    :@@@@%              -@@@@%   *@@@@%                   #@@@@.      @@@@@       .=*#%%%@@@@@=    :@@@@#           @@@@@.                \n*         -@@@@@:::::::::=@@@@@    :@@@@@              @@@@@*   +@@@@%                   @@@@@       @@@@%     -#@@@@@@@@@@@@:    -@@@@*           @@@@@                 \n*         =@@@@%         =@@@@%    .@@@@@             :@@@@@.   -@@@@%                   @@@@@      .@@@@*    +@@@@@@@@@@@@@@.    =@@@@+          .@@@@@                 \n*         +@@@@#         +@@@@#     @@@@@#            %@@@@%    :@@@@@                  .@@@@%      =@@@@=   -@@@@@*-:..%@@@@     +@@@@=          :@@@@#                 \n*         *@@@@*         *@@@@*     +@@@@@:          #@@@@@+    .@@@@@@                 :@@@@%      *@@@@-   @@@@@.     @@@@%     #@@@@:          =@@@@+                 \n*         %@@@@=         %@@@@+      @@@@@@-       .%@@@@@#      #@@@@@#                :@@@@%      #@@@@:   @@@@%      @@@@*     %@@@@.          #@@@@-                 \n*         @@@@@-         @@@@@=      =@@@@@@#=...-*@@@@@@@:       @@@@@@%=.    :+**.    :@@@@*      %@@@@.  .@@@@*     *@@@@=     @@@@@           %@@@@+                 \n*        .@@@@@:        .@@@@@:       *@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@%%%@@@@@@    +@@@@-      @@@@@   .@@@@@:  :%@@@@@-    .@@@@%           %@@@@@*+-              \n*        :@@@@@         :@@@@@         +@@@@@@@@@@@@@@@@@@@#       =@@@@@@@@@@@@@@@@%   %@@@@       @@@@@    @@@@@@@@@@@@@@@:    -@@@@*           *@@@@@@@@-             \n*        =@@@@@         -@@@@@          :@@@@@@@@@@@@@@@@@@@#       :@@@@@@@@@@@@@@@%   @@@@@       %@@@%    #@@@@@@@@@#@@@@.    +@@@@-           .@@@@@@@@#             \n*        *@@@@#         =@@@@%            :#@@@@@@@#: :@@@@@=         =@@@@@@@@@@@+.    @@@@@       :@@@+     *@@@@@@@- %@@@     *@@@=             =@@@@@@@*             \n*        =++++-         -++++=               .:::.     .=*+:            :-=+++=:.       ****=        .=+.      .-++=:   :+++     -+=:               .-=+=:.     \n*        \n*        \n*        HQChart       \n*        Ver: '+HQCHART_VERSION+'  \n*        License: Apache License 2.0                                                                              \n*        Source: https://github.com/jones2000/HQChart\n*\n**************************************************************************************************************************************************************************                                                                                                                                                                      \n    ';console.log(logo);}PrintHQChartVersion();//把给外界调用的方法暴露出来
 exports.default=(_jsChartInit$jsChartS={jsChartInit:JSChart.Init,jsChartStyle:JSChart.SetStyle,// IsIndexSymbol:IsIndexSymbol,
 // BaseIndex:BaseIndex,
 // ChartLine:ChartLine,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.15503",
+  "version": "1.1.15515",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.js

@@ -58734,6 +58734,7 @@ function FrameSplitMinuteX()
 
         const minuteCoordinate = g_MinuteCoordinateData;
         var xcoordinateData = minuteCoordinate.GetCoordinateData(this.Symbol, width, this.Frame.GlobalOption);
+        if (!xcoordinateData) return;
         var minuteCount=xcoordinateData.Count;
         var minuteMiddleCount=xcoordinateData.MiddleCount>0? xcoordinateData.MiddleCount: parseInt(minuteCount/2);
         var xcoordinate = xcoordinateData.Data;
@@ -102904,7 +102905,9 @@ var MARKET_SUFFIX_NAME=
     CFFEX3:'.CF',        //中期所 (China Financial Futures Exchange)
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
-    GZFE:".GZFE",        //广州期货交易所
+    CZCE2:".CZCE",        //郑州期货交易所
+    GZFE:".GZFE",         //广州期货交易所
+    GZFE2:"GFEX",         //广州期货交易所
     INE:".INE",          //上海国际能源交易中心
 
     USA:'.USA',          //美股
@@ -103119,6 +103122,25 @@ var MARKET_SUFFIX_NAME=
         if (upperSymbol.indexOf(this.SHFE2) > 0) return true;
         return false;
     },
+
+    IsSHFEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsSHFE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
         
     IsCFFEX: function (upperSymbol) 
     {
@@ -103158,16 +103180,77 @@ var MARKET_SUFFIX_NAME=
         return upperSymbol.indexOf(this.DCE) > 0;
     },
 
+    IsDCEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsDCE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //M2605-P-2400
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
+
     IsCZCE: function (upperSymbol) 
     {
         if (!upperSymbol) return false;
-        return upperSymbol.indexOf(this.CZCE) > 0;
+
+        return upperSymbol.indexOf(this.CZCE) > 0 || upperSymbol.indexOf(this.CZCE2)>0;
+    },
+
+    IsCZCEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsCZCE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
     },
 
     IsGZFE:function(upperSymbol)
     {
         if (!upperSymbol) return false;
-        return upperSymbol.indexOf(this.GZFE) > 0;
+        if (upperSymbol.indexOf(this.GZFE)>0) return true;
+        if (upperSymbol.indexOf(this.GZFE2)>0) return true;
+        
+        return false;
+    },
+
+    IsGZFEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsGZFE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
     },
 
     IsINE:function(upperSymbol)
@@ -103176,6 +103259,26 @@ var MARKET_SUFFIX_NAME=
         return upperSymbol.indexOf(this.INE) > 0;
     },
 
+
+    IsINEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsINE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
+
     //是否包含某一个市场的
     IsIncludes:function(symbol, arySuffix)
     {

package/src/jscommon/umychart.report.js

@@ -1745,7 +1745,7 @@ function JSReportChartContainer(uielement)
         //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值 27=扩展名字
         //30=全局扩展数据  31=当前板块扩展数据 
         //32=收盘价线 33=K线  35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
-        //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速%
+        //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速% 48=交割日期 49=开始日期 50=过期时间
         //80=整行背景色
         //101-199=数值型  201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
 
@@ -1864,8 +1864,6 @@ function JSReportChartContainer(uielement)
 
         if (IFrameSplitOperator.IsBool(item[37])) stock.Checked=item[37];
 
-        
-
         //1,3,5,10,15 涨速%
         if (IFrameSplitOperator.IsNumber(item[43])) stock.RSpeed1M=item[43]; 
         if (IFrameSplitOperator.IsNumber(item[44])) stock.RSpeed3M=item[44]; 
@@ -1873,9 +1871,6 @@ function JSReportChartContainer(uielement)
         if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46]; 
         if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47]; 
 
-        if (item[80] || item[80]===null) stock.BGColor=item[80];       //整行背景色
-        if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];  //扩展数据2
-
         function __Temp_IsNumberOrObject(value)
         {
             if (IFrameSplitOperator.IsNumber(value)) return true;
@@ -1890,6 +1885,14 @@ function JSReportChartContainer(uielement)
             return false;
         }
 
+        if (__Temp_IsNumberOrObject(item[48])) stock.DeliveryDate=item[48];
+        if (__Temp_IsNumberOrObject(item[49])) stock.OpenDate=item[49];
+        if (__Temp_IsNumberOrObject(item[50])) stock.ExpireDate=item[50];
+        
+
+        if (item[80] || item[80]===null) stock.BGColor=item[80];       //整行背景色
+        if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];  //扩展数据2
+
         //10个数值型 101-199
         if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
         if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
@@ -4991,6 +4994,9 @@ var REPORT_COLUMN_ID=
     FUTURES_YCLOSE_ID:36,        //期货昨结算
     FUTURES_OPEN_POSITION_ID:37,    //期货开仓量
     FUTURES_CLOSE_POSITION_ID:38,    //期货平仓量
+    DELIVERY_DATE_ID:39,             //交割日期
+    OPEN_DATE_ID:40,
+    EXPIRE_DATE_ID:41,
 
 
     //1,3,5,10,15分钟涨速
@@ -5142,6 +5148,10 @@ var MAP_COLUMN_FIELD=new Map([
     [REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID, "OpenPosition"],
     [REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID, "ClosePosition"],
 
+    [REPORT_COLUMN_ID.DELIVERY_DATE_ID, "DeliveryDate"],
+    [REPORT_COLUMN_ID.OPEN_DATE_ID, "OpenDate"],
+    [REPORT_COLUMN_ID.EXPIRE_DATE_ID, "ExpireDate"],
+
     [REPORT_COLUMN_ID.RISING_SPEED_1M_ID, "RSpeed1M"],
     [REPORT_COLUMN_ID.RISING_SPEED_3M_ID, "RSpeed3M"],
     [REPORT_COLUMN_ID.RISING_SPEED_5M_ID, "RSpeed5M"],
@@ -5813,6 +5823,9 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.TIME_ID, Title:"时间", TextAlign:"left", ValueType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"99:99:99.999" },
             { Type:REPORT_COLUMN_ID.DATE_ID, Title:"日期", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.DELIVERY_DATE_ID, Title:"交割日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.OPEN_DATE_ID, Title:"上市日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.EXPIRE_DATE_ID, Title:"到期日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
 
             { Type:REPORT_COLUMN_ID.CHECKBOX_ID, Title:"", TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() },
 
@@ -6969,7 +6982,7 @@ function ChartReport()
         else if (column.Type==REPORT_COLUMN_ID.SYMBOL_ID)
         {
             if (stock && stock.Symbol) drawInfo.Text=stock.Symbol;
-            else drawInfo.Text=data.Symbol;
+            else drawInfo.Text=MARKET_SUFFIX_NAME.GetShortSymbol(data.Symbol);
 
             this.FormatDrawInfo(column, stock, drawInfo, data);
         }
@@ -7202,7 +7215,7 @@ function ChartReport()
             this.FormaTimeDrawInfo(column, stock, drawInfo, data);
             this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
-        else if (column.Type==REPORT_COLUMN_ID.DATE_ID)
+        else if (column.Type==REPORT_COLUMN_ID.DATE_ID || column.Type==REPORT_COLUMN_ID.DELIVERY_DATE_ID || column.Type==REPORT_COLUMN_ID.OPEN_DATE_ID || column.Type==REPORT_COLUMN_ID.EXPIRE_DATE_ID)
         {
             this.FormaDateDrawInfo(column, stock, drawInfo, data);
             this.FormatDrawInfoEvent(stock, data, column, drawInfo);
@@ -8128,20 +8141,26 @@ function ChartReport()
 
     this.FormaDateDrawInfo=function(column, stock, drawInfo, data)
     {
-        if (!stock || !IFrameSplitOperator.IsNumber(stock.Date)) return;
+        var fieldName=MAP_COLUMN_FIELD.get(column.Type);
+        if (!stock || !fieldName) return;
+        var date=stock[fieldName];
+
+        if (!IFrameSplitOperator.IsNumber(date)) return;
 
         if (column.FormatType==0)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM-DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM-DD");
         else if (column.FormatType==1)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY/MM/DD");
         else if (column.FormatType==2)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD/W");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY/MM/DD/W");
         else if (column.FormatType==3)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM");
-        else if (column.FormatType==4)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM/DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM");
         else if (column.FormatType==4)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM-DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"MM/DD");
+        else if (column.FormatType==5)
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"MM-DD");
+        else 
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM-DD");
     }
 
 

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

@@ -62830,6 +62830,7 @@ function FrameSplitMinuteX()
 
         const minuteCoordinate = g_MinuteCoordinateData;
         var xcoordinateData = minuteCoordinate.GetCoordinateData(this.Symbol, width, this.Frame.GlobalOption);
+        if (!xcoordinateData) return;
         var minuteCount=xcoordinateData.Count;
         var minuteMiddleCount=xcoordinateData.MiddleCount>0? xcoordinateData.MiddleCount: parseInt(minuteCount/2);
         var xcoordinate = xcoordinateData.Data;
@@ -107000,7 +107001,9 @@ var MARKET_SUFFIX_NAME=
     CFFEX3:'.CF',        //中期所 (China Financial Futures Exchange)
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
-    GZFE:".GZFE",        //广州期货交易所
+    CZCE2:".CZCE",        //郑州期货交易所
+    GZFE:".GZFE",         //广州期货交易所
+    GZFE2:"GFEX",         //广州期货交易所
     INE:".INE",          //上海国际能源交易中心
 
     USA:'.USA',          //美股
@@ -107215,6 +107218,25 @@ var MARKET_SUFFIX_NAME=
         if (upperSymbol.indexOf(this.SHFE2) > 0) return true;
         return false;
     },
+
+    IsSHFEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsSHFE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
         
     IsCFFEX: function (upperSymbol) 
     {
@@ -107254,16 +107276,77 @@ var MARKET_SUFFIX_NAME=
         return upperSymbol.indexOf(this.DCE) > 0;
     },
 
+    IsDCEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsDCE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //M2605-P-2400
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
+
     IsCZCE: function (upperSymbol) 
     {
         if (!upperSymbol) return false;
-        return upperSymbol.indexOf(this.CZCE) > 0;
+
+        return upperSymbol.indexOf(this.CZCE) > 0 || upperSymbol.indexOf(this.CZCE2)>0;
+    },
+
+    IsCZCEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsCZCE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
     },
 
     IsGZFE:function(upperSymbol)
     {
         if (!upperSymbol) return false;
-        return upperSymbol.indexOf(this.GZFE) > 0;
+        if (upperSymbol.indexOf(this.GZFE)>0) return true;
+        if (upperSymbol.indexOf(this.GZFE2)>0) return true;
+        
+        return false;
+    },
+
+    IsGZFEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsGZFE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
     },
 
     IsINE:function(upperSymbol)
@@ -107272,6 +107355,26 @@ var MARKET_SUFFIX_NAME=
         return upperSymbol.indexOf(this.INE) > 0;
     },
 
+
+    IsINEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsINE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
+
     //是否包含某一个市场的
     IsIncludes:function(symbol, arySuffix)
     {
@@ -144529,7 +144632,7 @@ function JSReportChartContainer(uielement)
         //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值 27=扩展名字
         //30=全局扩展数据  31=当前板块扩展数据 
         //32=收盘价线 33=K线  35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
-        //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速%
+        //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速% 48=交割日期 49=开始日期 50=过期时间
         //80=整行背景色
         //101-199=数值型  201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
 
@@ -144648,8 +144751,6 @@ function JSReportChartContainer(uielement)
 
         if (IFrameSplitOperator.IsBool(item[37])) stock.Checked=item[37];
 
-        
-
         //1,3,5,10,15 涨速%
         if (IFrameSplitOperator.IsNumber(item[43])) stock.RSpeed1M=item[43]; 
         if (IFrameSplitOperator.IsNumber(item[44])) stock.RSpeed3M=item[44]; 
@@ -144657,9 +144758,6 @@ function JSReportChartContainer(uielement)
         if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46]; 
         if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47]; 
 
-        if (item[80] || item[80]===null) stock.BGColor=item[80];       //整行背景色
-        if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];  //扩展数据2
-
         function __Temp_IsNumberOrObject(value)
         {
             if (IFrameSplitOperator.IsNumber(value)) return true;
@@ -144674,6 +144772,14 @@ function JSReportChartContainer(uielement)
             return false;
         }
 
+        if (__Temp_IsNumberOrObject(item[48])) stock.DeliveryDate=item[48];
+        if (__Temp_IsNumberOrObject(item[49])) stock.OpenDate=item[49];
+        if (__Temp_IsNumberOrObject(item[50])) stock.ExpireDate=item[50];
+        
+
+        if (item[80] || item[80]===null) stock.BGColor=item[80];       //整行背景色
+        if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];  //扩展数据2
+
         //10个数值型 101-199
         if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
         if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
@@ -147775,6 +147881,9 @@ var REPORT_COLUMN_ID=
     FUTURES_YCLOSE_ID:36,        //期货昨结算
     FUTURES_OPEN_POSITION_ID:37,    //期货开仓量
     FUTURES_CLOSE_POSITION_ID:38,    //期货平仓量
+    DELIVERY_DATE_ID:39,             //交割日期
+    OPEN_DATE_ID:40,
+    EXPIRE_DATE_ID:41,
 
 
     //1,3,5,10,15分钟涨速
@@ -147926,6 +148035,10 @@ var MAP_COLUMN_FIELD=new Map([
     [REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID, "OpenPosition"],
     [REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID, "ClosePosition"],
 
+    [REPORT_COLUMN_ID.DELIVERY_DATE_ID, "DeliveryDate"],
+    [REPORT_COLUMN_ID.OPEN_DATE_ID, "OpenDate"],
+    [REPORT_COLUMN_ID.EXPIRE_DATE_ID, "ExpireDate"],
+
     [REPORT_COLUMN_ID.RISING_SPEED_1M_ID, "RSpeed1M"],
     [REPORT_COLUMN_ID.RISING_SPEED_3M_ID, "RSpeed3M"],
     [REPORT_COLUMN_ID.RISING_SPEED_5M_ID, "RSpeed5M"],
@@ -148597,6 +148710,9 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.TIME_ID, Title:"时间", TextAlign:"left", ValueType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"99:99:99.999" },
             { Type:REPORT_COLUMN_ID.DATE_ID, Title:"日期", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.DELIVERY_DATE_ID, Title:"交割日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.OPEN_DATE_ID, Title:"上市日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.EXPIRE_DATE_ID, Title:"到期日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
 
             { Type:REPORT_COLUMN_ID.CHECKBOX_ID, Title:"", TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() },
 
@@ -149753,7 +149869,7 @@ function ChartReport()
         else if (column.Type==REPORT_COLUMN_ID.SYMBOL_ID)
         {
             if (stock && stock.Symbol) drawInfo.Text=stock.Symbol;
-            else drawInfo.Text=data.Symbol;
+            else drawInfo.Text=MARKET_SUFFIX_NAME.GetShortSymbol(data.Symbol);
 
             this.FormatDrawInfo(column, stock, drawInfo, data);
         }
@@ -149986,7 +150102,7 @@ function ChartReport()
             this.FormaTimeDrawInfo(column, stock, drawInfo, data);
             this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
-        else if (column.Type==REPORT_COLUMN_ID.DATE_ID)
+        else if (column.Type==REPORT_COLUMN_ID.DATE_ID || column.Type==REPORT_COLUMN_ID.DELIVERY_DATE_ID || column.Type==REPORT_COLUMN_ID.OPEN_DATE_ID || column.Type==REPORT_COLUMN_ID.EXPIRE_DATE_ID)
         {
             this.FormaDateDrawInfo(column, stock, drawInfo, data);
             this.FormatDrawInfoEvent(stock, data, column, drawInfo);
@@ -150912,20 +151028,26 @@ function ChartReport()
 
     this.FormaDateDrawInfo=function(column, stock, drawInfo, data)
     {
-        if (!stock || !IFrameSplitOperator.IsNumber(stock.Date)) return;
+        var fieldName=MAP_COLUMN_FIELD.get(column.Type);
+        if (!stock || !fieldName) return;
+        var date=stock[fieldName];
+
+        if (!IFrameSplitOperator.IsNumber(date)) return;
 
         if (column.FormatType==0)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM-DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM-DD");
         else if (column.FormatType==1)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY/MM/DD");
         else if (column.FormatType==2)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD/W");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY/MM/DD/W");
         else if (column.FormatType==3)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM");
         else if (column.FormatType==4)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM/DD");
-        else if (column.FormatType==4)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM-DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"MM/DD");
+        else if (column.FormatType==5)
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"MM-DD");
+        else 
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM-DD");
     }
 
 
@@ -156803,7 +156925,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15502";
+var HQCHART_VERSION="1.1.15514";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -62874,6 +62874,7 @@ function FrameSplitMinuteX()
 
         const minuteCoordinate = g_MinuteCoordinateData;
         var xcoordinateData = minuteCoordinate.GetCoordinateData(this.Symbol, width, this.Frame.GlobalOption);
+        if (!xcoordinateData) return;
         var minuteCount=xcoordinateData.Count;
         var minuteMiddleCount=xcoordinateData.MiddleCount>0? xcoordinateData.MiddleCount: parseInt(minuteCount/2);
         var xcoordinate = xcoordinateData.Data;
@@ -107044,7 +107045,9 @@ var MARKET_SUFFIX_NAME=
     CFFEX3:'.CF',        //中期所 (China Financial Futures Exchange)
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
-    GZFE:".GZFE",        //广州期货交易所
+    CZCE2:".CZCE",        //郑州期货交易所
+    GZFE:".GZFE",         //广州期货交易所
+    GZFE2:"GFEX",         //广州期货交易所
     INE:".INE",          //上海国际能源交易中心
 
     USA:'.USA',          //美股
@@ -107259,6 +107262,25 @@ var MARKET_SUFFIX_NAME=
         if (upperSymbol.indexOf(this.SHFE2) > 0) return true;
         return false;
     },
+
+    IsSHFEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsSHFE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
         
     IsCFFEX: function (upperSymbol) 
     {
@@ -107298,16 +107320,77 @@ var MARKET_SUFFIX_NAME=
         return upperSymbol.indexOf(this.DCE) > 0;
     },
 
+    IsDCEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsDCE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //M2605-P-2400
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
+
     IsCZCE: function (upperSymbol) 
     {
         if (!upperSymbol) return false;
-        return upperSymbol.indexOf(this.CZCE) > 0;
+
+        return upperSymbol.indexOf(this.CZCE) > 0 || upperSymbol.indexOf(this.CZCE2)>0;
+    },
+
+    IsCZCEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsCZCE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
     },
 
     IsGZFE:function(upperSymbol)
     {
         if (!upperSymbol) return false;
-        return upperSymbol.indexOf(this.GZFE) > 0;
+        if (upperSymbol.indexOf(this.GZFE)>0) return true;
+        if (upperSymbol.indexOf(this.GZFE2)>0) return true;
+        
+        return false;
+    },
+
+    IsGZFEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsGZFE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
     },
 
     IsINE:function(upperSymbol)
@@ -107316,6 +107399,26 @@ var MARKET_SUFFIX_NAME=
         return upperSymbol.indexOf(this.INE) > 0;
     },
 
+
+    IsINEOption:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        if (!this.IsINE(upperSymbol)) return false;
+        var shortSymbol=JSChart.GetShortSymbol(upperSymbol); 
+        //ZN2605-P-20600
+        var aryValue=shortSymbol.split("-");
+        if (!aryValue || aryValue.length!=3) return false;
+
+        var strValue=aryValue[0];
+        const regex = /([a-zA-Z]+)(\d+)/;
+        const match = strValue.match(regex);
+        if (!match || !match[1] || !match[2]) return false;
+
+        var prefix=match[1];
+
+        return true;
+    },
+
     //是否包含某一个市场的
     IsIncludes:function(symbol, arySuffix)
     {
@@ -144573,7 +144676,7 @@ function JSReportChartContainer(uielement)
         //18=内盘 19=外盘 20=现量 21=涨幅% 22=涨跌 23=换手率% 24=振幅% 25=流通市值 26=总市值 27=扩展名字
         //30=全局扩展数据  31=当前板块扩展数据 
         //32=收盘价线 33=K线  35=时间 36=日期字段 38=持仓量 39=结算价 40=昨结算价 41=开仓量 42=平仓量
-        //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速%
+        //43=1m涨速% 44=3m涨速% 45=5m涨速% 46=10m涨速%  47=15m涨速% 48=交割日期 49=开始日期 50=过期时间
         //80=整行背景色
         //101-199=数值型  201-299=字符型 301-350=进度条 351-400=按钮 401-499=日期时间
 
@@ -144692,8 +144795,6 @@ function JSReportChartContainer(uielement)
 
         if (IFrameSplitOperator.IsBool(item[37])) stock.Checked=item[37];
 
-        
-
         //1,3,5,10,15 涨速%
         if (IFrameSplitOperator.IsNumber(item[43])) stock.RSpeed1M=item[43]; 
         if (IFrameSplitOperator.IsNumber(item[44])) stock.RSpeed3M=item[44]; 
@@ -144701,9 +144802,6 @@ function JSReportChartContainer(uielement)
         if (IFrameSplitOperator.IsNumber(item[46])) stock.RSpeed10M=item[46]; 
         if (IFrameSplitOperator.IsNumber(item[47])) stock.RSpeed15M=item[47]; 
 
-        if (item[80] || item[80]===null) stock.BGColor=item[80];       //整行背景色
-        if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];  //扩展数据2
-
         function __Temp_IsNumberOrObject(value)
         {
             if (IFrameSplitOperator.IsNumber(value)) return true;
@@ -144718,6 +144816,14 @@ function JSReportChartContainer(uielement)
             return false;
         }
 
+        if (__Temp_IsNumberOrObject(item[48])) stock.DeliveryDate=item[48];
+        if (__Temp_IsNumberOrObject(item[49])) stock.OpenDate=item[49];
+        if (__Temp_IsNumberOrObject(item[50])) stock.ExpireDate=item[50];
+        
+
+        if (item[80] || item[80]===null) stock.BGColor=item[80];       //整行背景色
+        if (item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA]) stock.ExtendDataV2=item[JSCHART_DATA_FIELD_ID.REPORT_EXTENDDATA];  //扩展数据2
+
         //10个数值型 101-199
         if (__Temp_IsNumberOrObject(item[101])) stock.ReserveNumber1=item[101];
         if (__Temp_IsNumberOrObject(item[102])) stock.ReserveNumber2=item[102];
@@ -147819,6 +147925,9 @@ var REPORT_COLUMN_ID=
     FUTURES_YCLOSE_ID:36,        //期货昨结算
     FUTURES_OPEN_POSITION_ID:37,    //期货开仓量
     FUTURES_CLOSE_POSITION_ID:38,    //期货平仓量
+    DELIVERY_DATE_ID:39,             //交割日期
+    OPEN_DATE_ID:40,
+    EXPIRE_DATE_ID:41,
 
 
     //1,3,5,10,15分钟涨速
@@ -147970,6 +148079,10 @@ var MAP_COLUMN_FIELD=new Map([
     [REPORT_COLUMN_ID.FUTURES_OPEN_POSITION_ID, "OpenPosition"],
     [REPORT_COLUMN_ID.FUTURES_CLOSE_POSITION_ID, "ClosePosition"],
 
+    [REPORT_COLUMN_ID.DELIVERY_DATE_ID, "DeliveryDate"],
+    [REPORT_COLUMN_ID.OPEN_DATE_ID, "OpenDate"],
+    [REPORT_COLUMN_ID.EXPIRE_DATE_ID, "ExpireDate"],
+
     [REPORT_COLUMN_ID.RISING_SPEED_1M_ID, "RSpeed1M"],
     [REPORT_COLUMN_ID.RISING_SPEED_3M_ID, "RSpeed3M"],
     [REPORT_COLUMN_ID.RISING_SPEED_5M_ID, "RSpeed5M"],
@@ -148641,6 +148754,9 @@ function ChartReport()
 
             { Type:REPORT_COLUMN_ID.TIME_ID, Title:"时间", TextAlign:"left", ValueType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"99:99:99.999" },
             { Type:REPORT_COLUMN_ID.DATE_ID, Title:"日期", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.DELIVERY_DATE_ID, Title:"交割日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.OPEN_DATE_ID, Title:"上市日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
+            { Type:REPORT_COLUMN_ID.EXPIRE_DATE_ID, Title:"到期日", TextAlign:"left", FormatType:0, TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"9999-99-99" },
 
             { Type:REPORT_COLUMN_ID.CHECKBOX_ID, Title:"", TextAlign:"center", FixedWidth:20*GetDevicePixelRatio() },
 
@@ -149797,7 +149913,7 @@ function ChartReport()
         else if (column.Type==REPORT_COLUMN_ID.SYMBOL_ID)
         {
             if (stock && stock.Symbol) drawInfo.Text=stock.Symbol;
-            else drawInfo.Text=data.Symbol;
+            else drawInfo.Text=MARKET_SUFFIX_NAME.GetShortSymbol(data.Symbol);
 
             this.FormatDrawInfo(column, stock, drawInfo, data);
         }
@@ -150030,7 +150146,7 @@ function ChartReport()
             this.FormaTimeDrawInfo(column, stock, drawInfo, data);
             this.FormatDrawInfoEvent(stock, data, column, drawInfo);
         }
-        else if (column.Type==REPORT_COLUMN_ID.DATE_ID)
+        else if (column.Type==REPORT_COLUMN_ID.DATE_ID || column.Type==REPORT_COLUMN_ID.DELIVERY_DATE_ID || column.Type==REPORT_COLUMN_ID.OPEN_DATE_ID || column.Type==REPORT_COLUMN_ID.EXPIRE_DATE_ID)
         {
             this.FormaDateDrawInfo(column, stock, drawInfo, data);
             this.FormatDrawInfoEvent(stock, data, column, drawInfo);
@@ -150956,20 +151072,26 @@ function ChartReport()
 
     this.FormaDateDrawInfo=function(column, stock, drawInfo, data)
     {
-        if (!stock || !IFrameSplitOperator.IsNumber(stock.Date)) return;
+        var fieldName=MAP_COLUMN_FIELD.get(column.Type);
+        if (!stock || !fieldName) return;
+        var date=stock[fieldName];
+
+        if (!IFrameSplitOperator.IsNumber(date)) return;
 
         if (column.FormatType==0)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM-DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM-DD");
         else if (column.FormatType==1)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY/MM/DD");
         else if (column.FormatType==2)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY/MM/DD/W");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY/MM/DD/W");
         else if (column.FormatType==3)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"YYYY-MM");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM");
         else if (column.FormatType==4)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM/DD");
-        else if (column.FormatType==4)
-            drawInfo.Text=IFrameSplitOperator.FormatDateString(stock.Date,"MM-DD");
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"MM/DD");
+        else if (column.FormatType==5)
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"MM-DD");
+        else 
+            drawInfo.Text=IFrameSplitOperator.FormatDateString(date,"YYYY-MM-DD");
     }
 
 
@@ -171750,7 +171872,7 @@ function ChartStockData()
 
 
 
-var HQCHART_VERSION="1.1.15502";
+var HQCHART_VERSION="1.1.15514";
 
 function PrintHQChartVersion()
 {