hqchart 1.1.13960 → 1.1.13965

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

@@ -47131,6 +47131,7 @@ function MinuteLeftTooltipPaint()
     this.DateTimeColor=g_JSChartResource.PCTooltipPaint.DateTimeColor;      //日期时间颜色
     this.VolColor=g_JSChartResource.PCTooltipPaint.VolColor;          //标题成交量
     this.AmountColor=g_JSChartResource.PCTooltipPaint.AmountColor;    //成交金额
+    this.PositionColor=g_JSChartResource.PCTooltipPaint.PositionColor;  //持仓
     this.LanguageID=JSCHART_LANGUAGE_ID.LANGUAGE_CHINESE_ID;
     this.TitlePaint;
 
@@ -47304,6 +47305,12 @@ function MinuteLeftTooltipPaint()
 
                 aryText.push(titleItem);
             }
+
+            if (isFutures && IFrameSplitOperator.IsNumber(item.Position))   //持仓
+            {
+                var titleItem=this.FormatPosition(item.Position,'PCTooltip-Position');
+                if (titleItem) aryText.push(titleItem);
+            }
         }
         else if (drawData.Type==1)  //集合竞价
         {
@@ -47429,6 +47436,21 @@ function MinuteLeftTooltipPaint()
         
         return titleItem;
     }
+
+    this.FormatPosition=function(value, TitleID)
+    {
+        if (!IFrameSplitOperator.IsNumber(value)) return null;
+        
+        var titleItem=
+        { 
+            Title:g_JSChartLocalization.GetText(TitleID,this.LanguageID),
+            TitleColor:this.TitleColor,
+            Text:value.toFixed(0),
+            TextColor:this.PositionColor
+        };
+        
+        return titleItem;
+    }
 }
 
 //股票信息
@@ -73080,6 +73102,7 @@ function JSChartResource()
         DateTimeColor:'rgb(60,60,60)',
         VolColor:"rgb(60,60,60)",       //标题成交量
         AmountColor:"rgb(60,60,60)",    //成交金额
+        PositionColor:"rgb(60,60,60)",  //持仓量
     };
 
     this.PCTooltip= {
@@ -74086,6 +74109,8 @@ function JSChartResource()
             if (item.DateTimeColor) this.PCTooltipPaint.DateTimeColor=item.DateTimeColor;
             if (item.VolColor) this.PCTooltipPaint.VolColor=item.VolColor;
             if (item.AmountColor) this.PCTooltipPaint.AmountColor=item.AmountColor;
+            if (item.PositionColor) this.PCTooltipPaint.PositionColor=item.PositionColor;
+            
         }
 
         if (style.DialogTooltip)
@@ -75096,6 +75121,7 @@ function JSChartLocalization()
         ['PCTooltip-Increase', {CN:'涨幅', EN:'Increase:', TC:'漲幅'}],
         ['PCTooltip-Vol', {CN:'成交量', EN:'Volume:', TC:'成交量'}],
         ['PCTooltip-Amount', {CN:'成交额', EN:'Amount:', TC:'成交額'}],
+        ["PCTooltip-Position",{CN:'持仓量', EN:'Position:', TC:'持倉'}],
         ['PCTooltip-AC-Price', {CN:'匹配价:', EN:'Price:', TC:'匹配價'}],
         ['PCTooltip-AC-Increase', {CN:'竞价涨幅:', EN:'Increase:', TC:'競價漲幅'}],
         ['PCTooltip-AC-Vol', {CN:'匹配量:', EN:'V:', TC:'匹配量'}],
@@ -125592,6 +125618,7 @@ function GetBlackStyle()
             DateTimeColor:'rgb(210,210,210)',
             VolColor:"rgb(255, 185, 15)",       //标题成交量
             AmountColor:"rgb(210,210,210)",    //成交金额
+            PositionColor:"rgb(255,215,0)",  //持仓量
         },
 
         PCTooltipPaint:
@@ -127678,6 +127705,12 @@ function JSReportChart(divElement)
             if (IFrameSplitOperator.IsNumber(item.Sort)) chart.SortInfo.Sort=item.Sort;
         }
 
