hqchart 1.1.13678 → 1.1.13689

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

@@ -72171,6 +72171,16 @@ function JSChartResource()
             NameFont:{ Size:14, Name:"微软雅黑" },
             SymbolFont:{ Size:12, Name:"微软雅黑" }
         },
+
+        VScrollbar:
+        {
+            ScrollBarHeight:50,
+            ButtonColor:"rgba(252,252,252,0.8)",
+            BarColor:"rgba(168,168,168,0.9)",
+            BorderColor:'rgba(180,180,180,0.9)',
+            BGColor:"rgba(234,239,248,0.9)",
+            BarWidth:{ Size:8 }
+        },
     },
 
     //滚动条
@@ -98081,6 +98091,38 @@ var g_JSComplierResource=
         Data:new Map()  //自定义函数 key=变量名, Value:{ Name:变量名, Description:描述信息 }
     },
 
+    CustomDataFunction: //自定义数据函数 
+    {
+        //自定义函数 key=变量名, Value:{ Name:变量名, Description:描述信息, ArgCount:参数个数 }
+        Data:new Map(
+        [
+            [
+                "L2_VOLNUM",
+                { 
+                    Name:"L2_VOLNUM",
+                    Description:"单数分档,按: N(0--1):(超大+大)/(中+小),M(0--1):买/卖二类,沪深京品种的资金流向,仅日线以上周期,用于特定版本", 
+                    ArgCount:2 
+                }
+            ],
+            [
+                "L2_VOL", 
+                { 
+                    Name:"L2_VOL",
+                    Description:"成交量分档,按: N(0--3):超大/大/中/小四档处理,M(0--3):买入/卖出/主买/主卖四类,沪深京品种的资金流向,仅日线以上周期,用于特定版本", 
+                    ArgCount:2 
+                }
+            ],
+            [
+                "L2_AMO", 
+                { 
+                    Name:"L2_AMO",
+                    Description:"成交额分档,按: N(0--3):超大/大/中/小四档处理,M(0--3):买入/卖出/主买/主卖四类,沪深京品种的资金流向,仅日线以上周期,用于特定版本", 
+                    ArgCount:2 
+                }
+            ]
+        ])  
+    },
+
     GetDrawIcon:function(id)
     {
         var icon;
@@ -98133,6 +98175,12 @@ var g_JSComplierResource=
     {
         if (g_JSComplierResource.CustomVariant.Data.has(name)) return true;
         return false;
+    },
+
+    IsCustomDataFunction:function(name)
+    {
+        if (g_JSComplierResource.CustomDataFunction.Data.has(name)) return true;
+        return false;
     }
 }
 
@@ -99039,7 +99087,15 @@ function Node(ErrorHandler)
             "CAPITAL","TOTALCAPITAL","EXCHANGE",
             "HYBLOCK","DYBLOCK","GNBLOCK","FGBLOCK","ZSBLOCK","ZHBLOCK","ZDBLOCK","HYZSCODE",
             "GNBLOCKNUM","FGBLOCKNUM","ZSBLOCKNUM","ZHBLOCKNUM","ZDBLOCKNUM",
-            "HYSYL","HYSJL","FROMOPEN"
+            "HYSYL","HYSJL","FROMOPEN",
+            //资金流向
+            "LARGEINTRDVOL","LARGEOUTTRDVOL",
+            "TRADENUM","TRADEINNUM","TRADEOUTNUM",
+            "LARGETRDINNUM","LARGETRDOUTNUM",
+            "CUR_BUYORDER","CUR_SELLORDER",
+            "ACTINVOL","ACTOUTVOL",
+            "BIDORDERVOL","BIDCANCELVOL","AVGBIDPX", 
+            "OFFERORDERVOL","OFFERCANCELVOL","AVGOFFERPX", 
         ]);
 
         if (setVariantName.has(varName))
@@ -99132,6 +99188,15 @@ function Node(ErrorHandler)
             return;
         }
 
