hqchart 1.1.15428 → 1.1.15438

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

@@ -83531,13 +83531,13 @@ function JSChartResource()
         {
             Color:"RGB(60,60,60)",
             Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
-            Font:{ Size:12, Name:"微软雅黑" }
+            Font:{ Size:14, Name:"微软雅黑" }
         },
 
         Row:
         {
             Mergin:{ Top:2, Bottom:2 },
-            Font:{ Size:15, Name:"微软雅黑"},
+            Font:{ Size:14, Name:"微软雅黑"},
             BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 }
         },
 
@@ -106642,6 +106642,7 @@ var MARKET_SUFFIX_NAME=
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
     GZFE:".GZFE",        //广州期货交易所
+    INE:".INE",          //上海国际能源交易中心
 
     USA:'.USA',          //美股
     FTSE:'.FTSE',        //富时中国
@@ -106886,10 +106887,18 @@ var MARKET_SUFFIX_NAME=
         return upperSymbol.indexOf(this.GZFE) > 0;
     },
 
+    IsINE:function(upperSymbol)
+    {
+        if (!upperSymbol) return false;
+        return upperSymbol.indexOf(this.INE) > 0;
+    },
+
     IsChinaFutures:function(upperSymbol)   //是否是国内期货 /期权
     {
+        if (!upperSymbol) return false;
+        
         return this.IsSHO(upperSymbol) || this.IsSZO(upperSymbol) || 
-            this.IsGZFE(upperSymbol) ||
+            this.IsGZFE(upperSymbol) || this.IsINE(upperSymbol) ||
             this.IsCFFEX(upperSymbol) || this.IsCZCE(upperSymbol) || this.IsDCE(upperSymbol) || this.IsSHFE(upperSymbol);
     },
 
@@ -107744,7 +107753,8 @@ function MinuteTimeStringData()
         if (MARKET_SUFFIX_NAME.IsTW(upperSymbol)) return this.GetTW(upperSymbol);
         if (MARKET_SUFFIX_NAME.IsJP(upperSymbol)) return this.GetJP(upperSymbol);
         if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol)) return this.GetUSA(upperSymbol);
-        if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
+        if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || 
+            MARKET_SUFFIX_NAME.IsGZFE(upperSymbol) || MARKET_SUFFIX_NAME.IsINE(upperSymbol))
         {
             var splitData = g_FuturesTimeData.GetSplitData(upperSymbol, option);
             if (!splitData) return null;
@@ -108236,7 +108246,7 @@ function MinuteCoordinateData()
                 data=this.GetTWData(upperSymbol,width);
             else if (MARKET_SUFFIX_NAME.IsJP(upperSymbol))
                 data=this.GetJPData(upperSymbol,width);
-            else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol))
+            else if (MARKET_SUFFIX_NAME.IsCFFEX(upperSymbol) || MARKET_SUFFIX_NAME.IsCZCE(upperSymbol) || MARKET_SUFFIX_NAME.IsDCE(upperSymbol) || MARKET_SUFFIX_NAME.IsSHFE(upperSymbol) || MARKET_SUFFIX_NAME.IsGZFE(upperSymbol) || MARKET_SUFFIX_NAME.IsINE(upperSymbol))
                 return this.GetChinatFuturesData(upperSymbol, width, option);
             else if (MARKET_SUFFIX_NAME.IsUSA(upperSymbol))
                 data = this.GetUSAData(upperSymbol,width);
@@ -109083,6 +109093,13 @@ function FuturesTimeData()
         [MARKET_SUFFIX_NAME.SHFE + '-LU', {Time:6,Decimal:0,Name:'低硫燃油'}],
         [MARKET_SUFFIX_NAME.SHFE + '-BC', {Time:4,Decimal:0,Name:'国际铜'}],
         [MARKET_SUFFIX_NAME.SHFE + '-EC', {Time:0,Decimal:0,Name:'集运指数'}],
+
+        //上海国际能源交易中心 独立的一个市场
+        [MARKET_SUFFIX_NAME.INE + '-NR', {Time:6,Decimal:1,Name:'20号胶'}],
+        [MARKET_SUFFIX_NAME.INE + '-SC', {Time:5,Decimal:1,Name:'原油'}],
+        [MARKET_SUFFIX_NAME.INE + '-LU', {Time:6,Decimal:0,Name:'低硫燃油'}],
+        [MARKET_SUFFIX_NAME.INE + '-BC', {Time:4,Decimal:0,Name:'国际铜'}],
+        [MARKET_SUFFIX_NAME.INE + '-EC', {Time:0,Decimal:0,Name:'集运指数'}],
        
         //郑州期货交易所
         [MARKET_SUFFIX_NAME.CZCE + '-CF', {Time:6,Decimal:0,Name:"棉花"}],
@@ -109199,6 +109216,11 @@ function FuturesTimeData()
             oneWordName = MARKET_SUFFIX_NAME.GZFE + '-' + oneWord;
             twoWordsName = MARKET_SUFFIX_NAME.GZFE + '-' + twoWords;
         }
