hqchart 1.1.14593 → 1.1.14604

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

@@ -4413,6 +4413,8 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         {
             var item=option.EnableXDrag;
             if (IFrameSplitOperator.IsBool(item.Bottom)) chart.EnableXDrag.Bottom=item.Bottom;
+            if (item.LButton && IFrameSplitOperator.IsNumber(item.LButton.Type)) chart.EnableXDrag.LButton.Type=item.LButton.Type;
+            if (item.RButton && IFrameSplitOperator.IsNumber(item.RButton.Type)) chart.EnableXDrag.RButton.Type=item.RButton.Type;
         }
 
         if (option.KLineTooltip)
@@ -4971,6 +4973,7 @@ function JSChart(divElement, bOffscreen, bCacheCanvas)
         if (IFrameSplitOperator.IsBool(option.EnableIndexChartDrag)) chart.EnableIndexChartDrag=option.EnableIndexChartDrag;
         if (IFrameSplitOperator.IsBool(option.EnableVerifyRecvData)) chart.EnableVerifyRecvData=option.EnableVerifyRecvData;
         if (IFrameSplitOperator.IsBool(option.EnableNightDayBG)) chart.EnableNightDayBG=option.EnableNightDayBG;
+        if (IFrameSplitOperator.IsNumber(option.MaxDayCount)) chart.MaxDayCount=option.MaxDayCount;
 
         //老版本开启左键区间选择
         if (IFrameSplitOperator.IsBool(option.EnableSelectRect))
@@ -6604,6 +6607,17 @@ JSChart.GetfloatPrecision=function(symbol)
     return GetfloatPrecision(symbol);
 }
 
+//获取不带后缀的代码
+JSChart.GetShortSymbol=function(symbol)
+{
+    if (IFrameSplitOperator.IsString(symbol)) return null;
+    var pos=symbol.lastIndexOf(".");
+    if (pos<=0) return symbol;
+
+    return symbol.slice(0,pos);
+}
+
+
 var JSCHART_EVENT_ID=
 {
     //RECV_KLINE_MATCH:1, //接收到形态匹配
@@ -7202,7 +7216,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         Wheel:false, WheelYMove:5  //是否可以滚轴缩放Y轴最大最小值
     }; 
     
-    this.EnableXDrag={ Bottom:true };   //X轴拖动缩放
+    this.EnableXDrag={ Bottom:true, LButton:{ Type:1 }, RButton:{ Type:2 } };   //X轴拖动缩放 Type: 1=拖动K线 2=缩放K线
 
     this.EnableZoomIndexWindow=false;               //是否支持双击缩放附图窗口
     this.EnableVerifyRecvData=false;                //是否检测接收到的数据
@@ -7769,7 +7783,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
       
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
         if (!this.IsShowRightMenu) return;
-        if (this.PreventRightMenu.Enable) return;
+        if (this.PreventRightMenu.Enable) 
+        {
+            this.PreventRightMenu.Enable=false; //生效一次就可以
+            return;
+        }
 
         var x = e.clientX-this.UIElement.getBoundingClientRect().left;
         var y = e.clientY-this.UIElement.getBoundingClientRect().top;
