hqchart 1.1.15343 → 1.1.15349

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "hqchart",
-  "version": "1.1.15343",
+  "version": "1.1.15349",
   "description": "HQChart - H5, 微信小程序 沪深/港股/数字货币/期货/美股 K线图(kline),走势图,缩放,拖拽,十字光标,画图工具,截图,筹码图. 分析家语法,通达信语法,(麦语法),第3方数据对接",
   "main": "lib/main.js",
   "scripts": {

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -55672,6 +55672,10 @@ HQData.NetworkFilter=function(data, callback)
             HQData.INDEX_RequestData(data,callback);
             break;
 
+        case "JSSymbolData::GetIndustryData":
+            HQData.INDUSTRY_RequestData(data,callback);
+            break;
+
         case 'JSSymbolData::GetSymbolData':   
             //HQChart使用教程30-K线图如何对接第3方数据38-通达信指标K线数据
             HQData.RequestSymbolData(data,callback);        //计算指标需要的K线数据
@@ -57324,6 +57328,30 @@ HQData.INDEX_RequestData=function(data,callback)
     callback(hqchartData);
 }
 
+HQData.INDUSTRY_RequestData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var period=data.Period;
+    var symbol=data.Request.Data.symbol;
+    var indexSymbol="399001.sz";
+    var dateRange=data.Request.Data.dateRange;
+    var aryData=[];
+    if (ChartData.IsMinutePeriod(period, true))
+    {
+        var fullData=HQData.GetM1KLineDataBySymbol(symbol);
+        if (fullData) aryData=HQData.GetKLineDataByDateTime(fullData, dateRange.Start.Date, dateRange.Start.Time, dateRange.End.Date, dateRange.End.Time);
+    }
+    else if (ChartData.IsDayPeriod(period,true))
+    {
+        var fullData=HQData.GetDayKLineDataBySymbol(indexSymbol);
+        if (fullData) aryData=HQData.GetKLineDataByDate(fullData, dateRange.Start.Date, dateRange.End.Date);
+    }
+
+    var hqchartData={ name:indexSymbol, symbol:indexSymbol, data:aryData, ver:2.0 };
+
+    callback(hqchartData);
+}
+
 HQData.RequestSymbolData=function(data,callback)
 {
     data.PreventDefault=true;
@@ -59003,6 +59031,7 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
             //{Date:20190916, Time: Value:15.5, Value2:0 },
         ],
         //Width:10
+        AdWidth:{ Type:1, Value:0.8 }
     };
 
     var point2=
@@ -59016,6 +59045,7 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
             //{Date:20190916, Time: Value:15.5, Value2:0 },
         ],
         //Width:10
+        AdWidth:{ Type:1, Value:0.5 }
     };
 
     for(var i=0;i<kData.Data.length;++i)
@@ -59342,6 +59372,8 @@ HQData.APIIndex_SCATTER_PLOT_V2=function(data, callback)
             };
         }
 
+        //if ((i%6)==2) item.Radius2=20;
+
 
         item.Tooltip=
         [
@@ -59404,6 +59436,7 @@ HQData.APIIndex_KLINE_TABLE=function(data, callback)
         { Name:"账户4", DayCount:8, OperatorID:0 },
     ]
     
+    
     for(var i=0;i<kData.Data.length;++i)   
     {
         var kItem=kData.Data[i];
@@ -59464,6 +59497,7 @@ HQData.APIIndex_KLINE_TABLE=function(data, callback)
 
         tableData.Draw.DrawData.push(colItem);
     }
