hqchart 1.1.14591 → 1.1.14598

package/src/jscommon/umychart.report.js

@@ -284,6 +284,11 @@ function JSReportChart(divElement)
         if (this.JSChartContainer) this.JSChartContainer.SetSelectedRow(option);
     }
 
+    this.DeleteSymbol=function(arySymbol, option)
+    {
+        if (this.JSChartContainer) this.JSChartContainer.DeleteSymbol(arySymbol, option);
+    }
+
     this.EnableFilter=function(bEnable, option) //启动|关闭筛选
     {
         if (this.JSChartContainer) this.JSChartContainer.EnableFilter(bEnable, option);
@@ -1188,6 +1193,55 @@ function JSReportChartContainer(uielement)
         this.UpdateStockData();
     }
 
+    //删除股票
+    this.DeleteSymbol=function(arySymbol, option)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return false;
+
+        var setSymbol=new Set(arySymbol);
+        var bFinder=false;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.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;
+        }
+
+        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.AutoUpdateEvent=function(bStart, explain)          //自定更新事件, 是给websocket使用
     {
         var eventID=bStart ? JSCHART_EVENT_ID.RECV_START_AUTOUPDATE:JSCHART_EVENT_ID.RECV_STOP_AUTOUPDATE;

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

@@ -7202,7 +7202,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;                //是否检测接收到的数据
@@ -8432,7 +8432,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 +8460,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    //X轴坐标拖动 缩放K线
     this.OnDragXCoordinateZoom=function(drag, moveData, e)
     {
         var moveSetp=moveData.X;
@@ -8487,6 +8493,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 +8646,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         }
     }
 
+    
     this.GetXDataIndex=function(obj)
     {
         if (!this.ChartPaint[0] || !this.ChartPaint[0].Data) return false;
@@ -8688,6 +8745,10 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         else if (IsMinuteChart)
         {
             if (this.OnMinuteSelectRectMouseUp) this.OnMinuteSelectRectMouseUp(e);  //分时图区间选择
+        }
+        else if (this.MouseDrag && this.MouseDrag.Click && this.MouseDrag.Click.IsInFrameBottom)
+        {
+
         }
         else if ((bLButtonSelectRect || bRButtonSelectRect) && !bShfitDragKLine)  //K线图区间选择
         {
@@ -11020,7 +11081,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 ");
         }
 
@@ -11269,6 +11331,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     if (this.OnCustomKeyDown(keyID, e))
                         break;
                 }
+
+                //K线 如果超出K线数据了 调整到最后一个数据
+                if (this.FixCursorIndexValid && this.FixCursorIndexValid())
+                {
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                    break;
+                }
                
                 if (this.CursorIndex<=0.99999)
                 {
@@ -11300,6 +11371,15 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                         break;
                 }
 
+                //K线 如果超出K线数据了 调整到最后一个数据
+                if (this.FixCursorIndexValid && this.FixCursorIndexValid())
+                {
+                    this.UpdatePointByCursorIndex();
+                    this.DrawDynamicInfo();
+                    this.ShowTooltipByKeyDown();
+                    break;
+                }
+
                 var xPointcount=0;
                 if (this.Frame.XPointCount) xPointcount=this.Frame.XPointCount;
                 else xPointcount=this.Frame.SubFrame[0].Frame.XPointCount;
@@ -11720,13 +11800,21 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             return;
         }
 
+        var kData=this.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return;
+
         var index=Math.abs(this.CursorIndex-0.5);
         index=parseInt(index.toFixed(0));
         if (this.ClassName=='KLineChartContainer' || this.ClassName=='KLineTrainChartContainer') index=this.CursorIndex;
 
+        var dataIndex=kData.DataOffset+index;
+        if (dataIndex<0 || dataIndex>=kData.Data.length) return;
+        var kItem=kData.Data[dataIndex];
+        if (!kItem) return;
+
         var data=this.Frame.Data;
         var toolTip=new TooltipData();
-        toolTip.Data=data.Data[data.DataOffset+index];
+        toolTip.Data=kItem;
         toolTip.ChartPaint=this.ChartPaint[0];
 
         var pixelTatio = GetDevicePixelRatio();
@@ -14539,7 +14627,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))
@@ -15244,6 +15337,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;  //十字光标
@@ -86819,7 +86923,8 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
                 [
                     
                     { 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:"启动右键拖拽", 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) },
                     { 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 },
@@ -88654,6 +88759,22 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
 
         return result;
     }
+
+    //修正十字光标位置有效的K线
+    this.FixCursorIndexValid=function()
+    {
+        var kData=this.GetKData();
+        if (!kData || !IFrameSplitOperator.IsNonEmptyArray(kData.Data)) return false;
+
+        var dataIndex=this.CursorIndex+kData.DataOffset;
+        if (dataIndex>=kData.Data.length)
+        {
+            this.CursorIndex=kData.Data.length-kData.DataOffset-1;
+            return true;
+        }
+
+        return false;
+    }
 }
 
 //API 返回数据 转化为array[]
@@ -89635,8 +89756,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();
     }
@@ -89663,7 +89784,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)
@@ -133106,6 +133227,11 @@ function JSReportChart(divElement)
         if (this.JSChartContainer) this.JSChartContainer.SetSelectedRow(option);
     }
 
+    this.DeleteSymbol=function(arySymbol, option)
+    {
+        if (this.JSChartContainer) this.JSChartContainer.DeleteSymbol(arySymbol, option);
+    }
+
     this.EnableFilter=function(bEnable, option) //启动|关闭筛选
     {
         if (this.JSChartContainer) this.JSChartContainer.EnableFilter(bEnable, option);
@@ -134010,6 +134136,55 @@ function JSReportChartContainer(uielement)
         this.UpdateStockData();
     }
 
+    //删除股票
+    this.DeleteSymbol=function(arySymbol, option)
+    {
+        if (!IFrameSplitOperator.IsNonEmptyArray(arySymbol)) return false;
+
+        var setSymbol=new Set(arySymbol);
+        var bFinder=false;
+        if (IFrameSplitOperator.IsNonEmptyArray(this.SourceData.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;
+        }
+
+        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.AutoUpdateEvent=function(bStart, explain)          //自定更新事件, 是给websocket使用
     {
         var eventID=bStart ? JSCHART_EVENT_ID.RECV_START_AUTOUPDATE:JSCHART_EVENT_ID.RECV_STOP_AUTOUPDATE;
@@ -145656,7 +145831,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.14590";
+var HQCHART_VERSION="1.1.14597";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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