hqchart 1.1.15503 → 1.1.15518

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");
     }
 
 
@@ -158325,20 +158447,23 @@ function ChartSymbolList()
         for(var i=this.Data.XOffset;i<this.Column.length;++i)
         {
             var item=this.Column[i];
-            this.DrawItem(dataIndex, data, item, left, top, rowType);
+            this.DrawItem(dataIndex, data, item, left, top, rowType, i);
             left+=item.Width;
 
             if (left>=chartRight) break;
         }
     }
 
-    this.DrawItem=function(index, data, column, left, top, rowType)
+    this.DrawItem=function(index, data, column, left, top, rowType, colIndex)
     {
         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:this.TextColor , TextAlign:column.TextAlign };
+        var columnEx=null;
+        if (stock && IFrameSplitOperator.IsNonEmptyArray(stock.Column)) columnEx=stock.Column[colIndex];
+
         if (column.Type==KEYBOARD_COLUMN_ID.SHORT_SYMBOL_ID)
         {
             if (stock && stock.ShortSymbol) drawInfo.Text=stock.ShortSymbol;
@@ -158348,6 +158473,8 @@ function ChartSymbolList()
         }
         else if (column.Type==KEYBOARD_COLUMN_ID.NAME_ID)
         {
+            if (columnEx && columnEx.IsShow===false) return;
+
             if (stock && stock.Name) 
             {
                 drawInfo.Text=this.TextEllipsis(stock.Name, textWidth, column.MaxText);
@@ -158356,6 +158483,8 @@ function ChartSymbolList()
         }
         else if (column.Type==KEYBOARD_COLUMN_ID.TYPE_NAME_ID)
         {
+            if (columnEx && columnEx.IsShow===false) return;
+            
             if (stock && stock.TypeName) 
             {
                 drawInfo.Text=this.TextEllipsis(stock.TypeName, textWidth, column.MaxText);
@@ -171750,7 +171879,7 @@ function ChartStockData()
 
 
 
-var HQCHART_VERSION="1.1.15502";
+var HQCHART_VERSION="1.1.15517";
 
 function PrintHQChartVersion()
 {