@@ -8432,7 +8450,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
         else if (drag.Click && drag.Click.IsInFrameBottom)
         {
-            this.OnDragXCoordinateZoom(drag, {X:moveSetp, Y:moveSetpY}, e);
+            var dragType=this.GetDragXCoordinateType(e,"DocOnMouseMove");
+           
+            if (dragType==2)
+                this.OnDragXCoordinateZoom(drag, {X:moveSetp, Y:moveSetpY}, e);
+            else if (dragType==1)
+                this.OnDragXCoordinateKLine(drag, {X:moveSetp, Y:moveSetpY}, e);
         }
         else if ((bLButtonSelectRect || bRButtonSelectRect) && !isDragSelectRect && !isDragSubSelectRect && !bShfitDragKLine)  //左右键区间选择
         {
@@ -8455,6 +8478,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    //X轴坐标拖动 缩放K线
     this.OnDragXCoordinateZoom=function(drag, moveData, e)
     {
         var moveSetp=moveData.X;
@@ -8487,6 +8511,56 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         this.SetCursor({Cursor:cursorStatus});
     }
 
+    //X轴坐标拖动 拖动K线
+    this.OnDragXCoordinateKLine=function(drag, moveData, e)
+    {
+        var moveSetpX=moveData.X;
+        var moveSetpY=moveData.Y;
+
+        if (moveSetpX<5) return false;
+
+        var isLeft=true;
+        if (drag.LastMove.X<e.clientX) isLeft=false;    //右移数据
+
+        var cursorStatus="pointer";
+        var oneStepWidth=this.GetMoveOneStepWidth();
+        if (moveSetpX<oneStepWidth)
+        {
+            this.SetCursor({Cursor:cursorStatus});
+            return false;
+        }
+
+        var bNeedDraw=false;
+        if(this.DataMove(moveSetpX,isLeft))
+        {
+            this.UpdataDataoffset();
+            //this.UpdatePointByCursorIndex(); //推拽数据的时候不需要把鼠标位置更新到K线上
+            this.UpdateFrameMaxMin();
+            this.ResetFrameXYSplit();
+            bNeedDraw=true;
+        }
+        else
+        {
+            if (this.DragDownloadData) 
+            {
+                this.DragDownloadData();
+                if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash) return true;
+            }
+        }
+
+        drag.LastMove.X=e.clientX;
+        this.SetCursor({Cursor:cursorStatus});
+
+        if (bNeedDraw) 
+        {
+            this.Draw();
+            this.OnKLinePageChange("datamove");
+        }
+
+        return true;
+    }
+
+
     this.OnDragMode_One=function(moveData, e)
     {
         var moveSetp=moveData.X;
@@ -8590,6 +8664,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    
     this.GetXDataIndex=function(obj)
     {
         if (!this.ChartPaint[0] || !this.ChartPaint[0].Data) return false;
@@ -8689,6 +8764,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
             if (this.OnMinuteSelectRectMouseUp) this.OnMinuteSelectRectMouseUp(e);  //分时图区间选择
         }
+        else if (this.MouseDrag && this.MouseDrag.Click && this.MouseDrag.Click.IsInFrameBottom)
+        {
+            if (e && e.button===2 && this.EnableXDrag.RButton.Type>=1) this.PreventRightMenu.Enable=true;
+        }
         else if ((bLButtonSelectRect || bRButtonSelectRect) && !bShfitDragKLine)  //K线图区间选择
         {
             var drag=this.MouseDrag;
@@ -11020,7 +11099,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         //X轴拖动缩放
         if (this.ClassName=="KLineChartContainer"  && this.EnableXDrag.Bottom && this.Frame.PtInFrameBottom(x,y))
         {
-            mouseStatus={ Cursor:"ew-resize", Name:"FrameButtom"};
+            //var dragType=this.GetDragXCoordinateType(e,"OnMouseMove");
+            //mouseStatus={ Cursor:"pointer", Name:"FrameButtom"};
             JSConsole.Chart.Log("[JSChartContainer::OnMouseMove] frame bottom ");
         }
 
@@ -14565,7 +14645,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (this.ClearKLineInfo) this.ClearKLineInfo();
                 break;
             case JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID:
-                if (param!=null) this.DragMode=param;
+                if (param!=null) 
+                {
+                    this.DragMode=param;
+                    if (this.DragMode==1 && IFrameSplitOperator.IsBool(aryArgs[1]))     //shift+左键拖动
+                        this.KLineDragConfig.EnableShfit=aryArgs[1];
+                }
                 break;
             case JSCHART_MENU_ID.CMD_CHANGE_BG_SPLIT_ID:
                 if (IFrameSplitOperator.IsBool(srcParam))
@@ -14819,6 +14904,8 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 break;
             case JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID:
                 if (IFrameSplitOperator.IsBool(srcParam)) this.EnableXDrag.Bottom=srcParam;
+                if (IFrameSplitOperator.IsNonEmptyArray(aryArgs) && IFrameSplitOperator.IsNumber(aryArgs[1])) this.EnableXDrag.LButton.Type=aryArgs[1];
+                if (IFrameSplitOperator.IsNonEmptyArray(aryArgs) && IFrameSplitOperator.IsNumber(aryArgs[2])) this.EnableXDrag.RButton.Type=aryArgs[2];
                 break;
             case JSCHART_MENU_ID.CMD_FULLSCREEN_SUMMARY_ID:
                 this.FullScreenSummary();
@@ -15270,6 +15357,17 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         return true;
     }
 
+    this.GetDragXCoordinateType=function(event, funcName)
+    {
+        if (funcName=="DocOnMouseMove")
+        {
+            if (event.buttons==1) return this.EnableXDrag.LButton.Type;     //左键
+            else if (event.buttons==2) return this.EnableXDrag.RButton.Type;//右键
+        }
+        
+        return null;
+    }
+
     this.OnMarkRectSelect=function(e)
     {
         var corssCursor=this.ChartCorssCursor;  //十字光标
@@ -86843,10 +86941,6 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 Name:"其他设置",
                 SubMenu:
                 [
-                    
-                    { Name:"禁止拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[0]}, Checked:0==this.DragMode },
-                    { Name:"启动拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[1]}, Checked:1==this.DragMode },
-                    { Name:"X轴拖动缩放", Data:{  ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID, Args:[!this.EnableXDrag.Bottom]}, Checked:this.EnableXDrag.Bottom },
                     { Name:"左键区间选择", Data:{ ID:JSCHART_MENU_ID.CMD_LBUTTON_SELECT_RECT_ID, Args:[!bLButtonSelectRect]}, Checked:bLButtonSelectRect },
                     { Name:"右键区间选择", Data:{ ID:JSCHART_MENU_ID.CMD_RBUTTON_SELECT_RECT_ID, Args:[!bRButtonSelectRect]}, Checked:bRButtonSelectRect },
                     { Name:JSPopMenu.SEPARATOR_LINE_NAME },
@@ -86903,6 +86997,27 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                             { Name:"启用", Data:{ ID:JSCHART_MENU_ID.CMD_KLINE_TOOLTIP_ATTRIBUTE, Args:[{Enable:!this.KLineTooltipConfig.Enable}]}, Checked:this.KLineTooltipConfig.Enable },
                             { Name:"键盘左右显示", Data:{ ID:JSCHART_MENU_ID.CMD_KLINE_TOOLTIP_ATTRIBUTE, Args:[{EnableKeyDown:!this.KLineTooltipConfig.EnableKeyDown}]}, Checked:this.KLineTooltipConfig.EnableKeyDown },
                         ]
+                    },
+                    {
+                        Name:"X轴拖动",
+                        SubMenu:
+                        [
+                            { Name:"启动", Data:{  ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID, Args:[!this.EnableXDrag.Bottom]}, Checked:this.EnableXDrag.Bottom },
+                            { Name:"左键拖动K线", Data:{  ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID, Args:[null, this.EnableXDrag.LButton.Type===1?0:1]}, Checked:this.EnableXDrag.LButton.Type===1 && this.EnableXDrag.Bottom },
+                            { Name:"左键缩放K线", Data:{  ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID, Args:[null, this.EnableXDrag.LButton.Type===2?0:2]}, Checked:this.EnableXDrag.LButton.Type===2 && this.EnableXDrag.Bottom },
+
+                            { Name:"右键拖动K线", Data:{  ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID, Args:[null, null, this.EnableXDrag.RButton.Type===1?0:1]}, Checked:this.EnableXDrag.RButton.Type===1 && this.EnableXDrag.Bottom },
+                            { Name:"右键缩放K线", Data:{  ID:JSCHART_MENU_ID.CMD_ENABLE_XDRAG_BOTTOM_ID, Args:[null, null, this.EnableXDrag.RButton.Type===2?0:2]}, Checked:this.EnableXDrag.RButton.Type===2 && this.EnableXDrag.Bottom },
+                        ]
+                    },
+                    {
+                        Name:"K线拖动",
+                        SubMenu:
+                        [
+                            { Name:"禁用", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[0]}, Checked:0==this.DragMode },
+                            { Name:"左键拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[1, false]}, Checked:1==(this.DragMode && !this.KLineDragConfig.EnableShfit) },
+                            { Name:"Shift+左键拖拽", Data:{ ID:JSCHART_MENU_ID.CMD_CHANGE_DRAG_MODE_ID, Args:[1, true]}, Checked:1==(this.DragMode && this.KLineDragConfig.EnableShfit) },
+                        ]
                     }
                 ]
             }
@@ -89117,6 +89232,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
     this.AutoUpdateTimer;                     //自动更新定时器
     this.TradeDate=0;                         //行情交易日期
     this.DayCount=1;                          //显示几天的数据
+    this.MaxDayCount=-1;                      //最大显示天数 -1 无限制
     this.DayData;                             //多日分钟数据
     this.LimitPrice;                          //涨停价格 { Max:null, Min:null };  
 
@@ -89677,8 +89793,8 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         if (!startItem || !endItem) return;
 
         JSConsole.Chart.Log('[MinuteChartContainer::UpdateSelectRect]',startItem,endItem);
-        paint.SetPoint(startItem, { Index:0 });
-        paint.SetPoint(endItem, { Index:1 });
+        paint.SetPoint(startItem, { Index:0 , DataIndex:start });
+        paint.SetPoint(endItem, { Index:1,DataIndex:end  });
 
         this.Draw();
     }
