hqchart 1.1.14258 → 1.1.14274

package/src/jscommon/umychart.js

@@ -2758,6 +2758,8 @@ var JSCHART_BUTTON_ID=
     INDEX_NAME_BUTTON:43,
 
     ADD_INDEX_WINDOW:44,    //增加指标窗口
+
+    CHIP_CLOSE:45,          //关闭筹码图
 }
 
 var JSCHART_DATA_FIELD_ID=
@@ -4842,6 +4844,34 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
 
     }
 
+    this.TryPhoneClickButton=function(x,y,e)
+    {
+        if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域 , 指标标题点击
+        {
+            if (this.TryClickLock && this.TryClickLock(x, y)) return true;
+            if (this.TryClickIndexTitle && this.TryClickIndexTitle(x,y)) return true;
+        }
+
+        if (this.ClickFrameButton)
+        {
+            var button=this.Frame.PtInButtons(x,y);
+            if (button)
+            {
+                this.ClickFrameButton(button, e);
+                return true;
+            }
+        }
+
+        button=this.PtInExtendChartButtons(x,y);
+        if (button && this.ClickExtendChartButton)
+        {
+            this.ClickExtendChartButton(button, e);
+            return true;
+        }
+
+        return false;
+    }
+
     this.OnTouchStart=function(e)
     {
         if (this.ChartSplashPaint && this.ChartSplashPaint.IsEnableSplash == true) return;
@@ -4864,23 +4894,7 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
             var touches = this.GetToucheData(e, this.IsForceLandscape);
             var pt=this.PointAbsoluteToRelative(touches[0].clientX, touches[0].clientY, true);
 
-            if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域 , 指标标题点击
-            {
-                var x = pt.X;
-                var y = pt.Y;
-                if (this.TryClickLock && this.TryClickLock(x, y)) return;
-                if (this.TryClickIndexTitle && this.TryClickIndexTitle(x,y)) return;
-            }
-
-            if (this.ClickFrameButton)
-            {
-                var button=this.Frame.PtInButtons(pt.X,pt.Y);
-                if (button)
-                {
-                    this.ClickFrameButton(button, e);
-                    return;
-                }
-            }
+            if (this.TryPhoneClickButton(pt.X, pt.Y, e)) return;
 
             if (this.EnableVerticalDrag )
             {
@@ -44761,8 +44775,12 @@ function StockChipPhone()
     //手机端没有按钮
     this.DrawToolbar=function(moveonPoint, mouseStatus) { }
 
+    this.CloseButtonConfig=CloneData(g_JSChartResource.StockChip.PhoneCloseButton);
+    
+
     this.Draw=function()
     {
+        this.Buttons=[];
         this.IsHScreen=this.ChartFrame.IsHScreen==true;
         this.PixelRatio=GetDevicePixelRatio();
         if (this.IsHScreen)
@@ -44805,6 +44823,7 @@ function StockChipPhone()
         }
 
         this.DrawBorder();
+        this.DrawCloseButton();
         this.SizeChange=false;
     }
 
@@ -45167,6 +45186,73 @@ function StockChipPhone()
         
         this.Canvas.fill();
     }
+
+    //关闭按钮
+    this.DrawCloseButton=function()
+    {
+        var config=this.CloseButtonConfig;
+        var font=`${config.Size}px ${config.Family}`;
+        var rtButton=null;
+        if (this.IsHScreen)
+        {
+            var border=this.ChartBorder.GetHScreenBorder();
+            var right=border.Left-2;
+            var bottom=border.ChartHeight-2;
+            var left=right-config.Size;
+            var top=bottom-config.Size;
+
+            var rtButton={ Left:left, Top:top, Bottom:bottom, Right:right };
+            rtButton.Width=rtButton.Right-rtButton.Left;
+            rtButton.Height=rtButton.Bottom-rtButton.Top;
+        }
+        else
+        {
+            var border=this.ChartBorder.GetBorder();
+            var top=border.Bottom+2;
+            var bottom=top+config.Size;
+            var right=border.ChartWidth-2;
+            var left=right-config.Size;
+
+            var rtButton={ Left:left, Top:top, Bottom:bottom, Right:right };
+            rtButton.Width=rtButton.Right-rtButton.Left;
+            rtButton.Height=rtButton.Bottom-rtButton.Top;
+        }
+
+        if (!rtButton) return;
+
+        if (config.Border)
+        {
+            if (config.Border.BGColor) 
+            {
+                this.Canvas.fillStyle=config.Border.BGColor;
+                this.Canvas.fillRect(rtButton.Left,rtButton.Top,rtButton.Width,rtButton.Height);
+            }
+        }
+
+        this.Canvas.fillStyle=config.Color;
+        this.Canvas.font=font;
+        this.Canvas.textAlign="left";
+        this.Canvas.textBaseline="bottom";
+        if (this.IsHScreen)
+        {
+            var radius=config.Size/2;
+            var x=rtButton.Left+radius, y=rtButton.Bottom-radius;
+            this.Canvas.save(); 
+            this.Canvas.translate(x,y);
+            this.Canvas.rotate(90 * Math.PI / 180);
+            this.Canvas.fillText(config.Text,-radius,radius);
+            this.Canvas.restore();
+            
+        }
+        else
+        {
+            this.Canvas.fillText(config.Text, rtButton.Left, rtButton.Bottom);
+        }
+
+        var btnItem={ ID:JSCHART_BUTTON_ID.CHIP_CLOSE, Rect:rtButton };
+        this.Buttons.push(btnItem);
+    
+    }
 }
 
 //窗口分割
