hqchart 1.1.15382 → 1.1.15428

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

@@ -12688,6 +12688,13 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return false;
     }
 
+    this.IsHScreenModel=function()
+    {
+        if (this.ClassName=="KLineChartHScreenContainer" || this.ClassName=="MinuteChartHScreenContainer") return true;
+
+        return false;
+    }
+
     this.UpdatePointByCursorIndex=function(type)    //type 1=根据十字光标更新 2=强制取消十字光标
     {
         if (type==1)    //根据十字光标更新
@@ -12708,8 +12715,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     pt.X=null;
                 }
             }
-            this.LastPoint.X=pt.X;
-            this.LastPoint.Y=pt.Y;
+
+            if (this.IsHScreenModel())
+            {
+                this.LastPoint.X=pt.Y;
+                this.LastPoint.Y=pt.X;
+            }
+            else
+            {
+                this.LastPoint.X=pt.X;
+                this.LastPoint.Y=pt.Y;
+            }
+            
         }
         else if (type==2)
         {
@@ -12729,8 +12746,18 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 pt.Y=this.Frame.GetYFromData(close);
                 this.LastPoint.FrameID=0;
             }
-            this.LastPoint.X=pt.X;
-            this.LastPoint.Y=pt.Y;
+
+            if (this.IsHScreenModel())
+            {
+                this.LastPoint.X=pt.Y;
+                this.LastPoint.Y=pt.X;
+            }
+            else
+            {
+                this.LastPoint.X=pt.X;
+                this.LastPoint.Y=pt.Y;
+            }
+            
         }
     }
 
@@ -32133,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 } 
+        };
             
     }
 
@@ -60137,6 +60170,11 @@ IFrameSplitOperator.RemoveMarketSuffix=function(symbol)
     return symbol;
 }
 
+IFrameSplitOperator.IsNumberString=function(strValue)
+{
+    return /^\d+$/.test(strValue);
+}
+
 function FrameSplitKLinePriceY()
 {
     this.newMethod=IFrameSplitOperator;   //派生
@@ -83567,6 +83605,13 @@ function JSChartResource()
             CloseColor:"rgb(30,144,255)",
             YCloseColor:"rgba(105,105,105,0.5)",  //昨收线
             AreaColor:'rgba(0,191,255,0.2)',
+
+            UpColor:"rgb(255,0,0)",
+            UpAreaColor:"rgba(255,0,0,0.5)",
+            DownColor:"rgb(0,128,0)",
+            DownAreaColor:"rgba(0,128,0,0.5)",
+            UnchangeColor:'rgb(90,90,90)', 
+            UnchangeAreaColor:'rgba(90,90,90,0.5)', 
         },
 
         KLine:
@@ -83800,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)
@@ -84768,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)
@@ -84965,6 +85196,13 @@ function JSChartResource()
             if (closeLine.CloseColor) this.Report.CloseLine.CloseColor=closeLine.CloseColor;
             if (closeLine.YCloseColor) this.Report.CloseLine.YCloseColor=closeLine.YCloseColor;
             if (closeLine.AreaColor) this.Report.CloseLine.AreaColor=closeLine.AreaColor;
+
+            if (closeLine.UpColor) this.Report.CloseLine.UpColor=closeLine.UpColor;
+            if (closeLine.UpAreaColor) this.Report.CloseLine.UpAreaColor=closeLine.UpAreaColor;
+            if (closeLine.DownColor) this.Report.CloseLine.DownColor=closeLine.DownColor;
+            if (closeLine.DownAreaColor) this.Report.CloseLine.DownAreaColor=closeLine.DownAreaColor;
+            if (closeLine.UnchangeColor) this.Report.CloseLine.UnchangeColor=closeLine.UnchangeColor;
+            if (closeLine.UnchangeAreaColor) this.Report.CloseLine.UnchangeAreaColor=closeLine.UnchangeAreaColor;
         }
 
         if (item.KLine)
@@ -91358,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;
@@ -97713,21 +97954,31 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
     this.UpdatePointByCursorIndex=function()
     {
-        this.LastPoint.X=this.Frame.GetXFromIndex(this.CursorIndex);
+        var x=null, y=null;
+        x=this.Frame.GetXFromIndex(this.CursorIndex);
 
         var index=this.CursorIndex;
         index=parseInt(index.toFixed(0));
         var data=this.GetKData();
-        if (data.DataOffset+index>=data.Data.length)
+        if (data.DataOffset+index<data.Data.length)
         {
-            return;
+            var item=data.Data[data.DataOffset+index];
+            var close=null;
+            if (item.Before) close=item.Before.Close;
+            else close=item.Close;
+            y=this.Frame.GetYFromData(close);
         }
-        var item=data.Data[data.DataOffset+index];
-        var close=null;
-        if (item.Before) close=item.Before.Close;
-        else close=item.Close
 
-        this.LastPoint.Y=this.Frame.GetYFromData(close);
+        if (this.IsHScreenModel())
+        {
+            this.LastPoint.X=y;
+            this.LastPoint.Y=x;
+        }
+        else
+        {
+            this.LastPoint.X=x;
+            this.LastPoint.Y=y;
+        }
         this.LastPoint.FrameID=0;
     }
 
