hqchart 1.1.15390 → 1.1.15438

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

@@ -32160,6 +32160,12 @@ function ChartKLine()
             TextColor: g_JSChartResource.DaySummaryKLine.TextColor,
             LeftMargin:g_JSChartResource.DaySummaryKLine.LeftMargin,
         }
+
+        this.PriceGapStyple=
+        { 
+            Line:{ Color:g_JSChartResource.PriceGapStyple.Line.Color }, 
+            Text:{ Color:g_JSChartResource.PriceGapStyple.Text.Color, Font: g_JSChartResource.PriceGapStyple.Text.Font } 
+        };
             
     }
 
@@ -60164,6 +60170,11 @@ IFrameSplitOperator.RemoveMarketSuffix=function(symbol)
     return symbol;
 }
 
+IFrameSplitOperator.IsNumberString=function(strValue)
+{
+    return /^\d+$/.test(strValue);
+}
+
 function FrameSplitKLinePriceY()
 {
     this.newMethod=IFrameSplitOperator;   //派生
@@ -83476,13 +83487,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 }
         },
 
@@ -83834,6 +83845,70 @@ function JSChartResource()
         }
     }
 
+    //买卖5档
+    this.StockInfo=
+    {
+        Header:
+        {
+            Name:
+            {
+                Font:`${20*GetDevicePixelRatio()}px 微软雅黑`,
+                Color:"rgb(90,90,90)",
+                Margin:{ Left:5, Top:10, Bottom:5, Right:5, YOffset:0 },
+            },
+
+            Symbol:
+            {
+                Font:`${18*GetDevicePixelRatio()}px 微软雅黑`,
+                Color:"rgb(90,90,90)",
+                Margin:{ Left:5, Top:10, Bottom:5, Right:5, YOffset:0 },
+            },
+
+            AryCell:
+            [
+                { Font:`bold ${16*GetDevicePixelRatio()}px 微软雅黑`,Color:"rgb(90,90,90)", Margin:{ Left:5, Top:5, Bottom:5, Right:5, YOffset:0 } },
+                { Font:`${16*GetDevicePixelRatio()}px 微软雅黑`,Color:"rgb(90,90,90)", Margin:{ Left:5, Top:5, Bottom:5, Right:5, YOffset:0 } },
+                { Font:`${16*GetDevicePixelRatio()}px 微软雅黑`,Color:"rgb(90,90,90)", Margin:{ Left:5, Top:5, Bottom:5, Right:5, YOffset:0 } }
+            ],
+
+            TextColor:"rgb(100,100,10)",
+
+            BottomLine:{ Enable:true, Color:"rgb(192,192,192)"} ,    //底部分割线
+        },
+
+        BuySell:
+        {
+            Font:14*GetDevicePixelRatio() +'px 微软雅黑',
+            TitleColor:"rgb(90,90,90)",
+            VolColor:"rgb(90,90,90)",
+            Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
+            CellMargin:{ Top:5, Bottom:5, Left:5, Right:5, YOffset:0 },
+            BottomLine:{ Enable:true, Color:"rgb(192,192,192)"},    //底部分割线
+            TopLine:{ Enable:false, Color:"rgb(192,192,192)"},    //底部分割线
+
+            CenterLine:
+            {
+                BuyColor:"rgb(228, 164, 54)",SellColor:"rgb(61, 147, 219)", NoneColor:"rgb(90,90,90)",
+                Width:2*GetDevicePixelRatio()
+            }
+        },
+
+        Table:
+        {
+            Font:14*GetDevicePixelRatio() +'px 微软雅黑',
+            TitleColor:"rgb(90,90,90)",
+            TextColor:"rgb(90,90,90)",
+            Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
+            CellMargin:{ Top:5, Bottom:5, Left:5, Right:5, YOffset:0 },
+        },
+
+        UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
+        DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
+        UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
+
+        BorderColor:"rgb(192,192,192)"
+    }
+
 
     //自定义风格
     this.SetStyle=function(style)
@@ -84802,7 +84877,129 @@ function JSChartResource()
         if (style.KLineCountDownPaint) this.SetKLineCountDownPaint(style.KLineCountDownPaint);
 
         if (style.SmallFloatTooltipV2) this.SetSmallFloatTooltipV2(style.SmallFloatTooltipV2);
