hqchart 1.1.13732 → 1.1.13740

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

@@ -6582,6 +6582,7 @@ var JSCHART_EVENT_ID=
     ON_CUSTOM_CORSSCURSOR_POSITION:155,    //自定义十字光标X轴的输出的位置
 
     ON_CUSTOM_MINUTE_NIGHT_DAY_X_INDEX:156,   //日盘夜盘的分界线
+    ON_CUSTOM_MINUTE_BG:157,                    //自定义分时图背景颜色
 }
 
 var JSCHART_OPERATOR_ID=
@@ -7607,7 +7608,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     this.SelectChartDrawPicture=null;
                     this.ClearChartDrawPicture(drawPictrueData.ChartDrawPicture);
                 }
-                else if (drawPictrueData.ChartDrawPicture.EnableMove==true)
+                else
                 {
                     this.UpDownDrag=null;   //画图优先
                     this.CurrentChartDrawPicture=drawPictrueData.ChartDrawPicture;
@@ -7627,12 +7628,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                     //this.SelectChartDrawPicture=drawPictrueData.ChartDrawPicture;
                     this.SelectChartDrawPicture.DragInfo={Click:{X:e.clientX,Y:e.clientY}};
                 }
-                else
-                {
-                    this.CurrentChartDrawPicture=null;
-                    this.SelectChartDrawPicture=null;
-                }
-               
+                
                 var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_DRAWPICTURE); //选中画图工具事件
                 if (event && event.Callback)
                 {
@@ -7821,7 +7817,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var sendData={X:x, Y:y, e:e, ChartDrag:this.CustomChartDrag, Drag:drag };
             this.TryDragMove_CustomChartDrag(sendData);
         }
-        else if (this.CurrentChartDrawPicture)
+        else if (this.CurrentChartDrawPicture && this.CurrentChartDrawPicture.EnableMove===true)
         {
             var drawPicture=this.CurrentChartDrawPicture;
             if (drawPicture.Status==1 || drawPicture.Status==2)
@@ -8628,21 +8624,12 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var pixelTatio = GetDevicePixelRatio(); //鼠标移动坐标是原始坐标 需要乘以放大倍速
                 if (this.GetChartDrawPictureByPoint(drawPictrueData))
                 {
-                    if (drawPictrueData.ChartDrawPicture.EnableMove==true)  //是否可以移动
-                    {
-                        drawPictrueData.ChartDrawPicture.Status=20;
-                        drawPictrueData.ChartDrawPicture.ValueToPoint();
-                        drawPictrueData.ChartDrawPicture.MovePointIndex=drawPictrueData.PointIndex;
-                        drawPictrueData.ChartDrawPicture.IsSelected=true;
-                        this.CurrentChartDrawPicture=drawPictrueData.ChartDrawPicture;
-                        this.SelectChartDrawPicture=drawPictrueData.ChartDrawPicture;
-                       
-                    }
-                    else
-                    {
-                        this.CurrentChartDrawPicture=null;
-                        this.SelectChartDrawPicture=null;
-                    }
+                    drawPictrueData.ChartDrawPicture.Status=20;
+                    drawPictrueData.ChartDrawPicture.ValueToPoint();
+                    drawPictrueData.ChartDrawPicture.MovePointIndex=drawPictrueData.PointIndex;
+                    drawPictrueData.ChartDrawPicture.IsSelected=true;
+                    this.CurrentChartDrawPicture=drawPictrueData.ChartDrawPicture;
+                    this.SelectChartDrawPicture=drawPictrueData.ChartDrawPicture;
 
                     var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_DRAWPICTURE); //选中画图工具事件
                     if (event && event.Callback)
@@ -8777,7 +8764,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
                 //JSConsole.Chart.Log(`[JSChartContainer::OnTouchMove]  moveAngle=${moveAngle} , moveUpDown=${moveUpDown}, moveSetp=${moveSetp}`);
 
-                if (this.CurrentChartDrawPicture)
+                if (this.CurrentChartDrawPicture && this.CurrentChartDrawPicture.EnableMove===true)
                 {
                     var drawPicture=this.CurrentChartDrawPicture;
                     if (drawPicture.Status==1 || drawPicture.Status==2)
@@ -16990,6 +16977,7 @@ function MinuteFrame()
             if (this.BeforeDrawXYCallback) this.BeforeDrawXYCallback(this);
 
             this.DrawNightDayBG();  //绘制夜盘 日盘背景
+            this.DrawCustomBG();    //绘制自定义背景色
 
             this.DrawTitleBG();
             this.DrawHorizontal();
@@ -17434,6 +17422,60 @@ function MinuteFrame()
         }
     }
 