+    
 
     var apiData=
     {

package/src/jscommon/umychart.complier.js

@@ -1212,6 +1212,7 @@ var Syntax = {
 function Node(ErrorHandler)
 {
     this.IsNeedIndexData=false;         //是否需要大盘数据
+    this.IsNeedIndustryData=false;      //行业数据下载
     this.IsNeedLatestIndexData=false;   //是否需要下载最新大盘数据
     this.IsNeedSymbolData=false;        //是否需要下载股票数据
     this.IsNeedMarginData=new Set();
@@ -1239,6 +1240,7 @@ function Node(ErrorHandler)
         if (this.IsNeedSymbolData) jobs.push({ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_SYMBOL_DATA});
         if (this.IsNeedIndexData) jobs.push({ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_INDEX_DATA});
         if (this.IsNeedLatestIndexData) jobs.push({ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_LATEST_INDEX_DATA});
+        if (this.IsNeedIndustryData) jobs.push({ID:JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_INDUSTRY_DATA});
 
         //最新的个股行情数据
         for(var i=0;i<this.Dynainfo.length;++i)
@@ -1325,6 +1327,13 @@ function Node(ErrorHandler)
             return;
         }
 
+        let setIndustryName=new Set(['HY_INDEXA','HY_INDEXC','HY_INDEXH','HY_INDEXL',"HY_INDEXO","HY_INDEXV",'HY_INDEXADV','HY_INDEXDEC']);
+        if (setIndustryName.has(varName)) 
+        {
+            this.IsNeedIndustryData=true;
+            return;
+        }
+
         let setSymbolDataName=new Set(['CLOSE','C','VOL','V','OPEN','O','HIGH','H','LOW','L','AMOUNT','AMO','VOLINSTK']);
         if (setSymbolDataName.has(varName)) 
         {
@@ -12133,6 +12142,7 @@ function JSSymbolData(ast,option,jsExecute)
 
     this.LatestData=new Map();  //最新行情 key=id value=数据
     this.IndexData;             //大盘指数
+    this.IndustryData;          //行业数据
     this.LatestIndexData;       //最新大盘数据
     this.MarginData=new Map();  //融资融券
     this.HKToSHSZData=new Map();    //北上资金
@@ -12525,168 +12535,130 @@ function JSSymbolData(ast,option,jsExecute)
     this.GetIndexData=function()
     {
         if (this.IndexData) return this.Execute.RunNextJob();
+        if (!this.NetworkFilter) return this.Execute.RunNextJob();
 
-        var self=this;
-        if (ChartData.IsDayPeriod(this.Period,true))     //请求日线数据 9=季线
+        var dateRange=this.Data.GetDateRange();
+        var period=this.Period;
+        var obj=
         {
-            if (this.NetworkFilter)
-            {
-                var dateRange=this.Data.GetDateRange();
-                var obj=
-                {
-                    Name:'JSSymbolData::GetIndexData', //类名::
-                    Explain:'大盘数据',
-                    Period:self.Period,
-                    Request:
-                    { 
-                        Url:self.KLineApiUrl,  Type:'POST' ,
-                        Data: 
-                        { 
-                            field:[ "name", "symbol","yclose","open","price","high","low","vol",'up','down','stop','unchanged'],
-                            indexSymbol:"000001.sh", symbol: this.Symbol, period:this.Period,
-                            dateRange:dateRange 
-                        } 
-                    },
-                    Self:this,
-                    PreventDefault:false
-                };
-                this.NetworkFilter(obj, function(data) 
+            Name:'JSSymbolData::GetIndexData', //类名::
+            Explain:'大盘数据',
+            Period:period,
+            Request:
+            { 
+                Type:'POST' ,
+                Data: 
                 { 
-                    self.RecvIndexHistroyData(data);
-                    self.Execute.RunNextJob();
-                });
+                    field:[ "name", "symbol","yclose","open","price","high","low","vol",'up','down','stop','unchanged'],
+                    indexSymbol:"000001.sh", symbol: this.Symbol, period:period,
+                    dateRange:dateRange 
+                } 
+            },
+            Self:this,
+            PreventDefault:false
+        };
 
-                if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
-            }
+        this.NetworkFilter(obj, (data)=>
+        { 
+            JSConsole.Complier.Log('[JSSymbolData::GetIndexData] recv data' , data);
 
-            JSNetwork.HttpRequest({
-                url: self.KLineApiUrl,
-                data:
-                {
-                    "field": [ "name", "symbol","yclose","open","price","high","low","vol",'up','down','stop','unchanged'],
-                    "symbol": '000001.sh',
-                    "start": -1,
-                    "count": self.MaxRequestDataCount+500   //多请求2年的数据 确保股票剔除停牌日期以后可以对上
-                },
-                type:"post",
-                dataType: "json",
-                async:true, 
-                success: function (recvData)
-                {
-                    self.RecvIndexHistroyData(recvData);
-                    self.Execute.RunNextJob();
-                },
-                error: function(request)
+            this.IndexData=this.APIKDataToChartData(data, period);
+            this.Execute.RunNextJob();
+        });
+
+    }
+
+
+    this.APIKDataToChartData=function(data, period)
+    {
+        var result=null;
+        if (ChartData.IsDayPeriod(period,true))     //请求日线数据
+        {
+            var hisData=this.JsonDataToHistoryData(data);
+            result=new ChartData();
+            result.DataType=0; /*日线数据 */
+            result.Data=hisData;
+
+            if (this.IsApiPeriod==true)
+            {
+                result.Period=period;
+                result.Data=this.Data.FixKData(hisData,period);
+            }
+            else
+            {
+                var aryOverlayData=this.SourceData.GetOverlayData(result.Data);      //和主图数据拟合以后的数据
+                result.Data=aryOverlayData;
+        
+                if (ChartData.IsDayPeriod(period,false))   //周期数据
                 {
-                    self.RecvError(request);
+                    var periodData=result.GetPeriodData(period);
+                    result.Data=periodData;
                 }
-            });
+            }
         }
-        else  if (ChartData.IsMinutePeriod(this.Period, true))          //请求分钟数据
+        else if (ChartData.IsMinutePeriod(period, true))
         {
-            if (this.NetworkFilter)
-            {
-                var dateRange=this.Data.GetDateRange();
-                var obj=
-                {
-                    Name:'JSSymbolData::GetIndexData', //类名::
-                    Explain:'大盘数据',
-                    Period:self.Period,
-                    Request:{ Url:self.MinuteKLineApiUrl,  Type:'POST' ,
-                        Data: 
-                        { 
-                            field:["name","symbol","yclose","open","price","high","low","vol"],
-                            indexSymbol:"000001.sh", symbol: this.Symbol, period:this.Period,
-                            dateRange:dateRange 
-                        } 
-                    },
-                    Self:this,
-                    PreventDefault:false
-                };
-                this.NetworkFilter(obj, function(data) 
-                { 
-                    self.RecvIndexMinuteHistroyData(data);
-                    self.Execute.RunNextJob();
-                });
+            var hisData=this.JsonDataToMinuteHistoryData(data);
+            result=new ChartData();
+            result.DataType=1; /*分钟线数据 */
+            result.Data=hisData;
 
-                if (obj.PreventDefault==true) return;   //已被上层替换,不调用默认的网络请求
+            if (this.IsApiPeriod==true)
+            {
+                result.Period=this.Period;
+                result.Data=this.Data.FixKData(hisData,period);
             }
+            else
+            {
+                var aryOverlayData=this.SourceData.GetOverlayMinuteData(result.Data);      //和主图数据拟合以后的数据
+                result.Data=aryOverlayData;
 
-            JSNetwork.HttpRequest({
-                url: self.MinuteKLineApiUrl,
-                data:
+                if (ChartData.IsMinutePeriod(period,false))   //周期数据
                 {
-                    "field": ["name","symbol","yclose","open","price","high","low","vol"],
-                    "symbol": '000001.sh',
-                    "start": -1,
-                    "count": self.MaxRequestMinuteDayCount+5
-                },
-                type:"post",
-                dataType: "json",
-                async:true,
-                success: function (data)
-                {
-                    self.RecvIndexMinuteHistroyData(data);
-                    self.Execute.RunNextJob();
-                },
-                error: function(request)
-                {
-                    self.RecvError(request);
+                    var periodData=result.GetPeriodData(period);
+                    result.Data=periodData;
                 }
-            });
+            }
         }
 
+        return result;
     }
 
-    this.RecvIndexHistroyData=function(data)
+    //获取行业数据
+    this.GetIndustryData=function()
     {
-        JSConsole.Complier.Log('[JSSymbolData::RecvIndexHistroyData] recv data' , data);
-
-        let hisData=this.JsonDataToHistoryData(data);
-        this.IndexData=new ChartData();
-        this.IndexData.DataType=0; /*日线数据 */
-        this.IndexData.Data=hisData;
+        if (this.IndustryData) return this.Execute.RunNextJob();
+        if (!this.NetworkFilter) return this.Execute.RunNextJob();
 
-        if (this.IsApiPeriod==true)
-        {
-            this.IndexData.Period=this.Period;
-            this.IndexData.Data=this.Data.FixKData(hisData,this.Period);
-        }
-        else
+        var dateRange=this.Data.GetDateRange();
+        var period=this.Period;
+        var obj=
         {
-            var aryOverlayData=this.SourceData.GetOverlayData(this.IndexData.Data);      //和主图数据拟合以后的数据
-            this.IndexData.Data=aryOverlayData;
-    
-            if (ChartData.IsDayPeriod(this.Period,false))   //周期数据
-            {
-                let periodData=this.IndexData.GetPeriodData(this.Period);
-                this.IndexData.Data=periodData;
-            }
-        }
-    }
-
-    this.RecvIndexMinuteHistroyData=function(data)
-    {
-        JSConsole.Complier.Log('[JSSymbolData::RecvIndexMinuteHistroyData] recv data' , data);
+            Name:'JSSymbolData::GetIndustryData', //类名::
+            Explain:'行业数据',
+            Period:period,
+            Request:
+            { 
+                Url:self.KLineApiUrl,  Type:'POST' ,
+                Data: 
+                { 
+                    field:[ "name", "symbol","yclose","open","price","high","low","vol",'up','down','stop','unchanged'],
+                    symbol: this.Symbol, period:period,
+                    dateRange:dateRange 
+                } 
+            },
+            Self:this,
+            PreventDefault:false
+        };
 
-        let hisData=this.JsonDataToMinuteHistoryData(data);
-        this.IndexData=new ChartData();
-        this.IndexData.DataType=1; /*分钟线数据 */
-        this.IndexData.Data=hisData;
+       
+        this.NetworkFilter(obj, (data)=>
+        { 
+            JSConsole.Complier.Log('[JSSymbolData::GetIndustryData] recv data' , data);
 
-        if (this.IsApiPeriod==true)
-        {
-            this.IndexData.Period=this.Period;
-            this.IndexData.Data=this.Data.FixKData(hisData,this.Period);
-        }
-        else
-        {
-            if (ChartData.IsMinutePeriod(this.Period,false))   //周期数据
-            {
-                let periodData=this.IndexData.GetPeriodData(this.Period);
-                this.IndexData.Data=periodData;
-            }
-        }
+            this.IndustryData=this.APIKDataToChartData(data, period);
+            this.Execute.RunNextJob();
+        });
     }
 
     this.GetOtherSymbolParam=function(name)
@@ -13030,6 +13002,32 @@ function JSSymbolData(ast,option,jsExecute)
         }
     }
 