+        if (style.StockInfo) this.SetStockInfo(style.StockInfo);
+
+    }
+
+    this.SetStockInfo=function(style)
+    {
+        var dest=this.StockInfo;
+
+        if (style.BuySell)
+        {
+            var item=style.BuySell;
+            if (item.Font) dest.BuySell.Font=item.Font;
+            if (item.TitleColor) dest.BuySell.TitleColor=item.TitleColor;
+            if (item.VolColor) dest.BuySell.VolColor=item.VolColor;
+            CopyMarginConfig(dest.BuySell.Margin, item.Margin);
+            if (item.CellMargin)
+            {
+                var subItem=item.CellMargin;
+                CopyMarginConfig(dest.BuySell.CellMargin, subItem);
+                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) dest.BuySell.CellMargin.YOffset=subItem.YOffset
+            }
+
+            if (item.BottomLine)
+            {
+                var subItem=item.BottomLine;
+                if (subItem.Color) dest.BuySell.BottomLine.Color=subItem.Color;
+                if (IFrameSplitOperator.IsBool(subItem.Enable)) dest.BuySell.BottomLine.Enable=subItem.Enable;
+            }
+
+            if (item.TopLine)
+            {
+                var subItem=item.TopLine;
+                if (subItem.Color) dest.BuySell.TopLine.Color=subItem.Color;
+                if (IFrameSplitOperator.IsBool(subItem.Enable)) dest.BuySell.TopLine.Enable=subItem.Enable;
+            }
+
+            if (item.CenterLine)
+            {
+                var subItem=item.CenterLine;
+                if (subItem.BuyColor) dest.BuySell.CenterLine.BuyColor=subItem.BuyColor;
+                if (subItem.SellColor) dest.BuySell.CenterLine.SellColor=subItem.SellColor;
+                if (subItem.NoneColor) dest.BuySell.CenterLine.NoneColor=subItem.NoneColor;
+                if (IFrameSplitOperator.IsNumber(subItem.Width)) dest.BuySell.CenterLine.Width=subItem.Width;
+            }
+
+            
+        }
+
+        if (style.Table)
+        {
+            var item=style.Table;
+            if (item.Font) dest.Table.Font=item.Font;
+            if (item.TitleColor) dest.Table.TitleColor=item.TitleColor;
+            if (item.TextColor) dest.Table.TextColor=item.TextColor;
+            CopyMarginConfig(dest.Table.Margin, item.Margin);
+            if (item.CellMargin)
+            {
+                var subItem=item.CellMargin;
+                CopyMarginConfig(dest.Table.CellMargin, subItem);
+                if (IFrameSplitOperator.IsNumber(subItem.YOffset)) dest.Table.CellMargin.YOffset=subItem.YOffset
+            }
+        }
+
+        if (style.Header)
+        {
+            var item=style.Header;
+            if (item.Font) dest.Header.Font=item.Font;
+            if (item.TextColor) dest.Header.TextColor=item.TextColor;
+            if (item.Name)
+            {
+                var subItem=item.Name;
+                if (subItem.Font) dest.Header.Name.Font=subItem.Font;
+                if (subItem.Color) dest.Header.Name.Color=subItem.Color;
+                if (subItem.Margin)
+                {
+                    var margin=subItem.Margin;
+                    CopyMarginConfig(dest.Header.Name.Margin, margin);
+                    if (IFrameSplitOperator.IsNumber(margin.YOffset)) dest.Header.Name.Margin.YOffset=margin.YOffset
+                }
+            }
+
+            if (item.Symbol)
+            {
+                var subItem=item.Symbol;
+                if (subItem.Font) dest.Header.Symbol.Font=subItem.Font;
+                if (subItem.Color) dest.Header.Symbol.Color=subItem.Color;
+                if (subItem.Margin)
+                {
+                    var margin=subItem.Margin;
+                    CopyMarginConfig(dest.Header.Symbol.Margin, margin);
+                    if (IFrameSplitOperator.IsNumber(margin.YOffset)) dest.Header.Symbol.Margin.YOffset=margin.YOffset
+                }
+            }
+
+            if (IFrameSplitOperator.IsNonEmptyArray(item.AryCell))
+            {
+                for(var i=0;i<item.AryCell.length;++i)
+                {
+                    var subItem=item.AryCell[i];
+                    if (!dest.Header.AryCell[i]) dest.Header.AryCell[i]={ };
+                    var subDest=dest.Header.AryCell[i];
+                    if (subItem.Font) subDest.Font=subItem.Font;
+                    if (subItem.Margin)
+                    {
+                        var margin=subItem.Margin;
+                        CopyMarginConfig(subDest.Margin, margin);
+                        if (IFrameSplitOperator.IsNumber(margin.YOffset)) subDest.YOffset=margin.YOffset
+                    }
+                }
+            }
+
+            if (item.BottomLine)
+            {
+                var subItem=item.BottomLine;
+                if (subItem.Color) dest.Header.BottomLine.Color=subItem.Color;
+                if (IFrameSplitOperator.IsBool(subItem.Enable)) dest.Header.BottomLine.Enable=subItem.Enable;
+            }
+        }
 