+        //自定义数据函数
+        if (g_JSComplierResource.IsCustomDataFunction(callee.Name))
+        {
+            var item={FunctionName:callee.Name, ID:JS_EXECUTE_JOB_ID.JOB_CUSTOM_DATA_FUNCTION, Args:args}
+            if (token) item.Token={ Index:token.Start, Line:token.LineNumber};
+            this.FunctionData.push(item);
+            return;
+        }
+
         if (callee.Name=='DYNAINFO') 
         {
             var item={ ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SYMBOL_LATEST_DATA, Args:args,  FunctionName:callee.Name };
@@ -112558,7 +112623,7 @@ function JSSymbolData(ast,option,jsExecute)
                 Request:
                 { 
                     Url:"数据地址", Type:'POST', 
-                    Data:{ VariantName:jobItem.VariantName, symbol: this.Symbol, daterange:dateRange, period:this.Period } 
+                    Data:{ VariantName:jobItem.VariantName, symbol: this.Symbol, daterange:dateRange, period:this.Period, right:this.Right } 
                 },
                 Self:this,
                 VariantInfo:variantInfo,
@@ -112601,7 +112666,61 @@ function JSSymbolData(ast,option,jsExecute)
                     { 
                         FunctionName:jobItem.FunctionName, 
                         symbol: this.Symbol, daterange:dateRange,
-                        JobItem:jobItem //函数编译信息
+                        JobItem:jobItem, //函数编译信息
+                        period:this.Period,
+                        right:this.Right,
+                    } 
+                },
+                Self:this,
+                FunctionInfo:functionInfo,
+                PreventDefault:false
+            };
+            this.NetworkFilter(obj, function(recvData) 
+            { 
+                if (recvData.Error) self.AddStockValueError(key,recvData.Error);
+                else self.RecvStockValue(recvData.Data,jobItem,key,recvData.DataType);
+                self.Execute.RunNextJob();
+            });
+        }
+        else
+        {
+            this.AddStockValueError(key, `自定义函数${key}下载失败`);
+            this.Execute.RunNextJob();
+        }
+    }
+
+
+    this.GetCustomFunctionDataV2=function(jobItem)
+    {
+        var funcName=jobItem.FunctionName;
+        var functionInfo=g_JSComplierResource.CustomDataFunction.Data.get(funcName);
+        if (!functionInfo) return;
+
+        var aryArgs=this.JobArgumentsToArray(jobItem, functionInfo.ArgCount);
+        var key=this.GetStockDataKey(jobItem,aryArgs);
+        
+        if (this.StockData.has(key)) return this.Execute.RunNextJob();  //一个函数只能缓存一个数据, 保存多个外部自己保存
+
+        var self=this;
+        if (this.NetworkFilter)
+        {
+            var dateRange=this.Data.GetDateRange();
+            var obj=
+            {
+                Name:'JSSymbolData::GetCustomFunctionData', //类名::函数名
+                Explain:'自定义函数数据下载',
+                JobID:jobItem.ID,
+                Request:
+                { 
+                    Url:"数据地址", Type:'POST', 
+                    Data:
+                    { 
+                        FunctionName:jobItem.FunctionName, 
+                        symbol: this.Symbol, daterange:dateRange,
+                        JobItem:jobItem, //函数编译信息
+                        Key:key,
+                        period:this.Period,
+                        right:this.Right,
                     } 
                 },
                 Self:this,
@@ -114418,6 +114537,7 @@ var JS_EXECUTE_JOB_ID=
 
     JOB_CUSTOM_FUNCTION_DATA:6000,       //自定义函数
     JOB_CUSTOM_VARIANT_DATA:6001,        //自定义变量
+    JOB_CUSTOM_DATA_FUNCTION:6002,     //自定义数据函数
     //截面数据
     //财务数据 SF(公告期,数据名称)   如: SF(201901,"流动资产");
     JOB_DOWNLOAD_SECTION_SF:20000,
@@ -114658,8 +114778,26 @@ function JSExecute(ast,option)
         ["MACHINEDATE",null],["MACHINETIME",null],["MACHINEWEEK",null],
 
         ["TR", null], //真实波幅
-        ["AUTOFILTER", null]
-
+        ["AUTOFILTER", null],
+
+        ['LARGEINTRDVOL', null],    //逐笔买入大单成交量,相当于L2_VOL(0,0)+L2_VOL(1,0),沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ['LARGEOUTTRDVOL', null],    //逐笔卖出大单成交量,相当于L2_VOL(0,1)+L2_VOL(1,1),沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ["TRADENUM", null],         //逐笔成交总单数,沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ["TRADEINNUM", null],       //逐笔买入成交单数,相当于L2_VOLNUM(0,0)+L2_VOLNUM(1,0),沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ["TRADEOUTNUM", null],      //逐笔卖出成交单数,相当于L2_VOLNUM(0,1)+L2_VOLNUM(1,1),沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ["LARGETRDINNUM", null],    //逐笔买入大单成交单数,相当于L2_VOLNUM(0,0),沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ["LARGETRDOUTNUM", null],   //逐笔卖出大单成交单数,相当于L2_VOLNUM(0,1),沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ["CUR_BUYORDER", null],     //总委买量,序列数据,专业版等(资金流向功能)沪深京品种行情专用
+        ["CUR_SELLORDER", null],    //总委卖量,序列数据,专业版等(资金流向功能)沪深京品种行情专用
+        ["ACTINVOL", null],         //主动买成交量,相当于L2_VOL(0,2)+L2_VOL(1,2)+L2_VOL(2,2)+L2_VOL(3,2),沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ["ACTOUTVOL", null],        //主动卖成交量,相当于L2_VOL(0,3)+L2_VOL(1,3)+L2_VOL(2,3)+L2_VOL(3,3),沪深京品种的资金流向,仅日线以上周期,用于特定版本
+        ["BIDORDERVOL", null],      //累计总有效委买量,专业版等(资金流向功能)沪深京品种行情专用 累计总有效委买量-累计总有效撤买量=总买+总成交量
+        ["BIDCANCELVOL", null],     //累计总有效撤买量,专业版等(资金流向功能)沪深京品种行情专用  累计总有效委买量-累计总有效撤买量=总买+总成交量
+        ["AVGBIDPX", null],         //专业版等(资金流向功能)沪深京品种行情专用:最新委买均价
+        ["OFFERORDERVOL", null],    //累计总有效委卖量,专业版等(资金流向功能)沪深京品种行情专用  累计总有效委卖量-累计总有效撤卖量=总卖+总成交量
+        ["OFFERCANCELVOL", null],   //累计总有效撤卖量,专业版等(资金流向功能)沪深京品种行情专用  累计总有效委卖量-累计总有效撤卖量=总卖+总成交量
+        ["AVGOFFERPX", null],       //专业版等(资金流向功能)沪深京品种行情专用:最新委卖均价
+        //["", null],
     ]);   
 
     this.SymbolData=new JSSymbolData(this.AST,option,this);
@@ -114784,6 +114922,9 @@ function JSExecute(ast,option)
             case JS_EXECUTE_JOB_ID.JOB_CUSTOM_FUNCTION_DATA:
                 return this.SymbolData.GetCustomFunctionData(jobItem);
 
+            case JS_EXECUTE_JOB_ID.JOB_CUSTOM_DATA_FUNCTION:
+                return this.SymbolData.GetCustomFunctionDataV2(jobItem);
+
 
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_CUSTOM_API_DATA:
                 return this.SymbolData.DownloadCustomAPIData(jobItem);
@@ -114876,6 +115017,24 @@ function JSExecute(ast,option)
             case "HYSJL":
 
             case 'FROMOPEN':
+
+            case "LARGEINTRDVOL":
+            case "LARGEOUTTRDVOL":
+            case "TRADENUM":
+            case "TRADEINNUM":
+            case "TRADEOUTNUM":
+            case "LARGETRDINNUM": 
+            case "LARGETRDOUTNUM":
+            case "CUR_BUYORDER":
+            case "CUR_SELLORDER": 
+            case "ACTINVOL":
+            case "ACTOUTVOL":
+            case "BIDORDERVOL":
+            case "BIDCANCELVOL":
+            case "AVGBIDPX":
+            case "OFFERORDERVOL":
+            case "OFFERCANCELVOL":
+            case "AVGOFFERPX":
                 return this.SymbolData.GetStockCacheData({ VariantName:name, Node:node });
             case 'SETCODE':
                 return this.SymbolData.SETCODE();
@@ -114939,8 +115098,9 @@ function JSExecute(ast,option)
                 return this.SymbolData.WEEKOFYEAR();
             case "DAYSTOTODAY":
                 return this.SymbolData.DAYSTOTODAY();
-
         }