+        if (option.VirtualTable)
+        {
+            var item=option.VirtualTable;
+            if (IFrameSplitOperator.IsBool(item.Enable)) chart.Data.Virtual.Enable=item.Enable;
+        }
+
         var reportChart=chart.GetReportChart();
         if (reportChart)
         {
@@ -127892,7 +127925,7 @@ function JSReportChartContainer(uielement)
     this.Symbol;    //板块代码
     this.Name;      //板块名称
     this.NetworkFilter;                                 //数据回调接口
-    this.Data={ XOffset:0, YOffset:0, Data:[] };        //股票列表
+    this.Data={ XOffset:0, YOffset:0, Data:[], Virtual:{ Enable:false, Count:0 } };        //股票列表  (Virtual 虚拟表)
     this.SourceData={ Data:[] } ;                       //原始股票顺序(排序还原用)
     this.BlockData=new Map();                           //当前板块数据
     this.MapStockData=new Map();                        //原始股票数据
@@ -128261,6 +128294,7 @@ function JSReportChartContainer(uielement)
     {
         this.SourceData.Data=[];
         this.Data.Data=[];
+        this.Data.Virtual.Count=0;
         this.BlockData=new Map(); 
     }
 
@@ -128517,6 +128551,12 @@ function JSReportChartContainer(uielement)
             }
         }
 
+        if (recvData.Virtual)   //虚拟表设置
+        {
+            var item=recvData.Virtual;
+            if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
+        }
+
         this.Draw();
         this.UpdateStockData();
     }