+    //获取大盘指数缓存数据
+    this.GetIndustryCacheData=function(dataName)
+    {
+        if (!this.IndustryData) return [];
+
+        switch(dataName)
+        {
+        case 'HY_INDEXA':
+            return this.IndustryData.GetAmount();
+        case 'HY_INDEXC':
+            return this.IndustryData.GetClose();
+        case 'HY_INDEXH':
+            return this.IndustryData.GetHigh();
+        case 'HY_INDEXL':
+            return this.IndustryData.GetLow();
+        case 'HY_INDEXO':
+            return this.IndustryData.GetOpen();
+        case 'HY_INDEXV':
+            return this.IndustryData.GetVol();
+        case 'HY_INDEXADV':
+            return this.IndustryData.GetUp();
+        case 'HY_INDEXDEC':
+            return this.IndustryData.GetDown();
+        }
+    }
+
     //指数转成对应的板块
     this.GetBlockSymbol=function(symbol)    
     {
@@ -16972,6 +16970,7 @@ var JS_EXECUTE_JOB_ID=
     JOB_DOWNLOAD_LATEST_INDEX_DATA:8,   //下载最新大盘数据
     JOB_DOWNLOAD_OTHER_SYMBOL_DATA:9,   //下载其他股票的K线数据
     JOB_DOWNLOAD_SYMBOL_PERIOD_DATA:10, //下载周期数据
+    JOB_DOWNLOAD_INDUSTRY_DATA:11,      //行业数据
 
     JOB_DOWNLOAD_FINVALUE:301,                  //引用专业财务数据 FINVALUE(ID),ID为数据编号
     JOB_DOWNLOAD_FINONE:302,                    //引用指定年和月日的某类型的财务数据 FINONE(ID,Y,MMDD),ID为数据编号,Y和MMDD表示年和月日.
@@ -17258,6 +17257,10 @@ function JSExecute(ast,option)
         ['INDEXA',null],['INDEXC',null],['INDEXH',null],['INDEXL',null],['INDEXO',null],['INDEXV',null],
         ['INDEXADV',null],['INDEXDEC',null],
 
+        //行业数据
+        ["HY_INDEXA",null],["HY_INDEXC",null],["HY_INDEXH",null],["HY_INDEXL",null],["HY_INDEXO",null],["HY_INDEXV",null],
+        ["HY_INDEXADV",null],["HY_INDEXDEC",null],
+
         ["ADVANCE",null],['DECLINE', null],
 
         ['FROMOPEN',null],      //已开盘有多长分钟
@@ -17382,6 +17385,8 @@ function JSExecute(ast,option)
                 return this.SymbolData.GetSymbolPeriodData(jobItem);
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_INDEX_DATA:
                 return this.SymbolData.GetIndexData();
+            case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_INDUSTRY_DATA:
+                return this.SymbolData.GetIndustryData();
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_LATEST_INDEX_DATA:
                 return this.SymbolData.GetLatestIndexData();
             case JS_EXECUTE_JOB_ID.JOB_DOWNLOAD_INDEX_INCREASE_DATA:
@@ -17506,6 +17511,16 @@ function JSExecute(ast,option)
             case 'INDEXADV':
             case 'INDEXDEC':
                 return this.SymbolData.GetIndexCacheData(name);
+            //行业数据
+            case 'HY_INDEXA':
+            case 'HY_INDEXC':
+            case 'HY_INDEXH':
+            case 'HY_INDEXL':
+            case 'HY_INDEXO':
+            case 'HY_INDEXV':
+            case 'HY_INDEXADV':
+            case 'HY_INDEXDEC':
+                return this.SymbolData.GetIndustryCacheData(name);
             case 'CURRBARSCOUNT':
                 return this.SymbolData.GetCurrBarsCount();
             case "BARPOS":

package/src/jscommon/umychart.js

@@ -34462,6 +34462,7 @@ function ChartKLineTable()
     this.MapCache=null; //key=date/date-time  value={ Date:, Time:, Data:[ ] }
     this.GetKValue=ChartData.GetKValue;
     this.AryCellRect=[];    //保存单元格信息
+    this.AryNameRect=[];    //右侧行的名字
 
 
     this.SetOption=function(option)
@@ -34564,6 +34565,7 @@ function ChartKLineTable()
     this.Draw=function()
     {
         this.AryCellRect=[];
+        this.AryNameRect=[];
         if (!this.IsShow || this.ChartFrame.IsMinSize || !this.IsVisible) return;
         if (this.IsShowIndexTitleOnly()) return;
         if (this.IsHideScriptIndex()) return;
@@ -34770,6 +34772,8 @@ function ChartKLineTable()
                 this.Canvas.textBaseline='bottom';
                 this.Canvas.textAlign='left';
                 this.Canvas.fillText(item.Name,rtBG.Left+2,yText);
+
+                this.AryNameRect.push({ Rect:rtBG, Item:item, Index:i });
             }
 
             y+=this.RowHeight;
@@ -89324,6 +89328,19 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             this.ChartCorssCursor.OnDBClick(data);
             bDraw=data.Draw
         }
