hqchart 1.1.13206 → 1.1.13213

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

@@ -6553,7 +6553,12 @@ var JSCHART_MENU_ID=
     CMD_SHOW_BEFORE_DATA_ID:24,     //显示|隐藏集合竞价
 
     CMD_SELECTED_ZOOM_ID:25,        //选中放大
-    CMD_SELECTED_SUMMARY_ID:26,  //区间统计
+    CMD_SELECTED_SUMMARY_ID:26,     //区间统计
+
+    CMD_SHOW_INDEX_ID:27,           //显示隐藏指标
+    CMD_SHOW_OVERLAY_INDEX_ID:28,   //显示隐藏叠加指标
+    CMD_DELETE_OVERLAY_INDEX_ID:29, //删除叠加指标
+    CMD_SHOW_OVERLAY_Y_AXIS_ID:30,   //显示隐藏Y轴叠加指标
 }
 
 
@@ -11898,19 +11903,27 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
         {
             this.ChartDrawPicture=[];
             if (this.ChartDrawStorage) this.ChartDrawStorage.Clear();
-
+            this.SelectChartDrawPicture=null;
+            
             if (option && option.Draw==false) bDraw=false;
             if (bDraw) this.Draw();
         }
         else
         {
-            for(var i in this.ChartDrawPicture)
+            for(var i=0; i<this.ChartDrawPicture.length; ++i)
             {
-                if (this.ChartDrawPicture[i]==drawPicture)
+                var item=this.ChartDrawPicture[i];
+                if (item.Guid==drawPicture.Guid || item==drawPicture)
                 {
                     if (this.ChartDrawStorage) this.ChartDrawStorage.DeleteDrawData(drawPicture);
                     this.ChartDrawPicture.splice(i,1);
 
+                    if (this.SelectChartDrawPicture)    //去掉选中
+                    {
+                        if (this.SelectChartDrawPicture.Guid==drawPicture.Guid || this.SelectChartDrawPicture==drawPicture) 
+                            this.SelectChartDrawPicture=null;
+                    }
+
                     if (option && option.Draw==false) bDraw=false;
                     if (bDraw) this.Draw();
                 }
@@ -12112,6 +12125,11 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.Position)) frame.OverlayIndexType.Position=item.OverlayIndexType.Position;
                 if (IFrameSplitOperator.IsNumber(item.OverlayIndexType.LineSpace)) frame.OverlayIndexType.LineSpace=item.OverlayIndexType.LineSpace;
             }
+
+            if (IFrameSplitOperator.IsNonEmptyArray(item.CustomToolbar))    //自定义工具按钮
+            {
+                frame.CustomToolbar=item.CustomToolbar.slice();
+            }
         }
 
         if (IFrameSplitOperator.IsNumber(option.SplitCount)) subFrame.Frame.YSplitOperator.SplitCount=option.SplitCount;
@@ -13148,9 +13166,92 @@ function JSChartContainer(uielement, OffscreenElement, cacheElement)
                 var dlg=new KLineSelectRectDialog(this.DivElement);
                 dlg.DoModal(srcParam);
                 break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_INDEX_ID:        //显示隐藏指标   [0]=windowIndex [1]=0=自动 1=隐藏 2=显示