+
+        this.ThrowUnexpectedNode(node, '变量'+name+'不存在', name);
     }
 
     this.ReadCustomVariant=function(name,node)
@@ -115891,6 +116051,15 @@ function JSExecute(ast,option)
             return node.Out;
         }
 
+        if (g_JSComplierResource.IsCustomDataFunction(funcName))
+        {
+            var functionInfo=g_JSComplierResource.CustomDataFunction.Data.get(funcName);
+            node.Out=this.SymbolData.GetStockCacheData( {FunctionName:funcName, Args:args, ArgCount:functionInfo.ArgCount, Node:node } );
+            node.Draw=null;
+
+            return  node.Out;
+        }
+
         switch(funcName)
         {
             case 'DYNAINFO':    //行情最新数据
@@ -116460,6 +116629,24 @@ function JSExplainer(ast,option)
         ['DRAWNULL',"无效数据"],
         ["TR", "求真实波幅"],
 
+        ["LARGEINTRDVOL","逐笔买入大单成交量"],
+        ["LARGEOUTTRDVOL","逐笔卖出大单成交量"],
+        ["TRADENUM", "逐笔成交总单数"],         
+        ["TRADEINNUM", "逐笔买入成交单数"],       
+        ["TRADEOUTNUM", "逐笔卖出成交单数"],      
+        ["LARGETRDINNUM", "逐笔买入大单成交单数"],   
+        ["LARGETRDOUTNUM", "逐笔卖出大单成交单数"],  
+        ["CUR_BUYORDER", "总委买量"],    
+        ["CUR_SELLORDER", "总委卖量"],   
+        ["ACTINVOL", "主动买成交量"],         
+        ["ACTOUTVOL", "主动卖成交量"],        
+        ["BIDORDERVOL", "累计总有效委买量"],     
+        ["BIDCANCELVOL", "累计总有效撤买量"],    
+        ["AVGBIDPX", "最新委买均价"],         
+        ["OFFERORDERVOL", "累计总有效委卖量"],   
+        ["OFFERCANCELVOL", "累计总有效撤卖量"],   
+        ["AVGOFFERPX", "最新委卖均价"],
+
     ]);   
 
     if (option)
