hqchart 1.1.13490 → 1.1.13497

package/src/jscommon/umychart.testdata.js

@@ -85,6 +85,22 @@ HQData.NetworkFilter=function(data, callback)
         case "TradeDetail::RequestData":
             HQData.TradeDetail_RequestData(data,callback);
             break;
+
+        //////////////////////////////////////////////////////
+        //报价列表数据
+        case "JSReportChartContainer::RequestStockListData":
+            HQData.Report_RequestStockListData(data, callback);          //码表
+            break;
+
+        case "JSReportChartContainer::RequestMemberListData":           //板块成分
+            HQData.Report_RequestMemberListDat(data, callback);
+            break;
+        case "JSDealChartContainer::RequestStockData":                  //股票数据更新
+            HQData.Report_RequestStockData(data, callback);
+            break;
+        case "JSDealChartContainer::RequestStockSortData":              //股票排序数据
+            HQData.Report_RequestStockSortData(data, callback);
+            break;
     }
 }
 
@@ -495,3 +511,284 @@ HQData.RequestOverlayHistoryMinuteData=function(data, callback)
 }
 
 
+//////////////////////////////////////////////////////////////////////////////////////
+// 报价列表
+//
+//
+/////////////////////////////////////////////////////////////////////////////////////
+
+//码表
+HQData.Report_RequestStockListData=function(data, callback)
+{
+    data.PreventDefault=true;
+
+    var hqchartData={ data:[] };
+    
+    if (IFrameSplitOperator.IsNonEmptyArray(SHSZ_STOCK_LIST_TEST_DATA.symbol))
+    {
+        //0=证券代码 1=股票名称
+        for(var i=0;i<SHSZ_STOCK_LIST_TEST_DATA.symbol.length;++i)
+        {
+            var symbol=SHSZ_STOCK_LIST_TEST_DATA.symbol[i];
+            var name=SHSZ_STOCK_LIST_TEST_DATA.name[i];
+
+            hqchartData.data.push([symbol,name]);
+        }
+    }
+
+    console.log("[HQData.Report_RequestStockListData] hqchartData",hqchartData);
+    callback(hqchartData);
+
+}
+
+//板块|行业等成分列表
+HQData.Report_RequestMemberListDat=function(data, callback)
+{
+    var symbol=data.Request.Data.symbol;    //板块代码
+    data.PreventDefault=true;
+
+    var hqchartData= { symbol:symbol , name:symbol, data:[] , code:0 };
+    var testDataCount=SHSZ_STOCK_LIST_TEST_DATA.symbol.length;
+    var testIndex=Math.round(Math.random()*(testDataCount-100));
+    var count=parseInt(Math.random()*(200)+100); ;
+
+    for(var i=testIndex, j=0; i<SHSZ_STOCK_LIST_TEST_DATA.symbol.length && j<count; ++i, ++j)
+    {
+        hqchartData.data.push(SHSZ_STOCK_LIST_TEST_DATA.symbol[i]);
+    }
+
+    callback(hqchartData);
+}
+
+HQData.Report_RequestStockData=function(data, callback)
+{
+    var stocks=data.Request.Data.stocks;    //股票列表
+    data.PreventDefault=true;
+
+    var mapStock=new Map();
+    for(var i=0;i<stocks.length;++i)
+    {
+        var item=stocks[i];
+        mapStock.set(item.Symbol,{ Symbol:item.Symbol, Data:null });
+    }
+
+    if (IFrameSplitOperator.IsNonEmptyArray(SHSZ_STOCK_LIST_TEST_DATA.symbol))
+    {
+        for(var i=0;i<SHSZ_STOCK_LIST_TEST_DATA.symbol.length;++i)
+        {
+            var symbol=SHSZ_STOCK_LIST_TEST_DATA.symbol[i];
+            if (!mapStock.has(symbol)) continue;
+            var item=mapStock.get(symbol);
+            var name=SHSZ_STOCK_LIST_TEST_DATA.name[i];
+            var price=SHSZ_STOCK_LIST_TEST_DATA.close[i];
+            var vol=SHSZ_STOCK_LIST_TEST_DATA.vol[i];
+            var newItem=
+            [
+                symbol, 
+                name, 
+                SHSZ_STOCK_LIST_TEST_DATA.yclose[i],
+                SHSZ_STOCK_LIST_TEST_DATA.open[i],
+                SHSZ_STOCK_LIST_TEST_DATA.high[i],
+                SHSZ_STOCK_LIST_TEST_DATA.low[i],
+                price,
+                vol,
+                SHSZ_STOCK_LIST_TEST_DATA.amount[i],
+            ];
+
+            //买价 量
+            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;
+             
+
+            item.Data=newItem;
+        }
+    }
+
+    var hqchartData={  data:[], code:0 };
+
+    for(var mapItem of mapStock)
+    {
+        var item=mapItem[1];
+        if (!item.Data) continue;
+
+        hqchartData.data.push(item.Data);
+    }
+
+    callback(hqchartData);
+}
+
+HQData.Report_RequestStockSortData=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 aryData=data.Self.Data.Data.slice(); //所有的股票
+    var mapStock=new Map();
+    var count=end-start+1;
+    for(var i = 0; i < count; i++)
+    {
+        var index = Math.floor(Math.random()*(aryData.length-1));
+        var symbol =  aryData[index];
+        mapStock.set(symbol, { Symbol:symbol, Index:i+start, Data:null });
+        aryData.splice(index, 1);
+    }
+
+    if (IFrameSplitOperator.IsNonEmptyArray(SHSZ_STOCK_LIST_TEST_DATA.symbol))
+    {
+        for(var i=0;i<SHSZ_STOCK_LIST_TEST_DATA.symbol.length;++i)
+        {
+            var symbol=SHSZ_STOCK_LIST_TEST_DATA.symbol[i];
+            if (!mapStock.has(symbol)) continue;
+            var item=mapStock.get(symbol);
+            var name=SHSZ_STOCK_LIST_TEST_DATA.name[i];
+            var price=SHSZ_STOCK_LIST_TEST_DATA.close[i];
+            var vol=SHSZ_STOCK_LIST_TEST_DATA.vol[i];
+            var newItem=
+            [
+                symbol, 
+                name, 
+                SHSZ_STOCK_LIST_TEST_DATA.yclose[i],
+                SHSZ_STOCK_LIST_TEST_DATA.open[i],
+                SHSZ_STOCK_LIST_TEST_DATA.high[i],
+                SHSZ_STOCK_LIST_TEST_DATA.low[i],
+                price,
+                vol,
+                SHSZ_STOCK_LIST_TEST_DATA.amount[i],
+            ];
+
+            //买价 量
+            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;
+                
+
+            item.Data=newItem;
+        }
+    }
+
+    var hqchartData={ data:[], index:[], filedindex:column.index, sort:sortType, symbol:blockID };
+
+    for(var mapItem of mapStock)
+    {
+        var item=mapItem[1];
+        if (!item.Data) continue;
+
+        hqchartData.data.push(item.Data);
+        hqchartData.index.push(item.Index);
+    }
+    
+    callback(hqchartData);
+}
+
+

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