+    this.DrawCustomBG=function()
+    {
+        if (!this.HQChart) return;
+        if (this.IsHScreen) return;
+
+        var symbol=this.HQChart.Symbol;
+        if (!symbol) return;
+
+        var event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CUSTOM_MINUTE_BG)
+        if (!event || !event.Callback) return;
+
+        var aryDay=null;
+        if (this.DayCount>1)
+        {
+            if (!IFrameSplitOperator.IsNonEmptyArray(this.HQChart.DayData)) return;
+            aryDay=[];
+            for(var i=this.HQChart.DayData.length-1;i>=0;--i)
+            {
+                aryDay.push({ Date:this.HQChart.DayData[i].Date, BGColor:null } );
+            }
+        }
+        else if (this.DayCount==1)
+        {
+            if (!IFrameSplitOperator.IsPlusNumber(this.HQChart.DataStatus.LatestDate)) return;
+            aryDay=[{ Date:this.HQChart.DataStatus.LatestDate, BGColor:null }];
+        }
+
+        if (!IFrameSplitOperator.IsNonEmptyArray(aryDay)) return;
+        
+        var sendData={ XPointCount:this.XPointCount, DayCount:this.DayCount, MinuteCount:this.MinuteCount , AryDay:aryDay, PreventDefault:false };
+        event.Callback(event, sendData, this);
+        if (sendData.PreventDefault) return;
+
+        var border=this.ChartBorder.GetBorder();
+        for(var i=0;i<aryDay.length;++i)
+        {
+            var item=aryDay[i];
+            if (!item.BGColor) continue;
+
+            var start=i*this.MinuteCount;
+            var end=start+this.MinuteCount-1;
+
+            var xStart=this.GetXFromIndex(start);
+            var xEnd=this.GetXFromIndex(end);
+
+            var rtDay={Left:xStart, Top:border.Top, Right:xEnd, Bottom:border.Bottom };
+            rtDay.Width=rtDay.Right-rtDay.Left;
+            rtDay.Height=rtDay.Bottom-rtDay.Top;
+
+            this.Canvas.fillStyle =item.BGColor;
+            this.Canvas.fillRect(rtDay.Left, rtDay.Top, rtDay.Width, rtDay.Height);
+        }
+    }
+
     this.DrawNightDayBG=function()
     {
         if (this.DayCount!=1) return;
@@ -83517,20 +83559,13 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                     drawPictrueData.Y=(touches[0].clientY-uielement.getBoundingClientRect().top);
                     if (this.GetChartDrawPictureByPoint(drawPictrueData))
                     {
-                        if (drawPictrueData.ChartDrawPicture.EnableMove==true)
-                        {
-                            drawPictrueData.ChartDrawPicture.Status=20;
-                            drawPictrueData.ChartDrawPicture.ValueToPoint();
-                            drawPictrueData.ChartDrawPicture.MovePointIndex=drawPictrueData.PointIndex;
-                            drawPictrueData.ChartDrawPicture.IsSelected=true;
-                            this.CurrentChartDrawPicture=drawPictrueData.ChartDrawPicture;
-                            this.SelectChartDrawPicture=drawPictrueData.ChartDrawPicture;
-                        }
-                        else
-                        {
-                            this.CurrentChartDrawPicture=null;
-                            this.SelectChartDrawPicture=null;
-                        }
+                       
+                        drawPictrueData.ChartDrawPicture.Status=20;
+                        drawPictrueData.ChartDrawPicture.ValueToPoint();
+                        drawPictrueData.ChartDrawPicture.MovePointIndex=drawPictrueData.PointIndex;
+                        drawPictrueData.ChartDrawPicture.IsSelected=true;
+                        this.CurrentChartDrawPicture=drawPictrueData.ChartDrawPicture;
+                        this.SelectChartDrawPicture=drawPictrueData.ChartDrawPicture;
                         
                         let event=this.GetEventCallback(JSCHART_EVENT_ID.ON_CLICK_DRAWPICTURE); //选中画图工具事件
                         if (event && event.Callback)
@@ -83619,7 +83654,7 @@ function MinuteChartContainer(uielement,offscreenElement,cacheElement)
                 var moveUpDown=Math.abs(drag.LastMove.Y-touches[0].clientY);
                 moveSetp=parseInt(moveSetp);
 
-                if (this.CurrentChartDrawPicture)
+                if (this.CurrentChartDrawPicture && this.CurrentChartDrawPicture.EnableMove===true)
                 {
                     var drawPicture=this.CurrentChartDrawPicture;
                     if (drawPicture.Status==1 || drawPicture.Status==2)
@@ -141205,6 +141240,8 @@ var JS_DRAWTOOL_MENU_ID=
     CMD_CHANGE_FONT_COLOR_ID:7, //切换字体颜色
     CMD_CHANGE_BG_COLOR_ID:8,    //切换背景色
     CMD_CHANGE_BORDER_COLOR_ID:9,   //边框颜色
+
+    CMD_LOCK_DRAW_CHART_ID:10,      //上锁
 };
 
 function JSDialogDrawTool()
@@ -141801,6 +141838,7 @@ function JSDialogModifyDraw()
     this.BGColorButton=null;
     this.FontColorButton=null;
     this.BorderColorButton=null;
+    this.LockButton=null;
 
     this.RandomLineColor=["rgb(255,69,0)", "rgb(173,255,47)", "rgb(238,154,73)", "rgb(255,105,180)"];               //线段颜色
     this.RandomBGColor=["rgba(210,251,209，0.8)", "rgb(217,217,253)", "rgb(255,208,204)", "rgb(252,249,206)"];      //背景颜色
@@ -141813,7 +141851,9 @@ function JSDialogModifyDraw()
         { Title:"修改字体颜色", ClassName: 'hqchart_drawtool icon-zitiyanse', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_FONT_COLOR_ID }},
         { Title:"修改背景颜色", ClassName: 'hqchart_drawtool icon-zitibeijingse', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BG_COLOR_ID }},
         { Title:"修改边框颜色", ClassName: 'hqchart_drawtool icon-biankuang', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BORDER_COLOR_ID }},