@@ -117051,7 +117238,9 @@ function JSExplainer(ast,option)
                 } 
             ],
 
-           
+            ["L2_VOLNUM", { Name:"L2_VOLNUM", Param:{ Count:2 }, ToString:function(args) { return `单数分档`; } }],
+            ["L2_VOL", { Name:"L2_VOL", Param:{ Count:2 }, ToString:function(args) { return `成交量分档`; } }],
+            ["L2_AMO", { Name:"L2_AMO", Param:{ Count:2 }, ToString:function(args) { return `成交额分档`; } }],
             
         ]
     );
@@ -133993,7 +134182,7 @@ function ChartVScrollbar()
     this.ChartBorder;                   //边框信息
     this.ChartFrame;                    //框架画法
     this.Name;                          //名称
-    this.ClassName='ChartReportTab';       //类名
+    this.ClassName='ChartVScrollbar';       //类名
     this.IsDrawFirst=false;
     this.GetEventCallback;              //获取事件
     this.Report;
@@ -134570,6 +134759,7 @@ function JSKeyboardChartContainer(uielement)
    
     //拖拽滚动条
     this.DragYScroll=null;  //{Start:{x,y}, End:{x, y}}
+
     this.IsDestroy=false;        //是否已经销毁了
 
     this.ChartDestory=function()    //销毁
@@ -134610,6 +134800,7 @@ function JSKeyboardChartContainer(uielement)
             this.Data.Data=aryExactQuery.concat(aryFuzzyQuery);
 
         this.ChartPaint[0].SelectedRow=0;
+        this.ChartPaint[0].SizeChange=true;
 
         JSConsole.Chart.Log(`[JSKeyboardChart:Search] search=${strSearch}, source=${this.SourceData.Data.length} match=${this.Data.Data.length}`);
 
@@ -134686,6 +134877,12 @@ function JSKeyboardChartContainer(uielement)
         chart.Data=this.Data;
         this.ChartPaint[0]=chart;
 