@@ -6678,6 +6678,9 @@ var JSCHART_MENU_ID=
     CMD_CHANGE_LANGUAGE_ID:37,          //语言切换
 
     CMD_CHANGE_DRAG_RECT_SHOW_MODE_ID:38,
+
+
+    CMD_REPORT_CHANGE_BLOCK_ID:60,      //报价列表 切换板块ID
 }
 
 
@@ -125088,13 +125091,23 @@ function JSReportChart(divElement)
         this.JSChartContainer=chart;
         this.DivElement.JSChart=this;   //div中保存一份
 
+        if (option.EnablePopMenuV2===true) chart.InitalPopMenu();
+
         if (option.Symbol) chart.Symbol=option.Symbol;
         if (option.Name) chart.Name=option.Name;
 
         var requestOption={ Callback:null };
         if (chart.Symbol) requestOption.Callback=function(){ chart.RequestMemberListData(); };
-
-        chart.RequestStockListData(requestOption);   //下载码表     
+        
+        if (option.LoadStockList===false)
+        {
+           chart.ChartSplashPaint.IsEnableSplash=false;
+           chart.Draw();
+        }
+        else
+        {
+            chart.RequestStockListData(requestOption);   //下载码表     
+        }
     }
 
     this.CreateJSReportChartContainer=function(option)
@@ -125362,6 +125375,8 @@ function JSReportChartContainer(uielement)
 
     this.IsDestroy=false;        //是否已经销毁了
 
+    this.JSPopMenu;             //内置菜单
+
     this.ChartDestory=function()    //销毁
     {
         this.IsDestroy=true;
@@ -125379,6 +125394,14 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    this.InitalPopMenu=function()   //初始化弹出窗口
+    {
+        if (this.JSPopMenu) return;
+
+        this.JSPopMenu=new JSPopMenu();     //内置菜单
+        this.JSPopMenu.Inital();
+    }
+
     this.AutoScrollPage=function(step)
     {
         this.AutoDragScrollTimer=setTimeout(() =>
@@ -125822,7 +125845,7 @@ function JSReportChartContainer(uielement)
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
         }
 
-        throw { Name:'JSReportChartContainer::RequestMemberListData', Error:'(板块成分数据)不提供内置测试数据' };
+        //throw { Name:'JSReportChartContainer::RequestMemberListData', Error:'(板块成分数据)不提供内置测试数据' };
     }
 
     this.RecvMemberListData=function(recvData)
@@ -125887,7 +125910,7 @@ function JSReportChartContainer(uielement)
             if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
         }
 