@@ -89705,7 +89821,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         var item = kData.Data[dataIndex];
         JSConsole.Chart.Log("[MinuteChartContainer::MoveRectSelectPoint] point, item", obj.PointIndex, item);
 
-        if (!paint.SetPoint(item,{ Index: obj.PointIndex })) return false;
+        if (!paint.SetPoint(item,{ Index: obj.PointIndex,DataIndex:dataIndex })) return false;
 
         var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_DRAG_SELECT_RECT);
         if (event)
@@ -91141,10 +91257,22 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
 
         if (x>=rtClient.Left && x<=rtClient.Right && y>=rtClient.Top && y<=rtClient.Bottom ) isInClient=true;
 
-        if (!this.OnWheel_ZoomUpDownFrameY(e,x,y)) return;
+        var bPreventDefault=false;
+        if (this.OnWheel_ChangeDayCount(e,x,y)) //ctrl+上下滚轴
+        {
+            bPreventDefault=true;
+        }
+        else
+        {
+            if (this.OnWheel_ZoomUpDownFrameY(e,x,y))
+                bPreventDefault=true;
+        }
 
-        if(e.preventDefault) e.preventDefault();
-        else e.returnValue = false;
+        if (bPreventDefault)
+        {
+            if(e.preventDefault) e.preventDefault();
+            else e.returnValue = false;
+        }
     }
 
     //通过滚轴缩放Y轴