@@ -98278,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;
@@ -106736,6 +106989,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;
@@ -107076,7 +107341,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);
     }
+
 }
 
 
@@ -111341,6 +111617,24 @@ JSComplierHelper.GetConvertValueName=function(funcName)
 
     return valueName;
 }
+
+
+//DYNAINFO() 转换
+//["DYNA_NOW",null],  //DYNA_NOW  现价 DYNAINFO(7) 即时行情数据 没有现价时(比如在开盘前),返回昨收盘价
+//["DYNA_ZAF",null],  //DYNA_ZAF 涨幅 DYNAINFO(14)  即时行情数据(沪深京早盘竞价期间使用匹配价的涨幅) 转换成幅度需要乘100
+//["DYNA_LB", null],  //DYNA_LB   DYNAINFO(17)    量比 即时行情数据
+//["DYNA_ZAS",null],  //DYNA_ZAS  DYNAINFO(24)  返回涨速 报价界面行情数据 转换成幅度需要乘100
+//["SELLVOL", null], //返回内盘,即DYNAINFO(22) 即时行情数据
+//["BUYVOL", null],  //返回外盘,即DYNAINFO(21) 即时行情数据
+const MAP_DYNAINFO_SHORTCUT=new Map(
+[
+    ['DYNA_NOW', { Name:"DYNA_NOW", ID:7 } ],
+    ['DYNA_LB',  { Name:"DYNA_LB", ID:17 } ],
+    ['DYNA_ZAS', { Name:"DYNA_ZAS", ID:24 } ],
+    ['SELLVOL',  { Name:"SELLVOL", ID:22 }],
+    ['BUYVOL',  { Name:"BUYVOL", ID:21 } ],
+]
+);
         
 
 
@@ -112280,6 +112574,14 @@ function Node(ErrorHandler)
             return;
         }
 
+        if (MAP_DYNAINFO_SHORTCUT.has(varName))
+        {
+            var item=MAP_DYNAINFO_SHORTCUT.get(varName);
+            var item={ ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SYMBOL_LATEST_DATA, Args:[item.ID], FunctionName:varName };
+            this.Dynainfo.push(item);
+            return;
+        }
+
         if (varName.indexOf('#')>0)
         {
             var aryWrods = varName.split('#');
@@ -123035,8 +123337,10 @@ var DYNAINFO_ARGUMENT_ID=
     CLOSE:7,
     VOL:8,
     AMOUNT:10,
+    UPDOWN:12,      //DYNAINFO(12) 日涨跌 即时行情数据
     AMPLITUDE:13,   //振幅
     INCREASE:14,    //涨幅
+                    
     EXCHANGERATE:37,    //换手率
 };
 
@@ -123215,16 +123519,18 @@ function JSSymbolData(ast,option,jsExecute)
         let stock=data.stock[0];
         if (!stock) return;
 
