hqchart 1.1.13963 → 1.1.13969

package/src/jscommon/umychart.report.js

@@ -203,6 +203,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)
         {
@@ -417,7 +423,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();                        //原始股票数据
@@ -786,6 +792,7 @@ function JSReportChartContainer(uielement)
     {
         this.SourceData.Data=[];
         this.Data.Data=[];
+        this.Data.Virtual.Count=0;
         this.BlockData=new Map(); 
     }
 
@@ -1042,6 +1049,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();
     }
@@ -1267,6 +1280,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];
@@ -2622,8 +2641,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)
             {
@@ -2637,7 +2657,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)
         {
@@ -2653,13 +2673,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
@@ -3097,7 +3118,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))
@@ -3815,6 +3845,12 @@ function JSReportChartContainer(uielement)
             }
         }
 
+        if (data.Virtual)
+        {
+            var item=data.Virtual;
+            if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
+        }
+
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
@@ -3823,6 +3859,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)
     {
@@ -4502,8 +4602,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;
     }
@@ -5079,6 +5180,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;
@@ -5118,7 +5227,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];
 

package/src/jscommon/umychart.testdata.js

@@ -170,6 +170,10 @@ HQData.NetworkFilter=function(data, callback)
             //HQChart使用教程95-报价列表对接第3方数据4-股票排序数据
             HQData.Report_RequestStockSortData(data, callback);
             break;
+        case "JSDealChartContainer::RequestVirtualStockData":
+            HQData.Report_RequestVirtualStockData(data, callback);         //股票数据 虚拟表格
+            break;
+
     }
 }
 
@@ -1040,6 +1044,30 @@ HQData.Report_RequestStockListData=function(data, callback)
 
 }
 
+//空码表
+HQData.Report_RequestStockListData_Empty=function(data, callback)          
+{
+    data.PreventDefault=true;
+    var hqchartData={ data:[] };
+    console.log("[HQData.Report_RequestStockListData_EMPTY] hqchartData",hqchartData);
+    callback(hqchartData);
+}
+
+HQData.Report_RequestMemberVirtualListData=function(data, callback, option)
+{
+    var symbol=data.Request.Data.symbol;    //板块代码
+    data.PreventDefault=true;
+
+    var hqchartData= { symbol:symbol , name:symbol, data:[] , code:0, Virtual:{ Count:option.Virtual.Count } };
+
+    for(var i=0; i<SHSZ_STOCK_LIST_TEST_DATA.symbol.length && i<50; ++i )
+    {
+        hqchartData.data.push(SHSZ_STOCK_LIST_TEST_DATA.symbol[i]);
+    }
+
+    callback(hqchartData);
+}
+
 //板块|行业等成分列表
 HQData.Report_RequestMemberListDat=function(data, callback)
 {
@@ -1305,6 +1333,119 @@ HQData.Report_RequestStockSortData=function(data, callback)
 }
 
 