@@ -128742,6 +128782,12 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
+        if (this.Data.Virtual && this.Data.Virtual.Enable)
+        {
+            this.RequestVirtualStockData(); //虚拟表格 全部取后台
+            return;
+        }
+
         if (this.SortInfo && this.SortInfo.Field>=0 && this.SortInfo.Sort>0)
         {
             var column=chart.Column[this.SortInfo.Field];
@@ -130097,8 +130143,9 @@ function JSReportChartContainer(uielement)
         if (!chart) return false;
 
         var pageSize=chart.GetPageSize();
-        if (pageSize>this.Data.Data.length) return false;
-        if (this.Data.YOffset+pageSize>=this.Data.Data.length) 
+        var dataCount=chart.GetAllRowCount();
+        if (pageSize>dataCount) return false;
+        if (this.Data.YOffset+pageSize>=dataCount) 
         {
             if (bCycle===true)
             {
@@ -130112,7 +130159,7 @@ function JSReportChartContainer(uielement)
         }
 
         this.Data.YOffset+=pageSize;
-        var showDataCount=this.Data.Data.length-this.Data.YOffset;
+        var showDataCount=dataCount-this.Data.YOffset;
 
         if (chart.SelectedModel==0)
         {
@@ -130128,13 +130175,14 @@ function JSReportChartContainer(uielement)
         var chart=this.ChartPaint[0];
         if (!chart) return false;
         var pageSize=chart.GetPageSize();
-        if (pageSize>this.Data.Data.length) return false;
+        var dataCount=chart.GetAllRowCount();
+        if (pageSize>dataCount) return false;
 
         if (this.Data.YOffset<=0) 
         {
             if (bCycle===true)
             {
-                this.Data.YOffset=this.Data.Data.length-pageSize;   //循环到最后一页
+                this.Data.YOffset=dataCount-pageSize;   //循环到最后一页
                 return true;
             }
             else
@@ -130572,7 +130620,16 @@ function JSReportChartContainer(uielement)
         if (column.Sort!=1 && column.Sort!=2) return false;
 
         var sortInfo={ Field:index, Sort:sortType };
-        if (sortInfo.Sort==0)   //不排序还原
+        if (this.Data.Virtual && this.Data.Virtual.Enable)
+        {
+            this.SortInfo.Field=sortInfo.Field;
+            this.SortInfo.Sort=sortInfo.Sort;
+            this.Data.YOffset=0;
+            this.ResetReportSelectStatus();
+            this.RequestVirtualStockData();   //虚拟表格
+            return true;
+        }
+        else if (sortInfo.Sort==0)   //不排序还原
         {
             this.Data.Data=[];
             if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
@@ -131298,6 +131355,70 @@ function JSReportChartContainer(uielement)
         if (bUpdate) this.Draw();
     }
 
+    //虚拟表格 请求序号 所有数据后台返回
+    this.RequestVirtualStockData=function()
+    {
+        var chart=this.ChartPaint[0];
+        if (!chart) return;
+
+        var self=this;
+        var startIndex=this.Data.YOffset;
+        var pageSize=chart.GetPageSize();
+        var endIndex=startIndex+pageSize;
+        var dataCount=chart.GetAllRowCount();
+        if (endIndex>=dataCount) endIndex=dataCount-1;
+
+        if (!this.NetworkFilter) return;
+
+        var requestData=
+        {
+            range:{ start:startIndex, end:endIndex, count:chart.GetAllRowCount() }, 
+            column:null, 
+            sort:0, symbol:this.Symbol, name:this.Name,
+            pageSize:pageSize
+        }
+
+        if (this.SortInfo && this.SortInfo.Field>=0 && this.SortInfo.Sort>0) //排序
+        {
+            var column=chart.Column[this.SortInfo.Field];
+            requestData.column={ name: column.Title, type: column.Type, index:this.SortInfo.Field, ID:column.ID };
+            requestData.sort=this.SortInfo.Sort;
+        }
+
+        var obj=
+        {
+            Name:'JSDealChartContainer::RequestVirtualStockData', //类名::函数名
+            Explain:'报价列表股票数据(虚拟表格)',
+            Request:
+            { 
+                Data: requestData
+            }, 
+            Self:this,
+            PreventDefault:false
+        };
+
+        if (chart.FixedRowCount>0 && chart.FixedRowData.Type==1)
+        {
+            var arySymbol=[];
+            for(var i=0;i<chart.FixedRowData.Symbol.length;++i)
+            {
+                var item=chart.FixedRowData.Symbol[i];
+                if (item) arySymbol.push(item);
+            }
+
+            obj.Request.FixedSymbol=arySymbol;
+        }
+
+        this.NetworkFilter(obj, function(data) 
+        { 
+            self.RecvStockSortData(data);
+            self.AutoUpdate();
+        });
+
+        if (obj.PreventDefault==true) return;  
+        
+    }
+
     //底部标签
     this.ShowPageInfo=function(bShow)
     {
@@ -131977,8 +132098,9 @@ function ChartReport()
     this.GetYScrollRange=function()
     {
         if (!IFrameSplitOperator.IsNonEmptyArray(this.Data.Data)) return 0;
+        var dataCount=this.GetAllRowCount();
 
-        var maxOffset=this.Data.Data.length-this.RowCount;
+        var maxOffset=dataCount-this.RowCount;
 
         return maxOffset;
     }
@@ -132554,6 +132676,14 @@ function ChartReport()
         this.Canvas.stroke();
     }
 
+    //获取一共多少行
+    this.GetAllRowCount=function()
+    {
+        var count=this.Data.Data.length;
+        if (this.Data.Virtual && this.Data.Virtual.Enable) count=this.Data.Virtual.Count;
+        return count;
+    }
+
     this.DrawBody=function()
     {
         if (!this.Data) return;
@@ -132593,7 +132723,8 @@ function ChartReport()
         var setSelected;
         if (this.MultiSelectModel==1) setSelected=new Set(this.MultiSelectedRow);
 
-        for(var i=this.Data.YOffset, j=0; i<this.Data.Data.length && j<this.RowCount ;++i, ++j)
+        var dataCount=this.GetAllRowCount();
+        for(var i=this.Data.YOffset, j=0; i<dataCount && j<this.RowCount ;++i, ++j)
         {
             var symbol=this.Data.Data[i];
 
@@ -144555,7 +144686,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13959";
+var HQCHART_VERSION="1.1.13964";
 
 function PrintHQChartVersion()
 {