-        if (IFrameSplitOperator.IsNumber(stock.yclose)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.YCLOSE,stock.yclose);
-        if (IFrameSplitOperator.IsNumber(stock.open)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.OPEN,stock.open);
-        if (IFrameSplitOperator.IsNumber(stock.high)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.HIGH,stock.high);
-        if (IFrameSplitOperator.IsNumber(stock.low)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.LOW,stock.low);
-        if (IFrameSplitOperator.IsNumber(stock.price)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.CLOSE,stock.price);
-        if (IFrameSplitOperator.IsNumber(stock.vol)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.VOL,stock.vol);
-        if (IFrameSplitOperator.IsNumber(stock.amount)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.AMOUNT,stock.amount);
-        if (IFrameSplitOperator.IsNumber(stock.increase)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.INCREASE,stock.increase);
-        if (IFrameSplitOperator.IsNumber(stock.exchangerate)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.EXCHANGERATE,stock.exchangerate);
-        if (IFrameSplitOperator.IsNumber(stock.amplitude)) this.LatestData.set(DYNAINFO_ARGUMENT_ID.AMPLITUDE,stock.amplitude);
+        if (IFrameSplitOperator.IsNumber(stock.yclose)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.YCLOSE),stock.yclose);
+        if (IFrameSplitOperator.IsNumber(stock.open)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.OPEN),stock.open);
+        if (IFrameSplitOperator.IsNumber(stock.high)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.HIGH),stock.high);
+        if (IFrameSplitOperator.IsNumber(stock.low)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.LOW),stock.low);
+        if (IFrameSplitOperator.IsNumber(stock.price)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.CLOSE),stock.price);
+        if (IFrameSplitOperator.IsNumber(stock.vol)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.VOL),stock.vol);
+        if (IFrameSplitOperator.IsNumber(stock.amount)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.AMOUNT),stock.amount);
+        if (IFrameSplitOperator.IsNumber(stock.increase)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.INCREASE),stock.increase);
+        if (IFrameSplitOperator.IsNumber(stock.exchangerate)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.EXCHANGERATE),stock.exchangerate);
+        if (IFrameSplitOperator.IsNumber(stock.amplitude)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.AMPLITUDE),stock.amplitude);
+        if (IFrameSplitOperator.IsNumber(stock.updown)) this.LatestData.set(this.GetLatestDataKey(DYNAINFO_ARGUMENT_ID.UPDOWN),stock.updown); 
+        
        
         /*
         this.LatestData={ Symbol:stock.symbol, Name:stock.name, Date:stock.date, Time:stock.time,
@@ -123249,7 +123555,7 @@ function JSSymbolData(ast,option,jsExecute)
             if (IFrameSplitOperator.IsNumber(item.value) || IFrameSplitOperator.IsString(item.value))
             {
                 JSConsole.Complier.Log(`[JSSymbolData::RecvLatestDataVer2] symbol=${symbol} DYNAINFO(${item.id})=${item.value}.`);
-                this.LatestData.set(item.id, item.value);
+                this.LatestData.set(this.GetLatestDataKey(item.id), item.value);
             }
                 
         }
@@ -123257,11 +123563,50 @@ function JSSymbolData(ast,option,jsExecute)
         JSConsole.Complier.Log('[JSSymbolData::RecvLatestDataVer2]', this.LatestData);
     }
 
-    this.GetLatestCacheData=function(dataname)
+    this.GetLatestCacheData=function(dataID)
     {
-        if (this.LatestData.has(dataname)) return this.LatestData.get(dataname);
+        var key=this.GetLatestDataKey(dataID);
+        if (!this.LatestData.has(key)) return null;
 
-        return null;
+        var data=this.LatestData.get(key);
+
+        //DYNAINFO(36) 自由流通换手率(序列数据,每个周期的数据不同,使用最新的自由流通股本) 转换成幅度需要乘100 比如DYNAINFO(36)>0.25表示换手超过25%
+        //DYNAINFO(37) 换手率(序列数据,每个周期的数据不同,使用的流通股本为最近数据) 转换成幅度需要乘100 比如DYNAINFO(37)>0.1表示换手超过10%
+        if (dataID==37 || dataID==36)
+        {
+            var value=null;
+            if (IFrameSplitOperator.IsNumber(data)) value=data;
+            else if (IFrameSplitOperator.IsNonEmptyArray(data) && IFrameSplitOperator.IsNumber(data[0])) value=data[0];
+            else return null;
+
+            if (!this.Data || !IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return null;
+           
+            var aryData=[];
+            for(var i=0;i<this.Data.Data.length;++i)
+            {
+                var kItem=this.Data.Data[i];
+                aryData[i]=null;
+                if (!kItem || !IFrameSplitOperator.IsNumber(kItem.Vol)) continue;
+
+                aryData[i]=kItem.Vol/value*100.0;//  换手率
+            }
+
+            return aryData;
+        }
+
+        
+        return data;
+    }
+
+    this.GetDynaCacheData=function(name)
+    {
+        var data=null;
+        if (MAP_DYNAINFO_SHORTCUT.has(name))
+        {
+            var item=MAP_DYNAINFO_SHORTCUT.get(name);
+            data=this.GetLatestCacheData(item.ID);
+        }
+        return data;
     }
 
     this.GetLatestIndexData=function()
@@ -124337,12 +124682,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,
@@ -124354,6 +124694,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) 
@@ -126715,13 +127056,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;
@@ -128246,6 +128588,13 @@ function JSExecute(ast,option)
         ["TR", null], //真实波幅
         ["AUTOFILTER", null],
 
+        ["DYNA_NOW",null],  //DYNA_NOW  现价 DYNAINFO(7) 即时行情数据 没有现价时(比如在开盘前),返回昨收盘价
+        ["DYNA_ZAF",null],  //DYNA_ZAF 涨幅 DYNAINFO(14)  即时行情数据(沪深京早盘竞价期间使用匹配价的涨幅) 转换成幅度需要乘100
+        ["DYNA_LB", null],  //DYNA_LB   DYNAINFO(17)    量比 即时行情数据
+        ["DYNA_ZAS",null],  //DYNA_ZAS  DYNAINFO(24)  返回涨速 报价界面行情数据 转换成幅度需要乘100
+        ["SELLVOL", null], //返回内盘,即DYNAINFO(22) 即时行情数据
+        ["BUYVOL", null],  //返回外盘,即DYNAINFO(21) 即时行情数据
+
         ['LARGEINTRDVOL', null],    //逐笔买入大单成交量,相当于L2_VOL(0,0)+L2_VOL(1,0),沪深京品种的资金流向,仅日线以上周期,用于特定版本
         ['LARGEOUTTRDVOL', null],    //逐笔卖出大单成交量,相当于L2_VOL(0,1)+L2_VOL(1,1),沪深京品种的资金流向,仅日线以上周期,用于特定版本
         ["TRADENUM", null],         //逐笔成交总单数,沪深京品种的资金流向,仅日线以上周期,用于特定版本
@@ -128410,6 +128759,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':
@@ -128477,7 +128828,6 @@ function JSExecute(ast,option)
             case 'CAPITAL':
             case 'EXCHANGE':
             case "HSL":
-
             case "HYBLOCK":
             case "DYBLOCK":
             case "GNBLOCK":
@@ -137936,8 +138286,8 @@ function DownloadFinanceData(obj)
         {
             case 1: //FINANCE(1) 总股本(随时间可能有变化) 股
             case 7: //FINANCE(7) 流通股本(随时间可能有变化) 股
-            case "EXCHANGE": //换手率
             case "HSL"://换手率
+            case "EXCHANGE": //换手率
                 this.DownloadHistoryData(id);
                 break;
             case 3:
@@ -138198,7 +138548,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 };
@@ -139339,6 +139689,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)',        //边框线
         }
         
     };
@@ -139407,9 +139818,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';
 
@@ -139874,8 +140294,8 @@ 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;
@@ -140522,17 +140942,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];
@@ -140643,13 +141069,14 @@ 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:
@@ -140674,6 +141101,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(
@@ -140682,6 +141114,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"],
@@ -140838,7 +141275,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;   //柱子数据所在原始数据索引列
@@ -140851,6 +141288,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);
@@ -140870,7 +141309,7 @@ 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:"擎擎擎擎擎" },
 
@@ -140898,6 +141337,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" },
             
         ];
 
@@ -141238,7 +141682,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);
@@ -141339,6 +141783,11 @@ function ChartDealList()
                     break;
             }
         }
+
+        if (column.StringFormat && text)
+        {
+            text=column.StringFormat.replace("{0}", text);
+        }
         
         drawInfo.Text=text;
     }
@@ -141460,8 +141909,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;
 
@@ -141649,6 +142100,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=
@@ -146978,7 +147439,15 @@ function ChartReport()
     { 
         CloseColor:g_JSChartResource.Report.CloseLine.CloseColor,
         YCloseColor:g_JSChartResource.Report.CloseLine.YCloseColor,
-        AreaColor:g_JSChartResource.Report.CloseLine.AreaColor
+        AreaColor:g_JSChartResource.Report.CloseLine.AreaColor,
+
+        UpColor:g_JSChartResource.Report.CloseLine.UpColor,
+        DownColor:g_JSChartResource.Report.CloseLine.DownColor,
+        UnchangeColor:g_JSChartResource.Report.CloseLine.UnchangeColor, 
+
+        UpAreaColor:g_JSChartResource.Report.CloseLine.UpAreaColor,
+        DownAreaColor:g_JSChartResource.Report.CloseLine.DownAreaColor,
+        UnchangeAreaColor:g_JSChartResource.Report.CloseLine.UnchangeAreaColor, 
     }
 
     //K线配置
@@ -147289,6 +147758,7 @@ function ChartReport()
         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)
         {
@@ -147417,7 +147887,7 @@ function ChartReport()
             { 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" },
+            { 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擎" },
@@ -150456,8 +150926,7 @@ function ChartReport()
             this.Canvas.setLineDash([]);
         }
 
-        if (lineData.Color) this.Canvas.strokeStyle=lineData.Color;
-        else this.Canvas.strokeStyle=this.CloseLineConfig.CloseColor; 
+        this.Canvas.strokeStyle=this.GetCloseLineColor(lineData, column);
 
         var bFirstPoint=true;
         var ptFirst={}; //第1个点
@@ -150495,8 +150964,7 @@ function ChartReport()
                 this.Canvas.lineTo(x,yCenter);
                 this.Canvas.lineTo(ptFirst.X,yCenter);
                 this.Canvas.closePath();
-                var areaColor=this.CloseLineConfig.AreaColor;
-                if (lineData.AreaColor) areaColor=lineData.AreaColor;
+                var areaColor=this.GetCloseAreaColor(lineData, column);
                 this.SetFillStyle(areaColor,left,top, left,bottom);
                 this.Canvas.fill();
             }
@@ -150505,6 +150973,48 @@ function ChartReport()
         this.Canvas.restore();
     }
 
+    this.GetCloseLineColor=function(lineData, column)
+    {
+        var color=this.CloseLineConfig.CloseColor;
+        if (lineData.Color) 
+        {
+            color=lineData.Color;
+        }
+        else if (column.LineColorType==1)
+        {
+            var color= this.CloseLineConfig.UnchangeColor;
+            if (IFrameSplitOperator.IsNumber(lineData.YClose) && IFrameSplitOperator.IsNonEmptyArray(lineData.Data) && IFrameSplitOperator.IsNumber(lineData.Data[ lineData.Data.length -1 ]))
+            {
+                var lastValue=lineData.Data[ lineData.Data.length -1 ];
+                if (lastValue>lineData.YClose) color=this.CloseLineConfig.UpColor; 
+                else if (lastValue<lineData.YClose) color=this.CloseLineConfig.DownColor; 
+            }
+        }
+
+        return color;
+    }
+
+    this.GetCloseAreaColor=function(lineData, column)
+    {
+        var color=this.CloseLineConfig.AreaColor;
+        if (lineData.AreaColor) 
+        {
+            color=lineData.AreaColor;
+        }
+        else if (column.LineColorType==1)
+        {
+            var color= this.CloseLineConfig.UnchangeAreaColor;
+            if (IFrameSplitOperator.IsNumber(lineData.YClose) && IFrameSplitOperator.IsNonEmptyArray(lineData.Data) && IFrameSplitOperator.IsNumber(lineData.Data[ lineData.Data.length -1 ]))
+            {
+                var lastValue=lineData.Data[ lineData.Data.length -1 ];
+                if (lastValue>lineData.YClose) color=this.CloseLineConfig.UpAreaColor; 
+                else if (lastValue<lineData.YClose) color=this.CloseLineConfig.DownAreaColor; 
+            }
+        }
+
+        return color;
+    }
+
     //klineData={ Data:[ open, high, low, close ] }
     this.DrawKLine=function(klineData, column, rtItem, data)
     {
@@ -150574,7 +151084,31 @@ function ChartReport()
         var distanceWidth=this.KLineConfig.DistanceWidth;
         var xOffset=left;
         var x, xLeft, xRight;
+        var drawCount=0;
         for(var i=0;i<aryKLine.length;++i,xOffset+=(dataWidth+distanceWidth))
+        {
+            xLeft=xOffset;
+            xRight=xOffset+dataWidth;
+            x=xLeft+(xRight-xLeft)/2;
+            if (xRight>right) break;
+            drawCount++;
+        }
+
+        var xOffset=left;
+        var startIndex=0;
+        if (aryKLine.length>drawCount) 
+        {
+            high=null,low=null;
+            startIndex=aryKLine.length-drawCount;
+            for(var i=startIndex;i<aryKLine.length;++i)
+            {
+                var item=aryKLine[i];
+                if (high==null || high<item.High) high=item.High;
+                if (low==null || low>item.Low) low=item.Low;
+            }
+        }
+
+        for(var i=startIndex;i<aryKLine.length;++i,xOffset+=(dataWidth+distanceWidth))
         {
             var item=aryKLine[i];
             xLeft=xOffset;
@@ -150662,7 +151196,11 @@ function ChartReport()
         }
         else
         {
-
+            this.Canvas.beginPath();
+            var xBar=x;
+            this.Canvas.moveTo(ToFixedPoint(xBar),ToFixedPoint(yBarTop));
+            this.Canvas.lineTo(ToFixedPoint(xBar),ToFixedPoint(yBarBottom));
+            this.Canvas.stroke();
         }
     }
 
@@ -155550,7 +156088,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.15381";
+var HQCHART_VERSION="1.1.15427";
 
 function PrintHQChartVersion()
 {