@@ -91174,6 +91302,28 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         return true;
     }
 
+    this.OnWheel_ChangeDayCount=function(e, x, y)
+    {
+        if (!e.ctrlKey) return false;
+
+        var wheelValue=e.wheelDelta;
+        if (!IFrameSplitOperator.IsObjectExist(e.wheelDelta))
+            wheelValue=e.deltaY* -0.01;
+
+        var value=wheelValue>=0?-1:1;
+        var dayCount=this.DayCount;
+
+        dayCount+=value;
+        if (IFrameSplitOperator.IsPlusNumber(dayCount))
+        {
+            if (IFrameSplitOperator.IsPlusNumber(this.MaxDayCount) && dayCount>this.MaxDayCount) return true;
+
+            this.ChangeDayCount(dayCount);
+        }
+       
+        return true;
+    }
+
     this.OnDoubleClick=function(x,y,e)
     {
         JSConsole.Chart.Log("[MinuteChartContainer::OnDoubleClick]", e);
@@ -91323,7 +91473,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
         this.ChartCorssCursor.StringFormatY.ShareAfterVol=this.ShareAfterVol;
         this.ChartCorssCursor.CallAcutionXOperator=new CallAcutionXOperator();
         this.ChartCorssCursor.GetEventCallback=(id)=> { return this.GetEventCallback(id); }
-       
+        this.ChartCorssCursor.OnChangeStatusCallback=(data, obj)=>{ this.OnChangeCorssCursorStatus(data,obj); }
 
         //创建等待提示
         this.ChartSplashPaint = new ChartSplashPaint();
@@ -131059,7 +131209,7 @@ function GetBlackStyle()
                 Color:"rgba(255,250, 250,0.8)",
                 TextColor:'rgba(0,0, 0, 0.8)',
 
-                MoveRowColor:'rgb(135,206,250)',
+                MoveRowColor:'rgb(37,47,69)',
                 SrcRowColor:'rgb(49,48,56)',
             },
 
@@ -133148,6 +133298,16 @@ function JSReportChart(divElement)
         if (this.JSChartContainer) this.JSChartContainer.SetSelectedRow(option);
     }
 