-        throw { Name:'JSReportChartContainer::RequestStockListData', Error:'(码表数据)不提供内置测试数据' };
+        //throw { Name:'JSReportChartContainer::RequestStockListData', Error:'(码表数据)不提供内置测试数据' };
     }
 
     this.RecvStockListData=function(data, option)
@@ -126101,7 +126124,7 @@ function JSReportChartContainer(uielement)
             if (obj.PreventDefault==true) return;  
         }
 
-        throw { Name:'JSReportChartContainer::RequestStockData', Error:'(报价列表股票数据)不提供内置测试数据' };
+        //throw { Name:'JSReportChartContainer::RequestStockData', Error:'(报价列表股票数据)不提供内置测试数据' };
     }
 
     this.RecvStockData=function(data)
@@ -127701,6 +127724,52 @@ function JSReportChartContainer(uielement)
         }
     }
 
+    this.GetTabPopMenu=function(tabItem)
+    {
+        var aryMenu=[ ];
+
+        if (IFrameSplitOperator.IsNonEmptyArray(tabItem.ArySubMenu))
+        {
+            for(var i=0;i<tabItem.ArySubMenu.length;++i)
+            {
+                var item=tabItem.ArySubMenu[i];
+                var menuItem={ Name:item.Title, Data:{ ID:item.CommandID, Args:[item.ID]} };
+
+                aryMenu.push(menuItem);
+            }
+        }
+
+
+        return aryMenu;
+    }
+
+    this.PopupTabMenu=function(menuData, tab, e)
+    {
+        if (!this.JSPopMenu) return;
+
+        var rtTab=tab.Rect;
+        var pixelRatio=GetDevicePixelRatio();
+        var rtCell={ Left:rtTab.Left/pixelRatio, Right:rtTab.Right/pixelRatio, Bottom:rtTab.Bottom/pixelRatio, Top:rtTab.Top/pixelRatio };
+        rtCell.Width=rtCell.Right-rtCell.Left;
+        rtCell.Height=rtCell.Bottom-rtCell.Top;
+
+        var rtClient=this.UIElement.getBoundingClientRect();
+        var rtScroll=GetScrollPosition();
+
+        var offsetLeft=rtClient.left+rtScroll.Left;
+        var offsetTop=rtClient.top+rtScroll.Top;
+        rtCell.Left+=offsetLeft;
+        rtCell.Right+=offsetLeft;
+        rtCell.Top+=offsetTop;
+        rtCell.Bottom+=offsetTop;
+
+        this.JSPopMenu.CreatePopMenu(menuData);
+        this.JSPopMenu.PopupMenuByTab(rtCell);
+
+        if(e.preventDefault) e.preventDefault();
+        if(e.stopPropagation) e.stopPropagation();
+    }
+
     //点击标签
     this.OnClickTab=function(tabData, e)
     {
@@ -127714,36 +127783,80 @@ function JSReportChartContainer(uielement)
 
         if (tabData.Tab.IsMenu)
         {
+            var menuData={ Menu:this.GetTabPopMenu(tabData.Tab), Position:JSPopMenu.POSITION_ID.TAB_MENU_ID };
+            menuData.ClickCallback=(data)=>{ this.OnClickTabPopMenu(tabData, data); }
+
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_REPORT_TABMENU);
             if (event && event.Callback)
             {
-                redraw=true;
-                var rtItem=tabData.Rect;
-                var rtDOM={ Left: rtItem.Left/pixelTatio, Right:rtItem.Right/pixelTatio, Top:rtItem.Top/pixelTatio, Bottom:rtItem.Bottom/pixelTatio };
-
-                var sendData={ Data:tabData, IsSide:{X:x, Y:x}, UIElement:uiElement, Rect:rtDOM, e:e , Redraw:redraw };
+                var sendData={ MenuData:menuData, Tab:tabData, PreventDefault:false, e:e };
                 event.Callback(event, sendData, this);
-                if (IFrameSplitOperator.IsBool(sendData.Redraw)) redraw=sendData.Redraw;
+                if (sendData.PreventDefault==true) return;
             }
 
-            this.SetSelectedTab(tabData.Index); //选中tab
+            this.PopupTabMenu(menuData, tabData.Tab, e);
         }
         else
         {
             var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_REPORT_TAB);
             if (event && event.Callback)
             {
-                var sendData={ Data:tabData, IsSide:{X:x, Y:x}, UIElement:uiElement, e:e , Redraw:redraw };
+                var sendData={ Data:tabData, IsSide:{X:x, Y:x}, UIElement:uiElement, e:e , Redraw:redraw, PreventDefault:false };
                 event.Callback(event, sendData, this);
                 if (IFrameSplitOperator.IsBool(sendData.Redraw)) redraw=sendData.Redraw;
+                if (sendData.PreventDefault==true) return;
             }
 