@@ -48848,6 +48934,10 @@ IFrameSplitOperator.FormatDateString=function(value,format, languageID)
     {
         case 'MM-DD':
             return IFrameSplitOperator.NumberToString(month) + '-' + IFrameSplitOperator.NumberToString(day);
+        case "MM-DD/W":
+            var date=new Date(year,month-1,day);
+            var week=g_JSChartLocalization.GetText(WEEK_NAME[date.getDay()],languageID);
+            return `${IFrameSplitOperator.NumberToString(month)}-${IFrameSplitOperator.NumberToString(day)}/${week}`;
         case "MM/DD":
             return `${IFrameSplitOperator.NumberToString(month)}/${IFrameSplitOperator.NumberToString(day)}`;
         case "MM/DD/W":
@@ -70401,6 +70491,16 @@ function JSChartResource()
             Size:13*GetDevicePixelRatio(),
             MerginLeft:4
         },
+
+        //手机端
+        PhoneCloseButton:
+        {
+            Family:"iconfont", 
+            Size:16*GetDevicePixelRatio(), 
+            Text:"\ue60c", 
+            Color:"rgb(255,255,255)",
+            Border:{ BGColor:"rgb(169,169,169)" }
+        }
     }
 
     //深度图
@@ -70535,7 +70635,7 @@ function JSChartResource()
             Size:12, Family:"iconfont",
             Arrow:[null, "\ue6b2", "\ue6b1"],           //[0]=默认排序的图标背景色
             Color:[null, "rgb(255,0,0)", "rgb(255,0,0)"],
-            Margin:{ Left:0, Bottom:6 }
+            Margin:{ Left:0, Bottom:2, Right:0,}
         },
 
         Item:
@@ -71319,6 +71419,20 @@ function JSChartResource()
             if (item.DefaultButton) T_SetButtonStyle(item.DefaultButton, this.StockChip.DefaultButton);
             if (item.LongButton) T_SetButtonStyle(item.LongButton, this.StockChip.LongButton);
             if (item.RecentButton) T_SetButtonStyle(item.RecentButton, this.StockChip.RecentButton);
+            if (item.CloseButton) T_SetButtonStyle(item.CloseButton, this.StockChip.CloseButton);
+
+            if (item.PhoneCloseButton)
+            {
+                var subItem=item.PhoneCloseButton;
+                if (subItem.Family) this.StockChip.PhoneCloseButton.Family=subItem.Family;
+                if (subItem.Text) this.StockChip.PhoneCloseButton.Text=subItem.Text;
+                if (subItem.Color) this.StockChip.PhoneCloseButton.Color=subItem.Color;
+                if (IFrameSplitOperator.IsNumber(subItem.Size)) this.StockChip.PhoneCloseButton.Size=subItem.Size;
+                if (subItem.Border)
+                {
+                    if (subItem.Border.BGColor) this.StockChip.PhoneCloseButton.Border.BGColor=subItem.Border.BGColor;
+                }
+            }
         }
 
         if (style.DepthChart)
@@ -80565,6 +80679,10 @@ function KLineChartContainer(uielement,OffscreenElement, cacheElement)
             button.Chart.ShowType=2;
             this.Draw();
         }
+        else if (button.ID==JSCHART_BUTTON_ID.CHIP_CLOSE)
+        {
+            if (this.DeleteStockChipChart) this.DeleteStockChipChart();
+        }
     }
 
     //成交量分布图数据请求
@@ -88165,6 +88283,9 @@ function KLineChartHScreenContainer(uielement)
             var touches = this.GetToucheData(e, false);
             var pt=this.PointAbsoluteToRelative(touches[0].clientX, touches[0].clientY, true);
 
+            if (this.TryPhoneClickButton(pt.X,pt.Y,e)) return;
+
+            /*
             if (this.TryClickLock || this.TryClickIndexTitle) //指标枷锁区域, 指标标题点击
             {
                 var x = pt.X;
@@ -88182,6 +88303,7 @@ function KLineChartHScreenContainer(uielement)
                     return;
                 }
             }
+            */
 
             if (this.EnableVerticalDrag )
             {