+        else if (MARKET_SUFFIX_NAME.IsINE(upperSymbol))     //上海国际能源交易中心
+        {
+            oneWordName = MARKET_SUFFIX_NAME.INE + '-' + oneWord;
+            twoWordsName = MARKET_SUFFIX_NAME.INE + '-' + twoWords;
+        }
 
         if (this.MAP_TWOWORDS.has(twoWordsName))
         {
@@ -139439,13 +139461,13 @@ function GetBlackStyle()
             {
                 Color:"RGB(245,245,245)",
                 Mergin:{ Left:5, Right:5, Top:4, Bottom:2 },
-                Font:{ Size:12, Name:"微软雅黑" }
+                //Font:{ Size:12, Name:"微软雅黑" }
             },
     
             Row:
             {
                 Mergin:{ Top:2, Bottom:2 },
-                Font:{ Size:15, Name:"微软雅黑"},
+                //Font:{ Size:15, Name:"微软雅黑"},
                 BarMergin:{ Top:2, Left:3, Right:3, Bottom:2 }
             },
     
@@ -140344,8 +140366,11 @@ function JSDealChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (chart) chart.Data=null;
 
-        if (option && IFrameSplitOperator.IsNumber(option.TradeDate))
-            this.TradeDate=option.TradeDate;
+        if (option)
+        {
+            if (IFrameSplitOperator.IsNumber(option.TradeDate)) this.TradeDate=option.TradeDate;
+            if (IFrameSplitOperator.IsNonEmptyArray(option.Column)) this.SetColumn(option.Column);
+        } 
 
         if (!this.Symbol)
         {
@@ -140453,6 +140478,7 @@ function JSDealChartContainer(uielement)
         chart.Data=this.Data;
         chart.Symbol=this.Symbol;
         chart.YClose=data.yclose;
+        chart.YFClose=data.yfclose;
         chart.Open=data.open;
 
         if (this.IsShowLastPage) this.SetLastPageDataOffset();   //显示最后一屏
@@ -141120,8 +141146,6 @@ var DEAL_COLUMN_ID=
     SYMBOL_ID:11,       //股票代码
     NAME_ID:12,         //股票名称
 
-   
-
     //预留数值类型 10个
     RESERVE_NUMBER1_ID:201,         //ReserveNumber1:
     RESERVE_NUMBER2_ID:202,
@@ -141199,6 +141223,7 @@ function ChartDealList()
     //this.Data={Offset:0, Data:[ {Time:925, Price:20.1, Vol:10000050, BS:1, Deal:45 }, {Time:925, Price:18.2, Vol:1150, BS:1, Deal:5 }] };
     this.Symbol;
     this.YClose;    //昨收
+    this.YFClose;   //昨结算
     this.Open;      //开盘价
     this.Decimal=2; //小数位数
     this.IsSingleTable=false;    //单表模式
@@ -141353,7 +141378,6 @@ function ChartDealList()
             { Type:DEAL_COLUMN_ID.STRING_TIME_ID, Title:"时间", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Time, MaxText:"88:88:88" },
             { Type:DEAL_COLUMN_ID.INDEX_ID, Title:"序号", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Index, MaxText:"88888" },
 
-           
             { Type:DEAL_COLUMN_ID.CENTER_BAR_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
             { Type:DEAL_COLUMN_ID.CUSTOM_TEXT_ID, Title:"自定义", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.Text, MaxText:"擎擎擎擎擎" },
 
@@ -141682,10 +141706,7 @@ function ChartDealList()
             }
             else if (item.Type==DEAL_COLUMN_ID.PRICE_ID)
             {
-                if (data.Price>this.YClose) textColor=this.UpColor;
-                else if (data.Price<this.YClose) textColor=this.DownColor;
-                else textColor=this.UnchangeColor;
-
+                textColor=this.GetPriceColor(data.Price);
                 text=data.Price.toFixed(this.Decimal);
             }
             else if (item.Type==DEAL_COLUMN_ID.VOL_ID)
@@ -141786,6 +141807,29 @@ function ChartDealList()
         }
     }
 