-            this.SetSelectedTab(tabData.Index);
+            if (tabData.Tab.CommandID==JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID)
+            {
+                this.ExecuteMenuCommand(tabData.Tab.CommandID,  [tabData.Tab.ID]);
+                this.SetSelectedTab(tabData.Index);
+            }
         }
 
         if (redraw) this.Draw();
     }
 
+    this.OnClickTabPopMenu=function(tabData, data)
+    {
+        JSConsole.Chart.Log('[JSReportChartContainer::OnClickTabPopMenu] ',tabData, data);
+
+        var cmdID=data.Data.ID;     //命令ID
+        var aryArgs=data.Data.Args; //参数
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_MENU_COMMAND);  //回调通知外部
+        if (event && event.Callback)
+        {
+            var data={ PreventDefault:false, CommandID:cmdID, Args:aryArgs, SrcData:data, TabData:tabData };
+            event.Callback(event,data,this);
+            if (data.PreventDefault) return;
+        }
+
+        this.ExecuteMenuCommand(cmdID,aryArgs);
+        
+        this.SetSelectedTab(tabData.Index);
+        this.Draw();
+    }
+
+    this.ExecuteMenuCommand=function(cmdID, aryArgs)
+    {
+        JSConsole.Chart.Log('[JSReportChartContainer::ExecuteMenuCommand] cmdID=, aryArgs=', cmdID,aryArgs);
+
+        var param=null, srcParam=null;  //原始值
+        if (IFrameSplitOperator.IsNonEmptyArray(aryArgs))
+        {
+            srcParam=aryArgs[0];
+            if (IFrameSplitOperator.IsNumber(aryArgs[0])) param=aryArgs[0];
+        }
+
+        switch(cmdID)
+        {
+            case JSCHART_MENU_ID.CMD_REPORT_CHANGE_BLOCK_ID:
+                if (srcParam) this.ChangeSymbol(param);
+                break;
+        }
+    }
+
     this.SwapColumn=function(leftIndex, rightIndex, option)
     {
         var reportChart=this.GetReportChart();
@@ -128022,7 +128135,7 @@ function JSReportChartContainer(uielement)
             if (obj.PreventDefault==true) return;  
         }
 
-        throw { Name:'JSReportChartContainer::RequestStockSortData', Error:'(报价列表股票排序数据)不提供内置测试数据' };
+        //throw { Name:'JSReportChartContainer::RequestStockSortData', Error:'(报价列表股票排序数据)不提供内置测试数据' };
     }
 
     this.RecvStockSortData=function(data)
@@ -130819,7 +130932,7 @@ function ChartReportTab()
     this.IsShow=true;                   //是否显示
 
     //Tab
-    this.TabList=[];                //{ Title:标题, ID:, IsMenu: 是否菜单 }
+    this.TabList=[];                //{ Title:标题, ID:, IsMenu: 是否菜单, ArySubMenu:[ { Title:, ID: }] }
     this.SelectedTabIndex=-1;
     this.MoveOnTabIndex=-1;
     
@@ -130888,7 +131001,7 @@ function ChartReportTab()
 
             var tabItem={ Title:item.Title, IsMenu:false, FixedSymbol:[], FixedRowCount:0 };
             if (item.ID) tabItem.ID=item.ID;
-            if (item.MenuID) tabItem.MenuID=item.MenuID;
+            if (item.CommandID) tabItem.CommandID=item.CommandID;
             if (IFrameSplitOperator.IsBool(item.IsMenu)) tabItem.IsMenu=item.IsMenu;
             if (IFrameSplitOperator.IsNonEmptyArray(item.FixedSymbol))
             {
@@ -130900,6 +131013,10 @@ function ChartReportTab()
                     ++tabItem.FixedRowCount;
                 }
             }
+
+            if (IFrameSplitOperator.IsNonEmptyArray(item.ArySubMenu))
+                tabItem.ArySubMenu=item.ArySubMenu.slice();
+            
             this.TabList.push(tabItem);
         }
     }
@@ -134409,7 +134526,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13489";
+var HQCHART_VERSION="1.1.13496";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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