+        if (style.UpTextColor) dest.UpTextColor=style.UpTextColor;
+        if (style.DownTextColor) dest.DownTextColor=style.DownTextColor;
+        if (style.UnchangeTextColor) dest.UnchangeTextColor=style.UnchangeTextColor;
+        if (style.BorderColor) dest.BorderColor=style.BorderColor;
     }
 
     this.SetSmallFloatTooltipV2=function(style)
@@ -91399,6 +91596,9 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
         if (!option.Windows) return;
         var count=option.Windows.length;
         if (count<=0) return;
+
+        this.Frame.RestoreIndexWindows();
+        
         var currentLength=this.Frame.SubFrame.length;
 
         var period=null, right=null, symbol=null;
@@ -98329,6 +98529,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.ChangeIndexTemplate=function(option)   //切换指标模板 可以设置指标窗口个数 每个窗口的指标, 只能从第3个指标窗口开始设置，前面2个指标窗口固定无法设置
     {
         if (!Array.isArray(option.Windows)) return;
+        this.Frame.RestoreIndexWindows();
+        
         var count=option.Windows.length;
         var currentLength=this.Frame.SubFrame.length;
         var startWindowIndex=2;
@@ -106396,6 +106598,7 @@ var MARKET_SUFFIX_NAME=
     DCE: '.DCE',         //大连商品交易所(Dalian Commodity Exchange)
     CZCE: '.CZC',        //郑州期货交易所
     GZFE:".GZFE",        //广州期货交易所
+    INE:".INE",          //上海国际能源交易中心
 
     USA:'.USA',          //美股
     FTSE:'.FTSE',        //富时中国
@@ -106640,10 +106843,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);
     },
 
@@ -106787,6 +106998,18 @@ var MARKET_SUFFIX_NAME=
         return false;
     },
 
+    IsHKStock:function(symbol)  //港股股票 全是数字
+    {
+        if (!symbol) return false;
+        var upperSymbol=symbol.toUpperCase();
+        if (!this.IsHK(upperSymbol)) return false;
+
+        var shortSymbol=this.GetShortSymbol(symbol);
+        if (IFrameSplitOperator.IsNumberString(shortSymbol)) return true;
+
+        return false;
+    },
+
     GetMarketStatus:function(symbol)    //获取市场状态 0=闭市 1=盘前 2=盘中 3=盘后
     {
         if (!symbol) return 0;
@@ -107127,7 +107350,18 @@ var MARKET_SUFFIX_NAME=
         if (MARKET_SUFFIX_NAME.IsBJ(upperSymbol)) return 100;   //单位手=100股
 
         return 1;
+    },
+
+    //获取不带后缀的代码
+    GetShortSymbol:function(symbol)
+    {
+        if (!IFrameSplitOperator.IsString(symbol)) return null;
+        var pos=symbol.lastIndexOf(".");
+        if (pos<=0) return symbol;
+
+        return symbol.slice(0,pos);
     }
+
 }
 
 