+    this.GetPriceColor=function(price)
+    {
+        var upperSymbol=null;
+        if (this.Symbol) upperSymbol=this.Symbol.toUpperCase();
+        if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+        {
+            if (!IFrameSplitOperator.IsNumber(this.YFClose)) return  this.UnchangeColor;
+            return this.GetUpDownColor(price, this.YFClose);
+        }
+        else
+        {
+            if (!IFrameSplitOperator.IsNumber(this.YClose)) return this.UnchangeColor;
+            return this.GetUpDownColor(price, this.YClose);
+        }
+    }
+
+    this.GetUpDownColor=function(price, price2)
+    {
+        if (price>price2) return this.UpColor;
+        else if (price<price2) return this.DownColor;
+        else return this.UnchangeColor;
+    }
+
     this.FormatReserveNumber=function(column, data, drawInfo)
     {
         if (column.DefaultText) drawInfo.Text=column.DefaultText;
@@ -143927,6 +143971,8 @@ function JSReportChartContainer(uielement)
         //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];
@@ -143958,17 +144004,39 @@ function JSReportChartContainer(uielement)
 
         if (item[27]) stock.NameEx=item[27];      //扩展名字
 
+        if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38];        //持仓量
+        if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39];          //结算价
+        if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40];         //昨结算价
+        if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41];    //开仓量
+        if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42];   //平仓量
+
         //衍生数据计算
         if (!IFrameSplitOperator.IsNumber(item[21]))    //涨幅%
         {
-            if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
-                stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;
+            if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+            {
+                if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YFClose) && stock.YFClose!=0)
+                    stock.Increase=(stock.Price-stock.YFClose)/stock.YFClose*100;
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
+                    stock.Increase=(stock.Price-stock.YClose)/stock.YClose*100;
+            }
         }
 
         if (!IFrameSplitOperator.IsNumber(item[22]))    //涨跌
         {
-            if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose))
-                stock.UpDown=stock.Price-stock.YClose;
+            if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+            {
+                if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YFClose))
+                    stock.UpDown=stock.Price-stock.YFClose;
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(stock.Price) && IFrameSplitOperator.IsNumber(stock.YClose))
+                    stock.UpDown=stock.Price-stock.YClose;
+            }
         }   
 
         if (!IFrameSplitOperator.IsNumber(item[23]))    //换手率%
@@ -143979,8 +144047,17 @@ function JSReportChartContainer(uielement)
 
         if (!IFrameSplitOperator.IsNumber(item[24]))    //振幅%
         {
-            if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
-                stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;
+            if (MARKET_SUFFIX_NAME.IsChinaFutures(upperSymbol))
+            {
+                if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YFClose) && stock.YFClose!=0)
+                    stock.Amplitude=(stock.High-stock.Low)/stock.YFClose*100;
+            }
+            else
+            {
+                if (IFrameSplitOperator.IsNumber(stock.High) && IFrameSplitOperator.IsNumber(stock.Low) && IFrameSplitOperator.IsNumber(stock.YClose) && stock.YClose!=0)
+                    stock.Amplitude=(stock.High-stock.Low)/stock.YClose*100;
+            }
+            
         }
 
         if (!IFrameSplitOperator.IsNumber(item[25]))    //流通市值
@@ -144009,11 +144086,7 @@ function JSReportChartContainer(uielement)
 
         if (IFrameSplitOperator.IsBool(item[37])) stock.Checked=item[37];
 
-        if (IFrameSplitOperator.IsNumber(item[38])) stock.Position=item[38];        //持仓量
-        if (IFrameSplitOperator.IsNumber(item[39])) stock.FClose=item[39];          //结算价
-        if (IFrameSplitOperator.IsNumber(item[40])) stock.YFClose=item[40];         //昨结算价
-        if (IFrameSplitOperator.IsNumber(item[41])) stock.OpenPosition=item[41];    //开仓量
-        if (IFrameSplitOperator.IsNumber(item[42])) stock.ClosePosition=item[42];   //平仓量
+        
 
         //1,3,5,10,15 涨速%
         if (IFrameSplitOperator.IsNumber(item[43])) stock.RSpeed1M=item[43]; 
@@ -150303,7 +150376,16 @@ function ChartReport()
         }
         else    //昨收价 计算颜色
         {
-            if (IFrameSplitOperator.IsNumber(stock.YClose))  yClose=stock.YClose;
+            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))  
@@ -163828,7 +163910,7 @@ function JSDialogTooltip()
             return item;
         }
 
-        if (IFrameSplitOperator.IsNumber(yClose) && format!=1)
+        if (IFrameSplitOperator.IsNumber(yClose) && format!=1 && yClose!=0)
         {
             var value=(price-yClose)/yClose*100;
             item.Text=`${price.toFixed(defaultfloatPrecision)}(${value.toFixed(2)}%)`;
@@ -163904,9 +163986,7 @@ function JSDialogTooltip()
             Color:this.ValueColor
         };
 
-        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose)) return item;
-
-      
+        if (!IFrameSplitOperator.IsNumber(price) || !IFrameSplitOperator.IsNumber(yClose) || yClose===0) return item;
 
         var diffValue=price-yClose;
         var value=(price-yClose)/yClose;
@@ -163954,7 +164034,7 @@ function JSDialogTooltip()
         };
 
 
-        if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose)) return item;
+        if (!IFrameSplitOperator.IsNumber(high) || !IFrameSplitOperator.IsNumber(low) || !IFrameSplitOperator.IsNumber(yClose) || yClose===0) return item;
 
         var diffValue=high-low;
         var value=(high-low)/yClose;
@@ -168147,7 +168227,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.15427";
+var HQCHART_VERSION="1.1.15437";
 
 function PrintHQChartVersion()
 {