+HQData.Report_RequestVirtualStockData=function(data, callback)
+{
+    var blockID=data.Request.Data.symbol;       //板块代码
+    var range=data.Request.Data.range;          //排序范围
+    var column=data.Request.Data.column;        //排序列信息
+    var sortType=data.Request.Data.sort;        //排序方向
+    var pageSize=data.Request.Data.pageSize;
+    data.PreventDefault=true;
+
+    var start=range.start;
+    var end=range.end;
+    if (start>0) start-=pageSize;
+    if (start<0) start=0;
+    end+=pageSize;
+
+    var count=end-start+1;
+    
+    var aryData=[];
+    var aryIndex=[];
+
+    if (IFrameSplitOperator.IsNonEmptyArray(SHSZ_STOCK_LIST_TEST_DATA.symbol))
+    {
+        var randomStart = Math.floor(Math.random()*(SHSZ_STOCK_LIST_TEST_DATA.symbol.length-1));
+        var symbolCount=SHSZ_STOCK_LIST_TEST_DATA.symbol.length;
+        for(var i=0;i<count;++i)
+        {
+            var dataIndex=(randomStart+i)%symbolCount;
+            var symbol=SHSZ_STOCK_LIST_TEST_DATA.symbol[dataIndex];
+            var name=SHSZ_STOCK_LIST_TEST_DATA.name[dataIndex];
+            var price=SHSZ_STOCK_LIST_TEST_DATA.close[dataIndex];
+            var vol=SHSZ_STOCK_LIST_TEST_DATA.vol[dataIndex];
+            var newItem=
+            [
+                symbol, 
+                name, 
+                SHSZ_STOCK_LIST_TEST_DATA.yclose[dataIndex],
+                SHSZ_STOCK_LIST_TEST_DATA.open[dataIndex],
+                SHSZ_STOCK_LIST_TEST_DATA.high[dataIndex],
+                SHSZ_STOCK_LIST_TEST_DATA.low[dataIndex],
+                price,
+                vol,
+                SHSZ_STOCK_LIST_TEST_DATA.amount[dataIndex],
+            ];
+
+            //买价 量
+            newItem[9]=price+0.05;
+            newItem[10]=10;
+
+            //卖价 量
+            newItem[11]=price-0.06;
+            newItem[12]=5;
+
+            //均价
+            newItem[13]=price-0.03;   
+            
+            //内盘
+            newItem[18]=vol/4;  
+            //外盘 
+            newItem[19]=vol/5;  
+
+            newItem[14]=vol*1.5;   //流通股本
+            newItem[15]=vol*1.8;  //总股本
+
+            //换手率
+            newItem[23]=(Math.round(Math.random()*60))/100;
+
+            //名字字段
+            var symbolEx={ Text:name };
+            if (i%20==5)
+                symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}, { Text:'\ue627', Color:'#1c65db'} ] };
+            else if (i%20==9)
+                symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue629', Color:'rgb(255,165,0)'}] } ;
+            else if (i%20==18)
+                symbolEx.Symbol={ Family:'iconfont', Size:16,  Data:[ { Text:'\ue627', Color:'#1c65db'}] } ;
+
+            newItem[27]=symbolEx;
+
+
+            //扩展数据 (定制数据)
+            var extendData=[];
+            newItem[30]=extendData;
+
+            //行业
+            extendData[0]="行业X";
+            //地区
+            extendData[1]="地区X";
+            
+            //PE|PB
+            extendData[2]=(Math.round(Math.random()*60))/100;
+            extendData[3]=(Math.round(Math.random()*60))/100;
+            extendData[4]=(Math.round(Math.random()*60))/100;
+            extendData[5]=(Math.round(Math.random()*60))/100;
+
+            
+            //周涨幅
+            extendData[6]=(Math.round(Math.random()*60))/100;
+            extendData[7]=(Math.round(Math.random()*60))/100;
+            extendData[8]=(Math.round(Math.random()*60))/100;
+
+
+            aryData.push(newItem);
+            aryIndex.push(start+i);
+        }
+    }
+
+    var hqchartData={ data:aryData, index:aryIndex, filedindex:-1, sort:sortType, symbol:blockID };
+
+    if (column)  hqchartData.filedindex=column.index;
+
+    callback(hqchartData);
+}
+
+
 
 HQData.Keyboard_RequestSymbolList=function(data, callback)
 {

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

@@ -48553,8 +48553,36 @@ function RectSelectPaint()
         return null;
     }
 
+    this.GetSelectRectDataByOnePoint=function()
+    {
+        if (!this.FirstPoint) return null;
+
+        var data=this.GetKData();
+        if (!data) return null;
+        var isMinuteChart=this.IsMinuteChart();
+        var firstDate=this.DateToNumber(this.FirstPoint,isMinuteChart);
+        var selectData={ Start:null, End:null, Data:data };
+        for(var i=0;i<data.Data.length;++i)
+        {
+            var item=data.Data[i];
+            if (!item) continue;
+            var value=this.DateToNumber(item,isMinuteChart);
+
+            if (firstDate==value) 
+            {
+                selectData.Start=i;
+                selectData.End=i;
+                return selectData;
+            }
+        }
+
+        return null;
+    }
+
     this.GetSelectRectData=function()
     {
+        if (this.IsOnlyOnePoint) return this.GetSelectRectDataByOnePoint();
+
         if (!this.FirstPoint || !this.SecondPoint) return null;
         
         var data=this.GetKData();
@@ -127661,6 +127689,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)
         {
@@ -127875,7 +127909,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();                        //原始股票数据
@@ -128244,6 +128278,7 @@ function JSReportChartContainer(uielement)
     {
         this.SourceData.Data=[];
         this.Data.Data=[];
+        this.Data.Virtual.Count=0;
         this.BlockData=new Map(); 
     }
 
@@ -128500,6 +128535,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();
     }
@@ -128725,6 +128766,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];
@@ -130080,8 +130127,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)
             {
@@ -130095,7 +130143,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)
         {
@@ -130111,13 +130159,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
@@ -130555,7 +130604,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))
@@ -131273,6 +131331,12 @@ function JSReportChartContainer(uielement)
             }
         }
 
+        if (data.Virtual)
+        {
+            var item=data.Virtual;
+            if (IFrameSplitOperator.IsNumber(item.Count)) this.Data.Virtual.Count=item.Count;
+        }
+
         var chart=this.ChartPaint[0];
         if (!chart) return;
 
@@ -131281,6 +131345,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)
     {
@@ -131960,8 +132088,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;
     }
@@ -132537,6 +132666,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;
@@ -132576,7 +132713,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];
 
@@ -139177,7 +139315,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13962";
+var HQCHART_VERSION="1.1.13968";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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