+        chart.VScrollbar=new ChartKeyboardVScrollbar();
+        chart.VScrollbar.Frame=this.Frame;
+        chart.VScrollbar.Canvas=this.Canvas;
+        chart.VScrollbar.ChartBorder=this.Frame.ChartBorder;
+        chart.VScrollbar.Report=chart;
+
         if (option)
         {
             
@@ -134937,7 +135134,7 @@ function JSKeyboardChartContainer(uielement)
 
     this.UIOnMouseDown=function(e)
     {
-        this.DragXScroll=null;
+        this.DragYScroll=null;
         this.DragMove={ Click:{ X:e.clientX, Y:e.clientY }, Move:{X:e.clientX, Y:e.clientY}, PreMove:{X:e.clientX, Y:e.clientY } };
 
         var pixelTatio = GetDevicePixelRatio();
@@ -134956,6 +135153,29 @@ function JSKeyboardChartContainer(uielement)
                 if (clickData.Redraw==true)
                     this.Draw();
             }
+            else if (clickData.Type==5 && e.button==0)  //右侧滚动条
+            {
+                var scroll=clickData.VScrollbar;
+                if (scroll.Type==1) //顶部按钮
+                {
+                    if (this.MoveYOffset(-1)) 
+                        this.Draw();
+                }
+                else if (scroll.Type==2)   //底部按钮
+                {
+                    if (this.MoveYOffset(1)) 
+                        this.Draw();
+                }
+                else if (scroll.Type==3)    //滚动条
+                {
+                    this.DragYScroll={ Click:{X:x, Y:y}, LastMove:{X:x, Y:y} };
+                }
+                else if (scroll.Type==4)    //滚动条内部
+                {
+                    if (this.SetYOffset(scroll.Pos)) 
+                        this.Draw();
+                }
+            }
         }
 
         document.onmousemove=(e)=>{ this.DocOnMouseMove(e); }
@@ -135001,68 +135221,17 @@ function JSKeyboardChartContainer(uielement)
         var x = (e.clientX-this.UIElement.getBoundingClientRect().left)*pixelTatio;
         var y = (e.clientY-this.UIElement.getBoundingClientRect().top)*pixelTatio;
 
-        //JSConsole.Chart.Log(`[JSReportChartContainer::DocOnMouseMove] x=${x}, y=${y}`);
-        
-        if (this.DragRow)
-        {
-            var drag=this.DragRow;
-            var moveSetpY=drag.LastMove.Y-e.clientY;
-            if (Math.abs(moveSetpY)<2) return;
-            var reportChart=this.GetReportChart();
-            drag.LastMove.X=e.clientX;
-            drag.LastMove.Y=e.clientY;
-            drag.Inside={X:x, Y:y};
-
-            if (reportChart) 
-            {
-                var moveRow=reportChart.OnDrawgRow(x,y,e);
-                if (moveRow )
-                {
-                    if (moveRow.Type==2)
-                    {
-                        if (moveRow.Data.DataIndex!=drag.Data.Row.DataIndex)
-                        {
-                            drag.MoveRow=moveRow;
-                        }
-                    }
-                    else if (moveRow.Type==7)
-                    {
-                        var pageStatus=reportChart.GetCurrentPageStatus();
-                        if (!pageStatus.IsEnd)
-                        {
-                            this.MoveYOffset(1, false);
-                            drag.MoveRow=null;
-
-                            this.EnablePageScroll=true;
-                            this.AutoScrollPage(2);
-                        }
-                    }
-                    else if (moveRow.Type==5)
-                    {
-                        if (this.Data.YOffset>0)
-                        {
-                            this.MoveYOffset(-1, false);
-                            drag.MoveRow=null;
-
-                            this.EnablePageScroll=true;
-                            this.AutoScrollPage(-2);
-                        }
-                    }
-                }
-                reportChart.DragRow=drag;
-            }
-
-            this.Draw();
-        }
-        else if (this.DragXScroll)
+        if (this.DragYScroll)
         {
             var chart=this.ChartPaint[0];
-            if (!chart || !chart.Tab) return;
+            if (!chart || !chart.VScrollbar) return;
 
-            this.DragXScroll.LastMove.X=x;
-            this.DragXScroll.LastMove.Y=y;
-            var pos=chart.Tab.GetScrollPostionByPoint(x,y);
-            if (this.SetXOffset(pos)) this.Draw();
+            this.DragYScroll.LastMove.X=x;
+            this.DragYScroll.LastMove.Y=y;
+
+            var pos=chart.VScrollbar.GetScrollPostionByPoint(x,y);
+            if (this.SetYOffset(pos)) 
+                this.Draw();
         }
     }
 
