hqchart 1.1.13640 → 1.1.13652

package/package.json

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

package/src/jscommon/umychart.NetworkFilterTest.js

@@ -48701,6 +48701,11 @@ HQData.NetworkFilter=function(data, callback)
             HQData.RequestMinuteDaysData(data, callback);
             break;
 
+        case "MinuteChartContainer::RequestPopMinuteData":          //弹出分时图数据
+            //HQChart使用教程29-走势图如何对接第3方数据2-最新分时数据  格式跟这个一样
+            HQData.RequestPopMinuteData(data, callback);
+            break;
+
         //HQChart使用教程30-K线图如何对接第3方数据1
         case 'KLineChartContainer::RequestHistoryData':                 //日线全量数据下载
             //HQChart使用教程30-K线图如何对接第3方数据2-日K数据
@@ -48805,39 +48810,93 @@ HQData.RequestMinuteData=function(data, callback)
     var symbol=data.Request.Data.symbol[0];             //请求的股票代码
     var callcation=data.Request.Data.callcation;        //集合竞价
     console.log(`[HQData::RequestMinuteData] Symbol=${symbol}`);
+
+    setTimeout(()=>{
+        var srcStock=MINUTE_1DAY_DATA.stock[0];
+        var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.name };
+        if (callcation.Before)
+        {
+            var before=
+            [
+                //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+                [915, srcStock.yclose,0,0],
+                [916, srcStock.yclose+0.01,0,0],
+                [917, srcStock.yclose+0.03,0,0],
+                [918, srcStock.yclose+0.02,0,0],
+                [919, srcStock.yclose+0.02,0,0],
+                [920, srcStock.yclose+0.01,0,0],
+                [921, srcStock.yclose,0,0],
+                [922, srcStock.yclose-0.02,0,0],
+                [923, srcStock.yclose-0.03,0,0],
+                [924, srcStock.yclose,0,0],
+                [925, srcStock.yclose,0,0],
+            ];
+
+            var beforeinfo={ totalcount:11, ver:1.0 };
+
+            stockItem.before=before;
+            stockItem.beforeinfo=beforeinfo;
+        }
+
+        var hqchartData={code:0, stock:[stockItem] };
     
-    var srcStock=MINUTE_1DAY_DATA.stock[0];
-    var stockItem={ date:srcStock.date, minute:srcStock.minute, yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.name };
-    if (callcation.Before)
-    {
-        var before=
-        [
-            //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
-            [915, srcStock.yclose,0,0],
-            [916, srcStock.yclose+0.01,0,0],
-            [917, srcStock.yclose+0.03,0,0],
-            [918, srcStock.yclose+0.02,0,0],
-            [919, srcStock.yclose+0.02,0,0],
-            [920, srcStock.yclose+0.01,0,0],
-            [921, srcStock.yclose,0,0],
-            [922, srcStock.yclose-0.02,0,0],
-            [923, srcStock.yclose-0.03,0,0],
-            [924, srcStock.yclose,0,0],
-            [925, srcStock.yclose,0,0],
-        ];
 
-        var beforeinfo={ totalcount:11, ver:1.0 };
+        callback(hqchartData);
+    }, 50);
+}
 
-        stockItem.before=before;
-        stockItem.beforeinfo=beforeinfo;
-    }
+HQData.RequestPopMinuteData=function(data, callback)
+{
+    data.PreventDefault=true;
+    var symbol=data.Request.Data.symbol[0];             //请求的股票代码
+    var date=data.Request.Data.date;
+    var callcation=data.Request.Data.callcation;        //集合竞价
+    console.log(`[HQData::RequestPopMinuteData] Symbol=${symbol} Date=${date}`);
 
-    var hqchartData={code:0, stock:[stockItem] };
-   
+    setTimeout(()=>{
+        var srcStock=MINUTE_1DAY_DATA.stock[0];
+        var stockItem={ date:date, minute:[], yclose:srcStock.yclose, symbol:srcStock.symbol, name:srcStock.symbol, IsHistoryMinute:true };
+        if (callcation.Before)
+        {
+            var before=
+            [
+                //[交易时间, 价格，成交量， 成交金额, 日期（可选，YYYYMMDD)],
+                [915, srcStock.yclose,0,0],
+                [916, srcStock.yclose+0.01,0,0],
+                [917, srcStock.yclose+0.03,0,0],
+                [918, srcStock.yclose+0.02,0,0],
+                [919, srcStock.yclose+0.02,0,0],
+                [920, srcStock.yclose+0.01,0,0],
+                [921, srcStock.yclose,0,0],
+                [922, srcStock.yclose-0.02,0,0],
+                [923, srcStock.yclose-0.03,0,0],
+                [924, srcStock.yclose,0,0],
+                [925, srcStock.yclose,0,0],
+            ];
 
-    callback(hqchartData);
+            var beforeinfo={ totalcount:11, ver:1.0 };
+
+            stockItem.before=before;
+            stockItem.beforeinfo=beforeinfo;
+        }
+
+        for(var i=0;i<srcStock.minute.length;++i)
+        {
+            var item=srcStock.minute[i];
+            var newItem=CloneData(item);
+            newItem.date=date;
+
+            stockItem.minute.push(newItem);
+        }
+
+        var hqchartData={code:0, stock:[stockItem] };
+    
+
+        callback(hqchartData);
+    }, 50);
 }
 