-        { Title:"删除图形", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID }}
+        { Title:"上锁", ClassName: 'hqchart_drawtool icon-lock', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_LOCK_DRAW_CHART_ID }},
+        { Title:"删除图形", ClassName: 'hqchart_drawtool icon-recycle_bin', Type:2, Data:{ ID:JS_DRAWTOOL_MENU_ID.CMD_DELETE_DRAW_CHART_ID }},
+
     ];
    
     this.Inital=function(hqchart)
@@ -141897,6 +141937,10 @@ function JSDialogModifyDraw()
                 this.BorderColorButton=data;
                 divItem.style.display="none";
                 break;
+            case JS_DRAWTOOL_MENU_ID.CMD_LOCK_DRAW_CHART_ID:
+                this.LockButton=data;
+                this.LockButton.Span.style['color']="rgb(220,220,220)";
+                break;
 
         }
 
@@ -141926,6 +141970,9 @@ function JSDialogModifyDraw()
             case JS_DRAWTOOL_MENU_ID.CMD_CHANGE_BORDER_COLOR_ID:
                 this.ModifyBorderColor();
                 break;
+            case JS_DRAWTOOL_MENU_ID.CMD_LOCK_DRAW_CHART_ID:
+                this.ModifyLockChart();
+                break;
         }
     }
 
@@ -142050,6 +142097,14 @@ function JSDialogModifyDraw()
         this.HQChart.Draw();
     }
 
+    this.ModifyLockChart=function()
+    {
+        if (!this.ChartPicture || !this.HQChart) return;
+        this.ChartPicture.EnableMove=!this.ChartPicture.EnableMove;
+
+        if (this.LockButton) this.LockButton.Span.style['color']=this.ChartPicture.EnableMove?"rgb(220,220,220)":"rgb(0,0,0)";
+    }
+
     this.ModifyBorderColor=function()
     {
         if (!this.ChartPicture || !this.HQChart) return;
@@ -142146,7 +142201,12 @@ function JSDialogModifyDraw()
                 item.Span.style['color']=borderColor;
             }
         }
-        
+
+        if (this.LockButton) 
+        {
+            var item=this.LockButton;
+            item.Span.style['color']=this.ChartPicture.EnableMove?"rgb(220,220,220)":"rgb(0,0,0)";
+        }
     }
 
     this.OnMouseDownTitle=function(e)
@@ -142888,7 +142948,7 @@ function HQChartScriptWorker()
 
 
 
-var HQCHART_VERSION="1.1.13731";
+var HQCHART_VERSION="1.1.13739";
 
 function PrintHQChartVersion()
 {