@@ -107475,7 +107709,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;
@@ -107967,7 +108202,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);
@@ -108814,6 +109049,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:"棉花"}],
@@ -108930,6 +109172,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))
         {
@@ -123375,13 +123622,13 @@ function JSSymbolData(ast,option,jsExecute)
 
     this.GetDynaCacheData=function(name)
     {
+        var data=null;
         if (MAP_DYNAINFO_SHORTCUT.has(name))
         {
             var item=MAP_DYNAINFO_SHORTCUT.get(name);
-            return this.GetLatestCacheData(item.ID);
+            data=this.GetLatestCacheData(item.ID);
         }
-
-        return null;
+        return data;
     }
 
     this.GetLatestIndexData=function()
@@ -124457,12 +124704,7 @@ function JSSymbolData(ast,option,jsExecute)
                     { Url:self.RealtimeApiUrl,  Type:'POST' ,
                         Data: 
                         {
-                            "field": [ "name", "symbol","yclose","open","price","high","low","vol"],
-                            "symbol": self.Symbol,
-                            "start": -1,
-                            "count": self.MaxRequestDataCount,
-                            "period":this.Period,
-                            "right":this.Right
+                            symbol: self.Symbol,count: self.MaxRequestDataCount, period:this.Period,right:this.Right
                         } 
                     },
                     Self:this,
@@ -124474,6 +124716,7 @@ function JSSymbolData(ast,option,jsExecute)
                     obj.Request.KLineDataTimeRange={Start:{ Date:this.KLineDateTimeRange.Start.Date},  End:{ Date:this.KLineDateTimeRange.End.Date} };
                     if (this.IsNumber(this.KLineDateTimeRange.Start.Time)) obj.Request.KLineDataTimeRange.Start.Time=this.KLineDateTimeRange.Start.Time;
                     if (this.IsNumber(this.KLineDateTimeRange.End.Time)) obj.Request.KLineDataTimeRange.End.Time=this.KLineDateTimeRange.End.Time;
+                    obj.Request.Data.dateRange=obj.Request.KLineDataTimeRange;
                 }
 
                 this.NetworkFilter(obj, function(data) 
@@ -126835,13 +127078,14 @@ function JSSymbolData(ast,option,jsExecute)
         if (readArgument.Value=='') readArgument.Value=this.Symbol; //缺省使用股票代码
 
         var symbol=readArgument.Value;
+        var upperSymbol=symbol.toUpperCase();
 
         //支持 SH60000, SZ000001
         //A股后缀小写
-        if (symbol.indexOf('.SH')>0) result.Symbol=symbol.replace('.SH', ".sh");
-        else if (symbol.indexOf('.SZ')>0) result.Symbol=symbol.replace('.SZ', ".sz");
-        else if (symbol.indexOf("SH")==0) result.Symbol=symbol.slice(2)+".sh";
-        else if (symbol.indexOf("SZ")==0) result.Symbol=symbol.slice(2)+".sz";
+        if (upperSymbol.indexOf('.SH')>0) result.Symbol=symbol.replace('.SH', ".sh");
+        else if (upperSymbol.indexOf('.SZ')>0) result.Symbol=symbol.replace('.SZ', ".sz");
+        else if (upperSymbol.indexOf("SH")==0) result.Symbol=symbol.slice(2)+".sh";
+        else if (upperSymbol.indexOf("SZ")==0) result.Symbol=symbol.slice(2)+".sz";
         else result.Symbol=symbol;
 
         return true;
@@ -128537,6 +128781,8 @@ function JSExecute(ast,option)
 
     this.ReadSymbolData=function(name,node)
     {
+        if (MAP_DYNAINFO_SHORTCUT.has(name)) return this.SymbolData.GetDynaCacheData(name);
+
         switch(name)
         {
             case 'CLOSE':
@@ -128604,7 +128850,6 @@ function JSExecute(ast,option)
             case 'CAPITAL':
             case 'EXCHANGE':
             case "HSL":
-
             case "HYBLOCK":
             case "DYBLOCK":
             case "GNBLOCK":
@@ -128705,14 +128950,6 @@ function JSExecute(ast,option)
                 return this.SymbolData.WEEKOFYEAR();
             case "DAYSTOTODAY":
                 return this.SymbolData.DAYSTOTODAY();
-
-            case "DYNA_NOW":
-            case "DYNA_ZAF":
-            case "DYNA_LB":
-            case "DYNA_ZAS":
-            case "SELLVOL":
-            case "BUYVOL":
-                return this.SymbolData.GetDynaCacheData(name);
         }
 
         this.ThrowUnexpectedNode(node, '变量'+name+'不存在', name);
@@ -138071,8 +138308,8 @@ function DownloadFinanceData(obj)
         {
             case 1: //FINANCE(1) 总股本(随时间可能有变化) 股
             case 7: //FINANCE(7) 流通股本(随时间可能有变化) 股
-            case "EXCHANGE": //换手率
             case "HSL"://换手率
+            case "EXCHANGE": //换手率
                 this.DownloadHistoryData(id);
                 break;
             case 3:
@@ -138333,7 +138570,7 @@ function DownloadFinanceData(obj)
                 if (!item.capital) return null;
                 return { Date:date, Value:item.capital.total };
             case 7:
-            case "HSL": //换手率
+            case "HSL":
             case "EXCHANGE":    //换手率 历史流通股本
                 if (!item.capital) return null;
                 return { Date:date, Value:item.capital.a };
@@ -139180,13 +139417,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 }
             },
     
@@ -139474,6 +139711,67 @@ function GetBlackStyle()
                 BGColor: {  Selected:"rgb(234,85,4)", Default:"rgb(25,25,25)", MoveOn:"rgb(59,59,59)" },
                 BorderColor:"rgb(60,60,60)",
             }