+    this.DeleteSymbol=function(arySymbol, option)
+    {
+        if (this.JSChartContainer) this.JSChartContainer.DeleteSymbol(arySymbol, option);
+    }
+
+    this.AddSymbol=function(arySymbol, option)
+    {
+        if (this.JSChartContainer) this.JSChartContainer.AddSymbol(arySymbol, option);
+    }
+
     this.EnableFilter=function(bEnable, option) //启动|关闭筛选
     {
         if (this.JSChartContainer) this.JSChartContainer.EnableFilter(bEnable, option);
@@ -134052,22 +134212,108 @@ function JSReportChartContainer(uielement)
         this.UpdateStockData();
     }
 
-    this.AutoUpdateEvent=function(bStart, explain)          //自定更新事件, 是给websocket使用
+    //删除股票
+    this.DeleteSymbol=function(arySymbol, option)
     {
-        var eventID=bStart ? JSCHART_EVENT_ID.RECV_START_AUTOUPDATE:JSCHART_EVENT_ID.RECV_STOP_AUTOUPDATE;
-        if (!this.mapEvent.has(eventID)) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return false;
 
-        var self=this;
-        var event=this.mapEvent.get(eventID);
-        var data={ Stock:{ Symbol:this.Symbol, Name:this.Name, DayCount:this.DayCount }, Explain: explain };
-        if (bStart) 
+        var setSymbol=new Set(arySymbol);
+        var bFinder=false;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
         {
-            data.Callback=function(data) //数据到达更新回调
-            { 
-                self.RecvDealUpdateData(data); 
+            var aryData=[];
+            for(var i=0;i<this.SourceData.Data.length;++i)
+            {
+                var item=this.SourceData.Data[i];
+                if (setSymbol.has(item)) 
+                {
+                    bFinder=true;
+                    continue;
+                }
+                aryData.push(item);
             }
+
+            if (bFinder) this.SourceData.Data=aryData;
         }
-        event.Callback(event,data,this);
+
+        if (IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))
+        {
+            var aryData=[];
+            for(var i=0;i<this.Data.Data.length;++i)
+            {
+                var item=this.Data.Data[i];
+                if (setSymbol.has(item)) 
+                {
+                    bFinder=true;
+                    continue;
+                }
+                aryData.push(item);
+            }
+
+            if (bFinder) this.Data.Data=aryData;
+        }
+
+        if (!bFinder) return false;
+        
+        this.Draw();
+        this.UpdateStockData();
+
+        return true;
+    }
+
+    //添加股票
+    this.AddSymbol=function(arySymbol, option)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return false;
+
+        var bDuplicate=true;
+        if (option && IFrameSplitOperator.IsBool(option.Duplicate)) bDuplicate=option.Duplicate; //是否去重
+
+        var mapSymbol=new Map();
+        for(var i=0;i<arySymbol.length;++i)
+        {
+            var item={ Symbol:arySymbol[i], IsExist:false, IsExist2:false };
+            mapSymbol.set(item.Symbol, item);
+        }
+
+        if (bDuplicate)
+        {
+            if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.Data))
+            {
+                for(var i=0;i<this.SourceData.Data.length;++i)
+                {
+                    var item=this.Data.Data[i];
+                    if (mapSymbol.has(item))
+                    {
+                        mapSymbol.get(item).IsExist=true;
+                    }
+                }
+            }
+
+            if (IFrameSplitOperator.IsNonEmptyArray(this.Data.Data))
+            {
+                for(var i=0;i<this.Data.Data.length;++i)
+                {
+                    var item=this.Data.Data[i];
+                    if (mapSymbol.has(item))
+                    {
+                        mapSymbol.get(item).IsExist2=true;
+                    }
+                }
+            }
+        }
+
+        for(var mapItem of mapSymbol)
+        {
+            var item=mapItem[1];
+            if (!item.IsExist) this.SourceData.Data.push(item.Symbol);
+            if (!item.IsExist2) this.Data.Data.push(item.Symbol);
+        }
+
+        this.Draw();
+        this.UpdateStockData();
+
+        return true;
     }
 
     //下载码表
@@ -134602,7 +134848,6 @@ function JSReportChartContainer(uielement)
     this.StopAutoUpdate=function()
     {
         this.CancelAutoUpdate();
-        this.AutoUpdateEvent(false,'JSDealChartContainer::StopAutoUpdate');
         if (!this.IsAutoUpdate) return;
         this.IsAutoUpdate=false;
     }
@@ -145698,7 +145943,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14592";
+var HQCHART_VERSION="1.1.14603";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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