@@ -135072,6 +135241,8 @@ function JSKeyboardChartContainer(uielement)
         document.onmousemove=null;
         document.onmouseup=null; 
 
+        this.DragYScroll=null;
+
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_KEYBOARD_MOUSEUP)
         if (event && event.Callback)
         {
@@ -135378,6 +135549,21 @@ function JSKeyboardChartContainer(uielement)
             return result;
         }
     }
+
+    this.SetYOffset=function(pos)
+    {
+        if (!IFrameSplitOperator.IsNumber(pos)) return false;
+        var chart=this.ChartPaint[0];
+        if (!chart) return false;
+
+        var maxOffset=chart.GetYScrollRange();
+        if (pos<0) pos=0;
+        if (pos>maxOffset) pos=maxOffset;
+
+        this.Data.YOffset=pos;
+
+        return true;
+    }
 }
 
 function JSKeyboardFrame()
@@ -135387,14 +135573,14 @@ function JSKeyboardFrame()
 
     this.BorderLine=null;                   //1=上 2=下 4=左 8=右
 
-    this.BorderColor=g_JSChartResource.Report.BorderColor;    //边框线
+    this.BorderColor=g_JSChartResource.Keyboard.BorderColor;    //边框线
 
     this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;
     this.LogoTextFont=g_JSChartResource.FrameLogo.Font;
 
-    this.ReloadResource=function(resource)
+    this.ReloadResource=function(option)
     {
-        this.BorderColor=g_JSChartResource.Report.BorderColor;    //边框线
+        this.BorderColor=g_JSChartResource.Keyboard.BorderColor;    //边框线
         this.LogoTextColor=g_JSChartResource.FrameLogo.TextColor;
         this.LogoTextFont=g_JSChartResource.FrameLogo.Font;
     }
@@ -135491,10 +135677,12 @@ function ChartSymbolList()
     this.IsDrawBorder=false;            //是否绘制单元格边框
 
     this.ShowSymbol=[];                 //显示的股票列表 { Index:序号(排序用), Symbol:股票代码 }
+
+    this.VScrollbar;                    //竖向滚动条
    
     this.BorderColor=g_JSChartResource.Keyboard.BorderColor;          //边框线
     this.SelectedColor=g_JSChartResource.Keyboard.SelectedColor;      //选中行
-    this.TextColor=g_JSChartResource.Keyboard.TextColor;                //文字颜色
+    this.TextColor=g_JSChartResource.Keyboard.TextColor;              //文字颜色
 
     //表格内容配置
     this.ItemFontConfig={ Size:g_JSChartResource.Keyboard.Item.Font.Size, Name:g_JSChartResource.Keyboard.Item.Font.Name };
@@ -135527,7 +135715,11 @@ function ChartSymbolList()
 
     this.ReloadResource=function(resource)
     {
-       
+        this.BorderColor=g_JSChartResource.Keyboard.BorderColor;          //边框线
+        this.SelectedColor=g_JSChartResource.Keyboard.SelectedColor;      //选中行
+        this.TextColor=g_JSChartResource.Keyboard.TextColor;              //文字颜色
+
+        if (this.VScrollbar) this.VScrollbar.ReloadResource(resource);
     }
 
     this.SetColumn=function(aryColumn)
@@ -135542,6 +135734,7 @@ function ChartSymbolList()
         if (this.SizeChange) this.CalculateSize();
         else this.UpdateCacheData();
 
+        var bShowVScrollbar=this.IsShowVScrollbar();
         this.Canvas.save();
 
         this.Canvas.beginPath();
@@ -135554,6 +135747,12 @@ function ChartSymbolList()
         
         this.DrawBorder();
 
+        if (this.VScrollbar && bShowVScrollbar)
+        {
+            var bottom=this.ChartBorder.GetBottom();
+            this.VScrollbar.DrawScrollbar(this.RectClient.Left,this.RectClient.Top+2, this.RectClient.Right+this.VScrollbar.ButtonSize+2, bottom-2);
+        }
+
         this.SizeChange=false;
     }
 