+        },
+
+        StockInfo:
+        {
+            Header:
+            {
+                Name:
+                {
+                    //Font:`${20*GetDevicePixelRatio()}px 微软雅黑`,
+                    Color:"rgb(255,255,0)",
+                    //Margin:{ Left:5, Top:10, Bottom:5, Right:10, YOffset:0 },
+                },
+
+                Symbol:
+                {
+                    //Font:`${18*GetDevicePixelRatio()}px 微软雅黑`,
+                    Color:"rgb(250,250,250)",
+                    //Margin:{ Left:5, Top:10, Bottom:5, Right:5, YOffset:0 },
+                },
+
+                AryCell:
+                [
+                    //{ Font:`bold ${16*GetDevicePixelRatio()}px 微软雅黑`, Margin:{ Left:5, Top:5, Bottom:5, Right:15, YOffset:0 } },
+                    //{ Font:`${16*GetDevicePixelRatio()}px 微软雅黑`, Margin:{ Left:5, Top:5, Bottom:5, Right:15, YOffset:0 } },
+                    //{ Font:`${16*GetDevicePixelRatio()}px 微软雅黑`, Margin:{ Left:5, Top:5, Bottom:5, Right:5, YOffset:0 } }
+                ],
+
+                TextColor:"rgb(250,250,250)",
+
+                BottomLine:{ Enable:true, Color:"rgb(60,60,60)"} ,    //底部分割线
+            },
+
+            BuySell:
+            {
+                //Font:14*GetDevicePixelRatio() +'px 微软雅黑',
+                TitleColor:"rgb(250,250,250)",
+                VolColor:"rgb(250,250,250)",
+                //Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
+                //CellMargin:{ Top:5, Bottom:5, YOffset:0, Left:5, Right:5, YOffset:-5 },
+                BottomLine:{ Enable:true, Color:"rgb(60,60,60)"} ,    //底部分割线
+                TopLine:{ Enable:false, Color:"rgb(60,60,60)"} ,      //顶部分割线
+
+                CenterLine:
+                {
+                    NoneColor:"rgb(60,60,60)",
+                }
+            },
+
+            Table:
+            {
+                Font:14*GetDevicePixelRatio() +'px 微软雅黑',
+                TitleColor:"rgb(250,250,250)",
+                TextColor:"rgb(250,250,250)",
+                //Margin:{ Left:0, Top:0, Bottom:0, Right:0 },
+                //CellMargin:{ Top:5, Bottom:5, YOffset:0, Left:5, Right:5, YOffset:-5 },
+            },
+
+            UpTextColor:"rgb(238,21,21)",      //上涨文字颜色
+            DownTextColor:"rgb(25,158,0)",     //下跌文字颜色
+            UnchangeTextColor:"rgb(90,90,90)",     //平盘文字颜色 
+            BorderColor:'rgb(38,38,41)',        //边框线
         }
         
     };