+                if (param==null || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                var windowIndex=param, showType=aryArgs[1];
+                var script=this.WindowIndex[windowIndex];
+                if (!script) return false;
+            
+                if (showType==1) script.IsShow=false;
+                else if (showType==2) script.IsShow=true;
+                else script.IsShow=!script.IsShow;
+
+                this.UpdateWindowIndex(windowIndex);
+                break;
+
+            case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID:   //显示隐藏叠加指标 [0]=indexGuid [1]=0=自动 1=隐藏 2=显示
+                if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                var indexGuid=srcParam,showType=aryArgs[1];
+
+                var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+                if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return false;
+
+                var script=overlay.OverlayItem.Script;
+
+                if (showType==1) script.IsShow=false;
+                else if (showType==2) script.IsShow==true;
+                else script.IsShow=!script.IsShow;
+
+                this.UpdateOverlayIndex(indexGuid);
+                break;
+            case JSCHART_MENU_ID.CMD_DELETE_OVERLAY_INDEX_ID:
+                if (srcParam && this.DeleteOverlayWindowsIndex)
+                    this.DeleteOverlayWindowsIndex(srcParam);
+                break;
+            case JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID:
+                if (!srcParam || !IFrameSplitOperator.IsNumber(aryArgs[1])) return false;
+                if (!this.GetOverlayIndexByIdentify) return false;
+
+                var indexGuid=srcParam,showType=aryArgs[1];
+                var finder=this.GetOverlayIndexByIdentify(indexGuid);
+                if (!finder || !finder.OverlayItem) return false;
+                
+                var frame=finder.OverlayItem.Frame;
+                if (showType==1) frame.IsShow=false;
+                else if (showType==2) frame.IsShow==true;
+                else frame.IsShow=!frame.IsShow; 
+
+                this.UpdataDataoffset();           //更新数据偏移
+                this.UpdateFrameMaxMin();          //调整坐标最大 最小值
+                this.Draw();
+
+                break;
         }
     }
 
+    this.GetShowIndexMenuData=function(windowIndex, showType)
+    {
+        var script=this.WindowIndex[windowIndex];
+        if (!script) return null;
+
+        var data= { Name:script.IsShow?"隐藏指标":"显示指标",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_INDEX_ID, Args:[windowIndex, 0] } };  
+
+        return data;
+    }
+
+    this.GetShowOverlayIndexMenuData=function(indexGuid, showType)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
+
+        var script=overlay.OverlayItem.Script;
+        var data= { Name:script.IsShow?"隐藏指标":"显示指标",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_OVERLAY_INDEX_ID, Args:[indexGuid, 0] } };  
+
+        return data;
+    }
+
+    this.GetShowOverlayIndexYAxisMenuData=function(indexGuid, showType)
+    {
+        var overlay=this.GetOverlayIndexByIdentify(indexGuid);
+        if (!overlay || !overlay.OverlayItem || !overlay.OverlayItem.Script) return null;
+
+        var frame=overlay.OverlayItem.Frame;
+        var data= { Name:frame.IsShow?"隐藏Y轴":"显示Y轴",  Data:{ ID: JSCHART_MENU_ID.CMD_SHOW_OVERLAY_Y_AXIS_ID, Args:[indexGuid, 0] } };  
+
+        return data;
+    }
+
     //点击右键菜单
     this.OnClickRightMenu=function(data)
     {
@@ -57655,7 +57756,7 @@ function DynamicChartTitlePainting()
                 var rtButton={ Left:left, YCenter:yCenter };
                 this.DrawButton(item, rtButton, moveonPoint, mouseStatus);
 
-                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:1, OverlayID:toolbarInfo.ID, Title:overlayItem.Title  });
+                this.Buttons.push({ ID:item.ID, Rect:rtButton, FrameID:this.Frame.Identify, Type:1, OverlayID:toolbarInfo.ID, Title:overlayItem.Title, Data:item.Data  });
 
                 left=rtButton.Right;
 
@@ -59885,11 +59986,14 @@ function ChartDrawHLine()
 
     this.Button= 
     { 
-        CloseIcon: {  Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null },
-        SettingIcon: { Text:'\ue623',Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, TooltipText:null }
+        CloseIcon: {  Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_DELETE, TooltipText:null, Margin:{ Left:2, Right:2 } },
+        SettingIcon: { Text:'\ue623',Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_SETTING, TooltipText:null, Margin:{ Left:2, Right:2 } }
         //修改ID, Text , TooltipText 可以外部定制按钮
     }
 
+    this.CustomButton=[];   //自定义的按钮 { Text:'\ue62b', Color:'rgb(255,255,255)', Family:"iconfont", Size:16, ID:JSCHART_BUTTON_ID.DRAW_PICTURE_BUTTON_1, TooltipText:null }
+
+    this.AryShowButton=[];  //需要显示的按钮 { Data:, Width }
     this.AryButton=[];
     this.ExtendData;    //扩展数据
     this.ShowPriceTextConfig=