@@ -135564,6 +135763,12 @@ function ChartSymbolList()
         this.RectClient.Right=this.ChartBorder.GetRight();
         this.RectClient.Top=this.ChartBorder.GetTop();
         this.RectClient.Bottom=this.ChartBorder.GetBottom();
+
+        var bShowVScrollbar=this.IsShowVScrollbar();
+        if (bShowVScrollbar && this.VScrollbar && this.VScrollbar.Enable)
+        {
+            this.RectClient.Right-=(this.VScrollbar.ButtonSize+2);
+        }
     }
 
     this.GetPageSize=function(recalculate) //recalculate 是否重新计算
@@ -135597,6 +135802,8 @@ function ChartSymbolList()
 
     this.CalculateSize=function()   //计算大小
     {
+        if (this.VScrollbar && this.VScrollbar.Enable) this.VScrollbar.CalculateSize();
+
         this.UpdateCacheData();
 
         var pixelRatio=GetDevicePixelRatio();
@@ -135791,6 +135998,7 @@ function ChartSymbolList()
         else if (textAlign=='right')
         {
             x=left+width-2;
+            if (left+width-2>this.RectClient.Right) x=this.RectClient.Right-2;
             this.Canvas.textAlign="right";
         }
         else
@@ -135845,6 +136053,12 @@ function ChartSymbolList()
         else
             var uiElement={Left:null, Top:null};
 
+        if (this.VScrollbar)
+        {
+            var item=this.VScrollbar.OnMouseDown(x,y,e);
+            if (item) return { Type:5, VScrollbar:item };   //右侧滚动条
+        }
+
         var row=this.PtInBody(x,y);
         if (row)
         {
@@ -136005,6 +136219,57 @@ function ChartSymbolList()
             event.Callback(event,data,this);
         }
     }
+
+    this.GetYScrollRange=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return 0;
+
+        var maxOffset=this.Data.Data.length-this.RowCount;
+
+        return maxOffset;
+    }
+
+    //大于1屏数据 显示滚动条
+    this.IsShowVScrollbar=function()
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return false;
+        
+        return this.Data.Data.length>this.RowCount;
+    }
+}
+
+//纵向滚动条
+function ChartKeyboardVScrollbar()
+{
+    this.newMethod=ChartVScrollbar;   //派生
+    this.newMethod();
+    delete this.newMethod;
+
+    this.ClassName='ChartKeyboardVScrollbar';
+    this.Enable=true;
+
+    this.ScrollBarHeight=g_JSChartResource.Keyboard.VScrollbar.ScrollBarHeight;
+    this.ButtonColor=g_JSChartResource.Keyboard.VScrollbar.ButtonColor;
+    this.BarColor=g_JSChartResource.Keyboard.VScrollbar.BarColor;
+    this.BorderColor=g_JSChartResource.Keyboard.VScrollbar.BorderColor;
+    this.BGColor=g_JSChartResource.Keyboard.VScrollbar.BGColor;
+    this.Mergin={ Left:2, Right:2, Top:2, Bottom:2 };
+    this.BarWithConfig={ Size:g_JSChartResource.Keyboard.VScrollbar.BarWidth.Size };
+
+    this.ReloadResource=function(resource)
+    {
+        this.ScrollBarHeight=g_JSChartResource.Keyboard.VScrollbar.ScrollBarHeight;
+        this.ButtonColor=g_JSChartResource.Keyboard.VScrollbar.ButtonColor;
+        this.BarColor=g_JSChartResource.Keyboard.VScrollbar.BarColor;
+        this.BorderColor=g_JSChartResource.Keyboard.VScrollbar.BorderColor;
+        this.BGColor=g_JSChartResource.Keyboard.VScrollbar.BGColor;
+        this.BarWithConfig={ Size:g_JSChartResource.Keyboard.VScrollbar.BarWidth.Size };
+    }
+
+    this.IsShowCallback=function()
+    {
+        return true;
+    }
 }
 
 /*
@@ -137485,7 +137750,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13677";
+var HQCHART_VERSION="1.1.13688";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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