hqchart 1.1.13682 → 1.1.13689

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

@@ -98091,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;
@@ -98143,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;
     }
 }
 
@@ -99049,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))
@@ -99142,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 };
@@ -112568,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,
@@ -112611,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,
@@ -114428,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,
@@ -114668,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);
@@ -114794,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);
@@ -114886,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();
@@ -114949,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)
@@ -115901,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':    //行情最新数据
@@ -116470,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)
@@ -117061,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 `成交额分档`; } }],
             
         ]
     );
@@ -137571,7 +137750,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13681";
+var HQCHART_VERSION="1.1.13688";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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

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

@@ -48734,6 +48734,14 @@ HQData.NetworkFilter=function(data, callback)
             HQData.RequestIndexVariantData(data,callback);
             break;
 
+        case "JSSymbolData::GetCustomFunctionData":                      //自定义函数数据下载
+            HQData.CustomFunction_RequestData(data,callback);
+            break;
+
+        case "JSSymbolData::GetCustomVariantData":                       //自定义函数数据下载
+            HQData.CustomVarData_RequestData(data,callback);
+            break;
+
         case "JSSymbolData::GetOtherSymbolData":
             //HQChart使用教程30-K线图如何对接第3方数据31-获取指定品种的K线数据
             HQData.RequestOtherSymbolData(data, callback);
@@ -48782,6 +48790,10 @@ HQData.NetworkFilter=function(data, callback)
             HQData.TradeDetail_RequestData(data,callback);
             break;
 
+        case "JSSymbolData::GetFinance":    //财务数据
+            HQData.Finance_RequestData(data,callback);
+            break;
+
         //////////////////////////////////////////////////////
         //报价列表数据
         case "JSReportChartContainer::RequestStockListData":
@@ -49111,6 +49123,7 @@ HQData.RequestMinuteRealtimeData=function(data,callback)
 
 HQData.RequestIndexVariantData=function(data,callback)
 {
+    data.PreventDefault=true;
     var varName=data.Request.Data.VariantName;  //变量名称
     if (varName=="FROMOPEN") 
     {
@@ -49120,6 +49133,102 @@ HQData.RequestIndexVariantData=function(data,callback)
         hqchartData.DataType=1;
         callback(hqchartData);
     }
+    else if (varName=="FGBLOCK")
+    {
+        var hqchartData={ DataType:1, Data:{Value:"融资融券 大盘股 MSCI成份 周期股 沪股通标的"} }; //返回所属风格板块.
+        callback(hqchartData);
+    }
+    else if (varName=="GNBLOCK")
+    {
+        var hqchartData={ DataType:1,  Data:{ Value:"含可转债 跨境支付CIPS"} }; //返回所属概念板块.
+        callback(hqchartData);
+    }
+    else if (varName=="HYBLOCK")
+    {
+        var hqchartData={ DataType:1,  Data:{Value:"全国性银行"}}; //返回品种所属行业.
+        callback(hqchartData);
+    }
+    else if (varName=="DYBLOCK")
+    {
+        var hqchartData={ DataType:1, Data:{Value:"上海板块"} }; //返回品种所属地域..
+        callback(hqchartData);
+    }
+    else if (varName=="CAPITAL")
+    {
+        var hqchartData={ DataType:1, Data:{ Value:29352177375 } }; // 当前流通股本,单位为手,债券1手为10张,其它为100
+        callback(hqchartData);
+    }
+    else if (varName=="LARGEINTRDVOL")
+    {
+        //测试数据
+        var kData=data.Self.Data;
+        var hqchartData={ DataType:2, Data:[] };
+        for(var i=0;i<kData.Data.length;++i)
+        {
+            var kItem=kData.Data[i];
+            hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol*0.15 });
+        }
+        callback(hqchartData);
+    }
+    else if (varName=="LARGEOUTTRDVOL")
+    {
+        //测试数据
+        var kData=data.Self.Data;
+        var hqchartData={ DataType:2, Data:[] };
+        for(var i=0;i<kData.Data.length;++i)
+        {
+            var kItem=kData.Data[i];
+            hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol*0.17 });
+        }
+        callback(hqchartData);
+    }
+
+}
+
+HQData.CustomFunction_RequestData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var funcName=data.Request.Data.FunctionName;
+    var hqchartData=null;
+
+    if (funcName=='L2_VOL')
+    {
+        var args=data.Request.Data.JobItem.Args;
+        var param=[ args[0].Value, args[1].Value ];
+
+        var hqchartData={ DataType:2, Data:[] };
+        var kData=data.Self.Data;
+        for(var i=0;i<kData.Data.length;++i)
+        {
+            var kItem=kData.Data[i];
+            hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Vol/3 });
+        }
+    }
+    
+    callback(hqchartData);
+}
+
+HQData.CustomVarData_RequestData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var varName=data.Request.Data.VariantName;
+    if (varName=="DCLOSE")
+    {
+        var hqchartData={ DataType:2, Data:[] };
+        var kData=data.Self.Data;
+        for(var i=0;i<kData.Data.length;++i)
+        {
+            var kItem=kData.Data[i];
+            hqchartData.Data.push({ Date:kItem.Date, Time:kItem.Time, Value:kItem.Close });
+        }
+
+        callback(hqchartData);
+    }
+    else
+    {
+        throw `${varName} 没有对接. [HQData.CustomVarData_RequestData]`
+    }
+
 
 }
 
@@ -49265,6 +49374,18 @@ HQData.RequestOverlayHistoryMinuteData=function(data, callback)
 }
 
 
+HQData.Finance_RequestData=function(data,callback)
+{
+    data.PreventDefault=true;
+    var id=data.Request.Data.id;
+    var hqchartData=null;
+    if (id==7)  // 流通股本(随时间可能有变化)
+        hqchartData=TEST_FINANCE_7.data;
+
+    if (hqchartData) callback(hqchartData);
+}
+
+
 //////////////////////////////////////////////////////////////////////////////////////
 // 报价列表
 //