@@ -139542,9 +139840,18 @@ function JSDealChart(divElement)
     this.OnSize=function()
     {
         //画布大小通过div获取
-        var height=parseInt(this.DivElement.style.height.replace("px",""));
+        var height=this.DivElement.offsetHeight;
+        var width=this.DivElement.offsetWidth;
+        if (this.DivElement.style.height && this.DivElement.style.width)
+        {
+            if (this.DivElement.style.height.includes("px"))
+                height=parseInt(this.DivElement.style.height.replace("px",""));
+            if (this.DivElement.style.width.includes("px"))
+                width=parseInt(this.DivElement.style.width.replace("px",""));
+        }
+        
         this.CanvasElement.height=height;
-        this.CanvasElement.width=parseInt(this.DivElement.style.width.replace("px",""));
+        this.CanvasElement.width=width;
         this.CanvasElement.style.width=this.CanvasElement.width+'px';
         this.CanvasElement.style.height=this.CanvasElement.height+'px';
 
@@ -140009,14 +140316,17 @@ function JSDealChartContainer(uielement)
     this.ChangeSymbol=function(symbol, option)
     {
         this.Symbol=symbol;
-        this.Data=null;
-        this.SourceData=null;
+        this.Data={ DataOffset:0, Data:[] };                //分笔数据
+        this.SourceData={DataOffset:0, Data:[] };           //原始分笔数据
 
         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)
         {
@@ -140124,6 +140434,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();   //显示最后一屏
@@ -140657,17 +140968,23 @@ JSDealChartContainer.JsonDataToDealData=function(data)
 
         if (item[100]) dealItem.Guid=item[100];
 
-         //10个数值型 101-199
-         if (IFrameSplitOperator.IsNumber(item[101])) dealItem.ReserveNumber1=item[101];
-         if (IFrameSplitOperator.IsNumber(item[102])) dealItem.ReserveNumber2=item[102];
-         if (IFrameSplitOperator.IsNumber(item[103])) dealItem.ReserveNumber3=item[103];
-         if (IFrameSplitOperator.IsNumber(item[104])) dealItem.ReserveNumber4=item[104];
-         if (IFrameSplitOperator.IsNumber(item[105])) dealItem.ReserveNumber5=item[105];
-         if (IFrameSplitOperator.IsNumber(item[106])) dealItem.ReserveNumber6=item[106];
-         if (IFrameSplitOperator.IsNumber(item[107])) dealItem.ReserveNumber7=item[107];
-         if (IFrameSplitOperator.IsNumber(item[108])) dealItem.ReserveNumber8=item[108];
-         if (IFrameSplitOperator.IsNumber(item[109])) dealItem.ReserveNumber9=item[109];
-         if (IFrameSplitOperator.IsNumber(item[110])) dealItem.ReserveNumber10=item[110];
+        //柱子类型
+        if (item[50]) dealItem.MultiBar1=item[50];
+        if (item[51]) dealItem.MultiBar2=item[51];
+        if (item[52]) dealItem.MultiBar3=item[52];
+        if (item[53]) dealItem.MultiBar4=item[53];
+
+        //10个数值型 101-199
+        if (IFrameSplitOperator.IsNumber(item[101])) dealItem.ReserveNumber1=item[101];
+        if (IFrameSplitOperator.IsNumber(item[102])) dealItem.ReserveNumber2=item[102];
+        if (IFrameSplitOperator.IsNumber(item[103])) dealItem.ReserveNumber3=item[103];
+        if (IFrameSplitOperator.IsNumber(item[104])) dealItem.ReserveNumber4=item[104];
+        if (IFrameSplitOperator.IsNumber(item[105])) dealItem.ReserveNumber5=item[105];
+        if (IFrameSplitOperator.IsNumber(item[106])) dealItem.ReserveNumber6=item[106];
+        if (IFrameSplitOperator.IsNumber(item[107])) dealItem.ReserveNumber7=item[107];
+        if (IFrameSplitOperator.IsNumber(item[108])) dealItem.ReserveNumber8=item[108];
+        if (IFrameSplitOperator.IsNumber(item[109])) dealItem.ReserveNumber9=item[109];
+        if (IFrameSplitOperator.IsNumber(item[110])) dealItem.ReserveNumber10=item[110];
 
         //10个字符型 201-299
         if (IFrameSplitOperator.IsString(item[201]) || IFrameSplitOperator.IsObject(item[201])) dealItem.ReserveString1=item[201];
@@ -140778,14 +141095,13 @@ var DEAL_COLUMN_ID=
     UPDOWN_ID:5,        //涨跌
     STRING_TIME_ID:6,   //字符串时间
     INDEX_ID:7,         //序号 从1开始
-    MULTI_BAR_ID:8,     //多颜色柱子 
+    
     CENTER_BAR_ID:9,    //中心柱子
     CUSTOM_TEXT_ID:10,   //自定义文本
 
     SYMBOL_ID:11,       //股票代码
     NAME_ID:12,         //股票名称
 
-
     //预留数值类型 10个
     RESERVE_NUMBER1_ID:201,         //ReserveNumber1:
     RESERVE_NUMBER2_ID:202,
@@ -140809,6 +141125,11 @@ var DEAL_COLUMN_ID=
     RESERVE_STRING8_ID:308,
     RESERVE_STRING9_ID:309,
     RESERVE_STRING10_ID:310,
+
+    MULTI_BAR_ID:50,     //多颜色柱子 
+    MULTI_BAR2_ID:51,
+    MULTI_BAR3_ID:52,
+    MULTI_BAR4_ID:53
 }
 
 var MAP_DEAL_COLUMN_FIELD=new Map(
@@ -140817,6 +141138,11 @@ var MAP_DEAL_COLUMN_FIELD=new Map(
     [DEAL_COLUMN_ID.NAME_ID, "Name"],
     [DEAL_COLUMN_ID.PRICE_ID, "Price"],
 
+    [DEAL_COLUMN_ID.MULTI_BAR_ID, "MultiBar1"],
+    [DEAL_COLUMN_ID.MULTI_BAR2_ID, "MultiBar2"],
+    [DEAL_COLUMN_ID.MULTI_BAR3_ID, "MultiBar3"],
+    [DEAL_COLUMN_ID.MULTI_BAR4_ID, "MultiBar4"],
+
     [DEAL_COLUMN_ID.RESERVE_NUMBER1_ID,"ReserveNumber1"],
     [DEAL_COLUMN_ID.RESERVE_NUMBER2_ID,"ReserveNumber2"],
     [DEAL_COLUMN_ID.RESERVE_NUMBER3_ID,"ReserveNumber3"],
@@ -140853,6 +141179,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;    //单表模式
@@ -140973,7 +141300,7 @@ function ChartDealList()
 
             if (item.ChartTooltip) colItem.ChartTooltip={ Enable:item.ChartTooltip.Enable, Type:item.ChartTooltip.Type };   //图形提示信息
 
-            if (item.Type==DEAL_COLUMN_ID.MULTI_BAR_ID || item.Type==DEAL_COLUMN_ID.CENTER_BAR_ID)
+            if (item.Type==DEAL_COLUMN_ID.CENTER_BAR_ID)
             {
                 if (!IFrameSplitOperator.IsNumber(item.DataIndex)) continue;
                 colItem.DataIndex=item.DataIndex;   //柱子数据所在原始数据索引列
@@ -140986,6 +141313,8 @@ function ChartDealList()
             {
                 if (item.Format) colItem.Format=item.Format;        //数据格式化设置{ Type:1=原始 2=千分位分割 3=万亿转换, ExFloatPrecision:万亿转换以后的小数位数 }
                 if (IFrameSplitOperator.IsNumber(item.ColorType))  colItem.ColorType=item.ColorType;        //0=默认 1=(>0, =0, <0) 2=(>=0, <0)
+                if (IFrameSplitOperator.IsNumber(item.FloatPrecision)) colItem.FloatPrecision=item.FloatPrecision;
+                if (item.StringFormat) colItem.StringFormat=item.StringFormat;      //"{0}%" 输出增加固定字符
             }
 
             this.Column.push(colItem);
@@ -141005,7 +141334,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.MULTI_BAR_ID, Title:"柱子", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
             { 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:"擎擎擎擎擎" },
 
@@ -141033,6 +141361,11 @@ function ChartDealList()
             { Type:DEAL_COLUMN_ID.RESERVE_STRING8_ID, Title:"文字8", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
             { Type:DEAL_COLUMN_ID.RESERVE_STRING9_ID, Title:"文字9", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
             { Type:DEAL_COLUMN_ID.RESERVE_STRING10_ID, Title:"文字10", TextAlign:"right", TextColor:g_JSChartResource.Report.FieldColor.Text, MaxText:"擎擎擎擎擎擎" },
+
+            { Type:DEAL_COLUMN_ID.MULTI_BAR_ID, Title:"柱子", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
+            { Type:DEAL_COLUMN_ID.MULTI_BAR2_ID, Title:"柱子2", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
+            { Type:DEAL_COLUMN_ID.MULTI_BAR3_ID, Title:"柱子3", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
+            { Type:DEAL_COLUMN_ID.MULTI_BAR4_ID, Title:"柱子4", TextAlign:"center", Width:null, TextColor:g_JSChartResource.DealList.FieldColor.BarTitle, MaxText:"888888" },
             
         ];
 
@@ -141329,10 +141662,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)
@@ -141373,7 +141703,7 @@ function ChartDealList()
             {
                 text=(dataIndex+1).toString();
             }
-            else if (item.Type==DEAL_COLUMN_ID.MULTI_BAR_ID)
+            else if (this.IsMulitBar(item.Type))
             {
                 var rtItem={Left:left, Top:top, Width:itemWidth, Height:this.RowHeight};
                 this.DrawMultiBar(item, data, rtItem);
@@ -141433,6 +141763,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;
@@ -141474,6 +141827,11 @@ function ChartDealList()
                     break;
             }
         }
+
+        if (column.StringFormat && text)
+        {
+            text=column.StringFormat.replace("{0}", text);
+        }
         
         drawInfo.Text=text;
     }
@@ -141595,8 +141953,10 @@ function ChartDealList()
 
     this.DrawMultiBar=function(colunmInfo, data, rtItem)
     {
-        if (!data.Source || !IFrameSplitOperator.IsNonEmptyArray(data.Source)) return false;
-        var barData=data.Source[colunmInfo.DataIndex]; //{ Value:[0.4,0,2], Color:[0,1] };
+        var fieldName=MAP_DEAL_COLUMN_FIELD.get(colunmInfo.Type);
+        if (!data || !fieldName) return;
+
+        var barData=data[fieldName]; //{ Value:[0.4,0,2], Color:[0,1] };
         if (!barData) return false;
         if (!IFrameSplitOperator.IsNonEmptyArray(barData.Value)) return false;
 
@@ -141784,6 +142144,16 @@ function ChartDealList()
         return ARARY_TYPE.includes(value);
     }
 
+    this.IsMulitBar=function(value)
+    {
+        var ARARY_TYPE=
+        [
+            DEAL_COLUMN_ID.MULTI_BAR_ID,DEAL_COLUMN_ID.MULTI_BAR2_ID,DEAL_COLUMN_ID.MULTI_BAR3_ID,DEAL_COLUMN_ID.MULTI_BAR4_ID,
+        ];
+
+        return ARARY_TYPE.includes(value);
+    }
+
     this.IsReserveNumber=function(value)
     {
         var ARARY_TYPE=
@@ -143557,6 +143927,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];
@@ -143588,17 +143960,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]))    //换手率%
@@ -143609,8 +144003,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]))    //流通市值
@@ -143639,11 +144042,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]; 
@@ -149933,7 +150332,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))  
@@ -155762,7 +156170,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15389";
+var HQCHART_VERSION="1.1.15437";
 
 function PrintHQChartVersion()
 {