+
+        if (this.TryDBClickChartTooltipData)    //外部预留接口
+        {
+            var data={ e:e, X:x, Y:y, Draw:false, PreventDefault:false };
+            this.TryDBClickChartTooltipData(data, this);
+            if (data.Draw) bDraw=true;
+
+            if (data.PreventDefault)
+            {
+                if (bDraw) this.Draw();
+                return;
+            }
+        }
             
         if (this.EnableYDrag && (this.EnableYDrag.Left || this.EnableYDrag.Right) && this.Frame && this.Frame.PtInFrameY)
         {

package/src/jscommon/umychart.testdata.js

@@ -158,6 +158,10 @@ HQData.NetworkFilter=function(data, callback)
             HQData.INDEX_RequestData(data,callback);
             break;
 
+        case "JSSymbolData::GetIndustryData":
+            HQData.INDUSTRY_RequestData(data,callback);
+            break;
+
         case 'JSSymbolData::GetSymbolData':   
             //HQChart使用教程30-K线图如何对接第3方数据38-通达信指标K线数据
             HQData.RequestSymbolData(data,callback);        //计算指标需要的K线数据
@@ -1810,6 +1814,30 @@ HQData.INDEX_RequestData=function(data,callback)
     callback(hqchartData);
 }
 
+HQData.INDUSTRY_RequestData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var period=data.Period;
+    var symbol=data.Request.Data.symbol;
+    var indexSymbol="399001.sz";
+    var dateRange=data.Request.Data.dateRange;
+    var aryData=[];
+    if (ChartData.IsMinutePeriod(period, true))
+    {
+        var fullData=HQData.GetM1KLineDataBySymbol(symbol);
+        if (fullData) aryData=HQData.GetKLineDataByDateTime(fullData, dateRange.Start.Date, dateRange.Start.Time, dateRange.End.Date, dateRange.End.Time);
+    }
+    else if (ChartData.IsDayPeriod(period,true))
+    {
+        var fullData=HQData.GetDayKLineDataBySymbol(indexSymbol);
+        if (fullData) aryData=HQData.GetKLineDataByDate(fullData, dateRange.Start.Date, dateRange.End.Date);
+    }
+
+    var hqchartData={ name:indexSymbol, symbol:indexSymbol, data:aryData, ver:2.0 };
+
+    callback(hqchartData);
+}
+
 HQData.RequestSymbolData=function(data,callback)
 {
     data.PreventDefault=true;
@@ -3489,6 +3517,7 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
             //{Date:20190916, Time: Value:15.5, Value2:0 },
         ],
         //Width:10
+        AdWidth:{ Type:1, Value:0.8 }
     };
 
     var point2=
@@ -3502,6 +3531,7 @@ HQData.APIIndex_MULTI_BAR=function(data, callback)
             //{Date:20190916, Time: Value:15.5, Value2:0 },
         ],
         //Width:10
+        AdWidth:{ Type:1, Value:0.5 }
     };
 
     for(var i=0;i<kData.Data.length;++i)
@@ -3828,6 +3858,8 @@ HQData.APIIndex_SCATTER_PLOT_V2=function(data, callback)
             };
         }
 
+        //if ((i%6)==2) item.Radius2=20;
+
 
         item.Tooltip=
         [
@@ -3890,6 +3922,7 @@ HQData.APIIndex_KLINE_TABLE=function(data, callback)
         { Name:"账户4", DayCount:8, OperatorID:0 },
     ]
     
+    
     for(var i=0;i<kData.Data.length;++i)   
     {
         var kItem=kData.Data[i];
@@ -3950,6 +3983,7 @@ HQData.APIIndex_KLINE_TABLE=function(data, callback)
 
         tableData.Draw.DrawData.push(colItem);
     }
+    
 
     var apiData=
     {