+
 HQData.RequestMinuteDaysData=function(data, callback)
 {
     data.PreventDefault=true;

package/src/jscommon/umychart.PopMinuteChart.js

@@ -0,0 +1,268 @@
+/*
+   Copyright (c) 2018 jones
+ 
+   http://www.apache.org/licenses/LICENSE-2.0
+
+   开源项目 https://github.com/jones2000/HQChart
+ 
+   jones_2000@163.com
+
+   K线点击弹出指定日期分时图
+*/
+
+
+function JSPopMinuteChart()
+{
+    this.DivDialog=null;
+    this.DivInfoText=null;
+    this.HQChart=null;
+    this.DragTitle=null;
+    this.Date=null;
+    this.ID=Guid();
+
+    this.Minute=
+    {
+        Option:JSPopMinuteChart.GetMinuteOption(),
+        JSChart:null,
+        Date:null,
+    }
+
+    this.Inital=function(hqchart)
+    {
+        this.HQChart=hqchart;
+    }
+
+    this.Create=function()
+    {
+        var divDom=document.createElement('div');
+        divDom.className='jchart_pop_minute_dailog';
+        divDom.id=this.ID;
+        divDom.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;
+        divDom.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;
+
+        var divTitle=document.createElement("div");
+        divTitle.className='jschart_pop_minute_chart_Title_Div';
+        divTitle.onmousedown=(e)=>{ this.OnMouseDownTitle(e); }
+        divDom.appendChild(divTitle);
+       
+        var divInfoText=document.createElement("div");
+        divInfoText.className="";
+        divInfoText.innerText="分时图";
+        this.DivInfoText=divInfoText;
+        divTitle.appendChild(divInfoText);
+
+        var divClose=document.createElement("div");
+        divClose.className='jschart_pop_minute_chart_Close_Div';
+        divClose.innerText="x";
+        divClose.onmousedown=(e)=>{ this.Close(e); }
+        divTitle.appendChild(divClose);
+
+
+        var divChart=document.createElement('div');
+        divChart.className='jschart_pop_minute_chart';
+        divDom.appendChild(divChart);
+
+        this.DivDialog=divDom;
+
+        var chart=JSChart.Init(divChart);
+        this.Minute.JSChart=chart;
+        this.Minute.Option.OnCreatedCallback=(chart)=>{ this.OnCreateHQChart(chart); }
+        this.Minute.Option.NetworkFilter=(data, callback)=>{ this.NetworkFilter(data, callback); }
+        chart.SetOption(this.Minute.Option);  //设置K线配置
+
+        document.body.appendChild(divDom);
+    }
+
+    this.NetworkFilter=function(data, callback)
+    {
+        if (!this.HQChart || !this.HQChart.NetworkFilter) return;
+        
+        if (data.Name== 'MinuteChartContainer::RequestMinuteData')  //分时图数据对接
+        {
+            data.Request.Data.date=this.Date;
+            data.Name="MinuteChartContainer::RequestPopMinuteData";
+            data.Explain="指定日期分时数据"
+        };
+
+        this.HQChart.NetworkFilter(data, callback);       
+    }
+
+    this.OnCreateHQChart=function(chart)
+    {
+
+    }
+
+    this.Destroy=function()
+    {
+        document.body.remove(this.DivDialog);
+        this.DivDialog=null;
+        this.DivInfoText=null;
+        this.Minute.JSChart=null;
+    }
+
+    this.IsShow=function()
+    {
+        if (!this.DivDialog) return false;
+        
+        return this.DivDialog.style.visibility==='visible';
+    }
+
+    this.Show=function(data, x,y)
+    {
+        if (!this.DivDialog) this.Create();
+        if (!data.Symbol || !IFrameSplitOperator.IsPlusNumber(data.Date));
+
+        this.Date=data.Date;
+        var name=data.Symbol;
+        if (data.Name) name=data.Name;
+        var title=`${name} ${IFrameSplitOperator.FormatDateString(data.Date)} 分时图`
+        this.DivInfoText.innerText=title;
+
+        if (this.Minute.JSChart)
+        {
+            this.Minute.JSChart.ChangeSymbol(data.Symbol);
+        }
+
+        //超出窗口调整位置
+        var height=this.DivDialog.offsetHeight;
+        var width=this.DivDialog.offsetWidth;
+        var xRight=window.innerWidth-5;
+        var ybottom=window.innerHeight-5;
+        if (x+width>xRight) x=xRight-width;
+        if (y+height>ybottom) y=ybottom-height;
+
+        this.DivDialog.style.visibility='visible';
+        this.DivDialog.style.top = y + "px";
+        this.DivDialog.style.left = x + "px";
+    }
+
+    this.Close=function(e)
+    {
+        if (!this.DivDialog) return;
+
+        this.DivDialog.style.visibility='hidden';
+    }
+
+    this.OnMouseDownTitle=function(e)
+    {
+        if (!this.DivDialog) return;
+
+        var dragData={ X:e.clientX, Y:e.clientY };
+        dragData.YOffset=e.clientX - this.DivDialog.offsetLeft;
+        dragData.XOffset=e.clientY - this.DivDialog.offsetTop;
+        this.DragTitle=dragData;
+
+        document.onmousemove=(e)=>{ this.DocOnMouseMoveTitle(e); }
+        document.onmouseup=(e)=>{ this.DocOnMouseUpTitle(e); }
+    }
+
+    this.DocOnMouseMoveTitle=function(e)
+    {
+        if (!this.DragTitle) return;
+
+        var left = e.clientX - this.DragTitle.YOffset;
+        var top = e.clientY - this.DragTitle.XOffset;
+
+        var right=left+this.DivDialog.offsetWidth;
+        var bottom=top+ this.DivDialog.offsetHeight;
+        
+        if ((right+5)>=window.innerWidth) left=window.innerWidth-this.DivDialog.offsetWidth-5;
+        if ((bottom+5)>=window.innerHeight) top=window.innerHeight-this.DivDialog.offsetHeight-5;
+
+        this.DivDialog.style.left = left + 'px';
+        this.DivDialog.style.top = top + 'px';
+
+        if(e.preventDefault) e.preventDefault();
+    }
+
+    this.DocOnMouseUpTitle=function(e)
+    {
+        this.DragTitle=null;
+        this.onmousemove = null;
+        this.onmouseup = null;
+    }
+
+    this.ReloadResource=function(option)
+    {
+        if (!this.DivDialog) return;
+
+        this.DivDialog.style["background-color"]=g_JSChartResource.PopMinuteChart.BGColor;
+        this.DivDialog.style["border-color"]=g_JSChartResource.PopMinuteChart.BorderColor;
+
+        if (this.Minute.JSChart) this.Minute.JSChart.ReloadResource(option);
+    }
+}
+
+
+JSPopMinuteChart.GetMinuteOption=function()
+{
+    var option=
+    {
+        Type:'分钟走势图',   //创建图形类型
+        Windows: //窗口指标
+        [
+            //{ Index:"VOL" },
+            //{ Index:"RSI" }
+        ], 
+                
+        Symbol:null,         // cf1909.czc
+        IsAutoUpdate:false,          //是自动更新数据
+        AutoUpdateFrequency:10000,   //数据更新频率
+        DayCount:1,                     //1 最新交易日数据 >1 多日走势图
+        IsShowRightMenu:false,       //是否显示右键菜单
+        
+        EnableSelectRect:true,
+        EnableZoomIndexWindow:true,
+        EnableResize:true,
+
+        //BeforeOpen:{IsShow:true, Width:120, IsShowMultiDay:true, MulitiDayWidth:100, },
+        //AfterClose:{IsShow:true, Width:100, IsShowMultiDay:true, MulitiDayWidth:50,  ShareVol:2 }, //ShareVol:0=盘后成交量独立坐标, 1==盘后成交量主图共用 2==盘后成交量盘前共用
+
+        CorssCursorInfo:{ Left:2, Right:1, Bottom:1 },
+                
+        MinuteLine:
+        {
+           
+        },
+
+        MinuteTitle:
+        {
+            IsShowTime:true,
+            IsShowName:false,
+            IsShowDate:true,
+            IsShowVolTitle:true,
+            //IsAlwaysShowLastData:true,
+            IsTitleShowLatestData:true,
+        },
+
+        MinuteVol:
+        {
+            BarColorType:1,
+        },
+
+        //Language:'EN',
+    
+        Border: //边框
+        {
+            Left:20,    //左边间距
+            Right:20,     //右边间距
+            Top:25,
+            Bottom:25,
+
+            AutoLeft:{ Blank:10, MinWidth:60 },
+            AutoRight:{ Blank:10, MinWidth:60 },
+        },
+                
+        Frame:  //子框架设置
+        [
+            { SplitCount:5 },
+            { SplitCount:3 },
+            { SplitCount:3 },
+        ],
+    }
+
+    return option;
+}
+
+
+