@@ -59995,8 +60099,32 @@ function ChartDrawHLine()
         this.Draw();
     }
 
+    //获取需要显示的按钮 系统按钮+自定义按钮
+    this.GetShowButton=function()
+    {
+        var aryButton=[];
+
+        var item=this.Button.SettingIcon;
+        if (item && item.Text) aryButton.push({ Data:item, Width:null });
+
+        item=this.Button.CloseIcon;
+        if (item && item.Text) aryButton.push({ Data:item, Width:null });
+
+        if (IFrameSplitOperator.IsNonEmptyArray(this.CustomButton))
+        {
+            for(var i=0;i<this.CustomButton.length;++i)
+            {
+                item=this.CustomButton[i];
+                if (item && item.Text) aryButton.push({ Data:item, Width:null });
+            }
+        }
+
+        return aryButton;
+    }
+
     this.Draw=function(moveonPoint, mouseStatus)
     {
+        this.AryShowButton=[];
         this.LinePoint=[];
         this.AryButton=[];
         this.ColseButtonSize=0;
@@ -60072,6 +60200,8 @@ function ChartDrawHLine()
         var labInfo;
         if (this.GetLabelCallback) labInfo=this.GetLabelCallback(this);
 
+        this.AryShowButton=this.GetShowButton();    //获取按钮
+
         //描述信息
         if (labInfo)
             this.DrawLab(labInfo, drawPoint[0].Y);
@@ -60375,42 +60505,33 @@ function ChartDrawHLine()
     {
         var pixelRatio=GetDevicePixelRatio();
 
-        if (this.Button.SettingIcon)
-        {
-            var icon=this.Button.SettingIcon;
-            var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
-            this.Canvas.font=font;
-            var width=this.Canvas.measureText(icon.Text).width;
-            this.SettingButtonSize=width;
-        }
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
 
-        if (this.Button.CloseIcon)
+        var totalWidth=0;
+        for(var i=0;i<this.AryShowButton.length;++i)
         {
-            var icon=this.Button.CloseIcon;
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
             var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
             this.Canvas.font=font;
-            var width=this.Canvas.measureText(icon.Text).width;
-            this.ColseButtonSize=width;
-        }
+            item.Width=this.Canvas.measureText(icon.Text).width+2;
 
-        if (this.ColseButtonSize<=0 && this.SettingButtonSize<=0) return;
+            if (icon.Margin)
+            {
+                var margin=icon.Margin;
+                if (IFrameSplitOperator.IsNumber(margin.Left)) item.Width+=margin.Left;
+                if (IFrameSplitOperator.IsNumber(margin.Right)) item.Width+=margin.Right;
+            }
 
-        var buttonWidth=0
-        if (this.SettingButtonSize>0) buttonWidth+=this.SettingButtonSize;
-        if (this.ColseButtonSize>0) 
-        {
-            if (buttonWidth>0) buttonWidth+=this.ButtonSpace;
-            buttonWidth+=this.ColseButtonSize;
+            totalWidth+=item.Width;
         }
 
-        buttonWidth+=4;
-
-        this.ButtonBGWidth=buttonWidth;
+        this.ButtonBGWidth=totalWidth;
     }
 
     this.DrawButton=function(drawTop, drawLeft, drawHeight, rtDraw)
     {
-        if (this.ColseButtonSize<=0 && this.SettingButtonSize<=0) return;
+        if (!IFrameSplitOperator.IsNonEmptyArray(this.AryShowButton)) return;
 
         if (this.ButtonPosition==1) drawTop-=drawHeight;
 
@@ -60422,61 +60543,29 @@ function ChartDrawHLine()
         this.Canvas.fillStyle=this.ButtonBGColor;
         this.Canvas.fillRect(ToFixedRect(rtBG.Left),ToFixedRect(rtBG.Top), ToFixedRect(rtBG.Width),ToFixedRect(rtBG.Height));
 
-        left+=1;
         var pixelRatio=GetDevicePixelRatio();
-        if (this.Button.SettingIcon && this.Button.SettingIcon.Text)
+        for(var i=0;i<this.AryShowButton.length;++i)
         {
-            var rtButton={Left:left, Top:drawTop, Width:this.SettingButtonSize, Height:drawHeight };
-            rtButton.Right=rtButton.Left+rtButton.Width;
-            rtButton.Bottom=rtButton.Top+rtButton.Height;
-            var yCenter=rtButton.Top+rtButton.Height/2;
-            var xCenter=rtButton.Left+rtButton.Width/2;
+            var item=this.AryShowButton[i];
+            var icon=item.Data;
 
-            var icon=this.Button.SettingIcon;
-            this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
-            this.Canvas.textAlign="center";
-            this.Canvas.textBaseline="middle";
-            this.Canvas.fillStyle=icon.Color;
-            this.Canvas.fillText(this.Button.SettingIcon.Text,xCenter,yCenter);
-
-            this.AryButton.push({Rect:rtButton, ID:icon.ID, TooltipText:icon.TooltipText});
-
-            /*
-            if (this.ColseButtonSize>0)
-            {
-                var xLine=rtButton.Right+this.ButtonSpace/2;
-                xLine=ToFixedPoint(xLine);
-                this.Canvas.strokeStyle=this.ButtonSplitLineColor;
-                this.Canvas.beginPath();
-                this.Canvas.moveTo(xLine,rtButton.Top);
-                this.Canvas.lineTo(xLine,rtButton.Bottom);
-                this.Canvas.stroke();
-            }
-            */
-
-            left=rtButton.Right+this.ButtonSpace;
-        }
-
-        if (this.Button.CloseIcon && this.Button.CloseIcon.Text)
-        {
-            var rtButton={Left:left, Top:drawTop, Width:this.ColseButtonSize, Height:drawHeight };
+            var rtButton={Left:left, Top:drawTop, Width:item.Width, Height:drawHeight };
             rtButton.Right=rtButton.Left+rtButton.Width;
             rtButton.Bottom=rtButton.Top+rtButton.Height;
             var yCenter=rtButton.Top+rtButton.Height/2;
             var xCenter=rtButton.Left+rtButton.Width/2;
-            var icon=this.Button.CloseIcon;
-            this.Canvas.font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+
+            var font=`${icon.Size*pixelRatio}px ${icon.Family}`;
+            this.Canvas.font=font;
             this.Canvas.textAlign="center";
             this.Canvas.textBaseline="middle";
             this.Canvas.fillStyle=icon.Color;
-            this.Canvas.fillText(this.Button.CloseIcon.Text,xCenter,yCenter);
+            this.Canvas.fillText(icon.Text,xCenter,yCenter);
 
             this.AryButton.push({Rect:rtButton,ID:icon.ID, TooltipText:icon.TooltipText });
 
             left=rtButton.Right;
         }
-
-        rtDraw.Right=rtBG.Right;
     }
 
     this.PtInButtons=function(x,y)
@@ -116973,6 +117062,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         titlePaint.OverlayIndex.get(overlayIndex.Identify).Data[id]=new DynamicTitleData(chart.Data,varItem.Name,clrTitle);
 
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -117327,6 +117417,7 @@ function OverlayScriptIndex(name,script,args,option)
 
         //var titleIndex=windowIndex+1;
         //hqChart.TitlePaint[titleIndex].Data[id]=new DynamicTitleData(bar.Data,varItem.Name,bar.Color);
+        this.SetChartIndexName(chart);
         frame.ChartPaint.push(chart);
     }
 
@@ -131875,7 +131966,7 @@ function ScrollBarBGChart()
 
 
 
-var HQCHART_VERSION="1.1.13205";
+var HQCHART_VERSION="1.1.13209";
 
 function PrintHQChartVersion()
 {

package/src/jscommon/umychart.version.js

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